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

Timestamp:

Dec 24, 2017 2:38:58 PM (7 years ago)

Author:

vboxsync

Message:

VBoxMouseNT: NT 3.1 tweaks.

Location:

trunk/src/VBox/Additions/WINNT/Mouse/NT4

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxPS2NT.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/WINNT/Mouse/NT4/Makefile.kmk

@@ -30 +30 @@
         VBoxPS2NT.rc
 VBoxMouseNT_LIBS        = \
+        $(VBOX_LIB_IPRT_GUEST_R0_NT4) \
+        $(VBOX_LIB_VBGL_R0) \
+        $(if-expr defined(VBOX_WITH_NT3_ADDITIONS),$(PATH_SDK_$(VBOX_WINDDK_GST_NT4)_LIB)/int64.lib,) \
         $(PATH_SDK_$(VBOX_WINDDK_GST_NT4)_LIB)/exsup.lib \
         $(PATH_SDK_$(VBOX_WINDDK_GST_NT4)_LIB)/ntoskrnl.lib \
-        $(PATH_SDK_$(VBOX_WINDDK_GST_NT4)_LIB)/hal.lib \
-        $(VBOX_LIB_VBGL_R0) \
-        $(VBOX_LIB_IPRT_GUEST_R0_NT4)
+        $(PATH_SDK_$(VBOX_WINDDK_GST_NT4)_LIB)/hal.lib
 VBoxMouseNT_CLEAN       = \
         $(VBoxMouseNT_0_OUTDIR)/VBoxMouseNT.pdb
+VBoxMouseNT_USES.win += vboximportchecker
+ifndef VBOX_WITH_NT3_ADDITIONS
+ VBoxMouseNT_VBOX_IMPORT_CHECKER.win.x86 = nt4/r0
+else
+ VBoxMouseNT_DEFS      += RT_WITHOUT_NOCRT_WRAPPERS TARGET_NT3
+ VBoxMouseNT_SOURCES   += \
+       ../../../../Runtime/r0drv/nt/nt3fakes-r0drv-nt.cpp \
+       ../../../../Runtime/r0drv/nt/nt3fakesA-r0drv-nt.asm \
+       ../../../../Runtime/common/string/strcmp.asm \
+       ../../../../Runtime/common/string/strchr.asm
+ VBoxMouseNT_VBOX_IMPORT_CHECKER.win.x86 = nt31/r0 #nt350/r0
+ VBoxMouseNT_LDFLAGS +=
+endif
+
 
 include $(FILE_KBUILD_SUB_FOOTER)

trunk/src/VBox/Additions/WINNT/Mouse/NT4/VBoxPS2NT.cpp

@@ -37 +37 @@
 #undef ExFreePool
 #undef ExAllocatePool
+
+/* KeQueryTickCount is a macro accessing KeTickCount data export from NT 3.50+. */
+#if 0 //def TARGET_NT3
+# undef KeQueryTickCount
+extern "C" NTKERNELAPI VOID NTAPI KeQueryTickCount(PLARGE_INTEGER);
+#endif
 
 /* i8042 mouse status bits */
@@ -1969 +1975 @@
     if (pDevExt->HardwarePresent & KEYBOARD_HARDWARE_PRESENT)
     {
-        pDevExt->KbdExt.InputData = (PKEYBOARD_INPUT_DATA)
-            ExAllocatePool(NonPagedPool, pDevExt->Cfg.KbdAttr.InputDataQueueLength);
-
+        pDevExt->KbdExt.InputData = (PKEYBOARD_INPUT_DATA)ExAllocatePool(NonPagedPool, pDevExt->Cfg.KbdAttr.InputDataQueueLength);
         if (!pDevExt->KbdExt.InputData)
         {
@@ -1990 +1994 @@
         MouNameFull.MaximumLength = sizeof(L"\\Device\\") + MouNameBase.Length + DevNameSuff.MaximumLength;
         MouNameFull.Buffer = (PWSTR)ExAllocatePool(PagedPool, MouNameFull.MaximumLength);
-
         if (!MouNameFull.Buffer)
         {
@@ -2022 +2025 @@
             goto fail;
 
-        pDevExt->MouExt.InputData =
-            (PMOUSE_INPUT_DATA)ExAllocatePool(NonPagedPool, pDevExt->Cfg.MouAttr.InputDataQueueLength);
+        pDevExt->MouExt.InputData = (PMOUSE_INPUT_DATA)ExAllocatePool(NonPagedPool, pDevExt->Cfg.MouAttr.InputDataQueueLength);
         if (!pDevExt->MouExt.InputData)
         {
@@ -2706 +2708 @@
     if (NT_SUCCESS(status))
     {
-        aQuery = (PRTL_QUERY_REGISTRY_TABLE)
-                        ExAllocatePool(PagedPool, sizeof(RTL_QUERY_REGISTRY_TABLE) * (queries + 1));
+        aQuery = (PRTL_QUERY_REGISTRY_TABLE)ExAllocatePool(PagedPool, sizeof(RTL_QUERY_REGISTRY_TABLE) * (queries + 1));
         if (!aQuery)
             status = STATUS_UNSUCCESSFUL;