[ros-diffs] [akhaldi] 73336: [COMCTL32_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409

Author: akhaldi
Date: Tue Nov 22 12:11:38 2016
New Revision: 73336

URL: http://svn.reactos.org/svn/reactos?rev=73336&view=rev
Log:
[COMCTL32_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409

Modified:
    trunk/rostests/winetests/comctl32/listview.c
    trunk/rostests/winetests/comctl32/status.c
    trunk/rostests/winetests/comctl32/syslink.c
    trunk/rostests/winetests/comctl32/toolbar.c
    trunk/rostests/winetests/comctl32/tooltips.c
    trunk/rostests/winetests/comctl32/treeview.c

Modified: trunk/rostests/winetests/comctl32/listview.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/listvi…
==============================================================================
--- trunk/rostests/winetests/comctl32/listview.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/comctl32/listview.c	[iso-8859-1] Tue Nov 22 12:11:38 2016
@@ -5785,6 +5785,7 @@
     HWND hwnd, fg;
     RECT rect;
     INT r;
+    POINT orig_pos;
 
     hwnd = CreateWindowExA(0, "SysListView32", "foo",
WS_VISIBLE|WS_CHILD|LVS_LIST,
             10, 10, 100, 200, hwndparent, NULL, NULL, NULL);
@@ -5811,6 +5812,7 @@
     ok(r == 0, "should not fail\n");
 
     GetWindowRect(hwnd, &rect);
+    GetCursorPos(&orig_pos);
     SetCursorPos(rect.left+5, rect.top+5);
     flush_events();
     r = SendMessageA(hwnd, WM_MOUSEMOVE, MAKELONG(1, 1), 0);
@@ -5830,6 +5832,7 @@
     expect(1, r);
 
     DestroyWindow(hwnd);
+    SetCursorPos(orig_pos.x, orig_pos.y);
 }
 
 static void test_callback_mask(void)

Modified: trunk/rostests/winetests/comctl32/status.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/status…
==============================================================================
--- trunk/rostests/winetests/comctl32/status.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/comctl32/status.c	[iso-8859-1] Tue Nov 22 12:11:38 2016
@@ -291,7 +291,7 @@
     expect(5,LOWORD(r));
     expect(SBT_POPOUT,HIWORD(r));
     r = SendMessageW(hWndStatus, WM_GETTEXTLENGTH, 0, 0);
-    ok(r == 5 || broken(0x02000005 /* NT4 */), "Expected 5, got %d\n", r);
+    ok(r == 5, "Expected 5, got %d\n", r);
     r = SendMessageA(hWndStatus, SB_GETTEXTLENGTHA, 1, 0);
     expect(0,LOWORD(r));
     expect(SBT_OWNERDRAW,HIWORD(r));

Modified: trunk/rostests/winetests/comctl32/syslink.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/syslin…
==============================================================================
--- trunk/rostests/winetests/comctl32/syslink.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/comctl32/syslink.c	[iso-8859-1] Tue Nov 22 12:11:38 2016
@@ -195,6 +195,7 @@
     BOOL rc;
     HWND hWndSysLink;
     LONG oldstyle;
+    POINT orig_pos;
 
     if (!load_v6_module(&ctx_cookie, &hCtx))
         return;
@@ -216,6 +217,10 @@
         skip("Could not register ICC_LINK_CLASS\n");
         return;
     }
+
+    /* Move the cursor off the parent window */
+    GetCursorPos(&orig_pos);
+    SetCursorPos(400, 400);
 
     init_msg_sequences(sequences, NUM_MSG_SEQUENCE);
 
@@ -254,4 +259,5 @@
     DestroyWindow(hWndSysLink);
     DestroyWindow(hWndParent);
     unload_v6_module(ctx_cookie, hCtx);
-}
+    SetCursorPos(orig_pos.x, orig_pos.y);
+}

