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

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

May 21, 2024

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 May 21, 2024

May 21, 2024

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 May 21, 2024

May 21, 2024

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

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

May 21, 2024

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

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

May 21, 2024

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

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlstyle.c.
by Alexandre Julliard May 21, 2024

May 21, 2024

Module: wine Branch: master Commit: 72dccb8f639be24e5cc8979f772a0701826f5aa1 URL: https://gitlab.winehq.org/wine/wine/-/commit/72dccb8f639be24e5cc8979f772a07… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 21 14:33:57 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlstyle.c. --- dlls/mshtml/htmlstyle.c | 419 ++---------------------------------------------- 1 file changed, 10 insertions(+), 409 deletions(-)

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlstorage.c.
by Alexandre Julliard May 21, 2024

May 21, 2024

Module: wine Branch: master Commit: 628adb09596066636c8083afd6f56ee53259451a URL: https://gitlab.winehq.org/wine/wine/-/commit/628adb09596066636c8083afd6f56e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 21 14:30:23 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlstorage.c. --- dlls/mshtml/htmlstorage.c | 50 +---------------------------------------------- 1 file changed, 1 insertion(+), 49 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 68452794449..b865e5adc7e 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -371,55 +371,7 @@ done: return FAILED(hres) ? hres : S_OK; } -static HRESULT WINAPI HTMLStorage_QueryInterface(IHTMLStorage *iface, REFIID riid, void **ppv) -{ - HTMLStorage *This = impl_from_IHTMLStorage(iface); - return IDispatchEx_QueryInterface(&This->dispex.IDispatchEx_iface, riid, ppv); -} - -static ULONG WINAPI HTMLStorage_AddRef(IHTMLStorage *iface) -{ - HTMLStorage *This = impl_from_IHTMLStorage(iface); - return IDispatchEx_AddRef(&This->dispex.IDispatchEx_iface); -} - -static ULONG WINAPI HTMLStorage_Release(IHTMLStorage *iface) -{ - HTMLStorage *This = impl_from_IHTMLStorage(iface); - return IDispatchEx_Release(&This->dispex.IDispatchEx_iface); -} - -static HRESULT WINAPI HTMLStorage_GetTypeInfoCount(IHTMLStorage *iface, UINT *pctinfo) -{ - HTMLStorage *This = impl_from_IHTMLStorage(iface); - return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLStorage_GetTypeInfo(IHTMLStorage *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLStorage *This = impl_from_IHTMLStorage(iface); - - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLStorage_GetIDsOfNames(IHTMLStorage *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLStorage *This = impl_from_IHTMLStorage(iface); - - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, - lcid, rgDispId); -} - -static HRESULT WINAPI HTMLStorage_Invoke(IHTMLStorage *iface, DISPID dispIdMember, REFIID riid, LCID lcid, - WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLStorage *This = impl_from_IHTMLStorage(iface); - - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, - pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLStorage, IHTMLStorage, impl_from_IHTMLStorage(iface)->dispex) static BOOL create_path(const WCHAR *path) {

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlselect.c.
by Alexandre Julliard May 21, 2024

May 21, 2024

