- wine-devel - winehq.org

[PATCH] user32: Load libpng in DllMain.
by Tim Clem 26 Aug '21

26 Aug '21

libpng is currently loaded on the first attempt to access a PNG icon or cursor. That creates a race condition that can deadlock the loader in certain circumstances if LoadIcon or LoadCursor is called while while the loader lock is held, e.g. from a DllMain. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> --- It's possible for one thread to win the INIT_ONCE to load libpng without owning the loader lock. If the thread with the loader lock happens to try to load libpng shortly thereafter, they deadlock. All of Wine's built-in icon resources are PNGs, so we almost always end up loading libpng anyway. Doing it up-front in user32's DllMain ensures that it's done while the loader lock is held and prevents the issue. dlls/user32/cursoricon.c | 21 +++------------------ dlls/user32/png.c | 4 ++-- dlls/user32/user_main.c | 6 +++++- dlls/user32/user_private.h | 3 +++ 4 files changed, 13 insertions(+), 21 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 7ad0a04a551..dc831db9287 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -111,21 +111,6 @@ static int get_display_bpp(void) return ret; } -static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; - -static const struct png_funcs *png_funcs; - -static BOOL WINAPI load_libpng( INIT_ONCE *once, void *param, void **context ) -{ - __wine_init_unix_lib( user32_module, DLL_PROCESS_ATTACH, NULL, &png_funcs ); - return TRUE; -} - -static BOOL have_libpng(void) -{ - return InitOnceExecuteOnce( &init_once, load_libpng, NULL, NULL ) && png_funcs; -} - static HICON alloc_icon_handle( BOOL is_ani, UINT num_steps ) { struct cursoricon_object *obj; @@ -571,7 +556,7 @@ static BOOL CURSORICON_GetResIconEntry( LPCVOID dir, DWORD size, int n, *width = icon->bWidth; *height = icon->bHeight; *bits = resdir->idEntries[n].wBitCount; - if (!*width && !*height && have_libpng()) *width = *height = 256; + if (!*width && !*height && png_funcs) *width = *height = 256; return TRUE; } @@ -704,7 +689,7 @@ static BOOL CURSORICON_GetFileEntry( LPCVOID dir, DWORD size, int n, if (info->biSize == PNG_SIGN) { - if (have_libpng()) return png_funcs->get_png_info(info, size, width, height, bits); + if (png_funcs) return png_funcs->get_png_info(info, size, width, height, bits); *width = *height = *bits = 0; return TRUE; } @@ -858,7 +843,7 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE { BITMAPINFO *bmi_png; - if (!have_libpng()) return 0; + if (!png_funcs) return 0; bmi_png = png_funcs->load_png( (const char *)bmi, &maxsize ); if (bmi_png) { diff --git a/dlls/user32/png.c b/dlls/user32/png.c index a994c6de5c2..bcd619fe52b 100644 --- a/dlls/user32/png.c +++ b/dlls/user32/png.c @@ -293,7 +293,7 @@ static BITMAPINFO * CDECL load_png(const char *png_data, DWORD *size) return info; } -static const struct png_funcs png_funcs = +static const struct png_funcs funcs = { get_png_info, load_png @@ -335,7 +335,7 @@ NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *p LOAD_FUNCPTR(png_set_read_fn); #undef LOAD_FUNCPTR - *(const struct png_funcs **)ptr_out = &png_funcs; + *(const struct png_funcs **)ptr_out = &funcs; return STATUS_SUCCESS; } diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 303f19accfc..882a0c5237b 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -52,6 +52,8 @@ static HPALETTE hPrimaryPalette; static DWORD exiting_thread_id; +const struct png_funcs *png_funcs = NULL; + extern void WDML_NotifyThreadDetach(void); #ifdef __MINGW32__ @@ -382,8 +384,10 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) case DLL_PROCESS_ATTACH: user32_module = inst; ret = process_attach(); - if(ret) + if(ret) { imm32_module = LoadLibraryW(L"imm32.dll"); + __wine_init_unix_lib( user32_module, DLL_PROCESS_ATTACH, NULL, &png_funcs ); + } break; case DLL_THREAD_DETACH: thread_detach(); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 7c4d9015976..0be02919bbe 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -380,6 +380,9 @@ struct png_funcs BITMAPINFO * (CDECL *load_png)(const char *png_data, DWORD *size); }; +/* May be NULL if libpng cannot be loaded. */ +extern const struct png_funcs *png_funcs DECLSPEC_HIDDEN; + /* Mingw's assert() imports MessageBoxA and gets confused by user32 exporting it */ #ifdef __MINGW32__ #undef assert -- 2.32.0

2 1

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

26 Aug '21

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/qcap/tests/smartteefilter.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index e5ae66ff2d3..6842fccb863 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -706,7 +706,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] 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

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