wine-commits January 2021

wine-commits@winehq.org

2 participants
472 discussions

Zhiyi Zhang : gdi32: Report correct HORZRES and VERTRES values for GetDeviceCaps() with DCs on a specific monitor.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: 2006f76b5fa06b1a3456cb56dd164e3688d480f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2006f76b5fa06b1a3456cb56… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun Jan 24 12:14:20 2021 +0800 gdi32: Report correct HORZRES and VERTRES values for GetDeviceCaps() with DCs on a specific monitor. Fix DLC Quest uses the primary monitor size to render when in fullscreen mode on non-primary monitors. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 18 +++++++++++++ dlls/gdi32/driver.c | 64 ++++++++++++++++++++++++++++++++++++++++++--- dlls/gdi32/gdi_private.h | 4 +++ dlls/user32/tests/monitor.c | 4 +-- 4 files changed, 85 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index a9a37d9efe7..830fabf6e78 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -623,6 +623,7 @@ BOOL WINAPI RestoreDC( HDC hdc, INT level ) HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, const DEVMODEW *initData ) { + const WCHAR *display, *p; HDC hdc; DC * dc; const struct gdi_dc_funcs *funcs; @@ -663,6 +664,23 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, } } + if (is_display_device( driver )) + display = driver; + else if (is_display_device( device )) + display = device; + else + display = NULL; + + if (display) + { + /* Copy only the display name. For example, \\.\DISPLAY1 in \\.\DISPLAY1\Monitor0 */ + p = display + 12; + while (iswdigit( *p )) + ++p; + lstrcpynW( dc->display, display, p - display + 1 ); + dc->display[p - display] = '\0'; + } + dc->vis_rect.left = 0; dc->vis_rect.top = 0; dc->vis_rect.right = GetDeviceCaps( hdc, DESKTOPHORZRES ); diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index e2528ece046..bb98c554238 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -81,7 +81,9 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION driver_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static BOOL (WINAPI *pEnumDisplayMonitors)(HDC, LPRECT, MONITORENUMPROC, LPARAM); static HWND (WINAPI *pGetDesktopWindow)(void); +static BOOL (WINAPI *pGetMonitorInfoW)(HMONITOR, LPMONITORINFO); static INT (WINAPI *pGetSystemMetrics)(INT); static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); @@ -137,10 +139,13 @@ static const struct gdi_dc_funcs *get_display_driver(void) /********************************************************************** * is_display_device */ -static BOOL is_display_device( LPCWSTR name ) +BOOL is_display_device( LPCWSTR name ) { const WCHAR *p = name; + if (!name) + return FALSE; + if (wcsnicmp( name, L"\\\\.\\DISPLAY", lstrlenW(L"\\\\.\\DISPLAY") )) return FALSE; p += lstrlenW(L"\\\\.\\DISPLAY"); @@ -237,10 +242,33 @@ void CDECL __wine_set_display_driver( HMODULE module ) HeapFree( GetProcessHeap(), 0, driver ); user32 = LoadLibraryA( "user32.dll" ); + pGetMonitorInfoW = (void *)GetProcAddress( user32, "GetMonitorInfoW" ); pGetSystemMetrics = (void *)GetProcAddress( user32, "GetSystemMetrics" ); + pEnumDisplayMonitors = (void *)GetProcAddress( user32, "EnumDisplayMonitors" ); pSetThreadDpiAwarenessContext = (void *)GetProcAddress( user32, "SetThreadDpiAwarenessContext" ); } +struct monitor_info +{ + const WCHAR *name; + RECT rect; +}; + +static BOOL CALLBACK monitor_enum_proc( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lparam ) +{ + struct monitor_info *info = (struct monitor_info *)lparam; + MONITORINFOEXW mi; + + mi.cbSize = sizeof(mi); + pGetMonitorInfoW( monitor, (MONITORINFO *)&mi ); + if (!lstrcmpiW( info->name, mi.szDevice )) + { + info->rect = mi.rcMonitor; + return FALSE; + } + + return TRUE; +} static INT CDECL nulldrv_AbortDoc( PHYSDEV dev ) { @@ -378,8 +406,38 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) GetDeviceCaps( dev->hdc, LOGPIXELSX ) * 10 ); case VERTSIZE: return MulDiv( GetDeviceCaps( dev->hdc, VERTRES ), 254, GetDeviceCaps( dev->hdc, LOGPIXELSY ) * 10 ); - case HORZRES: return pGetSystemMetrics ? pGetSystemMetrics( SM_CXSCREEN ) : 640; - case VERTRES: return pGetSystemMetrics ? pGetSystemMetrics( SM_CYSCREEN ) : 480; + case HORZRES: + { + DC *dc = get_nulldrv_dc( dev ); + struct monitor_info info; + + if (dc->display[0] && pEnumDisplayMonitors && pGetMonitorInfoW) + { + info.name = dc->display; + SetRectEmpty( &info.rect ); + pEnumDisplayMonitors( NULL, NULL, monitor_enum_proc, (LPARAM)&info ); + if (!IsRectEmpty( &info.rect )) + return info.rect.right - info.rect.left; + } + + return pGetSystemMetrics ? pGetSystemMetrics( SM_CXSCREEN ) : 640; + } + case VERTRES: + { + DC *dc = get_nulldrv_dc( dev ); + struct monitor_info info; + + if (dc->display[0] && pEnumDisplayMonitors && pGetMonitorInfoW) + { + info.name = dc->display; + SetRectEmpty( &info.rect ); + pEnumDisplayMonitors( NULL, NULL, monitor_enum_proc, (LPARAM)&info ); + if (!IsRectEmpty( &info.rect )) + return info.rect.bottom - info.rect.top; + } + + return pGetSystemMetrics ? pGetSystemMetrics( SM_CYSCREEN ) : 480; + } case BITSPIXEL: return 32; case PLANES: return 1; case NUMBRUSHES: return -1; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 8d917a795c0..2bf16e8eaf8 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -84,6 +84,7 @@ typedef struct tagDC int pixel_format; /* pixel format (for memory DCs) */ UINT aa_flags; /* anti-aliasing flags to pass to GetGlyphOutline for current font */ FLOAT miterLimit; + WCHAR display[CCHDEVICENAME]; /* Display name when created for a specific display device */ int flags; DWORD layout; @@ -487,6 +488,9 @@ typedef struct #define WMFC_MAGIC 0x43464d57 +/* driver.c */ +extern BOOL is_display_device( LPCWSTR name ) DECLSPEC_HIDDEN; + /* path.c */ extern void free_gdi_path( struct gdi_path *path ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index ee435a4faf4..08557867566 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2085,7 +2085,7 @@ static void test_display_dc(void) hdc = CreateDCA(dd.DeviceName, NULL, NULL, NULL); ok(!!hdc, "CreateDCA %s failed.\n", dd.DeviceName); - check_display_dc(hdc, &dm, TRUE); + check_display_dc(hdc, &dm, FALSE); /* Tests after mode changes */ memset(&dm2, 0, sizeof(dm2)); @@ -2108,7 +2108,7 @@ static void test_display_dc(void) continue; } - check_display_dc(hdc, &dm2, TRUE); + check_display_dc(hdc, &dm2, FALSE); /* Tests after monitor detach */ if (!(dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE))

