Changeset 31111 in vbox

Timestamp:

Jul 26, 2010 12:23:16 PM (14 years ago)

Author:

vboxsync

Message:

Shared Folders/VBoxTray: Auto-mount all shares depending on free drive letters.

Location:

trunk

Files:

• include/VBox/VBoxGuestLib.h (modified) (1 diff)
• src/VBox/Additions/WINNT/VBoxTray/VBoxSharedFolders.cpp (modified) (4 diffs)
• src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSharedFolders.cpp (modified) (1 diff)

trunk/include/VBox/VBoxGuestLib.h

@@ -526 +526 @@
 VBGLR3DECL(int)     VbglR3SharedFolderConnect(uint32_t *pu32ClientId);
 VBGLR3DECL(int)     VbglR3SharedFolderDisconnect(uint32_t u32ClientId);
+VBGLR3DECL(bool)    VbglR3SharedFolderExists(uint32_t u32ClientId, char *pszShareName);
 VBGLR3DECL(int)     VbglR3SharedFolderGetMappings(uint32_t u32ClientId, bool fAutoMountOnly,
                                                   PVBGLR3SHAREDFOLDERMAPPING *ppaMappings, uint32_t *pcMappings);

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxSharedFolders.cpp

@@ -25 +25 @@
 int VBoxSharedFoldersAutoMount(void)
 {
-#if 0
     uint32_t u32ClientId;
     int rc = VbglR3SharedFolderConnect(&u32ClientId);
@@ -32 +31 @@
     else
     {
-        uint32_t cMappings = 64; /* See shflsvc.h for define; should be used later. */
-        uint32_t cbMappings = cMappings * sizeof(VBGLR3SHAREDFOLDERMAPPING);
-        VBGLR3SHAREDFOLDERMAPPING *paMappings = (PVBGLR3SHAREDFOLDERMAPPING)RTMemAlloc(cbMappings);
-
-        if (paMappings)
+        uint32_t cMappings;
+        VBGLR3SHAREDFOLDERMAPPING *paMappings;
+
+        rc = VbglR3SharedFolderGetMappings(u32ClientId, true /* Only process auto-mounted folders */,
+                                           &paMappings, &cMappings);
+        if (RT_SUCCESS(rc))
         {
-            rc = VbglR3SharedFolderGetMappings(u32ClientId, true /* Only process auto-mounted folders */,
-                                               paMappings, cbMappings,
-                                               &cMappings);
-            if (RT_SUCCESS(rc))
+#if 0
+            /* Check for a fixed/virtual auto-mount share. */
+            if (VbglR3SharedFolderExists(u32ClientId, "vbsfAutoMount"))
             {
-                RT_CLAMP(cMappings, 0, 64); /* Maximum mappings, see shflsvc.h */
-                for (uint32_t i = 0; i < cMappings; i++)
+                Log(("VBoxTray: Hosts supports auto-mount root\n"));
+            }
+            else
+            {
+#endif
+                Log(("VBoxTray: Got %u shared folder mappings\n", cMappings));
+                for (uint32_t i = 0; i < cMappings && RT_SUCCESS(rc); i++)
                 {
                     char *pszName = NULL;
@@ -51 +55 @@
                         && *pszName)
                     {
+                        Log(("VBoxTray: Connecting share %u (%s) ...\n", i+1, pszName));
+
                         char *pszShareName = NULL;
-                        RTStrAPrintf(&pszShareName, "\\\\vboxsrv\\%s", pszName);
-                        if (pszShareName)
+                        if (   RTStrAPrintf(&pszShareName, "\\\\vboxsrv\\%s", pszName) > 0
+                            && pszShareName)
                         {
-                            NETRESOURCE resource;
-                            RT_ZERO(resource);
-                            resource.dwType = RESOURCETYPE_ANY;
-                            resource.lpLocalName = TEXT("f:");
-                            resource.lpRemoteName = TEXT(pszShareName);
-
-                            /** @todo Figure out how to map the drives in a block (F,G,H, ...).
-                                      Save the mapping for later use. */
-                            DWORD dwErr = WNetAddConnection2A(&resource, NULL, NULL, 0);
-                            if (dwErr == NO_ERROR)
+                            char cDrive = 'D'; /* Start probing whether drive D: is free to use. */
+                            do
                             {
-                                LogRel(("VBoxTray: Shared folder \"%s\" was mounted to share \"%s\"\n", pszName, dwErr));
+                                char szCurDrive[3];
+                                RTStrPrintf(szCurDrive, sizeof(szCurDrive), "%c:", cDrive++);
+
+                                NETRESOURCE resource;
+                                RT_ZERO(resource);
+                                resource.dwType = RESOURCETYPE_ANY;
+                                resource.lpLocalName = TEXT(szCurDrive);
+                                resource.lpRemoteName = TEXT(pszShareName);
+                                /* Go straight to our network provider in order to get maximum lookup speed. */
+                                resource.lpProvider = TEXT("VirtualBox Shared Folders");
+
+                                /** @todo Figure out how to map the drives in a block (F,G,H, ...).
+                                          Save the mapping for later use. */
+                                DWORD dwErr = WNetAddConnection2A(&resource, NULL, NULL, 0);
+                                if (dwErr == NO_ERROR)
+                                {
+                                    LogRel(("VBoxTray: Shared folder \"%s\" was mounted to drive \"%s\"\n", pszName, szCurDrive));
+                                    break;
+                                }
+                                else
+                                {
+                                    LogRel(("VBoxTray: Mounting \"%s\" to \"%s\" resulted in dwErr = %ld\n", pszName, szCurDrive, dwErr));
+
+                                    switch (dwErr)
+                                    {
+                                        /*
+                                         * The local device specified by the lpLocalName member is already
+                                         * connected to a network resource.  Try next drive ...
+                                         */
+                                        case ERROR_ALREADY_ASSIGNED:
+                                            break;
+
+                                        default:
+                                            LogRel(("VBoxTray: Error while mounting shared folder \"%s\" to \"%s\", error = %ld\n",
+                                                    pszName, szCurDrive, dwErr));
+                                            break;
+                                    }
+                                }
+                            } while(cDrive <= 'Z');
+
+                            if (cDrive > 'Z')
+                            {
+                                LogRel(("VBoxTray: No free driver letter found to assign shared folder \"%s\", aborting.\n", pszName));
+                                break;
                             }
-                            else
-                            {
-                                switch (dwErr)
-                                {
-                                    case ERROR_ALREADY_ASSIGNED:
-                                        break;
-
-                                    default:
-                                        LogRel(("VBoxTray: Error while mounting shared folder \"%s\", error = %ld\n",
-                                                pszName, dwErr));
-                                }
-                            }
+
                             RTStrFree(pszShareName);
                         }
+                        else
+                            rc = VERR_NO_MEMORY;
                         RTStrFree(pszName);
                     }
@@ -88 +120 @@
                              paMappings[i].u32Root, rc));
                 }
+#if 0
             }
