Changeset 68556 in vbox for trunk/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMFDriver.cpp

Timestamp:

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

Author:

vboxsync

Message:

merging vbglioc r117707: Mouse/NT5: Use always Vbgl APIs to talking to the driver. Must do lazy registration of the event callback as we don't know when VBoxGuest will show up.

File:

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

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

@@ -30 +30 @@
     NOREF(RegistryPath);
     PAGED_CODE();
+LOGREL(("DriverEntry:"));
 
     int irc = RTR0Init(0);
@@ -42 +43 @@
     DriverObject->DriverExtension->AddDevice = VBoxDrvAddDevice;
 
-    for (int i=0; i<=IRP_MJ_MAXIMUM_FUNCTION; ++i)
-    {
+    for (int i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; ++i)
         DriverObject->MajorFunction[i] = VBoxIrpPassthrough;
-    }
-
     DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = VBoxIrpInternalIOCTL;
-    DriverObject->MajorFunction[IRP_MJ_PNP] = VBoxIrpPnP;
-    DriverObject->MajorFunction[IRP_MJ_POWER] = VBoxIrpPower;
-
-    NTSTATUS tmpStatus = VBoxNewProtInit();
-    if (!NT_SUCCESS(tmpStatus))
-    {
-        WARN(("VBoxNewProtInit failed Status (0x%x)", tmpStatus));
-    }
-
+    DriverObject->MajorFunction[IRP_MJ_PNP]                     = VBoxIrpPnP;
+    DriverObject->MajorFunction[IRP_MJ_POWER]                   = VBoxIrpPower;
+
+    VBoxMouFltInitGlobals();
     LOGF_LEAVE();
     return STATUS_SUCCESS;
@@ -67 +60 @@
     LOGF_ENTER();
 
-    NTSTATUS tmpStatus = VBoxNewProtTerm();
-    if (!NT_SUCCESS(tmpStatus))
-    {
-        WARN(("VBoxNewProtTerm failed Status (0x%x)", tmpStatus));
-    }
-
-
+    VBoxMouFltDeleteGlobals();
     RTR0Term();
 }