June 2020 - Wine-Commits - list.winehq.org

Rémi Bernon : user32/tests: Add inter-process rawinput message tests.
by Alexandre Julliard June 23, 2020

June 23, 2020

Module: wine Branch: master Commit: df5d632324815549d0e7933e64b1d30265145585 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df5d632324815549d0e7933e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 15 12:05:42 2020 +0200 user32/tests: Add inter-process rawinput message tests. Rawinput messages are not received anymore if the foreground window is from another process. Using RIDEV_INPUTSINK makes it possible to receive them again, but with RIM_INPUTSINK flag. When multiple processes register for rawinput messages, the foreground process will receive the message, as well as any other that registerd with RIM_INPUTSINK flag, including when the foreground process itself did. Currently the messages may be received correctly, but that depends on where the input events are generated, so add another test case with messages sent from the test process, and validate that nothing should be received. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 168 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 162 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 5fdc3ff36d..66d421896f 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1878,8 +1878,119 @@ struct rawinput_test rawinput_tests[] = /* same-process foreground tests */ { TRUE, FALSE, 0, FALSE, FALSE, FALSE, /* todos: */ FALSE, FALSE, FALSE }, { TRUE, TRUE, 0, FALSE, TRUE, TRUE, /* todos: */ FALSE, FALSE, FALSE }, + + /* cross-process foreground tests */ + { TRUE, TRUE, 0, FALSE, FALSE, FALSE, /* todos: */ FALSE, FALSE, FALSE }, + { TRUE, TRUE, RIDEV_INPUTSINK, FALSE, TRUE, FALSE, /* todos: */ FALSE, TRUE, FALSE }, + { TRUE, TRUE, 0, FALSE, FALSE, FALSE, /* todos: */ FALSE, TRUE, TRUE }, + + /* multi-process rawinput tests */ + { TRUE, TRUE, 0, FALSE, FALSE, FALSE, /* todos: */ FALSE, FALSE, FALSE }, + { TRUE, TRUE, RIDEV_INPUTSINK, FALSE, TRUE, FALSE, /* todos: */ FALSE, TRUE, FALSE }, + { TRUE, TRUE, RIDEV_INPUTSINK, FALSE, TRUE, FALSE, /* todos: */ FALSE, TRUE, FALSE }, }; +static void rawinput_test_process(void) +{ + RAWINPUTDEVICE raw_devices[1]; + HANDLE ready, start, done; + DWORD ret; + POINT pt; + HWND hwnd = NULL; + MSG msg; + int i; + + ready = OpenEventA(EVENT_ALL_ACCESS, FALSE, "rawinput_test_process_ready"); + ok(ready != 0, "OpenEventA failed, error: %u\n", GetLastError()); + + start = OpenEventA(EVENT_ALL_ACCESS, FALSE, "rawinput_test_process_start"); + ok(start != 0, "OpenEventA failed, error: %u\n", GetLastError()); + + done = OpenEventA(EVENT_ALL_ACCESS, FALSE, "rawinput_test_process_done"); + ok(done != 0, "OpenEventA failed, error: %u\n", GetLastError()); + + for (i = 0; i < ARRAY_SIZE(rawinput_tests); ++i) + { + WaitForSingleObject(ready, INFINITE); + ResetEvent(ready); + + switch (i) + { + case 6: + case 7: + case 8: + case 9: + case 10: + case 11: + GetCursorPos(&pt); + + hwnd = CreateWindowA("static", "static", WS_VISIBLE | WS_POPUP, + pt.x - 50, pt.y - 50, 100, 100, 0, NULL, NULL, NULL); + SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)rawinput_wndproc); + ok(hwnd != 0, "CreateWindow failed\n"); + empty_message_queue(); + + /* FIXME: Try to workaround X11/Win32 focus inconsistencies and + * make the window visible and foreground as hard as possible. */ + ShowWindow(hwnd, SW_SHOW); + SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + SetForegroundWindow(hwnd); + UpdateWindow(hwnd); + empty_message_queue(); + + if (i == 9 || i == 10 || i == 11) + { + raw_devices[0].usUsagePage = 0x01; + raw_devices[0].usUsage = 0x02; + raw_devices[0].dwFlags = i == 11 ? RIDEV_INPUTSINK : 0; + raw_devices[0].hwndTarget = i == 11 ? hwnd : 0; + + SetLastError(0xdeadbeef); + ret = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(ret, "%d: RegisterRawInputDevices failed\n", i); + ok(GetLastError() == 0xdeadbeef, "%d: RegisterRawInputDevices returned %08x\n", i, GetLastError()); + } + + rawinput_test_received_legacy = FALSE; + rawinput_test_received_raw = FALSE; + rawinput_test_received_rawfg = FALSE; + + if (i != 8) mouse_event(MOUSEEVENTF_MOVE, 5, 0, 0, 0); + empty_message_queue(); + break; + } + + SetEvent(start); + + while (MsgWaitForMultipleObjects(1, &done, FALSE, INFINITE, QS_ALLINPUT) != WAIT_OBJECT_0) + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + + ResetEvent(done); + + if (i == 9 || i == 10 || i == 11) + { + raw_devices[0].dwFlags = RIDEV_REMOVE; + raw_devices[0].hwndTarget = 0; + + ok(rawinput_test_received_legacy, "%d: foreground process expected WM_MOUSEMOVE message\n", i); + ok(rawinput_test_received_raw, "%d: foreground process expected WM_INPUT message\n", i); + ok(rawinput_test_received_rawfg, "%d: foreground process expected RIM_INPUT message\n", i); + + SetLastError(0xdeadbeef); + ret = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(ret, "%d: RegisterRawInputDevices failed\n", i); + ok(GetLastError() == 0xdeadbeef, "%d: RegisterRawInputDevices returned %08x\n", i, GetLastError()); + } + + if (hwnd) DestroyWindow(hwnd); + } + + WaitForSingleObject(ready, INFINITE); + CloseHandle(done); + CloseHandle(start); + CloseHandle(ready); +} + struct rawinput_test_thread_params { HANDLE ready; @@ -1933,14 +2044,17 @@ static DWORD WINAPI rawinput_test_thread(void *arg) return 0; } -static void test_rawinput(void) +static void test_rawinput(const char* argv0) { struct rawinput_test_thread_params params; + PROCESS_INFORMATION process_info; RAWINPUTDEVICE raw_devices[1]; - HANDLE thread; + STARTUPINFOA startup_info; + HANDLE thread, process_ready, process_start, process_done; DWORD ret; POINT pt, newpt; HWND hwnd; + char path[MAX_PATH]; int i; params.ready = CreateEventA(NULL, FALSE, FALSE, NULL); @@ -1955,6 +2069,24 @@ static void test_rawinput(void) thread = CreateThread(NULL, 0, rawinput_test_thread, &params, 0, NULL); ok(thread != NULL, "CreateThread failed\n"); + process_ready = CreateEventA(NULL, FALSE, FALSE, "rawinput_test_process_ready"); + ok(process_ready != NULL, "CreateEventA failed\n"); + + process_start = CreateEventA(NULL, FALSE, FALSE, "rawinput_test_process_start"); + ok(process_start != NULL, "CreateEventA failed\n"); + + process_done = CreateEventA(NULL, FALSE, FALSE, "rawinput_test_process_done"); + ok(process_done != NULL, "CreateEventA failed\n"); + + memset(&startup_info, 0, sizeof(startup_info)); + startup_info.cb = sizeof(startup_info); + startup_info.dwFlags = STARTF_USESHOWWINDOW; + startup_info.wShowWindow = SW_SHOWNORMAL; + + sprintf(path, "%s input rawinput_test", argv0); + ret = CreateProcessA(NULL, path, NULL, NULL, TRUE, 0, NULL, NULL, &startup_info, &process_info ); + ok(ret, "CreateProcess \"%s\" failed err %u.\n", path, GetLastError()); + SetCursorPos(100, 100); empty_message_queue(); @@ -1989,17 +2121,24 @@ static void test_rawinput(void) { SetLastError(0xdeadbeef); ret = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); - ok(ret, "%d: RegisterRawInputDevices failed\n", i); - ok(GetLastError() == 0xdeadbeef, "%d: RegisterRawInputDevices returned %08x\n", i, GetLastError()); + ok(ret || broken(rawinput_tests[i].register_flags == RIDEV_EXINPUTSINK), /* < vista */ + "%d: RegisterRawInputDevices failed\n", i); + ok(GetLastError() == 0xdeadbeef || broken(rawinput_tests[i].register_flags == RIDEV_EXINPUTSINK), /* < vista */ + "%d: RegisterRawInputDevices returned %08x\n", i, GetLastError()); } + SetEvent(process_ready); + WaitForSingleObject(process_start, INFINITE); + ResetEvent(process_start); + SetEvent(params.ready); WaitForSingleObject(params.start, INFINITE); ResetEvent(params.start); - if (i <= 3) mouse_event(MOUSEEVENTF_MOVE, 5, 0, 0, 0); + if (i <= 3 || i == 8) mouse_event(MOUSEEVENTF_MOVE, 5, 0, 0, 0); empty_message_queue(); + SetEvent(process_done); SetEvent(params.done); todo_wine_if(rawinput_tests[i].todo_legacy) @@ -2029,6 +2168,14 @@ static void test_rawinput(void) DestroyWindow(hwnd); } + SetEvent(process_ready); + winetest_wait_child_process(process_info.hProcess); + CloseHandle(process_info.hProcess); + CloseHandle(process_info.hThread); + CloseHandle(process_done); + CloseHandle(process_start); + CloseHandle(process_ready); + WaitForSingleObject(thread, INFINITE); CloseHandle(params.done); @@ -3230,11 +3377,20 @@ static void test_UnregisterDeviceNotification(void) START_TEST(input) { + char **argv; + int argc; POINT pos; init_function_pointers(); GetCursorPos( &pos ); + argc = winetest_get_mainargs(&argv); + if (argc >= 3 && strcmp(argv[2], "rawinput_test") == 0) + { + rawinput_test_process(); + return; + } + test_Input_blackbox(); test_Input_whitebox(); test_Input_unicode(); @@ -3252,7 +3408,7 @@ START_TEST(input) test_OemKeyScan(); test_GetRawInputData(); test_RegisterRawInputDevices(); - test_rawinput(); + test_rawinput(argv[0]); if(pGetMouseMovePointsEx) test_GetMouseMovePointsEx();

1 0

Alistair Leslie-Hughes : directmanipulation: Implement IDirectManipulationViewport2 stub interface.
by Alexandre Julliard June 23, 2020

June 23, 2020

Module: wine Branch: master Commit: b6ca6c2387f95e16625f53cd6c5c76a9c9b984bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6ca6c2387f95e16625f53cd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 26 09:51:05 2019 +1000 directmanipulation: Implement IDirectManipulationViewport2 stub interface. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/directmanipulation/directmanipulation.c | 341 ++++++++++++++++++++++++++- 1 file changed, 339 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b6ca6c2387f95e16625f…

1 0

Alex Henrie : ntoskrnl: Provide a more realistic value for register CR0.
by Alexandre Julliard June 23, 2020

June 23, 2020

Module: wine Branch: master Commit: f83f0e5f13a36a246e12d5838aa5bace3ebe5c3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f83f0e5f13a36a246e12d583… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 23 00:32:58 2020 -0600 ntoskrnl: Provide a more realistic value for register CR0. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48997 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/instr.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index 44f2ed4f51..f197570db0 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -35,6 +35,13 @@ #define KSHARED_USER_DATA_PAGE_SIZE 0x1000 +#define CR0_PE 0x00000001 /* Protected Mode */ +#define CR0_ET 0x00000010 /* Extension Type */ +#define CR0_NE 0x00000020 /* Numeric Error */ +#define CR0_WP 0x00010000 /* Write Protect */ +#define CR0_AM 0x00040000 /* Alignment Mask */ +#define CR0_PG 0x80000000 /* Paging */ + enum instr_op { INSTR_OP_MOV, @@ -350,7 +357,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) TRACE( "mov cr%u,%s at 0x%08x\n", reg, reg_names[instr[2] & 7], context->Eip ); switch (reg) { - case 0: *data = 0x10; break; /* FIXME: set more bits ? */ + case 0: *data = CR0_PE|CR0_ET|CR0_NE|CR0_WP|CR0_AM|CR0_PG; break; case 2: *data = 0; break; case 3: *data = 0; break; case 4: *data = 0; break;

1 0

Paul Gofman : netio.sys: Check for callback address before reusing pending IO structure.
by Alexandre Julliard June 23, 2020

June 23, 2020

Module: wine Branch: master Commit: c2eb5a0f396bed647362cbdac6653dcc4a812922 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2eb5a0f396bed647362cbda… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jun 23 00:27:05 2020 +0300 netio.sys: Check for callback address before reusing pending IO structure. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netio.sys/netio.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index c9203f37ad..64ea891087 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -59,6 +59,7 @@ struct wsk_pending_io { OVERLAPPED ovr; TP_WAIT *tp_wait; + void *callback; IRP *irp; }; @@ -159,27 +160,41 @@ static struct wsk_pending_io *allocate_pending_io(struct wsk_socket_internal *so PTP_WAIT_CALLBACK socket_async_callback, IRP *irp) { struct wsk_pending_io *io = socket->pending_io; - unsigned int i; + unsigned int i, io_index; + io_index = ~0u; for (i = 0; i < ARRAY_SIZE(socket->pending_io); ++i) + { if (!io[i].irp) - break; + { + if (io[i].callback == socket_async_callback) + { + io[i].irp = irp; + return &io[i]; + } + + if (io_index == ~0u) + io_index = i; + } + } - if (i == ARRAY_SIZE(socket->pending_io)) + if (io_index == ~0u) { FIXME("Pending io requests count exceeds limit.\n"); return NULL; } - io[i].irp = irp; + io[io_index].irp = irp; - if (io[i].tp_wait) - return &io[i]; + if (io[io_index].tp_wait) + CloseThreadpoolWait(io[io_index].tp_wait); + else + io[io_index].ovr.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); - io[i].ovr.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); - io[i].tp_wait = CreateThreadpoolWait(socket_async_callback, socket, NULL); + io[io_index].tp_wait = CreateThreadpoolWait(socket_async_callback, socket, NULL); + io[io_index].callback = socket_async_callback; - return &io[i]; + return &io[io_index]; } static struct wsk_pending_io *find_pending_io(struct wsk_socket_internal *socket, TP_WAIT *tp_wait)

