Changeset 78304 in vbox for trunk/src/VBox/Additions/WINNT/SharedFolders/driver/net.cpp

Timestamp:

Apr 26, 2019 1:19:49 AM (6 years ago)

Author:

vboxsync

Message:

winnt/vboxsf: Use g_SfClient everywhere to avoid having dangling pointers (MRX_VBOX_NETROOT_EXTENSION::phgcmClient) and copies (MRX_VBOX_DEVICE_EXTENSION::hgcmClient). This also reduces the stack space usage. ASSUMES that the module can only be instantiated once (already an assumption of the g_SfClient variable and related code in VBoxGuestLibSharedFoldersInline.h). Renamed all sources to .cpp (except the w2k hacks). bugref:9172

File:

• trunk/src/VBox/Additions/WINNT/SharedFolders/driver/net.cpp (moved) (moved from trunk/src/VBox/Additions/WINNT/SharedFolders/driver/net.c ) (6 diffs)

trunk/src/VBox/Additions/WINNT/SharedFolders/driver/net.cpp

@@ -79 +79 @@
     PMRX_V_NET_ROOT pVNetRoot = (PMRX_V_NET_ROOT)pCreateNetRootContext->pVNetRoot;
 
-    PMRX_VBOX_DEVICE_EXTENSION pDeviceExtension = VBoxMRxGetDeviceExtension(pCreateNetRootContext->RxContext);
     PMRX_VBOX_NETROOT_EXTENSION pNetRootExtension = VBoxMRxGetNetRootExtension(pVNetRoot->pNetRoot);
 
@@ -158 +157 @@
      * pNetRootExtension is actually the pNetRoot->Context and it is not NULL.
      */
-    fInitializeNetRoot = (pNetRootExtension->phgcmClient == NULL);
-
     Status = STATUS_SUCCESS;
 
-    if (fInitializeNetRoot)
+    if (!pNetRootExtension->fInitialized)
     {
         PWCHAR pRootName;
@@ -172 +169 @@
 
         pNetRoot->MRxNetRootState = MRX_NET_ROOT_STATE_GOOD;
+        pNetRootExtension->map.root = SHFL_ROOT_NIL;
 
         RootNameLength = pNetRoot->pNetRootName->Length - pSrvCall->pSrvCallName->Length;
@@ -193 +191 @@
             RootNameLength -= sizeof(WCHAR);
 
-        if (!pNetRootExtension->phgcmClient)
+        if (!pNetRootExtension->fInitialized)
         {
             Log(("VBOXSF: MRxCreateVNetRoot: Initialize netroot length = %d, name = %.*ls\n",
@@ -204 +202 @@
             }
 
-            vrc = VbglR0SfMapFolder(&pDeviceExtension->hgcmClient, ParsedPath, &pNetRootExtension->map);
+            vrc = VbglR0SfMapFolder(&g_SfClient, ParsedPath, &pNetRootExtension->map);
             vbsfFreeNonPagedMem(ParsedPath);
-            if (vrc != VINF_SUCCESS)
+            if (RT_SUCCESS(vrc))
             {
-                Log(("VBOXSF: MRxCreateVNetRoot: VbglR0SfMapFolder failed with %d\n", vrc));
-                Status = STATUS_BAD_NETWORK_NAME;
+                pNetRootExtension->fInitialized = true;
+                Status = STATUS_SUCCESS;
             }
             else
             {
-                Status = STATUS_SUCCESS;
-                pNetRootExtension->phgcmClient = &pDeviceExtension->hgcmClient;
+                Log(("VBOXSF: MRxCreateVNetRoot: VbglR0SfMapFolder failed with %d\n", vrc));
+                pNetRootExtension->map.root = SHFL_ROOT_NIL;
+                Status = STATUS_BAD_NETWORK_NAME;
             }
         }
@@ -259 +258 @@
     Log(("VBOXSF: MRxFinalizeNetRoot: NET_ROOT %p\n", pNetRoot));
 
-    if (pNetRootExtension->phgcmClient)
-    {
-        int vrc = VbglR0SfUnmapFolder(pNetRootExtension->phgcmClient, &pNetRootExtension->map);
+    if (   pNetRootExtension->fInitialized
+        && g_SfClient.handle != NULL)
+    {
+        int vrc = VbglR0SfUnmapFolder(&g_SfClient, &pNetRootExtension->map);
         if (vrc != VINF_SUCCESS)
             Log(("VBOXSF: MRxFinalizeVNetRoot: VbglR0SfUnmapFolder failed with %d\n",
                  vrc));
-        pNetRootExtension->phgcmClient = NULL;
+        pNetRootExtension->map.root = SHFL_ROOT_NIL;
+        pNetRootExtension->fInitialized = false;
     }