1 0

Zhiyi Zhang : user32/tests: Add display DC tests.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: 640f7081db10e53f6d3eaf27890bcce256836bb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=640f7081db10e53f6d3eaf27… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun Jan 24 12:14:05 2021 +0800 user32/tests: Add display DC tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 156 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 156 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 5e4cc9d154f..ee435a4faf4 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1992,6 +1992,161 @@ static void test_handles(void) ok(ret, "EnumDisplayMonitors failed, error %#x.\n", GetLastError()); } +#define check_display_dc(a, b, c) _check_display_dc(__LINE__, a, b, c) +static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_todo) +{ + INT value; + + value = GetDeviceCaps(hdc, HORZRES); + todo_wine_if(allow_todo && dm->dmPelsWidth != GetSystemMetrics(SM_CXSCREEN)) + ok_(__FILE__, line)(value == dm->dmPelsWidth, "Expected HORZRES %d, got %d.\n", + dm->dmPelsWidth, value); + + value = GetDeviceCaps(hdc, VERTRES); + todo_wine_if(allow_todo && dm->dmPelsHeight != GetSystemMetrics(SM_CYSCREEN)) + ok_(__FILE__, line)(value == dm->dmPelsHeight, "Expected VERTRES %d, got %d.\n", + dm->dmPelsHeight, value); + + value = GetDeviceCaps(hdc, DESKTOPHORZRES); + todo_wine_if(dm->dmPelsWidth != GetSystemMetrics(SM_CXVIRTUALSCREEN) + && value == GetSystemMetrics(SM_CXVIRTUALSCREEN)) + ok_(__FILE__, line)(value == dm->dmPelsWidth, "Expected DESKTOPHORZRES %d, got %d.\n", + dm->dmPelsWidth, value); + + value = GetDeviceCaps(hdc, DESKTOPVERTRES); + todo_wine_if(dm->dmPelsHeight != GetSystemMetrics(SM_CYVIRTUALSCREEN) + && value == GetSystemMetrics(SM_CYVIRTUALSCREEN)) + ok_(__FILE__, line)(value == dm->dmPelsHeight, "Expected DESKTOPVERTRES %d, got %d.\n", + dm->dmPelsHeight, value); + + value = GetDeviceCaps(hdc, VREFRESH); + todo_wine_if(value != dm->dmDisplayFrequency && value == 1) + ok_(__FILE__, line)(value == dm->dmDisplayFrequency, "Expected VREFRESH %d, got %d.\n", + dm->dmDisplayFrequency, value); +} + +static void test_display_dc(void) +{ + DWORD device_idx, mode_idx; + DEVMODEA dm, dm2, dm3; + INT count, old_count; + DISPLAY_DEVICEA dd; + BOOL ret; + LONG res; + HDC hdc; + + /* Test DCs covering the entire virtual screen */ + hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); + ok(!!hdc, "CreateDCA failed.\n"); + + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); + ok(ret, "EnumDisplaySettingsA failed.\n"); + + check_display_dc(hdc, &dm, FALSE); + + /* Tests after mode changes */ + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode_idx = 0; EnumDisplaySettingsA(NULL, mode_idx, &dm2); ++mode_idx) + { + if (dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight) + break; + } + ok(dm2.dmPelsWidth && dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight, + "Failed to find a different resolution.\n"); + + res = ChangeDisplaySettingsExA(NULL, &dm2, NULL, CDS_RESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL || broken(res == DISP_CHANGE_FAILED), /* Win8 TestBots */ + "ChangeDisplaySettingsExA returned unexpected %d.\n", res); + if (res == DISP_CHANGE_SUCCESSFUL) + { + check_display_dc(hdc, &dm2, FALSE); + + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA returned unexpected %d.\n", res); + } + + DeleteDC(hdc); + + /* Test DCs covering a specific monitor */ + dd.cb = sizeof(dd); + for (device_idx = 0; EnumDisplayDevicesA(NULL, device_idx, &dd, 0); ++device_idx) + { + if (!(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) + continue; + + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + ret = EnumDisplaySettingsA(dd.DeviceName, ENUM_CURRENT_SETTINGS, &dm); + ok(ret, "EnumDisplaySettingsA %s failed.\n", dd.DeviceName); + + hdc = CreateDCA(dd.DeviceName, NULL, NULL, NULL); + ok(!!hdc, "CreateDCA %s failed.\n", dd.DeviceName); + + check_display_dc(hdc, &dm, TRUE); + + /* Tests after mode changes */ + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode_idx = 0; EnumDisplaySettingsA(dd.DeviceName, mode_idx, &dm2); ++mode_idx) + { + if (dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight) + break; + } + ok(dm2.dmPelsWidth && dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight, + "Failed to find a different resolution for %s.\n", dd.DeviceName); + + res = ChangeDisplaySettingsExA(dd.DeviceName, &dm2, NULL, CDS_RESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL || broken(res == DISP_CHANGE_FAILED), /* Win8 TestBots */ + "ChangeDisplaySettingsExA %s returned unexpected %d.\n", dd.DeviceName, res); + if (res != DISP_CHANGE_SUCCESSFUL) + { + win_skip("Failed to change display mode for %s.\n", dd.DeviceName); + DeleteDC(hdc); + continue; + } + + check_display_dc(hdc, &dm2, TRUE); + + /* Tests after monitor detach */ + if (!(dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)) + { + old_count = GetSystemMetrics(SM_CMONITORS); + + memset(&dm3, 0, sizeof(dm3)); + dm3.dmSize = sizeof(dm3); + ret = EnumDisplaySettingsA(dd.DeviceName, ENUM_CURRENT_SETTINGS, &dm3); + ok(ret, "EnumDisplaySettingsA %s failed.\n", dd.DeviceName); + + dm3.dmFields = DM_POSITION | DM_PELSWIDTH | DM_PELSHEIGHT; + dm3.dmPelsWidth = 0; + dm3.dmPelsHeight = 0; + res = ChangeDisplaySettingsExA(dd.DeviceName, &dm3, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + dd.DeviceName, res); + res = ChangeDisplaySettingsExA(dd.DeviceName, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + dd.DeviceName, res); + + count = GetSystemMetrics(SM_CMONITORS); + ok(count == old_count - 1, "Expected monitor count %d, got %d.\n", old_count - 1, count); + + /* Should report the same values before detach */ + check_display_dc(hdc, &dm2, TRUE); + } + + res = ChangeDisplaySettingsExA(dd.DeviceName, &dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + dd.DeviceName, res); + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + dd.DeviceName, res); + DeleteDC(hdc); + } +} + START_TEST(monitor) { init_function_pointers(); @@ -2002,4 +2157,5 @@ START_TEST(monitor) test_work_area(); test_display_config(); test_handles(); + test_display_dc(); }

