May 2024 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlstyleelem.c.
by Alexandre Julliard 21 May '24

21 May '24

Module: wine Branch: master Commit: 3ee6f3b9183c3dab8f4a89331a345d88f561e0e0 URL: https://gitlab.winehq.org/wine/wine/-/commit/3ee6f3b9183c3dab8f4a89331a345d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 21 14:36:17 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlstyleelem.c. --- dlls/mshtml/htmlstyleelem.c | 108 ++------------------------------------------ 1 file changed, 4 insertions(+), 104 deletions(-) diff --git a/dlls/mshtml/htmlstyleelem.c b/dlls/mshtml/htmlstyleelem.c index 5b3d9165964..af5831dd85a 100644 --- a/dlls/mshtml/htmlstyleelem.c +++ b/dlls/mshtml/htmlstyleelem.c @@ -49,58 +49,8 @@ static inline HTMLStyleElement *impl_from_IHTMLStyleElement(IHTMLStyleElement *i return CONTAINING_RECORD(iface, HTMLStyleElement, IHTMLStyleElement_iface); } -static HRESULT WINAPI HTMLStyleElement_QueryInterface(IHTMLStyleElement *iface, - REFIID riid, void **ppv) -{ - HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLStyleElement_AddRef(IHTMLStyleElement *iface) -{ - HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLStyleElement_Release(IHTMLStyleElement *iface) -{ - HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLStyleElement_GetTypeInfoCount(IHTMLStyleElement *iface, UINT *pctinfo) -{ - HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLStyleElement_GetTypeInfo(IHTMLStyleElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, - ppTInfo); -} - -static HRESULT WINAPI HTMLStyleElement_GetIDsOfNames(IHTMLStyleElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLStyleElement_Invoke(IHTMLStyleElement *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLStyleElement, IHTMLStyleElement, + impl_from_IHTMLStyleElement(iface)->element.node.event_target.dispex) static HRESULT WINAPI HTMLStyleElement_put_type(IHTMLStyleElement *iface, BSTR v) { @@ -289,58 +239,8 @@ static inline HTMLStyleElement *impl_from_IHTMLStyleElement2(IHTMLStyleElement2 return CONTAINING_RECORD(iface, HTMLStyleElement, IHTMLStyleElement2_iface); } -static HRESULT WINAPI HTMLStyleElement2_QueryInterface(IHTMLStyleElement2 *iface, - REFIID riid, void **ppv) -{ - HTMLStyleElement *This = impl_from_IHTMLStyleElement2(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLStyleElement2_AddRef(IHTMLStyleElement2 *iface) -{ - HTMLStyleElement *This = impl_from_IHTMLStyleElement2(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLStyleElement2_Release(IHTMLStyleElement2 *iface) -{ - HTMLStyleElement *This = impl_from_IHTMLStyleElement2(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLStyleElement2_GetTypeInfoCount(IHTMLStyleElement2 *iface, UINT *pctinfo) -{ - HTMLStyleElement *This = impl_from_IHTMLStyleElement2(iface); - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLStyleElement2_GetTypeInfo(IHTMLStyleElement2 *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLStyleElement *This = impl_from_IHTMLStyleElement2(iface); - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, - ppTInfo); -} - -static HRESULT WINAPI HTMLStyleElement2_GetIDsOfNames(IHTMLStyleElement2 *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLStyleElement *This = impl_from_IHTMLStyleElement2(iface); - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLStyleElement2_Invoke(IHTMLStyleElement2 *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLStyleElement *This = impl_from_IHTMLStyleElement2(iface); - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLStyleElement2, IHTMLStyleElement2, + impl_from_IHTMLStyleElement2(iface)->element.node.event_target.dispex) static HRESULT WINAPI HTMLStyleElement2_get_sheet(IHTMLStyleElement2 *iface, IHTMLStyleSheet **p) {

1 0

Danyil Blyschak : shcore: Check optional pointer in filestream_CopyTo() before writing to it.
by Alexandre Julliard 21 May '24

21 May '24

