September 2023 - Wine-Commits

Rémi Bernon : dmstyle: Use PARENTSRC with dmusic.
by Alexandre Julliard Sept. 12, 2023

Sept. 12, 2023

Module: wine Branch: master Commit: 31980e74501b39490d20782bd36693ae2370668f URL: https://gitlab.winehq.org/wine/wine/-/commit/31980e74501b39490d20782bd36693… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 30 19:53:42 2023 +0200 dmstyle: Use PARENTSRC with dmusic. --- dlls/dmstyle/Makefile.in | 1 + dlls/dmstyle/dmobject.c | 732 ----------------------------------------------- dlls/dmstyle/dmobject.h | 124 -------- 3 files changed, 1 insertion(+), 856 deletions(-)

1 0

Rémi Bernon : dmband: Use PARENTSRC with dmusic.
by Alexandre Julliard Sept. 12, 2023

Sept. 12, 2023

Module: wine Branch: master Commit: 649de392194c83841b2e6f0c03a34c3b370ebf2a URL: https://gitlab.winehq.org/wine/wine/-/commit/649de392194c83841b2e6f0c03a34c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 30 19:57:16 2023 +0200 dmband: Use PARENTSRC with dmusic. --- dlls/dmband/Makefile.in | 1 + dlls/dmband/dmobject.c | 732 ------------------------------------------------ dlls/dmband/dmobject.h | 124 -------- 3 files changed, 1 insertion(+), 856 deletions(-)

1 0

Rémi Bernon : dswave: Always return S_FALSE from DllCanUnloadNow.
by Alexandre Julliard Sept. 12, 2023

Sept. 12, 2023

Module: wine Branch: master Commit: 65f25a150fe19eb883cae89327960d63a22afab5 URL: https://gitlab.winehq.org/wine/wine/-/commit/65f25a150fe19eb883cae89327960d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 22 17:36:49 2023 +0200 dswave: Always return S_FALSE from DllCanUnloadNow. --- dlls/dswave/dswave.c | 2 -- dlls/dswave/dswave_main.c | 23 ----------------------- dlls/dswave/dswave_private.h | 7 ------- 3 files changed, 32 deletions(-) diff --git a/dlls/dswave/dswave.c b/dlls/dswave/dswave.c index e6d85d738fe..8e06fc8d13d 100644 --- a/dlls/dswave/dswave.c +++ b/dlls/dswave/dswave.c @@ -86,7 +86,6 @@ static ULONG WINAPI IUnknownImpl_Release(IUnknown *iface) if (!ref) { HeapFree(GetProcessHeap(), 0, This); - DSWAVE_UnlockModule(); } return ref; @@ -191,7 +190,6 @@ HRESULT create_dswave(REFIID lpcGUID, void **ppobj) obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl; obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - DSWAVE_LockModule(); hr = IUnknown_QueryInterface(&obj->IUnknown_iface, lpcGUID, ppobj); IUnknown_Release(&obj->IUnknown_iface); return hr; diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c index 81dcc73de85..f2ce7bb950f 100644 --- a/dlls/dswave/dswave_main.c +++ b/dlls/dswave/dswave_main.c @@ -39,8 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dswave); -LONG DSWAVE_refCount = 0; - typedef struct { IClassFactory IClassFactory_iface; } IClassFactoryImpl; @@ -70,15 +68,11 @@ static HRESULT WINAPI WaveCF_QueryInterface(IClassFactory * iface, REFIID riid, static ULONG WINAPI WaveCF_AddRef(IClassFactory * iface) { - DSWAVE_LockModule(); - return 2; /* non-heap based object */ } static ULONG WINAPI WaveCF_Release(IClassFactory * iface) { - DSWAVE_UnlockModule(); - return 1; /* non-heap based object */ } @@ -98,12 +92,6 @@ static HRESULT WINAPI WaveCF_CreateInstance(IClassFactory * iface, IUnknown *out static HRESULT WINAPI WaveCF_LockServer(IClassFactory * iface, BOOL dolock) { TRACE("(%d)\n", dolock); - - if (dolock) - DSWAVE_LockModule(); - else - DSWAVE_UnlockModule(); - return S_OK; } @@ -117,17 +105,6 @@ static const IClassFactoryVtbl WaveCF_Vtbl = { static IClassFactoryImpl Wave_CF = {{&WaveCF_Vtbl}}; -/****************************************************************** - * DllCanUnloadNow (DSWAVE.@) - * - * - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return DSWAVE_refCount != 0 ? S_FALSE : S_OK; -} - - /****************************************************************** * DllGetClassObject (DSWAVE.@) * diff --git a/dlls/dswave/dswave_private.h b/dlls/dswave/dswave_private.h index a7758a970bc..50406c676c1 100644 --- a/dlls/dswave/dswave_private.h +++ b/dlls/dswave/dswave_private.h @@ -44,11 +44,4 @@ */ extern HRESULT create_dswave(REFIID lpcGUID, void **ret_iface); -/********************************************************************** - * Dll lifetime tracking declaration for dswave.dll - */ -extern LONG DSWAVE_refCount; -static inline void DSWAVE_LockModule(void) { InterlockedIncrement( &DSWAVE_refCount ); } -static inline void DSWAVE_UnlockModule(void) { InterlockedDecrement( &DSWAVE_refCount ); } - #endif /* __WINE_DSWAVE_PRIVATE_H */

