Changeset 103480 in vbox for trunk/src/VBox/GuestHost/SharedClipboard

Timestamp:

Feb 20, 2024 3:21:35 PM (12 months ago)

Author:

vboxsync

Message:

Shared Clipboard: Added a ShClTransferTransformPath() function to make the paths more uniform. bugref:9437

Location:

trunk/src/VBox/GuestHost/SharedClipboard

Files:

• ClipboardStreamImpl-win.cpp (modified) (2 diffs)
• clipboard-transfers.cpp (modified) (1 diff)

trunk/src/VBox/GuestHost/SharedClipboard/ClipboardStreamImpl-win.cpp

@@ -38 +38 @@
 
 #include <VBox/GuestHost/SharedClipboard.h>
+#include <VBox/GuestHost/SharedClipboard-transfers.h>
 #include <VBox/GuestHost/SharedClipboard-win.h>
 
@@ -211 +212 @@
             rc = RTStrCopy(openParms.pszPath, openParms.cbPath, m_strPath.c_str());
             if (RT_SUCCESS(rc))
-                rc = ShClTransferObjOpen(m_pTransfer, &openParms, &m_hObj);
+            {
+                rc = ShClTransferTransformPath(openParms.pszPath, openParms.cbPath);
+                if (RT_SUCCESS(rc))
+                    rc = ShClTransferObjOpen(m_pTransfer, &openParms, &m_hObj);
+            }
 
             ShClTransferObjOpenParmsDestroy(&openParms);

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp

@@ -3368 +3368 @@
     }
     return "Unknown";
+}
+
+/**
+ * Transforms a path so that it can be sent over to the other party.
+ *
+ * @returns VBox status code.
+ * @param   pszPath             Path to transform. Will be modified in place.
+ * @param   cbPath              Size (in bytes) of \a pszPath.
+ *
+ * @note    Shared Clipboard file paths always are sent over as UNIX-style paths.
+ *          Sending over back slashes ('\') could happen on non-Windows OSes as part of a path or file name.
+ */
+int ShClTransferTransformPath(char *pszPath, size_t cbPath)
+{
+#if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
+    RT_NOREF(cbPath);
+    RTPathChangeToUnixSlashes(pszPath, true /* fForce */);
+#else
+    RT_NOREF(pszPath, cbPath);
+#endif
+    return VINF_SUCCESS;
 }