Changeset 95865 in vbox

Timestamp:

Jul 27, 2022 1:18:54 AM (3 years ago)

Author:

vboxsync

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

152590

Message:

VBoxTray/VBoxClipboard: Drop strsafe.h as it requires stdio.h which we don't have in VBOX_WITH_NOCRT_STATIC mode. Replacing StringCbLengthW with RTUtf16NLenEx. bugref:10261

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp (modified) (4 diffs)

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

@@ -28 +28 @@
 #include <iprt/asm.h>
 #include <iprt/errcore.h>
+#include <iprt/ldr.h>
 #include <iprt/mem.h>
-#include <iprt/ldr.h>
-
+#include <iprt/utf16.h>
 
 #include <VBox/GuestHost/SharedClipboard.h>
@@ -39 +39 @@
 # include <VBox/GuestHost/SharedClipboard-transfers.h>
 #endif
-
-#include <strsafe.h>
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
@@ -418 +416 @@
                                 if (fFormat == VBOX_SHCL_FMT_UNICODETEXT)
                                 {
-                                    size_t cbActual = 0;
-                                    HRESULT hrc = StringCbLengthW((LPWSTR)pvMem, cb, &cbActual);
-                                    if (FAILED(hrc))
+                                    size_t cwcActual = 0;
+                                    rc = RTUtf16NLenEx((PCRTUTF16)pvMem, cb / sizeof(RTUTF16), &cwcActual);
+                                    if (RT_SUCCESS(rc))
+                                        cb = (uint32_t)((cwcActual + 1 /* '\0' */) * sizeof(RTUTF16));
+                                    else
                                     {
-                                        LogRel(("Shared Clipboard: Received host data is invalid (%RU32 vs. %zu)\n",
-                                                cb, cbActual));
+                                        LogRel(("Shared Clipboard: Invalid UTF16 string from host: cb=%RU32, cwcActual=%zu, rc=%Rrc\n",
+                                                cb, cwcActual, rc));
 
                                         /* Discard invalid data. */
@@ -429 +429 @@
                                         GlobalFree(hMem);
                                         hMem = NULL;
-                                    }
-                                    else
-                                    {
-                                        /* cbActual is the number of bytes, excluding those used
-                                         * for the terminating null character.
-                                         */
-                                        cb = (uint32_t)(cbActual + 2);
                                     }
                                 }