November 2023 - Wine-commits

Alex Henrie : dsuiext: Use CRT allocation functions.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: e90e08b5991eaf048b64e70c9053fa7c44f28e52 URL: https://gitlab.winehq.org/wine/wine/-/commit/e90e08b5991eaf048b64e70c9053fa… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:28:05 2023 -0600 dsuiext: Use CRT allocation functions. --- dlls/dsuiext/dsuiext.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/dsuiext/dsuiext.c b/dlls/dsuiext/dsuiext.c index 762f7596e73..5867c677f68 100644 --- a/dlls/dsuiext/dsuiext.c +++ b/dlls/dsuiext/dsuiext.c @@ -28,7 +28,6 @@ #include "iads.h" #include "dsclient.h" -#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dsuiext); @@ -76,7 +75,7 @@ static ULONG WINAPI dispspec_Release(IDsDisplaySpecifier *iface) if (!ref) { TRACE("destroying %p\n", iface); - heap_free(dispspec); + free(dispspec); } return ref; @@ -180,7 +179,7 @@ static HRESULT DsDisplaySpecifier_create(REFIID iid, void **obj) DisplaySpec *dispspec; HRESULT hr; - dispspec = heap_alloc(sizeof(*dispspec)); + dispspec = malloc(sizeof(*dispspec)); if (!dispspec) return E_OUTOFMEMORY; dispspec->IDsDisplaySpecifier_iface.lpVtbl = &IDsDisplaySpecifier_vtbl; @@ -250,7 +249,7 @@ static ULONG WINAPI factory_Release(IClassFactory *iface) TRACE("(%p) ref %lu\n", iface, ref); if (!ref) - heap_free(factory); + free(factory); return ref; } @@ -289,7 +288,7 @@ static HRESULT factory_constructor(const struct class_info *info, REFIID riid, v class_factory *factory; HRESULT hr; - factory = heap_alloc(sizeof(*factory)); + factory = malloc(sizeof(*factory)); if (!factory) return E_OUTOFMEMORY; factory->IClassFactory_iface.lpVtbl = &factory_vtbl;

1 0

Alex Henrie : iccvid: Use CRT allocation functions.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: f10be2e88ba8c806d754bafbed77d1c77afe6db4 URL: https://gitlab.winehq.org/wine/wine/-/commit/f10be2e88ba8c806d754bafbed77d1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:30:32 2023 -0600 iccvid: Use CRT allocation functions. --- dlls/iccvid/iccvid.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c index cffc75be58e..a1cfdc1ee21 100644 --- a/dlls/iccvid/iccvid.c +++ b/dlls/iccvid/iccvid.c @@ -51,7 +51,6 @@ #include "iccvid_private.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(iccvid); @@ -353,7 +352,7 @@ static cinepak_info *decode_cinepak_init(void) cinepak_info *cvinfo; int i; - cvinfo = heap_alloc( sizeof (cinepak_info) ); + cvinfo = malloc(sizeof(cinepak_info)); if( !cvinfo ) return NULL; cvinfo->strip_num = 0; @@ -374,10 +373,10 @@ static void free_cvinfo( cinepak_info *cvinfo ) for( i=0; i<cvinfo->strip_num; i++ ) { - heap_free(cvinfo->v4_codebook[i]); - heap_free(cvinfo->v1_codebook[i]); + free(cvinfo->v4_codebook[i]); + free(cvinfo->v1_codebook[i]); } - heap_free( cvinfo ); + free( cvinfo ); } typedef void (*fn_cvid_v1)(unsigned char *frm, unsigned char *limit, @@ -481,13 +480,13 @@ static void decode_cinepak(cinepak_info *cvinfo, unsigned char *buf, int size, for(i = cvinfo->strip_num; i < frame.strips; i++) { - if((cvinfo->v4_codebook[i] = heap_alloc(sizeof(cvid_codebook) * 260)) == NULL) + if((cvinfo->v4_codebook[i] = malloc(sizeof(cvid_codebook) * 260)) == NULL) { ERR("CVID: codebook v4 alloc err\n"); return; } - if((cvinfo->v1_codebook[i] = heap_alloc(sizeof(cvid_codebook) * 260)) == NULL) + if((cvinfo->v1_codebook[i] = malloc(sizeof(cvid_codebook) * 260)) == NULL) { ERR("CVID: codebook v1 alloc err\n"); return; @@ -941,7 +940,7 @@ static LRESULT ICCVID_Close( ICCVID_Info *info ) return 0; if( info->cvinfo ) free_cvinfo( info->cvinfo ); - heap_free( info ); + free( info ); return 1; } @@ -1001,7 +1000,7 @@ LRESULT WINAPI ICCVID_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg, if (icinfo && compare_fourcc(icinfo->fccType, ICTYPE_VIDEO)) return 0; - info = heap_alloc( sizeof (ICCVID_Info) ); + info = malloc(sizeof(ICCVID_Info)); if( info ) { info->dwMagic = ICCVID_MAGIC;