1 0

Sebastian Lackner : server: Store and notify all notification events associated with a given registry handle.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: 9c29cee63843cf68ebb99d10b2464bd737127bbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c29cee63843cf68ebb99d10… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Jan 26 22:41:43 2021 -0600 server: Store and notify all notification events associated with a given registry handle. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 6 +++--- server/registry.c | 41 ++++++++++++++++++++++++----------------- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index a619bc45cb8..ac1dec9f2f8 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1887,7 +1887,7 @@ static void test_notify(void) pRtlFreeUnicodeString(&str); status = pNtWaitForSingleObject(events[0], FALSE, &timeout); - todo_wine ok(!status, "got %#x\n", status); + ok(!status, "got %#x\n", status); status = pNtWaitForSingleObject(events[1], FALSE, &timeout); ok(!status, "got %#x\n", status); status = pNtWaitForSingleObject(events[2], FALSE, &timeout); @@ -1917,7 +1917,7 @@ static void test_notify(void) ok(status == STATUS_SUCCESS, "NtDeleteSubkey failed: %x\n", status); status = pNtWaitForSingleObject(events[0], FALSE, &timeout); - todo_wine ok(!status, "got %#x\n", status); + ok(!status, "got %#x\n", status); status = pNtWaitForSingleObject(events[1], FALSE, &timeout); ok(!status, "got %#x\n", status); status = pNtWaitForSingleObject(events[2], FALSE, &timeout); @@ -1935,7 +1935,7 @@ static void test_notify(void) pNtClose(key); status = pNtWaitForSingleObject(events[0], FALSE, &timeout); - todo_wine ok(!status, "got %#x\n", status); + ok(!status, "got %#x\n", status); status = pNtWaitForSingleObject(events[1], FALSE, &timeout); ok(!status, "got %#x\n", status); status = pNtWaitForSingleObject(events[2], FALSE, &timeout); diff --git a/server/registry.c b/server/registry.c index c937e051597..64aec1d83c9 100644 --- a/server/registry.c +++ b/server/registry.c @@ -52,7 +52,8 @@ struct notify { struct list entry; /* entry in list of notifications */ - struct event *event; /* event to set when changing this key */ + struct event **events; /* events to set when changing this key */ + unsigned int event_count; /* number of events */ int subtree; /* true if subtree notification */ unsigned int filter; /* which events to notify on */ obj_handle_t hkey; /* hkey associated with this notification */ @@ -314,12 +315,17 @@ static struct object_type *key_get_type( struct object *obj ) /* notify waiter and maybe delete the notification */ static void do_notification( struct key *key, struct notify *notify, int del ) { - if (notify->event) + unsigned int i; + + for (i = 0; i < notify->event_count; ++i) { - set_event( notify->event ); - release_object( notify->event ); - notify->event = NULL; + set_event( notify->events[i] ); + release_object( notify->events[i] ); } + free( notify->events ); + notify->events = NULL; + notify->event_count = 0; + if (del) { list_remove( &notify->entry ); @@ -2283,20 +2289,13 @@ DECL_HANDLER(set_registry_notification) if (event) { notify = find_notify( key, current->process, req->hkey ); - if (notify) - { - if (notify->event) - release_object( notify->event ); - grab_object( event ); - notify->event = event; - } - else + if (!notify) { notify = mem_alloc( sizeof(*notify) ); if (notify) { - grab_object( event ); - notify->event = event; + notify->events = NULL; + notify->event_count = 0; notify->subtree = req->subtree; notify->filter = req->filter; notify->hkey = req->hkey; @@ -2306,8 +2305,16 @@ DECL_HANDLER(set_registry_notification) } if (notify) { - reset_event( event ); - set_error( STATUS_PENDING ); + struct event **new_array; + + if ((new_array = realloc( notify->events, (notify->event_count + 1) * sizeof(*notify->events) ))) + { + notify->events = new_array; + notify->events[notify->event_count++] = (struct event *)grab_object( event ); + reset_event( event ); + set_error( STATUS_PENDING ); + } + else set_error( STATUS_NO_MEMORY ); } release_object( event ); }

1 0

Zebediah Figura : ntdll/tests: Add more tests for registry notifications.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: 3c72ad33a9390c9926b29b8ea8537c70a75174ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c72ad33a9390c9926b29b8e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 26 22:41:42 2021 -0600 ntdll/tests: Add more tests for registry notifications. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 61 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 44 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 9335d9cc927..a619bc45cb8 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1853,28 +1853,30 @@ static void test_notify(void) LARGE_INTEGER timeout; IO_STATUS_BLOCK iosb; UNICODE_STRING str; - HANDLE key, events[2], subkey; + HANDLE key, key2, events[4], subkey; NTSTATUS status; + unsigned int i; InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); status = pNtOpenKey(&key, KEY_ALL_ACCESS, &attr); ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); + status = pNtOpenKey(&key2, KEY_ALL_ACCESS, &attr); + ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); - events[0] = CreateEventW(NULL, FALSE, TRUE, NULL); - ok(events[0] != NULL, "CreateEvent failed: %u\n", GetLastError()); - events[1] = CreateEventW(NULL, FALSE, TRUE, NULL); - ok(events[1] != NULL, "CreateEvent failed: %u\n", GetLastError()); + for (i = 0; i < ARRAY_SIZE(events); ++i) + events[i] = CreateEventW(NULL, TRUE, TRUE, NULL); status = pNtNotifyChangeKey(key, events[0], NULL, NULL, &iosb, REG_NOTIFY_CHANGE_NAME, FALSE, NULL, 0, TRUE); ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status); - status = pNtNotifyChangeKey(key, events[1], NULL, NULL, &iosb, REG_NOTIFY_CHANGE_NAME, FALSE, NULL, 0, TRUE); + status = pNtNotifyChangeKey(key, events[1], NULL, NULL, &iosb, 0, FALSE, NULL, 0, TRUE); + ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status); + status = pNtNotifyChangeKey(key2, events[2], NULL, NULL, &iosb, 0, FALSE, NULL, 0, TRUE); + ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status); + status = pNtNotifyChangeKey(key2, events[3], NULL, NULL, &iosb, REG_NOTIFY_CHANGE_NAME, FALSE, NULL, 0, TRUE); ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status); - timeout.QuadPart = 0; - status = pNtWaitForSingleObject(events[0], FALSE, &timeout); - ok(status == STATUS_TIMEOUT, "NtWaitForSingleObject returned %x\n", status); - status = pNtWaitForSingleObject(events[1], FALSE, &timeout); - ok(status == STATUS_TIMEOUT, "NtWaitForSingleObject returned %x\n", status); + status = WaitForMultipleObjects(4, events, FALSE, 0); + ok(status == WAIT_TIMEOUT, "got %d\n", status); attr.RootDirectory = key; attr.ObjectName = &str; @@ -1885,22 +1887,43 @@ static void test_notify(void) pRtlFreeUnicodeString(&str); status = pNtWaitForSingleObject(events[0], FALSE, &timeout); - todo_wine ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); + todo_wine ok(!status, "got %#x\n", status); status = pNtWaitForSingleObject(events[1], FALSE, &timeout); - ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); + ok(!status, "got %#x\n", status); + status = pNtWaitForSingleObject(events[2], FALSE, &timeout); + ok(status == STATUS_TIMEOUT, "got %#x\n", status); + status = pNtWaitForSingleObject(events[3], FALSE, &timeout); + ok(status == STATUS_TIMEOUT, "got %#x\n", status); status = pNtNotifyChangeKey(key, events[0], NULL, NULL, &iosb, 0, FALSE, NULL, 0, TRUE); ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status); + + status = pNtWaitForSingleObject(events[0], FALSE, &timeout); + ok(status == STATUS_TIMEOUT, "got %#x\n", status); + status = pNtWaitForSingleObject(events[1], FALSE, &timeout); + ok(!status, "got %#x\n", status); + status = pNtWaitForSingleObject(events[2], FALSE, &timeout); + ok(status == STATUS_TIMEOUT, "got %#x\n", status); + status = pNtWaitForSingleObject(events[3], FALSE, &timeout); + ok(status == STATUS_TIMEOUT, "got %#x\n", status); + status = pNtNotifyChangeKey(key, events[1], NULL, NULL, &iosb, 0, FALSE, NULL, 0, TRUE); ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status); + status = WaitForMultipleObjects(4, events, FALSE, 0); + ok(status == WAIT_TIMEOUT, "got %d\n", status); + status = pNtDeleteKey(subkey); ok(status == STATUS_SUCCESS, "NtDeleteSubkey failed: %x\n", status); status = pNtWaitForSingleObject(events[0], FALSE, &timeout); - todo_wine ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); + todo_wine ok(!status, "got %#x\n", status); status = pNtWaitForSingleObject(events[1], FALSE, &timeout); - ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); + ok(!status, "got %#x\n", status); + status = pNtWaitForSingleObject(events[2], FALSE, &timeout); + ok(status == STATUS_TIMEOUT, "got %#x\n", status); + status = pNtWaitForSingleObject(events[3], FALSE, &timeout); + ok(status == STATUS_TIMEOUT, "got %#x\n", status); pNtClose(subkey); @@ -1912,9 +1935,13 @@ static void test_notify(void) pNtClose(key); status = pNtWaitForSingleObject(events[0], FALSE, &timeout); - todo_wine ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); + todo_wine ok(!status, "got %#x\n", status); status = pNtWaitForSingleObject(events[1], FALSE, &timeout); - ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); + ok(!status, "got %#x\n", status); + status = pNtWaitForSingleObject(events[2], FALSE, &timeout); + ok(status == STATUS_TIMEOUT, "got %#x\n", status); + status = pNtWaitForSingleObject(events[3], FALSE, &timeout); + ok(status == STATUS_TIMEOUT, "got %#x\n", status); if (pNtNotifyChangeMultipleKeys) {

1 0

Paul Gofman : iphlpapi: Mark adapter addresses as DNS eligible when interface has a gateway.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: 5d046a780c61687aae8315b3032b91a630735dd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d046a780c61687aae8315b3… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jan 27 16:26:31 2021 +0300 iphlpapi: Mark adapter addresses as DNS eligible when interface has a gateway. Fixes hang on attempt to enter a single player game in Kingdoms Reborn. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 28 ++++++++++++++-------------- dlls/iphlpapi/tests/iphlpapi.c | 6 ++++++ include/iptypes.h | 3 +++ 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 81c4992ac73..bd1fea02e19 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -940,16 +940,19 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index DWORD *v4addrs = NULL, *v4masks = NULL; SOCKET_ADDRESS *v6addrs = NULL, *v6masks = NULL; PMIB_IPFORWARDTABLE routeTable = NULL; + BOOL output_gateways; + + if ((flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) || !(flags & GAA_FLAG_SKIP_UNICAST)) + { + ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, GetProcessHeap(), 0); + if (ret) return ret; + num_v4_gateways = count_v4_gateways(index, routeTable); + } + output_gateways = (flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) && (family == WS_AF_INET || family == WS_AF_UNSPEC); if (family == WS_AF_INET) { ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs, &v4masks); - - if (!ret && flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) - { - ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, GetProcessHeap(), 0); - if (!ret) num_v4_gateways = count_v4_gateways(index, routeTable); - } } else if (family == WS_AF_INET6) { @@ -958,12 +961,6 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index else if (family == WS_AF_UNSPEC) { ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs, &v4masks); - - if (!ret && flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) - { - ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, GetProcessHeap(), 0); - if (!ret) num_v4_gateways = count_v4_gateways(index, routeTable); - } if (!ret) ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs, &v6masks); } else @@ -996,7 +993,8 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index } total_size += sizeof(IP_ADAPTER_UNICAST_ADDRESS) * num_v4addrs; total_size += sizeof(struct sockaddr_in) * num_v4addrs; - total_size += (sizeof(IP_ADAPTER_GATEWAY_ADDRESS) + sizeof(SOCKADDR_IN)) * num_v4_gateways; + if (output_gateways) + total_size += (sizeof(IP_ADAPTER_GATEWAY_ADDRESS) + sizeof(SOCKADDR_IN)) * num_v4_gateways; total_size += sizeof(IP_ADAPTER_UNICAST_ADDRESS) * num_v6addrs; total_size += sizeof(SOCKET_ADDRESS) * num_v6addrs; for (i = 0; i < num_v6addrs; i++) @@ -1050,7 +1048,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index aa->Luid.Info.NetLuidIndex = index; aa->Luid.Info.IfType = aa->IfType; - if (num_v4_gateways) + if (output_gateways && num_v4_gateways) { PMIB_IPFORWARDROW adapterRow; @@ -1089,6 +1087,8 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index ua->u.s.Length = sizeof(IP_ADAPTER_UNICAST_ADDRESS); ua->Address.iSockaddrLength = sizeof(struct sockaddr_in); ua->Address.lpSockaddr = (SOCKADDR *)((char *)ua + ua->u.s.Length); + if (num_v4_gateways) + ua->u.s.Flags |= IP_ADAPTER_ADDRESS_DNS_ELIGIBLE; sa = (struct WS_sockaddr_in *)ua->Address.lpSockaddr; sa->sin_family = WS_AF_INET; diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 6cbe725bada..358084fde68 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1277,6 +1277,7 @@ static void testWin2KFunctions(void) static void test_GetAdaptersAddresses(void) { + BOOL dns_eligible_found = FALSE; ULONG ret, size, osize, i; IP_ADAPTER_ADDRESSES *aa, *ptr; IP_ADAPTER_UNICAST_ADDRESS *ua; @@ -1349,6 +1350,10 @@ static void test_GetAdaptersAddresses(void) S(U(*ua)).Flags, ua->PrefixOrigin, ua->SuffixOrigin, ua->DadState, ua->ValidLifetime, ua->PreferredLifetime, ua->LeaseLifetime, S(U(*ua)).Length < sizeof(IP_ADAPTER_UNICAST_ADDRESS_LH) ? 0 : ua->OnLinkPrefixLength); + + if (ua->Flags & IP_ADAPTER_ADDRESS_DNS_ELIGIBLE) + dns_eligible_found = TRUE; + ua = ua->Next; } for (i = 0, temp[0] = '\0'; i < ARRAY_SIZE(aa->ZoneIndices); i++) @@ -1380,6 +1385,7 @@ static void test_GetAdaptersAddresses(void) ok(!strcasecmp(aa->AdapterName, buf), "expected '%s' got '%s'\n", aa->AdapterName, buf); } } + ok(dns_eligible_found, "Did not find any dns eligible addresses.\n"); HeapFree(GetProcessHeap(), 0, ptr); } diff --git a/include/iptypes.h b/include/iptypes.h index c1a253d7b41..c1ee7322b01 100644 --- a/include/iptypes.h +++ b/include/iptypes.h @@ -94,6 +94,9 @@ typedef NL_DAD_STATE IP_DAD_STATE; #ifdef _WINSOCK2API_ +#define IP_ADAPTER_ADDRESS_DNS_ELIGIBLE 0x00000001 +#define IP_ADAPTER_ADDRESS_TRANSIENT 0x00000002 + typedef struct _IP_ADAPTER_UNICAST_ADDRESS_LH { union { struct {

