Changeset 91746 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray

Timestamp:

Oct 14, 2021 8:50:31 PM (3 years ago)

Author:

vboxsync

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

147502

Message:

VBoxTray/VBoxClipboard: Use VbglR3ClipboardWriteDataEx instead of the legacy function for writing the empty reply on failure. I don't think the host really support the client switching between context and non-context mode. bugref:10094

File:

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

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

@@ -538 +538 @@
             const SHCLFORMAT fFormat = (uint32_t)pEvent->u.fReadData;
 
+            LogFlowFunc(("SHCL_WIN_WM_READ_DATA: fFormat=%#x\n", fFormat));
+
+            int rc = SharedClipboardWinOpen(hwnd);
             HANDLE hClip = NULL;
-
-            LogFlowFunc(("SHCL_WIN_WM_READ_DATA: fFormat=%#x\n", fFormat));
-
-            int rc = SharedClipboardWinOpen(hwnd);
             if (RT_SUCCESS(rc))
             {
@@ -558 +557 @@
                         }
                         else
-                        {
                             hClip = NULL;
-                        }
                     }
                 }
@@ -577 +574 @@
                         }
                         else
-                        {
                             hClip = NULL;
-                        }
                     }
                 }
@@ -598 +593 @@
                             }
                             else
-                            {
                                 hClip = NULL;
-                            }
                         }
                     }
                 }
+
                 if (hClip == NULL)
-                {
                     LogFunc(("SHCL_WIN_WM_READ_DATA: hClip=NULL, lastError=%ld\n", GetLastError()));
 
-                    /* Requested clipboard format is not available, send empty data. */
-                    VbglR3ClipboardWriteData(pCtx->CmdCtx.idClient, VBOX_SHCL_FMT_NONE, NULL, 0);
-                }
-
                 SharedClipboardWinClose();
             }
+
+            /* If the requested clipboard format is not available, we must send empty data. */
+            if (hClip == NULL)
+                VbglR3ClipboardWriteDataEx(&pEvent->cmdCtx, VBOX_SHCL_FMT_NONE, NULL, 0);
             break;
         }