September 2023 - Wine-commits

Gabriel Ivăncescu : mshtml: Use the dispex's query_interface for DOMTextNodes.
by Alexandre Julliard 19 Sep '23

19 Sep '23

Module: wine Branch: master Commit: 7abe09518762db954ebe643ec6da33a600fdfbb7 URL: https://gitlab.winehq.org/wine/wine/-/commit/7abe09518762db954ebe643ec6da33… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Sep 19 17:26:14 2023 +0300 mshtml: Use the dispex's query_interface for DOMTextNodes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmltextnode.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index 2bebe9dee1b..cdbc708a896 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -331,9 +331,14 @@ static HRESULT HTMLDOMTextNode_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTM return HTMLDOMTextNode_Create(This->node.doc, nsnode, ret); } -static void *HTMLDOMTextNode_QI(HTMLDOMNode *iface, REFIID riid) +static inline HTMLDOMTextNode *impl_from_DispatchEx(DispatchEx *iface) { - HTMLDOMTextNode *This = impl_from_HTMLDOMNode(iface); + return CONTAINING_RECORD(iface, HTMLDOMTextNode, node.event_target.dispex); +} + +static void *HTMLDOMTextNode_query_interface(DispatchEx *dispex, REFIID riid) +{ + HTMLDOMTextNode *This = impl_from_DispatchEx(dispex); if(IsEqualGUID(&IID_IHTMLDOMTextNode, riid)) return &This->IHTMLDOMTextNode_iface; @@ -346,13 +351,12 @@ static void *HTMLDOMTextNode_QI(HTMLDOMNode *iface, REFIID riid) static const cpc_entry_t HTMLDOMTextNode_cpc[] = {{NULL}}; static const NodeImplVtbl HTMLDOMTextNodeImplVtbl = { - .qi = HTMLDOMTextNode_QI, .cpc_entries = HTMLDOMTextNode_cpc, .clone = HTMLDOMTextNode_clone }; static const dispex_static_data_vtbl_t HTMLDOMTextNode_dispex_vtbl = { - .query_interface = HTMLDOMNode_query_interface, + .query_interface = HTMLDOMTextNode_query_interface, .destructor = HTMLDOMNode_destructor, .traverse = HTMLDOMNode_traverse, .unlink = HTMLDOMNode_unlink

1 0

Gabriel Ivăncescu : mshtml: Use the dispex's query_interface for the remaining nodes.
by Alexandre Julliard 19 Sep '23

19 Sep '23

Module: wine Branch: master Commit: 02e03a64fa154a07acb8c8c1eee8d9c213789621 URL: https://gitlab.winehq.org/wine/wine/-/commit/02e03a64fa154a07acb8c8c1eee8d9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Sep 19 17:26:14 2023 +0300 mshtml: Use the dispex's query_interface for the remaining nodes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlanchor.c | 12 ++++------ dlls/mshtml/htmlarea.c | 8 +++---- dlls/mshtml/htmlbody.c | 12 ++++------ dlls/mshtml/htmlcomment.c | 13 +++++++---- dlls/mshtml/htmldoc.c | 4 ++-- dlls/mshtml/htmlelem.c | 12 ++++------ dlls/mshtml/htmlevent.h | 1 - dlls/mshtml/htmlform.c | 12 ++++------ dlls/mshtml/htmlframe.c | 14 ++++++------ dlls/mshtml/htmlgeneric.c | 12 +++++----- dlls/mshtml/htmlhead.c | 52 ++++++++++++++++++++------------------------ dlls/mshtml/htmlimg.c | 8 +++---- dlls/mshtml/htmlinput.c | 36 ++++++++++++------------------ dlls/mshtml/htmllink.c | 8 +++---- dlls/mshtml/htmlnode.c | 6 ----- dlls/mshtml/htmlobject.c | 28 +++++++++--------------- dlls/mshtml/htmlscript.c | 12 ++++------ dlls/mshtml/htmlselect.c | 24 +++++++------------- dlls/mshtml/htmlstyleelem.c | 12 ++++------ dlls/mshtml/htmltable.c | 36 ++++++++++-------------------- dlls/mshtml/htmltextarea.c | 12 ++++------ dlls/mshtml/htmltextnode.c | 2 +- dlls/mshtml/mshtml_private.h | 4 +--- dlls/mshtml/svg.c | 48 ++++++++++++++++++++-------------------- 24 files changed, 158 insertions(+), 230 deletions(-)