1 0

Alex Henrie : inseng: Use CRT allocation functions.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: 9f3a275d34b72eb4ad365a15a472ee91b9860461 URL: https://gitlab.winehq.org/wine/wine/-/commit/9f3a275d34b72eb4ad365a15a472ee… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:31:25 2023 -0600 inseng: Use CRT allocation functions. --- dlls/inseng/inseng_main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/inseng/inseng_main.c b/dlls/inseng/inseng_main.c index c72a12955b8..f7ce3f173c2 100644 --- a/dlls/inseng/inseng_main.c +++ b/dlls/inseng/inseng_main.c @@ -32,7 +32,6 @@ #include "inseng.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(inseng); @@ -87,7 +86,7 @@ static ULONG WINAPI InstallEngine_Release(IInstallEngine2 *iface) TRACE("(%p) ref=%ld\n", This, ref); if(!ref) - heap_free(This); + free(This); return ref; } @@ -334,7 +333,7 @@ static HRESULT WINAPI InstallEngineCF_CreateInstance(IClassFactory *iface, IUnkn TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); - engine = heap_alloc(sizeof(*engine)); + engine = malloc(sizeof(*engine)); if(!engine) return E_OUTOFMEMORY;

1 0

Alex Henrie : jsproxy: Use CRT allocation functions.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: 1df98a99cd6a53c4bb842169a639c2644c42b6c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/1df98a99cd6a53c4bb842169a639c2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:33:04 2023 -0600 jsproxy: Use CRT allocation functions. --- dlls/jsproxy/main.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c index b93d1200f42..4e69210dce3 100644 --- a/dlls/jsproxy/main.c +++ b/dlls/jsproxy/main.c @@ -31,7 +31,6 @@ #include "dispex.h" #include "activscp.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(jsproxy); @@ -50,7 +49,7 @@ static inline WCHAR *strdupAW( const char *src, int len ) if (src) { int dst_len = MultiByteToWideChar( CP_ACP, 0, src, len, NULL, 0 ); - if ((dst = heap_alloc( (dst_len + 1) * sizeof(WCHAR) ))) + if ((dst = malloc( (dst_len + 1) * sizeof(WCHAR) ))) { len = MultiByteToWideChar( CP_ACP, 0, src, len, dst, dst_len ); dst[dst_len] = 0; @@ -65,7 +64,7 @@ static inline char *strdupWA( const WCHAR *src ) if (src) { int len = WideCharToMultiByte( CP_ACP, 0, src, -1, NULL, 0, NULL, NULL ); - if ((dst = heap_alloc( len ))) WideCharToMultiByte( CP_ACP, 0, src, -1, dst, len, NULL, NULL ); + if ((dst = malloc( len ))) WideCharToMultiByte( CP_ACP, 0, src, -1, dst, len, NULL, NULL ); } return dst; } @@ -85,7 +84,7 @@ BOOL WINAPI InternetDeInitializeAutoProxyDll( LPSTR mime, DWORD reserved ) EnterCriticalSection( &cs_jsproxy ); - heap_free( global_script->text ); + free( global_script->text ); global_script->text = NULL; LeaveCriticalSection( &cs_jsproxy ); @@ -104,17 +103,17 @@ static WCHAR *load_script( const char *filename ) if (handle == INVALID_HANDLE_VALUE) return NULL; size = GetFileSize( handle, NULL ); - if (!(buffer = heap_alloc( size ))) goto done; + if (!(buffer = malloc( size ))) goto done; if (!ReadFile( handle, buffer, size, &bytes_read, NULL ) || bytes_read != size) goto done; len = MultiByteToWideChar( CP_ACP, 0, buffer, size, NULL, 0 ); - if (!(script = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto done; + if (!(script = malloc( (len + 1) * sizeof(WCHAR) ))) goto done; MultiByteToWideChar( CP_ACP, 0, buffer, size, script, len ); script[len] = 0; done: CloseHandle( handle ); - heap_free( buffer ); + free( buffer ); return script; } @@ -141,13 +140,13 @@ BOOL WINAPI JSPROXY_InternetInitializeAutoProxyDll( DWORD version, LPSTR tmpfile LeaveCriticalSection( &cs_jsproxy ); return FALSE; } - heap_free( global_script->text ); + free( global_script->text ); if ((global_script->text = strdupAW( buffer->lpszScriptBuffer, buffer->dwScriptBufferSize ))) ret = TRUE; } else { - heap_free( global_script->text ); + free( global_script->text ); if ((global_script->text = load_script( tmpfile ))) ret = TRUE; } @@ -263,10 +262,10 @@ static char *get_computer_name( COMPUTER_NAME_FORMAT format ) GetComputerNameExA( format, NULL, &size ); if (GetLastError() != ERROR_MORE_DATA) return NULL; - if (!(ret = heap_alloc( size ))) return NULL; + if (!(ret = malloc( size ))) return NULL; if (!GetComputerNameExA( format, ret, &size )) { - heap_free( ret ); + free( ret ); return NULL; } return ret; @@ -295,7 +294,7 @@ static HRESULT dns_resolve( const WCHAR *hostname, VARIANT *result ) if (!hostnameA) return E_OUTOFMEMORY; res = getaddrinfo( hostnameA, NULL, NULL, &ai ); - heap_free( hostnameA ); + free( hostnameA ); if (res) return S_FALSE; elem = ai; @@ -589,8 +588,8 @@ BOOL WINAPI InternetGetProxyInfo( LPCSTR url, DWORD len_url, LPCSTR hostname, DW ret = run_script( global_script->text, urlW, hostnameW, proxy, len_proxy ); done: - heap_free( hostnameW ); - heap_free( urlW ); + free( hostnameW ); + free( urlW ); LeaveCriticalSection( &cs_jsproxy ); return ret; }

