Changeset 93301 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jan 18, 2022 11:24:43 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

149369

Message:

IPRT: VC++ 19.2 update 11 build adjustments. bugref:8489

Location:

trunk/src/VBox/Runtime

Files:

• common/checksum/RTSha1Digest.cpp (modified) (5 diffs)
• common/checksum/RTSha256Digest.cpp (modified) (5 diffs)
• common/rest/rest-primary-object-types.cpp (modified) (1 diff)
• r0drv/nt/mp-r0drv-nt.cpp (modified) (1 diff)
• r0drv/nt/ntBldSymDb.cpp (modified) (1 diff)
• r3/win/vcc-fakes-kernel32.cpp (modified) (2 diffs)
• testcase/tstRTDigest-2.cpp (modified) (1 diff)
• testcase/tstRTFileAio.cpp (modified) (1 diff)
• testcase/tstRTMemCache.cpp (modified) (1 diff)
• testcase/tstTSC.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/checksum/RTSha1Digest.cpp

@@ -58 +58 @@
 
     /* Buffer size for progress callback */
-    double rdMulti = 100.0 / (cbBuf ? cbBuf : 1);
+    double rdMulti = 100.0 / (cbBuf ? (double)cbBuf : 1.0);
 
     /* Working buffer */
@@ -75 +75 @@
         if (pfnProgressCallback)
         {
-            rc = pfnProgressCallback((unsigned)(cbReadTotal * rdMulti), pvUser);
+            rc = pfnProgressCallback((unsigned)((double)cbReadTotal * rdMulti), pvUser);
             if (RT_FAILURE(rc))
                 break; /* canceled */
@@ -120 +120 @@
 
     /* Fetch the file size. Only needed if there is a progress callback. */
-    double rdMulti = 0;
+    double rdMulti = 0.0;
     if (pfnProgressCallback)
     {
@@ -130 +130 @@
             return rc;
         }
-        rdMulti = 100.0 / (cbFile ? cbFile : 1);
+        rdMulti = 100.0 / (cbFile ? (double)cbFile : 1.0);
     }
 
