[PATCH 0/1] MR6738: include: Add missing defines and enums for IDragSourceHelper2.

[Vijay Kiran Kamuju (＠infyquest)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6738

[PATCH 1/1] include: Add missing defines and enums for IDragSourceHelper2.

[Vijay Kiran Kamuju]

From: Vijay Kiran Kamuju <infyquest(a)gmail.com>

---
 include/shobjidl.idl | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/include/shobjidl.idl b/include/shobjidl.idl
index 886cff89ef9..4118e3d9ba2 100644
--- a/include/shobjidl.idl
+++ b/include/shobjidl.idl
@@ -1609,6 +1609,17 @@ cpp_quote("#define DWFAF_HIDDEN           0x0001")
         [out] LPVOID *ppvObj);
 }
 
+cpp_quote("#include <pshpack8.h>")
+typedef struct
+{
+    SIZE     sizeDragImage;
+    POINT    ptOffset;
+    HBITMAP  hbmpDragImage;
+    COLORREF crColorKey;
+} SHDRAGIMAGE, *LPSHDRAGIMAGE;
+cpp_quote("#include <poppack.h>")
+
+cpp_quote("#define DI_GETDRAGIMAGE TEXT(\"ShellGetDragImage\")")
 
 /*****************************************************************************
  * IDragSourceHelper interface
@@ -1621,14 +1632,6 @@ cpp_quote("#define DWFAF_HIDDEN           0x0001")
 ]
 interface IDragSourceHelper : IUnknown
 {
-    typedef struct
-    {
-        SIZE     sizeDragImage;
-        POINT    ptOffset;
-        HBITMAP  hbmpDragImage;
-        COLORREF crColorKey;
-    } SHDRAGIMAGE, *LPSHDRAGIMAGE;
-
   HRESULT InitializeFromBitmap(
       [in] LPSHDRAGIMAGE pshdi,
       [in] IDataObject *pDataObject);
@@ -1639,6 +1642,11 @@ interface IDragSourceHelper : IUnknown
       [in] IDataObject *pDataObject);
 }
 
+typedef [v1_enum] enum DSH_FLAGS
+{
+    DSH_ALLOWDROPDESCRIPTIONTEXT = 0x0001,
+} DSH_FLAGS;
+cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(DSH_FLAGS)")
 
 /*****************************************************************************
  * IDragSourceHelper2 interface
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/6738

[PATCH 1/1] include: Add missing defines and enums for IDragSourceHelper2.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=149338

Your paranoid android.


=== debian11b (64 bit WoW report) ===

user32:
input.c:4305: Test succeeded inside todo block: button_down_hwnd_todo 1: got MSG_TEST_WIN hwnd 00000000019C0100, msg WM_LBUTTONDOWN, wparam 0x1, lparam 0x320032