1 0

Rémi Bernon : dswave: Use PARENTSRC with dmusic.
by Alexandre Julliard Sept. 12, 2023

Sept. 12, 2023

Module: wine Branch: master Commit: b27a036eaf9ca599e24d840f4b3aa0dab9a0040a URL: https://gitlab.winehq.org/wine/wine/-/commit/b27a036eaf9ca599e24d840f4b3aa0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 30 19:52:16 2023 +0200 dswave: Use PARENTSRC with dmusic. --- dlls/dswave/Makefile.in | 1 + dlls/dswave/dmobject.c | 733 ------------------------------------------------ dlls/dswave/dmobject.h | 124 -------- 3 files changed, 1 insertion(+), 857 deletions(-)

1 0

Rémi Bernon : dswave: Use CRT allocation functions.
by Alexandre Julliard Sept. 12, 2023

Sept. 12, 2023

Module: wine Branch: master Commit: 8bcaec25529104d1e53fdd1242cb5ae211db411e URL: https://gitlab.winehq.org/wine/wine/-/commit/8bcaec25529104d1e53fdd1242cb5a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Sep 9 09:30:46 2023 +0200 dswave: Use CRT allocation functions. --- dlls/dswave/dswave.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/dswave/dswave.c b/dlls/dswave/dswave.c index 8e06fc8d13d..5bdd83dfa2c 100644 --- a/dlls/dswave/dswave.c +++ b/dlls/dswave/dswave.c @@ -84,9 +84,7 @@ static ULONG WINAPI IUnknownImpl_Release(IUnknown *iface) TRACE("(%p) ref=%ld\n", This, ref); - if (!ref) { - HeapFree(GetProcessHeap(), 0, This); - } + if (!ref) free(This); return ref; } @@ -179,11 +177,8 @@ HRESULT create_dswave(REFIID lpcGUID, void **ppobj) IDirectMusicWaveImpl *obj; HRESULT hr; - obj = HeapAlloc(GetProcessHeap(), 0, sizeof(IDirectMusicWaveImpl)); - if (!obj) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } + *ppobj = NULL; + if (!(obj = calloc(1, sizeof(*obj)))) return E_OUTOFMEMORY; obj->IUnknown_iface.lpVtbl = &unknown_vtbl; obj->ref = 1; dmobject_init(&obj->dmobj, &CLSID_DirectSoundWave, &obj->IUnknown_iface);

1 0