1 0

Rémi Bernon : dmband: Rename IDirectMusicBandImpl prefix to band.
by Alexandre Julliard 19 Sep '23

19 Sep '23

Module: wine Branch: master Commit: be0085238e510d4c8de8a874b218c533ab55638c URL: https://gitlab.winehq.org/wine/wine/-/commit/be0085238e510d4c8de8a874b218c5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Sep 10 13:41:13 2023 +0200 dmband: Rename IDirectMusicBandImpl prefix to band. --- dlls/dmband/band.c | 53 ++++++++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index 02e3573bab9..eb662f732ca 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -39,8 +39,7 @@ static inline IDirectMusicBandImpl *impl_from_IDirectMusicBand(IDirectMusicBand return CONTAINING_RECORD(iface, IDirectMusicBandImpl, IDirectMusicBand_iface); } -/* DirectMusicBandImpl IDirectMusicBand part: */ -static HRESULT WINAPI IDirectMusicBandImpl_QueryInterface(IDirectMusicBand *iface, REFIID riid, +static HRESULT WINAPI band_QueryInterface(IDirectMusicBand *iface, REFIID riid, void **ret_iface) { IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); @@ -64,7 +63,7 @@ static HRESULT WINAPI IDirectMusicBandImpl_QueryInterface(IDirectMusicBand *ifac return S_OK; } -static ULONG WINAPI IDirectMusicBandImpl_AddRef(IDirectMusicBand *iface) +static ULONG WINAPI band_AddRef(IDirectMusicBand *iface) { IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); LONG ref = InterlockedIncrement(&This->ref); @@ -74,7 +73,7 @@ static ULONG WINAPI IDirectMusicBandImpl_AddRef(IDirectMusicBand *iface) return ref; } -static ULONG WINAPI IDirectMusicBandImpl_Release(IDirectMusicBand *iface) +static ULONG WINAPI band_Release(IDirectMusicBand *iface) { IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); LONG ref = InterlockedDecrement(&This->ref); @@ -86,7 +85,7 @@ static ULONG WINAPI IDirectMusicBandImpl_Release(IDirectMusicBand *iface) return ref; } -static HRESULT WINAPI IDirectMusicBandImpl_CreateSegment(IDirectMusicBand *iface, +static HRESULT WINAPI band_CreateSegment(IDirectMusicBand *iface, IDirectMusicSegment **segment) { IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); @@ -110,7 +109,7 @@ static HRESULT WINAPI IDirectMusicBandImpl_CreateSegment(IDirectMusicBand *iface return hr; } -static HRESULT WINAPI IDirectMusicBandImpl_Download(IDirectMusicBand *iface, +static HRESULT WINAPI band_Download(IDirectMusicBand *iface, IDirectMusicPerformance *pPerformance) { IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); @@ -118,7 +117,7 @@ static HRESULT WINAPI IDirectMusicBandImpl_Download(IDirectMusicBand *iface, return S_OK; } -static HRESULT WINAPI IDirectMusicBandImpl_Unload(IDirectMusicBand *iface, +static HRESULT WINAPI band_Unload(IDirectMusicBand *iface, IDirectMusicPerformance *pPerformance) { IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); @@ -126,17 +125,17 @@ static HRESULT WINAPI IDirectMusicBandImpl_Unload(IDirectMusicBand *iface, return S_OK; } -static const IDirectMusicBandVtbl dmband_vtbl = { - IDirectMusicBandImpl_QueryInterface, - IDirectMusicBandImpl_AddRef, - IDirectMusicBandImpl_Release, - IDirectMusicBandImpl_CreateSegment, - IDirectMusicBandImpl_Download, - IDirectMusicBandImpl_Unload +static const IDirectMusicBandVtbl band_vtbl = +{ + band_QueryInterface, + band_AddRef, + band_Release, + band_CreateSegment, + band_Download, + band_Unload, }; -/* IDirectMusicBandImpl IDirectMusicObject part: */ -static HRESULT WINAPI band_IDirectMusicObject_ParseDescriptor(IDirectMusicObject *iface, +static HRESULT WINAPI band_object_ParseDescriptor(IDirectMusicObject *iface, IStream *stream, DMUS_OBJECTDESC *desc) { struct chunk_entry riff = {0}; @@ -175,18 +174,18 @@ static HRESULT WINAPI band_IDirectMusicObject_ParseDescriptor(IDirectMusicObject return S_OK; } -static const IDirectMusicObjectVtbl dmobject_vtbl = { +static const IDirectMusicObjectVtbl band_object_vtbl = +{ dmobj_IDirectMusicObject_QueryInterface, dmobj_IDirectMusicObject_AddRef, dmobj_IDirectMusicObject_Release, dmobj_IDirectMusicObject_GetDescriptor, dmobj_IDirectMusicObject_SetDescriptor, - band_IDirectMusicObject_ParseDescriptor + band_object_ParseDescriptor, }; #define DMUS_IO_INSTRUMENT_DX7_SIZE offsetof(DMUS_IO_INSTRUMENT, nPitchBendRange) -/* IDirectMusicBandImpl IPersistStream part: */ static HRESULT parse_instrument(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm) { @@ -447,7 +446,7 @@ static inline IDirectMusicBandImpl *impl_from_IPersistStream(IPersistStream *ifa return CONTAINING_RECORD(iface, IDirectMusicBandImpl, dmobj.IPersistStream_iface); } -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm) +static HRESULT WINAPI band_persist_stream_Load(IPersistStream *iface, IStream *pStm) { IDirectMusicBandImpl *This = impl_from_IPersistStream(iface); DMUS_PRIVATE_CHUNK Chunk; @@ -490,18 +489,18 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS return S_OK; } -static const IPersistStreamVtbl persiststream_vtbl = { +static const IPersistStreamVtbl band_persist_stream_vtbl = +{ dmobj_IPersistStream_QueryInterface, dmobj_IPersistStream_AddRef, dmobj_IPersistStream_Release, unimpl_IPersistStream_GetClassID, unimpl_IPersistStream_IsDirty, - IPersistStreamImpl_Load, + band_persist_stream_Load, unimpl_IPersistStream_Save, - unimpl_IPersistStream_GetSizeMax + unimpl_IPersistStream_GetSizeMax, }; -/* for ClassFactory */ HRESULT create_dmband(REFIID lpcGUID, void **ppobj) { IDirectMusicBandImpl* obj; @@ -509,11 +508,11 @@ HRESULT create_dmband(REFIID lpcGUID, void **ppobj) *ppobj = NULL; if (!(obj = calloc(1, sizeof(*obj)))) return E_OUTOFMEMORY; - obj->IDirectMusicBand_iface.lpVtbl = &dmband_vtbl; + obj->IDirectMusicBand_iface.lpVtbl = &band_vtbl; obj->ref = 1; dmobject_init(&obj->dmobj, &CLSID_DirectMusicBand, (IUnknown *)&obj->IDirectMusicBand_iface); - obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl; - obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; + obj->dmobj.IDirectMusicObject_iface.lpVtbl = &band_object_vtbl; + obj->dmobj.IPersistStream_iface.lpVtbl = &band_persist_stream_vtbl; list_init (&obj->Instruments); hr = IDirectMusicBand_QueryInterface(&obj->IDirectMusicBand_iface, lpcGUID, ppobj);