@@ -161 +161 @@
         if (pfnProgressCallback)
         {
-            rc = pfnProgressCallback((unsigned)(cbReadTotal * rdMulti), pvUser);
+            rc = pfnProgressCallback((unsigned)((double)cbReadTotal * rdMulti), pvUser);
             if (RT_FAILURE(rc))
                 break; /* canceled */

trunk/src/VBox/Runtime/common/checksum/RTSha256Digest.cpp

@@ -58 +58 @@
 
     /* Buffer size for progress callback */
-    double rdMulti = 100.0 / (cbBuf ? cbBuf : 1);
+    double rdMulti = 100.0 / (cbBuf ? (double)cbBuf : 1);
 
     /* Working buffer */
@@ -75 +75 @@
         if (pfnProgressCallback)
         {
-            rc = pfnProgressCallback((unsigned)(cbReadTotal * rdMulti), pvUser);
+            rc = pfnProgressCallback((unsigned)((double)cbReadTotal * rdMulti), pvUser);
             if (RT_FAILURE(rc))
                 break; /* canceled */
@@ -124 +124 @@
 
     /* Fetch the file size. Only needed if there is a progress callback. */
-    double rdMulti = 0;
+    double rdMulti = 0.0;
     if (pfnProgressCallback)
     {
@@ -134 +134 @@
             return rc;
         }
-        rdMulti = 100.0 / (cbFile ? cbFile : 1);
+        rdMulti = 100.0 / (cbFile ? (double)cbFile : 1.0);
     }
 
@@ -161 +161 @@
         if (pfnProgressCallback)
         {
-            rc = pfnProgressCallback((unsigned)(cbReadTotal * rdMulti), pvUser);
+            rc = pfnProgressCallback((unsigned)((double)cbReadTotal * rdMulti), pvUser);
             if (RT_FAILURE(rc))
                 break; /* canceled */

trunk/src/VBox/Runtime/common/rest/rest-primary-object-types.cpp

@@ -1024 +1024 @@
         {
             m_rdValue = iTmp;
-            if (m_rdValue == iTmp)
+            if ((int64_t)m_rdValue == iTmp)
                 return rc;
             return a_rCursor.m_pPrimary->addError(a_rCursor, VERR_OUT_OF_RANGE, "value %RI64 does not fit in a double", iTmp);

trunk/src/VBox/Runtime/r0drv/nt/mp-r0drv-nt.cpp

@@ -1933 +1933 @@
      * APC fallback.
      */
-    static KDPC s_aPokeDpcs[RTCPUSET_MAX_CPUS] = {0};
+    static KDPC s_aPokeDpcs[RTCPUSET_MAX_CPUS] = {{0}};
     static bool s_fPokeDPCsInitialized = false;
 

trunk/src/VBox/Runtime/r0drv/nt/ntBldSymDb.cpp

@@ -967 +967 @@
     static struct { const char *psz; size_t cch; } const s_aNames[] =
     {
-        RT_STR_TUPLE("ntoskrnl.pdb"),
-        RT_STR_TUPLE("ntkrnlmp.pdb"),
-        RT_STR_TUPLE("ntkrnlpa.pdb"),
-        RT_STR_TUPLE("ntkrpamp.pdb"),
+        { RT_STR_TUPLE("ntoskrnl.pdb") },
+        { RT_STR_TUPLE("ntkrnlmp.pdb") },
+        { RT_STR_TUPLE("ntkrnlpa.pdb") },
+        { RT_STR_TUPLE("ntkrpamp.pdb") },
     };
 

trunk/src/VBox/Runtime/r3/win/vcc-fakes-kernel32.cpp

@@ -472 +472 @@
         case FILE_END:
         {
-            FILE_STANDARD_INFO StdInfo = {0};
+            FILE_STANDARD_INFO StdInfo = {{0}};
             rcNt = NtQueryInformationFile(hFile, &Ios, &StdInfo, sizeof(StdInfo), FileStandardInformation);
             if (NT_SUCCESS(rcNt))
@@ -504 +504 @@
 {
     IO_STATUS_BLOCK    Ios     = RTNT_IO_STATUS_BLOCK_INITIALIZER;
-    FILE_STANDARD_INFO StdInfo = {0};
+    FILE_STANDARD_INFO StdInfo = {{0}};
     NTSTATUS rcNt = NtQueryInformationFile(hFile, &Ios, &StdInfo, sizeof(StdInfo), FileStandardInformation);
     if (NT_SUCCESS(rcNt))

trunk/src/VBox/Runtime/testcase/tstRTDigest-2.cpp

@@ -186 +186 @@
     RTTESTI_CHECK(rc == VINF_SUCCESS);
 
-    RTTestIValueF((uint64_t)cChunks * sizeof(g_abRandom72KB) / _1K / (0.000000001 * cNsElapsed), RTTESTUNIT_KILOBYTES_PER_SEC,
-                  "%s throughput", pszDigestName);
+    RTTestIValueF((uint64_t)((long double)(cChunks * sizeof(g_abRandom72KB)) / _1K / (0.000000001 * (long double)cNsElapsed)),
+                  RTTESTUNIT_KILOBYTES_PER_SEC, "%s throughput", pszDigestName);
     RTTESTI_CHECK_RC(RTCrDigestRelease(hDigest), 0);
 }

trunk/src/VBox/Runtime/testcase/tstRTFileAio.cpp

@@ -157 +157 @@
 
     NanoTS = RTTimeNanoTS() - NanoTS;
-    uint64_t SpeedKBs = (uint64_t)(cbTestFile / (NanoTS / 1000000000.0) / 1024);
+    uint64_t SpeedKBs = (uint64_t)((double)cbTestFile / ((double)NanoTS / 1000000000.0) / 1024);
     RTTestValue(g_hTest, "Throughput", SpeedKBs, RTTESTUNIT_KILOBYTES_PER_SEC);
 

trunk/src/VBox/Runtime/testcase/tstRTMemCache.cpp

@@ -309 +309 @@
 
     RTTestIPrintf(RTTESTLVL_ALWAYS, "%'8u iterations per second, %'llu ns on avg\n",
-                  (unsigned)((long double)cIterations * 1000000000.0 / cElapsedNS),
+                  (unsigned)((long double)cIterations * 1000000000.0 / (long double)cElapsedNS),
                   cElapsedNS / cIterations);
 

trunk/src/VBox/Runtime/testcase/tstTSC.cpp

@@ -388 +388 @@
      */
     RTPrintf("tstTSC: %RU64 ticks in %RU64 ns\n", uTSC, uNanoTS);
-    uint64_t cHz = (uint64_t)(uTSC / ((long double)uNanoTS / (long double)1000000000));
+    uint64_t cHz = (uint64_t)((long double)uTSC / ((long double)uNanoTS / (long double)1000000000));
     RTPrintf("tstTSC: Frequency %RU64 Hz", cHz);
     if (cHz > _1G)