Changeset 68550 in vbox for trunk/src/VBox/Additions/WINNT/Mouse/NT5

Timestamp:

Aug 31, 2017 12:09:41 PM (7 years ago)

Author:

vboxsync

Message:

merging vbglioc r117689: Initial VBoxGuest I/O control changes.

File:

• trunk/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMFInternal.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMFInternal.cpp

@@ -148 +148 @@
 static NTSTATUS vboxNewProtRegisterMouseEventCb(BOOLEAN fRegister)
 {
-    VBoxGuestMouseSetNotifyCallback CbInfo = {};
-    CbInfo.pfnNotify = fRegister ? vboxNewProtMouseEventCb : NULL;
-
-    NTSTATUS Status = vboxGdcSubmit(VBOXGUEST_IOCTL_SET_MOUSE_NOTIFY_CALLBACK, &CbInfo, sizeof (CbInfo));
+    VBGLIOCSETMOUSENOTIFYCALLBACK Info;
+    VBGLREQHDR_INIT(&Info.Hdr, SET_MOUSE_NOTIFY_CALLBACK);
+    Info.u.In.pfnNotify = fRegister ? vboxNewProtMouseEventCb : NULL;
+    Info.u.In.pvUser    = NULL;
+
+    NTSTATUS Status = vboxGdcSubmit(VBGL_IOCTL_SET_MOUSE_NOTIFY_CALLBACK, &Info, sizeof(Info));
     if (!NT_SUCCESS(Status))
-    {
         WARN(("vboxGdcSubmit failed Status(0x%x)", Status));
+    else if (RT_FAILURE(Info.Hdr.rc))
+    {
+        WARN(("VBGL_IOCTL_SET_MOUSE_NOTIFY_CALLBACK failed: rc=%Rrc", Info.Hdr.rc));
+        Status = STATUS_UNSUCCESSFUL;
     }
     return Status;
@@ -327 +332 @@
         if (!vboxIsVBGLInited() && !vboxIsVBGLInitFailed())
         {
-            int rc = VbglInitClient();
-
+            int rc = VbglR0InitClient();
             if (RT_SUCCESS(rc))
             {
@@ -540 +544 @@
             InterlockedExchange(&g_ctx.fVBGLInitFailed, TRUE);
 
-            VbglTerminate();
+            VbglR0TerminateClient();
 
             /* The VBGL is now in the not initialized state. */