September 2023 - Wine-commits

Brendan Shanks : dwrite: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: e8ea81cf7a0cabb8655e1c14d84328a1ba813fb3 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8ea81cf7a0cabb8655e1c14d84328… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Sep 13 15:15:11 2023 -0700 dwrite: Ensure unixlib function tables and enum stay in sync. --- dlls/dwrite/freetype.c | 4 ++++ dlls/dwrite/unixlib.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index f50cf36fc18..181b6437f37 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -815,6 +815,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = get_design_glyph_metrics, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); + #ifdef _WIN64 typedef ULONG PTR32; @@ -1041,4 +1043,6 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = wow64_get_design_glyph_metrics, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_wow64_funcs) == unix_funcs_count ); + #endif /* _WIN64 */ diff --git a/dlls/dwrite/unixlib.h b/dlls/dwrite/unixlib.h index 33a9690b160..1b9938f08c5 100644 --- a/dlls/dwrite/unixlib.h +++ b/dlls/dwrite/unixlib.h @@ -107,6 +107,7 @@ enum font_backend_funcs unix_get_glyph_bbox, unix_get_glyph_bitmap, unix_get_design_glyph_metrics, + unix_funcs_count, }; #define UNIX_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params )

1 0

Brendan Shanks : winspool.drv: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: c95ec7236c8d7133ebe5099724ebb4c32612085a URL: https://gitlab.winehq.org/wine/wine/-/commit/c95ec7236c8d7133ebe5099724ebb4… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Sep 13 15:33:23 2023 -0700 winspool.drv: Ensure unixlib function tables and enum stay in sync. --- dlls/winspool.drv/cups.c | 4 ++++ dlls/winspool.drv/wspool.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/winspool.drv/cups.c b/dlls/winspool.drv/cups.c index 1034277aad6..6ad270709cc 100644 --- a/dlls/winspool.drv/cups.c +++ b/dlls/winspool.drv/cups.c @@ -433,6 +433,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = get_ppd, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); + #ifdef _WIN64 typedef ULONG PTR32; @@ -523,4 +525,6 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = wow64_get_ppd, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_wow64_funcs) == unix_funcs_count ); + #endif /* _WIN64 */ diff --git a/dlls/winspool.drv/wspool.h b/dlls/winspool.drv/wspool.h index 6a8a4fee1a8..29a459ed91c 100644 --- a/dlls/winspool.drv/wspool.h +++ b/dlls/winspool.drv/wspool.h @@ -72,4 +72,5 @@ enum cups_funcs unix_enum_printers, unix_get_default_page_size, unix_get_ppd, + unix_funcs_count, };

1 0

Brendan Shanks : bcrypt: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: 2fd33f6ce10f67cfe553f6bac9a8a853c997f9ab URL: https://gitlab.winehq.org/wine/wine/-/commit/2fd33f6ce10f67cfe553f6bac9a8a8… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Aug 30 12:48:43 2023 -0700 bcrypt: Ensure unixlib function tables and enum stay in sync. --- dlls/bcrypt/bcrypt_internal.h | 1 + dlls/bcrypt/gnutls.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index 5dc21484ccb..26a98eba1dc 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -319,6 +319,7 @@ enum key_funcs unix_key_asymmetric_destroy, unix_key_asymmetric_export, unix_key_asymmetric_import, + unix_funcs_count, }; #endif /* __BCRYPT_INTERNAL_H */ diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index bc0e036a53d..5d8c71c78c5 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -2271,6 +2271,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = key_asymmetric_import }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); + #ifdef _WIN64 typedef ULONG PTR32; @@ -2752,6 +2754,8 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = wow64_key_asymmetric_import }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_wow64_funcs) == unix_funcs_count ); + #endif /* _WIN64 */ #endif /* HAVE_GNUTLS_CIPHER_INIT */

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Remove HLSL_OP3_LERP.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: vkd3d Branch: master Commit: f251da574c21ce17c5defebc9c9d8f75ad9b4e4f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f251da574c21ce17c5defebc9c9d8… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Sep 13 10:24:31 2023 +0200 vkd3d-shader/hlsl: Remove HLSL_OP3_LERP. It is unused, and it's not clear whether it would be of any help to have it. --- libs/vkd3d-shader/hlsl.c | 1 - libs/vkd3d-shader/hlsl.h | 1 - 2 files changed, 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 09580970..5fe9047b 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2486,7 +2486,6 @@ const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op) [HLSL_OP2_RSHIFT] = ">>", [HLSL_OP3_DP2ADD] = "dp2add", - [HLSL_OP3_LERP] = "lerp", [HLSL_OP3_MOVC] = "movc", [HLSL_OP3_TERNARY] = "ternary", }; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 04e681a9..bece9a4a 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -551,7 +551,6 @@ enum hlsl_ir_expr_op HLSL_OP2_RSHIFT, HLSL_OP3_DP2ADD, - HLSL_OP3_LERP, /* TERNARY is used specifically for ternary operator, and later lowered according to profile to e.g. MOVC. */ HLSL_OP3_MOVC, HLSL_OP3_TERNARY,

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Document some possibly obscure HLSL opcodes.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: vkd3d Branch: master Commit: ee28861837c825818ace2e1e50825ade87a9c723 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ee28861837c825818ace2e1e50825… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Sep 12 17:30:55 2023 +0200 vkd3d-shader/hlsl: Document some possibly obscure HLSL opcodes. --- libs/vkd3d-shader/hlsl.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index bece9a4a..44cebaaf 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -550,8 +550,13 @@ enum hlsl_ir_expr_op HLSL_OP2_NEQUAL, HLSL_OP2_RSHIFT, + /* DP2ADD(a, b, c) computes the scalar product of a.xy and b.xy, + * then adds c. */ HLSL_OP3_DP2ADD, - /* TERNARY is used specifically for ternary operator, and later lowered according to profile to e.g. MOVC. */ + /* MOVC(a, b, c) returns c if a is bitwise zero and b otherwise. + * TERNARY(a, b, c) returns c if a == 0 and b otherwise. + * They differ for floating point numbers, because + * -0.0 == 0.0, but it is not bitwise zero. */ HLSL_OP3_MOVC, HLSL_OP3_TERNARY, };

