Changeset 99802 in vbox for trunk/src/VBox/HostServices

Timestamp:

May 16, 2023 12:05:16 AM (20 months ago)

Author:

vboxsync

Message:

*: Adjustments necessary for dropping -Zc:wchar_t- on windows and instead let the C++ compiler use the native wchar_t type.

Location:

trunk/src/VBox/HostServices/SharedFolders

Files:

• VBoxSharedFoldersSvc.cpp (modified) (6 diffs)
• mappings.cpp (modified) (14 diffs)
• vbsf.cpp (modified) (9 diffs)
• vbsfpath.cpp (modified) (1 diff)

trunk/src/VBox/HostServices/SharedFolders/VBoxSharedFoldersSvc.cpp

@@ -359 +359 @@
                                                         pFolderName->u16Size, pFolderName->u16Length, cb));
 
-                rc = RTUtf16ToUtf8(pFolderName->String.ucs2, &pszFolderName);
+                rc = RTUtf16ToUtf8(pFolderName->String.utf16, &pszFolderName);
                 RTMemFree(pFolderName);
                 AssertRCReturn(rc, rc);
@@ -433 +433 @@
             {
                 LogRel(("SharedFolders host service: %Rrc loading %d [%ls] -> [%s]\n",
-                        rc, i, pMapName->String.ucs2, pszFolderName));
+                        rc, i, pMapName->String.utf16, pszFolderName));
             }
 
@@ -1070 +1070 @@
             else
                 Log(("SharedFolders host service: request to map folder '%ls'\n",
-                     ((PSHFLSTRING)paParms[0].u.pointer.addr)->String.ucs2));
+                     ((PSHFLSTRING)paParms[0].u.pointer.addr)->String.utf16));
 
             /* Verify parameter count and types. */
@@ -1106 +1106 @@
                         && paParms[0].u.pointer.size >= sizeof(SHFLSTRING)
                         && pszMapName->u16Length >= 2
-                        && pszMapName->String.ucs2[pszMapName->u16Length / 2 - 1] == 0x0000)
+                        && pszMapName->String.utf16[pszMapName->u16Length / 2 - 1] == 0x0000)
                     {
                         pszMapName->u16Length -= 2;
@@ -1731 +1731 @@
 
                 char *pszHostPath;
-                rc = RTUtf16ToUtf8(pHostPath->String.ucs2, &pszHostPath);
+                rc = RTUtf16ToUtf8(pHostPath->String.utf16, &pszHostPath);
                 if (RT_SUCCESS(rc))
                 {
@@ -1760 +1760 @@
         Log(("SharedFolders host service: svcCall: SHFL_FN_REMOVE_MAPPING\n"));
         LogRel(("SharedFolders host service: Removing host mapping '%ls'\n",
-                ((SHFLSTRING *)paParms[0].u.pointer.addr)->String.ucs2));
+                ((SHFLSTRING *)paParms[0].u.pointer.addr)->String.utf16));
 
         /* Verify parameter count and types. */

trunk/src/VBox/HostServices/SharedFolders/mappings.cpp

@@ -183 +183 @@
      */
     LogRel2(("SharedFolders: mapping a placeholder for '%ls' -> '%s'\n",
-              pLoadedMapping->pMapName->String.ucs2, pLoadedMapping->pszFolderName));
+              pLoadedMapping->pMapName->String.utf16, pLoadedMapping->pszFolderName));
     return vbsfMappingsAdd(pLoadedMapping->pszFolderName, pLoadedMapping->pMapName,
                            pLoadedMapping->fWritable, pLoadedMapping->fAutoMount, pLoadedMapping->pAutoMountPoint,
@@ -214 +214 @@
                 else
                     LogRel(("SharedFolders: Warning! No free root ID entry for mapping #%u: %ls [%s]\n", iMapping,
-                            g_FolderMapping[iMapping].pMapName->String.ucs2, g_FolderMapping[iMapping].pszFolderName));
+                            g_FolderMapping[iMapping].pMapName->String.utf16, g_FolderMapping[iMapping].pszFolderName));
             }
         }
@@ -225 +225 @@
             if (iMapping != SHFL_ROOT_NIL)
                 LogRel2(("SharedFolders: idRoot %u: iMapping #%u: %ls [%s]\n", idRoot, iMapping,
-                         g_FolderMapping[iMapping].pMapName->String.ucs2, g_FolderMapping[iMapping].pszFolderName));
+                         g_FolderMapping[iMapping].pMapName->String.utf16, g_FolderMapping[iMapping].pszFolderName));
         }
 }