1 0

Paul Gofman : ntoskrnl/tests: Use the same sin port as ws2_32 tests.
by Alexandre Julliard June 23, 2020

June 23, 2020

Module: wine Branch: master Commit: 5ead4e1e69c87806dbb4db5cab4ef75fa727a5eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ead4e1e69c87806dbb4db5c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jun 23 00:27:03 2020 +0300 ntoskrnl/tests: Use the same sin port as ws2_32 tests. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.h | 2 ++ dlls/ntoskrnl.exe/tests/driver4.c | 2 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index 4b70046b8e..3bfc4bd80a 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -55,3 +55,5 @@ static inline char *drv_strrchr( const char *str, char ch ) do { if (*str == ch) ret = (char *)(ULONG_PTR)str; } while (*str++); return ret; } + +#define SERVER_LISTEN_PORT 9374 diff --git a/dlls/ntoskrnl.exe/tests/driver4.c b/dlls/ntoskrnl.exe/tests/driver4.c index fedd5f25c2..e11879e9e5 100644 --- a/dlls/ntoskrnl.exe/tests/driver4.c +++ b/dlls/ntoskrnl.exe/tests/driver4.c @@ -243,7 +243,7 @@ static void test_wsk_listen_socket(void) memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; - addr.sin_port = htons(12345); + addr.sin_port = htons(SERVER_LISTEN_PORT); IoReuseIrp(wsk_irp, STATUS_UNSUCCESSFUL); IoSetCompletionRoutine(wsk_irp, irp_completion_routine, &irp_complete_event, TRUE, TRUE, TRUE); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index c53f97e9d1..5555095bd2 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -532,7 +532,7 @@ static DWORD WINAPI wsk_test_thread(void *parameter) memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; - addr.sin_port = htons(12345); + addr.sin_port = htons(SERVER_LISTEN_PORT); addr.sin_addr.s_addr = htonl(0x7f000001); ret = connect(s, (struct sockaddr *)&addr, sizeof(addr));

