Changeset 63068 in vbox for trunk/src/VBox/Additions/WINNT/Mouse

Timestamp:

Aug 5, 2016 9:56:39 PM (8 years ago)

Author:

vboxsync

Message:

GA/NT/Mouse: warnings

File:

• trunk/src/VBox/Additions/WINNT/Mouse/NT4/VBoxPS2NT.cpp (modified) (6 diffs)

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

@@ -2480 +2480 @@
 static NTSTATUS KbdInitHw(PDEVICE_OBJECT pDevObj)
 {
-    NTSTATUS status;
+    NTSTATUS status = STATUS_SUCCESS; /* Shut up MSC. */
     BOOLEAN fWaitForAck = TRUE;
     PDEVEXT pDevExt = (PDEVEXT)pDevObj->DeviceExtension;
@@ -2495 +2495 @@
         if (NT_SUCCESS(status))
             break;
+        if (status == STATUS_IO_TIMEOUT)
+        {
+            LARGE_INTEGER nextQuery, difference, tenSeconds;
+            KeStallExecutionProcessor(50);
+            KeQueryTickCount(&nextQuery);
+            difference.QuadPart = nextQuery.QuadPart - startOfSpin.QuadPart;
+            tenSeconds.QuadPart = 10*10*1000*1000;
+            ASSERT(KeQueryTimeIncrement() <= MAXLONG);
+            if (difference.QuadPart*KeQueryTimeIncrement() >= tenSeconds.QuadPart)
+                break;
+        }
         else
-        {
-            if (status == STATUS_IO_TIMEOUT)
-            {
-                LARGE_INTEGER nextQuery, difference, tenSeconds;
-                KeStallExecutionProcessor(50);
-                KeQueryTickCount(&nextQuery);
-                difference.QuadPart = nextQuery.QuadPart - startOfSpin.QuadPart;
-                tenSeconds.QuadPart = 10*10*1000*1000;
-                ASSERT(KeQueryTimeIncrement() <= MAXLONG);
-                if (difference.QuadPart*KeQueryTimeIncrement() >= tenSeconds.QuadPart)
-                    break;
-            }
-            else
-                break;
-        }
+            break;
     }
 
@@ -2542 +2539 @@
     {
         status = PutBytePoll(i8042Dat, TRUE /*=wait*/, KbdDevType, pDevExt,
-                                  ConvertTypematic(pDevExt->Cfg.KeyRepeatCurrent.Rate,
-                                                   pDevExt->Cfg.KeyRepeatCurrent.Delay));
+                             ConvertTypematic(pDevExt->Cfg.KeyRepeatCurrent.Rate,
+                                              pDevExt->Cfg.KeyRepeatCurrent.Delay));
         /* ignore errors */
     }
@@ -2671 +2668 @@
 {
     PRTL_QUERY_REGISTRY_TABLE aQuery = NULL;
-    UNICODE_STRING parametersPath;
+    UNICODE_STRING parametersPath = { 0, 0, NULL }; /* Shut up MSC (actually badly structured code is a fault, but whatever). */
     UNICODE_STRING defaultPointerName;
     UNICODE_STRING defaultKeyboardName;
@@ -3214 +3211 @@
 static NTSTATUS MouFindWheel(PDEVICE_OBJECT pDevObj)
 {
-    NTSTATUS status;
+    NTSTATUS status = STATUS_SUCCESS; /* Shut up MSC. */
     PDEVEXT pDevExt = (PDEVEXT) pDevObj->DeviceExtension;
 
@@ -3232 +3229 @@
     }
 
-    UCHAR byte;
+    UCHAR byte = UINT8_MAX;
     for (unsigned i = 0; i < 5; i++)
     {