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

Timestamp:

Sep 21, 2018 3:36:16 PM (6 years ago)

Author:

vboxsync

Message:

DnD: Renamed action names, added typedefs for DnD actions.

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• VBoxDnD.cpp (modified) (6 diffs)
• VBoxDnDDropSource.cpp (modified) (4 diffs)

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

@@ -94 +94 @@
       mEventSem(NIL_RTSEMEVENT),
       hWnd(NULL),
-      uAllActions(DND_IGNORE_ACTION),
+      uAllActions(VBOX_DND_ACTION_IGNORE),
       mfMouseButtonDown(false),
 #ifdef VBOX_WITH_DRAG_AND_DROP_GH
@@ -878 +878 @@
         if (uAllActions)
         {
-            if (uAllActions & DND_COPY_ACTION)
+            if (uAllActions & VBOX_DND_ACTION_COPY)
                 startupInfo.dwOKEffects |= DROPEFFECT_COPY;
-            if (uAllActions & DND_MOVE_ACTION)
+            if (uAllActions & VBOX_DND_ACTION_MOVE)
                 startupInfo.dwOKEffects |= DROPEFFECT_MOVE;
-            if (uAllActions & DND_LINK_ACTION)
+            if (uAllActions & VBOX_DND_ACTION_LINK)
                 startupInfo.dwOKEffects |= DROPEFFECT_LINK;
         }
@@ -925 +925 @@
     int rc;
 
-    uint32_t uActionNotify = DND_IGNORE_ACTION;
+    uint32_t uActionNotify = VBOX_DND_ACTION_IGNORE;
     if (mMode == HG)
     {
@@ -1196 +1196 @@
     if (RT_SUCCESS(rc))
     {
-        uint32_t uDefAction = DND_IGNORE_ACTION;
+        uint32_t uDefAction = VBOX_DND_ACTION_IGNORE;
 
         AssertPtr(pDropTarget);
@@ -1202 +1202 @@
         if (!strFormats.isEmpty())
         {
-            uDefAction = DND_COPY_ACTION;
+            uDefAction = VBOX_DND_ACTION_COPY;
 
             LogFlowFunc(("Acknowledging pDropTarget=0x%p, uDefAction=0x%x, uAllActions=0x%x, strFormats=%s\n",
@@ -1550 +1550 @@
 
     this->lstFmtActive.clear();
-    this->uAllActions = DND_IGNORE_ACTION;
+    this->uAllActions = VBOX_DND_ACTION_IGNORE;
 
     int rc2 = setMode(Unknown);

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

@@ -37 +37 @@
       mpWndParent(pParent),
       mdwCurEffect(0),
-      muCurAction(DND_IGNORE_ACTION)
+      muCurAction(VBOX_DND_ACTION_IGNORE)
 {
     LogFlowFuncEnter();
@@ -105 +105 @@
     {
         mdwCurEffect = 0;
-        muCurAction = DND_IGNORE_ACTION;
+        muCurAction = VBOX_DND_ACTION_IGNORE;
 
         LogFlowFunc(("Canceled\n"));
@@ -130 +130 @@
 STDMETHODIMP VBoxDnDDropSource::GiveFeedback(DWORD dwEffect)
 {
-    uint32_t uAction = DND_IGNORE_ACTION;
+    uint32_t uAction = VBOX_DND_ACTION_IGNORE;
 
 #if 1
@@ -138 +138 @@
     {
         if (dwEffect & DROPEFFECT_COPY)
-            uAction |= DND_COPY_ACTION;
+            uAction |= VBOX_DND_ACTION_COPY;
         if (dwEffect & DROPEFFECT_MOVE)
-            uAction |= DND_MOVE_ACTION;
+            uAction |= VBOX_DND_ACTION_MOVE;
         if (dwEffect & DROPEFFECT_LINK)
-            uAction |= DND_LINK_ACTION;
+            uAction |= VBOX_DND_ACTION_LINK;
     }