Changeset 63066 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Aug 5, 2016 9:47:28 PM (8 years ago)

Author:

vboxsync

Message:

GA/NT/Mouse: warnings

Location:

trunk/src/VBox/Additions/WINNT/Mouse

Files:

• NT4/VBoxPS2NT.cpp (modified) (9 diffs)
• NT5/VBoxMFInternal.cpp (modified) (4 diffs)

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

@@ -972 +972 @@
 static VOID CtrlRetriesExceededDpc(PKDPC Dpc, PDEVICE_OBJECT pDevObj, PIRP Irp, PVOID pCtx)
 {
-    NOREF(Dpc);
-    NOREF(pCtx);
-    PDEVEXT pDevExt = (PDEVEXT)pDevObj->DeviceExtension;
+    RT_NOREF(Dpc, pCtx);
 
     Irp->IoStatus.Status = STATUS_IO_TIMEOUT;
 
     IoStartNextPacket(pDevObj, FALSE);
-    IoCompleteRequest (Irp, IO_KEYBOARD_INCREMENT);
+    IoCompleteRequest(Irp, IO_KEYBOARD_INCREMENT);
 }
 
@@ -1091 +1089 @@
 static VOID CtrlTimeoutDpc(PKDPC Dpc, PDEVICE_OBJECT pDevObj, PVOID SystemContext1, PVOID SystemContext2)
 {
+    RT_NOREF(Dpc, SystemContext1, SystemContext2);
     PDEVEXT pDevExt = (PDEVEXT)pDevObj->DeviceExtension;
 
@@ -1574 +1573 @@
         {
             if (pDevExt->KeyboardEnableCount == 0)
+            {
                 UCHAR scanCode = I8X_GET_DATA_BYTE(pDevExt->DevRegs[i8042Dat]);
+                NOREF(scanCode);
+            }
             return FALSE;
         }
@@ -1716 +1718 @@
                                                    &peripheralType, NULL,
                                                    KbdCallOut, pInit);
+        NOREF(status); /* how diligent of us */
 
         if (pDevExt->HardwarePresent & KEYBOARD_HARDWARE_PRESENT)
@@ -1747 +1750 @@
                           PUNICODE_STRING KeyboardDeviceName, PUNICODE_STRING PointerDeviceName)
 {
-    PDEVEXT pDevExt = &pInit->DevExt;
     NTSTATUS status = STATUS_SUCCESS;
     INTERFACE_TYPE interfaceType;
@@ -1789 +1791 @@
     BOOLEAN fConflict;
 
-    UNICODE_STRING KbdNameFull;
-    UNICODE_STRING MouNameFull;
-    UNICODE_STRING KbdNameBase;
-    UNICODE_STRING MouNameBase;
-    UNICODE_STRING DevNameSuff;
-    UNICODE_STRING resourceDeviceClass;
-    UNICODE_STRING registryPath;
+    UNICODE_STRING KbdNameFull          = { 0, 0, NULL };
+    UNICODE_STRING MouNameFull          = { 0, 0, NULL };
+    UNICODE_STRING KbdNameBase          = { 0, 0, NULL };
+    UNICODE_STRING MouNameBase          = { 0, 0, NULL };
+    UNICODE_STRING DevNameSuff          = { 0, 0, NULL };
+    UNICODE_STRING resourceDeviceClass  = { 0, 0, NULL };
+    UNICODE_STRING registryPath         = { 0, 0, NULL };
 
 #define NAME_MAX 256
@@ -1811 +1813 @@
 
     RtlZeroMemory(pInit, sizeof(INITEXT));
-    KbdNameFull.MaximumLength = 0;
-    KbdNameFull.Length = 0;
-    MouNameFull.MaximumLength = 0;
-    MouNameFull.Length = 0;
-    DevNameSuff.MaximumLength = 0;
-    DevNameSuff.Length = 0;
-    resourceDeviceClass.MaximumLength = 0;
-    resourceDeviceClass.Length = 0;
-    registryPath.MaximumLength = 0;
     RtlZeroMemory(keyboardBuffer, NAME_MAX * sizeof(WCHAR));
     KbdNameBase.Buffer = keyboardBuffer;
@@ -2929 +2922 @@
                            CONFIGURATION_TYPE uPrfType, ULONG uPrfNr, PKEY_VALUE_FULL_INFORMATION *pPrfInf)
 {
+    RT_NOREF(PathName, pBusInf, uCtrlType, uCtrlNr, uPrfType, uPrfNr);
     UNICODE_STRING unicodeIdentifier;
     GetDevIdentifier(pPrfInf, &unicodeIdentifier);
@@ -3081 +3075 @@
                            CONFIGURATION_TYPE uPrfType, ULONG uPrfNr, PKEY_VALUE_FULL_INFORMATION *pPrfInf)
 {
+    RT_NOREF(PathName, pBusInf, uCtrlType, uCtrlNr, uPrfType, uPrfNr);
     NTSTATUS status = STATUS_SUCCESS;
 

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

@@ -1 +1 @@
 /* $Id$ */
-
 /** @file
  * VBox Mouse filter internal functions
@@ -17 +16 @@
  */
 
+#undef WIN9X_COMPAT_SPINLOCK
 #define WIN9X_COMPAT_SPINLOCK /* Avoid duplicate _KeInitializeSpinLock@4 error on x86. */
 #include <iprt/asm.h>
@@ -79 +79 @@
     NTSTATUS Status;
     PIRP pIrp;
-    KIRQL Irql = KeGetCurrentIrql();
-    Assert(Irql == PASSIVE_LEVEL);
+    Assert(KeGetCurrentIrql() == PASSIVE_LEVEL);
 
     pIrp = IoBuildDeviceIoControlRequest(uCtl, g_ctx.Gdc.pDo, NULL, 0, NULL, 0, TRUE, pEvent, pIoStatus);
@@ -119 +118 @@
 static DECLCALLBACK(void) vboxNewProtMouseEventCb(void *pvContext)
 {
+    RT_NOREF(pvContext);
     PVBOXMOUSE_DEVEXT pDevExt = (PVBOXMOUSE_DEVEXT)ASMAtomicUoReadPtr((void * volatile *)&g_ctx.pCurrentDevExt);
     if (pDevExt)