- wine-devel - winehq.org

[PATCH] qedit/tests: Remove duplicated ok() call
by Michael Stefaniuc 26 Aug '21

26 Aug '21

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/qedit/tests/samplegrabber.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/qedit/tests/samplegrabber.c b/dlls/qedit/tests/samplegrabber.c index f82c375b76f..6a58d5ea7e6 100644 --- a/dlls/qedit/tests/samplegrabber.c +++ b/dlls/qedit/tests/samplegrabber.c @@ -661,7 +661,6 @@ static void test_sink_allocator(IPin *pin) hr = IMemInputPin_GetAllocator(input, &ret_allocator); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(ret_allocator == req_allocator, "Allocators didn't match.\n"); - ok(hr == S_OK, "Got hr %#x.\n", hr); IMemAllocator_Release(ret_allocator); hr = IMemAllocator_SetProperties(req_allocator, &req_props, &ret_props); -- 2.31.1

2 1

[PATCH] amstream/tests: Actually test the return of IMediaFilter_SetSyncSource
by Michael Stefaniuc 26 Aug '21

26 Aug '21

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/amstream/tests/amstream.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index a43eec77ec2..d27bf801482 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -5055,7 +5055,7 @@ static void test_audiostreamsample_get_sample_times(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(current_time == 0, "Got current time %s.\n", wine_dbgstr_longlong(current_time)); - IMediaFilter_SetSyncSource(graph_media_filter, &clock.IReferenceClock_iface); + hr = IMediaFilter_SetSyncSource(graph_media_filter, &clock.IReferenceClock_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); current_time = 0xdeadbeefdeadbeef; @@ -9338,7 +9338,7 @@ static void test_ddrawstreamsample_get_sample_times(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(current_time == 0, "Got current time %s.\n", wine_dbgstr_longlong(current_time)); - IMediaFilter_SetSyncSource(graph_media_filter, &clock.IReferenceClock_iface); + hr = IMediaFilter_SetSyncSource(graph_media_filter, &clock.IReferenceClock_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); current_time = 0xdeadbeefdeadbeef; -- 2.31.1

2 1

[PATCH] windows.gaming.input/tests: Test the correct return value
by Michael Stefaniuc 26 Aug '21

26 Aug '21

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/windows.gaming.input/tests/input.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windows.gaming.input/tests/input.c b/dlls/windows.gaming.input/tests/input.c index b05dc508637..6e863def54d 100644 --- a/dlls/windows.gaming.input/tests/input.c +++ b/dlls/windows.gaming.input/tests/input.c @@ -190,7 +190,7 @@ static void test_Gamepad(void) ok(hr == S_OK, "IGamepadStatics_add_GamepadAdded failed, hr %#x\n", hr); token.value = 0xdeadbeef; - IGamepadStatics_add_GamepadRemoved(gamepad_statics, &gamepad_event_handler.IEventHandler_Gamepad_iface, &token); + hr = IGamepadStatics_add_GamepadRemoved(gamepad_statics, &gamepad_event_handler.IEventHandler_Gamepad_iface, &token); ok(hr == S_OK, "IGamepadStatics_add_GamepadRemoved failed, hr %#x\n", hr); ok(token.value != 0xdeadbeef, "IGamepadStatics_add_GamepadRemoved returned token %#I64x\n", token.value); @@ -367,7 +367,7 @@ static void test_RawGameController(void) ok(hr == S_OK, "IRawGameControllerStatics_add_RawGameControllerAdded failed, hr %#x\n", hr); token.value = 0xdeadbeef; - IRawGameControllerStatics_add_RawGameControllerRemoved(controller_statics, &controller_event_handler.IEventHandler_RawGameController_iface, &token); + hr = IRawGameControllerStatics_add_RawGameControllerRemoved(controller_statics, &controller_event_handler.IEventHandler_RawGameController_iface, &token); ok(hr == S_OK, "IRawGameControllerStatics_add_RawGameControllerRemoved failed, hr %#x\n", hr); ok(token.value != 0xdeadbeef, "IRawGameControllerStatics_add_RawGameControllerRemoved returned token %#I64x\n", token.value); -- 2.31.1

1 0

[PATCH 1/4] ntdll/tests: Also test the IOSB status in test_volume_info().
by Zebediah Figura 26 Aug '21

26 Aug '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 662dc1d55cb..1118f41f81f 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1662,8 +1662,10 @@ static void test_volume_info(void) PIPE_TYPE_MESSAGE, 4096 )) return; memset( buffer, 0xaa, sizeof(buffer) ); + memset( &iosb, 0xaa, sizeof(iosb) ); status = pNtQueryVolumeInformationFile( read, &iosb, buffer, sizeof(buffer), FileFsDeviceInformation ); ok( status == STATUS_SUCCESS, "NtQueryVolumeInformationFile failed: %x\n", status ); + ok( iosb.Status == STATUS_SUCCESS, "got status %#x\n", iosb.Status ); ok( iosb.Information == sizeof(*device_info), "Information = %lu\n", iosb.Information ); device_info = (FILE_FS_DEVICE_INFORMATION*)buffer; ok( device_info->DeviceType == FILE_DEVICE_NAMED_PIPE, "DeviceType = %u\n", device_info->DeviceType ); @@ -1671,8 +1673,10 @@ static void test_volume_info(void) "Characteristics = %x\n", device_info->Characteristics ); memset( buffer, 0xaa, sizeof(buffer) ); + memset( &iosb, 0xaa, sizeof(iosb) ); status = pNtQueryVolumeInformationFile( write, &iosb, buffer, sizeof(buffer), FileFsDeviceInformation ); ok( status == STATUS_SUCCESS, "NtQueryVolumeInformationFile failed: %x\n", status ); + ok( iosb.Status == STATUS_SUCCESS, "got status %#x\n", iosb.Status ); ok( iosb.Information == sizeof(*device_info), "Information = %lu\n", iosb.Information ); device_info = (FILE_FS_DEVICE_INFORMATION*)buffer; ok( device_info->DeviceType == FILE_DEVICE_NAMED_PIPE, "DeviceType = %u\n", device_info->DeviceType ); -- 2.30.2

2 6

[PATCH v2 1/3] kernel32/tests: Test GetTimeFormatA()'s Unicode to ANSI conversion.
by Francois Gouget 26 Aug '21

26 Aug '21

The ANSI string may be longer than the Unicode one and the return value should reflect that. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Supersedes: 212527-212529 v2: Fix the last todo_wine(). --- dlls/kernel32/tests/locale.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index b83cdc6b956..45bf56d8ad7 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -631,6 +631,34 @@ static void test_GetTimeFormatA(void) curtime.wMonth = 60; ret = GetTimeFormatA(lcid, 0, &curtime, "h:m:s", buffer, ARRAY_SIZE(buffer)); expect_str(ret, buffer, "12:56:13"); + + /* The ANSI string may be longer than the Unicode one. + * In particular, in the Japanese code page, "\x93\xfa" = L"\x65e5". + */ + + lcid = MAKELCID(MAKELANGID(LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN), SORT_DEFAULT); + + ret = GetTimeFormatA(lcid, 0, &curtime, "h\x93\xfa", buffer, 5); + if (broken(1)) /* FIXME Remove once Wine is less broken */ + expect_str(ret, buffer, "12\x93\xfa"); /* only 3+1 WCHARs */ + todo_wine ok(ret == strlen("12\x93\xfa") + 1, "Expected ret %d, got %d\n", strlen("12\x93\xfa") + 1, ret); + ok(strcmp(buffer, "12\x93\xfa") == 0, "Expected '12\x93\xfa', got '%s'\n", buffer); + + ret = GetTimeFormatA(lcid, 0, &curtime, "h\x93\xfa", buffer, 4); + todo_wine expect_err(ret, NULL, ERROR_INSUFFICIENT_BUFFER); + SetLastError(0xdeadbeef); + + ret = GetTimeFormatA(lcid, 0, &curtime, "h\x93\xfa", NULL, 0); + if (broken(1)) /* FIXME Remove once Wine is less broken */ + expect_str(ret, NULL, "12\x93\xfa"); + todo_wine ok(ret == strlen("12\x93\xfa") + 1, "Expected ret %d, got %d\n", strlen("12\x93\xfa") + 1, ret); + + strcpy(buffer, "pristine"); /* clear previous identical result */ + ret = GetTimeFormatA(lcid, 0, &curtime, "h\x93\xfa", buffer, 0); + if (broken(1)) /* FIXME Remove once Wine is less broken */ + expect_str(ret, NULL, "12\x93\xfa"); + todo_wine ok(ret == strlen("12\x93\xfa") + 1, "Expected ret %d, got %d\n", strlen("12\x93\xfa") + 1, ret); + ok(strcmp(buffer, "pristine") == 0, "Expected a pristine buffer, got '%s'\n", buffer); } static void test_GetTimeFormatEx(void) -- 2.20.1

1 2

[PATCH v6] user32: Don't save maximized position for toplevel windows covering the entire work area.
by Gabriel Ivăncescu 26 Aug '21

26 Aug '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51672 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/user32/tests/win.c | 54 ++++++++++++++++++++------ dlls/user32/winpos.c | 86 +++++++++++++++++++++++++++++++++-------- 2 files changed, 112 insertions(+), 28 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 228395e..e23ab81 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -11624,8 +11624,9 @@ static void test_IsWindowEnabled(void) static void test_window_placement(void) { - RECT orig = {100, 200, 300, 400}, orig2 = {200, 300, 400, 500}, rect; + RECT orig = {100, 200, 300, 400}, orig2 = {200, 300, 400, 500}, rect, work_rect; WINDOWPLACEMENT wp = {sizeof(wp)}; + MONITORINFO mon_info; HWND hwnd; BOOL ret; @@ -11633,6 +11634,10 @@ static void test_window_placement(void) orig.left, orig.top, orig.right - orig.left, orig.bottom - orig.top, 0, 0, 0, 0); ok(!!hwnd, "failed to create window, error %u\n", GetLastError()); + mon_info.cbSize = sizeof(mon_info); + GetMonitorInfoW(MonitorFromWindow(hwnd, MONITOR_DEFAULTTOPRIMARY), &mon_info); + work_rect = mon_info.rcWork; + ret = GetWindowPlacement(hwnd, &wp); ok(ret, "failed to get window placement, error %u\n", GetLastError()); ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd); @@ -11675,7 +11680,6 @@ static void test_window_placement(void) ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11693,6 +11697,42 @@ todo_wine ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", wine_dbgstr_rect(&wp.rcNormalPosition)); + SetWindowPos(hwnd, 0, work_rect.left, work_rect.top, work_rect.right - work_rect.left, + work_rect.bottom - work_rect.top, SWP_NOZORDER | SWP_NOACTIVATE); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); + ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + + SetWindowPos(hwnd, 0, work_rect.left, work_rect.top, work_rect.right - work_rect.left - 1, + work_rect.bottom - work_rect.top, SWP_NOZORDER | SWP_NOACTIVATE); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); + ok(wp.ptMaxPosition.x == work_rect.left && wp.ptMaxPosition.y == work_rect.top, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + + SetWindowPos(hwnd, 0, work_rect.left, work_rect.top, work_rect.right - work_rect.left, + work_rect.bottom - work_rect.top - 1, SWP_NOZORDER | SWP_NOACTIVATE); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); + ok(wp.ptMaxPosition.x == work_rect.left && wp.ptMaxPosition.y == work_rect.top, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + ShowWindow(hwnd, SW_MINIMIZE); ret = GetWindowPlacement(hwnd, &wp); @@ -11701,7 +11741,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11714,7 +11753,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11727,7 +11765,6 @@ todo_wine ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11745,7 +11782,6 @@ todo_wine ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == 100 && wp.ptMinPosition.y == 100, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig2), "got normal pos %s\n", @@ -11761,7 +11797,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig2), "got normal pos %s\n", @@ -11783,7 +11818,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11804,7 +11838,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == 100 && wp.ptMinPosition.y == 100, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11825,7 +11858,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11839,7 +11871,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11854,7 +11885,6 @@ todo_wine ok(wp.showCmd == SW_NORMAL, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 6e96a4b..cdf8541 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -675,6 +675,33 @@ BOOL WINAPI MoveWindow( HWND hwnd, INT x, INT y, INT cx, INT cy, } +/******************************************************************* + * get_work_rect + * + * Get the work area that a maximized window can cover, depending on style. + */ +static BOOL get_work_rect( HWND hwnd, RECT *rect ) +{ + HMONITOR monitor = MonitorFromWindow( hwnd, MONITOR_DEFAULTTOPRIMARY ); + MONITORINFO mon_info; + DWORD style; + + if (!monitor) return FALSE; + + mon_info.cbSize = sizeof(mon_info); + GetMonitorInfoW( monitor, &mon_info ); + + style = GetWindowLongW( hwnd, GWL_STYLE ); + *rect = mon_info.rcMonitor; + if (style & WS_MAXIMIZEBOX) + { + if ((style & WS_CAPTION) == WS_CAPTION || !(style & (WS_CHILD | WS_POPUP))) + *rect = mon_info.rcWork; + } + return TRUE; +} + + /******************************************************************* * WINPOS_GetMinMaxInfo * @@ -683,8 +710,8 @@ BOOL WINAPI MoveWindow( HWND hwnd, INT x, INT y, INT cx, INT cy, MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd ) { DPI_AWARENESS_CONTEXT context; + RECT rc_work, rc_primary; MINMAXINFO MinMax; - HMONITOR monitor; INT xinc, yinc; LONG style = GetWindowLongW( hwnd, GWL_STYLE ); LONG adjustedStyle; @@ -738,22 +765,8 @@ MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd ) /* if the app didn't change the values, adapt them for the current monitor */ - if ((monitor = MonitorFromWindow( hwnd, MONITOR_DEFAULTTOPRIMARY ))) + if (get_work_rect( hwnd, &rc_work )) { - RECT rc_work, rc_primary; - MONITORINFO mon_info; - - mon_info.cbSize = sizeof(mon_info); - GetMonitorInfoW( monitor, &mon_info ); - - rc_work = mon_info.rcMonitor; - - if (style & WS_MAXIMIZEBOX) - { - if ((style & WS_CAPTION) == WS_CAPTION || !(style & (WS_CHILD | WS_POPUP))) - rc_work = mon_info.rcWork; - } - rc_primary = get_primary_monitor_rect(); if (MinMax.ptMaxSize.x == (rc_primary.right - rc_primary.left) + 2 * xinc && MinMax.ptMaxSize.y == (rc_primary.bottom - rc_primary.top) + 2 * yinc) @@ -916,6 +929,41 @@ static POINT get_minimized_pos( HWND hwnd, POINT pt ) return pt; } +static void update_maximized_pos( HWND hwnd ) +{ + /* For top level windows covering the work area, we might have + to "forget" the maximized position. Windows presumably does + this to avoid situations where the border style changes, + which would lead the window to be outside the screen, or the + window gets reloaded on a different screen, and the "saved" + position no longer applies to it (despite being maximized). + + Some applications (e.g. Imperiums: Greek Wars) depend on this. + */ + WND *wnd = WIN_GetPtr( hwnd ); + RECT work_rect; + + if (!wnd) return; + if (wnd->parent && wnd->parent != GetDesktopWindow()) goto done; + + if (wnd->dwStyle & WS_MAXIMIZE) + { + WIN_ReleasePtr( wnd ); + if (!get_work_rect( hwnd, &work_rect )) + SetRect( &work_rect, 0, 0, GetSystemMetrics( SM_CXSCREEN ), GetSystemMetrics( SM_CYSCREEN ) ); + + if (!(wnd = WIN_GetPtr( hwnd ))) return; + if (wnd->window_rect.left <= work_rect.left && wnd->window_rect.top <= work_rect.top && + wnd->window_rect.right >= work_rect.right && wnd->window_rect.bottom >= work_rect.bottom) + wnd->max_pos.x = wnd->max_pos.y = -1; + } + else + wnd->max_pos.x = wnd->max_pos.y = -1; + +done: + WIN_ReleasePtr( wnd ); +} + /*********************************************************************** * WINPOS_MinMaximize @@ -1338,6 +1386,11 @@ BOOL WINAPI GetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *wndpl ) pWnd->normal_rect = pWnd->window_rect; } + WIN_ReleasePtr( pWnd ); + update_maximized_pos( hwnd ); + + if (!(pWnd = WIN_GetPtr( hwnd ))) return FALSE; + wndpl->length = sizeof(*wndpl); if( pWnd->dwStyle & WS_MINIMIZE ) wndpl->showCmd = SW_SHOWMINIMIZED; @@ -1431,6 +1484,7 @@ static BOOL WINPOS_SetPlacement( HWND hwnd, const WINDOWPLACEMENT *wndpl, UINT f style = pWnd->dwStyle; WIN_ReleasePtr( pWnd ); + if (flags & PLACE_MAX) update_maximized_pos( hwnd ); if( style & WS_MINIMIZE ) { -- 2.31.1

2 1

[PATCH] ntoskrnl.exe: Fix the spelling of some comments.
by Francois Gouget 26 Aug '21

26 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index f11dce1cc93..9886be69ccb 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1355,7 +1355,7 @@ static void test_pnp_devices(void) ok(!ret, "failed to open child: %#x\n", ret); ret = DeviceIoControl(child, IOCTL_WINETEST_MARK_PENDING, NULL, 0, NULL, 0, &size, &ovl); - ok(!ret, "DeviceIoControl succeded\n"); + ok(!ret, "DeviceIoControl succeeded\n"); ok(GetLastError() == ERROR_IO_PENDING, "got error %u\n", GetLastError()); ok(size == 0, "got size %u\n", size); @@ -2693,12 +2693,12 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled SetLastError(0xdeadbeef); ret = ReadFile(async_file, report, caps.InputReportByteLength, NULL, &overlapped); - ok(!ret, "ReadFile succeded\n"); + ok(!ret, "ReadFile succeeded\n"); ok(GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError()); SetLastError(0xdeadbeef); ret = ReadFile(async_file, buffer, caps.InputReportByteLength, NULL, &overlapped2); - ok(!ret, "ReadFile succeded\n"); + ok(!ret, "ReadFile succeeded\n"); ok(GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError()); /* wait for second report to be ready */ -- 2.20.1

1 0

[PATCH] winedbg: dbg_get_debuggee_info() is not used anymore. Remove it.
by Francois Gouget 26 Aug '21

26 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- The last call was removed on 2020-04-07 by 86ed5e563dc7. --- programs/winedbg/debugger.h | 1 - programs/winedbg/winedbg.c | 21 --------------------- 2 files changed, 22 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 3733e1b410f..e7a4901a769 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -464,7 +464,6 @@ extern struct dbg_thread* dbg_get_thread(struct dbg_process* p, DWORD tid); extern void dbg_del_thread(struct dbg_thread* t); extern BOOL dbg_init(HANDLE hProc, const WCHAR* in, BOOL invade); extern BOOL dbg_load_module(HANDLE hProc, HANDLE hFile, const WCHAR* name, DWORD_PTR base, DWORD size); -extern BOOL dbg_get_debuggee_info(HANDLE hProcess, IMAGEHLP_MODULE64* imh_mod); extern void dbg_set_option(const char*, const char*); extern void dbg_start_interactive(HANDLE hFile); extern void dbg_init_console(void); diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 5e433bbb699..04a80b0f86d 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -429,27 +429,6 @@ static BOOL CALLBACK mod_loader_cb(PCSTR mod_name, DWORD64 base, PVOID ctx) return TRUE; } -BOOL dbg_get_debuggee_info(HANDLE hProcess, IMAGEHLP_MODULE64* imh_mod) -{ - struct mod_loader_info mli; - BOOL opt; - - /* this will resynchronize builtin dbghelp's internal ELF module list */ - SymLoadModule(hProcess, 0, 0, 0, 0, 0); - mli.handle = hProcess; - mli.imh_mod = imh_mod; - imh_mod->SizeOfStruct = sizeof(*imh_mod); - imh_mod->BaseOfImage = 0; - /* this is a wine specific options to return also ELF modules in the - * enumeration - */ - opt = SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, TRUE); - SymEnumerateModules64(hProcess, mod_loader_cb, &mli); - SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, opt); - - return imh_mod->BaseOfImage != 0; -} - BOOL dbg_load_module(HANDLE hProc, HANDLE hFile, const WCHAR* name, DWORD_PTR base, DWORD size) { BOOL ret = SymLoadModuleExW(hProc, NULL, name, NULL, base, size, NULL, 0); -- 2.20.1

1 0

[PATCH] wldap32: Make the wrap_*() functions static.
by Francois Gouget 26 Aug '21

26 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wldap32/libldap.c | 126 ++++++++++++++++++++--------------------- dlls/wldap32/libldap.h | 82 --------------------------- 2 files changed, 63 insertions(+), 145 deletions(-) diff --git a/dlls/wldap32/libldap.c b/dlls/wldap32/libldap.c index 5cea944729d..495ea609059 100644 --- a/dlls/wldap32/libldap.c +++ b/dlls/wldap32/libldap.c @@ -61,22 +61,22 @@ static LDAPMod *nullmods[] = { NULL }; static const struct ldap_callbacks *callbacks; -void * CDECL wrap_ber_alloc_t( int options ) +static void * CDECL wrap_ber_alloc_t( int options ) { return ber_alloc_t( options ); } -void CDECL wrap_ber_bvecfree( struct bervalU **berval ) +static void CDECL wrap_ber_bvecfree( struct bervalU **berval ) { ber_bvecfree( (struct berval **)berval ); } -void CDECL wrap_ber_bvfree( struct bervalU *berval ) +static void CDECL wrap_ber_bvfree( struct bervalU *berval ) { ber_bvfree( (struct berval *)berval ); } -unsigned int CDECL wrap_ber_first_element( void *ber, ULONG *ret_len, char **last ) +static unsigned int CDECL wrap_ber_first_element( void *ber, ULONG *ret_len, char **last ) { ber_len_t len; ber_tag_t ret; @@ -97,22 +97,22 @@ unsigned int CDECL wrap_ber_first_element( void *ber, ULONG *ret_len, char **las return ret; } -int CDECL wrap_ber_flatten( void *ber, struct bervalU **berval ) +static int CDECL wrap_ber_flatten( void *ber, struct bervalU **berval ) { return ber_flatten( ber, (struct berval **)berval ); } -void CDECL wrap_ber_free( void *ber, int freebuf ) +static void CDECL wrap_ber_free( void *ber, int freebuf ) { ber_free( ber, freebuf ); } -void * CDECL wrap_ber_init( struct bervalU *berval ) +static void * CDECL wrap_ber_init( struct bervalU *berval ) { return ber_init( (struct berval *)berval ); } -unsigned int CDECL wrap_ber_next_element( void *ber, unsigned int *ret_len, char *last ) +static unsigned int CDECL wrap_ber_next_element( void *ber, unsigned int *ret_len, char *last ) { ber_len_t len; ber_tag_t ret; @@ -133,7 +133,7 @@ unsigned int CDECL wrap_ber_next_element( void *ber, unsigned int *ret_len, char return ret; } -unsigned int CDECL wrap_ber_peek_tag( void *ber, unsigned int *ret_len ) +static unsigned int CDECL wrap_ber_peek_tag( void *ber, unsigned int *ret_len ) { ber_len_t len; ber_tag_t ret; @@ -149,7 +149,7 @@ unsigned int CDECL wrap_ber_peek_tag( void *ber, unsigned int *ret_len ) return ret; } -unsigned int CDECL wrap_ber_skip_tag( void *ber, unsigned int *ret_len ) +static unsigned int CDECL wrap_ber_skip_tag( void *ber, unsigned int *ret_len ) { ber_len_t len; ber_tag_t ret; @@ -165,7 +165,7 @@ unsigned int CDECL wrap_ber_skip_tag( void *ber, unsigned int *ret_len ) return ret; } -int WINAPIV wrap_ber_printf( void *ber, char *fmt, ... ) +static int WINAPIV wrap_ber_printf( void *ber, char *fmt, ... ) { int ret; __ms_va_list args; @@ -230,7 +230,7 @@ int WINAPIV wrap_ber_printf( void *ber, char *fmt, ... ) return ret; } -int WINAPIV wrap_ber_scanf( void *ber, char *fmt, ... ) +static int WINAPIV wrap_ber_scanf( void *ber, char *fmt, ... ) { int ret; __ms_va_list args; @@ -301,12 +301,12 @@ int WINAPIV wrap_ber_scanf( void *ber, char *fmt, ... ) return ret; } -int CDECL wrap_ldap_abandon_ext( void *ld, int msgid, LDAPControlU **serverctrls, LDAPControlU **clientctrls ) +static int CDECL wrap_ldap_abandon_ext( void *ld, int msgid, LDAPControlU **serverctrls, LDAPControlU **clientctrls ) { return ldap_abandon_ext( ld, msgid, (LDAPControl **)serverctrls, (LDAPControl **)clientctrls ); } -int CDECL wrap_ldap_add_ext( void *ld, const char *dn, LDAPModU **attrs, LDAPControlU **serverctrls, +static int CDECL wrap_ldap_add_ext( void *ld, const char *dn, LDAPModU **attrs, LDAPControlU **serverctrls, LDAPControlU **clientctrls, ULONG *msg ) { int dummy; @@ -314,14 +314,14 @@ int CDECL wrap_ldap_add_ext( void *ld, const char *dn, LDAPModU **attrs, LDAPCon (LDAPControl **)clientctrls, msg ? (int *)msg : &dummy ); } -int CDECL wrap_ldap_add_ext_s( void *ld, const char *dn, LDAPModU **attrs, LDAPControlU **serverctrls, +static int CDECL wrap_ldap_add_ext_s( void *ld, const char *dn, LDAPModU **attrs, LDAPControlU **serverctrls, LDAPControlU **clientctrls ) { return ldap_add_ext_s( ld, dn ? dn : "", attrs ? (LDAPMod **)attrs : nullmods, (LDAPControl **)serverctrls, (LDAPControl **)clientctrls ); } -int CDECL wrap_ldap_compare_ext( void *ld, const char *dn, const char *attrs, struct bervalU *value, +static int CDECL wrap_ldap_compare_ext( void *ld, const char *dn, const char *attrs, struct bervalU *value, LDAPControlU **serverctrls, LDAPControlU **clientctrls, ULONG *msg ) { int dummy; @@ -329,49 +329,49 @@ int CDECL wrap_ldap_compare_ext( void *ld, const char *dn, const char *attrs, st (LDAPControl **)serverctrls, (LDAPControl **)clientctrls, msg ? (int *)msg : &dummy ); } -int CDECL wrap_ldap_compare_ext_s( void *ld, const char *dn, const char *attrs, struct bervalU *value, +static int CDECL wrap_ldap_compare_ext_s( void *ld, const char *dn, const char *attrs, struct bervalU *value, LDAPControlU **serverctrls, LDAPControlU **clientctrls ) { return ldap_compare_ext_s( ld, dn ? dn : "", attrs ? attrs : "", (struct berval *)value, (LDAPControl **)serverctrls, (LDAPControl **)clientctrls ); } -void CDECL wrap_ldap_control_free( LDAPControlU *control ) +static void CDECL wrap_ldap_control_free( LDAPControlU *control ) { ldap_control_free( (LDAPControl *)control ); } -void CDECL wrap_ldap_controls_free( LDAPControlU **control ) +static void CDECL wrap_ldap_controls_free( LDAPControlU **control ) { ldap_controls_free( (LDAPControl **)control ); } -int CDECL wrap_ldap_count_entries( void *ld, void *chain ) +static int CDECL wrap_ldap_count_entries( void *ld, void *chain ) { return ldap_count_entries( ld, chain ); } -int CDECL wrap_ldap_count_references( void *ld, void *chain ) +static int CDECL wrap_ldap_count_references( void *ld, void *chain ) { return ldap_count_references( ld, chain ); } -int CDECL wrap_ldap_count_values_len( struct bervalU **values ) +static int CDECL wrap_ldap_count_values_len( struct bervalU **values ) { return ldap_count_values_len( (struct berval **)values ); } -int CDECL wrap_ldap_create_sort_control( void *ld, LDAPSortKeyU **keylist, int critical, LDAPControlU **control ) +static int CDECL wrap_ldap_create_sort_control( void *ld, LDAPSortKeyU **keylist, int critical, LDAPControlU **control ) { return ldap_create_sort_control( ld, (LDAPSortKey **)keylist, critical, (LDAPControl **)control ); } -int CDECL wrap_ldap_create_vlv_control( void *ld, LDAPVLVInfoU *info, LDAPControlU **control ) +static int CDECL wrap_ldap_create_vlv_control( void *ld, LDAPVLVInfoU *info, LDAPControlU **control ) { return ldap_create_vlv_control( ld, (LDAPVLVInfo *)info, (LDAPControl **)control ); } -int CDECL wrap_ldap_delete_ext( void *ld, const char *dn, LDAPControlU **serverctrls, LDAPControlU **clientctrls, +static int CDECL wrap_ldap_delete_ext( void *ld, const char *dn, LDAPControlU **serverctrls, LDAPControlU **clientctrls, ULONG *msg ) { int dummy; @@ -379,22 +379,22 @@ int CDECL wrap_ldap_delete_ext( void *ld, const char *dn, LDAPControlU **serverc msg ? (int *)msg : &dummy ); } -int CDECL wrap_ldap_delete_ext_s( void *ld, const char *dn, LDAPControlU **serverctrls, LDAPControlU **clientctrls ) +static int CDECL wrap_ldap_delete_ext_s( void *ld, const char *dn, LDAPControlU **serverctrls, LDAPControlU **clientctrls ) { return ldap_delete_ext_s( ld, dn ? dn : "", (LDAPControl **)serverctrls, (LDAPControl **)clientctrls ); } -char * CDECL wrap_ldap_dn2ufn( const char *dn ) +static char * CDECL wrap_ldap_dn2ufn( const char *dn ) { return ldap_dn2ufn( dn ); } -char ** CDECL wrap_ldap_explode_dn( const char *dn, int notypes ) +static char ** CDECL wrap_ldap_explode_dn( const char *dn, int notypes ) { return ldap_explode_dn( dn, notypes ); } -int CDECL wrap_ldap_extended_operation( void *ld, const char *oid, struct bervalU *data, LDAPControlU **serverctrls, +static int CDECL wrap_ldap_extended_operation( void *ld, const char *oid, struct bervalU *data, LDAPControlU **serverctrls, LDAPControlU **clientctrls, ULONG *msg ) { int dummy; @@ -402,59 +402,59 @@ int CDECL wrap_ldap_extended_operation( void *ld, const char *oid, struct berval (LDAPControl **)clientctrls, msg ? (int *)msg : &dummy ); } -int CDECL wrap_ldap_extended_operation_s( void *ld, const char *oid, struct bervalU *data, LDAPControlU **serverctrls, +static int CDECL wrap_ldap_extended_operation_s( void *ld, const char *oid, struct bervalU *data, LDAPControlU **serverctrls, LDAPControlU **clientctrls, char **retoid, struct bervalU **retdata ) { return ldap_extended_operation_s( ld, oid ? oid : "", (struct berval *)data, (LDAPControl **)serverctrls, (LDAPControl **)clientctrls, retoid, (struct berval **)retdata ); } -char * CDECL wrap_ldap_get_dn( void *ld, void *entry ) +static char * CDECL wrap_ldap_get_dn( void *ld, void *entry ) { return ldap_get_dn( ld, entry ); } -char * CDECL wrap_ldap_first_attribute( void *ld, void *entry, void **ber ) +static char * CDECL wrap_ldap_first_attribute( void *ld, void *entry, void **ber ) { return ldap_first_attribute( ld, entry, (BerElement **)ber ); } -void * CDECL wrap_ldap_first_entry( void *ld, void *chain ) +static void * CDECL wrap_ldap_first_entry( void *ld, void *chain ) { return ldap_first_entry( ld, chain ); } -void * CDECL wrap_ldap_first_reference( void *ld, void *chain ) +static void * CDECL wrap_ldap_first_reference( void *ld, void *chain ) { return ldap_first_reference( ld, chain ); } -int CDECL wrap_ldap_get_option( void *ld, int option, void *value ) +static int CDECL wrap_ldap_get_option( void *ld, int option, void *value ) { return ldap_get_option( ld, option, value ); } -struct bervalU ** CDECL wrap_ldap_get_values_len( void *ld, void *entry, const char *attr ) +static struct bervalU ** CDECL wrap_ldap_get_values_len( void *ld, void *entry, const char *attr ) { return (struct bervalU **)ldap_get_values_len( ld, entry, attr ); } -int CDECL wrap_ldap_initialize( void **ld, const char *url ) +static int CDECL wrap_ldap_initialize( void **ld, const char *url ) { return ldap_initialize( (LDAP **)ld, url ); } -void CDECL wrap_ldap_memfree( void *ptr ) +static void CDECL wrap_ldap_memfree( void *ptr ) { return ldap_memfree( ptr ); } -void CDECL wrap_ldap_memvfree( void **ptr ) +static void CDECL wrap_ldap_memvfree( void **ptr ) { ldap_memvfree( ptr ); } -int CDECL wrap_ldap_modify_ext( void *ld, const char *dn, LDAPModU **mods, LDAPControlU **serverctrls, +static int CDECL wrap_ldap_modify_ext( void *ld, const char *dn, LDAPModU **mods, LDAPControlU **serverctrls, LDAPControlU **clientctrls, ULONG *msg ) { int dummy; @@ -462,88 +462,88 @@ int CDECL wrap_ldap_modify_ext( void *ld, const char *dn, LDAPModU **mods, LDAPC (LDAPControl **)clientctrls, msg ? (int *)msg : &dummy ); } -int CDECL wrap_ldap_modify_ext_s( void *ld, const char *dn, LDAPModU **mods, LDAPControlU **serverctrls, +static int CDECL wrap_ldap_modify_ext_s( void *ld, const char *dn, LDAPModU **mods, LDAPControlU **serverctrls, LDAPControlU **clientctrls ) { return ldap_modify_ext_s( ld, dn ? dn : "", mods ? (LDAPMod **)mods : nullmods, (LDAPControl **)serverctrls, (LDAPControl **)clientctrls ); } -int CDECL wrap_ldap_msgfree( void *msg ) +static int CDECL wrap_ldap_msgfree( void *msg ) { return ldap_msgfree( msg ); } -char * CDECL wrap_ldap_next_attribute( void *ld, void *entry, void *ber ) +static char * CDECL wrap_ldap_next_attribute( void *ld, void *entry, void *ber ) { return ldap_next_attribute( ld, entry, ber ); } -void * CDECL wrap_ldap_next_entry( void *ld, void *entry ) +static void * CDECL wrap_ldap_next_entry( void *ld, void *entry ) { return ldap_next_entry( ld, entry ); } -void * CDECL wrap_ldap_next_reference( void *ld, void *entry ) +static void * CDECL wrap_ldap_next_reference( void *ld, void *entry ) { return ldap_next_reference( ld, entry ); } -int CDECL wrap_ldap_parse_extended_result( void *ld, void *result, char **retoid, struct bervalU **retdata, int free ) +static int CDECL wrap_ldap_parse_extended_result( void *ld, void *result, char **retoid, struct bervalU **retdata, int free ) { return ldap_parse_extended_result( ld, result, retoid, (struct berval **)retdata, free ); } -int CDECL wrap_ldap_parse_reference( void *ld, void *ref, char ***referrals, LDAPControlU ***serverctrls, int free ) +static int CDECL wrap_ldap_parse_reference( void *ld, void *ref, char ***referrals, LDAPControlU ***serverctrls, int free ) { return ldap_parse_reference( ld, ref, referrals, (LDAPControl ***)serverctrls, free ); } -int CDECL wrap_ldap_parse_result( void *ld, void *res, int *errcode, char **matcheddn, char **errmsg, +static int CDECL wrap_ldap_parse_result( void *ld, void *res, int *errcode, char **matcheddn, char **errmsg, char ***referrals, LDAPControlU ***serverctrls, int free ) { return ldap_parse_result( ld, res, errcode, matcheddn, errmsg, referrals, (LDAPControl ***)serverctrls, free ); } -int CDECL wrap_ldap_parse_sortresponse_control( void *ld, LDAPControlU *ctrl, int *result, char **attr ) +static int CDECL wrap_ldap_parse_sortresponse_control( void *ld, LDAPControlU *ctrl, int *result, char **attr ) { return ldap_parse_sortresponse_control( ld, (LDAPControl *)ctrl, result, attr ); } -int CDECL wrap_ldap_parse_vlvresponse_control( void *ld, LDAPControlU *ctrls, int *target_pos, int *list_count, +static int CDECL wrap_ldap_parse_vlvresponse_control( void *ld, LDAPControlU *ctrls, int *target_pos, int *list_count, struct bervalU **ctx, int *errcode ) { return ldap_parse_vlvresponse_control( ld, (LDAPControl *)ctrls, target_pos, list_count, (struct berval **)ctx, errcode ); } -int CDECL wrap_ldap_rename( void *ld, const char *dn, const char *newrdn, const char *newparent, int delete, +static int CDECL wrap_ldap_rename( void *ld, const char *dn, const char *newrdn, const char *newparent, int delete, LDAPControlU **clientctrls, LDAPControlU **serverctrls, ULONG *msg ) { return ldap_rename( ld, dn ? dn : "", newrdn, newparent, delete, (LDAPControl **)clientctrls, (LDAPControl **)serverctrls, (int *)msg ); } -int CDECL wrap_ldap_rename_s( void *ld, const char *dn, const char *newrdn, const char *newparent, int delete, +static int CDECL wrap_ldap_rename_s( void *ld, const char *dn, const char *newrdn, const char *newparent, int delete, LDAPControlU **clientctrls, LDAPControlU **serverctrls ) { return ldap_rename_s( ld, dn ? dn : "", newrdn, newparent, delete, (LDAPControl **)clientctrls, (LDAPControl **)serverctrls ); } -int CDECL wrap_ldap_result( void *ld, int msgid, int all, struct timevalU *timeout, void **result ) +static int CDECL wrap_ldap_result( void *ld, int msgid, int all, struct timevalU *timeout, void **result ) { return ldap_result( ld, msgid, all, (struct timeval *)timeout, (LDAPMessage **)result ); } -int CDECL wrap_ldap_sasl_bind( void *ld, const char *dn, const char *mech, struct bervalU *cred, +static int CDECL wrap_ldap_sasl_bind( void *ld, const char *dn, const char *mech, struct bervalU *cred, LDAPControlU **serverctrls, LDAPControlU **clientctrls, int *msgid ) { return ldap_sasl_bind( ld, dn, mech, (struct berval *)cred, (LDAPControl **)serverctrls, (LDAPControl **)clientctrls, msgid ); } -int CDECL wrap_ldap_sasl_bind_s( void *ld, const char *dn, const char *mech, struct bervalU *cred, +static int CDECL wrap_ldap_sasl_bind_s( void *ld, const char *dn, const char *mech, struct bervalU *cred, LDAPControlU **serverctrls, LDAPControlU **clientctrls, struct bervalU **servercred ) { return ldap_sasl_bind_s( ld, dn, mech, (struct berval *)cred, (LDAPControl **)serverctrls, @@ -559,14 +559,14 @@ static int wrap_sasl_interact( LDAP *ld, unsigned int flags, void *defaults, voi return -1; } -int CDECL wrap_ldap_sasl_interactive_bind_s( void *ld, const char *dn, const char *mech, LDAPControlU **serverctrls, +static int CDECL wrap_ldap_sasl_interactive_bind_s( void *ld, const char *dn, const char *mech, LDAPControlU **serverctrls, LDAPControlU **clientctrls, unsigned int flags, void *defaults ) { return ldap_sasl_interactive_bind_s( ld, dn, mech, (LDAPControl **)serverctrls, (LDAPControl **)clientctrls, flags, wrap_sasl_interact, defaults ); } -int CDECL wrap_ldap_search_ext( void *ld, const char *base, int scope, const char *filter, char **attrs, int attrsonly, +static int CDECL wrap_ldap_search_ext( void *ld, const char *base, int scope, const char *filter, char **attrs, int attrsonly, LDAPControlU **serverctrls, LDAPControlU **clientctrls, struct timevalU *timeout, int sizelimit, ULONG *msg ) { @@ -574,7 +574,7 @@ int CDECL wrap_ldap_search_ext( void *ld, const char *base, int scope, const cha (LDAPControl **)clientctrls, (struct timeval *)timeout, sizelimit, (int *)msg ); } -int CDECL wrap_ldap_search_ext_s( void *ld, const char *base, int scope, const char *filter, char **attrs, +static int CDECL wrap_ldap_search_ext_s( void *ld, const char *base, int scope, const char *filter, char **attrs, int attrsonly, LDAPControlU **serverctrls, LDAPControlU **clientctrls, struct timevalU *timeout, int sizelimit, void **result ) { @@ -583,27 +583,27 @@ int CDECL wrap_ldap_search_ext_s( void *ld, const char *base, int scope, const c (LDAPMessage **)result ); } -int CDECL wrap_ldap_set_option( void *ld, int option, const void *value ) +static int CDECL wrap_ldap_set_option( void *ld, int option, const void *value ) { return ldap_set_option( ld, option, value ); } -int CDECL wrap_ldap_start_tls_s( void *ld, LDAPControlU **serverctrls, LDAPControlU **clientctrls ) +static int CDECL wrap_ldap_start_tls_s( void *ld, LDAPControlU **serverctrls, LDAPControlU **clientctrls ) { return ldap_start_tls_s( ld, (LDAPControl **)serverctrls, (LDAPControl **)clientctrls ); } -int CDECL wrap_ldap_unbind_ext( void *ld, LDAPControlU **serverctrls, LDAPControlU **clientctrls ) +static int CDECL wrap_ldap_unbind_ext( void *ld, LDAPControlU **serverctrls, LDAPControlU **clientctrls ) { return ldap_unbind_ext( ld, (LDAPControl **)serverctrls, (LDAPControl **)clientctrls ); } -int CDECL wrap_ldap_unbind_ext_s( void *ld, LDAPControlU **serverctrls, LDAPControlU **clientctrls ) +static int CDECL wrap_ldap_unbind_ext_s( void *ld, LDAPControlU **serverctrls, LDAPControlU **clientctrls ) { return ldap_unbind_ext_s( ld, (LDAPControl **)serverctrls, (LDAPControl **)clientctrls ); } -void CDECL wrap_ldap_value_free_len( struct bervalU **values ) +static void CDECL wrap_ldap_value_free_len( struct bervalU **values ) { ldap_value_free_len( (struct berval **)values ); } diff --git a/dlls/wldap32/libldap.h b/dlls/wldap32/libldap.h index 3d2719452c4..d0c37ab498d 100644 --- a/dlls/wldap32/libldap.h +++ b/dlls/wldap32/libldap.h @@ -100,88 +100,6 @@ typedef struct sasl_interactU unsigned int len; } sasl_interact_tU; -extern void * CDECL wrap_ber_alloc_t(int) DECLSPEC_HIDDEN; -extern void CDECL wrap_ber_bvecfree(struct bervalU **) DECLSPEC_HIDDEN; -extern void CDECL wrap_ber_bvfree(struct bervalU *) DECLSPEC_HIDDEN; -extern unsigned int CDECL wrap_ber_first_element(void *, unsigned int *, char **) DECLSPEC_HIDDEN; -extern int CDECL wrap_ber_flatten(void *, struct bervalU **) DECLSPEC_HIDDEN; -extern void CDECL wrap_ber_free(void *, int) DECLSPEC_HIDDEN; -extern void * CDECL wrap_ber_init(struct bervalU *) DECLSPEC_HIDDEN; -extern unsigned int CDECL wrap_ber_next_element(void *, unsigned int *, char *) DECLSPEC_HIDDEN; -extern unsigned int CDECL wrap_ber_peek_tag(void *, unsigned int *) DECLSPEC_HIDDEN; -extern unsigned int CDECL wrap_ber_skip_tag(void *, unsigned int *) DECLSPEC_HIDDEN; -extern int WINAPIV wrap_ber_printf(void *, char *, ...) DECLSPEC_HIDDEN; -extern int WINAPIV wrap_ber_scanf(void *, char *, ...) DECLSPEC_HIDDEN; - -extern int CDECL wrap_ldap_abandon_ext(void *, int, LDAPControlU **, LDAPControlU **) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_add_ext(void *, const char *, LDAPModU **, LDAPControlU **, LDAPControlU **, - ULONG *) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_add_ext_s(void *, const char *, LDAPModU **, LDAPControlU **, - LDAPControlU **) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_compare_ext(void *, const char *, const char *, struct bervalU *, LDAPControlU **, - LDAPControlU **, ULONG *) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_compare_ext_s(void *, const char *, const char *, struct bervalU *, LDAPControlU **, - LDAPControlU **) DECLSPEC_HIDDEN; -extern void CDECL wrap_ldap_control_free(LDAPControlU *) DECLSPEC_HIDDEN; -extern void CDECL wrap_ldap_controls_free(LDAPControlU **) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_count_entries(void *, void *) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_count_references(void *, void *) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_count_values_len(struct bervalU **) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_create_sort_control(void *, LDAPSortKeyU **, int, LDAPControlU **) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_create_vlv_control(void *, LDAPVLVInfoU *, LDAPControlU **) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_delete_ext(void *, const char *, LDAPControlU **, LDAPControlU **, ULONG *) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_delete_ext_s(void *, const char *, LDAPControlU **, LDAPControlU **) DECLSPEC_HIDDEN; -extern char * CDECL wrap_ldap_dn2ufn(const char *) DECLSPEC_HIDDEN; -extern char ** CDECL wrap_ldap_explode_dn(const char *, int) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_extended_operation(void *, const char *, struct bervalU *, LDAPControlU **, - LDAPControlU **, ULONG *) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_extended_operation_s(void *, const char *, struct bervalU *, LDAPControlU **, - LDAPControlU **, char **, struct bervalU **) DECLSPEC_HIDDEN; -extern char * CDECL wrap_ldap_get_dn(void *, void *) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_get_option(void *, int, void *) DECLSPEC_HIDDEN; -extern struct bervalU ** CDECL wrap_ldap_get_values_len(void *, void *, const char *) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_initialize(void **, const char *) DECLSPEC_HIDDEN; -extern char * CDECL wrap_ldap_first_attribute(void *, void *, void **) DECLSPEC_HIDDEN; -extern void * CDECL wrap_ldap_first_entry(void *, void *) DECLSPEC_HIDDEN; -extern void * CDECL wrap_ldap_first_reference(void *, void *) DECLSPEC_HIDDEN; -extern void CDECL wrap_ldap_memfree(void *) DECLSPEC_HIDDEN; -extern void CDECL wrap_ldap_memvfree(void **) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_modify_ext(void *, const char *, LDAPModU **, LDAPControlU **, LDAPControlU **, - ULONG *) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_modify_ext_s(void *, const char *, LDAPModU **, LDAPControlU **, - LDAPControlU **) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_msgfree(void *) DECLSPEC_HIDDEN; -extern char * CDECL wrap_ldap_next_attribute(void *, void *, void *) DECLSPEC_HIDDEN; -extern void * CDECL wrap_ldap_next_entry(void *, void *) DECLSPEC_HIDDEN; -extern void * CDECL wrap_ldap_next_reference(void *, void *) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_parse_extended_result(void *, void *, char **, struct bervalU **, int) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_parse_reference(void *, void *, char ***, LDAPControlU ***, int) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_parse_result(void *, void *, int *, char **, char **, char ***, LDAPControlU ***, - int) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_parse_sortresponse_control(void *, LDAPControlU *, int *, char **) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_parse_vlvresponse_control(void *, LDAPControlU *, int *, int *, struct bervalU **, - int *) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_rename(void *, const char *, const char *, const char *, int, LDAPControlU **, - LDAPControlU **, ULONG *) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_rename_s(void *, const char *, const char *, const char *, int, LDAPControlU **, - LDAPControlU **) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_result(void *, int, int, struct timevalU *, void **) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_sasl_bind(void *, const char *, const char *, struct bervalU *, LDAPControlU **, - LDAPControlU **, int *) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_sasl_bind_s(void *, const char *, const char *, struct bervalU *, LDAPControlU **, - LDAPControlU **, struct bervalU **) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_sasl_interactive_bind_s(void *, const char *, const char *, LDAPControlU **, - LDAPControlU **, unsigned int, void *) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_search_ext(void *, const char *, int, const char *, char **, int, LDAPControlU **, - LDAPControlU **, struct timevalU *, int, ULONG *) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_search_ext_s(void *, const char *, int, const char *, char **, int, LDAPControlU **, - LDAPControlU **, struct timevalU *, int, void **) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_set_option(void *, int, const void *) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_start_tls_s(void *, LDAPControlU **, LDAPControlU **) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_unbind_ext(void *, LDAPControlU **, LDAPControlU **) DECLSPEC_HIDDEN; -extern int CDECL wrap_ldap_unbind_ext_s(void *, LDAPControlU **, LDAPControlU **) DECLSPEC_HIDDEN; -extern void CDECL wrap_ldap_value_free_len(struct bervalU **) DECLSPEC_HIDDEN; - struct ldap_funcs { void * (CDECL *fn_ber_alloc_t)(int); -- 2.20.1

1 0

[PATCH] wined3d: Fix the spelling of a comment.
by Francois Gouget 26 Aug '21

26 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wined3d/query.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 53a6b0ffca0..9abea2cb1f5 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1682,9 +1682,9 @@ static BOOL wined3d_query_vk_issue(struct wined3d_query *query, uint32_t flags) return false; } - /* A query need to either begin and end inside a single render pass, - * or begin and end ouside of a render pass. Occlusion queries, if issued - * ouside of a render pass, are queued up and only begun when a render + /* A query needs to either begin and end inside a single render pass, + * or begin and end outside of a render pass. Occlusion queries, if issued + * outside of a render pass, are queued up and only begun when a render * pass is started, to avoid interrupting it when the query ends. */ if (context_vk->vk_render_pass) { -- 2.20.1

1 0

[PATCH] include: Fix the spelling of a comment.
by Francois Gouget 26 Aug '21

26 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- include/ntgdi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ntgdi.h b/include/ntgdi.h index 66611b38fb0..845f85601fd 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -131,7 +131,7 @@ enum typedef struct DC_ATTR { HDC hdc; /* handle to self */ - LONG disabled; /* disabled flag, controled by DCHF_(DISABLE|ENABLE)DC */ + LONG disabled; /* disabled flag, controlled by DCHF_(DISABLE|ENABLE)DC */ int save_level; COLORREF background_color; COLORREF brush_color; -- 2.20.1

1 0

[PATCH 4/7] gdi32: Support passing an array of chars to NtGdiGetCharWidthW.
by Jacek Caban 26 Aug '21

26 Aug '21

And use it for GetCharWidthA. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/driver.c | 3 ++- dlls/gdi32/font.c | 29 ++++++++++++++++------------- dlls/gdi32/text.c | 38 ++++++++++++-------------------------- dlls/wineps.drv/builtin.c | 24 +++++++++++++----------- dlls/wineps.drv/psdrv.h | 2 +- include/wine/gdi_driver.h | 4 ++-- 6 files changed, 46 insertions(+), 54 deletions(-)

2 1

[PATCH v2 7/7] gdi32: Use NtGdiGetCharWidthW for GetCharWidthI.
by Huw Davies 26 Aug '21

26 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 67 ++++++++++++++++------------------------------- dlls/gdi32/text.c | 10 +++++++ 2 files changed, 33 insertions(+), 44 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 4faaaacdfce..e80143066b5 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -4872,9 +4872,30 @@ BOOL WINAPI NtGdiGetCharWidthW( HDC hdc, UINT first, UINT last, WCHAR *chars, UINT i, count = last; BOOL ret; PHYSDEV dev; - DC * dc = get_dc_ptr( hdc ); + DC *dc; - if (!dc) return FALSE; + if (flags & NTGDI_GETCHARWIDTH_INDICES) + { + ABC *abc; + unsigned int i; + + if (!(abc = HeapAlloc(GetProcessHeap(), 0, count * sizeof(ABC)))) + return FALSE; + + if (!GetCharABCWidthsI( hdc, first, last, chars, abc )) + { + HeapFree( GetProcessHeap(), 0, abc ); + return FALSE; + } + + for (i = 0; i < count; i++) + ((INT *)buf)[i] = abc[i].abcA + abc[i].abcB + abc[i].abcC; + + HeapFree(GetProcessHeap(), 0, abc); + return TRUE; + } + + if (!(dc = get_dc_ptr( hdc ))) return FALSE; if (!chars) count = last - first + 1; dev = GET_DC_PHYSDEV( dc, pGetCharWidth ); @@ -7114,48 +7135,6 @@ BOOL WINAPI EnableEUDC(BOOL fEnableEUDC) return FALSE; } -/*********************************************************************** - * GetCharWidthI (GDI32.@) - * - * Retrieve widths of characters. - * - * PARAMS - * hdc [I] Handle to a device context. - * first [I] First glyph in range to query. - * count [I] Number of glyph indices to query. - * glyphs [I] Array of glyphs to query. - * buffer [O] Buffer to receive character widths. - * - * NOTES - * Only works with TrueType fonts. - * - * RETURNS - * Success: TRUE - * Failure: FALSE - */ -BOOL WINAPI GetCharWidthI(HDC hdc, UINT first, UINT count, LPWORD glyphs, LPINT buffer) -{ - ABC *abc; - unsigned int i; - - TRACE("(%p, %d, %d, %p, %p)\n", hdc, first, count, glyphs, buffer); - - if (!(abc = HeapAlloc(GetProcessHeap(), 0, count * sizeof(ABC)))) - return FALSE; - - if (!GetCharABCWidthsI(hdc, first, count, glyphs, abc)) - { - HeapFree(GetProcessHeap(), 0, abc); - return FALSE; - } - - for (i = 0; i < count; i++) - buffer[i] = abc[i].abcA + abc[i].abcB + abc[i].abcC; - - HeapFree(GetProcessHeap(), 0, abc); - return TRUE; -} - /*********************************************************************** * GetFontUnicodeRanges (GDI32.@) * diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index b31196252ad..c3d72938eba 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1672,3 +1672,13 @@ BOOL WINAPI GetCharWidthFloatA( HDC hdc, UINT first, UINT last, float *buffer ) HeapFree( GetProcessHeap(), 0, chars ); return ret; } + +/*********************************************************************** + * GetCharWidthI (GDI32.@) + */ +BOOL WINAPI GetCharWidthI( HDC hdc, UINT first, UINT count, WORD *glyphs, INT *buffer ) +{ + TRACE( "(%p, %d, %d, %p, %p)\n", hdc, first, count, glyphs, buffer ); + return NtGdiGetCharWidthW( hdc, first, count, glyphs, + NTGDI_GETCHARWIDTH_INT | NTGDI_GETCHARWIDTH_INDICES, buffer ); +} -- 2.23.0

1 0

[PATCH v2 6/7] gdi32: Use NtGdiGetCharWidthW for GetCharWidthFloatA.
by Huw Davies 26 Aug '21

26 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 26 -------------------------- dlls/gdi32/text.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 26 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index cbf3f6fb555..4faaaacdfce 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -6443,32 +6443,6 @@ done: return ret; } -/************************************************************************* - * GetCharWidthFloatA [GDI32.@] - */ -BOOL WINAPI GetCharWidthFloatA( HDC hdc, UINT first, UINT last, float *buffer ) -{ - WCHAR *wstr; - int i, wlen; - char *str; - - if (!(str = FONT_GetCharsByRangeA( hdc, first, last, &i ))) - return FALSE; - wstr = FONT_mbtowc( hdc, str, i, &wlen, NULL ); - heap_free(str); - - for (i = 0; i < wlen; ++i) - { - if (!GetCharWidthFloatW( hdc, wstr[i], wstr[i], &buffer[i] )) - { - heap_free(wstr); - return FALSE; - } - } - heap_free(wstr); - return TRUE; -} - /*********************************************************************** * * * Font Resource API * diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index b753dac7052..b31196252ad 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1657,3 +1657,18 @@ BOOL WINAPI GetCharWidthFloatW( HDC hdc, UINT first, UINT last, float *buffer ) { return NtGdiGetCharWidthW( hdc, first, last, NULL, 0, buffer ); } + +/*********************************************************************** + * GetCharWidthFloatA (GDI32.@) + */ +BOOL WINAPI GetCharWidthFloatA( HDC hdc, UINT first, UINT last, float *buffer ) +{ + WCHAR *chars; + INT count; + BOOL ret; + + if (!(chars = get_chars_by_range( hdc, first, last, &count ))) return FALSE; + ret = NtGdiGetCharWidthW( hdc, 0, count, chars, 0, buffer ); + HeapFree( GetProcessHeap(), 0, chars ); + return ret; +} -- 2.23.0

1 0

[PATCH v2 5/7] gdi32: Use NtGdiGetCharWidthW for GetCharWidthFloatW.
by Huw Davies 26 Aug '21

26 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 50 ++++++++++++----------------------------------- dlls/gdi32/text.c | 8 ++++++++ 2 files changed, 21 insertions(+), 37 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 7e4d67af8ae..cbf3f6fb555 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -4882,10 +4882,19 @@ BOOL WINAPI NtGdiGetCharWidthW( HDC hdc, UINT first, UINT last, WCHAR *chars, if (ret) { - INT *buffer = buf; - /* convert device units to logical */ - for (i = 0; i < count; i++) - buffer[i] = width_to_LP( dc, buffer[i] ); + if (flags & NTGDI_GETCHARWIDTH_INT) + { + INT *buffer = buf; + /* convert device units to logical */ + for (i = 0; i < count; i++) + buffer[i] = width_to_LP( dc, buffer[i] ); + } + else + { + float scale = fabs( dc->xformVport2World.eM11 ) / 16.0f; + for (i = 0; i < count; i++) + ((float *)buf)[i] = ((int *)buf)[i] * scale; + } } release_dc_ptr( dc ); return ret; @@ -6460,39 +6469,6 @@ BOOL WINAPI GetCharWidthFloatA( HDC hdc, UINT first, UINT last, float *buffer ) return TRUE; } -/************************************************************************* - * GetCharWidthFloatW [GDI32.@] - */ -BOOL WINAPI GetCharWidthFloatW( HDC hdc, UINT first, UINT last, float *buffer ) -{ - DC *dc = get_dc_ptr( hdc ); - int *ibuffer; - PHYSDEV dev; - BOOL ret; - UINT i; - - TRACE("dc %p, first %#x, last %#x, buffer %p\n", dc, first, last, buffer); - - if (!dc) return FALSE; - - if (!(ibuffer = heap_alloc( (last - first + 1) * sizeof(int) ))) - { - release_dc_ptr( dc ); - return FALSE; - } - - dev = GET_DC_PHYSDEV( dc, pGetCharWidth ); - if ((ret = dev->funcs->pGetCharWidth( dev, first, last - first + 1, NULL, ibuffer ))) - { - float scale = fabs( dc->xformVport2World.eM11 ) / 16.0f; - for (i = first; i <= last; ++i) - buffer[i - first] = ibuffer[i - first] * scale; - } - - heap_free(ibuffer); - return ret; -} - /*********************************************************************** * * * Font Resource API * diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 0bb47f00c24..b753dac7052 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1649,3 +1649,11 @@ BOOL WINAPI GetCharWidth32A( HDC hdc, UINT first, UINT last, INT *buffer ) HeapFree( GetProcessHeap(), 0, chars ); return ret; } + +/*********************************************************************** + * GetCharWidthFloatW (GDI32.@) + */ +BOOL WINAPI GetCharWidthFloatW( HDC hdc, UINT first, UINT last, float *buffer ) +{ + return NtGdiGetCharWidthW( hdc, first, last, NULL, 0, buffer ); +} -- 2.23.0

1 0

[PATCH v2 4/7] gdi32: Support passing an array of chars to NtGdiGetCharWidthW.
by Huw Davies 26 Aug '21

26 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> And use it for GetCharWidthA. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/driver.c | 3 ++- dlls/gdi32/font.c | 29 ++++++++++++++++------------- dlls/gdi32/text.c | 38 ++++++++++++-------------------------- dlls/wineps.drv/builtin.c | 24 +++++++++++++----------- dlls/wineps.drv/psdrv.h | 2 +- include/wine/gdi_driver.h | 4 ++-- 6 files changed, 46 insertions(+), 54 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index f370d088585..3d64eedc638 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -380,7 +380,8 @@ static BOOL CDECL nulldrv_GetCharABCWidthsI( PHYSDEV dev, UINT first, UINT count return FALSE; } -static BOOL CDECL nulldrv_GetCharWidth( PHYSDEV dev, UINT first, UINT last, INT *buffer ) +static BOOL CDECL nulldrv_GetCharWidth( PHYSDEV dev, UINT first, UINT count, + const WCHAR *chars, INT *buffer ) { return FALSE; } diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index c88e69ef013..7e4d67af8ae 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3089,27 +3089,29 @@ static BOOL CDECL font_GetCharABCWidthsI( PHYSDEV dev, UINT first, UINT count, W /************************************************************* * font_GetCharWidth */ -static BOOL CDECL font_GetCharWidth( PHYSDEV dev, UINT first, UINT last, INT *buffer ) +static BOOL CDECL font_GetCharWidth( PHYSDEV dev, UINT first, UINT count, + const WCHAR *chars, INT *buffer ) { struct font_physdev *physdev = get_font_dev( dev ); + UINT c, i; ABC abc; - UINT c; if (!physdev->font) { dev = GET_NEXT_PHYSDEV( dev, pGetCharWidth ); - return dev->funcs->pGetCharWidth( dev, first, last, buffer ); + return dev->funcs->pGetCharWidth( dev, first, count, chars, buffer ); } - TRACE( "%p, %d, %d, %p\n", physdev->font, first, last, buffer ); + TRACE( "%p, %d, %d, %p\n", physdev->font, first, count, buffer ); EnterCriticalSection( &font_cs ); - for (c = first; c <= last; c++) + for (i = 0; i < count; i++) { + c = chars ? chars[i] : i + first; if (get_glyph_outline( physdev->font, c, GGO_METRICS, NULL, &abc, 0, NULL, NULL ) == GDI_ERROR) - buffer[c - first] = 0; + buffer[i] = 0; else - buffer[c - first] = abc.abcA + abc.abcB + abc.abcC; + buffer[i] = abc.abcA + abc.abcB + abc.abcC; } LeaveCriticalSection( &font_cs ); return TRUE; @@ -4864,25 +4866,26 @@ static LPSTR FONT_GetCharsByRangeA(HDC hdc, UINT firstChar, UINT lastChar, PINT /*********************************************************************** * NtGdiGetCharWidthW (win32u.@) */ -BOOL WINAPI NtGdiGetCharWidthW( HDC hdc, UINT firstChar, UINT lastChar, WCHAR *chars, +BOOL WINAPI NtGdiGetCharWidthW( HDC hdc, UINT first, UINT last, WCHAR *chars, ULONG flags, void *buf ) { - UINT i; + UINT i, count = last; BOOL ret; PHYSDEV dev; DC * dc = get_dc_ptr( hdc ); if (!dc) return FALSE; + if (!chars) count = last - first + 1; dev = GET_DC_PHYSDEV( dc, pGetCharWidth ); - ret = dev->funcs->pGetCharWidth( dev, firstChar, lastChar, buf ); + ret = dev->funcs->pGetCharWidth( dev, first, count, chars, buf ); if (ret) { INT *buffer = buf; /* convert device units to logical */ - for( i = firstChar; i <= lastChar; i++, buffer++ ) - *buffer = width_to_LP( dc, *buffer ); + for (i = 0; i < count; i++) + buffer[i] = width_to_LP( dc, buffer[i] ); } release_dc_ptr( dc ); return ret; @@ -6479,7 +6482,7 @@ BOOL WINAPI GetCharWidthFloatW( HDC hdc, UINT first, UINT last, float *buffer ) } dev = GET_DC_PHYSDEV( dc, pGetCharWidth ); - if ((ret = dev->funcs->pGetCharWidth( dev, first, last, ibuffer ))) + if ((ret = dev->funcs->pGetCharWidth( dev, first, last - first + 1, NULL, ibuffer ))) { float scale = fabs( dc->xformVport2World.eM11 ) / 16.0f; for (i = first; i <= last; ++i) diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 167aa5cc07d..0bb47f00c24 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1580,12 +1580,13 @@ BOOL WINAPI GetCharWidth32W( HDC hdc, UINT first, UINT last, INT *buffer ) return NtGdiGetCharWidthW( hdc, first, last, NULL, NTGDI_GETCHARWIDTH_INT, buffer ); } -static char *get_chars_by_range( HDC hdc, UINT first, UINT last, INT *byte_len ) +static WCHAR *get_chars_by_range( HDC hdc, UINT first, UINT last, INT *ret_len ) { INT i, count = last - first + 1; + WCHAR *wstr; + char *str; UINT mbcp; UINT c; - LPSTR str; if (count <= 0) return NULL; @@ -1628,8 +1629,9 @@ static char *get_chars_by_range( HDC hdc, UINT first, UINT last, INT *byte_len ) } str[i] = '\0'; - *byte_len = i; - return str; + wstr = text_mbtowc( hdc, str, i, ret_len, NULL ); + HeapFree( GetProcessHeap(), 0, str ); + return wstr; } /*********************************************************************** @@ -1638,28 +1640,12 @@ static char *get_chars_by_range( HDC hdc, UINT first, UINT last, INT *byte_len ) */ BOOL WINAPI GetCharWidth32A( HDC hdc, UINT first, UINT last, INT *buffer ) { - INT i, wlen; - LPSTR str; - LPWSTR wstr; - BOOL ret = TRUE; - - str = get_chars_by_range( hdc, first, last, &i ); - if (str == NULL) - return FALSE; - - wstr = text_mbtowc( hdc, str, i, &wlen, NULL ); - - for(i = 0; i < wlen; i++) - { - if(!GetCharWidth32W( hdc, wstr[i], wstr[i], buffer )) - { - ret = FALSE; - break; - } - buffer++; - } + WCHAR *chars; + INT count; + BOOL ret; - HeapFree( GetProcessHeap(), 0, str ); - HeapFree( GetProcessHeap(), 0, wstr ); + if (!(chars = get_chars_by_range( hdc, first, last, &count ))) return FALSE; + ret = NtGdiGetCharWidthW( hdc, 0, count, chars, NTGDI_GETCHARWIDTH_INT, buffer ); + HeapFree( GetProcessHeap(), 0, chars ); return ret; } diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index 22397567aa4..11ba2154148 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -343,28 +343,30 @@ BOOL CDECL PSDRV_GetTextExtentExPoint(PHYSDEV dev, LPCWSTR str, INT count, LPINT /*********************************************************************** * PSDRV_GetCharWidth */ -BOOL CDECL PSDRV_GetCharWidth(PHYSDEV dev, UINT firstChar, UINT lastChar, LPINT buffer) +BOOL CDECL PSDRV_GetCharWidth(PHYSDEV dev, UINT first, UINT count, const WCHAR *chars, INT *buffer) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); - UINT i; + UINT i, c; if (physDev->font.fontloc == Download) { dev = GET_NEXT_PHYSDEV( dev, pGetCharWidth ); - return dev->funcs->pGetCharWidth( dev, firstChar, lastChar, buffer ); + return dev->funcs->pGetCharWidth( dev, first, count, chars, buffer ); } - TRACE("U+%.4X U+%.4X\n", firstChar, lastChar); + TRACE("U+%.4X +%u\n", first, count); - if (lastChar > 0xffff || firstChar > lastChar) + for (i = 0; i < count; ++i) { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + c = chars ? chars[i] : first + i; - for (i = firstChar; i <= lastChar; ++i) - { - *buffer = floor( PSDRV_UVMetrics(i, physDev->font.fontinfo.Builtin.afm)->WX + if (c > 0xffff) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + *buffer = floor( PSDRV_UVMetrics(c, physDev->font.fontinfo.Builtin.afm)->WX * physDev->font.fontinfo.Builtin.scale + 0.5 ); TRACE("U+%.4X: %i\n", i, *buffer); ++buffer; diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 84828a5c9ce..db7c6e37f7c 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -439,7 +439,7 @@ extern INT CDECL PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID extern BOOL CDECL PSDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR str, UINT count, const INT *lpDx ) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL PSDRV_GetCharWidth(PHYSDEV dev, UINT firstChar, UINT lastChar, LPINT buffer) DECLSPEC_HIDDEN; +extern BOOL CDECL PSDRV_GetCharWidth(PHYSDEV dev, UINT first, UINT count, const WCHAR *chars, INT *buffer) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_GetTextExtentExPoint(PHYSDEV dev, LPCWSTR str, INT count, LPINT alpDx) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_GetTextMetrics(PHYSDEV dev, TEXTMETRICW *metrics) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_LineTo(PHYSDEV dev, INT x, INT y) DECLSPEC_HIDDEN; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 5ca84ccf56c..6db6cf94b70 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -99,7 +99,7 @@ struct gdi_dc_funcs UINT (CDECL *pGetBoundsRect)(PHYSDEV,RECT*,UINT); BOOL (CDECL *pGetCharABCWidths)(PHYSDEV,UINT,UINT,LPABC); BOOL (CDECL *pGetCharABCWidthsI)(PHYSDEV,UINT,UINT,WORD*,LPABC); - BOOL (CDECL *pGetCharWidth)(PHYSDEV,UINT,UINT,LPINT); + BOOL (CDECL *pGetCharWidth)(PHYSDEV,UINT,UINT,const WCHAR*,LPINT); BOOL (CDECL *pGetCharWidthInfo)(PHYSDEV,void*); INT (CDECL *pGetDeviceCaps)(PHYSDEV,INT); BOOL (CDECL *pGetDeviceGammaRamp)(PHYSDEV,LPVOID); @@ -169,7 +169,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 64 +#define WINE_GDI_DRIVER_VERSION 65 #define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */ -- 2.23.0

1 0

[PATCH v2 3/7] gdi32: Use NtGdiGetCharWidthW for GetCharWidth.
by Huw Davies 26 Aug '21

26 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 45 +++-------------------- dlls/gdi32/text.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++ include/ntgdi.h | 6 ++- 3 files changed, 103 insertions(+), 41 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index cdd3ca24034..c88e69ef013 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -4862,11 +4862,10 @@ static LPSTR FONT_GetCharsByRangeA(HDC hdc, UINT firstChar, UINT lastChar, PINT } /*********************************************************************** - * GetCharWidthW (GDI32.@) - * GetCharWidth32W (GDI32.@) + * NtGdiGetCharWidthW (win32u.@) */ -BOOL WINAPI GetCharWidth32W( HDC hdc, UINT firstChar, UINT lastChar, - LPINT buffer ) +BOOL WINAPI NtGdiGetCharWidthW( HDC hdc, UINT firstChar, UINT lastChar, WCHAR *chars, + ULONG flags, void *buf ) { UINT i; BOOL ret; @@ -4876,10 +4875,11 @@ BOOL WINAPI GetCharWidth32W( HDC hdc, UINT firstChar, UINT lastChar, if (!dc) return FALSE; dev = GET_DC_PHYSDEV( dc, pGetCharWidth ); - ret = dev->funcs->pGetCharWidth( dev, firstChar, lastChar, buffer ); + ret = dev->funcs->pGetCharWidth( dev, firstChar, lastChar, buf ); if (ret) { + INT *buffer = buf; /* convert device units to logical */ for( i = firstChar; i <= lastChar; i++, buffer++ ) *buffer = width_to_LP( dc, *buffer ); @@ -4889,41 +4889,6 @@ BOOL WINAPI GetCharWidth32W( HDC hdc, UINT firstChar, UINT lastChar, } -/*********************************************************************** - * GetCharWidthA (GDI32.@) - * GetCharWidth32A (GDI32.@) - */ -BOOL WINAPI GetCharWidth32A( HDC hdc, UINT firstChar, UINT lastChar, - LPINT buffer ) -{ - INT i, wlen; - LPSTR str; - LPWSTR wstr; - BOOL ret = TRUE; - - str = FONT_GetCharsByRangeA(hdc, firstChar, lastChar, &i); - if(str == NULL) - return FALSE; - - wstr = FONT_mbtowc(hdc, str, i, &wlen, NULL); - - for(i = 0; i < wlen; i++) - { - if(!GetCharWidth32W(hdc, wstr[i], wstr[i], buffer)) - { - ret = FALSE; - break; - } - buffer++; - } - - HeapFree(GetProcessHeap(), 0, str); - HeapFree(GetProcessHeap(), 0, wstr); - - return ret; -} - - /* helper for nulldrv_ExtTextOut */ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT flags, UINT aa_flags, GLYPHMETRICS *metrics, struct gdi_image_bits *image ) diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index acc796fce30..167aa5cc07d 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1570,3 +1570,96 @@ UINT WINAPI GetOutlineTextMetricsW( HDC hdc, UINT size, OUTLINETEXTMETRICW *otm { return NtGdiGetOutlineTextMetricsInternalW( hdc, size, otm, 0 ); } + +/*********************************************************************** + * GetCharWidthW (GDI32.@) + * GetCharWidth32W (GDI32.@) + */ +BOOL WINAPI GetCharWidth32W( HDC hdc, UINT first, UINT last, INT *buffer ) +{ + return NtGdiGetCharWidthW( hdc, first, last, NULL, NTGDI_GETCHARWIDTH_INT, buffer ); +} + +static char *get_chars_by_range( HDC hdc, UINT first, UINT last, INT *byte_len ) +{ + INT i, count = last - first + 1; + UINT mbcp; + UINT c; + LPSTR str; + + if (count <= 0) + return NULL; + + mbcp = GdiGetCodePage( hdc ); + switch (mbcp) + { + case 932: + case 936: + case 949: + case 950: + case 1361: + if (last > 0xffff) + return NULL; + if ((first ^ last) > 0xff) + return NULL; + break; + default: + if (last > 0xff) + return NULL; + mbcp = 0; + break; + } + + if (!(str = HeapAlloc( GetProcessHeap(), 0, count * 2 + 1 ))) + return NULL; + + for (i = 0, c = first; c <= last; i++, c++) + { + if (mbcp) { + if (c > 0xff) + str[i++] = (BYTE)(c >> 8); + if (c <= 0xff && IsDBCSLeadByteEx( mbcp, c )) + str[i] = 0x1f; /* FIXME: use default character */ + else + str[i] = (BYTE)c; + } + else + str[i] = (BYTE)c; + } + str[i] = '\0'; + + *byte_len = i; + return str; +} + +/*********************************************************************** + * GetCharWidthA (GDI32.@) + * GetCharWidth32A (GDI32.@) + */ +BOOL WINAPI GetCharWidth32A( HDC hdc, UINT first, UINT last, INT *buffer ) +{ + INT i, wlen; + LPSTR str; + LPWSTR wstr; + BOOL ret = TRUE; + + str = get_chars_by_range( hdc, first, last, &i ); + if (str == NULL) + return FALSE; + + wstr = text_mbtowc( hdc, str, i, &wlen, NULL ); + + for(i = 0; i < wlen; i++) + { + if(!GetCharWidth32W( hdc, wstr[i], wstr[i], buffer )) + { + ret = FALSE; + break; + } + buffer++; + } + + HeapFree( GetProcessHeap(), 0, str ); + HeapFree( GetProcessHeap(), 0, wstr ); + return ret; +} diff --git a/include/ntgdi.h b/include/ntgdi.h index 66611b38fb0..7e75b944e85 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -123,6 +123,9 @@ enum NtGdiSetDIBColorTable, }; +#define NTGDI_GETCHARWIDTH_INT 0x02 +#define NTGDI_GETCHARWIDTH_INDICES 0x08 + #define MWT_SET 4 /* structs not compatible with native Windows */ @@ -227,7 +230,8 @@ INT WINAPI NtGdiGetAppClipBox( HDC hdc, RECT *rect ); BOOL WINAPI NtGdiGetBitmapDimension( HBITMAP bitmap, SIZE *size ); UINT WINAPI NtGdiGetBoundsRect( HDC hdc, RECT *rect, UINT flags ); BOOL WINAPI NtGdiGetCharABCWidthsW( HDC hdc, UINT first_char, UINT last_char, ABC *abc ); -BOOL WINAPI NtGdiGetCharWidthW( HDC hdc, UINT first_char, UINT last_char, INT *buffer ); +BOOL WINAPI NtGdiGetCharWidthW( HDC hdc, UINT first_char, UINT last_char, WCHAR *chars, + ULONG flags, void *buffer ); BOOL WINAPI NtGdiGetDCDword( HDC hdc, UINT method, DWORD *result ); BOOL WINAPI NtGdiGetDCPoint( HDC hdc, UINT method, POINT *result ); INT WINAPI NtGdiGetDeviceCaps( HDC hdc, INT cap ); -- 2.23.0

1 0

[PATCH v2 2/7] gdi32/tests: Use winetest_debug to silence noisy traces.
by Huw Davies 26 Aug '21

26 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/tests/font.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 04fe6afd875..f93e5e5e5d0 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5493,9 +5493,9 @@ static INT CALLBACK enum_ms_shell_dlg_proc(const LOGFONTA *lf, const TEXTMETRICA { struct enum_fullname_data *efnd = (struct enum_fullname_data *)lParam; -if (0) /* Disabled to limit console spam */ - trace("enumed font \"%s\", charset %d, height %d, weight %d, italic %d\n", - lf->lfFaceName, lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); + if (winetest_debug > 2) + trace("enumed font \"%s\", charset %d, height %d, weight %d, italic %d\n", + lf->lfFaceName, lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); if (type != TRUETYPE_FONTTYPE) return 1; if (strcmp(lf->lfFaceName, "MS Shell Dlg") != 0) return 1; @@ -5514,9 +5514,9 @@ static INT CALLBACK enum_ms_shell_dlg2_proc(const LOGFONTA *lf, const TEXTMETRIC { struct enum_fullname_data *efnd = (struct enum_fullname_data *)lParam; -if (0) /* Disabled to limit console spam */ - trace("enumed font \"%s\", charset %d, height %d, weight %d, italic %d\n", - lf->lfFaceName, lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); + if (winetest_debug > 2) + trace("enumed font \"%s\", charset %d, height %d, weight %d, italic %d\n", + lf->lfFaceName, lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); if (type != TRUETYPE_FONTTYPE) return 1; if (strcmp(lf->lfFaceName, "MS Shell Dlg 2") != 0) return 1; -- 2.23.0

1 0

[PATCH v2 1/7] gdi32/tests: Add more char width tests.
by Huw Davies 26 Aug '21

26 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/tests/font.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ef1dc26595d..04fe6afd875 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1127,6 +1127,12 @@ static void ABCWidths_helper(const char* description, HDC hdc, WORD *glyphs, con ok(abc->abcA * base_abci->abcA >= 0, "%s: abcA's sign should be unchanged\n", description); ok(abc->abcC * base_abci->abcC >= 0, "%s: abcC's sign should be unchanged\n", description); + ret = GetCharABCWidthsI(hdc, glyphs[0], 1, NULL, abc); + ok(ret, "%s: GetCharABCWidthsI should have succeeded\n", description); + ok ((INT)abc->abcB > 0, "%s: abcB should be positive\n", description); + ok(abc->abcA * base_abci->abcA >= 0, "%s: abcA's sign should be unchanged\n", description); + ok(abc->abcC * base_abci->abcC >= 0, "%s: abcC's sign should be unchanged\n", description); + ret = GetCharABCWidthsW(hdc, 'i', 'i', abc); ok(ret, "%s: GetCharABCWidthsW should have succeeded\n", description); ok ((INT)abc->abcB > 0, "%s: abcB should be positive\n", description); @@ -7009,8 +7015,9 @@ static void test_GetCharWidthI(void) HFONT hfont, prev_hfont; WORD glyphs[5]; INT widths[5]; + INT width; LOGFONTA lf; - ABC abc[5]; + ABC abc[5], abc1; int len, i; DWORD nb; BOOL ret; @@ -7033,10 +7040,20 @@ static void test_GetCharWidthI(void) ret = GetCharABCWidthsI(hdc, 0, len, glyphs, abc); ok(ret, "GetCharABCWidthsI failed\n"); + memset(&abc1, 0xcc, sizeof(abc1)); + ret = GetCharABCWidthsI(hdc, glyphs[0], 1, NULL, &abc1); + ok(ret, "GetCharABCWidthsI failed\n"); + ok(!memcmp(&abc1, abc, sizeof(abc1)), "unexpected abc1\n"); + memset(widths, 0xcc, sizeof(widths)); ret = GetCharWidthI(hdc, 0, len, glyphs, widths); ok(ret, "GetCharWidthI failed\n"); + width = 0xdeadbeef; + ret = GetCharWidthI(hdc, glyphs[0], 1, NULL, &width); + ok(ret, "GetCharWidthI failed\n"); + ok(width == widths[0], "unexpected width %u\n", width); + for (i = 0; i < len; i++) ok(widths[i] == abc[i].abcA + abc[i].abcB + abc[i].abcC, "%u, glyph %u, got width %d\n", i, glyphs[i], widths[i]); -- 2.23.0

1 0

[PATCH 7/7] msvcp90: Don't use throw_exception helper for bad_alloc exception.
by Piotr Caban 26 Aug '21

26 Aug '21

1 0

[PATCH 6/7] msvcp90: Fix _Xmem and _Nomemory exception message.
by Piotr Caban 26 Aug '21

26 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/exception.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 5/7] msvcp90: Don't use throw_exception helper for rethrow.
by Piotr Caban 26 Aug '21

26 Aug '21

1 0

[PATCH 4/7] msvcp90: Remove MSVCP_SIZE_T_MAX definition.
by Piotr Caban 26 Aug '21

26 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/details.c | 12 ++++++------ dlls/msvcp90/msvcp90.h | 1 - 2 files changed, 6 insertions(+), 7 deletions(-)

1 0

[PATCH 3/7] msvcp90: Always throw bad_alloc exception in operator_new on allocation failure.
by Piotr Caban 26 Aug '21

26 Aug '21

1 0

[PATCH 2/7] msvcp90: Remove MSVCRT_ prefix from new() and delete().
by Piotr Caban 26 Aug '21

26 Aug '21

1 0

[PATCH 1/7] msvcp90: Move Concurrency::details functions to details.c file.
by Piotr Caban 26 Aug '21

26 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp100/Makefile.in | 1 + dlls/msvcp110/Makefile.in | 1 + dlls/msvcp120/Makefile.in | 1 + dlls/msvcp140/Makefile.in | 1 + dlls/msvcp90/details.c | 1133 ++++++++++++++++++++++++++++++++++ dlls/msvcp90/misc.c | 1235 ++----------------------------------- dlls/msvcp90/msvcp90.h | 7 +- dlls/msvcp90/msvcp_main.c | 1 + 8 files changed, 1205 insertions(+), 1175 deletions(-) create mode 100644 dlls/msvcp90/details.c

1 0

[PATCH 1/3] kernel32/tests: Test GetTimeFormatA()'s Unicode to ANSI conversion.
by Francois Gouget 26 Aug '21

26 Aug '21

The ANSI string may be longer than the Unicode one and the return value should reflect that. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/kernel32/tests/locale.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index b83cdc6b956..86aa6ee5b12 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -631,6 +631,32 @@ static void test_GetTimeFormatA(void) curtime.wMonth = 60; ret = GetTimeFormatA(lcid, 0, &curtime, "h:m:s", buffer, ARRAY_SIZE(buffer)); expect_str(ret, buffer, "12:56:13"); + + /* The ANSI string may be longer than the Unicode one. + * In particular, in the Japanese code page, "\x93\xfa" = L"\x65e5". + */ + + lcid = MAKELCID(MAKELANGID(LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN), SORT_DEFAULT); + + ret = GetTimeFormatA(lcid, 0, &curtime, "h\x93\xfa", buffer, 5); + if (broken(1)) /* FIXME Remove once Wine is less broken */ + expect_str(ret, buffer, "12\x93\xfa"); /* only 3+1 WCHARs */ + todo_wine ok(ret == strlen("12\x93\xfa") + 1, "Expected ret %d, got %d\n", strlen("12\x93\xfa") + 1, ret); + ok(strcmp(buffer, "12\x93\xfa") == 0, "Expected '12\x93\xfa', got '%s'\n", buffer); + + ret = GetTimeFormatA(lcid, 0, &curtime, "h\x93\xfa", buffer, 4); + todo_wine expect_err(ret, NULL, ERROR_INSUFFICIENT_BUFFER); + SetLastError(0xdeadbeef); + + ret = GetTimeFormatA(lcid, 0, &curtime, "h\x93\xfa", NULL, 0); + if (broken(1)) /* FIXME Remove once Wine is less broken */ + expect_str(ret, NULL, "12\x93\xfa"); + todo_wine ok(ret == strlen("12\x93\xfa") + 1, "Expected ret %d, got %d\n", strlen("12\x93\xfa") + 1, ret); + + strcpy(buffer, "pristine"); /* clear previous identical result */ + ret = GetTimeFormatA(lcid, 0, &curtime, "h\x93\xfa", buffer, 0); + todo_wine expect_str(ret, NULL, "12\x93\xfa"); + ok(strcmp(buffer, "pristine") == 0, "Expected a pristine buffer, got '%s'\n", buffer); } static void test_GetTimeFormatEx(void) -- 2.20.1

2 4

[PATCH] user32/tests: Fix ASCII / ANSI mixups in dde comments.
by Francois Gouget 26 Aug '21

26 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/user32/tests/dde.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 96cf210d542..ef709369c5d 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -2438,7 +2438,7 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV test_cmd_w_to_a, sizeof(test_cmd_w_to_a), NULL, NULL ); switch (str_index) { - case 0: /* ASCII string */ + case 0: /* ANSI string */ if (unicode_server) { ok(size == size_a_to_w, "Wrong size %d/%d, msg_index=%d\n", size, size_a_to_w, msg_index); @@ -2447,7 +2447,7 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV } else if (unicode_client) { - /* ASCII string mapped W->A -> garbage */ + /* ANSI string mapped W->A -> garbage */ } else { -- 2.20.1

1 0

[PATCH] user32/tests: Fix an ASCII / ANSI mixup in a dde ok() message.
by Francois Gouget 26 Aug '21

26 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/user32/tests/dde.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index ef709369c5d..dc0bb85d736 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -2649,8 +2649,8 @@ static void test_end_to_end_server(void) HDDEDATA hdata; static const char test_service[] = "TestDDEService"; - trace("client %s, server %s\n", unicode_client ? "unicode" : "ascii", - unicode_server ? "unicode" : "ascii"); + trace("client %s, server %s\n", unicode_client ? "unicode" : "ansi", + unicode_server ? "unicode" : "ansi"); server_pid = 0; msg_index = 0; -- 2.20.1

1 0

[PATCH] wsock32: Fix ASCII / ANSI mixups in comments.
by Francois Gouget 26 Aug '21

26 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wsock32/service.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wsock32/service.c b/dlls/wsock32/service.c index 2b6e4e7b58d..f2a45c983b5 100644 --- a/dlls/wsock32/service.c +++ b/dlls/wsock32/service.c @@ -65,7 +65,7 @@ INT WINAPI GetAddressByNameW(DWORD dwNameSpace, LPGUID lpServiceType, LPWSTR lpS * Retrieve a service type GUID for a network service specified by name. * * PARAMETERS - * lpServiceName [I] NUL-terminated ASCII string that uniquely represents the name of the service + * lpServiceName [I] NUL-terminated ANSI string that uniquely represents the name of the service * lpServiceType [O] Destination for the service type GUID * * RETURNS @@ -114,7 +114,7 @@ INT WINAPI GetTypeByNameW(LPWSTR lpServiceName, LPGUID lpServiceType) * dwNameSpace [I] Name space or set of name spaces within which the function will operate * dwOperation [I] Operation to perform * dwFlags [I] Flags to modify the function's operation - * lpServiceInfo [I] Pointer to a ASCII SERVICE_INFO structure + * lpServiceInfo [I] Pointer to an ANSI SERVICE_INFO structure * lpServiceAsyncInfo [I] Reserved for future use. Must be NULL. * lpdwStatusFlags [O] Destination for function status information * @@ -167,7 +167,7 @@ INT WINAPI SetServiceW(DWORD dwNameSpace, DWORD dwOperation, DWORD dwFlags, LPSE * dwNameSpace [I] Name space or set of name spaces within which the function * will operate. * lpGuid [I] Pointer to GUID of network service type. - * lpServiceName [I] NUL-terminated ASCII string that uniquely represents the name + * lpServiceName [I] NUL-terminated ANSI string that uniquely represents the name * of the service. * dwProperties [I] Flags specifying which information to return in lpBuffer. * lpBuffer [O] Pointer to buffer where the function returns an array -- 2.20.1

1 0

[PATCH] msvcrt/tests: Remove redundant NULL check before free()
by Michael Stefaniuc 26 Aug '21

26 Aug '21

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/tests/cpp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 80eab3364ba..15105ca60dd 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1101,8 +1101,7 @@ static void test_demangle_datatype(void) name = p__unDName(0, demangle[i].mangled, 0, malloc, free, 0x2800); todo_wine_if (!demangle[i].test_in_wine) ok(name != NULL && !strcmp(name,demangle[i].result), "Got name \"%s\" for %d\n", name, i); - if(name) - free(name); + free(name); } } -- 2.31.1

2 1

[PATCH v2 1/3] winhttp: Factor out query_data_ready() function.
by Paul Gofman 26 Aug '21

26 Aug '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- winhttp functions (in particular, WinHttpQueryDataAvailable and WinHttpReadData) can execute synchronously if the data is available. This is the documented behaviour which is also confirmed by the tests. 'eFootball PES 2021 Season Update' depends on this behaviour. It creates asynchronous session but then breaks in various ways if WinHttpReadData() actually queues the async task. The game always calls WinHttpQueryDataAvailable() first and then WinHttpReadData with the read size equal to the available data, so that the read is always synchronous on Windows. dlls/winhttp/request.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index a6c16d7b653..b8f5817737e 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2815,19 +2815,26 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) return !ret; } +static DWORD query_data_ready( struct request *request ) +{ + DWORD count; + + count = get_available_data( request ); + if (!request->read_chunked && request->netconn) count += netconn_query_data_available( request->netconn ); + + return count; +} + static DWORD query_data_available( struct request *request, DWORD *available, BOOL async ) { DWORD ret = ERROR_SUCCESS, count = 0; if (end_of_read_data( request )) goto done; - count = get_available_data( request ); - if (!request->read_chunked && request->netconn) count += netconn_query_data_available( request->netconn ); - if (!count) + if (!(count = query_data_ready( request ))) { if ((ret = refill_buffer( request, async ))) goto done; - count = get_available_data( request ); - if (!request->read_chunked && request->netconn) count += netconn_query_data_available( request->netconn ); + count = query_data_ready( request ); } done: -- 2.31.1

3 7

[PATCH 3/3] user32/tests: Add a helper to initialize function pointers.
by Zhiyi Zhang 26 Aug '21

26 Aug '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/sysparams.c | 57 +++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 89a524407bf..9b9dfe4f089 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -4128,6 +4128,39 @@ static void test_GetAutoRotationState(void) ok(ret, "Expected GetAutoRotationState to succeed, error %d\n", GetLastError()); } +static void init_function_pointers(void) +{ + HMODULE user32 = GetModuleHandleA("user32.dll"); + +#define GET_PROC(module, func) \ + p##func = (void *)GetProcAddress(module, #func); \ + if (!p##func) \ + trace("GetProcAddress(%s, %s) failed.\n", #module, #func); + + GET_PROC(user32, AdjustWindowRectExForDpi) + GET_PROC(user32, ChangeDisplaySettingsExA) + GET_PROC(user32, GetAutoRotationState) + GET_PROC(user32, GetAwarenessFromDpiAwarenessContext) + GET_PROC(user32, GetDpiForMonitorInternal) + GET_PROC(user32, GetDpiForSystem) + GET_PROC(user32, GetDpiForWindow) + GET_PROC(user32, GetProcessDpiAwarenessInternal) + GET_PROC(user32, GetSystemMetricsForDpi) + GET_PROC(user32, GetThreadDpiAwarenessContext) + GET_PROC(user32, GetWindowDpiAwarenessContext) + GET_PROC(user32, IsProcessDPIAware) + GET_PROC(user32, IsValidDpiAwarenessContext) + GET_PROC(user32, LogicalToPhysicalPointForPerMonitorDPI) + GET_PROC(user32, PhysicalToLogicalPointForPerMonitorDPI) + GET_PROC(user32, SetProcessDPIAware) + GET_PROC(user32, SetProcessDpiAwarenessContext) + GET_PROC(user32, SetProcessDpiAwarenessInternal) + GET_PROC(user32, SetThreadDpiAwarenessContext) + GET_PROC(user32, SystemParametersInfoForDpi) + +#undef GET_PROC +} + START_TEST(sysparams) { int argc; @@ -4137,29 +4170,9 @@ START_TEST(sysparams) HDC hdc; HANDLE hThread; DWORD dwThreadId; - HANDLE hInstance, hdll; + HANDLE hInstance; - hdll = GetModuleHandleA("user32.dll"); - pChangeDisplaySettingsExA = (void*)GetProcAddress(hdll, "ChangeDisplaySettingsExA"); - pIsProcessDPIAware = (void*)GetProcAddress(hdll, "IsProcessDPIAware"); - pSetProcessDPIAware = (void*)GetProcAddress(hdll, "SetProcessDPIAware"); - pGetDpiForSystem = (void*)GetProcAddress(hdll, "GetDpiForSystem"); - pGetDpiForWindow = (void*)GetProcAddress(hdll, "GetDpiForWindow"); - pGetDpiForMonitorInternal = (void*)GetProcAddress(hdll, "GetDpiForMonitorInternal"); - pSetProcessDpiAwarenessContext = (void*)GetProcAddress(hdll, "SetProcessDpiAwarenessContext"); - pGetProcessDpiAwarenessInternal = (void*)GetProcAddress(hdll, "GetProcessDpiAwarenessInternal"); - pSetProcessDpiAwarenessInternal = (void*)GetProcAddress(hdll, "SetProcessDpiAwarenessInternal"); - pGetThreadDpiAwarenessContext = (void*)GetProcAddress(hdll, "GetThreadDpiAwarenessContext"); - pSetThreadDpiAwarenessContext = (void*)GetProcAddress(hdll, "SetThreadDpiAwarenessContext"); - pGetWindowDpiAwarenessContext = (void*)GetProcAddress(hdll, "GetWindowDpiAwarenessContext"); - pGetAwarenessFromDpiAwarenessContext = (void*)GetProcAddress(hdll, "GetAwarenessFromDpiAwarenessContext"); - pIsValidDpiAwarenessContext = (void*)GetProcAddress(hdll, "IsValidDpiAwarenessContext"); - pGetSystemMetricsForDpi = (void*)GetProcAddress(hdll, "GetSystemMetricsForDpi"); - pSystemParametersInfoForDpi = (void*)GetProcAddress(hdll, "SystemParametersInfoForDpi"); - pAdjustWindowRectExForDpi = (void*)GetProcAddress(hdll, "AdjustWindowRectExForDpi"); - pLogicalToPhysicalPointForPerMonitorDPI = (void*)GetProcAddress(hdll, "LogicalToPhysicalPointForPerMonitorDPI"); - pPhysicalToLogicalPointForPerMonitorDPI = (void*)GetProcAddress(hdll, "PhysicalToLogicalPointForPerMonitorDPI"); - pGetAutoRotationState = (void*)GetProcAddress(hdll, "GetAutoRotationState"); + init_function_pointers(); hInstance = GetModuleHandleA( NULL ); hdc = GetDC(0); -- 2.30.2

2 1

[PATCH 7/7] gdi32: Use NtGdiGetCharWidthW for GetCharWidthI.
by Jacek Caban 26 Aug '21

26 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 67 ++++++++++++++++------------------------------- dlls/gdi32/text.c | 10 +++++++ 2 files changed, 33 insertions(+), 44 deletions(-)

1 0

[PATCH 6/7] gdi32: Use NtGdiGetCharWidthW for GetCharWidthFloatA.
by Jacek Caban 26 Aug '21

26 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 26 -------------------------- dlls/gdi32/text.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 26 deletions(-)

1 0

[PATCH 5/7] gdi32: Use NtGdiGetCharWidthW for GetCharWidthFloatW.
by Jacek Caban 26 Aug '21

26 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 50 ++++++++++++----------------------------------- dlls/gdi32/text.c | 8 ++++++++ 2 files changed, 21 insertions(+), 37 deletions(-)

1 0

[PATCH 3/7] gdi32: Use NtGdiGetCharWidthW for GetCharWidth.
by Jacek Caban 26 Aug '21

26 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 45 +++-------------------- dlls/gdi32/text.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++ include/ntgdi.h | 6 ++- 3 files changed, 103 insertions(+), 41 deletions(-)

1 0

[PATCH 2/7] gdi32/tests: Use winetest_debug to silence noisy traces.
by Jacek Caban 26 Aug '21

26 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/tests/font.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

1 0

[PATCH 1/7] gdi32/tests: Add more char width tests.
by Jacek Caban 26 Aug '21

26 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/tests/font.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)

1 0

[PATCH v6] dpnet: Implement IDirectPlay8Address GetURLW/A.
by Alistair Leslie-Hughes 26 Aug '21

26 Aug '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dpnet/address.c | 115 ++++++++++++++++++++++++++--- dlls/dpnet/tests/address.c | 143 +++++++++++++++++++++++++++++++++++++ 2 files changed, 248 insertions(+), 10 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 6aa62a97785..5a877d3006a 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -45,6 +45,22 @@ static char *heap_strdupA( const char *str ) return ret; } +static inline WCHAR *heap_strdupAtoW(const char *str) +{ + LPWSTR ret = NULL; + + if(str) { + DWORD len; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = heap_alloc(len*sizeof(WCHAR)); + if(ret) + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + } + + return ret; +} + static BOOL add_component(IDirectPlay8AddressImpl *This, struct component *item) { if(This->comp_count == This->comp_array_size) @@ -256,20 +272,99 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_Clear(IDirectPlay8Address *iface) return DPN_OK; } -static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLW(IDirectPlay8Address *iface, WCHAR *pwszURL, - DWORD *pdwNumChars) +static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLW(IDirectPlay8Address *iface, WCHAR *url, DWORD *length) { - IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); - TRACE("(%p): stub\n", This); - return DPN_OK; + IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); + HRESULT hr = DPNERR_BUFFERTOOSMALL; + int i; + WCHAR buffer[1024] = {0}; + int position = 0; + + TRACE("(%p, %p, %p)\n", This, url, length); + + if(!length || (!url && *length != 0)) + return DPNERR_INVALIDPOINTER; + + for(i=0; i < This->comp_count; i++) + { + struct component *entry = This->components[i]; + + if(position) + lstrcatW(&buffer[position++], L";"); + + switch(entry->type) + { + case DPNA_DATATYPE_GUID: + position += swprintf( &buffer[position], ARRAY_SIZE(buffer), L"%s=%%7B%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X%%7D", + entry->name, entry->data.guid.Data1, entry->data.guid.Data2, entry->data.guid.Data3, + entry->data.guid.Data4[0], entry->data.guid.Data4[1], entry->data.guid.Data4[2], + entry->data.guid.Data4[3], entry->data.guid.Data4[4], entry->data.guid.Data4[5], + entry->data.guid.Data4[6], entry->data.guid.Data4[7] ); + + break; + case DPNA_DATATYPE_STRING: + position += swprintf(&buffer[position], ARRAY_SIZE(buffer), L"%s=%s", entry->name, entry->data.string); + break; + case DPNA_DATATYPE_DWORD: + position += swprintf(&buffer[position], ARRAY_SIZE(buffer), L"%s=%d", entry->name, entry->data.value); + break; + case DPNA_DATATYPE_STRING_ANSI: + { + WCHAR *str = heap_strdupAtoW(entry->data.ansi); + position += swprintf(&buffer[position], ARRAY_SIZE(buffer), L"%s=%s", entry->name, str); + heap_free(str); + break; + } + case DPNA_DATATYPE_BINARY: + default: + FIXME("Unsupported type %d\n", entry->type); + } + } + + if(url && *length >= lstrlenW(buffer) + lstrlenW(DPNA_HEADER) + 1) + { + lstrcpyW(url, DPNA_HEADER); + lstrcatW(url, buffer); + hr = DPN_OK; + } + + *length = lstrlenW(buffer) + lstrlenW(DPNA_HEADER) + 1; + + return hr; } -static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLA(IDirectPlay8Address *iface, CHAR *pszURL, - DWORD *pdwNumChars) +static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLA(IDirectPlay8Address *iface, char *url, DWORD *length) { - IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); - TRACE("(%p): stub\n", This); - return DPN_OK; + IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); + HRESULT hr; + WCHAR *buffer = NULL; + + TRACE("(%p, %p %p)\n", This, url, length); + + if(!length || (!url && *length != 0)) + return DPNERR_INVALIDPOINTER; + + if(url && *length) + { + url[0] = '\0'; + buffer = heap_alloc(*length * sizeof(WCHAR)); + } + + hr = IDirectPlay8Address_GetURLW(iface, buffer, length); + if(hr == DPN_OK) + { + DWORD size; + size = WideCharToMultiByte(CP_ACP, 0, buffer, -1, NULL, 0, NULL, NULL); + if(size <= *length) + WideCharToMultiByte(CP_ACP, 0, buffer, -1, url, *length, NULL, NULL); + else + { + *length = size; + hr = DPNERR_BUFFERTOOSMALL; + } + } + heap_free(buffer); + return hr; } static HRESULT WINAPI IDirectPlay8AddressImpl_GetSP(IDirectPlay8Address *iface, GUID *pguidSP) diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index a8d31c9854a..0e8b8da3b09 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -304,6 +304,147 @@ static void address_setsp(void) } } +static void address_urlW(void) +{ + HRESULT hr; + IDirectPlay8Address *localaddr = NULL; + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&localaddr); + ok(hr == S_OK, "Failed to create IDirectPlay8Address object\n"); + if(SUCCEEDED(hr)) + { + WCHAR *buffer = NULL; + DWORD bufflen = 0, bufflen2; + DWORD port = 4321; + + hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, NULL); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); + + bufflen = 10; + hr = IDirectPlay8Address_GetURLW(localaddr, NULL, &bufflen); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLW(localaddr, NULL, &bufflen); + ok(bufflen == 66, "got %d\n", bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen * sizeof(WCHAR)); + + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(L"x-directplay:/provider=%7BEBFE7BA0-628D-11D2-AE0F-006097B01411%7D", buffer), "got %s\n", wine_dbgstr_w(buffer)); + HeapFree(GetProcessHeap(), 0, buffer); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_PORT, &port, sizeof(DWORD), DPNA_DATATYPE_DWORD); + ok(hr == S_OK, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLW(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen * sizeof(WCHAR)); + + bufflen2 = bufflen/2; + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, &bufflen2); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + ok(!lstrlenW(buffer), "wrong length\n"); + + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(L"x-directplay:/provider=%7BEBFE7BA0-628D-11D2-AE0F-006097B01411%7D;port=4321", buffer), "got %s\n", wine_dbgstr_w(buffer)); + HeapFree(GetProcessHeap(), 0, buffer); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, &localhost, sizeof(localhost), DPNA_DATATYPE_STRING); + ok(hr == S_OK, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLW(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen * sizeof(WCHAR)); + + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(L"x-directplay:/provider=%7BEBFE7BA0-628D-11D2-AE0F-006097B01411%7D;port=4321;hostname=localhost", buffer), "got %s\n", wine_dbgstr_w(buffer)); + HeapFree(GetProcessHeap(), 0, buffer); + + IDirectPlay8Address_Release(localaddr); + } +} + +static void address_urlA(void) +{ + HRESULT hr; + IDirectPlay8Address *localaddr = NULL; + static const char urlA1[] = "x-directplay:/provider=%7BEBFE7BA0-628D-11D2-AE0F-006097B01411%7D"; + static const char urlA2[] = "x-directplay:/provider=%7BEBFE7BA0-628D-11D2-AE0F-006097B01411%7D;port=4321"; + static const char urlA3[] = "x-directplay:/provider=%7BEBFE7BA0-628D-11D2-AE0F-006097B01411%7D;port=4321;hostname=localhost"; + static const char localhostA[] = "localhost"; + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&localaddr); + ok(hr == S_OK, "Failed to create IDirectPlay8Address object\n"); + if(SUCCEEDED(hr)) + { + char *buffer = NULL; + DWORD bufflen = 0, bufflen2; + DWORD port = 4321; + + hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, NULL); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); + + bufflen = 10; + hr = IDirectPlay8Address_GetURLA(localaddr, NULL, &bufflen); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLA(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen); + + bufflen2 = bufflen/2; + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen2); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + ok(!strlen(buffer), "wrong length\n"); + + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpA(urlA1, buffer), "got %s\n", buffer); + HeapFree(GetProcessHeap(), 0, buffer); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_PORT, &port, sizeof(DWORD), DPNA_DATATYPE_DWORD); + ok(hr == S_OK, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLA(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen); + + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpA(urlA2, buffer), "got %s\n", buffer); + HeapFree(GetProcessHeap(), 0, buffer); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, &localhostA, sizeof(localhostA), DPNA_DATATYPE_STRING_ANSI); + ok(hr == S_OK, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLA(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen); + + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpA(urlA3, buffer), "got %s\n", buffer); + HeapFree(GetProcessHeap(), 0, buffer); + + IDirectPlay8Address_Release(localaddr); + } +} + static void address_duplicate(void) { HRESULT hr; @@ -381,6 +522,8 @@ START_TEST(address) address_addcomponents(); address_setsp(); address_duplicate(); + address_urlW(); + address_urlA(); CoUninitialize(); } -- 2.32.0

2 1

[PATCH] d3dcompiler/tests: Add a D3DDisassemble() test with sm2 shader.
by Nikolay Sivov 26 Aug '21

26 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dcompiler_43/tests/asm.c | 35 +++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index 749b1153267..7527da5cdb6 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -31,6 +31,7 @@ static HRESULT (WINAPI *pD3DAssemble)(const void *data, SIZE_T datasize, const c const D3D_SHADER_MACRO *defines, ID3DInclude *include, UINT flags, ID3DBlob **shader, ID3DBlob **error_messages); static pD3DPreprocess ppD3DPreprocess; +static pD3DDisassemble ppD3DDisassemble; struct shader_test { const char *text; @@ -1721,6 +1722,38 @@ static void d3dpreprocess_test(void) if (shader) ID3D10Blob_Release(shader); } +static const DWORD vs_2_0[] = +{ + 0xfffe0200, /* vs_2_0 */ + 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x0200001f, 0x80000003, 0x900f0001, /* dcl_normal v1 */ + 0x0200001f, 0x8001000a, 0x900f0002, /* dcl_color1 v2 */ + 0x0200001f, 0x80000005, 0x900f0003, /* dcl_texcoord0 v3 */ + 0x02000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x02000001, 0xd00f0001, 0x90e40002, /* mov oD1, v2 */ + 0x02000001, 0xe0070000, 0x90e40003, /* mov oT0.xyz, v3 */ + 0x02000001, 0xc00f0001, 0x90ff0002, /* mov oFog, v2.w */ + 0x02000001, 0xc00f0002, 0x90ff0001, /* mov oPts, v1.w */ + 0x0000ffff +}; + +static void test_disassemble_shader(void) +{ + ID3DBlob *blob; + HRESULT hr; + + hr = ppD3DDisassemble(vs_2_0, 0, 0, NULL, &blob); +#if D3D_COMPILER_VERSION == 47 + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); +#else + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); +#endif + + hr = ppD3DDisassemble(vs_2_0, sizeof(vs_2_0), 0, NULL, &blob); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ID3D10Blob_Release(blob); +} + static BOOL load_d3dcompiler(void) { HMODULE module; @@ -1733,6 +1766,7 @@ static BOOL load_d3dcompiler(void) pD3DAssemble = (void*)GetProcAddress(module, "D3DAssemble"); ppD3DPreprocess = (void*)GetProcAddress(module, "D3DPreprocess"); + ppD3DDisassemble = (void *)GetProcAddress(module, "D3DDisassemble"); return TRUE; } @@ -1761,4 +1795,5 @@ START_TEST(asm) assembleshader_test(); d3dpreprocess_test(); + test_disassemble_shader(); } -- 2.32.0

2 1

[PATCH] shlwapi/tests: Avoid casts from COM object to interface
by Michael Stefaniuc 26 Aug '21

26 Aug '21

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shlwapi/tests/ordinal.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 919cac8563f..bf43d35b1c2 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1423,7 +1423,7 @@ static HRESULT WINAPI Contain_FindConnectionPoint( else { *ppCP = iface->pt[0]; - IUnknown_AddRef((IUnknown*)*ppCP); + IConnectionPoint_AddRef(*ppCP); } return S_OK; @@ -1459,7 +1459,8 @@ static void test_IConnectionPoint(void) dispatch->IDispatch_iface.lpVtbl = &disp_vtbl; dispatch->refCount = 1; - rc = pConnectToConnectionPoint((IUnknown*)dispatch, &IID_NULL, TRUE, (IUnknown*)container, &cookie, &point); + rc = pConnectToConnectionPoint((IUnknown*)&dispatch->IDispatch_iface, &IID_NULL, TRUE, + (IUnknown*)&container->IConnectionPointContainer_iface, &cookie, &point); ok(rc == S_OK, "pConnectToConnectionPoint failed with %x\n",rc); ok(point != NULL, "returned ConnectionPoint is NULL\n"); ok(cookie != 0xffffffff, "invalid cookie returned\n"); @@ -1475,15 +1476,16 @@ static void test_IConnectionPoint(void) rc = pIConnectionPoint_SimpleInvoke(point,0xa1,&params); ok(rc == S_OK, "pConnectToConnectionPoint failed with %x\n",rc); - rc = pConnectToConnectionPoint(NULL, &IID_NULL, FALSE, (IUnknown*)container, &cookie, NULL); + rc = pConnectToConnectionPoint(NULL, &IID_NULL, FALSE, + (IUnknown*)&container->IConnectionPointContainer_iface, &cookie, NULL); ok(rc == S_OK, "pConnectToConnectionPoint failed with %x\n",rc); /* MSDN says this should be required but it crashes on XP IUnknown_Release(point); */ - ref = IUnknown_Release((IUnknown*)container); + ref = IConnectionPointContainer_Release(&container->IConnectionPointContainer_iface); ok(ref == 0, "leftover IConnectionPointContainer reference %i\n",ref); - ref = IUnknown_Release((IUnknown*)dispatch); + ref = IDispatch_Release(&dispatch->IDispatch_iface); ok(ref == 0, "leftover IDispatch reference %i\n",ref); } @@ -1593,7 +1595,7 @@ static void test_SHPropertyBag_ReadLONG(void) rc = pSHPropertyBag_ReadLONG(&pb->IPropertyBag_iface, szName1, &out); ok(rc == DISP_E_BADVARTYPE || broken(rc == S_OK) || broken(rc == S_FALSE), "incorrect return %x\n",rc); ok(out == 0xfeedface || broken(out == 0xfeedfa00), "value should not have changed %x\n",out); - IUnknown_Release((IUnknown*)pb); + IPropertyBag_Release(&pb->IPropertyBag_iface); } static void test_SHSetWindowBits(void) -- 2.31.1

2 1

[PATCH] mf/tests: Avoid cast from COM object to interface
by Michael Stefaniuc 26 Aug '21

26 Aug '21

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mf/tests/mf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 4b894df1de0..3dfd852643c 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1139,7 +1139,7 @@ static void test_session_events(IMFMediaSession *session) ok(hr == MF_S_MULTIPLE_BEGIN, "Unexpected hr %#x.\n", hr); /* Same callback, different state. */ - hr = IMFMediaSession_BeginGetEvent(session, &callback.IMFAsyncCallback_iface, (IUnknown *)&callback); + hr = IMFMediaSession_BeginGetEvent(session, &callback.IMFAsyncCallback_iface, (IUnknown *)&callback.IMFAsyncCallback_iface); ok(hr == MF_E_MULTIPLE_BEGIN, "Unexpected hr %#x.\n", hr); /* Different callback, same state. */ -- 2.31.1

3 2

[PATCH 2/3] user32/tests: Add DisplayConfigSetDeviceInfo() tests.
by Zhiyi Zhang 26 Aug '21

26 Aug '21

Test that DisplayConfigSetDeviceInfo() can be used for getting and setting display DPI. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 132 +++++++++++++++++++++++++++++++++--- include/wingdi.h | 51 ++++++++++---- 2 files changed, 161 insertions(+), 22 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index bc4bc53502a..62c0f542105 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -19,34 +19,49 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "ntstatus.h" +#define WIN32_NO_STATUS + #include "wine/test.h" #include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "winreg.h" +#include "winternl.h" +#include "ddk/d3dkmthk.h" #include "wine/heap.h" #include <stdio.h> -static HMODULE hdll; static LONG (WINAPI *pGetDisplayConfigBufferSizes)(UINT32,UINT32*,UINT32*); +static BOOL (WINAPI *pGetDpiForMonitorInternal)(HMONITOR,UINT,UINT*,UINT*); static LONG (WINAPI *pQueryDisplayConfig)(UINT32,UINT32*,DISPLAYCONFIG_PATH_INFO*,UINT32*, DISPLAYCONFIG_MODE_INFO*,DISPLAYCONFIG_TOPOLOGY_ID*); static LONG (WINAPI *pDisplayConfigGetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER*); +static LONG (WINAPI *pDisplayConfigSetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER*); static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); +static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER*); +static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME*); + static void init_function_pointers(void) { - hdll = GetModuleHandleA("user32.dll"); + HMODULE user32 = GetModuleHandleA("user32.dll"); + HMODULE gdi32 = GetModuleHandleA("gdi32.dll"); -#define GET_PROC(func) \ - p ## func = (void*)GetProcAddress(hdll, #func); \ - if(!p ## func) \ - trace("GetProcAddress(%s) failed\n", #func); +#define GET_PROC(module, func) \ + p##func = (void *)GetProcAddress(module, #func); \ + if (!p##func) \ + trace("GetProcAddress(%s, %s) failed.\n", #module, #func); - GET_PROC(GetDisplayConfigBufferSizes) - GET_PROC(QueryDisplayConfig) - GET_PROC(DisplayConfigGetDeviceInfo) - GET_PROC(SetThreadDpiAwarenessContext) + GET_PROC(user32, GetDisplayConfigBufferSizes) + GET_PROC(user32, GetDpiForMonitorInternal) + GET_PROC(user32, QueryDisplayConfig) + GET_PROC(user32, DisplayConfigGetDeviceInfo) + GET_PROC(user32, DisplayConfigSetDeviceInfo) + GET_PROC(user32, SetThreadDpiAwarenessContext) + + GET_PROC(gdi32, D3DKMTCloseAdapter) + GET_PROC(gdi32, D3DKMTOpenAdapterFromGdiDisplayName) #undef GET_PROC } @@ -68,6 +83,23 @@ static void flush_events(void) } } +static unsigned int get_primary_dpi(void) +{ + DPI_AWARENESS_CONTEXT old_context; + UINT dpi_x = 0, dpi_y = 0; + POINT point = {0, 0}; + HMONITOR monitor; + + if (!pSetThreadDpiAwarenessContext || !pGetDpiForMonitorInternal) + return 0; + + old_context = pSetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE); + monitor = MonitorFromPoint(point, MONITOR_DEFAULTTOPRIMARY); + pGetDpiForMonitorInternal(monitor, 0, &dpi_x, &dpi_y); + pSetThreadDpiAwarenessContext(old_context); + return dpi_y; +} + static int get_bitmap_stride(int width, int bpp) { return ((width * bpp + 15) >> 3) & ~1; @@ -1968,6 +2000,85 @@ static void test_DisplayConfigGetDeviceInfo(void) ok(ret == ERROR_GEN_FAILURE || ret == ERROR_INVALID_PARAMETER || ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); } +static void test_DisplayConfigSetDeviceInfo(void) +{ + static const unsigned int scales[] = {100, 125, 150, 175, 200, 225, 250, 300, 350, 400, 450, 500}; + int current_scale, current_scale_idx, recommended_scale_idx, step, dpi, old_dpi; + D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_gdi_desc; + DISPLAYCONFIG_GET_SOURCE_DPI_SCALE get_scale_req; + DISPLAYCONFIG_SET_SOURCE_DPI_SCALE set_scale_req; + D3DKMT_CLOSEADAPTER close_adapter_desc; + NTSTATUS status; + LONG ret; + +#define CHECK_FUNC(func) \ + if (!p##func) \ + { \ + skip("%s() is unavailable.\n", #func); \ + return; \ + } + + CHECK_FUNC(D3DKMTCloseAdapter) + CHECK_FUNC(D3DKMTOpenAdapterFromGdiDisplayName) + CHECK_FUNC(DisplayConfigGetDeviceInfo) + CHECK_FUNC(DisplayConfigSetDeviceInfo) + CHECK_FUNC(GetDpiForMonitorInternal) + CHECK_FUNC(SetThreadDpiAwarenessContext) + +#undef CHECK_FUNC + + lstrcpyW(open_adapter_gdi_desc.DeviceName, L"\\\\.\\DISPLAY1"); + status = pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc); + ok(status == STATUS_SUCCESS, "D3DKMTOpenAdapterFromGdiDisplayName failed, status %#x.\n", status); + + get_scale_req.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_DPI_SCALE; + get_scale_req.header.size = sizeof(get_scale_req); + get_scale_req.header.adapterId = open_adapter_gdi_desc.AdapterLuid; + get_scale_req.header.id = open_adapter_gdi_desc.VidPnSourceId; + ret = pDisplayConfigGetDeviceInfo(&get_scale_req.header); + if (ret != NO_ERROR) + { + skip("DisplayConfigGetDeviceInfo failed, returned %d.\n", ret); + goto failed; + } + + dpi = get_primary_dpi(); + old_dpi = dpi; + current_scale = dpi * 100 / 96; + for (current_scale_idx = 0; current_scale_idx < ARRAY_SIZE(scales); ++current_scale_idx) + { + if (scales[current_scale_idx] == current_scale) + break; + } + ok(scales[current_scale_idx] == current_scale, "Failed to find current scale.\n"); + recommended_scale_idx = current_scale_idx - get_scale_req.curRelativeScaleStep; + + set_scale_req.header.type = DISPLAYCONFIG_DEVICE_INFO_SET_SOURCE_DPI_SCALE; + set_scale_req.header.size = sizeof(set_scale_req); + set_scale_req.header.adapterId = open_adapter_gdi_desc.AdapterLuid; + set_scale_req.header.id = open_adapter_gdi_desc.VidPnSourceId; + for (step = get_scale_req.minRelativeScaleStep; step <= get_scale_req.maxRelativeScaleStep; ++step) + { + set_scale_req.relativeScaleStep = step; + ret = pDisplayConfigSetDeviceInfo(&set_scale_req.header); + ok(ret == NO_ERROR, "DisplayConfigSetDeviceInfo failed, returned %d.\n", ret); + + dpi = scales[step + recommended_scale_idx] * 96 / 100; + ok(dpi == get_primary_dpi(), "Expected %d, got %d.\n", get_primary_dpi(), dpi); + } + + /* Restore to the original scale */ + set_scale_req.relativeScaleStep = get_scale_req.curRelativeScaleStep; + ret = pDisplayConfigSetDeviceInfo(&set_scale_req.header); + ok(ret == NO_ERROR, "DisplayConfigSetDeviceInfo failed, returned %d.\n", ret); + ok(old_dpi == get_primary_dpi(), "Expected %d, got %d.\n", get_primary_dpi(), old_dpi); + +failed: + close_adapter_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); +} + static BOOL CALLBACK test_handle_proc(HMONITOR full_monitor, HDC hdc, LPRECT rect, LPARAM lparam) { MONITORINFO monitor_info = {sizeof(monitor_info)}; @@ -2293,6 +2404,7 @@ START_TEST(monitor) test_enumdisplaydevices(); test_ChangeDisplaySettingsEx(); test_DisplayConfigGetDeviceInfo(); + test_DisplayConfigSetDeviceInfo(); test_EnumDisplayMonitors(); test_GetDisplayConfigBufferSizes(); test_QueryDisplayConfig(); diff --git a/include/wingdi.h b/include/wingdi.h index c10d7518337..1af133dae43 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3286,18 +3286,20 @@ typedef struct _RGNDATA { typedef BOOL (CALLBACK *ABORTPROC)(HDC, INT); typedef enum { - DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME = 1, - DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME = 2, - DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_PREFERRED_MODE = 3, - DISPLAYCONFIG_DEVICE_INFO_GET_ADAPTER_NAME = 4, - DISPLAYCONFIG_DEVICE_INFO_SET_TARGET_PERSISTENCE = 5, - DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_BASE_TYPE = 6, - DISPLAYCONFIG_DEVICE_INFO_GET_SUPPORT_VIRTUAL_RESOLUTION = 7, - DISPLAYCONFIG_DEVICE_INFO_SET_SUPPORT_VIRTUAL_RESOLUTION = 8, - DISPLAYCONFIG_DEVICE_INFO_GET_ADVANCED_COLOR_INFO = 9, - DISPLAYCONFIG_DEVICE_INFO_SET_ADVANCED_COLOR_STATE = 10, - DISPLAYCONFIG_DEVICE_INFO_GET_SDR_WHITE_LEVEL = 11, - DISPLAYCONFIG_DEVICE_INFO_FORCE_UINT32 = 0xffffffff + DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_DPI_SCALE = (int)-3, + DISPLAYCONFIG_DEVICE_INFO_SET_SOURCE_DPI_SCALE = (int)-4, + DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME = (int)1, + DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME = (int)2, + DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_PREFERRED_MODE = (int)3, + DISPLAYCONFIG_DEVICE_INFO_GET_ADAPTER_NAME = (int)4, + DISPLAYCONFIG_DEVICE_INFO_SET_TARGET_PERSISTENCE = (int)5, + DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_BASE_TYPE = (int)6, + DISPLAYCONFIG_DEVICE_INFO_GET_SUPPORT_VIRTUAL_RESOLUTION = (int)7, + DISPLAYCONFIG_DEVICE_INFO_SET_SUPPORT_VIRTUAL_RESOLUTION = (int)8, + DISPLAYCONFIG_DEVICE_INFO_GET_ADVANCED_COLOR_INFO = (int)9, + DISPLAYCONFIG_DEVICE_INFO_SET_ADVANCED_COLOR_STATE = (int)10, + DISPLAYCONFIG_DEVICE_INFO_GET_SDR_WHITE_LEVEL = (int)11, + DISPLAYCONFIG_DEVICE_INFO_FORCE_UINT32 = (int)0xffffffff } DISPLAYCONFIG_DEVICE_INFO_TYPE; typedef struct DISPLAYCONFIG_DEVICE_INFO_HEADER { @@ -3638,6 +3640,31 @@ typedef struct DISPLAYCONFIG_SDR_WHITE_LEVEL { ULONG SDRWhiteLevel; } DISPLAYCONFIG_SDR_WHITE_LEVEL; +/* Scale steps are relative to the recommended scale. For example: + * Scales : 100% 125% 150% 175% 200% 225% 250% 300% 350% 400% 450% 500% + * DPI : 96 120 144 168 192 216 240 288 336 384 432 480 + * ^ ^ ^ ^ + * | | Recommended scale, step is 0. | + * | Current scale, step is -2. Max scale step is 6. + * Minimum scale, step is -4. + * + * The scale values can be found in the display settings drop-down. The algorithm to calculate the + * recommended scale is unclear. + */ +typedef struct DISPLAYCONFIG_GET_SOURCE_DPI_SCALE +{ + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + int minRelativeScaleStep; /* Minimum scale step relative to the recommended scale */ + int curRelativeScaleStep; /* Current scale step relative to the recommended scale */ + int maxRelativeScaleStep; /* Maximum scale step relative to the recommended scale */ +} DISPLAYCONFIG_GET_SOURCE_DPI_SCALE; + +typedef struct DISPLAYCONFIG_SET_SOURCE_DPI_SCALE +{ + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + int relativeScaleStep; /* Target scale step relative to the recommended scale */ +} DISPLAYCONFIG_SET_SOURCE_DPI_SCALE; + #define DISPLAYCONFIG_PATH_MODE_IDX_INVALID 0xffffffff #define DISPLAYCONFIG_PATH_TARGET_MODE_IDX_INVALID 0xffff #define DISPLAYCONFIG_PATH_DESKTOP_IMAGE_IDX_INVALID 0xffff -- 2.30.2

1 0

[PATCH 1/3] user32/tests: Separate display config test functions.
by Zhiyi Zhang 26 Aug '21

26 Aug '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 43 +++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index dfb57d3e2c2..bc4bc53502a 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1400,6 +1400,12 @@ static void test_GetDisplayConfigBufferSizes(void) UINT32 paths, modes; LONG ret; + if (!pGetDisplayConfigBufferSizes) + { + win_skip("GetDisplayConfigBufferSizes() is not supported\n"); + return; + } + ret = pGetDisplayConfigBufferSizes(QDC_ALL_PATHS, NULL, NULL); ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); @@ -1643,6 +1649,12 @@ static void test_QueryDisplayConfig_result(UINT32 flags, DISPLAYCONFIG_TARGET_PREFERRED_MODE preferred_mode; DISPLAYCONFIG_ADAPTER_NAME adapter_name; + if (!pDisplayConfigGetDeviceInfo) + { + win_skip("DisplayConfigGetDeviceInfo() is not supported\n"); + return; + } + for (i = 0; i < paths; i++) { source_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME; @@ -1767,6 +1779,12 @@ static void test_QueryDisplayConfig(void) DISPLAYCONFIG_TOPOLOGY_ID topologyid; LONG ret; + if (!pQueryDisplayConfig) + { + win_skip("QueryDisplayConfig() is not supported\n"); + return; + } + ret = pQueryDisplayConfig(QDC_ALL_PATHS, NULL, NULL, NULL, NULL, NULL); ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); @@ -1864,6 +1882,12 @@ static void test_DisplayConfigGetDeviceInfo(void) DISPLAYCONFIG_TARGET_PREFERRED_MODE preferred_mode; DISPLAYCONFIG_ADAPTER_NAME adapter_name; + if (!pDisplayConfigGetDeviceInfo) + { + win_skip("DisplayConfigGetDeviceInfo() is not supported\n"); + return; + } + ret = pDisplayConfigGetDeviceInfo(NULL); ok(ret == ERROR_GEN_FAILURE, "got %d\n", ret); @@ -1944,21 +1968,6 @@ static void test_DisplayConfigGetDeviceInfo(void) ok(ret == ERROR_GEN_FAILURE || ret == ERROR_INVALID_PARAMETER || ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); } -static void test_display_config(void) -{ - if (!pGetDisplayConfigBufferSizes || - !pQueryDisplayConfig || - !pDisplayConfigGetDeviceInfo) - { - win_skip("DisplayConfig APIs are not supported\n"); - return; - } - - test_GetDisplayConfigBufferSizes(); - test_QueryDisplayConfig(); - test_DisplayConfigGetDeviceInfo(); -} - static BOOL CALLBACK test_handle_proc(HMONITOR full_monitor, HDC hdc, LPRECT rect, LPARAM lparam) { MONITORINFO monitor_info = {sizeof(monitor_info)}; @@ -2283,10 +2292,12 @@ START_TEST(monitor) init_function_pointers(); test_enumdisplaydevices(); test_ChangeDisplaySettingsEx(); + test_DisplayConfigGetDeviceInfo(); test_EnumDisplayMonitors(); + test_GetDisplayConfigBufferSizes(); + test_QueryDisplayConfig(); test_monitors(); test_work_area(); - test_display_config(); test_handles(); test_display_dc(); } -- 2.30.2

1 0

[PATCH] mfplat/tests: Avoid cast from COM object to interface
by Michael Stefaniuc 26 Aug '21

26 Aug '21

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 3e0907e41ad..54af1ee151d 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -3129,7 +3129,7 @@ static void test_event_queue(void) ok(hr == MF_S_MULTIPLE_BEGIN, "Unexpected hr %#x.\n", hr); /* Same callback, different state. */ - hr = IMFMediaEventQueue_BeginGetEvent(queue, &callback.IMFAsyncCallback_iface, (IUnknown *)&callback); + hr = IMFMediaEventQueue_BeginGetEvent(queue, &callback.IMFAsyncCallback_iface, (IUnknown *)&callback.IMFAsyncCallback_iface); ok(hr == MF_E_MULTIPLE_BEGIN, "Unexpected hr %#x.\n", hr); /* Different callback, same state. */ -- 2.31.1

3 2

[PATCH] dwrite: Avoid casts from COM object to interface
by Michael Stefaniuc 26 Aug '21

26 Aug '21

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dwrite/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index d25ba2dd06b..b7071314bb2 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1996,7 +1996,7 @@ static HRESULT WINAPI dwritefont_GetFontFamily(IDWriteFont3 *iface, IDWriteFontF TRACE("%p, %p.\n", iface, family); - *family = (IDWriteFontFamily *)font->family; + *family = (IDWriteFontFamily *)&font->family->IDWriteFontFamily2_iface; IDWriteFontFamily_AddRef(*family); return S_OK; } @@ -2531,7 +2531,7 @@ static HRESULT WINAPI dwritefontfamily_GetFontCollection(IDWriteFontFamily2 *ifa TRACE("%p, %p.\n", iface, collection); - *collection = (IDWriteFontCollection *)family->collection; + *collection = (IDWriteFontCollection *)&family->collection->IDWriteFontCollection3_iface; IDWriteFontCollection_AddRef(*collection); return S_OK; } -- 2.31.1

2 1

[PATCH] msxml3/tests: Remove superfluous cast to self
by Michael Stefaniuc 26 Aug '21

26 Aug '21

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d2a4d867bae..063f9433a77 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -258,7 +258,7 @@ static IDispatch* create_dispevent(void) event->IDispatch_iface.lpVtbl = &dispeventVtbl; event->ref = 1; - return (IDispatch*)&event->IDispatch_iface; + return &event->IDispatch_iface; } /* IStream */ -- 2.31.1

2 1

[PATCH] winebus.sys: Print the debug string and not the pointer to it
by Michael Stefaniuc 26 Aug '21

26 Aug '21

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winebus.sys/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 41aef8ab018..e9c85deb846 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -339,7 +339,7 @@ DEVICE_OBJECT *bus_enumerate_hid_devices(const WCHAR *bus_id, enum_func function DEVICE_OBJECT *ret = NULL; int cont; - TRACE("bus_id %p\n", debugstr_w(bus_id)); + TRACE("bus_id %s\n", debugstr_w(bus_id)); EnterCriticalSection(&device_list_cs); LIST_FOR_EACH_ENTRY_SAFE(ext, next, &device_list, struct device_extension, entry) -- 2.31.1

1 0

[PATCH] msdaps: Avoid casts from COM object to interface
by Michael Stefaniuc 26 Aug '21

26 Aug '21

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msdaps/row_server.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msdaps/row_server.c b/dlls/msdaps/row_server.c index 2b496bece20..9cc64cd0218 100644 --- a/dlls/msdaps/row_server.c +++ b/dlls/msdaps/row_server.c @@ -589,9 +589,9 @@ static HRESULT create_server(IUnknown *outer, const CLSID *class, void **obj) server->class = *class; server->inner_unk = NULL; if(IsEqualGUID(class, &CLSID_wine_row_server)) - create_row_marshal((IUnknown*)server, (void**)&server->marshal); + create_row_marshal((IUnknown*)&server->IWineRowServer_iface, (void**)&server->marshal); else if(IsEqualGUID(class, &CLSID_wine_rowset_server)) - create_rowset_marshal((IUnknown*)server, (void**)&server->marshal); + create_rowset_marshal((IUnknown*)&server->IWineRowServer_iface, (void**)&server->marshal); else ERR("create_server called with class %s\n", debugstr_guid(class)); -- 2.31.1

1 0

[PATCH v3 2/2 resend] xactengine3_7: Implement IXACT3Engine PrepareInMemoryWave
by Alistair Leslie-Hughes 26 Aug '21

26 Aug '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/xact_dll.c | 40 +++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 6f4f118257f..a200e40451e 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -1055,8 +1055,44 @@ static HRESULT WINAPI IXACT3EngineImpl_PrepareInMemoryWave(IXACT3Engine *iface, IXACT3Wave **ppWave) { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); - FIXME("(%p): stub!\n", This); - return E_NOTIMPL; + XACT3WaveImpl *wave; + FACTWave *fwave = NULL; + FACTWaveBankEntry fact_wavebank; + UINT ret; + + TRACE("(%p)->(0x%08x, %p, %p, %p, %d, %d, %p)\n", This, dwFlags, &entry, pdwSeekTable, + pbWaveData, dwPlayOffset, nLoopCount, ppWave); + + fact_wavebank.dwFlagsAndDuration = entry.dwFlagsAndDuration; + fact_wavebank.Format.dwValue = entry.Format.dwValue; + fact_wavebank.PlayRegion.dwOffset = entry.PlayRegion.dwOffset; + fact_wavebank.PlayRegion.dwLength = entry.PlayRegion.dwLength; + fact_wavebank.LoopRegion.dwStartSample = entry.LoopRegion.dwStartSample; + fact_wavebank.LoopRegion.dwTotalSamples = entry.LoopRegion.dwTotalSamples; + + ret = FACTAudioEngine_PrepareInMemoryWave(This->fact_engine, dwFlags, fact_wavebank, + pdwSeekTable, pbWaveData, dwPlayOffset, nLoopCount, &fwave); + if(ret != 0 || !fwave) + { + ERR("Failed to CreateWave: %d (%p)\n", ret, fwave); + return E_FAIL; + } + + wave = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wave)); + if (!wave) + { + FACTWave_Destroy(fwave); + ERR("Failed to allocate XACT3WaveImpl!"); + return E_OUTOFMEMORY; + } + + wave->IXACT3Wave_iface.lpVtbl = &XACT3Wave_Vtbl; + wave->fact_wave = fwave; + *ppWave = &wave->IXACT3Wave_iface; + + TRACE("Created Wave: %p\n", wave); + + return S_OK; } static HRESULT WINAPI IXACT3EngineImpl_PrepareStreamingWave(IXACT3Engine *iface, -- 2.32.0

1 0

[PATCH v3 1/2 resend] xactengine3_7: Implement IXACT3Engine PrepareStreamingWave
by Alistair Leslie-Hughes 26 Aug '21

26 Aug '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/xact_dll.c | 55 +++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 231ef753f22..6f4f118257f 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -1066,8 +1066,59 @@ static HRESULT WINAPI IXACT3EngineImpl_PrepareStreamingWave(IXACT3Engine *iface, IXACT3Wave **ppWave) { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); - FIXME("(%p): stub!\n", This); - return E_NOTIMPL; + XACT3WaveImpl *wave; + FACTWave *fwave = NULL; + FACTStreamingParameters fakeParms; + wrap_readfile_struct *fake; + FACTWaveBankEntry fact_wavebank; + UINT ret; + + TRACE("(%p)->(0x%08x, %p, %p, %d, %p, %d, %d, %p)\n", This, dwFlags, &entry, &streamingParams, + dwAlignment, pdwSeekTable, dwPlayOffset, nLoopCount, ppWave); + + fake = (wrap_readfile_struct*) CoTaskMemAlloc( + sizeof(wrap_readfile_struct)); + fake->engine = This; + fake->file = streamingParams.file; + fakeParms.file = fake; + fakeParms.flags = streamingParams.flags; + fakeParms.offset = streamingParams.offset; + fakeParms.packetSize = streamingParams.packetSize; + + fact_wavebank.dwFlagsAndDuration = entry.dwFlagsAndDuration; + fact_wavebank.Format.dwValue = entry.Format.dwValue; + fact_wavebank.PlayRegion.dwOffset = entry.PlayRegion.dwOffset; + fact_wavebank.PlayRegion.dwLength = entry.PlayRegion.dwLength; + fact_wavebank.LoopRegion.dwStartSample = entry.LoopRegion.dwStartSample; + fact_wavebank.LoopRegion.dwTotalSamples = entry.LoopRegion.dwTotalSamples; + + /* FAudio Prototype is incorrect and shouldn't take a buffer as an parameter, + * passing through NULL to ensure it's not used. + */ + ret = FACTAudioEngine_PrepareStreamingWave(This->fact_engine, dwFlags, fact_wavebank, fakeParms, + dwAlignment, pdwSeekTable, NULL, dwPlayOffset, nLoopCount, &fwave); + + if(ret != 0 || !fwave) + { + ERR("Failed to CreateWave: %d (%p)\n", ret, fwave); + return E_FAIL; + } + + wave = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wave)); + if (!wave) + { + FACTWave_Destroy(fwave); + ERR("Failed to allocate XACT3WaveImpl!"); + return E_OUTOFMEMORY; + } + + wave->IXACT3Wave_iface.lpVtbl = &XACT3Wave_Vtbl; + wave->fact_wave = fwave; + *ppWave = &wave->IXACT3Wave_iface; + + TRACE("Created Wave: %p\n", wave); + + return S_OK; } static HRESULT WINAPI IXACT3EngineImpl_PrepareWave(IXACT3Engine *iface, -- 2.32.0

1 0

[PATCH 1/2] d3dx10: Add a stub mesh object.
by Nikolay Sivov 26 Aug '21

26 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx10_43/Makefile.in | 1 + dlls/d3dx10_43/d3dx10_43.spec | 2 +- dlls/d3dx10_43/mesh.c | 378 ++++++++++++++++++++++++++++++++++ 3 files changed, 380 insertions(+), 1 deletion(-) create mode 100644 dlls/d3dx10_43/mesh.c diff --git a/dlls/d3dx10_43/Makefile.in b/dlls/d3dx10_43/Makefile.in index a763f588996..b6baed2b619 100644 --- a/dlls/d3dx10_43/Makefile.in +++ b/dlls/d3dx10_43/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ compiler.c \ d3dx10_43_main.c \ font.c \ + mesh.c \ sprite.c \ texture.c diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index aaa056acdd2..da6629ad1a0 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -34,7 +34,7 @@ @ stdcall D3DX10CreateFontIndirectA(ptr ptr ptr) @ stdcall D3DX10CreateFontIndirectW(ptr ptr ptr) @ stdcall D3DX10CreateFontW(ptr long long long long long long long long long wstr ptr) -@ stub D3DX10CreateMesh(ptr ptr long str long long long ptr) +@ stdcall D3DX10CreateMesh(ptr ptr long str long long long ptr) @ stub D3DX10CreateShaderResourceViewFromFileA(ptr str ptr ptr ptr ptr) @ stub D3DX10CreateShaderResourceViewFromFileW(ptr wstr ptr ptr ptr ptr) @ stub D3DX10CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) diff --git a/dlls/d3dx10_43/mesh.c b/dlls/d3dx10_43/mesh.c new file mode 100644 index 00000000000..8507df82884 --- /dev/null +++ b/dlls/d3dx10_43/mesh.c @@ -0,0 +1,378 @@ +/* + * Copyright 2021 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#define COBJMACROS +#include "d3dx10.h" + +#include "wine/debug.h" +#include "wine/heap.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + +struct d3dx10_mesh +{ + ID3DX10Mesh ID3DX10Mesh_iface; + LONG refcount; +}; + +static inline struct d3dx10_mesh *impl_from_ID3DX10Mesh(ID3DX10Mesh *iface) +{ + return CONTAINING_RECORD(iface, struct d3dx10_mesh, ID3DX10Mesh_iface); +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_QueryInterface(ID3DX10Mesh *iface, REFIID riid, void **out) +{ + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); + + if (IsEqualGUID(riid, &IID_ID3DX10Mesh) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3dx10_mesh_AddRef(ID3DX10Mesh *iface) +{ + struct d3dx10_mesh *mesh = impl_from_ID3DX10Mesh(iface); + ULONG refcount = InterlockedIncrement(&mesh->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3dx10_mesh_Release(ID3DX10Mesh *iface) +{ + struct d3dx10_mesh *mesh = impl_from_ID3DX10Mesh(iface); + ULONG refcount = InterlockedDecrement(&mesh->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + heap_free(mesh); + + return refcount; +} + +static UINT STDMETHODCALLTYPE d3dx10_mesh_GetFaceCount(ID3DX10Mesh *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static UINT STDMETHODCALLTYPE d3dx10_mesh_GetVertexCount(ID3DX10Mesh *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static UINT STDMETHODCALLTYPE d3dx10_mesh_GetVertexBufferCount(ID3DX10Mesh *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static UINT STDMETHODCALLTYPE d3dx10_mesh_GetFlags(ID3DX10Mesh *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetVertexDescription(ID3DX10Mesh *iface, + const D3D10_INPUT_ELEMENT_DESC **desc, UINT *count) +{ + FIXME("iface %p, desc %p, count %p stub!\n", iface, desc, count); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_SetVertexData(ID3DX10Mesh *iface, UINT index, + const void *data) +{ + FIXME("iface %p, index %u, data %p stub!\n", iface, index, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetVertexBuffer(ID3DX10Mesh *iface, UINT index, + ID3DX10MeshBuffer **buffer) +{ + FIXME("iface %p, index %u, buffer %p stub!\n", iface, index, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_SetIndexData(ID3DX10Mesh *iface, const void *data, + UINT count) +{ + FIXME("iface %p, data %p, count %u stub!\n", iface, data, count); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetIndexBuffer(ID3DX10Mesh *iface, + ID3DX10MeshBuffer **buffer) +{ + FIXME("iface %p, buffer %p stub!\n", iface, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_SetAttributeData(ID3DX10Mesh *iface, + const UINT *data) +{ + FIXME("iface %p, data %p stub!\n", iface, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetAttributeBuffer(ID3DX10Mesh *iface, + ID3DX10MeshBuffer **buffer) +{ + FIXME("iface %p, buffer %p stub!\n", iface, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_SetAttributeTable(ID3DX10Mesh *iface, + const D3DX10_ATTRIBUTE_RANGE *table, UINT size) +{ + FIXME("iface %p, table %p, size %u stub!\n", iface, table, size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetAttributeTable(ID3DX10Mesh *iface, + D3DX10_ATTRIBUTE_RANGE *table, UINT *size) +{ + FIXME("iface %p, table %p, size %p stub!\n", iface, table, size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GenerateAdjacencyAndPointReps(ID3DX10Mesh *iface, + float epsilon) +{ + FIXME("iface %p, epsilon %.8e stub!\n", iface, epsilon); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GenerateGSAdjacency(ID3DX10Mesh *iface) +{ + FIXME("iface %p stub!\n", iface); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_SetAdjacencyData(ID3DX10Mesh *iface, + const UINT *adjacency) +{ + FIXME("iface %p, adjacency %p stub!\n", iface, adjacency); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetAdjacencyBuffer(ID3DX10Mesh *iface, + ID3DX10MeshBuffer **buffer) +{ + FIXME("iface %p, buffer %p stub!\n", iface, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_SetPointRepData(ID3DX10Mesh *iface, + const UINT *pointreps) +{ + FIXME("iface %p, pointreps %p stub!\n", iface, pointreps); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetPointRepBuffer(ID3DX10Mesh *iface, + ID3DX10MeshBuffer **buffer) +{ + FIXME("iface %p, buffer %p stub!\n", iface, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_Discard(ID3DX10Mesh *iface, + D3DX10_MESH_DISCARD_FLAGS flags) +{ + FIXME("iface %p, flags %#x stub!\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_CloneMesh(ID3DX10Mesh *iface, UINT flags, + const char *pos_semantic, const D3D10_INPUT_ELEMENT_DESC *desc, UINT decl_count, + ID3DX10Mesh **cloned_mesh) +{ + FIXME("iface %p, flags %#x, pos_semantic %s, desc %p, decl_count %u, cloned_mesh %p stub!\n", + iface, flags, debugstr_a(pos_semantic), desc, decl_count, cloned_mesh); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_Optimize(ID3DX10Mesh *iface, UINT flags, + UINT *face_remap, ID3D10Blob **vertex_remap) +{ + FIXME("iface %p, flags %#x, face_remap %p, vertex_remap %p stub!\n", iface, flags, + face_remap, vertex_remap); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GenerateAttributeBufferFromTable(ID3DX10Mesh *iface) +{ + FIXME("iface %p stub!\n", iface); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_Intersect(ID3DX10Mesh *iface, D3DXVECTOR3 *ray_pos, + D3DXVECTOR3 *ray_dir, UINT *hit_count, UINT *face_index, float *u, float *v, float *dist, + ID3D10Blob **all_hits) +{ + FIXME("iface %p, ray_pos %p, ray_dir %p, hit_count %p, u %p, v %p, dist %p, all_hits %p stub!\n", + iface, ray_pos, ray_dir, hit_count, u, v, dist, all_hits); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_IntersectSubset(ID3DX10Mesh *iface, UINT attr_id, + D3DXVECTOR3 *ray_pos, D3DXVECTOR3 *ray_dir, UINT *hit_count, float *u, float *v, + float *dist, ID3D10Blob **all_hits) +{ + FIXME("iface %p, attr_id %u, ray_pos %p, ray_dir %p, hit_count %p, u %p, v %p, dist %p, all_hits %p stub!\n", + iface, attr_id, ray_pos, ray_dir, hit_count, u, v, dist, all_hits); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_CommitToDevice(ID3DX10Mesh *iface) +{ + FIXME("iface %p stub!\n", iface); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_DrawSubset(ID3DX10Mesh *iface, UINT attr_id) +{ + FIXME("iface %p, attr_id %u stub!\n", iface, attr_id); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_DrawSubsetInstanced(ID3DX10Mesh *iface, UINT attr_id, + UINT instance_count, UINT start_instance) +{ + FIXME("iface %p, attr_id %u, instance_count %u, start_instance %u stub!\n", iface, attr_id, + instance_count, start_instance); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetDeviceVertexBuffer(ID3DX10Mesh *iface, UINT index, + ID3D10Buffer **buffer) +{ + FIXME("iface %p, index %u, buffer %p stub!\n", iface, index, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetDeviceIndexBuffer(ID3DX10Mesh *iface, + ID3D10Buffer **buffer) +{ + FIXME("iface %p, buffer %p stub!\n", iface, buffer); + + return E_NOTIMPL; +} + +static const ID3DX10MeshVtbl d3dx10_mesh_vtbl = +{ + d3dx10_mesh_QueryInterface, + d3dx10_mesh_AddRef, + d3dx10_mesh_Release, + d3dx10_mesh_GetFaceCount, + d3dx10_mesh_GetVertexCount, + d3dx10_mesh_GetVertexBufferCount, + d3dx10_mesh_GetFlags, + d3dx10_mesh_GetVertexDescription, + d3dx10_mesh_SetVertexData, + d3dx10_mesh_GetVertexBuffer, + d3dx10_mesh_SetIndexData, + d3dx10_mesh_GetIndexBuffer, + d3dx10_mesh_SetAttributeData, + d3dx10_mesh_GetAttributeBuffer, + d3dx10_mesh_SetAttributeTable, + d3dx10_mesh_GetAttributeTable, + d3dx10_mesh_GenerateAdjacencyAndPointReps, + d3dx10_mesh_GenerateGSAdjacency, + d3dx10_mesh_SetAdjacencyData, + d3dx10_mesh_GetAdjacencyBuffer, + d3dx10_mesh_SetPointRepData, + d3dx10_mesh_GetPointRepBuffer, + d3dx10_mesh_Discard, + d3dx10_mesh_CloneMesh, + d3dx10_mesh_Optimize, + d3dx10_mesh_GenerateAttributeBufferFromTable, + d3dx10_mesh_Intersect, + d3dx10_mesh_IntersectSubset, + d3dx10_mesh_CommitToDevice, + d3dx10_mesh_DrawSubset, + d3dx10_mesh_DrawSubsetInstanced, + d3dx10_mesh_GetDeviceVertexBuffer, + d3dx10_mesh_GetDeviceIndexBuffer, +}; + +HRESULT WINAPI D3DX10CreateMesh(ID3D10Device *device, const D3D10_INPUT_ELEMENT_DESC *decl, + UINT decl_count, const char *position_semantic, UINT vertex_count, UINT face_count, + UINT options, ID3DX10Mesh **mesh) +{ + struct d3dx10_mesh *object; + + FIXME("device %p, decl %p, decl_count %u, position_semantic %s, vertex_count %u, face_count %u, " + "options %#x, mesh %p semi-stub.\n", device, decl, decl_count, debugstr_a(position_semantic), vertex_count, + face_count, options, mesh); + + *mesh = NULL; + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->ID3DX10Mesh_iface.lpVtbl = &d3dx10_mesh_vtbl; + object->refcount = 1; + + *mesh = &object->ID3DX10Mesh_iface; + + return S_OK; +} -- 2.32.0

2 3

[PATCH v2 1/4] user32/tests: Mark some winevents optional in the SetParent sequence.
by Connor McAdams 26 Aug '21

26 Aug '21

Earlier patch set messages within the sequence to be optional, update winevents in sequence to match this. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- -v2: Fix winevent_hook_todo checks in patch 2/4. dlls/user32/tests/msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9867e319d58..079d63158c8 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -16694,12 +16694,12 @@ static const struct message WmSetParentSeq_2[] = { { EVENT_OBJECT_PARENTCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE }, { HCBT_ACTIVATE, hook|optional }, - { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_NCACTIVATE, sent|wparam|optional, 1 }, { WM_ACTIVATE, sent|wparam|optional, 1 }, { HCBT_SETFOCUS, hook|optional }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|optional|defwinproc }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOREDRAW|SWP_NOSIZE|SWP_NOCLIENTSIZE }, { WM_MOVE, sent|defwinproc|wparam, 0 }, -- 2.25.1

2 6

[PATCH 1/4] user32/tests: Mark some winevents optional in the SetParent sequence.
by Connor McAdams 25 Aug '21

25 Aug '21

Earlier patch set messages within the sequence to be optional, update winevents in sequence to match this. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/user32/tests/msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9867e319d58..079d63158c8 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -16694,12 +16694,12 @@ static const struct message WmSetParentSeq_2[] = { { EVENT_OBJECT_PARENTCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE }, { HCBT_ACTIVATE, hook|optional }, - { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_NCACTIVATE, sent|wparam|optional, 1 }, { WM_ACTIVATE, sent|wparam|optional, 1 }, { HCBT_SETFOCUS, hook|optional }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|optional|defwinproc }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOREDRAW|SWP_NOSIZE|SWP_NOCLIENTSIZE }, { WM_MOVE, sent|defwinproc|wparam, 0 }, -- 2.25.1

2 5

[PATCH 1/4] quartz: Always return S_FALSE from DllCanUnloadNow().
by Zebediah Figura 25 Aug '21

25 Aug '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/quartz/acmwrapper.c | 2 -- dlls/quartz/avidec.c | 2 -- dlls/quartz/dsoundrender.c | 2 -- dlls/quartz/filesource.c | 2 -- dlls/quartz/filtergraph.c | 2 -- dlls/quartz/filtermapper.c | 2 -- dlls/quartz/main.c | 24 ++---------------------- dlls/quartz/memallocator.c | 2 -- dlls/quartz/passthrough.c | 2 -- dlls/quartz/quartz_private.h | 2 -- dlls/quartz/systemclock.c | 2 -- dlls/quartz/videorenderer.c | 2 -- dlls/quartz/vmr9.c | 10 ++-------- 13 files changed, 4 insertions(+), 52 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 81e856a00df..a07bdfef0ca 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -484,8 +484,6 @@ static void acm_wrapper_destroy(struct strmbase_filter *iface) FreeMediaType(&filter->mt); strmbase_filter_cleanup(&filter->filter); free(filter); - - InterlockedDecrement(&object_locks); } static HRESULT acm_wrapper_init_stream(struct strmbase_filter *iface) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index b1e07fe5879..3d947e1b1bf 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -538,8 +538,6 @@ static void avi_decompressor_destroy(struct strmbase_filter *iface) strmbase_filter_cleanup(&filter->filter); free(filter); - - InterlockedDecrement(&object_locks); } static HRESULT avi_decompressor_init_stream(struct strmbase_filter *iface) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 68c88ea5a15..9ecdb280cc6 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -549,8 +549,6 @@ static void dsound_render_destroy(struct strmbase_filter *iface) strmbase_passthrough_cleanup(&filter->passthrough); strmbase_filter_cleanup(&filter->filter); free(filter); - - InterlockedDecrement(&object_locks); } static struct strmbase_pin *dsound_render_get_pin(struct strmbase_filter *iface, unsigned int index) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index cf5fe457715..e5e7b482984 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -351,8 +351,6 @@ static void async_reader_destroy(struct strmbase_filter *iface) strmbase_filter_cleanup(&filter->filter); free(filter); - - InterlockedDecrement(&object_locks); } static HRESULT async_reader_query_interface(struct strmbase_filter *iface, REFIID iid, void **out) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index a1f3757a202..47b9da9510b 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -475,8 +475,6 @@ static ULONG WINAPI FilterGraphInner_Release(IUnknown *iface) DeleteCriticalSection(&This->event_cs); DeleteCriticalSection(&This->cs); free(This); - - InterlockedDecrement(&object_locks); } return ref; } diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index b3210fdcd59..230273891d4 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -487,8 +487,6 @@ static ULONG WINAPI Inner_Release(IUnknown *iface) if (ref == 0) { CoTaskMemFree(This); - - InterlockedDecrement(&object_locks); } return ref; diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 303cc30a931..ed7080b76b9 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -24,11 +24,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); extern HRESULT WINAPI QUARTZ_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC_HIDDEN; -extern HRESULT WINAPI QUARTZ_DllCanUnloadNow(void) DECLSPEC_HIDDEN; extern BOOL WINAPI QUARTZ_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN; -LONG object_locks = 0; - BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { if (reason == DLL_PROCESS_DETACH && !reserved) @@ -127,21 +124,15 @@ static HRESULT WINAPI DSCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter if (SUCCEEDED(hres = This->create_instance(pOuter, &punk))) { - InterlockedIncrement(&object_locks); hres = IUnknown_QueryInterface(punk, riid, ppobj); IUnknown_Release(punk); } return hres; } -static HRESULT WINAPI DSCF_LockServer(IClassFactory *iface, BOOL dolock) +static HRESULT WINAPI DSCF_LockServer(IClassFactory *iface, BOOL lock) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - FIXME("(%p)->(%d),stub!\n",This,dolock); - if(dolock) - InterlockedIncrement(&object_locks); - else - InterlockedDecrement(&object_locks); + FIXME("iface %p, lock %d, stub!\n", iface, lock); return S_OK; } @@ -199,17 +190,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return QUARTZ_DllGetClassObject( rclsid, riid, ppv ); } -/*********************************************************************** - * DllCanUnloadNow (QUARTZ.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - if (!object_locks && QUARTZ_DllCanUnloadNow() == S_OK) - return S_OK; - return S_FALSE; -} - - #define OUR_GUID_ENTRY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } , #name }, diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index cc13f776cfb..531fbe874cf 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -911,8 +911,6 @@ static void StdMemAllocator_Destroy(IMemAllocator *iface) DeleteCriticalSection(&This->csState); CoTaskMemFree(This); - - InterlockedDecrement(&object_locks); } HRESULT mem_allocator_create(IUnknown *lpUnkOuter, IUnknown **out) diff --git a/dlls/quartz/passthrough.c b/dlls/quartz/passthrough.c index 7f81ae8a1be..2f8fe9dc370 100644 --- a/dlls/quartz/passthrough.c +++ b/dlls/quartz/passthrough.c @@ -80,8 +80,6 @@ static ULONG WINAPI seeking_passthrough_Release(IUnknown *iface) { strmbase_passthrough_cleanup(&passthrough->passthrough); free(passthrough); - - InterlockedDecrement(&object_locks); } return refcount; } diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index de83c2535db..c706d906a26 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -58,8 +58,6 @@ static inline const char *debugstr_time(REFERENCE_TIME time) return wine_dbg_sprintf("%s", rev); } -extern LONG object_locks; - /* see IAsyncReader::Request on MSDN for the explanation of this */ #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) #define BYTES_FROM_MEDIATIME(time) ((time) / 10000000) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 73a923a7b99..cebe4846f04 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -115,8 +115,6 @@ static ULONG WINAPI system_clock_inner_Release(IUnknown *iface) clock->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&clock->cs); heap_free(clock); - - InterlockedDecrement(&object_locks); } return refcount; } diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 1a59a9b5213..1dbb8a02181 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -130,8 +130,6 @@ static void video_renderer_destroy(struct strmbase_renderer *iface) video_window_cleanup(&filter->window); strmbase_renderer_cleanup(&filter->renderer); free(filter); - - InterlockedDecrement(&object_locks); } static HRESULT video_renderer_query_interface(struct strmbase_renderer *iface, REFIID iid, void **out) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 2562b74932a..4bde811c6d7 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -528,12 +528,6 @@ static void vmr_disconnect(struct strmbase_renderer *This) } } -static void vmr_free(struct quartz_vmr *filter) -{ - free(filter); - InterlockedDecrement(&object_locks); -} - static void vmr_destroy(struct strmbase_renderer *iface) { struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); @@ -563,7 +557,7 @@ static void vmr_destroy(struct strmbase_renderer *iface) FreeLibrary(filter->hD3d9); strmbase_renderer_cleanup(&filter->renderer); if (!filter->IVMRSurfaceAllocatorNotify9_refcount) - vmr_free(filter); + free(filter); } static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, void **out) @@ -1955,7 +1949,7 @@ static ULONG WINAPI VMR9SurfaceAllocatorNotify_Release(IVMRSurfaceAllocatorNotif TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount && !filter->renderer.filter.refcount) - vmr_free(filter); + free(filter); return refcount; } -- 2.30.2

1 3

[PATCH 1/2] ntdll: Unify get_file_info and fd_get_file_info.
by Erich E. Hoover 25 Aug '21

25 Aug '21

get_file_info and fd_get_file_info duplicate the same logic except that they either work on paths or file descriptors (respectively). This patch consolidates these two routines and moves some of the path-specific behavior to an updated [fd_]is_mount_point. Besides consolidation, this patch simplifies the reparse point patches (coming soon!) since there's now only one routine that handles both path-based and fd-based requests for file information. Best, Erich

1 0

[PATCH] msvcrt/tests: Remove redundant NULL check before free()
by Michael Stefaniuc 25 Aug '21

25 Aug '21

--- dlls/msvcrt/tests/cpp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 80eab3364ba..15105ca60dd 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1101,8 +1101,7 @@ static void test_demangle_datatype(void) name = p__unDName(0, demangle[i].mangled, 0, malloc, free, 0x2800); todo_wine_if (!demangle[i].test_in_wine) ok(name != NULL && !strcmp(name,demangle[i].result), "Got name \"%s\" for %d\n", name, i); - if(name) - free(name); + free(name); } } -- 2.31.1

1 0

[PATCH] d3dx10: Remove redundant NULL check before heap_free()
by Michael Stefaniuc 25 Aug '21

25 Aug '21

--- dlls/d3dx10_43/texture.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 8d30aef8648..32215b0a99a 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -709,8 +709,7 @@ end: IWICFormatConverter_Release(converter); if (dds_frame) IWICDdsFrameDecode_Release(dds_frame); - if (buffer) - heap_free(buffer); + heap_free(buffer); if (frame) IWICBitmapFrameDecode_Release(frame); if (decoder) -- 2.31.1

1 0

[PATCH 1/5] d3d10/effect: Use shader reflection to return output signature description.
by Nikolay Sivov 25 Aug '21

25 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/d3d10_private.h | 2 +- dlls/d3d10/effect.c | 54 ++++++++------------------------------ dlls/d3d10/tests/effect.c | 37 +++++++++++++++++++++++++- 3 files changed, 48 insertions(+), 45 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 249d4ea384a..359c1f017f7 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -106,7 +106,7 @@ struct d3d10_effect_shader_signature struct d3d10_effect_shader_variable { struct d3d10_effect_shader_signature input_signature; - struct d3d10_effect_shader_signature output_signature; + ID3D10ShaderReflection *reflection; union { ID3D10VertexShader *vs; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 520f816098f..3f0916e60d5 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -599,16 +599,12 @@ static HRESULT shader_chunk_handler(const char *data, DWORD data_size, DWORD tag switch(tag) { case TAG_ISGN: - case TAG_OSGN: { /* 32 (DXBC header) + 1 * 4 (chunk index) + 2 * 4 (chunk header) + data_size (chunk data) */ UINT size = 44 + data_size; - struct d3d10_effect_shader_signature *sig; + struct d3d10_effect_shader_signature *sig = &s->input_signature; char *ptr; - if (tag == TAG_ISGN) sig = &s->input_signature; - else sig = &s->output_signature; - if (!(sig->signature = heap_alloc_zero(size))) { ERR("Failed to allocate input signature data\n"); @@ -666,28 +662,22 @@ static HRESULT get_fx10_shader_resources(struct d3d10_effect_variable *v, const struct d3d10_effect_shader_variable *sv = &v->u.shader; struct d3d10_effect_shader_resource *sr; D3D10_SHADER_INPUT_BIND_DESC bind_desc; - ID3D10ShaderReflection *reflection; struct d3d10_effect_variable *var; D3D10_SHADER_DESC desc; unsigned int i, y; - HRESULT hr; - - if (FAILED(hr = D3D10ReflectShader(data, data_size, &reflection))) - return hr; - reflection->lpVtbl->GetDesc(reflection, &desc); + sv->reflection->lpVtbl->GetDesc(sv->reflection, &desc); sv->resource_count = desc.BoundResources; if (!(sv->resources = heap_calloc(sv->resource_count, sizeof(*sv->resources)))) { ERR("Failed to allocate shader resource binding information memory.\n"); - reflection->lpVtbl->Release(reflection); return E_OUTOFMEMORY; } for (i = 0; i < desc.BoundResources; ++i) { - reflection->lpVtbl->GetResourceBindingDesc(reflection, i, &bind_desc); + sv->reflection->lpVtbl->GetResourceBindingDesc(sv->reflection, i, &bind_desc); sr = &sv->resources[i]; sr->in_type = bind_desc.Type; @@ -731,7 +721,6 @@ static HRESULT get_fx10_shader_resources(struct d3d10_effect_variable *v, const if (!sr->variable) { WARN("Failed to find shader resource.\n"); - reflection->lpVtbl->Release(reflection); return E_FAIL; } } @@ -774,6 +763,9 @@ static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offse /* We got a shader VertexShader vs = NULL, so it is fine to skip this. */ if (!dxbc_size) return S_OK; + if (FAILED(hr = D3D10ReflectShader(ptr, dxbc_size, &v->u.shader.reflection))) + return hr; + if (FAILED(hr = get_fx10_shader_resources(v, ptr, dxbc_size))) return hr; @@ -2747,8 +2739,9 @@ static HRESULT d3d10_effect_object_apply(struct d3d10_effect_object *o) static void d3d10_effect_shader_variable_destroy(struct d3d10_effect_shader_variable *s, D3D10_SHADER_VARIABLE_TYPE type) { + if (s->reflection) + s->reflection->lpVtbl->Release(s->reflection); shader_free_signature(&s->input_signature); - shader_free_signature(&s->output_signature); switch (type) { @@ -7068,7 +7061,6 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetOutputSignature { struct d3d10_effect_variable *v = impl_from_ID3D10EffectShaderVariable(iface); struct d3d10_effect_shader_variable *s; - D3D10_SIGNATURE_PARAMETER_DESC *d; TRACE("iface %p, shader_index %u, element_index %u, desc %p\n", iface, shader_index, element_index, desc); @@ -7087,35 +7079,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetOutputSignature } s = &v->effect->used_shaders[shader_index]->u.shader; - if (!s->output_signature.signature) - { - WARN("No shader signature\n"); - return D3DERR_INVALIDCALL; - } - - /* Check desc for NULL, this crashes on W7/DX10 */ - if (!desc) - { - WARN("This should crash on W7/DX10!\n"); - return E_FAIL; - } - - if (element_index >= s->output_signature.element_count) - { - WARN("Invalid element index specified\n"); - return E_INVALIDARG; - } - d = &s->output_signature.elements[element_index]; - desc->SemanticName = d->SemanticName; - desc->SemanticIndex = d->SemanticIndex; - desc->SystemValueType = d->SystemValueType; - desc->ComponentType = d->ComponentType; - desc->Register = d->Register; - desc->ReadWriteMask = d->ReadWriteMask; - desc->Mask = d->Mask; + if (!s->reflection) + return D3DERR_INVALIDCALL; - return S_OK; + return s->reflection->lpVtbl->GetOutputParameterDesc(s->reflection, element_index, desc); } diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 9a217993e7e..df0d1a99ef4 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -23,6 +23,8 @@ #include <float.h> +#define D3DERR_INVALIDCALL 0x8876086c + static ID3D10Device *create_device(void) { ID3D10Device *device; @@ -2796,8 +2798,9 @@ static void test_effect_local_shader(void) D3D10_EFFECT_TYPE_DESC typedesc; D3D10_EFFECT_DESC effect_desc; ID3D10EffectShaderVariable *null_shader, *null_anon_vs, *null_anon_ps, *null_anon_gs, - *p3_anon_vs, *p3_anon_ps, *p3_anon_gs, *p6_vs, *p6_ps, *p6_gs, *gs; + *p3_anon_vs, *p3_anon_ps, *p3_anon_gs, *p6_vs, *p6_ps, *p6_gs, *gs, *ps, *vs; D3D10_EFFECT_SHADER_DESC shaderdesc; + D3D10_SIGNATURE_PARAMETER_DESC sign; ID3D10Device *device; ULONG refcount; @@ -3648,6 +3651,38 @@ todo_wine shaderdesc.SODecl); } + /* Output signature description */ + v = effect->lpVtbl->GetVariableByName(effect, "p"); + ps = v->lpVtbl->AsShader(v); + + hr = ps->lpVtbl->GetOutputSignatureElementDesc(ps, 0, 0, &sign); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ok(!strcmp(sign.SemanticName, "SV_Target"), "Unexpected semantic %s.\n", sign.SemanticName); + + v = effect->lpVtbl->GetVariableByName(effect, "v"); + vs = v->lpVtbl->AsShader(v); + + hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 0, 0, &sign); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + + hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 1, 0, &sign); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); + + /* NULL shader variable */ + v = effect->lpVtbl->GetVariableByName(effect, "v0"); + vs = v->lpVtbl->AsShader(v); + + hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 0, 0, &sign); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); -- 2.32.0

3 15

[PATCH] d3dx10_41/tests: Enable tests.
by Nikolay Sivov 25 Aug '21

25 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- configure.ac | 1 + dlls/d3dx10_41/Makefile.in | 1 + dlls/d3dx10_41/tests/Makefile.in | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 dlls/d3dx10_41/tests/Makefile.in diff --git a/configure.ac b/configure.ac index a9750330443..801407c71a3 100644 --- a/configure.ac +++ b/configure.ac @@ -3086,6 +3086,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dx10_38) WINE_CONFIG_MAKEFILE(dlls/d3dx10_39) WINE_CONFIG_MAKEFILE(dlls/d3dx10_40) WINE_CONFIG_MAKEFILE(dlls/d3dx10_41) +WINE_CONFIG_MAKEFILE(dlls/d3dx10_41/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_42) WINE_CONFIG_MAKEFILE(dlls/d3dx10_42/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_43) diff --git a/dlls/d3dx10_41/Makefile.in b/dlls/d3dx10_41/Makefile.in index 41ebda9892c..a3a64fef6d8 100644 --- a/dlls/d3dx10_41/Makefile.in +++ b/dlls/d3dx10_41/Makefile.in @@ -1,4 +1,5 @@ MODULE = d3dx10_41.dll +IMPORTLIB = d3dx10_41 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/d3dx10_41/tests/Makefile.in b/dlls/d3dx10_41/tests/Makefile.in new file mode 100644 index 00000000000..bde10a26ea7 --- /dev/null +++ b/dlls/d3dx10_41/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = d3dx10_41.dll +IMPORTS = d3dx10_41 ole32 gdi32 +PARENTSRC = ../../d3dx10_43/tests + +C_SRCS = \ + d3dx10.c -- 2.32.0

2 1

[v2 PATCH 1/3] d3dx10: Add a stub mesh object.
by Matteo Bruni 25 Aug '21

25 Aug '21

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2 (Matteo): Rename a couple of "size" arguments to "count" (trivial) dlls/d3dx10_43/Makefile.in | 1 + dlls/d3dx10_43/d3dx10_43.spec | 2 +- dlls/d3dx10_43/mesh.c | 378 ++++++++++++++++++++++++++++++++++ 3 files changed, 380 insertions(+), 1 deletion(-) create mode 100644 dlls/d3dx10_43/mesh.c diff --git a/dlls/d3dx10_43/Makefile.in b/dlls/d3dx10_43/Makefile.in index a763f588996..b6baed2b619 100644 --- a/dlls/d3dx10_43/Makefile.in +++ b/dlls/d3dx10_43/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ compiler.c \ d3dx10_43_main.c \ font.c \ + mesh.c \ sprite.c \ texture.c diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index aaa056acdd2..da6629ad1a0 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -34,7 +34,7 @@ @ stdcall D3DX10CreateFontIndirectA(ptr ptr ptr) @ stdcall D3DX10CreateFontIndirectW(ptr ptr ptr) @ stdcall D3DX10CreateFontW(ptr long long long long long long long long long wstr ptr) -@ stub D3DX10CreateMesh(ptr ptr long str long long long ptr) +@ stdcall D3DX10CreateMesh(ptr ptr long str long long long ptr) @ stub D3DX10CreateShaderResourceViewFromFileA(ptr str ptr ptr ptr ptr) @ stub D3DX10CreateShaderResourceViewFromFileW(ptr wstr ptr ptr ptr ptr) @ stub D3DX10CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) diff --git a/dlls/d3dx10_43/mesh.c b/dlls/d3dx10_43/mesh.c new file mode 100644 index 00000000000..276319719f8 --- /dev/null +++ b/dlls/d3dx10_43/mesh.c @@ -0,0 +1,378 @@ +/* + * Copyright 2021 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#define COBJMACROS +#include "d3dx10.h" + +#include "wine/debug.h" +#include "wine/heap.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + +struct d3dx10_mesh +{ + ID3DX10Mesh ID3DX10Mesh_iface; + LONG refcount; +}; + +static inline struct d3dx10_mesh *impl_from_ID3DX10Mesh(ID3DX10Mesh *iface) +{ + return CONTAINING_RECORD(iface, struct d3dx10_mesh, ID3DX10Mesh_iface); +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_QueryInterface(ID3DX10Mesh *iface, REFIID riid, void **out) +{ + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); + + if (IsEqualGUID(riid, &IID_ID3DX10Mesh) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3dx10_mesh_AddRef(ID3DX10Mesh *iface) +{ + struct d3dx10_mesh *mesh = impl_from_ID3DX10Mesh(iface); + ULONG refcount = InterlockedIncrement(&mesh->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3dx10_mesh_Release(ID3DX10Mesh *iface) +{ + struct d3dx10_mesh *mesh = impl_from_ID3DX10Mesh(iface); + ULONG refcount = InterlockedDecrement(&mesh->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + heap_free(mesh); + + return refcount; +} + +static UINT STDMETHODCALLTYPE d3dx10_mesh_GetFaceCount(ID3DX10Mesh *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static UINT STDMETHODCALLTYPE d3dx10_mesh_GetVertexCount(ID3DX10Mesh *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static UINT STDMETHODCALLTYPE d3dx10_mesh_GetVertexBufferCount(ID3DX10Mesh *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static UINT STDMETHODCALLTYPE d3dx10_mesh_GetFlags(ID3DX10Mesh *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetVertexDescription(ID3DX10Mesh *iface, + const D3D10_INPUT_ELEMENT_DESC **desc, UINT *count) +{ + FIXME("iface %p, desc %p, count %p stub!\n", iface, desc, count); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_SetVertexData(ID3DX10Mesh *iface, UINT index, + const void *data) +{ + FIXME("iface %p, index %u, data %p stub!\n", iface, index, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetVertexBuffer(ID3DX10Mesh *iface, UINT index, + ID3DX10MeshBuffer **buffer) +{ + FIXME("iface %p, index %u, buffer %p stub!\n", iface, index, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_SetIndexData(ID3DX10Mesh *iface, const void *data, + UINT count) +{ + FIXME("iface %p, data %p, count %u stub!\n", iface, data, count); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetIndexBuffer(ID3DX10Mesh *iface, + ID3DX10MeshBuffer **buffer) +{ + FIXME("iface %p, buffer %p stub!\n", iface, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_SetAttributeData(ID3DX10Mesh *iface, + const UINT *data) +{ + FIXME("iface %p, data %p stub!\n", iface, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetAttributeBuffer(ID3DX10Mesh *iface, + ID3DX10MeshBuffer **buffer) +{ + FIXME("iface %p, buffer %p stub!\n", iface, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_SetAttributeTable(ID3DX10Mesh *iface, + const D3DX10_ATTRIBUTE_RANGE *table, UINT count) +{ + FIXME("iface %p, table %p, count %u stub!\n", iface, table, count); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetAttributeTable(ID3DX10Mesh *iface, + D3DX10_ATTRIBUTE_RANGE *table, UINT *count) +{ + FIXME("iface %p, table %p, count %p stub!\n", iface, table, count); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GenerateAdjacencyAndPointReps(ID3DX10Mesh *iface, + float epsilon) +{ + FIXME("iface %p, epsilon %.8e stub!\n", iface, epsilon); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GenerateGSAdjacency(ID3DX10Mesh *iface) +{ + FIXME("iface %p stub!\n", iface); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_SetAdjacencyData(ID3DX10Mesh *iface, + const UINT *adjacency) +{ + FIXME("iface %p, adjacency %p stub!\n", iface, adjacency); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetAdjacencyBuffer(ID3DX10Mesh *iface, + ID3DX10MeshBuffer **buffer) +{ + FIXME("iface %p, buffer %p stub!\n", iface, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_SetPointRepData(ID3DX10Mesh *iface, + const UINT *pointreps) +{ + FIXME("iface %p, pointreps %p stub!\n", iface, pointreps); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetPointRepBuffer(ID3DX10Mesh *iface, + ID3DX10MeshBuffer **buffer) +{ + FIXME("iface %p, buffer %p stub!\n", iface, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_Discard(ID3DX10Mesh *iface, + D3DX10_MESH_DISCARD_FLAGS flags) +{ + FIXME("iface %p, flags %#x stub!\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_CloneMesh(ID3DX10Mesh *iface, UINT flags, + const char *pos_semantic, const D3D10_INPUT_ELEMENT_DESC *desc, UINT decl_count, + ID3DX10Mesh **cloned_mesh) +{ + FIXME("iface %p, flags %#x, pos_semantic %s, desc %p, decl_count %u, cloned_mesh %p stub!\n", + iface, flags, debugstr_a(pos_semantic), desc, decl_count, cloned_mesh); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_Optimize(ID3DX10Mesh *iface, UINT flags, + UINT *face_remap, ID3D10Blob **vertex_remap) +{ + FIXME("iface %p, flags %#x, face_remap %p, vertex_remap %p stub!\n", iface, flags, + face_remap, vertex_remap); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GenerateAttributeBufferFromTable(ID3DX10Mesh *iface) +{ + FIXME("iface %p stub!\n", iface); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_Intersect(ID3DX10Mesh *iface, D3DXVECTOR3 *ray_pos, + D3DXVECTOR3 *ray_dir, UINT *hit_count, UINT *face_index, float *u, float *v, float *dist, + ID3D10Blob **all_hits) +{ + FIXME("iface %p, ray_pos %p, ray_dir %p, hit_count %p, u %p, v %p, dist %p, all_hits %p stub!\n", + iface, ray_pos, ray_dir, hit_count, u, v, dist, all_hits); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_IntersectSubset(ID3DX10Mesh *iface, UINT attr_id, + D3DXVECTOR3 *ray_pos, D3DXVECTOR3 *ray_dir, UINT *hit_count, float *u, float *v, + float *dist, ID3D10Blob **all_hits) +{ + FIXME("iface %p, attr_id %u, ray_pos %p, ray_dir %p, hit_count %p, u %p, v %p, dist %p, all_hits %p stub!\n", + iface, attr_id, ray_pos, ray_dir, hit_count, u, v, dist, all_hits); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_CommitToDevice(ID3DX10Mesh *iface) +{ + FIXME("iface %p stub!\n", iface); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_DrawSubset(ID3DX10Mesh *iface, UINT attr_id) +{ + FIXME("iface %p, attr_id %u stub!\n", iface, attr_id); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_DrawSubsetInstanced(ID3DX10Mesh *iface, UINT attr_id, + UINT instance_count, UINT start_instance) +{ + FIXME("iface %p, attr_id %u, instance_count %u, start_instance %u stub!\n", iface, attr_id, + instance_count, start_instance); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetDeviceVertexBuffer(ID3DX10Mesh *iface, UINT index, + ID3D10Buffer **buffer) +{ + FIXME("iface %p, index %u, buffer %p stub!\n", iface, index, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3dx10_mesh_GetDeviceIndexBuffer(ID3DX10Mesh *iface, + ID3D10Buffer **buffer) +{ + FIXME("iface %p, buffer %p stub!\n", iface, buffer); + + return E_NOTIMPL; +} + +static const ID3DX10MeshVtbl d3dx10_mesh_vtbl = +{ + d3dx10_mesh_QueryInterface, + d3dx10_mesh_AddRef, + d3dx10_mesh_Release, + d3dx10_mesh_GetFaceCount, + d3dx10_mesh_GetVertexCount, + d3dx10_mesh_GetVertexBufferCount, + d3dx10_mesh_GetFlags, + d3dx10_mesh_GetVertexDescription, + d3dx10_mesh_SetVertexData, + d3dx10_mesh_GetVertexBuffer, + d3dx10_mesh_SetIndexData, + d3dx10_mesh_GetIndexBuffer, + d3dx10_mesh_SetAttributeData, + d3dx10_mesh_GetAttributeBuffer, + d3dx10_mesh_SetAttributeTable, + d3dx10_mesh_GetAttributeTable, + d3dx10_mesh_GenerateAdjacencyAndPointReps, + d3dx10_mesh_GenerateGSAdjacency, + d3dx10_mesh_SetAdjacencyData, + d3dx10_mesh_GetAdjacencyBuffer, + d3dx10_mesh_SetPointRepData, + d3dx10_mesh_GetPointRepBuffer, + d3dx10_mesh_Discard, + d3dx10_mesh_CloneMesh, + d3dx10_mesh_Optimize, + d3dx10_mesh_GenerateAttributeBufferFromTable, + d3dx10_mesh_Intersect, + d3dx10_mesh_IntersectSubset, + d3dx10_mesh_CommitToDevice, + d3dx10_mesh_DrawSubset, + d3dx10_mesh_DrawSubsetInstanced, + d3dx10_mesh_GetDeviceVertexBuffer, + d3dx10_mesh_GetDeviceIndexBuffer, +}; + +HRESULT WINAPI D3DX10CreateMesh(ID3D10Device *device, const D3D10_INPUT_ELEMENT_DESC *decl, + UINT decl_count, const char *position_semantic, UINT vertex_count, UINT face_count, + UINT options, ID3DX10Mesh **mesh) +{ + struct d3dx10_mesh *object; + + FIXME("device %p, decl %p, decl_count %u, position_semantic %s, vertex_count %u, face_count %u, " + "options %#x, mesh %p semi-stub.\n", device, decl, decl_count, debugstr_a(position_semantic), vertex_count, + face_count, options, mesh); + + *mesh = NULL; + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->ID3DX10Mesh_iface.lpVtbl = &d3dx10_mesh_vtbl; + object->refcount = 1; + + *mesh = &object->ID3DX10Mesh_iface; + + return S_OK; +} -- 2.26.3

1 2

[PATCH 1/4] ntoskrnl.exe/tests: Add more HID usage nary tests.
by Rémi Bernon 25 Aug '21

25 Aug '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntoskrnl.exe/tests/driver_hid.c | 12 ++++++- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 49 ++++++++++++++++++++++------ 2 files changed, 50 insertions(+), 11 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index 8111af23c06..ce942815dcb 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -299,6 +299,16 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) REPORT_COUNT(1, 8), REPORT_SIZE(1, 1), INPUT(1, Data|Var|Abs), + + USAGE(4, (HID_USAGE_PAGE_KEYBOARD<<16)|0x8c), + USAGE(4, (HID_USAGE_PAGE_KEYBOARD<<16)|0x8d), + USAGE(4, (HID_USAGE_PAGE_KEYBOARD<<16)|0x8e), + USAGE(4, (HID_USAGE_PAGE_KEYBOARD<<16)|0x8f), + LOGICAL_MINIMUM(1, 1), + LOGICAL_MAXIMUM(1, 16), + REPORT_COUNT(1, 2), + REPORT_SIZE(1, 8), + INPUT(1, Data|Ary|Abs), END_COLLECTION, USAGE_PAGE(2, HID_USAGE_PAGE_HAPTICS), @@ -477,7 +487,7 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_READ_REPORT: { - ULONG expected_size = 23; + ULONG expected_size = 25; ok(!in_size, "got input size %u\n", in_size); ok(out_size == expected_size, "got output size %u\n", out_size); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index f11dce1cc93..a7a67f298ab 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1684,13 +1684,13 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled { .Usage = HID_USAGE_GENERIC_JOYSTICK, .UsagePage = HID_USAGE_PAGE_GENERIC, - .InputReportByteLength = 24, + .InputReportByteLength = 26, .OutputReportByteLength = 3, .FeatureReportByteLength = 18, .NumberLinkCollectionNodes = 10, - .NumberInputButtonCaps = 13, + .NumberInputButtonCaps = 17, .NumberInputValueCaps = 7, - .NumberInputDataIndices = 43, + .NumberInputDataIndices = 47, .NumberFeatureButtonCaps = 1, .NumberFeatureValueCaps = 5, .NumberFeatureDataIndices = 7, @@ -1699,13 +1699,13 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled { .Usage = HID_USAGE_GENERIC_JOYSTICK, .UsagePage = HID_USAGE_PAGE_GENERIC, - .InputReportByteLength = 23, + .InputReportByteLength = 25, .OutputReportByteLength = 2, .FeatureReportByteLength = 17, .NumberLinkCollectionNodes = 10, - .NumberInputButtonCaps = 13, + .NumberInputButtonCaps = 17, .NumberInputValueCaps = 7, - .NumberInputDataIndices = 43, + .NumberInputDataIndices = 47, .NumberFeatureButtonCaps = 1, .NumberFeatureValueCaps = 5, .NumberFeatureDataIndices = 7, @@ -1872,12 +1872,12 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled HIDP_LINK_COLLECTION_NODE collections[16]; PHIDP_PREPARSED_DATA preparsed_data; USAGE_AND_PAGE usage_and_pages[16]; - HIDP_BUTTON_CAPS button_caps[16]; + HIDP_BUTTON_CAPS button_caps[32]; HIDP_VALUE_CAPS value_caps[16]; char buffer[200], report[200]; DWORD collection_count; DWORD waveform_list; - HIDP_DATA data[32]; + HIDP_DATA data[64]; USAGE usages[16]; NTSTATUS status; HIDP_CAPS caps; @@ -2186,7 +2186,7 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled value = HidP_MaxUsageListLength(HidP_Feature + 1, 0, preparsed_data); ok(value == 0, "HidP_MaxUsageListLength(HidP_Feature + 1, 0) returned %d, expected %d\n", value, 0); value = HidP_MaxUsageListLength(HidP_Input, 0, preparsed_data); - ok(value == 42, "HidP_MaxUsageListLength(HidP_Input, 0) returned %d, expected %d\n", value, 42); + ok(value == 50, "HidP_MaxUsageListLength(HidP_Input, 0) returned %d, expected %d\n", value, 50); value = HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_BUTTON, preparsed_data); ok(value == 32, "HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_BUTTON) returned %d, expected %d\n", value, 32); value = HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_LED, preparsed_data); @@ -2307,7 +2307,7 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled value = HidP_MaxDataListLength(HidP_Feature + 1, preparsed_data); ok(value == 0, "HidP_MaxDataListLength(HidP_Feature + 1) returned %d, expected %d\n", value, 0); value = HidP_MaxDataListLength(HidP_Input, preparsed_data); - ok(value == 50, "HidP_MaxDataListLength(HidP_Input) returned %d, expected %d\n", value, 50); + ok(value == 58, "HidP_MaxDataListLength(HidP_Input) returned %d, expected %d\n", value, 58); value = HidP_MaxDataListLength(HidP_Output, preparsed_data); ok(value == 0, "HidP_MaxDataListLength(HidP_Output) returned %d, expected %d\n", value, 0); value = HidP_MaxDataListLength(HidP_Feature, preparsed_data); @@ -2328,6 +2328,35 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled winetest_pop_context(); } + /* HID nary usage collections are set with 1-based usage index in their declaration order */ + + memset(report, 0, caps.InputReportByteLength); + status = HidP_InitializeReportForID(HidP_Input, report_id, preparsed_data, report, + caps.InputReportByteLength); + ok(status == HIDP_STATUS_SUCCESS, "HidP_InitializeReportForID returned %#x\n", status); + value = 2; + usages[0] = 0x8e; + usages[1] = 0x8f; + status = HidP_SetUsages(HidP_Input, HID_USAGE_PAGE_KEYBOARD, 0, usages, &value, preparsed_data, + report, caps.InputReportByteLength); + ok(status == HIDP_STATUS_SUCCESS, "HidP_SetUsages returned %#x\n", status); + todo_wine + ok(report[caps.InputReportByteLength - 2] == 3, "unexpected usage index %d, expected 3\n", + report[caps.InputReportByteLength - 2]); + todo_wine + ok(report[caps.InputReportByteLength - 1] == 4, "unexpected usage index %d, expected 4\n", + report[caps.InputReportByteLength - 1]); + report[caps.InputReportByteLength - 2] = 0; + report[caps.InputReportByteLength - 1] = 0; + value = 1; + usages[0] = 0x8c; + status = HidP_SetUsages(HidP_Input, HID_USAGE_PAGE_KEYBOARD, 0, usages, &value, preparsed_data, + report, caps.InputReportByteLength); + ok(status == HIDP_STATUS_SUCCESS, "HidP_SetUsages returned %#x\n", status); + todo_wine + ok(report[caps.InputReportByteLength - 2] == 1, "unexpected usage index %d, expected 1\n", + report[caps.InputReportByteLength - 2]); + memset(report, 0xcd, sizeof(report)); status = HidP_InitializeReportForID(HidP_Feature, 3, preparsed_data, report, caps.FeatureReportByteLength); ok(status == HIDP_STATUS_REPORT_DOES_NOT_EXIST, "HidP_InitializeReportForID returned %#x\n", status); -- 2.33.0

2 4

[PATCH 1/3] dinput: Allocate data format on device creation.
by Rémi Bernon 25 Aug '21

25 Aug '21

It's accessed on Release, and this will make it easier to handle device creation failure cleanup. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I'm resending this HID joystick implementation, I think HID layer is now in a good shape and this will be a good occasion to start testing it. The input events should at least work, and the force feedback support otoh will require the complete winebus refactoring first. This series is just the initial implementation, which does nothing, but I splitted and added some small refactoring first to make it simpler. Since last time I shaved the initial implementation to only include the necessary functions, and I'll add specific implementation of new methods as they start to be implemented (instead of having stubs of everything). The enumeration is mostly the same as the last version I sent. dlls/dinput/device.c | 9 +++++++++ dlls/dinput/joystick_linux.c | 3 +-- dlls/dinput/joystick_linuxinput.c | 3 +-- dlls/dinput/joystick_osx.c | 3 +-- dlls/dinput/keyboard.c | 4 +--- dlls/dinput/mouse.c | 3 +-- 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index ac60a21326c..25084f82a9c 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1708,11 +1708,20 @@ HRESULT direct_input_device_alloc( SIZE_T size, const IDirectInputDevice8WVtbl * const GUID *guid, IDirectInputImpl *dinput, void **out ) { IDirectInputDeviceImpl *This; + DIDATAFORMAT *format; + if (!(This = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ))) return DIERR_OUTOFMEMORY; + if (!(format = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*format) ))) + { + HeapFree( GetProcessHeap(), 0, This ); + return DIERR_OUTOFMEMORY; + } + This->IDirectInputDevice8A_iface.lpVtbl = &dinput_device_a_vtbl; This->IDirectInputDevice8W_iface.lpVtbl = vtbl; This->ref = 1; This->guid = *guid; + This->data_format.wine_df = format; InitializeCriticalSection( &This->crit ); This->dinput = dinput; IDirectInput_AddRef( &dinput->IDirectInput7A_iface ); diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 3215978c995..258f6e9e5e0 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -411,6 +411,7 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, JoystickIm if (FAILED(hr = direct_input_device_alloc( sizeof(JoystickImpl), &JoystickWvt, rguid, dinput, (void **)&newDevice ))) return hr; + df = newDevice->generic.base.data_format.wine_df; newDevice->generic.base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JoystickImpl*->generic.base.crit"); newDevice->joydev = &joystick_devices[index]; @@ -438,7 +439,6 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, JoystickIm goto FAILED1; /* Create copy of default data format */ - if (!(df = HeapAlloc(GetProcessHeap(), 0, c_dfDIJoystick2.dwSize))) goto FAILED; memcpy(df, &c_dfDIJoystick2, c_dfDIJoystick2.dwSize); df->dwNumObjs = newDevice->generic.devcaps.dwAxes + newDevice->generic.devcaps.dwPOVs + newDevice->generic.devcaps.dwButtons; @@ -465,7 +465,6 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, JoystickIm df->rgodf[idx ].pguid = &GUID_Button; df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(i) | DIDFT_PSHBUTTON; } - newDevice->generic.base.data_format.wine_df = df; /* initialize default properties */ for (i = 0; i < c_dfDIJoystick2.dwNumObjs; i++) { diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 2b970271ec3..06a735f7d91 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -407,6 +407,7 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, JoystickIm if (FAILED(hr = direct_input_device_alloc( sizeof(JoystickImpl), &JoystickWvt, rguid, dinput, (void **)&newDevice ))) return hr; + df = newDevice->generic.base.data_format.wine_df; newDevice->generic.base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JoystickImpl*->base.crit"); newDevice->generic.joy_polldev = joy_polldev; @@ -468,7 +469,6 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, JoystickIm if (setup_dinput_options(&newDevice->generic, default_axis_map) != DI_OK) goto failed; /* Create copy of default data format */ - if (!(df = HeapAlloc(GetProcessHeap(), 0, c_dfDIJoystick2.dwSize))) goto failed; memcpy(df, &c_dfDIJoystick2, c_dfDIJoystick2.dwSize); if (!(df->rgodf = HeapAlloc(GetProcessHeap(), 0, df->dwNumObjs * df->dwObjSize))) goto failed; @@ -514,7 +514,6 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, JoystickIm df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(newDevice->generic.devcaps.dwButtons++) | DIDFT_PSHBUTTON; } df->dwNumObjs = idx; - newDevice->generic.base.data_format.wine_df = df; fake_current_js_state(newDevice); diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 27a47b07639..62a063b6da1 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -1075,6 +1075,7 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, JoystickIm if (FAILED(hr = direct_input_device_alloc( sizeof(JoystickImpl), &JoystickWvt, rguid, dinput, (void **)&newDevice ))) return hr; + df = newDevice->generic.base.data_format.wine_df; newDevice->generic.base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JoystickImpl*->generic.base.crit"); newDevice->id = index; @@ -1138,7 +1139,6 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, JoystickIm } /* Create copy of default data format */ - if (!(df = HeapAlloc(GetProcessHeap(), 0, c_dfDIJoystick2.dwSize))) goto FAILED; memcpy(df, &c_dfDIJoystick2, c_dfDIJoystick2.dwSize); df->dwNumObjs = newDevice->generic.devcaps.dwAxes + newDevice->generic.devcaps.dwPOVs + newDevice->generic.devcaps.dwButtons; @@ -1203,7 +1203,6 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, JoystickIm df->rgodf[idx ].pguid = &GUID_Button; df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(i) | DIDFT_PSHBUTTON; } - newDevice->generic.base.data_format.wine_df = df; /* initialize default properties */ get_osx_device_elements_props(newDevice); diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index fc9dbdb2ed4..5d532ab8059 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -203,12 +203,12 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysKeyboar if (FAILED(hr = direct_input_device_alloc( sizeof(SysKeyboardImpl), &SysKeyboardWvt, rguid, dinput, (void **)&newDevice ))) return hr; + df = newDevice->base.data_format.wine_df; newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysKeyboardImpl*->base.crit"); newDevice->subtype = get_keyboard_subtype(); /* Create copy of default data format */ - if (!(df = HeapAlloc(GetProcessHeap(), 0, c_dfDIKeyboard.dwSize))) goto failed; memcpy(df, &c_dfDIKeyboard, c_dfDIKeyboard.dwSize); if (!(df->rgodf = HeapAlloc(GetProcessHeap(), 0, df->dwNumObjs * df->dwObjSize))) goto failed; @@ -226,8 +226,6 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysKeyboar } df->dwNumObjs = idx; - newDevice->base.data_format.wine_df = df; - *out = newDevice; return DI_OK; diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 22e40a60285..145a792f396 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -149,6 +149,7 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysMouseIm if (FAILED(hr = direct_input_device_alloc( sizeof(SysMouseImpl), &SysMouseWvt, rguid, dinput, (void **)&newDevice ))) return hr; + df = newDevice->base.data_format.wine_df; newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysMouseImpl*->base.crit"); newDevice->base.dwCoopLevel = DISCL_NONEXCLUSIVE | DISCL_BACKGROUND; @@ -165,7 +166,6 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysMouseIm if (hkey) RegCloseKey(hkey); /* Create copy of default data format */ - if (!(df = HeapAlloc(GetProcessHeap(), 0, c_dfDIMouse2.dwSize))) goto failed; memcpy(df, &c_dfDIMouse2, c_dfDIMouse2.dwSize); if (!(df->rgodf = HeapAlloc(GetProcessHeap(), 0, df->dwNumObjs * df->dwObjSize))) goto failed; memcpy(df->rgodf, c_dfDIMouse2.rgodf, df->dwNumObjs * df->dwObjSize); @@ -177,7 +177,6 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysMouseIm else df->rgodf[i].dwType = DIDFT_MAKEINSTANCE(i) | DIDFT_PSHBUTTON; - newDevice->base.data_format.wine_df = df; if (dinput->dwVersion >= 0x0800) { newDevice->base.use_raw_input = TRUE; -- 2.33.0

1 2

[PATCH] winegstreamer: Create media source read thread after initializing wg_parser.
by Paul Gofman 25 Aug '21

25 Aug '21

Fixes race condition as wg_parser is used right away in the created thread. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winegstreamer/media_source.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 05544ef7abe..01ab626254a 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1315,8 +1315,6 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ if (FAILED(hr = MFAllocateWorkQueue(&object->async_commands_queue))) goto fail; - object->read_thread = CreateThread(NULL, 0, read_thread, object, 0, NULL); - if (!(parser = unix_funcs->wg_decodebin_parser_create())) { hr = E_OUTOFMEMORY; @@ -1324,6 +1322,8 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ } object->wg_parser = parser; + object->read_thread = CreateThread(NULL, 0, read_thread, object, 0, NULL); + object->state = SOURCE_OPENING; if (FAILED(hr = unix_funcs->wg_parser_connect(parser, file_size))) -- 2.31.1

2 1

[PATCH] winmm/tests: Fix an ASCII / ANSI mixup in a trace() message.
by Francois Gouget 25 Aug '21

25 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/winmm/tests/mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c index b9e35aa519d..a72966c320b 100644 --- a/dlls/winmm/tests/mixer.c +++ b/dlls/winmm/tests/mixer.c @@ -983,7 +983,7 @@ static void mixer_testsA(void) MMRESULT rc; UINT ndev, d; - trace("--- Testing ASCII functions ---\n"); + trace("--- Testing ANSI functions ---\n"); ndev=mixerGetNumDevs(); trace("found %d Mixer devices\n",ndev); -- 2.20.1

1 0

[PATCH] winspool.drv: Fix ASCII / ANSI mixups in comments and TRACE() messages.
by Francois Gouget 25 Aug '21

25 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/winspool.drv/info.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index d6aa60a028f..8a17355f120 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -4047,7 +4047,7 @@ BOOL WINAPI ResetPrinterW(HANDLE hPrinter, LPPRINTER_DEFAULTSW pDefault) * Get ValueName from hkey storing result in out * when the Value in the registry has only a filename, use driverdir as prefix * outlen is space left in out - * String is stored either as unicode or ascii + * String is stored either as unicode or ansi * */ @@ -4180,7 +4180,7 @@ static void WINSPOOL_GetDefaultDevMode(LPBYTE ptr, DWORD buflen, DWORD *needed) * WINSPOOL_GetDevModeFromReg * * Get ValueName from hkey storing result in ptr. buflen is space left in ptr - * DevMode is stored either as unicode or ascii. + * DevMode is stored either as unicode or ansi. */ static BOOL WINSPOOL_GetDevModeFromReg(HKEY hkey, LPCWSTR ValueName, LPBYTE ptr, @@ -6770,7 +6770,7 @@ DWORD WINAPI EnumPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName, memcpy (ppev->pValueName, pBuffer, len); - TRACE ("Converted '%s' from Unicode to ASCII\n", pBuffer); + TRACE ("Converted '%s' from Unicode to ANSI\n", pBuffer); if (ppev->dwType != REG_SZ && ppev->dwType != REG_EXPAND_SZ && ppev->dwType != REG_MULTI_SZ) @@ -6789,7 +6789,7 @@ DWORD WINAPI EnumPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName, memcpy (ppev->pData, pBuffer, len); - TRACE ("Converted '%s' from Unicode to ASCII\n", pBuffer); + TRACE ("Converted '%s' from Unicode to ANSI\n", pBuffer); TRACE (" (only first string of REG_MULTI_SZ printed)\n"); } -- 2.20.1

1 0

[PATCH] setupapi: Fix a couple of ASCII / ANSI mixups in comments.
by Francois Gouget 25 Aug '21

25 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/setupapi/misc.c | 2 +- dlls/setupapi/setupapi_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 26e5359804c..4d3ced2e4ae 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -1781,7 +1781,7 @@ BOOL WINAPI SetupLogErrorW(LPCWSTR message, LogSeverity severity) WideCharToMultiByte(CP_ACP, 0, message, -1, msg, len, NULL, NULL); } - /* This is the normal way to proceed. The log files are ASCII files + /* This is the normal way to proceed. The log files are ANSI files * and W is to be converted. */ ret = SetupLogErrorA(msg, severity); diff --git a/dlls/setupapi/setupapi_private.h b/dlls/setupapi/setupapi_private.h index 21ac50e0f3c..7681348a11c 100644 --- a/dlls/setupapi/setupapi_private.h +++ b/dlls/setupapi/setupapi_private.h @@ -94,7 +94,7 @@ extern const WCHAR *DIRID_get_string( int dirid ) DECLSPEC_HIDDEN; extern const WCHAR *PARSER_get_inf_filename( HINF hinf ) DECLSPEC_HIDDEN; extern WCHAR *PARSER_get_dest_dir( INFCONTEXT *context ) DECLSPEC_HIDDEN; -/* support for Ascii queue callback functions */ +/* support for ANSI queue callback functions */ struct callback_WtoA_context { -- 2.20.1

1 0

[PATCH] msi: Fix ASCII / ANSI mixups in comments.
by Francois Gouget 25 Aug '21

25 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msi/msipriv.h | 2 +- dlls/msi/package.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 950a18d0e74..a039a5af4c7 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -735,7 +735,7 @@ struct tagMSIMIME #define MSIHANDLE_MAGIC 0x4d434923 -/* handle unicode/ascii output in the Msi* API functions */ +/* handle unicode/ansi output in the Msi* API functions */ typedef struct { BOOL unicode; union { diff --git a/dlls/msi/package.c b/dlls/msi/package.c index bf93f3e9afe..23e938f1759 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1806,7 +1806,7 @@ INT MSI_ProcessMessageVerbatim(MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSI_FormatRecordW(package, record, message, &len); } - /* convert it to ASCII */ + /* convert it to ANSI */ len = WideCharToMultiByte( CP_ACP, 0, message, -1, NULL, 0, NULL, NULL ); msg = msi_alloc( len ); WideCharToMultiByte( CP_ACP, 0, message, -1, msg, len, NULL, NULL ); -- 2.20.1

1 0

[PATCH] secur32/tests: Fix an ASCII / ANSI mixup in an ntlm comment.
by Francois Gouget 25 Aug '21

25 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/secur32/tests/ntlm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 930a49e451b..5ed650ffc2d 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -1384,7 +1384,7 @@ static void testAcquireCredentialsHandleW(void) getSecError(ret)); pFreeCredentialsHandle(&cred); - /* Test using the ASCII structure. */ + /* Test using the ANSI structure. */ idA.User = (unsigned char*) test_user; idA.UserLength = strlen(test_user); idA.Domain = (unsigned char *) workgroup; -- 2.20.1

1 0

[PATCH 1/3] kernel32/tests: Remove the macros from the GetDateFormatEx() tests.
by Francois Gouget 25 Aug '21

25 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/kernel32/tests/locale.c | 67 ++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 37 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index f6d1adcfbd2..105c839d57f 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -951,32 +951,32 @@ static void test_GetDateFormatEx(void) return; } - STRINGSW("",""); /* If flags are set, then format must be NULL */ SetLastError(0xdeadbeef); - ret = pGetDateFormatEx(localeW, DATE_LONGDATE, NULL, input, buffer, ARRAY_SIZE(buffer), NULL); - ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, - "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); - EXPECT_EQW; - STRINGSW("",""); /* NULL buffer, len > 0 */ + /* If flags are set, then format must be NULL */ + wcscpy(buffer, L"pristine"); + ret = pGetDateFormatEx(localeW, DATE_LONGDATE, NULL, L"", buffer, ARRAY_SIZE(buffer), NULL); + expect_werr(ret, buffer, ERROR_INVALID_FLAGS); SetLastError(0xdeadbeef); - ret = pGetDateFormatEx(localeW, 0, NULL, input, NULL, ARRAY_SIZE(buffer), NULL); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - - STRINGSW("",""); /* NULL buffer, len == 0 */ - ret = pGetDateFormatEx(localeW, 0, NULL, input, NULL, 0, NULL); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; EXPECT_EQW; - STRINGSW("",""); /* Invalid flag combination */ + /* NULL buffer, len > 0 */ + wcscpy(buffer, L"pristine"); + ret = pGetDateFormatEx(localeW, 0, NULL, L"", NULL, ARRAY_SIZE(buffer), NULL); + expect_werr(ret, buffer, ERROR_INVALID_PARAMETER); SetLastError(0xdeadbeef); + + /* NULL buffer, len == 0 */ + ret = pGetDateFormatEx(localeW, 0, NULL, L"", NULL, 0, NULL); + expect_wstr(ret, NULL, L""); + + /* Invalid flag combination */ + wcscpy(buffer, L"pristine"); ret = pGetDateFormatEx(localeW, DATE_LONGDATE|DATE_SHORTDATE, NULL, - input, NULL, 0, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, - "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); - EXPECT_EQW; + L"", NULL, 0, NULL); + expect_werr(ret, buffer, ERROR_INVALID_FLAGS); + SetLastError(0xdeadbeef); + /* Incorrect DOW and time */ curtime.wYear = 2002; curtime.wMonth = 10; curtime.wDay = 23; @@ -985,10 +985,8 @@ static void test_GetDateFormatEx(void) curtime.wMinute = 34512; /* Invalid */ curtime.wSecond = 65535; /* Invalid */ curtime.wMilliseconds = 12345; - STRINGSW("dddd d MMMM yyyy","Wednesday 23 October 2002"); /* Incorrect DOW and time */ - ret = pGetDateFormatEx(localeW, 0, &curtime, input, buffer, ARRAY_SIZE(buffer), NULL); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; EXPECT_EQW; + ret = pGetDateFormatEx(localeW, 0, &curtime, L"dddd d MMMM yyyy", buffer, ARRAY_SIZE(buffer), NULL); + expect_wstr(ret, buffer, L"Wednesday 23 October 2002"); curtime.wYear = 2002; curtime.wMonth = 10; @@ -998,10 +996,10 @@ static void test_GetDateFormatEx(void) curtime.wMinute = 34512; /* Invalid */ curtime.wSecond = 65535; /* Invalid */ curtime.wMilliseconds = 12345; - STRINGSW("dddd d MMMM yyyy","Wednesday 23 October 2002"); - ret = pGetDateFormatEx(localeW, 0, &curtime, input, buffer, ARRAY_SIZE(buffer), emptyW); /* Use reserved arg */ - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + wcscpy(buffer, L"pristine"); + ret = pGetDateFormatEx(localeW, 0, &curtime, L"dddd d MMMM yyyy", buffer, ARRAY_SIZE(buffer), emptyW); /* Use reserved arg */ + expect_werr(ret, buffer, ERROR_INVALID_PARAMETER); + SetLastError(0xdeadbeef); /* Limit tests */ @@ -1013,11 +1011,8 @@ static void test_GetDateFormatEx(void) curtime.wMinute = 0; curtime.wSecond = 0; curtime.wMilliseconds = 0; - STRINGSW("dddd d MMMM yyyy","Monday 1 January 1601"); - SetLastError(0xdeadbeef); - ret = pGetDateFormatEx(localeW, 0, &curtime, input, buffer, ARRAY_SIZE(buffer), NULL); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; EXPECT_EQW; + ret = pGetDateFormatEx(localeW, 0, &curtime, L"dddd d MMMM yyyy", buffer, ARRAY_SIZE(buffer), NULL); + expect_wstr(ret, buffer, L"Monday 1 January 1601"); curtime.wYear = 1600; curtime.wMonth = 12; @@ -1027,11 +1022,9 @@ static void test_GetDateFormatEx(void) curtime.wMinute = 59; curtime.wSecond = 59; curtime.wMilliseconds = 999; - STRINGSW("dddd d MMMM yyyy","Friday 31 December 1600"); - SetLastError(0xdeadbeef); - ret = pGetDateFormatEx(localeW, 0, &curtime, input, buffer, ARRAY_SIZE(buffer), NULL); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + wcscpy(buffer, L"pristine"); + ret = pGetDateFormatEx(localeW, 0, &curtime, L"dddd d MMMM yyyy", buffer, ARRAY_SIZE(buffer), NULL); + expect_werr(ret, buffer, ERROR_INVALID_PARAMETER); } static void test_GetDateFormatW(void) -- 2.20.1

1 2

[PATCH v4] user32: Don't save maximized position placement for toplevel windows covering the entire work area.
by Gabriel Ivăncescu 25 Aug '21

25 Aug '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51672 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/user32/tests/win.c | 54 +++++++++++++++++++++++------- dlls/user32/winpos.c | 73 +++++++++++++++++++++++++++++++++-------- 2 files changed, 102 insertions(+), 25 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 228395e..e23ab81 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -11624,8 +11624,9 @@ static void test_IsWindowEnabled(void) static void test_window_placement(void) { - RECT orig = {100, 200, 300, 400}, orig2 = {200, 300, 400, 500}, rect; + RECT orig = {100, 200, 300, 400}, orig2 = {200, 300, 400, 500}, rect, work_rect; WINDOWPLACEMENT wp = {sizeof(wp)}; + MONITORINFO mon_info; HWND hwnd; BOOL ret; @@ -11633,6 +11634,10 @@ static void test_window_placement(void) orig.left, orig.top, orig.right - orig.left, orig.bottom - orig.top, 0, 0, 0, 0); ok(!!hwnd, "failed to create window, error %u\n", GetLastError()); + mon_info.cbSize = sizeof(mon_info); + GetMonitorInfoW(MonitorFromWindow(hwnd, MONITOR_DEFAULTTOPRIMARY), &mon_info); + work_rect = mon_info.rcWork; + ret = GetWindowPlacement(hwnd, &wp); ok(ret, "failed to get window placement, error %u\n", GetLastError()); ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd); @@ -11675,7 +11680,6 @@ static void test_window_placement(void) ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11693,6 +11697,42 @@ todo_wine ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", wine_dbgstr_rect(&wp.rcNormalPosition)); + SetWindowPos(hwnd, 0, work_rect.left, work_rect.top, work_rect.right - work_rect.left, + work_rect.bottom - work_rect.top, SWP_NOZORDER | SWP_NOACTIVATE); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); + ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + + SetWindowPos(hwnd, 0, work_rect.left, work_rect.top, work_rect.right - work_rect.left - 1, + work_rect.bottom - work_rect.top, SWP_NOZORDER | SWP_NOACTIVATE); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); + ok(wp.ptMaxPosition.x == work_rect.left && wp.ptMaxPosition.y == work_rect.top, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + + SetWindowPos(hwnd, 0, work_rect.left, work_rect.top, work_rect.right - work_rect.left, + work_rect.bottom - work_rect.top - 1, SWP_NOZORDER | SWP_NOACTIVATE); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); + ok(wp.ptMaxPosition.x == work_rect.left && wp.ptMaxPosition.y == work_rect.top, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + ShowWindow(hwnd, SW_MINIMIZE); ret = GetWindowPlacement(hwnd, &wp); @@ -11701,7 +11741,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11714,7 +11753,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11727,7 +11765,6 @@ todo_wine ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11745,7 +11782,6 @@ todo_wine ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == 100 && wp.ptMinPosition.y == 100, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig2), "got normal pos %s\n", @@ -11761,7 +11797,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig2), "got normal pos %s\n", @@ -11783,7 +11818,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11804,7 +11838,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == 100 && wp.ptMinPosition.y == 100, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11825,7 +11858,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11839,7 +11871,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11854,7 +11885,6 @@ todo_wine ok(wp.showCmd == SW_NORMAL, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 6e96a4b..7edd63a 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -675,6 +675,27 @@ BOOL WINAPI MoveWindow( HWND hwnd, INT x, INT y, INT cx, INT cy, } +/******************************************************************* + * get_maximized_area_rect + * + * Get the work area that a maximized window can cover, depending on style. + */ +static RECT get_work_rect_for_style( HMONITOR monitor, DWORD style ) +{ + MONITORINFO mon_info; + + mon_info.cbSize = sizeof(mon_info); + GetMonitorInfoW( monitor, &mon_info ); + + if (style & WS_MAXIMIZEBOX) + { + if ((style & WS_CAPTION) == WS_CAPTION || !(style & (WS_CHILD | WS_POPUP))) + return mon_info.rcWork; + } + return mon_info.rcMonitor; +} + + /******************************************************************* * WINPOS_GetMinMaxInfo * @@ -741,19 +762,8 @@ MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd ) if ((monitor = MonitorFromWindow( hwnd, MONITOR_DEFAULTTOPRIMARY ))) { RECT rc_work, rc_primary; - MONITORINFO mon_info; - - mon_info.cbSize = sizeof(mon_info); - GetMonitorInfoW( monitor, &mon_info ); - - rc_work = mon_info.rcMonitor; - - if (style & WS_MAXIMIZEBOX) - { - if ((style & WS_CAPTION) == WS_CAPTION || !(style & (WS_CHILD | WS_POPUP))) - rc_work = mon_info.rcWork; - } + rc_work = get_work_rect_for_style( monitor, style ); rc_primary = get_primary_monitor_rect(); if (MinMax.ptMaxSize.x == (rc_primary.right - rc_primary.left) + 2 * xinc && MinMax.ptMaxSize.y == (rc_primary.bottom - rc_primary.top) + 2 * yinc) @@ -916,6 +926,38 @@ static POINT get_minimized_pos( HWND hwnd, POINT pt ) return pt; } +static void update_maximized_pos( WND *wnd ) +{ + HMONITOR monitor; + RECT rc_work; + + /* For top level windows covering the work area, we might have + to "forget" the maximized position. Windows presumably does + this to avoid situations where the border style changes, + which would lead the window to be outside the screen, or the + window gets reloaded on a different screen, and the "saved" + position no longer applies to it (despite being maximized). + + Some applications (e.g. Imperiums: Greek Wars) depend on this. + */ + if (wnd->parent && wnd->parent != GetDesktopWindow()) + return; + + if (wnd->dwStyle & WS_MAXIMIZE) + { + if ((monitor = MonitorFromWindow( wnd->obj.handle, MONITOR_DEFAULTTOPRIMARY ))) + rc_work = get_work_rect_for_style( monitor, wnd->dwStyle ); + else + SetRect( &rc_work, 0, 0, GetSystemMetrics( SM_CXSCREEN ), GetSystemMetrics( SM_CYSCREEN ) ); + + if (wnd->window_rect.left <= rc_work.left && wnd->window_rect.top <= rc_work.top && + wnd->window_rect.right >= rc_work.right && wnd->window_rect.bottom >= rc_work.bottom) + wnd->max_pos.x = wnd->max_pos.y = -1; + } + else + wnd->max_pos.x = wnd->max_pos.y = -1; +} + /*********************************************************************** * WINPOS_MinMaximize @@ -1337,6 +1379,7 @@ BOOL WINAPI GetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *wndpl ) { pWnd->normal_rect = pWnd->window_rect; } + update_maximized_pos( pWnd ); wndpl->length = sizeof(*wndpl); if( pWnd->dwStyle & WS_MINIMIZE ) @@ -1425,7 +1468,11 @@ static BOOL WINPOS_SetPlacement( HWND hwnd, const WINDOWPLACEMENT *wndpl, UINT f if (!pWnd || pWnd == WND_OTHER_PROCESS || pWnd == WND_DESKTOP) return FALSE; if (flags & PLACE_MIN) pWnd->min_pos = point_thread_to_win_dpi( hwnd, wp.ptMinPosition ); - if (flags & PLACE_MAX) pWnd->max_pos = point_thread_to_win_dpi( hwnd, wp.ptMaxPosition ); + if (flags & PLACE_MAX) + { + pWnd->max_pos = point_thread_to_win_dpi( hwnd, wp.ptMaxPosition ); + update_maximized_pos( pWnd ); + } if (flags & PLACE_RECT) pWnd->normal_rect = rect_thread_to_win_dpi( hwnd, wp.rcNormalPosition ); style = pWnd->dwStyle; -- 2.31.1

2 3

[PATCH 8/9] gdi32: Use NtGdiCreateDIBBrush for CreateDIBPatternBrushPt.
by Jacek Caban 25 Aug '21

25 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/brush.c | 11 ++++++----- dlls/gdi32/objects.c | 8 ++++++++ include/ntgdi.h | 3 ++- 3 files changed, 16 insertions(+), 6 deletions(-)

2 1

[PATCH v2 9/9] gdi32: Use NtGdiCreateDIBBrush for CreateDIBPatternBrush.
by Huw Davies 25 Aug '21

25 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/brush.c | 20 -------------------- dlls/gdi32/objects.c | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 5868824dd8f..1dcf4b2c844 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -224,26 +224,6 @@ HBRUSH WINAPI NtGdiCreatePatternBrushInternal( HBITMAP bitmap, BOOL pen, BOOL is } -/*********************************************************************** - * CreateDIBPatternBrush (GDI32.@) - * - * Create a logical brush with a pattern from a DIB. - */ -HBRUSH WINAPI CreateDIBPatternBrush( HGLOBAL hbitmap, UINT coloruse ) -{ - LOGBRUSH logbrush; - - TRACE("%p\n", hbitmap ); - - logbrush.lbStyle = BS_DIBPATTERN; - logbrush.lbColor = coloruse; - - logbrush.lbHatch = (ULONG_PTR)hbitmap; - - return create_brush( &logbrush ); -} - - /*********************************************************************** * NtGdiCreateDIBBrush (win32u.@) * diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 9f43f1505e8..e5aa641edf3 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -448,6 +448,22 @@ HBRUSH WINAPI CreatePatternBrush( HBITMAP bitmap ) return NtGdiCreatePatternBrushInternal( bitmap, FALSE, FALSE ); } +/*********************************************************************** + * CreateDIBPatternBrush (GDI32.@) + */ +HBRUSH WINAPI CreateDIBPatternBrush( HGLOBAL hbitmap, UINT coloruse ) +{ + HBRUSH brush; + void *mem; + + TRACE( "%p\n", hbitmap ); + + if (!(mem = GlobalLock( hbitmap ))) return 0; + brush = NtGdiCreateDIBBrush( mem, coloruse, /* FIXME */ 0, FALSE, FALSE, hbitmap ); + GlobalUnlock( hbitmap ); + return brush; +} + /*********************************************************************** * CreateDIBPatternBrushPt (GDI32.@) */ -- 2.23.0

1 0

[PATCH v2 8/9] gdi32: Use NtGdiCreateDIBBrush for CreateDIBPatternBrushPt.
by Huw Davies 25 Aug '21

25 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/brush.c | 11 ++++++----- dlls/gdi32/objects.c | 8 ++++++++ include/ntgdi.h | 3 ++- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index c723b7c842f..5868824dd8f 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -245,20 +245,21 @@ HBRUSH WINAPI CreateDIBPatternBrush( HGLOBAL hbitmap, UINT coloruse ) /*********************************************************************** - * CreateDIBPatternBrushPt (GDI32.@) + * NtGdiCreateDIBBrush (win32u.@) * * Create a logical brush with a pattern from a DIB. */ -HBRUSH WINAPI CreateDIBPatternBrushPt( const void* data, UINT coloruse ) +HBRUSH WINAPI NtGdiCreateDIBBrush( const void *data, UINT coloruse, UINT size, + BOOL is_8x8, BOOL pen, const void *client ) { - const BITMAPINFO *info=data; + const BITMAPINFO *info = data; LOGBRUSH logbrush; if (!data) return NULL; - TRACE("%p %dx%d %dbpp\n", info, info->bmiHeader.biWidth, - info->bmiHeader.biHeight, info->bmiHeader.biBitCount); + TRACE( "%p %dx%d %dbpp\n", info, info->bmiHeader.biWidth, + info->bmiHeader.biHeight, info->bmiHeader.biBitCount ); logbrush.lbStyle = BS_DIBPATTERNPT; logbrush.lbColor = coloruse; diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 6981eea72d0..9f43f1505e8 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -448,6 +448,14 @@ HBRUSH WINAPI CreatePatternBrush( HBITMAP bitmap ) return NtGdiCreatePatternBrushInternal( bitmap, FALSE, FALSE ); } +/*********************************************************************** + * CreateDIBPatternBrushPt (GDI32.@) + */ +HBRUSH WINAPI CreateDIBPatternBrushPt( const void *data, UINT coloruse ) +{ + return NtGdiCreateDIBBrush( data, coloruse, /* FIXME */ 0, FALSE, FALSE, data ); +} + /*********************************************************************** * CreateBitmapIndirect (GDI32.@) */ diff --git a/include/ntgdi.h b/include/ntgdi.h index 928d1cec505..66611b38fb0 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -195,7 +195,8 @@ HANDLE WINAPI NtGdiCreateClientObj( ULONG type ); HFONT WINAPI NtGdiHfontCreate( const ENUMLOGFONTEXDVW *enumex, ULONG unk2, ULONG unk3, ULONG unk4, void *data ); HDC WINAPI NtGdiCreateCompatibleDC( HDC hdc ); -HBRUSH WINAPI NtGdiCreateDIBBrush( const void* data, UINT coloruse ); +HBRUSH WINAPI NtGdiCreateDIBBrush( const void *data, UINT coloruse, UINT size, + BOOL is_8x8, BOOL pen, const void *client ); HRGN WINAPI NtGdiCreateEllipticRgn( INT left, INT top, INT right, INT bottom ); HBRUSH WINAPI NtGdiCreateHatchBrush( INT style, COLORREF color, BOOL pen ); HBRUSH WINAPI NtGdiCreatePatternBrushInternal( HBITMAP hbitmap, BOOL pen, BOOL is_8x8 ); -- 2.23.0

1 0

[PATCH v2 7/9] gdi32: Use NtGdiCreatePatternBrushInternal for CreatePatternBrush.
by Huw Davies 25 Aug '21

25 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/brush.c | 9 +++++---- dlls/gdi32/objects.c | 8 ++++++++ include/ntgdi.h | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 408d93b2167..c723b7c842f 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -209,16 +209,17 @@ HBRUSH WINAPI NtGdiCreateHatchBrush( INT style, COLORREF color, BOOL pen ) /*********************************************************************** - * CreatePatternBrush (GDI32.@) + * NtGdiCreatePatternBrushInternal (win32u.@) * * Create a logical brush with a pattern from a bitmap. */ -HBRUSH WINAPI CreatePatternBrush( HBITMAP hbitmap ) +HBRUSH WINAPI NtGdiCreatePatternBrushInternal( HBITMAP bitmap, BOOL pen, BOOL is_8x8 ) { LOGBRUSH logbrush = { BS_PATTERN, 0, 0 }; - TRACE("%p\n", hbitmap ); - logbrush.lbHatch = (ULONG_PTR)hbitmap; + TRACE( "%p\n", bitmap ); + + logbrush.lbHatch = (ULONG_PTR)bitmap; return create_brush( &logbrush ); } diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 80f7454c2cb..6981eea72d0 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -440,6 +440,14 @@ HBRUSH WINAPI CreateHatchBrush( INT style, COLORREF color ) return NtGdiCreateHatchBrush( style, color, FALSE ); } +/*********************************************************************** + * CreatePatternBrush (GDI32.@) + */ +HBRUSH WINAPI CreatePatternBrush( HBITMAP bitmap ) +{ + return NtGdiCreatePatternBrushInternal( bitmap, FALSE, FALSE ); +} + /*********************************************************************** * CreateBitmapIndirect (GDI32.@) */ diff --git a/include/ntgdi.h b/include/ntgdi.h index a7936561b23..928d1cec505 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -198,7 +198,7 @@ HDC WINAPI NtGdiCreateCompatibleDC( HDC hdc ); HBRUSH WINAPI NtGdiCreateDIBBrush( const void* data, UINT coloruse ); HRGN WINAPI NtGdiCreateEllipticRgn( INT left, INT top, INT right, INT bottom ); HBRUSH WINAPI NtGdiCreateHatchBrush( INT style, COLORREF color, BOOL pen ); -HBRUSH WINAPI NtGdiCreatePatternBrushInternal( HBITMAP hbitmap, BOOL pen ); +HBRUSH WINAPI NtGdiCreatePatternBrushInternal( HBITMAP hbitmap, BOOL pen, BOOL is_8x8 ); HPEN WINAPI NtGdiCreatePen( INT style, INT width, COLORREF color, HBRUSH brush ); HRGN WINAPI NtGdiCreateRectRgn( INT left, INT top, INT right, INT bottom ); HRGN WINAPI NtGdiCreateRoundRectRgn( INT left, INT top, INT right, INT bottom, -- 2.23.0

1 0

[PATCH v2 6/9] gdi32: Use NtGdiCreateHatchBrush for CreateHatchBrush.
by Huw Davies 25 Aug '21

25 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/brush.c | 6 +++--- dlls/gdi32/objects.c | 8 ++++++++ include/ntgdi.h | 1 + 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index d3b83beffe8..408d93b2167 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -190,15 +190,15 @@ HBRUSH create_brush( const LOGBRUSH *brush ) /*********************************************************************** - * CreateHatchBrush (GDI32.@) + * NtGdiCreateHatchBrush (win32u.@) * * Create a logical brush with a hatched pattern. */ -HBRUSH WINAPI CreateHatchBrush( INT style, COLORREF color ) +HBRUSH WINAPI NtGdiCreateHatchBrush( INT style, COLORREF color, BOOL pen ) { LOGBRUSH logbrush; - TRACE("%d %06x\n", style, color ); + TRACE( "%d %06x\n", style, color ); logbrush.lbStyle = BS_HATCHED; logbrush.lbColor = color; diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index b68cdd455b9..80f7454c2cb 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -432,6 +432,14 @@ HBRUSH WINAPI CreateSolidBrush( COLORREF color ) return NtGdiCreateSolidBrush( color, NULL ); } +/*********************************************************************** + * CreateHatchBrush (GDI32.@) + */ +HBRUSH WINAPI CreateHatchBrush( INT style, COLORREF color ) +{ + return NtGdiCreateHatchBrush( style, color, FALSE ); +} + /*********************************************************************** * CreateBitmapIndirect (GDI32.@) */ diff --git a/include/ntgdi.h b/include/ntgdi.h index d275a239434..a7936561b23 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -197,6 +197,7 @@ HFONT WINAPI NtGdiHfontCreate( const ENUMLOGFONTEXDVW *enumex, ULONG unk2, UL HDC WINAPI NtGdiCreateCompatibleDC( HDC hdc ); HBRUSH WINAPI NtGdiCreateDIBBrush( const void* data, UINT coloruse ); HRGN WINAPI NtGdiCreateEllipticRgn( INT left, INT top, INT right, INT bottom ); +HBRUSH WINAPI NtGdiCreateHatchBrush( INT style, COLORREF color, BOOL pen ); HBRUSH WINAPI NtGdiCreatePatternBrushInternal( HBITMAP hbitmap, BOOL pen ); HPEN WINAPI NtGdiCreatePen( INT style, INT width, COLORREF color, HBRUSH brush ); HRGN WINAPI NtGdiCreateRectRgn( INT left, INT top, INT right, INT bottom ); -- 2.23.0

1 0

[PATCH v2 5/9] gdi32: Use NtGdiCreateSolidBrush for CreateSolidBrush.
by Huw Davies 25 Aug '21

25 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/brush.c | 4 ++-- dlls/gdi32/objects.c | 8 ++++++++ include/ntgdi.h | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 75737d1083b..d3b83beffe8 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -268,11 +268,11 @@ HBRUSH WINAPI CreateDIBPatternBrushPt( const void* data, UINT coloruse ) /*********************************************************************** - * CreateSolidBrush (GDI32.@) + * NtGdiCreateSolidBrush (win32u.@) * * Create a logical brush consisting of a single colour. */ -HBRUSH WINAPI CreateSolidBrush( COLORREF color ) +HBRUSH WINAPI NtGdiCreateSolidBrush( COLORREF color, HBRUSH brush ) { LOGBRUSH logbrush; diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 48474515151..b68cdd455b9 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -424,6 +424,14 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH *brush ) } } +/*********************************************************************** + * CreateSolidBrush (GDI32.@) + */ +HBRUSH WINAPI CreateSolidBrush( COLORREF color ) +{ + return NtGdiCreateSolidBrush( color, NULL ); +} + /*********************************************************************** * CreateBitmapIndirect (GDI32.@) */ diff --git a/include/ntgdi.h b/include/ntgdi.h index ba4d2ff3556..d275a239434 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -202,7 +202,7 @@ HPEN WINAPI NtGdiCreatePen( INT style, INT width, COLORREF color, HBRUSH bru HRGN WINAPI NtGdiCreateRectRgn( INT left, INT top, INT right, INT bottom ); HRGN WINAPI NtGdiCreateRoundRectRgn( INT left, INT top, INT right, INT bottom, INT ellipse_width, INT ellipse_height ); -HBRUSH WINAPI NtGdiCreateSolidBrush( COLORREF color ); +HBRUSH WINAPI NtGdiCreateSolidBrush( COLORREF color, HBRUSH brush ); BOOL WINAPI NtGdiDeleteClientObj( HGDIOBJ obj ); BOOL WINAPI NtGdiDeleteObjectApp( HGDIOBJ obj ); LONG WINAPI NtGdiDoPalette( HGDIOBJ handle, WORD start, WORD count, void *entries, -- 2.23.0

1 0

[PATCH v2 4/9] gdi32: Reimplement CreateBrushIndirect on top of other brush constructors.
by Huw Davies 25 Aug '21

25 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/brush.c | 96 +++----------------------------------- dlls/gdi32/gdiobj.c | 14 +++--- dlls/gdi32/ntgdi_private.h | 1 + dlls/gdi32/objects.c | 26 +++++++++++ dlls/gdi32/tests/brush.c | 11 +++++ 5 files changed, 51 insertions(+), 97 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 5febac710dc..75737d1083b 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -167,26 +167,7 @@ BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT * } -/*********************************************************************** - * CreateBrushIndirect (GDI32.@) - * - * Create a logical brush with a given style, color or pattern. - * - * PARAMS - * brush [I] Pointer to a LOGBRUSH structure describing the desired brush. - * - * RETURNS - * A handle to the created brush, or a NULL handle if the brush cannot be - * created. - * - * NOTES - * - The brush returned should be freed by the caller using DeleteObject() - * when it is no longer required. - * - Windows 95 and earlier cannot create brushes from bitmaps or DIBs larger - * than 8x8 pixels. If a larger bitmap is given, only a portion of the bitmap - * is used. - */ -HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) +HBRUSH create_brush( const LOGBRUSH *brush ) { BRUSHOBJ * ptr; HBRUSH hbrush; @@ -212,19 +193,6 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) * CreateHatchBrush (GDI32.@) * * Create a logical brush with a hatched pattern. - * - * PARAMS - * style [I] Direction of lines for the hatch pattern (HS_* values from "wingdi.h") - * color [I] Colour of the hatched pattern - * - * RETURNS - * A handle to the created brush, or a NULL handle if the brush cannot - * be created. - * - * NOTES - * - This function uses CreateBrushIndirect() to create the brush. - * - The brush returned should be freed by the caller using DeleteObject() - * when it is no longer required. */ HBRUSH WINAPI CreateHatchBrush( INT style, COLORREF color ) { @@ -236,7 +204,7 @@ HBRUSH WINAPI CreateHatchBrush( INT style, COLORREF color ) logbrush.lbColor = color; logbrush.lbHatch = style; - return CreateBrushIndirect( &logbrush ); + return create_brush( &logbrush ); } @@ -244,18 +212,6 @@ HBRUSH WINAPI CreateHatchBrush( INT style, COLORREF color ) * CreatePatternBrush (GDI32.@) * * Create a logical brush with a pattern from a bitmap. - * - * PARAMS - * hbitmap [I] Bitmap containing pattern for the brush - * - * RETURNS - * A handle to the created brush, or a NULL handle if the brush cannot - * be created. - * - * NOTES - * - This function uses CreateBrushIndirect() to create the brush. - * - The brush returned should be freed by the caller using DeleteObject() - * when it is no longer required. */ HBRUSH WINAPI CreatePatternBrush( HBITMAP hbitmap ) { @@ -263,7 +219,7 @@ HBRUSH WINAPI CreatePatternBrush( HBITMAP hbitmap ) TRACE("%p\n", hbitmap ); logbrush.lbHatch = (ULONG_PTR)hbitmap; - return CreateBrushIndirect( &logbrush ); + return create_brush( &logbrush ); } @@ -271,21 +227,6 @@ HBRUSH WINAPI CreatePatternBrush( HBITMAP hbitmap ) * CreateDIBPatternBrush (GDI32.@) * * Create a logical brush with a pattern from a DIB. - * - * PARAMS - * hbitmap [I] Global object containing BITMAPINFO structure for the pattern - * coloruse [I] Specifies color format, if provided - * - * RETURNS - * A handle to the created brush, or a NULL handle if the brush cannot - * be created. - * - * NOTES - * - This function uses CreateBrushIndirect() to create the brush. - * - The brush returned should be freed by the caller using DeleteObject() - * when it is no longer required. - * - This function is for compatibility only. CreateDIBPatternBrushPt() should - * be used instead. */ HBRUSH WINAPI CreateDIBPatternBrush( HGLOBAL hbitmap, UINT coloruse ) { @@ -298,7 +239,7 @@ HBRUSH WINAPI CreateDIBPatternBrush( HGLOBAL hbitmap, UINT coloruse ) logbrush.lbHatch = (ULONG_PTR)hbitmap; - return CreateBrushIndirect( &logbrush ); + return create_brush( &logbrush ); } @@ -306,19 +247,6 @@ HBRUSH WINAPI CreateDIBPatternBrush( HGLOBAL hbitmap, UINT coloruse ) * CreateDIBPatternBrushPt (GDI32.@) * * Create a logical brush with a pattern from a DIB. - * - * PARAMS - * data [I] Pointer to a BITMAPINFO structure and image data for the pattern - * coloruse [I] Specifies color format, if provided - * - * RETURNS - * A handle to the created brush, or a NULL handle if the brush cannot - * be created. - * - * NOTES - * - This function uses CreateBrushIndirect() to create the brush. - * - The brush returned should be freed by the caller using DeleteObject() - * when it is no longer required. */ HBRUSH WINAPI CreateDIBPatternBrushPt( const void* data, UINT coloruse ) { @@ -335,7 +263,7 @@ HBRUSH WINAPI CreateDIBPatternBrushPt( const void* data, UINT coloruse ) logbrush.lbColor = coloruse; logbrush.lbHatch = (ULONG_PTR)data; - return CreateBrushIndirect( &logbrush ); + return create_brush( &logbrush ); } @@ -343,18 +271,6 @@ HBRUSH WINAPI CreateDIBPatternBrushPt( const void* data, UINT coloruse ) * CreateSolidBrush (GDI32.@) * * Create a logical brush consisting of a single colour. - * - * PARAMS - * color [I] Colour to make the solid brush - * - * RETURNS - * A handle to the newly created brush, or a NULL handle if the brush cannot - * be created. - * - * NOTES - * - This function uses CreateBrushIndirect() to create the brush. - * - The brush returned should be freed by the caller using DeleteObject() - * when it is no longer required. */ HBRUSH WINAPI CreateSolidBrush( COLORREF color ) { @@ -366,7 +282,7 @@ HBRUSH WINAPI CreateSolidBrush( COLORREF color ) logbrush.lbColor = color; logbrush.lbHatch = 0; - return CreateBrushIndirect( &logbrush ); + return create_brush( &logbrush ); } diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index da428d149ce..07277a12e8c 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -641,12 +641,12 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) font_init(); /* create stock objects */ - stock_objects[WHITE_BRUSH] = CreateBrushIndirect( &WhiteBrush ); - stock_objects[LTGRAY_BRUSH] = CreateBrushIndirect( &LtGrayBrush ); - stock_objects[GRAY_BRUSH] = CreateBrushIndirect( &GrayBrush ); - stock_objects[DKGRAY_BRUSH] = CreateBrushIndirect( &DkGrayBrush ); - stock_objects[BLACK_BRUSH] = CreateBrushIndirect( &BlackBrush ); - stock_objects[NULL_BRUSH] = CreateBrushIndirect( &NullBrush ); + stock_objects[WHITE_BRUSH] = create_brush( &WhiteBrush ); + stock_objects[LTGRAY_BRUSH] = create_brush( &LtGrayBrush ); + stock_objects[GRAY_BRUSH] = create_brush( &GrayBrush ); + stock_objects[DKGRAY_BRUSH] = create_brush( &DkGrayBrush ); + stock_objects[BLACK_BRUSH] = create_brush( &BlackBrush ); + stock_objects[NULL_BRUSH] = create_brush( &NullBrush ); stock_objects[WHITE_PEN] = CreatePenIndirect( &WhitePen ); stock_objects[BLACK_PEN] = CreatePenIndirect( &BlackPen ); @@ -672,7 +672,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) scaled_stock_objects[SYSTEM_FIXED_FONT] = create_scaled_font( &deffonts->SystemFixedFont ); scaled_stock_objects[DEFAULT_GUI_FONT] = create_scaled_font( &deffonts->DefaultGuiFont ); - stock_objects[DC_BRUSH] = CreateBrushIndirect( &DCBrush ); + stock_objects[DC_BRUSH] = create_brush( &DCBrush ); stock_objects[DC_PEN] = CreatePenIndirect( &DCPen ); /* clear the NOSYSTEM bit on all stock objects*/ diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 91230666fad..ffa28f39c73 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -168,6 +168,7 @@ extern DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src extern void get_mono_dc_colors( DC *dc, int color_table_size, BITMAPINFO *info, int count ) DECLSPEC_HIDDEN; /* brush.c */ +extern HBRUSH create_brush( const LOGBRUSH *brush ); extern BOOL store_brush_pattern( LOGBRUSH *brush, struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern void free_brush_pattern( struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT *usage ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 4225437aa4a..48474515151 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -398,6 +398,32 @@ HPEN WINAPI CreatePen( INT style, INT width, COLORREF color ) return NtGdiCreatePen( style, width, color, NULL ); } +/*********************************************************************** + * CreateBrushIndirect (GDI32.@) + */ +HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH *brush ) +{ + switch (brush->lbStyle) + { + case BS_NULL: + return GetStockObject( NULL_BRUSH ); + case BS_SOLID: + return CreateSolidBrush( brush->lbColor ); + case BS_HATCHED: + return CreateHatchBrush( brush->lbHatch, brush->lbColor ); + case BS_PATTERN: + case BS_PATTERN8X8: + return CreatePatternBrush( (HBITMAP)brush->lbHatch ); + case BS_DIBPATTERN: + return CreateDIBPatternBrush( (HGLOBAL)brush->lbHatch, brush->lbColor ); + case BS_DIBPATTERNPT: + return CreateDIBPatternBrushPt( (void *)brush->lbHatch, brush->lbColor ); + default: + WARN( "invalid brush style %u\n", brush->lbStyle ); + return 0; + } +} + /*********************************************************************** * CreateBitmapIndirect (GDI32.@) */ diff --git a/dlls/gdi32/tests/brush.c b/dlls/gdi32/tests/brush.c index 1a2201bd511..f04ee22ab6d 100644 --- a/dlls/gdi32/tests/brush.c +++ b/dlls/gdi32/tests/brush.c @@ -361,6 +361,16 @@ static void test_brush_org( void ) ReleaseDC( 0, hdc ); } +static void test_null_brush(void) +{ + LOGBRUSH lb; + HBRUSH brush; + + lb.lbStyle = BS_NULL; + brush = CreateBrushIndirect(&lb); + ok(brush == GetStockObject(NULL_BRUSH), "brush is not NULL_BRUSH\n"); +} + START_TEST(brush) { test_solidbrush(); @@ -368,4 +378,5 @@ START_TEST(brush) test_pattern_brush(); test_palette_brush(); test_brush_org(); + test_null_brush(); } -- 2.23.0

1 0

[PATCH v2 3/9] gdi32: Move D3DKMTOpenAdapterFromGdiDisplayName to objects.c.
by Huw Davies 25 Aug '21

25 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/driver.c | 91 ----------------------------------------- dlls/gdi32/objects.c | 97 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 96 insertions(+), 92 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 3073f745f92..f370d088585 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -32,11 +32,6 @@ #include "ddrawgdi.h" #include "wine/winbase16.h" #include "winuser.h" -#include "winternl.h" -#include "initguid.h" -#include "devguid.h" -#include "setupapi.h" -#include "ddk/d3dkmthk.h" #include "ntgdi_private.h" #include "wine/list.h" @@ -45,8 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(driver); -DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); - struct graphics_driver { struct list entry; @@ -163,20 +156,6 @@ BOOL is_display_device( LPCWSTR name ) return TRUE; } -static HANDLE get_display_device_init_mutex( void ) -{ - HANDLE mutex = CreateMutexW( NULL, FALSE, L"display_device_init" ); - - WaitForSingleObject( mutex, INFINITE ); - return mutex; -} - -static void release_display_device_init_mutex( HANDLE mutex ) -{ - ReleaseMutex( mutex ); - CloseHandle( mutex ); -} - #ifdef __i386__ static const WCHAR printer_env[] = L"w32x86"; #elif defined __x86_64__ @@ -1249,76 +1228,6 @@ NTSTATUS WINAPI NtGdiDdDDICloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) return status; } -/****************************************************************************** - * D3DKMTOpenAdapterFromGdiDisplayName [GDI32.@] - */ -NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc ) -{ - WCHAR *end, key_nameW[MAX_PATH], bufferW[MAX_PATH]; - HDEVINFO devinfo = INVALID_HANDLE_VALUE; - NTSTATUS status = STATUS_UNSUCCESSFUL; - D3DKMT_OPENADAPTERFROMLUID luid_desc; - SP_DEVINFO_DATA device_data; - DWORD size, state_flags; - DEVPROPTYPE type; - HANDLE mutex; - int index; - - TRACE("(%p)\n", desc); - - if (!desc) - return STATUS_UNSUCCESSFUL; - - TRACE("DeviceName: %s\n", wine_dbgstr_w( desc->DeviceName )); - if (wcsnicmp( desc->DeviceName, L"\\\\.\\DISPLAY", lstrlenW(L"\\\\.\\DISPLAY") )) - return STATUS_UNSUCCESSFUL; - - index = wcstol( desc->DeviceName + lstrlenW(L"\\\\.\\DISPLAY"), &end, 10 ) - 1; - if (*end) - return STATUS_UNSUCCESSFUL; - - /* Get adapter LUID from SetupAPI */ - mutex = get_display_device_init_mutex(); - - size = sizeof( bufferW ); - swprintf( key_nameW, MAX_PATH, L"\\Device\\Video%d", index ); - if (RegGetValueW( HKEY_LOCAL_MACHINE, L"HARDWARE\\DEVICEMAP\\VIDEO", key_nameW, RRF_RT_REG_SZ, NULL, bufferW, &size )) - goto done; - - /* Strip \Registry\Machine\ prefix and retrieve Wine specific data set by the display driver */ - lstrcpyW( key_nameW, bufferW + 18 ); - size = sizeof( state_flags ); - if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, L"StateFlags", RRF_RT_REG_DWORD, NULL, - &state_flags, &size )) - goto done; - - if (!(state_flags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) - goto done; - - size = sizeof( bufferW ); - if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, L"GPUID", RRF_RT_REG_SZ, NULL, bufferW, &size )) - goto done; - - devinfo = SetupDiCreateDeviceInfoList( &GUID_DEVCLASS_DISPLAY, NULL ); - device_data.cbSize = sizeof( device_data ); - SetupDiOpenDeviceInfoW( devinfo, bufferW, NULL, 0, &device_data ); - if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &DEVPROPKEY_GPU_LUID, &type, - (BYTE *)&luid_desc.AdapterLuid, sizeof( luid_desc.AdapterLuid ), - NULL, 0)) - goto done; - - if ((status = NtGdiDdDDIOpenAdapterFromLuid( &luid_desc ))) goto done; - - desc->hAdapter = luid_desc.hAdapter; - desc->AdapterLuid = luid_desc.AdapterLuid; - desc->VidPnSourceId = index; - -done: - SetupDiDestroyDeviceInfoList( devinfo ); - release_display_device_init_mutex( mutex ); - return status; -} - /****************************************************************************** * NtGdiDdDDIOpenAdapterFromLuid (win32u.@) */ diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 3acafbc9331..4225437aa4a 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -19,9 +19,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdlib.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "gdi_private.h" +#include "winuser.h" +#include "winreg.h" #include "winnls.h" -#include "winternl.h" +#include "initguid.h" +#include "devguid.h" +#include "setupapi.h" #include "wine/rbtree.h" #include "wine/debug.h" @@ -29,6 +37,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); +DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); + struct hdc_list { HDC hdc; @@ -619,3 +629,88 @@ UINT WINAPI SetDIBColorTable( HDC hdc, UINT start, UINT count, const RGBQUAD *co { return NtGdiDoPalette( hdc, start, count, (void *)colors, NtGdiSetDIBColorTable, FALSE ); } + +static HANDLE get_display_device_init_mutex( void ) +{ + HANDLE mutex = CreateMutexW( NULL, FALSE, L"display_device_init" ); + + WaitForSingleObject( mutex, INFINITE ); + return mutex; +} + +static void release_display_device_init_mutex( HANDLE mutex ) +{ + ReleaseMutex( mutex ); + CloseHandle( mutex ); +} + +/*********************************************************************** + * D3DKMTOpenAdapterFromGdiDisplayName (GDI32.@) + */ +NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc ) +{ + WCHAR *end, key_nameW[MAX_PATH], bufferW[MAX_PATH]; + HDEVINFO devinfo = INVALID_HANDLE_VALUE; + NTSTATUS status = STATUS_UNSUCCESSFUL; + D3DKMT_OPENADAPTERFROMLUID luid_desc; + SP_DEVINFO_DATA device_data; + DWORD size, state_flags; + DEVPROPTYPE type; + HANDLE mutex; + int index; + + TRACE("(%p)\n", desc); + + if (!desc) + return STATUS_UNSUCCESSFUL; + + TRACE("DeviceName: %s\n", wine_dbgstr_w( desc->DeviceName )); + if (wcsnicmp( desc->DeviceName, L"\\\\.\\DISPLAY", lstrlenW(L"\\\\.\\DISPLAY") )) + return STATUS_UNSUCCESSFUL; + + index = wcstol( desc->DeviceName + lstrlenW(L"\\\\.\\DISPLAY"), &end, 10 ) - 1; + if (*end) + return STATUS_UNSUCCESSFUL; + + /* Get adapter LUID from SetupAPI */ + mutex = get_display_device_init_mutex(); + + size = sizeof( bufferW ); + swprintf( key_nameW, MAX_PATH, L"\\Device\\Video%d", index ); + if (RegGetValueW( HKEY_LOCAL_MACHINE, L"HARDWARE\\DEVICEMAP\\VIDEO", key_nameW, + RRF_RT_REG_SZ, NULL, bufferW, &size )) + goto done; + + /* Strip \Registry\Machine\ prefix and retrieve Wine specific data set by the display driver */ + lstrcpyW( key_nameW, bufferW + 18 ); + size = sizeof( state_flags ); + if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, L"StateFlags", RRF_RT_REG_DWORD, NULL, + &state_flags, &size )) + goto done; + + if (!(state_flags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) + goto done; + + size = sizeof( bufferW ); + if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, L"GPUID", RRF_RT_REG_SZ, NULL, bufferW, &size )) + goto done; + + devinfo = SetupDiCreateDeviceInfoList( &GUID_DEVCLASS_DISPLAY, NULL ); + device_data.cbSize = sizeof( device_data ); + SetupDiOpenDeviceInfoW( devinfo, bufferW, NULL, 0, &device_data ); + if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &DEVPROPKEY_GPU_LUID, &type, + (BYTE *)&luid_desc.AdapterLuid, sizeof( luid_desc.AdapterLuid ), + NULL, 0)) + goto done; + + if ((status = NtGdiDdDDIOpenAdapterFromLuid( &luid_desc ))) goto done; + + desc->hAdapter = luid_desc.hAdapter; + desc->AdapterLuid = luid_desc.AdapterLuid; + desc->VidPnSourceId = index; + +done: + SetupDiDestroyDeviceInfoList( devinfo ); + release_display_device_init_mutex( mutex ); + return status; +} -- 2.23.0

1 0

[PATCH v2 2/9] gdi32: Implement NtGdiDdDDIOpenAdapterFromLuid.
by Huw Davies 25 Aug '21

25 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> And use it for D3DKMTOpenAdapterFromGdiDisplayName. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/driver.c | 41 +++++++++++++++++++++++------------------ dlls/gdi32/gdi32.spec | 1 + include/ddk/d3dkmthk.h | 6 ++++++ include/ntgdi.h | 1 + 4 files changed, 31 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index fba1f1cffea..3073f745f92 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1257,13 +1257,11 @@ NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDI WCHAR *end, key_nameW[MAX_PATH], bufferW[MAX_PATH]; HDEVINFO devinfo = INVALID_HANDLE_VALUE; NTSTATUS status = STATUS_UNSUCCESSFUL; - static D3DKMT_HANDLE handle_start = 0; - struct d3dkmt_adapter *adapter; + D3DKMT_OPENADAPTERFROMLUID luid_desc; SP_DEVINFO_DATA device_data; DWORD size, state_flags; DEVPROPTYPE type; HANDLE mutex; - LUID luid; int index; TRACE("(%p)\n", desc); @@ -1279,10 +1277,6 @@ NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDI if (*end) return STATUS_UNSUCCESSFUL; - adapter = heap_alloc( sizeof( *adapter ) ); - if (!adapter) - return STATUS_NO_MEMORY; - /* Get adapter LUID from SetupAPI */ mutex = get_display_device_init_mutex(); @@ -1309,28 +1303,39 @@ NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDI device_data.cbSize = sizeof( device_data ); SetupDiOpenDeviceInfoW( devinfo, bufferW, NULL, 0, &device_data ); if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &DEVPROPKEY_GPU_LUID, &type, - (BYTE *)&luid, sizeof( luid ), NULL, 0)) + (BYTE *)&luid_desc.AdapterLuid, sizeof( luid_desc.AdapterLuid ), + NULL, 0)) goto done; - EnterCriticalSection( &driver_section ); - /* D3DKMT_HANDLE is UINT, so we can't use pointer as handle */ - adapter->handle = ++handle_start; - list_add_tail( &d3dkmt_adapters, &adapter->entry ); - LeaveCriticalSection( &driver_section ); + if ((status = NtGdiDdDDIOpenAdapterFromLuid( &luid_desc ))) goto done; - desc->hAdapter = handle_start; - desc->AdapterLuid = luid; + desc->hAdapter = luid_desc.hAdapter; + desc->AdapterLuid = luid_desc.AdapterLuid; desc->VidPnSourceId = index; - status = STATUS_SUCCESS; done: SetupDiDestroyDeviceInfoList( devinfo ); release_display_device_init_mutex( mutex ); - if (status != STATUS_SUCCESS) - heap_free( adapter ); return status; } +/****************************************************************************** + * NtGdiDdDDIOpenAdapterFromLuid (win32u.@) + */ +NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc ) +{ + static D3DKMT_HANDLE handle_start = 0; + struct d3dkmt_adapter *adapter; + + if (!(adapter = heap_alloc( sizeof( *adapter ) ))) return STATUS_NO_MEMORY; + + EnterCriticalSection( &driver_section ); + desc->hAdapter = adapter->handle = ++handle_start; + list_add_tail( &d3dkmt_adapters, &adapter->entry ); + LeaveCriticalSection( &driver_section ); + return STATUS_SUCCESS; +} + /****************************************************************************** * NtGdiDdDDICreateDevice (win32u.@) */ diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 48ce04e3819..5bddcd26de6 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -89,6 +89,7 @@ @ stdcall D3DKMTEscape(ptr) NtGdiDdDDIEscape @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) @ stdcall D3DKMTOpenAdapterFromHdc(ptr) NtGdiDdDDIOpenAdapterFromHdc +@ stdcall D3DKMTOpenAdapterFromLuid(ptr) NtGdiDdDDIOpenAdapterFromLuid @ stdcall D3DKMTQueryStatistics(ptr) NtGdiDdDDIQueryStatistics @ stdcall D3DKMTSetQueuedLimit(ptr) NtGdiDdDDISetQueuedLimit @ stdcall D3DKMTSetVidPnSourceOwner(ptr) NtGdiDdDDISetVidPnSourceOwner diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index dc53ea343c0..2ca3c4d7448 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -122,6 +122,12 @@ typedef struct _D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME D3DDDI_VIDEO_PRESENT_SOURCE_ID VidPnSourceId; } D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME; +typedef struct _D3DKMT_OPENADAPTERFROMLUID +{ + LUID AdapterLuid; + D3DKMT_HANDLE hAdapter; +} D3DKMT_OPENADAPTERFROMLUID; + typedef struct _D3DKMT_SETVIDPNSOURCEOWNER { D3DKMT_HANDLE hDevice; diff --git a/include/ntgdi.h b/include/ntgdi.h index 7f3ecec8c64..ba4d2ff3556 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -333,6 +333,7 @@ NTSTATUS WINAPI NtGdiDdDDICreateDCFromMemory( D3DKMT_CREATEDCFROMMEMORY *desc ); NTSTATUS WINAPI NtGdiDdDDICreateDevice( D3DKMT_CREATEDEVICE *desc ); NTSTATUS WINAPI NtGdiDdDDIDestroyDCFromMemory( const D3DKMT_DESTROYDCFROMMEMORY *desc ); NTSTATUS WINAPI NtGdiDdDDIDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ); +NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc ); NTSTATUS WINAPI NtGdiDdDDIQueryStatistics( D3DKMT_QUERYSTATISTICS *stats ); NTSTATUS WINAPI NtGdiDdDDISetQueuedLimit( D3DKMT_SETQUEUEDLIMIT *desc ); NTSTATUS WINAPI NtGdiDdDDISetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ); -- 2.23.0

1 0

[PATCH v2 1/9] gdi32: Use ntgdi names for D3DKMT functions.
by Huw Davies 25 Aug '21

25 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/dib.c | 8 ++++---- dlls/gdi32/driver.c | 38 +++++++++++++++++++------------------- dlls/gdi32/gdi32.spec | 22 +++++++++++----------- include/ntgdi.h | 12 ++++++++++++ 4 files changed, 46 insertions(+), 34 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index de1942894de..5a8d29ae5bf 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1579,9 +1579,9 @@ error: /*********************************************************************** - * D3DKMTCreateDCFromMemory (GDI32.@) + * NtGdiDdDDICreateDCFromMemory (win32u.@) */ -NTSTATUS WINAPI D3DKMTCreateDCFromMemory( D3DKMT_CREATEDCFROMMEMORY *desc ) +NTSTATUS WINAPI NtGdiDdDDICreateDCFromMemory( D3DKMT_CREATEDCFROMMEMORY *desc ) { const struct d3dddi_format_info { @@ -1693,9 +1693,9 @@ error: /*********************************************************************** - * D3DKMTDestroyDCFromMemory (GDI32.@) + * NtGdiDdDDIDestroyDCFromMemory (win32u.@) */ -NTSTATUS WINAPI D3DKMTDestroyDCFromMemory( const D3DKMT_DESTROYDCFROMMEMORY *desc ) +NTSTATUS WINAPI NtGdiDdDDIDestroyDCFromMemory( const D3DKMT_DESTROYDCFROMMEMORY *desc ) { if (!desc) return STATUS_INVALID_PARAMETER; diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 1df4660211e..fba1f1cffea 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1203,27 +1203,27 @@ ULONG WINAPI DdQueryDisplaySettingsUniqueness(VOID) } /****************************************************************************** - * D3DKMTOpenAdapterFromHdc [GDI32.@] + * NtGdiDdDDIOpenAdapterFromHdc (win32u.@) */ -NTSTATUS WINAPI D3DKMTOpenAdapterFromHdc( void *pData ) +NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromHdc( void *pData ) { FIXME("(%p): stub\n", pData); return STATUS_NO_MEMORY; } /****************************************************************************** - * D3DKMTEscape [GDI32.@] + * NtGdiDdDDIEscape (win32u.@) */ -NTSTATUS WINAPI D3DKMTEscape( const void *pData ) +NTSTATUS WINAPI NtGdiDdDDIEscape( const void *pData ) { FIXME("(%p): stub\n", pData); return STATUS_NO_MEMORY; } /****************************************************************************** - * D3DKMTCloseAdapter [GDI32.@] + * NtGdiDdDDICloseAdapter (win32u.@) */ -NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) +NTSTATUS WINAPI NtGdiDdDDICloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) { NTSTATUS status = STATUS_INVALID_PARAMETER; struct d3dkmt_adapter *adapter; @@ -1332,9 +1332,9 @@ done: } /****************************************************************************** - * D3DKMTCreateDevice [GDI32.@] + * NtGdiDdDDICreateDevice (win32u.@) */ -NTSTATUS WINAPI D3DKMTCreateDevice( D3DKMT_CREATEDEVICE *desc ) +NTSTATUS WINAPI NtGdiDdDDICreateDevice( D3DKMT_CREATEDEVICE *desc ) { static D3DKMT_HANDLE handle_start = 0; struct d3dkmt_adapter *adapter; @@ -1377,9 +1377,9 @@ NTSTATUS WINAPI D3DKMTCreateDevice( D3DKMT_CREATEDEVICE *desc ) } /****************************************************************************** - * D3DKMTDestroyDevice [GDI32.@] + * NtGdiDdDDIDestroyDevice (win32u.@) */ -NTSTATUS WINAPI D3DKMTDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) +NTSTATUS WINAPI NtGdiDdDDIDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) { NTSTATUS status = STATUS_INVALID_PARAMETER; D3DKMT_SETVIDPNSOURCEOWNER set_owner_desc; @@ -1397,7 +1397,7 @@ NTSTATUS WINAPI D3DKMTDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) { memset( &set_owner_desc, 0, sizeof(set_owner_desc) ); set_owner_desc.hDevice = desc->hDevice; - D3DKMTSetVidPnSourceOwner( &set_owner_desc ); + NtGdiDdDDISetVidPnSourceOwner( &set_owner_desc ); list_remove( &device->entry ); heap_free( device ); status = STATUS_SUCCESS; @@ -1410,27 +1410,27 @@ NTSTATUS WINAPI D3DKMTDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) } /****************************************************************************** - * D3DKMTQueryStatistics [GDI32.@] + * NtGdiDdDDIQueryStatistics (win32u.@) */ -NTSTATUS WINAPI D3DKMTQueryStatistics(D3DKMT_QUERYSTATISTICS *stats) +NTSTATUS WINAPI NtGdiDdDDIQueryStatistics( D3DKMT_QUERYSTATISTICS *stats ) { FIXME("(%p): stub\n", stats); return STATUS_SUCCESS; } /****************************************************************************** - * D3DKMTSetQueuedLimit [GDI32.@] + * NtGdiDdDDISetQueuedLimit (win32u.@) */ -NTSTATUS WINAPI D3DKMTSetQueuedLimit( D3DKMT_SETQUEUEDLIMIT *desc ) +NTSTATUS WINAPI NtGdiDdDDISetQueuedLimit( D3DKMT_SETQUEUEDLIMIT *desc ) { FIXME( "(%p): stub\n", desc ); return STATUS_NOT_IMPLEMENTED; } /****************************************************************************** - * D3DKMTSetVidPnSourceOwner [GDI32.@] + * NtGdiDdDDISetVidPnSourceOwner (win32u.@) */ -NTSTATUS WINAPI D3DKMTSetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ) +NTSTATUS WINAPI NtGdiDdDDISetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ) { TRACE("(%p)\n", desc); @@ -1448,9 +1448,9 @@ NTSTATUS WINAPI D3DKMTSetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *des } /****************************************************************************** - * D3DKMTCheckVidPnExclusiveOwnership [GDI32.@] + * NtGdiDdDDICheckVidPnExclusiveOwnership (win32u.@) */ -NTSTATUS WINAPI D3DKMTCheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc ) +NTSTATUS WINAPI NtGdiDdDDICheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc ) { TRACE("(%p)\n", desc); diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 6aef8c2dbf6..48ce04e3819 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -80,18 +80,18 @@ @ stdcall CreateScalableFontResourceA(long str str str) @ stdcall CreateScalableFontResourceW(long wstr wstr wstr) @ stdcall CreateSolidBrush(long) -@ stdcall D3DKMTCheckVidPnExclusiveOwnership(ptr) -@ stdcall D3DKMTCloseAdapter(ptr) -@ stdcall D3DKMTCreateDCFromMemory(ptr) -@ stdcall D3DKMTCreateDevice(ptr) -@ stdcall D3DKMTDestroyDCFromMemory(ptr) -@ stdcall D3DKMTDestroyDevice(ptr) -@ stdcall D3DKMTEscape(ptr) +@ stdcall D3DKMTCheckVidPnExclusiveOwnership(ptr) NtGdiDdDDICheckVidPnExclusiveOwnership +@ stdcall D3DKMTCloseAdapter(ptr) NtGdiDdDDICloseAdapter +@ stdcall D3DKMTCreateDCFromMemory(ptr) NtGdiDdDDICreateDCFromMemory +@ stdcall D3DKMTCreateDevice(ptr) NtGdiDdDDICreateDevice +@ stdcall D3DKMTDestroyDCFromMemory(ptr) NtGdiDdDDIDestroyDCFromMemory +@ stdcall D3DKMTDestroyDevice(ptr) NtGdiDdDDIDestroyDevice +@ stdcall D3DKMTEscape(ptr) NtGdiDdDDIEscape @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) -@ stdcall D3DKMTOpenAdapterFromHdc(ptr) -@ stdcall D3DKMTQueryStatistics(ptr) -@ stdcall D3DKMTSetQueuedLimit(ptr) -@ stdcall D3DKMTSetVidPnSourceOwner(ptr) +@ stdcall D3DKMTOpenAdapterFromHdc(ptr) NtGdiDdDDIOpenAdapterFromHdc +@ stdcall D3DKMTQueryStatistics(ptr) NtGdiDdDDIQueryStatistics +@ stdcall D3DKMTSetQueuedLimit(ptr) NtGdiDdDDISetQueuedLimit +@ stdcall D3DKMTSetVidPnSourceOwner(ptr) NtGdiDdDDISetVidPnSourceOwner @ stdcall DPtoLP(long ptr long) @ stdcall DeleteColorSpace(long) @ stdcall DeleteDC(long) diff --git a/include/ntgdi.h b/include/ntgdi.h index e1bb6fb901d..7f3ecec8c64 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -20,7 +20,9 @@ #define _NTGDI_ #include <wingdi.h> +#include <winternl.h> #include <winspool.h> +#include <ddk/d3dkmthk.h> typedef struct _GDI_HANDLE_ENTRY { @@ -325,4 +327,14 @@ BOOL WINAPI NtGdiUnrealizeObject( HGDIOBJ obj ); BOOL WINAPI NtGdiUpdateColors( HDC hdc ); BOOL WINAPI NtGdiWidenPath( HDC hdc ); +NTSTATUS WINAPI NtGdiDdDDICheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc ); +NTSTATUS WINAPI NtGdiDdDDICloseAdapter( const D3DKMT_CLOSEADAPTER *desc ); +NTSTATUS WINAPI NtGdiDdDDICreateDCFromMemory( D3DKMT_CREATEDCFROMMEMORY *desc ); +NTSTATUS WINAPI NtGdiDdDDICreateDevice( D3DKMT_CREATEDEVICE *desc ); +NTSTATUS WINAPI NtGdiDdDDIDestroyDCFromMemory( const D3DKMT_DESTROYDCFROMMEMORY *desc ); +NTSTATUS WINAPI NtGdiDdDDIDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ); +NTSTATUS WINAPI NtGdiDdDDIQueryStatistics( D3DKMT_QUERYSTATISTICS *stats ); +NTSTATUS WINAPI NtGdiDdDDISetQueuedLimit( D3DKMT_SETQUEUEDLIMIT *desc ); +NTSTATUS WINAPI NtGdiDdDDISetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ); + #endif /* _NTGDI_ */ -- 2.23.0

1 0

[PATCH] conhost: Use font face length as number of characters.
by Jacek Caban 25 Aug '21

25 Aug '21

From: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 13 +++++++++---- programs/conhost/window.c | 24 +++++++++++++----------- 2 files changed, 22 insertions(+), 15 deletions(-)

1 0

[PATCH 9/9] gdi32: Use NtGdiCreateDIBBrush for CreateDIBPatternBrush.
by Jacek Caban 25 Aug '21

25 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/brush.c | 20 -------------------- dlls/gdi32/objects.c | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 20 deletions(-)

1 0

[PATCH 7/9] gdi32: Use NtGdiCreatePatternBrushInternal for CreatePatternBrush.
by Jacek Caban 25 Aug '21

25 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/brush.c | 9 +++++---- dlls/gdi32/objects.c | 8 ++++++++ include/ntgdi.h | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-)

1 0

[PATCH 6/9] gdi32: Use NtGdiCreateHatchBrush for CreateHatchBrush.
by Jacek Caban 25 Aug '21

25 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/brush.c | 6 +++--- dlls/gdi32/objects.c | 8 ++++++++ include/ntgdi.h | 1 + 3 files changed, 12 insertions(+), 3 deletions(-)

1 0

[PATCH 5/9] gdi32: Use NtGdiCreateSolidBrush for CreateSolidBrush.
by Jacek Caban 25 Aug '21

25 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/brush.c | 4 ++-- dlls/gdi32/objects.c | 8 ++++++++ include/ntgdi.h | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-)

1 0

[PATCH 4/9] gdi32: Reimplement CreateBrushIndirect on top of other brush constructors.
by Jacek Caban 25 Aug '21

25 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/brush.c | 96 +++----------------------------------- dlls/gdi32/gdiobj.c | 14 +++--- dlls/gdi32/ntgdi_private.h | 1 + dlls/gdi32/objects.c | 26 +++++++++++ dlls/gdi32/tests/brush.c | 11 +++++ 5 files changed, 51 insertions(+), 97 deletions(-)

1 0

[PATCH 3/9] gdi32: Move D3DKMTOpenAdapterFromGdiDisplayName to objects.c.
by Jacek Caban 25 Aug '21

25 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/driver.c | 91 ----------------------------------------- dlls/gdi32/objects.c | 97 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 96 insertions(+), 92 deletions(-)

1 0

[PATCH 2/9] gdi32: Implement NtGdiDdDDIOpenAdapterFromLuid.
by Jacek Caban 25 Aug '21

25 Aug '21

And use it for D3DKMTOpenAdapterFromGdiDisplayName. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/driver.c | 41 +++++++++++++++++++++++------------------ dlls/gdi32/gdi32.spec | 1 + include/ddk/d3dkmthk.h | 6 ++++++ include/ntgdi.h | 1 + 4 files changed, 31 insertions(+), 18 deletions(-)

1 0

[PATCH 1/9] gdi32: Use ntgdi names for D3DKMT functions.
by Jacek Caban 25 Aug '21

25 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dib.c | 8 ++++---- dlls/gdi32/driver.c | 38 +++++++++++++++++++------------------- dlls/gdi32/gdi32.spec | 22 +++++++++++----------- include/ntgdi.h | 12 ++++++++++++ 4 files changed, 46 insertions(+), 34 deletions(-)

1 0

[PATCH] winex11.drv: When mapping a layered window make sure that surface has a valid bounding rectangle.
by Dmitry Timoshkov 25 Aug '21

25 Aug '21

Otherwise surface->flush() would be a no-op. This may happen 1. when UpdateLayeredWindow() was initially called on an invisible window 2. when a window is unmapped during being converted to managed 3. layered windows are mapped only once their attributes are set Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/winex11.drv/window.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4e856a41865..dfe7d1ce716 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1128,7 +1128,10 @@ static void map_window( HWND hwnd, DWORD new_style ) XMapWindow( data->display, data->whole_window ); XFlush( data->display ); if (data->surface && data->vis.visualid != default_visual.visualid) + { + add_bounds_rect( data->surface->funcs->get_bounds( data->surface ), &data->window_rect ); data->surface->funcs->flush( data->surface ); + } } else set_xembed_flags( data, XEMBED_MAPPED ); -- 2.31.1

1 1

[PATCH v2] ntoskrnl.exe: Add NtTraceControl/ZwTraceControl stubs
by Alistair Leslie-Hughes 25 Aug '21

25 Aug '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/unix/server.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 ++ dlls/wow64/sync.c | 14 ++++++++++++++ dlls/wow64/syscall.h | 1 + 5 files changed, 28 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 1bff52a299d..c3d17d989ac 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -414,6 +414,7 @@ @ stdcall -syscall NtTerminateProcess(long long) @ stdcall -syscall NtTerminateThread(long long) @ stdcall -syscall NtTestAlert() +@ stdcall -syscall NtTraceControl(long ptr long ptr long long) # @ stub NtTraceEvent # @ stub NtTranslateFilePath @ stdcall -syscall NtUnloadDriver(ptr) @@ -1435,6 +1436,7 @@ @ stdcall -private -syscall ZwTerminateProcess(long long) NtTerminateProcess @ stdcall -private -syscall ZwTerminateThread(long long) NtTerminateThread @ stdcall -private -syscall ZwTestAlert() NtTestAlert +@ stdcall -private -syscall ZwTraceControl(long ptr long ptr long long) NtTraceControl # @ stub ZwTraceEvent # @ stub ZwTranslateFilePath @ stdcall -private -syscall ZwUnloadDriver(ptr) NtUnloadDriver diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 986eb6c3250..05fae06fc37 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -721,6 +721,15 @@ NTSTATUS WINAPI NtTestAlert(void) return STATUS_SUCCESS; } +/*********************************************************************** + * NtTraceControl (NTDLL.@) + */ +NTSTATUS WINAPI NtTraceControl(ULONG code, void *inbuf, ULONG inbuf_len, void *outbuf, ULONG outbuf_len, ULONG *size) +{ + FIXME("code %u, inbuf %p, inbuf_len %u, outbuf %p, outbuf_len %u, size %p\n", code, inbuf, inbuf_len, + outbuf, outbuf_len, size); + return STATUS_SUCCESS; +} /*********************************************************************** * server_queue_process_apc diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index f51833b91a0..071dae6ceca 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -818,6 +818,7 @@ @ stdcall NtSetSecurityObject(long long ptr) @ stdcall NtSetVolumeInformationFile(long ptr ptr long long) @ stdcall NtShutdownSystem(long) +@ stdcall NtTraceControl(long ptr long ptr long long) @ stub NtTraceEvent @ stdcall NtUnlockFile(long ptr ptr ptr ptr) @ stub NtVdmControl @@ -1514,6 +1515,7 @@ @ stdcall -private ZwSetVolumeInformationFile(long ptr ptr long long) NtSetVolumeInformationFile @ stdcall -private ZwTerminateJobObject(long long) NtTerminateJobObject @ stdcall -private ZwTerminateProcess(long long) NtTerminateProcess +@ stdcall -private ZwTraceControl(long ptr long ptr long long) NtTraceControl @ stub ZwTranslateFilePath @ stdcall ZwUnloadDriver(ptr) @ stdcall -private ZwUnloadKey(ptr) NtUnloadKey diff --git a/dlls/wow64/sync.c b/dlls/wow64/sync.c index 2560fc10a0a..e4a58eeef6d 100644 --- a/dlls/wow64/sync.c +++ b/dlls/wow64/sync.c @@ -1480,6 +1480,20 @@ NTSTATUS WINAPI wow64_NtTestAlert( UINT *args ) return NtTestAlert(); } +/********************************************************************** + * wow64_NtTraceControl + */ +NTSTATUS WINAPI wow64_NtTraceControl( UINT *args ) +{ + ULONG code = get_ulong( &args ); + void *inbuf = get_ptr( &args ); + ULONG inbuf_len = get_ulong( &args ); + void *outbuf = get_ptr( &args ); + ULONG outbuf_len = get_ulong( &args ); + ULONG *size = get_ptr( &args ); + + return NtTraceControl(code, inbuf, inbuf_len, outbuf, outbuf_len, size); +} /********************************************************************** * wow64_NtWaitForDebugEvent diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index d6c1b7c74fa..a565e9cda3a 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -228,6 +228,7 @@ SYSCALL_ENTRY( NtTerminateProcess ) \ SYSCALL_ENTRY( NtTerminateThread ) \ SYSCALL_ENTRY( NtTestAlert ) \ + SYSCALL_ENTRY( NtTraceControl ) \ SYSCALL_ENTRY( NtUnloadDriver ) \ SYSCALL_ENTRY( NtUnloadKey ) \ SYSCALL_ENTRY( NtUnlockFile ) \ -- 2.32.0

1 0

[PATCH] services: Check correct permission
by Alistair Leslie-Hughes 25 Aug '21

25 Aug '21

Function svcctl_QueryServiceConfigW already checked for this permission, so make sense that QueryServiceConfig2W should as well. MSDN states "This handle is returned by the OpenService or CreateService function and must have the SERVICE_QUERY_CONFIG access right" Patch by Bugzilla user Dalai. Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=50412 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- programs/services/rpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 8d688c2f904..0f0a83df421 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -979,7 +979,7 @@ DWORD __cdecl svcctl_QueryServiceConfig2W( SC_RPC_HANDLE hService, DWORD level, memset(buffer, 0, size); - if ((err = validate_service_handle(hService, SERVICE_QUERY_STATUS, &service)) != 0) + if ((err = validate_service_handle(hService, SERVICE_QUERY_CONFIG, &service)) != 0) return err; switch (level) -- 2.32.0

1 0

[PATCH] nsiproxy: Include sys/queue.h from tcp.c
by Gerald Pfeifer 25 Aug '21

25 Aug '21

In what looks like a change between FreeBSD 11 and later versions (FreeBSD 12 and 13), we now need to explicitly include sys/queue.h to avoid In file included from dlls/nsiproxy.sys/tcp.c:42: /usr/include/netinet/tcp_var.h:516:2: error: expected specifier-qualifier-list before 'TAILQ_ENTRY' 516 | TAILQ_ENTRY(tcptw) tw_2msl; Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/nsiproxy.sys/tcp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index 8567330be99..603aefadfe9 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -58,6 +58,10 @@ #include <netinet/ip_var.h> #endif +#ifdef HAVE_SYS_QUEUE_H +#include <sys/queue.h> +#endif + #ifdef HAVE_NETINET_TCP_VAR_H #include <netinet/tcp_var.h> #endif -- 2.31.1

2 1

[PATCH] iphlpapi: Return early on error.
by Huw Davies 25 Aug '21

25 Aug '21

This prevents using err uninitialized. Spotted by Fabian Maurer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51655 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- Supersedes 212361. dlls/iphlpapi/iphlpapi_main.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 47c8a507e38..f83271eae97 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1206,15 +1206,11 @@ static DWORD dns_info_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG family, ULONG flags } } if (servers != (DNS_ADDR_ARRAY *)buf) heap_free( servers ); - if (err) goto err; + if (err) return err; } aa->DnsSuffix = heap_alloc( MAX_DNS_SUFFIX_STRING_LENGTH * sizeof(WCHAR) ); - if (!aa->DnsSuffix) - { - err = ERROR_NOT_ENOUGH_MEMORY; - goto err; - } + if (!aa->DnsSuffix) return ERROR_NOT_ENOUGH_MEMORY; aa->DnsSuffix[0] = '\0'; if (!DnsQueryConfig( DnsConfigSearchList, 0, name, NULL, NULL, &size ) && @@ -1231,8 +1227,7 @@ static DWORD dns_info_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG family, ULONG flags aa = aa->Next; } -err: - return err; + return ERROR_SUCCESS; } static DWORD adapters_addresses_alloc( ULONG family, ULONG flags, IP_ADAPTER_ADDRESSES **info ) -- 2.23.0

1 0

[PATCH 4/4] uxtheme: Draw scroll bar parent background only when theme parts are transparent.
by Zhiyi Zhang 25 Aug '21

25 Aug '21

Fix hangs in Source Insight 4 Options->Window->Styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/scrollbar.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/uxtheme/scrollbar.c b/dlls/uxtheme/scrollbar.c index 386f0446049..a9d5a83f2bb 100644 --- a/dlls/uxtheme/scrollbar.c +++ b/dlls/uxtheme/scrollbar.c @@ -100,9 +100,6 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES thumbstate = SCRBS_PRESSED; } - if (bar == SB_CTL) - DrawThemeParentBackground(hwnd, dc, NULL); - if (vertical) { int uparrowstate, downarrowstate; @@ -132,16 +129,22 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES partrect = *rect; partrect.bottom = partrect.top + arrowsize; + if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_ARROWBTN, uparrowstate)) + DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_ARROWBTN, uparrowstate, &partrect, NULL); partrect.bottom = rect->bottom; partrect.top = partrect.bottom - arrowsize; + if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_ARROWBTN, downarrowstate)) + DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_ARROWBTN, downarrowstate, &partrect, NULL); if (thumbpos > 0) { partrect.top = rect->top + arrowsize; partrect.bottom = rect->top + thumbpos; + if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_UPPERTRACKVERT, uppertrackstate)) + DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_UPPERTRACKVERT, uppertrackstate, &partrect, NULL); } @@ -149,6 +152,8 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES partrect.top = rect->top + thumbpos; partrect.bottom = partrect.top + thumbsize; + if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_THUMBBTNVERT, thumbstate)) + DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_THUMBBTNVERT, thumbstate, &partrect, NULL); if (SUCCEEDED(GetThemePartSize(theme, dc, SBP_GRIPPERVERT, thumbstate, NULL, TS_DRAW, &grippersize))) { @@ -167,7 +172,11 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES else partrect.top = rect->top + arrowsize; if (partrect.bottom > partrect.top) + { + if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_LOWERTRACKVERT, lowertrackstate)) + DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_LOWERTRACKVERT, lowertrackstate, &partrect, NULL); + } } else { int leftarrowstate, rightarrowstate; @@ -197,16 +206,22 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES partrect = *rect; partrect.right = partrect.left + arrowsize; + if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_ARROWBTN, leftarrowstate)) + DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_ARROWBTN, leftarrowstate, &partrect, NULL); partrect.right = rect->right; partrect.left = partrect.right - arrowsize; + if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_ARROWBTN, rightarrowstate)) + DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_ARROWBTN, rightarrowstate, &partrect, NULL); if (thumbpos > 0) { partrect.left = rect->left + arrowsize; partrect.right = rect->left + thumbpos; + if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_UPPERTRACKHORZ, uppertrackstate)) + DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_UPPERTRACKHORZ, uppertrackstate, &partrect, NULL); } @@ -214,6 +229,8 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES partrect.left = rect->left + thumbpos; partrect.right = partrect.left + thumbsize; + if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_THUMBBTNHORZ, thumbstate)) + DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_THUMBBTNHORZ, thumbstate, &partrect, NULL); if (SUCCEEDED(GetThemePartSize(theme, dc, SBP_GRIPPERHORZ, thumbstate, NULL, TS_DRAW, &grippersize))) { @@ -232,7 +249,11 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES else partrect.left = rect->left + arrowsize; if (partrect.right > partrect.left) + { + if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_LOWERTRACKHORZ, lowertrackstate)) + DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_LOWERTRACKHORZ, lowertrackstate, &partrect, NULL); + } } } -- 2.30.2

1 0

[PATCH 3/4] uxtheme: Use TransparentBlt() for bitmaps with all alpha values being 0xff.
by Zhiyi Zhang 25 Aug '21

25 Aug '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51553 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/msstyles.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index ed22d923250..6f74d2d3d7d 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -1072,11 +1072,18 @@ static BOOL prepare_alpha (HBITMAP bmp, BOOL* hasAlpha) if (!bmp || GetObjectW( bmp, sizeof(dib), &dib ) != sizeof(dib)) return FALSE; - if(dib.dsBm.bmBitsPixel != 32) + if (dib.dsBm.bmBitsPixel != 32 || dib.dsBmih.biCompression != BI_RGB) /* nothing to do */ return TRUE; - *hasAlpha = TRUE; + /* If all alpha values are 0xff, don't use alpha blending */ + for (n = 0, p = dib.dsBm.bmBits; n < dib.dsBmih.biWidth * dib.dsBmih.biHeight; n++, p += 4) + if ((*hasAlpha = (p[3] != 0xff))) + break; + + if (!*hasAlpha) + return TRUE; + p = dib.dsBm.bmBits; n = dib.dsBmih.biHeight * dib.dsBmih.biWidth; /* AlphaBlend() wants premultiplied alpha, so do that now */ -- 2.30.2

1 0

[PATCH 2/4] uxtheme: Implement DrawThemeIcon().
by Zhiyi Zhang 25 Aug '21

25 Aug '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51589 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/draw.c | 58 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 521f9eb32a9..4394f4943b7 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -2,6 +2,7 @@ * Win32 5.1 Theme drawing * * Copyright (C) 2003 Kevin Koltzau + * Copyright 2021 Zhiyi Zhang for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include <stdlib.h> #include <stdarg.h> @@ -25,6 +28,8 @@ #include "winbase.h" #include "winuser.h" #include "wingdi.h" +#include "commctrl.h" +#include "commoncontrols.h" #include "vfwmsgs.h" #include "uxtheme.h" #include "tmschema.h" @@ -1649,10 +1654,57 @@ HRESULT WINAPI DrawThemeEdge(HTHEME hTheme, HDC hdc, int iPartId, HRESULT WINAPI DrawThemeIcon(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, const RECT *pRect, HIMAGELIST himl, int iImageIndex) { - FIXME("%d %d: stub\n", iPartId, iStateId); - if(!hTheme) + INT effect = ICE_NONE, saturation = 0, alpha = 128; + IImageList *image_list = (IImageList *)himl; + IMAGELISTDRAWPARAMS params = {0}; + COLORREF color = 0; + + TRACE("%p %p %d %d %s %p %d\n", hTheme, hdc, iPartId, iStateId, wine_dbgstr_rect(pRect), himl, + iImageIndex); + + if (!hTheme) return E_HANDLE; - return E_NOTIMPL; + + GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_ICONEFFECT, &effect); + switch (effect) + { + case ICE_NONE: + params.fState = ILS_NORMAL; + break; + case ICE_GLOW: + GetThemeColor(hTheme, iPartId, iStateId, TMT_GLOWCOLOR, &color); + params.fState = ILS_GLOW; + params.crEffect = color; + break; + case ICE_SHADOW: + GetThemeColor(hTheme, iPartId, iStateId, TMT_SHADOWCOLOR, &color); + params.fState = ILS_SHADOW; + params.crEffect = color; + break; + case ICE_PULSE: + GetThemeInt(hTheme, iPartId, iStateId, TMT_SATURATION, &saturation); + params.fState = ILS_SATURATE; + params.Frame = saturation; + break; + case ICE_ALPHA: + GetThemeInt(hTheme, iPartId, iStateId, TMT_ALPHALEVEL, &alpha); + params.fState = ILS_ALPHA; + params.Frame = alpha; + break; + } + + params.cbSize = sizeof(params); + params.himl = himl; + params.i = iImageIndex; + params.hdcDst = hdc; + params.x = pRect->left; + params.y = pRect->top; + params.cx = pRect->right - pRect->left; + params.cy = pRect->bottom - pRect->top; + params.rgbBk = CLR_NONE; + params.rgbFg = CLR_NONE; + params.fStyle = ILD_TRANSPARENT; + return IImageList_Draw(image_list, &params); } /*********************************************************************** -- 2.30.2

1 0

[PATCH 1/4] uxtheme: Add comctl32 v6 manifest.
by Zhiyi Zhang 25 Aug '21

25 Aug '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/uxtheme.manifest | 16 ++++++++++++++++ dlls/uxtheme/version.rc | 3 +++ 2 files changed, 19 insertions(+) create mode 100644 dlls/uxtheme/uxtheme.manifest diff --git a/dlls/uxtheme/uxtheme.manifest b/dlls/uxtheme/uxtheme.manifest new file mode 100644 index 00000000000..fa17a821fe7 --- /dev/null +++ b/dlls/uxtheme/uxtheme.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Uxtheme" version="1.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/dlls/uxtheme/version.rc b/dlls/uxtheme/version.rc index fdeec0a0ab6..71d9f9ec7e1 100644 --- a/dlls/uxtheme/version.rc +++ b/dlls/uxtheme/version.rc @@ -19,3 +19,6 @@ #define WINE_FILENAME_STR "uxtheme.dll" #include <wine/wine_common_ver.rc> + +/* @makedep: uxtheme.manifest */ +1 RT_MANIFEST uxtheme.manifest -- 2.30.2

1 0

[PATCH 1/3] ntoskrnl/tests: Add some tests for IRP pending flags.
by Zebediah Figura 24 Aug '21

24 Aug '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntoskrnl.exe/tests/driver.c | 109 +++++++++++++++++++++++++++++-- 1 file changed, 102 insertions(+), 7 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 7ee48696c09..65c7860e786 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1737,11 +1737,44 @@ static void test_stack_limits(void) ok(low < (ULONG_PTR)&low && (ULONG_PTR)&low < high, "stack variable is not in stack limits\n"); } -static unsigned int got_completion; +static unsigned int got_completion, completion_lower_pending, completion_upper_pending; static NTSTATUS WINAPI completion_cb(DEVICE_OBJECT *device, IRP *irp, void *context) { + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); ok(device == context, "Got device %p; expected %p.\n", device, context); + + if (device == upper_device) + { + todo_wine_if (completion_lower_pending) + ok(irp->PendingReturned == completion_lower_pending, "Got PendingReturned %u, expected %u.\n", + irp->PendingReturned, completion_lower_pending); + + ok(irp->CurrentLocation == 2, "Got current location %u.\n", irp->CurrentLocation); + ok(stack->Control == (SL_INVOKE_ON_CANCEL | SL_INVOKE_ON_ERROR | SL_INVOKE_ON_SUCCESS), + "Got control flags %#x.\n", stack->Control); + stack = IoGetNextIrpStackLocation(irp); + todo_wine ok(!stack->Control, "Got control flags %#x.\n", stack->Control); + stack = irp->Tail.Overlay.CurrentStackLocation + 1; /* previous location */ + ok(!stack->Control, "Got control flags %#x.\n", stack->Control); + + if (irp->PendingReturned && completion_upper_pending) + IoMarkIrpPending(irp); + } + else + { + todo_wine_if (completion_upper_pending) + ok(irp->PendingReturned == completion_upper_pending, "Got PendingReturned %u, expected %u.\n", + irp->PendingReturned, completion_upper_pending); + + ok(irp->CurrentLocation == 3, "Got current location %u.\n", irp->CurrentLocation); + ok(!stack->Control, "Got control flags %#x.\n", stack->Control); + stack = IoGetNextIrpStackLocation(irp); + todo_wine ok(!stack->Control, "Got control flags %#x.\n", stack->Control); + stack = irp->Tail.Overlay.CurrentStackLocation - 2; /* lowest location */ + todo_wine ok(!stack->Control, "Got control flags %#x.\n", stack->Control); + } + ++got_completion; return STATUS_SUCCESS; } @@ -1753,15 +1786,50 @@ static void test_completion(void) KEVENT event; IRP *irp; + completion_lower_pending = completion_upper_pending = FALSE; + KeInitializeEvent(&event, NotificationEvent, FALSE); irp = IoBuildDeviceIoControlRequest(IOCTL_WINETEST_COMPLETION, upper_device, NULL, 0, NULL, 0, FALSE, &event, &io); - IoSetCompletionRoutine(irp, completion_cb, NULL, TRUE, TRUE, TRUE); ret = IoCallDriver(upper_device, irp); ok(ret == STATUS_SUCCESS, "IoCallDriver returned %#x\n", ret); ok(got_completion == 2, "got %u calls to completion routine\n", got_completion); + + completion_lower_pending = TRUE; + got_completion = 0; + + irp = IoBuildDeviceIoControlRequest(IOCTL_WINETEST_COMPLETION, upper_device, + NULL, 0, NULL, 0, FALSE, &event, &io); + IoSetCompletionRoutine(irp, completion_cb, NULL, TRUE, TRUE, TRUE); + ret = IoCallDriver(upper_device, irp); + ok(ret == STATUS_PENDING, "IoCallDriver returned %#x\n", ret); + ok(!got_completion, "got %u calls to completion routine\n", got_completion); + + ok(irp->CurrentLocation == 1, "Got current location %u.\n", irp->CurrentLocation); + ok(!irp->PendingReturned, "Got pending flag %u.\n", irp->PendingReturned); + + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(irp, IO_NO_INCREMENT); + ok(got_completion == 2, "got %u calls to completion routine\n", got_completion); + + completion_upper_pending = TRUE; + got_completion = 0; + + irp = IoBuildDeviceIoControlRequest(IOCTL_WINETEST_COMPLETION, upper_device, + NULL, 0, NULL, 0, FALSE, &event, &io); + IoSetCompletionRoutine(irp, completion_cb, NULL, TRUE, TRUE, TRUE); + ret = IoCallDriver(upper_device, irp); + ok(ret == STATUS_PENDING, "IoCallDriver returned %#x\n", ret); + ok(!got_completion, "got %u calls to completion routine\n", got_completion); + + ok(irp->CurrentLocation == 1, "Got current location %u.\n", irp->CurrentLocation); + ok(!irp->PendingReturned, "Got pending flag %u.\n", irp->PendingReturned); + + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(irp, IO_NO_INCREMENT); + ok(got_completion == 2, "got %u calls to completion routine\n", got_completion); } static void test_IoAttachDeviceToDeviceStack(void) @@ -2392,10 +2460,19 @@ static NTSTATUS test_mismatched_status_ioctl(IRP *irp, IO_STACK_LOCATION *stack, return STATUS_SUCCESS; } -static NTSTATUS test_completion_ioctl(DEVICE_OBJECT *device, IRP *irp) +static NTSTATUS completion_ioctl(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) { if (device == upper_device) { + ok(irp->CurrentLocation == 2, "Got current location %u.\n", irp->CurrentLocation); + ok(!irp->PendingReturned, "Got pending flag %u.\n", irp->PendingReturned); + ok(stack->Control == (SL_INVOKE_ON_CANCEL | SL_INVOKE_ON_ERROR | SL_INVOKE_ON_SUCCESS), + "Got control flags %#x.\n", stack->Control); + stack = IoGetNextIrpStackLocation(irp); + ok(!stack->Control, "Got control flags %#x.\n", stack->Control); + stack = irp->Tail.Overlay.CurrentStackLocation + 1; /* previous location */ + ok(!stack->Control, "Got control flags %#x.\n", stack->Control); + IoCopyCurrentIrpStackLocationToNext(irp); IoSetCompletionRoutine(irp, completion_cb, upper_device, TRUE, TRUE, TRUE); return IoCallDriver(lower_device, irp); @@ -2403,9 +2480,27 @@ static NTSTATUS test_completion_ioctl(DEVICE_OBJECT *device, IRP *irp) else { ok(device == lower_device, "Got wrong device.\n"); - irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; + ok(irp->CurrentLocation == 1, "Got current location %u.\n", irp->CurrentLocation); + ok(!irp->PendingReturned, "Got pending flag %u.\n", irp->PendingReturned); + ok(stack->Control == (SL_INVOKE_ON_CANCEL | SL_INVOKE_ON_ERROR | SL_INVOKE_ON_SUCCESS), + "Got control flags %#x.\n", stack->Control); + stack = irp->Tail.Overlay.CurrentStackLocation + 1; /* previous location */ + ok(stack->Control == (SL_INVOKE_ON_CANCEL | SL_INVOKE_ON_ERROR | SL_INVOKE_ON_SUCCESS), + "Got control flags %#x.\n", stack->Control); + stack = irp->Tail.Overlay.CurrentStackLocation + 2; /* top location */ + ok(!stack->Control, "Got control flags %#x.\n", stack->Control); + + if (completion_lower_pending) + { + IoMarkIrpPending(irp); + return STATUS_PENDING; + } + else + { + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } } } @@ -2481,7 +2576,7 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_WINETEST_MISMATCHED_STATUS: return test_mismatched_status_ioctl(irp, stack, &irp->IoStatus.Information); case IOCTL_WINETEST_COMPLETION: - return test_completion_ioctl(device, irp); + return completion_ioctl(device, irp, stack); default: break; } -- 2.30.2

2 3

[PATCH 1/2] server: Add helper functions to perform atomic stores.
by Zebediah Figura 24 Aug '21

24 Aug '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- server/fd.c | 61 ++++++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/server/fd.c b/server/fd.c index de7c5d7e36d..60555032f21 100644 --- a/server/fd.c +++ b/server/fd.c @@ -385,41 +385,44 @@ timeout_t monotonic_time; struct _KUSER_SHARED_DATA *user_shared_data = NULL; static const int user_shared_data_timeout = 16; +static void atomic_store_ulong(volatile ULONG *ptr, ULONG value) +{ + /* on x86 there should be total store order guarantees, so volatile is + * enough to ensure the stores aren't reordered by the compiler, and then + * they will always be seen in-order from other CPUs. On other archs, we + * need atomic intrinsics to guarantee that. */ +#if defined(__i386__) || defined(__x86_64__) + *ptr = value; +#else + __atomic_store_n(ptr, value, __ATOMIC_SEQ_CST); +#endif +} + +static void atomic_store_long(volatile LONG *ptr, LONG value) +{ +#if defined(__i386__) || defined(__x86_64__) + *ptr = value; +#else + __atomic_store_n(ptr, value, __ATOMIC_SEQ_CST); +#endif +} + static void set_user_shared_data_time(void) { timeout_t tick_count = monotonic_time / 10000; - /* on X86 there should be total store order guarantees, so volatile is enough - * to ensure the stores aren't reordered by the compiler, and then they will - * always be seen in-order from other CPUs. On other archs, we need atomic - * intrinsics to guarantee that. */ -#if defined(__i386__) || defined(__x86_64__) - user_shared_data->SystemTime.High2Time = current_time >> 32; - user_shared_data->SystemTime.LowPart = current_time; - user_shared_data->SystemTime.High1Time = current_time >> 32; + atomic_store_long(&user_shared_data->SystemTime.High2Time, current_time >> 32); + atomic_store_ulong(&user_shared_data->SystemTime.LowPart, current_time); + atomic_store_long(&user_shared_data->SystemTime.High1Time, current_time >> 32); - user_shared_data->InterruptTime.High2Time = monotonic_time >> 32; - user_shared_data->InterruptTime.LowPart = monotonic_time; - user_shared_data->InterruptTime.High1Time = monotonic_time >> 32; + atomic_store_long(&user_shared_data->InterruptTime.High2Time, monotonic_time >> 32); + atomic_store_ulong(&user_shared_data->InterruptTime.LowPart, monotonic_time); + atomic_store_long(&user_shared_data->InterruptTime.High1Time, monotonic_time >> 32); - user_shared_data->TickCount.High2Time = tick_count >> 32; - user_shared_data->TickCount.LowPart = tick_count; - user_shared_data->TickCount.High1Time = tick_count >> 32; - *(volatile ULONG *)&user_shared_data->TickCountLowDeprecated = tick_count; -#else - __atomic_store_n(&user_shared_data->SystemTime.High2Time, current_time >> 32, __ATOMIC_SEQ_CST); - __atomic_store_n(&user_shared_data->SystemTime.LowPart, current_time, __ATOMIC_SEQ_CST); - __atomic_store_n(&user_shared_data->SystemTime.High1Time, current_time >> 32, __ATOMIC_SEQ_CST); - - __atomic_store_n(&user_shared_data->InterruptTime.High2Time, monotonic_time >> 32, __ATOMIC_SEQ_CST); - __atomic_store_n(&user_shared_data->InterruptTime.LowPart, monotonic_time, __ATOMIC_SEQ_CST); - __atomic_store_n(&user_shared_data->InterruptTime.High1Time, monotonic_time >> 32, __ATOMIC_SEQ_CST); - - __atomic_store_n(&user_shared_data->TickCount.High2Time, tick_count >> 32, __ATOMIC_SEQ_CST); - __atomic_store_n(&user_shared_data->TickCount.LowPart, tick_count, __ATOMIC_SEQ_CST); - __atomic_store_n(&user_shared_data->TickCount.High1Time, tick_count >> 32, __ATOMIC_SEQ_CST); - __atomic_store_n(&user_shared_data->TickCountLowDeprecated, tick_count, __ATOMIC_SEQ_CST); -#endif + atomic_store_long(&user_shared_data->TickCount.High2Time, tick_count >> 32); + atomic_store_ulong(&user_shared_data->TickCount.LowPart, tick_count); + atomic_store_long(&user_shared_data->TickCount.High1Time, tick_count >> 32); + atomic_store_ulong(&user_shared_data->TickCountLowDeprecated, tick_count); } void set_current_time(void) -- 2.30.2

3 4

[PATCH 1/3] winhttp: Factor out query_data_ready() function.
by Paul Gofman 24 Aug '21

24 Aug '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- winhttp functions (in particular, WinHttpQueryDataAvailable and WinHttpReadData) can execute synchronously if the data is available. This is the documented behaviour which is also confirmed by the tests. 'eFootball PES 2021 Season Update' depends on this behaviour. It creates asynchronous session but then breaks in various ways if WinHttpReadData() actually queues the async task. The game always calls WinHttpQueryDataAvailable() first and then WinHttpReadData with the read size equal to the available data, so that the read is always synchronous on Windows. dlls/winhttp/request.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index a6c16d7b653..b8f5817737e 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2815,19 +2815,26 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) return !ret; } +static DWORD query_data_ready( struct request *request ) +{ + DWORD count; + + count = get_available_data( request ); + if (!request->read_chunked && request->netconn) count += netconn_query_data_available( request->netconn ); + + return count; +} + static DWORD query_data_available( struct request *request, DWORD *available, BOOL async ) { DWORD ret = ERROR_SUCCESS, count = 0; if (end_of_read_data( request )) goto done; - count = get_available_data( request ); - if (!request->read_chunked && request->netconn) count += netconn_query_data_available( request->netconn ); - if (!count) + if (!(count = query_data_ready( request ))) { if ((ret = refill_buffer( request, async ))) goto done; - count = get_available_data( request ); - if (!request->read_chunked && request->netconn) count += netconn_query_data_available( request->netconn ); + count = query_data_ready( request ); } done: -- 2.31.1

2 4

[PATCH] kernel32/tests: Remove the macros from the GetNumberFormatA() tests.
by Francois Gouget 24 Aug '21

24 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/kernel32/tests/locale.c | 207 +++++++++++++++-------------------- 1 file changed, 87 insertions(+), 120 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 6e17030ff9d..e6514f0b11f 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -160,11 +160,6 @@ static void InitFunctionPointers(void) #define BUFFER_SIZE 128 -#define STRINGSA(x,y) strcpy(input, x); strcpy(Expected, y); SetLastError(0xdeadbeef); buffer[0] = '\0' -#define EXPECT_LENA ok(ret == lstrlenA(Expected)+1, "Expected len %d, got %d\n", lstrlenA(Expected)+1, ret) -#define EXPECT_EQA ok(strncmp(buffer, Expected, strlen(Expected)) == 0, \ - "Expected '%s', got '%s'\n", Expected, buffer) - #define expect_str(r,s,e) expect_str_(__LINE__, r, s, e) static void expect_str_(int line, int ret, const char *str, const char *expected) { @@ -1407,95 +1402,89 @@ static void test_GetNumberFormatA(void) static char szComma[] = { ',', '\0' }; int ret; LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); - char buffer[BUFFER_SIZE], Expected[BUFFER_SIZE], input[BUFFER_SIZE]; + char buffer[BUFFER_SIZE]; NUMBERFMTA format; - memset(&format, 0, sizeof(format)); - - STRINGSA("23",""); /* NULL output, length > 0 --> Error */ SetLastError(0xdeadbeef); - ret = GetNumberFormatA(lcid, 0, input, NULL, NULL, ARRAY_SIZE(buffer)); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - STRINGSA("23,53",""); /* Invalid character --> Error */ + /* NULL output, length > 0 --> Error */ + strcpy(buffer, "pristine"); + ret = GetNumberFormatA(lcid, 0, "23", NULL, NULL, ARRAY_SIZE(buffer)); + expect_err(ret, buffer, ERROR_INVALID_PARAMETER); SetLastError(0xdeadbeef); - ret = GetNumberFormatA(lcid, 0, input, NULL, buffer, ARRAY_SIZE(buffer)); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - STRINGSA("--",""); /* Double '-' --> Error */ + /* Invalid character --> Error */ + strcpy(buffer, "pristine"); + ret = GetNumberFormatA(lcid, 0, "23,53", NULL, buffer, ARRAY_SIZE(buffer)); + expect_err(ret, buffer, ERROR_INVALID_PARAMETER); SetLastError(0xdeadbeef); - ret = GetNumberFormatA(lcid, 0, input, NULL, buffer, ARRAY_SIZE(buffer)); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - STRINGSA("0-",""); /* Trailing '-' --> Error */ + /* Double '-' --> Error */ + strcpy(buffer, "pristine"); + ret = GetNumberFormatA(lcid, 0, "--", NULL, buffer, ARRAY_SIZE(buffer)); + expect_err(ret, buffer, ERROR_INVALID_PARAMETER); SetLastError(0xdeadbeef); - ret = GetNumberFormatA(lcid, 0, input, NULL, buffer, ARRAY_SIZE(buffer)); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - STRINGSA("0..",""); /* Double '.' --> Error */ + /* Trailing '-' --> Error */ + strcpy(buffer, "pristine"); + ret = GetNumberFormatA(lcid, 0, "0-", NULL, buffer, ARRAY_SIZE(buffer)); + expect_err(ret, buffer, ERROR_INVALID_PARAMETER); SetLastError(0xdeadbeef); - ret = GetNumberFormatA(lcid, 0, input, NULL, buffer, ARRAY_SIZE(buffer)); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - STRINGSA(" 0.1",""); /* Leading space --> Error */ + /* Double '.' --> Error */ + strcpy(buffer, "pristine"); + ret = GetNumberFormatA(lcid, 0, "0..", NULL, buffer, ARRAY_SIZE(buffer)); + expect_err(ret, buffer, ERROR_INVALID_PARAMETER); SetLastError(0xdeadbeef); - ret = GetNumberFormatA(lcid, 0, input, NULL, buffer, ARRAY_SIZE(buffer)); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - STRINGSA("1234","1"); /* Length too small --> Write up to length chars */ + /* Leading space --> Error */ + strcpy(buffer, "pristine"); + ret = GetNumberFormatA(lcid, 0, " 0.1", NULL, buffer, ARRAY_SIZE(buffer)); + expect_err(ret, buffer, ERROR_INVALID_PARAMETER); SetLastError(0xdeadbeef); - ret = GetNumberFormatA(lcid, NUO, input, NULL, buffer, 2); - ok( !ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); - STRINGSA("2353",""); /* Format and flags given --> Error */ + /* Length too small --> Write up to length chars */ + ret = GetNumberFormatA(lcid, NUO, "1234", NULL, buffer, 2); + /* there is no guarantee on the buffer content, see GetTimeFormatA() */ + expect_err(ret, NULL, ERROR_INSUFFICIENT_BUFFER); SetLastError(0xdeadbeef); - ret = GetNumberFormatA(lcid, NUO, input, &format, buffer, ARRAY_SIZE(buffer)); - ok( !ret, "Expected ret == 0, got %d\n", ret); - ok( GetLastError() == ERROR_INVALID_FLAGS, - "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); - STRINGSA("2353",""); /* Invalid format --> Error */ - SetLastError(0xdeadbeef); - ret = GetNumberFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + /* Valid number */ + ret = GetNumberFormatA(lcid, NUO, "2353", NULL, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "2,353.00"); - STRINGSA("2353","2,353.00"); /* Valid number */ - ret = GetNumberFormatA(lcid, NUO, input, NULL, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + /* Valid negative number */ + ret = GetNumberFormatA(lcid, NUO, "-2353", NULL, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "-2,353.00"); - STRINGSA("-2353","-2,353.00"); /* Valid negative number */ - ret = GetNumberFormatA(lcid, NUO, input, NULL, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + /* test for off by one error in grouping */ + ret = GetNumberFormatA(lcid, NUO, "-353", NULL, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "-353.00"); - STRINGSA("-353","-353.00"); /* test for off by one error in grouping */ - ret = GetNumberFormatA(lcid, NUO, input, NULL, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + /* Valid real number */ + ret = GetNumberFormatA(lcid, NUO, "2353.1", NULL, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "2,353.10"); - STRINGSA("2353.1","2,353.10"); /* Valid real number */ - ret = GetNumberFormatA(lcid, NUO, input, NULL, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + /* Too many DP --> Truncated */ + ret = GetNumberFormatA(lcid, NUO, "2353.111", NULL, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "2,353.11"); - STRINGSA("2353.111","2,353.11"); /* Too many DP --> Truncated */ - ret = GetNumberFormatA(lcid, NUO, input, NULL, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + /* Too many DP --> Rounded */ + ret = GetNumberFormatA(lcid, NUO, "2353.119", NULL, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "2,353.12"); - STRINGSA("2353.119","2,353.12"); /* Too many DP --> Rounded */ - ret = GetNumberFormatA(lcid, NUO, input, NULL, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + /* Format and flags given --> Error */ + memset(&format, 0, sizeof(format)); + strcpy(buffer, "pristine"); + ret = GetNumberFormatA(lcid, NUO, "2353", &format, buffer, ARRAY_SIZE(buffer)); + expect_err(ret, buffer, ERROR_INVALID_FLAGS); + SetLastError(0xdeadbeef); + + /* Invalid format --> Error */ + strcpy(buffer, "pristine"); + ret = GetNumberFormatA(lcid, 0, "2353", &format, buffer, ARRAY_SIZE(buffer)); + expect_err(ret, buffer, ERROR_INVALID_PARAMETER); + SetLastError(0xdeadbeef); format.NumDigits = 0; /* No decimal separator */ format.LeadingZero = 0; @@ -1504,80 +1493,58 @@ static void test_GetNumberFormatA(void) format.lpDecimalSep = szDot; format.lpThousandSep = szComma; - STRINGSA("2353","2353"); /* No decimal or grouping chars expected */ - ret = GetNumberFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + /* No decimal or grouping chars expected */ + ret = GetNumberFormatA(lcid, 0, "2353", &format, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "2353"); format.NumDigits = 1; /* 1 DP --> Expect decimal separator */ - STRINGSA("2353","2353.0"); - ret = GetNumberFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + ret = GetNumberFormatA(lcid, 0, "2353", &format, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "2353.0"); format.Grouping = 2; /* Group by 100's */ - STRINGSA("2353","23,53.0"); - ret = GetNumberFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + ret = GetNumberFormatA(lcid, 0, "2353", &format, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "23,53.0"); - STRINGSA("235","235.0"); /* Grouping of a positive number */ + /* Grouping of a positive number */ format.Grouping = 3; - ret = GetNumberFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + ret = GetNumberFormatA(lcid, 0, "235", &format, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "235.0"); - STRINGSA("-235","-235.0"); /* Grouping of a negative number */ + /* Grouping of a negative number */ format.NegativeOrder = NEG_LEFT; - ret = GetNumberFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + ret = GetNumberFormatA(lcid, 0, "-235", &format, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "-235.0"); format.LeadingZero = 1; /* Always provide leading zero */ - STRINGSA(".5","0.5"); - ret = GetNumberFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + ret = GetNumberFormatA(lcid, 0, ".5", &format, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "0.5"); format.NegativeOrder = NEG_PARENS; - STRINGSA("-1","(1.0)"); - ret = GetNumberFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + ret = GetNumberFormatA(lcid, 0, "-1", &format, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "(1.0)"); format.NegativeOrder = NEG_LEFT; - STRINGSA("-1","-1.0"); - ret = GetNumberFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + ret = GetNumberFormatA(lcid, 0, "-1", &format, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "-1.0"); format.NegativeOrder = NEG_LEFT_SPACE; - STRINGSA("-1","- 1.0"); - ret = GetNumberFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + ret = GetNumberFormatA(lcid, 0, "-1", &format, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "- 1.0"); format.NegativeOrder = NEG_RIGHT; - STRINGSA("-1","1.0-"); - ret = GetNumberFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + ret = GetNumberFormatA(lcid, 0, "-1", &format, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "1.0-"); format.NegativeOrder = NEG_RIGHT_SPACE; - STRINGSA("-1","1.0 -"); - ret = GetNumberFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + ret = GetNumberFormatA(lcid, 0, "-1", &format, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "1.0 -"); + /* Test French formatting */ lcid = MAKELCID(MAKELANGID(LANG_FRENCH, SUBLANG_DEFAULT), SORT_DEFAULT); - if (IsValidLocale(lcid, 0)) { - STRINGSA("-12345","-12 345,00"); /* Try French formatting */ - Expected[3] = (char)160; /* Non breaking space */ - ret = GetNumberFormatA(lcid, NUO, input, NULL, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + ret = GetNumberFormatA(lcid, NUO, "-12345", NULL, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "-12\xa0\x33\x34\x35,00"); /* Non breaking space */ } } -- 2.20.1

2 2

[PATCH] iphlpapi: In dns_info_alloc prevent usage of uninitialized variable
by Fabian Maurer 24 Aug '21

24 Aug '21

This can happen when the GAA_FLAG_SKIP_DNS_SERVER flag is set. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51655 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/iphlpapi/iphlpapi_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 408ac14bd1b..fea6860fc66 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1159,7 +1159,7 @@ static DWORD dns_info_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG family, ULONG flags char buf[FIELD_OFFSET(DNS_ADDR_ARRAY, AddrArray[3])]; IP_ADAPTER_DNS_SERVER_ADDRESS *dns, **next; DWORD query = dns_servers_query_code( family ); - DWORD err, i, size, attempt, sockaddr_len; + DWORD err = 0, i, size, attempt, sockaddr_len; WCHAR name[MAX_ADAPTER_NAME_LENGTH + 1]; DNS_ADDR_ARRAY *servers; DNS_TXT_DATAW *search; -- 2.33.0

1 0

[PATCH v5 resend] dpnet: Implement IDirectPlay8Address GetURLW/A.
by Alistair Leslie-Hughes 24 Aug '21

24 Aug '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dpnet/Makefile.in | 2 +- dlls/dpnet/address.c | 115 ++++++++++++++++++++++++++--- dlls/dpnet/tests/address.c | 143 +++++++++++++++++++++++++++++++++++++ 3 files changed, 249 insertions(+), 11 deletions(-) diff --git a/dlls/dpnet/Makefile.in b/dlls/dpnet/Makefile.in index bcf07772e39..9d979a34f22 100644 --- a/dlls/dpnet/Makefile.in +++ b/dlls/dpnet/Makefile.in @@ -1,6 +1,6 @@ MODULE = dpnet.dll IMPORTLIB = dpnet -IMPORTS = dxguid uuid ole32 advapi32 ws2_32 +IMPORTS = dxguid uuid ole32 advapi32 ws2_32 user32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 6aa62a97785..6819638a2b8 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -45,6 +45,22 @@ static char *heap_strdupA( const char *str ) return ret; } +static inline WCHAR *heap_strdupAtoW(const char *str) +{ + LPWSTR ret = NULL; + + if(str) { + DWORD len; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = heap_alloc(len*sizeof(WCHAR)); + if(ret) + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + } + + return ret; +} + static BOOL add_component(IDirectPlay8AddressImpl *This, struct component *item) { if(This->comp_count == This->comp_array_size) @@ -256,20 +272,99 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_Clear(IDirectPlay8Address *iface) return DPN_OK; } -static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLW(IDirectPlay8Address *iface, WCHAR *pwszURL, - DWORD *pdwNumChars) +static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLW(IDirectPlay8Address *iface, WCHAR *url, DWORD *length) { - IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); - TRACE("(%p): stub\n", This); - return DPN_OK; + IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); + HRESULT hr = DPNERR_BUFFERTOOSMALL; + int i; + WCHAR buffer[1024] = {0}; + int position = 0; + + TRACE("(%p, %p, %p)\n", This, url, length); + + if(!length || (!url && *length != 0)) + return DPNERR_INVALIDPOINTER; + + for(i=0; i < This->comp_count; i++) + { + struct component *entry = This->components[i]; + + if(position) + lstrcatW(&buffer[position++], L";"); + + switch(entry->type) + { + case DPNA_DATATYPE_GUID: + position += wsprintfW( &buffer[position], L"%s=%%7B%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X%%7D", + entry->name, entry->data.guid.Data1, entry->data.guid.Data2, entry->data.guid.Data3, + entry->data.guid.Data4[0], entry->data.guid.Data4[1], entry->data.guid.Data4[2], + entry->data.guid.Data4[3], entry->data.guid.Data4[4], entry->data.guid.Data4[5], + entry->data.guid.Data4[6], entry->data.guid.Data4[7] ); + + break; + case DPNA_DATATYPE_STRING: + position += wsprintfW(&buffer[position], L"%s=%s", entry->name, entry->data.string); + break; + case DPNA_DATATYPE_DWORD: + position += wsprintfW(&buffer[position], L"%s=%d", entry->name, entry->data.value); + break; + case DPNA_DATATYPE_STRING_ANSI: + { + WCHAR *str = heap_strdupAtoW(entry->data.ansi); + position += wsprintfW(&buffer[position], L"%s=%s", entry->name, str); + heap_free(str); + break; + } + case DPNA_DATATYPE_BINARY: + default: + FIXME("Unsupported type %d\n", entry->type); + } + } + + if(url && *length >= lstrlenW(buffer) + lstrlenW(DPNA_HEADER) + 1) + { + lstrcpyW(url, DPNA_HEADER); + lstrcatW(url, buffer); + hr = DPN_OK; + } + + *length = lstrlenW(buffer) + lstrlenW(DPNA_HEADER) + 1; + + return hr; } -static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLA(IDirectPlay8Address *iface, CHAR *pszURL, - DWORD *pdwNumChars) +static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLA(IDirectPlay8Address *iface, char *url, DWORD *length) { - IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); - TRACE("(%p): stub\n", This); - return DPN_OK; + IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); + HRESULT hr; + WCHAR *buffer = NULL; + + TRACE("(%p, %p %p)\n", This, url, length); + + if(!length || (!url && *length != 0)) + return DPNERR_INVALIDPOINTER; + + if(url && *length) + { + url[0] = '\0'; + buffer = heap_alloc(*length * sizeof(WCHAR)); + } + + hr = IDirectPlay8Address_GetURLW(iface, buffer, length); + if(hr == DPN_OK) + { + DWORD size; + size = WideCharToMultiByte(CP_ACP, 0, buffer, -1, NULL, 0, NULL, NULL); + if(size <= *length) + WideCharToMultiByte(CP_ACP, 0, buffer, -1, url, *length, NULL, NULL); + else + { + *length = size; + hr = DPNERR_BUFFERTOOSMALL; + } + } + heap_free(buffer); + return hr; } static HRESULT WINAPI IDirectPlay8AddressImpl_GetSP(IDirectPlay8Address *iface, GUID *pguidSP) diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index a8d31c9854a..0e8b8da3b09 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -304,6 +304,147 @@ static void address_setsp(void) } } +static void address_urlW(void) +{ + HRESULT hr; + IDirectPlay8Address *localaddr = NULL; + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&localaddr); + ok(hr == S_OK, "Failed to create IDirectPlay8Address object\n"); + if(SUCCEEDED(hr)) + { + WCHAR *buffer = NULL; + DWORD bufflen = 0, bufflen2; + DWORD port = 4321; + + hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, NULL); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); + + bufflen = 10; + hr = IDirectPlay8Address_GetURLW(localaddr, NULL, &bufflen); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLW(localaddr, NULL, &bufflen); + ok(bufflen == 66, "got %d\n", bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen * sizeof(WCHAR)); + + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(L"x-directplay:/provider=%7BEBFE7BA0-628D-11D2-AE0F-006097B01411%7D", buffer), "got %s\n", wine_dbgstr_w(buffer)); + HeapFree(GetProcessHeap(), 0, buffer); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_PORT, &port, sizeof(DWORD), DPNA_DATATYPE_DWORD); + ok(hr == S_OK, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLW(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen * sizeof(WCHAR)); + + bufflen2 = bufflen/2; + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, &bufflen2); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + ok(!lstrlenW(buffer), "wrong length\n"); + + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(L"x-directplay:/provider=%7BEBFE7BA0-628D-11D2-AE0F-006097B01411%7D;port=4321", buffer), "got %s\n", wine_dbgstr_w(buffer)); + HeapFree(GetProcessHeap(), 0, buffer); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, &localhost, sizeof(localhost), DPNA_DATATYPE_STRING); + ok(hr == S_OK, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLW(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen * sizeof(WCHAR)); + + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(L"x-directplay:/provider=%7BEBFE7BA0-628D-11D2-AE0F-006097B01411%7D;port=4321;hostname=localhost", buffer), "got %s\n", wine_dbgstr_w(buffer)); + HeapFree(GetProcessHeap(), 0, buffer); + + IDirectPlay8Address_Release(localaddr); + } +} + +static void address_urlA(void) +{ + HRESULT hr; + IDirectPlay8Address *localaddr = NULL; + static const char urlA1[] = "x-directplay:/provider=%7BEBFE7BA0-628D-11D2-AE0F-006097B01411%7D"; + static const char urlA2[] = "x-directplay:/provider=%7BEBFE7BA0-628D-11D2-AE0F-006097B01411%7D;port=4321"; + static const char urlA3[] = "x-directplay:/provider=%7BEBFE7BA0-628D-11D2-AE0F-006097B01411%7D;port=4321;hostname=localhost"; + static const char localhostA[] = "localhost"; + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&localaddr); + ok(hr == S_OK, "Failed to create IDirectPlay8Address object\n"); + if(SUCCEEDED(hr)) + { + char *buffer = NULL; + DWORD bufflen = 0, bufflen2; + DWORD port = 4321; + + hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, NULL); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); + + bufflen = 10; + hr = IDirectPlay8Address_GetURLA(localaddr, NULL, &bufflen); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLA(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen); + + bufflen2 = bufflen/2; + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen2); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + ok(!strlen(buffer), "wrong length\n"); + + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpA(urlA1, buffer), "got %s\n", buffer); + HeapFree(GetProcessHeap(), 0, buffer); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_PORT, &port, sizeof(DWORD), DPNA_DATATYPE_DWORD); + ok(hr == S_OK, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLA(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen); + + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpA(urlA2, buffer), "got %s\n", buffer); + HeapFree(GetProcessHeap(), 0, buffer); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, &localhostA, sizeof(localhostA), DPNA_DATATYPE_STRING_ANSI); + ok(hr == S_OK, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLA(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen); + + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpA(urlA3, buffer), "got %s\n", buffer); + HeapFree(GetProcessHeap(), 0, buffer); + + IDirectPlay8Address_Release(localaddr); + } +} + static void address_duplicate(void) { HRESULT hr; @@ -381,6 +522,8 @@ START_TEST(address) address_addcomponents(); address_setsp(); address_duplicate(); + address_urlW(); + address_urlA(); CoUninitialize(); } -- 2.30.2

2 1

[PATCH] ntoskrnl.exe: Add NtTraceControl/ZwTraceControl stubs
by Alistair Leslie-Hughes 24 Aug '21

24 Aug '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 7 +++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 ++ 2 files changed, 9 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index fb3f9a23152..2213b1d9f61 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -4348,6 +4348,13 @@ NTSTATUS WINAPI KdEnableDebugger(void) return STATUS_DEBUGGER_INACTIVE; } +NTSTATUS WINAPI NtTraceControl(ULONG code, void *inbuf, ULONG inbuf_len, void *outbuf, ULONG outbuf_len, ULONG *size) +{ + FIXME("code %u, inbuf %p, inbuf_len %u, outbuf %p, outbuf_len %u, size %p\n", code, inbuf, inbuf_len, + outbuf, outbuf_len, size); + return STATUS_SUCCESS; +} + /***************************************************** * DllMain */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index f51833b91a0..071dae6ceca 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -818,6 +818,7 @@ @ stdcall NtSetSecurityObject(long long ptr) @ stdcall NtSetVolumeInformationFile(long ptr ptr long long) @ stdcall NtShutdownSystem(long) +@ stdcall NtTraceControl(long ptr long ptr long long) @ stub NtTraceEvent @ stdcall NtUnlockFile(long ptr ptr ptr ptr) @ stub NtVdmControl @@ -1514,6 +1515,7 @@ @ stdcall -private ZwSetVolumeInformationFile(long ptr ptr long long) NtSetVolumeInformationFile @ stdcall -private ZwTerminateJobObject(long long) NtTerminateJobObject @ stdcall -private ZwTerminateProcess(long long) NtTerminateProcess +@ stdcall -private ZwTraceControl(long ptr long ptr long long) NtTraceControl @ stub ZwTranslateFilePath @ stdcall ZwUnloadDriver(ptr) @ stdcall -private ZwUnloadKey(ptr) NtUnloadKey -- 2.32.0

2 1

[PATCH v3] user32: Don't save maximized position placement for toplevel windows covering the entire work area.
by Gabriel Ivăncescu 24 Aug '21

24 Aug '21

The game "Imperiums: Greek Wars" depends on this to display its window properly. It also fixes the todo_wine in test_window_placement, along with a few new tests that show exactly the threshold at which the "transition" happens. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51672 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/user32/tests/win.c | 54 ++++++++++++++++++++++++++++++++--------- dlls/user32/winpos.c | 47 ++++++++++++++++++++++++++++++++++- 2 files changed, 88 insertions(+), 13 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 228395e..e23ab81 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -11624,8 +11624,9 @@ static void test_IsWindowEnabled(void) static void test_window_placement(void) { - RECT orig = {100, 200, 300, 400}, orig2 = {200, 300, 400, 500}, rect; + RECT orig = {100, 200, 300, 400}, orig2 = {200, 300, 400, 500}, rect, work_rect; WINDOWPLACEMENT wp = {sizeof(wp)}; + MONITORINFO mon_info; HWND hwnd; BOOL ret; @@ -11633,6 +11634,10 @@ static void test_window_placement(void) orig.left, orig.top, orig.right - orig.left, orig.bottom - orig.top, 0, 0, 0, 0); ok(!!hwnd, "failed to create window, error %u\n", GetLastError()); + mon_info.cbSize = sizeof(mon_info); + GetMonitorInfoW(MonitorFromWindow(hwnd, MONITOR_DEFAULTTOPRIMARY), &mon_info); + work_rect = mon_info.rcWork; + ret = GetWindowPlacement(hwnd, &wp); ok(ret, "failed to get window placement, error %u\n", GetLastError()); ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd); @@ -11675,7 +11680,6 @@ static void test_window_placement(void) ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11693,6 +11697,42 @@ todo_wine ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", wine_dbgstr_rect(&wp.rcNormalPosition)); + SetWindowPos(hwnd, 0, work_rect.left, work_rect.top, work_rect.right - work_rect.left, + work_rect.bottom - work_rect.top, SWP_NOZORDER | SWP_NOACTIVATE); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); + ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + + SetWindowPos(hwnd, 0, work_rect.left, work_rect.top, work_rect.right - work_rect.left - 1, + work_rect.bottom - work_rect.top, SWP_NOZORDER | SWP_NOACTIVATE); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); + ok(wp.ptMaxPosition.x == work_rect.left && wp.ptMaxPosition.y == work_rect.top, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + + SetWindowPos(hwnd, 0, work_rect.left, work_rect.top, work_rect.right - work_rect.left, + work_rect.bottom - work_rect.top - 1, SWP_NOZORDER | SWP_NOACTIVATE); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); + ok(wp.ptMaxPosition.x == work_rect.left && wp.ptMaxPosition.y == work_rect.top, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + ShowWindow(hwnd, SW_MINIMIZE); ret = GetWindowPlacement(hwnd, &wp); @@ -11701,7 +11741,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11714,7 +11753,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11727,7 +11765,6 @@ todo_wine ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11745,7 +11782,6 @@ todo_wine ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == 100 && wp.ptMinPosition.y == 100, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig2), "got normal pos %s\n", @@ -11761,7 +11797,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig2), "got normal pos %s\n", @@ -11783,7 +11818,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11804,7 +11838,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == 100 && wp.ptMinPosition.y == 100, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11825,7 +11858,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11839,7 +11871,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11854,7 +11885,6 @@ todo_wine ok(wp.showCmd == SW_NORMAL, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 6e96a4b..b5733d8 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -916,6 +916,47 @@ static POINT get_minimized_pos( HWND hwnd, POINT pt ) return pt; } +static void update_maximized_pos( WND *wnd ) +{ + MONITORINFO mon_info; + HMONITOR monitor; + RECT rc_work; + + /* For top level windows covering the working area, we might + have to "forget" the maximized position. Windows presumably + does this to avoid situations where the border style changes, + which would lead the window to be outside the screen, or the + window gets reloaded on a different screen, and the "saved" + position no longer applies to it (despite being maximized). + + Some applications (e.g. Imperiums: Greek Wars) depend on this. + */ + if (!wnd->parent || wnd->parent == GetDesktopWindow()) + { + if (wnd->dwStyle & WS_MAXIMIZE) + { + if ((monitor = MonitorFromWindow( wnd->obj.handle, MONITOR_DEFAULTTOPRIMARY ))) + { + mon_info.cbSize = sizeof(mon_info); + GetMonitorInfoW( monitor, &mon_info ); + rc_work = mon_info.rcMonitor; + + /* use the work area for windows that maximize without covering it, to match GetMinMaxInfo */ + if ((wnd->dwStyle & WS_CAPTION) == WS_CAPTION || !(wnd->dwStyle & (WS_CHILD | WS_POPUP))) + rc_work = mon_info.rcWork; + } + else + SetRect( &rc_work, 0, 0, GetSystemMetrics( SM_CXSCREEN ), GetSystemMetrics( SM_CYSCREEN ) ); + + if (wnd->window_rect.left <= rc_work.left && wnd->window_rect.top <= rc_work.top && + wnd->window_rect.right >= rc_work.right && wnd->window_rect.bottom >= rc_work.bottom) + wnd->max_pos.x = wnd->max_pos.y = -1; + } + else + wnd->max_pos.x = wnd->max_pos.y = -1; + } +} + /*********************************************************************** * WINPOS_MinMaximize @@ -1337,6 +1378,7 @@ BOOL WINAPI GetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *wndpl ) { pWnd->normal_rect = pWnd->window_rect; } + update_maximized_pos( pWnd ); wndpl->length = sizeof(*wndpl); if( pWnd->dwStyle & WS_MINIMIZE ) @@ -1424,8 +1466,11 @@ static BOOL WINPOS_SetPlacement( HWND hwnd, const WINDOWPLACEMENT *wndpl, UINT f if (!pWnd || pWnd == WND_OTHER_PROCESS || pWnd == WND_DESKTOP) return FALSE; + if (flags & PLACE_MAX) { + pWnd->max_pos = point_thread_to_win_dpi( hwnd, wp.ptMaxPosition ); + update_maximized_pos( pWnd ); + } if (flags & PLACE_MIN) pWnd->min_pos = point_thread_to_win_dpi( hwnd, wp.ptMinPosition ); - if (flags & PLACE_MAX) pWnd->max_pos = point_thread_to_win_dpi( hwnd, wp.ptMaxPosition ); if (flags & PLACE_RECT) pWnd->normal_rect = rect_thread_to_win_dpi( hwnd, wp.rcNormalPosition ); style = pWnd->dwStyle; -- 2.31.1

3 3

[PATCH 3/3] ws2_32: Disallow NULL in socket lookups.
by Akihiro Sagawa 24 Aug '21

24 Aug '21

NULL means an unused slot, not a valid socket. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ws2_32/socket.c | 4 ++++ 1 file changed, 4 insertions(+)

2 1

[PATCH 2/3] ws2_32: Explicitly return WSAENOTSOCK for a file handle in getsockopt() except SO_OPENTYPE.
by Akihiro Sagawa 24 Aug '21

24 Aug '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51671 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ws2_32/socket.c | 7 +++++++ dlls/ws2_32/tests/sock.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-)

3 2

[PATCH 1/3] ws2_32/tests: Add socket option validity tests for a file handle.
by Akihiro Sagawa 24 Aug '21

24 Aug '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)

2 1

[PATCH] oleaut32: Fully initialize VARIANT structure in VariantInit().
by Nikolay Sivov 24 Aug '21

24 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- This follows newer behavior, and fixes application I'm testing that's using stack variable: - initializing it; - setting type to VT_I4; - setting only lower data word to 0, leading to occasional garbage in top word. dlls/oleaut32/tests/vartest.c | 13 +++++++++---- dlls/oleaut32/variant.c | 17 +++-------------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 05efb5a888b..f25a448645c 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -673,11 +673,16 @@ static void _test_bstr_var(unsigned line, const VARIANT *v, const WCHAR *str) static void test_VariantInit(void) { - VARIANT v; + VARIANT v, v2, v3; - memset(&v, -1, sizeof(v)); - VariantInit(&v); - ok(V_VT(&v) == VT_EMPTY, "VariantInit() returned vt %d\n", V_VT(&v)); + memset(&v, -1, sizeof(v)); + memset(&v2, 0, sizeof(v2)); + memset(&v3, -1, sizeof(v3)); + V_VT(&v3) = VT_EMPTY; + + VariantInit(&v); + ok(!memcmp(&v, &v2, sizeof(v)) || + broken(!memcmp(&v, &v3, sizeof(v3)) /* pre Win8 */), "Unexpected contents.\n"); } /* All possible combinations of extra V_VT() flags */ diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 40a1170e247..2c60f920f5e 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -545,24 +545,13 @@ static inline HRESULT VARIANT_ValidateType(VARTYPE vt) /****************************************************************************** * VariantInit [OLEAUT32.8] * - * Initialise a variant. - * - * PARAMS - * pVarg [O] Variant to initialise - * - * RETURNS - * Nothing. - * - * NOTES - * This function simply sets the type of the variant to VT_EMPTY. It does not - * free any existing value, use VariantClear() for that. + * Since Windows 8.1 whole structure is initialized, before that only type field was reset to VT_EMPTY. */ void WINAPI VariantInit(VARIANTARG* pVarg) { - TRACE("(%p)\n", pVarg); + TRACE("(%p)\n", pVarg); - /* Win8.1 zeroes whole struct. Previous implementations don't set any other fields. */ - V_VT(pVarg) = VT_EMPTY; + memset(pVarg, 0, sizeof(*pVarg)); } HRESULT VARIANT_ClearInd(VARIANTARG *pVarg) -- 2.32.0

1 0

[PATCH 6/6] gdi32: Merge enhmetafiledrv.h into emfdc.c.
by Jacek Caban 24 Aug '21

24 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/emfdc.c | 35 ++++++++++++++------ dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 49 ---------------------------- 2 files changed, 25 insertions(+), 59 deletions(-) delete mode 100644 dlls/gdi32/enhmfdrv/enhmetafiledrv.h

2 1

[PATCH 5/6] gdi32: Merge enhmfdrv/bitblt.c into emfdc.c.
by Jacek Caban 24 Aug '21

24 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 1 - dlls/gdi32/emfdc.c | 297 +++++++++++++++++++++++- dlls/gdi32/enhmfdrv/bitblt.c | 326 --------------------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 3 - 4 files changed, 295 insertions(+), 332 deletions(-) delete mode 100644 dlls/gdi32/enhmfdrv/bitblt.c

2 1

[PATCH 4/6] gdi32: Merge enhmfdrv/graphics.c into emfdc.c.
by Jacek Caban 24 Aug '21

24 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 1 - dlls/gdi32/emfdc.c | 699 +++++++++++++++++++++- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/graphics.c | 834 --------------------------- 4 files changed, 698 insertions(+), 837 deletions(-) delete mode 100644 dlls/gdi32/enhmfdrv/graphics.c

2 1

[PATCH 3/6] gdi32: Merge enhmfdrv/objects.c into emfdc.c.
by Jacek Caban 24 Aug '21

24 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 1 - dlls/gdi32/emfdc.c | 433 ++++++++++++++++++++++++++++ dlls/gdi32/enhmfdrv/objects.c | 514 ---------------------------------- 3 files changed, 433 insertions(+), 515 deletions(-) delete mode 100644 dlls/gdi32/enhmfdrv/objects.c

2 1

[PATCH 2/6] gdi32: Merge enhmfdrv/init.c into emfdc.c.
by Jacek Caban 24 Aug '21

24 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 1 - dlls/gdi32/emfdc.c | 291 ++++++++++++++++++++++++++++++++ dlls/gdi32/enhmfdrv/init.c | 333 ------------------------------------- 3 files changed, 291 insertions(+), 334 deletions(-) delete mode 100644 dlls/gdi32/enhmfdrv/init.c

2 1

[PATCH 1/6] gdi32: Move enhmfdrv/dc.c into new emfdc.c file.
by Jacek Caban 24 Aug '21

24 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 2 +- dlls/gdi32/{enhmfdrv/dc.c => emfdc.c} | 19 +++++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) rename dlls/gdi32/{enhmfdrv/dc.c => emfdc.c} (99%)

2 1

[PATCH v3 1/7] winebus.sys: Create the SDL bus thread in main.c.
by Rémi Bernon 24 Aug '21

24 Aug '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: Declare a const unixlib_entry_t __wine_unix_call_funcs[] variable in unixlib.h, instead of const unixlib_entry_t *__wine_unix_call_funcs which was not resolved... dlls/winebus.sys/bus.h | 6 +- dlls/winebus.sys/bus_sdl.c | 150 +++++++++++++++---------------------- dlls/winebus.sys/main.c | 85 ++++++++++++++++++--- 3 files changed, 139 insertions(+), 102 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index 3e53b9c53f1..c5b93b769c9 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -30,10 +30,12 @@ typedef int(*enum_func)(DEVICE_OBJECT *device, void *context); /* Buses */ NTSTATUS udev_driver_init(void) DECLSPEC_HIDDEN; NTSTATUS iohid_driver_init(void) DECLSPEC_HIDDEN; -NTSTATUS sdl_driver_init(void) DECLSPEC_HIDDEN; void udev_driver_unload( void ) DECLSPEC_HIDDEN; void iohid_driver_unload( void ) DECLSPEC_HIDDEN; -void sdl_driver_unload( void ) DECLSPEC_HIDDEN; + +extern NTSTATUS sdl_bus_init(void *) DECLSPEC_HIDDEN; +extern NTSTATUS sdl_bus_wait(void *) DECLSPEC_HIDDEN; +extern NTSTATUS sdl_bus_stop(void *) DECLSPEC_HIDDEN; /* Native device function table */ typedef struct diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 84e3ef20664..02509f1560c 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -63,7 +63,6 @@ static const WCHAR sdl_busidW[] = {'S','D','L','J','O','Y',0}; static DWORD map_controllers = 0; static void *sdl_handle = NULL; -static HANDLE deviceloop_handle; static UINT quit_event = -1; #define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL @@ -889,68 +888,15 @@ static void sdl_load_mappings(void) } } -static DWORD CALLBACK deviceloop_thread(void *args) +NTSTATUS sdl_bus_init(void *args) { - HANDLE init_done = args; - SDL_Event event; - - if (pSDL_Init(SDL_INIT_GAMECONTROLLER|SDL_INIT_HAPTIC) < 0) - { - ERR("Can't init SDL: %s\n", pSDL_GetError()); - return STATUS_UNSUCCESSFUL; - } - - pSDL_JoystickEventState(SDL_ENABLE); - pSDL_GameControllerEventState(SDL_ENABLE); - - /* Process mappings */ - if (pSDL_GameControllerAddMapping != NULL) sdl_load_mappings(); - - SetEvent(init_done); - - while (1) { - while (pSDL_WaitEvent(&event) != 0) { - if (event.type == quit_event) { - TRACE("Device thread exiting\n"); - return 0; - } - process_device_event(&event); - } - } -} - -void sdl_driver_unload( void ) -{ - SDL_Event event; - - TRACE("Unload Driver\n"); - - if (!deviceloop_handle) - return; - - quit_event = pSDL_RegisterEvents(1); - if (quit_event == -1) { - ERR("error registering quit event\n"); - return; - } - - event.type = quit_event; - if (pSDL_PushEvent(&event) != 1) { - ERR("error pushing quit event\n"); - return; - } - - WaitForSingleObject(deviceloop_handle, INFINITE); - CloseHandle(deviceloop_handle); - dlclose(sdl_handle); -} + static const WCHAR controller_modeW[] = {'M','a','p',' ','C','o','n','t','r','o','l','l','e','r','s',0}; + static const UNICODE_STRING controller_mode = {sizeof(controller_modeW) - sizeof(WCHAR), sizeof(controller_modeW), (WCHAR*)controller_modeW}; -static BOOL sdl_initialize(void) -{ if (!(sdl_handle = dlopen(SONAME_LIBSDL2, RTLD_NOW))) { WARN("could not load %s\n", SONAME_LIBSDL2); - return FALSE; + return STATUS_UNSUCCESSFUL; } #define LOAD_FUNCPTR(f) \ if ((p##f = dlsym(sdl_handle, #f)) == NULL) \ @@ -1000,63 +946,85 @@ static BOOL sdl_initialize(void) pSDL_JoystickGetProduct = dlsym(sdl_handle, "SDL_JoystickGetProduct"); pSDL_JoystickGetProductVersion = dlsym(sdl_handle, "SDL_JoystickGetProductVersion"); pSDL_JoystickGetVendor = dlsym(sdl_handle, "SDL_JoystickGetVendor"); - return TRUE; + + if (pSDL_Init(SDL_INIT_GAMECONTROLLER | SDL_INIT_HAPTIC) < 0) + { + ERR("could not init SDL: %s\n", pSDL_GetError()); + goto failed; + } + + if ((quit_event = pSDL_RegisterEvents(1)) == -1) + { + ERR("error registering quit event\n"); + goto failed; + } + + pSDL_JoystickEventState(SDL_ENABLE); + pSDL_GameControllerEventState(SDL_ENABLE); + + map_controllers = check_bus_option(&controller_mode, 1); + + /* Process mappings */ + if (pSDL_GameControllerAddMapping != NULL) sdl_load_mappings(); + + return STATUS_SUCCESS; failed: dlclose(sdl_handle); sdl_handle = NULL; - return FALSE; + return STATUS_UNSUCCESSFUL; } -NTSTATUS sdl_driver_init(void) +NTSTATUS sdl_bus_wait(void *args) { - static const WCHAR controller_modeW[] = {'M','a','p',' ','C','o','n','t','r','o','l','l','e','r','s',0}; - static const UNICODE_STRING controller_mode = {sizeof(controller_modeW) - sizeof(WCHAR), sizeof(controller_modeW), (WCHAR*)controller_modeW}; + SDL_Event event; - HANDLE events[2]; - DWORD result; + do + { + if (pSDL_WaitEvent(&event) != 0) process_device_event(&event); + else WARN("SDL_WaitEvent failed: %s\n", pSDL_GetError()); + } while (event.type != quit_event); - if (!sdl_handle && !sdl_initialize()) return STATUS_UNSUCCESSFUL; + TRACE("SDL main loop exiting\n"); + dlclose(sdl_handle); + sdl_handle = NULL; + return STATUS_SUCCESS; +} - map_controllers = check_bus_option(&controller_mode, 1); +NTSTATUS sdl_bus_stop(void *args) +{ + SDL_Event event; - if (!(events[0] = CreateEventW(NULL, TRUE, FALSE, NULL))) - { - WARN("CreateEvent failed\n"); - return STATUS_UNSUCCESSFUL; - } - if (!(events[1] = CreateThread(NULL, 0, deviceloop_thread, events[0], 0, NULL))) - { - WARN("CreateThread failed\n"); - CloseHandle(events[0]); - return STATUS_UNSUCCESSFUL; - } + if (!sdl_handle) return STATUS_SUCCESS; - result = WaitForMultipleObjects(2, events, FALSE, INFINITE); - CloseHandle(events[0]); - if (result == WAIT_OBJECT_0) + event.type = quit_event; + if (pSDL_PushEvent(&event) != 1) { - TRACE("Initialization successful\n"); - deviceloop_handle = events[1]; - return STATUS_SUCCESS; + ERR("error pushing quit event\n"); + return STATUS_UNSUCCESSFUL; } - CloseHandle(events[1]); - dlclose(sdl_handle); - sdl_handle = NULL; - return STATUS_UNSUCCESSFUL; + return STATUS_SUCCESS; } #else -NTSTATUS sdl_driver_init(void) +NTSTATUS sdl_bus_init(void *args) { + WARN("SDL support not compiled in!\n"); return STATUS_NOT_IMPLEMENTED; } -void sdl_driver_unload( void ) +NTSTATUS sdl_bus_wait(void *args) { - TRACE("Stub: Unload Driver\n"); + WARN("SDL support not compiled in!\n"); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS sdl_bus_stop(void *args) +{ + WARN("SDL support not compiled in!\n"); + return STATUS_NOT_IMPLEMENTED; } #endif /* SONAME_LIBSDL2 */ diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index e372ec6db3f..6be5e677bba 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -618,6 +618,74 @@ static void keyboard_device_create(void) IoInvalidateDeviceRelations(bus_pdo, BusRelations); } +static DWORD bus_count; +static HANDLE bus_thread[16]; + +struct bus_main_params +{ + const WCHAR *name; + + HANDLE init_done; + NTSTATUS (*init_func)(void *args); + + NTSTATUS (*wait_func)(void *args); +}; + +static DWORD CALLBACK bus_main_thread(void *args) +{ + struct bus_main_params bus = *(struct bus_main_params *)args; + NTSTATUS status; + + TRACE("%s main loop starting\n", debugstr_w(bus.name)); + status = bus.init_func(NULL); + SetEvent(bus.init_done); + TRACE("%s main loop started\n", debugstr_w(bus.name)); + + if (status) WARN("%s bus init returned status %#x\n", debugstr_w(bus.name), status); + else status = bus.wait_func(NULL); + + if (status) WARN("%s bus wait returned status %#x\n", debugstr_w(bus.name), status); + else TRACE("%s main loop exited\n", debugstr_w(bus.name)); + return status; +} + +static NTSTATUS bus_main_thread_start(struct bus_main_params *bus) +{ + DWORD i = bus_count++; + + if (!(bus->init_done = CreateEventW(NULL, FALSE, FALSE, NULL))) + { + ERR("failed to create %s bus init done event.\n", debugstr_w(bus->name)); + bus_count--; + return STATUS_UNSUCCESSFUL; + } + + if (!(bus_thread[i] = CreateThread(NULL, 0, bus_main_thread, bus, 0, NULL))) + { + ERR("failed to create %s bus thread.\n", debugstr_w(bus->name)); + CloseHandle(bus->init_done); + bus_count--; + return STATUS_UNSUCCESSFUL; + } + + WaitForSingleObject(bus->init_done, INFINITE); + CloseHandle(bus->init_done); + return STATUS_SUCCESS; +} + +static NTSTATUS sdl_driver_init(void) +{ + static const WCHAR bus_name[] = {'S','D','L',0}; + struct bus_main_params bus = + { + .name = bus_name, + .init_func = sdl_bus_init, + .wait_func = sdl_bus_wait, + }; + + return bus_main_thread_start(&bus); +} + static NTSTATUS fdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) { static const WCHAR SDL_enabledW[] = {'E','n','a','b','l','e',' ','S','D','L',0}; @@ -634,16 +702,12 @@ static NTSTATUS fdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) mouse_device_create(); keyboard_device_create(); - if (check_bus_option(&SDL_enabled, 1)) + if (!check_bus_option(&SDL_enabled, 1) || sdl_driver_init()) { - if (sdl_driver_init() == STATUS_SUCCESS) - { - irp->IoStatus.Status = STATUS_SUCCESS; - break; - } + udev_driver_init(); + iohid_driver_init(); } - udev_driver_init(); - iohid_driver_init(); + irp->IoStatus.Status = STATUS_SUCCESS; break; case IRP_MN_SURPRISE_REMOVAL: @@ -652,7 +716,10 @@ static NTSTATUS fdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) case IRP_MN_REMOVE_DEVICE: udev_driver_unload(); iohid_driver_unload(); - sdl_driver_unload(); + sdl_bus_stop(NULL); + + WaitForMultipleObjects(bus_count, bus_thread, TRUE, INFINITE); + while (bus_count--) CloseHandle(bus_thread[bus_count]); irp->IoStatus.Status = STATUS_SUCCESS; IoSkipCurrentIrpStackLocation(irp); -- 2.33.0

1 7

[PATCH v5] conhost: Use font face length as number of characters, not size
by Hugh McMaster 24 Aug '21

24 Aug '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- Changes in v5: * Add whitespace around arguments. * Only null-terminate when copying to LOGFONT FaceName. * Remove brackets around a multiplication operation. programs/conhost/conhost.c | 13 +++++++++---- programs/conhost/window.c | 31 +++++++++++++++---------------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 9bfc5f84242..05447d52dd5 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -97,9 +97,14 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int screen_buffer->popup_attr = console->active->attr; screen_buffer->font = console->active->font; - if (!(screen_buffer->font.face_name = malloc( screen_buffer->font.face_len ))) return NULL; - memcpy( screen_buffer->font.face_name, console->active->font.face_name, - screen_buffer->font.face_len ); + if (screen_buffer->font.face_len) + { + screen_buffer->font.face_name = malloc( screen_buffer->font.face_len * sizeof(WCHAR) ); + if (!screen_buffer->font.face_name) return NULL; + + memcpy( screen_buffer->font.face_name, console->active->font.face_name, + screen_buffer->font.face_len * sizeof(WCHAR) ); + } } else { @@ -1728,7 +1733,7 @@ static NTSTATUS get_output_info( struct screen_buffer *screen_buffer, size_t *ou { struct condrv_output_info *info; - *out_size = min( *out_size, sizeof(*info) + screen_buffer->font.face_len ); + *out_size = min( *out_size, sizeof(*info) + screen_buffer->font.face_len * sizeof(WCHAR) ); if (!(info = alloc_ioctl_buffer( *out_size ))) return STATUS_NO_MEMORY; info->cursor_size = screen_buffer->cursor_size; diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 3ce36fe2c3d..8df949645c0 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -242,7 +242,6 @@ static void load_config( const WCHAR *key_name, struct console_config *config ) TRACE("loading %s registry settings.\n", wine_dbgstr_w( key_name )); memcpy( config->color_map, color_map, sizeof(color_map) ); - memset( config->face_name, 0, sizeof(config->face_name) ); config->cursor_size = 25; config->cursor_visible = 1; config->font_pitch_family = FIXED_PITCH | FF_DONTCARE; @@ -683,9 +682,9 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) if (console->window->font && logfont->lfHeight == console->active->font.height && logfont->lfWeight == console->active->font.weight && !logfont->lfItalic && !logfont->lfUnderline && !logfont->lfStrikeOut && - console->active->font.face_len == wcslen( logfont->lfFaceName ) * sizeof(WCHAR) && + console->active->font.face_len == wcslen( logfont->lfFaceName ) && !memcmp( logfont->lfFaceName, console->active->font.face_name, - console->active->font.face_len )) + console->active->font.face_len * sizeof(WCHAR) )) { TRACE( "equal to current\n" ); return TRUE; @@ -708,9 +707,9 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) font_info->weight = tm.tmWeight; free( font_info->face_name ); - font_info->face_len = wcslen( logfont->lfFaceName ) * sizeof(WCHAR); - font_info->face_name = malloc( font_info->face_len ); - memcpy( font_info->face_name, logfont->lfFaceName, font_info->face_len ); + font_info->face_len = wcslen( logfont->lfFaceName ); + font_info->face_name = malloc( font_info->face_len * sizeof(WCHAR) ); + memcpy( font_info->face_name, logfont->lfFaceName, font_info->face_len * sizeof(WCHAR) ); /* FIXME: use maximum width for DBCS codepages since some chars take two cells */ if (GetCPInfo( console->output_cp, &cpinfo ) && cpinfo.MaxCharSize > 1) @@ -819,9 +818,10 @@ static int WINAPI get_first_font_sub_enum( const LOGFONTW *lf, const TEXTMETRICW load_config( fc->console->window->config_key, &config ); config.cell_width = fc->console->active->font.width; config.cell_height = fc->console->active->font.height; - fc->console->active->font.face_len = wcslen( config.face_name ) * sizeof(WCHAR); - memcpy( fc->console->active->font.face_name, config.face_name, - fc->console->active->font.face_len ); + memcpy( config.face_name, fc->console->active->font.face_name, + fc->console->active->font.face_len * sizeof(WCHAR) ); + config.face_name[fc->console->active->font.face_len] = 0; + /* Force also its writing back to the registry so that we can get it * the next time. */ @@ -1895,8 +1895,9 @@ static void apply_config( struct console *console, const struct console_config * console->active->font.height != config->cell_height || console->active->font.weight != config->font_weight || console->active->font.pitch_family != config->font_pitch_family || - console->active->font.face_len != wcslen( config->face_name ) * sizeof(WCHAR) || - memcmp( console->active->font.face_name, config->face_name, console->active->font.face_len )) + console->active->font.face_len != wcslen( config->face_name ) || + memcmp( console->active->font.face_name, config->face_name, + console->active->font.face_len * sizeof(WCHAR) )) { update_console_font( console, config->face_name, config->cell_height, config->font_weight ); } @@ -1908,8 +1909,6 @@ static void apply_config( struct console *console, const struct console_config * static void current_config( struct console *console, struct console_config *config ) { - size_t len; - config->menu_mask = console->window->menu_mask; config->quick_edit = console->window->quick_edit; @@ -1930,9 +1929,9 @@ static void current_config( struct console *console, struct console_config *conf config->cell_height = console->active->font.height; config->font_weight = console->active->font.weight; config->font_pitch_family = console->active->font.pitch_family; - len = min( ARRAY_SIZE(config->face_name) - 1, console->active->font.face_len / sizeof(WCHAR) ); - if (len) memcpy( config->face_name, console->active->font.face_name, len * sizeof(WCHAR) ); - config->face_name[len] = 0; + memcpy( config->face_name, console->active->font.face_name, + console->active->font.face_len * sizeof(WCHAR) ); + config->face_name[console->active->font.face_len] = 0; config->sb_width = console->active->width; config->sb_height = console->active->height; -- 2.33.0

1 0

[PATCH 00/14] More codeview records and PDB structures supported in winedump
by Eric Pouech 24 Aug '21

24 Aug '21

The following serie adds definitions and dumping facility for a couple of more codeview records. It also adds more internal PDB details to winedump. --- Eric Pouech (14): tools/winedump: correctly support flags in public records (V1 and V2) tools/winedump: added support for dumping S_LOCAL symbol record tools/winedump: added support for S_DEFRANGE* family of CodeView records tools/winedump: print symbol id when dumping symbols tools/winedump: now dumping CodeView records about site information tools/winedump: added support for CALLERS/CALLEES/INLINEES codeview records tools/winedump: added support for buildinfo codeview record tools/winedump: added support for dumping trampoline codeview records tools/winedump: now dumping heap_alloc_site CodeView records tools/winedump: added support for dumping filestatic Codeview records tools/winedump: added support for dumping stream of fixed index 4 tools/winedump: now dumping information about type's hash stream tools/winedump: now dumping CodeView types records found in IPI stream (#4) tools/winedump: correct and update a couple of info in PDB symbol stream header dlls/dbghelp/msc.c | 10 +- include/wine/mscvpdb.h | 270 +++++++++++++++++++++++++++- tools/winedump/msc.c | 390 +++++++++++++++++++++++++++++++++++------ tools/winedump/pdb.c | 100 +++++++++-- 4 files changed, 689 insertions(+), 81 deletions(-)

1 14

[PATCH] dpnet: Fix an ASCII / ANSI mixup in a warning message.
by Francois Gouget 24 Aug '21

24 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dpnet/address.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 6aa62a97785..b616d221b38 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -500,7 +500,7 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * case DPNA_DATATYPE_STRING_ANSI: if ((strlen((const CHAR*)lpvData)+1) != dwDataSize) { - WARN("Invalid ASCII size, returning DPNERR_INVALIDPARAM\n"); + WARN("Invalid ANSI size, returning DPNERR_INVALIDPARAM\n"); return DPNERR_INVALIDPARAM; } break; -- 2.20.1

1 0

[PATCH] imm32: Fix an ASCII / ANSI mixup in a comment.
by Francois Gouget 24 Aug '21

24 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/imm32/imm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 9d2a09f22be..20633041871 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1755,7 +1755,7 @@ UINT WINAPI ImmGetDescriptionA( /* fetch the unicode buffer */ len = ImmGetDescriptionW( hKL, buf, len + 1 ); - /* convert it back to ASCII */ + /* convert it back to ANSI */ len = WideCharToMultiByte( CP_ACP, 0, buf, len + 1, lpszDescription, uBufLen, NULL, NULL ); -- 2.20.1

1 0

[PATCH] iphlpapi: Fix an ASCII / ANSI mixup in a comment.
by Francois Gouget 24 Aug '21

24 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/iphlpapi/tests/iphlpapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index d1881616d30..223d6d270cb 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -28,7 +28,7 @@ * * The Name field of the IP_ADAPTER_INDEX_MAP entries returned by * GetInterfaceInfo is declared as a wide string, but the bytes are actually - * an ASCII string on some versions of the IP helper API under Win9x. This was + * an ANSI string on some versions of the IP helper API under Win9x. This was * apparently an MS bug, it's corrected in later versions. * * The DomainName field of FIXED_INFO isn't NULL-terminated on Win98. -- 2.20.1

1 0

[PATCH] kernelbase: Fix an ASCII / ANSI mixup in a comment.
by Francois Gouget 24 Aug '21

24 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/kernelbase/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index a8f0643e8bf..5f777e0f752 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -1651,7 +1651,7 @@ LSTATUS WINAPI DECLSPEC_HOTPATCH RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWO if (status && status != STATUS_BUFFER_OVERFLOW) goto done; /* we need to fetch the contents for a string type even if not requested, - * because we need to compute the length of the ASCII string. */ + * because we need to compute the length of the ANSI string. */ if (data || is_string(info->Type)) { /* retry with a dynamically allocated buffer */ @@ -2106,7 +2106,7 @@ LSTATUS WINAPI RegEnumValueA( HKEY hkey, DWORD index, LPSTR value, LPDWORD val_c buffer, total_size, &total_size ); /* we need to fetch the contents for a string type even if not requested, - * because we need to compute the length of the ASCII string. */ + * because we need to compute the length of the ANSI string. */ /* retry with a dynamically allocated buffer */ while (status == STATUS_BUFFER_OVERFLOW) -- 2.20.1

1 0

[PATCH] kernel32/tests: Remove the macros from the GetTimeFormatEx() tests.
by Francois Gouget 24 Aug '21

24 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Similar to the STRINGSA() removal but for STRINGSW() this time. --- dlls/kernel32/tests/locale.c | 247 +++++++++++++++++------------------ 1 file changed, 123 insertions(+), 124 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 88cc1c11d95..6e17030ff9d 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -194,6 +194,29 @@ static void expect_err_(int line, int ret, const char *str, DWORD err, const cha #define EXPECT_LENW ok(ret == lstrlenW(Expected)+1, "Expected Len %d, got %d\n", lstrlenW(Expected)+1, ret) #define EXPECT_EQW ok(wcsncmp(buffer, Expected, lstrlenW(Expected)) == 0, "Bad conversion\n") +#define expect_wstr(r,s,e) expect_wstr_(__LINE__, r, s, e) +static void expect_wstr_(int line, int ret, const WCHAR *str, const WCHAR *expected) +{ + if (ret) + { + ok_(__FILE__, line)(GetLastError() == 0xdeadbeef, "unexpected gle %u\n", GetLastError()); + ok_(__FILE__, line)(ret == wcslen(expected) + 1, "Expected ret %d, got %d\n", wcslen(expected) + 1, ret); + if (str) + ok_(__FILE__, line)(wcscmp(str, expected) == 0, "Expected %s, got %s\n", wine_dbgstr_w(expected), wine_dbgstr_w(str)); + } + else + ok_(__FILE__, line)(0, "expected success, got error %d\n", GetLastError()); +} + +#define expect_werr(r,s,e) expect_werr_(__LINE__, r, s, e, #e) +static void expect_werr_(int line, int ret, const WCHAR *str, DWORD err, const char* err_name) +{ + ok_(__FILE__, line)(!ret && GetLastError() == err, + "Expected %s, got %d and ret=%d\n", err_name, GetLastError(), ret); + if (str) + ok_(__FILE__, line)(wcscmp(str, L"pristine") == 0, "Expected a pristine buffer, got %s\n", wine_dbgstr_w(str)); +} + #define NUO LOCALE_NOUSEROVERRIDE static void test_GetLocaleInfoA(void) @@ -625,7 +648,7 @@ static void test_GetTimeFormatEx(void) { int ret; SYSTEMTIME curtime; - WCHAR buffer[BUFFER_SIZE], input[BUFFER_SIZE], Expected[BUFFER_SIZE]; + WCHAR buffer[BUFFER_SIZE]; if (!pGetTimeFormatEx) { @@ -633,114 +656,102 @@ static void test_GetTimeFormatEx(void) return; } + SetLastError(0xdeadbeef); + + /* Invalid time */ memset(&curtime, 2, sizeof(SYSTEMTIME)); - STRINGSW("tt HH':'mm'@'ss", ""); /* Invalid time */ + wcscpy(buffer, L"pristine"); + ret = pGetTimeFormatEx(localeW, TIME_FORCE24HOURFORMAT, &curtime, L"tt HH':'mm'@'ss", buffer, ARRAY_SIZE(buffer)); + expect_werr(ret, buffer, ERROR_INVALID_PARAMETER); SetLastError(0xdeadbeef); - ret = pGetTimeFormatEx(localeW, TIME_FORCE24HOURFORMAT, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + /* Valid time */ curtime.wHour = 8; curtime.wMinute = 56; curtime.wSecond = 13; curtime.wMilliseconds = 22; - STRINGSW("tt HH':'mm'@'ss", "AM 08:56@13"); /* Valid time */ - SetLastError(0xdeadbeef); - ret = pGetTimeFormatEx(localeW, TIME_FORCE24HOURFORMAT, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; EXPECT_EQW; + ret = pGetTimeFormatEx(localeW, TIME_FORCE24HOURFORMAT, &curtime, L"tt HH':'mm'@'ss", buffer, ARRAY_SIZE(buffer)); + expect_wstr(ret, buffer, L"AM 08:56@13"); /* MSDN: LOCALE_NOUSEROVERRIDE can't be specified with a format string */ + wcscpy(buffer, L"pristine"); + ret = pGetTimeFormatEx(localeW, NUO|TIME_FORCE24HOURFORMAT, &curtime, L"HH", buffer, ARRAY_SIZE(buffer)); + expect_werr(ret, buffer, ERROR_INVALID_FLAGS); SetLastError(0xdeadbeef); - ret = pGetTimeFormatEx(localeW, NUO|TIME_FORCE24HOURFORMAT, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, - "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); - STRINGSW("tt HH':'mm'@'ss", "A"); /* Insufficient buffer */ + /* Insufficient buffer */ + ret = pGetTimeFormatEx(localeW, TIME_FORCE24HOURFORMAT, &curtime, L" tt", buffer, 2); + /* there is no guarantee on the buffer content, see GetTimeFormatA() */ + expect_werr(ret, NULL, ERROR_INSUFFICIENT_BUFFER); SetLastError(0xdeadbeef); - ret = pGetTimeFormatEx(localeW, TIME_FORCE24HOURFORMAT, &curtime, input, buffer, 2); - ok( !ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); - STRINGSW("tt HH':'mm'@'ss", "AM 08:56@13"); /* Calculate length only */ - ret = pGetTimeFormatEx(localeW, TIME_FORCE24HOURFORMAT, &curtime, input, NULL, 0); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; + /* Calculate length only */ + ret = pGetTimeFormatEx(localeW, TIME_FORCE24HOURFORMAT, &curtime, L"tt HH':'mm'@'ss", NULL, 0); + expect_wstr(ret, NULL, L"AM 08:56@13"); - STRINGSW("", "8 AM"); /* TIME_NOMINUTESORSECONDS, default format */ + /* TIME_NOMINUTESORSECONDS, default format */ ret = pGetTimeFormatEx(localeW, NUO|TIME_NOMINUTESORSECONDS, &curtime, NULL, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; EXPECT_EQW; + expect_wstr(ret, buffer, L"8 AM"); - STRINGSW("m1s2m3s4", ""); /* TIME_NOMINUTESORSECONDS/complex format */ - ret = pGetTimeFormatEx(localeW, TIME_NOMINUTESORSECONDS, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret == lstrlenW(buffer)+1, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; EXPECT_EQW; + /* TIME_NOMINUTESORSECONDS/complex format */ + wcscpy(buffer, L"pristine"); + ret = pGetTimeFormatEx(localeW, TIME_NOMINUTESORSECONDS, &curtime, L"m1s2m3s4", buffer, ARRAY_SIZE(buffer)); + expect_wstr(ret, buffer, L""); - STRINGSW("", "8:56 AM"); /* TIME_NOSECONDS/Default format */ + /* TIME_NOSECONDS/Default format */ ret = pGetTimeFormatEx(localeW, NUO|TIME_NOSECONDS, &curtime, NULL, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; EXPECT_EQW; + expect_wstr(ret, buffer, L"8:56 AM"); - STRINGSW("h:m:s tt", "8:56 AM"); /* TIME_NOSECONDS */ - ret = pGetTimeFormatEx(localeW, TIME_NOSECONDS, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; EXPECT_EQW; + /* TIME_NOSECONDS */ + wcscpy(buffer, L"pristine"); /* clear previous identical result */ + ret = pGetTimeFormatEx(localeW, TIME_NOSECONDS, &curtime, L"h:m:s tt", buffer, ARRAY_SIZE(buffer)); + expect_wstr(ret, buffer, L"8:56 AM"); - STRINGSW("h.@:m.@:s.@:tt", "8.@:56AM"); /* Multiple delimiters */ - ret = pGetTimeFormatEx(localeW, TIME_NOSECONDS, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; EXPECT_EQW; + /* Multiple delimiters */ + ret = pGetTimeFormatEx(localeW, TIME_NOSECONDS, &curtime, L"h.@:m.@:s.@:tt", buffer, ARRAY_SIZE(buffer)); + expect_wstr(ret, buffer, L"8.@:56AM"); - STRINGSW("s1s2s3", ""); /* Duplicate tokens */ - ret = pGetTimeFormatEx(localeW, TIME_NOSECONDS, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret == lstrlenW(buffer)+1, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; EXPECT_EQW; + /* Duplicate tokens */ + wcscpy(buffer, L"pristine"); + ret = pGetTimeFormatEx(localeW, TIME_NOSECONDS, &curtime, L"s1s2s3", buffer, ARRAY_SIZE(buffer)); + expect_wstr(ret, buffer, L""); - STRINGSW("t/tt", "A/AM"); /* AM time marker */ - ret = pGetTimeFormatEx(localeW, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; EXPECT_EQW; + /* AM time marker */ + ret = pGetTimeFormatEx(localeW, 0, &curtime, L"t/tt", buffer, ARRAY_SIZE(buffer)); + expect_wstr(ret, buffer, L"A/AM"); + /* PM time marker */ curtime.wHour = 13; - STRINGSW("t/tt", "P/PM"); /* PM time marker */ - ret = pGetTimeFormatEx(localeW, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; EXPECT_EQW; + ret = pGetTimeFormatEx(localeW, 0, &curtime, L"t/tt", buffer, ARRAY_SIZE(buffer)); + expect_wstr(ret, buffer, L"P/PM"); - STRINGSW("h1t2tt3m", "156"); /* TIME_NOTIMEMARKER: removes text around time marker token */ - ret = pGetTimeFormatEx(localeW, TIME_NOTIMEMARKER, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; EXPECT_EQW; + /* TIME_NOTIMEMARKER: removes text around time marker token */ + ret = pGetTimeFormatEx(localeW, TIME_NOTIMEMARKER, &curtime, L"h1t2tt3m", buffer, ARRAY_SIZE(buffer)); + expect_wstr(ret, buffer, L"156"); - STRINGSW("h:m:s tt", "13:56:13 PM"); /* TIME_FORCE24HOURFORMAT */ - ret = pGetTimeFormatEx(localeW, TIME_FORCE24HOURFORMAT, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; EXPECT_EQW; + /* TIME_FORCE24HOURFORMAT */ + ret = pGetTimeFormatEx(localeW, TIME_FORCE24HOURFORMAT, &curtime, L"h:m:s tt", buffer, ARRAY_SIZE(buffer)); + expect_wstr(ret, buffer, L"13:56:13 PM"); - STRINGSW("h:m:s", "13:56:13"); /* TIME_FORCE24HOURFORMAT doesn't add time marker */ - ret = pGetTimeFormatEx(localeW, TIME_FORCE24HOURFORMAT, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; EXPECT_EQW; + /* TIME_FORCE24HOURFORMAT doesn't add time marker */ + ret = pGetTimeFormatEx(localeW, TIME_FORCE24HOURFORMAT, &curtime, L"h:m:s", buffer, ARRAY_SIZE(buffer)); + expect_wstr(ret, buffer, L"13:56:13"); + /* 24 hrs, leading 0 */ curtime.wHour = 14; /* change this to 14 or 2pm */ curtime.wMinute = 5; curtime.wSecond = 3; - STRINGSW("h hh H HH m mm s ss t tt", "2 02 14 14 5 05 3 03 P PM"); /* 24 hrs, leading 0 */ - ret = pGetTimeFormatEx(localeW, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; EXPECT_EQW; + ret = pGetTimeFormatEx(localeW, 0, &curtime, L"h hh H HH m mm s ss t tt", buffer, ARRAY_SIZE(buffer)); + expect_wstr(ret, buffer, L"2 02 14 14 5 05 3 03 P PM"); + /* "hh" and "HH" */ curtime.wHour = 0; - STRINGSW("h/H/hh/HH", "12/0/12/00"); /* "hh" and "HH" */ - ret = pGetTimeFormatEx(localeW, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; EXPECT_EQW; + ret = pGetTimeFormatEx(localeW, 0, &curtime, L"h/H/hh/HH", buffer, ARRAY_SIZE(buffer)); + expect_wstr(ret, buffer, L"12/0/12/00"); - STRINGSW("h:m:s tt", "12:5:3 AM"); /* non-zero flags should fail with format, doesn't */ - ret = pGetTimeFormatEx(localeW, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; EXPECT_EQW; + /* non-zero flags should fail with format, doesn't */ + ret = pGetTimeFormatEx(localeW, 0, &curtime, L"h:m:s tt", buffer, ARRAY_SIZE(buffer)); + expect_wstr(ret, buffer, L"12:5:3 AM"); /* try to convert formatting strings with more than two letters * "h:hh:hhh:H:HH:HHH:m:mm:mmm:M:MM:MMM:s:ss:sss:S:SS:SSS" @@ -752,69 +763,57 @@ static void test_GetTimeFormatEx(void) curtime.wMinute = 56; curtime.wSecond = 13; curtime.wMilliseconds = 22; - STRINGSW("h:hh:hhh H:HH:HHH m:mm:mmm M:MM:MMM s:ss:sss S:SS:SSS", - "8:08:08 8:08:08 56:56:56 M:MM:MMM 13:13:13 S:SS:SSS"); - ret = pGetTimeFormatEx(localeW, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; EXPECT_EQW; + ret = pGetTimeFormatEx(localeW, 0, &curtime, L"h:hh:hhh H:HH:HHH m:mm:mmm M:MM:MMM s:ss:sss S:SS:SSS", buffer, ARRAY_SIZE(buffer)); + expect_wstr(ret, buffer, L"8:08:08 8:08:08 56:56:56 M:MM:MMM 13:13:13 S:SS:SSS"); - STRINGSW("h", "text"); /* Don't write to buffer if len is 0 */ - lstrcpyW(buffer, Expected); - ret = pGetTimeFormatEx(localeW, 0, &curtime, input, buffer, 0); - ok(ret == 2, "Expected ret == 2, got %d, error %d\n", ret, GetLastError()); - EXPECT_EQW; + /* Don't write to buffer if len is 0 */ + wcscpy(buffer, L"pristine"); + ret = pGetTimeFormatEx(localeW, 0, &curtime, L"h:mm", buffer, 0); + expect_wstr(ret, NULL, L"8:56"); + ok(wcscmp(buffer, L"pristine") == 0, "Expected a pristine buffer, got %s\n", wine_dbgstr_w(buffer)); - STRINGSW("h 'h' H 'H' HH 'HH' m 'm' s 's' t 't' tt 'tt'", - "8 h 8 H 08 HH 56 m 13 s A t AM tt"); /* "'" preserves tokens */ - ret = pGetTimeFormatEx(localeW, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; EXPECT_EQW; + /* "'" preserves tokens */ + ret = pGetTimeFormatEx(localeW, 0, &curtime, L"h 'h' H 'H' HH 'HH' m 'm' s 's' t 't' tt 'tt'", buffer, ARRAY_SIZE(buffer)); + expect_wstr(ret, buffer, L"8 h 8 H 08 HH 56 m 13 s A t AM tt"); - STRINGSW("'''", "'"); /* invalid quoted string */ - ret = pGetTimeFormatEx(localeW, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; EXPECT_EQW; + /* invalid quoted string */ + ret = pGetTimeFormatEx(localeW, 0, &curtime, L"'''", buffer, ARRAY_SIZE(buffer)); + expect_wstr(ret, buffer, L"'"); - /* test that msdn suggested single quotation usage works as expected */ - STRINGSW("''''", "'"); /* single quote mark */ - ret = pGetTimeFormatEx(localeW, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; EXPECT_EQW; + /* check that MSDN's suggested single quotation usage works as expected */ + wcscpy(buffer, L"pristine"); /* clear previous identical result */ + ret = pGetTimeFormatEx(localeW, 0, &curtime, L"''''", buffer, ARRAY_SIZE(buffer)); + expect_wstr(ret, buffer, L"'"); - STRINGSW("''HHHHHH", "08"); /* Normal use */ - ret = pGetTimeFormatEx(localeW, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; EXPECT_EQW; + /* Normal use */ + ret = pGetTimeFormatEx(localeW, 0, &curtime, L"''HHHHHH", buffer, ARRAY_SIZE(buffer)); + expect_wstr(ret, buffer, L"08"); /* and test for normal use of the single quotation mark */ - STRINGSW("'''HHHHHH'", "'HHHHHH"); /* Normal use */ - ret = pGetTimeFormatEx(localeW, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; EXPECT_EQW; + ret = pGetTimeFormatEx(localeW, 0, &curtime, L"'''HHHHHH'", buffer, ARRAY_SIZE(buffer)); + expect_wstr(ret, buffer, L"'HHHHHH"); - STRINGSW("'''HHHHHH", "'HHHHHH"); /* Odd use */ - ret = pGetTimeFormatEx(localeW, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; EXPECT_EQW; + /* Odd use */ + wcscpy(buffer, L"pristine"); /* clear previous identical result */ + ret = pGetTimeFormatEx(localeW, 0, &curtime, L"'''HHHHHH", buffer, ARRAY_SIZE(buffer)); + expect_wstr(ret, buffer, L"'HHHHHH"); - STRINGSW("'123'tt", ""); /* TIME_NOTIMEMARKER drops literals too */ - ret = pGetTimeFormatEx(localeW, TIME_NOTIMEMARKER, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; EXPECT_EQW; + /* TIME_NOTIMEMARKER drops literals too */ + ret = pGetTimeFormatEx(localeW, TIME_NOTIMEMARKER, &curtime, L"'123'tt", buffer, ARRAY_SIZE(buffer)); + expect_wstr(ret, buffer, L""); + /* Invalid time */ curtime.wHour = 25; - STRINGSW("'123'tt", ""); /* Invalid time */ + wcscpy(buffer, L"pristine"); + ret = pGetTimeFormatEx(localeW, 0, &curtime, L"'123'tt", buffer, ARRAY_SIZE(buffer)); + expect_werr(ret, buffer, ERROR_INVALID_PARAMETER); SetLastError(0xdeadbeef); - ret = pGetTimeFormatEx(localeW, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + /* Invalid date */ curtime.wHour = 12; - curtime.wMonth = 60; /* Invalid */ - STRINGSW("h:m:s", "12:56:13"); /* Invalid date */ - ret = pGetTimeFormatEx(localeW, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENW; EXPECT_EQW; + curtime.wMonth = 60; + ret = pGetTimeFormatEx(localeW, 0, &curtime, L"h:m:s", buffer, ARRAY_SIZE(buffer)); + expect_wstr(ret, buffer, L"12:56:13"); } static void test_GetDateFormatA(void) -- 2.20.1

1 0

[PATCH] kernel32/tests: Remove the macros from the GetDateFormatA() tests.
by Francois Gouget 24 Aug '21

24 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/kernel32/tests/locale.c | 132 ++++++++++++++--------------------- 1 file changed, 53 insertions(+), 79 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index ca8ac4d8f0e..f6d1adcfbd2 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -817,62 +817,57 @@ static void test_GetDateFormatA(void) SYSTEMTIME curtime; LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); LCID lcid_ru = MAKELCID(MAKELANGID(LANG_RUSSIAN, SUBLANG_NEUTRAL), SORT_DEFAULT); - char buffer[BUFFER_SIZE], input[BUFFER_SIZE], Expected[BUFFER_SIZE]; + char buffer[BUFFER_SIZE], Expected[BUFFER_SIZE]; char short_day[10], month[10], genitive_month[10]; - memset(&curtime, 2, sizeof(SYSTEMTIME)); /* Invalid time */ - STRINGSA("ddd',' MMM dd yy",""); SetLastError(0xdeadbeef); - ret = GetDateFormatA(lcid, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + /* Invalid time */ + memset(&curtime, 2, sizeof(SYSTEMTIME)); + strcpy(buffer, "pristine"); + ret = GetDateFormatA(lcid, 0, &curtime, "ddd',' MMM dd yy", buffer, ARRAY_SIZE(buffer)); + expect_err(ret, buffer, ERROR_INVALID_PARAMETER); + SetLastError(0xdeadbeef); + + /* Simple case */ curtime.wYear = 2002; curtime.wMonth = 5; curtime.wDay = 4; curtime.wDayOfWeek = 3; - STRINGSA("ddd',' MMM dd yy","Sat, May 04 02"); /* Simple case */ - ret = GetDateFormatA(lcid, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + ret = GetDateFormatA(lcid, 0, &curtime, "ddd',' MMM dd yy", buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "Sat, May 04 02"); /* Same as above but with LOCALE_NOUSEROVERRIDE */ - STRINGSA("ddd',' MMM dd yy",""); /* Simple case */ + strcpy(buffer, "pristine"); + ret = GetDateFormatA(lcid, NUO, &curtime, "ddd',' MMM dd yy", buffer, ARRAY_SIZE(buffer)); + expect_err(ret, buffer, ERROR_INVALID_FLAGS); SetLastError(0xdeadbeef); - ret = GetDateFormatA(lcid, NUO, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, - "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); - EXPECT_EQA; - STRINGSA("ddd',' MMM dd yy","Sat, May 04 02"); /* Format containing "'" */ - ret = GetDateFormatA(lcid, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + /* Format containing "'" */ + ret = GetDateFormatA(lcid, 0, &curtime, "ddd',' MMM dd yy", buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "Sat, May 04 02"); - curtime.wHour = 36; /* Invalid */ - STRINGSA("ddd',' MMM dd ''''yy","Sat, May 04 '02"); /* Invalid time */ - ret = GetDateFormatA(lcid, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + /* Invalid time */ + curtime.wHour = 36; + ret = GetDateFormatA(lcid, 0, &curtime, "ddd',' MMM dd ''''yy", buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "Sat, May 04 '02"); - STRINGSA("ddd',' MMM dd ''''yy",""); /* Get size only */ - ret = GetDateFormatA(lcid, 0, &curtime, input, NULL, 0); - ok(ret == 16, "Expected ret == 16, got %d, error %d\n", ret, GetLastError()); - EXPECT_EQA; + /* Get size only */ + ret = GetDateFormatA(lcid, 0, &curtime, "ddd',' MMM dd ''''yy", NULL, 0); + expect_str(ret, NULL, "Sat, May 04 '02"); - STRINGSA("ddd',' MMM dd ''''yy",""); /* Buffer too small */ + /* Buffer too small */ + strcpy(buffer, "pristine"); + ret = GetDateFormatA(lcid, 0, &curtime, "ddd", buffer, 2); + /* there is no guarantee on the buffer content, see GetTimeFormatA() */ + expect_err(ret, NULL, ERROR_INSUFFICIENT_BUFFER); SetLastError(0xdeadbeef); - ret = GetDateFormatA(lcid, 0, &curtime, input, buffer, 2); - ok( !ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); - STRINGSA("ddd',' MMM dd ''''yy","5/4/2002"); /* Default to DATE_SHORTDATE */ + /* Default to DATE_SHORTDATE */ ret = GetDateFormatA(lcid, NUO, &curtime, NULL, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - if (strncmp(buffer, Expected, strlen(Expected)) && strncmp(buffer, "5/4/02", strlen(Expected)) != 0) - ok (0, "Expected '%s' or '5/4/02', got '%s'\n", Expected, buffer); + expect_str(ret, buffer, "5/4/2002"); - SetLastError(0xdeadbeef); buffer[0] = '\0'; /* DATE_LONGDATE */ + /* DATE_LONGDATE */ ret = GetDateFormatA(lcid, NUO|DATE_LONGDATE, &curtime, NULL, buffer, ARRAY_SIZE(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); ok(strcmp(buffer, "Saturday, May 04, 2002") == 0 || @@ -881,21 +876,16 @@ static void test_GetDateFormatA(void) /* test for expected DATE_YEARMONTH behavior with null format */ /* NT4 returns ERROR_INVALID_FLAGS for DATE_YEARMONTH */ - STRINGSA("ddd',' MMM dd ''''yy", ""); /* DATE_YEARMONTH */ + strcpy(buffer, "pristine"); + ret = GetDateFormatA(lcid, NUO|DATE_YEARMONTH, &curtime, "ddd',' MMM dd ''''yy", buffer, ARRAY_SIZE(buffer)); + expect_err(ret, buffer, ERROR_INVALID_FLAGS); SetLastError(0xdeadbeef); - ret = GetDateFormatA(lcid, NUO|DATE_YEARMONTH, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, - "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); - EXPECT_EQA; /* Test that using invalid DATE_* flags results in the correct error */ /* and return values */ - STRINGSA("m/d/y", ""); /* Invalid flags */ + ret = GetDateFormatA(lcid, DATE_YEARMONTH|DATE_SHORTDATE|DATE_LONGDATE, &curtime, "m/d/y", buffer, ARRAY_SIZE(buffer)); + expect_err(ret, NULL, ERROR_INVALID_FLAGS); SetLastError(0xdeadbeef); - ret = GetDateFormatA(lcid, DATE_YEARMONTH|DATE_SHORTDATE|DATE_LONGDATE, &curtime, input, - buffer, ARRAY_SIZE(buffer)); - ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, - "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); ret = GetDateFormatA(lcid_ru, 0, &curtime, "ddMMMM", buffer, ARRAY_SIZE(buffer)); if (!ret) @@ -915,54 +905,38 @@ static void test_GetDateFormatA(void) ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); strcpy(short_day, buffer); - STRINGSA("dd MMMMddd dd", ""); + ret = GetDateFormatA(lcid_ru, 0, &curtime, "dd MMMMddd dd", buffer, ARRAY_SIZE(buffer)); sprintf(Expected, "04 %s%s 04", genitive_month, short_day); - ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_EQA; + expect_str(ret, buffer, Expected); - STRINGSA("MMMMddd dd", ""); + ret = GetDateFormatA(lcid_ru, 0, &curtime, "MMMMddd dd", buffer, ARRAY_SIZE(buffer)); sprintf(Expected, "%s%s 04", month, short_day); - ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_EQA; + expect_str(ret, buffer, Expected); - STRINGSA("MMMMddd", ""); + ret = GetDateFormatA(lcid_ru, 0, &curtime, "MMMMddd", buffer, ARRAY_SIZE(buffer)); sprintf(Expected, "%s%s", month, short_day); - ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_EQA; + expect_str(ret, buffer, Expected); - STRINGSA("MMMMdd", ""); + ret = GetDateFormatA(lcid_ru, 0, &curtime, "MMMMdd", buffer, ARRAY_SIZE(buffer)); sprintf(Expected, "%s04", genitive_month); - ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_EQA; + expect_str(ret, buffer, Expected); - STRINGSA("MMMMdd ddd", ""); + ret = GetDateFormatA(lcid_ru, 0, &curtime, "MMMMdd ddd", buffer, ARRAY_SIZE(buffer)); sprintf(Expected, "%s04 %s", genitive_month, short_day); - ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_EQA; + expect_str(ret, buffer, Expected); - STRINGSA("dd dddMMMM", ""); + ret = GetDateFormatA(lcid_ru, 0, &curtime, "dd dddMMMM", buffer, ARRAY_SIZE(buffer)); sprintf(Expected, "04 %s%s", short_day, month); - ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_EQA; + expect_str(ret, buffer, Expected); - STRINGSA("dd dddMMMM ddd MMMMdd", ""); + ret = GetDateFormatA(lcid_ru, 0, &curtime, "dd dddMMMM ddd MMMMdd", buffer, ARRAY_SIZE(buffer)); sprintf(Expected, "04 %s%s %s %s04", short_day, month, short_day, genitive_month); - ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_EQA; + expect_str(ret, buffer, Expected); /* with literal part */ - STRINGSA("ddd',' MMMM dd", ""); + ret = GetDateFormatA(lcid_ru, 0, &curtime, "ddd',' MMMM dd", buffer, ARRAY_SIZE(buffer)); sprintf(Expected, "%s, %s 04", short_day, genitive_month); - ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_EQA; + expect_str(ret, buffer, Expected); } static void test_GetDateFormatEx(void) -- 2.20.1

1 0

[PATCH] kernel32/tests: Remove the macros from the GetCurrencyFormatA() tests.
by Francois Gouget 24 Aug '21

24 Aug '21

Also simplify testing all the NegativeOrder values. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/kernel32/tests/locale.c | 305 +++++++++++++---------------------- 1 file changed, 110 insertions(+), 195 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index e6514f0b11f..ca8ac4d8f0e 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1144,92 +1144,104 @@ static void test_GetCurrencyFormatA(void) static char szDot[] = { '.', '\0' }; static char szComma[] = { ',', '\0' }; static char szDollar[] = { '$', '\0' }; - int ret; + static const char* const negative_order[] = + {"($1.0)", /* 0 */ + "-$1.0", + "$-1.0", + "$1.0-", + "(1.0$)", + "-1.0$", /* 5 */ + "1.0-$", + "1.0$-", + "-1.0 $", + "-$ 1.0", + "1.0 $-", /* 10 */ + "$ 1.0-", + "$ -1.0", + "1.0- $", + "($ 1.0)", + "(1.0 $)", /* 15 */ + }; + int ret, o; LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); - char buffer[BUFFER_SIZE], Expected[BUFFER_SIZE], input[BUFFER_SIZE]; + char buffer[BUFFER_SIZE]; CURRENCYFMTA format; - memset(&format, 0, sizeof(format)); - - STRINGSA("23",""); /* NULL output, length > 0 --> Error */ SetLastError(0xdeadbeef); - ret = GetCurrencyFormatA(lcid, 0, input, NULL, NULL, ARRAY_SIZE(buffer)); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - STRINGSA("23,53",""); /* Invalid character --> Error */ + /* NULL output, length > 0 --> Error */ + ret = GetCurrencyFormatA(lcid, 0, "23", NULL, NULL, ARRAY_SIZE(buffer)); + expect_err(ret, NULL, ERROR_INVALID_PARAMETER); SetLastError(0xdeadbeef); - ret = GetCurrencyFormatA(lcid, 0, input, NULL, buffer, ARRAY_SIZE(buffer)); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - STRINGSA("--",""); /* Double '-' --> Error */ + /* Invalid character --> Error */ + strcpy(buffer, "pristine"); + ret = GetCurrencyFormatA(lcid, 0, "23,53", NULL, buffer, ARRAY_SIZE(buffer)); + expect_err(ret, buffer, ERROR_INVALID_PARAMETER); SetLastError(0xdeadbeef); - ret = GetCurrencyFormatA(lcid, 0, input, NULL, buffer, ARRAY_SIZE(buffer)); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - STRINGSA("0-",""); /* Trailing '-' --> Error */ + /* Double '-' --> Error */ + strcpy(buffer, "pristine"); + ret = GetCurrencyFormatA(lcid, 0, "--", NULL, buffer, ARRAY_SIZE(buffer)); + expect_err(ret, buffer, ERROR_INVALID_PARAMETER); SetLastError(0xdeadbeef); - ret = GetCurrencyFormatA(lcid, 0, input, NULL, buffer, ARRAY_SIZE(buffer)); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - STRINGSA("0..",""); /* Double '.' --> Error */ + /* Trailing '-' --> Error */ + strcpy(buffer, "pristine"); + ret = GetCurrencyFormatA(lcid, 0, "0-", NULL, buffer, ARRAY_SIZE(buffer)); + expect_err(ret, buffer, ERROR_INVALID_PARAMETER); SetLastError(0xdeadbeef); - ret = GetCurrencyFormatA(lcid, 0, input, NULL, buffer, ARRAY_SIZE(buffer)); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - STRINGSA(" 0.1",""); /* Leading space --> Error */ + /* Double '.' --> Error */ + strcpy(buffer, "pristine"); + ret = GetCurrencyFormatA(lcid, 0, "0..", NULL, buffer, ARRAY_SIZE(buffer)); + expect_err(ret, buffer, ERROR_INVALID_PARAMETER); SetLastError(0xdeadbeef); - ret = GetCurrencyFormatA(lcid, 0, input, NULL, buffer, ARRAY_SIZE(buffer)); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - STRINGSA("1234","$"); /* Length too small --> Write up to length chars */ + /* Leading space --> Error */ + ret = GetCurrencyFormatA(lcid, 0, " 0.1", NULL, buffer, ARRAY_SIZE(buffer)); + expect_err(ret, buffer, ERROR_INVALID_PARAMETER); SetLastError(0xdeadbeef); - ret = GetCurrencyFormatA(lcid, NUO, input, NULL, buffer, 2); - ok( !ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); - STRINGSA("2353",""); /* Format and flags given --> Error */ + /* Length too small --> Write up to length chars */ + strcpy(buffer, "pristine"); + ret = GetCurrencyFormatA(lcid, NUO, "1234", NULL, buffer, 2); + /* there is no guarantee on the buffer content, see GetTimeFormatA() */ + expect_err(ret, NULL, ERROR_INSUFFICIENT_BUFFER); SetLastError(0xdeadbeef); - ret = GetCurrencyFormatA(lcid, NUO, input, &format, buffer, ARRAY_SIZE(buffer)); - ok( !ret, "Expected ret == 0, got %d\n", ret); - ok( GetLastError() == ERROR_INVALID_FLAGS, - "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); - STRINGSA("2353",""); /* Invalid format --> Error */ - SetLastError(0xdeadbeef); - ret = GetCurrencyFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + /* Valid number */ + ret = GetCurrencyFormatA(lcid, NUO, "2353", NULL, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "$2,353.00"); - STRINGSA("2353","$2,353.00"); /* Valid number */ - ret = GetCurrencyFormatA(lcid, NUO, input, NULL, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + /* Valid negative number */ + ret = GetCurrencyFormatA(lcid, NUO, "-2353", NULL, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "($2,353.00)"); - STRINGSA("-2353","($2,353.00)"); /* Valid negative number */ - ret = GetCurrencyFormatA(lcid, NUO, input, NULL, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + /* Valid real number */ + ret = GetCurrencyFormatA(lcid, NUO, "2353.1", NULL, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "$2,353.10"); - STRINGSA("2353.1","$2,353.10"); /* Valid real number */ - ret = GetCurrencyFormatA(lcid, NUO, input, NULL, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + /* Too many DP --> Truncated */ + ret = GetCurrencyFormatA(lcid, NUO, "2353.111", NULL, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "$2,353.11"); - STRINGSA("2353.111","$2,353.11"); /* Too many DP --> Truncated */ - ret = GetCurrencyFormatA(lcid, NUO, input, NULL, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + /* Too many DP --> Rounded */ + ret = GetCurrencyFormatA(lcid, NUO, "2353.119", NULL, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "$2,353.12"); - STRINGSA("2353.119","$2,353.12"); /* Too many DP --> Rounded */ - ret = GetCurrencyFormatA(lcid, NUO, input, NULL, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + /* Format and flags given --> Error */ + memset(&format, 0, sizeof(format)); + strcpy(buffer, "pristine"); + ret = GetCurrencyFormatA(lcid, NUO, "2353", &format, buffer, ARRAY_SIZE(buffer)); + expect_err(ret, buffer, ERROR_INVALID_FLAGS); + SetLastError(0xdeadbeef); + + /* Invalid format --> Error */ + strcpy(buffer, "pristine"); + ret = GetCurrencyFormatA(lcid, 0, "2353", &format, buffer, ARRAY_SIZE(buffer)); + expect_err(ret, buffer, ERROR_INVALID_PARAMETER); + SetLastError(0xdeadbeef); format.NumDigits = 0; /* No decimal separator */ format.LeadingZero = 0; @@ -1240,154 +1252,57 @@ static void test_GetCurrencyFormatA(void) format.lpThousandSep = szComma; format.lpCurrencySymbol = szDollar; - STRINGSA("2353","$2353"); /* No decimal or grouping chars expected */ - ret = GetCurrencyFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + /* No decimal or grouping chars expected */ + ret = GetCurrencyFormatA(lcid, 0, "2353", &format, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "$2353"); - format.NumDigits = 1; /* 1 DP --> Expect decimal separator */ - STRINGSA("2353","$2353.0"); - ret = GetCurrencyFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + /* 1 DP --> Expect decimal separator */ + format.NumDigits = 1; + ret = GetCurrencyFormatA(lcid, 0, "2353", &format, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "$2353.0"); - format.Grouping = 2; /* Group by 100's */ - STRINGSA("2353","$23,53.0"); - ret = GetCurrencyFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + /* Group by 100's */ + format.Grouping = 2; + ret = GetCurrencyFormatA(lcid, 0, "2353", &format, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "$23,53.0"); - STRINGSA("235","$235.0"); /* Grouping of a positive number */ + /* Grouping of a positive number */ format.Grouping = 3; - ret = GetCurrencyFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + ret = GetCurrencyFormatA(lcid, 0, "235", &format, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "$235.0"); - STRINGSA("-235","$-235.0"); /* Grouping of a negative number */ + /* Grouping of a negative number */ format.NegativeOrder = 2; - ret = GetCurrencyFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + ret = GetCurrencyFormatA(lcid, 0, "-235", &format, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "$-235.0"); - format.LeadingZero = 1; /* Always provide leading zero */ - STRINGSA(".5","$0.5"); - ret = GetCurrencyFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + /* Always provide leading zero */ + format.LeadingZero = 1; + ret = GetCurrencyFormatA(lcid, 0, ".5", &format, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "$0.5"); format.PositiveOrder = CY_POS_RIGHT; - STRINGSA("1","1.0$"); - ret = GetCurrencyFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + ret = GetCurrencyFormatA(lcid, 0, "1", &format, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "1.0$"); format.PositiveOrder = CY_POS_LEFT_SPACE; - STRINGSA("1","$ 1.0"); - ret = GetCurrencyFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + ret = GetCurrencyFormatA(lcid, 0, "1", &format, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "$ 1.0"); format.PositiveOrder = CY_POS_RIGHT_SPACE; - STRINGSA("1","1.0 $"); - ret = GetCurrencyFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; - - format.NegativeOrder = 0; - STRINGSA("-1","($1.0)"); - ret = GetCurrencyFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; - - format.NegativeOrder = 1; - STRINGSA("-1","-$1.0"); - ret = GetCurrencyFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + ret = GetCurrencyFormatA(lcid, 0, "1", &format, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "1.0 $"); - format.NegativeOrder = 2; - STRINGSA("-1","$-1.0"); - ret = GetCurrencyFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; - format.NegativeOrder = 3; - STRINGSA("-1","$1.0-"); - ret = GetCurrencyFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; - - format.NegativeOrder = 4; - STRINGSA("-1","(1.0$)"); - ret = GetCurrencyFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; - - format.NegativeOrder = 5; - STRINGSA("-1","-1.0$"); - ret = GetCurrencyFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; - - format.NegativeOrder = 6; - STRINGSA("-1","1.0-$"); - ret = GetCurrencyFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; - - format.NegativeOrder = 7; - STRINGSA("-1","1.0$-"); - ret = GetCurrencyFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; - - format.NegativeOrder = 8; - STRINGSA("-1","-1.0 $"); - ret = GetCurrencyFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; - - format.NegativeOrder = 9; - STRINGSA("-1","-$ 1.0"); - ret = GetCurrencyFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; - - format.NegativeOrder = 10; - STRINGSA("-1","1.0 $-"); - ret = GetCurrencyFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; - - format.NegativeOrder = 11; - STRINGSA("-1","$ 1.0-"); - ret = GetCurrencyFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; - - format.NegativeOrder = 12; - STRINGSA("-1","$ -1.0"); - ret = GetCurrencyFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; - - format.NegativeOrder = 13; - STRINGSA("-1","1.0- $"); - ret = GetCurrencyFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; - - format.NegativeOrder = 14; - STRINGSA("-1","($ 1.0)"); - ret = GetCurrencyFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; - - format.NegativeOrder = 15; - STRINGSA("-1","(1.0 $)"); - ret = GetCurrencyFormatA(lcid, 0, input, &format, buffer, ARRAY_SIZE(buffer)); - ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + for (o = 0; o <= 15; o++) + { + winetest_push_context("%d", o); + format.NegativeOrder = o; + strcpy(buffer, "pristine"); + ret = GetCurrencyFormatA(lcid, 0, "-1", &format, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, negative_order[o]); + winetest_pop_context(); + } } #define NEG_PARENS 0 /* "(1.1)" */ -- 2.20.1

1 0

[PATCH v4 resend] dpnet: Implement IDirectPlay8Server EnumServiceProviders
by Alistair Leslie-Hughes 24 Aug '21

24 Aug '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dpnet/server.c | 14 ++++++- dlls/dpnet/tests/server.c | 86 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/server.c b/dlls/dpnet/server.c index 977771697ac..26dd76388b1 100644 --- a/dlls/dpnet/server.c +++ b/dlls/dpnet/server.c @@ -126,9 +126,19 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_EnumServiceProviders(IDirectPlay8Se PDWORD pcReturned, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%s %s %p %p %p %d)\n", This, debugstr_guid(pguidServiceProvider), debugstr_guid(pguidApplication), + TRACE("(%p)->(%s %s %p %p %p %d)\n", This, debugstr_guid(pguidServiceProvider), debugstr_guid(pguidApplication), pSPInfoBuffer, pcbEnumData, pcReturned, dwFlags); - return E_NOTIMPL; + + if(!This->msghandler) + return DPNERR_UNINITIALIZED; + + if(dwFlags) + FIXME("Unhandled flags %x\n", dwFlags); + + if(pguidApplication) + FIXME("Application guid %s is currently being ignored\n", debugstr_guid(pguidApplication)); + + return enum_services_providers(pguidServiceProvider, pSPInfoBuffer, pcbEnumData, pcReturned); } static HRESULT WINAPI IDirectPlay8ServerImpl_CancelAsyncOperation(IDirectPlay8Server *iface, DPNHANDLE hAsyncHandle, DWORD dwFlags) diff --git a/dlls/dpnet/tests/server.c b/dlls/dpnet/tests/server.c index 74a0e5adfcf..4314c69ccc1 100644 --- a/dlls/dpnet/tests/server.c +++ b/dlls/dpnet/tests/server.c @@ -184,6 +184,91 @@ static void test_server_info(void) } } +static void test_enum_service_providers(void) +{ + DPN_SERVICE_PROVIDER_INFO *serv_prov_info = NULL; + IDirectPlay8Server *server = NULL; + DWORD items, size; + DWORD i; + HRESULT hr; + + hr = CoCreateInstance( &CLSID_DirectPlay8Server, NULL, CLSCTX_ALL, &IID_IDirectPlay8Server, (LPVOID*)&server); + ok(hr == S_OK, "Failed to create IDirectPlay8Server object\n"); + if (FAILED(hr)) + return; + + size = 0; + items = 0; + hr = IDirectPlay8Server_EnumServiceProviders(server, NULL, NULL, serv_prov_info, &size, &items, 0); + ok(hr == DPNERR_UNINITIALIZED, "got %x\n", hr); + + hr = IDirectPlay8Server_Initialize(server, NULL, DirectPlayMessageHandler, 0); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (FAILED(hr)) + { + IDirectPlay8Server_Release(server); + return; + } + + size = 0; + items = 0; + + hr = IDirectPlay8Server_EnumServiceProviders(server, NULL, NULL, NULL, &size, NULL, 0); + ok(hr == E_POINTER, "IDirectPlay8Server_EnumServiceProviders failed with %x\n", hr); + + hr = IDirectPlay8Server_EnumServiceProviders(server, NULL, NULL, NULL, NULL, &items, 0); + ok(hr == E_POINTER, "IDirectPlay8Server_EnumServiceProviders failed with %x\n", hr); + + hr = IDirectPlay8Server_EnumServiceProviders(server, NULL, NULL, NULL, &size, &items, 0); + ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Server_EnumServiceProviders failed with %x\n", hr); + ok(size != 0, "size is unexpectedly 0\n"); + + serv_prov_info = HeapAlloc(GetProcessHeap(), 0, size); + + hr = IDirectPlay8Server_EnumServiceProviders(server, NULL, NULL, serv_prov_info, &size, &items, 0); + ok(hr == S_OK, "IDirectPlay8Server_EnumServiceProviders failed with %x\n", hr); + ok(items != 0, "Found unexpectedly no service providers\n"); + + trace("number of items found: %d\n", items); + + for (i=0;i<items;i++) + { + trace("Found Service Provider: %s\n", wine_dbgstr_w(serv_prov_info[i].pwszName)); + trace("Found guid: %s\n", wine_dbgstr_guid(&serv_prov_info[i].guid)); + } + + ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); + + size = 0; + items = 0; + + hr = IDirectPlay8Server_EnumServiceProviders(server, &CLSID_DP8SP_TCPIP, NULL, NULL, &size, &items, 0); + ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Server_EnumServiceProviders failed with %x\n", hr); + ok(size != 0, "size is unexpectedly 0\n"); + + serv_prov_info = HeapAlloc(GetProcessHeap(), 0, size); + + hr = IDirectPlay8Server_EnumServiceProviders(server, &CLSID_DP8SP_TCPIP, NULL, serv_prov_info, &size, &items, 0); + ok(hr == S_OK, "IDirectPlay8Server_EnumServiceProviders failed with %x\n", hr); + ok(items != 0, "Found unexpectedly no adapter\n"); + + + for (i=0;i<items;i++) + { + trace("Found adapter: %s\n", wine_dbgstr_w(serv_prov_info[i].pwszName)); + trace("Found adapter guid: %s\n", wine_dbgstr_guid(&serv_prov_info[i].guid)); + } + + /* Invalid GUID */ + items = 88; + hr = IDirectPlay8Server_EnumServiceProviders(server, &appguid, NULL, serv_prov_info, &size, &items, 0); + ok(hr == DPNERR_DOESNOTEXIST, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); + ok(items == 88, "Found adapter %d\n", items); + + HeapFree(GetProcessHeap(), 0, serv_prov_info); + IDirectPlay8Server_Release(server); +} + BOOL is_process_elevated(void) { HANDLE token; @@ -398,6 +483,7 @@ START_TEST(server) create_server(); test_server_info(); + test_enum_service_providers(); CoUninitialize(); -- 2.30.2

1 0

[PATCH 4/4] uxtheme: Support more HiDPI properties.
by Zhiyi Zhang 24 Aug '21

24 Aug '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/draw.c | 46 +++++++++++++++++++++++++++++++++-------- dlls/uxtheme/stylemap.c | 6 ++++++ include/tmschema.h | 6 ++++++ include/vssym32.h | 6 ++++++ 4 files changed, 55 insertions(+), 9 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 5b90f6b1fdc..521f9eb32a9 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -144,6 +144,24 @@ HRESULT WINAPI DrawThemeBackground(HTHEME hTheme, HDC hdc, int iPartId, return DrawThemeBackgroundEx(hTheme, hdc, iPartId, iStateId, pRect, &opts); } +/* Map integer 1..7 to TMT_MINDPI1..TMT_MINDPI7 */ +static int mindpi_index_to_property(int index) +{ + return index <= 5 ? TMT_MINDPI1 + index - 1 : TMT_MINDPI6 + index - 6; +} + +/* Map integer 1..7 to TMT_MINSIZE1..TMT_MINSIZE7 */ +static int minsize_index_to_property(int index) +{ + return index <= 5 ? TMT_MINSIZE1 + index - 1 : TMT_MINSIZE6 + index - 6; +} + +/* Map integer 1..7 to TMT_IMAGEFILE1..TMT_IMAGEFILE7 */ +static int imagefile_index_to_property(int index) +{ + return index <= 5 ? TMT_IMAGEFILE1 + index - 1 : TMT_IMAGEFILE6 + index - 6; +} + /*********************************************************************** * UXTHEME_SelectImage * @@ -171,16 +189,20 @@ static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, HDC hdc, int iPartId, if(imageselecttype == IST_DPI) { int reqdpi = 0; int screendpi = GetDeviceCaps(hdc, LOGPIXELSX); - for(i=4; i>=0; i--) { + for (i = 7; i >= 1; i--) + { reqdpi = 0; - if(SUCCEEDED(GetThemeInt(hTheme, iPartId, iStateId, i + TMT_MINDPI1, &reqdpi))) { + if (SUCCEEDED(GetThemeInt(hTheme, iPartId, iStateId, mindpi_index_to_property(i), + &reqdpi))) + { if(reqdpi != 0 && screendpi >= reqdpi) { - TRACE("Using %d DPI, image %d\n", reqdpi, i + TMT_IMAGEFILE1); + TRACE("Using %d DPI, image %d\n", reqdpi, imagefile_index_to_property(i)); if (imageDpi) *imageDpi = reqdpi; - return MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, i + TMT_IMAGEFILE1); + return MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, + imagefile_index_to_property(i)); } } } @@ -190,11 +212,16 @@ static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, HDC hdc, int iPartId, else if(imageselecttype == IST_SIZE) { POINT size = {pRect->right-pRect->left, pRect->bottom-pRect->top}; POINT reqsize; - for(i=4; i>=0; i--) { - PTHEME_PROPERTY fileProp = - MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, i + TMT_IMAGEFILE1); + for (i = 7; i >= 1; i--) + { + PTHEME_PROPERTY fileProp; + + fileProp = MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, + imagefile_index_to_property(i)); if (!fileProp) continue; - if(FAILED(GetThemePosition(hTheme, iPartId, iStateId, i + TMT_MINSIZE1, &reqsize))) { + if (FAILED(GetThemePosition(hTheme, iPartId, iStateId, minsize_index_to_property(i), + &reqsize))) + { /* fall back to size of Nth image */ WCHAR szPath[MAX_PATH]; int imagelayout = IL_HORIZONTAL; @@ -221,7 +248,8 @@ static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, HDC hdc, int iPartId, } } if(reqsize.x <= size.x && reqsize.y <= size.y) { - TRACE("Using image size %dx%d, image %d\n", reqsize.x, reqsize.y, i + TMT_IMAGEFILE1); + TRACE("Using image size %dx%d, image %d\n", reqsize.x, reqsize.y, + imagefile_index_to_property(i)); return fileProp; } } diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 463c236df30..4fe254c1e7a 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -187,6 +187,8 @@ static const MSSTYLES_PROPERTY_MAP mapProperty[] = { {TMT_INT, TMT_MINDPI3, L"MINDPI3"}, {TMT_INT, TMT_MINDPI4, L"MINDPI4"}, {TMT_INT, TMT_MINDPI5, L"MINDPI5"}, + {TMT_INT, TMT_MINDPI6, L"MINDPI6"}, + {TMT_INT, TMT_MINDPI7, L"MINDPI7"}, {TMT_FONT, TMT_GLYPHFONT, L"GLYPHFONT"}, {TMT_FILENAME, TMT_IMAGEFILE, L"IMAGEFILE"}, {TMT_FILENAME, TMT_IMAGEFILE1, L"IMAGEFILE1"}, @@ -194,6 +196,8 @@ static const MSSTYLES_PROPERTY_MAP mapProperty[] = { {TMT_FILENAME, TMT_IMAGEFILE3, L"IMAGEFILE3"}, {TMT_FILENAME, TMT_IMAGEFILE4, L"IMAGEFILE4"}, {TMT_FILENAME, TMT_IMAGEFILE5, L"IMAGEFILE5"}, + {TMT_FILENAME, TMT_IMAGEFILE6, L"IMAGEFILE6"}, + {TMT_FILENAME, TMT_IMAGEFILE7, L"IMAGEFILE7"}, {TMT_FILENAME, TMT_STOCKIMAGEFILE, L"STOCKIMAGEFILE"}, {TMT_FILENAME, TMT_GLYPHIMAGEFILE, L"GLYPHIMAGEFILE"}, {TMT_STRING, TMT_TEXT, L"TEXT"}, @@ -206,6 +210,8 @@ static const MSSTYLES_PROPERTY_MAP mapProperty[] = { {TMT_POSITION, TMT_MINSIZE4, L"MINSIZE4"}, {TMT_POSITION, TMT_MINSIZE5, L"MINSIZE5"}, {TMT_POSITION, TMT_NORMALSIZE, L"NORMALSIZE"}, + {TMT_POSITION, TMT_MINSIZE6, L"MINSIZE6"}, + {TMT_POSITION, TMT_MINSIZE7, L"MINSIZE7"}, {TMT_MARGINS, TMT_SIZINGMARGINS, L"SIZINGMARGINS"}, {TMT_MARGINS, TMT_CONTENTMARGINS, L"CONTENTMARGINS"}, {TMT_MARGINS, TMT_CAPTIONMARGINS, L"CAPTIONMARGINS"}, diff --git a/include/tmschema.h b/include/tmschema.h index 2d2eccce11e..47eb146ebdc 100644 --- a/include/tmschema.h +++ b/include/tmschema.h @@ -322,6 +322,8 @@ BEGIN_TM_PROPS() TM_PROP(2422, TMT, MINDPI3, INT) TM_PROP(2423, TMT, MINDPI4, INT) TM_PROP(2424, TMT, MINDPI5, INT) + TM_PROP(2433, TMT, MINDPI6, INT) + TM_PROP(2434, TMT, MINDPI7, INT) /* Font rendering properties */ TM_PROP(2601, TMT, GLYPHFONT, FONT) @@ -335,6 +337,8 @@ BEGIN_TM_PROPS() TM_PROP(3006, TMT, IMAGEFILE5, FILENAME) TM_PROP(3007, TMT, STOCKIMAGEFILE, FILENAME) TM_PROP(3008, TMT, GLYPHIMAGEFILE, FILENAME) + TM_PROP(3009, TMT, IMAGEFILE6, FILENAME) + TM_PROP(3010, TMT, IMAGEFILE7, FILENAME) /* String rendering properties */ TM_PROP(3201, TMT, TEXT, STRING) @@ -349,6 +353,8 @@ BEGIN_TM_PROPS() TM_PROP(3407, TMT, MINSIZE4, POSITION) TM_PROP(3408, TMT, MINSIZE5, POSITION) TM_PROP(3409, TMT, NORMALSIZE, POSITION) + TM_PROP(3410, TMT, MINSIZE6, POSITION) + TM_PROP(3411, TMT, MINSIZE7, POSITION) /* Margin rendering properties */ TM_PROP(3601, TMT, SIZINGMARGINS, MARGINS) diff --git a/include/vssym32.h b/include/vssym32.h index 4e7c2f791d8..8685fb7f7f0 100644 --- a/include/vssym32.h +++ b/include/vssym32.h @@ -301,6 +301,8 @@ enum GLYPHFONTSIZINGTYPE { #define TMT_OPACITY 2430 #define TMT_COLORIZATIONCOLOR 2431 #define TMT_COLORIZATIONOPACITY 2432 +#define TMT_MINDPI6 2433 +#define TMT_MINDPI7 2434 #define TMT_GLYPHFONT 2601 #define TMT_IMAGEFILE 3001 #define TMT_IMAGEFILE1 3002 @@ -309,6 +311,8 @@ enum GLYPHFONTSIZINGTYPE { #define TMT_IMAGEFILE4 3005 #define TMT_IMAGEFILE5 3006 #define TMT_GLYPHIMAGEFILE 3008 +#define TMT_IMAGEFILE6 3009 +#define TMT_IMAGEFILE7 3010 #define TMT_TEXT 3201 #define TMT_CLASSICVALUE 3202 #define TMT_OFFSET 3401 @@ -320,6 +324,8 @@ enum GLYPHFONTSIZINGTYPE { #define TMT_MINSIZE4 3407 #define TMT_MINSIZE5 3408 #define TMT_NORMALSIZE 3409 +#define TMT_MINSIZE6 3410 +#define TMT_MINSIZE7 3411 #define TMT_SIZINGMARGINS 3601 #define TMT_CONTENTMARGINS 3602 #define TMT_CAPTIONMARGINS 3603 -- 2.30.2

1 0

[PATCH 3/4] uxtheme: Support TrueSizeStretchMark property.
by Zhiyi Zhang 24 Aug '21

24 Aug '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/draw.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 866200f7fa8..5b90f6b1fdc 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -579,7 +579,7 @@ static HRESULT get_image_part_size (HTHEME hTheme, HDC hdc, int iPartId, { case TS_DRAW: { - int sizingType = ST_STRETCH, scalingType = TSST_NONE; + int sizingType = ST_STRETCH, scalingType = TSST_NONE, stretchMark = 0; POINT srcSize; srcSize.x = rcSrc.right - rcSrc.left; @@ -589,10 +589,13 @@ static HRESULT get_image_part_size (HTHEME hTheme, HDC hdc, int iPartId, if (sizingType == ST_TRUESIZE) { GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_TRUESIZESCALINGTYPE, &scalingType); + GetThemeInt(hTheme, iPartId, iStateId, TMT_TRUESIZESTRETCHMARK, &stretchMark); if (scalingType == TSST_DPI) { + /* Scale to DPI only if the destination DPI exceeds the source DPI by + * stretchMark percent */ dstDpi = GetDeviceCaps(hdc, LOGPIXELSY); - if (dstDpi && dstDpi != imageDpi) + if (dstDpi && dstDpi != imageDpi && MulDiv(100, dstDpi, imageDpi) >= stretchMark + 100) { srcSize.x = MulDiv(srcSize.x, dstDpi, imageDpi); srcSize.y = MulDiv(srcSize.y, dstDpi, imageDpi); @@ -620,19 +623,11 @@ static HRESULT get_image_part_size (HTHEME hTheme, HDC hdc, int iPartId, if (sizingType == ST_TRUESIZE) { - int truesizestretchmark = 100; - - /* Whatever TrueSizeStretchMark does - it does not seem to - * be what's outlined below. It appears as if native - * uxtheme always stretches if dest is smaller than source - * (ie as if TrueSizeStretchMark==100 with the code below) */ -#if 0 - /* Only stretch when target exceeds source by truesizestretchmark percent */ - GetThemeInt(hTheme, iPartId, iStateId, TMT_TRUESIZESTRETCHMARK, &truesizestretchmark); -#endif - if (scalingType == TSST_SIZE || dstSize.x < 0 || dstSize.y < 0 - || (MulDiv(srcSize.x, 100, dstSize.x) > truesizestretchmark - && MulDiv(srcSize.y, 100, dstSize.y) > truesizestretchmark)) + if ((dstSize.x < 0 || dstSize.y < 0) + || (dstSize.x < srcSize.x && dstSize.y < srcSize.y) + || (scalingType == TSST_SIZE + && MulDiv(100, dstSize.x, srcSize.x) >= stretchMark + 100 + && MulDiv(100, dstSize.y, srcSize.y) >= stretchMark + 100)) { *psz = dstSize; } -- 2.30.2

1 0

[PATCH 2/4] uxtheme: Support TrueSizeScalingType property.
by Zhiyi Zhang 24 Aug '21

24 Aug '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/draw.c | 88 ++++++++++++++++++++++++++++++--------------- 1 file changed, 59 insertions(+), 29 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 424e08c4183..866200f7fa8 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -149,7 +149,8 @@ HRESULT WINAPI DrawThemeBackground(HTHEME hTheme, HDC hdc, int iPartId, * * Select the image to use */ -static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, const RECT *pRect, BOOL glyph) +static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, + const RECT *pRect, BOOL glyph, int *imageDpi) { PTHEME_PROPERTY tp; int imageselecttype = IST_NONE; @@ -160,6 +161,9 @@ static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, HDC hdc, int iPartId, else image = TMT_IMAGEFILE; + if (imageDpi) + *imageDpi = 96; + if((tp=MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, image))) return tp; GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_IMAGESELECTTYPE, &imageselecttype); @@ -172,6 +176,10 @@ static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, HDC hdc, int iPartId, if(SUCCEEDED(GetThemeInt(hTheme, iPartId, iStateId, i + TMT_MINDPI1, &reqdpi))) { if(reqdpi != 0 && screendpi >= reqdpi) { TRACE("Using %d DPI, image %d\n", reqdpi, i + TMT_IMAGEFILE1); + + if (imageDpi) + *imageDpi = reqdpi; + return MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, i + TMT_IMAGEFILE1); } } @@ -228,15 +236,18 @@ static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, HDC hdc, int iPartId, * * Load image for part/state */ -static HRESULT UXTHEME_LoadImage(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, const RECT *pRect, BOOL glyph, - HBITMAP *hBmp, RECT *bmpRect, BOOL* hasImageAlpha) +static HRESULT UXTHEME_LoadImage(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, + const RECT *pRect, BOOL glyph, HBITMAP *hBmp, RECT *bmpRect, + BOOL *hasImageAlpha, int *imageDpi) { int imagelayout = IL_HORIZONTAL; int imagecount = 1; int imagenum; BITMAP bmp; WCHAR szPath[MAX_PATH]; - PTHEME_PROPERTY tp = UXTHEME_SelectImage(hTheme, hdc, iPartId, iStateId, pRect, glyph); + PTHEME_PROPERTY tp; + + tp = UXTHEME_SelectImage(hTheme, hdc, iPartId, iStateId, pRect, glyph, imageDpi); if(!tp) { FIXME("Couldn't determine image for part/state %d/%d, invalid theme?\n", iPartId, iStateId); return E_PROP_ID_UNSUPPORTED; @@ -484,8 +495,8 @@ static HRESULT UXTHEME_DrawImageGlyph(HTHEME hTheme, HDC hdc, int iPartId, POINT topleft; BOOL hasAlpha; - hr = UXTHEME_LoadImage(hTheme, hdc, iPartId, iStateId, pRect, TRUE, - &bmpSrc, &rcSrc, &hasAlpha); + hr = UXTHEME_LoadImage(hTheme, hdc, iPartId, iStateId, pRect, TRUE, &bmpSrc, &rcSrc, &hasAlpha, + NULL); if(FAILED(hr)) return hr; hdcSrc = CreateCompatibleDC(hdc); if(!hdcSrc) { @@ -554,30 +565,50 @@ static HRESULT get_image_part_size (HTHEME hTheme, HDC hdc, int iPartId, int iStateId, RECT *prc, THEMESIZE eSize, POINT *psz) { + int imageDpi, dstDpi; HRESULT hr = S_OK; HBITMAP bmpSrc; RECT rcSrc; BOOL hasAlpha; - hr = UXTHEME_LoadImage(hTheme, hdc, iPartId, iStateId, prc, FALSE, - &bmpSrc, &rcSrc, &hasAlpha); + hr = UXTHEME_LoadImage(hTheme, hdc, iPartId, iStateId, prc, FALSE, &bmpSrc, &rcSrc, &hasAlpha, + &imageDpi); if (FAILED(hr)) return hr; switch (eSize) { case TS_DRAW: + { + int sizingType = ST_STRETCH, scalingType = TSST_NONE; + POINT srcSize; + + srcSize.x = rcSrc.right - rcSrc.left; + srcSize.y = rcSrc.bottom - rcSrc.top; + + GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_SIZINGTYPE, &sizingType); + if (sizingType == ST_TRUESIZE) + { + GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_TRUESIZESCALINGTYPE, &scalingType); + if (scalingType == TSST_DPI) + { + dstDpi = GetDeviceCaps(hdc, LOGPIXELSY); + if (dstDpi && dstDpi != imageDpi) + { + srcSize.x = MulDiv(srcSize.x, dstDpi, imageDpi); + srcSize.y = MulDiv(srcSize.y, dstDpi, imageDpi); + } + } + } + *psz = srcSize; + if (prc != NULL) { POINT dstSize; - POINT srcSize; - int sizingtype = ST_STRETCH; BOOL uniformsizing = FALSE; dstSize.x = prc->right - prc->left; dstSize.y = prc->bottom - prc->top; - srcSize.x = rcSrc.right-rcSrc.left; - srcSize.y = rcSrc.bottom-rcSrc.top; - + GetThemeBool(hTheme, iPartId, iStateId, TMT_UNIFORMSIZING, &uniformsizing); if(uniformsizing) { /* Scale height and width equally */ @@ -586,9 +617,9 @@ static HRESULT get_image_part_size (HTHEME hTheme, HDC hdc, int iPartId, else dstSize.x = MulDiv (srcSize.x, dstSize.y, srcSize.y); } - - GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_SIZINGTYPE, &sizingtype); - if(sizingtype == ST_TRUESIZE) { + + if (sizingType == ST_TRUESIZE) + { int truesizestretchmark = 100; /* Whatever TrueSizeStretchMark does - it does not seem to @@ -599,13 +630,11 @@ static HRESULT get_image_part_size (HTHEME hTheme, HDC hdc, int iPartId, /* Only stretch when target exceeds source by truesizestretchmark percent */ GetThemeInt(hTheme, iPartId, iStateId, TMT_TRUESIZESTRETCHMARK, &truesizestretchmark); #endif - if(dstSize.x < 0 || dstSize.y < 0 || - (MulDiv(srcSize.x, 100, dstSize.x) > truesizestretchmark && - MulDiv(srcSize.y, 100, dstSize.y) > truesizestretchmark)) { - memcpy (psz, &dstSize, sizeof (SIZE)); - } - else { - memcpy (psz, &srcSize, sizeof (SIZE)); + if (scalingType == TSST_SIZE || dstSize.x < 0 || dstSize.y < 0 + || (MulDiv(srcSize.x, 100, dstSize.x) > truesizestretchmark + && MulDiv(srcSize.y, 100, dstSize.y) > truesizestretchmark)) + { + *psz = dstSize; } } else @@ -613,9 +642,10 @@ static HRESULT get_image_part_size (HTHEME hTheme, HDC hdc, int iPartId, psz->x = abs(dstSize.x); psz->y = abs(dstSize.y); } - break; } - /* else fall through */ + + break; + } case TS_MIN: /* FIXME: couldn't figure how native uxtheme computes min size */ case TS_TRUE: @@ -649,8 +679,8 @@ static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId, COLORREF transparentcolor = 0; BOOL hasAlpha; - hr = UXTHEME_LoadImage(hTheme, hdc, iPartId, iStateId, pRect, FALSE, - &bmpSrc, &rcSrc, &hasAlpha); + hr = UXTHEME_LoadImage(hTheme, hdc, iPartId, iStateId, pRect, FALSE, &bmpSrc, &rcSrc, &hasAlpha, + NULL); if(FAILED(hr)) return hr; hdcSrc = CreateCompatibleDC(hdc); if(!hdcSrc) { @@ -2078,8 +2108,8 @@ BOOL WINAPI IsThemeBackgroundPartiallyTransparent(HTHEME hTheme, int iPartId, if (bgtype != BT_IMAGEFILE) return FALSE; - if(FAILED (UXTHEME_LoadImage (hTheme, 0, iPartId, iStateId, &rect, FALSE, - &bmpSrc, &rcSrc, &hasAlpha))) + if (FAILED(UXTHEME_LoadImage(hTheme, 0, iPartId, iStateId, &rect, FALSE, &bmpSrc, &rcSrc, + &hasAlpha, NULL))) return FALSE; get_transparency (hTheme, iPartId, iStateId, hasAlpha, &transparent, -- 2.30.2

1 0

[PATCH 1/4] uxtheme: Remove useless calculation.
by Zhiyi Zhang 24 Aug '21

24 Aug '21

rcDst is not used after it is used for getting destination rectangle width and height. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/draw.c | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index b8196b09966..424e08c4183 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -568,16 +568,13 @@ static HRESULT get_image_part_size (HTHEME hTheme, HDC hdc, int iPartId, case TS_DRAW: if (prc != NULL) { - RECT rcDst; POINT dstSize; POINT srcSize; int sizingtype = ST_STRETCH; BOOL uniformsizing = FALSE; - rcDst = *prc; - - dstSize.x = rcDst.right-rcDst.left; - dstSize.y = rcDst.bottom-rcDst.top; + dstSize.x = prc->right - prc->left; + dstSize.y = prc->bottom - prc->top; srcSize.x = rcSrc.right-rcSrc.left; srcSize.y = rcSrc.bottom-rcSrc.top; @@ -585,35 +582,15 @@ static HRESULT get_image_part_size (HTHEME hTheme, HDC hdc, int iPartId, if(uniformsizing) { /* Scale height and width equally */ if (dstSize.x*srcSize.y < dstSize.y*srcSize.x) - { dstSize.y = MulDiv (srcSize.y, dstSize.x, srcSize.x); - rcDst.bottom = rcDst.top + dstSize.y; - } else - { dstSize.x = MulDiv (srcSize.x, dstSize.y, srcSize.y); - rcDst.right = rcDst.left + dstSize.x; - } } GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_SIZINGTYPE, &sizingtype); if(sizingtype == ST_TRUESIZE) { int truesizestretchmark = 100; - - if(dstSize.x < 0 || dstSize.y < 0) { - BOOL mirrorimage = TRUE; - GetThemeBool(hTheme, iPartId, iStateId, TMT_MIRRORIMAGE, &mirrorimage); - if(mirrorimage) { - if(dstSize.x < 0) { - rcDst.left += dstSize.x; - rcDst.right += dstSize.x; - } - if(dstSize.y < 0) { - rcDst.top += dstSize.y; - rcDst.bottom += dstSize.y; - } - } - } + /* Whatever TrueSizeStretchMark does - it does not seem to * be what's outlined below. It appears as if native * uxtheme always stretches if dest is smaller than source -- 2.30.2

1 0

[PATCH 1/5] winebus.sys: Report WINEBUS\WINE_COMP_HID compatible id.
by Rémi Bernon 23 Aug '21

23 Aug '21

And match it in winehid.sys instead of individual bus ids. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This series should apply smoothly with the previous winebus.sys. I'm also sending it now because it may need a bit more consideration. The rationale of the design is described below: The idea here is to create a new xinput.sys driver, which will match xinput-compatible winebus.sys devices, and create two device nodes on top of the underlying device. The first one will be the public "&IG_00" XInput bogus HID gamepad, as native has, and as Win32 SDL expects to see. The other will be a pass-through to the underlying device, but although it's going to be an HID compatible device too, it will need to be exposed on a different interface class GUID in order to be used only by Wine XInput. The second node will filter its read requests, and then translate them into the corresponding bogus XInput HID report, passing them to the first one for its read request completion. This design removes the need to really care about XInput gamepad compat in winebus.sys, making it possible to extend the HID reports there to include the full capabilities of the unix devices: * It will allow the user-space XInput implementation to have access to the full capabilities of the underlying device, and not be limited by the bogus HID compatibility anymore. * It also removes an eventual need to duplicate the winebus devices, as the two nodes will only need one underlying device (the bogus XInput node will never actually request reads to its underlying PDO). * And finally it makes it possible to have XInput compatibility with any underlying device, not just with SDL or evdev where we handle the report creation. Even hidraw or iohid device reports can be translated to the XInput HID reports. dlls/winebus.sys/main.c | 22 ++++++++++++++++++++-- dlls/winehid.sys/winehid.inf | 7 +------ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index e372ec6db3f..e360416b5dd 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -225,7 +225,7 @@ static WCHAR *get_device_id(DEVICE_OBJECT *device) return dst; } -static WCHAR *get_compatible_ids(DEVICE_OBJECT *device) +static WCHAR *get_hardware_ids(DEVICE_OBJECT *device) { struct device_extension *ext = (struct device_extension *)device->DeviceExtension; WCHAR *dst; @@ -239,6 +239,24 @@ static WCHAR *get_compatible_ids(DEVICE_OBJECT *device) return dst; } +static WCHAR *get_compatible_ids(DEVICE_OBJECT *device) +{ + static const WCHAR hid_compat[] = + { + 'W','I','N','E','B','U','S','\\','W','I','N','E','_','C','O','M','P','_','H','I','D',0 + }; + DWORD len = strlenW(hid_compat); + WCHAR *dst; + + if ((dst = ExAllocatePool(PagedPool, (len + 2) * sizeof(WCHAR)))) + { + strcpyW(dst, hid_compat); + dst[len + 1] = 0; + } + + return dst; +} + static void remove_pending_irps(DEVICE_OBJECT *device) { struct device_extension *ext = device->DeviceExtension; @@ -441,7 +459,7 @@ static NTSTATUS handle_IRP_MN_QUERY_ID(DEVICE_OBJECT *device, IRP *irp) { case BusQueryHardwareIDs: TRACE("BusQueryHardwareIDs\n"); - irp->IoStatus.Information = (ULONG_PTR)get_compatible_ids(device); + irp->IoStatus.Information = (ULONG_PTR)get_hardware_ids(device); break; case BusQueryCompatibleIDs: TRACE("BusQueryCompatibleIDs\n"); diff --git a/dlls/winehid.sys/winehid.inf b/dlls/winehid.sys/winehid.inf index f9ed4091217..c1d8a1cf999 100644 --- a/dlls/winehid.sys/winehid.inf +++ b/dlls/winehid.sys/winehid.inf @@ -7,12 +7,7 @@ Class=HIDClass Wine=mfg_section [mfg_section] -Wine hidraw device=device_section,HIDRAW -Wine IOHID device=device_section,IOHID -Wine libevent device=device_section,LNXEV -Wine SDL HID device=device_section,SDLJOY -Wine mouse device=device_section,WINEMOUSE -Wine keyboard device=device_section,WINEKEYBOARD +Wine HID compatible device=device_section,WINEBUS\WINE_COMP_HID [device_section.Services] AddService = winehid,0x2,svc_section -- 2.32.0

2 20

[PATCH] loader: fix build with --without-pthread
by Alex Xu (Hello71) 23 Aug '21

23 Aug '21

dubious whether --without-pthread is actually useful, but as long as it exists it should at least try to work --- loader/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/main.c b/loader/main.c index 86c2b28263e..30f363d2430 100644 --- a/loader/main.c +++ b/loader/main.c @@ -172,6 +172,8 @@ int main( int argc, char *argv[] ) } fprintf( stderr, "wine: could not load ntdll.so: %s\n", dlerror() ); +#ifdef HAVE_PTHREAD_H pthread_detach( pthread_self() ); /* force importing libpthread for OpenGL */ +#endif exit(1); } -- 2.33.0

2 1

[PATCH] ws2_32: Handle success in addrinfo_err_from_unix
by Alistair Leslie-Hughes 23 Aug '21

23 Aug '21

When unix_getnameinfo is called, we end up with a warning fixme for no reason. 0740:fixme:winsock:addrinfo_err_from_unix unhandled error 0 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ws2_32/unixlib.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index a9a2b6939d9..25a38b46758 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -410,6 +410,7 @@ static int addrinfo_err_from_unix( int err ) { switch (err) { + case 0: return 0; case EAI_AGAIN: return WS_EAI_AGAIN; case EAI_BADFLAGS: return WS_EAI_BADFLAGS; case EAI_FAIL: return WS_EAI_FAIL; -- 2.32.0

2 1

[PATCH] winegcc: Add rpaths to help the macOS loader find ntdll.so.
by Huw Davies 23 Aug '21

23 Aug '21

On macOS unixlibs that link to ntdll.so currently fail to load. It appears the macOS loader needs to be able to locate the file even if the library is already loaded. This patch changes the LC_ID_DYLIB name of ntdll.so to "@rpath/ntdll.so" so that when other unixlibs link against this they will insert that name into their LC_LOAD_DYLIB entry for ntdll.so. The patch also adds LC_RPATH entries for both @loader_path/ (running from installed tree) and @loader_path/../ntdll/ (running from build tree). Although it's only required to explicitly change ntdll.so's LC_ID_DYLIB and to only add LC_RPATHs to unixlibs that load ntdll.so, it seems simpler to do the same for all unixlibs, which is what this patch does. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- I'm not exactly happy with this patch, so any other ideas would be appreciated. tools/winegcc/winegcc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 426336e4536..0a72e6fbe49 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -492,6 +492,13 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) strarray_add( flags, opts->image_base ); } if (opts->strip) strarray_add( flags, "-Wl,-x" ); + if (opts->unix_lib) + { + strarray_add( flags, "-install_name" ); + strarray_add( flags, strmake( "@rpath/%s.so", output_name ) ); + strarray_add( flags, "-Wl,-rpath,@loader_path/" ); + strarray_add( flags, "-Wl,-rpath,@loader_path/../ntdll/" ); + } strarray_addall( link_args, flags ); return link_args; -- 2.23.0

3 18

Re: [PATCH] ntdll: Only use sysinfo function when present
by Gerald Pfeifer 23 Aug '21

23 Aug '21

On Tue, 10 Aug 2021, Gerald Pfeifer wrote: > On some systems <sys/sysinfo.h> may be present while the sysinfo > function may not, or at least not as part of standard libraries, > so check whether the function is actually available before using > it. Note that the Marvin tester complained about test failures, which I believe is only due to me not including changes to generated files (autoconf, which show unrelated differences due to different versions of autoconf). I assume/hope Alexandre is simply running autoconf after applying this patch (and then hopefully pushing everything)? :-) Thanks, Gerald

2 1

[PATCH 10/10] gdi32: Separate EMFDRV_PDEVICE and struct emf.
by Jacek Caban 23 Aug '21

23 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/emfdrv.c | 9 +++++++-- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 6 ++---- dlls/gdi32/enhmfdrv/graphics.c | 18 +++++++++--------- dlls/gdi32/enhmfdrv/init.c | 9 +++++---- dlls/gdi32/enhmfdrv/objects.c | 2 +- 5 files changed, 24 insertions(+), 20 deletions(-)

2 1

[PATCH 09/10] gdi32: Use NtGdiGetRgnBox in emfdrv_stroke_and_fill_path.
by Jacek Caban 23 Aug '21

23 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/graphics.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)

2 1

[PATCH 08/10] gdi32: Avoid using EMFDRV_PDEVICE outside emfdev.c.
by Jacek Caban 23 Aug '21

23 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/emfdrv.c | 5 ++++ dlls/gdi32/enhmfdrv/bitblt.c | 2 +- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 5 ---- dlls/gdi32/enhmfdrv/graphics.c | 22 ++++++++--------- dlls/gdi32/enhmfdrv/init.c | 4 +-- dlls/gdi32/enhmfdrv/objects.c | 37 +++++++++++++--------------- 6 files changed, 36 insertions(+), 39 deletions(-)

2 1

[PATCH 07/10] gdi32: Use struct emf for EMF helpers.
by Jacek Caban 23 Aug '21

23 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/bitblt.c | 18 +++--- dlls/gdi32/enhmfdrv/dc.c | 72 +++++++++++------------ dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 8 +-- dlls/gdi32/enhmfdrv/graphics.c | 65 +++++++++++---------- dlls/gdi32/enhmfdrv/init.c | 37 ++++++------ dlls/gdi32/enhmfdrv/objects.c | 86 ++++++++++++++-------------- 6 files changed, 140 insertions(+), 146 deletions(-)

2 1

[PATCH 06/10] gdi32: Move EMF driver to separated file.
by Jacek Caban 23 Aug '21

23 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 1 + dlls/gdi32/emfdrv.c | 595 +++++++++++++++++++++++++++ dlls/gdi32/enhmfdrv/bitblt.c | 29 -- dlls/gdi32/enhmfdrv/dc.c | 9 - dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 48 --- dlls/gdi32/enhmfdrv/graphics.c | 388 ----------------- dlls/gdi32/enhmfdrv/init.c | 172 -------- dlls/gdi32/enhmfdrv/objects.c | 19 - include/ntgdi.h | 1 + 9 files changed, 597 insertions(+), 665 deletions(-) create mode 100644 dlls/gdi32/emfdrv.c

2 1

[PATCH 05/10] gdi32: Handle EMF recording clean up in DeleteDC.
by Jacek Caban 23 Aug '21

23 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 2 +- dlls/gdi32/enhmfdrv/init.c | 95 +++++++++++++++++-------------------- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 4 ++ dlls/gdi32/tests/metafile.c | 1 - 5 files changed, 50 insertions(+), 53 deletions(-)

2 1

[PATCH 04/10] gdi32: Use NtGdiDeleteObjectApp for DeleteDC.
by Jacek Caban 23 Aug '21

23 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 8 ++--- dlls/gdi32/dc.c | 73 +++++++++++++++++++------------------------- dlls/gdi32/dib.c | 4 +-- dlls/gdi32/gdidc.c | 9 ++++++ dlls/gdi32/objects.c | 9 +++++- 5 files changed, 54 insertions(+), 49 deletions(-)

2 1

[PATCH 03/10] gdi32: Use NtGdiResetDC for ResetDCW.
by Jacek Caban 23 Aug '21

23 Aug '21

2 1

[PATCH 02/10] gdi32: Store EMF bounds in DC_ATTR.
by Jacek Caban 23 Aug '21

23 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 + dlls/gdi32/enhmfdrv/init.c | 9 ++++++--- include/ntgdi.h | 1 + 3 files changed, 8 insertions(+), 3 deletions(-)

2 1

[PATCH 01/10] gdi32: Introduce NtGdiCreateMetafileDC.
by Jacek Caban 23 Aug '21

23 Aug '21

And use it in CreateEnhMetaFileW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/init.c | 165 +++++++++++++++++++++---------------- 1 file changed, 96 insertions(+), 69 deletions(-)

2 1

[website] German translation for release 6.15
by Julian Rüger 23 Aug '21

23 Aug '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 6.14
by Julian Rüger 23 Aug '21

23 Aug '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 6.13
by Julian Rüger 23 Aug '21

23 Aug '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH vkd3d 1/8] vkd3d-shader/hlsl: Use vkd3d_make_u32() in more places.
by Zebediah Figura 23 Aug '21

23 Aug '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 9f5c18dd..38c71626 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -163,9 +163,9 @@ static void write_sm4_type(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b } } - type->bytecode_offset = put_u32(buffer, sm4_class(type) | (sm4_base_type(type) << 16)); - put_u32(buffer, type->dimy | (type->dimx << 16)); - put_u32(buffer, array_size | (field_count << 16)); + type->bytecode_offset = put_u32(buffer, vkd3d_make_u32(sm4_class(type), sm4_base_type(type))); + put_u32(buffer, vkd3d_make_u32(type->dimy, type->dimx)); + put_u32(buffer, vkd3d_make_u32(array_size, field_count)); put_u32(buffer, fields_offset); if (profile->major_version >= 5) @@ -207,7 +207,8 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) cbuffer_position = put_u32(&buffer, 0); put_u32(&buffer, cbuffer_count); /* bound resource count */ resource_position = put_u32(&buffer, 0); - put_u32(&buffer, (target_types[profile->type] << 16) | (profile->major_version << 8) | profile->minor_version); + put_u32(&buffer, vkd3d_make_u32(vkd3d_make_u16(profile->minor_version, profile->major_version), + target_types[profile->type])); put_u32(&buffer, 0); /* FIXME: compilation flags */ creator_position = put_u32(&buffer, 0); @@ -371,7 +372,7 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) VKD3D_SM4_LIB, }; - put_u32(&buffer, (shader_types[profile->type] << 16) | (profile->major_version << 4) | profile->minor_version); + put_u32(&buffer, vkd3d_make_u32((profile->major_version << 4) | profile->minor_version, shader_types[profile->type])); put_u32(&buffer, 0); /* FIXME: instruction token count */ dxbc_writer_add_section(dxbc, TAG_SHDR, buffer.data, buffer.size); -- 2.32.0

5 27

[PATCH] services/tests: Vista+ returns fixed 1024x768 WinDisc monitor information.
by Francois Gouget 23 Aug '21

23 Aug '21

Unlike Windows XP which returned the actual display information to non-interactive services. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/user32/sysparams.c | 4 ++-- programs/services/tests/service.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 24e39206746..00282ff27ee 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3980,12 +3980,12 @@ BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) /* Fallback to report one monitor */ if (handle == NULLDRV_DEFAULT_HMONITOR) { - RECT default_rect = {0, 0, 640, 480}; + RECT default_rect = {0, 0, 1024, 768}; info->rcMonitor = default_rect; info->rcWork = default_rect; info->dwFlags = MONITORINFOF_PRIMARY; if (info->cbSize >= sizeof(MONITORINFOEXW)) - lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, L"\\\\.\\DISPLAY1" ); + lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, L"\\\\.\\WinDisc" ); return TRUE; } diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index aa9878b9769..64b7209a293 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -148,15 +148,15 @@ static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, LPAR r = GetMonitorInfoA(hmon, (MONITORINFO*)&mi); service_ok(r, "GetMonitorInfo failed.\n"); - service_ok(mi.rcMonitor.left == 0 && mi.rcMonitor.top == 0 && mi.rcMonitor.right >= 640 && mi.rcMonitor.bottom >= 480, + service_ok(mi.rcMonitor.left == 0 && mi.rcMonitor.top == 0 && mi.rcMonitor.right == 1024 && mi.rcMonitor.bottom == 768, "Unexpected monitor rcMonitor values: {%d,%d,%d,%d}\n", mi.rcMonitor.left, mi.rcMonitor.top, mi.rcMonitor.right, mi.rcMonitor.bottom); - service_ok(mi.rcWork.left == 0 && mi.rcWork.top == 0 && mi.rcWork.right >= 640 && mi.rcWork.bottom >= 480, + service_ok(mi.rcWork.left == 0 && mi.rcWork.top == 0 && mi.rcWork.right == 1024 && mi.rcWork.bottom == 768, "Unexpected monitor rcWork values: {%d,%d,%d,%d}\n", mi.rcWork.left, mi.rcWork.top, mi.rcWork.right, mi.rcWork.bottom); - service_ok(!strcmp(mi.szDevice, "WinDisc") || !strcmp(mi.szDevice, "\\\\.\\DISPLAY1"), + service_ok(!strcmp(mi.szDevice, "\\\\.\\WinDisc"), "Unexpected szDevice received: %s\n", mi.szDevice); service_ok(mi.dwFlags == MONITORINFOF_PRIMARY, "Unexpected secondary monitor info.\n"); -- 2.20.1

2 2

[PATCH] nsiproxy: Include netinet/in.h in udp.c
by Gerald Pfeifer 23 Aug '21

23 Aug '21

This is necessary to define struct in_addr which is used by netinet/ip.h on FreeBSD. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/nsiproxy.sys/udp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index 9f9966815c2..190eb7f21f5 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -38,6 +38,10 @@ #include <sys/socketvar.h> #endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif + #ifdef HAVE_NETINET_IP_H #include <netinet/ip.h> #endif -- 2.31.1

2 1

[PATCH v2 1/7] winebus.sys: Create the SDL bus thread in main.c.
by Rémi Bernon 23 Aug '21

23 Aug '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Supersedes: 211939-211944 v2: Move the threads first, introduce the unixlib next. Use a new unixlib style interface directly from the start but share the entry point table directly instead of using __wine_unix_call. dlls/winebus.sys/bus.h | 6 +- dlls/winebus.sys/bus_sdl.c | 150 +++++++++++++++---------------------- dlls/winebus.sys/main.c | 85 ++++++++++++++++++--- 3 files changed, 139 insertions(+), 102 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index 3e53b9c53f1..c5b93b769c9 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -30,10 +30,12 @@ typedef int(*enum_func)(DEVICE_OBJECT *device, void *context); /* Buses */ NTSTATUS udev_driver_init(void) DECLSPEC_HIDDEN; NTSTATUS iohid_driver_init(void) DECLSPEC_HIDDEN; -NTSTATUS sdl_driver_init(void) DECLSPEC_HIDDEN; void udev_driver_unload( void ) DECLSPEC_HIDDEN; void iohid_driver_unload( void ) DECLSPEC_HIDDEN; -void sdl_driver_unload( void ) DECLSPEC_HIDDEN; + +extern NTSTATUS sdl_bus_init(void *) DECLSPEC_HIDDEN; +extern NTSTATUS sdl_bus_wait(void *) DECLSPEC_HIDDEN; +extern NTSTATUS sdl_bus_stop(void *) DECLSPEC_HIDDEN; /* Native device function table */ typedef struct diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 84e3ef20664..02509f1560c 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -63,7 +63,6 @@ static const WCHAR sdl_busidW[] = {'S','D','L','J','O','Y',0}; static DWORD map_controllers = 0; static void *sdl_handle = NULL; -static HANDLE deviceloop_handle; static UINT quit_event = -1; #define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL @@ -889,68 +888,15 @@ static void sdl_load_mappings(void) } } -static DWORD CALLBACK deviceloop_thread(void *args) +NTSTATUS sdl_bus_init(void *args) { - HANDLE init_done = args; - SDL_Event event; - - if (pSDL_Init(SDL_INIT_GAMECONTROLLER|SDL_INIT_HAPTIC) < 0) - { - ERR("Can't init SDL: %s\n", pSDL_GetError()); - return STATUS_UNSUCCESSFUL; - } - - pSDL_JoystickEventState(SDL_ENABLE); - pSDL_GameControllerEventState(SDL_ENABLE); - - /* Process mappings */ - if (pSDL_GameControllerAddMapping != NULL) sdl_load_mappings(); - - SetEvent(init_done); - - while (1) { - while (pSDL_WaitEvent(&event) != 0) { - if (event.type == quit_event) { - TRACE("Device thread exiting\n"); - return 0; - } - process_device_event(&event); - } - } -} - -void sdl_driver_unload( void ) -{ - SDL_Event event; - - TRACE("Unload Driver\n"); - - if (!deviceloop_handle) - return; - - quit_event = pSDL_RegisterEvents(1); - if (quit_event == -1) { - ERR("error registering quit event\n"); - return; - } - - event.type = quit_event; - if (pSDL_PushEvent(&event) != 1) { - ERR("error pushing quit event\n"); - return; - } - - WaitForSingleObject(deviceloop_handle, INFINITE); - CloseHandle(deviceloop_handle); - dlclose(sdl_handle); -} + static const WCHAR controller_modeW[] = {'M','a','p',' ','C','o','n','t','r','o','l','l','e','r','s',0}; + static const UNICODE_STRING controller_mode = {sizeof(controller_modeW) - sizeof(WCHAR), sizeof(controller_modeW), (WCHAR*)controller_modeW}; -static BOOL sdl_initialize(void) -{ if (!(sdl_handle = dlopen(SONAME_LIBSDL2, RTLD_NOW))) { WARN("could not load %s\n", SONAME_LIBSDL2); - return FALSE; + return STATUS_UNSUCCESSFUL; } #define LOAD_FUNCPTR(f) \ if ((p##f = dlsym(sdl_handle, #f)) == NULL) \ @@ -1000,63 +946,85 @@ static BOOL sdl_initialize(void) pSDL_JoystickGetProduct = dlsym(sdl_handle, "SDL_JoystickGetProduct"); pSDL_JoystickGetProductVersion = dlsym(sdl_handle, "SDL_JoystickGetProductVersion"); pSDL_JoystickGetVendor = dlsym(sdl_handle, "SDL_JoystickGetVendor"); - return TRUE; + + if (pSDL_Init(SDL_INIT_GAMECONTROLLER | SDL_INIT_HAPTIC) < 0) + { + ERR("could not init SDL: %s\n", pSDL_GetError()); + goto failed; + } + + if ((quit_event = pSDL_RegisterEvents(1)) == -1) + { + ERR("error registering quit event\n"); + goto failed; + } + + pSDL_JoystickEventState(SDL_ENABLE); + pSDL_GameControllerEventState(SDL_ENABLE); + + map_controllers = check_bus_option(&controller_mode, 1); + + /* Process mappings */ + if (pSDL_GameControllerAddMapping != NULL) sdl_load_mappings(); + + return STATUS_SUCCESS; failed: dlclose(sdl_handle); sdl_handle = NULL; - return FALSE; + return STATUS_UNSUCCESSFUL; } -NTSTATUS sdl_driver_init(void) +NTSTATUS sdl_bus_wait(void *args) { - static const WCHAR controller_modeW[] = {'M','a','p',' ','C','o','n','t','r','o','l','l','e','r','s',0}; - static const UNICODE_STRING controller_mode = {sizeof(controller_modeW) - sizeof(WCHAR), sizeof(controller_modeW), (WCHAR*)controller_modeW}; + SDL_Event event; - HANDLE events[2]; - DWORD result; + do + { + if (pSDL_WaitEvent(&event) != 0) process_device_event(&event); + else WARN("SDL_WaitEvent failed: %s\n", pSDL_GetError()); + } while (event.type != quit_event); - if (!sdl_handle && !sdl_initialize()) return STATUS_UNSUCCESSFUL; + TRACE("SDL main loop exiting\n"); + dlclose(sdl_handle); + sdl_handle = NULL; + return STATUS_SUCCESS; +} - map_controllers = check_bus_option(&controller_mode, 1); +NTSTATUS sdl_bus_stop(void *args) +{ + SDL_Event event; - if (!(events[0] = CreateEventW(NULL, TRUE, FALSE, NULL))) - { - WARN("CreateEvent failed\n"); - return STATUS_UNSUCCESSFUL; - } - if (!(events[1] = CreateThread(NULL, 0, deviceloop_thread, events[0], 0, NULL))) - { - WARN("CreateThread failed\n"); - CloseHandle(events[0]); - return STATUS_UNSUCCESSFUL; - } + if (!sdl_handle) return STATUS_SUCCESS; - result = WaitForMultipleObjects(2, events, FALSE, INFINITE); - CloseHandle(events[0]); - if (result == WAIT_OBJECT_0) + event.type = quit_event; + if (pSDL_PushEvent(&event) != 1) { - TRACE("Initialization successful\n"); - deviceloop_handle = events[1]; - return STATUS_SUCCESS; + ERR("error pushing quit event\n"); + return STATUS_UNSUCCESSFUL; } - CloseHandle(events[1]); - dlclose(sdl_handle); - sdl_handle = NULL; - return STATUS_UNSUCCESSFUL; + return STATUS_SUCCESS; } #else -NTSTATUS sdl_driver_init(void) +NTSTATUS sdl_bus_init(void *args) { + WARN("SDL support not compiled in!\n"); return STATUS_NOT_IMPLEMENTED; } -void sdl_driver_unload( void ) +NTSTATUS sdl_bus_wait(void *args) { - TRACE("Stub: Unload Driver\n"); + WARN("SDL support not compiled in!\n"); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS sdl_bus_stop(void *args) +{ + WARN("SDL support not compiled in!\n"); + return STATUS_NOT_IMPLEMENTED; } #endif /* SONAME_LIBSDL2 */ diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index e372ec6db3f..6be5e677bba 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -618,6 +618,74 @@ static void keyboard_device_create(void) IoInvalidateDeviceRelations(bus_pdo, BusRelations); } +static DWORD bus_count; +static HANDLE bus_thread[16]; + +struct bus_main_params +{ + const WCHAR *name; + + HANDLE init_done; + NTSTATUS (*init_func)(void *args); + + NTSTATUS (*wait_func)(void *args); +}; + +static DWORD CALLBACK bus_main_thread(void *args) +{ + struct bus_main_params bus = *(struct bus_main_params *)args; + NTSTATUS status; + + TRACE("%s main loop starting\n", debugstr_w(bus.name)); + status = bus.init_func(NULL); + SetEvent(bus.init_done); + TRACE("%s main loop started\n", debugstr_w(bus.name)); + + if (status) WARN("%s bus init returned status %#x\n", debugstr_w(bus.name), status); + else status = bus.wait_func(NULL); + + if (status) WARN("%s bus wait returned status %#x\n", debugstr_w(bus.name), status); + else TRACE("%s main loop exited\n", debugstr_w(bus.name)); + return status; +} + +static NTSTATUS bus_main_thread_start(struct bus_main_params *bus) +{ + DWORD i = bus_count++; + + if (!(bus->init_done = CreateEventW(NULL, FALSE, FALSE, NULL))) + { + ERR("failed to create %s bus init done event.\n", debugstr_w(bus->name)); + bus_count--; + return STATUS_UNSUCCESSFUL; + } + + if (!(bus_thread[i] = CreateThread(NULL, 0, bus_main_thread, bus, 0, NULL))) + { + ERR("failed to create %s bus thread.\n", debugstr_w(bus->name)); + CloseHandle(bus->init_done); + bus_count--; + return STATUS_UNSUCCESSFUL; + } + + WaitForSingleObject(bus->init_done, INFINITE); + CloseHandle(bus->init_done); + return STATUS_SUCCESS; +} + +static NTSTATUS sdl_driver_init(void) +{ + static const WCHAR bus_name[] = {'S','D','L',0}; + struct bus_main_params bus = + { + .name = bus_name, + .init_func = sdl_bus_init, + .wait_func = sdl_bus_wait, + }; + + return bus_main_thread_start(&bus); +} + static NTSTATUS fdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) { static const WCHAR SDL_enabledW[] = {'E','n','a','b','l','e',' ','S','D','L',0}; @@ -634,16 +702,12 @@ static NTSTATUS fdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) mouse_device_create(); keyboard_device_create(); - if (check_bus_option(&SDL_enabled, 1)) + if (!check_bus_option(&SDL_enabled, 1) || sdl_driver_init()) { - if (sdl_driver_init() == STATUS_SUCCESS) - { - irp->IoStatus.Status = STATUS_SUCCESS; - break; - } + udev_driver_init(); + iohid_driver_init(); } - udev_driver_init(); - iohid_driver_init(); + irp->IoStatus.Status = STATUS_SUCCESS; break; case IRP_MN_SURPRISE_REMOVAL: @@ -652,7 +716,10 @@ static NTSTATUS fdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) case IRP_MN_REMOVE_DEVICE: udev_driver_unload(); iohid_driver_unload(); - sdl_driver_unload(); + sdl_bus_stop(NULL); + + WaitForMultipleObjects(bus_count, bus_thread, TRUE, INFINITE); + while (bus_count--) CloseHandle(bus_thread[bus_count]); irp->IoStatus.Status = STATUS_SUCCESS; IoSkipCurrentIrpStackLocation(irp); -- 2.33.0

1 7

[PATCH 2/2] iphlpapi: Use the correct physical address.
by Huw Davies 23 Aug '21

23 Aug '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51642 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 7d75ce5af3a..47c8a507e38 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1280,9 +1280,9 @@ static DWORD adapters_addresses_alloc( ULONG family, ULONG flags, IP_ADAPTER_ADD aa[i].FriendlyName = (WCHAR *)str_ptr; str_ptr += sizeof(rw[i].alias.String); } - aa[i].PhysicalAddressLength = rw->phys_addr.Length; + aa[i].PhysicalAddressLength = rw[i].phys_addr.Length; if (aa[i].PhysicalAddressLength > sizeof(aa[i].PhysicalAddress)) aa[i].PhysicalAddressLength = 0; - memcpy( aa[i].PhysicalAddress, rw->phys_addr.Address, aa[i].PhysicalAddressLength ); + memcpy( aa[i].PhysicalAddress, rw[i].phys_addr.Address, aa[i].PhysicalAddressLength ); aa[i].Mtu = dyn[i].mtu; aa[i].IfType = stat[i].type; aa[i].OperStatus = dyn[i].oper_status; -- 2.23.0

1 0

[PATCH 1/2] iphlpapi: Don't truncate 64-bit ptrs.
by Huw Davies 23 Aug '21

23 Aug '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51620 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51626 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 408ac14bd1b..7d75ce5af3a 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -864,7 +864,8 @@ ULONG adapters_addresses_size( IP_ADAPTER_ADDRESSES *info ) void adapters_addresses_copy( IP_ADAPTER_ADDRESSES *dst, IP_ADAPTER_ADDRESSES *src ) { char *ptr; - DWORD len, align = sizeof(ULONGLONG) - 1; + DWORD len; + UINT_PTR align = sizeof(ULONGLONG) - 1; struct address_entry_copy_params params; while (src) -- 2.23.0

1 0

[PATCH 2/2] winewrapper: Add dlls/ntdll to the library path so macOS can find ntdll.so.
by Huw Davies 23 Aug '21

23 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- tools/winewrapper | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winewrapper b/tools/winewrapper index 2206d7c4446..93d44bcd06c 100755 --- a/tools/winewrapper +++ b/tools/winewrapper @@ -69,9 +69,9 @@ if [ "`uname -s`" = "Darwin" ] then if [ -n "$DYLD_LIBRARY_PATH" ] then - DYLD_LIBRARY_PATH="$topdir/libs/wine:$DYLD_LIBRARY_PATH" + DYLD_LIBRARY_PATH="$topdir/libs/wine:$topdir/dlls/ntdll:$DYLD_LIBRARY_PATH" else - DYLD_LIBRARY_PATH="$topdir/libs/wine" + DYLD_LIBRARY_PATH="$topdir/libs/wine:$topdir/dlls/ntdll" fi export DYLD_LIBRARY_PATH else -- 2.23.0

1 0

[PATCH 1/2] winegcc: Add a @loader_path to help the macOS loader find ntdll.so.
by Huw Davies 23 Aug '21

23 Aug '21

On macOS unixlibs that link to ntdll.so currently fail to load. It appears the macOS loader needs to be able to locate the file even if the library is already loaded. This patch changes the LC_ID_DYLIB name of ntdll.so to "@loader_path/ntdll.so" so that when other unixlibs link against this they will insert that name into their LC_LOAD_DYLIB entry for ntdll.so. While changing only ntdll.so is necessary, for simplicity this patch changes all unixlibs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51632 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- tools/winegcc/winegcc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 426336e4536..710f6dc900d 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -492,6 +492,11 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) strarray_add( flags, opts->image_base ); } if (opts->strip) strarray_add( flags, "-Wl,-x" ); + if (opts->unix_lib) + { + strarray_add( flags, "-install_name" ); + strarray_add( flags, strmake( "@loader_path/%s.so", output_name ) ); + } strarray_addall( link_args, flags ); return link_args; -- 2.23.0

1 0

[PATCH 5/5] light.msstyles: Add TrueSizeScalingType property to TrueSize sizing parts.
by Zhiyi Zhang 23 Aug '21

23 Aug '21

When SizingType property value is TrueSize, theme part images are scaled only when TrueSizeScalingType property value is DPI or Size. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/light.rc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 5c67480f69a..76adf8f8398 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -207,6 +207,7 @@ BLUE_INI TEXTFILE "ImageCount = 12\r\n" "MirrorImage = False\r\n" "ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = Dpi\r\n" "UniformSizing = True\r\n" "Transparent = True\r\n" "ImageFile1 = blue_checkbox_13px.bmp\r\n" @@ -242,6 +243,7 @@ BLUE_INI TEXTFILE "ContentMargins = 0, 0, 0, 0\r\n" "ImageCount = 8\r\n" "ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = Dpi\r\n" "UniformSizing = True\r\n" "ImageFile1 = blue_radiobutton_13px.bmp\r\n" "ImageFile2 = blue_radiobutton_16px.bmp\r\n" @@ -304,6 +306,7 @@ BLUE_INI TEXTFILE "Transparent = True\r\n" "ImageLayout = Vertical\r\n" "ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = Dpi\r\n" "Transparent = True\r\n" "UniformSizing = True\r\n" "ImageFile1 = blue_commandlink_glyph_30px.bmp\r\n" @@ -556,6 +559,7 @@ BLUE_INI TEXTFILE "[ScrollBar.SizeBox]\r\n" "BgType = ImageFile\r\n" "ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = Dpi\r\n" "ImageCount = 2\r\n" "SizingType = TrueSize\r\n" "Transparent = True\r\n" @@ -654,6 +658,7 @@ BLUE_INI TEXTFILE "ContentMargins = 0, 0, 0, 0\r\n" "BgType = ImageFile\r\n" "ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = Dpi\r\n" "ImageCount = 2\r\n" "SizingType = TrueSize\r\n" "Transparent = True\r\n" @@ -860,6 +865,7 @@ BLUE_INI TEXTFILE "Transparent = True\r\n" "SizingType = TrueSize\r\n" "ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = Dpi\r\n" "UniformSizing = true\r\n" "ImageFile1 = blue_trackbar_thumb_up_11px.bmp\r\n" "ImageFile2 = blue_trackbar_thumb_up_15px.bmp\r\n" @@ -875,6 +881,7 @@ BLUE_INI TEXTFILE "SizingType = TrueSize\r\n" "ImageLayout = Vertical\r\n" "ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = Dpi\r\n" "UniformSizing = True\r\n" "ImageFile1 = blue_trackbar_thumb_down_11px.bmp\r\n" "ImageFile2 = blue_trackbar_thumb_down_15px.bmp\r\n" @@ -890,6 +897,7 @@ BLUE_INI TEXTFILE "Transparent = True\r\n" "ImageLayout = Vertical\r\n" "ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = Dpi\r\n" "UniformSizing = True\r\n" "ImageFile1 = blue_trackbar_thumb_left_19px.bmp\r\n" "ImageFile2 = blue_trackbar_thumb_left_25px.bmp\r\n" @@ -905,6 +913,7 @@ BLUE_INI TEXTFILE "Transparent = True\r\n" "ImageLayout = Vertical\r\n" "ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = Dpi\r\n" "UniformSizing = True\r\n" "ImageFile1 = blue_trackbar_thumb_right_19px.bmp\r\n" "ImageFile2 = blue_trackbar_thumb_right_25px.bmp\r\n" @@ -937,6 +946,7 @@ BLUE_INI TEXTFILE "[Tooltip.Close]\r\n" "BgType = ImageFile\r\n" "ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = Dpi\r\n" "ImageCount = 3\r\n" "SizingType = TrueSize\r\n" "ImageLayout = Vertical\r\n" @@ -968,6 +978,7 @@ BLUE_INI TEXTFILE "ImageCount = 2\r\n" "ImageLayout = vertical\r\n" "ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = Dpi\r\n" "UniformSizing = True\r\n" "ImageFile1 = blue_treeview_expand_collapse_9px.bmp\r\n" "ImageFile2 = blue_treeview_expand_collapse_11px.bmp\r\n" -- 2.30.2

1 0

[PATCH 4/5] light.msstyles: Add more TreeView HiDPI images.
by Zhiyi Zhang 23 Aug '21

23 Aug '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 8 +++- .../blue_treeview_expand_collapse_10px.bmp | Bin 938 -> 0 bytes .../blue_treeview_expand_collapse_11px.bmp | Bin 0 -> 1106 bytes ...=> blue_treeview_expand_collapse_11px.svg} | 8 ++-- .../blue_treeview_expand_collapse_13px.bmp | Bin 0 -> 1490 bytes ...=> blue_treeview_expand_collapse_13px.svg} | 8 ++-- .../blue_treeview_expand_collapse_15px.bmp | Bin 1938 -> 0 bytes .../blue_treeview_expand_collapse_16px.bmp | Bin 0 -> 2186 bytes .../blue_treeview_expand_collapse_16px.svg | 14 +++++++ .../blue_treeview_expand_collapse_18px.bmp | Bin 0 -> 2730 bytes .../blue_treeview_expand_collapse_18px.svg | 16 ++++++++ .../blue_treeview_expand_collapse_20px.bmp | Bin 0 -> 3338 bytes .../blue_treeview_expand_collapse_20px.svg | 16 ++++++++ .../blue_treeview_expand_collapse_23px.bmp | Bin 0 -> 4370 bytes .../blue_treeview_expand_collapse_23px.svg | 16 ++++++++ dlls/light.msstyles/light.rc | 36 ++++++++++++++---- 16 files changed, 102 insertions(+), 20 deletions(-) delete mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_10px.bmp create mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_11px.bmp rename dlls/light.msstyles/{blue_treeview_expand_collapse_15px.svg => blue_treeview_expand_collapse_11px.svg} (54%) create mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_13px.bmp rename dlls/light.msstyles/{blue_treeview_expand_collapse_10px.svg => blue_treeview_expand_collapse_13px.svg} (54%) delete mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_15px.bmp create mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_16px.bmp create mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_16px.svg create mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_18px.bmp create mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_18px.svg create mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_20px.bmp create mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_20px.svg create mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_23px.bmp create mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_23px.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index fe7760f8082..265d984bb52 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -97,6 +97,10 @@ SVG_SRCS = \ blue_trackbar_thumb_up_15px.svg \ blue_trackbar_thumb_up_21px.svg \ blue_trackbar_thumb_vertical.svg \ - blue_treeview_expand_collapse_10px.svg \ - blue_treeview_expand_collapse_15px.svg \ + blue_treeview_expand_collapse_11px.svg \ + blue_treeview_expand_collapse_13px.svg \ + blue_treeview_expand_collapse_16px.svg \ + blue_treeview_expand_collapse_18px.svg \ + blue_treeview_expand_collapse_20px.svg \ + blue_treeview_expand_collapse_23px.svg \ blue_treeview_expand_collapse_9px.svg diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_10px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_10px.bmp deleted file mode 100644 index 31860c071b5e1f8a4e151da24c9b3063e286b3f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 938 zcmZ?rUB%1*23<h128g+USOka}859^mQVLLcAQK7vXJCLJkl24G_n=}VNuro6M5&@o z(a)&{4Zo%t{KtmTO~$1bT^)#zO)WNc*wo@uhprZ%I%Ktk)WOseqYjsvwQJW--oJl8 z!6;j|Zry(%-noALdI4N!fyANeCIIPcK()%a)PmH3<bd|40NF2qv?DgPFm)g~AlnI~ z7HDoVx>_`KHbDL}pqW{?)B)uqfcPa)jW@a)5Fcb75O)Catu<@bXkb%=q;B7;RjY(> QsR4-t?U@5q!-h=_0DaY}!T<mO diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_11px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_11px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..ca04c0d291fc37479da3b6e7c21741c61ec5074b GIT binary patch literal 1106 zcmbu;K?;IE6b9h2f}kK;wTPgO-~oa{h*oVpNf6Ygh0ADPi?(foP%%O90%6cCqB=uu zrvFufPL2u<{XXWs&q)_*BfZ4lYl-U|sUi(TVI5XP4e0W-IAfn5O}IAHCqE>k@%`Hj zB_BUls_|T_To&=pG%s4(%Y2fRd6`Y}X;$=EHtO@((C4-PI?J*)p68YGoCC{|lWCf* zEKk<9?J4RFwV&q6(j2viT#*^)TuHhov^1mVKmwe<^L?K_m)MG08sI%^=v|O~3}O?t zj^i}3KjQ2I&aTTWOc$Z&T^NQ@5FPC?<2YxGdPfFHChU<#&hYK9C#!H<*L5qhIrU#w Cztr~t literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_15px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_11px.svg similarity index 54% rename from dlls/light.msstyles/blue_treeview_expand_collapse_15px.svg rename to dlls/light.msstyles/blue_treeview_expand_collapse_11px.svg index d219da9b6f4..59df40cb0e4 100644 --- a/dlls/light.msstyles/blue_treeview_expand_collapse_15px.svg +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_11px.svg @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:15-32" width="15" height="30" version="1.1" viewBox="0 0 3.9687 7.9375" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +<svg id="bitmap:11-32" width="11" height="22" version="1.1" viewBox="0 0 2.9104 5.8209" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <metadata> <rdf:RDF> <cc:Work rdf:about=""> @@ -9,8 +9,6 @@ </cc:Work> </rdf:RDF> </metadata> - <g> - <path d="m0.92604 3.7042 2.5586-1.7198-2.5586-1.7198z" fill="none" stroke="#aeaeae" stroke-width=".26458"/> - <path d="m0.26458 7.4083h3.175v-3.175z" fill="#3096fa" stroke-width=".19844"/> - </g> + <path d="m0.66143 2.6368 1.5026-1.1842-1.5026-1.1842z" fill="none" stroke="#aeaeae" stroke-width=".26458"/> + <path d="m0.26456 5.5563h2.1167v-2.1167z" fill="#3096fa" stroke-width=".19844"/> </svg> diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_13px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_13px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..9edaf18e26b4b5158398e2ca307a90b2127a62de GIT binary patch literal 1490 zcmcJPziPuU5XP1NOOvH!Ng?zR@(fwpB}-nVLzhrAmMn!p3MLsl6jRxoA!JB120E2M zpCwt;@6rgwA<Hr}!k<rf_x&VWU=K&%4RIP%+$T^Q>OmE8D{6@M=RT&^&_euORMW$| z@q^V2n%09{moXjY19^NMXrEj=7jZ6zYCbNH@o_#Tk1JwaTnNLtP{!uUForA3{I@?z zl4q@TrOdiuG_;80m_Dtbab{MCD$BA~2t*9_Xr^iUj`;>$r-&nlJoHZBUXXubjjoR~ zjPW3Ugnq#FO^rv+P#-mVzfbNpxy{h?A)i8f>~mv0JQ@a`no??sd<R`~pPds!XAJ)b n&R`Ap%I>@7#6Vl<Es7%N-;#60VEvhtvdVjTIhd!so?ZV1Nxc7- literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_10px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_13px.svg similarity index 54% rename from dlls/light.msstyles/blue_treeview_expand_collapse_10px.svg rename to dlls/light.msstyles/blue_treeview_expand_collapse_13px.svg index 370531f67bc..f63653a8430 100644 --- a/dlls/light.msstyles/blue_treeview_expand_collapse_10px.svg +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_13px.svg @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:10-32" width="10" height="20" version="1.1" viewBox="0 0 2.6458 5.2917" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +<svg id="bitmap:13-32" width="13" height="26" version="1.1" viewBox="0 0 3.4396 6.8792" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <metadata> <rdf:RDF> <cc:Work rdf:about=""> @@ -9,8 +9,6 @@ </cc:Work> </rdf:RDF> </metadata> - <g> - <path d="m0.92604 2.3616 1.2446-1.0424-1.2446-1.0424z" fill="none" stroke="#aeaeae" stroke-width=".26458"/> - <path d="m0.26458 4.7625h1.8521v-1.8521z" fill="#3096fa" stroke-width=".19844"/> - </g> + <path d="m0.92604 3.1357 1.5306-1.4107-1.5306-1.4107z" fill="none" stroke="#aeaeae" stroke-width=".26458"/> + <path d="m0.26458 6.35h2.3813v-2.3813z" fill="#3096fa" stroke-width=".19844"/> </svg> diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_15px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_15px.bmp deleted file mode 100644 index 8f55669d86dd1d01a1188c6a2cb5beee25381c34..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1938 zcmchVJ8r`;42EU2KnnEX8x&o#=Lo5TG|14USLxazbH)M<kSiE|#EStRCa)f$Tf3+~ zlL!z5Nue}E@Ndc_KZ&%Iy?*w@Va)OVfKuoYO2m`6g1tG#G1Z0?;`oqHW|OyfEy$W) zv$8Ie^!qiK{VfKPE3>K)-el>U%iCBk?_xQ;k3GkqV|_e_b@5!*#)q&bAIj={46FE9 z*2R@&xon!|-WB)xtE!UFwyx`uFV7Yu7TgQ$j%vvB{LYqV^ASt_wrwAXg*MQ$E!XrZ zR{4vfn4pe5rv{UyHBfg-EMjY{GgRxE*2bzFa8ty;X`Qa?Zk1nIA4@stp^uy&XeFgg q6i3#_#_Sv0Z_Izz&li1UdS9+N^$U%m!@UZ*+b1^aKGWHS?DY=`0D<fP diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_16px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_16px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..ab9813146d6dab88842b00214be7ad7446b89fb3 GIT binary patch literal 2186 zcmZ?r?c!hngDxOh1H=MAtN_G}K$00qGeG4*Oa%DPzyLuYq5n?qLB$9;;#e%iDWkip zpHmGQeoZs@PYlN8IAYDfr5_|tj2Za!6JrJ;{e;XQMn66?h}DnF3{v!CGlNw9=w^_k zAK46Y^~21dME_vcyLRo``I|Ry<|5aP>(;IN55!kCY}lYhju{~R>({SO0Mf63IG$89 zK>9&?)~s2h0c2kSnzd->&Yj%Engi1hQom}|Do!AO77$+t`bU=-Gm!Pe)C0xhfcP~K zr^3W=(b)8Z)Dr6-T>3#~0OiDh_!TfrR)F}}051KM*bhuou|RWQ1MN-2W+$>3vi<Yt z&*uR0Cjv3a;lFX?Ms=XRi{!*Vl6&)!-9`)><bEK&1`IE4V$`Fn0l62L?s(9}X~_ow DJIPeq literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_16px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_16px.svg new file mode 100644 index 00000000000..caf7ddf36b5 --- /dev/null +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_16px.svg @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:16-32" width="16" height="32" version="1.1" viewBox="0 0 4.2333 8.4667" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <path d="m0.92602 3.969 2.2916-1.7207-2.2916-1.7207z" fill="none" stroke="#aeaeae" stroke-width=".26458"/> + <path d="m0.52914 7.9375h2.9104v-2.9104z" fill="#3096fa" stroke-width=".19844"/> +</svg> diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_18px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_18px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..ed6ba251404c7859d402cad390a54b4d0d686f29 GIT binary patch literal 2730 zcmeIxJqp4w6bJB#F6!ps?BF1X&@*&#a`6D-<m%w+;Owr0lQ@RbcI`C;@eX<db*TTR z7DDOAYtli%(ARvt<VTWHdn6m;Rn~Yf5iLX)Q4t+cMcw)2(Nsz(#QUMK&>oH#N|M#A zv1WbGq}#??-M3cAiM(BNtvrYF9E;;{EUuGh6>+kxqE4En<0M(SPTVqaRLj(ftTLRx zVSWRy>+XXfXqrlJLd3~&oW6+#<KcPU6!nE_U5gxAi~aP_KEgWaoHKIBl2X>u-yzPv z?+<8<TT~}ngRu$XioMOEvAjCTp*2O%ndXp%TpMvgNa|;mG^dRHz&5&{GQL;QbHwk8 Y?ngPtJf7$FVU+TJ>HY`Yeg4wCClAF{T>t<8 literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_18px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_18px.svg new file mode 100644 index 00000000000..727a373970a --- /dev/null +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_18px.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:18-32" width="18" height="36" version="1.1" viewBox="0 0 4.7624 9.525" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g transform="matrix(2 0 0 2.0707 .13123 -.34848)"> + <path d="m0.66082 2.3416 1.1469-0.83167-1.1469-0.83167z" fill="none" stroke="#aeaeae" stroke-width=".13001"/> + <path d="m0.46353 4.5126h1.4552v-1.4055z" fill="#3096fa" stroke-width=".097511"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_20px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_20px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..30982d5d41380915caa2201148c10626791e7b8c GIT binary patch literal 3338 zcmeI!yGp}Q9LMoUb&+-ubQcHFt-I(@1P68T5!6j|ad2_yC=TMFg0E0W)7VZr6#5Jb zinAB6FW?2@_pd$lk|sGPIfH|tznt`3J~>HG)0Wo93(n7W%>Ix}k~uQsOglNsa-Lmi z3moV7B`rZ|Wn(|oC81(8q5ZEmzn>S&9~Z^IG;!CH#*Fi%&D2ctOidln#MJe4O%qSY zH1(3qG+vyU){8Q;c*D%B-k@p2>osk8%CzbITj4uUtya&P&8D@V8N7g8HyVwJ@Y&33 zu)fF%xhJ#cLjMSiPpR=dZ;Rts*L9csdzigbo{Yj;;QbTXGgG>~d%cc1L)|U*CEHlH zr{2+^C!;ErN}hV3wCeS`{FTw(hIuj=Ge_GI^L(V7*9D_IHJ<iO@`k&r>f*{IPsY}2 zwMF{9kexV7+H^eTwj>_qZdR|eF57r(NmktaY<?cT?-#hXE9TU~ozj_?>N9x%aAZB- zQD$Dx81j94CI{+#rlp!6);7m&O09Jkbsh|PUY(K$V&i!guqJM7Jx|l#cXhqr07>y| literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_20px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_20px.svg new file mode 100644 index 00000000000..e6b567d5e94 --- /dev/null +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_20px.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:20-32" width="20" height="40" version="1.1" viewBox="0 0 5.2916 10.583" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g transform="matrix(2 0 0 2.0707 .13123 -.34848)"> + <path d="m0.52855 2.5873 1.4194-1.1412-1.4194-1.1412z" fill="none" stroke="#aeaeae" stroke-width=".13001"/> + <path d="m0.19896 5.0236h1.8521v-1.7888z" fill="#3096fa" stroke-width=".097512"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_23px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_23px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..3c42111b2dfd36a9bc3d201e27bde024a2a51626 GIT binary patch literal 4370 zcmeI!ze^io7{Kw1wxCk522s(a6sHz6(52uOhfcOoJLo^)Kj7fvaAU}>;FO`I!;$0? z0&WgcXu*z!4z(bN7V{_g1FqjkbCBfT_uls|m(7<vxy$oB@8{lJ?vfPO@>9<JDD%8a z%o0mP&UxXCvMoL5DKY}bd3Z=AD8Bo+9ceKno*3$n<=!)Jy;pE=_6tGU=+&aH2Jxd> zG?UhkO6p7+UoEM#Nqx1V&nEHpioRm&>xKA=jUO+>S51EWY;!fvH_tYA=zQ}`yAG9a zH`A`G-?y7(-_`Bg&$90feft^7I>k>m<FPwD1D@x}UyY%RdcA&#KRFB>J0N~Ho6W_n zecW5$_qW(yv0cs57hAkqt+vAcKVl~<KeRjkOJ4utI0uZUgC3*X7K_jI8MaUU8!<D8 z-*1Z*1VIkprS`X4t-em{tL)ICwn4Os4`D9JHqI7@^}nU(Qr<@rS9(ph^l<IZ(|1CA z<?|SqoXxPY#i>*(WAuI|e&Ek#X^SOm#{MJMQI>YA)tbgVCOq~hva<1(i8G?)y6%XL zD?Rkz-}AbD-v1|h+I-in>w0u~oh|ndwH@Ld_l<6TTwY~&u8A+yzS~|Cs$=xqSPQK4 zC;3FzvdQk;gBQ4&e9wmKX04m-xAEVr){rKLcSn>lPaBQKt2Bmg4zB!O9&w)Yx}LOo J)|<(1%zsjeaS;Fj literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_23px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_23px.svg new file mode 100644 index 00000000000..6bd39dbfc67 --- /dev/null +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_23px.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:23-32" width="23" height="46" version="1.1" viewBox="0 0 6.0853 12.17" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g transform="matrix(2 0 0 2.0707 .13123 -.34848)"> + <path d="m0.66084 2.9897 1.6823-1.3432-1.6823-1.3432z" fill="none" stroke="#aeaeae" stroke-width=".13001"/> + <path d="m0.33125 5.6625h2.1166v-2.0444z" fill="#3096fa" stroke-width=".097511"/> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index cd5245f702f..5c67480f69a 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -970,11 +970,19 @@ BLUE_INI TEXTFILE "ImageSelectType = Dpi\r\n" "UniformSizing = True\r\n" "ImageFile1 = blue_treeview_expand_collapse_9px.bmp\r\n" -"ImageFile2 = blue_treeview_expand_collapse_10px.bmp\r\n" -"ImageFile3 = blue_treeview_expand_collapse_15px.bmp\r\n" +"ImageFile2 = blue_treeview_expand_collapse_11px.bmp\r\n" +"ImageFile3 = blue_treeview_expand_collapse_13px.bmp\r\n" +"ImageFile4 = blue_treeview_expand_collapse_16px.bmp\r\n" +"ImageFile5 = blue_treeview_expand_collapse_18px.bmp\r\n" +"ImageFile6 = blue_treeview_expand_collapse_20px.bmp\r\n" +"ImageFile7 = blue_treeview_expand_collapse_23px.bmp\r\n" "MinDpi1 = 96\r\n" -"MinDpi2 = 133\r\n" -"MinDpi3 = 150\r\n" +"MinDpi2 = 120\r\n" +"MinDpi3 = 144\r\n" +"MinDpi4 = 168\r\n" +"MinDpi5 = 192\r\n" +"MinDpi6 = 216\r\n" +"MinDpi7 = 240\r\n" } /* Button */ @@ -1275,11 +1283,23 @@ BLUE_TRACKBAR_THUMB_UP_21PX_BMP BITMAP "blue_trackbar_thumb_up_21px.bmp" /* @makedep: blue_treeview_expand_collapse_9px.bmp */ BLUE_TREEVIEW_EXPAND_COLLAPSE_9PX_BMP BITMAP "blue_treeview_expand_collapse_9px.bmp" -/* @makedep: blue_treeview_expand_collapse_10px.bmp */ -BLUE_TREEVIEW_EXPAND_COLLAPSE_10PX_BMP BITMAP "blue_treeview_expand_collapse_10px.bmp" +/* @makedep: blue_treeview_expand_collapse_11px.bmp */ +BLUE_TREEVIEW_EXPAND_COLLAPSE_11PX_BMP BITMAP "blue_treeview_expand_collapse_11px.bmp" -/* @makedep: blue_treeview_expand_collapse_15px.bmp */ -BLUE_TREEVIEW_EXPAND_COLLAPSE_15PX_BMP BITMAP "blue_treeview_expand_collapse_15px.bmp" +/* @makedep: blue_treeview_expand_collapse_13px.bmp */ +BLUE_TREEVIEW_EXPAND_COLLAPSE_13PX_BMP BITMAP "blue_treeview_expand_collapse_13px.bmp" + +/* @makedep: blue_treeview_expand_collapse_16px.bmp */ +BLUE_TREEVIEW_EXPAND_COLLAPSE_16PX_BMP BITMAP "blue_treeview_expand_collapse_16px.bmp" + +/* @makedep: blue_treeview_expand_collapse_18px.bmp */ +BLUE_TREEVIEW_EXPAND_COLLAPSE_18PX_BMP BITMAP "blue_treeview_expand_collapse_18px.bmp" + +/* @makedep: blue_treeview_expand_collapse_20px.bmp */ +BLUE_TREEVIEW_EXPAND_COLLAPSE_20PX_BMP BITMAP "blue_treeview_expand_collapse_20px.bmp" + +/* @makedep: blue_treeview_expand_collapse_23px.bmp */ +BLUE_TREEVIEW_EXPAND_COLLAPSE_23PX_BMP BITMAP "blue_treeview_expand_collapse_23px.bmp" /* File version */ #define WINE_FILEDESCRIPTION_STR "Light Theme" -- 2.30.2

1 0

[PATCH 3/5] light.msstyles: Add Tooltip HiDPI images.
by Zhiyi Zhang 23 Aug '21

23 Aug '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 8 +++- dlls/light.msstyles/blue_tooltip_close.bmp | Bin 3402 -> 0 bytes dlls/light.msstyles/blue_tooltip_close.svg | 17 -------- .../blue_tooltip_close_16px.bmp | Bin 0 -> 3210 bytes .../blue_tooltip_close_16px.svg | 17 ++++++++ .../blue_tooltip_close_20px.bmp | Bin 0 -> 4938 bytes .../blue_tooltip_close_20px.svg | 17 ++++++++ .../blue_tooltip_close_24px.bmp | Bin 0 -> 7050 bytes .../blue_tooltip_close_24px.svg | 17 ++++++++ .../blue_tooltip_close_28px.bmp | Bin 0 -> 9546 bytes .../blue_tooltip_close_28px.svg | 17 ++++++++ .../blue_tooltip_close_32px.bmp | Bin 0 -> 12426 bytes .../blue_tooltip_close_32px.svg | 17 ++++++++ .../blue_tooltip_close_36px.bmp | Bin 0 -> 15690 bytes .../blue_tooltip_close_36px.svg | 17 ++++++++ .../blue_tooltip_close_40px.bmp | Bin 0 -> 19338 bytes .../blue_tooltip_close_40px.svg | 17 ++++++++ dlls/light.msstyles/light.rc | 38 ++++++++++++++++-- 18 files changed, 161 insertions(+), 21 deletions(-) delete mode 100644 dlls/light.msstyles/blue_tooltip_close.bmp delete mode 100644 dlls/light.msstyles/blue_tooltip_close.svg create mode 100644 dlls/light.msstyles/blue_tooltip_close_16px.bmp create mode 100644 dlls/light.msstyles/blue_tooltip_close_16px.svg create mode 100644 dlls/light.msstyles/blue_tooltip_close_20px.bmp create mode 100644 dlls/light.msstyles/blue_tooltip_close_20px.svg create mode 100644 dlls/light.msstyles/blue_tooltip_close_24px.bmp create mode 100644 dlls/light.msstyles/blue_tooltip_close_24px.svg create mode 100644 dlls/light.msstyles/blue_tooltip_close_28px.bmp create mode 100644 dlls/light.msstyles/blue_tooltip_close_28px.svg create mode 100644 dlls/light.msstyles/blue_tooltip_close_32px.bmp create mode 100644 dlls/light.msstyles/blue_tooltip_close_32px.svg create mode 100644 dlls/light.msstyles/blue_tooltip_close_36px.bmp create mode 100644 dlls/light.msstyles/blue_tooltip_close_36px.svg create mode 100644 dlls/light.msstyles/blue_tooltip_close_40px.bmp create mode 100644 dlls/light.msstyles/blue_tooltip_close_40px.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index 847962e6680..fe7760f8082 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -75,7 +75,13 @@ SVG_SRCS = \ blue_toolbar_buttons_split_dropdown_glyph.svg \ blue_toolbar_separator_horizontal.svg \ blue_toolbar_separator_vertical.svg \ - blue_tooltip_close.svg \ + blue_tooltip_close_16px.svg \ + blue_tooltip_close_20px.svg \ + blue_tooltip_close_24px.svg \ + blue_tooltip_close_28px.svg \ + blue_tooltip_close_32px.svg \ + blue_tooltip_close_36px.svg \ + blue_tooltip_close_40px.svg \ blue_trackbar_slider_track.svg \ blue_trackbar_thumb_down_11px.svg \ blue_trackbar_thumb_down_15px.svg \ diff --git a/dlls/light.msstyles/blue_tooltip_close.bmp b/dlls/light.msstyles/blue_tooltip_close.bmp deleted file mode 100644 index 82adf7e5cc1d7e306225f7c7954ef38a29b4c141..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3402 zcmb_czmF0@6dq3#VuBD<4m^!mTtQ=EYj;_=J5OU{Ea~i|(}Ko=(n!gFLHHS9L%AId z4VT+Bh8PM8{szLq^LxvHvtfga!-luB^WOJ8X5P&EjQ4LJ2>1Dc_cvG!_6l}KybyOW zT4B7l9ui{p;|Lj-AHHru{^7W{75^O-!tTM|Y=w3@7|*;7A1kwGu#Y=wn;_#{JoAv} zI*oAx<N2)+&ZiC3_ruNsH<$RS5I<k8U``6Yk@PPye(|LX=QCmpi5p`)_2TR#)-aTD ztjYQAjo%dh#%xE3Ur)X9_3Ro)Yxfmw8Ao@7c}ejNz<<1E_>ZFq@Rq{Cf4a5edcn`} zAkQcSd_&<fzbnM#eh~Hwqnkr_FS<3=J=>sn>?V)e`rNTY+;z8S`Rp`$&W6f3ZRFUu z_YH7N?)_|xqS++%GI81~2jiKy=4TT`uvsQaf%JoMjCXm+b8$lH^JALGJhzzy?bHuo zbHL6eeu~l6590}?@I8|LW#*WC_2WEAd0-Zd!+(u0<K)qgvp6LY8_GPqH;;aRUr=I> z@rZo&<K1(L0oPZs<s$S0wJRyU!PyDz)Q_u&6an5+IF9mdaXd)>U!772yoSQ%y>(wd zqrm#1n?rXmx;523TirW$h`a9go@URX4q=>qd*9x_NRWa4Gr9LGl}fbHX!Pp!`d<3M zc;+d5f^Sx<)dJ}U;}{Pk&Qq;c)A*k79Ci!ePW?bU2i#oZr_E;5)eq!N!A8=*#OSLZ z@aJI*i5s_CEsuU+UrEG<GR|xA=m+KnCFTI{s~??CCk9-9jm6r^#bWUY^U~UfanNqJ zcj|{}ni1eEh2tpS7RQ6=2XG;*p`mcO{#~p;uzu*~(A|q}O?A&!_l_Onu5-`GGyLzK SLmk4%(T45Y`vy2B_|ZStLw0Ha diff --git a/dlls/light.msstyles/blue_tooltip_close.svg b/dlls/light.msstyles/blue_tooltip_close.svg deleted file mode 100644 index 4a0e66448bc..00000000000 --- a/dlls/light.msstyles/blue_tooltip_close.svg +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:17-32" width="17" height="48" version="1.1" viewBox="0 0 4.4979 12.7" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> - <metadata> - <rdf:RDF> - <cc:Work rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> - </cc:Work> - </rdf:RDF> - </metadata> - <g stroke-width=".26458"> - <path d="m4.4979 0.42636-0.453-0.42636-1.796 1.6903-1.796-1.6903-0.453 0.42636 1.796 1.6903-1.796 1.6903 0.453 0.42636 1.796-1.6903 1.796 1.6903 0.453-0.42636-1.796-1.6903z" fill="#aeaeae"/> - <path d="m4.4979 4.6597-0.453-0.42636-1.796 1.6903-1.796-1.6903-0.453 0.42636 1.796 1.6903-1.796 1.6903 0.453 0.42636 1.796-1.6903 1.796 1.6903 0.453-0.42636-1.796-1.6903z" fill="#ff1744"/> - <path d="m4.4979 8.893-0.453-0.42636-1.796 1.6903-1.796-1.6903-0.453 0.42636 1.796 1.6903-1.796 1.6903 0.453 0.42636 1.796-1.6903 1.796 1.6903 0.453-0.42636-1.796-1.6903z" fill="#d50000"/> - </g> -</svg> diff --git a/dlls/light.msstyles/blue_tooltip_close_16px.bmp b/dlls/light.msstyles/blue_tooltip_close_16px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..3180921ac29fecbf0fc46b05b4c92054da45db67 GIT binary patch literal 3210 zcmbtTK~6$35UtUr3kfJe6XOja(E}I|Sr|87#jPjcECd#?11_Qd7|#It9HGvX&bNKP z{WN@HZ9DVc%=FEl{_FT$nctZHf6%(1)uVNy?$jym%KG{E|I<qC|JbDaqqp~eU)t%c z1p8?!m93Qe?v`9pLq?@CN4ObPm2J~v7%pKA$L7s8_MTJB`)FEIV}ac%_4TmFa_xmZ z62rqdT*>D7AqM&+uW)5Y9KQu^F|Ne$^kJPut3-V{j+c{rL+?41SMtaBRef=}b?W!( zwmtG}&=)tahlBolzJL~o{3T7C7%5z-Glb<isxv>I4dO44=<iyo-`3zpH=o*iHM-I? zLutR^rS36DxOCREwka_zcWXH&FP%5`o<DbVbpAQMgWU}~+RQ)LbFsUx0ZhRa4EVhm zRX*YK9>RreE(gz`59=gaCFvWegL~t>2Xo>bYBv0;zPS84^+R6MBd|rk55Rf-1z$;v zL;irKMT``#=o7+HZ&tL9o}ZUn-5~xl^vz3N+_{cHTdyClb!$4EHfgPBCC~qCHtSiA za5dexDKRXUvCJ`fY2Vm;PX6fp6Q=86cazD)%s<$3vAgdEOu-cl_`MiaKH>8o!i8)u z2hX4n>m*tw=^Lnnb@twaIq?oP8-7(^Tz;MUA+PBX*rMMD;Jp5VucXBxe?ZeBMhaK- f31P{`GjR0$EEbCfX}%17^O6^LTgQ4npSS)1w*yU5 literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_tooltip_close_16px.svg b/dlls/light.msstyles/blue_tooltip_close_16px.svg new file mode 100644 index 00000000000..1b2c048585a --- /dev/null +++ b/dlls/light.msstyles/blue_tooltip_close_16px.svg @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:16-32" width="16" height="48" version="1.1" viewBox="0 0 4.2333 12.7" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m4.2332 0.42636-0.42634-0.42636-1.6903 1.6903-1.6903-1.6903-0.42635 0.42636 1.6903 1.6903-1.6903 1.6903 0.42635 0.42636 1.6903-1.6903 1.6903 1.6903 0.42634-0.42636-1.6903-1.6903z" fill="#aeaeae"/> + <path d="m4.2332 4.6597-0.42634-0.42636-1.6903 1.6903-1.6903-1.6903-0.42635 0.42636 1.6903 1.6903-1.6903 1.6903 0.42635 0.42636 1.6903-1.6903 1.6903 1.6903 0.42634-0.42636-1.6903-1.6903z" fill="#ff1744"/> + <path d="m4.2332 8.893-0.42634-0.42636-1.6903 1.6903-1.6903-1.6903-0.42635 0.42636 1.6903 1.6903-1.6903 1.6903 0.42635 0.42636 1.6903-1.6903 1.6903 1.6903 0.42634-0.42636-1.6903-1.6903z" fill="#d50000"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_tooltip_close_20px.bmp b/dlls/light.msstyles/blue_tooltip_close_20px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..f84b4be814a946e52a97e63e35247b9d6ef45694 GIT binary patch literal 4938 zcmbu>T}}cq5C`xYJ%JkJ(S!KJM@&q7@hS$Mzyy5Ky8u`45Wscn{JWjCw%c~5Z0wfp zGQaIkTk7QX<<7X{o6ajL_f(#!T$x96P4&+$osz>E)BWL&ojkw2Cts;F+zj47Qx}e( zgSSMDh=qaUyfEfOy+k>Fb#0pSX%ob+$=m*2Yt7JdeL}kFXfbnEC+f_ar7@+J#MD|P zv(?I(Jg35O<nK!Bc-$|s@XX{L8|Qq^;&;}rBdkY`MUCsBHc8%+cl2urv2i|Y{VZAB z7pW<+q^8EInJreyJTHT>406vgwfbK^Ke}%_v%%tLIn!Il%pUBDO7s4KSQyY}W4oZw z7G*xN>iuInwi}M0j_i6qwp+f|nxW;4k##w1F>@AYRAbgGjVZMxrq(K%aXw}~_Z(BJ zlXyR;!f~t_@%=$l*{{${^3^!!VGdb5@3rfQ;;<gw8uT@;leX|(a-Wla1^J5eS?g!X z;^#|Ei6u2PR?Td&N+x;Bek_CBb4;xc^GW05e)FB#VDYnHvW2$8;jr56cFp?-Vqw7A z@AnHT7KPf?`v=8sg7`JLTfWwsq2&#?f3%o63-63WW7e!rl$laXVrs3D8Rvs+)&DyK z@or9$gIZ<f`gw^3lj8fi>aC_ZpR-y`tVfPTjq9N{&P%DL`1l?B+{a^7Tkj={`ye$X lmekZ(HM7MknUs$unLPLV+;dE=j`HdD4{xe1ewH_#^$Qcgd0hYi literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_tooltip_close_20px.svg b/dlls/light.msstyles/blue_tooltip_close_20px.svg new file mode 100644 index 00000000000..9fcc2c42a6f --- /dev/null +++ b/dlls/light.msstyles/blue_tooltip_close_20px.svg @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:20-32" width="20" height="60" version="1.1" viewBox="0 0 5.2916 15.875" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m5.2916 0.53295-0.53293-0.53295-2.1129 2.1129-2.1129-2.1129-0.53294 0.53295 2.1129 2.1129-2.1129 2.1129 0.53294 0.53295 2.1129-2.1129 2.1129 2.1129 0.53293-0.53295-2.1129-2.1129z" fill="#aeaeae"/> + <path d="m5.2916 5.8246-0.53293-0.53295-2.1129 2.1129-2.1129-2.1129-0.53294 0.53295 2.1129 2.1129-2.1129 2.1129 0.53294 0.53295 2.1129-2.1129 2.1129 2.1129 0.53293-0.53295-2.1129-2.1129z" fill="#ff1744"/> + <path d="m5.2916 11.116-0.53293-0.53295-2.1129 2.1129-2.1129-2.1129-0.53294 0.53295 2.1129 2.1129-2.1129 2.1129 0.53294 0.53295 2.1129-2.1129 2.1129 2.1129 0.53293-0.53295-2.1129-2.1129z" fill="#d50000"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_tooltip_close_24px.bmp b/dlls/light.msstyles/blue_tooltip_close_24px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..6df29c0f3c7943940009b72cc0f25d3e80ac538e GIT binary patch literal 7050 zcmcJRO_CBZ6vt!f5kycoE~$b!grm;r!i`sP>j~y46i{3MID>o)3-?sPCF1+1^O`1= zG<h#QsR`+%$?yNZhUEU|(?{dl6Mg=nKA`@c`YZFvyr$9k_jtTCYfSZrC42w)>-Xhd z-qV}t*Y+c0_A6ulzKgyVErJ0Sm}r|JJs+u)<@<v%&+n^s&F8-!F*crcBG#Cmp#?Vg zoz4$uH|?!C;Q5&Bx52v5k1M;`&IZG2D>ZJhInEl5T((9-%9dzo**O}e>?@71-Y}1> zA$OV<%{kW}#zqZl_}G)w=ztA=G~ONAo@8^33Vd*JiR7}2{6_8ewnp<I@S}~5e4uGH za@duETtmW^YG~NG8YS!;jh8+jyFA~o>gsIF;jZ!!8qe#pyTetimKU}$p9gmIwQpAs zeXIPPWwtS3fCVO2A3oS2&5zVA^~2*^tG@sI7}y>$HlB4NtuZ~X{2YAyt#5Z4Kd=XT zn=G)sKignk<VRq)vy*r=qeSBtn=_-)$YpCZq-=?XmYt(f%5G|e^@e$D4Y}iek};8U zuD{~{N7&M$QP;P`=J30Tcz0rZ3!7u4_5pE;<ubM=&2PePXKNxK*?zRKIX7C39JW?N z!j@`i*tr@d>>Lf8Va>A(^(U=2=wMG+yI^;Dz6W)6CceA>c#U<*-Juz)FMYdYHrA)p z>1aNmuc)hjXPJ!=46wk&oW>!|kJK&o!)!KF-+v~PNskyC&pOdKrVhKo=Dwq6u^-q& z9ebIB(Zz(uZLlu#Be0wKHG|mDR%zT~BL`?2ja+u6Ak&btB^p|Gjz%dv&<N`d^VpiW zo}rV-IoBV?x(3-U>DZ!C%!VzAcz0rZ3!7u4_QA&`mdn_hD8C82ovn#{Wc$&^=GxF| u<gm3G61G%B!_L(xVdrR2u3q$f?DBjM>gv2$EZqIaYphG|4neGz%>EA#R|S9o literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_tooltip_close_24px.svg b/dlls/light.msstyles/blue_tooltip_close_24px.svg new file mode 100644 index 00000000000..4564e4991f2 --- /dev/null +++ b/dlls/light.msstyles/blue_tooltip_close_24px.svg @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:24-32" width="24" height="72" version="1.1" viewBox="0 0 6.35 19.05" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g transform="matrix(1.5,0,0,1.5,1.1e-4,0)" stroke-width=".11759"> + <path d="M 4.2332,0.42636 3.80686,0 2.11656,1.6903 0.42626,0 -9e-5,0.42636 1.69021,2.11666 -9e-5,3.80696 0.42626,4.23332 2.11656,2.54302 3.80686,4.23332 4.2332,3.80696 2.5429,2.11666 Z" fill="#aeaeae"/> + <path d="m4.2332 4.6597-0.42634-0.42636-1.6903 1.6903-1.6903-1.6903-0.42635 0.42636 1.6903 1.6903-1.6903 1.6903 0.42635 0.42636 1.6903-1.6903 1.6903 1.6903 0.42634-0.42636-1.6903-1.6903z" fill="#ff1744"/> + <path d="m4.2332 8.893-0.42634-0.42636-1.6903 1.6903-1.6903-1.6903-0.42635 0.42636 1.6903 1.6903-1.6903 1.6903 0.42635 0.42636 1.6903-1.6903 1.6903 1.6903 0.42634-0.42636-1.6903-1.6903z" fill="#d50000"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_tooltip_close_28px.bmp b/dlls/light.msstyles/blue_tooltip_close_28px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..1f156a94a8a0a5d681cf9e9727ff0e9bb139e6a1 GIT binary patch literal 9546 zcmciHPj1>k6b5itp;t&)bkRk7f?lA?A62T<O+~wCj?ryT&>OHtSV$n?2=oA5mdgOr z^nK%b#Bq#0Gw%bGVZso-pWoQ?JXUVMe12c}*Kc|MCGCy0k+fIE+u}<4Kkwx2#mf~% z^@DHR?WeClU;IhWz@YW}jSO!~Y2RDFHVq;sV#C18NqXC<G|6OpkoKb*XS{D^3b(ru zdr_G_FId|4@;f0<pBG|jT=bYj97A*5nCG*+)I-e2YSx%$pQY!CVa8evGu5(~xmJ#8 zwNgx$6=SlkqltRdT%Y*dHb$ruaD6V#__~hK*VeKgr?o$6p20fisI|A58?nZBTIw3> zZGG-r>-?Fnm#%BR^?Vxg?6Nd}mKkHQ%oNLN=2*F=#Y#09R;<aiV$4hL2mO8*`@%ES zc|Ui0Uy=Rp-`CX)cyl7=qs|Dghxu>zWEI87!VT_kTzNlqr2FO5(IO^d!@%e_d47=3 zQ)y1xK^pDeayN7%iMK=ShikVu=2cnn(DsZxLtgt3Q)8Fm7@FgzJnMPYyu;nK^VbK{ z?6dUDGR#<uVWwIZGuO&7tyYT3vSLiOrRIrsi}l)Evy?gkH{{ZcuQdbxaV_g{TKf)@ zZq;)1wYOHId~WiYR^xjtol{f2t<U`>ua~ZC{>1sr&a=zX{8?s<#WGVYtC?fvnieb7 zWLU8#(~2>r7L|?qM5*&9>O>j#yJ}KvZ<srOU%`I&L*e}MgExn6qWeRg7e){B;l|C> zLd?x(Ggz<Jr8N5U17adJ3|RB|{A#sYO{F<$hvjlfySGTJk;L4E*bB`oe1?a%XXJ?( zh*gh`Ji{?O8<)Q^<=Mzf^EgOc|NOu-`z)M8yclMzRf#q;)v}nmR*q@4QcRW=W3nwZ z+tzJZ$IUfMsS|KRF3tG5j?o|2vL2_k?=b0BEk~`r&vKJvq1E^vOI=gFt<U`>ua~ZC z{>1sr&a=zX{8?s<#WGVYtC?fvnieb7WLU8#(~2>%N0WN1bpk!5&bQSGSlI8@Ols{7 ZbEo%}#dtjS&kw<zNN)81KLm58)_;ze#<l<e literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_tooltip_close_28px.svg b/dlls/light.msstyles/blue_tooltip_close_28px.svg new file mode 100644 index 00000000000..214eb8780a9 --- /dev/null +++ b/dlls/light.msstyles/blue_tooltip_close_28px.svg @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:28-32" width="28" height="84" version="1.1" viewBox="0 0 7.4083 22.225" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g transform="matrix(1.75 0 0 1.75 .0001325 0)" stroke-width=".093313"> + <path d="M 4.2332,0.42636 3.80686,0 2.11656,1.6903 0.42626,0 -9e-5,0.42636 1.69021,2.11666 -9e-5,3.80696 0.42626,4.23332 2.11656,2.54302 3.80686,4.23332 4.2332,3.80696 2.5429,2.11666 Z" fill="#aeaeae"/> + <path d="m4.2332 4.6597-0.42634-0.42636-1.6903 1.6903-1.6903-1.6903-0.42635 0.42636 1.6903 1.6903-1.6903 1.6903 0.42635 0.42636 1.6903-1.6903 1.6903 1.6903 0.42634-0.42636-1.6903-1.6903z" fill="#ff1744"/> + <path d="m4.2332 8.893-0.42634-0.42636-1.6903 1.6903-1.6903-1.6903-0.42635 0.42636 1.6903 1.6903-1.6903 1.6903 0.42635 0.42636 1.6903-1.6903 1.6903 1.6903 0.42634-0.42636-1.6903-1.6903z" fill="#d50000"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_tooltip_close_32px.bmp b/dlls/light.msstyles/blue_tooltip_close_32px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..c830714715a8ad11f1b9cd33b3ecb0bd82d7010e GIT binary patch literal 12426 zcmc(iv5pfl5QZ0lfF~eVUO`90BcR*?N)aI;(en<pJi)z0`c;yRQshZUMZsevsmzSy z**JS^kL?*NtMkpC?Va!U*dCv!^QVuEeV*X=Zz%UrenNQxZ!f_%t{q=5k7=6o4_2A! z*YCeBZE0_>g5Cbin`Xa+@;cZ>+<?B3fh_;o&!GMQ1xB~uHO=2Qeyh&AWp5ng1oqq6 z?-d*Q6*OG2iQzQZm{Xl^x1dE~E-V{;`M&Ah&G(+-LiJ>Yb1^z@&-cH#ZVqr=C~HV% z)9T{-=d4N27mb_PWV!EBG;lsbYz+-kwnT##yF`OFJ4Zt;_LYWE{=oWJn?n9V9nmpT zKJhK&EpDCD_)=}Mh6-%b$ZDv_Mhz+alpICl$+0Y(=3jVbjcH0|SI}VDu{{=R6Yjt0 zxZPUg`joB*&ac0}xxTp?IDbBy)(iJdss_%_7+Xt&ge}#e!7kOH$<EbKgPo({=JyZ0 z`yHWB?nJA6j*Z56cn2g6%Iwj(@YsDj#-Y>yzlHpxwQ*>{y1VbC?aRc>AMeca#|I-k zGcG=dZ|EBt$nx8!cV_lDF$XB-^E<Pfy*KLjf6Jbj4Kkpdpx7ArY}cl)VZcUyuL0vh zT;D!S%vNJA&<FbRefRHfzTt0*3u&`fIv0U)_r5>f8+-rf`jxB)&L^>H9diA1G;qF# zY)uWNYz+-kwnT##yF`OFJ4Zt;wyz<SKd?U5hT6!F#Ky+h=dyE7eU@7!T>slt4VW`S z``h<d^3G|f$ws{?{G2?Q69bM->p*&DjcH0{*U*6M*dB|u;kRSsNv(^Go7NiFr*u7V ze*Hbh_0845`SaNnOYWOg4V<4bww4A7TdF~WU8+HoovWb+J4eH<?;q~|b)?*hmU0V? zLuvyt9^L`125mNJA86>=)b8TY#r8M#EwxTV3o(9n|KDsj^VMp#Y};0JX2i6iZ)70L z@7HzRY`tC|pcp7Sc+~Iz$OhjV$2fttF&MCsudZRhCWh63@o-G4w-)NR8gt=dz6~(! zd_x<><w^t8i{>IQZer{fi-o=abNx!z1Lu?2v<|ucIT|=$L$;=dQnrQ$DO;jJi(R5Y zo1LSf7Tec=xhRl7wy`$UMt&rg86)Kr-}bph!u7w+(4fvH9SIt$u~9<`KPOMpxKeBa zo9171W{qjdV5@6Dc5IKu+VI=4@ub!<<F;#!>r=WOIKTcG%Jt3F!1?pp6ie=#R1KV; zF}9Wl30tZ`gI%gYlbx%f20KRs<d2))KivK6IQaiU^&AVtcz6dS4XW(GT=Z;e$2h=T Tbg}(SeM_y2LkqF)@BjY+-`XP* literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_tooltip_close_32px.svg b/dlls/light.msstyles/blue_tooltip_close_32px.svg new file mode 100644 index 00000000000..cf07f1835c8 --- /dev/null +++ b/dlls/light.msstyles/blue_tooltip_close_32px.svg @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:32-32" width="32" height="96" version="1.1" viewBox="0 0 8.4666 25.4" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g transform="matrix(2 0 0 2 .00014667 0)" stroke-width=".066145"> + <path d="M 4.2332,0.42636 3.80686,0 2.11656,1.6903 0.42626,0 -9e-5,0.42636 1.69021,2.11666 -9e-5,3.80696 0.42626,4.23332 2.11656,2.54302 3.80686,4.23332 4.2332,3.80696 2.5429,2.11666 Z" fill="#aeaeae"/> + <path d="m4.2332 4.6597-0.42634-0.42636-1.6903 1.6903-1.6903-1.6903-0.42635 0.42636 1.6903 1.6903-1.6903 1.6903 0.42635 0.42636 1.6903-1.6903 1.6903 1.6903 0.42634-0.42636-1.6903-1.6903z" fill="#ff1744"/> + <path d="m4.2332 8.893-0.42634-0.42636-1.6903 1.6903-1.6903-1.6903-0.42635 0.42636 1.6903 1.6903-1.6903 1.6903 0.42635 0.42636 1.6903-1.6903 1.6903 1.6903 0.42634-0.42636-1.6903-1.6903z" fill="#d50000"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_tooltip_close_36px.bmp b/dlls/light.msstyles/blue_tooltip_close_36px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..a2db16910aeb3d47f4dd8b3a8670bbb2993227c0 GIT binary patch literal 15690 zcmd6u!H&}~5QdH50jeUj2sm)y0V*VJAfYa+m5{jb9Nf6>6YwaN+TN=iIQP;Eg_mg6 zM+h@%X4lQe&dhjhCEBdJ_W1w5jFY$;Y3JX*esaz63x40h`3}w>a6WNw-BW0Pe}rF; zj@r5N502FH+wVUgg$#5&3y$xn&h0Db{=N@}m=B;AdZM>~>?Y8+g%hrJe{$~62Y)or z=lu-44z1_Txqr{kJ{K&=Q-JA$g*;oPCSTO&x5qqd*Q^m}H`nd^;b&YsKX2V}<F(^@ zapO|%B&mlqUc#o;*3OHurD~?m_t~tpEOab1tgg+Pg}5}jnmOdhX(jrSSdMonhU3GD z3F&M4qwjfq|A+Q~O#2RALo^57y$1g_-f#Ny$Yv_QLVSZv1zA|@R*+{fH*_BrU}Ccr zU>ei&9?eU;E}R&89#UF~k0e&Zq|w*R;jpFXrp)bQv(U59KsGBK3oT0)%DYxmJCA&0 ztyEhYAM*~4aXq+kAs<OU$7^i$gt66IFy9wU1->Vs=f&FX9_mpzhDXD+DN`FeJGM+v z^P$=p^*eX_rk;Mes;l{{x>)@Xz0ecAA4r`0JgFzpzlF1g^K|{P&R##fc~Q^6>(F}c zu3y(p{jkG=JlUB#EacfRfq&I9P(QWD9BbFE(J|mz1z3s6bnUoa+&KT9lYW+ZNaH0u zT5avT7+b1l>U^KgO3OmWLc{9XtXYUlqpO)iew<dKFNx)NhhjKBoS2Zlrhni)kMIA` z9*||<!D|@E0qrq<Yr5a`<x#+torU-qOvPB3>sE}1ksG>yvNH)-vNMh8c^}A2vo4$% zdLB|*iH{^!!=%yI%;B)5=%&o=W3$k+&_FgT9Sbc>7RtL;Q#+4*W35zM8Xxlxjd4A= zaUmZ`KgVlq^@Oq2TQJ`prtIGn(6h64_w^_o!vmRauIf#R+Su9go~feR81-YjSS+Ti z)v8)9m&NLb=!Kr>?X#@c>k0I4;jH02L0tCwA$ZQf>(F}cpl#}h9Tw!t&eUNc&xQ&7 ztCoTKsXgXcyLOF^0naMHN=&9}$MxdI`S+akv(!TxFX7Q@Yv;w-QZ-ZO`)pQP7CIIh zR@Y|DLR=bM%^dRMv=V(uEXO+(!|~z7g!DE21Mhi!|A+Q~Ec*^#!$1ybkMUd6{iZLE z0;cRN#K&MN#==~;Vmyr8(EXF0Nx+hwX-v=iKwg@4;l$AMkkU$gB(WMMjlO0Mhb=`n zWo{pvg`R~5vRUa^Xj!sQ-nE+AdE^^wrP|W?n0IK5>%ol+`AGUXUL&k0__d$x`yl2s nkf%@$DEs$>9;SO1T7O{1JZ)ef&t4nzJh4WG^{4iKbDjGSZgXOz literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_tooltip_close_36px.svg b/dlls/light.msstyles/blue_tooltip_close_36px.svg new file mode 100644 index 00000000000..9881bff0a43 --- /dev/null +++ b/dlls/light.msstyles/blue_tooltip_close_36px.svg @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:36-32" width="36" height="108" version="1.1" viewBox="0 0 9.5249 28.575" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g transform="matrix(2.25 0 0 2.25 .00016917 0)" stroke-width=".055432"> + <path d="M 4.2332,0.42636 3.80686,0 2.11656,1.6903 0.42626,0 -9e-5,0.42636 1.69021,2.11666 -9e-5,3.80696 0.42626,4.23332 2.11656,2.54302 3.80686,4.23332 4.2332,3.80696 2.5429,2.11666 Z" fill="#aeaeae"/> + <path d="m4.2332 4.6597-0.42634-0.42636-1.6903 1.6903-1.6903-1.6903-0.42635 0.42636 1.6903 1.6903-1.6903 1.6903 0.42635 0.42636 1.6903-1.6903 1.6903 1.6903 0.42634-0.42636-1.6903-1.6903z" fill="#ff1744"/> + <path d="m4.2332 8.893-0.42634-0.42636-1.6903 1.6903-1.6903-1.6903-0.42635 0.42636 1.6903 1.6903-1.6903 1.6903 0.42635 0.42636 1.6903-1.6903 1.6903 1.6903 0.42634-0.42636-1.6903-1.6903z" fill="#d50000"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_tooltip_close_40px.bmp b/dlls/light.msstyles/blue_tooltip_close_40px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..91cbb58b98c162c9ba5b84b0402459dad30ea679 GIT binary patch literal 19338 zcmd6sO^(w*5QUB441^_1&M^eBKy0`QSrCa`q*)ASN#-(Su4B5Al+!WYomW3yo(NNs z`_+4&+xGY;58t1@4X4jj`u}%YKBeVXTHXvFhqtK?mvQ=f{fxtK{zt3Ehp#_=UdOO+ z@0zmXb{LM2O-a{5$|i===eS8@Y3onRpOT{Qy1%<?{tNB0>~q7m0AtR^bHt2Awm`-b zTh7=T@4c_lY*d#W66UYcOsU=isLj&$Nm#8J*8Uc&m$#Qs&g$*y>F4R?z0JMYnA75K z>E(Q+YH~C^2un>P$&+Ynd7AY|E~3$7qdj-?`QD;bgYMf@j6rNX&mzWPHWA}OY{Ur7 z;X-^68=oV=j3TyRMipBS<LUX7vr3hoUuh|g@w!gW*LUYFJH{kh{##(FnmkR9hS8E^ z=|xyQ{5?EMte(D}Uc~C{=jqvljrWh$+uF|@t*Xt?_O)1QW6~_CzLqOlk7lAeNj9oQ zvS0iAN!r#TV|G17=R>P2%_G0xWzQSNKsL_L8Ru-QIWaE4#`(lpV;hFgt8x2fHFml` zV}^RAY+@)W*6+v7dNq!x<--_0hbebA<*&w@-#>2H7GRvQo#*JnSY!)itguatcgDwc z$9;`vqq@>@t6e9}l<Kuy)ThnT_DNW+8P@(5tCzQzPtNM?>FMX`<-N_l*qGDeZ|UWH zq-t_BJqSxpBgvC!Yk8XWNG_t$WTQQI^ZDMQR6AbFbAA<L5F2xf7=zhFj0>?5BQ%E# z@j+~Sjs!D`*n$~VY(b3le46<9+2y}V<A{dOFVA{+-m+s%qV-_Z<Y{^|td<;0FT(2K z@8MBm_4M`hB35rdPtP7~ynn3T)_&$_Rc(g0uf<XulV(ZvwOq-1G!xZHvQaIP{o3D8 z(zX^Ev+F53A6i{y9_#O*1KD_+W{fv%lZM{mFTghCpWopZ*+}#J{Jh=o_ly1hLD|H> zym>tw4x6-$mnHo7kHog){KR-OhcmWt#++@=SYZoeEV1Q`t?`Sl+rCD#QC)t#TE9y( zrFsjWHcQ(lVYOyh`&+DD-d;XAtGB18pQo4iHuqv<PK&>#m-CUT$<g#6EH#ZJPok~m zY1SjTh(?o*_5k^OZ&9k<uH`wuk}-shIfaa&Y(mCG*oYCF!$tT&Ha<r}8HH@2j7qi; z#>Do>&n~4(<A{dOFV70h+jNXcv>uF_JWY>=)skcBMOZ!jJv>URp1z)5#Om$m>Dhyg z_m9=v+Rq%Vs?E^$wODFn(k!XImMdA0W}-StHmXIk({(g|uglkQuG2LO&6Mg|jQpOr i!q}aSx243$Y^<3vhOu#e&Nydd&4n?Xjq{0d&h`%jAC;m2 literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_tooltip_close_40px.svg b/dlls/light.msstyles/blue_tooltip_close_40px.svg new file mode 100644 index 00000000000..a13b9ee7149 --- /dev/null +++ b/dlls/light.msstyles/blue_tooltip_close_40px.svg @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:40-32" width="40" height="120" version="1.1" viewBox="0 0 10.583 31.75" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g transform="matrix(2.5 0 0 2.5 .00019167 0)" stroke-width=".047328"> + <path d="M 4.2332,0.42636 3.80686,0 2.11656,1.6903 0.42626,0 -9e-5,0.42636 1.69021,2.11666 -9e-5,3.80696 0.42626,4.23332 2.11656,2.54302 3.80686,4.23332 4.2332,3.80696 2.5429,2.11666 Z" fill="#aeaeae"/> + <path d="m4.2332 4.6597-0.42634-0.42636-1.6903 1.6903-1.6903-1.6903-0.42635 0.42636 1.6903 1.6903-1.6903 1.6903 0.42635 0.42636 1.6903-1.6903 1.6903 1.6903 0.42634-0.42636-1.6903-1.6903z" fill="#ff1744"/> + <path d="m4.2332 8.893-0.42634-0.42636-1.6903 1.6903-1.6903-1.6903-0.42635 0.42636 1.6903 1.6903-1.6903 1.6903 0.42635 0.42636 1.6903-1.6903 1.6903 1.6903 0.42634-0.42636-1.6903-1.6903z" fill="#d50000"/> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 9db8903412d..cd5245f702f 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -936,10 +936,24 @@ BLUE_INI TEXTFILE "\r\n; Tooltip\r\n" "[Tooltip.Close]\r\n" "BgType = ImageFile\r\n" -"ImageFile = blue_tooltip_close.bmp\r\n" +"ImageSelectType = Dpi\r\n" "ImageCount = 3\r\n" "SizingType = TrueSize\r\n" "ImageLayout = Vertical\r\n" +"ImageFile1 = blue_tooltip_close_16px.bmp\r\n" +"ImageFile2 = blue_tooltip_close_20px.bmp\r\n" +"ImageFile3 = blue_tooltip_close_24px.bmp\r\n" +"ImageFile4 = blue_tooltip_close_28px.bmp\r\n" +"ImageFile5 = blue_tooltip_close_32px.bmp\r\n" +"ImageFile6 = blue_tooltip_close_36px.bmp\r\n" +"ImageFile7 = blue_tooltip_close_40px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 120\r\n" +"MinDpi3 = 144\r\n" +"MinDpi4 = 168\r\n" +"MinDpi5 = 192\r\n" +"MinDpi6 = 216\r\n" +"MinDpi7 = 240\r\n" "\r\n; TreeView\r\n" "[TreeView]\r\n" @@ -1190,8 +1204,26 @@ BLUE_TOOLBAR_BUTTONS_SPLIT_DROPDOWN_BMP BITMAP "blue_toolbar_buttons_split_dropd BLUE_TOOLBAR_BUTTONS_SPLIT_DROPDOWN_GLYPH_BMP BITMAP "blue_toolbar_buttons_split_dropdown_glyph.bmp" /* Tooltip */ -/* @makedep: blue_tooltip_close.bmp */ -BLUE_TOOLTIP_CLOSE_BMP BITMAP "blue_tooltip_close.bmp" +/* @makedep: blue_tooltip_close_16px.bmp */ +BLUE_TOOLTIP_CLOSE_16PX_BMP BITMAP "blue_tooltip_close_16px.bmp" + +/* @makedep: blue_tooltip_close_20px.bmp */ +BLUE_TOOLTIP_CLOSE_20PX_BMP BITMAP "blue_tooltip_close_20px.bmp" + +/* @makedep: blue_tooltip_close_24px.bmp */ +BLUE_TOOLTIP_CLOSE_24PX_BMP BITMAP "blue_tooltip_close_24px.bmp" + +/* @makedep: blue_tooltip_close_28px.bmp */ +BLUE_TOOLTIP_CLOSE_28PX_BMP BITMAP "blue_tooltip_close_28px.bmp" + +/* @makedep: blue_tooltip_close_32px.bmp */ +BLUE_TOOLTIP_CLOSE_32PX_BMP BITMAP "blue_tooltip_close_32px.bmp" + +/* @makedep: blue_tooltip_close_36px.bmp */ +BLUE_TOOLTIP_CLOSE_36PX_BMP BITMAP "blue_tooltip_close_36px.bmp" + +/* @makedep: blue_tooltip_close_40px.bmp */ +BLUE_TOOLTIP_CLOSE_40PX_BMP BITMAP "blue_tooltip_close_40px.bmp" /* TrackBar */ /* @makedep: blue_trackbar_thumb_horizontal.bmp */ -- 2.30.2

1 0

[PATCH 2/5] light.msstyles: Add Scroll Bar gripper HiDPI images.
by Zhiyi Zhang 23 Aug '21

23 Aug '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 8 ++- ...=> blue_scrollbar_resizebox_grip_16px.bmp} | Bin 2314 -> 2186 bytes ...=> blue_scrollbar_resizebox_grip_16px.svg} | 4 +- .../blue_scrollbar_resizebox_grip_20px.bmp | Bin 0 -> 3338 bytes .../blue_scrollbar_resizebox_grip_20px.svg | 26 ++++++++ .../blue_scrollbar_resizebox_grip_24px.bmp | Bin 0 -> 4746 bytes .../blue_scrollbar_resizebox_grip_24px.svg | 26 ++++++++ .../blue_scrollbar_resizebox_grip_28px.bmp | Bin 0 -> 6410 bytes .../blue_scrollbar_resizebox_grip_28px.svg | 26 ++++++++ .../blue_scrollbar_resizebox_grip_32px.bmp | Bin 0 -> 8330 bytes .../blue_scrollbar_resizebox_grip_32px.svg | 26 ++++++++ .../blue_scrollbar_resizebox_grip_36px.bmp | Bin 0 -> 10506 bytes .../blue_scrollbar_resizebox_grip_36px.svg | 26 ++++++++ .../blue_scrollbar_resizebox_grip_40px.bmp | Bin 0 -> 12938 bytes .../blue_scrollbar_resizebox_grip_40px.svg | 26 ++++++++ dlls/light.msstyles/light.rc | 56 ++++++++++++++++-- 16 files changed, 216 insertions(+), 8 deletions(-) rename dlls/light.msstyles/{blue_scrollbar_resizebox_grip.bmp => blue_scrollbar_resizebox_grip_16px.bmp} (55%) rename dlls/light.msstyles/{blue_scrollbar_resizebox_grip.svg => blue_scrollbar_resizebox_grip_16px.svg} (85%) create mode 100644 dlls/light.msstyles/blue_scrollbar_resizebox_grip_20px.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_resizebox_grip_20px.svg create mode 100644 dlls/light.msstyles/blue_scrollbar_resizebox_grip_24px.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_resizebox_grip_24px.svg create mode 100644 dlls/light.msstyles/blue_scrollbar_resizebox_grip_28px.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_resizebox_grip_28px.svg create mode 100644 dlls/light.msstyles/blue_scrollbar_resizebox_grip_32px.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_resizebox_grip_32px.svg create mode 100644 dlls/light.msstyles/blue_scrollbar_resizebox_grip_36px.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_resizebox_grip_36px.svg create mode 100644 dlls/light.msstyles/blue_scrollbar_resizebox_grip_40px.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_resizebox_grip_40px.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index 3b33058fdef..847962e6680 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -42,7 +42,13 @@ SVG_SRCS = \ blue_scrollbar_arrow_glyphs_7px.svg \ blue_scrollbar_arrow_glyphs_9px.svg \ blue_scrollbar_arrows.svg \ - blue_scrollbar_resizebox_grip.svg \ + blue_scrollbar_resizebox_grip_16px.svg \ + blue_scrollbar_resizebox_grip_20px.svg \ + blue_scrollbar_resizebox_grip_24px.svg \ + blue_scrollbar_resizebox_grip_28px.svg \ + blue_scrollbar_resizebox_grip_32px.svg \ + blue_scrollbar_resizebox_grip_36px.svg \ + blue_scrollbar_resizebox_grip_40px.svg \ blue_scrollbar_shaft_horizontal.svg \ blue_scrollbar_shaft_vertical.svg \ blue_scrollbar_thumb_horizontal.svg \ diff --git a/dlls/light.msstyles/blue_scrollbar_resizebox_grip.bmp b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_16px.bmp similarity index 55% rename from dlls/light.msstyles/blue_scrollbar_resizebox_grip.bmp rename to dlls/light.msstyles/blue_scrollbar_resizebox_grip_16px.bmp index 6bc433536ddf5adfba071bea14e246fb9e41b33a..24c0e9114e2e8311c99211541b01c004740397ff 100644 GIT binary patch delta 48 rcmeAY>Jn6O^6lba0D~?dSp&ohKr8^nj6fDMkY?bR7$~yQB8US3pI`<U delta 51 ucmeAY>=IIO^5x=W0D~?dSp&ohKr9Hvj6fDMkZ$0Z7$~yQB8X$+ga!bmJO{e~ diff --git a/dlls/light.msstyles/blue_scrollbar_resizebox_grip.svg b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_16px.svg similarity index 85% rename from dlls/light.msstyles/blue_scrollbar_resizebox_grip.svg rename to dlls/light.msstyles/blue_scrollbar_resizebox_grip_16px.svg index 5c31233d422..f736ba75a1c 100644 --- a/dlls/light.msstyles/blue_scrollbar_resizebox_grip.svg +++ b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_16px.svg @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:32-32" width="32" height="17" version="1.1" viewBox="0 0 8.4667 4.4979" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +<svg id="bitmap:32-32" width="32" height="16" version="1.1" viewBox="0 0 8.4667 4.2333" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <metadata> <rdf:RDF> <cc:Work rdf:about=""> @@ -9,7 +9,7 @@ </cc:Work> </rdf:RDF> </metadata> - <g fill="#bdbdbd" stroke-width="0"> + <g transform="translate(0 -.26463)" fill="#bdbdbd" stroke-width="0"> <rect x="3.4396" y="3.7042" width=".52917" height=".52917"/> <rect x="2.6458" y="3.7042" width=".52917" height=".52917"/> <rect x="1.8521" y="3.7042" width=".52917" height=".52917"/> diff --git a/dlls/light.msstyles/blue_scrollbar_resizebox_grip_20px.bmp b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_20px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..80f8ab73ad3e3ace8f8eba336a25cf9bc5afc2fe GIT binary patch literal 3338 zcmZ?r<>F-kgDxOh1H>9YECR%g3<?a)K)QhkNML~f3=9wilKJoC9#o8>gn$4G0r^pB z>W0AHy?g(IFw9g!d}7t1n*-BFDvfRqAwJA}Lh8`vVfsetfeiulctPjGT!$`>&WEX^ zHjQo%Iv-{qx;Q!?rf!rT+#!G~-f)T2+c&t}flHj;?i;mlGz3ONU^E1VY6t)T(*B|c literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_resizebox_grip_20px.svg b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_20px.svg new file mode 100644 index 00000000000..9e3289560eb --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_20px.svg @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:40-32" width="40" height="20" version="1.1" viewBox="0 0 10.583 5.2916" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g transform="translate(0 -.26463)" fill="#bdbdbd" stroke-width="0"> + <rect x="4.2333" y="4.4979" width=".52917" height=".52917"/> + <rect x="3.175" y="4.4979" width=".52917" height=".52917"/> + <rect x="2.1167" y="4.4979" width=".52917" height=".52917"/> + <rect x="3.175" y="3.4396" width=".52917" height=".52917"/> + <rect x="4.2333" y="3.4396" width=".52917" height=".52917"/> + <rect x="4.2333" y="2.3813" width=".52917" height=".52917"/> + <rect x="5.8209" y="2.3813" width=".52917" height=".52917"/> + <rect x="6.8792" y="4.4979" width=".52917" height=".52917"/> + <rect x="5.8209" y="4.498" width=".52917" height=".52917"/> + <rect x="5.8209" y="3.4396" width=".52917" height=".52917"/> + <rect x="6.8792" y="3.4396" width=".52917" height=".52917"/> + <rect x="7.9375" y="4.4979" width=".52917" height=".52917"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_scrollbar_resizebox_grip_24px.bmp b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_24px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..cdcf712b11afcb657c9f72d4d7fe93f09f6bf0f7 GIT binary patch literal 4746 zcmeHF!41MN40Ht(^u?1An4uqD{d5(+OwgS&TX29=KbB=9s-kjH+)I2{+q!lb=U$#` z*5_U0qH)sb<SYk8dGqbKtSa)_Emeo>bX&OC=@^qy^+OJnQYr#t;oi{8d0e&zYGpCn z$I_vf#YJ<d@hL|8SUU8yxM&VFi2HFM`|Y#(wVle&lht$nwH;vnZ#!W9<LKdW&}@y~ cj2^f3-01Jk=y7<TNC)Tu9iRhr;9neg03EPm)c^nh literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_resizebox_grip_24px.svg b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_24px.svg new file mode 100644 index 00000000000..d84102732ec --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_24px.svg @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:48-32" width="48" height="24" version="1.1" viewBox="0 0 12.7 6.35" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g transform="matrix(1.5 0 0 1.5 -.1323 -.52924)" fill="#bdbdbd" stroke-width="0"> + <rect x="3.4396" y="3.7042" width=".52917" height=".52917"/> + <rect x="2.5577" y="3.7042" width=".52917" height=".52917"/> + <rect x="1.6757" y="3.7042" width=".52917" height=".52917"/> + <rect x="2.5577" y="2.8223" width=".52917" height=".52917"/> + <rect x="3.4396" y="2.8223" width=".52917" height=".52917"/> + <rect x="3.4396" y="1.9403" width=".52917" height=".52917"/> + <rect x="4.6743" y="1.9403" width=".52917" height=".52917"/> + <rect x="5.5563" y="3.7042" width=".52917" height=".52917"/> + <rect x="4.6743" y="3.7042" width=".52917" height=".52917"/> + <rect x="4.6743" y="2.8223" width=".52917" height=".52917"/> + <rect x="5.5563" y="2.8223" width=".52917" height=".52917"/> + <rect x="6.4382" y="3.7042" width=".52917" height=".52917"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_scrollbar_resizebox_grip_28px.bmp b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_28px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..4799cf5192529ed576f0360fa4d751863c4825d4 GIT binary patch literal 6410 zcmeH_F%H5o3`LFT#0fxR;26wZm{_<9YX@fTl(VHS=ufp=TOv|~e$>Qj{*U$Zl<|Hz z$!ENEopfGxo^|fzB73c`qb{paMZVvn)baLst}GiH!-h`z{|S^*Dkg4=|D}3+o|f%_ zUcau<9F`AREG@c+9<6FLhvh>iON;KI2P+9g31r_^)*sE$%9qWX^|#6$?VHV;^+$8i wM*>j-)*HlGPlKoT>fOQ9dcPO)d3W$MoM$Bg5+DH*AOR8}0TLhq66lM-48=cU?f?J) literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_resizebox_grip_28px.svg b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_28px.svg new file mode 100644 index 00000000000..89841e4d662 --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_28px.svg @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:56-32" width="56" height="28" version="1.1" viewBox="0 0 14.817 7.4083" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g transform="matrix(1.5 0 0 1.5 -.1323 -.52924)" fill="#bdbdbd" stroke-width="0"> + <rect x="4.1451" y="4.4098" width=".52917" height=".52917"/> + <rect x="3.2632" y="4.4098" width=".52917" height=".52917"/> + <rect x="2.3812" y="4.4098" width=".52917" height=".52917"/> + <rect x="3.2632" y="3.5279" width=".52917" height=".52917"/> + <rect x="4.1451" y="3.5279" width=".52917" height=".52917"/> + <rect x="4.1451" y="2.6459" width=".52917" height=".52917"/> + <rect x="5.3799" y="2.6458" width=".52917" height=".52917"/> + <rect x="6.2619" y="4.4097" width=".52917" height=".52917"/> + <rect x="5.3799" y="4.4097" width=".52917" height=".52917"/> + <rect x="5.3799" y="3.5278" width=".52917" height=".52917"/> + <rect x="6.2619" y="3.5278" width=".52917" height=".52917"/> + <rect x="7.1438" y="4.4097" width=".52917" height=".52917"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_scrollbar_resizebox_grip_32px.bmp b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_32px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..d3f1cfbbc799f4f85ecc74e5f4754ca209399e8c GIT binary patch literal 8330 zcmeH_!3~2j3`JA5gD^_PrKeuHO0S)OoibZ+sJ;XT$HY<;B7H<K_&etNDf4@o!gek4 z{K<OCnq=MNd6&3-<aoGJ2>&~0)BO5;5AunR$B7!2kbp%X#+ddC_4{0YxAK<m?T5at zVy!Q&9{x1FHjjR-W34Z(9zHd_HjjR-W34Z(9zHd_HjjRcB+!F^_q=-d^_a2rPwyPw zeI+kFH18bVeLZF@{nI;#cVEd1H4?ZA0quOlpQWR2)M(9T>7&jK-`0GVjy|JCYd%XK cb#D450TLhq5+DH*AOR8}0TLhq61WC|6_ucH&;S4c literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_resizebox_grip_32px.svg b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_32px.svg new file mode 100644 index 00000000000..44cf59cb260 --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_32px.svg @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:64-32" width="64" height="32" version="1.1" viewBox="0 0 16.933 8.4666" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g transform="matrix(2 0 0 2 -1.8779e-5 -.52927)" fill="#bdbdbd" stroke-width="0"> + <rect x="3.4396" y="3.7042" width=".52917" height=".52917"/> + <rect x="2.6458" y="3.7042" width=".52917" height=".52917"/> + <rect x="1.8521" y="3.7042" width=".52917" height=".52917"/> + <rect x="2.6458" y="2.9104" width=".52917" height=".52917"/> + <rect x="3.4396" y="2.9104" width=".52917" height=".52917"/> + <rect x="3.4396" y="2.1167" width=".52917" height=".52917"/> + <rect x="4.4979" y="2.1167" width=".52917" height=".52917"/> + <rect x="5.2917" y="3.7042" width=".52917" height=".52917"/> + <rect x="4.4979" y="3.7042" width=".52917" height=".52917"/> + <rect x="4.4979" y="2.9104" width=".52917" height=".52917"/> + <rect x="5.2917" y="2.9104" width=".52917" height=".52917"/> + <rect x="6.0854" y="3.7042" width=".52917" height=".52917"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_scrollbar_resizebox_grip_36px.bmp b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_36px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..e76f511f3fe00890d79af83dc0505b230cf62c26 GIT binary patch literal 10506 zcmeH}F%H5o3`K)r;uH)FaE&gouy7UD4$R!CXDcb_OO=Xc#Y@!isyeRx9oK$pq;|Lc zIeo5IUi)m<Y{zVybV%FmpQpSmt}&(WJt<>%xjz;uPGINg$PlPOU>JsRZt7tko1VS6 zr$_6lZY^Khx0SE{Exk0ZdbNFN-&Vfnu=LWn>ecq8eOvjO!_rIRs)vU_iv*(QA-ZpE z45M>K_rd4)f7aT#sNd*!5Z$Nu;vw+Q1g!HTCZ4XmR=qdBr?<*Qb9wW7y6Uv*z4<-8 jRW8g00SG_<0uX=z1Rwwb2tWV=5P$##AOHaftcSoGrTlR1 literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_resizebox_grip_36px.svg b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_36px.svg new file mode 100644 index 00000000000..1fd06a9f818 --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_36px.svg @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:72-32" width="72" height="36" version="1.1" viewBox="0 0 19.05 9.5249" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g transform="matrix(2 0 0 2 -1.8779e-5 -.52927)" fill="#bdbdbd" stroke-width="0"> + <rect x="3.9687" y="4.2333" width=".52917" height=".52917"/> + <rect x="3.1749" y="4.2333" width=".52917" height=".52917"/> + <rect x="2.3812" y="4.2333" width=".52917" height=".52917"/> + <rect x="3.1749" y="3.4395" width=".52917" height=".52917"/> + <rect x="3.9687" y="3.4395" width=".52917" height=".52917"/> + <rect x="3.9687" y="2.6458" width=".52917" height=".52917"/> + <rect x="5.027" y="2.6459" width=".52917" height=".52917"/> + <rect x="5.8208" y="4.2334" width=".52917" height=".52917"/> + <rect x="5.027" y="4.2334" width=".52917" height=".52917"/> + <rect x="5.027" y="3.4396" width=".52917" height=".52917"/> + <rect x="5.8208" y="3.4396" width=".52917" height=".52917"/> + <rect x="6.6145" y="4.2334" width=".52917" height=".52917"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_scrollbar_resizebox_grip_40px.bmp b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_40px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..f2becdbaf72972b9d8f2e728373fedfee1522a73 GIT binary patch literal 12938 zcmeH{I}XA?3`7^fK`5y?LK-S0#8qfH0e8yT!Um8sO5+%tEy9bk;Kbw4ydvHCaV)Rv zQGf6CT<SU0vnl(st^ehdAH(SyN_pSotD!qxZ&Pkrv|A=a1px^B0fD~nhxt+4^W6CC z$$PY!vvlq+<LJ&-z3y&lqj{axDvs`K)vFIn8_nyiR&jJ^t6qIr+Gt*9wTh!VTlMP0 z(nj+-ix>hBfIyT$<~J#`SJYRl`b^K6y;}K?&dKzg*(>U+Reh%C%wDbhN9SaE&g>QS zMLh%{0D&k0>zk(iJzA|>bL?T_(XN@9dh;;xXm!S#V-FLLcFoMxn}>-<t22lp009U< c00Izz00bZa0SG_<0uX=z1Rwwb2z*1}3Br`i;{X5v literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_resizebox_grip_40px.svg b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_40px.svg new file mode 100644 index 00000000000..793a7e1abe0 --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_resizebox_grip_40px.svg @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:80-32" width="80" height="40" version="1.1" viewBox="0 0 21.167 10.583" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g transform="matrix(2 0 0 2 -1.8779e-5 -.52927)" fill="#bdbdbd" stroke-width="0"> + <rect x="4.2333" y="4.498" width=".66145" height=".66145"/> + <rect x="3.175" y="4.4979" width=".66145" height=".66145"/> + <rect x="2.1167" y="4.4979" width=".66145" height=".66145"/> + <rect x="3.175" y="3.4396" width=".66145" height=".66145"/> + <rect x="4.2334" y="3.4396" width=".66145" height=".66145"/> + <rect x="4.2333" y="2.3813" width=".66145" height=".66145"/> + <rect x="5.6886" y="4.498" width=".66145" height=".66145"/> + <rect x="5.6886" y="3.4396" width=".66145" height=".66145"/> + <rect x="5.6886" y="2.3813" width=".66145" height=".66145"/> + <rect x="6.7469" y="4.4979" width=".66145" height=".66145"/> + <rect x="6.7469" y="3.4396" width=".66145" height=".66145"/> + <rect x="7.8052" y="4.4979" width=".66145" height=".66145"/> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 3e6df6ea6a5..9db8903412d 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -554,12 +554,26 @@ BLUE_INI TEXTFILE "ImageLayout = Vertical\r\n" "[ScrollBar.SizeBox]\r\n" -"ImageFile = blue_scrollbar_resizebox_grip.bmp\r\n" "BgType = ImageFile\r\n" +"ImageSelectType = Dpi\r\n" "ImageCount = 2\r\n" "SizingType = TrueSize\r\n" "Transparent = True\r\n" "VAlign = Bottom\r\n" +"ImageFile1 = blue_scrollbar_resizebox_grip_16px.bmp\r\n" +"ImageFile2 = blue_scrollbar_resizebox_grip_20px.bmp\r\n" +"ImageFile3 = blue_scrollbar_resizebox_grip_24px.bmp\r\n" +"ImageFile4 = blue_scrollbar_resizebox_grip_28px.bmp\r\n" +"ImageFile5 = blue_scrollbar_resizebox_grip_32px.bmp\r\n" +"ImageFile6 = blue_scrollbar_resizebox_grip_36px.bmp\r\n" +"ImageFile7 = blue_scrollbar_resizebox_grip_40px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 120\r\n" +"MinDpi3 = 144\r\n" +"MinDpi4 = 168\r\n" +"MinDpi5 = 192\r\n" +"MinDpi6 = 216\r\n" +"MinDpi7 = 240\r\n" "\r\n; Spin\r\n" "[Spin]\r\n" @@ -638,13 +652,27 @@ BLUE_INI TEXTFILE "[Status.Gripper]\r\n" "ContentMargins = 0, 0, 0, 0\r\n" -"; Same as scrollbar resize box gripper \r\n" -"ImageFile = blue_scrollbar_resizebox_grip.bmp\r\n" "BgType = ImageFile\r\n" +"ImageSelectType = Dpi\r\n" "ImageCount = 2\r\n" "SizingType = TrueSize\r\n" "Transparent = True\r\n" "VAlign = Bottom\r\n" +"; Same as scrollbar resize box gripper \r\n" +"ImageFile1 = blue_scrollbar_resizebox_grip_16px.bmp\r\n" +"ImageFile2 = blue_scrollbar_resizebox_grip_20px.bmp\r\n" +"ImageFile3 = blue_scrollbar_resizebox_grip_24px.bmp\r\n" +"ImageFile4 = blue_scrollbar_resizebox_grip_28px.bmp\r\n" +"ImageFile5 = blue_scrollbar_resizebox_grip_32px.bmp\r\n" +"ImageFile6 = blue_scrollbar_resizebox_grip_36px.bmp\r\n" +"ImageFile7 = blue_scrollbar_resizebox_grip_40px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 120\r\n" +"MinDpi3 = 144\r\n" +"MinDpi4 = 168\r\n" +"MinDpi5 = 192\r\n" +"MinDpi6 = 216\r\n" +"MinDpi7 = 240\r\n" "\r\n; Tab\r\n" "[Tab]\r\n" @@ -1058,8 +1086,26 @@ BLUE_SCROLLBAR_ARROW_GLYPHS_7PX_BMP BITMAP "blue_scrollbar_arrow_glyphs_7px.bmp" /* @makedep: blue_scrollbar_arrow_glyphs_9px.bmp */ BLUE_SCROLLBAR_ARROW_GLYPHS_9PX_BMP BITMAP "blue_scrollbar_arrow_glyphs_9px.bmp" -/* @makedep: blue_scrollbar_resizebox_grip.bmp */ -BLUE_SCROLLBAR_RESIZEBOX_GRIP_BMP BITMAP "blue_scrollbar_resizebox_grip.bmp" +/* @makedep: blue_scrollbar_resizebox_grip_16px.bmp */ +BLUE_SCROLLBAR_RESIZEBOX_GRIP_16PX_BMP BITMAP "blue_scrollbar_resizebox_grip_16px.bmp" + +/* @makedep: blue_scrollbar_resizebox_grip_20px.bmp */ +BLUE_SCROLLBAR_RESIZEBOX_GRIP_20PX_BMP BITMAP "blue_scrollbar_resizebox_grip_20px.bmp" + +/* @makedep: blue_scrollbar_resizebox_grip_24px.bmp */ +BLUE_SCROLLBAR_RESIZEBOX_GRIP_24PX_BMP BITMAP "blue_scrollbar_resizebox_grip_24px.bmp" + +/* @makedep: blue_scrollbar_resizebox_grip_28px.bmp */ +BLUE_SCROLLBAR_RESIZEBOX_GRIP_28PX_BMP BITMAP "blue_scrollbar_resizebox_grip_28px.bmp" + +/* @makedep: blue_scrollbar_resizebox_grip_32px.bmp */ +BLUE_SCROLLBAR_RESIZEBOX_GRIP_32PX_BMP BITMAP "blue_scrollbar_resizebox_grip_32px.bmp" + +/* @makedep: blue_scrollbar_resizebox_grip_36px.bmp */ +BLUE_SCROLLBAR_RESIZEBOX_GRIP_36PX_BMP BITMAP "blue_scrollbar_resizebox_grip_36px.bmp" + +/* @makedep: blue_scrollbar_resizebox_grip_40px.bmp */ +BLUE_SCROLLBAR_RESIZEBOX_GRIP_40PX_BMP BITMAP "blue_scrollbar_resizebox_grip_40px.bmp" /* @makedep: blue_scrollbar_shaft_horizontal.bmp */ BLUE_SCROLLBAR_SHAFT_HORIZONTAL_BMP BITMAP "blue_scrollbar_shaft_horizontal.bmp" -- 2.30.2

1 0

[PATCH 1/5] light.msstyles: Add more Button HiDPI images.
by Zhiyi Zhang 23 Aug '21

23 Aug '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- These HiDPI images are added so that UI parts can render with crisp images instead of blurry scaled images. DPIs up to 240 (250% 96 DPI) are supported. For even higher DPI settings, they still need to use scaled images. However, they will scale from 240 DPI images so they will be less blurry. The reason there is a limit on 240 DPI is that theme file format v3 supports MinDpi1~5, later versions added MinDpi6~7. So for every 25% DPI increase from 96, a MinDpi property is used. On Windows, uxtheme only reports images with the currently available monitor DPIs so only a limited set of MinDPI properties are used. Due to the lack of documentation of how HiDPI images are packed in theme file format v4, such dynamic DPI image reporting is not implemented. Instead, MinDpi6~7 support will be added by later uxtheme patches. dlls/light.msstyles/Makefile.in | 13 +++ dlls/light.msstyles/blue_checkbox_19px.bmp | Bin 0 -> 17466 bytes dlls/light.msstyles/blue_checkbox_19px.svg | 48 +++++++++++ dlls/light.msstyles/blue_checkbox_22px.bmp | Bin 0 -> 23370 bytes dlls/light.msstyles/blue_checkbox_22px.svg | 50 +++++++++++ dlls/light.msstyles/blue_checkbox_28px.bmp | Bin 0 -> 37770 bytes dlls/light.msstyles/blue_checkbox_28px.svg | 40 +++++++++ dlls/light.msstyles/blue_checkbox_31px.bmp | Bin 0 -> 46266 bytes dlls/light.msstyles/blue_checkbox_31px.svg | 46 ++++++++++ .../blue_commandlink_glyph_37px.bmp | Bin 0 -> 27518 bytes .../blue_commandlink_glyph_37px.svg | 19 ++++ .../blue_commandlink_glyph_52px.bmp | Bin 0 -> 54218 bytes .../blue_commandlink_glyph_52px.svg | 19 ++++ .../blue_commandlink_glyph_60px.bmp | Bin 0 -> 72138 bytes .../blue_commandlink_glyph_60px.svg | 19 ++++ .../blue_commandlink_glyph_67px.bmp | Bin 0 -> 89918 bytes .../blue_commandlink_glyph_67px.svg | 19 ++++ .../blue_commandlink_glyph_75px.bmp | Bin 0 -> 112638 bytes .../blue_commandlink_glyph_75px.svg | 19 ++++ dlls/light.msstyles/blue_radiobutton_19px.bmp | Bin 0 -> 11690 bytes dlls/light.msstyles/blue_radiobutton_19px.svg | 28 ++++++ dlls/light.msstyles/blue_radiobutton_22px.bmp | Bin 0 -> 15626 bytes dlls/light.msstyles/blue_radiobutton_22px.svg | 28 ++++++ dlls/light.msstyles/blue_radiobutton_28px.bmp | Bin 0 -> 25226 bytes dlls/light.msstyles/blue_radiobutton_28px.svg | 28 ++++++ dlls/light.msstyles/blue_radiobutton_31px.bmp | Bin 0 -> 30890 bytes dlls/light.msstyles/blue_radiobutton_31px.svg | 28 ++++++ dlls/light.msstyles/light.rc | 81 ++++++++++++++++-- 28 files changed, 477 insertions(+), 8 deletions(-) create mode 100644 dlls/light.msstyles/blue_checkbox_19px.bmp create mode 100644 dlls/light.msstyles/blue_checkbox_19px.svg create mode 100644 dlls/light.msstyles/blue_checkbox_22px.bmp create mode 100644 dlls/light.msstyles/blue_checkbox_22px.svg create mode 100644 dlls/light.msstyles/blue_checkbox_28px.bmp create mode 100644 dlls/light.msstyles/blue_checkbox_28px.svg create mode 100644 dlls/light.msstyles/blue_checkbox_31px.bmp create mode 100644 dlls/light.msstyles/blue_checkbox_31px.svg create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_37px.bmp create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_37px.svg create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_52px.bmp create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_52px.svg create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_60px.bmp create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_60px.svg create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_67px.bmp create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_67px.svg create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_75px.bmp create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_75px.svg create mode 100644 dlls/light.msstyles/blue_radiobutton_19px.bmp create mode 100644 dlls/light.msstyles/blue_radiobutton_19px.svg create mode 100644 dlls/light.msstyles/blue_radiobutton_22px.bmp create mode 100644 dlls/light.msstyles/blue_radiobutton_22px.svg create mode 100644 dlls/light.msstyles/blue_radiobutton_28px.bmp create mode 100644 dlls/light.msstyles/blue_radiobutton_28px.svg create mode 100644 dlls/light.msstyles/blue_radiobutton_31px.bmp create mode 100644 dlls/light.msstyles/blue_radiobutton_31px.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index 3205d1b28f9..3b33058fdef 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -6,12 +6,21 @@ SVG_SRCS = \ blue_button.svg \ blue_checkbox_13px.svg \ blue_checkbox_16px.svg \ + blue_checkbox_19px.svg \ + blue_checkbox_22px.svg \ blue_checkbox_25px.svg \ + blue_checkbox_28px.svg \ + blue_checkbox_31px.svg \ blue_combobutton.svg \ blue_combobutton_glyph.svg \ blue_commandlink.svg \ blue_commandlink_glyph_30px.svg \ + blue_commandlink_glyph_37px.svg \ blue_commandlink_glyph_45px.svg \ + blue_commandlink_glyph_52px.svg \ + blue_commandlink_glyph_60px.svg \ + blue_commandlink_glyph_67px.svg \ + blue_commandlink_glyph_75px.svg \ blue_groupbox.svg \ blue_header.svg \ blue_header_item.svg \ @@ -21,7 +30,11 @@ SVG_SRCS = \ blue_progress_track_vertical.svg \ blue_radiobutton_13px.svg \ blue_radiobutton_16px.svg \ + blue_radiobutton_19px.svg \ + blue_radiobutton_22px.svg \ blue_radiobutton_25px.svg \ + blue_radiobutton_28px.svg \ + blue_radiobutton_31px.svg \ blue_rebar_background.svg \ blue_rebar_chevron.svg \ blue_rebar_gripper_horizontal.svg \ diff --git a/dlls/light.msstyles/blue_checkbox_19px.bmp b/dlls/light.msstyles/blue_checkbox_19px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..005d8148040fa29a76fe40367fd9396a0689e6f4 GIT binary patch literal 17466 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 literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_checkbox_19px.svg b/dlls/light.msstyles/blue_checkbox_19px.svg new file mode 100644 index 00000000000..9e45a9c8048 --- /dev/null +++ b/dlls/light.msstyles/blue_checkbox_19px.svg @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:19-32" width="19" height="228" fill="#000000" version="1.1" viewBox="0 0 19 228" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g transform="matrix(.95 0 0 .9499 .051376 .05137)" fill="none" stroke-width="1.0527"> + <path d="m2.9e-6 0h36.923v36.965h-36.923z"/> + <rect x=".47226" y=".47227" width="18.947" height="18.95" rx="2.1053" ry="2.1055" stroke="#aeaeae"/> + <rect x=".47226" y="20.474" width="18.947" height="18.95" rx="2.1053" ry="2.1055" stroke="#3096fa"/> + <path d="m0.76923 39.275h36.923v36.965h-36.923z"/> + <rect x=".47227" y="40.477" width="18.947" height="18.95" rx="2.1053" ry="2.1055" stroke="#2979ff"/> + <rect x=".47227" y="60.479" width="18.947" height="18.95" rx="2.1053" ry="2.1055" stroke="#aeaeae"/> + <path d="m3.5e-6 80.09h36.923v36.965h-36.923z"/> + <path d="m0.76923 119.36h36.923v36.965h-36.923z"/> + <path d="m0 160.18h36.923v36.965h-36.923z"/> + <path d="m0.76923 199.45h36.923v36.965h-36.923z"/> + <path d="m4.1802e-6 80.009h36.923v36.965h-36.923z"/> + <rect x=".47227" y="80.481" width="18.947" height="18.95" rx="2.1053" ry="2.1055" stroke="#aeaeae"/> + <rect x=".47227" y="100.48" width="18.947" height="18.95" rx="2.1053" ry="2.1055" stroke="#3096fa"/> + <path d="m0.76923 119.28h36.923v36.965h-36.923z"/> + <rect x=".47227" y="120.49" width="18.947" height="18.95" rx="2.1053" ry="2.1055" stroke="#2979ff"/> + <rect x=".47227" y="140.49" width="18.947" height="18.95" rx="2.1053" ry="2.1055" stroke="#aeaeae"/> + <path d="m3.8669e-6 160.02h36.923v36.965h-36.923z"/> + <rect x=".47227" y="160.49" width="18.947" height="18.95" rx="2.1053" ry="2.1055" stroke="#aeaeae"/> + <rect x=".47227" y="180.49" width="18.947" height="18.95" rx="2.1053" ry="2.1055" stroke="#3096fa"/> + <path d="m0.76923 199.29h36.923v36.965h-36.923z"/> + <rect x=".47227" y="200.49" width="18.947" height="18.95" rx="2.1053" ry="2.1055" stroke="#2979ff"/> + <rect x=".47227" y="220.5" width="18.947" height="18.95" rx="2.1053" ry="2.1055" stroke="#aeaeae"/> + </g> + <path d="m7.1363 88.91-3.1023-3.1343-1.0341 1.0447 4.1363 4.1791 8.8637-8.9553-1.0341-1.0447z" stroke-width=".99999"/> + <g transform="matrix(1.4616 0 0 1.463 .051379 .05137)" stroke-width=".46768"> + <path d="m4.8475 73.723-2.1226-2.1423-0.70752 0.71411 2.83 2.8565 6.0645-6.121-0.70752-0.71411z" fill="#3096fa"/> + <path d="m4.8475 99.697-2.1226-2.1423-0.70752 0.71411 2.83 2.8565 6.0645-6.121-0.70752-0.71411z" fill="#aeaeae"/> + <path d="m4.8475 86.71-2.1226-2.1423-0.70752 0.71412 2.83 2.8565 6.0645-6.121-0.70752-0.71411z" fill="#2979ff"/> + </g> + <path d="m3 161h13v1h-13z"/> + <g transform="matrix(1.4616 0 0 1.463 .051379 -.37608)" stroke-width=".46768"> + <path d="m2.0174 123.29h8.8945v0.68351h-8.8945z" fill="#3096fa"/> + <path d="m2.0174 136.28h8.8945v0.68351h-8.8945z" fill="#2979ff"/> + <path d="m2.0174 149.26h8.8945v0.68351h-8.8945z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_checkbox_22px.bmp b/dlls/light.msstyles/blue_checkbox_22px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..8b072c13265e17dae870cae1ce30e7e1141a51c2 GIT binary patch literal 23370 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 N$jN#&&69G+{{u0LOQQe) literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_checkbox_22px.svg b/dlls/light.msstyles/blue_checkbox_22px.svg new file mode 100644 index 00000000000..67d005ab6f8 --- /dev/null +++ b/dlls/light.msstyles/blue_checkbox_22px.svg @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:22-32" width="22" height="264" fill="#000000" version="1.1" viewBox="0 0 22 264" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g transform="matrix(1.1 0 0 1.1001 .043576 .04358)" fill="none"> + <path d="m2.9e-6 0h36.923v36.965h-36.923z" stroke-width=".90907"/> + <rect transform="scale(1,-1)" x=".86945" y="-19.05" width="18.182" height="18.18" rx="1.8182" ry="1.818" stroke="#aeaeae" stroke-width="1.8181"/> + <rect x=".86945" y="20.868" width="18.182" height="18.18" rx="1.8182" ry="1.818" stroke="#3096fa" stroke-width="1.8181"/> + <path d="m0.76923 39.275h36.923v36.965h-36.923z" stroke-width=".90907"/> + <rect x=".86945" y="40.867" width="18.182" height="18.18" rx="1.8182" ry="1.818" stroke="#2979ff" stroke-width="1.8181"/> + <rect x=".86945" y="60.865" width="18.182" height="18.18" rx="1.8182" ry="1.818" stroke="#aeaeae" stroke-width="1.8181"/> + <g stroke-width=".90907"> + <path d="m3.5e-6 80.09h36.923v36.965h-36.923z"/> + <path d="m0.76923 119.36h36.923v36.965h-36.923z"/> + <path d="m0 160.18h36.923v36.965h-36.923z"/> + <path d="m0.76923 199.45h36.923v36.965h-36.923z"/> + <path d="m1.2896e-6 79.978h36.923v36.965h-36.923z"/> + </g> + <rect x=".86945" y="80.864" width="18.182" height="18.18" rx="1.8182" ry="1.818" stroke="#aeaeae" stroke-width="1.8181"/> + <rect x=".86945" y="100.86" width="18.182" height="18.18" rx="1.8182" ry="1.818" stroke="#3096fa" stroke-width="1.8181"/> + <path d="m0.76923 119.25h36.923v36.965h-36.923z" stroke-width=".90907"/> + <rect x=".86945" y="120.86" width="18.182" height="18.18" rx="1.8182" ry="1.818" stroke="#2979ff" stroke-width="1.8181"/> + <rect x=".86945" y="140.86" width="18.182" height="18.18" rx="1.8182" ry="1.818" stroke="#aeaeae" stroke-width="1.8181"/> + <path d="m1.2654e-6 159.96h36.923v36.965h-36.923z" stroke-width=".90907"/> + <rect x=".86945" y="160.86" width="18.182" height="18.18" rx="1.8182" ry="1.818" stroke="#aeaeae" stroke-width="1.8181"/> + <rect x=".86945" y="180.86" width="18.182" height="18.18" rx="1.8182" ry="1.818" stroke="#3096fa" stroke-width="1.8181"/> + <path d="m0.76923 199.23h36.923v36.965h-36.923z" stroke-width=".90907"/> + <rect x=".86945" y="200.85" width="18.182" height="18.18" rx="1.8182" ry="1.818" stroke="#2979ff" stroke-width="1.8181"/> + <rect x=".86945" y="220.85" width="18.182" height="18.18" rx="1.8182" ry="1.818" stroke="#aeaeae" stroke-width="1.8181"/> + </g> + <path d="m8.4545 102.7-3.3409-3.4478-1.1136 1.1493 4.4546 4.5971 9.5454-9.8507-1.1136-1.1493z"/> + <g transform="matrix(1.5767 0 0 1.6944 .79522 .04358)" stroke-width=".36133"> + <path d="m4.8579 73.573-2.1189-2.0348-0.70632 0.67828 2.8252 2.7131 6.0541-5.8139-0.70631-0.67828z" fill="#3096fa"/> + <path d="m4.8579 99.541-2.1189-2.0348-0.70632 0.67828 2.8252 2.7132 6.0541-5.8139-0.70631-0.67828z" fill="#aeaeae"/> + <path d="m4.8579 86.557-2.1189-2.0348-0.70632 0.67828 2.8252 2.7131 6.0541-5.8139-0.70631-0.67828z" fill="#2979ff"/> + </g> + <path d="m4 186h14v2h-14z"/> + <g transform="matrix(1.5385 0 0 1.6944 1 -.16794)" stroke-width=".36579"> + <path d="m1.95 122.86h9.1v1.1804h-9.1z" fill="#3096fa"/> + <path d="m1.95 135.84h9.1v1.1804h-9.1z" fill="#2979ff"/> + <path d="m1.95 148.83h9.1v1.1804h-9.1z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_checkbox_28px.bmp b/dlls/light.msstyles/blue_checkbox_28px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..8911e3159873641a1f6c603eef6bafbd995b803c GIT binary patch literal 37770 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 literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_checkbox_28px.svg b/dlls/light.msstyles/blue_checkbox_28px.svg new file mode 100644 index 00000000000..35e78c0d6ef --- /dev/null +++ b/dlls/light.msstyles/blue_checkbox_28px.svg @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:28-32" width="28" height="336" fill="#000000" version="1.1" viewBox="0 0 28 336" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect x=".99999" y="1" width="26" height="26" rx="2" ry="2" fill="none" stroke="#aeaeae" stroke-width="2"/> + <path d="m10.045 130.87-4.534-4.7014-1.5114 1.5672 6.0454 6.2686 12.955-13.433-1.5114-1.5672z"/> + <path d="m4 237h20v2h-20z"/> + <g transform="matrix(1.1398 0 0 1.1208 -.13981 -.12081)" fill="none" stroke-width="1.7695"> + <rect x="1.0074" y="25.975" width="22.796" height="23.213" rx="1.7547" ry="1.7844" stroke="#3096fa"/> + <rect x="1.0074" y="50.957" width="22.796" height="23.213" rx="1.7547" ry="1.7844" stroke="#2979ff"/> + <rect x="1.0074" y="75.939" width="22.796" height="23.213" rx="1.7547" ry="1.7844" stroke="#aeaeae"/> + <rect x="1.0074" y="100.92" width="22.811" height="23.198" rx="1.7547" ry="1.7844" fill="none" stroke="#aeaeae"/> + <rect x="1.0148" y="125.9" width="22.796" height="23.213" rx="1.7547" ry="1.7844" stroke="#3096fa"/> + <rect x="1.0148" y="150.88" width="22.796" height="23.213" rx="1.7547" ry="1.7844" stroke="#2979ff"/> + <rect x="1.0148" y="175.86" width="22.796" height="23.213" rx="1.7547" ry="1.7844" stroke="#aeaeae"/> + </g> + <g transform="matrix(1.1304 0 0 1.1208 -.13044 -.12081)" stroke-width=".78927"> + <path d="m9.0017 141.85-4.0109-4.1947-1.337 1.3983 5.3479 5.593 11.46-11.985-1.337-1.3983z" fill="#3096fa"/> + <path d="m9.0017 166.83-4.0109-4.1947-1.337 1.3983 5.3479 5.593 11.46-11.985-1.337-1.3983z" fill="#2979ff"/> + <path d="m9.0017 191.81-4.0109-4.1947-1.337 1.3983 5.3479 5.593 11.46-11.985-1.337-1.3983z" fill="#aeaeae"/> + </g> + <g transform="matrix(1.1304 0 0 1.1208 -.13044 -.12081)" fill="none" stroke-width="1.7768"> + <rect x="1.0038" y="200.85" width="23" height="23.198" rx="1.7692" ry="1.7844" fill="none" stroke="#aeaeae"/> + <rect x="1.0113" y="225.83" width="22.985" height="23.213" rx="1.7692" ry="1.7844" stroke="#3096fa"/> + <rect x="1.0113" y="250.81" width="22.985" height="23.213" rx="1.7692" ry="1.7844" stroke="#2979ff"/> + <rect x="1.0113" y="275.79" width="22.985" height="23.213" rx="1.7692" ry="1.7844" stroke="#aeaeae"/> + </g> + <g transform="matrix(1.1765 0 0 1.1208 -.70588 -.12081)"> + <path d="m4 236.54h17v1.7844h-17z" fill="#3096fa" stroke-width=".77367"/> + <path d="m4 261.53h17v1.7844h-17z" fill="#2979ff" stroke-width=".77367"/> + <path d="m4 286.51h17v1.7844h-17z" fill="#aeaeae" stroke-width=".77367"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_checkbox_31px.bmp b/dlls/light.msstyles/blue_checkbox_31px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..eab02f44485bfc8ec3811f0d5b9e89eed276f225 GIT binary patch literal 46266 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 G9QrjU(2gnq literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_checkbox_31px.svg b/dlls/light.msstyles/blue_checkbox_31px.svg new file mode 100644 index 00000000000..731c5af121a --- /dev/null +++ b/dlls/light.msstyles/blue_checkbox_31px.svg @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:31-32" width="31" height="372" fill="#000000" version="1.1" viewBox="0 0 31 372" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect x="1" y="1" width="29" height="29" rx="2" ry="2" fill="none" stroke="#aeaeae" stroke-width="2"/> + <path d="m11.682 144.66-5.0112-5.0148-1.6705 1.6717 6.6816 6.6864 14.318-14.328-1.6705-1.6717z"/> + <path d="m5 262h21v3h-21z"/> + <g transform="matrix(1.2787 0 0 1.2336 -.27878 -.23525)" fill="none" stroke-width="1.5924"> + <g> + <rect x="1.0142" y="26.116" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#3096fa"/> + <rect x="1.0142" y="51.246" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#2979ff"/> + <rect x="1.0142" y="76.375" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#aeaeae"/> + </g> + <rect x="1.0142" y="101.5" width="22.68" height="23.508" rx="1.5641" ry="1.6213" fill="none" stroke="#aeaeae"/> + <g> + <rect x="1.0284" y="126.62" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#3096fa"/> + <rect x="1.0284" y="151.75" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#2979ff"/> + <rect x="1.0284" y="176.88" width="22.652" height="23.537" rx="1.5641" ry="1.6213" stroke="#aeaeae"/> + </g> + </g> + <g transform="matrix(1.2494 0 0 1.2335 .4349 -.23356)" stroke-width=".6481"> + <path d="m9.0017 142.59-4.0109-4.0654-1.337 1.3552 5.3479 5.4206 11.46-11.616-1.337-1.3552z" fill="#3096fa"/> + <path d="m9.0017 167.72-4.0109-4.0654-1.337 1.3552 5.3479 5.4206 11.46-11.616-1.337-1.3552z" fill="#2979ff"/> + <path d="m9.0017 192.85-4.0109-4.0654-1.337 1.3552 5.3479 5.4206 11.46-11.616-1.337-1.3552z" fill="#aeaeae"/> + </g> + <g transform="matrix(1.2522 0 0 1.2335 -.2522 -.23356)" fill="none" stroke-width="1.6092"> + <rect x="1.006" y="202.04" width="23.16" height="23.509" rx="1.5972" ry="1.6213" fill="none" stroke="#aeaeae"/> + <g> + <rect x="1.0205" y="227.16" width="23.131" height="23.538" rx="1.5972" ry="1.6213" stroke="#3096fa"/> + <rect x="1.0205" y="252.29" width="23.131" height="23.538" rx="1.5972" ry="1.6213" stroke="#2979ff"/> + <rect x="1.0205" y="277.42" width="23.131" height="23.538" rx="1.5972" ry="1.6213" stroke="#aeaeae"/> + </g> + </g> + <g transform="matrix(1.3032 0 0 1.2335 -.88963 -.23356)" stroke-width=".70069"> + <path d="m4.5192 237.72h16.114v2.432h-16.114z" fill="#3096fa"/> + <path d="m4.5192 262.85h16.114v2.432h-16.114z" fill="#2979ff"/> + <path d="m4.5192 287.98h16.114v2.432h-16.114z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_commandlink_glyph_37px.bmp b/dlls/light.msstyles/blue_commandlink_glyph_37px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..027f93edf2e8d36d6c34767dbebda8e7a9e1890a GIT binary patch literal 27518 zcmeI4&rj4q6vx---{1i*CLr#D&=$SmL68e4IGE^3z3D*{FDA0P5aZdSuw6NcH$Z+K zJ#o>0!UQ-%B;ki~g|@KI@9a*26hgO4*FNLh_~<U3PCxsZnRa}k(?9s;MXK_8ho7T} z>xeIiOQ~zA%h>*UjvuF9luA|qsXf#`aR1e*A|b!H60%=*ivckp2E@SMHQ<d~cU{|> zqPKl4F41nmG+o==L6BQCKN8{Al<@0!(P#$GT7^k**~a^Xkt(O(FLbxU*M`sK*~Tyj zF870FfN5KEmBILw1D97Y?xF4WG}nP+n-4f}?c3H6m^{tpctvA?1D9K{o`9*WxqhNu zZ`Z?x<5yx1S2JNOnm?S0Tj{7=CyrNjG$Ov%!PH1kn@*uS6O}2>@{Vmhf@{A&mAry^ zC(in#*0o>g8UzoUap!%odcafC{qfK#8V{p>r#Q<yW1XE~+0s0?A6qZutUqd9`xCcX z(1+H29?v%OQR|4aJQcgHg5|r<gY9^n_19CEzV}w=Pqz7q!~98o53gwUAwF}NXV&9Z zju8W5Kn#chF(3xSfEW-1wHTP6pYKIXFE1~%$gwUgESTWgMG#_=h!W4S&dkg-gJn%K z(cIkJSS@ZFU1n)%sTE8cJ{PvxMxV2m`e$cnyTG!oxysnG$g!et^?_wia~)vIBFBpU zGz1n;b2;$GBF74@$6!+Jr^aFl(NjzN2g~5Nm6*dteTqrNCVWNCv7R{IuP4?m+<gmr z2>T2scAmnRqwEj%r^Us^M02b-{~(;R8FygmMflgJLtL*C&9Un1_!gMd*eHYNS(NsU zyDZM%0*-afL-?GF`y5f~!~M4jeR|dB!TZGL1z<4{JDQ2b{7E?lPY>E_ipxARN;^wg zF(3xSfEW-1Vn7Ut0WlE80OiuXl*>$W`TGLOcbMSWMG#^Vk543?W2KR{X0WVjCUCVU z{(mXe#+2=71=GecSDHnRm4-VEFl}qDGWr;c94lqhePG(tTnChGXOUy2T*nZYJk8}$ zKFuP>O8LwaFrob_W3hyGtSiTg@v;(cWL(WeVBDl!TjU(;(ec&qrmi*dMm7^U#~QCA z<^1BFqTEZu%2K}l5txqq(?~ke94n2a2f@Q;+^O*e9*na}Up$1bM02b(obCk6mgXtr z`k82sl}2y2fMs3t5O@;JvC``sO<-9);$bi^(D&XQ&BS8<RGF((`!<{BrNXXNvR@2{ z0Wly3#DEwO17bi7)N8=AtzJCK%_hgH*9zFx&)?ziFp|%)o?0uQV6n)to?0uQXtBt# zvRx|x&nwDW0kvN#0&4}7)U(XBAAMXBW4W=<!1G)yAaahCqo?Cmy!bm=E8u*G%-0G~ zYdj>HV?AT7fJAewr7^1sPF4}swMH1s3j%8eu$VuoUSI9oeAc8oe<aFYF(3xSfEW-1 zVn7Ut0Wna&0m-q3yOSJixTBLLB*%KvM)>=GWIa~NvHH1`+P0Eo4Rn3Uu?B<$K1z-? dASCcna;yO%XMB_#>lsqyS7Ja6h=Kpiz#nOTm`eZv literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_commandlink_glyph_37px.svg b/dlls/light.msstyles/blue_commandlink_glyph_37px.svg new file mode 100644 index 00000000000..34aa72aba74 --- /dev/null +++ b/dlls/light.msstyles/blue_commandlink_glyph_37px.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:37-32" width="37" height="185" version="1.1" viewBox="0 0 9.7896 48.949" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g transform="matrix(1.25 0 0 1.25 -.066217 -1.3229)" stroke-width=".16933"> + <path d="m4.7625 2.9633-0.37306 0.40505 1.2118 1.3185h-4.2783v0.57455h4.2783l-1.2144 1.3185 0.37571 0.40505 1.8521-2.0109z" fill="#3096fa"/> + <path d="m4.7625 10.795-0.37306 0.40505 1.2118 1.3185h-4.2783v0.57455h4.2783l-1.2144 1.3185 0.37571 0.40505 1.8521-2.0109z" fill="#3096fa"/> + <path d="m4.7625 18.627-0.37306 0.40505 1.2118 1.3185h-4.2783v0.57455h4.2783l-1.2144 1.3185 0.37571 0.40505 1.8521-2.0109z" fill="#2979ff"/> + <path d="m4.7625 26.459-0.37306 0.40505 1.2118 1.3185h-4.2783v0.57455h4.2783l-1.2144 1.3185 0.37571 0.40505 1.8521-2.0109z" fill="#aeaeae"/> + <path d="m4.7625 34.29-0.37306 0.40505 1.2118 1.3185h-4.2783v0.57455h4.2783l-1.2144 1.3185 0.37571 0.40505 1.8521-2.0109z" fill="#3096fa"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_commandlink_glyph_52px.bmp b/dlls/light.msstyles/blue_commandlink_glyph_52px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..a50aeeff00a066b21322c6fd8ea7951dfb8b0270 GIT binary patch literal 54218 zcmeI5%Wl&^7=;7$9jfkF#sT38Wm^eVy-RF(gjOmKz$S@UM8JkS0_@QC6?$Fw4cPJ$ z-S?V=YB)~fC}R%-DN~1kbfQkjPAZSjH{-cD$NlG@{P<bwz24&Y3#3O#Q@2W`Tcx|D zJJ^0a_#B%fFI_72f0Fm~{PNT1BOm_L=F~s^75|6?NPq-LfCNZ@1W14cNI(*SPOLUN zEfr~vC57-;rxmV4&oz>UrftcZ^w#VQbe#9JBzk%&{32OX_q$r`#Nnl(sii)P))a+H zIZd(pB>7V6w!&raG(`_ra++G|qv(3-X;N3l^%RBgC2RT>S689O(A19AJJFiHt2K+J z<d&Y(7s@y;EJf-BWevuqe%_A4mo5cmk3Wh1cBGoFG)?0Cvt_nh>WxD^lWlJ;_1cw| zB9G%!AJ_G046@IAsvnAM8?MUg+UBJ~=R4MQgU~s4H?A(APrfkvWua@JZv0>lI?fC& zvD%Wjp3^(`r=jCCqve}KEomQO+z*M>j$|!EO;L5DcW<Xzx}CnqoCHXK1W14cNPq-L zfCNZ@1W14cNPq-LfCNZ@1W14cNWd+DgM))jB=|?Qc>n1B{{A}BHIhbxe^jofy}i8| zXgD8eN%Uyc6a1rcH9^B7(&eZoY{Ne)R}<=FDXR(ZiT01~?(Q!8rU`mhvYN0j+CMtb zbcMXvKO{NYo@oCl&VLm;3{BV<?H|SUv}V!d+&>C-$3-RRIYAn>yJQ<>JN1udk3Wfh zjKfV=Gp<RTf3{5MapoT_s;wpEKu4~<;XRT5QRwlek3$_K<EqhLL!Zbo$TshRHj(~O z)In}u3N0e%J2>y$x&it`&au(|E<n!((&*SJat(BNcsK_=XQNuM5C5pV_1w|X(KK|N zj%vX+{G;-;r1KS=|LFY?_($bxNj2fR-+->|X0u8EXbOcn36KB@kN^pg011!)36KB@ zkN^pg011!)36KB@kN^odCZKEOP2C70gews5AJw(Wx~>P;NE&HdvL@8Y3^be%v?O|v z%3p+QT7-^ELsKpIELu~oyp+>a4@7>qopvp{QC{{=Q|;bLPE#!q>8BXhQ(x1Sc|BD` zdUuAJ8kJS(F*Vi8qWz=LvzF6T3!M8$QO0qB=>%mB#-%~t2%P#ybH~q?SHym!(oEat zxcPsfrye--j~3Y0l6GxtZzBDp+M_;Bdo%{w=RFmX{!y&!^7B%m^Bt^(^6Lhnb8KA; z7SNYn7-NCZHIS}X=Ah%u(9)=ENnFqA#{FsNI5o7?gKrYGr1KQxen=zOk*sB?sUB>g zj<z-b|7ePYISG&e36KB@kN^pg011!)36KB@kN^pg011!)36KB@I46J@XU`C`E%qk1 zna}a-qv}`5_0*3;nTg#fG~Qu)AzEW=A|7S>xy0NW`&4MW(3HP5Hm%Tju0u_|*umkY z8FN!+yxmljEw*zf3PpQjf7#>LJNLw*9ZWW!cwBvz)}xEuY}ZOpV&A*?^^t12sGH;% zzO^@3T>f^PqWXisorjChed@2f9*w6y&3Am7kN#l|B=UJPYy5hweI%|?t?}!HueXi( z^(}>XEb^Zb?rHKwi;MA>#~=X`AOR8}0TLhq5+DH*AOR8}0TLhq5+DH*AOR8}ftw&e z|L9Fn9sihmYjy_yjB~>?BmDcUKYVwJc!zSo*Rp=MP5<cl7l7j<_~fTZ(e(W;>dNRN zV){o@KL1NzlwZs@KcCsI=^u5$!?7RME5CA4{e{hQ*^ZTSKY0;)tYeT+zrR=h(I{N% z#F=MHgg!50eMU>@^Gwz?kkIvl)julqc|iI{ix@4&FJtH*<^LZYA104L0wh2JBtQZr MKmsH{0yjk9H|x&3X8-^I literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_commandlink_glyph_52px.svg b/dlls/light.msstyles/blue_commandlink_glyph_52px.svg new file mode 100644 index 00000000000..9065e1c1836 --- /dev/null +++ b/dlls/light.msstyles/blue_commandlink_glyph_52px.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:52-32" width="52" height="260" version="1.1" viewBox="0 0 13.758 68.793" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g transform="matrix(1.73 0 0 1.73 -.17208 .042322)" stroke-width=".088403"> + <path d="m4.8558 2.1167-0.36659 0.36968 1.1908 1.2034h-4.2041v0.52438h4.2041l-1.1933 1.2034 0.3692 0.36968 1.82-1.8353z" fill="#3096fa"/> + <path d="m4.8558 10.07-0.36659 0.36968 1.1908 1.2034h-4.2041v0.52438h4.2041l-1.1933 1.2034 0.3692 0.36968 1.82-1.8353z" fill="#3096fa"/> + <path d="m4.8558 18.022-0.36659 0.36968 1.1908 1.2034h-4.2041v0.52438h4.2041l-1.1933 1.2034 0.3692 0.36968 1.82-1.8353z" fill="#2979ff"/> + <path d="m4.8558 25.975-0.36659 0.36968 1.1908 1.2034h-4.2041v0.52438h4.2041l-1.1933 1.2034 0.3692 0.36968 1.82-1.8353z" fill="#aeaeae"/> + <path d="m4.8558 33.928-0.36659 0.36968 1.1908 1.2034h-4.2041v0.52438h4.2041l-1.1933 1.2034 0.3692 0.36968 1.82-1.8353z" fill="#3096fa"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_commandlink_glyph_60px.bmp b/dlls/light.msstyles/blue_commandlink_glyph_60px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..1fc32a765cd121767b7e8f4e260d1ac46d9b87bc GIT binary patch literal 72138 zcmeI4y>8nu6h<AiFVU@I5)`pyuN{gkox1c@x;Tk}cq}?6@=N6BJ^C*8ZfQ_S+ZSLX z2asYhx+ISgf{IPk_dE9!Nh@M5fBgM)GO~|9rp!(GYRVV$)XC`c=z}@_wtw9mI*)oZ z+Wpw)>dWsxe>pF<I{etG6^$SO0SG_<0uX=z1Rwwb2tWV=5b#A{bDu42@zuYkeyz^3 z$ZA`vWp=A6w!UMjit${uN*!~a%VIJ$I@h9A>X`G4=H0n$b4{N69zllf4{zh`VIAo2 z)A9EEcw5#0+G<~Ol{TGjJU%qL{cAhk6#4JIM-XiqB_1DI`)1d*zw+*4V)Qk>PeiPB zCHa&ZtzBKCtNq@?<W*N%j*cd&ye`MN8IRKNFk0&v=Nx;&SIc}R^QzP_Uyrq#-RteK z=GE$SA69cJT3y{7LjVF0fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P(3~ z1fHLtZ*2)%MZ4%9A0HP_PfxWiv1>LOZ$zuqF>5y3rbg#lv`UTUcIQSYt;q9k{IdSW z+o8C&U7UCuZ?|(wc&&!;wyXiP)xO4UZ93g}d}wz2S9sj}{y~Krx8J2qT)k@@dW19I z6(>g5>Hu@J4xOAMKA*g9*I3bc_~GFpPvv|?D;_>#2vqUblss&Ko3Uy3axG!6N2^GN zry$(x?M8cabIu`bd(BB`J*1!KAOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z z1Rwwb2tXiA0`>Lz!j>?j?-un|>(yCZ+cG<ide5ZMIN$0Ny|#`x&nBN!qj%lV9C4n} zyg!#CKcC4ndG0pTh0_{u<85DVZL9^{wa}2qp4KF4^?I70RqMSz>-`>LwR$~h^))86 z?YF)@n;72B?-TKAT{ZlL*0y$0*>3M)@~SdBZx1S|yw1*ZGcKj!VYHfSl>M)p-hQU_ z_s;t2bk>|-<G$|x-}UxL^ZL>uTg{1ReW{(_ApijgKmY;|fB*y_009U<00Izz00bZa z0SG_<0uX=z1Rwwb2tXiQ0@X6RwIy5y?IYjZXN$7PYFlF0T-|3kqE+gcHJ8O?YILqe ztJG+2e}06}l05ImFY9l-9fD)q$B4J_c6+yk)p7`L%Njsi?Q7iDrqhkbhi12bZO5A; z?|uKEHjNUG53NIwZspy@#OPazMyb&{bY_nGeDa#rQF?ee&XYM`(TazU8wLk|cbSlf zE$nKU&twfDwY?racp^Lo;9hT!an3n}&T39Y>mmI-2LT8`00Izz00bZa0SG_<0uX=z z1Rwwb2tWV=5P$##AOHafKmY<^64?H|JM#M&Bs1>)3_k8>me0{pSH*ZP_o+y2^=pXD zM+`&kPw=6mOP^?Fzfl*zgwz&q<L!|A+9g)J{XX87b&s~%*V<E?PB$JOn%(}j9s9V4 zSer(P$A{J~<Ef9f`+a7O|3?zBR`yEzFw%g1vR5+Fy^<;IZBA&PSxS5AQqpRt0QL{| o|Nk@woLXP~X!Z}jiiQ^;009U<00Izz00bZa0SG_<0-Xr_18edjo&W#< literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_commandlink_glyph_60px.svg b/dlls/light.msstyles/blue_commandlink_glyph_60px.svg new file mode 100644 index 00000000000..39c0b268689 --- /dev/null +++ b/dlls/light.msstyles/blue_commandlink_glyph_60px.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:60-32" width="60" height="300" version="1.1" viewBox="0 0 15.875 79.376" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g transform="matrix(2 0 0 2 -.00011333 -1.3333e-5)" stroke-width=".066145"> + <path d="m4.7625 2.1167-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#3096fa"/> + <path d="m4.7625 10.054-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#3096fa"/> + <path d="m4.7625 17.992-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#2979ff"/> + <path d="m4.7625 25.929-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#aeaeae"/> + <path d="m4.7625 33.867-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#3096fa"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_commandlink_glyph_67px.bmp b/dlls/light.msstyles/blue_commandlink_glyph_67px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..feda4b6f2333839485908487353dfe763cd86c33 GIT binary patch literal 89918 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 A>Hq)$ literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_commandlink_glyph_67px.svg b/dlls/light.msstyles/blue_commandlink_glyph_67px.svg new file mode 100644 index 00000000000..3bec4747060 --- /dev/null +++ b/dlls/light.msstyles/blue_commandlink_glyph_67px.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:67-32" width="67" height="335" version="1.1" viewBox="0 0 17.727 88.637" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g transform="matrix(2.3333 0 0 2.3333 -.17651 -.1764)" stroke-width=".048596"> + <path d="m4.6737 2.0033-0.37573 0.37688 1.2205 1.2268h-4.3089v0.53459h4.3089l-1.2231 1.2268 0.3784 0.37688 1.8653-1.8711z" fill="#3096fa"/> + <path d="m4.6737 9.6007-0.37573 0.37688 1.2205 1.2268h-4.3089v0.53459h4.3089l-1.2231 1.2268 0.3784 0.37688 1.8653-1.8711z" fill="#3096fa"/> + <path d="m4.6737 17.198-0.37573 0.37688 1.2205 1.2268h-4.3089v0.53459h4.3089l-1.2231 1.2268 0.3784 0.37688 1.8653-1.8711z" fill="#2979ff"/> + <path d="m4.6737 24.796-0.37573 0.37688 1.2205 1.2268h-4.3089v0.53459h4.3089l-1.2231 1.2268 0.3784 0.37688 1.8653-1.8711z" fill="#aeaeae"/> + <path d="m4.6738 32.393-0.37573 0.37688 1.2205 1.2268h-4.3089v0.53459h4.3089l-1.2231 1.2268 0.3784 0.37688 1.8653-1.8711z" fill="#3096fa"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_commandlink_glyph_75px.bmp b/dlls/light.msstyles/blue_commandlink_glyph_75px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..0d12720c412be39cd4b1f00c1a2bdb872c236bef GIT binary patch literal 112638 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 V00IagfB*srAb<b@2q0hx{15l2nOOh; literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_commandlink_glyph_75px.svg b/dlls/light.msstyles/blue_commandlink_glyph_75px.svg new file mode 100644 index 00000000000..f24c34fe6b6 --- /dev/null +++ b/dlls/light.msstyles/blue_commandlink_glyph_75px.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:75-32" width="75" height="375" version="1.1" viewBox="0 0 19.844 99.22" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g transform="matrix(2.5 0 0 2.5 .13215 -5e-5)" stroke-width=".042333"> + <path d="m4.7625 2.1167-0.37306 0.37307 1.2118 1.2144h-4.2783v0.52918h4.2783l-1.2144 1.2144 0.37571 0.37307 1.8521-1.8522z" fill="#3096fa"/> + <path d="m4.7625 10.054-0.37306 0.37307 1.2118 1.2144h-4.2783v0.52918h4.2783l-1.2144 1.2144 0.37571 0.37307 1.8521-1.8522z" fill="#3096fa"/> + <path d="m4.7625 17.992-0.37306 0.37307 1.2118 1.2144h-4.2783v0.52918h4.2783l-1.2144 1.2144 0.37571 0.37307 1.8521-1.8522z" fill="#2979ff"/> + <path d="m4.7625 25.929-0.37306 0.37307 1.2118 1.2144h-4.2783v0.52918h4.2783l-1.2144 1.2144 0.37571 0.37307 1.8521-1.8522z" fill="#aeaeae"/> + <path d="m4.7625 33.867-0.37306 0.37307 1.2118 1.2144h-4.2783v0.52918h4.2783l-1.2144 1.2144 0.37571 0.37307 1.8521-1.8522z" fill="#3096fa"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_radiobutton_19px.bmp b/dlls/light.msstyles/blue_radiobutton_19px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..a8f0d8e369e091c4a70bc0738a13df37ea5213d3 GIT binary patch literal 11690 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 HC$8gvq=Xj^ literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_radiobutton_19px.svg b/dlls/light.msstyles/blue_radiobutton_19px.svg new file mode 100644 index 00000000000..116c68b5fdc --- /dev/null +++ b/dlls/light.msstyles/blue_radiobutton_19px.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:19-32" width="19" height="152" version="1.1" viewBox="0 0 19 152" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <path d="m15 85.5a5.5 5.5 0 0 1-5.5 5.5 5.5 5.5 0 0 1-5.5-5.5 5.5 5.5 0 0 1 5.5-5.5 5.5 5.5 0 0 1 5.5 5.5z" stroke-width=".99999"/> + <g transform="matrix(1.2106 0 0 1.189 -.18477 -.17782)" fill="none" stroke-width=".83352"> + <ellipse cx="8" cy="8.1396" rx="7.4306" ry="7.5733" stroke="#aeaeae"/> + <ellipse cx="8" cy="24.12" rx="7.4306" ry="7.5733" stroke="#3096fa"/> + <ellipse cx="8" cy="40.1" rx="7.4306" ry="7.5733" stroke="#2979ff"/> + <ellipse cx="8" cy="56.08" rx="7.4306" ry="7.5733" stroke="#aeaeae"/> + <ellipse cx="8" cy="72.06" rx="7.4306" ry="7.5733" stroke="#aeaeae"/> + <ellipse cx="8" cy="88.04" rx="7.4306" ry="7.5733" stroke="#3096fa"/> + <ellipse cx="8" cy="104.02" rx="7.4306" ry="7.5733" stroke="#2979ff"/> + <ellipse cx="8" cy="120" rx="7.4306" ry="7.5733" stroke="#aeaeae"/> + </g> + <g transform="matrix(1.0159 0 0 1.1881 1.3728 -.10631)"> + <path d="m12.967 88.044a5 4.2482 0 0 1-5 4.2482 5 4.2482 0 0 1-5-4.2482 5 4.2482 0 0 1 5-4.2482 5 4.2482 0 0 1 5 4.2482z" fill="#3096fa" stroke="#3096fa" stroke-width=".76202"/> + <path d="m13.414 104.04a5.414 4.6292 0 0 1-5.414 4.6292 5.414 4.6292 0 0 1-5.414-4.6292 5.414 4.6292 0 0 1 5.414-4.6292 5.414 4.6292 0 0 1 5.414 4.6292z" fill="#2979ff" stroke-width=".76202"/> + <path d="m13.414 120.03a5.414 4.6292 0 0 1-5.414 4.6292 5.414 4.6292 0 0 1-5.414-4.6292 5.414 4.6292 0 0 1 5.414-4.6292 5.414 4.6292 0 0 1 5.414 4.6292z" fill="#aeaeae" stroke-width=".76203"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_radiobutton_22px.bmp b/dlls/light.msstyles/blue_radiobutton_22px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..580b466b2c9fedc9626edd2f66e8d1b5acde1e0e GIT binary patch literal 15626 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 Zf!OcI%*`U_Zhkk^_`MUR%j2G}{x8-y9Pt1E literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_radiobutton_22px.svg b/dlls/light.msstyles/blue_radiobutton_22px.svg new file mode 100644 index 00000000000..45993de1038 --- /dev/null +++ b/dlls/light.msstyles/blue_radiobutton_22px.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:22-32" width="22" height="176" version="1.1" viewBox="0 0 22 176" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g fill="none" stroke-width="2"> + <circle cx="11" cy="11" r="10" stroke="#aeaeae"/> + <circle cx="11" cy="33" r="10" stroke="#3096fa"/> + <circle cx="11" cy="55" r="10" stroke="#2979ff"/> + <circle cx="11" cy="77" r="10" stroke="#aeaeae"/> + <circle cx="11" cy="99" r="10" stroke="#aeaeae"/> + <circle cx="11" cy="121" r="10" stroke="#3096fa"/> + <circle cx="11.055" cy="143" r="10" stroke="#2979ff"/> + <circle cx="11" cy="165" r="10" stroke="#aeaeae"/> + </g> + <path d="m17 99a6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6 6 6 0 0 1 6 6z"/> + <g transform="translate(0 -16)"> + <path d="m17 137a6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6 6 6 0 0 1 6 6z" fill="#3096fa"/> + <path d="m17 159a6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6 6 6 0 0 1 6 6z" fill="#2979ff"/> + <path d="m17 181a6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6 6 6 0 0 1 6 6z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_radiobutton_28px.bmp b/dlls/light.msstyles/blue_radiobutton_28px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..4329d94e6ed6e87d8279e8e2482ede00ec4c9db3 GIT binary patch literal 25226 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 E7wh(kHvj+t literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_radiobutton_28px.svg b/dlls/light.msstyles/blue_radiobutton_28px.svg new file mode 100644 index 00000000000..fc52dd57e08 --- /dev/null +++ b/dlls/light.msstyles/blue_radiobutton_28px.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:28-32" width="28" height="224" version="1.1" viewBox="0 0 28 224" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g fill="none" stroke-width="2"> + <circle cx="14" cy="14" r="13" stroke="#aeaeae"/> + <circle cx="14" cy="42" r="13" stroke="#3096fa"/> + <circle cx="14" cy="70" r="13" stroke="#2979ff"/> + <circle cx="14" cy="98" r="13" stroke="#aeaeae"/> + <circle cx="14" cy="126" r="13" stroke="#aeaeae"/> + <circle cx="14" cy="154" r="13" stroke="#3096fa"/> + <circle cx="14" cy="182" r="13" stroke="#2979ff"/> + <circle cx="14" cy="210" r="13" stroke="#aeaeae"/> + </g> + <path d="m22 126a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8z"/> + <g transform="matrix(1.0667 0 0 1 1.6667 20.5)" stroke-width=".9375"> + <path d="m19.062 133.5a7.5 8 0 0 1-7.5 8 7.5 8 0 0 1-7.5-8 7.5 8 0 0 1 7.5-8 7.5 8 0 0 1 7.5 8z" fill="#3096fa"/> + <path d="m19.062 161.5a7.5 8 0 0 1-7.5 8 7.5 8 0 0 1-7.5-8 7.5 8 0 0 1 7.5-8 7.5 8 0 0 1 7.5 8z" fill="#2979ff"/> + <path d="m19.062 189.5a7.5 8 0 0 1-7.5 8 7.5 8 0 0 1-7.5-8 7.5 8 0 0 1 7.5-8 7.5 8 0 0 1 7.5 8z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_radiobutton_31px.bmp b/dlls/light.msstyles/blue_radiobutton_31px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..159e5cb68b30cceabb3be64feecb9ca97fb3074b GIT binary patch literal 30890 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 literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_radiobutton_31px.svg b/dlls/light.msstyles/blue_radiobutton_31px.svg new file mode 100644 index 00000000000..5dddadd4ee7 --- /dev/null +++ b/dlls/light.msstyles/blue_radiobutton_31px.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:31-32" width="31" height="248" version="1.1" viewBox="0 0 31 248" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g fill="none" stroke-width="2"> + <circle cx="15.5" cy="15.5" r="14.5" stroke="#aeaeae"/> + <circle cx="15.5" cy="46.5" r="14.5" stroke="#3096fa"/> + <circle cx="15.5" cy="77.5" r="14.5" stroke="#2979ff"/> + <circle cx="15.5" cy="108.5" r="14.5" stroke="#aeaeae"/> + <circle cx="15.5" cy="139.5" r="14.5" stroke="#aeaeae"/> + <circle cx="15.5" cy="170.5" r="14.5" stroke="#3096fa"/> + <circle cx="15.5" cy="201.5" r="14.5" stroke="#2979ff"/> + <circle cx="15.5" cy="232.5" r="14.5" stroke="#aeaeae"/> + </g> + <path d="m25 139.5a9.5 9.5 0 0 1-9.5 9.5 9.5 9.5 0 0 1-9.5-9.5 9.5 9.5 0 0 1 9.5-9.5 9.5 9.5 0 0 1 9.5 9.5z"/> + <g transform="matrix(1.0667 0 0 1 3.6666 40.5)" stroke-width=".9375"> + <path d="m19.999 130a8.906 9.5 0 0 1-8.906 9.5 8.906 9.5 0 0 1-8.906-9.5 8.906 9.5 0 0 1 8.906-9.5 8.906 9.5 0 0 1 8.906 9.5z" fill="#3096fa"/> + <path d="m19.999 161a8.906 9.5 0 0 1-8.906 9.5 8.906 9.5 0 0 1-8.906-9.5 8.906 9.5 0 0 1 8.906-9.5 8.906 9.5 0 0 1 8.906 9.5z" fill="#2979ff"/> + <path d="m19.999 192a8.906 9.5 0 0 1-8.906 9.5 8.906 9.5 0 0 1-8.906-9.5 8.906 9.5 0 0 1 8.906-9.5 8.906 9.5 0 0 1 8.906 9.5z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index bddf183132c..3e6df6ea6a5 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -211,10 +211,18 @@ BLUE_INI TEXTFILE "Transparent = True\r\n" "ImageFile1 = blue_checkbox_13px.bmp\r\n" "ImageFile2 = blue_checkbox_16px.bmp\r\n" -"ImageFile3 = blue_checkbox_25px.bmp\r\n" +"ImageFile3 = blue_checkbox_19px.bmp\r\n" +"ImageFile4 = blue_checkbox_22px.bmp\r\n" +"ImageFile5 = blue_checkbox_25px.bmp\r\n" +"ImageFile6 = blue_checkbox_28px.bmp\r\n" +"ImageFile7 = blue_checkbox_31px.bmp\r\n" "MinDpi1 = 96\r\n" -"MinDpi2 = 118\r\n" -"MinDpi3 = 185\r\n" +"MinDpi2 = 120\r\n" +"MinDpi3 = 144\r\n" +"MinDpi4 = 168\r\n" +"MinDpi5 = 192\r\n" +"MinDpi6 = 216\r\n" +"MinDpi7 = 240\r\n" "[Button.Checkbox(Checkeddisabled)]\r\n" "TextColor = 189 189 189\r\n" @@ -237,10 +245,18 @@ BLUE_INI TEXTFILE "UniformSizing = True\r\n" "ImageFile1 = blue_radiobutton_13px.bmp\r\n" "ImageFile2 = blue_radiobutton_16px.bmp\r\n" -"ImageFile3 = blue_radiobutton_25px.bmp\r\n" +"ImageFile3 = blue_radiobutton_19px.bmp\r\n" +"ImageFile4 = blue_radiobutton_22px.bmp\r\n" +"ImageFile5 = blue_radiobutton_25px.bmp\r\n" +"ImageFile6 = blue_radiobutton_28px.bmp\r\n" +"ImageFile7 = blue_radiobutton_31px.bmp\r\n" "MinDpi1 = 96\r\n" -"MinDpi2 = 118\r\n" -"MinDpi3 = 185\r\n" +"MinDpi2 = 120\r\n" +"MinDpi3 = 144\r\n" +"MinDpi4 = 168\r\n" +"MinDpi5 = 192\r\n" +"MinDpi6 = 216\r\n" +"MinDpi7 = 240\r\n" "[Button.Radiobutton(Checkeddisabled)]\r\n" "TextColor = 189 189 189\r\n" @@ -291,9 +307,19 @@ BLUE_INI TEXTFILE "Transparent = True\r\n" "UniformSizing = True\r\n" "ImageFile1 = blue_commandlink_glyph_30px.bmp\r\n" -"ImageFile2 = blue_commandlink_glyph_45px.bmp\r\n" +"ImageFile2 = blue_commandlink_glyph_37px.bmp\r\n" +"ImageFile3 = blue_commandlink_glyph_45px.bmp\r\n" +"ImageFile4 = blue_commandlink_glyph_52px.bmp\r\n" +"ImageFile5 = blue_commandlink_glyph_60px.bmp\r\n" +"ImageFile6 = blue_commandlink_glyph_67px.bmp\r\n" +"ImageFile7 = blue_commandlink_glyph_75px.bmp\r\n" "MinDpi1 = 96\r\n" -"MinDpi2 = 144\r\n" +"MinDpi2 = 120\r\n" +"MinDpi3 = 144\r\n" +"MinDpi4 = 168\r\n" +"MinDpi5 = 192\r\n" +"MinDpi6 = 216\r\n" +"MinDpi7 = 240\r\n" "\r\n; ComboBox\r\n" "[ComboBox]\r\n" @@ -919,18 +945,42 @@ BLUE_CHECKBOX_13PX_BMP BITMAP "blue_checkbox_13px.bmp" /* @makedep: blue_checkbox_16px.bmp */ BLUE_CHECKBOX_16PX_BMP BITMAP "blue_checkbox_16px.bmp" +/* @makedep: blue_checkbox_19px.bmp */ +BLUE_CHECKBOX_19PX_BMP BITMAP "blue_checkbox_19px.bmp" + +/* @makedep: blue_checkbox_22px.bmp */ +BLUE_CHECKBOX_22PX_BMP BITMAP "blue_checkbox_22px.bmp" + /* @makedep: blue_checkbox_25px.bmp */ BLUE_CHECKBOX_25PX_BMP BITMAP "blue_checkbox_25px.bmp" +/* @makedep: blue_checkbox_28px.bmp */ +BLUE_CHECKBOX_28PX_BMP BITMAP "blue_checkbox_28px.bmp" + +/* @makedep: blue_checkbox_31px.bmp */ +BLUE_CHECKBOX_31PX_BMP BITMAP "blue_checkbox_31px.bmp" + /* @makedep: blue_radiobutton_13px.bmp */ BLUE_RADIOBUTTON_13PX_BMP BITMAP "blue_radiobutton_13px.bmp" /* @makedep: blue_radiobutton_16px.bmp */ BLUE_RADIOBUTTON_16PX_BMP BITMAP "blue_radiobutton_16px.bmp" +/* @makedep: blue_radiobutton_19px.bmp */ +BLUE_RADIOBUTTON_19PX_BMP BITMAP "blue_radiobutton_19px.bmp" + +/* @makedep: blue_radiobutton_22px.bmp */ +BLUE_RADIOBUTTON_22PX_BMP BITMAP "blue_radiobutton_22px.bmp" + /* @makedep: blue_radiobutton_25px.bmp */ BLUE_RADIOBUTTON_25PX_BMP BITMAP "blue_radiobutton_25px.bmp" +/* @makedep: blue_radiobutton_28px.bmp */ +BLUE_RADIOBUTTON_28PX_BMP BITMAP "blue_radiobutton_28px.bmp" + +/* @makedep: blue_radiobutton_31px.bmp */ +BLUE_RADIOBUTTON_31PX_BMP BITMAP "blue_radiobutton_31px.bmp" + /* @makedep: blue_groupbox.bmp */ BLUE_GROUPBOX_BMP BITMAP "blue_groupbox.bmp" @@ -940,9 +990,24 @@ BLUE_COMMANDLINK_BMP BITMAP "blue_commandlink.bmp" /* @makedep: blue_commandlink_glyph_30px.bmp */ BLUE_COMMANDLINK_GLYPH_30PX_BMP BITMAP "blue_commandlink_glyph_30px.bmp" +/* @makedep: blue_commandlink_glyph_37px.bmp */ +BLUE_COMMANDLINK_GLYPH_37PX_BMP BITMAP "blue_commandlink_glyph_37px.bmp" + /* @makedep: blue_commandlink_glyph_45px.bmp */ BLUE_COMMANDLINK_GLYPH_45PX_BMP BITMAP "blue_commandlink_glyph_45px.bmp" +/* @makedep: blue_commandlink_glyph_52px.bmp */ +BLUE_COMMANDLINK_GLYPH_52PX_BMP BITMAP "blue_commandlink_glyph_52px.bmp" + +/* @makedep: blue_commandlink_glyph_60px.bmp */ +BLUE_COMMANDLINK_GLYPH_60PX_BMP BITMAP "blue_commandlink_glyph_60px.bmp" + +/* @makedep: blue_commandlink_glyph_67px.bmp */ +BLUE_COMMANDLINK_GLYPH_67PX_BMP BITMAP "blue_commandlink_glyph_67px.bmp" + +/* @makedep: blue_commandlink_glyph_75px.bmp */ +BLUE_COMMANDLINK_GLYPH_75PX_BMP BITMAP "blue_commandlink_glyph_75px.bmp" + /* ComboBox */ /* @makedep: blue_combobutton.bmp */ BLUE_COMBOBUTTON_BMP BITMAP "blue_combobutton.bmp" -- 2.30.2

1 0

[PATCH v3 2/2] kernelbase: Don't add a backslash to the second path if not needed.
by Zhiyi Zhang 23 Aug '21

23 Aug '21

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/kernelbase/path.c | 7 ++++--- dlls/kernelbase/tests/path.c | 18 +++++++----------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 9387705e963..a9105341fad 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -401,7 +401,7 @@ HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD fl { SIZE_T combined_length, length2; WCHAR *combined_path; - BOOL from_path2 = FALSE; + BOOL add_backslash = FALSE; HRESULT hr; TRACE("%s %s %#x %p\n", wine_dbgstr_w(path1), wine_dbgstr_w(path2), flags, out); @@ -419,7 +419,8 @@ HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD fl { path1 = path2; path2 = NULL; - from_path2 = TRUE; + add_backslash = (is_drive_spec(path1) && !path1[2]) + || (is_prefixed_disk(path1) && !path1[6]); } length2 = path2 ? lstrlenW(path2) : 0; @@ -435,7 +436,7 @@ HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD fl lstrcpyW(combined_path, path1); PathCchStripPrefix(combined_path, combined_length); - if (from_path2) PathCchAddBackslashEx(combined_path, combined_length, NULL, NULL); + if (add_backslash) PathCchAddBackslashEx(combined_path, combined_length, NULL, NULL); if (path2 && path2[0]) { diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index f8712679eae..af511f500f3 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -426,7 +426,6 @@ struct combine_test const CHAR *path1; const CHAR *path2; const CHAR *result; - BOOL todo; }; static const struct combine_test combine_tests[] = @@ -474,21 +473,21 @@ static const struct combine_test combine_tests[] = /* Second path is fully qualified */ {"X:\\", "C:", "C:\\"}, {"X:\\", "C:\\", "C:\\"}, - {"X:\\", "C:\\a", "C:\\a", TRUE}, + {"X:\\", "C:\\a", "C:\\a"}, {"X:\\", "\\\\", "\\\\"}, - {"X:\\", "\\\\a", "\\\\a", TRUE}, + {"X:\\", "\\\\a", "\\\\a"}, {"X:\\", "\\\\?\\C:", "C:\\"}, {"X:\\", "\\\\?\\C:\\", "C:\\"}, - {"X:\\", "\\\\?\\C:\\a", "C:\\a", TRUE}, - {"X:\\", "\\\\?\\UNC", "\\\\?\\UNC", TRUE}, + {"X:\\", "\\\\?\\C:\\a", "C:\\a"}, + {"X:\\", "\\\\?\\UNC", "\\\\?\\UNC"}, {"X:\\", "\\\\?\\UNC\\", "\\\\"}, - {"X:\\", "\\\\?\\UNC\\a", "\\\\a", TRUE}, + {"X:\\", "\\\\?\\UNC\\a", "\\\\a"}, {"X:\\", "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}", - "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}", TRUE}, + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}"}, {"X:\\", "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\"}, {"X:\\", "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a", - "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a", TRUE}, + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a"}, /* Canonicalization */ {"C:\\a", ".\\b", "C:\\a\\b"}, @@ -547,7 +546,6 @@ static void test_PathAllocCombine(void) if (SUCCEEDED(hr)) { WideCharToMultiByte(CP_ACP, 0, resultW, -1, resultA, ARRAY_SIZE(resultA), NULL, NULL); - todo_wine_if(t->todo) ok(!lstrcmpA(resultA, t->result), "combine %s %s expect result %s, got %s\n", t->path1, t->path2, t->result, resultA); LocalFree(resultW); @@ -611,7 +609,6 @@ static void test_PathCchCombine(void) hr = pPathCchCombine(output, ARRAY_SIZE(output), p1, p2); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - todo_wine_if(combine_tests[i].todo) ok(!lstrcmpW(output, expected), "Combining %s with %s returned %s, expected %s\n", wine_dbgstr_w(p1), wine_dbgstr_w(p2), wine_dbgstr_w(output), wine_dbgstr_w(expected)); } @@ -680,7 +677,6 @@ static void test_PathCchCombineEx(void) hr = pPathCchCombineEx(output, MAX_PATH, p1, p2, 0); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - todo_wine_if(combine_tests[i].todo) ok(!lstrcmpW(output, expected), "Combining %s with %s returned %s, expected %s\n", wine_dbgstr_w(p1), wine_dbgstr_w(p2), wine_dbgstr_w(output), wine_dbgstr_w(expected)); } -- 2.30.2

1 0

[PATCH v3 1/2] kernelbase/tests: Add more tests for combining the second path.
by Zhiyi Zhang 23 Aug '21

23 Aug '21

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v3: Supersede 212136~212137. Add more tests and some style changes. dlls/kernelbase/tests/path.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 8d85542612f..f8712679eae 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -426,6 +426,7 @@ struct combine_test const CHAR *path1; const CHAR *path2; const CHAR *result; + BOOL todo; }; static const struct combine_test combine_tests[] = @@ -473,12 +474,21 @@ static const struct combine_test combine_tests[] = /* Second path is fully qualified */ {"X:\\", "C:", "C:\\"}, {"X:\\", "C:\\", "C:\\"}, + {"X:\\", "C:\\a", "C:\\a", TRUE}, {"X:\\", "\\\\", "\\\\"}, + {"X:\\", "\\\\a", "\\\\a", TRUE}, {"X:\\", "\\\\?\\C:", "C:\\"}, {"X:\\", "\\\\?\\C:\\", "C:\\"}, + {"X:\\", "\\\\?\\C:\\a", "C:\\a", TRUE}, + {"X:\\", "\\\\?\\UNC", "\\\\?\\UNC", TRUE}, {"X:\\", "\\\\?\\UNC\\", "\\\\"}, + {"X:\\", "\\\\?\\UNC\\a", "\\\\a", TRUE}, + {"X:\\", "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}", TRUE}, {"X:\\", "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\"}, + {"X:\\", "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a", TRUE}, /* Canonicalization */ {"C:\\a", ".\\b", "C:\\a\\b"}, @@ -537,6 +547,7 @@ static void test_PathAllocCombine(void) if (SUCCEEDED(hr)) { WideCharToMultiByte(CP_ACP, 0, resultW, -1, resultA, ARRAY_SIZE(resultA), NULL, NULL); + todo_wine_if(t->todo) ok(!lstrcmpA(resultA, t->result), "combine %s %s expect result %s, got %s\n", t->path1, t->path2, t->result, resultA); LocalFree(resultW); @@ -600,6 +611,7 @@ static void test_PathCchCombine(void) hr = pPathCchCombine(output, ARRAY_SIZE(output), p1, p2); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + todo_wine_if(combine_tests[i].todo) ok(!lstrcmpW(output, expected), "Combining %s with %s returned %s, expected %s\n", wine_dbgstr_w(p1), wine_dbgstr_w(p2), wine_dbgstr_w(output), wine_dbgstr_w(expected)); } @@ -668,6 +680,7 @@ static void test_PathCchCombineEx(void) hr = pPathCchCombineEx(output, MAX_PATH, p1, p2, 0); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + todo_wine_if(combine_tests[i].todo) ok(!lstrcmpW(output, expected), "Combining %s with %s returned %s, expected %s\n", wine_dbgstr_w(p1), wine_dbgstr_w(p2), wine_dbgstr_w(output), wine_dbgstr_w(expected)); } -- 2.30.2

1 0

[PATCH 1/2] kernel32/tests: Don't allow the pre-Vista locale results.
by Francois Gouget 22 Aug '21

22 Aug '21

This simplifies the Get*Format() tests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/kernel32/tests/locale.c | 40 +++++++++++------------------------- 1 file changed, 12 insertions(+), 28 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 4625283035c..d738089064f 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -479,9 +479,8 @@ static void test_GetTimeFormatA(void) STRINGSA("m1s2m3s4", ""); /* TIME_NOMINUTESORSECONDS/complex format */ ret = GetTimeFormatA(lcid, TIME_NOMINUTESORSECONDS, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret == strlen(buffer)+1, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - ok( !strcmp( buffer, "" ) || broken( !strcmp( buffer, "4" )), /* win9x */ - "Expected '', got '%s'\n", buffer ); + ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + EXPECT_LENA; EXPECT_EQA; STRINGSA("", "8:56 AM"); /* TIME_NOSECONDS/Default format */ ret = GetTimeFormatA(lcid, NUO|TIME_NOSECONDS, &curtime, NULL, buffer, ARRAY_SIZE(buffer)); @@ -497,14 +496,12 @@ static void test_GetTimeFormatA(void) STRINGSA("h.@:m.@:s.@:tt", "8.@:56AM"); /* Multiple delimiters */ ret = GetTimeFormatA(lcid, TIME_NOSECONDS, &curtime, input, buffer, ARRAY_SIZE(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - ok( !strcmp( buffer, "8.@:56AM" ) || broken( !strcmp( buffer, "8.@:56.@:AM" )) /* win9x */, - "Expected '8.@:56AM', got '%s'\n", buffer ); + EXPECT_LENA; EXPECT_EQA; STRINGSA("s1s2s3", ""); /* Duplicate tokens */ ret = GetTimeFormatA(lcid, TIME_NOSECONDS, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret == strlen(buffer)+1, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - ok( !strcmp( buffer, "" ) || broken( !strcmp( buffer, "3" )), /* win9x */ - "Expected '', got '%s'\n", buffer ); + ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + EXPECT_LENA; EXPECT_EQA; STRINGSA("t/tt", "A/AM"); /* AM time marker */ ret = GetTimeFormatA(lcid, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); @@ -829,7 +826,6 @@ static void test_GetDateFormatA(void) LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); LCID lcid_ru = MAKELCID(MAKELANGID(LANG_RUSSIAN, SUBLANG_NEUTRAL), SORT_DEFAULT); char buffer[BUFFER_SIZE], input[BUFFER_SIZE], Expected[BUFFER_SIZE]; - char Broken[BUFFER_SIZE]; char short_day[10], month[10], genitive_month[10]; memset(&curtime, 2, sizeof(SYSTEMTIME)); /* Invalid time */ @@ -947,21 +943,15 @@ static void test_GetDateFormatA(void) STRINGSA("MMMMdd", ""); sprintf(Expected, "%s04", genitive_month); - sprintf(Broken, "%s04", month); ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - ok(strncmp(buffer, Expected, strlen(Expected)) == 0 || - broken(strncmp(buffer, Broken, strlen(Broken)) == 0) /* nt4 */, - "Expected '%s', got '%s'\n", Expected, buffer); + EXPECT_EQA; STRINGSA("MMMMdd ddd", ""); sprintf(Expected, "%s04 %s", genitive_month, short_day); - sprintf(Broken, "%s04 %s", month, short_day); ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - ok(strncmp(buffer, Expected, strlen(Expected)) == 0 || - broken(strncmp(buffer, Broken, strlen(Broken)) == 0) /* nt4 */, - "Expected '%s', got '%s'\n", Expected, buffer); + EXPECT_EQA; STRINGSA("dd dddMMMM", ""); sprintf(Expected, "04 %s%s", short_day, month); @@ -971,22 +961,16 @@ static void test_GetDateFormatA(void) STRINGSA("dd dddMMMM ddd MMMMdd", ""); sprintf(Expected, "04 %s%s %s %s04", short_day, month, short_day, genitive_month); - sprintf(Broken, "04 %s%s %s %s04", short_day, month, short_day, month); ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - ok(strncmp(buffer, Expected, strlen(Expected)) == 0 || - broken(strncmp(buffer, Broken, strlen(Broken)) == 0) /* nt4 */, - "Expected '%s', got '%s'\n", Expected, buffer); + EXPECT_EQA; /* with literal part */ STRINGSA("ddd',' MMMM dd", ""); sprintf(Expected, "%s, %s 04", short_day, genitive_month); - sprintf(Broken, "%s, %s 04", short_day, month); ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, ARRAY_SIZE(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - ok(strncmp(buffer, Expected, strlen(Expected)) == 0 || - broken(strncmp(buffer, Broken, strlen(Broken)) == 0) /* nt4 */, - "Expected '%s', got '%s'\n", Expected, buffer); + EXPECT_EQA; } static void test_GetDateFormatEx(void) @@ -1221,7 +1205,7 @@ static void test_GetCurrencyFormatA(void) SetLastError(0xdeadbeef); ret = GetCurrencyFormatA(lcid, NUO, input, &format, buffer, ARRAY_SIZE(buffer)); ok( !ret, "Expected ret == 0, got %d\n", ret); - ok( GetLastError() == ERROR_INVALID_FLAGS || GetLastError() == ERROR_INVALID_PARAMETER, + ok( GetLastError() == ERROR_INVALID_FLAGS, "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); STRINGSA("2353",""); /* Invalid format --> Error */ @@ -1477,7 +1461,7 @@ static void test_GetNumberFormatA(void) SetLastError(0xdeadbeef); ret = GetNumberFormatA(lcid, NUO, input, &format, buffer, ARRAY_SIZE(buffer)); ok( !ret, "Expected ret == 0, got %d\n", ret); - ok( GetLastError() == ERROR_INVALID_FLAGS || GetLastError() == ERROR_INVALID_PARAMETER, + ok( GetLastError() == ERROR_INVALID_FLAGS, "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); STRINGSA("2353",""); /* Invalid format --> Error */ @@ -1662,7 +1646,7 @@ static void test_GetNumberFormatEx(void) STRINGSW("2353",""); /* Format and flags given --> Error */ ret = pGetNumberFormatEx(enW, NUO, input, &format, buffer, ARRAY_SIZE(buffer)); ok( !ret, "Expected ret == 0, got %d\n", ret); - ok( GetLastError() == ERROR_INVALID_FLAGS || GetLastError() == ERROR_INVALID_PARAMETER, + ok( GetLastError() == ERROR_INVALID_FLAGS, "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); STRINGSW("2353",""); /* Invalid format --> Error */ -- 2.20.1

1 1

[PATCH] wineusb.sys: Fix a potential buffer overflow in add_usb_device().
by Francois Gouget 22 Aug '21

22 Aug '21

name needs to be able to hold 15 characters plus an unsigned int, potentially up to 10 characters even if it is unlikely, plus the trailing nul character. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- From: static const WCHAR formatW[] = {'\\','D','e','v','i','c','e','\\','U','S','B','P','D','O','-','%','u',0}; ... sprintfW(name, formatW, name_index++); --- dlls/wineusb.sys/wineusb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index fae297915fc..a7156899379 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -94,7 +94,7 @@ static void add_usb_device(libusb_device *libusb_device) DEVICE_OBJECT *device_obj; UNICODE_STRING string; NTSTATUS status; - WCHAR name[20]; + WCHAR name[26]; int ret; libusb_get_device_descriptor(libusb_device, &device_desc); -- 2.20.1

1 0

[PATCH] avifil32: Fix a ASCII / ANSI mixup in comments.
by Francois Gouget 22 Aug '21

22 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/avifil32/api.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 5a9985424e7..0494bfc59e4 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -203,7 +203,7 @@ HRESULT WINAPI AVIFileOpenA(PAVIFILE *ppfile, LPCSTR szFile, UINT uMode, if (ppfile == NULL || szFile == NULL) return AVIERR_BADPARAM; - /* convert ASCII string to Unicode and call unicode function */ + /* convert the ANSI string to Unicode and call the Unicode function */ len = MultiByteToWideChar(CP_ACP, 0, szFile, -1, NULL, 0); if (len <= 0) return AVIERR_BADPARAM; @@ -1515,7 +1515,7 @@ HRESULT WINAPI AVISaveVA(LPCSTR szFile, CLSID *pclsidHandler, if (szFile == NULL || ppavi == NULL || plpOptions == NULL) return AVIERR_BADPARAM; - /* convert ASCII string to Unicode and call Unicode function */ + /* convert the ANSI string to Unicode and call the Unicode function */ len = MultiByteToWideChar(CP_ACP, 0, szFile, -1, NULL, 0); if (len <= 0) return AVIERR_BADPARAM; -- 2.20.1

1 0

[PATCH] kernel32/tests: Don't skip the CompareStringA() tests on Windows.
by Francois Gouget 22 Aug '21

22 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Found another if (0)... --- dlls/kernel32/tests/locale.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index c65c2cce3f2..4625283035c 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1903,9 +1903,13 @@ static void test_CompareStringA(void) ret = lstrcmpA(NULL, ""); ok (ret == -1 || broken(ret == -2) /* win9x */, "lstrcmpA(NULL, \"\") should return -1, got %d\n", ret); - - if (0) { /* this requires collation table patch to make it MS compatible */ + + /* this requires collation table patch to make it MS compatible */ + if (strcmp(winetest_platform, "wine") == 0) + skip("in Wine due to the lack of a compatible collation table\n"); + else + { ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "'o", -1, "-o", -1 ); ok(ret == CSTR_LESS_THAN, "'o vs -o expected CSTR_LESS_THAN, got %d\n", ret); -- 2.20.1

1 0

[PATCH] shell32: Add IApplicationDocumentLists stub (resend)
by André Zwing 22 Aug '21

22 Aug '21

This let's Cablabel S3 Lite 1.4.0.2 start, otherwise it shows a msgbox with the error and freezes. Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- dlls/shell32/shell32_classes.idl | 6 ++ dlls/shell32/shell32_main.h | 1 + dlls/shell32/shellole.c | 1 + dlls/shell32/shellpath.c | 112 +++++++++++++++++++++++++++++++ include/shobjidl.idl | 31 +++++++++ 5 files changed, 151 insertions(+) diff --git a/dlls/shell32/shell32_classes.idl b/dlls/shell32/shell32_classes.idl index f2c5ed4a766..22ef49ae5c7 100644 --- a/dlls/shell32/shell32_classes.idl +++ b/dlls/shell32/shell32_classes.idl @@ -74,6 +74,12 @@ coclass KnownFolderManager { interface IKnownFolderManager; } uuid(86c14003-4d6b-4ef3-a7b4-0506663b2e68) ] coclass ApplicationDestinations { interface IApplicationDestinations; } +[ + helpstring("Application Document List"), + threading(apartment), + uuid(86bec222-30f2-47e0-9f25-60d11cd75c28) +] coclass ApplicationDocumentLists { interface IApplicationDocumentLists; } + [ helpstring("Shell Drag and Drop Helper"), threading(apartment), diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index da50e19de46..99e5d0d4288 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -112,6 +112,7 @@ HRESULT WINAPI IAutoComplete_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVO HRESULT WINAPI ApplicationAssociationRegistration_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT WINAPI ApplicationDestinations_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; +HRESULT WINAPI ApplicationDocumentLists_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT IShellLink_ConstructFromFile(IUnknown * pUnkOuter, REFIID riid, LPCITEMIDLIST pidl, IUnknown **ppv) DECLSPEC_HIDDEN; diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 64ae59fd283..9870afe162e 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -68,6 +68,7 @@ static const struct { {&CLSID_ApplicationAssociationRegistration, ApplicationAssociationRegistration_Constructor}, {&CLSID_ApplicationDestinations, ApplicationDestinations_Constructor}, + {&CLSID_ApplicationDocumentLists, ApplicationDocumentLists_Constructor}, {&CLSID_AutoComplete, IAutoComplete_Constructor}, {&CLSID_ControlPanel, IControlPanel_Constructor}, {&CLSID_DragDropHelper, IDropTargetHelper_Constructor}, diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 2ffd608f645..0c656a570e3 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -1178,6 +1178,118 @@ HRESULT WINAPI ApplicationDestinations_Constructor(IUnknown *outer, REFIID riid, return hr; } +typedef struct +{ + IApplicationDocumentLists IApplicationDocumentLists_iface; + LONG ref; +} IApplicationDocumentListsImpl; + +static inline IApplicationDocumentListsImpl *impl_from_IApplicationDocumentLists( IApplicationDocumentLists *iface ) +{ + return CONTAINING_RECORD(iface, IApplicationDocumentListsImpl, IApplicationDocumentLists_iface); +} + +static HRESULT WINAPI ApplicationDocumentLists_QueryInterface(IApplicationDocumentLists *iface, + REFIID riid, LPVOID *ppv) +{ + IApplicationDocumentListsImpl *This = impl_from_IApplicationDocumentLists(iface); + + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppv); + + if (ppv == NULL) + return E_POINTER; + + if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IApplicationDocumentLists, riid)) + { + *ppv = &This->IApplicationDocumentLists_iface; + IUnknown_AddRef((IUnknown*)*ppv); + + TRACE("Returning IApplicationDocumentLists: %p\n", *ppv); + return S_OK; + } + + *ppv = NULL; + FIXME("(%p)->(%s, %p) interface not supported.\n", This, debugstr_guid(riid), ppv); + + return E_NOINTERFACE; +} + +static ULONG WINAPI ApplicationDocumentLists_AddRef(IApplicationDocumentLists *iface) +{ + IApplicationDocumentListsImpl *This = impl_from_IApplicationDocumentLists(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p), new refcount=%i\n", This, ref); + + return ref; +} + +static ULONG WINAPI ApplicationDocumentLists_Release(IApplicationDocumentLists *iface) +{ + IApplicationDocumentListsImpl *This = impl_from_IApplicationDocumentLists(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p), new refcount=%i\n", This, ref); + + if (ref == 0) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI ApplicationDocumentLists_SetAppID(IApplicationDocumentLists *iface, + const WCHAR *appid) +{ + IApplicationDocumentListsImpl *This = impl_from_IApplicationDocumentLists(iface); + + FIXME("(%p, %s) stub!\n", This, debugstr_w(appid)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ApplicationDocumentLists_GetList(IApplicationDocumentLists *iface, + uint list_type, uint item_count, + REFIID riid, void **obj) +{ + IApplicationDocumentListsImpl *This = impl_from_IApplicationDocumentLists(iface); + + FIXME("(%p, %u, %u, %s, %p): stub\n", This, list_type, item_count, debugstr_guid(riid), obj); + + return E_NOTIMPL; +} + +static const IApplicationDocumentListsVtbl ApplicationDocumentListsVtbl = +{ + ApplicationDocumentLists_QueryInterface, + ApplicationDocumentLists_AddRef, + ApplicationDocumentLists_Release, + ApplicationDocumentLists_SetAppID, + ApplicationDocumentLists_GetList +}; + +HRESULT WINAPI ApplicationDocumentLists_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) +{ + IApplicationDocumentListsImpl *This; + HRESULT hr; + + TRACE("(%p, %s, %p)\n", outer, debugstr_guid(riid), ppv); + + if (outer) + return CLASS_E_NOAGGREGATION; + + if (!(This = SHAlloc(sizeof(*This)))) + return E_OUTOFMEMORY; + + This->IApplicationDocumentLists_iface.lpVtbl = &ApplicationDocumentListsVtbl; + This->ref = 0; + + hr = IUnknown_QueryInterface(&This->IApplicationDocumentLists_iface, riid, ppv); + if (FAILED(hr)) + SHFree(This); + + return hr; +} + typedef struct { const KNOWNFOLDERID *id; diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 52e0c5c9db1..92e4da36c77 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -3485,6 +3485,29 @@ interface IApplicationDestinations : IUnknown HRESULT RemoveAllDestinations(); } +[ + object, + uuid(3c594f9f-9f30-47a1-979a-c9e83d3d0a06), + pointer_default(unique) +] +interface IApplicationDocumentLists : IUnknown +{ + typedef [v1_enum] enum APPDOCLISTTYPE + { + ADLT_RECENT = 0, + ADLT_FREQUENT = 1, + } APPDOCLISTTYPE; + + HRESULT SetAppID( + [in] LPCWSTR pszAppID); + + HRESULT GetList( + [in] APPDOCLISTTYPE list_type, + [in] UINT item_count, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); +} + [ uuid(6332debf-87b5-4670-90c0-5e57b408a49e), object, @@ -3825,6 +3848,14 @@ library ShellObjects interface IApplicationDestinations; } + [ + uuid(86bec222-30f2-47e0-9f25-60d11cd75c28) + ] + coclass ApplicationDocumentLists + { + interface IApplicationDocumentLists; + } + [ uuid(00021401-0000-0000-c000-000000000046) ] -- 2.25.1

1 0

[tools] winetest: Add support for Windows 10 21H1.
by Francois Gouget 22 Aug '21

22 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Some bits were missing which is why 21H1 did not appear on the website. Then I forgot to send this patch and wondered why it was not getting applied :-( This patch modifies winetest.conf. If the website uses a copy of that file it will need to be updated too. That should be sufficient to get 21H1 to appear on future builds. Note: I have put 21H1 in the win10L category because it will get the miscellaneous locale configurations eventually. That means it goes next to 2004 for now. Here are instructions to fix the past builds: 1. 21H1 was not yet known on the 13th which led to the "unknown" category. To get those back where they should be: for u in data/7f1446*/unknown_*;do w=$(echo "$u" | sed -e 's/unknown_/win21H1_/'); mv "$u" "$w"; done 2. Force gather to update the index pages to take the win21H1 reports into account. (technically only the builds from the 13th onward need an update but the list is getting long so it's simpler and not that time consuming to just do them all). gather --update-all 3. Update the main index pages build-index build-patterns Adjusting the paths to the scripts as appropriate... --- winetest/build-patterns | 2 +- winetest/winetest.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index a11c3de10..2ee5d5bdd 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -426,7 +426,7 @@ my %platform_order = ( win1709 => 1709, win1803 => 1803, win1809 => 1809, win1903 => 1903, win1909 => 1909, win2004 => 2004, - win2009 => 2009, + win2009 => 2009, win21H1 => 2101, win10 => 2100, # for backward compatibility wine => 3000, linux => 3001, mac => 3001, bsd => 3002, solaris => 3003 diff --git a/winetest/winetest.conf b/winetest/winetest.conf index 5ac2261a1..3db146a9f 100644 --- a/winetest/winetest.conf +++ b/winetest/winetest.conf @@ -50,7 +50,7 @@ $fixed_threshold = 0.99; { name => "Win1709+", ids => [ "win1709", "win1803", "win1809", "win1903" ] }, { name => "Win1909+", ids => [ "win1909" ] }, { name => "Win10", ids => [ "win2009", "win10" ] }, # win10 for backward compatibility - { name => "Win10L", ids => [ "win2004" ] }, + { name => "Win10L", ids => [ "win2004", "win21H1" ] }, { name => "Other", ids => [ "unknown" ] }, { name => "Linux", ids => [ "linux" ] }, { name => "Mac", ids => [ "mac" ] }, -- 2.20.1

1 0

[PATCH] dbghelp: fix the annoying failure about 'wrong name EntryPoint'
by Eric Pouech 21 Aug '21

21 Aug '21

Regression was introduced in d614ac46718311f49541b32ac726c17a06077ae1 by allowing to return the symbol with the lowest address in the module even if the requested address was strictly below. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/symbol.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index b2b4d578910..570e2adb8b6 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -893,11 +893,7 @@ struct symt_ht* symt_find_nearest(struct module* module, DWORD_PTR addr) high = module->num_sorttab; symt_get_address(&module->addr_sorttab[0]->symt, &ref_addr); - if (addr <= ref_addr) - { - low = symt_get_best_at(module, 0); - return module->addr_sorttab[low]; - } + if (addr < ref_addr) return NULL; if (high) {

1 0

[PATCH 1/2] server: Remove support for waiting on an IRP object.
by Zebediah Figura 21 Aug '21

21 Aug '21

This was initially used to let the client wait on IRP completion; c56c42ff79515a79b1913d31e21d6fecd7c11ef5 changed it to use the async handle instead. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- server/device.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/server/device.c b/server/device.c index 6400751e339..b669921a003 100644 --- a/server/device.c +++ b/server/device.c @@ -57,7 +57,6 @@ struct irp_call }; static void irp_call_dump( struct object *obj, int verbose ); -static int irp_call_signaled( struct object *obj, struct wait_queue_entry *entry ); static void irp_call_destroy( struct object *obj ); static const struct object_ops irp_call_ops = @@ -65,10 +64,10 @@ static const struct object_ops irp_call_ops = sizeof(struct irp_call), /* size */ &no_type, /* type */ irp_call_dump, /* dump */ - add_queue, /* add_queue */ - remove_queue, /* remove_queue */ - irp_call_signaled, /* signaled */ - no_satisfied, /* satisfied */ + no_add_queue, /* add_queue */ + NULL, /* remove_queue */ + NULL, /* signaled */ + NULL, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ default_map_access, /* map_access */ @@ -335,13 +334,6 @@ static void irp_call_dump( struct object *obj, int verbose ) fprintf( stderr, "IRP call file=%p\n", irp->file ); } -static int irp_call_signaled( struct object *obj, struct wait_queue_entry *entry ) -{ - struct irp_call *irp = (struct irp_call *)obj; - - return !irp->file; /* file is cleared once the irp has completed */ -} - static void irp_call_destroy( struct object *obj ) { struct irp_call *irp = (struct irp_call *)obj; @@ -411,7 +403,6 @@ static void set_irp_result( struct irp_call *irp, unsigned int status, release_object( irp->async ); irp->async = NULL; } - wake_up( &irp->obj, 0 ); release_object( irp ); /* no longer on the device queue */ release_object( file ); -- 2.30.2

1 1

[PATCH 1/2] user32/tests: Add tests for monochrome icons
by Fabian Maurer 21 Aug '21

21 Aug '21

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/tests/cursoricon.c | 84 ++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index f84312f3ea2..dbe2b3a57f0 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -3094,6 +3094,89 @@ static void test_copy_image(void) } } +/* The test the logic for the same function in user32 */ +static HBITMAP create_masked_bitmap( int width, int height, const void *and, const void *xor ) +{ + HDC dc = CreateCompatibleDC( 0 ); + HBITMAP bitmap; + int line_size = width/8; + const char* and2 = (const char*)and; + const char* xor2 = (const char*)xor; + char buffer[sizeof(BITMAPINFOHEADER) + sizeof(RGBQUAD) * 2] = {0}; + + BITMAPINFO *bitmap_info = (BITMAPINFO*)buffer; + bitmap_info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bitmap_info->bmiHeader.biWidth = width; + bitmap_info->bmiHeader.biHeight = height * 2; + bitmap_info->bmiHeader.biPlanes = 1; + bitmap_info->bmiHeader.biBitCount = 1; + bitmap_info->bmiColors[1].rgbRed = 255; + bitmap_info->bmiColors[1].rgbGreen = 255; + bitmap_info->bmiColors[1].rgbBlue = 255; + + bitmap = CreateBitmap( width, height * 2, 1, 1, NULL ); + + for (int i = 0; i < height; i++) + { + SetDIBits( dc, bitmap, height - i - 1, 1, &xor2[i*line_size], bitmap_info, FALSE ); + SetDIBits( dc, bitmap, 2*height - i - 1, 1, &and2[i*line_size], bitmap_info, FALSE ); + } + DeleteDC( dc ); + return bitmap; +} + +static void check_monochrome_icon(HICON icon, int draw_flag, int line, BOOL todo) +{ + HDC dc = CreateCompatibleDC(0); + HBITMAP canvas = CreateCompatibleBitmap(dc, 32, 32); + + SelectObject(dc, canvas); + + DrawIconEx(dc, 0, 0, icon, 16, 16, 0, NULL, draw_flag); + + for (int i = 0; i < 16; i++) + { + COLORREF color = GetPixel(dc, i, 8); + int expect = i % 2 == 0 ? 0 : 0xFFFFFF; + todo_wine_if(todo && (i%2 != 0)) + ok_(__FILE__,line)(color == expect, "At index %d got %x\n", i, color); + } + DeleteObject(canvas); + DeleteDC(dc); +} + +static void test_monochrome_icon_creation(void) +{ + HCURSOR cursor; + HICON icon; + ICONINFO iconinfo = {0}; + static const unsigned char monochrome_bits[] = + { + 0xFF, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0x55, 0x55, 0x00, 0x00, 0xAA, 0xAA, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0xAA, 0xAA, 0x00, 0x00, + 0x55, 0x55, 0x00, 0x00, 0xAA, 0xAA, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + }; + + iconinfo.fIcon = 1; + iconinfo.hbmMask = create_masked_bitmap(16, 16, monochrome_bits, &monochrome_bits[32]); + + cursor = CreateCursor(0, 8, 8, 16, 16, monochrome_bits, &monochrome_bits[32]); + ok(cursor != NULL, "CreateCursor failed\n"); + check_monochrome_icon(cursor, DI_NORMAL, __LINE__, TRUE); + DestroyCursor(cursor); + + icon = CreateIcon(0, 16, 16, 1, 1, monochrome_bits, &monochrome_bits[32]); + ok(icon != NULL, "CreateIcon failed\n"); + check_monochrome_icon(icon, DI_NORMAL, __LINE__, TRUE); + DestroyIcon(icon); + + icon = CreateIconIndirect(&iconinfo); + ok(icon != NULL, "CreateIconIndirect failed\n"); + check_monochrome_icon(icon, DI_NORMAL, __LINE__, FALSE); + DestroyIcon(icon); +} + START_TEST(cursoricon) { pGetCursorInfo = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetCursorInfo" ); @@ -3130,6 +3213,7 @@ START_TEST(cursoricon) test_DestroyCursor(); test_PrivateExtractIcons(); test_monochrome_icon(); + test_monochrome_icon_creation(); do_parent(); test_child_process(); finish_child_process(); -- 2.33.0

2 3

[PATCH 1/2] d3d10/effect: Handle geometry shader variables declared with stream output.
by Nikolay Sivov 21 Aug '21

21 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- This change allows effects with such variables to be parsed at all, next step to make it actually useful would be to parse declaration string to D3D10_SO_DECLARATION_ENTRY[] array. Since GetShaderDesc() is not implemented, for testing purposes declaration string could be checked via +d3d10 traces. Also worth noting that compiler seems to do only mask validation for declaration string, meaning that successful compilation does not mean that effect will be successfully created. Effect parsing then does further validation by checking semantics. dlls/d3d10/d3d10_private.h | 7 + dlls/d3d10/effect.c | 37 +++- dlls/d3d10/tests/effect.c | 397 ++++++++++++++++++++----------------- 3 files changed, 252 insertions(+), 189 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 8d48231d971..80761e5b706 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -53,6 +53,11 @@ enum d3d10_effect_object_type D3D10_EOT_SAMPLE_MASK = 0xb, }; +enum d3d10_effect_object_type_flags +{ + D3D10_EOT_FLAG_GS_SO = 0x1, +}; + enum d3d10_effect_object_operation { D3D10_EOO_VALUE = 1, @@ -111,6 +116,7 @@ struct d3d10_effect_shader_variable unsigned int resource_count; struct d3d10_effect_shader_resource *resources; + char *stream_output_declaration; }; struct d3d10_effect_state_object_variable @@ -154,6 +160,7 @@ struct d3d10_effect_type char *name; D3D10_SHADER_VARIABLE_TYPE basetype; D3D10_SHADER_VARIABLE_CLASS type_class; + unsigned int type_flags; DWORD id; struct wine_rb_entry entry; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 3040cb63528..e234aa0fea6 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -790,6 +790,8 @@ static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offse break; case D3D10_SVT_GEOMETRYSHADER: + if (v->type->type_flags & D3D10_EOT_FLAG_GS_SO) + FIXME("Create geometry shader with stream output.\n"); hr = ID3D10Device_CreateGeometryShader(device, ptr, dxbc_size, &v->u.shader.shader.gs); if (FAILED(hr)) return hr; break; @@ -816,8 +818,10 @@ static D3D10_SHADER_VARIABLE_CLASS d3d10_variable_class(DWORD c, BOOL is_column_ } } -static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object) +static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object, DWORD *flags) { + *flags = 0; + if(is_object) { switch (t) @@ -829,6 +833,9 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object) case 5: return D3D10_SVT_PIXELSHADER; case 6: return D3D10_SVT_VERTEXSHADER; case 7: return D3D10_SVT_GEOMETRYSHADER; + case 8: + *flags = D3D10_EOT_FLAG_GS_SO; + return D3D10_SVT_GEOMETRYSHADER; case 10: return D3D10_SVT_TEXTURE1D; case 11: return D3D10_SVT_TEXTURE1DARRAY; @@ -865,9 +872,9 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object) static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, struct d3d10_effect_type *t) { + DWORD typeinfo, type_flags; const char *ptr; DWORD unknown0; - DWORD typeinfo; unsigned int i; if (offset >= data_size || !require_space(offset, 6, sizeof(DWORD), data_size)) @@ -915,7 +922,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, t->member_count = 0; t->column_count = (typeinfo & D3D10_FX10_TYPE_COLUMN_MASK) >> D3D10_FX10_TYPE_COLUMN_SHIFT; t->row_count = (typeinfo & D3D10_FX10_TYPE_ROW_MASK) >> D3D10_FX10_TYPE_ROW_SHIFT; - t->basetype = d3d10_variable_type((typeinfo & D3D10_FX10_TYPE_BASETYPE_MASK) >> D3D10_FX10_TYPE_BASETYPE_SHIFT, FALSE); + t->basetype = d3d10_variable_type((typeinfo & D3D10_FX10_TYPE_BASETYPE_MASK) >> D3D10_FX10_TYPE_BASETYPE_SHIFT, FALSE, &type_flags); t->type_class = d3d10_variable_class((typeinfo & D3D10_FX10_TYPE_CLASS_MASK) >> D3D10_FX10_TYPE_CLASS_SHIFT, typeinfo & D3D10_FX10_TYPE_MATRIX_COLUMN_MAJOR_MASK); TRACE("Type description: %#x.\n", typeinfo); @@ -940,8 +947,9 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, t->member_count = 0; t->column_count = 0; t->row_count = 0; - t->basetype = d3d10_variable_type(typeinfo, TRUE); + t->basetype = d3d10_variable_type(typeinfo, TRUE, &type_flags); t->type_class = D3D10_SVC_OBJECT; + t->type_flags = type_flags; TRACE("Type description: %#x.\n", typeinfo); TRACE("\tbasetype: %s.\n", debug_d3d10_shader_variable_type(t->basetype)); @@ -1503,8 +1511,8 @@ static BOOL read_value_list(const char *data, size_t data_size, DWORD offset, D3D_SHADER_VARIABLE_TYPE out_type, UINT out_base, UINT out_size, void *out_data) { D3D_SHADER_VARIABLE_TYPE in_type; + DWORD t, value, type_flags; const char *ptr; - DWORD t, value; DWORD count, i; if (offset >= data_size || !require_space(offset, 1, sizeof(count), data_size)) @@ -1532,7 +1540,7 @@ static BOOL read_value_list(const char *data, size_t data_size, DWORD offset, read_dword(&ptr, &t); read_dword(&ptr, &value); - in_type = d3d10_variable_type(t, FALSE); + in_type = d3d10_variable_type(t, FALSE, &type_flags); TRACE("\t%s: %#x.\n", debug_d3d10_shader_variable_type(in_type), value); switch (out_type) @@ -2129,7 +2137,7 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, TRACE("Shader type is %s\n", debug_d3d10_shader_variable_type(v->type->basetype)); for (i = 0; i < max(v->type->element_count, 1); ++i) { - DWORD shader_offset; + DWORD shader_offset, sodecl_offset; struct d3d10_effect_variable *var; if (!v->type->element_count) @@ -2146,6 +2154,21 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, if (FAILED(hr = parse_fx10_shader(data, data_size, shader_offset, var))) return hr; + + if (v->type->type_flags & D3D10_EOT_FLAG_GS_SO) + { + read_dword(ptr, &sodecl_offset); + TRACE("Stream output declaration at offset %#x.\n", sodecl_offset); + + if (!fx10_copy_string(data, data_size, sodecl_offset, + &var->u.shader.stream_output_declaration)) + { + ERR("Failed to copy name.\n"); + return E_OUTOFMEMORY; + } + + TRACE("Stream output declaration: %s.\n", debugstr_a(var->u.shader.stream_output_declaration)); + } } break; diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index e67eb188328..1c3d754eaf1 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -2533,6 +2533,10 @@ GeometryShader g0 = NULL; VertexShader v[2] = { CompileShader( vs_4_0, VS() ), CompileShader( vs_4_0, VS2() ) }; PixelShader p = CompileShader( ps_4_0, PS() ); GeometryShader g = CompileShader( gs_4_0, GS() ); +GeometryShader g_so = ConstructGSWithSO +( + CompileShader( gs_4_0, GS()), "SV_POSITION.x" +); technique10 Render { pass P0 {} @@ -2580,186 +2584,202 @@ technique10 Render } } #endif -static DWORD fx_local_shader[] = { -0x43425844, 0x95577e13, 0xab5facae, 0xd06d9eab, 0x8b127be0, 0x00000001, 0x00001652, 0x00000001, -0x00000024, 0x30315846, 0x00001626, 0xfeff1001, 0x00000000, 0x00000000, 0x00000006, 0x00000000, -0x00000000, 0x00000000, 0x00000001, 0x0000138a, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000d, 0x00000006, 0x00000000, 0x74726556, -0x68537865, 0x72656461, 0x00000400, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000600, 0x00307600, 0x65786950, 0x6168536c, 0x00726564, 0x00000030, 0x00000002, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x47003070, 0x656d6f65, 0x53797274, 0x65646168, -0x005b0072, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00070000, 0x30670000, -0x00000400, 0x00000200, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000600, 0xb4007600, -0x44000001, 0x02434258, 0x5f11b96d, 0x31cdd883, 0xade81d9f, 0x014d6a2d, 0xb4000000, 0x05000001, -0x34000000, 0x8c000000, 0xc0000000, 0xf4000000, 0x38000000, 0x52000001, 0x50464544, 0x00000000, -0x00000000, 0x00000000, 0x1c000000, 0x00000000, 0x00fffe04, 0x1c000001, 0x4d000000, 0x6f726369, -0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, 0x2e392072, -0x392e3632, 0x322e3235, 0x00343438, 0x49ababab, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, -0x00000000, 0x00000000, 0x03000000, 0x00000000, 0x0f000000, 0x5000000f, 0x5449534f, 0x004e4f49, -0x4fababab, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, 0x00000000, 0x01000000, 0x03000000, -0x00000000, 0x0f000000, 0x53000000, 0x4f505f56, 0x49544953, 0x53004e4f, 0x3c524448, 0x40000000, -0x0f000100, 0x5f000000, 0xf2030000, 0x00001010, 0x67000000, 0xf2040000, 0x00001020, 0x01000000, -0x36000000, 0xf2050000, 0x00001020, 0x46000000, 0x0000101e, 0x3e000000, 0x53010000, 0x74544154, -0x02000000, 0x00000000, 0x00000000, 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x01000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xb4000000, 0x44000001, 0xa4434258, -0x42e88ad3, 0xcc4b1ab5, 0x5f89bf37, 0x0139edfb, 0xb4000000, 0x05000001, 0x34000000, 0x8c000000, -0xc0000000, 0xf4000000, 0x38000000, 0x52000001, 0x50464544, 0x00000000, 0x00000000, 0x00000000, -0x1c000000, 0x00000000, 0x00fffe04, 0x1c000001, 0x4d000000, 0x6f726369, 0x74666f73, 0x29522820, -0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, 0x2e392072, 0x392e3632, 0x322e3235, -0x00343438, 0x49ababab, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, 0x00000000, 0x00000000, -0x02000000, 0x00000000, 0x0f000000, 0x5000000f, 0x5449534f, 0x004e4f49, 0x4fababab, 0x2c4e4753, -0x01000000, 0x08000000, 0x20000000, 0x00000000, 0x01000000, 0x03000000, 0x00000000, 0x0f000000, -0x53000000, 0x4f505f56, 0x49544953, 0x53004e4f, 0x3c524448, 0x40000000, 0x0f000100, 0x5f000000, -0xf2030000, 0x00001010, 0x67000000, 0xf2040000, 0x00001020, 0x01000000, 0x2b000000, 0xf2050000, -0x00001020, 0x46000000, 0x0000101e, 0x3e000000, 0x53010000, 0x74544154, 0x02000000, 0x00000000, -0x00000000, 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x01000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x70000000, 0x0001b000, 0x42584400, 0xf9269a43, 0xf17ba57f, -0x6d728d8a, 0x599e9d79, 0x000001ff, 0x0001b000, 0x00000500, 0x00003400, 0x00008c00, 0x0000c000, -0x0000f400, 0x00013400, 0x45445200, 0x00005046, 0x00000000, 0x00000000, 0x00000000, 0x00001c00, -0xff040000, 0x000100ff, 0x00001c00, 0x63694d00, 0x6f736f72, 0x28207466, 0x48202952, 0x204c534c, -0x64616853, 0x43207265, 0x69706d6f, 0x2072656c, 0x36322e39, 0x3235392e, 0x3438322e, 0xabab0034, -0x475349ab, 0x00002c4e, 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000100, 0x00000300, -0x00000000, 0x00000f00, 0x5f565300, 0x49534f50, 0x4e4f4954, 0x47534f00, 0x00002c4e, 0x00000100, -0x00000800, 0x00002000, 0x00000000, 0x00000000, 0x00000300, 0x00000000, 0x00000f00, 0x5f565300, -0x67726154, 0xab007465, 0x444853ab, 0x00003852, 0x00004000, 0x00000e00, 0x00006500, 0x1020f203, -0x00000000, 0x00003600, 0x1020f208, 0x00000000, 0x00400200, 0x80000000, 0x8000003f, 0x0000003f, -0x80000000, 0x00003e3f, 0x41545301, 0x00007454, 0x00000200, 0x00000000, 0x00000000, 0x00000100, -0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x10006700, 0x44000002, 0x5c434258, 0x7482cd04, 0xb6d82978, 0xe48192f2, 0x01eec6be, -0x10000000, 0x05000002, 0x34000000, 0x8c000000, 0xc0000000, 0xf4000000, 0x94000000, 0x52000001, -0x50464544, 0x00000000, 0x00000000, 0x00000000, 0x1c000000, 0x00000000, 0x00475304, 0x1c000001, -0x4d000000, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, -0x656c6970, 0x2e392072, 0x392e3632, 0x322e3235, 0x00343438, 0x49ababab, 0x2c4e4753, 0x01000000, -0x08000000, 0x20000000, 0x00000000, 0x01000000, 0x03000000, 0x00000000, 0x0f000000, 0x5300000f, -0x4f505f56, 0x49544953, 0x4f004e4f, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, 0x00000000, -0x01000000, 0x03000000, 0x00000000, 0x0f000000, 0x53000000, 0x4f505f56, 0x49544953, 0x53004e4f, -0x98524448, 0x40000000, 0x26000200, 0x61000000, 0xf2050000, 0x03002010, 0x00000000, 0x01000000, -0x5d000000, 0x5c010018, 0x67010028, 0xf2040000, 0x00001020, 0x01000000, 0x5e000000, 0x03020000, -0x36000000, 0xf2060000, 0x00001020, 0x46000000, 0x0000201e, 0x00000000, 0x13000000, 0x36010000, -0xf2060000, 0x00001020, 0x46000000, 0x0100201e, 0x00000000, 0x13000000, 0x36010000, 0xf2060000, -0x00001020, 0x46000000, 0x0200201e, 0x00000000, 0x13000000, 0x09010000, 0x3e010000, 0x53010000, -0x74544154, 0x08000000, 0x00000000, 0x00000000, 0x02000000, 0x00000000, 0x00000000, 0x00000000, -0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01000000, 0x03000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x03000000, 0x05000000, 0x03000000, 0x00000000, 0x00000000, 0x00000000, 0x52000000, 0x65646e65, -0x30500072, 0x00315000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000002, 0x00000000, -0x00000001, 0x00000002, 0x00000000, 0x01003250, 0x02000000, 0x00000000, 0x01000000, 0x02000000, -0x00000000, 0x01000000, 0x02000000, 0x00000000, 0x50000000, 0x01b00033, 0x58440000, 0x269a4342, -0x7ba57ff9, 0x728d8af1, 0x9e9d796d, 0x0001ff59, 0x01b00000, 0x00050000, 0x00340000, 0x008c0000, -0x00c00000, 0x00f40000, 0x01340000, 0x44520000, 0x00504645, 0x00000000, 0x00000000, 0x00000000, -0x001c0000, 0x04000000, 0x0100ffff, 0x001c0000, 0x694d0000, 0x736f7263, 0x2074666f, 0x20295228, -0x4c534c48, 0x61685320, 0x20726564, 0x706d6f43, 0x72656c69, 0x322e3920, 0x35392e36, 0x38322e32, -0xab003434, 0x5349abab, 0x002c4e47, 0x00010000, 0x00080000, 0x00200000, 0x00000000, 0x00010000, -0x00030000, 0x00000000, 0x000f0000, 0x56530000, 0x534f505f, 0x4f495449, 0x534f004e, 0x002c4e47, -0x00010000, 0x00080000, 0x00200000, 0x00000000, 0x00000000, 0x00030000, 0x00000000, 0x000f0000, -0x56530000, 0x7261545f, 0x00746567, 0x4853abab, 0x00385244, 0x00400000, 0x000e0000, 0x00650000, -0x20f20300, 0x00000010, 0x00360000, 0x20f20800, 0x00000010, 0x40020000, 0x00000000, 0x00003f80, -0x00003f80, 0x00000000, 0x003e3f80, 0x54530100, 0x00745441, 0x00020000, 0x00000000, 0x00000000, -0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x083e0000, 0x00000000, 0x01b40000, 0x58440000, 0x6d024342, 0x835f11b9, -0x9f31cdd8, 0x2dade81d, 0x00014d6a, 0x01b40000, 0x00050000, 0x00340000, 0x008c0000, 0x00c00000, -0x00f40000, 0x01380000, 0x44520000, 0x00504645, 0x00000000, 0x00000000, 0x00000000, 0x001c0000, -0x04000000, 0x0100fffe, 0x001c0000, 0x694d0000, 0x736f7263, 0x2074666f, 0x20295228, 0x4c534c48, -0x61685320, 0x20726564, 0x706d6f43, 0x72656c69, 0x322e3920, 0x35392e36, 0x38322e32, 0xab003434, -0x5349abab, 0x002c4e47, 0x00010000, 0x00080000, 0x00200000, 0x00000000, 0x00000000, 0x00030000, -0x00000000, 0x0f0f0000, 0x4f500000, 0x49544953, 0xab004e4f, 0x534fabab, 0x002c4e47, 0x00010000, -0x00080000, 0x00200000, 0x00000000, 0x00010000, 0x00030000, 0x00000000, 0x000f0000, 0x56530000, -0x534f505f, 0x4f495449, 0x4853004e, 0x003c5244, 0x00400000, 0x000f0001, 0x005f0000, 0x10f20300, -0x00000010, 0x00670000, 0x20f20400, 0x00000010, 0x00010000, 0x00360000, 0x20f20500, 0x00000010, -0x1e460000, 0x00000010, 0x003e0000, 0x54530100, 0x00745441, 0x00020000, 0x00000000, 0x00000000, -0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x09fa0000, 0x00000000, 0x02100000, 0x58440000, 0x045c4342, 0x787482cd, -0xf2b6d829, 0xbee48192, 0x0001eec6, 0x02100000, 0x00050000, 0x00340000, 0x008c0000, 0x00c00000, -0x00f40000, 0x01940000, 0x44520000, 0x00504645, 0x00000000, 0x00000000, 0x00000000, 0x001c0000, -0x04000000, 0x01004753, 0x001c0000, 0x694d0000, 0x736f7263, 0x2074666f, 0x20295228, 0x4c534c48, -0x61685320, 0x20726564, 0x706d6f43, 0x72656c69, 0x322e3920, 0x35392e36, 0x38322e32, 0xab003434, -0x5349abab, 0x002c4e47, 0x00010000, 0x00080000, 0x00200000, 0x00000000, 0x00010000, 0x00030000, -0x00000000, 0x0f0f0000, 0x56530000, 0x534f505f, 0x4f495449, 0x534f004e, 0x002c4e47, 0x00010000, -0x00080000, 0x00200000, 0x00000000, 0x00010000, 0x00030000, 0x00000000, 0x000f0000, 0x56530000, -0x534f505f, 0x4f495449, 0x4853004e, 0x00985244, 0x00400000, 0x00260002, 0x00610000, 0x10f20500, -0x00030020, 0x00000000, 0x00010000, 0x185d0000, 0x285c0100, 0x00670100, 0x20f20400, 0x00000010, -0x00010000, 0x005e0000, 0x00030200, 0x00360000, 0x20f20600, 0x00000010, 0x1e460000, 0x00000020, -0x00000000, 0x00130000, 0x00360100, 0x20f20600, 0x00000010, 0x1e460000, 0x00010020, 0x00000000, -0x00130000, 0x00360100, 0x20f20600, 0x00000010, 0x1e460000, 0x00020020, 0x00000000, 0x00130000, -0x00090100, 0x003e0100, 0x54530100, 0x00745441, 0x00080000, 0x00000000, 0x00000000, 0x00020000, -0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00010000, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x00050000, 0x00030000, 0x00000000, 0x00000000, -0x00000000, 0x0bba0000, 0x00000000, 0x34500000, 0x0001b000, 0x42584400, 0xf9269a43, 0xf17ba57f, -0x6d728d8a, 0x599e9d79, 0x000001ff, 0x0001b000, 0x00000500, 0x00003400, 0x00008c00, 0x0000c000, -0x0000f400, 0x00013400, 0x45445200, 0x00005046, 0x00000000, 0x00000000, 0x00000000, 0x00001c00, -0xff040000, 0x000100ff, 0x00001c00, 0x63694d00, 0x6f736f72, 0x28207466, 0x48202952, 0x204c534c, -0x64616853, 0x43207265, 0x69706d6f, 0x2072656c, 0x36322e39, 0x3235392e, 0x3438322e, 0xabab0034, -0x475349ab, 0x00002c4e, 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000100, 0x00000300, -0x00000000, 0x00000f00, 0x5f565300, 0x49534f50, 0x4e4f4954, 0x47534f00, 0x00002c4e, 0x00000100, -0x00000800, 0x00002000, 0x00000000, 0x00000000, 0x00000300, 0x00000000, 0x00000f00, 0x5f565300, -0x67726154, 0xab007465, 0x444853ab, 0x00003852, 0x00004000, 0x00000e00, 0x00006500, 0x1020f203, -0x00000000, 0x00003600, 0x1020f208, 0x00000000, 0x00400200, 0x80000000, 0x8000003f, 0x0000003f, -0x80000000, 0x00003e3f, 0x41545301, 0x00007454, 0x00000200, 0x00000000, 0x00000000, 0x00000100, -0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x000dd900, 0x00000000, 0x0001b400, 0x42584400, 0x8ad3a443, 0x1ab542e8, 0xbf37cc4b, -0xedfb5f89, 0x00000139, 0x0001b400, 0x00000500, 0x00003400, 0x00008c00, 0x0000c000, 0x0000f400, -0x00013800, 0x45445200, 0x00005046, 0x00000000, 0x00000000, 0x00000000, 0x00001c00, 0xfe040000, -0x000100ff, 0x00001c00, 0x63694d00, 0x6f736f72, 0x28207466, 0x48202952, 0x204c534c, 0x64616853, -0x43207265, 0x69706d6f, 0x2072656c, 0x36322e39, 0x3235392e, 0x3438322e, 0xabab0034, 0x475349ab, -0x00002c4e, 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000000, 0x00000200, 0x00000000, -0x000f0f00, 0x534f5000, 0x4f495449, 0xabab004e, 0x47534fab, 0x00002c4e, 0x00000100, 0x00000800, -0x00002000, 0x00000000, 0x00000100, 0x00000300, 0x00000000, 0x00000f00, 0x5f565300, 0x49534f50, -0x4e4f4954, 0x44485300, 0x00003c52, 0x01004000, 0x00000f00, 0x00005f00, 0x1010f203, 0x00000000, -0x00006700, 0x1020f204, 0x00000000, 0x00000100, 0x00002b00, 0x1020f205, 0x00000000, 0x101e4600, -0x00000000, 0x00003e00, 0x41545301, 0x00007454, 0x00000200, 0x00000000, 0x00000000, 0x00000200, -0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x000f9500, 0x00000000, 0x00021000, 0x42584400, 0xcd045c43, 0x29787482, 0x92f2b6d8, -0xc6bee481, 0x000001ee, 0x00021000, 0x00000500, 0x00003400, 0x00008c00, 0x0000c000, 0x0000f400, -0x00019400, 0x45445200, 0x00005046, 0x00000000, 0x00000000, 0x00000000, 0x00001c00, 0x53040000, -0x00010047, 0x00001c00, 0x63694d00, 0x6f736f72, 0x28207466, 0x48202952, 0x204c534c, 0x64616853, -0x43207265, 0x69706d6f, 0x2072656c, 0x36322e39, 0x3235392e, 0x3438322e, 0xabab0034, 0x475349ab, -0x00002c4e, 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000100, 0x00000300, 0x00000000, -0x000f0f00, 0x5f565300, 0x49534f50, 0x4e4f4954, 0x47534f00, 0x00002c4e, 0x00000100, 0x00000800, -0x00002000, 0x00000000, 0x00000100, 0x00000300, 0x00000000, 0x00000f00, 0x5f565300, 0x49534f50, -0x4e4f4954, 0x44485300, 0x00009852, 0x02004000, 0x00002600, 0x00006100, 0x2010f205, 0x00000300, -0x00000000, 0x00000100, 0x00185d00, 0x00285c01, 0x00006701, 0x1020f204, 0x00000000, 0x00000100, -0x00005e00, 0x00000302, 0x00003600, 0x1020f206, 0x00000000, 0x201e4600, 0x00000000, 0x00000000, -0x00001300, 0x00003601, 0x1020f206, 0x00000000, 0x201e4600, 0x00000100, 0x00000000, 0x00001300, -0x00003601, 0x1020f206, 0x00000000, 0x201e4600, 0x00000200, 0x00000000, 0x00001300, 0x00000901, -0x00003e01, 0x41545301, 0x00007454, 0x00000800, 0x00000000, 0x00000000, 0x00000200, 0x00000000, -0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, -0x00000300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000300, 0x00000500, 0x00000300, 0x00000000, 0x00000000, 0x00000000, -0x00115500, 0x00000000, 0x00355000, 0xa5003650, 0x00000000, 0x50000000, 0x00a50037, 0x00010000, -0x002d0000, 0x00110000, 0x00000000, 0xffff0000, 0x0000ffff, 0x00000000, 0x00580000, 0x003c0000, -0x00000000, 0xffff0000, 0x0000ffff, 0x00000000, 0x00860000, 0x006a0000, 0x00000000, 0xffff0000, -0x0000ffff, 0x00000000, 0x00a50000, 0x00890000, 0x00000000, 0xffff0000, 0x00a7ffff, 0x025f0000, -0x00000000, 0x04170000, 0x003c0000, 0x00000000, 0xffff0000, 0x0419ffff, 0x00000000, 0x05cd0000, -0x006a0000, 0x00000000, 0xffff0000, 0x05cfffff, 0x00000000, 0x07e30000, 0x00080000, 0x00000000, -0x07ea0000, 0x00000000, 0x00000000, 0x07ed0000, 0x00030000, 0x00000000, 0x00070000, 0x00000000, -0x00010000, 0x07f00000, 0x00060000, 0x00000000, 0x00010000, 0x07fc0000, 0x00080000, 0x00000000, -0x00010000, 0x08080000, 0x08140000, 0x00030000, 0x00000000, 0x00070000, 0x00000000, 0x00010000, -0x08170000, 0x00060000, 0x00000000, 0x00010000, 0x08230000, 0x00080000, 0x00000000, 0x00010000, -0x082f0000, 0x083b0000, 0x00030000, 0x00000000, 0x00070000, 0x00000000, 0x00070000, 0x09f20000, -0x00060000, 0x00000000, 0x00070000, 0x0bb20000, 0x00080000, 0x00000000, 0x00070000, 0x0dce0000, -0x0dd60000, 0x00030000, 0x00000000, 0x00070000, 0x00000000, 0x00070000, 0x0f8d0000, 0x00060000, -0x00000000, 0x00070000, 0x114d0000, 0x00080000, 0x00000000, 0x00070000, 0x13690000, 0x13710000, -0x00030000, 0x00000000, 0x00070000, 0x00000000, 0x00020000, 0x00580000, 0x00060000, 0x00000000, -0x00020000, 0x002d0000, 0x00080000, 0x00000000, 0x00020000, 0x00860000, 0x13740000, 0x00030000, -0x00000000, 0x00070000, 0x00000000, 0x00020000, 0x04170000, 0x00060000, 0x00000000, 0x00030000, -0x13770000, 0x00080000, 0x00000000, 0x00020000, 0x05cd0000, 0x137f0000, 0x00030000, 0x00000000, -0x00070000, 0x00000000, 0x00020000, 0x04170000, 0x00060000, 0x00000000, 0x00030000, 0x13820000, -0x00080000, 0x00000000, 0x00020000, 0x05cd0000, 0x00000000, +static DWORD fx_local_shader[] = +{ + 0x43425844, 0x0a74ff0f, 0xea10b516, 0x8be88332, 0x2a273ca7, 0x00000001, 0x0000182d, 0x00000001, + 0x00000024, 0x30315846, 0x00001801, 0xfeff1001, 0x00000000, 0x00000000, 0x00000007, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0x00001549, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000e, 0x00000006, 0x00000000, 0x74726556, + 0x68537865, 0x72656461, 0x00000400, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000600, 0x00307600, 0x65786950, 0x6168536c, 0x00726564, 0x00000030, 0x00000002, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x47003070, 0x656d6f65, 0x53797274, 0x65646168, + 0x005b0072, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00070000, 0x30670000, + 0x00000400, 0x00000200, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000600, 0xa8007600, + 0x44000001, 0x92434258, 0xa75ea3fc, 0x13affa34, 0x46be1a21, 0x0104d04a, 0xa8000000, 0x05000001, + 0x34000000, 0x80000000, 0xb4000000, 0xe8000000, 0x2c000000, 0x52000001, 0x44464544, 0x00000000, + 0x00000000, 0x00000000, 0x1c000000, 0x00000000, 0x00fffe04, 0x1c000001, 0x4d000000, 0x6f726369, + 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, 0x30312072, + 0x4900312e, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, 0x00000000, 0x00000000, 0x03000000, + 0x00000000, 0x0f000000, 0x5000000f, 0x5449534f, 0x004e4f49, 0x4fababab, 0x2c4e4753, 0x01000000, + 0x08000000, 0x20000000, 0x00000000, 0x01000000, 0x03000000, 0x00000000, 0x0f000000, 0x53000000, + 0x4f505f56, 0x49544953, 0x53004e4f, 0x3c524448, 0x40000000, 0x0f000100, 0x5f000000, 0xf2030000, + 0x00001010, 0x67000000, 0xf2040000, 0x00001020, 0x01000000, 0x36000000, 0xf2050000, 0x00001020, + 0x46000000, 0x0000101e, 0x3e000000, 0x53010000, 0x74544154, 0x02000000, 0x00000000, 0x00000000, + 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x01000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0xa8000000, 0x44000001, 0x84434258, 0xa05ac55b, 0x929a6a46, 0x4f0df40a, + 0x01a2fea3, 0xa8000000, 0x05000001, 0x34000000, 0x80000000, 0xb4000000, 0xe8000000, 0x2c000000, + 0x52000001, 0x44464544, 0x00000000, 0x00000000, 0x00000000, 0x1c000000, 0x00000000, 0x00fffe04, + 0x1c000001, 0x4d000000, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, + 0x6d6f4320, 0x656c6970, 0x30312072, 0x4900312e, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, + 0x00000000, 0x00000000, 0x02000000, 0x00000000, 0x0f000000, 0x5000000f, 0x5449534f, 0x004e4f49, + 0x4fababab, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, 0x00000000, 0x01000000, 0x03000000, + 0x00000000, 0x0f000000, 0x53000000, 0x4f505f56, 0x49544953, 0x53004e4f, 0x3c524448, 0x40000000, + 0x0f000100, 0x5f000000, 0xf2030000, 0x00001010, 0x67000000, 0xf2040000, 0x00001020, 0x01000000, + 0x2b000000, 0xf2050000, 0x00001020, 0x46000000, 0x0000101e, 0x3e000000, 0x53010000, 0x74544154, + 0x02000000, 0x00000000, 0x00000000, 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x01000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x70000000, 0x0001a400, 0x42584400, + 0xf4813443, 0xb6605b8e, 0xc69999b8, 0xcb75f1b5, 0x000001eb, 0x0001a400, 0x00000500, 0x00003400, + 0x00008000, 0x0000b400, 0x0000e800, 0x00012800, 0x45445200, 0x00004446, 0x00000000, 0x00000000, + 0x00000000, 0x00001c00, 0xff040000, 0x000100ff, 0x00001c00, 0x63694d00, 0x6f736f72, 0x28207466, + 0x48202952, 0x204c534c, 0x64616853, 0x43207265, 0x69706d6f, 0x2072656c, 0x312e3031, 0x47534900, + 0x00002c4e, 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000100, 0x00000300, 0x00000000, + 0x00000f00, 0x5f565300, 0x49534f50, 0x4e4f4954, 0x47534f00, 0x00002c4e, 0x00000100, 0x00000800, + 0x00002000, 0x00000000, 0x00000000, 0x00000300, 0x00000000, 0x00000f00, 0x5f565300, 0x67726154, + 0xab007465, 0x444853ab, 0x00003852, 0x00004000, 0x00000e00, 0x00006500, 0x1020f203, 0x00000000, + 0x00003600, 0x1020f208, 0x00000000, 0x00400200, 0x80000000, 0x8000003f, 0x0000003f, 0x80000000, + 0x00003e3f, 0x41545301, 0x00007454, 0x00000200, 0x00000000, 0x00000000, 0x00000100, 0x00000000, + 0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x04006700, 0x44000002, 0x23434258, 0x6e8e325e, 0x5f0774e8, 0xbfe636e1, 0x01d3f67a, 0x04000000, + 0x05000002, 0x34000000, 0x80000000, 0xb4000000, 0xe8000000, 0x88000000, 0x52000001, 0x44464544, + 0x00000000, 0x00000000, 0x00000000, 0x1c000000, 0x00000000, 0x00475304, 0x1c000001, 0x4d000000, + 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, + 0x30312072, 0x4900312e, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, 0x00000000, 0x01000000, + 0x03000000, 0x00000000, 0x0f000000, 0x5300000f, 0x4f505f56, 0x49544953, 0x4f004e4f, 0x2c4e4753, + 0x01000000, 0x08000000, 0x20000000, 0x00000000, 0x01000000, 0x03000000, 0x00000000, 0x0f000000, + 0x53000000, 0x4f505f56, 0x49544953, 0x53004e4f, 0x98524448, 0x40000000, 0x26000200, 0x61000000, + 0xf2050000, 0x03002010, 0x00000000, 0x01000000, 0x5d000000, 0x5c010018, 0x67010028, 0xf2040000, + 0x00001020, 0x01000000, 0x5e000000, 0x03020000, 0x36000000, 0xf2060000, 0x00001020, 0x46000000, + 0x0000201e, 0x00000000, 0x13000000, 0x36010000, 0xf2060000, 0x00001020, 0x46000000, 0x0100201e, + 0x00000000, 0x13000000, 0x36010000, 0xf2060000, 0x00001020, 0x46000000, 0x0200201e, 0x00000000, + 0x13000000, 0x09010000, 0x3e010000, 0x53010000, 0x74544154, 0x08000000, 0x00000000, 0x00000000, + 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x01000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x01000000, 0x03000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x03000000, 0x05000000, 0x03000000, 0x00000000, + 0x00000000, 0x00000000, 0x5b000000, 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x08000000, 0x67000000, 0x006f735f, 0x00000204, 0x43425844, 0x8e325e23, 0x0774e86e, 0xe636e15f, + 0xd3f67abf, 0x00000001, 0x00000204, 0x00000005, 0x00000034, 0x00000080, 0x000000b4, 0x000000e8, + 0x00000188, 0x46454452, 0x00000044, 0x00000000, 0x00000000, 0x00000000, 0x0000001c, 0x47530400, + 0x00000100, 0x0000001c, 0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, + 0x6f432072, 0x6c69706d, 0x31207265, 0x00312e30, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x5449534f, + 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x00000098, + 0x00020040, 0x00000026, 0x05000061, 0x002010f2, 0x00000003, 0x00000000, 0x00000001, 0x0100185d, + 0x0100285c, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x0200005e, 0x00000003, 0x06000036, + 0x001020f2, 0x00000000, 0x00201e46, 0x00000000, 0x00000000, 0x01000013, 0x06000036, 0x001020f2, + 0x00000000, 0x00201e46, 0x00000001, 0x00000000, 0x01000013, 0x06000036, 0x001020f2, 0x00000000, + 0x00201e46, 0x00000002, 0x00000000, 0x01000013, 0x01000009, 0x0100003e, 0x54415453, 0x00000074, + 0x00000008, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, + 0x00000005, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x505f5653, 0x5449534f, 0x2e4e4f49, + 0x65520078, 0x7265646e, 0x00305000, 0x01003150, 0x02000000, 0x00000000, 0x01000000, 0x02000000, + 0x00000000, 0x01000000, 0x02000000, 0x00000000, 0x50000000, 0x00010032, 0x00020000, 0x00000000, + 0x00010000, 0x00020000, 0x00000000, 0x00010000, 0x00020000, 0x00000000, 0x33500000, 0x0001a400, + 0x42584400, 0xf4813443, 0xb6605b8e, 0xc69999b8, 0xcb75f1b5, 0x000001eb, 0x0001a400, 0x00000500, + 0x00003400, 0x00008000, 0x0000b400, 0x0000e800, 0x00012800, 0x45445200, 0x00004446, 0x00000000, + 0x00000000, 0x00000000, 0x00001c00, 0xff040000, 0x000100ff, 0x00001c00, 0x63694d00, 0x6f736f72, + 0x28207466, 0x48202952, 0x204c534c, 0x64616853, 0x43207265, 0x69706d6f, 0x2072656c, 0x312e3031, + 0x47534900, 0x00002c4e, 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000100, 0x00000300, + 0x00000000, 0x00000f00, 0x5f565300, 0x49534f50, 0x4e4f4954, 0x47534f00, 0x00002c4e, 0x00000100, + 0x00000800, 0x00002000, 0x00000000, 0x00000000, 0x00000300, 0x00000000, 0x00000f00, 0x5f565300, + 0x67726154, 0xab007465, 0x444853ab, 0x00003852, 0x00004000, 0x00000e00, 0x00006500, 0x1020f203, + 0x00000000, 0x00003600, 0x1020f208, 0x00000000, 0x00400200, 0x80000000, 0x8000003f, 0x0000003f, + 0x80000000, 0x00003e3f, 0x41545301, 0x00007454, 0x00000200, 0x00000000, 0x00000000, 0x00000100, + 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x000a4500, 0x00000000, 0x0001a800, 0x42584400, 0xa3fc9243, 0xfa34a75e, 0x1a2113af, + 0xd04a46be, 0x00000104, 0x0001a800, 0x00000500, 0x00003400, 0x00008000, 0x0000b400, 0x0000e800, + 0x00012c00, 0x45445200, 0x00004446, 0x00000000, 0x00000000, 0x00000000, 0x00001c00, 0xfe040000, + 0x000100ff, 0x00001c00, 0x63694d00, 0x6f736f72, 0x28207466, 0x48202952, 0x204c534c, 0x64616853, + 0x43207265, 0x69706d6f, 0x2072656c, 0x312e3031, 0x47534900, 0x00002c4e, 0x00000100, 0x00000800, + 0x00002000, 0x00000000, 0x00000000, 0x00000300, 0x00000000, 0x000f0f00, 0x534f5000, 0x4f495449, + 0xabab004e, 0x47534fab, 0x00002c4e, 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000100, + 0x00000300, 0x00000000, 0x00000f00, 0x5f565300, 0x49534f50, 0x4e4f4954, 0x44485300, 0x00003c52, + 0x01004000, 0x00000f00, 0x00005f00, 0x1010f203, 0x00000000, 0x00006700, 0x1020f204, 0x00000000, + 0x00000100, 0x00003600, 0x1020f205, 0x00000000, 0x101e4600, 0x00000000, 0x00003e00, 0x41545301, + 0x00007454, 0x00000200, 0x00000000, 0x00000000, 0x00000200, 0x00000000, 0x00000000, 0x00000000, + 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000bf500, 0x00000000, + 0x00020400, 0x42584400, 0x325e2343, 0x74e86e8e, 0x36e15f07, 0xf67abfe6, 0x000001d3, 0x00020400, + 0x00000500, 0x00003400, 0x00008000, 0x0000b400, 0x0000e800, 0x00018800, 0x45445200, 0x00004446, + 0x00000000, 0x00000000, 0x00000000, 0x00001c00, 0x53040000, 0x00010047, 0x00001c00, 0x63694d00, + 0x6f736f72, 0x28207466, 0x48202952, 0x204c534c, 0x64616853, 0x43207265, 0x69706d6f, 0x2072656c, + 0x312e3031, 0x47534900, 0x00002c4e, 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000100, + 0x00000300, 0x00000000, 0x000f0f00, 0x5f565300, 0x49534f50, 0x4e4f4954, 0x47534f00, 0x00002c4e, + 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000100, 0x00000300, 0x00000000, 0x00000f00, + 0x5f565300, 0x49534f50, 0x4e4f4954, 0x44485300, 0x00009852, 0x02004000, 0x00002600, 0x00006100, + 0x2010f205, 0x00000300, 0x00000000, 0x00000100, 0x00185d00, 0x00285c01, 0x00006701, 0x1020f204, + 0x00000000, 0x00000100, 0x00005e00, 0x00000302, 0x00003600, 0x1020f206, 0x00000000, 0x201e4600, + 0x00000000, 0x00000000, 0x00001300, 0x00003601, 0x1020f206, 0x00000000, 0x201e4600, 0x00000100, + 0x00000000, 0x00001300, 0x00003601, 0x1020f206, 0x00000000, 0x201e4600, 0x00000200, 0x00000000, + 0x00001300, 0x00000901, 0x00003e01, 0x41545301, 0x00007454, 0x00000800, 0x00000000, 0x00000000, + 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000100, 0x00000300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000300, 0x00000500, 0x00000300, 0x00000000, + 0x00000000, 0x00000000, 0x000da900, 0x00000000, 0x00345000, 0x000001a4, 0x43425844, 0x8ef48134, + 0xb8b6605b, 0xb5c69999, 0xebcb75f1, 0x00000001, 0x000001a4, 0x00000005, 0x00000034, 0x00000080, + 0x000000b4, 0x000000e8, 0x00000128, 0x46454452, 0x00000044, 0x00000000, 0x00000000, 0x00000000, + 0x0000001c, 0xffff0400, 0x00000100, 0x0000001c, 0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, + 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, 0x31207265, 0x00312e30, 0x4e475349, 0x0000002c, + 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, + 0x505f5653, 0x5449534f, 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, + 0x52444853, 0x00000038, 0x00000040, 0x0000000e, 0x03000065, 0x001020f2, 0x00000000, 0x08000036, + 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, + 0x54415453, 0x00000074, 0x00000002, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, + 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000fbc, + 0x00000000, 0x000001a8, 0x43425844, 0x5ac55b84, 0x9a6a46a0, 0x0df40a92, 0xa2fea34f, 0x00000001, + 0x000001a8, 0x00000005, 0x00000034, 0x00000080, 0x000000b4, 0x000000e8, 0x0000012c, 0x46454452, + 0x00000044, 0x00000000, 0x00000000, 0x00000000, 0x0000001c, 0xfffe0400, 0x00000100, 0x0000001c, + 0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, + 0x31207265, 0x00312e30, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, + 0x00000000, 0x00000002, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, + 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x0000003c, 0x00010040, 0x0000000f, + 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x0500002b, + 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, 0x54415453, 0x00000074, 0x00000002, + 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000116c, 0x00000000, 0x00000204, 0x43425844, + 0x8e325e23, 0x0774e86e, 0xe636e15f, 0xd3f67abf, 0x00000001, 0x00000204, 0x00000005, 0x00000034, + 0x00000080, 0x000000b4, 0x000000e8, 0x00000188, 0x46454452, 0x00000044, 0x00000000, 0x00000000, + 0x00000000, 0x0000001c, 0x47530400, 0x00000100, 0x0000001c, 0x7263694d, 0x666f736f, 0x52282074, + 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, 0x31207265, 0x00312e30, 0x4e475349, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, + 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, + 0x004e4f49, 0x52444853, 0x00000098, 0x00020040, 0x00000026, 0x05000061, 0x002010f2, 0x00000003, + 0x00000000, 0x00000001, 0x0100185d, 0x0100285c, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x0200005e, 0x00000003, 0x06000036, 0x001020f2, 0x00000000, 0x00201e46, 0x00000000, 0x00000000, + 0x01000013, 0x06000036, 0x001020f2, 0x00000000, 0x00201e46, 0x00000001, 0x00000000, 0x01000013, + 0x06000036, 0x001020f2, 0x00000000, 0x00201e46, 0x00000002, 0x00000000, 0x01000013, 0x01000009, + 0x0100003e, 0x54415453, 0x00000074, 0x00000008, 0x00000000, 0x00000000, 0x00000002, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000003, 0x00000005, 0x00000003, 0x00000000, 0x00000000, 0x00000000, + 0x00001320, 0x00000000, 0x50003550, 0x00a50036, 0x00000000, 0x37500000, 0x0000a500, 0x00000100, + 0x00002d00, 0x00001100, 0x00000000, 0xffffff00, 0x000000ff, 0x00000000, 0x00005800, 0x00003c00, + 0x00000000, 0xffffff00, 0x000000ff, 0x00000000, 0x00008600, 0x00006a00, 0x00000000, 0xffffff00, + 0x000000ff, 0x00000000, 0x0000a500, 0x00008900, 0x00000000, 0xffffff00, 0x0000a7ff, 0x00025300, + 0x00000000, 0x0003ff00, 0x00003c00, 0x00000000, 0xffffff00, 0x000401ff, 0x00000000, 0x0005a900, + 0x00006a00, 0x00000000, 0xffffff00, 0x0005abff, 0x00000000, 0x0007cf00, 0x0007b300, 0x00000000, + 0xffffff00, 0x0007d4ff, 0x0009dc00, 0x00000000, 0x0009ea00, 0x00000800, 0x00000000, 0x0009f100, + 0x00000000, 0x00000000, 0x0009f400, 0x00000300, 0x00000000, 0x00000700, 0x00000000, 0x00000100, + 0x0009f700, 0x00000600, 0x00000000, 0x00000100, 0x000a0300, 0x00000800, 0x00000000, 0x00000100, + 0x000a0f00, 0x000a1b00, 0x00000300, 0x00000000, 0x00000700, 0x00000000, 0x00000100, 0x000a1e00, + 0x00000600, 0x00000000, 0x00000100, 0x000a2a00, 0x00000800, 0x00000000, 0x00000100, 0x000a3600, + 0x000a4200, 0x00000300, 0x00000000, 0x00000700, 0x00000000, 0x00000700, 0x000bed00, 0x00000600, + 0x00000000, 0x00000700, 0x000da100, 0x00000800, 0x00000000, 0x00000700, 0x000fb100, 0x000fb900, + 0x00000300, 0x00000000, 0x00000700, 0x00000000, 0x00000700, 0x00116400, 0x00000600, 0x00000000, + 0x00000700, 0x00131800, 0x00000800, 0x00000000, 0x00000700, 0x00152800, 0x00153000, 0x00000300, + 0x00000000, 0x00000700, 0x00000000, 0x00000200, 0x00005800, 0x00000600, 0x00000000, 0x00000200, + 0x00002d00, 0x00000800, 0x00000000, 0x00000200, 0x00008600, 0x00153300, 0x00000300, 0x00000000, + 0x00000700, 0x00000000, 0x00000200, 0x0003ff00, 0x00000600, 0x00000000, 0x00000300, 0x00153600, + 0x00000800, 0x00000000, 0x00000200, 0x0005a900, 0x00153e00, 0x00000300, 0x00000000, 0x00000700, + 0x00000000, 0x00000200, 0x0003ff00, 0x00000600, 0x00000000, 0x00000300, 0x00154100, 0x00000800, + 0x00000000, 0x00000200, 0x0005a900, 0x00000000, }; static void test_effect_local_shader(void) @@ -2776,7 +2796,8 @@ static void test_effect_local_shader(void) D3D10_EFFECT_TYPE_DESC typedesc; D3D10_EFFECT_DESC effect_desc; ID3D10EffectShaderVariable *null_shader, *null_anon_vs, *null_anon_ps, *null_anon_gs, - *p3_anon_vs, *p3_anon_ps, *p3_anon_gs, *p6_vs, *p6_ps, *p6_gs; + *p3_anon_vs, *p3_anon_ps, *p3_anon_gs, *p6_vs, *p6_ps, *p6_gs, *gs; + D3D10_EFFECT_SHADER_DESC shaderdesc; ID3D10Device *device; ULONG refcount; @@ -2796,7 +2817,7 @@ static void test_effect_local_shader(void) effect_desc.ConstantBuffers); ok(effect_desc.SharedConstantBuffers == 0, "Unexpected shared constant buffers count %u.\n", effect_desc.SharedConstantBuffers); - ok(effect_desc.GlobalVariables == 6, "Unexpected global variables count %u.\n", + ok(effect_desc.GlobalVariables == 7, "Unexpected global variables count %u.\n", effect_desc.GlobalVariables); ok(effect_desc.SharedGlobalVariables == 0, "Unexpected shared global variables count %u.\n", effect_desc.SharedGlobalVariables); @@ -3614,6 +3635,18 @@ if (0) ok(typedesc.UnpackedSize == 0x0, "UnpackedSize is %#x, expected 0x0\n", typedesc.UnpackedSize); ok(typedesc.Stride == 0x0, "Stride is %#x, expected 0x0\n", typedesc.Stride); + /* Geometry shader with stream output */ + v = effect->lpVtbl->GetVariableByName(effect, "g_so"); + gs = v->lpVtbl->AsShader(v); + hr = gs->lpVtbl->GetShaderDesc(gs, 0, &shaderdesc); +todo_wine + ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + if (hr == S_OK) + { + ok(!shaderdesc.IsInline, "Unexpected inline flag.\n"); + ok(!strcmp(shaderdesc.SODecl, "SV_POSITION.x"), "Unexpected stream output declaration %s.\n", shaderdesc.SODecl); + } + effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); -- 2.32.0

4 4

[PATCH 00/11] Series short description
by Eric Pouech 21 Aug '21

21 Aug '21

The following series updates pdb information and enhances tools/winedump. Most information details comes from https://github.com/Microsoft/microsoft-pdb. --- Eric Pouech (11): tools/winedump: move string conversion of machine and language into dedicated helpers tools/winedump: added more supported languages from .pdb COMPILE records tools/winedump: added a bunch of new CPU definitions for PDB tools/winedump: now properly displaying function attributes in function/methods codeview records tools/winedump: enhanced dumping function attributes for CodeView tools/winedump: added some new bits in UDT's property field dbghelp, tools/winedump: Added proper support for S_OBJNAME records include/wine/mscvpdb.h: made len and id type/symbol fields unsigned (as it's supposed to be) dbghelp, tools/winedump: update support for S_COMPILE* records include/wine/mscvpdb.h: added typedef:s for type-id references tools/winedump: fix public and data/proc ref definitions of Codeview records dlls/dbghelp/msc.c | 64 ++--- include/cvconst.h | 92 ++++++ include/wine/mscvpdb.h | 625 +++++++++++++++++++++++------------------ tools/winedump/msc.c | 340 ++++++++++++++++------ 4 files changed, 718 insertions(+), 403 deletions(-)

1 11

[PATCH] wineusb.sys: Remove device from the device list on PDO removal
by Torge Matthies 21 Aug '21

21 Aug '21

Fixes a crash when shutting down a prefix. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51479 Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/wineusb.sys/wineusb.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index fae297915fc..28a36b9f380 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -413,12 +413,15 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device_obj, IRP *irp) break; case IRP_MN_REMOVE_DEVICE: + EnterCriticalSection(&wineusb_cs); remove_pending_irps(device); libusb_unref_device(device->libusb_device); libusb_close(device->handle); + list_remove(&device->entry); IoDeleteDevice(device->device_obj); + LeaveCriticalSection(&wineusb_cs); ret = STATUS_SUCCESS; break; -- 2.32.0

2 2

[PATCH 1/4] ntoskrnl: Dereference the device children in IoDeleteDevice().
by Zebediah Figura 21 Aug '21

21 Aug '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d20b39efe15..b0ac64e8b51 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1628,9 +1628,17 @@ void WINAPI IoDeleteDevice( DEVICE_OBJECT *device ) { struct wine_device *wine_device = CONTAINING_RECORD(device, struct wine_device, device_obj); DEVICE_OBJECT **prev = &device->DriverObject->DeviceObject; + DEVICE_RELATIONS *children; + unsigned int i; + while (*prev && *prev != device) prev = &(*prev)->NextDevice; if (*prev) *prev = (*prev)->NextDevice; - ExFreePool( wine_device->children ); + if ((children = wine_device->children)) + { + for (i = 0; i < children->Count; ++i) + ObDereferenceObject( children->Objects[i] ); + ExFreePool( children ); + } ObDereferenceObject( device ); } } -- 2.30.2

1 3

[PATCH v2 2/2] kernelbase/tests: Add more tests for second path.
by Daniel Lehman 20 Aug '21

20 Aug '21

1 0

[PATCH v2 1/2] kernelbase: Don't add a backslash to the second path if not needed.
by Daniel Lehman 20 Aug '21

20 Aug '21

1 0

[PATCH] d3dx10_43/tests: Test all attributes of glyph textures.
by Nikolay Sivov 20 Aug '21

20 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 90339b1853c..7ed77a6406c 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2352,15 +2352,22 @@ todo_wine ID3D10Resource_Release(resource); ID3D10Texture2D_GetDesc(texture, &texture_desc); + ok(texture_desc.Width == 256, "Unexpected width %u.\n", texture_desc.Width); + ok(texture_desc.Height == 256, "Unexpected height %u.\n", texture_desc.Height); + ok(texture_desc.MipLevels == 5, "Unexpected miplevels %u.\n", texture_desc.MipLevels); + ok(texture_desc.ArraySize == 1, "Unexpected array size %u.\n", texture_desc.ArraySize); ok(texture_desc.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Unexpected format %#x.\n", texture_desc.Format); + ok(texture_desc.SampleDesc.Count == 1, "Unexpected samples count %u.\n", + texture_desc.SampleDesc.Count); + ok(texture_desc.SampleDesc.Quality == 0, "Unexpected quality level %u.\n", + texture_desc.SampleDesc.Quality); ok(texture_desc.Usage == 0, "Unexpected usage %#x.\n", texture_desc.Usage); - ok(texture_desc.Width == 256, "Unexpected width %u.\n", texture_desc.Width); - ok(texture_desc.Height == 256, "Unexpected height %u.\n", texture_desc.Height); - ok(texture_desc.CPUAccessFlags == 0, "Unexpected access flags %#x.\n", - texture_desc.CPUAccessFlags); ok(texture_desc.BindFlags == D3D10_BIND_SHADER_RESOURCE, "Unexpected bind flags %#x.\n", texture_desc.BindFlags); + ok(texture_desc.CPUAccessFlags == 0, "Unexpected access flags %#x.\n", + texture_desc.CPUAccessFlags); + ok(texture_desc.MiscFlags == 0, "Unexpected misc flags %#x.\n", texture_desc.MiscFlags); count = GetGlyphOutlineW(hdc, glyph, GGO_GLYPH_INDEX | GGO_METRICS, &glyph_metrics, 0, NULL, &mat); ok(count != GDI_ERROR, "Unexpected count %#x.\n", count); -- 2.32.0

2 1

[PATCH] d3dx10_42/tests: Enable tests.
by Nikolay Sivov 20 Aug '21

20 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- configure.ac | 1 + dlls/d3dx10_42/tests/Makefile.in | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 dlls/d3dx10_42/tests/Makefile.in diff --git a/configure.ac b/configure.ac index a143f6d3d2a..70c0e981d5e 100644 --- a/configure.ac +++ b/configure.ac @@ -3095,6 +3095,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dx10_39) WINE_CONFIG_MAKEFILE(dlls/d3dx10_40) WINE_CONFIG_MAKEFILE(dlls/d3dx10_41) WINE_CONFIG_MAKEFILE(dlls/d3dx10_42) +WINE_CONFIG_MAKEFILE(dlls/d3dx10_42/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_43) WINE_CONFIG_MAKEFILE(dlls/d3dx10_43/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx11_42) diff --git a/dlls/d3dx10_42/tests/Makefile.in b/dlls/d3dx10_42/tests/Makefile.in new file mode 100644 index 00000000000..c3965b7c3f2 --- /dev/null +++ b/dlls/d3dx10_42/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = d3dx10_42.dll +IMPORTS = d3dx10_42 ole32 gdi32 +PARENTSRC = ../../d3dx10_43/tests + +C_SRCS = \ + d3dx10.c -- 2.32.0

2 1

[v2 PATCH 1/2] d3d10/effect: Handle geometry shader variables declared with stream output.
by Matteo Bruni 20 Aug '21

20 Aug '21

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2 (Matteo): Tiny fixups. Hopefully without breaking it this time around... dlls/d3d10/d3d10_private.h | 7 + dlls/d3d10/effect.c | 38 +++- dlls/d3d10/tests/effect.c | 398 ++++++++++++++++++++----------------- 3 files changed, 254 insertions(+), 189 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 8d48231d971..249d4ea384a 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -53,6 +53,11 @@ enum d3d10_effect_object_type D3D10_EOT_SAMPLE_MASK = 0xb, }; +enum d3d10_effect_object_type_flags +{ + D3D10_EOT_FLAG_GS_SO = 0x1, +}; + enum d3d10_effect_object_operation { D3D10_EOO_VALUE = 1, @@ -111,6 +116,7 @@ struct d3d10_effect_shader_variable unsigned int resource_count; struct d3d10_effect_shader_resource *resources; + char *stream_output_declaration; }; struct d3d10_effect_state_object_variable @@ -154,6 +160,7 @@ struct d3d10_effect_type char *name; D3D10_SHADER_VARIABLE_TYPE basetype; D3D10_SHADER_VARIABLE_CLASS type_class; + unsigned int flags; DWORD id; struct wine_rb_entry entry; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 3040cb63528..0ee63ed41d5 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -790,6 +790,8 @@ static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offse break; case D3D10_SVT_GEOMETRYSHADER: + if (v->type->flags & D3D10_EOT_FLAG_GS_SO) + FIXME("Create geometry shader with stream output.\n"); hr = ID3D10Device_CreateGeometryShader(device, ptr, dxbc_size, &v->u.shader.shader.gs); if (FAILED(hr)) return hr; break; @@ -816,8 +818,10 @@ static D3D10_SHADER_VARIABLE_CLASS d3d10_variable_class(DWORD c, BOOL is_column_ } } -static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object) +static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object, DWORD *flags) { + *flags = 0; + if(is_object) { switch (t) @@ -829,6 +833,9 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object) case 5: return D3D10_SVT_PIXELSHADER; case 6: return D3D10_SVT_VERTEXSHADER; case 7: return D3D10_SVT_GEOMETRYSHADER; + case 8: + *flags = D3D10_EOT_FLAG_GS_SO; + return D3D10_SVT_GEOMETRYSHADER; case 10: return D3D10_SVT_TEXTURE1D; case 11: return D3D10_SVT_TEXTURE1DARRAY; @@ -865,9 +872,9 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object) static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, struct d3d10_effect_type *t) { + DWORD typeinfo, type_flags; const char *ptr; DWORD unknown0; - DWORD typeinfo; unsigned int i; if (offset >= data_size || !require_space(offset, 6, sizeof(DWORD), data_size)) @@ -915,7 +922,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, t->member_count = 0; t->column_count = (typeinfo & D3D10_FX10_TYPE_COLUMN_MASK) >> D3D10_FX10_TYPE_COLUMN_SHIFT; t->row_count = (typeinfo & D3D10_FX10_TYPE_ROW_MASK) >> D3D10_FX10_TYPE_ROW_SHIFT; - t->basetype = d3d10_variable_type((typeinfo & D3D10_FX10_TYPE_BASETYPE_MASK) >> D3D10_FX10_TYPE_BASETYPE_SHIFT, FALSE); + t->basetype = d3d10_variable_type((typeinfo & D3D10_FX10_TYPE_BASETYPE_MASK) >> D3D10_FX10_TYPE_BASETYPE_SHIFT, FALSE, &type_flags); t->type_class = d3d10_variable_class((typeinfo & D3D10_FX10_TYPE_CLASS_MASK) >> D3D10_FX10_TYPE_CLASS_SHIFT, typeinfo & D3D10_FX10_TYPE_MATRIX_COLUMN_MAJOR_MASK); TRACE("Type description: %#x.\n", typeinfo); @@ -940,12 +947,14 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, t->member_count = 0; t->column_count = 0; t->row_count = 0; - t->basetype = d3d10_variable_type(typeinfo, TRUE); + t->basetype = d3d10_variable_type(typeinfo, TRUE, &type_flags); t->type_class = D3D10_SVC_OBJECT; + t->flags = type_flags; TRACE("Type description: %#x.\n", typeinfo); TRACE("\tbasetype: %s.\n", debug_d3d10_shader_variable_type(t->basetype)); TRACE("\tclass: %s.\n", debug_d3d10_shader_variable_class(t->type_class)); + TRACE("\tflags: %#x.\n", t->flags); break; case 3: @@ -1503,8 +1512,8 @@ static BOOL read_value_list(const char *data, size_t data_size, DWORD offset, D3D_SHADER_VARIABLE_TYPE out_type, UINT out_base, UINT out_size, void *out_data) { D3D_SHADER_VARIABLE_TYPE in_type; + DWORD t, value, type_flags; const char *ptr; - DWORD t, value; DWORD count, i; if (offset >= data_size || !require_space(offset, 1, sizeof(count), data_size)) @@ -1532,7 +1541,7 @@ static BOOL read_value_list(const char *data, size_t data_size, DWORD offset, read_dword(&ptr, &t); read_dword(&ptr, &value); - in_type = d3d10_variable_type(t, FALSE); + in_type = d3d10_variable_type(t, FALSE, &type_flags); TRACE("\t%s: %#x.\n", debug_d3d10_shader_variable_type(in_type), value); switch (out_type) @@ -2129,7 +2138,7 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, TRACE("Shader type is %s\n", debug_d3d10_shader_variable_type(v->type->basetype)); for (i = 0; i < max(v->type->element_count, 1); ++i) { - DWORD shader_offset; + DWORD shader_offset, sodecl_offset; struct d3d10_effect_variable *var; if (!v->type->element_count) @@ -2146,6 +2155,21 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, if (FAILED(hr = parse_fx10_shader(data, data_size, shader_offset, var))) return hr; + + if (v->type->flags & D3D10_EOT_FLAG_GS_SO) + { + read_dword(ptr, &sodecl_offset); + TRACE("Stream output declaration at offset %#x.\n", sodecl_offset); + + if (!fx10_copy_string(data, data_size, sodecl_offset, + &var->u.shader.stream_output_declaration)) + { + ERR("Failed to copy stream output declaration.\n"); + return E_OUTOFMEMORY; + } + + TRACE("Stream output declaration: %s.\n", debugstr_a(var->u.shader.stream_output_declaration)); + } } break; diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index e67eb188328..53e2d52c496 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -2533,6 +2533,10 @@ GeometryShader g0 = NULL; VertexShader v[2] = { CompileShader( vs_4_0, VS() ), CompileShader( vs_4_0, VS2() ) }; PixelShader p = CompileShader( ps_4_0, PS() ); GeometryShader g = CompileShader( gs_4_0, GS() ); +GeometryShader g_so = ConstructGSWithSO +( + CompileShader( gs_4_0, GS()), "SV_POSITION.x" +); technique10 Render { pass P0 {} @@ -2580,186 +2584,202 @@ technique10 Render } } #endif -static DWORD fx_local_shader[] = { -0x43425844, 0x95577e13, 0xab5facae, 0xd06d9eab, 0x8b127be0, 0x00000001, 0x00001652, 0x00000001, -0x00000024, 0x30315846, 0x00001626, 0xfeff1001, 0x00000000, 0x00000000, 0x00000006, 0x00000000, -0x00000000, 0x00000000, 0x00000001, 0x0000138a, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000d, 0x00000006, 0x00000000, 0x74726556, -0x68537865, 0x72656461, 0x00000400, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000600, 0x00307600, 0x65786950, 0x6168536c, 0x00726564, 0x00000030, 0x00000002, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x47003070, 0x656d6f65, 0x53797274, 0x65646168, -0x005b0072, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00070000, 0x30670000, -0x00000400, 0x00000200, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000600, 0xb4007600, -0x44000001, 0x02434258, 0x5f11b96d, 0x31cdd883, 0xade81d9f, 0x014d6a2d, 0xb4000000, 0x05000001, -0x34000000, 0x8c000000, 0xc0000000, 0xf4000000, 0x38000000, 0x52000001, 0x50464544, 0x00000000, -0x00000000, 0x00000000, 0x1c000000, 0x00000000, 0x00fffe04, 0x1c000001, 0x4d000000, 0x6f726369, -0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, 0x2e392072, -0x392e3632, 0x322e3235, 0x00343438, 0x49ababab, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, -0x00000000, 0x00000000, 0x03000000, 0x00000000, 0x0f000000, 0x5000000f, 0x5449534f, 0x004e4f49, -0x4fababab, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, 0x00000000, 0x01000000, 0x03000000, -0x00000000, 0x0f000000, 0x53000000, 0x4f505f56, 0x49544953, 0x53004e4f, 0x3c524448, 0x40000000, -0x0f000100, 0x5f000000, 0xf2030000, 0x00001010, 0x67000000, 0xf2040000, 0x00001020, 0x01000000, -0x36000000, 0xf2050000, 0x00001020, 0x46000000, 0x0000101e, 0x3e000000, 0x53010000, 0x74544154, -0x02000000, 0x00000000, 0x00000000, 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x01000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xb4000000, 0x44000001, 0xa4434258, -0x42e88ad3, 0xcc4b1ab5, 0x5f89bf37, 0x0139edfb, 0xb4000000, 0x05000001, 0x34000000, 0x8c000000, -0xc0000000, 0xf4000000, 0x38000000, 0x52000001, 0x50464544, 0x00000000, 0x00000000, 0x00000000, -0x1c000000, 0x00000000, 0x00fffe04, 0x1c000001, 0x4d000000, 0x6f726369, 0x74666f73, 0x29522820, -0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, 0x2e392072, 0x392e3632, 0x322e3235, -0x00343438, 0x49ababab, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, 0x00000000, 0x00000000, -0x02000000, 0x00000000, 0x0f000000, 0x5000000f, 0x5449534f, 0x004e4f49, 0x4fababab, 0x2c4e4753, -0x01000000, 0x08000000, 0x20000000, 0x00000000, 0x01000000, 0x03000000, 0x00000000, 0x0f000000, -0x53000000, 0x4f505f56, 0x49544953, 0x53004e4f, 0x3c524448, 0x40000000, 0x0f000100, 0x5f000000, -0xf2030000, 0x00001010, 0x67000000, 0xf2040000, 0x00001020, 0x01000000, 0x2b000000, 0xf2050000, -0x00001020, 0x46000000, 0x0000101e, 0x3e000000, 0x53010000, 0x74544154, 0x02000000, 0x00000000, -0x00000000, 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x01000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x70000000, 0x0001b000, 0x42584400, 0xf9269a43, 0xf17ba57f, -0x6d728d8a, 0x599e9d79, 0x000001ff, 0x0001b000, 0x00000500, 0x00003400, 0x00008c00, 0x0000c000, -0x0000f400, 0x00013400, 0x45445200, 0x00005046, 0x00000000, 0x00000000, 0x00000000, 0x00001c00, -0xff040000, 0x000100ff, 0x00001c00, 0x63694d00, 0x6f736f72, 0x28207466, 0x48202952, 0x204c534c, -0x64616853, 0x43207265, 0x69706d6f, 0x2072656c, 0x36322e39, 0x3235392e, 0x3438322e, 0xabab0034, -0x475349ab, 0x00002c4e, 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000100, 0x00000300, -0x00000000, 0x00000f00, 0x5f565300, 0x49534f50, 0x4e4f4954, 0x47534f00, 0x00002c4e, 0x00000100, -0x00000800, 0x00002000, 0x00000000, 0x00000000, 0x00000300, 0x00000000, 0x00000f00, 0x5f565300, -0x67726154, 0xab007465, 0x444853ab, 0x00003852, 0x00004000, 0x00000e00, 0x00006500, 0x1020f203, -0x00000000, 0x00003600, 0x1020f208, 0x00000000, 0x00400200, 0x80000000, 0x8000003f, 0x0000003f, -0x80000000, 0x00003e3f, 0x41545301, 0x00007454, 0x00000200, 0x00000000, 0x00000000, 0x00000100, -0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x10006700, 0x44000002, 0x5c434258, 0x7482cd04, 0xb6d82978, 0xe48192f2, 0x01eec6be, -0x10000000, 0x05000002, 0x34000000, 0x8c000000, 0xc0000000, 0xf4000000, 0x94000000, 0x52000001, -0x50464544, 0x00000000, 0x00000000, 0x00000000, 0x1c000000, 0x00000000, 0x00475304, 0x1c000001, -0x4d000000, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, -0x656c6970, 0x2e392072, 0x392e3632, 0x322e3235, 0x00343438, 0x49ababab, 0x2c4e4753, 0x01000000, -0x08000000, 0x20000000, 0x00000000, 0x01000000, 0x03000000, 0x00000000, 0x0f000000, 0x5300000f, -0x4f505f56, 0x49544953, 0x4f004e4f, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, 0x00000000, -0x01000000, 0x03000000, 0x00000000, 0x0f000000, 0x53000000, 0x4f505f56, 0x49544953, 0x53004e4f, -0x98524448, 0x40000000, 0x26000200, 0x61000000, 0xf2050000, 0x03002010, 0x00000000, 0x01000000, -0x5d000000, 0x5c010018, 0x67010028, 0xf2040000, 0x00001020, 0x01000000, 0x5e000000, 0x03020000, -0x36000000, 0xf2060000, 0x00001020, 0x46000000, 0x0000201e, 0x00000000, 0x13000000, 0x36010000, -0xf2060000, 0x00001020, 0x46000000, 0x0100201e, 0x00000000, 0x13000000, 0x36010000, 0xf2060000, -0x00001020, 0x46000000, 0x0200201e, 0x00000000, 0x13000000, 0x09010000, 0x3e010000, 0x53010000, -0x74544154, 0x08000000, 0x00000000, 0x00000000, 0x02000000, 0x00000000, 0x00000000, 0x00000000, -0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01000000, 0x03000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x03000000, 0x05000000, 0x03000000, 0x00000000, 0x00000000, 0x00000000, 0x52000000, 0x65646e65, -0x30500072, 0x00315000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000002, 0x00000000, -0x00000001, 0x00000002, 0x00000000, 0x01003250, 0x02000000, 0x00000000, 0x01000000, 0x02000000, -0x00000000, 0x01000000, 0x02000000, 0x00000000, 0x50000000, 0x01b00033, 0x58440000, 0x269a4342, -0x7ba57ff9, 0x728d8af1, 0x9e9d796d, 0x0001ff59, 0x01b00000, 0x00050000, 0x00340000, 0x008c0000, -0x00c00000, 0x00f40000, 0x01340000, 0x44520000, 0x00504645, 0x00000000, 0x00000000, 0x00000000, -0x001c0000, 0x04000000, 0x0100ffff, 0x001c0000, 0x694d0000, 0x736f7263, 0x2074666f, 0x20295228, -0x4c534c48, 0x61685320, 0x20726564, 0x706d6f43, 0x72656c69, 0x322e3920, 0x35392e36, 0x38322e32, -0xab003434, 0x5349abab, 0x002c4e47, 0x00010000, 0x00080000, 0x00200000, 0x00000000, 0x00010000, -0x00030000, 0x00000000, 0x000f0000, 0x56530000, 0x534f505f, 0x4f495449, 0x534f004e, 0x002c4e47, -0x00010000, 0x00080000, 0x00200000, 0x00000000, 0x00000000, 0x00030000, 0x00000000, 0x000f0000, -0x56530000, 0x7261545f, 0x00746567, 0x4853abab, 0x00385244, 0x00400000, 0x000e0000, 0x00650000, -0x20f20300, 0x00000010, 0x00360000, 0x20f20800, 0x00000010, 0x40020000, 0x00000000, 0x00003f80, -0x00003f80, 0x00000000, 0x003e3f80, 0x54530100, 0x00745441, 0x00020000, 0x00000000, 0x00000000, -0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x083e0000, 0x00000000, 0x01b40000, 0x58440000, 0x6d024342, 0x835f11b9, -0x9f31cdd8, 0x2dade81d, 0x00014d6a, 0x01b40000, 0x00050000, 0x00340000, 0x008c0000, 0x00c00000, -0x00f40000, 0x01380000, 0x44520000, 0x00504645, 0x00000000, 0x00000000, 0x00000000, 0x001c0000, -0x04000000, 0x0100fffe, 0x001c0000, 0x694d0000, 0x736f7263, 0x2074666f, 0x20295228, 0x4c534c48, -0x61685320, 0x20726564, 0x706d6f43, 0x72656c69, 0x322e3920, 0x35392e36, 0x38322e32, 0xab003434, -0x5349abab, 0x002c4e47, 0x00010000, 0x00080000, 0x00200000, 0x00000000, 0x00000000, 0x00030000, -0x00000000, 0x0f0f0000, 0x4f500000, 0x49544953, 0xab004e4f, 0x534fabab, 0x002c4e47, 0x00010000, -0x00080000, 0x00200000, 0x00000000, 0x00010000, 0x00030000, 0x00000000, 0x000f0000, 0x56530000, -0x534f505f, 0x4f495449, 0x4853004e, 0x003c5244, 0x00400000, 0x000f0001, 0x005f0000, 0x10f20300, -0x00000010, 0x00670000, 0x20f20400, 0x00000010, 0x00010000, 0x00360000, 0x20f20500, 0x00000010, -0x1e460000, 0x00000010, 0x003e0000, 0x54530100, 0x00745441, 0x00020000, 0x00000000, 0x00000000, -0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x09fa0000, 0x00000000, 0x02100000, 0x58440000, 0x045c4342, 0x787482cd, -0xf2b6d829, 0xbee48192, 0x0001eec6, 0x02100000, 0x00050000, 0x00340000, 0x008c0000, 0x00c00000, -0x00f40000, 0x01940000, 0x44520000, 0x00504645, 0x00000000, 0x00000000, 0x00000000, 0x001c0000, -0x04000000, 0x01004753, 0x001c0000, 0x694d0000, 0x736f7263, 0x2074666f, 0x20295228, 0x4c534c48, -0x61685320, 0x20726564, 0x706d6f43, 0x72656c69, 0x322e3920, 0x35392e36, 0x38322e32, 0xab003434, -0x5349abab, 0x002c4e47, 0x00010000, 0x00080000, 0x00200000, 0x00000000, 0x00010000, 0x00030000, -0x00000000, 0x0f0f0000, 0x56530000, 0x534f505f, 0x4f495449, 0x534f004e, 0x002c4e47, 0x00010000, -0x00080000, 0x00200000, 0x00000000, 0x00010000, 0x00030000, 0x00000000, 0x000f0000, 0x56530000, -0x534f505f, 0x4f495449, 0x4853004e, 0x00985244, 0x00400000, 0x00260002, 0x00610000, 0x10f20500, -0x00030020, 0x00000000, 0x00010000, 0x185d0000, 0x285c0100, 0x00670100, 0x20f20400, 0x00000010, -0x00010000, 0x005e0000, 0x00030200, 0x00360000, 0x20f20600, 0x00000010, 0x1e460000, 0x00000020, -0x00000000, 0x00130000, 0x00360100, 0x20f20600, 0x00000010, 0x1e460000, 0x00010020, 0x00000000, -0x00130000, 0x00360100, 0x20f20600, 0x00000010, 0x1e460000, 0x00020020, 0x00000000, 0x00130000, -0x00090100, 0x003e0100, 0x54530100, 0x00745441, 0x00080000, 0x00000000, 0x00000000, 0x00020000, -0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00010000, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x00050000, 0x00030000, 0x00000000, 0x00000000, -0x00000000, 0x0bba0000, 0x00000000, 0x34500000, 0x0001b000, 0x42584400, 0xf9269a43, 0xf17ba57f, -0x6d728d8a, 0x599e9d79, 0x000001ff, 0x0001b000, 0x00000500, 0x00003400, 0x00008c00, 0x0000c000, -0x0000f400, 0x00013400, 0x45445200, 0x00005046, 0x00000000, 0x00000000, 0x00000000, 0x00001c00, -0xff040000, 0x000100ff, 0x00001c00, 0x63694d00, 0x6f736f72, 0x28207466, 0x48202952, 0x204c534c, -0x64616853, 0x43207265, 0x69706d6f, 0x2072656c, 0x36322e39, 0x3235392e, 0x3438322e, 0xabab0034, -0x475349ab, 0x00002c4e, 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000100, 0x00000300, -0x00000000, 0x00000f00, 0x5f565300, 0x49534f50, 0x4e4f4954, 0x47534f00, 0x00002c4e, 0x00000100, -0x00000800, 0x00002000, 0x00000000, 0x00000000, 0x00000300, 0x00000000, 0x00000f00, 0x5f565300, -0x67726154, 0xab007465, 0x444853ab, 0x00003852, 0x00004000, 0x00000e00, 0x00006500, 0x1020f203, -0x00000000, 0x00003600, 0x1020f208, 0x00000000, 0x00400200, 0x80000000, 0x8000003f, 0x0000003f, -0x80000000, 0x00003e3f, 0x41545301, 0x00007454, 0x00000200, 0x00000000, 0x00000000, 0x00000100, -0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x000dd900, 0x00000000, 0x0001b400, 0x42584400, 0x8ad3a443, 0x1ab542e8, 0xbf37cc4b, -0xedfb5f89, 0x00000139, 0x0001b400, 0x00000500, 0x00003400, 0x00008c00, 0x0000c000, 0x0000f400, -0x00013800, 0x45445200, 0x00005046, 0x00000000, 0x00000000, 0x00000000, 0x00001c00, 0xfe040000, -0x000100ff, 0x00001c00, 0x63694d00, 0x6f736f72, 0x28207466, 0x48202952, 0x204c534c, 0x64616853, -0x43207265, 0x69706d6f, 0x2072656c, 0x36322e39, 0x3235392e, 0x3438322e, 0xabab0034, 0x475349ab, -0x00002c4e, 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000000, 0x00000200, 0x00000000, -0x000f0f00, 0x534f5000, 0x4f495449, 0xabab004e, 0x47534fab, 0x00002c4e, 0x00000100, 0x00000800, -0x00002000, 0x00000000, 0x00000100, 0x00000300, 0x00000000, 0x00000f00, 0x5f565300, 0x49534f50, -0x4e4f4954, 0x44485300, 0x00003c52, 0x01004000, 0x00000f00, 0x00005f00, 0x1010f203, 0x00000000, -0x00006700, 0x1020f204, 0x00000000, 0x00000100, 0x00002b00, 0x1020f205, 0x00000000, 0x101e4600, -0x00000000, 0x00003e00, 0x41545301, 0x00007454, 0x00000200, 0x00000000, 0x00000000, 0x00000200, -0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x000f9500, 0x00000000, 0x00021000, 0x42584400, 0xcd045c43, 0x29787482, 0x92f2b6d8, -0xc6bee481, 0x000001ee, 0x00021000, 0x00000500, 0x00003400, 0x00008c00, 0x0000c000, 0x0000f400, -0x00019400, 0x45445200, 0x00005046, 0x00000000, 0x00000000, 0x00000000, 0x00001c00, 0x53040000, -0x00010047, 0x00001c00, 0x63694d00, 0x6f736f72, 0x28207466, 0x48202952, 0x204c534c, 0x64616853, -0x43207265, 0x69706d6f, 0x2072656c, 0x36322e39, 0x3235392e, 0x3438322e, 0xabab0034, 0x475349ab, -0x00002c4e, 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000100, 0x00000300, 0x00000000, -0x000f0f00, 0x5f565300, 0x49534f50, 0x4e4f4954, 0x47534f00, 0x00002c4e, 0x00000100, 0x00000800, -0x00002000, 0x00000000, 0x00000100, 0x00000300, 0x00000000, 0x00000f00, 0x5f565300, 0x49534f50, -0x4e4f4954, 0x44485300, 0x00009852, 0x02004000, 0x00002600, 0x00006100, 0x2010f205, 0x00000300, -0x00000000, 0x00000100, 0x00185d00, 0x00285c01, 0x00006701, 0x1020f204, 0x00000000, 0x00000100, -0x00005e00, 0x00000302, 0x00003600, 0x1020f206, 0x00000000, 0x201e4600, 0x00000000, 0x00000000, -0x00001300, 0x00003601, 0x1020f206, 0x00000000, 0x201e4600, 0x00000100, 0x00000000, 0x00001300, -0x00003601, 0x1020f206, 0x00000000, 0x201e4600, 0x00000200, 0x00000000, 0x00001300, 0x00000901, -0x00003e01, 0x41545301, 0x00007454, 0x00000800, 0x00000000, 0x00000000, 0x00000200, 0x00000000, -0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, -0x00000300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00000300, 0x00000500, 0x00000300, 0x00000000, 0x00000000, 0x00000000, -0x00115500, 0x00000000, 0x00355000, 0xa5003650, 0x00000000, 0x50000000, 0x00a50037, 0x00010000, -0x002d0000, 0x00110000, 0x00000000, 0xffff0000, 0x0000ffff, 0x00000000, 0x00580000, 0x003c0000, -0x00000000, 0xffff0000, 0x0000ffff, 0x00000000, 0x00860000, 0x006a0000, 0x00000000, 0xffff0000, -0x0000ffff, 0x00000000, 0x00a50000, 0x00890000, 0x00000000, 0xffff0000, 0x00a7ffff, 0x025f0000, -0x00000000, 0x04170000, 0x003c0000, 0x00000000, 0xffff0000, 0x0419ffff, 0x00000000, 0x05cd0000, -0x006a0000, 0x00000000, 0xffff0000, 0x05cfffff, 0x00000000, 0x07e30000, 0x00080000, 0x00000000, -0x07ea0000, 0x00000000, 0x00000000, 0x07ed0000, 0x00030000, 0x00000000, 0x00070000, 0x00000000, -0x00010000, 0x07f00000, 0x00060000, 0x00000000, 0x00010000, 0x07fc0000, 0x00080000, 0x00000000, -0x00010000, 0x08080000, 0x08140000, 0x00030000, 0x00000000, 0x00070000, 0x00000000, 0x00010000, -0x08170000, 0x00060000, 0x00000000, 0x00010000, 0x08230000, 0x00080000, 0x00000000, 0x00010000, -0x082f0000, 0x083b0000, 0x00030000, 0x00000000, 0x00070000, 0x00000000, 0x00070000, 0x09f20000, -0x00060000, 0x00000000, 0x00070000, 0x0bb20000, 0x00080000, 0x00000000, 0x00070000, 0x0dce0000, -0x0dd60000, 0x00030000, 0x00000000, 0x00070000, 0x00000000, 0x00070000, 0x0f8d0000, 0x00060000, -0x00000000, 0x00070000, 0x114d0000, 0x00080000, 0x00000000, 0x00070000, 0x13690000, 0x13710000, -0x00030000, 0x00000000, 0x00070000, 0x00000000, 0x00020000, 0x00580000, 0x00060000, 0x00000000, -0x00020000, 0x002d0000, 0x00080000, 0x00000000, 0x00020000, 0x00860000, 0x13740000, 0x00030000, -0x00000000, 0x00070000, 0x00000000, 0x00020000, 0x04170000, 0x00060000, 0x00000000, 0x00030000, -0x13770000, 0x00080000, 0x00000000, 0x00020000, 0x05cd0000, 0x137f0000, 0x00030000, 0x00000000, -0x00070000, 0x00000000, 0x00020000, 0x04170000, 0x00060000, 0x00000000, 0x00030000, 0x13820000, -0x00080000, 0x00000000, 0x00020000, 0x05cd0000, 0x00000000, +static DWORD fx_local_shader[] = +{ + 0x43425844, 0x0a74ff0f, 0xea10b516, 0x8be88332, 0x2a273ca7, 0x00000001, 0x0000182d, 0x00000001, + 0x00000024, 0x30315846, 0x00001801, 0xfeff1001, 0x00000000, 0x00000000, 0x00000007, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0x00001549, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000e, 0x00000006, 0x00000000, 0x74726556, + 0x68537865, 0x72656461, 0x00000400, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000600, 0x00307600, 0x65786950, 0x6168536c, 0x00726564, 0x00000030, 0x00000002, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x47003070, 0x656d6f65, 0x53797274, 0x65646168, + 0x005b0072, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00070000, 0x30670000, + 0x00000400, 0x00000200, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000600, 0xa8007600, + 0x44000001, 0x92434258, 0xa75ea3fc, 0x13affa34, 0x46be1a21, 0x0104d04a, 0xa8000000, 0x05000001, + 0x34000000, 0x80000000, 0xb4000000, 0xe8000000, 0x2c000000, 0x52000001, 0x44464544, 0x00000000, + 0x00000000, 0x00000000, 0x1c000000, 0x00000000, 0x00fffe04, 0x1c000001, 0x4d000000, 0x6f726369, + 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, 0x30312072, + 0x4900312e, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, 0x00000000, 0x00000000, 0x03000000, + 0x00000000, 0x0f000000, 0x5000000f, 0x5449534f, 0x004e4f49, 0x4fababab, 0x2c4e4753, 0x01000000, + 0x08000000, 0x20000000, 0x00000000, 0x01000000, 0x03000000, 0x00000000, 0x0f000000, 0x53000000, + 0x4f505f56, 0x49544953, 0x53004e4f, 0x3c524448, 0x40000000, 0x0f000100, 0x5f000000, 0xf2030000, + 0x00001010, 0x67000000, 0xf2040000, 0x00001020, 0x01000000, 0x36000000, 0xf2050000, 0x00001020, + 0x46000000, 0x0000101e, 0x3e000000, 0x53010000, 0x74544154, 0x02000000, 0x00000000, 0x00000000, + 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x01000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0xa8000000, 0x44000001, 0x84434258, 0xa05ac55b, 0x929a6a46, 0x4f0df40a, + 0x01a2fea3, 0xa8000000, 0x05000001, 0x34000000, 0x80000000, 0xb4000000, 0xe8000000, 0x2c000000, + 0x52000001, 0x44464544, 0x00000000, 0x00000000, 0x00000000, 0x1c000000, 0x00000000, 0x00fffe04, + 0x1c000001, 0x4d000000, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, + 0x6d6f4320, 0x656c6970, 0x30312072, 0x4900312e, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, + 0x00000000, 0x00000000, 0x02000000, 0x00000000, 0x0f000000, 0x5000000f, 0x5449534f, 0x004e4f49, + 0x4fababab, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, 0x00000000, 0x01000000, 0x03000000, + 0x00000000, 0x0f000000, 0x53000000, 0x4f505f56, 0x49544953, 0x53004e4f, 0x3c524448, 0x40000000, + 0x0f000100, 0x5f000000, 0xf2030000, 0x00001010, 0x67000000, 0xf2040000, 0x00001020, 0x01000000, + 0x2b000000, 0xf2050000, 0x00001020, 0x46000000, 0x0000101e, 0x3e000000, 0x53010000, 0x74544154, + 0x02000000, 0x00000000, 0x00000000, 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x01000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x70000000, 0x0001a400, 0x42584400, + 0xf4813443, 0xb6605b8e, 0xc69999b8, 0xcb75f1b5, 0x000001eb, 0x0001a400, 0x00000500, 0x00003400, + 0x00008000, 0x0000b400, 0x0000e800, 0x00012800, 0x45445200, 0x00004446, 0x00000000, 0x00000000, + 0x00000000, 0x00001c00, 0xff040000, 0x000100ff, 0x00001c00, 0x63694d00, 0x6f736f72, 0x28207466, + 0x48202952, 0x204c534c, 0x64616853, 0x43207265, 0x69706d6f, 0x2072656c, 0x312e3031, 0x47534900, + 0x00002c4e, 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000100, 0x00000300, 0x00000000, + 0x00000f00, 0x5f565300, 0x49534f50, 0x4e4f4954, 0x47534f00, 0x00002c4e, 0x00000100, 0x00000800, + 0x00002000, 0x00000000, 0x00000000, 0x00000300, 0x00000000, 0x00000f00, 0x5f565300, 0x67726154, + 0xab007465, 0x444853ab, 0x00003852, 0x00004000, 0x00000e00, 0x00006500, 0x1020f203, 0x00000000, + 0x00003600, 0x1020f208, 0x00000000, 0x00400200, 0x80000000, 0x8000003f, 0x0000003f, 0x80000000, + 0x00003e3f, 0x41545301, 0x00007454, 0x00000200, 0x00000000, 0x00000000, 0x00000100, 0x00000000, + 0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x04006700, 0x44000002, 0x23434258, 0x6e8e325e, 0x5f0774e8, 0xbfe636e1, 0x01d3f67a, 0x04000000, + 0x05000002, 0x34000000, 0x80000000, 0xb4000000, 0xe8000000, 0x88000000, 0x52000001, 0x44464544, + 0x00000000, 0x00000000, 0x00000000, 0x1c000000, 0x00000000, 0x00475304, 0x1c000001, 0x4d000000, + 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, 0x656c6970, + 0x30312072, 0x4900312e, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, 0x00000000, 0x01000000, + 0x03000000, 0x00000000, 0x0f000000, 0x5300000f, 0x4f505f56, 0x49544953, 0x4f004e4f, 0x2c4e4753, + 0x01000000, 0x08000000, 0x20000000, 0x00000000, 0x01000000, 0x03000000, 0x00000000, 0x0f000000, + 0x53000000, 0x4f505f56, 0x49544953, 0x53004e4f, 0x98524448, 0x40000000, 0x26000200, 0x61000000, + 0xf2050000, 0x03002010, 0x00000000, 0x01000000, 0x5d000000, 0x5c010018, 0x67010028, 0xf2040000, + 0x00001020, 0x01000000, 0x5e000000, 0x03020000, 0x36000000, 0xf2060000, 0x00001020, 0x46000000, + 0x0000201e, 0x00000000, 0x13000000, 0x36010000, 0xf2060000, 0x00001020, 0x46000000, 0x0100201e, + 0x00000000, 0x13000000, 0x36010000, 0xf2060000, 0x00001020, 0x46000000, 0x0200201e, 0x00000000, + 0x13000000, 0x09010000, 0x3e010000, 0x53010000, 0x74544154, 0x08000000, 0x00000000, 0x00000000, + 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x01000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x01000000, 0x03000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x03000000, 0x05000000, 0x03000000, 0x00000000, + 0x00000000, 0x00000000, 0x5b000000, 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x08000000, 0x67000000, 0x006f735f, 0x00000204, 0x43425844, 0x8e325e23, 0x0774e86e, 0xe636e15f, + 0xd3f67abf, 0x00000001, 0x00000204, 0x00000005, 0x00000034, 0x00000080, 0x000000b4, 0x000000e8, + 0x00000188, 0x46454452, 0x00000044, 0x00000000, 0x00000000, 0x00000000, 0x0000001c, 0x47530400, + 0x00000100, 0x0000001c, 0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, + 0x6f432072, 0x6c69706d, 0x31207265, 0x00312e30, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x5449534f, + 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x00000098, + 0x00020040, 0x00000026, 0x05000061, 0x002010f2, 0x00000003, 0x00000000, 0x00000001, 0x0100185d, + 0x0100285c, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x0200005e, 0x00000003, 0x06000036, + 0x001020f2, 0x00000000, 0x00201e46, 0x00000000, 0x00000000, 0x01000013, 0x06000036, 0x001020f2, + 0x00000000, 0x00201e46, 0x00000001, 0x00000000, 0x01000013, 0x06000036, 0x001020f2, 0x00000000, + 0x00201e46, 0x00000002, 0x00000000, 0x01000013, 0x01000009, 0x0100003e, 0x54415453, 0x00000074, + 0x00000008, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, + 0x00000005, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x505f5653, 0x5449534f, 0x2e4e4f49, + 0x65520078, 0x7265646e, 0x00305000, 0x01003150, 0x02000000, 0x00000000, 0x01000000, 0x02000000, + 0x00000000, 0x01000000, 0x02000000, 0x00000000, 0x50000000, 0x00010032, 0x00020000, 0x00000000, + 0x00010000, 0x00020000, 0x00000000, 0x00010000, 0x00020000, 0x00000000, 0x33500000, 0x0001a400, + 0x42584400, 0xf4813443, 0xb6605b8e, 0xc69999b8, 0xcb75f1b5, 0x000001eb, 0x0001a400, 0x00000500, + 0x00003400, 0x00008000, 0x0000b400, 0x0000e800, 0x00012800, 0x45445200, 0x00004446, 0x00000000, + 0x00000000, 0x00000000, 0x00001c00, 0xff040000, 0x000100ff, 0x00001c00, 0x63694d00, 0x6f736f72, + 0x28207466, 0x48202952, 0x204c534c, 0x64616853, 0x43207265, 0x69706d6f, 0x2072656c, 0x312e3031, + 0x47534900, 0x00002c4e, 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000100, 0x00000300, + 0x00000000, 0x00000f00, 0x5f565300, 0x49534f50, 0x4e4f4954, 0x47534f00, 0x00002c4e, 0x00000100, + 0x00000800, 0x00002000, 0x00000000, 0x00000000, 0x00000300, 0x00000000, 0x00000f00, 0x5f565300, + 0x67726154, 0xab007465, 0x444853ab, 0x00003852, 0x00004000, 0x00000e00, 0x00006500, 0x1020f203, + 0x00000000, 0x00003600, 0x1020f208, 0x00000000, 0x00400200, 0x80000000, 0x8000003f, 0x0000003f, + 0x80000000, 0x00003e3f, 0x41545301, 0x00007454, 0x00000200, 0x00000000, 0x00000000, 0x00000100, + 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x000a4500, 0x00000000, 0x0001a800, 0x42584400, 0xa3fc9243, 0xfa34a75e, 0x1a2113af, + 0xd04a46be, 0x00000104, 0x0001a800, 0x00000500, 0x00003400, 0x00008000, 0x0000b400, 0x0000e800, + 0x00012c00, 0x45445200, 0x00004446, 0x00000000, 0x00000000, 0x00000000, 0x00001c00, 0xfe040000, + 0x000100ff, 0x00001c00, 0x63694d00, 0x6f736f72, 0x28207466, 0x48202952, 0x204c534c, 0x64616853, + 0x43207265, 0x69706d6f, 0x2072656c, 0x312e3031, 0x47534900, 0x00002c4e, 0x00000100, 0x00000800, + 0x00002000, 0x00000000, 0x00000000, 0x00000300, 0x00000000, 0x000f0f00, 0x534f5000, 0x4f495449, + 0xabab004e, 0x47534fab, 0x00002c4e, 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000100, + 0x00000300, 0x00000000, 0x00000f00, 0x5f565300, 0x49534f50, 0x4e4f4954, 0x44485300, 0x00003c52, + 0x01004000, 0x00000f00, 0x00005f00, 0x1010f203, 0x00000000, 0x00006700, 0x1020f204, 0x00000000, + 0x00000100, 0x00003600, 0x1020f205, 0x00000000, 0x101e4600, 0x00000000, 0x00003e00, 0x41545301, + 0x00007454, 0x00000200, 0x00000000, 0x00000000, 0x00000200, 0x00000000, 0x00000000, 0x00000000, + 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000bf500, 0x00000000, + 0x00020400, 0x42584400, 0x325e2343, 0x74e86e8e, 0x36e15f07, 0xf67abfe6, 0x000001d3, 0x00020400, + 0x00000500, 0x00003400, 0x00008000, 0x0000b400, 0x0000e800, 0x00018800, 0x45445200, 0x00004446, + 0x00000000, 0x00000000, 0x00000000, 0x00001c00, 0x53040000, 0x00010047, 0x00001c00, 0x63694d00, + 0x6f736f72, 0x28207466, 0x48202952, 0x204c534c, 0x64616853, 0x43207265, 0x69706d6f, 0x2072656c, + 0x312e3031, 0x47534900, 0x00002c4e, 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000100, + 0x00000300, 0x00000000, 0x000f0f00, 0x5f565300, 0x49534f50, 0x4e4f4954, 0x47534f00, 0x00002c4e, + 0x00000100, 0x00000800, 0x00002000, 0x00000000, 0x00000100, 0x00000300, 0x00000000, 0x00000f00, + 0x5f565300, 0x49534f50, 0x4e4f4954, 0x44485300, 0x00009852, 0x02004000, 0x00002600, 0x00006100, + 0x2010f205, 0x00000300, 0x00000000, 0x00000100, 0x00185d00, 0x00285c01, 0x00006701, 0x1020f204, + 0x00000000, 0x00000100, 0x00005e00, 0x00000302, 0x00003600, 0x1020f206, 0x00000000, 0x201e4600, + 0x00000000, 0x00000000, 0x00001300, 0x00003601, 0x1020f206, 0x00000000, 0x201e4600, 0x00000100, + 0x00000000, 0x00001300, 0x00003601, 0x1020f206, 0x00000000, 0x201e4600, 0x00000200, 0x00000000, + 0x00001300, 0x00000901, 0x00003e01, 0x41545301, 0x00007454, 0x00000800, 0x00000000, 0x00000000, + 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000100, 0x00000300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000300, 0x00000500, 0x00000300, 0x00000000, + 0x00000000, 0x00000000, 0x000da900, 0x00000000, 0x00345000, 0x000001a4, 0x43425844, 0x8ef48134, + 0xb8b6605b, 0xb5c69999, 0xebcb75f1, 0x00000001, 0x000001a4, 0x00000005, 0x00000034, 0x00000080, + 0x000000b4, 0x000000e8, 0x00000128, 0x46454452, 0x00000044, 0x00000000, 0x00000000, 0x00000000, + 0x0000001c, 0xffff0400, 0x00000100, 0x0000001c, 0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, + 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, 0x31207265, 0x00312e30, 0x4e475349, 0x0000002c, + 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, + 0x505f5653, 0x5449534f, 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, + 0x52444853, 0x00000038, 0x00000040, 0x0000000e, 0x03000065, 0x001020f2, 0x00000000, 0x08000036, + 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, + 0x54415453, 0x00000074, 0x00000002, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, + 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000fbc, + 0x00000000, 0x000001a8, 0x43425844, 0x5ac55b84, 0x9a6a46a0, 0x0df40a92, 0xa2fea34f, 0x00000001, + 0x000001a8, 0x00000005, 0x00000034, 0x00000080, 0x000000b4, 0x000000e8, 0x0000012c, 0x46454452, + 0x00000044, 0x00000000, 0x00000000, 0x00000000, 0x0000001c, 0xfffe0400, 0x00000100, 0x0000001c, + 0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, + 0x31207265, 0x00312e30, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, + 0x00000000, 0x00000002, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, + 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x0000003c, 0x00010040, 0x0000000f, + 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x0500002b, + 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, 0x54415453, 0x00000074, 0x00000002, + 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000116c, 0x00000000, 0x00000204, 0x43425844, + 0x8e325e23, 0x0774e86e, 0xe636e15f, 0xd3f67abf, 0x00000001, 0x00000204, 0x00000005, 0x00000034, + 0x00000080, 0x000000b4, 0x000000e8, 0x00000188, 0x46454452, 0x00000044, 0x00000000, 0x00000000, + 0x00000000, 0x0000001c, 0x47530400, 0x00000100, 0x0000001c, 0x7263694d, 0x666f736f, 0x52282074, + 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, 0x31207265, 0x00312e30, 0x4e475349, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, + 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, + 0x004e4f49, 0x52444853, 0x00000098, 0x00020040, 0x00000026, 0x05000061, 0x002010f2, 0x00000003, + 0x00000000, 0x00000001, 0x0100185d, 0x0100285c, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x0200005e, 0x00000003, 0x06000036, 0x001020f2, 0x00000000, 0x00201e46, 0x00000000, 0x00000000, + 0x01000013, 0x06000036, 0x001020f2, 0x00000000, 0x00201e46, 0x00000001, 0x00000000, 0x01000013, + 0x06000036, 0x001020f2, 0x00000000, 0x00201e46, 0x00000002, 0x00000000, 0x01000013, 0x01000009, + 0x0100003e, 0x54415453, 0x00000074, 0x00000008, 0x00000000, 0x00000000, 0x00000002, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000003, 0x00000005, 0x00000003, 0x00000000, 0x00000000, 0x00000000, + 0x00001320, 0x00000000, 0x50003550, 0x00a50036, 0x00000000, 0x37500000, 0x0000a500, 0x00000100, + 0x00002d00, 0x00001100, 0x00000000, 0xffffff00, 0x000000ff, 0x00000000, 0x00005800, 0x00003c00, + 0x00000000, 0xffffff00, 0x000000ff, 0x00000000, 0x00008600, 0x00006a00, 0x00000000, 0xffffff00, + 0x000000ff, 0x00000000, 0x0000a500, 0x00008900, 0x00000000, 0xffffff00, 0x0000a7ff, 0x00025300, + 0x00000000, 0x0003ff00, 0x00003c00, 0x00000000, 0xffffff00, 0x000401ff, 0x00000000, 0x0005a900, + 0x00006a00, 0x00000000, 0xffffff00, 0x0005abff, 0x00000000, 0x0007cf00, 0x0007b300, 0x00000000, + 0xffffff00, 0x0007d4ff, 0x0009dc00, 0x00000000, 0x0009ea00, 0x00000800, 0x00000000, 0x0009f100, + 0x00000000, 0x00000000, 0x0009f400, 0x00000300, 0x00000000, 0x00000700, 0x00000000, 0x00000100, + 0x0009f700, 0x00000600, 0x00000000, 0x00000100, 0x000a0300, 0x00000800, 0x00000000, 0x00000100, + 0x000a0f00, 0x000a1b00, 0x00000300, 0x00000000, 0x00000700, 0x00000000, 0x00000100, 0x000a1e00, + 0x00000600, 0x00000000, 0x00000100, 0x000a2a00, 0x00000800, 0x00000000, 0x00000100, 0x000a3600, + 0x000a4200, 0x00000300, 0x00000000, 0x00000700, 0x00000000, 0x00000700, 0x000bed00, 0x00000600, + 0x00000000, 0x00000700, 0x000da100, 0x00000800, 0x00000000, 0x00000700, 0x000fb100, 0x000fb900, + 0x00000300, 0x00000000, 0x00000700, 0x00000000, 0x00000700, 0x00116400, 0x00000600, 0x00000000, + 0x00000700, 0x00131800, 0x00000800, 0x00000000, 0x00000700, 0x00152800, 0x00153000, 0x00000300, + 0x00000000, 0x00000700, 0x00000000, 0x00000200, 0x00005800, 0x00000600, 0x00000000, 0x00000200, + 0x00002d00, 0x00000800, 0x00000000, 0x00000200, 0x00008600, 0x00153300, 0x00000300, 0x00000000, + 0x00000700, 0x00000000, 0x00000200, 0x0003ff00, 0x00000600, 0x00000000, 0x00000300, 0x00153600, + 0x00000800, 0x00000000, 0x00000200, 0x0005a900, 0x00153e00, 0x00000300, 0x00000000, 0x00000700, + 0x00000000, 0x00000200, 0x0003ff00, 0x00000600, 0x00000000, 0x00000300, 0x00154100, 0x00000800, + 0x00000000, 0x00000200, 0x0005a900, 0x00000000, }; static void test_effect_local_shader(void) @@ -2776,7 +2796,8 @@ static void test_effect_local_shader(void) D3D10_EFFECT_TYPE_DESC typedesc; D3D10_EFFECT_DESC effect_desc; ID3D10EffectShaderVariable *null_shader, *null_anon_vs, *null_anon_ps, *null_anon_gs, - *p3_anon_vs, *p3_anon_ps, *p3_anon_gs, *p6_vs, *p6_ps, *p6_gs; + *p3_anon_vs, *p3_anon_ps, *p3_anon_gs, *p6_vs, *p6_ps, *p6_gs, *gs; + D3D10_EFFECT_SHADER_DESC shaderdesc; ID3D10Device *device; ULONG refcount; @@ -2796,7 +2817,7 @@ static void test_effect_local_shader(void) effect_desc.ConstantBuffers); ok(effect_desc.SharedConstantBuffers == 0, "Unexpected shared constant buffers count %u.\n", effect_desc.SharedConstantBuffers); - ok(effect_desc.GlobalVariables == 6, "Unexpected global variables count %u.\n", + ok(effect_desc.GlobalVariables == 7, "Unexpected global variables count %u.\n", effect_desc.GlobalVariables); ok(effect_desc.SharedGlobalVariables == 0, "Unexpected shared global variables count %u.\n", effect_desc.SharedGlobalVariables); @@ -3614,6 +3635,19 @@ if (0) ok(typedesc.UnpackedSize == 0x0, "UnpackedSize is %#x, expected 0x0\n", typedesc.UnpackedSize); ok(typedesc.Stride == 0x0, "Stride is %#x, expected 0x0\n", typedesc.Stride); + /* Geometry shader with stream output */ + v = effect->lpVtbl->GetVariableByName(effect, "g_so"); + gs = v->lpVtbl->AsShader(v); + hr = gs->lpVtbl->GetShaderDesc(gs, 0, &shaderdesc); +todo_wine + ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + if (hr == S_OK) + { + ok(!shaderdesc.IsInline, "Unexpected inline flag.\n"); + ok(!strcmp(shaderdesc.SODecl, "SV_POSITION.x"), "Unexpected stream output declaration %s.\n", + shaderdesc.SODecl); + } + effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); -- 2.26.3

1 0

[PATCH v2 1/4] winex11.drv: Only return vulkan functions if the host function is available.
by Georg Lehmann 20 Aug '21

20 Aug '21

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winex11.drv/vulkan.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index bdc287afeea..1bbdba2ce1d 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -435,12 +435,25 @@ static VkResult X11DRV_vkGetDeviceGroupSurfacePresentModesKHR(VkDevice device, return pvkGetDeviceGroupSurfacePresentModesKHR(device, x11_surface->surface, flags); } +static const char *wine_vk_native_fn_name(const char *name) +{ + if (!strcmp(name, "vkCreateWin32SurfaceKHR")) + return "vkCreateXlibSurfaceKHR"; + if (!strcmp(name, "vkGetPhysicalDeviceWin32PresentationSupportKHR")) + return "vkGetPhysicalDeviceXlibPresentationSupportKHR"; + + return name; +} + static void *X11DRV_vkGetDeviceProcAddr(VkDevice device, const char *name) { void *proc_addr; TRACE("%p, %s\n", device, debugstr_a(name)); + if (!pvkGetDeviceProcAddr(device, wine_vk_native_fn_name(name))) + return NULL; + if ((proc_addr = X11DRV_get_vk_device_proc_addr(name))) return proc_addr; @@ -453,6 +466,9 @@ static void *X11DRV_vkGetInstanceProcAddr(VkInstance instance, const char *name) TRACE("%p, %s\n", instance, debugstr_a(name)); + if (!pvkGetInstanceProcAddr(instance, wine_vk_native_fn_name(name))) + return NULL; + if ((proc_addr = X11DRV_get_vk_instance_proc_addr(instance, name))) return proc_addr; -- 2.33.0

2 7

[PATCH 11/11] concrt140: Don't forward to msvcr120.
by Piotr Caban 20 Aug '21

20 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/concrt140/Makefile.in | 6 + dlls/concrt140/concrt140.c | 102 +++++ dlls/concrt140/concrt140.spec | 676 +++++++++++++++++----------------- 3 files changed, 446 insertions(+), 338 deletions(-) create mode 100644 dlls/concrt140/concrt140.c

1 0

[PATCH 10/11] msvcrt: Simplify throw_exception helper.
by Piotr Caban 20 Aug '21

20 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/cpp.c | 12 ++++-------- dlls/msvcrt/heap.c | 2 +- dlls/msvcrt/msvcrt.h | 5 +---- 3 files changed, 6 insertions(+), 13 deletions(-)

1 0

[PATCH 09/11] msvcrt: Move improper_scheduler_detach to concurrency.c.
by Piotr Caban 20 Aug '21

20 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/concurrency.c | 52 +++++++++++++++++++++++++++++++--- dlls/msvcrt/cpp.c | 59 --------------------------------------- dlls/msvcrt/msvcrt.h | 3 -- 3 files changed, 48 insertions(+), 66 deletions(-)

1 0

[PATCH 08/11] msvcrt: Move improper_scheduler_attach to concurrency.c.
by Piotr Caban 20 Aug '21

20 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/concurrency.c | 45 +++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/cpp.c | 43 ------------------------------------- dlls/msvcrt/msvcrt.h | 1 - 3 files changed, 43 insertions(+), 46 deletions(-)

1 0

[PATCH 07/11] msvcrt: Move invalid_scheduler_policy_thread_specification to concurrency.c.
by Piotr Caban 20 Aug '21

20 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/concurrency.c | 45 +++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/cpp.c | 43 ------------------------------------- dlls/msvcrt/msvcrt.h | 1 - 3 files changed, 43 insertions(+), 46 deletions(-)

1 0

[PATCH 06/11] msvcrt: Move invalid_scheduler_policy_value to concurrency.c.
by Piotr Caban 20 Aug '21

20 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/concurrency.c | 76 ++++++++++++++++++++++++++++++++------- dlls/msvcrt/cpp.c | 43 ---------------------- dlls/msvcrt/msvcrt.h | 1 - 3 files changed, 64 insertions(+), 56 deletions(-)

1 0

[PATCH 05/11] msvcrt: Move invalid_scheduler_policy_key to concurrency.c.
by Piotr Caban 20 Aug '21

20 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/concurrency.c | 66 ++++++++++++++++++++++++++++++++++----- dlls/msvcrt/cpp.c | 43 ------------------------- dlls/msvcrt/msvcrt.h | 1 - 3 files changed, 58 insertions(+), 52 deletions(-)

1 0

[PATCH 04/11] msvcrt: Move scheduler_resource_allocation_error to concurrency.c.
by Piotr Caban 20 Aug '21

20 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/concurrency.c | 66 +++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/cpp.c | 64 ------------------------------------- dlls/msvcrt/msvcrt.h | 1 - 3 files changed, 63 insertions(+), 68 deletions(-)

1 0

[PATCH 03/11] msvcrt: Move improper_lock implementation to concurrency.c.
by Piotr Caban 20 Aug '21

20 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/concurrency.c | 76 ++++++++++++++++++++++++++++++++++----- dlls/msvcrt/cpp.c | 39 -------------------- dlls/msvcrt/msvcrt.h | 1 - 3 files changed, 67 insertions(+), 49 deletions(-)

1 0

[PATCH 02/11] msvcrt: Introduce macro for creating exception class.
by Piotr Caban 20 Aug '21

20 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/cpp.c | 192 ++++++---------------------------------- dlls/msvcrt/cppexcept.h | 101 +++++++++++++++++++-- 2 files changed, 121 insertions(+), 172 deletions(-)

1 0

[PATCH 01/11] msvcrt: Rename exception::what() implementation to exception_what.
by Piotr Caban 20 Aug '21

20 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr70/msvcr70.spec | 4 ++-- dlls/msvcr71/msvcr71.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/cpp.c | 30 +++++++++++++++--------------- dlls/msvcrt/msvcrt.spec | 6 +++--- dlls/msvcrtd/msvcrtd.spec | 4 ++-- 10 files changed, 36 insertions(+), 36 deletions(-)

1 0

[PATCH 8/8] gdi32: Use NtGdiGetOutlineTextMetricsInternalW for GetOutlineTextMetrics.
by Jacek Caban 20 Aug '21

20 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 188 ++-------------------------------------------- dlls/gdi32/text.c | 182 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 187 insertions(+), 183 deletions(-)

2 1

[PATCH 7/8] gdi32: Use NtGdiHfontCreate for CreateFont* functions.
by Jacek Caban 20 Aug '21

20 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 129 +------------------------------------------ dlls/gdi32/text.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 141 insertions(+), 126 deletions(-)

2 1

[PATCH 6/8] gdi32: Store font code page in DC_ATTR.
by Jacek Caban 20 Aug '21

20 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 2 +- dlls/gdi32/font.c | 28 ++++++---------------------- dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/text.c | 9 +++++++++ include/ntgdi.h | 1 + 5 files changed, 17 insertions(+), 24 deletions(-)

2 1

[PATCH 5/8] gdi32: Use NtGdiGetTextMetricsW for GetTextMetrics.
by Jacek Caban 20 Aug '21

20 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 16 ++----------- dlls/gdi32/text.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 14 deletions(-)

2 1

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-devel