1 0

Rémi Bernon : dmband: Get rid of the IDirectMusicBandImpl typedef.
by Alexandre Julliard 19 Sep '23

19 Sep '23

Module: wine Branch: master Commit: d3c5fe89f9cac1e059b803700899c7bbefcac40f URL: https://gitlab.winehq.org/wine/wine/-/commit/d3c5fe89f9cac1e059b803700899c7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Sep 10 13:42:05 2023 +0200 dmband: Get rid of the IDirectMusicBandImpl typedef. --- dlls/dmband/band.c | 39 ++++++++++++++++++--------------------- dlls/dmband/bandtrack.c | 3 +-- 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index eb662f732ca..bbf8c93a067 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -23,26 +23,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmband); WINE_DECLARE_DEBUG_CHANNEL(dmfile); - -/***************************************************************************** - * IDirectMusicBandImpl implementation - */ -typedef struct IDirectMusicBandImpl { +struct band +{ IDirectMusicBand IDirectMusicBand_iface; struct dmobject dmobj; LONG ref; struct list Instruments; -} IDirectMusicBandImpl; +}; -static inline IDirectMusicBandImpl *impl_from_IDirectMusicBand(IDirectMusicBand *iface) +static inline struct band *impl_from_IDirectMusicBand(IDirectMusicBand *iface) { - return CONTAINING_RECORD(iface, IDirectMusicBandImpl, IDirectMusicBand_iface); + return CONTAINING_RECORD(iface, struct band, IDirectMusicBand_iface); } static HRESULT WINAPI band_QueryInterface(IDirectMusicBand *iface, REFIID riid, void **ret_iface) { - IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); + struct band *This = impl_from_IDirectMusicBand(iface); TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ret_iface); @@ -65,7 +62,7 @@ static HRESULT WINAPI band_QueryInterface(IDirectMusicBand *iface, REFIID riid, static ULONG WINAPI band_AddRef(IDirectMusicBand *iface) { - IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); + struct band *This = impl_from_IDirectMusicBand(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%ld\n", This, ref); @@ -75,7 +72,7 @@ static ULONG WINAPI band_AddRef(IDirectMusicBand *iface) static ULONG WINAPI band_Release(IDirectMusicBand *iface) { - IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); + struct band *This = impl_from_IDirectMusicBand(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%ld\n", This, ref); @@ -88,7 +85,7 @@ static ULONG WINAPI band_Release(IDirectMusicBand *iface) static HRESULT WINAPI band_CreateSegment(IDirectMusicBand *iface, IDirectMusicSegment **segment) { - IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); + struct band *This = impl_from_IDirectMusicBand(iface); HRESULT hr; DMUS_BAND_PARAM bandparam; @@ -112,7 +109,7 @@ static HRESULT WINAPI band_CreateSegment(IDirectMusicBand *iface, static HRESULT WINAPI band_Download(IDirectMusicBand *iface, IDirectMusicPerformance *pPerformance) { - IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); + struct band *This = impl_from_IDirectMusicBand(iface); FIXME("(%p, %p): stub\n", This, pPerformance); return S_OK; } @@ -120,7 +117,7 @@ static HRESULT WINAPI band_Download(IDirectMusicBand *iface, static HRESULT WINAPI band_Unload(IDirectMusicBand *iface, IDirectMusicPerformance *pPerformance) { - IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); + struct band *This = impl_from_IDirectMusicBand(iface); FIXME("(%p, %p): stub\n", This, pPerformance); return S_OK; } @@ -186,7 +183,7 @@ static const IDirectMusicObjectVtbl band_object_vtbl = #define DMUS_IO_INSTRUMENT_DX7_SIZE offsetof(DMUS_IO_INSTRUMENT, nPitchBendRange) -static HRESULT parse_instrument(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK *pChunk, +static HRESULT parse_instrument(struct band *This, DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm) { DMUS_PRIVATE_CHUNK Chunk; @@ -293,7 +290,7 @@ static HRESULT parse_instrument(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK * return S_OK; } -static HRESULT parse_instruments_list(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK *pChunk, +static HRESULT parse_instruments_list(struct band *This, DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm) { HRESULT hr; @@ -348,7 +345,7 @@ static HRESULT parse_instruments_list(IDirectMusicBandImpl *This, DMUS_PRIVATE_C return S_OK; } -static HRESULT parse_band_form(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK *pChunk, +static HRESULT parse_band_form(struct band *This, DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm) { HRESULT hr = E_FAIL; @@ -441,14 +438,14 @@ static HRESULT parse_band_form(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK *p return S_OK; } -static inline IDirectMusicBandImpl *impl_from_IPersistStream(IPersistStream *iface) +static inline struct band *impl_from_IPersistStream(IPersistStream *iface) { - return CONTAINING_RECORD(iface, IDirectMusicBandImpl, dmobj.IPersistStream_iface); + return CONTAINING_RECORD(iface, struct band, dmobj.IPersistStream_iface); } static HRESULT WINAPI band_persist_stream_Load(IPersistStream *iface, IStream *pStm) { - IDirectMusicBandImpl *This = impl_from_IPersistStream(iface); + struct band *This = impl_from_IPersistStream(iface); DMUS_PRIVATE_CHUNK Chunk; LARGE_INTEGER liMove; HRESULT hr; @@ -503,7 +500,7 @@ static const IPersistStreamVtbl band_persist_stream_vtbl = HRESULT create_dmband(REFIID lpcGUID, void **ppobj) { - IDirectMusicBandImpl* obj; + struct band* obj; HRESULT hr; *ppobj = NULL; diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index bdb9344b064..bf494d39df2 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -1,5 +1,4 @@ -/* IDirectMusicBandTrack Implementation - * +/* * Copyright (C) 2003-2004 Rok Mandeljc * * This program is free software; you can redistribute it and/or

