Changeset 83822 in vbox for trunk/src

Timestamp:

Apr 19, 2020 1:13:00 AM (5 years ago)

Author:

vboxsync

Message:

VBoxService: VC++ 14.1 adjustments and warnings. bugref:8489

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxServiceAutoMount.cpp (modified) (3 diffs)
• VBoxServicePageSharing.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk

@@ -88 +88 @@
         $(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,)
 
-VBoxService_DEFS         += \
-        VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\"
+ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
+VBoxService_DEFS         += VBOX_BUILD_TARGET="$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)"
+else
+VBoxService_DEFS         += VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\"
+endif
 VBoxService_DEFS.win     += _WIN32_WINNT=0x0501
 VBoxService_DEFS.os2      = VBOX_WITH_HGCM

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp

@@ -885 +885 @@
     for (char chDrive = 'Z'; chDrive >= 'A'; chDrive--)
     {
-        RTUTF16 const wszMountPoint[4] = { chDrive, ':', '\0', '\0' };
+        RTUTF16 const wszMountPoint[4] = { (RTUTF16)chDrive, ':', '\0', '\0' };
         RTUTF16       wszTargetPath[RTPATH_MAX];
         DWORD const   cwcResult = QueryDosDeviceW(wszMountPoint, wszTargetPath, RT_ELEMENTS(wszTargetPath));
@@ -1432 +1432 @@
      */
     Assert(RT_C_IS_UPPER(pEntry->pszActualMountPoint[0]) && pEntry->pszActualMountPoint[1] == ':' && pEntry->pszActualMountPoint[2] == '\0');
-    RTUTF16 wszDrive[4] = { pEntry->pszActualMountPoint[0], ':', '\0', '\0' };
+    RTUTF16 wszDrive[4] = { (RTUTF16)pEntry->pszActualMountPoint[0], ':', '\0', '\0' };
 
     RTUTF16 wszPrefixedName[RTPATH_MAX];
@@ -1860 +1860 @@
 #ifdef RT_OS_WINDOWS
         Assert(RT_C_IS_UPPER(pszMountPoint[0]) && pszMountPoint[1] == ':' && pszMountPoint[2] == '\0');
-        RTUTF16 const wszDrive[4] = { pszMountPoint[0], ':', '\0', '\0' };
+        RTUTF16 const wszDrive[4] = { (RTUTF16)pszMountPoint[0], ':', '\0', '\0' };
         DWORD dwErr = WNetCancelConnection2W(wszDrive, 0 /*dwFlags*/, FALSE /*fForce*/);
         if (dwErr == NO_ERROR)

trunk/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp

@@ -499 +499 @@
                     pRec = &pModule->Core;
                 }
-                bool ret = RTAvlPVInsert(&pNewTree, pRec);
-                Assert(ret); NOREF(ret);
+                bool fRet = RTAvlPVInsert(&pNewTree, pRec);
+                Assert(fRet); NOREF(fRet);
             }
         }