Changeset 9880 in vbox

Timestamp:

Jun 23, 2008 2:44:31 PM (17 years ago)

Author:

vboxsync

Message:

External contribution: Gi youl Kim

Mac OS X deals with filename using unicode, especially
NFD(Normalization Form D - Canonical Decomposition). Here is link
about the topic.

​http://unicode.org/reports/tr15/

Mac OS X understands NFD and NFC(Normalization Form C - Canonical
Decomposition, followed by Canonical Composition), but uses NFD as
filename. Windows XP understands NFC but not NFD.

So, when you tries to access the files in the Mac OS X (host) via
Shared Folder from Windows XP (guest), and if the filename is Korean,
Japanese or any language which has form in NFC & NFC, The filename
does not appear correctly. Windows Vista understands NFD, so it won't
be matter with Vista (guest).

To resolve this problem, you should normalize the filename to NFC(from
Mac OS X to Windows XP) or NFD(from Windows XP to Mac OS X).

Location:

trunk/src/VBox/HostServices/SharedFolders

Files:

• Makefile.kmk (modified) (1 diff)
• vbsf.cpp (modified) (6 diffs)

trunk/src/VBox/HostServices/SharedFolders/Makefile.kmk

@@ -38 +38 @@
         $(VBOX_PATH_SDK)
 
+        
+VBoxSharedFolders_LDFLAGS.darwin = \
+        -framework Carbon
+
 VBoxSharedFolders_SOURCES = \
         service.cpp \

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

@@ -33 +33 @@
 #include <iprt/string.h>
 #include <iprt/uni.h>
+#ifdef RT_OS_DARWIN
+#include <Carbon/Carbon.h>
+#endif
 
 #undef LogFlow
@@ -232 +235 @@
     else
     {
+#ifdef RT_OS_DARWIN
+                SHFLSTRING *pPathParameter = pPath;
+                size_t cbPathLength;
+                CFMutableStringRef inStr = ::CFStringCreateMutable(NULL, 0);
+                uint16_t ucs2Length;
+                CFRange rangeCharacters;
+                
+                // Is 8 times length enough for decomposed in worst case...?
+                cbPathLength = sizeof(SHFLSTRING) + pPathParameter->u16Length * 8 + 2;
+                pPath = (SHFLSTRING *)RTMemAllocZ (cbPathLength);
+                if (!pPath)
+                {
+                        rc = VERR_NO_MEMORY;
+                        Log(("RTMemAllocZ %x failed!!\n", cbPathLength));
+                        return rc;
+                }
+                
+                ::CFStringAppendCharacters(inStr, (UniChar*)pPathParameter->String.ucs2, pPathParameter->u16Length / sizeof(pPathParameter->String.ucs2[0]));
+                ::CFStringNormalize(inStr, kCFStringNormalizationFormD);
+                ucs2Length = ::CFStringGetLength(inStr);
+                
+                rangeCharacters.location = 0;
+                rangeCharacters.length = ucs2Length;
+                ::CFStringGetCharacters(inStr, rangeCharacters, pPath->String.ucs2);
+                pPath->String.ucs2[ucs2Length] = 0x0000; // NULL terminated
+                pPath->u16Length = ucs2Length * sizeof(pPath->String.ucs2[0]);
+                pPath->u16Size = pPath->u16Length + sizeof(pPath->String.ucs2[0]);
+                
+                CFRelease(inStr);
+#endif
         /* Client sends us UCS2, so convert it to UTF8. */
         Log(("Root %ls path %.*ls\n", pwszRoot, pPath->u16Length/sizeof(pPath->String.ucs2[0]), pPath->String.ucs2));
@@ -256 +289 @@
             {
                 AssertFailed();
+#ifdef RT_OS_DARWIN
+                RTMemFree(pPath);
+                pPath = pPathParameter;
+#endif
                 return rc;
             }
@@ -299 +336 @@
                 {
                     AssertFailed();
+#ifdef RT_OS_DARWIN
+                        RTMemFree(pPath);
+                        pPath = pPathParameter;
+#endif
                     return rc;
                 }
@@ -313 +354 @@
             *dst = 0;
         }
+#ifdef RT_OS_DARWIN
+        RTMemFree(pPath);
+        pPath = pPathParameter;
+#endif
     }
 
@@ -1341 +1386 @@
             AssertRC(rc2);
 
+#ifdef RT_OS_DARWIN
+                        {
+                                // Convert to
+                                // Normalization Form C (composed Unicode). We need this because
+                                // Mac OS X file system uses NFD (Normalization Form D :decomposed Unicode)
+                                // while most other OS', server-side programs usually expect NFC.
+                                uint16_t ucs2Length;
+                                CFRange rangeCharacters;
+                                CFMutableStringRef inStr = ::CFStringCreateMutable(NULL, 0);
+                                
+                                ::CFStringAppendCharacters(inStr, (UniChar *)pwszString, RTUtf16Len (pwszString));
+                                ::CFStringNormalize(inStr, kCFStringNormalizationFormC);
+                                ucs2Length = ::CFStringGetLength(inStr);
+                                
+                                rangeCharacters.location = 0;
+                                rangeCharacters.length = ucs2Length;
+                                ::CFStringGetCharacters(inStr, rangeCharacters, pwszString);
+                                pwszString[ucs2Length] = 0x0000; // NULL terminated
+                                
+                                CFRelease(inStr);
+                        }
+#endif
             pSFDEntry->name.u16Length = RTUtf16Len (pSFDEntry->name.String.ucs2) * 2;
             pSFDEntry->name.u16Size = pSFDEntry->name.u16Length + 2;