-            else
-                Log(("VBoxTray: Error while getting the shared folder mappings, rc = %Rrc\n", rc));
+#endif
             RTMemFree(paMappings);
         }
         else
-            rc = VERR_NO_MEMORY;
+            Log(("VBoxTray: Error while getting the shared folder mappings, rc = %Rrc\n", rc));
         VbglR3SharedFolderDisconnect(u32ClientId);
     }
     return rc;
-#endif
-    return 0;
 }
 
 int VBoxSharedFoldersAutoUnmount(void)
 {
-    //WNetCancelConnection2(name, 0, 1 /* Force disconnect */);
-    return 0;
+    uint32_t u32ClientId;
+    int rc = VbglR3SharedFolderConnect(&u32ClientId);
+    if (!RT_SUCCESS(rc))
+        Log(("VBoxTray: Failed to connect to the shared folder service, error %Rrc\n", rc));
+    else
+    {
+        uint32_t cMappings;
+        VBGLR3SHAREDFOLDERMAPPING *paMappings;
+
+        rc = VbglR3SharedFolderGetMappings(u32ClientId, true /* Only process auto-mounted folders */,
+                                           &paMappings, &cMappings);
+        if (RT_SUCCESS(rc))
+        {
+            for (uint32_t i = 0; i < cMappings && RT_SUCCESS(rc); i++)
+            {
+                char *pszName = NULL;
+                rc = VbglR3SharedFolderGetName(u32ClientId, paMappings[i].u32Root, &pszName);
+                if (   RT_SUCCESS(rc)
+                    && *pszName)
+                {
+                    Log(("VBoxTray: Disconnecting share %u (%s) ...\n", i+1, pszName));
+
+                    char *pszShareName = NULL;
+                    if (   RTStrAPrintf(&pszShareName, "\\\\vboxsrv\\%s", pszName) > 0
+                        && pszShareName)
+                    {
+                        DWORD dwErr = WNetCancelConnection2(pszShareName, 0, FALSE /* Force disconnect */);
+                        if (dwErr == NO_ERROR)
+                        {
+                            LogRel(("VBoxTray: Share \"%s\" was disconnected\n", pszShareName));
+                            break;
+                        }
+                        else
+                        {
+                            LogRel(("VBoxTray: Disconnecting \"%s\" failed, dwErr = %ld\n", pszShareName, dwErr));
+
+                            switch (dwErr)
+                            {
+                                case ERROR_NOT_CONNECTED:
+                                    break;
+
+                                default:
+                                    LogRel(("VBoxTray: Error while disconnecting shared folder \"%s\", error = %ld\n",
+                                            pszShareName, dwErr));
+                                    break;
+                            }
+                        }
+
+                        RTStrFree(pszShareName);
+                    }
+                    else
+                        rc = VERR_NO_MEMORY;
+                    RTStrFree(pszName);
+                }
+                else
+                    Log(("VBoxTray: Error while getting the shared folder name for root node = %u, rc = %Rrc\n",
+                         paMappings[i].u32Root, rc));
+            }
+            RTMemFree(paMappings);
+        }
+        else
+            Log(("VBoxTray: Error while getting the shared folder mappings, rc = %Rrc\n", rc));
+        VbglR3SharedFolderDisconnect(u32ClientId);
+    }
+    return rc;
 }