Modified: trunk/rostests/winetests/comctl32/toolbar.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/toolba…
==============================================================================
--- trunk/rostests/winetests/comctl32/toolbar.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/comctl32/toolbar.c	[iso-8859-1] Tue Nov 22 12:11:38 2016
@@ -1235,11 +1235,8 @@
                        EqualRect(&rc,
&tbsize_alt_results[tbsize_alt_numtests].rcButton))) { \
                 win_skip("Alternate rect found\n"); \
                 tbsize_alt_numtests++; \
-            } else if (!(mask&1)) { \
+            } else todo_wine_if(mask&1) \
                 check_rect("button = %d, tbsize_numtests = %d", rc,
res->prcButtons[i], i, tbsize_numtests); \
-            } else {\
-                todo_wine { check_rect("button = %d, tbsize_numtests = %d", rc,
res->prcButtons[i], i, tbsize_numtests); } \
-            } \
             mask >>= 1; \
         } \
         tbsize_numtests++; \

Modified: trunk/rostests/winetests/comctl32/tooltips.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/toolti…
==============================================================================
--- trunk/rostests/winetests/comctl32/tooltips.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/comctl32/tooltips.c	[iso-8859-1] Tue Nov 22 12:11:38 2016
@@ -156,6 +156,7 @@
    DWORD       iterationNumber;
    WNDCLASSA wc;
    LRESULT   lResult;
+   POINT orig_pos;
 
    /* Create a class to use the custom draw wndproc */
    wc.style = CS_HREDRAW | CS_VREDRAW;
@@ -170,6 +171,8 @@
    wc.lpfnWndProc = custom_draw_wnd_proc;
    RegisterClassA(&wc);
 
+   GetCursorPos(&orig_pos);
+
    for (iterationNumber = 0;
         iterationNumber < sizeof(expectedResults)/sizeof(expectedResults[0]);
         iterationNumber++) {
@@ -242,7 +245,7 @@
        DestroyWindow(parent);
    }
 
-
+   SetCursorPos(orig_pos.x, orig_pos.y);
 }
 
 static const CHAR testcallbackA[]  = "callback";

Modified: trunk/rostests/winetests/comctl32/treeview.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/treevi…
==============================================================================
--- trunk/rostests/winetests/comctl32/treeview.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/comctl32/treeview.c	[iso-8859-1] Tue Nov 22 12:11:38 2016
@@ -2369,6 +2369,30 @@
     DestroyWindow(hwnd);
 }
 
+static void test_TVS_FULLROWSELECT(void)
+{
+    DWORD style;
+    HWND hwnd;
+
+    /* try to create both with TVS_HASLINES and TVS_FULLROWSELECT */
+    hwnd = create_treeview_control(TVS_FULLROWSELECT);
+
+    style = GetWindowLongA(hwnd, GWL_STYLE);
+    ok((style & (TVS_FULLROWSELECT | TVS_HASLINES)) == (TVS_FULLROWSELECT |
TVS_HASLINES), "got style 0x%08x\n", style);
+
+    DestroyWindow(hwnd);
+
+    /* create just with TVS_HASLINES, try to enable TVS_FULLROWSELECT later */
+    hwnd = create_treeview_control(0);
+
+    style = GetWindowLongA(hwnd, GWL_STYLE);
+    SetWindowLongA(hwnd, GWL_STYLE, style | TVS_FULLROWSELECT);
+    style = GetWindowLongA(hwnd, GWL_STYLE);
+    ok(style & TVS_FULLROWSELECT, "got style 0x%08x\n", style);
+
+    DestroyWindow(hwnd);
+}
+
 START_TEST(treeview)
 {
     HMODULE hComctl32;
@@ -2444,6 +2468,7 @@
     test_WM_GETDLGCODE();
     test_customdraw();
     test_WM_KEYDOWN();
+    test_TVS_FULLROWSELECT();
 
     if (!load_v6_module(&ctx_cookie, &hCtx))
     {