儲存庫 vbox 的更動 63081

時間撮記:

2016-8-6 下午01:58:35 (8 年 以前)

作者:

vboxsync

訊息:

NPGetResourceInformation: Local variable s/pNetResource/pNetResourceInfo/ as the name is easy to confusing with unrelated parameter lpNetResource.

位置:

trunk/src/VBox/Additions/WINNT/SharedFolders

檔案:

• driver/vbsf.c (修改) (1 筆差異)
• np/vboxmrxnp.cpp (修改) (10 筆差異)

trunk/src/VBox/Additions/WINNT/SharedFolders/driver/vbsf.c

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VirtualBox Windows Guest Shared Folders.
- *
- * File System Driver initialization and generic routines
+ * VirtualBox Windows Guest Shared Folders - File System Driver initialization and generic routines
  */
 

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- *
- * VirtualBox Windows Guest Shared Folders
- *
- * Network provider dll
+ * VirtualBox Windows Guest Shared Folders - Network provider dll
  */
 
@@ -20 +17 @@
 
 #include <iprt/win/windows.h>
-#include <windef.h>
-#include <winbase.h>
 #include <winsvc.h>
 #include <winnetwk.h>
@@ -1236 +1231 @@
     DWORD cbEntry;
     WCHAR *pStrings = (WCHAR *)((PBYTE)lpBuffer + *lpBufferSize);
-    NETRESOURCE *pNetResource = (NETRESOURCE *)lpBuffer;
+    NETRESOURCE *pNetResourceInfo = (NETRESOURCE *)lpBuffer;
 
     /* Check what kind of the resource is that by parsing path components.
@@ -1256 +1251 @@
         }
 
-        memset(pNetResource, 0, sizeof (*pNetResource));
-
-        pNetResource->dwType = RESOURCETYPE_ANY;
-        pNetResource->dwDisplayType = RESOURCEDISPLAYTYPE_SERVER;
-        pNetResource->dwUsage = RESOURCEUSAGE_CONTAINER;
+        memset(pNetResourceInfo, 0, sizeof (*pNetResourceInfo));
+
+        pNetResourceInfo->dwType = RESOURCETYPE_ANY;
+        pNetResourceInfo->dwDisplayType = RESOURCEDISPLAYTYPE_SERVER;
+        pNetResourceInfo->dwUsage = RESOURCEUSAGE_CONTAINER;
 
         pStrings = (PWCHAR)((PBYTE)pStrings - (cbEntry - sizeof(NETRESOURCE)));
 
-        pNetResource->lpRemoteName = pStrings;
+        pNetResourceInfo->lpRemoteName = pStrings;
         *pStrings++ = L'\\';
         *pStrings++ = L'\\';
@@ -1270 +1265 @@
         pStrings += sizeof(MRX_VBOX_SERVER_NAME_U) / sizeof(WCHAR);
 
-        pNetResource->lpProvider = pStrings;
+        pNetResourceInfo->lpProvider = pStrings;
         CopyMemory (pStrings, MRX_VBOX_PROVIDER_NAME_U, sizeof(MRX_VBOX_PROVIDER_NAME_U));
         pStrings += sizeof(MRX_VBOX_PROVIDER_NAME_U) / sizeof(WCHAR);
 
         Log(("VBOXNP: NPGetResourceInformation: lpRemoteName: %ls, strings %p/%p\n",
-             pNetResource->lpRemoteName, pStrings, (PBYTE)lpBuffer + *lpBufferSize));
+             pNetResourceInfo->lpRemoteName, pStrings, (PBYTE)lpBuffer + *lpBufferSize));
 
         if (lplpSystem)
@@ -1309 +1304 @@
         }
 
-        memset(pNetResource, 0, sizeof (*pNetResource));
-
-        pNetResource->dwType = RESOURCETYPE_DISK;
-        pNetResource->dwDisplayType = RESOURCEDISPLAYTYPE_SHARE;
-        pNetResource->dwUsage = RESOURCEUSAGE_CONNECTABLE;
+        memset(pNetResourceInfo, 0, sizeof (*pNetResourceInfo));
+
+        pNetResourceInfo->dwType = RESOURCETYPE_DISK;
+        pNetResourceInfo->dwDisplayType = RESOURCEDISPLAYTYPE_SHARE;
+        pNetResourceInfo->dwUsage = RESOURCEUSAGE_CONNECTABLE;
 
         pStrings = (PWCHAR)((PBYTE)pStrings - (cbEntry - sizeof(NETRESOURCE)));
 
-        pNetResource->lpRemoteName = pStrings;
+        pNetResourceInfo->lpRemoteName = pStrings;
         *pStrings++ = L'\\';
         *pStrings++ = L'\\';
@@ -1325 +1320 @@
         pStrings += lp - lpAfterName + 1;
 
-        pNetResource->lpProvider = pStrings;
+        pNetResourceInfo->lpProvider = pStrings;
         CopyMemory(pStrings, MRX_VBOX_PROVIDER_NAME_U, sizeof(MRX_VBOX_PROVIDER_NAME_U));
         pStrings += sizeof(MRX_VBOX_PROVIDER_NAME_U) / sizeof(WCHAR);
 
         Log(("VBOXNP: NPGetResourceInformation: lpRemoteName: %ls, strings %p/%p\n",
-             pNetResource->lpRemoteName, pStrings, (PBYTE)lpBuffer + *lpBufferSize));
+             pNetResourceInfo->lpRemoteName, pStrings, (PBYTE)lpBuffer + *lpBufferSize));
 
         if (lplpSystem)
@@ -1354 +1349 @@
     }
 
-    memset(pNetResource, 0, sizeof (*pNetResource));
-
-    pNetResource->dwType = RESOURCETYPE_DISK;
-    pNetResource->dwDisplayType = RESOURCEDISPLAYTYPE_SHARE;
-    pNetResource->dwUsage = RESOURCEUSAGE_CONNECTABLE;
+    memset(pNetResourceInfo, 0, sizeof (*pNetResourceInfo));
+
+    pNetResourceInfo->dwType = RESOURCETYPE_DISK;
+    pNetResourceInfo->dwDisplayType = RESOURCEDISPLAYTYPE_SHARE;
+    pNetResourceInfo->dwUsage = RESOURCEUSAGE_CONNECTABLE;
 
     pStrings = (PWCHAR)((PBYTE)pStrings - (cbEntry - sizeof(NETRESOURCE)));
 
     /* The server + share. */
-    pNetResource->lpRemoteName = pStrings;
+    pNetResourceInfo->lpRemoteName = pStrings;
     *pStrings++ = L'\\';
     *pStrings++ = L'\\';
@@ -1372 +1367 @@
     *pStrings++ = 0;
 
-    pNetResource->lpProvider = pStrings;
+    pNetResourceInfo->lpProvider = pStrings;
     CopyMemory(pStrings, MRX_VBOX_PROVIDER_NAME_U, sizeof(MRX_VBOX_PROVIDER_NAME_U));
     pStrings += sizeof(MRX_VBOX_PROVIDER_NAME_U) / sizeof(WCHAR);
@@ -1385 +1380 @@
 
     Log(("VBOXNP: NPGetResourceInformation: lpRemoteName: %ls, strings %p/%p\n",
-         pNetResource->lpRemoteName, pStrings, (PBYTE)lpBuffer + *lpBufferSize));
+         pNetResourceInfo->lpRemoteName, pStrings, (PBYTE)lpBuffer + *lpBufferSize));
     Log(("VBOXNP: NPGetResourceInformation: *lplpSystem: %ls\n", *lplpSystem));