Rémi Bernon : dmstyle: Awlays return S_FALSE from DllCanUnloadNow.
by Alexandre Julliard Sept. 12, 2023

Sept. 12, 2023

Module: wine Branch: master Commit: 994bcb48421c94949eed9f931aeae965dad2a9a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/994bcb48421c94949eed9f931aeae9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 22 17:43:30 2023 +0200 dmstyle: Awlays return S_FALSE from DllCanUnloadNow. --- dlls/dmstyle/auditiontrack.c | 2 -- dlls/dmstyle/chordtrack.c | 2 -- dlls/dmstyle/commandtrack.c | 2 -- dlls/dmstyle/dmstyle_main.c | 21 --------------------- dlls/dmstyle/dmstyle_private.h | 7 ------- dlls/dmstyle/motiftrack.c | 2 -- dlls/dmstyle/mutetrack.c | 2 -- dlls/dmstyle/style.c | 2 -- dlls/dmstyle/styletrack.c | 2 -- 9 files changed, 42 deletions(-) diff --git a/dlls/dmstyle/auditiontrack.c b/dlls/dmstyle/auditiontrack.c index 0bf1c818f6c..f324d18cecc 100644 --- a/dlls/dmstyle/auditiontrack.c +++ b/dlls/dmstyle/auditiontrack.c @@ -79,7 +79,6 @@ static ULONG WINAPI audition_track_Release(IDirectMusicTrack8 *iface) if (!ref) { HeapFree(GetProcessHeap(), 0, This); - DMSTYLE_UnlockModule(); } return ref; @@ -332,7 +331,6 @@ HRESULT create_dmauditiontrack(REFIID lpcGUID, void **ppobj) (IUnknown *)&track->IDirectMusicTrack8_iface); track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - DMSTYLE_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface); diff --git a/dlls/dmstyle/chordtrack.c b/dlls/dmstyle/chordtrack.c index fdaecac1240..01511963a40 100644 --- a/dlls/dmstyle/chordtrack.c +++ b/dlls/dmstyle/chordtrack.c @@ -82,7 +82,6 @@ static ULONG WINAPI chord_track_Release(IDirectMusicTrack8 *iface) if (!ref) { HeapFree(GetProcessHeap(), 0, This); - DMSTYLE_UnlockModule(); } return ref; @@ -431,7 +430,6 @@ HRESULT create_dmchordtrack(REFIID lpcGUID, void **ppobj) (IUnknown *)&track->IDirectMusicTrack8_iface); track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - DMSTYLE_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface); diff --git a/dlls/dmstyle/commandtrack.c b/dlls/dmstyle/commandtrack.c index 32e0bbe8c0d..02b32bc41e6 100644 --- a/dlls/dmstyle/commandtrack.c +++ b/dlls/dmstyle/commandtrack.c @@ -81,7 +81,6 @@ static ULONG WINAPI command_track_Release(IDirectMusicTrack8 *iface) if (!ref) { HeapFree(GetProcessHeap(), 0, This); - DMSTYLE_UnlockModule(); } return ref; @@ -385,7 +384,6 @@ HRESULT create_dmcommandtrack(REFIID lpcGUID, void **ppobj) track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; list_init (&track->Commands); - DMSTYLE_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface); diff --git a/dlls/dmstyle/dmstyle_main.c b/dlls/dmstyle/dmstyle_main.c index 8f951ece5ae..9d96ab3930e 100644 --- a/dlls/dmstyle/dmstyle_main.c +++ b/dlls/dmstyle/dmstyle_main.c @@ -37,8 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmstyle); -LONG DMSTYLE_refCount = 0; - typedef struct { IClassFactory IClassFactory_iface; HRESULT (*fnCreateInstance)(REFIID riid, void **ret_iface); @@ -81,15 +79,11 @@ static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID r static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) { - DMSTYLE_LockModule(); - return 2; /* non-heap based object */ } static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) { - DMSTYLE_UnlockModule(); - return 1; /* non-heap based object */ } @@ -111,12 +105,6 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) { TRACE("(%d)\n", dolock); - - if (dolock) - DMSTYLE_LockModule(); - else - DMSTYLE_UnlockModule(); - return S_OK; } @@ -137,15 +125,6 @@ static IClassFactoryImpl MotifTrack_CF = {{&classfactory_vtbl}, create_dmmotiftr static IClassFactoryImpl AuditionTrack_CF = {{&classfactory_vtbl}, create_dmauditiontrack}; static IClassFactoryImpl MuteTrack_CF = {{&classfactory_vtbl}, create_dmmutetrack}; -/****************************************************************** - * DllCanUnloadNow (DMSTYLE.1) - * - * - */ -HRESULT WINAPI DllCanUnloadNow(void) { - return DMSTYLE_refCount != 0 ? S_FALSE : S_OK; -} - /****************************************************************** * DllGetClassObject (DMSTYLE.@) diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h index 2807e98fe61..5237368b44e 100644 --- a/dlls/dmstyle/dmstyle_private.h +++ b/dlls/dmstyle/dmstyle_private.h @@ -61,13 +61,6 @@ typedef struct _DMUS_PRIVATE_COMMAND { IDirectMusicCollection* ppReferenceCollection; } DMUS_PRIVATE_COMMAND, *LPDMUS_PRIVATE_COMMAND; -/********************************************************************** - * Dll lifetime tracking declaration for dmstyle.dll - */ -extern LONG DMSTYLE_refCount; -static inline void DMSTYLE_LockModule(void) { InterlockedIncrement( &DMSTYLE_refCount ); } -static inline void DMSTYLE_UnlockModule(void) { InterlockedDecrement( &DMSTYLE_refCount ); } - /***************************************************************************** * Misc. */ diff --git a/dlls/dmstyle/motiftrack.c b/dlls/dmstyle/motiftrack.c index 5efe90706e0..93bfd821e56 100644 --- a/dlls/dmstyle/motiftrack.c +++ b/dlls/dmstyle/motiftrack.c @@ -79,7 +79,6 @@ static ULONG WINAPI motif_track_Release(IDirectMusicTrack8 *iface) if (!ref) { HeapFree(GetProcessHeap(), 0, This); - DMSTYLE_UnlockModule(); } return ref; @@ -304,7 +303,6 @@ HRESULT create_dmmotiftrack(REFIID lpcGUID, void **ppobj) (IUnknown *)&track->IDirectMusicTrack8_iface); track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - DMSTYLE_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface); diff --git a/dlls/dmstyle/mutetrack.c b/dlls/dmstyle/mutetrack.c index 2248d7151dd..3f632709397 100644 --- a/dlls/dmstyle/mutetrack.c +++ b/dlls/dmstyle/mutetrack.c @@ -79,7 +79,6 @@ static ULONG WINAPI mute_track_Release(IDirectMusicTrack8 *iface) if (!ref) { HeapFree(GetProcessHeap(), 0, This); - DMSTYLE_UnlockModule(); } return ref; @@ -313,7 +312,6 @@ HRESULT create_dmmutetrack(REFIID lpcGUID, void **ppobj) (IUnknown *)&track->IDirectMusicTrack8_iface); track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - DMSTYLE_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface); diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 23e32a75fd0..57350470e81 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -127,7 +127,6 @@ static ULONG WINAPI IDirectMusicStyle8Impl_Release(IDirectMusicStyle8 *iface) heap_free(motif); } heap_free(This); - DMSTYLE_UnlockModule(); } return ref; @@ -991,7 +990,6 @@ HRESULT create_dmstyle(REFIID lpcGUID, void **ppobj) list_init(&obj->bands); list_init(&obj->motifs); - DMSTYLE_LockModule(); hr = IDirectMusicStyle8_QueryInterface(&obj->IDirectMusicStyle8_iface, lpcGUID, ppobj); IDirectMusicStyle8_Release(&obj->IDirectMusicStyle8_iface); diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c index 83b03807ddf..3618483749c 100644 --- a/dlls/dmstyle/styletrack.c +++ b/dlls/dmstyle/styletrack.c @@ -96,7 +96,6 @@ static ULONG WINAPI style_track_Release(IDirectMusicTrack8 *iface) } heap_free(This); - DMSTYLE_UnlockModule(); } return ref; @@ -403,7 +402,6 @@ HRESULT create_dmstyletrack(REFIID lpcGUID, void **ppobj) track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; list_init (&track->Items); - DMSTYLE_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface);