1 0

Brendan Shanks : crypt32: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: 495e1a0c5b4fc90c557ef4198bdc0758195d180d URL: https://gitlab.winehq.org/wine/wine/-/commit/495e1a0c5b4fc90c557ef4198bdc07… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Sep 13 15:52:50 2023 -0700 crypt32: Ensure unixlib function tables and enum stay in sync. --- dlls/crypt32/crypt32_private.h | 1 + dlls/crypt32/unixlib.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index b5beb1b8a0e..fd1157ec295 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -510,6 +510,7 @@ enum unix_funcs unix_import_store_cert, unix_close_cert_store, unix_enum_root_certs, + unix_funcs_count, }; #define CRYPT32_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params ) diff --git a/dlls/crypt32/unixlib.c b/dlls/crypt32/unixlib.c index e90642fb0d5..72770caab5f 100644 --- a/dlls/crypt32/unixlib.c +++ b/dlls/crypt32/unixlib.c @@ -695,6 +695,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = enum_root_certs, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); + #ifdef _WIN64 typedef ULONG PTR32; @@ -796,4 +798,6 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = wow64_enum_root_certs, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_wow64_funcs) == unix_funcs_count ); + #endif /* _WIN64 */

1 0

Brendan Shanks : msv1_0: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: 798eff6a0e6885c821dffc67e205f70a41c538a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/798eff6a0e6885c821dffc67e205f7… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Sep 13 15:07:10 2023 -0700 msv1_0: Ensure unixlib function tables and enum stay in sync. --- dlls/msv1_0/unixlib.c | 4 ++++ dlls/msv1_0/unixlib.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/msv1_0/unixlib.c b/dlls/msv1_0/unixlib.c index 779250fc650..5ab028ed51f 100644 --- a/dlls/msv1_0/unixlib.c +++ b/dlls/msv1_0/unixlib.c @@ -243,6 +243,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = ntlm_check_version, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); + #ifdef _WIN64 typedef ULONG PTR32; @@ -301,4 +303,6 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = ntlm_check_version, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_wow64_funcs) == unix_funcs_count ); + #endif /* _WIN64 */ diff --git a/dlls/msv1_0/unixlib.h b/dlls/msv1_0/unixlib.h index 7aee646ed50..92edb8e18dc 100644 --- a/dlls/msv1_0/unixlib.h +++ b/dlls/msv1_0/unixlib.h @@ -111,4 +111,5 @@ enum ntlm_funcs unix_cleanup, unix_fork, unix_check_version, + unix_funcs_count, };

1 0

