Changeset 75471 in vbox for trunk/src

Timestamp:

Nov 14, 2018 9:38:08 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

126626

Message:

os2/VBoxSF,VBoxControl: Fixes, adjustments.

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxControl/VBoxControl.cpp (modified) (1 diff)
• os2/VBoxSF/VBoxSF.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp

@@ -1698 +1698 @@
                                 {
                                     const char *pszTag = pszMountedName + strlen(pszMountedName) + 1; /* safe */
-                                    if (strcmp(pszTag, "VBoxAutomounter") == 0)
-                                        RTPrintf("%s %s*", pszOn, szDrive);
+                                    if (*pszTag != '\0')
+                                        RTPrintf("%s %s (%s)", pszOn, szDrive, pszTag);
                                     else
                                         RTPrintf("%s %s", pszOn, szDrive);

trunk/src/VBox/Additions/os2/VBoxSF/VBoxSF.cpp

@@ -374 +374 @@
         pNew->cRefs         = 2; /* (List reference + the returned reference.) */
         pNew->cOpenFiles    = 0;
+        pNew->cOpenSearches = 0;
         pNew->cDrives       = 0;
         RT_ZERO(pNew->hHostFolder);
@@ -943 +944 @@
             cbParam = pFolder->cchName + 1;
             rc = KernCopyOut(pbData, &cbParam, sizeof(cbParam));
-            if (rc != NO_ERROR)
+            if (rc == NO_ERROR)
                 rc = KernCopyOut(pbData + sizeof(USHORT), pFolder->szName, pFolder->cbNameAndTag);
         }