1 0

Rémi Bernon : dmband: Always return S_FALSE from DllCanUnloadNow.
by Alexandre Julliard Sept. 12, 2023

Sept. 12, 2023

Module: wine Branch: master Commit: c3ebc387f38815748bbc1b01199baa9ea44eb04a URL: https://gitlab.winehq.org/wine/wine/-/commit/c3ebc387f38815748bbc1b01199baa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 22 17:51:00 2023 +0200 dmband: Always return S_FALSE from DllCanUnloadNow. --- dlls/dmband/band.c | 2 -- dlls/dmband/bandtrack.c | 2 -- dlls/dmband/dmband_main.c | 22 ---------------------- dlls/dmband/dmband_private.h | 8 -------- 4 files changed, 34 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index d71863a1f9d..907377ebed5 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -83,7 +83,6 @@ static ULONG WINAPI IDirectMusicBandImpl_Release(IDirectMusicBand *iface) if (!ref) { HeapFree(GetProcessHeap(), 0, This); - DMBAND_UnlockModule(); } return ref; @@ -527,7 +526,6 @@ HRESULT create_dmband(REFIID lpcGUID, void **ppobj) obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; list_init (&obj->Instruments); - DMBAND_LockModule(); hr = IDirectMusicBand_QueryInterface(&obj->IDirectMusicBand_iface, lpcGUID, ppobj); IDirectMusicBand_Release(&obj->IDirectMusicBand_iface); diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 0142b5b5188..25aca207612 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -82,7 +82,6 @@ static ULONG WINAPI band_track_Release(IDirectMusicTrack8 *iface) if (!ref) { HeapFree(GetProcessHeap(), 0, This); - DMBAND_UnlockModule(); } return ref; @@ -650,7 +649,6 @@ HRESULT create_dmbandtrack(REFIID lpcGUID, void **ppobj) track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; list_init (&track->Bands); - DMBAND_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface); diff --git a/dlls/dmband/dmband_main.c b/dlls/dmband/dmband_main.c index c08f8b0a087..c032a931f31 100644 --- a/dlls/dmband/dmband_main.c +++ b/dlls/dmband/dmband_main.c @@ -23,8 +23,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmband); -LONG DMBAND_refCount = 0; - typedef struct { IClassFactory IClassFactory_iface; HRESULT (*fnCreateInstance)(REFIID riid, void **ret_iface); @@ -60,15 +58,11 @@ static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID r static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) { - DMBAND_LockModule(); - return 2; /* non-heap based object */ } static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) { - DMBAND_UnlockModule(); - return 1; /* non-heap based object */ } @@ -90,12 +84,6 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) { TRACE("(%d)\n", dolock); - - if (dolock) - DMBAND_LockModule(); - else - DMBAND_UnlockModule(); - return S_OK; } @@ -110,16 +98,6 @@ static const IClassFactoryVtbl classfactory_vtbl = { static IClassFactoryImpl Band_CF = {{&classfactory_vtbl}, create_dmband}; static IClassFactoryImpl BandTrack_CF = {{&classfactory_vtbl}, create_dmbandtrack}; -/****************************************************************** - * DllCanUnloadNow (DMBAND.@) - * - * - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return DMBAND_refCount != 0 ? S_FALSE : S_OK; -} - /****************************************************************** * DllGetClassObject (DMBAND.@) diff --git a/dlls/dmband/dmband_private.h b/dlls/dmband/dmband_private.h index b89dd08dd83..0b1807eaf93 100644 --- a/dlls/dmband/dmband_private.h +++ b/dlls/dmband/dmband_private.h @@ -73,14 +73,6 @@ typedef struct _DMUS_PRIVATE_BAND { IDirectMusicBand *band; } DMUS_PRIVATE_BAND, *LPDMUS_PRIVATE_BAND; - -/********************************************************************** - * Dll lifetime tracking declaration for dmband.dll - */ -extern LONG DMBAND_refCount; -static inline void DMBAND_LockModule(void) { InterlockedIncrement( &DMBAND_refCount ); } -static inline void DMBAND_UnlockModule(void) { InterlockedDecrement( &DMBAND_refCount ); } - /***************************************************************************** * Misc. */

