儲存庫 vbox 的更動 40295

時間撮記:

2012-2-29 下午01:35:36 (13 年 以前)

作者:

vboxsync

訊息:

VBOXSF: NPGetUniversalName fix.

檔案:

• trunk/src/VBox/Additions/WINNT/SharedFolders/np/vboxmrxnp.cpp (修改) (4 筆差異)

trunk/src/VBox/Additions/WINNT/SharedFolders/np/vboxmrxnp.cpp

@@ -509 +509 @@
     if (dwStatus == WN_SUCCESS)
     {
-        Log(("VBOXNP: NPGetConnection: RemoteName: %ls\n",
-             RemoteName));
-
         ULONG cbRemoteName = (lstrlen(RemoteName) + 1) * sizeof (WCHAR); /* Including the trailing 0. */
+
+        Log(("VBOXNP: NPGetConnection: RemoteName: %ls, cb %d\n",
+             RemoteName, cbRemoteName));
 
         DWORD len = sizeof(WCHAR) + cbRemoteName; /* Including the leading '\'. */
@@ -1538 +1538 @@
         }
 
-        /* Adjust for actual remote name length. */
+        /* Adjust for actual remote name length as a part of the universal name. */
         BufferRequired += RemoteNameLength;
 
-        /* And for required place for remaining path. */
+        /* And for required place for remaining path as a part of the universal name. */
         BufferRequired += RemainingPathLength;
 
@@ -1562 +1562 @@
         lpString--; /* Trailing NULL */
 
-        lpDelimiter = lpString; /* Delimiter will be inserted later. For now keep the NULL terminated string. */
+        lpDelimiter = lpString; /* Delimiter between the remote name and the remaining path.
+                                 * May be 0 if the remaining path is empty.
+                                 */
 
         CopyMemory( lpString, lpRemainingPath, RemainingPathLength);
         lpString += RemainingPathLength / sizeof (WCHAR);
 
-        *lpDelimiter = 0;
+        *lpDelimiter = 0; /* Keep NULL terminated remote name. */
 
         pRemoteNameInfo->lpConnectionName = lpString;
@@ -1576 +1578 @@
         CopyMemory( lpString, lpRemainingPath, RemainingPathLength);
 
-        *lpDelimiter = L'\\';
+        /* If remaining path was not empty, restore the delimiter in the universal name. */
+        if (RemainingPathLength > sizeof(WCHAR))
+        {
+           *lpDelimiter = L'\\';
+        }
     }