1 0

Alex Henrie : mp3dmod: Use CRT allocation functions.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: 6d6ea43d386d6b42c01ee8caca5e3afc52a780e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/6d6ea43d386d6b42c01ee8caca5e3a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:34:41 2023 -0600 mp3dmod: Use CRT allocation functions. --- dlls/mp3dmod/mp3dmod.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index 12c34421ce9..842be5889da 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -31,7 +31,6 @@ #include "rpcproxy.h" #include "wmcodecdsp.h" #include "wine/debug.h" -#include "wine/heap.h" #include "initguid.h" DEFINE_GUID(WMMEDIATYPE_Audio, 0x73647561,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71); @@ -107,7 +106,7 @@ static ULONG WINAPI Unknown_Release(IUnknown *iface) MoFreeMediaType(&This->intype); MoFreeMediaType(&This->outtype); mpg123_delete(This->mh); - heap_free(This); + free(This); } return refcount; } @@ -575,7 +574,7 @@ static HRESULT create_mp3_decoder(IUnknown *outer, REFIID iid, void **obj) HRESULT hr; int err; - if (!(This = heap_alloc_zero(sizeof(*This)))) + if (!(This = calloc(1, sizeof(*This)))) return E_OUTOFMEMORY; This->IUnknown_inner.lpVtbl = &Unknown_vtbl;

1 0

Alex Henrie : msado15: Remove unused heap.h include.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: 02634d8351521aa78379a2315341681cf1e180c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/02634d8351521aa78379a231534168… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:36:29 2023 -0600 msado15: Remove unused heap.h include. --- dlls/msado15/main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 187c3cf7518..6489ae3f9b7 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -26,7 +26,6 @@ #include "msado15_backcompat.h" #include "wine/debug.h" -#include "wine/heap.h" #include "msado15_private.h"