+

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSharedFolders.cpp

@@ -83 +83 @@
         rc = Info.result;
     return rc;
+}
+
+
+/**
+ * Checks whether a shared folder share exists or not.
+ *
+ * @returns True if shared folder exists, false if not.
+ * @param   u32ClientId     The client id returned by VbglR3InfoSvcConnect().
+ * @param   pszShareName    Shared folder name to check.
+ */
+VBGLR3DECL(bool) VbglR3SharedFolderExists(uint32_t u32ClientId, char *pszShareName)
+{
+    AssertPtr(pszShareName);
+
+    uint32_t cMappings;
+    VBGLR3SHAREDFOLDERMAPPING *paMappings;
+
+    /** @todo Use some caching here? */
+    bool fFound = false;
+    int rc = VbglR3SharedFolderGetMappings(u32ClientId, true /* Only process auto-mounted folders */,
+                                           &paMappings, &cMappings);
+    if (RT_SUCCESS(rc))
+    {
+        for (uint32_t i = 0; i < cMappings && !fFound; i++)
+        {
+            char *pszName = NULL;
+            rc = VbglR3SharedFolderGetName(u32ClientId, paMappings[i].u32Root, &pszName);
+            if (   RT_SUCCESS(rc)
+                && *pszName)
+            {
+                if (RTStrICmp(pszName, pszShareName) == 0)
+                    fFound = true;
+                RTStrFree(pszName);
+            }
+        }
+        RTMemFree(paMappings);
+    }
+    return fFound;
 }