[COMCTL32_WINETEST] Sync to Wine-11.11

Author: MishaProductions

modules/rostests/winetests/comctl32/CMakeLists.txt

@@ -1,8 +1,8 @@
 
 remove_definitions(-D_WIN32_WINNT=0x502 -D_WIN32_IE=0x600)
 
-add_definitions(-D__ROS_LONG64__)
 add_definitions(-DUSE_WINE_TODOS -DWINETEST_USE_DBGSTR_LONGLONG)
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine)
 
 list(APPEND SOURCE
     animate.c
@@ -49,14 +49,22 @@ if(MSVC AND ARCH STREQUAL "amd64")
 endif()
 
 if(MSVC)
-    #  warning C4045: 'large_truncated_80_w': array bounds overflow
-    target_compile_options(comctl32_winetest PRIVATE /wd4045)
+    # warning C4045: 'large_truncated_80_w': array bounds overflow
+    # warning C4047: 'function': 'type' differs in levels of indirection from 'type'
+    # warning C4024: different types for formal and actual parameter
+    target_compile_options(comctl32_winetest PRIVATE /wd4045 /wd4047 /wd4024)
+endif()
+
+if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR
+   CMAKE_C_COMPILER_ID STREQUAL "Clang")
+    target_compile_options(comctl32_winetest PRIVATE -Wno-int-conversion -Wno-old-style-declaration)
 endif()
 
 target_compile_options(comctl32_winetest PRIVATE $<$<NOT:$<C_COMPILER_ID:MSVC>>:-Wno-format>)
 
 set_module_type(comctl32_winetest win32cui)
-add_importlibs(comctl32_winetest comctl32 ole32 user32 gdi32 advapi32 msvcrt kernel32)
+add_importlibs(comctl32_winetest comctl32 imm32 uxtheme ole32 oleacc oleaut32 user32 gdi32 advapi32 msvcrt kernel32)
+target_link_libraries(comctl32_winetest uuid oldnames)
 
 if(MSVC)
     add_importlibs(comctl32_winetest ntdll)

modules/rostests/winetests/comctl32/animate.c

@@ -32,7 +32,6 @@
 
 static HWND hAnimateParentWnd, hAnimateWnd;
 static const char animateTestClass[] = "AnimateTestClass";
-static WNDPROC animate_wndproc;
 static HANDLE shell32;
 
 /* try to make sure pending X events have been processed before continuing */
@@ -100,7 +99,7 @@ static void create_animate(DWORD parent_style, DWORD animate_style)
     hAnimateWnd = CreateWindowExA(0, ANIMATE_CLASSA, NULL, WS_CHILD | WS_VISIBLE | animate_style,
       0, 0, rect.right, rect.bottom, hAnimateParentWnd, NULL, shell32, 0);
     ok(hAnimateWnd != NULL, "failed to create parent wnd\n");
-    animate_wndproc = (WNDPROC)SetWindowLongPtrA(hAnimateWnd, GWLP_WNDPROC, 0);
+    SetWindowLongPtrA(hAnimateWnd, GWLP_WNDPROC, 0);
 
     ShowWindow(hAnimateParentWnd, SW_SHOWNORMAL);
     ok(GetUpdateRect(hAnimateParentWnd, NULL, FALSE), "GetUpdateRect: There should be a region that needs to be updated\n");
@@ -133,23 +132,40 @@ static void test_play(void)
 
     create_animate(0, 0);
     SetLastError(0xdeadbeef);
-    res = SendMessageA(hAnimateWnd, ACM_OPENA,(WPARAM)shell32, (LPARAM)MAKEINTRESOURCE(INVALID_AVI_INDEX));
+    res = SendMessageA(hAnimateWnd, ACM_OPENA,(WPARAM)shell32, MAKEINTRESOURCE(INVALID_AVI_INDEX));
     err = GetLastError();
     ok(res == 0, "Invalid video should have failed\n");
-    ok(err == ERROR_RESOURCE_NAME_NOT_FOUND, "Expected 1814, got %u\n", err);
+    ok(err == ERROR_RESOURCE_NAME_NOT_FOUND, "Expected 1814, got %lu\n", err);
 
     SetLastError(0xdeadbeef);
     res = SendMessageA(hAnimateWnd, ACM_PLAY, (WPARAM) -1, MAKELONG(0, -1));
     err = GetLastError();
     ok(res == 0, "Play should have failed\n");
-    ok(err == 0xdeadbeef, "Expected 0xdeadbeef, got %u\n", err);
+    ok(err == 0xdeadbeef, "Expected 0xdeadbeef, got %lu\n", err);
     destroy_animate();
 
     create_animate(0, 0);
-    res = SendMessageA(hAnimateWnd, ACM_OPENA,(WPARAM)shell32, (LPARAM)MAKEINTRESOURCE(SEARCHING_AVI_INDEX));
+    res = SendMessageA(hAnimateWnd, ACM_OPENA,(WPARAM)shell32, MAKEINTRESOURCE(SEARCHING_AVI_INDEX));
     ok(res != 0, "Load AVI resource failed\n");
     res = SendMessageA(hAnimateWnd, ACM_PLAY, (WPARAM) -1, MAKELONG(0, -1));
     ok(res != 0, "Play should have worked\n");
+    /* Test ACM_OPEN after playing an animation */
+    res = SendMessageA(hAnimateWnd, ACM_OPENA, 0, 0);
+    ok(res == 0, "ACM_OPENA with a NULL lparam while playing should return 0\n");
+    destroy_animate();
+
+    /* Test ACM_OPEN after opening an animation */
+    create_animate(0, 0);
+    res = SendMessageA(hAnimateWnd, ACM_OPENA, (WPARAM)shell32, MAKEINTRESOURCE(SEARCHING_AVI_INDEX));
+    ok(res != 0, "Load AVI resource failed\n");
+    res = SendMessageA(hAnimateWnd, ACM_OPENA, 0, 0);
+    ok(res == 0, "ACM_OPENA with a NULL lparam should return 0\n");
+    destroy_animate();
+
+    /* Test ACM_OPEN without opening an animation */
+    create_animate(0, 0);
+    res = SendMessageA(hAnimateWnd, ACM_OPENA, 0, 0);
+    ok(res == 0, "ACM_OPENA with a NULL lparam should return 0\n");
     destroy_animate();
 }