1 0

Rémi Bernon : dmband: Use CRT allocation functions.
by Alexandre Julliard Sept. 12, 2023

Sept. 12, 2023

Module: wine Branch: master Commit: b60ee21fb2d657d2bf848925dfb8464bca6f0d9f URL: https://gitlab.winehq.org/wine/wine/-/commit/b60ee21fb2d657d2bf848925dfb846… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Sep 9 09:16:50 2023 +0200 dmband: Use CRT allocation functions. --- dlls/dmband/band.c | 20 +++++--------------- dlls/dmband/bandtrack.c | 18 +++++------------- dlls/dmband/dmobject.c | 7 +++---- 3 files changed, 13 insertions(+), 32 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index 907377ebed5..02e3573bab9 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -81,9 +81,7 @@ static ULONG WINAPI IDirectMusicBandImpl_Release(IDirectMusicBand *iface) TRACE("(%p) ref=%ld\n", This, ref); - if (!ref) { - HeapFree(GetProcessHeap(), 0, This); - } + if (!ref) free(This); return ref; } @@ -277,11 +275,7 @@ static HRESULT parse_instrument(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK * /* * @TODO insert pNewInstrument into This */ - pNewInstrument = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_INSTRUMENT)); - if (NULL == pNewInstrument) { - ERR(": no more memory\n"); - return E_OUTOFMEMORY; - } + if (!(pNewInstrument = calloc(1, sizeof(*pNewInstrument)))) return E_OUTOFMEMORY; memcpy(&pNewInstrument->pInstrument, &inst, sizeof(DMUS_IO_INSTRUMENT)); pNewInstrument->ppReferenceCollection = NULL; if (NULL != pObject) { @@ -289,8 +283,7 @@ static HRESULT parse_instrument(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK * hr = IDirectMusicObject_QueryInterface (pObject, &IID_IDirectMusicCollection, (void**) &pCol); if (FAILED(hr)) { ERR(": failed to get IDirectMusicCollection Interface from DMObject\n"); - HeapFree(GetProcessHeap(), 0, pNewInstrument); - + free(pNewInstrument); return hr; } pNewInstrument->ppReferenceCollection = pCol; @@ -514,11 +507,8 @@ HRESULT create_dmband(REFIID lpcGUID, void **ppobj) IDirectMusicBandImpl* obj; HRESULT hr; - obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicBandImpl)); - if (NULL == obj) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } + *ppobj = NULL; + if (!(obj = calloc(1, sizeof(*obj)))) return E_OUTOFMEMORY; obj->IDirectMusicBand_iface.lpVtbl = &dmband_vtbl; obj->ref = 1; dmobject_init(&obj->dmobj, &CLSID_DirectMusicBand, (IUnknown *)&obj->IDirectMusicBand_iface); diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 25aca207612..bdb9344b064 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -80,9 +80,7 @@ static ULONG WINAPI band_track_Release(IDirectMusicTrack8 *iface) TRACE("(%p) ref=%ld\n", This, ref); - if (!ref) { - HeapFree(GetProcessHeap(), 0, This); - } + if (!ref) free(This); return ref; } @@ -344,11 +342,8 @@ static HRESULT load_band(IDirectMusicBandTrack *This, IStream *pClonedStream, * @TODO insert pBand into This */ if (SUCCEEDED(hr)) { - LPDMUS_PRIVATE_BAND pNewBand = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_BAND)); - if (NULL == pNewBand) { - ERR(": no more memory\n"); - return E_OUTOFMEMORY; - } + LPDMUS_PRIVATE_BAND pNewBand; + if (!(pNewBand = calloc(1, sizeof(*pNewBand)))) return E_OUTOFMEMORY; pNewBand->BandHeader = *pHeader; pNewBand->band = *ppBand; IDirectMusicBand_AddRef(*ppBand); @@ -637,11 +632,8 @@ HRESULT create_dmbandtrack(REFIID lpcGUID, void **ppobj) IDirectMusicBandTrack *track; HRESULT hr; - track = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*track)); - if (!track) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } + *ppobj = NULL; + if (!(track = calloc(1, sizeof(*track)))) return E_OUTOFMEMORY; track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; track->ref = 1; dmobject_init(&track->dmobj, &CLSID_DirectMusicBandTrack, diff --git a/dlls/dmband/dmobject.c b/dlls/dmband/dmobject.c index b526b23d031..07d887a376c 100644 --- a/dlls/dmband/dmobject.c +++ b/dlls/dmband/dmobject.c @@ -28,7 +28,6 @@ #include "dmusics.h" #include "dmobject.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(dmobj); WINE_DECLARE_DEBUG_CHANNEL(dmfile); @@ -375,7 +374,7 @@ HRESULT stream_next_chunk(IStream *stream, struct chunk_entry *chunk) /* Reads chunk data of the form: DWORD - size of array element element[] - Array of elements - The caller needs to heap_free() the array. + The caller needs to free() the array. */ HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk, void **array, unsigned int *count, DWORD elem_size) @@ -400,10 +399,10 @@ HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk, *count = (chunk->size - sizeof(DWORD)) / elem_size; size = *count * elem_size; - if (!(*array = heap_alloc(size))) + if (!(*array = malloc(size))) return E_OUTOFMEMORY; if (FAILED(hr = stream_read(stream, *array, size))) { - heap_free(*array); + free(*array); *array = NULL; return hr; }