@@ -268 +268 @@
             && !g_FolderMapping[i].fPlaceholder) /* Don't allow mapping placeholders. */
         {
-            if (!RTUtf16LocaleICmp(g_FolderMapping[i].pMapName->String.ucs2, pwszName))
+            if (!RTUtf16LocaleICmp(g_FolderMapping[i].pMapName->String.utf16, pwszName))
             {
                 SHFLROOT root = vbsfMappingGetRootFromIndex(i);
@@ -346 +346 @@
     Assert(pszFolderName && pMapName);
 
-    Log(("vbsfMappingsAdd %ls\n", pMapName->String.ucs2));
+    Log(("vbsfMappingsAdd %ls\n", pMapName->String.utf16));
 
     /* Check for duplicates, ignoring placeholders to give the GUI to change stuff at runtime. */
@@ -358 +358 @@
                 && !g_FolderMapping[i].fPlaceholder)
             {
-                if (!RTUtf16LocaleICmp(g_FolderMapping[i].pMapName->String.ucs2, pMapName->String.ucs2))
+                if (!RTUtf16LocaleICmp(g_FolderMapping[i].pMapName->String.utf16, pMapName->String.utf16))
                 {
-                    AssertMsgFailed(("vbsfMappingsAdd: %ls mapping already exists!!\n", pMapName->String.ucs2));
+                    AssertMsgFailed(("vbsfMappingsAdd: %ls mapping already exists!!\n", pMapName->String.utf16));
                     return VERR_ALREADY_EXISTS;
                 }
@@ -414 +414 @@
     if (i == SHFL_MAX_MAPPINGS)
     {
-        AssertLogRelMsgFailed(("vbsfMappingsAdd: no more room to add mapping %s to %ls!!\n", pszFolderName, pMapName->String.ucs2));
+        AssertLogRelMsgFailed(("vbsfMappingsAdd: no more room to add mapping %s to %ls!!\n", pszFolderName, pMapName->String.utf16));
         return VERR_TOO_MUCH_DATA;
     }
 
     Log(("vbsfMappingsAdd: added mapping %s to %ls (slot %u, root %u)\n",
-         pszFolderName, pMapName->String.ucs2, i, vbsfMappingGetRootFromIndex(i)));
+         pszFolderName, pMapName->String.utf16, i, vbsfMappingGetRootFromIndex(i)));
     return VINF_SUCCESS;
 }