1 0

Alex Henrie : msasn1: Use CRT allocation functions.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: 7b246524cfb6e43899b3c433d172d0451129889d URL: https://gitlab.winehq.org/wine/wine/-/commit/7b246524cfb6e43899b3c433d172d0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:37:22 2023 -0600 msasn1: Use CRT allocation functions. --- dlls/msasn1/main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c index 4614a5b292e..480683c3bb5 100644 --- a/dlls/msasn1/main.c +++ b/dlls/msasn1/main.c @@ -24,7 +24,6 @@ #include "winbase.h" #include "msasn1.h" -#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msasn1); @@ -41,7 +40,7 @@ ASN1module_t WINAPI ASN1_CreateModule(ASN1uint32_t ver, ASN1encodingrule_e rule, if (!encoder || !decoder || !freemem || !size) return module; - module = heap_alloc(sizeof(*module)); + module = malloc(sizeof(*module)); if (module) { module->nModuleName = magic; @@ -75,7 +74,7 @@ void WINAPI ASN1_CloseModule(ASN1module_t module) { TRACE("(%p)\n", module); - heap_free(module); + free(module); } ASN1error_e WINAPI ASN1_CreateEncoder(ASN1module_t module, ASN1encoding_t *encoder, ASN1octet_t *buf, @@ -88,7 +87,7 @@ ASN1error_e WINAPI ASN1_CreateEncoder(ASN1module_t module, ASN1encoding_t *encod if (!module || !encoder) return ASN1_ERR_BADARGS; - enc = heap_alloc(sizeof(*enc)); + enc = malloc(sizeof(*enc)); if (!enc) { return ASN1_ERR_MEMORY; @@ -138,7 +137,7 @@ ASN1error_e WINAPI ASN1_CreateDecoder(ASN1module_t module, ASN1decoding_t *decod if (!module || !decoder) return ASN1_ERR_BADARGS; - dec = heap_alloc(sizeof(*dec)); + dec = malloc(sizeof(*dec)); if (!dec) { return ASN1_ERR_MEMORY;

1 0

Alex Henrie : msdasql: Use CRT allocation functions.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: 3c2ec4ef94efd9fd47b4ed4b6dbd46250ec76f66 URL: https://gitlab.winehq.org/wine/wine/-/commit/3c2ec4ef94efd9fd47b4ed4b6dbd46… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:40:07 2023 -0600 msdasql: Use CRT allocation functions. --- dlls/msdasql/session.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 3e6e5f2a0b3..056468f1054 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -25,7 +25,6 @@ #include "objbase.h" #include "rpcproxy.h" #include "msdasc.h" -#include "wine/heap.h" #include "wine/debug.h" #include "msdasql.h" @@ -409,7 +408,7 @@ static ULONG WINAPI session_Release(IUnknown *iface) TRACE( "destroying %p\n", session ); IUnknown_Release(session->datasource); - heap_free( session ); + free(session); } return refs; } @@ -693,15 +692,15 @@ static ULONG WINAPI command_Release(ICommandText *iface) if (!refs) { TRACE( "destroying %p\n", command ); - heap_free(command->properties); + free(command->properties); if (command->session) IUnknown_Release(command->session); if (command->hstmt) SQLFreeHandle(SQL_HANDLE_STMT, command->hstmt); - heap_free( command->query ); - heap_free( command ); + free(command->query); + free(command); } return refs; } @@ -826,7 +825,7 @@ static ULONG WINAPI msdasql_rowset_Release(IRowset *iface) if (rowset->caller) IUnknown_Release(rowset->caller); - heap_free( rowset ); + free(rowset); } return refs; } @@ -1259,7 +1258,7 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI *rowset = NULL; if (!wcsnicmp( command->query, L"select ", 7 )) { - msrowset = heap_alloc(sizeof(*msrowset)); + msrowset = malloc(sizeof(*msrowset)); if (!msrowset) return E_OUTOFMEMORY; @@ -1326,8 +1325,7 @@ static HRESULT WINAPI command_GetCommandText(ICommandText *iface, GUID *dialect, hr = DB_S_DIALECTIGNORED; } - *commandstr = heap_alloc((lstrlenW(command->query)+1)*sizeof(WCHAR)); - wcscpy(*commandstr, command->query); + *commandstr = wcsdup(command->query); return hr; } @@ -1339,15 +1337,13 @@ static HRESULT WINAPI command_SetCommandText(ICommandText *iface, REFGUID dialec if (!IsEqualGUID(&DBGUID_DEFAULT, dialect)) FIXME("Currently non Default Dialect isn't supported\n"); - heap_free(command->query); + free(command->query); if (commandstr) { - command->query = heap_alloc((lstrlenW(commandstr)+1)*sizeof(WCHAR)); + command->query = wcsdup(commandstr); if (!command->query) return E_OUTOFMEMORY; - - wcscpy(command->query, commandstr); } else command->query = NULL; @@ -1775,7 +1771,7 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn if (outer) FIXME("Outer not currently supported\n"); - command = heap_alloc(sizeof(*command)); + command = malloc(sizeof(*command)); if (!command) return E_OUTOFMEMORY; @@ -1791,7 +1787,7 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn command->hstmt = NULL; command->prop_count = ARRAY_SIZE(msdasql_init_props); - command->properties = heap_alloc(sizeof(msdasql_init_props)); + command->properties = malloc(sizeof(msdasql_init_props)); memcpy(command->properties, msdasql_init_props, sizeof(msdasql_init_props)); IUnknown_QueryInterface(&session->session_iface, &IID_IUnknown, (void**)&command->session); @@ -1915,7 +1911,7 @@ HRESULT create_db_session(REFIID riid, IUnknown *datasource, HDBC hdbc, void **u struct msdasql_session *session; HRESULT hr; - session = heap_alloc(sizeof(*session)); + session = malloc(sizeof(*session)); if (!session) return E_OUTOFMEMORY;

