Changeset 80359 in vbox for trunk/src/VBox/GuestHost/SharedClipboard/ClipboardDataObjectImpl-win.cpp

Timestamp:

Aug 21, 2019 8:37:54 AM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/URI: Update.

File:

• trunk/src/VBox/GuestHost/SharedClipboard/ClipboardDataObjectImpl-win.cpp (modified) (4 diffs)

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

@@ -24 +24 @@
 #include <VBox/GuestHost/SharedClipboard-uri.h>
 
-/** !!! HACK ALERT !!! Dynamically resolve functions! */
-#ifdef _WIN32_IE
-#undef _WIN32_IE
-#define _WIN32_IE 0x0501
-#endif
-
 #include <iprt/win/windows.h>
 #include <iprt/win/shlobj.h>
@@ -55 +49 @@
     , m_pStream(NULL)
     , m_uObjIdx(0)
+    , m_EventListComplete(NIL_RTSEMEVENT)
+    , m_EventTransferComplete(NIL_RTSEMEVENT)
 {
     AssertPtr(m_pTransfer);
@@ -136 +132 @@
 {
     RTSemEventDestroy(m_EventListComplete);
+    m_EventListComplete = NIL_RTSEMEVENT;
+
     RTSemEventDestroy(m_EventTransferComplete);
+    m_EventTransferComplete = NIL_RTSEMEVENT;
 
     if (m_pStream)
@@ -776 +775 @@
     if (fComplete)
     {
+        if (m_EventTransferComplete != NIL_RTSEMEVENT)
+        {
+            int rc2 = RTSemEventSignal(m_EventTransferComplete);
+            AssertRC(rc2);
+        }
+    }
+
+    LogFlowFuncLeaveRC(rc);
+}
+
+void VBoxClipboardWinDataObject::OnTransferCanceled(void)
+{
+    LogFlowFuncEnter();
+
+    if (m_EventTransferComplete != NIL_RTSEMEVENT)
+    {
         int rc2 = RTSemEventSignal(m_EventTransferComplete);
         AssertRC(rc2);
     }
-
-    LogFlowFuncLeaveRC(rc);
-}
-
-void VBoxClipboardWinDataObject::OnTransferCanceled(void)
-{
-    LogFlowFuncEnter();
-
-    int rc2 = RTSemEventSignal(m_EventTransferComplete);
-    AssertRC(rc2);
 
     LogFlowFuncLeave();