1 0

Martin Storsjö : include: Update the d3d12 headers from vkd3d.
by Alexandre Julliard 19 Sep '23

19 Sep '23

Module: wine Branch: master Commit: 9a3266537d7c074c589e28dcaa5c41d64b5d515e URL: https://gitlab.winehq.org/wine/wine/-/commit/9a3266537d7c074c589e28dcaa5c41… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Sep 19 13:45:22 2023 +0300 include: Update the d3d12 headers from vkd3d. This corresponds to vkd3d as of commit e597b0d80f39f716a8740cb0be55edc78f4599d6. This brings in a function signature fix for the implementation of ID3D12CommandQueue::UpdateTileMappings() as well, from vkd3d commit e98e6c9b530995e68bd019a3319d90223ed864cf. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- include/d3d12.idl | 2648 +++++++++++++++++++++++++++++++++++++-- libs/vkd3d/libs/vkd3d/command.c | 2 +- 2 files changed, 2568 insertions(+), 82 deletions(-)

1 0

Yuxuan Shui : gdi32: Make GetStockObject hotpatchable.
by Alexandre Julliard 19 Sep '23

19 Sep '23

Module: wine Branch: master Commit: 74027f37311098859b1b279384e79dabb9468546 URL: https://gitlab.winehq.org/wine/wine/-/commit/74027f37311098859b1b279384e79d… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Fri Sep 15 12:30:36 2023 +0100 gdi32: Make GetStockObject hotpatchable. Needed for ntlea. --- dlls/gdi32/objects.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 42bf6fcf111..070ce9c3885 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -418,7 +418,7 @@ HGDIOBJ WINAPI GetCurrentObject( HDC hdc, UINT type ) /*********************************************************************** * GetStockObject (GDI32.@) */ -HGDIOBJ WINAPI GetStockObject( INT obj ) +HGDIOBJ WINAPI DECLSPEC_HOTPATCH GetStockObject( INT obj ) { if (obj < 0 || obj > STOCK_LAST + 1 || obj == 9) return 0;