1 0

Alex Henrie : msident: Use CRT allocation functions.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: a76bf99eff09c6618e9882cc828755a0c62e081f URL: https://gitlab.winehq.org/wine/wine/-/commit/a76bf99eff09c6618e9882cc828755… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:41:00 2023 -0600 msident: Use CRT allocation functions. --- dlls/msident/msident.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msident/msident.c b/dlls/msident/msident.c index 2099038ef15..86c05536e15 100644 --- a/dlls/msident/msident.c +++ b/dlls/msident/msident.c @@ -24,7 +24,6 @@ #include "rpcproxy.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(msident); @@ -76,7 +75,7 @@ static ULONG WINAPI EnumUserIdentity_Release(IEnumUserIdentity *iface) TRACE("(%p) ref=%ld\n", This, ref); if(!ref) - heap_free(This); + free(This); return ref; } @@ -166,7 +165,7 @@ static HRESULT WINAPI UserIdentityManager_EnumIdentities(IUserIdentityManager *i TRACE("(%p)\n", ppEnumUser); - ret = heap_alloc(sizeof(*ret)); + ret = malloc(sizeof(*ret)); if(!ret) return E_OUTOFMEMORY;

1 0

Alex Henrie : mspatcha: Use CRT allocation functions.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: 472ef2881a8f5910a1fd2aef501a7f300f605fb8 URL: https://gitlab.winehq.org/wine/wine/-/commit/472ef2881a8f5910a1fd2aef501a7f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:44:27 2023 -0600 mspatcha: Use CRT allocation functions. --- dlls/mspatcha/lzxd_dec.c | 5 ++--- dlls/mspatcha/mspatcha_main.c | 14 +++++++------- dlls/mspatcha/pa19.c | 10 ++-------- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/mspatcha/lzxd_dec.c b/dlls/mspatcha/lzxd_dec.c index fe04723b3a7..71c70bdf847 100644 --- a/dlls/mspatcha/lzxd_dec.c +++ b/dlls/mspatcha/lzxd_dec.c @@ -25,7 +25,6 @@ #include <assert.h> #include "windef.h" -#include "wine/heap.h" #include "wine/debug.h" #include "patchapi.h" @@ -683,7 +682,7 @@ DWORD decode_lzxd_stream(const BYTE *src, const size_t input_size, if (progress_fn != NULL && !progress_fn(progress_ctx, 0, (ULONG)output_size)) return ERROR_CANCELLED; - dec = heap_alloc(sizeof(*dec)); + dec = malloc(sizeof(*dec)); if (dec == NULL) return ERROR_OUTOFMEMORY; @@ -765,7 +764,7 @@ DWORD decode_lzxd_stream(const BYTE *src, const size_t input_size, reverse_e8_transform(dst + predef_size, output_size, e8_file_size); free_dec: - heap_free(dec); + free(dec); return err; } diff --git a/dlls/mspatcha/mspatcha_main.c b/dlls/mspatcha/mspatcha_main.c index 1f6653da161..d8582566e9b 100644 --- a/dlls/mspatcha/mspatcha_main.c +++ b/dlls/mspatcha/mspatcha_main.c @@ -48,7 +48,7 @@ static WCHAR *strdupAW(const char *src) if (src) { int len = MultiByteToWideChar(CP_ACP, 0, src, -1, NULL, 0); - if ((dst = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) + if ((dst = malloc(len * sizeof(WCHAR)))) MultiByteToWideChar(CP_ACP, 0, src, -1, dst, len); } return dst; @@ -65,12 +65,12 @@ BOOL WINAPI TestApplyPatchToFileA(LPCSTR patch_file, LPCSTR old_file, ULONG appl if (!(patch_fileW = strdupAW(patch_file))) return FALSE; if (old_file && !(old_fileW = strdupAW(old_file))) { - HeapFree(GetProcessHeap(), 0, patch_fileW); + free(patch_fileW); return FALSE; } ret = apply_patch_to_file(patch_fileW, old_fileW, NULL, apply_flags, NULL, NULL, TRUE); - HeapFree(GetProcessHeap(), 0, patch_fileW); - HeapFree(GetProcessHeap(), 0, old_fileW); + free(patch_fileW); + free(old_fileW); return ret; } @@ -123,10 +123,10 @@ BOOL WINAPI ApplyPatchToFileExA(LPCSTR patch_file, LPCSTR old_file, LPCSTR new_f ret = apply_patch_to_file(patch_fileW, old_fileW, new_fileW, apply_flags, progress_fn, progress_ctx, FALSE); - HeapFree(GetProcessHeap(), 0, new_fileW); + free(new_fileW); free_wstrs: - HeapFree(GetProcessHeap(), 0, patch_fileW); - HeapFree(GetProcessHeap(), 0, old_fileW); + free(patch_fileW); + free(old_fileW); return ret; } diff --git a/dlls/mspatcha/pa19.c b/dlls/mspatcha/pa19.c index dc6ef79e2b2..4b21b199ed8 100644 --- a/dlls/mspatcha/pa19.c +++ b/dlls/mspatcha/pa19.c @@ -37,7 +37,6 @@ #include "windef.h" #include "winternl.h" -#include "wine/heap.h" #include "wine/debug.h" #include "patchapi.h" @@ -319,7 +318,7 @@ static int read_header(struct patch_file_header *ph, const BYTE *buf, size_t siz if (ph->err != ERROR_SUCCESS) return -1; - ph->file_table = heap_calloc(ph->input_file_count, sizeof(struct input_file_info)); + ph->file_table = calloc(ph->input_file_count, sizeof(struct input_file_info)); if (ph->file_table == NULL) { ph->err = ERROR_OUTOFMEMORY; @@ -436,11 +435,6 @@ static int read_header(struct patch_file_header *ph, const BYTE *buf, size_t siz return (ph->err == ERROR_SUCCESS) ? 0 : -1; } -static void free_header(struct patch_file_header *ph) -{ - heap_free(ph->file_table); -} - #define TICKS_PER_SEC 10000000 #define SEC_TO_UNIX_EPOCH ((369 * 365 + 89) * (ULONGLONG)86400) @@ -787,7 +781,7 @@ free_decode_buf: VirtualFree(decode_buf, 0, MEM_RELEASE); free_patch_header: - free_header(&ph); + free(ph.file_table); return err; }

1 0