1 0

Rémi Bernon : ntdll: Only raise EXCEPTION_INVALID_HANDLE if debugger is present.
by Alexandre Julliard June 23, 2020

June 23, 2020

Module: wine Branch: master Commit: b7ccb9d06a897a384b71ccb959b431168ca07e03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7ccb9d06a897a384b71ccb9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 22 23:27:49 2020 +0200 ntdll: Only raise EXCEPTION_INVALID_HANDLE if debugger is present. CoD: WWII writes to PEB->BeingDebugged field, so we cannot completely trust it, but we can double check with ProcessDebugPort. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/om.c | 5 ++++- dlls/ntdll/tests/exception.c | 12 ++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index aaed9abaa9..f14e969652 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -364,9 +364,12 @@ static LONG WINAPI invalid_handle_exception_handler( EXCEPTION_POINTERS *eptr ) /* Everquest 2 / Pirates of the Burning Sea hooks NtClose, so we need a wrapper */ NTSTATUS close_handle( HANDLE handle ) { + DWORD_PTR debug_port; NTSTATUS ret = unix_funcs->NtClose( handle ); - if (ret == STATUS_INVALID_HANDLE && handle && NtCurrentTeb()->Peb->BeingDebugged) + if (ret == STATUS_INVALID_HANDLE && handle && NtCurrentTeb()->Peb->BeingDebugged && + !NtQueryInformationProcess( NtCurrentProcess(), ProcessDebugPort, &debug_port, + sizeof(debug_port), NULL) && debug_port) { __TRY { diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index a5e6faa461..411439f180 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -3595,6 +3595,12 @@ START_TEST(exception) test_suspend_process(); test_unload_trace(); + /* Call of Duty WWII writes to BeingDebugged then closes an invalid handle, + * crashing the game if an exception is raised. */ + NtCurrentTeb()->Peb->BeingDebugged = 0x98; + test_closehandle(0, (HANDLE)0xdeadbeef); + NtCurrentTeb()->Peb->BeingDebugged = 0; + #elif defined(__x86_64__) #define X(f) p##f = (void*)GetProcAddress(hntdll, #f) @@ -3638,6 +3644,12 @@ START_TEST(exception) else skip( "Dynamic unwind functions not found\n" ); + /* Call of Duty WWII writes to BeingDebugged then closes an invalid handle, + * crashing the game if an exception is raised. */ + NtCurrentTeb()->Peb->BeingDebugged = 0x98; + test_closehandle(0, (HANDLE)0xdeadbeef); + NtCurrentTeb()->Peb->BeingDebugged = 0; + #endif VirtualFree(code_mem, 0, MEM_RELEASE);

1 0

Alexandre Julliard : urlmon/tests: Update winehq.org's IP address.
by Alexandre Julliard June 23, 2020

June 23, 2020

Module: wine Branch: master Commit: ef9d05d9c2e62d31f59d1ad649856031b47a625b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef9d05d9c2e62d31f59d1ad6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 23 22:34:00 2020 +0200 urlmon/tests: Update winehq.org's IP address. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/url.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index cfa29248d6..6dd47732dd 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -157,10 +157,9 @@ static const WCHAR wszTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; static WCHAR BSCBHolder[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_',0 }; -static const WCHAR wszWineHQSite[] = - {'w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; -static const WCHAR wszWineHQIP[] = - {'4','.','1','5','.','1','8','4','.','7','7',0}; +#define WINEHQ_IP "4.4.81.124" +static const WCHAR wszWineHQSite[] = L"www.winehq.org"; +static const WCHAR wszWineHQIP[] = L"" WINEHQ_IP; static const CHAR wszIndexHtmlA[] = "index.html"; static const WCHAR cache_fileW[] = {'c',':','\\','c','a','c','h','e','.','h','t','m',0}; static const CHAR dwl_htmlA[] = "dwl.html"; @@ -2870,7 +2869,7 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t) url_a = "its:test.chm::/blank.html"; break; case HTTPS_TEST: - url_a = (flags & BINDTEST_INVALID_CN) ? "https://4.15.184.77/favicon.ico" : "https://test.winehq.org/tests/hello.html"; + url_a = (flags & BINDTEST_INVALID_CN) ? "https://" WINEHQ_IP "/favicon.ico" : "https://test.winehq.org/tests/hello.html"; break; case FTP_TEST: url_a = "ftp://ftp.winehq.org/welcome%2emsg";

1 0

Paul Gofman : shell32: Only consider copy operation multidest if the number of dst files is greater than one.
by Alexandre Julliard June 23, 2020

June 23, 2020

Module: wine Branch: master Commit: e2f456cfe57de42259cca8155a56854a0f170844 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2f456cfe57de42259cca815… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jun 23 15:09:01 2020 +0300 shell32: Only consider copy operation multidest if the number of dst files is greater than one. Fixes crash on start in Worms World Party Remastered. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlfileop.c | 2 +- dlls/shell32/tests/shlfileop.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index b941db3914..38c582be09 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1207,7 +1207,7 @@ static int copy_files(FILE_OPERATION *op, const FILE_LIST *flFrom, FILE_LIST *fl fileDest = &flTo->feFiles[0]; } - if (op->req->fFlags & FOF_MULTIDESTFILES) + if (op->req->fFlags & FOF_MULTIDESTFILES && flTo->dwNumFiles > 1) { if (flFrom->bAnyFromWildcard) return ERROR_CANCELLED; diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 27c7244042..36602f335d 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -1816,6 +1816,15 @@ static void test_copy(void) CreateDirectoryA("one", NULL); CreateDirectoryA("two", NULL); + /* Test with FOF_MULTIDESTFILES with a wildcard in pFrom and single output directory. */ + shfo.pFrom = "a*.txt\0"; + shfo.pTo = "one\0"; + shfo.fFlags |= FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI | FOF_MULTIDESTFILES; + retval = SHFileOperationA(&shfo); + ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(DeleteFileA("one\\aa.txt"), "Expected file to exist\n"); + ok(DeleteFileA("one\\ab.txt"), "Expected file to exist\n"); + /* pFrom has a glob, pTo has more than one dest */ shfo.pFrom = "a*.txt\0"; shfo.pTo = "one\0two\0";

1 0

Nikolay Sivov : mfplat: Implement GetVideoFormat().
by Alexandre Julliard June 23, 2020

June 23, 2020

Module: wine Branch: master Commit: cb43efe901ab03bc90895b9559f501e8f035fce1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb43efe901ab03bc90895b95… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 23 14:29:05 2020 +0300 mfplat: Implement GetVideoFormat(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 66722a84b6..843c09c5e0 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -38,6 +38,7 @@ struct media_type struct attributes attributes; IMFMediaType IMFMediaType_iface; IMFVideoMediaType IMFVideoMediaType_iface; + MFVIDEOFORMAT *video_format; }; struct stream_desc @@ -648,6 +649,7 @@ static ULONG WINAPI video_mediatype_Release(IMFVideoMediaType *iface) if (!refcount) { clear_attributes_object(&media_type->attributes); + CoTaskMemFree(media_type->video_format); heap_free(media_type); } @@ -971,9 +973,17 @@ static HRESULT WINAPI video_mediatype_FreeRepresentation(IMFVideoMediaType *ifac static const MFVIDEOFORMAT * WINAPI video_mediatype_GetVideoFormat(IMFVideoMediaType *iface) { - FIXME("%p.\n", iface); + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + unsigned int size; + HRESULT hr; + + TRACE("%p.\n", iface); + + CoTaskMemFree(media_type->video_format); + if (FAILED(hr = MFCreateMFVideoFormatFromMFMediaType((IMFMediaType *)iface, &media_type->video_format, &size))) + WARN("Failed to create format description, hr %#x.\n", hr); - return NULL; + return media_type->video_format; } static HRESULT WINAPI video_mediatype_GetVideoRepresentation(IMFVideoMediaType *iface, GUID representation,

1 0

Alexandre Julliard : ntdll: Move the system information functions to the Unix library.
by Alexandre Julliard June 23, 2020

June 23, 2020

Module: wine Branch: master Commit: 9b9845e43e08e357588bb6a2ca6bfc15ce2dcd73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b9845e43e08e357588bb6a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 23 14:29:31 2020 +0200 ntdll: Move the system information functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 1 + dlls/ntdll/loader.c | 3 +- dlls/ntdll/nt.c | 2799 ++-------------------------------------- dlls/ntdll/ntdll_misc.h | 7 +- dlls/ntdll/server.c | 3 - dlls/ntdll/signal_i386.c | 10 - dlls/ntdll/thread.c | 9 +- dlls/ntdll/unix/loader.c | 4 +- dlls/ntdll/unix/system.c | 2575 ++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/thread.c | 10 +- dlls/ntdll/unix/unix_private.h | 15 +- dlls/ntdll/unix/virtual.c | 2 +- dlls/ntdll/unixlib.h | 13 +- 13 files changed, 2717 insertions(+), 2734 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9b9845e43e08e357588b…

1 0