Module: wine Branch: master Commit: 4109d74a0afa93820cd43d1fe704757782de1140 URL: https://gitlab.winehq.org/wine/wine/-/commit/4109d74a0afa93820cd43d1fe70475… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 21 14:29:23 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlselect.c. --- dlls/mshtml/htmlselect.c | 164 ++--------------------------------------------- 1 file changed, 6 insertions(+), 158 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 88bec85597b..24affaea4ca 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -45,59 +45,8 @@ static inline HTMLOptionElement *impl_from_IHTMLOptionElement(IHTMLOptionElement return CONTAINING_RECORD(iface, HTMLOptionElement, IHTMLOptionElement_iface); } -static HRESULT WINAPI HTMLOptionElement_QueryInterface(IHTMLOptionElement *iface, - REFIID riid, void **ppv) -{ - HTMLOptionElement *This = impl_from_IHTMLOptionElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLOptionElement_AddRef(IHTMLOptionElement *iface) -{ - HTMLOptionElement *This = impl_from_IHTMLOptionElement(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLOptionElement_Release(IHTMLOptionElement *iface) -{ - HTMLOptionElement *This = impl_from_IHTMLOptionElement(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLOptionElement_GetTypeInfoCount(IHTMLOptionElement *iface, UINT *pctinfo) -{ - HTMLOptionElement *This = impl_from_IHTMLOptionElement(iface); - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLOptionElement_GetTypeInfo(IHTMLOptionElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLOptionElement *This = impl_from_IHTMLOptionElement(iface); - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, - ppTInfo); -} - -static HRESULT WINAPI HTMLOptionElement_GetIDsOfNames(IHTMLOptionElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLOptionElement *This = impl_from_IHTMLOptionElement(iface); - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLOptionElement_Invoke(IHTMLOptionElement *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLOptionElement *This = impl_from_IHTMLOptionElement(iface); - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLOptionElement, IHTMLOptionElement, + impl_from_IHTMLOptionElement(iface)->element.node.event_target.dispex) static HRESULT WINAPI HTMLOptionElement_put_selected(IHTMLOptionElement *iface, VARIANT_BOOL v) { @@ -430,54 +379,8 @@ static inline HTMLOptionElementFactory *impl_from_IHTMLOptionElementFactory(IHTM return CONTAINING_RECORD(iface, HTMLOptionElementFactory, IHTMLOptionElementFactory_iface); } -static HRESULT WINAPI HTMLOptionElementFactory_QueryInterface(IHTMLOptionElementFactory *iface, - REFIID riid, void **ppv) -{ - HTMLOptionElementFactory *This = impl_from_IHTMLOptionElementFactory(iface); - return IDispatchEx_QueryInterface(&This->dispex.IDispatchEx_iface, riid, ppv); -} - -static ULONG WINAPI HTMLOptionElementFactory_AddRef(IHTMLOptionElementFactory *iface) -{ - HTMLOptionElementFactory *This = impl_from_IHTMLOptionElementFactory(iface); - return IDispatchEx_AddRef(&This->dispex.IDispatchEx_iface); -} - -static ULONG WINAPI HTMLOptionElementFactory_Release(IHTMLOptionElementFactory *iface) -{ - HTMLOptionElementFactory *This = impl_from_IHTMLOptionElementFactory(iface); - return IDispatchEx_Release(&This->dispex.IDispatchEx_iface); -} - -static HRESULT WINAPI HTMLOptionElementFactory_GetTypeInfoCount(IHTMLOptionElementFactory *iface, UINT *pctinfo) -{ - HTMLOptionElementFactory *This = impl_from_IHTMLOptionElementFactory(iface); - return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLOptionElementFactory_GetTypeInfo(IHTMLOptionElementFactory *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLOptionElementFactory *This = impl_from_IHTMLOptionElementFactory(iface); - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLOptionElementFactory_GetIDsOfNames(IHTMLOptionElementFactory *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLOptionElementFactory *This = impl_from_IHTMLOptionElementFactory(iface); - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLOptionElementFactory_Invoke(IHTMLOptionElementFactory *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLOptionElementFactory *This = impl_from_IHTMLOptionElementFactory(iface); - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, pDispParams, - pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLOptionElementFactory, IHTMLOptionElementFactory, + impl_from_IHTMLOptionElementFactory(iface)->dispex) static HRESULT WINAPI HTMLOptionElementFactory_create(IHTMLOptionElementFactory *iface, VARIANT text, VARIANT value, VARIANT defaultselected, VARIANT selected, @@ -831,63 +734,8 @@ static const IEnumVARIANTVtbl HTMLSelectElementEnumVtbl = { HTMLSelectElementEnum_Clone }; -static HRESULT WINAPI HTMLSelectElement_QueryInterface(IHTMLSelectElement *iface, - REFIID riid, void **ppv) -{ - HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLSelectElement_AddRef(IHTMLSelectElement *iface) -{ - HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLSelectElement_Release(IHTMLSelectElement *iface) -{ - HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLSelectElement_GetTypeInfoCount(IHTMLSelectElement *iface, UINT *pctinfo) -{ - HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLSelectElement_GetTypeInfo(IHTMLSelectElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, - ppTInfo); -} - -static HRESULT WINAPI HTMLSelectElement_GetIDsOfNames(IHTMLSelectElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLSelectElement_Invoke(IHTMLSelectElement *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLSelectElement, IHTMLSelectElement, + impl_from_IHTMLSelectElement(iface)->element.node.event_target.dispex) static HRESULT WINAPI HTMLSelectElement_put_size(IHTMLSelectElement *iface, LONG v) {

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlscript.c.
by Alexandre Julliard May 21, 2024

May 21, 2024

Module: wine Branch: master Commit: 4123cb706a2f305169abcdea278d6f0bf286a03c URL: https://gitlab.winehq.org/wine/wine/-/commit/4123cb706a2f305169abcdea278d6f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 21 14:24:59 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlscript.c. --- dlls/mshtml/htmlscript.c | 55 ++---------------------------------------------- 1 file changed, 2 insertions(+), 53 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 2e008d9a95b..9a4d9dd5242 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -38,59 +38,8 @@ static inline HTMLScriptElement *impl_from_IHTMLScriptElement(IHTMLScriptElement return CONTAINING_RECORD(iface, HTMLScriptElement, IHTMLScriptElement_iface); } -static HRESULT WINAPI HTMLScriptElement_QueryInterface(IHTMLScriptElement *iface, - REFIID riid, void **ppv) -{ - HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLScriptElement_AddRef(IHTMLScriptElement *iface) -{ - HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLScriptElement_Release(IHTMLScriptElement *iface) -{ - HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLScriptElement_GetTypeInfoCount(IHTMLScriptElement *iface, UINT *pctinfo) -{ - HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLScriptElement_GetTypeInfo(IHTMLScriptElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, - ppTInfo); -} - -static HRESULT WINAPI HTMLScriptElement_GetIDsOfNames(IHTMLScriptElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLScriptElement_Invoke(IHTMLScriptElement *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLScriptElement, IHTMLScriptElement, + impl_from_IHTMLScriptElement(iface)->element.node.event_target.dispex) static HRESULT WINAPI HTMLScriptElement_put_src(IHTMLScriptElement *iface, BSTR v) {

