Changeset 84394 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

May 20, 2020 9:30:48 AM (5 years ago)

Author:

vboxsync

Message:

SUPHardNT: VC++ 19.x warnings. bugref:8489

Location:

trunk/src/VBox/HostDrivers/Support/win

Files:

• SUPDrv-win.cpp (modified) (3 diffs)
• SUPR3HardenedMain-win.cpp (modified) (6 diffs)

trunk/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp

@@ -509 +509 @@
                         if (NT_SUCCESS(rcNt))
                         {
-                            PSUPDRVDEVEXTERRORINFO pDevExtStub = (PSUPDRVDEVEXTERRORINFO)g_pDevObjStub->DeviceExtension;
-                            pDevExtStub->Common.pMainDrvExt = (PSUPDRVDEVEXT)g_pDevObjSys->DeviceExtension;
-                            pDevExtStub->Common.u32Cookie   = SUPDRVDEVEXTERRORINFO_COOKIE;
+                            PSUPDRVDEVEXTERRORINFO pDevExtErrInf = (PSUPDRVDEVEXTERRORINFO)g_pDevObjStub->DeviceExtension;
+                            pDevExtErrInf->Common.pMainDrvExt = (PSUPDRVDEVEXT)g_pDevObjSys->DeviceExtension;
+                            pDevExtErrInf->Common.u32Cookie   = SUPDRVDEVEXTERRORINFO_COOKIE;
 
 #endif
@@ -3171 +3171 @@
             AssertRCSuccess(rc);
 
-            bool fDone = supdrvNtProtectGetAlpcPortObjectType2(wszPortNm, &pObjType);
+            fDone = supdrvNtProtectGetAlpcPortObjectType2(wszPortNm, &pObjType);
             if (!fDone)
             {
@@ -4734 +4734 @@
             continue;
         PEPROCESS pDbgProc;
-        NTSTATUS rcNt = PsLookupProcessByProcessId(pHandleInfo->UniqueProcessId, &pDbgProc);
+        rcNt = PsLookupProcessByProcessId(pHandleInfo->UniqueProcessId, &pDbgProc);
         if (NT_SUCCESS(rcNt))
         {

trunk/src/VBox/HostDrivers/Support/win/SUPR3HardenedMain-win.cpp

@@ -4346 +4346 @@
            assume same location as in the parent (safe): */
         PSUPHNTLDRCACHEENTRY pLdrEntryKernel32;
-        int rc = supHardNtLdrCacheOpen("kernel32.dll", &pLdrEntryKernel32, NULL /*pErrInfo*/);
+        rc = supHardNtLdrCacheOpen("kernel32.dll", &pLdrEntryKernel32, NULL /*pErrInfo*/);
         if (RT_FAILURE(rc))
             supR3HardenedWinKillChild(pThis, "supR3HardenedWinSetupChildInit", rc,
@@ -4542 +4542 @@
                     uint8_t abPadding[4096];
                 } uBuf;
-                NTSTATUS rcNt = NtQueryVirtualMemory(pThis->hProcess,
-                                                     MemInfo.BaseAddress,
-                                                     MemorySectionName,
-                                                     &uBuf,
-                                                     sizeof(uBuf) - sizeof(WCHAR),
-                                                     &cbActual);
+                rcNt = NtQueryVirtualMemory(pThis->hProcess,
+                                            MemInfo.BaseAddress,
+                                            MemorySectionName,
+                                            &uBuf,
+                                            sizeof(uBuf) - sizeof(WCHAR),
+                                            &cbActual);
                 if (NT_SUCCESS(rcNt))
                 {
@@ -6018 +6018 @@
          * Print basic file information available via NtQueryInformationFile.
          */
-        IO_STATUS_BLOCK Ios = RTNT_IO_STATUS_BLOCK_INITIALIZER;
+        RTNT_IO_STATUS_BLOCK_REINIT(&Ios);
         rcNt = NtQueryInformationFile(hFile, &Ios, &u.BasicInfo, sizeof(u.BasicInfo), FileBasicInformation);
         if (NT_SUCCESS(rcNt) && NT_SUCCESS(Ios.Status))
@@ -6031 +6031 @@
             SUP_DPRINTF(("    FileBasicInformation -> %#x %#x\n", rcNt, Ios.Status));
 
+        RTNT_IO_STATUS_BLOCK_REINIT(&Ios);
         rcNt = NtQueryInformationFile(hFile, &Ios, &u.StdInfo, sizeof(u.StdInfo), FileStandardInformation);
         if (NT_SUCCESS(rcNt) && NT_SUCCESS(Ios.Status))
@@ -6041 +6042 @@
          */
         RT_ZERO(u);
+        RTNT_IO_STATUS_BLOCK_REINIT(&Ios);
         LARGE_INTEGER offRead;
         offRead.QuadPart = 0;
@@ -6102 +6104 @@
                         if (offRead.QuadPart > 0)
                         {
+                            RTNT_IO_STATUS_BLOCK_REINIT(&Ios);
                             RT_ZERO(u);
                             rcNt = NtReadFile(hFile, NULL /*hEvent*/, NULL /*ApcRoutine*/, NULL /*ApcContext*/, &Ios,