February 2022 - Wine-commits

Zebediah Figura : d3d11/tests: Don't run the 32-bit tests multithreaded.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 301065b1fff0dd6261dd5222a12249522155f644 URL: https://source.winehq.org/git/wine.git/?a=commit;h=301065b1fff0dd6261dd5222… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 7 14:46:32 2022 +0100 d3d11/tests: Don't run the 32-bit tests multithreaded. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 93f0aa896e8..52c8816b689 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -34055,6 +34055,11 @@ START_TEST(d3d11) char **argv; use_mt = !getenv("WINETEST_NO_MT_D3D"); + /* Some host drivers (MacOS, Mesa radeonsi) never unmap memory even when + * requested. When using the chunk allocator, running the tests with more + * than one thread can exceed the 32-bit virtual address space. */ + if (sizeof(void *) == 4 && !strcmp(winetest_platform, "wine")) + use_mt = FALSE; argc = winetest_get_mainargs(&argv); for (i = 2; i < argc; ++i)

1 0

Zebediah Figura : dxgi/tests: Don't run the 32-bit tests multithreaded.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: dece48b9fbae0fe67d71fd4eb5a96c41bc8e8a79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dece48b9fbae0fe67d71fd4e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 7 14:46:33 2022 +0100 dxgi/tests: Don't run the 32-bit tests multithreaded. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index a83964d7523..f70d849aebc 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -7595,6 +7595,11 @@ START_TEST(dxgi) ok(EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &registry_mode), "Failed to get display mode.\n"); use_mt = !getenv("WINETEST_NO_MT_D3D"); + /* Some host drivers (MacOS, Mesa radeonsi) never unmap memory even when + * requested. When using the chunk allocator, running the tests with more + * than one thread can exceed the 32-bit virtual address space. */ + if (sizeof(void *) == 4 && !strcmp(winetest_platform, "wine")) + use_mt = FALSE; argc = winetest_get_mainargs(&argv); for (i = 2; i < argc; ++i)

1 0

Zebediah Figura : setupapi/tests: Test queuing the same copy operation twice.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: ef77468b5e041d55db3821778665a2a406ed72ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef77468b5e041d55db382177… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 6 22:53:30 2022 -0600 setupapi/tests: Test queuing the same copy operation twice. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/install.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 44b7d09d1e5..4a452435652 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -2054,12 +2054,14 @@ static void test_start_copy(void) ok(queue != INVALID_HANDLE_VALUE, "Failed to open queue, error %#x.\n", GetLastError()); ret = SetupQueueCopyA(queue, "src", NULL, "one.txt", NULL, NULL, "dst", NULL, 0); ok(ret, "Failed to queue copy, error %#x.\n", GetLastError()); + ret = SetupQueueCopyA(queue, "src", NULL, "one.txt", NULL, NULL, "dst", NULL, 0); + ok(ret, "Failed to queue copy, error %#x.\n", GetLastError()); ret = SetupQueueCopyA(queue, "src", NULL, "two.txt", NULL, NULL, "dst", NULL, 0); ok(ret, "Failed to queue copy, error %#x.\n", GetLastError()); ret = SetupQueueCopyA(queue, "src", NULL, "three.txt", NULL, NULL, "dst", NULL, 0); ok(ret, "Failed to queue copy, error %#x.\n", GetLastError()); run_queue(queue, start_copy_cb); - ok(got_start_copy == 3, "Got %u callbacks.\n", got_start_copy); + todo_wine ok(got_start_copy == 3, "Got %u callbacks.\n", got_start_copy); ok(delete_file("dst/one.txt"), "Destination file should exist.\n"); ok(delete_file("dst/two.txt"), "Destination file should exist.\n"); ok(delete_file("dst/three.txt"), "Destination file should exist.\n");

1 0

