Changeset 74442 in vbox

Timestamp:

Sep 24, 2018 1:09:14 PM (6 years ago)

Author:

vboxsync

Message:

DnD: Build fix.

Location:

trunk

Files:

• include/VBox/HostServices/DragAndDropSvc.h (modified) (1 diff)
• src/VBox/Additions/WINNT/VBoxTray/VBoxDnD.cpp (modified) (3 diffs)
• src/VBox/Additions/WINNT/VBoxTray/VBoxDnD.h (modified) (4 diffs)
• src/VBox/Additions/WINNT/VBoxTray/VBoxDnDDropSource.cpp (modified) (4 diffs)

trunk/include/VBox/HostServices/DragAndDropSvc.h

@@ -67 +67 @@
 #include <VBox/VMMDevCoreTypes.h>
 #include <VBox/VBoxGuestCoreTypes.h>
+
+#include <VBox/GuestHost/DragAndDropDefs.h>
 
 namespace DragAndDropSvc {

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

@@ -917 +917 @@
  * @param   u32yPos                 Absolute Y position (in pixels) of the host cursor
  *                                  inside the guest.
- * @param   uAction                 Action the host wants to perform while moving.
+ * @param   dndAction               Action the host wants to perform while moving.
  *                                  Currently ignored.
  */
-int VBoxDnDWnd::OnHgMove(uint32_t u32xPos, uint32_t u32yPos, uint32_t uAction)
-{
-    RT_NOREF(uAction);
+int VBoxDnDWnd::OnHgMove(uint32_t u32xPos, uint32_t u32yPos, VBOXDNDACTION dndAction)
+{
+    RT_NOREF(dndAction);
     int rc;
 
@@ -928 +928 @@
     if (mMode == HG)
     {
-        LogFlowThisFunc(("u32xPos=%RU32, u32yPos=%RU32, uAction=0x%x\n",
-                         u32xPos, u32yPos, uAction));
+        LogFlowThisFunc(("u32xPos=%RU32, u32yPos=%RU32, dndAction=0x%x\n",
+                         u32xPos, u32yPos, dndAction));
 
         rc = mouseMove(u32xPos, u32yPos, MOUSEEVENTF_LEFTDOWN);
@@ -1264 +1264 @@
  * @param   pszFormat               Format the host requests the data in.
  * @param   cbFormat                Size (in bytes) of format string.
- * @param   uDefAction              Default action on the host.
- */
-int VBoxDnDWnd::OnGhDrop(const RTCString &strFormat, uint32_t uDefAction)
-{
-    RT_NOREF(uDefAction);
-
-    LogFlowThisFunc(("mMode=%ld, mState=%ld, pDropTarget=0x%p, strFormat=%s, uDefAction=0x%x\n",
-                     mMode, mState, pDropTarget, strFormat.c_str(), uDefAction));
+ * @param   dndActionDefault        Default action on the host.
+ */
+int VBoxDnDWnd::OnGhDrop(const RTCString &strFormat, uint32_t dndActionDefault)
+{
+    RT_NOREF(dndActionDefault);
+
+    LogFlowThisFunc(("mMode=%ld, mState=%ld, pDropTarget=0x%p, strFormat=%s, dndActionDefault=0x%x\n",
+                     mMode, mState, pDropTarget, strFormat.c_str(), dndActionDefault));
     int rc;
     if (mMode == GH)

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

@@ -97 +97 @@
 public:
 
-    uint32_t GetCurrentAction(void) { return muCurAction; }
+    VBOXDNDACTION GetCurrentAction(void) { return mDnDActionCurrent; }
 
 public: /* IUnknown methods. */
@@ -119 +119 @@
     DWORD                 mdwCurEffect;
     /** Current action to perform on the host. */
-    uint32_t              muCurAction;
+    VBOXDNDACTION         mDnDActionCurrent;
 };
 
@@ -333 +333 @@
 
     /* H->G */
-    int OnHgEnter(const RTCList<RTCString> &formats, uint32_t uAllActions);
-    int OnHgMove(uint32_t u32xPos, uint32_t u32yPos, uint32_t uAllActions);
+    int OnHgEnter(const RTCList<RTCString> &formats, VBOXDNDACTIONLIST dndLstActionsAllowed);
+    int OnHgMove(uint32_t u32xPos, uint32_t u32yPos, VBOXDNDACTION dndAction);
     int OnHgDrop(void);
     int OnHgLeave(void);
@@ -342 +342 @@
 #ifdef VBOX_WITH_DRAG_AND_DROP_GH
     int OnGhIsDnDPending(void);
-    int OnGhDrop(const RTCString &strFormat, uint32_t uDefAction);
+    int OnGhDrop(const RTCString &strFormat, VBOXDNDACTION dndActionDefault);
 #endif
 

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

@@ -37 +37 @@
       mpWndParent(pParent),
       mdwCurEffect(0),
-      muCurAction(VBOX_DND_ACTION_IGNORE)
+      mDnDActionCurrent(VBOX_DND_ACTION_IGNORE)
 {
     LogFlowFuncEnter();
@@ -97 +97 @@
 {
 #if 1
-    LogFlowFunc(("fEscapePressed=%RTbool, dwKeyState=0x%x, mdwCurEffect=%RI32, muCurAction=%RU32\n",
-                 fEscapePressed, dwKeyState, mdwCurEffect, muCurAction));
+    LogFlowFunc(("fEscapePressed=%RTbool, dwKeyState=0x%x, mdwCurEffect=%RI32, mDnDActionCurrent=%RU32\n",
+                 fEscapePressed, dwKeyState, mdwCurEffect, mDnDActionCurrent));
 #endif
 
@@ -105 +105 @@
     {
         mdwCurEffect = 0;
-        muCurAction = VBOX_DND_ACTION_IGNORE;
+        mDnDActionCurrent = VBOX_DND_ACTION_IGNORE;
 
         LogFlowFunc(("Canceled\n"));
@@ -146 +146 @@
 
     mdwCurEffect = dwEffect;
-    muCurAction = uAction;
+    mDnDActionCurrent = uAction;
 
     return DRAGDROP_S_USEDEFAULTCURSORS;