[PATCH 0/1] MR6586: user32/tests: Test that DragDetect() uses client coordinates instead of screen coordinates.

[Zhiyi Zhang (＠zhiyi)]

Test that DragDetect() uses client coordinates instead of screen coordinates even though MSDN says that DragDetect()
should use screen coordinates. This also means that Wine's current implementation is correct.

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

[PATCH 1/1] user32/tests: Test that DragDetect() uses client coordinates instead of screen coordinates.

[Zhiyi Zhang]

From: Zhiyi Zhang <zzhang(a)codeweavers.com>

Test that DragDetect() uses client coordinates instead of screen coordinates even though MSDN says that DragDetect()
should use screen coordinates. This also means that Wine's current implementation is correct.
---
 dlls/user32/tests/win.c | 73 +++++++++++++++++++++++++++++++++++++++++
 dlls/win32u/window.c    |  3 ++
 2 files changed, 76 insertions(+)

diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index 775164e3e9f..2fcd3a5d259 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -74,6 +74,30 @@ static const char* szAWRClass = "Winsize";
 static HMENU hmenu;
 static DWORD our_pid;
 
+static void hold_key( int vk )
+{
+    BYTE kstate[256];
+    BOOL res;
+
+    res = GetKeyboardState( kstate );
+    ok(res, "GetKeyboardState failed.\n");
+    kstate[vk] |= 0x80;
+    res = SetKeyboardState( kstate );
+    ok(res, "SetKeyboardState failed.\n");
+}
+
+static void release_key( int vk )
+{
+    BYTE kstate[256];
+    BOOL res;
+
+    res = GetKeyboardState( kstate );
+    ok(res, "GetKeyboardState failed.\n");
+    kstate[vk] &= ~0x80;
+    res = SetKeyboardState( kstate );
+    ok(res, "SetKeyboardState failed.\n");
+}
+
 static void dump_minmax_info( const MINMAXINFO *minmax )
 {
     trace("Reserved=%ld,%ld MaxSize=%ld,%ld MaxPos=%ld,%ld MinTrack=%ld,%ld MaxTrack=%ld,%ld\n",
@@ -12900,6 +12924,8 @@ static void test_cancel_mode(void)
 
 static void test_DragDetect(void)
 {
+    int cx_drag = GetSystemMetrics( SM_CXDRAG ), cy_drag = GetSystemMetrics( SM_CYDRAG );
+    HWND hwnd;
     POINT pt;
     BOOL ret;
 
@@ -12912,6 +12938,53 @@ static void test_DragDetect(void)
 
     ok(!GetCapture(), "got capture window %p\n", GetCapture());
     ok(!(GetKeyState( VK_LBUTTON ) & 0x8000), "got VK_LBUTTON\n");
+
+    /* Test mouse moving out of the drag rectangle in client coordinates */
+    hwnd = CreateWindowA( "static", "test", WS_POPUP | WS_VISIBLE, 100, 100, 50, 50, 0, 0, 0, 0 );
+    hold_key( VK_LBUTTON );
+
+    PostMessageA( hwnd, WM_MOUSEMOVE, MK_LBUTTON, MAKELPARAM(cx_drag, cy_drag) );
+
+    pt.x = 0;
+    pt.y = 0;
+    ret = DragDetect( hwnd, pt );
+    ok(ret, "Got unexpected %d.\n", ret);
+    flush_events( TRUE );
+
+    /* Test mouse not moving out of the drag rectangle in client coordinates */
+    PostMessageA( hwnd, WM_MOUSEMOVE, MK_LBUTTON, MAKELPARAM(cx_drag - 1, cy_drag - 1) );
+    PostMessageA( hwnd, WM_LBUTTONUP, 0, 0 );
+
+    pt.x = 0;
+    pt.y = 0;
+    ret = DragDetect( hwnd, pt );
+    ok(!ret || broken(ret) /* Win 7 */, "Got unexpected %d\n", ret);
+    flush_events( TRUE );
+
+    /* Test mouse moving out of the drag rectangle in screen coordinates */
+    PostMessageA( hwnd, WM_MOUSEMOVE, MK_LBUTTON, MAKELPARAM(cx_drag, cy_drag) );
+
+    pt.x = 0;
+    pt.y = 0;
+    ClientToScreen( hwnd, &pt );
+    ret = DragDetect( hwnd, pt );
+    ok(ret || broken(!ret) /* Win 7 */, "Got unexpected %d\n", ret);
+    flush_events( TRUE );
+
+    /* Test mouse not moving out of the drag rectangle in screen coordinates */
+    PostMessageA( hwnd, WM_MOUSEMOVE, MK_LBUTTON, MAKELPARAM(0, 0) );
+
+    pt.x = 0;
+    pt.y = 0;
+    ClientToScreen( hwnd, &pt );
+    ret = DragDetect( hwnd, pt );
+    /* NOTE that if DragDetect() do use screen coordinates for the second parameter for the initial
+     * mouse position, then FALSE should be returned in this case. But TRUE is returned here. So
+     * this means that DragDetect() don't use screen coordinates even though MSDN says that it does */
+    ok(ret, "Got unexpected %d\n", ret);
+
+    DestroyWindow( hwnd );
+    release_key( VK_LBUTTON );
 }
 
 static LRESULT WINAPI ncdestroy_test_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp )
diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c
index 26b0b338b46..cb7b1f6e3a6 100644
--- a/dlls/win32u/window.c
+++ b/dlls/win32u/window.c
@@ -5932,6 +5932,9 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code )
 
 /*******************************************************************
  *           NtUserDragDetect (win32u.@)
+ *
+ * Note that x and y are in the coordinate relative to the upper-left corner of the client area, not
+ * in screen coordinates as MSDN claims.
  */
 BOOL WINAPI NtUserDragDetect( HWND hwnd, int x, int y )
 {
-- 
GitLab

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

[PATCH 1/1] user32/tests: Test that DragDetect() uses client coordinates instead of screen coordinates.

[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=148768

Your paranoid android.


=== w1064v1507 (32 bit report) ===

user32:
win.c:13135: Test failed: window is minimized.

=== w10pro64 (32 bit report) ===

user32:
win.c:3842: Test failed: GetForegroundWindow returned 000202C8
win.c:3773: Test failed: SetForegroundWindow failed, error 0
win.c:3776: Test failed: GetForegroundWindow returned 000202C8
win.c:3813: Test failed: GetForegroundWindow returned 000202C8
win.c:3901: Test failed: GetActiveWindow() = 000201A8
win.c:3905: Test failed: GetFocus() = 00000000
win.c:3908: Test failed: GetFocus() = 00000000

=== w10pro64 (64 bit report) ===

user32:
win.c:3842: Test failed: GetForegroundWindow returned 00000000000202D0
win.c:3773: Test failed: SetForegroundWindow failed, error 0
win.c:3776: Test failed: GetForegroundWindow returned 00000000000202D0
win.c:3813: Test failed: GetForegroundWindow returned 00000000000202D0
win.c:3901: Test failed: GetActiveWindow() = 00000000000200F6
win.c:3905: Test failed: GetFocus() = 0000000000000000
win.c:3908: Test failed: GetFocus() = 0000000000000000

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

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