Changeset 74473 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Sep 26, 2018 11:55:28 AM (6 years ago)

Author:

vboxsync

Message:

DnD/VBoxTray: Made the proxy window's reset() function public and use that one instead of hide() from other places.

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• VBoxDnD.cpp (modified) (11 diffs)
• VBoxDnD.h (modified) (3 diffs)
• VBoxDnDDropTarget.cpp (modified) (2 diffs)

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

@@ -173 +173 @@
     }
 
-    reset();
+    Reset();
 
     RTCritSectDelete(&mCritSect);
@@ -441 +441 @@
              * - there was no drop data from the guest available and the user
              *   enters the guest screen again after this unsuccessful operation */
-            reset();
+            Reset();
             return 0;
         }
@@ -615 +615 @@
                 case VBGLR3DNDEVENTTYPE_GH_ERROR:
                 {
-                    reset();
+                    Reset();
                     rc = VINF_SUCCESS;
                     break;
@@ -647 +647 @@
 
                 /* If anything went wrong, do a reset and start over. */
-                reset();
+                Reset();
             }
 
@@ -783 +783 @@
 #endif
 
-    reset();
+    Reset();
     setMode(HG);
 
@@ -972 +972 @@
     LogRel(("DnD: Drag and drop operation aborted\n"));
 
-    reset();
+    Reset();
 
     int rc = VINF_SUCCESS;
@@ -1091 +1091 @@
         rc = rc2;
 
-    reset();
+    Reset();
 
     return rc;
@@ -1245 +1245 @@
 
             LogRel2(("DnD: Host refuses drag and drop operation from guest: %Rrc\n", rc2));
-            reset();
+            Reset();
         }
     }
 
     if (RT_FAILURE(rc))
-        reset(); /* Reset state on failure. */
+        Reset(); /* Reset state on failure. */
 
     LogFlowFuncLeaveRC(rc);
@@ -1280 +1280 @@
             rc = pDropTarget->WaitForDrop(5 * 1000 /* 5s timeout */);
 
-            reset();
+            Reset();
         }
         else if (mState == Dropped)
@@ -1538 +1538 @@
  * Resets the proxy window.
  */
-void VBoxDnDWnd::reset(void)
+void VBoxDnDWnd::Reset(void)
 {
     LogFlowThisFunc(("Resetting, old mMode=%ld, mState=%ld\n",
@@ -1833 +1833 @@
             /* Make sure our proxy window is hidden when an error occured to
              * not block the guest's UI. */
-            pWnd->hide();
+            pWnd->Reset();
 
             int rc2 = VbglR3DnDGHSendError(&pCtx->cmdCtx, rc);

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnD.h

@@ -332 +332 @@
     void OnDestroy(void);
 
-    /* H->G */
+    /* Host -> Guest */
     int OnHgEnter(const RTCList<RTCString> &formats, VBOXDNDACTIONLIST dndLstActionsAllowed);
     int OnHgMove(uint32_t u32xPos, uint32_t u32yPos, VBOXDNDACTION dndAction);
@@ -341 +341 @@
 
 #ifdef VBOX_WITH_DRAG_AND_DROP_GH
+    /* Guest -> Host */
     int OnGhIsDnDPending(void);
     int OnGhDrop(const RTCString &strFormat, VBOXDNDACTION dndActionDefault);
@@ -348 +349 @@
     int ProcessEvent(PVBOXDNDEVENT pEvent);
 
-public:
+    void Reset(void);
+
+protected:
 
     int hide(void);
-
-protected:
-
     int makeFullscreen(void);
     int mouseMove(int x, int y, DWORD dwMouseInputFlags);
     int mouseRelease(void);
-    void reset(void);
     int setMode(Mode enmMode);
 

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

@@ -262 +262 @@
 
     if (mpWndParent)
-        mpWndParent->hide();
+        mpWndParent->Reset();
 
     return S_OK;
@@ -549 +549 @@
 
     if (mpWndParent)
-        mpWndParent->hide();
+        mpWndParent->Reset();
 
     LogFlowFunc(("Returning with hr=%Rhrc (%Rrc), mFormatEtc.cfFormat=%RI16 (%s), *pdwEffect=%RI32\n",