Zebediah Figura : setupapi/tests: Add more tests for SetupInstallFilesFromInfSection().
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 63cdb0b91a80d6e4bfd7528131157a3f20f2de6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=63cdb0b91a80d6e4bfd75281… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 6 22:53:31 2022 -0600 setupapi/tests: Add more tests for SetupInstallFilesFromInfSection(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/install.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 4a452435652..3a40f1450ab 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -1065,9 +1065,13 @@ static void test_install_files_queue(void) { static const char inf_data[] = "[Version]\n" "Signature=\"$Chicago$\"\n" + "[DefaultInstall]\n" - "CopyFiles=files_section\n" - "[files_section]\n" + "CopyFiles=copy_section\n" + "DelFiles=delete_section\n" + "RenFiles=rename_section\n" + + "[copy_section]\n" "one.txt\n" "two.txt\n" "three.txt\n" @@ -1076,11 +1080,19 @@ static void test_install_files_queue(void) "six.txt\n" "seven.txt\n" "eight.txt\n" + + "[delete_section]\n" + "nine.txt\n" + + "[rename_section]\n" + "eleven.txt,ten.txt\n" + "[SourceDisksNames]\n" "1=heis\n" "2=duo,,,alpha\n" "3=treis,treis.cab\n" "4=tessares,tessares.cab,,alpha\n" + "[SourceDisksFiles]\n" "one.txt=1\n" "two.txt=1,beta\n" @@ -1090,8 +1102,11 @@ static void test_install_files_queue(void) "six.txt=3,beta\n" "seven.txt=4\n" "eight.txt=4,beta\n" + "[DestinationDirs]\n" - "files_section=40000,dst\n"; + "copy_section=40000,dst\n" + "delete_section=40000,dst\n" + "rename_section=40000,dst\n"; char path[MAX_PATH + 9]; HSPFILEQ queue; @@ -1116,12 +1131,17 @@ static void test_install_files_queue(void) ret = SetupSetDirectoryIdA(hinf, 40000, CURR_DIR); ok(ret, "Failed to set directory ID, error %u.\n", GetLastError()); + ret = CreateDirectoryA("dst", NULL); + ok(ret, "Failed to create test directory, error %u.\n", GetLastError()); + create_file("src/one.txt"); create_file("src/beta/two.txt"); create_file("src/alpha/three.txt"); create_file("src/alpha/beta/four.txt"); create_cab_file("src/treis.cab", "src\\beta\\five.txt\0six.txt\0"); create_cab_file("src/alpha/tessares.cab", "seven.txt\0eight.txt\0"); + create_file("dst/nine.txt"); + create_file("dst/ten.txt"); queue = SetupOpenFileQueue(); ok(queue != INVALID_HANDLE_VALUE, "Failed to open queue, error %#x.\n", GetLastError()); @@ -1147,6 +1167,9 @@ static void test_install_files_queue(void) ok(delete_file("dst/six.txt"), "Destination file should exist.\n"); ok(delete_file("dst/seven.txt"), "Destination file should exist.\n"); ok(delete_file("dst/eight.txt"), "Destination file should exist.\n"); + todo_wine ok(!delete_file("dst/nine.txt"), "Destination file should not exist.\n"); + todo_wine ok(!delete_file("dst/ten.txt"), "Destination file should not exist.\n"); + todo_wine ok(delete_file("dst/eleven.txt"), "Destination file should exist.\n"); SetupTermDefaultQueueCallback(context); ret = SetupCloseFileQueue(queue);

1 0

Zebediah Figura : setupapi: Use the source path if the target path is missing in SetupQueueRename().
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 47111ff6b08dc019456d0f3c910a924deb1267d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47111ff6b08dc019456d0f3c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 6 22:53:32 2022 -0600 setupapi: Use the source path if the target path is missing in SetupQueueRename(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/queue.c | 4 +- dlls/setupapi/tests/install.c | 91 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index e0287f63593..1773a4df3d7 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -723,7 +723,7 @@ BOOL WINAPI SetupQueueRenameA( HSPFILEQ handle, PCSTR SourcePath, PCSTR SourceFi if (!(op = heap_alloc_zero( sizeof(*op) ))) return FALSE; op->src_path = strdupAtoW( SourcePath ); op->src_file = strdupAtoW( SourceFilename ); - op->dst_path = strdupAtoW( TargetPath ); + op->dst_path = strdupAtoW( TargetPath ? TargetPath : SourcePath ); op->dst_file = strdupAtoW( TargetFilename ); queue_file_op( &queue->rename_queue, op ); return TRUE; @@ -742,7 +742,7 @@ BOOL WINAPI SetupQueueRenameW( HSPFILEQ handle, PCWSTR SourcePath, PCWSTR Source if (!(op = heap_alloc_zero( sizeof(*op) ))) return FALSE; op->src_path = strdupW( SourcePath ); op->src_file = strdupW( SourceFilename ); - op->dst_path = strdupW( TargetPath ); + op->dst_path = strdupW( TargetPath ? TargetPath : SourcePath ); op->dst_file = strdupW( TargetFilename ); queue_file_op( &queue->rename_queue, op ); return TRUE; diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 3a40f1450ab..498cd25aaab 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -2205,6 +2205,96 @@ static void test_register_dlls(void) ok(ret, "Failed to delete test DLL, error %u.\n", GetLastError()); } +static unsigned int start_rename_ret, got_start_rename; + +static UINT WINAPI start_rename_cb(void *context, UINT message, UINT_PTR param1, UINT_PTR param2) +{ + if (winetest_debug > 1) trace("%p, %#x, %#Ix, %#Ix\n", context, message, param1, param2); + + if (message == SPFILENOTIFY_STARTRENAME) + { + const FILEPATHS_A *paths = (const FILEPATHS_A *)param1; + + ++got_start_rename; + + if (strstr(paths->Source, "three.txt")) + { + SetLastError(0xdeadf00d); + return start_rename_ret; + } + } + + return SetupDefaultQueueCallbackA(context, message, param1, param2); +} + +static void test_rename(void) +{ + HSPFILEQ queue; + BOOL ret; + + ret = CreateDirectoryA("a", NULL); + ok(ret, "Failed to create test directory, error %u.\n", GetLastError()); + ret = CreateDirectoryA("b", NULL); + ok(ret, "Failed to create test directory, error %u.\n", GetLastError()); + + create_file("a/one.txt"); + create_file("b/three.txt"); + create_file("a/five.txt"); + create_file("b/six.txt"); + start_rename_ret = FILEOP_DOIT; + got_start_rename = 0; + queue = SetupOpenFileQueue(); + ok(queue != INVALID_HANDLE_VALUE, "Failed to open queue, error %#x.\n", GetLastError()); + ret = SetupQueueCopyA(queue, "b", NULL, "one.txt", NULL, NULL, "b", "two.txt", 0); + ok(ret, "Failed to queue copy, error %#x.\n", GetLastError()); + ret = SetupQueueRenameA(queue, "a", "one.txt", "b", "one.txt"); + ok(ret, "Failed to queue rename, error %#x.\n", GetLastError()); + ret = SetupQueueRenameA(queue, "b", "three.txt", NULL, "four.txt"); + ok(ret, "Failed to queue rename, error %#x.\n", GetLastError()); + ret = SetupQueueRenameA(queue, "b", "six.txt", "b", "seven.txt"); + ok(ret, "Failed to queue rename, error %#x.\n", GetLastError()); + ret = SetupQueueRenameA(queue, "a", "five.txt", "b", "six.txt"); + ok(ret, "Failed to queue rename, error %#x.\n", GetLastError()); + run_queue(queue, start_rename_cb); + ok(got_start_rename == 4, "Got %u callbacks.\n", got_start_rename); + ok(!delete_file("a/one.txt"), "File should not exist.\n"); + ok(!delete_file("a/five.txt"), "File should not exist.\n"); + ok(delete_file("b/one.txt"), "File should exist.\n"); + ok(delete_file("b/two.txt"), "File should exist.\n"); + ok(!delete_file("b/three.txt"), "File should not exist.\n"); + ok(delete_file("b/four.txt"), "File should exist.\n"); + ok(!delete_file("b/five.txt"), "File should not exist.\n"); + ok(delete_file("b/six.txt"), "File should exist.\n"); + ok(delete_file("b/seven.txt"), "File should exist.\n"); + SetupCloseFileQueue(queue); + + create_file("a/one.txt"); + create_file("a/three.txt"); + create_file("a/five.txt"); + start_rename_ret = FILEOP_SKIP; + got_start_rename = 0; + queue = SetupOpenFileQueue(); + ok(queue != INVALID_HANDLE_VALUE, "Failed to open queue, error %#x.\n", GetLastError()); + ret = SetupQueueRenameA(queue, "a", "one.txt", "a", "two.txt"); + ok(ret, "Failed to queue rename, error %#x.\n", GetLastError()); + ret = SetupQueueRenameA(queue, "a", "three.txt", "a", "four.txt"); + ok(ret, "Failed to queue rename, error %#x.\n", GetLastError()); + ret = SetupQueueRenameA(queue, "a", "five.txt", "a", "six.txt"); + ok(ret, "Failed to queue rename, error %#x.\n", GetLastError()); + run_queue(queue, start_rename_cb); + ok(got_start_rename == 3, "Got %u callbacks.\n", got_start_rename); + ok(!delete_file("a/one.txt"), "File should not exist.\n"); + ok(delete_file("a/two.txt"), "File should exist.\n"); + ok(delete_file("a/three.txt"), "File should exist.\n"); + ok(!delete_file("a/four.txt"), "File should not exist.\n"); + ok(!delete_file("a/five.txt"), "File should not exist.\n"); + ok(delete_file("a/six.txt"), "File should exist.\n"); + SetupCloseFileQueue(queue); + + ok(delete_file("a/"), "Failed to delete directory, error %u.\n", GetLastError()); + ok(delete_file("b/"), "Failed to delete directory, error %u.\n", GetLastError()); +} + static WCHAR service_name[] = L"Wine Test Service"; static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event; @@ -2313,6 +2403,7 @@ START_TEST(install) test_install_file(); test_start_copy(); test_register_dlls(); + test_rename(); UnhookWindowsHookEx(hhook);

1 0

Zebediah Figura : setupapi: Also handle DelFiles and RenFiles directives in SetupInstallFilesFromInfSection().
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 506ce2ae6bc2fc1395da402a8ed0de4527fa7e24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=506ce2ae6bc2fc1395da402a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 6 22:53:33 2022 -0600 setupapi: Also handle DelFiles and RenFiles directives in SetupInstallFilesFromInfSection(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/install.c | 4 +++- dlls/setupapi/tests/install.c | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 28ef0820ebf..58a19fa8a68 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1027,7 +1027,9 @@ BOOL WINAPI SetupInstallFilesFromInfSectionW( HINF hinf, HINF hlayout, HSPFILEQ info.src_root = src_root; info.copy_flags = flags; info.layout = hlayout; - return iterate_section_fields( hinf, section, L"CopyFiles", copy_files_callback, &info ); + return iterate_section_fields( hinf, section, L"CopyFiles", copy_files_callback, &info ) && + iterate_section_fields( hinf, section, L"DelFiles", delete_files_callback, &info ) && + iterate_section_fields( hinf, section, L"RenFiles", rename_files_callback, &info ); } diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 498cd25aaab..6c41c72453e 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -1167,9 +1167,9 @@ static void test_install_files_queue(void) ok(delete_file("dst/six.txt"), "Destination file should exist.\n"); ok(delete_file("dst/seven.txt"), "Destination file should exist.\n"); ok(delete_file("dst/eight.txt"), "Destination file should exist.\n"); - todo_wine ok(!delete_file("dst/nine.txt"), "Destination file should not exist.\n"); - todo_wine ok(!delete_file("dst/ten.txt"), "Destination file should not exist.\n"); - todo_wine ok(delete_file("dst/eleven.txt"), "Destination file should exist.\n"); + ok(!delete_file("dst/nine.txt"), "Destination file should not exist.\n"); + ok(!delete_file("dst/ten.txt"), "Destination file should not exist.\n"); + ok(delete_file("dst/eleven.txt"), "Destination file should exist.\n"); SetupTermDefaultQueueCallback(context); ret = SetupCloseFileQueue(queue);

1 0

Zebediah Figura : setupapi: Use SetupInstallFilesFromInfSectionW() in SetupInstallFromInfSectionW().
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 49c76f99fc5d492562bf05253c64003d325b9bca URL: https://source.winehq.org/git/wine.git/?a=commit;h=49c76f99fc5d492562bf0525… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 6 22:53:34 2022 -0600 setupapi: Use SetupInstallFilesFromInfSectionW() in SetupInstallFromInfSectionW(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/install.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 58a19fa8a68..3a72c5f527d 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1088,17 +1088,10 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section, } if (flags & SPINST_FILES) { - struct files_callback_info info; HSPFILEQ queue; if (!(queue = SetupOpenFileQueue())) return FALSE; - info.queue = queue; - info.src_root = src_root; - info.copy_flags = copy_flags; - info.layout = hinf; - ret = (iterate_section_fields( hinf, section, L"CopyFiles", copy_files_callback, &info ) && - iterate_section_fields( hinf, section, L"DelFiles", delete_files_callback, &info ) && - iterate_section_fields( hinf, section, L"RenFiles", rename_files_callback, &info ) && + ret = (SetupInstallFilesFromInfSectionW( hinf, NULL, queue, section, src_root, copy_flags ) && SetupCommitFileQueueW( owner, queue, callback, context )); SetupCloseFileQueue( queue ); if (!ret) return FALSE;

1 0

Rémi Bernon : user32/tests: Move test_mdi early in the test list.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: fb9237cf343497d4c96152d08667f97d9643a307 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb9237cf343497d4c96152d0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 7 09:30:09 2022 +0100 user32/tests: Move test_mdi early in the test list. The test gets spurious GetScrollInfo SB_HORZ failures if some other windows were created before using CW_USEDEFAULT positions, for instance the window from test_capture_4. This happened on some Win10 VMs, and was thought to be fixed with 9b5346df86bf1a85336ed03a67a630970ce08e9f, but it then broke the test on some other VMs. This is hopefully a better fix, and it reverts the previous one too. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=52507 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 8ec6d8af064..8614a048c4d 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2256,7 +2256,7 @@ static void test_mdi(void) mdi_hwndMain = CreateWindowExA(0, "MDI_parent_Class", "MDI parent window", WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX /*| WS_VISIBLE*/, - 200, 100, CW_USEDEFAULT, CW_USEDEFAULT, + 100, 100, CW_USEDEFAULT, CW_USEDEFAULT, GetDesktopWindow(), 0, GetModuleHandleA(NULL), NULL); assert(mdi_hwndMain); @@ -12644,6 +12644,10 @@ START_TEST(win) our_pid = GetWindowThreadProcessId(hwndMain, NULL); + /* This test is sensitive to other windows created with + * CW_USEDEFAULT position, execute it early too */ + test_mdi(); + /* Add the tests below this line */ test_child_window_from_point(); test_window_from_point(argv[0]); @@ -12665,7 +12669,6 @@ START_TEST(win) test_parent_owner(); test_enum_thread_windows(); - test_mdi(); test_icons(); test_SetWindowPos(hwndMain, hwndMain2); test_SetMenu(hwndMain);

1 0

Nikolay Sivov : mshtml: Implement layerX/layerY properties for mouse event.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: f961e832848330f5dfc7d2df0126d29258ea838d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f961e832848330f5dfc7d2df… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 6 17:10:58 2022 +0300 mshtml: Implement layerX/layerY properties for mouse event. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 50ca4cbb168..327bb1f915c 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1685,15 +1685,33 @@ static HRESULT WINAPI DOMMouseEvent_get_pageY(IDOMMouseEvent *iface, LONG *p) static HRESULT WINAPI DOMMouseEvent_get_layerX(IDOMMouseEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsresult nsres; + LONG r; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMMouseEvent_GetLayerX(This->mouse_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = r; + return S_OK; } static HRESULT WINAPI DOMMouseEvent_get_layerY(IDOMMouseEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsresult nsres; + LONG r; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMMouseEvent_GetLayerY(This->mouse_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = r; + return S_OK; } static HRESULT WINAPI DOMMouseEvent_get_which(IDOMMouseEvent *iface, USHORT *p)

1 0

Piotr Caban : ucrtbase: Add support for r-value demangling in unDName.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: a656a8b64459845dd68ea4aa43639b06f452193b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a656a8b64459845dd68ea4aa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 7 17:44:46 2022 +0100 ucrtbase: Add support for r-value demangling in unDName. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44202 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/undname.c | 6 ++++++ dlls/ucrtbase/tests/cpp.c | 21 ++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 7d79ca30dcf..bee171de42f 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -450,6 +450,7 @@ static BOOL get_modified_type(struct datatype_t *ct, struct parsed_symbol* sym, case 'R': str_modif = str_printf(sym, " *%s volatile", ptr_modif); break; case 'S': str_modif = str_printf(sym, " *%s const volatile", ptr_modif); break; case '?': str_modif = ""; break; + case '$': str_modif = str_printf(sym, " &&%s", ptr_modif); break; default: return FALSE; } @@ -1031,6 +1032,11 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, if (!demangle_datatype(sym, ct, pmt_ref, in_args)) goto done; ct->left = str_printf(sym, "%s %s", ct->left, ptr); } + else if (*sym->current == 'Q') + { + sym->current++; + if (!get_modified_type(ct, sym, pmt_ref, '$', in_args)) goto done; + } break; } break; diff --git a/dlls/ucrtbase/tests/cpp.c b/dlls/ucrtbase/tests/cpp.c index 163e1968069..77b06e7cd42 100644 --- a/dlls/ucrtbase/tests/cpp.c +++ b/dlls/ucrtbase/tests/cpp.c @@ -52,7 +52,7 @@ static int (CDECL *p___std_type_info_compare)(const type_info140*, const type_in static const char* (CDECL *p___std_type_info_name)(type_info140*, SLIST_HEADER*); static void (CDECL *p___std_type_info_destroy_list)(SLIST_HEADER*); static size_t (CDECL *p___std_type_info_hash)(type_info140*); - +static char* (__cdecl *p___unDName)(char*,const char*,int,void*,void*,unsigned short int); static BOOL init(void) { @@ -72,6 +72,7 @@ static BOOL init(void) p___std_type_info_name = (void*)GetProcAddress(module, "__std_type_info_name"); p___std_type_info_destroy_list = (void*)GetProcAddress(module, "__std_type_info_destroy_list"); p___std_type_info_hash = (void*)GetProcAddress(module, "__std_type_info_hash"); + p___unDName = (void*)GetProcAddress(module, "__unDName"); return TRUE; } @@ -189,9 +190,27 @@ static void test___std_type_info(void) ok(hash1 != hash2, "hash1 == hash2 for different strings\n"); } +static void test___unDName(void) +{ + char *name; + + name = p___unDName(0, "??4QDnsDomainNameRecord@@QAEAAV0@$$QAV0@@Z", 0, malloc, free, 0); + ok(!strcmp(name, "public: class QDnsDomainNameRecord & __thiscall " + "QDnsDomainNameRecord::operator=(class QDnsDomainNameRecord &&)"), + "unDName returned %s\n", wine_dbgstr_a(name)); + free(name); + + name = p___unDName(0, "??4QDnsDomainNameRecord@@QAEAAV0@$$QEAV0@@Z", 0, malloc, free, 0); + ok(!strcmp(name, "public: class QDnsDomainNameRecord & __thiscall " + "QDnsDomainNameRecord::operator=(class QDnsDomainNameRecord && __ptr64)"), + "unDName returned %s\n", wine_dbgstr_a(name)); + free(name); +} + START_TEST(cpp) { if (!init()) return; test___std_exception(); test___std_type_info(); + test___unDName(); }

1 0