Changeset 74448 in vbox for trunk

Timestamp:

Sep 24, 2018 4:45:04 PM (6 years ago)

Author:

vboxsync

Message:

DnD/VBoxTray: A bit of polishing for r125178 (Fixed handling CF_HDROP entries in Unicode format).

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnDDropTarget.cpp (modified) (2 diffs)

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

@@ -410 +410 @@
                                 if (pwszFile)
                                 {
-                                    const UINT cchFileUtf16 = DragQueryFileW(hDrop, i /* File index */,
+                                    const UINT cwcFileUtf16 = DragQueryFileW(hDrop, i /* File index */,
                                                                              pwszFile, cchFile + 1 /* Include terminator */);
 
-                                    AssertMsg(cchFileUtf16 == cchFile, ("cchFileUtf16 (%RU16) does not match cchFile (%RU16)\n",
-                                                                        cchFileUtf8, cchFile));
-                                    RT_NOREF(cchFileUtf16);
+                                    AssertMsg(cwcFileUtf16 == cchFile, ("cchFileUtf16 (%RU16) does not match cchFile (%RU16)\n",
+                                                                        cwcFileUtf16, cchFile));
+                                    RT_NOREF(cwcFileUtf16);
 
                                     rc = RTUtf16ToUtf8(pwszFile, &pszFileUtf8);
-                                    AssertRC(rc);
-                                    Assert(RTStrIsValidEncoding(pszFileUtf8));
-
-                                    cchFileUtf8 = (UINT)strlen(pszFileUtf8);
-                                    Assert(cchFileUtf8);
+                                    if (RT_SUCCESS(rc))
+                                    {
+                                        cchFileUtf8 = (UINT)strlen(pszFileUtf8);
+                                        Assert(cchFileUtf8);
+                                    }
 
                                     RTMemFree(pwszFile);
@@ -455 +455 @@
                                     cchFiles += cchFileUtf8;
                             }
+                            else
+                                LogRel(("DnD: Error handling file entry #%u, rc=%Rrc\n", i, rc));
 
                             if (pszFileUtf8)