1 0

Alexandre Julliard : win32u: Use the correct length for kernel object names in object attributes.
by Alexandre Julliard Sept. 12, 2023

Sept. 12, 2023

Module: wine Branch: master Commit: d76f5b4ab9b3a298529bc6449dca7e47cd7c4c6e URL: https://gitlab.winehq.org/wine/wine/-/commit/d76f5b4ab9b3a298529bc6449dca7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 12 10:00:24 2023 +0200 win32u: Use the correct length for kernel object names in object attributes. --- dlls/win32u/sysparams.c | 3 ++- dlls/win32u/winstation.c | 3 ++- dlls/winex11.drv/x11drv_main.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index fed309ff3d8..5506abac7c6 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -450,7 +450,8 @@ static HANDLE get_display_device_init_mutex( void ) snprintf( buffer, ARRAY_SIZE(buffer), "\\Sessions\\%u\\BaseNamedObjects\\display_device_init", (int)NtCurrentTeb()->Peb->SessionId ); - name.Length = name.MaximumLength = asciiz_to_unicode( bufferW, buffer ); + name.MaximumLength = asciiz_to_unicode( bufferW, buffer ); + name.Length = name.MaximumLength - sizeof(WCHAR); InitializeObjectAttributes( &attr, &name, OBJ_OPENIF, NULL, NULL ); if (NtCreateMutant( &mutex, MUTEX_ALL_ACCESS, &attr, FALSE ) < 0) return 0; diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c index 5d1d5254ae1..b187b246941 100644 --- a/dlls/win32u/winstation.c +++ b/dlls/win32u/winstation.c @@ -554,7 +554,8 @@ static HANDLE get_winstations_dir_handle(void) sprintf( bufferA, "\\Sessions\\%u\\Windows\\WindowStations", (int)NtCurrentTeb()->Peb->SessionId ); str.Buffer = buffer; - str.Length = str.MaximumLength = asciiz_to_unicode( buffer, bufferA ) - sizeof(WCHAR); + str.MaximumLength = asciiz_to_unicode( buffer, bufferA ); + str.Length = str.MaximumLength - sizeof(WCHAR); InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); status = NtOpenDirectoryObject( &dir, DIRECTORY_CREATE_OBJECT | DIRECTORY_TRAVERSE, &attr ); return status ? 0 : dir; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index c4d537d6ada..32a20e0e4f2 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -1008,7 +1008,8 @@ static HANDLE get_display_device_init_mutex(void) snprintf( buffer, ARRAY_SIZE(buffer), "\\Sessions\\%u\\BaseNamedObjects\\display_device_init", (int)NtCurrentTeb()->Peb->SessionId ); - name.Length = name.MaximumLength = asciiz_to_unicode( bufferW, buffer ); + name.MaximumLength = asciiz_to_unicode( bufferW, buffer ); + name.Length = name.MaximumLength - sizeof(WCHAR); InitializeObjectAttributes( &attr, &name, OBJ_OPENIF, NULL, NULL ); if (NtCreateMutant( &mutex, MUTEX_ALL_ACCESS, &attr, FALSE ) < 0) return 0;

