Changeset 2713 in vbox for trunk/src/VBox/Additions

Timestamp:

May 18, 2007 1:20:40 PM (18 years ago)

Author:

vboxsync

Message:

Preallocate data for the mouse filter ServiceCallback only when the host accepts mouse integration.

File:

• trunk/src/VBox/Additions/WINNT/MouseFilter/VBoxMouse.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/MouseFilter/VBoxMouse.cpp

@@ -116 +116 @@
             else
             {
-                 devExt->HostInformed = TRUE;
+                devExt->HostInformed = TRUE;
+
+                if (!devExt->reqSC)
+                {
+                    /* Preallocate request for ServiceCallback */
+                    VMMDevReqMouseStatus *req = NULL;
+
+                    vboxRC = VbglGRAlloc ((VMMDevRequestHeader **)&req, sizeof (VMMDevReqMouseStatus), VMMDevReq_GetMouseStatus);
+
+                    if (VBOX_SUCCESS(vboxRC))
+                    {
+                        devExt->reqSC = req;
+                    }
+                    else
+                    {
+                        dprintf(("VBoxMouse::vboxInformHost: request allocation for service callback failed\n"));
+                    }
+                }
             }
+
             VbglGRFree(&req->header);
         }
@@ -592 +610 @@
             int vboxRC = VbglInit ();
 
-            if (VBOX_SUCCESS(vboxRC))
-            {
-                /* We will not fail the driver initialization even
-                 * if the following VBox initialization code will fail.
-                 * In that case we will just do not have mouse integration.
-                 */
-
-                /* Allocate request for ServiceCallback */
-                VMMDevReqMouseStatus *req = NULL;
-
-                vboxRC = VbglGRAlloc ((VMMDevRequestHeader **)&req, sizeof (VMMDevReqMouseStatus), VMMDevReq_GetMouseStatus);
-
-                if (VBOX_SUCCESS(vboxRC))
-                {
-                    devExt->reqSC = req;
-                }
-                else
-                {
-                    dprintf(("VBoxMouse::VBoxMouse_PnP: request allocation failed\n"));
-                    VbglTerminate ();
-                }
-            }
-            else
+            if (VBOX_FAILURE(vboxRC))
             {
                 dprintf(("VBoxMouse::VBoxMouse_PnP: guest library initialization failed\n"));