1 0

Nikolay Sivov : mf/sar: Handle shutdown state in rendering callback.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: ee8e83bd45d53659def21934859aac9455941737 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee8e83bd45d53659def21934… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 27 17:37:47 2021 +0300 mf/sar: Handle shutdown state in rendering callback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index d839cba90f1..9030b3a81c0 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -1750,9 +1750,8 @@ static HRESULT WINAPI audio_renderer_render_callback_GetParameters(IMFAsyncCallb return E_NOTIMPL; } -static HRESULT WINAPI audio_renderer_render_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +static void audio_renderer_render(struct audio_renderer *renderer, IMFAsyncResult *result) { - struct audio_renderer *renderer = impl_from_render_callback_IMFAsyncCallback(iface); unsigned int src_frames, dst_frames, max_frames, src_len; struct queued_object *obj, *obj2; BOOL keep_sample = FALSE; @@ -1760,8 +1759,6 @@ static HRESULT WINAPI audio_renderer_render_callback_Invoke(IMFAsyncCallback *if BYTE *dst, *src; HRESULT hr; - EnterCriticalSection(&renderer->cs); - LIST_FOR_EACH_ENTRY_SAFE(obj, obj2, &renderer->queue, struct queued_object, entry) { if (obj->type == OBJECT_TYPE_MARKER) @@ -1816,7 +1813,15 @@ static HRESULT WINAPI audio_renderer_render_callback_Invoke(IMFAsyncCallback *if if (FAILED(hr = MFPutWaitingWorkItem(renderer->buffer_ready_event, 0, result, &renderer->buffer_ready_key))) WARN("Failed to submit wait item, hr %#x.\n", hr); +} +static HRESULT WINAPI audio_renderer_render_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + struct audio_renderer *renderer = impl_from_render_callback_IMFAsyncCallback(iface); + + EnterCriticalSection(&renderer->cs); + if (!(renderer->flags & SAR_SHUT_DOWN)) + audio_renderer_render(renderer, result); LeaveCriticalSection(&renderer->cs); return S_OK;

1 0

Nikolay Sivov : mf/sar: Release pending items when audio client is released.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: 02c859e43530b06c644588c60097a4ebc4dd87af URL: https://source.winehq.org/git/wine.git/?a=commit;h=02c859e43530b06c644588c6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 27 17:37:46 2021 +0300 mf/sar: Release pending items when audio client is released. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index e318576e80e..d839cba90f1 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -228,7 +228,13 @@ static ULONG WINAPI audio_renderer_sink_AddRef(IMFMediaSink *iface) static void audio_renderer_release_audio_client(struct audio_renderer *renderer) { + struct queued_object *obj, *obj2; + MFCancelWorkItem(renderer->buffer_ready_key); + LIST_FOR_EACH_ENTRY_SAFE(obj, obj2, &renderer->queue, struct queued_object, entry) + { + release_pending_object(obj); + } renderer->buffer_ready_key = 0; if (renderer->audio_client) { @@ -253,7 +259,6 @@ static ULONG WINAPI audio_renderer_sink_Release(IMFMediaSink *iface) { struct audio_renderer *renderer = impl_from_IMFMediaSink(iface); ULONG refcount = InterlockedDecrement(&renderer->refcount); - struct queued_object *obj, *obj2; TRACE("%p, refcount %u.\n", iface, refcount); @@ -273,10 +278,6 @@ static ULONG WINAPI audio_renderer_sink_Release(IMFMediaSink *iface) IMFMediaType_Release(renderer->current_media_type); audio_renderer_release_audio_client(renderer); CloseHandle(renderer->buffer_ready_event); - LIST_FOR_EACH_ENTRY_SAFE(obj, obj2, &renderer->queue, struct queued_object, entry) - { - release_pending_object(obj); - } DeleteCriticalSection(&renderer->cs); heap_free(renderer); }

1 0

Nikolay Sivov : mfmediaengine: Return full presentation range in GetBuffered().
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: 84b66e153d2ca78ce65126568c99b554bc3ac029 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84b66e153d2ca78ce6512656… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 27 17:37:01 2021 +0300 mfmediaengine: Return full presentation range in GetBuffered(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 17 ++++++++++++++--- dlls/mfmediaengine/tests/mfmediaengine.c | 14 ++++++++++++++ 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 0573ea844c1..6f6811ff9ea 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1152,11 +1152,22 @@ static HRESULT WINAPI media_engine_SetPreload(IMFMediaEngine *iface, MF_MEDIA_EN return S_OK; } -static HRESULT WINAPI media_engine_GetBuffered(IMFMediaEngine *iface, IMFMediaTimeRange **buffered) +static HRESULT WINAPI media_engine_GetBuffered(IMFMediaEngine *iface, IMFMediaTimeRange **range) { - FIXME("(%p, %p): stub.\n", iface, buffered); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, range); + + if (FAILED(hr = create_time_range(range))) + return hr; + + EnterCriticalSection(&engine->cs); + if (!isnan(engine->duration)) + hr = IMFMediaTimeRange_AddRange(*range, 0.0, engine->duration); + LeaveCriticalSection(&engine->cs); + + return hr; } static HRESULT WINAPI media_engine_Load(IMFMediaEngine *iface) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 1cc88420568..66984595d3b 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -391,13 +391,27 @@ static void test_Play(void) { struct media_engine_notify notify_impl = {{&media_engine_notify_vtbl}, 1}; IMFMediaEngineNotify *callback = &notify_impl.IMFMediaEngineNotify_iface; + IMFMediaTimeRange *range, *range1; IMFMediaEngine *media_engine; LONGLONG pts; + DWORD count; HRESULT hr; BOOL ret; media_engine = create_media_engine(callback); + hr = IMFMediaEngine_GetBuffered(media_engine, &range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaEngine_GetBuffered(media_engine, &range1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(range != range1, "Unexpected pointer.\n"); + + count = IMFMediaTimeRange_GetLength(range); + ok(!count, "Unexpected count %u.\n", count); + + IMFMediaTimeRange_Release(range); + IMFMediaTimeRange_Release(range1); + ret = IMFMediaEngine_IsPaused(media_engine); ok(ret, "Unexpected state %d.\n", ret);

1 0

Nikolay Sivov : mfmediaengine: Add partial implementation of a time range object.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: db549a680e900d28bed2ba95cb9da683e8ed9beb URL: https://source.winehq.org/git/wine.git/?a=commit;h=db549a680e900d28bed2ba95… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 27 17:37:00 2021 +0300 mfmediaengine: Add partial implementation of a time range object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 212 ++++++++++++++++++++++++++++++- dlls/mfmediaengine/tests/mfmediaengine.c | 98 ++++++++++++++ 2 files changed, 307 insertions(+), 3 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 5981548c9f8..0573ea844c1 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -34,6 +34,33 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +static BOOL mf_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) +{ + size_t new_capacity, max_capacity; + void *new_elements; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~(SIZE_T)0 / size; + if (count > max_capacity) + return FALSE; + + new_capacity = max(4, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = max_capacity; + + if (!(new_elements = heap_realloc(*elements, new_capacity * size))) + return FALSE; + + *elements = new_elements; + *capacity = new_capacity; + + return TRUE; +} + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { switch (reason) @@ -106,6 +133,27 @@ struct media_engine CRITICAL_SECTION cs; }; +struct range +{ + double start; + double end; +}; + +struct time_range +{ + IMFMediaTimeRange IMFMediaTimeRange_iface; + LONG refcount; + + struct range *ranges; + size_t count; + size_t capacity; +}; + +static struct time_range *impl_from_IMFMediaTimeRange(IMFMediaTimeRange *iface) +{ + return CONTAINING_RECORD(iface, struct time_range, IMFMediaTimeRange_iface); +} + struct media_error { IMFMediaError IMFMediaError_iface; @@ -226,6 +274,164 @@ static HRESULT create_media_error(IMFMediaError **ret) return S_OK; } +static HRESULT WINAPI time_range_QueryInterface(IMFMediaTimeRange *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFMediaTimeRange) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFMediaTimeRange_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI time_range_AddRef(IMFMediaTimeRange *iface) +{ + struct time_range *range = impl_from_IMFMediaTimeRange(iface); + ULONG refcount = InterlockedIncrement(&range->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI time_range_Release(IMFMediaTimeRange *iface) +{ + struct time_range *range = impl_from_IMFMediaTimeRange(iface); + ULONG refcount = InterlockedDecrement(&range->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + heap_free(range->ranges); + heap_free(range); + } + + return refcount; +} + +static DWORD WINAPI time_range_GetLength(IMFMediaTimeRange *iface) +{ + struct time_range *range = impl_from_IMFMediaTimeRange(iface); + + TRACE("%p.\n", iface); + + return range->count; +} + +static HRESULT WINAPI time_range_GetStart(IMFMediaTimeRange *iface, DWORD idx, double *start) +{ + struct time_range *range = impl_from_IMFMediaTimeRange(iface); + + TRACE("%p, %u, %p.\n", iface, idx, start); + + if (idx >= range->count) + return E_INVALIDARG; + + *start = range->ranges[idx].start; + + return S_OK; +} + +static HRESULT WINAPI time_range_GetEnd(IMFMediaTimeRange *iface, DWORD idx, double *end) +{ + struct time_range *range = impl_from_IMFMediaTimeRange(iface); + + TRACE("%p, %u, %p.\n", iface, idx, end); + + if (idx >= range->count) + return E_INVALIDARG; + + *end = range->ranges[idx].end; + + return S_OK; +} + +static BOOL WINAPI time_range_ContainsTime(IMFMediaTimeRange *iface, double time) +{ + struct time_range *range = impl_from_IMFMediaTimeRange(iface); + size_t i; + + TRACE("%p, %.8e.\n", iface, time); + + for (i = 0; i < range->count; ++i) + { + if (time >= range->ranges[i].start && time <= range->ranges[i].end) + return TRUE; + } + + return FALSE; +} + +static HRESULT WINAPI time_range_AddRange(IMFMediaTimeRange *iface, double start, double end) +{ + struct time_range *range = impl_from_IMFMediaTimeRange(iface); + + TRACE("%p, %.8e, %.8e.\n", iface, start, end); + + if (range->count) + { + FIXME("Range merging is not implemented.\n"); + return E_NOTIMPL; + } + + if (!mf_array_reserve((void **)&range->ranges, &range->capacity, range->count + 1, sizeof(*range->ranges))) + return E_OUTOFMEMORY; + + range->ranges[range->count].start = start; + range->ranges[range->count].end = end; + range->count++; + + return S_OK; +} + +static HRESULT WINAPI time_range_Clear(IMFMediaTimeRange *iface) +{ + struct time_range *range = impl_from_IMFMediaTimeRange(iface); + + TRACE("%p.\n", iface); + + range->count = 0; + + return S_OK; +} + +static const IMFMediaTimeRangeVtbl time_range_vtbl = +{ + time_range_QueryInterface, + time_range_AddRef, + time_range_Release, + time_range_GetLength, + time_range_GetStart, + time_range_GetEnd, + time_range_ContainsTime, + time_range_AddRange, + time_range_Clear, +}; + +static HRESULT create_time_range(IMFMediaTimeRange **range) +{ + struct time_range *object; + + object = heap_alloc_zero(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IMFMediaTimeRange_iface.lpVtbl = &time_range_vtbl; + object->refcount = 1; + + *range = &object->IMFMediaTimeRange_iface; + + return S_OK; +} + static void media_engine_set_flag(struct media_engine *engine, unsigned int mask, BOOL value) { if (value) @@ -1718,11 +1924,11 @@ static HRESULT WINAPI media_engine_factory_CreateInstance(IMFMediaEngineClassFac } static HRESULT WINAPI media_engine_factory_CreateTimeRange(IMFMediaEngineClassFactory *iface, - IMFMediaTimeRange **range) + IMFMediaTimeRange **range) { - FIXME("(%p, %p): stub.\n", iface, range); + TRACE("%p, %p.\n", iface, range); - return E_NOTIMPL; + return create_time_range(range); } static HRESULT WINAPI media_engine_factory_CreateError(IMFMediaEngineClassFactory *iface, IMFMediaError **error) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index f9f8fed4a74..1cc88420568 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -590,6 +590,103 @@ static void test_error(void) IMFMediaError_Release(eo); } +static void test_time_range(void) +{ + IMFMediaTimeRange *range; + double start, end; + DWORD count; + HRESULT hr; + BOOL ret; + + hr = IMFMediaEngineClassFactory_CreateTimeRange(factory, &range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Empty ranges. */ + hr = IMFMediaTimeRange_Clear(range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + ret = IMFMediaTimeRange_ContainsTime(range, 10.0); + ok(!ret, "Unexpected return value %d.\n", ret); + + count = IMFMediaTimeRange_GetLength(range); + ok(!count, "Unexpected range count.\n"); + + hr = IMFMediaTimeRange_GetStart(range, 0, &start); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTimeRange_GetEnd(range, 0, &end); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + /* Add a range. */ + hr = IMFMediaTimeRange_AddRange(range, 10.0, 1.0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = IMFMediaTimeRange_GetLength(range); + ok(count == 1, "Unexpected range count.\n"); + + hr = IMFMediaTimeRange_GetStart(range, 0, &start); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(start == 10.0, "Unexpected start %.e.\n", start); + + hr = IMFMediaTimeRange_GetEnd(range, 0, &end); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(end == 1.0, "Unexpected end %.e.\n", end); + + hr = IMFMediaTimeRange_AddRange(range, 2.0, 3.0); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = IMFMediaTimeRange_GetLength(range); + ok(count == 1, "Unexpected range count.\n"); + + hr = IMFMediaTimeRange_GetStart(range, 0, &start); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(start == 2.0, "Unexpected start %.8e.\n", start); + + hr = IMFMediaTimeRange_GetEnd(range, 0, &end); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(end == 3.0, "Unexpected end %.8e.\n", end); + + hr = IMFMediaTimeRange_AddRange(range, 10.0, 9.0); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = IMFMediaTimeRange_GetLength(range); +todo_wine + ok(count == 2, "Unexpected range count.\n"); + + hr = IMFMediaTimeRange_GetStart(range, 0, &start); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(start == 2.0, "Unexpected start %.8e.\n", start); + + hr = IMFMediaTimeRange_GetEnd(range, 0, &end); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(end == 3.0, "Unexpected end %.8e.\n", end); + + start = 0.0; + hr = IMFMediaTimeRange_GetStart(range, 1, &start); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(start == 10.0, "Unexpected start %.8e.\n", start); +} + hr = IMFMediaTimeRange_GetEnd(range, 1, &end); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(end == 9.0, "Unexpected end %.8e.\n", end); +} + hr = IMFMediaTimeRange_Clear(range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = IMFMediaTimeRange_GetLength(range); + ok(!count, "Unexpected range count.\n"); + + IMFMediaTimeRange_Release(range); +} + START_TEST(mfmediaengine) { HRESULT hr; @@ -617,6 +714,7 @@ START_TEST(mfmediaengine) test_playback_rate(); test_mute(); test_error(); + test_time_range(); IMFMediaEngineClassFactory_Release(factory);

1 0

Jacek Caban : mshtml: Make xhr.open async argument optional in IE9+ mode.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: d7b852625852616b9cf183cc597f4752ad82dc4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7b852625852616b9cf183cc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 27 19:36:57 2021 +0100 mshtml: Make xhr.open async argument optional in IE9+ mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/documentmode.js | 14 ++++++++++++++ dlls/mshtml/xmlhttprequest.c | 38 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index d6589343dff..75ebe082ce0 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -122,6 +122,20 @@ sync_test("xhr_props", function() { test_exposed("dispatchEvent", v >= 9); }); +sync_test("xhr open", function() { + var e = false; + try { + (new XMLHttpRequest()).open("GET", "https://www.winehq.org/"); + }catch(ex) { + e = true; + } + + if(document.documentMode < 10) + ok(e, "expected exception"); + else + ok(!e, "unexpected exception"); +}); + sync_test("style_props", function() { var style = document.body.style; diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index c05d5871286..8790807ce77 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -30,6 +30,7 @@ #include "mshtml_private.h" #include "htmlevent.h" +#include "mshtmdid.h" #include "initguid.h" #include "msxml6.h" #include "objsafe.h" @@ -475,6 +476,29 @@ static HRESULT WINAPI HTMLXMLHttpRequest_abort(IHTMLXMLHttpRequest *iface) return S_OK; } +static HRESULT HTMLXMLHttpRequest_open_hook(DispatchEx *dispex, LCID lcid, WORD flags, + DISPPARAMS *dp, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + /* If only two arguments were given, implicitly set async to false */ + if((flags & DISPATCH_METHOD) && dp->cArgs == 2 && !dp->cNamedArgs) { + VARIANT args[5]; + DISPPARAMS new_dp = {args, NULL, ARRAY_SIZE(args), 0}; + V_VT(args) = VT_EMPTY; + V_VT(args+1) = VT_EMPTY; + V_VT(args+2) = VT_BOOL; + V_BOOL(args+2) = VARIANT_TRUE; + args[3] = dp->rgvarg[0]; + args[4] = dp->rgvarg[1]; + + TRACE("implicit async\n"); + + return IDispatchEx_InvokeEx(&dispex->IDispatchEx_iface, DISPID_IHTMLXMLHTTPREQUEST_OPEN, + lcid, flags, &new_dp, res, ei, caller); + } + + return S_FALSE; /* fallback to default */ +} + static HRESULT WINAPI HTMLXMLHttpRequest_open(IHTMLXMLHttpRequest *iface, BSTR bstrMethod, BSTR bstrUrl, VARIANT varAsync, VARIANT varUser, VARIANT varPassword) { HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest(iface); @@ -847,6 +871,17 @@ static void HTMLXMLHttpRequest_bind_event(DispatchEx *dispex, eventid_t eid) This->event_listener->load_event = TRUE; } +static void HTMLXMLHttpRequest_init_dispex_info(dispex_data_t *info, compat_mode_t compat_mode) +{ + static const dispex_hook_t xhr_hooks[] = { + {DISPID_IHTMLXMLHTTPREQUEST_OPEN, HTMLXMLHttpRequest_open_hook}, + {DISPID_UNKNOWN} + }; + + EventTarget_init_dispex_info(info, compat_mode); + dispex_info_add_interface(info, IHTMLXMLHttpRequest_tid, compat_mode >= COMPAT_MODE_IE10 ? xhr_hooks : NULL); +} + static event_target_vtbl_t HTMLXMLHttpRequest_event_target_vtbl = { { NULL, @@ -858,14 +893,13 @@ static event_target_vtbl_t HTMLXMLHttpRequest_event_target_vtbl = { }; static const tid_t HTMLXMLHttpRequest_iface_tids[] = { - IHTMLXMLHttpRequest_tid, 0 }; static dispex_static_data_t HTMLXMLHttpRequest_dispex = { &HTMLXMLHttpRequest_event_target_vtbl.dispex_vtbl, DispHTMLXMLHttpRequest_tid, HTMLXMLHttpRequest_iface_tids, - EventTarget_init_dispex_info + HTMLXMLHttpRequest_init_dispex_info };

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2021