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

Tim Clem : ntdll: Move SEH exception info logs back to the seh channel.
by Alexandre Julliard June 13, 2022

June 13, 2022

Module: wine Branch: master Commit: f86a66b660267bf245817350a6012e0c5c6547df URL: https://source.winehq.org/git/wine.git/?a=commit;h=f86a66b660267bf245817350… Author: Tim Clem <tclem(a)codeweavers.com> Date: Mon Jun 13 13:37:56 2022 -0700 ntdll: Move SEH exception info logs back to the seh channel. These were accidentally moved as part of the introduction of +unwind. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 7e77329363c..fef163ac629 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -510,7 +510,7 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, (void *)context->Rip, GetCurrentThreadId() ); for (c = 0; c < min( EXCEPTION_MAXIMUM_PARAMETERS, rec->NumberParameters ); c++) - TRACE( " info[%d]=%016I64x\n", c, rec->ExceptionInformation[c] ); + TRACE_(seh)( " info[%d]=%016I64x\n", c, rec->ExceptionInformation[c] ); if (rec->ExceptionCode == EXCEPTION_WINE_STUB) {

1 0

Piotr Caban : server: Always return Win32 error code from IOCTL_AFD_GET_SO_ERROR.
by Alexandre Julliard June 13, 2022

June 13, 2022

Module: wine Branch: master Commit: 9d1085c8d39daaa02a0d30ac4a7af2860ff9fe3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d1085c8d39daaa02a0d30ac… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 10 17:05:37 2022 +0200 server: Always return Win32 error code from IOCTL_AFD_GET_SO_ERROR. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- server/sock.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/sock.c b/server/sock.c index 77a88a7fcf7..8a0f3198c4e 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2804,12 +2804,13 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { if (sock->errors[i]) { - error = sock_get_error( sock->errors[i] ); + error = sock->errors[i]; break; } } } + error = sock_get_error( error ); set_reply_data( &error, sizeof(error) ); return; }

1 0

Rémi Bernon : ntdll: Consistently name heap handles and pointers.
by Alexandre Julliard June 13, 2022

June 13, 2022

Module: wine Branch: master Commit: fef774f9530aafc18f1c8c64cadf5ca0f60bc00f URL: https://source.winehq.org/git/wine.git/?a=commit;h=fef774f9530aafc18f1c8c64… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 13 17:16:07 2022 +0200 ntdll: Consistently name heap handles and pointers. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 213 +++++++++++++++++++++++++++--------------------------- 1 file changed, 107 insertions(+), 106 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fef774f9530aafc18f1c…

1 0

Rémi Bernon : ntdll: Rename HEAP_GetPtr to unsafe_heap_from_handle.
by Alexandre Julliard June 13, 2022

June 13, 2022