1 0

Yuxuan Shui : user32: Make CallWindowProcA hotpatchable.
by Alexandre Julliard 19 Sep '23

19 Sep '23

Module: wine Branch: master Commit: 2508bb83633c7732bab376da2e4d9f8da2a1a00b URL: https://gitlab.winehq.org/wine/wine/-/commit/2508bb83633c7732bab376da2e4d9f… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Fri Sep 15 12:31:15 2023 +0100 user32: Make CallWindowProcA hotpatchable. Needed for ntlea. --- dlls/user32/winproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 5ab85eb81cd..8804199aed1 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -860,7 +860,7 @@ BOOL WINAPI User32CallSendAsyncCallback( const struct send_async_params *params, * * ECMA-234, Win32 */ -LRESULT WINAPI CallWindowProcA( WNDPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +LRESULT WINAPI DECLSPEC_HOTPATCH CallWindowProcA( WNDPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { struct win_proc_params params;

1 0

Yuxuan Shui : user32: Add hotpatchable wrapper for GetWindowLongA.
by Alexandre Julliard 19 Sep '23

19 Sep '23

Module: wine Branch: master Commit: f9f9481b67f7ecddd7cb5ddd308a9338d26445e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/f9f9481b67f7ecddd7cb5ddd308a93… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Fri Sep 15 12:32:06 2023 +0100 user32: Add hotpatchable wrapper for GetWindowLongA. ntlea for some reason expects GetWindowLongA to start with a "push $-2", and will try to skip over this instruction. If we don't anticipate this, it will ended up either skipping over critical instructions, or on a desync address. --- dlls/user32/win.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 28cf40441d9..7eaaa41e951 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -888,7 +888,28 @@ WORD WINAPI GetWindowWord( HWND hwnd, INT offset ) /********************************************************************** * GetWindowLongA (USER32.@) */ -LONG WINAPI GetWindowLongA( HWND hwnd, INT offset ) + +#ifdef __i386__ + +/* This wrapper is here to workaround a ntlea quirk. First of all, ntlea + * checks whether GetWindowLongA starts with the Win32 hotpatchable prologue, + * if it can find that, it will use a hooking strategy more difficult for us + * to deal with. Secondly, it assumes what follows the prologue is a `pushl $-2`, + * and will try to skip over this instruction when calling `GetWindowLongA`, + * (i.e. it tries to jump to `GetWindowLongA + 7`, 5 bytes for the prologue, 2 + * bytes for the `pushl`.). We have to anticipate that and make sure the result + * of doing this won't be a messed up stack, or a desynced PC. + */ +__ASM_STDCALL_FUNC( GetWindowLongA, 8, + ".byte 0x8b, 0xff, 0x55, 0x8b, 0xec\n" /* Win32 hotpatchable prologue. */ + "pushl $-2\n" + "addl $4, %esp\n" + "popl %ebp\n" + "jmp " __ASM_STDCALL("get_window_longA", 8) ) +LONG WINAPI get_window_longA( HWND hwnd, INT offset ) +#else +LONG WINAPI DECLSPEC_HOTPATCH GetWindowLongA( HWND hwnd, INT offset ) +#endif { switch (offset) {