1 0

Rémi Bernon : win32u: Match driver GPUs with vulkan GPUS from their ids, or index.
by Alexandre Julliard May 21, 2024

May 21, 2024

Module: wine Branch: master Commit: 73ad5443541517da89616f8b5b3e47cce35e1ead URL: https://gitlab.winehq.org/wine/wine/-/commit/73ad5443541517da89616f8b5b3e47… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 22 16:23:54 2024 +0200 win32u: Match driver GPUs with vulkan GPUS from their ids, or index. --- dlls/win32u/sysparams.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index bc86f72f345..4c122fb3bd8 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1184,12 +1184,36 @@ static BOOL write_gpu_to_registry( const struct gpu *gpu, const struct pci_id *p return TRUE; } +static struct vulkan_gpu *find_vulkan_gpu_from_uuid( const struct device_manager_ctx *ctx, const GUID *uuid ) +{ + struct vulkan_gpu *gpu; + + if (!uuid) return NULL; + + LIST_FOR_EACH_ENTRY( gpu, &ctx->vulkan_gpus, struct vulkan_gpu, entry ) + if (!memcmp( &gpu->uuid, uuid, sizeof(*uuid) )) return gpu; + + return NULL; +} + +static struct vulkan_gpu *find_vulkan_gpu_from_pci_id( const struct device_manager_ctx *ctx, const struct pci_id *pci_id ) +{ + struct vulkan_gpu *gpu; + + LIST_FOR_EACH_ENTRY( gpu, &ctx->vulkan_gpus, struct vulkan_gpu, entry ) + if (gpu->pci_id.vendor == pci_id->vendor && gpu->pci_id.device == pci_id->device) return gpu; + + return NULL; +} + static void add_gpu( const char *name, const struct pci_id *pci_id, const GUID *vulkan_uuid, ULONGLONG memory_size, void *param ) { struct device_manager_ctx *ctx = param; char buffer[4096]; KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; + struct vulkan_gpu *vulkan_gpu = NULL; + struct list *ptr; unsigned int i; HKEY hkey, subkey; DWORD len; @@ -1209,7 +1233,24 @@ static void add_gpu( const char *name, const struct pci_id *pci_id, const GUID * memset( &ctx->gpu, 0, sizeof(ctx->gpu) ); ctx->gpu.index = ctx->gpu_count; + + if ((vulkan_gpu = find_vulkan_gpu_from_uuid( ctx, vulkan_uuid ))) + TRACE( "Found vulkan GPU matching uuid %s, pci_id %#04x:%#04x, name %s\n", debugstr_guid(&vulkan_gpu->uuid), + pci_id->vendor, pci_id->device, debugstr_a(vulkan_gpu->name)); + else if ((vulkan_gpu = find_vulkan_gpu_from_pci_id( ctx, pci_id ))) + TRACE( "Found vulkan GPU matching pci_id %#04x:%#04x, uuid %s, name %s\n", pci_id->vendor, pci_id->device, + debugstr_guid(&vulkan_gpu->uuid), debugstr_a(vulkan_gpu->name)); + else if ((ptr = list_head( &ctx->vulkan_gpus ))) + { + vulkan_gpu = LIST_ENTRY( ptr, struct vulkan_gpu, entry ); + WARN( "Using vulkan GPU pci_id %#04x:%#04x, uuid %s, name %s\n", pci_id->vendor, pci_id->device, + debugstr_guid(&vulkan_gpu->uuid), debugstr_a(vulkan_gpu->name)); + } + if (vulkan_uuid) ctx->gpu.vulkan_uuid = *vulkan_uuid; + else if (vulkan_gpu) ctx->gpu.vulkan_uuid = vulkan_gpu->uuid; + + if (!name && vulkan_gpu) name = vulkan_gpu->name; if (name) RtlUTF8ToUnicodeN( ctx->gpu.name, sizeof(ctx->gpu.name) - sizeof(WCHAR), &len, name, strlen( name ) ); snprintf( ctx->gpu.path, sizeof(ctx->gpu.path), "PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X\\%08X", @@ -1257,6 +1298,12 @@ static void add_gpu( const char *name, const struct pci_id *pci_id, const GUID * WARN( "Failed to write gpu to registry\n" ); else ctx->gpu_count++; + + if (vulkan_gpu) + { + list_remove( &vulkan_gpu->entry ); + free_vulkan_gpu( vulkan_gpu ); + } } static BOOL write_source_to_registry( const struct source *source, HKEY *source_key )

1 0