Brendan Shanks : ws2_32: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: 9492913deefa44295f5ac0b4f6f45fa1a5f2d036 URL: https://gitlab.winehq.org/wine/wine/-/commit/9492913deefa44295f5ac0b4f6f45f… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Sep 13 15:11:40 2023 -0700 ws2_32: Ensure unixlib function tables and enum stay in sync. --- dlls/ws2_32/unixlib.c | 4 ++++ dlls/ws2_32/ws2_32_private.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index db36f18c7bd..88845e43ad2 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -1071,6 +1071,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = unix_getnameinfo, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == ws_unix_funcs_count ); + #ifdef _WIN64 typedef ULONG PTR32; @@ -1349,4 +1351,6 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = wow64_unix_getnameinfo, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_wow64_funcs) == ws_unix_funcs_count ); + #endif /* _WIN64 */ diff --git a/dlls/ws2_32/ws2_32_private.h b/dlls/ws2_32/ws2_32_private.h index 6ebcd6837ae..a009a1eefd3 100644 --- a/dlls/ws2_32/ws2_32_private.h +++ b/dlls/ws2_32/ws2_32_private.h @@ -141,6 +141,7 @@ enum ws_unix_funcs ws_unix_gethostbyname, ws_unix_gethostname, ws_unix_getnameinfo, + ws_unix_funcs_count, }; #endif

1 0

Rémi Bernon : dmcompos: Always return S_FALSE from DllCanUnloadNow.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: 7d94983c735b9fd960ac6ad9d1618f1183f5d703 URL: https://gitlab.winehq.org/wine/wine/-/commit/7d94983c735b9fd960ac6ad9d1618f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 22 17:38:20 2023 +0200 dmcompos: Always return S_FALSE from DllCanUnloadNow. --- dlls/dmcompos/chordmap.c | 2 -- dlls/dmcompos/chordmaptrack.c | 2 -- dlls/dmcompos/composer.c | 2 -- dlls/dmcompos/dmcompos_main.c | 21 --------------------- dlls/dmcompos/dmcompos_private.h | 7 ------- dlls/dmcompos/signposttrack.c | 2 -- 6 files changed, 36 deletions(-) diff --git a/dlls/dmcompos/chordmap.c b/dlls/dmcompos/chordmap.c index adc17402f39..86134451846 100644 --- a/dlls/dmcompos/chordmap.c +++ b/dlls/dmcompos/chordmap.c @@ -81,7 +81,6 @@ static ULONG WINAPI IDirectMusicChordMapImpl_Release(IDirectMusicChordMap *iface if (!ref) { HeapFree(GetProcessHeap(), 0, This); - DMCOMPOS_UnlockModule(); } return ref; @@ -326,7 +325,6 @@ HRESULT create_dmchordmap(REFIID lpcGUID, void **ppobj) obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl; obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - DMCOMPOS_LockModule(); hr = IDirectMusicChordMap_QueryInterface(&obj->IDirectMusicChordMap_iface, lpcGUID, ppobj); IDirectMusicChordMap_Release(&obj->IDirectMusicChordMap_iface); diff --git a/dlls/dmcompos/chordmaptrack.c b/dlls/dmcompos/chordmaptrack.c index 66517340d70..35c64aab4a6 100644 --- a/dlls/dmcompos/chordmaptrack.c +++ b/dlls/dmcompos/chordmaptrack.c @@ -79,7 +79,6 @@ static ULONG WINAPI chordmap_track_Release(IDirectMusicTrack8 *iface) if (!ref) { HeapFree(GetProcessHeap(), 0, This); - DMCOMPOS_UnlockModule(); } return ref; @@ -301,7 +300,6 @@ HRESULT create_dmchordmaptrack(REFIID lpcGUID, void **ppobj) (IUnknown *)&track->IDirectMusicTrack8_iface); track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - DMCOMPOS_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface); diff --git a/dlls/dmcompos/composer.c b/dlls/dmcompos/composer.c index a2a58396ee5..47e12358201 100644 --- a/dlls/dmcompos/composer.c +++ b/dlls/dmcompos/composer.c @@ -69,7 +69,6 @@ static ULONG WINAPI IDirectMusicComposerImpl_Release(IDirectMusicComposer *iface if (ref == 0) { HeapFree(GetProcessHeap(), 0, This); - DMCOMPOS_UnlockModule(); } return ref; @@ -183,7 +182,6 @@ HRESULT create_dmcomposer(REFIID riid, void **ret_iface) obj->IDirectMusicComposer_iface.lpVtbl = &dmcomposer_vtbl; obj->ref = 1; - DMCOMPOS_LockModule(); hr = IDirectMusicComposer_QueryInterface(&obj->IDirectMusicComposer_iface, riid, ret_iface); IDirectMusicComposer_Release(&obj->IDirectMusicComposer_iface); diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index dff77aa4d32..f7b5755683e 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -38,8 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmcompos); -LONG DMCOMPOS_refCount = 0; - typedef struct { IClassFactory IClassFactory_iface; HRESULT (*fnCreateInstance)(REFIID riid, void **ret_iface); @@ -82,15 +80,11 @@ static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID r static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) { - DMCOMPOS_LockModule(); - return 2; /* non-heap based object */ } static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) { - DMCOMPOS_UnlockModule(); - return 1; /* non-heap based object */ } @@ -112,12 +106,6 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) { TRACE("(%d)\n", dolock); - - if (dolock) - DMCOMPOS_LockModule(); - else - DMCOMPOS_UnlockModule(); - return S_OK; } @@ -135,15 +123,6 @@ static IClassFactoryImpl ChordMapTrack_CF = {{&classfactory_vtbl}, create_dmchor static IClassFactoryImpl Template_CF = {{&classfactory_vtbl}, create_direct_music_template}; static IClassFactoryImpl SignPostTrack_CF = {{&classfactory_vtbl}, create_dmsignposttrack}; -/****************************************************************** - * DllCanUnloadNow (DMCOMPOS.@) - * - * - */ -HRESULT WINAPI DllCanUnloadNow(void) { - return DMCOMPOS_refCount != 0 ? S_FALSE : S_OK; -} - /****************************************************************** * DllGetClassObject (DMCOMPOS.@) diff --git a/dlls/dmcompos/dmcompos_private.h b/dlls/dmcompos/dmcompos_private.h index c04d7da6060..928b5a5a993 100644 --- a/dlls/dmcompos/dmcompos_private.h +++ b/dlls/dmcompos/dmcompos_private.h @@ -49,11 +49,4 @@ extern HRESULT create_dmcomposer(REFIID riid, void **ret_iface); extern HRESULT create_dmchordmaptrack(REFIID riid, void **ret_iface); extern HRESULT create_dmsignposttrack(REFIID riid, void **ret_iface); -/********************************************************************** - * Dll lifetime tracking declaration for dmcompos.dll - */ -extern LONG DMCOMPOS_refCount; -static inline void DMCOMPOS_LockModule(void) { InterlockedIncrement( &DMCOMPOS_refCount ); } -static inline void DMCOMPOS_UnlockModule(void) { InterlockedDecrement( &DMCOMPOS_refCount ); } - #endif /* __WINE_DMCOMPOS_PRIVATE_H */ diff --git a/dlls/dmcompos/signposttrack.c b/dlls/dmcompos/signposttrack.c index 249f37b7711..23ed67acebe 100644 --- a/dlls/dmcompos/signposttrack.c +++ b/dlls/dmcompos/signposttrack.c @@ -79,7 +79,6 @@ static ULONG WINAPI signpost_track_Release(IDirectMusicTrack8 *iface) if (!ref) { HeapFree(GetProcessHeap(), 0, This); - DMCOMPOS_UnlockModule(); } return ref; @@ -289,7 +288,6 @@ HRESULT create_dmsignposttrack(REFIID lpcGUID, void **ppobj) (IUnknown *)&track->IDirectMusicTrack8_iface); track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - DMCOMPOS_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface);