@@ -436 +436 @@
 {
     Assert(pMapName);
-    Log(("vbsfMappingsRemove %ls\n", pMapName->String.ucs2));
+    Log(("vbsfMappingsRemove %ls\n", pMapName->String.utf16));
 
     /*
@@ -448 +448 @@
         if (g_FolderMapping[i].fValid == true)
         {
-            if (!RTUtf16LocaleICmp(g_FolderMapping[i].pMapName->String.ucs2, pMapName->String.ucs2))
+            if (!RTUtf16LocaleICmp(g_FolderMapping[i].pMapName->String.utf16, pMapName->String.utf16))
             {
                 if (g_FolderMapping[i].cMappings != 0)
                 {
-                    LogRel2(("SharedFolders: removing '%ls' -> '%s'%s, which is still used by the guest\n", pMapName->String.ucs2,
+                    LogRel2(("SharedFolders: removing '%ls' -> '%s'%s, which is still used by the guest\n", pMapName->String.utf16,
                              g_FolderMapping[i].pszFolderName, g_FolderMapping[i].fPlaceholder ? " (again)" : ""));
                     g_FolderMapping[i].fMissing = true;
@@ -463 +463 @@
                     /* pMapName can be the same as g_FolderMapping[i].pMapName when
                      * called from vbsfUnmapFolder, log it before deallocating the memory. */
-                    Log(("vbsfMappingsRemove: mapping %ls removed\n", pMapName->String.ucs2));
+                    Log(("vbsfMappingsRemove: mapping %ls removed\n", pMapName->String.utf16));
                     bool fSame = g_FolderMapping[i].pMapName == pMapName;
 
@@ -621 +621 @@
                 {
                     pString->u16Length = pFolderMapping->pMapName->u16Length;
-                    memcpy(pString->String.ucs2, pFolderMapping->pMapName->String.ucs2,
+                    memcpy(pString->String.utf16, pFolderMapping->pMapName->String.utf16,
                            pFolderMapping->pMapName->u16Size);
                     rc = VINF_SUCCESS;
@@ -786 +786 @@
 
     if (BIT_FLAG(pClient->fu32Flags, SHFL_CF_UTF8))
-    {
         Log(("vbsfMapFolder %s\n", pszMapName->String.utf8));
-    }
     else
-    {
-        Log(("vbsfMapFolder %ls\n", pszMapName->String.ucs2));
-    }
+        Log(("vbsfMapFolder %ls\n", pszMapName->String.utf16));
 
     AssertMsgReturn(wcDelimiter == '/' || wcDelimiter == '\\',
@@ -825 +821 @@
     else
     {
-        pFolderMapping = vbsfMappingGetByName(pszMapName->String.ucs2, pRoot);
+        pFolderMapping = vbsfMappingGetByName(pszMapName->String.utf16, pRoot);
     }
 
@@ -901 +897 @@
         Assert(pFolderMapping->fMissing);
         LogRel2(("SharedFolders: unmapping placeholder '%ls' -> '%s'\n",
-                pFolderMapping->pMapName->String.ucs2, pFolderMapping->pszFolderName));
+                pFolderMapping->pMapName->String.utf16, pFolderMapping->pszFolderName));
         vbsfMappingsRemove(pFolderMapping->pMapName);
     }

trunk/src/VBox/HostServices/SharedFolders/vbsf.cpp

@@ -266 +266 @@
     else
     {
-        LogRel2(("SharedFolders: GuestToHost 0x%RX32 [%.*ls]->[%s] %Rrc\n", fu32PathFlags, pPath->u16Length / 2, &pPath->String.ucs2[0], pszHostPath, rc));
+        LogRel2(("SharedFolders: GuestToHost 0x%RX32 [%.*ls]->[%s] %Rrc\n", fu32PathFlags, pPath->u16Length / 2, &pPath->String.utf16[0], pszHostPath, rc));
     }
 
@@ -1060 +1060 @@
 
     /* Build a host full path for the given path, handle file name case issues (if the guest
-     * expects case-insensitive paths but the host is case-sensitive) and convert ucs2 to utf8 if
+     * expects case-insensitive paths but the host is case-sensitive) and convert utf16 to utf8 if
      * necessary.
      */
@@ -1675 +1675 @@
         {
             /* Build a host full path for the given path
-             * and convert ucs2 to utf8 if necessary.
+             * and convert utf16 to utf8 if necessary.
              */
             char *pszFullPath = NULL;
@@ -1787 +1787 @@
         else
         {
-            pSFDEntry->name.String.ucs2[0] = 0;
-            pwszString = pSFDEntry->name.String.ucs2;
+            pSFDEntry->name.String.utf16[0] = 0;
+            pwszString = pSFDEntry->name.String.utf16;
             int rc2 = RTStrToUtf16Ex(pDirEntry->szName, RTSTR_MAX, &pwszString, pDirEntry->cbName+1, NULL);
             AssertRC(rc2);
@@ -1817 +1817 @@
             }
 #endif
-            pSFDEntry->name.u16Length = (uint32_t)RTUtf16Len(pSFDEntry->name.String.ucs2) * 2;
+            pSFDEntry->name.u16Length = (uint32_t)RTUtf16Len(pSFDEntry->name.String.utf16) * 2;
             pSFDEntry->name.u16Size = pSFDEntry->name.u16Length + 2;
 
             Log(("SHFL: File name size %d\n", pSFDEntry->name.u16Size));
-            Log(("SHFL: File name %ls\n", &pSFDEntry->name.String.ucs2));
+            Log(("SHFL: File name %ls\n", &pSFDEntry->name.String.utf16));
 
             // adjust cbNeeded (it was overestimated before)
@@ -1878 +1878 @@
     /* Build a host full path for the given path, handle file name case issues
      * (if the guest expects case-insensitive paths but the host is
-     * case-sensitive) and convert ucs2 to utf8 if necessary.
+     * case-sensitive) and convert utf16 to utf8 if necessary.
      */
     char *pszFullPath = NULL;
@@ -2194 +2194 @@
 
     ShflStringInitBuffer(&Buf.Dummy, sizeof(Buf));
-    Buf.Dummy.String.ucs2[0] = '\0';
+    Buf.Dummy.String.utf16[0] = '\0';
     rc = vbsfBuildFullPath(pClient, root, &Buf.Dummy, sizeof(Buf), &pszFullPath, NULL);
 
@@ -2410 +2410 @@
     {
         /*
-         * Build a host full path for the given path and convert ucs2 to utf8 if necessary.
+         * Build a host full path for the given path and convert utf16 to utf8 if necessary.
          */
         char *pszFullPath = NULL;
@@ -2488 +2488 @@
 
     /* Build a host full path for the given path
-     * and convert ucs2 to utf8 if necessary.
+     * and convert utf16 to utf8 if necessary.
      */
     char *pszFullPathSrc = NULL;

trunk/src/VBox/HostServices/SharedFolders/vbsfpath.cpp

@@ -491 +491 @@
         uint32_t cwcSrc  = 0;
         PRTUTF16 pwszSrc = NULL;
-        rc = vbsfNormalizeStringDarwin(&pGuestString->String.ucs2[0],
+        rc = vbsfNormalizeStringDarwin(&pGuestString->String.utf16[0],
                                        pGuestString->u16Length / sizeof(RTUTF16),
                                        &pwszSrc, &cwcSrc);
 #else
         uint32_t  const cwcSrc  = pGuestString->u16Length / sizeof(RTUTF16);
-        PCRTUTF16 const pwszSrc = &pGuestString->String.ucs2[0];
+        PCRTUTF16 const pwszSrc = &pGuestString->String.utf16[0];
 #endif