Module: wine Branch: master Commit: d28d7bd52cfb8f98835d4792901c12785b3bf0b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/d28d7bd52cfb8f98835d4792901c12… Author: Danyil Blyschak <dblyschak(a)codeweavers.com> Date: Tue May 21 11:15:45 2024 -0500 shcore: Check optional pointer in filestream_CopyTo() before writing to it. Check that the 'written' parameter in this function is non-null before incrementing it by 'written_chunk'. --- dlls/shcore/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index a64b6661d23..58ddda3fb2a 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -1017,7 +1017,7 @@ static HRESULT WINAPI filestream_CopyTo(IStream *iface, IStream *dest, ULARGE_IN /* Write */ hr = IStream_Write(dest, buff, read_chunk, &written_chunk); - if (written_chunk) + if (written) written->QuadPart += written_chunk; if (FAILED(hr) || written_chunk != left) break;

1 0

Rémi Bernon : dinput: Dynamically allocate the internal device / event arrays.
by Alexandre Julliard 21 May '24

21 May '24

Module: wine Branch: master Commit: 98e6b744e5fd523ee1f47802ea6e6dbf4232a4cf URL: https://gitlab.winehq.org/wine/wine/-/commit/98e6b744e5fd523ee1f47802ea6e6d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 21 19:27:10 2024 +0200 dinput: Dynamically allocate the internal device / event arrays. --- dlls/dinput/dinput_main.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index a3ff8283561..b27339901e5 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -45,8 +45,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); -#define INPUT_THREAD_MAX_DEVICES 128 - #define INPUT_THREAD_NOTIFY (WM_USER + 0x10) #define NOTIFY_THREAD_STOP 0 #define NOTIFY_REFRESH_DEVICES 1 @@ -57,11 +55,12 @@ struct input_thread_state BOOL running; UINT events_count; UINT devices_count; + UINT devices_capacity; HHOOK mouse_ll_hook; HHOOK keyboard_ll_hook; RAWINPUTDEVICE rawinput_devices[2]; - struct dinput_device *devices[INPUT_THREAD_MAX_DEVICES]; - HANDLE events[INPUT_THREAD_MAX_DEVICES]; + struct dinput_device **devices; + HANDLE *events; }; static inline struct dinput_device *impl_from_IDirectInputDevice8W( IDirectInputDevice8W *iface ) @@ -193,10 +192,24 @@ static void input_thread_update_device_list( struct input_thread_state *state ) { RAWINPUTDEVICE rawinput_keyboard = {.usUsagePage = HID_USAGE_PAGE_GENERIC, .usUsage = HID_USAGE_GENERIC_KEYBOARD, .dwFlags = RIDEV_REMOVE}; RAWINPUTDEVICE rawinput_mouse = {.usUsagePage = HID_USAGE_PAGE_GENERIC, .usUsage = HID_USAGE_GENERIC_MOUSE, .dwFlags = RIDEV_REMOVE}; - UINT count = 0, keyboard_ll_count = 0, mouse_ll_count = 0; + UINT count = 0, keyboard_ll_count = 0, mouse_ll_count = 0, capacity; struct dinput_device *device; EnterCriticalSection( &dinput_hook_crit ); + + if ((capacity = list_count( &acquired_device_list )) && capacity > state->devices_capacity) + { + struct dinput_device **devices; + HANDLE *events; + + if (!state->devices_capacity) capacity = max( capacity, 128 ); + else capacity = max( capacity, state->devices_capacity * 3 / 2 ); + + if ((events = realloc( state->events, capacity * sizeof(*events) ))) state->events = events; + if ((devices = realloc( state->devices, capacity * sizeof(*devices) ))) state->devices = devices; + if (events && devices) state->devices_capacity = capacity; + } + LIST_FOR_EACH_ENTRY( device, &acquired_device_list, struct dinput_device, entry ) { unhook_device_window_foreground_changes( device ); @@ -205,7 +218,7 @@ static void input_thread_update_device_list( struct input_thread_state *state ) if (!device->read_event || !device->vtbl->read) continue; state->events[count] = device->read_event; dinput_device_internal_addref( (state->devices[count] = device) ); - if (++count >= INPUT_THREAD_MAX_DEVICES) break; + if (++count >= state->devices_capacity) break; } state->events_count = count; @@ -238,7 +251,8 @@ static void input_thread_update_device_list( struct input_thread_state *state ) rawinput_device->hwndTarget = di_em_win; } - if (count < INPUT_THREAD_MAX_DEVICES) dinput_device_internal_addref( (state->devices[count++] = device) ); + dinput_device_internal_addref( (state->devices[count] = device) ); + if (++count >= state->devices_capacity) break; } state->devices_count = count; LeaveCriticalSection( &dinput_hook_crit ); @@ -402,6 +416,9 @@ static DWORD WINAPI dinput_thread_proc( void *params ) while (state.devices_count--) dinput_device_internal_release( state.devices[state.devices_count] ); if (state.keyboard_ll_hook) UnhookWindowsHookEx( state.keyboard_ll_hook ); if (state.mouse_ll_hook) UnhookWindowsHookEx( state.mouse_ll_hook ); + free( state.devices ); + free( state.events ); + DestroyWindow( di_em_win ); di_em_win = NULL; return 0;

1 0

Esme Povirk : gdiplus: Replace HDC use in draw_driver_string.
by Alexandre Julliard 21 May '24

21 May '24

Module: wine Branch: master Commit: 3c14122fa5bf9bd2ef085ff5c7c731e2f73e9ef5 URL: https://gitlab.winehq.org/wine/wine/-/commit/3c14122fa5bf9bd2ef085ff5c7c731… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat May 4 20:40:42 2024 +0000 gdiplus: Replace HDC use in draw_driver_string. --- dlls/gdiplus/graphics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 83fca7a9bfa..4dd33e5616b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -7806,7 +7806,7 @@ static GpStatus draw_driver_string(GpGraphics *graphics, GDIPCONST UINT16 *text, return METAFILE_DrawDriverString((GpMetafile*)graphics->image, text, length, font, format, brush, positions, flags, matrix); - if (graphics->hdc && !graphics->alpha_hdc && + if (has_gdi_dc(graphics) && !graphics->alpha_hdc && brush->bt == BrushTypeSolidColor && (((GpSolidFill*)brush)->color & 0xff000000) == 0xff000000) stat = GDI32_GdipDrawDriverString(graphics, text, length, font, format,

1 0

Esme Povirk : gdiplus: Bracket HDC use in get_path_hrgn.
by Alexandre Julliard 21 May '24

21 May '24

Module: wine Branch: master Commit: bc78d54d35738e9de7451fd24435396e65138c17 URL: https://gitlab.winehq.org/wine/wine/-/commit/bc78d54d35738e9de7451fd2443539… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat May 4 20:57:02 2024 +0000 gdiplus: Bracket HDC use in get_path_hrgn. --- dlls/gdiplus/region.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 063ccc96d90..ebab5c0a8a8 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -990,7 +990,7 @@ GpStatus WINGDIPAPI GdipGetRegionDataSize(GpRegion *region, UINT *needed) static GpStatus get_path_hrgn(GpPath *path, GpGraphics *graphics, HRGN *hrgn) { - HDC new_hdc=NULL; + HDC new_hdc=NULL, hdc; GpGraphics *new_graphics=NULL; GpStatus stat; INT save_state; @@ -1003,7 +1003,7 @@ static GpStatus get_path_hrgn(GpPath *path, GpGraphics *graphics, HRGN *hrgn) if (!graphics) { - new_hdc = CreateCompatibleDC(0); + hdc = new_hdc = CreateCompatibleDC(0); if (!new_hdc) return OutOfMemory; @@ -1015,31 +1015,36 @@ static GpStatus get_path_hrgn(GpPath *path, GpGraphics *graphics, HRGN *hrgn) return stat; } } - else if (!graphics->hdc) + else if (has_gdi_dc(graphics)) { - graphics->hdc = new_hdc = CreateCompatibleDC(0); + stat = gdi_dc_acquire(graphics, &hdc); + if (stat != Ok) + return stat; + } + else + { + graphics->hdc = hdc = new_hdc = CreateCompatibleDC(0); if (!new_hdc) return OutOfMemory; } - save_state = SaveDC(graphics->hdc); - EndPath(graphics->hdc); + save_state = SaveDC(hdc); + EndPath(hdc); - SetPolyFillMode(graphics->hdc, (path->fill == FillModeAlternate ? ALTERNATE - : WINDING)); + SetPolyFillMode(hdc, (path->fill == FillModeAlternate ? ALTERNATE : WINDING)); gdi_transform_acquire(graphics); stat = trace_path(graphics, path); if (stat == Ok) { - *hrgn = PathToRegion(graphics->hdc); + *hrgn = PathToRegion(hdc); stat = *hrgn ? Ok : OutOfMemory; } gdi_transform_release(graphics); - RestoreDC(graphics->hdc, save_state); + RestoreDC(hdc, save_state); if (new_hdc) { DeleteDC(new_hdc); @@ -1048,6 +1053,8 @@ static GpStatus get_path_hrgn(GpPath *path, GpGraphics *graphics, HRGN *hrgn) else graphics->hdc = NULL; } + else + gdi_dc_release(graphics, hdc); return stat; }

1 0

Esme Povirk : gdiplus: Bracket HDC use in gdi_transform_acquire/release.
by Alexandre Julliard 21 May '24

21 May '24

Module: wine Branch: master Commit: 8c04e7c0cceb34241b7276aee358987620d4502f URL: https://gitlab.winehq.org/wine/wine/-/commit/8c04e7c0cceb34241b7276aee35898… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat May 4 21:07:29 2024 +0000 gdiplus: Bracket HDC use in gdi_transform_acquire/release. --- dlls/gdiplus/graphics.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4dd33e5616b..d50379e5943 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -7154,14 +7154,21 @@ GpStatus WINGDIPAPI GdipGetClip(GpGraphics *graphics, GpRegion *region) GpStatus gdi_transform_acquire(GpGraphics *graphics) { - if (graphics->gdi_transform_acquire_count == 0 && graphics->hdc) + if (graphics->gdi_transform_acquire_count == 0 && has_gdi_dc(graphics)) { - graphics->gdi_transform_save = SaveDC(graphics->hdc); - ModifyWorldTransform(graphics->hdc, NULL, MWT_IDENTITY); - SetGraphicsMode(graphics->hdc, GM_COMPATIBLE); - SetMapMode(graphics->hdc, MM_TEXT); - SetWindowOrgEx(graphics->hdc, 0, 0, NULL); - SetViewportOrgEx(graphics->hdc, 0, 0, NULL); + HDC hdc; + GpStatus stat; + + stat = gdi_dc_acquire(graphics, &hdc); + if (stat != Ok) + return stat; + + graphics->gdi_transform_save = SaveDC(hdc); + ModifyWorldTransform(hdc, NULL, MWT_IDENTITY); + SetGraphicsMode(hdc, GM_COMPATIBLE); + SetMapMode(hdc, MM_TEXT); + SetWindowOrgEx(hdc, 0, 0, NULL); + SetViewportOrgEx(hdc, 0, 0, NULL); } graphics->gdi_transform_acquire_count++; return Ok; @@ -7177,6 +7184,7 @@ GpStatus gdi_transform_release(GpGraphics *graphics) if (graphics->gdi_transform_acquire_count == 1 && graphics->hdc) { RestoreDC(graphics->hdc, graphics->gdi_transform_save); + gdi_dc_release(graphics, graphics->hdc); } graphics->gdi_transform_acquire_count--; return Ok;

1 0

Esme Povirk : gdiplus: Do not store HDC on HWND Graphics objects.
by Alexandre Julliard 21 May '24

21 May '24

Module: wine Branch: master Commit: f20a1bb94fd567b39b3cce1a52c88edc7efca811 URL: https://gitlab.winehq.org/wine/wine/-/commit/f20a1bb94fd567b39b3cce1a52c88e… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon May 6 11:47:09 2024 -0500 gdiplus: Do not store HDC on HWND Graphics objects. --- dlls/gdiplus/gdiplus_private.h | 2 +- dlls/gdiplus/graphics.c | 38 ++++++++++++++++++++++++++++++++++---- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index e25f60de78e..d247b973b3b 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -665,7 +665,7 @@ static inline void image_unlock(GpImage *image) static inline BOOL has_gdi_dc(GpGraphics *graphics) { - return graphics->hdc != NULL; + return graphics->hdc != NULL || graphics->owndc; } static inline void set_rect(GpRectF *rect, REAL x, REAL y, REAL width, REAL height) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index d50379e5943..58fa129b504 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -55,6 +55,14 @@ GpStatus gdi_dc_acquire(GpGraphics *graphics, HDC *hdc) graphics->hdc_refs++; return Ok; } + else if (graphics->owndc) + { + *hdc = graphics->hdc = GetDC(graphics->hwnd); + if (!graphics->hdc) + return OutOfMemory; + graphics->hdc_refs++; + return Ok; + } *hdc = NULL; return InvalidParameter; @@ -64,6 +72,13 @@ void gdi_dc_release(GpGraphics *graphics, HDC hdc) { assert(graphics->hdc_refs > 0); graphics->hdc_refs--; + + if (graphics->owndc && !graphics->hdc_refs) + { + assert(graphics->hdc == hdc); + graphics->hdc = NULL; + ReleaseDC(graphics->hwnd, hdc); + } } static GpStatus draw_driver_string(GpGraphics *graphics, GDIPCONST UINT16 *text, INT length, @@ -2556,6 +2571,9 @@ GpStatus WINGDIPAPI GdipCreateFromHWND(HWND hwnd, GpGraphics **graphics) (*graphics)->hwnd = hwnd; (*graphics)->owndc = TRUE; + ReleaseDC(hwnd, hdc); + (*graphics)->hdc = NULL; + return Ok; } @@ -2610,13 +2628,13 @@ GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics) if (graphics->temp_hdc) { - DeleteDC(graphics->temp_hdc); + if (graphics->owndc) + ReleaseDC(graphics->hwnd, graphics->temp_hdc); + else + DeleteDC(graphics->temp_hdc); graphics->temp_hdc = NULL; } - if(graphics->owndc) - ReleaseDC(graphics->hwnd, graphics->hdc); - LIST_FOR_EACH_ENTRY_SAFE(cont, next, &graphics->containers, GraphicsContainerItem, entry){ list_remove(&cont->entry); delete_container(cont); @@ -7002,6 +7020,13 @@ GpStatus WINGDIPAPI GdipGetDC(GpGraphics *graphics, HDC *hdc) { stat = METAFILE_GetDC((GpMetafile*)graphics->image, hdc); } + else if (graphics->owndc) + { + graphics->temp_hdc = GetDC(graphics->hwnd); + if (!graphics->temp_hdc) + return OutOfMemory; + *hdc = graphics->temp_hdc; + } else if (!graphics->hdc || (graphics->image && graphics->image->type == ImageTypeBitmap)) { @@ -7083,6 +7108,11 @@ GpStatus WINGDIPAPI GdipReleaseDC(GpGraphics *graphics, HDC hdc) { stat = METAFILE_ReleaseDC((GpMetafile*)graphics->image, hdc); } + else if (graphics->owndc) + { + ReleaseDC(graphics->hwnd, graphics->temp_hdc); + graphics->temp_hdc = NULL; + } else if (graphics->temp_hdc == hdc) { DWORD* pos;

1 0

Esme Povirk : gdiplus: Don't call GetDeviceCaps for NULL dc.
by Alexandre Julliard 21 May '24

21 May '24

Module: wine Branch: master Commit: d41a1f0183f5686fa3ed1b42c4de07e393833925 URL: https://gitlab.winehq.org/wine/wine/-/commit/d41a1f0183f5686fa3ed1b42c4de07… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon May 6 11:52:56 2024 -0500 gdiplus: Don't call GetDeviceCaps for NULL dc. --- dlls/gdiplus/graphics.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 58fa129b504..14e09e7cc47 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -519,7 +519,8 @@ static GpStatus alpha_blend_hdc_pixels(GpGraphics *graphics, INT dst_x, INT dst_ if(!hbitmap || !temp_bits) goto done; - if ((GetDeviceCaps(graphics->hdc, TECHNOLOGY) == DT_RASPRINTER && + if ((graphics->hdc && + GetDeviceCaps(graphics->hdc, TECHNOLOGY) == DT_RASPRINTER && GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE) || fmt & PixelFormatPAlpha) memcpy(temp_bits, src, src_width * src_height * 4);

1 0

Alexandros Frantzis : win32u: Emit number characters for numpad virtual keys.
by Alexandre Julliard 21 May '24

21 May '24

Module: wine Branch: master Commit: c4e636425aeb6c3eed201c679666474864158652 URL: https://gitlab.winehq.org/wine/wine/-/commit/c4e636425aeb6c3eed201c67966647… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Fri May 3 10:50:00 2024 +0300 win32u: Emit number characters for numpad virtual keys. --- dlls/win32u/input.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 04532e7d015..38350861c6b 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -521,6 +521,7 @@ static WCHAR kbd_tables_vkey_to_wchar( const KBDTABLES *tables, UINT vkey, const if (vkey >= 'A' && vkey <= 'Z') return vkey - 'A' + 1; tables = &kbdus_tables; } + if (vkey >= VK_NUMPAD0 && vkey <= VK_NUMPAD9) tables = &kbdus_tables; mod = caps_mod = kbd_tables_get_mod_num( tables, state, FALSE ); if (caps) caps_mod = kbd_tables_get_mod_num( tables, state, TRUE );

1 0

Alexandros Frantzis : win32u: Allow drivers to send only the scan code for keyboard events.
by Alexandre Julliard 21 May '24

21 May '24

Module: wine Branch: master Commit: c288c28eafd6f8bbb3b2020a1b756c297f4a4923 URL: https://gitlab.winehq.org/wine/wine/-/commit/c288c28eafd6f8bbb3b2020a1b756c… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Fri May 3 15:43:08 2024 +0300 win32u: Allow drivers to send only the scan code for keyboard events. The implementation will map the scan code to a virtual key code internally. --- dlls/user32/tests/input.c | 31 +++++++++++++++++++++++-------- dlls/win32u/message.c | 23 ++++++++++++++++++++--- dlls/winewayland.drv/wayland_keyboard.c | 9 ++++----- 3 files changed, 47 insertions(+), 16 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index d84d543bed8..8fad3305f3e 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1063,16 +1063,26 @@ static void test_SendInput_keyboard_messages( WORD vkey, WORD scan, WCHAR wch, W struct send_input_keyboard_test rshift_scan[] = { {.scan = 0x36, .flags = KEYEVENTF_SCANCODE, .expect_state = {[VK_SHIFT] = 0x80, [VK_LSHIFT] = 0x80}, - .todo_state = {[0] = TRUE, [VK_SHIFT] = TRUE, [VK_LSHIFT] = TRUE}, - .expect = {KEY_HOOK(WM_KEYDOWN, 0x36, VK_RSHIFT, .todo_value = TRUE), KEY_MSG(WM_KEYDOWN, 0x36, VK_SHIFT, .todo_value = TRUE), {0}}}, + .expect = {KEY_HOOK(WM_KEYDOWN, 0x36, VK_RSHIFT), KEY_MSG(WM_KEYDOWN, 0x36, VK_SHIFT), {0}}}, {.scan = scan, .flags = KEYEVENTF_SCANCODE, .expect_state = {[VK_SHIFT] = 0x80, [VK_LSHIFT] = 0x80, /*[vkey] = 0x80*/}, - .todo_state = {[0] = TRUE, [VK_SHIFT] = TRUE, [VK_LSHIFT] = TRUE, /*[vkey] = TRUE*/}, - .expect = {KEY_HOOK(WM_KEYDOWN, scan, vkey, .todo_value = TRUE), KEY_MSG(WM_KEYDOWN, scan, vkey, .todo_value = TRUE), WIN_MSG(WM_CHAR, wch_shift, MAKELONG(1, scan), .todo = TRUE), {0}}}, + .expect = {KEY_HOOK(WM_KEYDOWN, scan, vkey), KEY_MSG(WM_KEYDOWN, scan, vkey), WIN_MSG(WM_CHAR, wch_shift, MAKELONG(1, scan)), {0}}}, {.scan = scan, .flags = KEYEVENTF_SCANCODE | KEYEVENTF_KEYUP, .expect_state = {[VK_SHIFT] = 0x80, [VK_LSHIFT] = 0x80}, - .todo_state = {[VK_SHIFT] = TRUE, [VK_LSHIFT] = TRUE}, - .expect = {KEY_HOOK(WM_KEYUP, scan, vkey, .todo_value = TRUE), KEY_MSG(WM_KEYUP, scan, vkey, .todo_value = TRUE), {0}}}, + .expect = {KEY_HOOK(WM_KEYUP, scan, vkey), KEY_MSG(WM_KEYUP, scan, vkey), {0}}}, {.scan = 0x36, .flags = KEYEVENTF_SCANCODE | KEYEVENTF_KEYUP, - .expect = {KEY_HOOK(WM_KEYUP, 0x36, VK_RSHIFT, .todo_value = TRUE), KEY_MSG(WM_KEYUP, 0x36, VK_SHIFT, .todo_value = TRUE), {0}}}, + .expect = {KEY_HOOK(WM_KEYUP, 0x36, VK_RSHIFT), KEY_MSG(WM_KEYUP, 0x36, VK_SHIFT), {0}}}, + {0}, + }; + + struct send_input_keyboard_test rctrl_scan[] = + { + {.scan = 0xe01d, .flags = KEYEVENTF_SCANCODE, .expect_state = {[VK_CONTROL] = 0x80, [VK_LCONTROL] = 0x80}, + .expect = {KEY_HOOK(WM_KEYDOWN, 0x1d, VK_LCONTROL), KEY_MSG(WM_KEYDOWN, 0x1d, VK_CONTROL), {0}}}, + {.scan = 0xe01d, .flags = KEYEVENTF_SCANCODE | KEYEVENTF_KEYUP, + .expect = {KEY_HOOK(WM_KEYUP, 0x1d, VK_LCONTROL), KEY_MSG(WM_KEYUP, 0x1d, VK_CONTROL), {0}}}, + {.scan = 0x1d, .flags = KEYEVENTF_SCANCODE | KEYEVENTF_EXTENDEDKEY, .expect_state = {[VK_CONTROL] = 0x80, [VK_RCONTROL] = 0x80}, + .expect = {KEY_HOOK_(WM_KEYDOWN, 0x1d, VK_RCONTROL, LLKHF_EXTENDED, .todo_value = TRUE), KEY_MSG(WM_KEYDOWN, 0x11d, VK_CONTROL), {0}}}, + {.scan = 0x1d, .flags = KEYEVENTF_SCANCODE | KEYEVENTF_EXTENDEDKEY | KEYEVENTF_KEYUP, + .expect = {KEY_HOOK_(WM_KEYUP, 0x1d, VK_RCONTROL, LLKHF_EXTENDED, .todo_value = TRUE), KEY_MSG(WM_KEYUP, 0x11d, VK_CONTROL), {0}}}, {0}, }; @@ -1179,7 +1189,6 @@ static void test_SendInput_keyboard_messages( WORD vkey, WORD scan, WCHAR wch, W lmenu_lcontrol_vkey[2].expect_state[vkey] = 0x80; shift_vkey[1].expect_state[vkey] = 0x80; rshift_scan[1].expect_state[vkey] = 0x80; - rshift_scan[1].todo_state[vkey] = TRUE; unicode_vkey[0].expect_state[vkey] = 0x80; /* test peeked messages */ @@ -1211,6 +1220,9 @@ static void test_SendInput_keyboard_messages( WORD vkey, WORD scan, WCHAR wch, W else check_send_input_keyboard_test( menu_ext_peeked, TRUE ); check_send_input_keyboard_test( lrshift_ext, TRUE ); check_send_input_keyboard_test( rshift_scan, TRUE ); + /* Skip on Korean layouts since they map the right control key to VK_HANJA */ + if (hkl == (HKL)0x04120412) skip( "skipping rctrl_scan test on Korean layout" ); + else check_send_input_keyboard_test( rctrl_scan, TRUE ); check_send_input_keyboard_test( unicode, TRUE ); check_send_input_keyboard_test( lmenu_unicode_peeked, TRUE ); check_send_input_keyboard_test( unicode_vkey, TRUE ); @@ -1251,6 +1263,9 @@ static void test_SendInput_keyboard_messages( WORD vkey, WORD scan, WCHAR wch, W else check_send_input_keyboard_test( menu_ext, FALSE ); check_send_input_keyboard_test( lrshift_ext, FALSE ); check_send_input_keyboard_test( rshift_scan, FALSE ); + /* Skip on Korean layouts since they map the right control key to VK_HANJA */ + if (hkl == (HKL)0x04120412) skip( "skipping rctrl_scan test on Korean layout" ); + else check_send_input_keyboard_test( rctrl_scan, FALSE ); check_send_input_keyboard_test( unicode, FALSE ); check_send_input_keyboard_test( lmenu_unicode, FALSE ); check_send_input_keyboard_test( unicode_vkey, FALSE ); diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 4a368ffb589..ddc9658f087 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -3558,9 +3558,26 @@ NTSTATUS send_hardware_message( HWND hwnd, UINT flags, const INPUT *input, LPARA MOUSEEVENTF_XDOWN | MOUSEEVENTF_XUP)); break; case INPUT_KEYBOARD: - req->input.kbd.vkey = input->ki.wVk; - req->input.kbd.scan = input->ki.wScan; - req->input.kbd.flags = input->ki.dwFlags; + if (input->ki.dwFlags & KEYEVENTF_SCANCODE) + { + UINT scan = input->ki.wScan; + /* TODO: Use the keyboard layout of the target hwnd, once + * NtUserGetKeyboardLayout supports non-current threads. */ + HKL layout = NtUserGetKeyboardLayout( 0 ); + if (flags & SEND_HWMSG_INJECTED) + { + scan = scan & 0xff; + if (input->ki.dwFlags & KEYEVENTF_EXTENDEDKEY) scan |= 0xe000; + } + req->input.kbd.vkey = NtUserMapVirtualKeyEx( scan, MAPVK_VSC_TO_VK_EX, layout ); + req->input.kbd.scan = input->ki.wScan & 0xff; + } + else + { + req->input.kbd.vkey = input->ki.wVk; + req->input.kbd.scan = input->ki.wScan; + } + req->input.kbd.flags = input->ki.dwFlags & ~KEYEVENTF_SCANCODE; req->input.kbd.time = input->ki.time; req->input.kbd.info = input->ki.dwExtraInfo; affects_key_state = TRUE; diff --git a/dlls/winewayland.drv/wayland_keyboard.c b/dlls/winewayland.drv/wayland_keyboard.c index 04a1c0a9fc3..55b14b1dfd5 100644 --- a/dlls/winewayland.drv/wayland_keyboard.c +++ b/dlls/winewayland.drv/wayland_keyboard.c @@ -801,9 +801,8 @@ static void send_right_control(HWND hwnd, uint32_t state) { INPUT input = {0}; input.type = INPUT_KEYBOARD; - input.ki.wScan = key2scan(KEY_RIGHTCTRL); - input.ki.wVk = VK_RCONTROL; - input.ki.dwFlags |= KEYEVENTF_EXTENDEDKEY; + input.ki.wScan = 0xe000 | (key2scan(KEY_RIGHTCTRL) & 0xff); + input.ki.dwFlags = KEYEVENTF_SCANCODE | KEYEVENTF_EXTENDEDKEY; if (state == WL_KEYBOARD_KEY_STATE_RELEASED) input.ki.dwFlags |= KEYEVENTF_KEYUP; NtUserSendHardwareInput(hwnd, 0, &input, 0); } @@ -824,8 +823,8 @@ static void keyboard_handle_key(void *data, struct wl_keyboard *wl_keyboard, if (key == KEY_RIGHTALT) send_right_control(hwnd, state); input.type = INPUT_KEYBOARD; - input.ki.wScan = scan & 0xff; - input.ki.wVk = NtUserMapVirtualKeyEx(scan, MAPVK_VSC_TO_VK_EX, keyboard_hkl); + input.ki.wScan = (scan & 0x300) ? scan + 0xdf00 : scan; + input.ki.dwFlags = KEYEVENTF_SCANCODE; if (scan & ~0xff) input.ki.dwFlags |= KEYEVENTF_EXTENDEDKEY; if (state == WL_KEYBOARD_KEY_STATE_RELEASED) input.ki.dwFlags |= KEYEVENTF_KEYUP;

1 0