1 0

Alexandre Julliard : wow64: Don't add MEM_RESERVE for invalid flags combinations.
by Alexandre Julliard Sept. 12, 2023

Sept. 12, 2023

Module: wine Branch: master Commit: f41ac64a73d84c5b49ef733cd39aaf2be9d69ca5 URL: https://gitlab.winehq.org/wine/wine/-/commit/f41ac64a73d84c5b49ef733cd39aaf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 12 15:53:41 2023 +0200 wow64: Don't add MEM_RESERVE for invalid flags combinations. --- dlls/ntdll/tests/wow64.c | 14 ++++++++++++++ dlls/wow64/virtual.c | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 12ad7329816..07375f16082 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -407,6 +407,20 @@ static void test_cross_process_notifications( HANDLE process, void *ptr ) } ok( !entry, "not at end of list\n" ); + addr = NULL; + size = 0x321; + status = NtAllocateVirtualMemory( process, &addr, 0, &size, 0, PAGE_EXECUTE_READ ); + ok( status == STATUS_INVALID_PARAMETER, "NtAllocateVirtualMemory failed %lx\n", status ); + entry = pop_from_work_list( &list->work_list ); + if (current_machine != IMAGE_FILE_MACHINE_ARM64) + { + entry = expect_cross_work_entry( list, entry, CrossProcessPreVirtualAlloc, addr, 0x321, + 0, PAGE_EXECUTE_READ, 0, 0xcccccccc ); + entry = expect_cross_work_entry( list, entry, CrossProcessPostVirtualAlloc, addr, 0x321, + 0, PAGE_EXECUTE_READ, status, 0xcccccccc ); + } + ok( !entry, "not at end of list\n" ); + addr = NULL; size = 0x4321; status = NtAllocateVirtualMemory( process, &addr, 0, &size, MEM_RESERVE, PAGE_EXECUTE_READWRITE ); diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index e497f60210e..412c79abb14 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -153,7 +153,7 @@ NTSTATUS WINAPI wow64_NtAllocateVirtualMemory( UINT *args ) BOOL is_current = RtlIsCurrentProcess( process ); NTSTATUS status; - if (!addr) type |= MEM_RESERVE; + if (!addr && (type & MEM_COMMIT)) type |= MEM_RESERVE; if (!is_current) send_cross_process_notification( process, CrossProcessPreVirtualAlloc,

1 0