1 0

Joel Holdsworth : include: Add flags to FILE_RENAME_INFORMATION used by FileRenameInformationEx.
by Alexandre Julliard 19 Sep '23

19 Sep '23

Module: wine Branch: master Commit: f112dde0e7f8910bf986cd28864cb40b84e14d24 URL: https://gitlab.winehq.org/wine/wine/-/commit/f112dde0e7f8910bf986cd28864cb4… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sat Jul 8 13:12:27 2023 +0100 include: Add flags to FILE_RENAME_INFORMATION used by FileRenameInformationEx. Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- include/winbase.h | 5 ++++- include/winternl.h | 14 +++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 135c2603a70..4429fac21c7 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -876,7 +876,10 @@ typedef struct _FILE_END_OF_FILE_INFO { } FILE_END_OF_FILE_INFO, *PFILE_END_OF_FILE_INFO; typedef struct _FILE_RENAME_INFO { - BOOLEAN ReplaceIfExists; + union { + BOOLEAN ReplaceIfExists; + DWORD Flags; + } DUMMYUNIONNAME; HANDLE RootDirectory; DWORD FileNameLength; WCHAR FileName[1]; diff --git a/include/winternl.h b/include/winternl.h index a233d8008ee..eadb36aa028 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1432,12 +1432,24 @@ typedef struct _FILE_NAME_INFORMATION { } FILE_NAME_INFORMATION, *PFILE_NAME_INFORMATION; typedef struct _FILE_RENAME_INFORMATION { - BOOLEAN ReplaceIfExists; + union { + BOOLEAN ReplaceIfExists; + ULONG Flags; + } DUMMYUNIONNAME; HANDLE RootDirectory; ULONG FileNameLength; WCHAR FileName[1]; } FILE_RENAME_INFORMATION, *PFILE_RENAME_INFORMATION; +#define FILE_RENAME_REPLACE_IF_EXISTS 0x00000001 +#define FILE_RENAME_POSIX_SEMANTICS 0x00000002 +#define FILE_RENAME_SUPPRESS_PIN_STATE_INHERITANCE 0x00000004 +#define FILE_RENAME_SUPPRESS_STORAGE_RESERVE_INHERITANCE 0x00000008 +#define FILE_RENAME_NO_INCREASE_AVAILABLE_SPACE 0x00000010 +#define FILE_RENAME_NO_DECREASE_AVAILABLE_SPACE 0x00000020 +#define FILE_RENAME_PRESERVE_AVAILABLE_SPACE 0x00000030 +#define FILE_RENAME_IGNORE_READONLY_ATTRIBUTE 0x00000040 + typedef struct _FILE_LINK_INFORMATION { BOOLEAN ReplaceIfExists; HANDLE RootDirectory;

1 0

Joel Holdsworth : ntdll/tests: Test both FileRenameInformation and FileRenameInformationEx in test_file_rename_information.
by Alexandre Julliard 19 Sep '23

19 Sep '23

Module: wine Branch: master Commit: 67479f8c2fc03c2043b8414bc063e671e36fdbda URL: https://gitlab.winehq.org/wine/wine/-/commit/67479f8c2fc03c2043b8414bc063e6… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Fri Sep 15 17:49:52 2023 +0100 ntdll/tests: Test both FileRenameInformation and FileRenameInformationEx in test_file_rename_information. Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- dlls/ntdll/tests/file.c | 123 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 83 insertions(+), 40 deletions(-)

1 0