Module: wine Branch: master Commit: 2ef69e449287c2b4e50a22e3bb45398efc596f25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ef69e449287c2b4e50a22e3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 13 17:36:56 2022 +0200 ntdll: Rename HEAP_GetPtr to unsafe_heap_from_handle. And related heap variables to handle and heapPtr to heap. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index d68d8577532..7e64eea4602 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -574,13 +574,7 @@ static const char *debugstr_heap_entry( struct rtl_heap_entry *entry ) entry->Region.dwUnCommittedSize, entry->Region.lpFirstBlock, entry->Region.lpLastBlock ); } -/*********************************************************************** - * HEAP_GetPtr - * RETURNS - * Pointer to the heap - * NULL: Failure - */ -static struct heap *HEAP_GetPtr( HANDLE handle ) +static struct heap *unsafe_heap_from_handle( HANDLE handle ) { struct heap *heap = handle; BOOL valid = TRUE; @@ -1298,7 +1292,7 @@ static DWORD heap_flags_from_global_flag( DWORD flag ) */ static void heap_set_debug_flags( HANDLE handle ) { - struct heap *heap = HEAP_GetPtr( handle ); + struct heap *heap = unsafe_heap_from_handle( handle ); ULONG global_flags = RtlGetNtGlobalFlags(); DWORD flags, force_flags; @@ -1421,16 +1415,17 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, PVOID addr, SIZE_T totalSize, SIZE_T c */ HANDLE WINAPI RtlDestroyHeap( HANDLE handle ) { - struct heap *heap = HEAP_GetPtr( handle ); SUBHEAP *subheap, *next; ARENA_LARGE *arena, *arena_next; struct block **pending, **tmp; + struct heap *heap; SIZE_T size; void *addr; TRACE( "handle %p\n", handle ); - if (!heap && handle && (((struct heap *)handle)->flags & HEAP_VALIDATE_PARAMS) && + if (!(heap = unsafe_heap_from_handle( handle )) && handle && + (((struct heap *)handle)->flags & HEAP_VALIDATE_PARAMS) && NtCurrentTeb()->Peb->BeingDebugged) { DbgPrint( "Attempt to destroy an invalid heap\n" ); @@ -1447,7 +1442,7 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE handle ) RtlFreeHeap( handle, 0, pending ); } - if (heap == process_heap) return heap; /* cannot delete the main process heap */ + if (heap == process_heap) return handle; /* cannot delete the main process heap */ /* remove it from the per-process list */ RtlEnterCriticalSection( &process_heap->cs ); @@ -1536,7 +1531,7 @@ void *WINAPI DECLSPEC_HOTPATCH RtlAllocateHeap( HANDLE handle, ULONG flags, SIZE void *ptr = NULL; NTSTATUS status; - if (!(heap = HEAP_GetPtr( handle ))) + if (!(heap = unsafe_heap_from_handle( handle ))) status = STATUS_INVALID_HANDLE; else { @@ -1577,7 +1572,7 @@ BOOLEAN WINAPI DECLSPEC_HOTPATCH RtlFreeHeap( HANDLE handle, ULONG flags, void * valgrind_notify_free( ptr ); - if (!(heap = HEAP_GetPtr( handle ))) + if (!(heap = unsafe_heap_from_handle( handle ))) status = STATUS_INVALID_PARAMETER; else { @@ -1661,7 +1656,7 @@ void *WINAPI RtlReAllocateHeap( HANDLE handle, ULONG flags, void *ptr, SIZE_T si if (!ptr) return NULL; - if (!(heap = HEAP_GetPtr( handle ))) + if (!(heap = unsafe_heap_from_handle( handle ))) status = STATUS_INVALID_HANDLE; else { @@ -1713,7 +1708,7 @@ ULONG WINAPI RtlCompactHeap( HANDLE handle, ULONG flags ) */ BOOLEAN WINAPI RtlLockHeap( HANDLE handle ) { - struct heap *heap = HEAP_GetPtr( handle ); + struct heap *heap = unsafe_heap_from_handle( handle ); if (!heap) return FALSE; heap_lock( heap, 0 ); return TRUE; @@ -1734,7 +1729,7 @@ BOOLEAN WINAPI RtlLockHeap( HANDLE handle ) */ BOOLEAN WINAPI RtlUnlockHeap( HANDLE handle ) { - struct heap *heap = HEAP_GetPtr( handle ); + struct heap *heap = unsafe_heap_from_handle( handle ); if (!heap) return FALSE; heap_unlock( heap, 0 ); return TRUE; @@ -1766,7 +1761,7 @@ SIZE_T WINAPI RtlSizeHeap( HANDLE handle, ULONG flags, const void *ptr ) struct heap *heap; NTSTATUS status; - if (!(heap = HEAP_GetPtr( handle ))) + if (!(heap = unsafe_heap_from_handle( handle ))) status = STATUS_INVALID_PARAMETER; else { @@ -1790,7 +1785,7 @@ BOOLEAN WINAPI RtlValidateHeap( HANDLE handle, ULONG flags, const void *ptr ) SUBHEAP *subheap; BOOLEAN ret; - if (!(heap = HEAP_GetPtr( handle ))) + if (!(heap = unsafe_heap_from_handle( handle ))) ret = FALSE; else { @@ -1914,7 +1909,7 @@ NTSTATUS WINAPI RtlWalkHeap( HANDLE handle, void *entry_ptr ) if (!entry) return STATUS_INVALID_PARAMETER; - if (!(heap = HEAP_GetPtr( handle ))) + if (!(heap = unsafe_heap_from_handle( handle ))) status = STATUS_INVALID_HANDLE; else { @@ -2008,7 +2003,7 @@ BOOLEAN WINAPI RtlGetUserInfoHeap( HANDLE handle, ULONG flags, void *ptr, void * *user_value = 0; *user_flags = 0; - if (!(heap = HEAP_GetPtr( handle ))) return TRUE; + if (!(heap = unsafe_heap_from_handle( handle ))) return TRUE; heap_lock( heap, flags ); if ((block = unsafe_block_from_ptr( heap, ptr, &subheap )) && !subheap) @@ -2038,7 +2033,7 @@ BOOLEAN WINAPI RtlSetUserValueHeap( HANDLE handle, ULONG flags, void *ptr, void TRACE( "handle %p, flags %#x, ptr %p, user_value %p.\n", handle, flags, ptr, user_value ); - if (!(heap = HEAP_GetPtr( handle ))) return TRUE; + if (!(heap = unsafe_heap_from_handle( handle ))) return TRUE; heap_lock( heap, flags ); if (!(block = unsafe_block_from_ptr( heap, ptr, &subheap ))) ret = FALSE;

1 0

Rémi Bernon : winebus.sys: Implement SOCD neutral cleaning for hatswitches.
by Alexandre Julliard June 13, 2022

June 13, 2022

Module: wine Branch: master Commit: e2936702a47247f806478f16d4631516ca2c3e9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2936702a47247f806478f16… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 20 21:05:36 2022 +0200 winebus.sys: Implement SOCD neutral cleaning for hatswitches. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52841 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 27 +++++++++++++++------------ dlls/winebus.sys/hid.c | 11 +++++++++++ dlls/winebus.sys/unix_private.h | 1 + 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 7dc47cdd518..5d810d25205 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -382,6 +382,8 @@ static NTSTATUS build_controller_report_descriptor(struct unix_device *iface) static const USAGE trigger_axis_usages[] = {HID_USAGE_GENERIC_Z, HID_USAGE_GENERIC_RZ}; struct sdl_device *impl = impl_from_unix_device(iface); ULONG i, button_count = SDL_CONTROLLER_BUTTON_MAX - 1; + BOOL state; + C_ASSERT(SDL_CONTROLLER_AXIS_MAX == 6); if (!hid_device_begin_report_descriptor(iface, &device_usage)) @@ -420,14 +422,15 @@ static NTSTATUS build_controller_report_descriptor(struct unix_device *iface) /* Initialize axis in the report */ for (i = SDL_CONTROLLER_AXIS_LEFTX; i < SDL_CONTROLLER_AXIS_MAX; i++) hid_device_set_abs_axis(iface, i, pSDL_GameControllerGetAxis(impl->sdl_controller, i)); - if (pSDL_GameControllerGetButton(impl->sdl_controller, SDL_CONTROLLER_BUTTON_DPAD_UP)) - hid_device_set_hatswitch_y(iface, 0, -1); - if (pSDL_GameControllerGetButton(impl->sdl_controller, SDL_CONTROLLER_BUTTON_DPAD_DOWN)) - hid_device_set_hatswitch_y(iface, 0, +1); - if (pSDL_GameControllerGetButton(impl->sdl_controller, SDL_CONTROLLER_BUTTON_DPAD_LEFT)) - hid_device_set_hatswitch_x(iface, 0, -1); - if (pSDL_GameControllerGetButton(impl->sdl_controller, SDL_CONTROLLER_BUTTON_DPAD_RIGHT)) - hid_device_set_hatswitch_x(iface, 0, +1); + + state = pSDL_GameControllerGetButton(impl->sdl_controller, SDL_CONTROLLER_BUTTON_DPAD_UP); + hid_device_move_hatswitch(iface, 0, 0, state ? -1 : +1); + state = pSDL_GameControllerGetButton(impl->sdl_controller, SDL_CONTROLLER_BUTTON_DPAD_DOWN); + hid_device_move_hatswitch(iface, 0, 0, state ? +1 : -1); + state = pSDL_GameControllerGetButton(impl->sdl_controller, SDL_CONTROLLER_BUTTON_DPAD_LEFT); + hid_device_move_hatswitch(iface, 0, state ? -1 : +1, 0); + state = pSDL_GameControllerGetButton(impl->sdl_controller, SDL_CONTROLLER_BUTTON_DPAD_RIGHT); + hid_device_move_hatswitch(iface, 0, state ? +1 : -1, 0); return STATUS_SUCCESS; } @@ -873,16 +876,16 @@ static BOOL set_report_from_controller_event(struct sdl_device *impl, SDL_Event switch ((button = ie->button)) { case SDL_CONTROLLER_BUTTON_DPAD_UP: - hid_device_set_hatswitch_y(iface, 0, ie->state ? -1 : 0); + hid_device_move_hatswitch(iface, 0, 0, ie->state ? -1 : +1); break; case SDL_CONTROLLER_BUTTON_DPAD_DOWN: - hid_device_set_hatswitch_y(iface, 0, ie->state ? +1 : 0); + hid_device_move_hatswitch(iface, 0, 0, ie->state ? +1 : -1); break; case SDL_CONTROLLER_BUTTON_DPAD_LEFT: - hid_device_set_hatswitch_x(iface, 0, ie->state ? -1 : 0); + hid_device_move_hatswitch(iface, 0, ie->state ? -1 : +1, 0); break; case SDL_CONTROLLER_BUTTON_DPAD_RIGHT: - hid_device_set_hatswitch_x(iface, 0, ie->state ? +1 : 0); + hid_device_move_hatswitch(iface, 0, ie->state ? +1 : -1, 0); break; case SDL_CONTROLLER_BUTTON_LEFTSHOULDER: button = 4; break; case SDL_CONTROLLER_BUTTON_RIGHTSHOULDER: button = 5; break; diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 8ed8c752893..c5543e081ae 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -1453,6 +1453,17 @@ BOOL hid_device_set_hatswitch_y(struct unix_device *iface, ULONG index, LONG new return TRUE; } +BOOL hid_device_move_hatswitch(struct unix_device *iface, ULONG index, LONG x, LONG y) +{ + struct hid_device_state *state = &iface->hid_device_state; + ULONG offset = state->hatswitch_start + index; + LONG old_x, old_y; + if (index > state->hatswitch_count) return FALSE; + hatswitch_decompose(state->report_buf[offset], &old_x, &old_y); + hatswitch_compose(old_x + x, old_y + y, &state->report_buf[offset]); + return TRUE; +} + BOOL hid_device_sync_report(struct unix_device *iface) { BOOL dropped; diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index f94a243d887..85eab6ccf5d 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -257,6 +257,7 @@ extern BOOL hid_device_set_rel_axis(struct unix_device *iface, ULONG index, LONG extern BOOL hid_device_set_button(struct unix_device *iface, ULONG index, BOOL is_set) DECLSPEC_HIDDEN; extern BOOL hid_device_set_hatswitch_x(struct unix_device *iface, ULONG index, LONG new_x) DECLSPEC_HIDDEN; extern BOOL hid_device_set_hatswitch_y(struct unix_device *iface, ULONG index, LONG new_y) DECLSPEC_HIDDEN; +extern BOOL hid_device_move_hatswitch(struct unix_device *iface, ULONG index, LONG x, LONG y) DECLSPEC_HIDDEN; extern BOOL hid_device_sync_report(struct unix_device *iface) DECLSPEC_HIDDEN; extern void hid_device_drop_report(struct unix_device *iface) DECLSPEC_HIDDEN;

1 0

Jinoh Kang : riched20/tests: Add tests for drawing embedded OLE objects.
by Alexandre Julliard June 13, 2022

June 13, 2022

Module: wine Branch: master Commit: a7d29d1625f7e02df4fbf59ef4e4a999d39edde0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7d29d1625f7e02df4fbf59e… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Jun 11 04:47:08 2022 +0900 riched20/tests: Add tests for drawing embedded OLE objects. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/riched20/tests/richole.c | 474 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 471 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a7d29d1625f7e02df4fb…

1 0

Jinoh Kang : riched20: Draw OLE objects with IViewObject implementation.
by Alexandre Julliard June 13, 2022

June 13, 2022

Module: wine Branch: master Commit: ecc607c6da96a5c2e8988f3021e98b442fe24c12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecc607c6da96a5c2e8988f30… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Fri Apr 1 01:25:24 2022 +0900 riched20: Draw OLE objects with IViewObject implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52752 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/riched20/richole.c | 29 +++++++++++++++++++++++++++++ dlls/riched20/tests/richole.c | 2 -- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 936f1c928b3..3d88b8a65b0 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -5733,6 +5733,7 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) void draw_ole( ME_Context *c, int x, int y, ME_Run *run, BOOL selected ) { IDataObject* ido; + IViewObject* ivo; FORMATETC fmt; STGMEDIUM stgm; DIBSECTION dibsect; @@ -5745,6 +5746,34 @@ void draw_ole( ME_Context *c, int x, int y, ME_Run *run, BOOL selected ) assert(run->nFlags & MERF_GRAPHICS); assert(run->reobj); + + if (SUCCEEDED(IOleObject_QueryInterface(run->reobj->obj.poleobj, &IID_IViewObject, (void**)&ivo))) + { + HRESULT hr; + RECTL bounds; + + convert_sizel(c, &run->reobj->obj.sizel, &sz); + if (c->editor->nZoomNumerator != 0) + { + sz.cx = MulDiv(sz.cx, c->editor->nZoomNumerator, c->editor->nZoomDenominator); + sz.cy = MulDiv(sz.cy, c->editor->nZoomNumerator, c->editor->nZoomDenominator); + } + + bounds.left = x; + bounds.top = y - sz.cy; + bounds.right = x + sz.cx; + bounds.bottom = y; + + hr = IViewObject_Draw(ivo, DVASPECT_CONTENT, -1, 0, 0, 0, c->hDC, &bounds, NULL, NULL, 0); + if (FAILED(hr)) + { + WARN("failed to draw object: %#08lx\n", hr); + } + + IViewObject_Release(ivo); + return; + } + if (IOleObject_QueryInterface(run->reobj->obj.poleobj, &IID_IDataObject, (void**)&ido) != S_OK) { FIXME("Couldn't get interface\n"); diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index db9d123815e..6a361bc3fa4 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -4193,7 +4193,6 @@ static void subtest_InsertObject(struct reolecb_obj *callback) UpdateWindow(hwnd); testobj->line = __LINE__; flush_dispatch_messages(); - todo_wine ok(testobj->draw_count != 0, "expected draw_count to be nonzero, got %d\n", testobj->draw_count); SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)""); @@ -4225,7 +4224,6 @@ static void subtest_InsertObject(struct reolecb_obj *callback) UpdateWindow(hwnd); testobj->line = __LINE__; flush_dispatch_messages(); - todo_wine ok(testobj->draw_count != 0, "expected draw_count to be nonzero, got %d\n", testobj->draw_count); SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"");

1 0

Daniel Lehman : kernel32/tests: Test if FormatMessage modifies va_list on error.
by Alexandre Julliard June 13, 2022

June 13, 2022

Module: wine Branch: master Commit: 8986f6fadd0ed9e4ceeafde92d9005e6c8c8a226 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8986f6fadd0ed9e4ceeafde9… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sat Jun 4 08:03:02 2022 -0700 kernel32/tests: Test if FormatMessage modifies va_list on error. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/kernel32/tests/format_msg.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 2d317d1bb9e..e2a4f05ffdb 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -1005,6 +1005,25 @@ static void test_message_wrap(void) ok(!strcmp("short\r\nlong?line", out),"failed out=[%s]\n",out); } +static void test_message_arg_eaten( const WCHAR *src, ... ) +{ + DWORD ret; + va_list list; + WCHAR *arg, out[1]; + + out[0] = 0xcccc; + va_start(list, src); + SetLastError(0xdeadbeef); + ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, src, 0, 0, out, ARRAY_SIZE(out), &list); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected GetLastError() to return ERROR_INSUFFICIENT_BUFFER, got %lu\n", GetLastError()); + ok(ret == 0, "Expected FormatMessageW to return 0, got %lu\n", ret); + ok(out[0] == 0, "Expected null, got %ls\n", out); + arg = va_arg( list, WCHAR * ); + ok(!wcscmp( L"unused", arg ), "Expected 'unused', got %s\n", wine_dbgstr_w(arg)); + va_end(list); +} + static void test_message_insufficient_buffer(void) { static const char init_buf[] = {'x', 'x', 'x', 'x', 'x'}; @@ -1153,6 +1172,9 @@ static void test_message_insufficient_buffer_wide(void) HeapFree( GetProcessHeap(), 0, tmp ); HeapFree( GetProcessHeap(), 0, buf ); } + + /* va_arg is eaten even in case of insufficient buffer */ + test_message_arg_eaten( L"%1!s! %2!s!", L"eaten", L"unused" ); } static void test_message_null_buffer(void)

1 0

Jacek Caban : win32u: Simplify get_text_metr_size.
by Alexandre Julliard June 13, 2022

June 13, 2022

Module: wine Branch: master Commit: 6ead654f5537c75e61294bd2ea6acfc97247db2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ead654f5537c75e61294bd2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 10 18:40:27 2022 +0200 win32u: Simplify get_text_metr_size. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/sysparams.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 7c333953f7e..0b6053a5ab9 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2743,14 +2743,13 @@ static LONG get_char_dimensions( HDC hdc, TEXTMETRICW *metric, LONG *height ) /* get text metrics and/or "average" char width of the specified logfont * for the specified dc */ -static void get_text_metr_size( HDC hdc, LOGFONTW *plf, TEXTMETRICW *metric, UINT *psz) +static void get_text_metr_size( HDC hdc, LOGFONTW *lf, TEXTMETRICW *metric, UINT *psz ) { - ENUMLOGFONTEXDVW exdv = { .elfEnumLogfontEx.elfLogFont = *plf }; HFONT hfont, hfontsav; TEXTMETRICW tm; UINT ret; if (!metric) metric = &tm; - hfont = NtGdiHfontCreate( &exdv, sizeof(exdv), 0, 0, NULL ); + hfont = NtGdiHfontCreate( lf, sizeof(*lf), 0, 0, NULL ); if (!hfont || !(hfontsav = NtGdiSelectFont( hdc, hfont ))) { metric->tmHeight = -1;

1 0

Nikolay Sivov : d2d1: Update to ID2D1DeviceContext1.
by Alexandre Julliard June 13, 2022

June 13, 2022

Module: wine Branch: master Commit: bc4afb8b2ac5e353437dbd9072a2c351e3b8938c URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc4afb8b2ac5e353437dbd90… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 12 20:13:05 2022 +0300 d2d1: Update to ID2D1DeviceContext1. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/device.c | 277 ++++++++++++++++++++++++++--------------------- dlls/d2d1/effect.c | 6 +- 3 files changed, 157 insertions(+), 128 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bc4afb8b2ac5e353437d…

1 0