1 0

Rémi Bernon : dmcompos: Use CRT allocation functions.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: 8a02434cf022f5e3644faee8329337ffe1cedaed URL: https://gitlab.winehq.org/wine/wine/-/commit/8a02434cf022f5e3644faee8329337… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Sep 9 09:19:08 2023 +0200 dmcompos: Use CRT allocation functions. --- dlls/dmcompos/chordmap.c | 33 ++++++++++++++------------------- dlls/dmcompos/chordmaptrack.c | 11 +++-------- dlls/dmcompos/composer.c | 11 +++-------- dlls/dmcompos/dmobject.c | 7 +++---- dlls/dmcompos/signposttrack.c | 11 +++-------- 5 files changed, 26 insertions(+), 47 deletions(-) diff --git a/dlls/dmcompos/chordmap.c b/dlls/dmcompos/chordmap.c index 86134451846..2ddddd3fd57 100644 --- a/dlls/dmcompos/chordmap.c +++ b/dlls/dmcompos/chordmap.c @@ -79,9 +79,7 @@ static ULONG WINAPI IDirectMusicChordMapImpl_Release(IDirectMusicChordMap *iface TRACE("(%p) ref=%ld\n", This, ref); - if (!ref) { - HeapFree(GetProcessHeap(), 0, This); - } + if (!ref) free(This); return ref; } @@ -310,23 +308,20 @@ static const IPersistStreamVtbl persiststream_vtbl = { /* for ClassFactory */ HRESULT create_dmchordmap(REFIID lpcGUID, void **ppobj) { - IDirectMusicChordMapImpl* obj; - HRESULT hr; + IDirectMusicChordMapImpl* obj; + HRESULT hr; - obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicChordMapImpl)); - if (NULL == obj) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - obj->IDirectMusicChordMap_iface.lpVtbl = &dmchordmap_vtbl; - obj->ref = 1; - dmobject_init(&obj->dmobj, &CLSID_DirectMusicChordMap, - (IUnknown *)&obj->IDirectMusicChordMap_iface); - obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl; - obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; + *ppobj = NULL; + if (!(obj = calloc(1, sizeof(*obj)))) return E_OUTOFMEMORY; + obj->IDirectMusicChordMap_iface.lpVtbl = &dmchordmap_vtbl; + obj->ref = 1; + dmobject_init(&obj->dmobj, &CLSID_DirectMusicChordMap, + (IUnknown *)&obj->IDirectMusicChordMap_iface); + obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl; + obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - hr = IDirectMusicChordMap_QueryInterface(&obj->IDirectMusicChordMap_iface, lpcGUID, ppobj); - IDirectMusicChordMap_Release(&obj->IDirectMusicChordMap_iface); + hr = IDirectMusicChordMap_QueryInterface(&obj->IDirectMusicChordMap_iface, lpcGUID, ppobj); + IDirectMusicChordMap_Release(&obj->IDirectMusicChordMap_iface); - return hr; + return hr; } diff --git a/dlls/dmcompos/chordmaptrack.c b/dlls/dmcompos/chordmaptrack.c index 35c64aab4a6..36079ef177a 100644 --- a/dlls/dmcompos/chordmaptrack.c +++ b/dlls/dmcompos/chordmaptrack.c @@ -77,9 +77,7 @@ static ULONG WINAPI chordmap_track_Release(IDirectMusicTrack8 *iface) TRACE("(%p) ref=%ld\n", This, ref); - if (!ref) { - HeapFree(GetProcessHeap(), 0, This); - } + if (!ref) free(This); return ref; } @@ -289,11 +287,8 @@ HRESULT create_dmchordmaptrack(REFIID lpcGUID, void **ppobj) IDirectMusicChordMapTrack* 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_DirectMusicChordMapTrack, diff --git a/dlls/dmcompos/composer.c b/dlls/dmcompos/composer.c index 47e12358201..3451f2d4203 100644 --- a/dlls/dmcompos/composer.c +++ b/dlls/dmcompos/composer.c @@ -67,9 +67,7 @@ static ULONG WINAPI IDirectMusicComposerImpl_Release(IDirectMusicComposer *iface TRACE("(%p) ref=%ld\n", This, ref); - if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This); - } + if (!ref) free(This); return ref; } @@ -174,11 +172,8 @@ HRESULT create_dmcomposer(REFIID riid, void **ret_iface) IDirectMusicComposerImpl *obj; HRESULT hr; - obj = HeapAlloc(GetProcessHeap(), 0, sizeof(*obj)); - if (!obj) { - *ret_iface = NULL; - return E_OUTOFMEMORY; - } + *ret_iface = NULL; + if (!(obj = calloc(1, sizeof(*obj)))) return E_OUTOFMEMORY; obj->IDirectMusicComposer_iface.lpVtbl = &dmcomposer_vtbl; obj->ref = 1; diff --git a/dlls/dmcompos/dmobject.c b/dlls/dmcompos/dmobject.c index b526b23d031..07d887a376c 100644 --- a/dlls/dmcompos/dmobject.c +++ b/dlls/dmcompos/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; } diff --git a/dlls/dmcompos/signposttrack.c b/dlls/dmcompos/signposttrack.c index 23ed67acebe..eccf87a4893 100644 --- a/dlls/dmcompos/signposttrack.c +++ b/dlls/dmcompos/signposttrack.c @@ -77,9 +77,7 @@ static ULONG WINAPI signpost_track_Release(IDirectMusicTrack8 *iface) TRACE("(%p) ref=%ld\n", This, ref); - if (!ref) { - HeapFree(GetProcessHeap(), 0, This); - } + if (!ref) free(This); return ref; } @@ -277,11 +275,8 @@ HRESULT create_dmsignposttrack(REFIID lpcGUID, void **ppobj) IDirectMusicSignPostTrack *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_DirectMusicSignPostTrack,

1 0