Module: wine Branch: master Commit: 5847aab99efe5b410d6779623aee51087d5e193f URL: https://gitlab.winehq.org/wine/wine/-/commit/5847aab99efe5b410d6779623aee510...
Author: Alex Henrie alexhenrie24@gmail.com Date: Thu Nov 9 07:40:21 2023 -0700
nsi: Use CRT allocation functions.
---
dlls/nsi/nsi.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index 5dc54d0035f..c5f481efb48 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -174,7 +174,7 @@ DWORD WINAPI NsiEnumerateObjectsAllParametersEx( struct nsi_enumerate_all_ex *pa out_size = sizeof(DWORD) + (params->key_size + params->rw_size + params->dynamic_size + params->static_size) * params->count;
- out = heap_alloc( out_size ); + out = malloc( out_size ); if (!out) return ERROR_OUTOFMEMORY;
in.module = *params->module; @@ -202,7 +202,7 @@ DWORD WINAPI NsiEnumerateObjectsAllParametersEx( struct nsi_enumerate_all_ex *pa if (params->static_size) memcpy( params->static_data, ptr, params->static_size * params->count ); }
- heap_free( out ); + free( out );
return err; } @@ -254,8 +254,8 @@ DWORD WINAPI NsiGetAllParametersEx( struct nsi_get_all_parameters_ex *params )
if (device == INVALID_HANDLE_VALUE) return GetLastError();
- in = heap_alloc( in_size ); - out = heap_alloc( out_size ); + in = malloc( in_size ); + out = malloc( out_size ); if (!in || !out) { err = ERROR_OUTOFMEMORY; @@ -284,8 +284,8 @@ DWORD WINAPI NsiGetAllParametersEx( struct nsi_get_all_parameters_ex *params ) }
err: - heap_free( out ); - heap_free( in ); + free( out ); + free( in ); return err; }
@@ -321,7 +321,7 @@ DWORD WINAPI NsiGetParameterEx( struct nsi_get_parameter_ex *params )
if (device == INVALID_HANDLE_VALUE) return GetLastError();
- in = heap_alloc( in_size ); + in = malloc( in_size ); if (!in) return ERROR_OUTOFMEMORY; in->module = *params->module; in->first_arg = params->first_arg; @@ -334,7 +334,7 @@ DWORD WINAPI NsiGetParameterEx( struct nsi_get_parameter_ex *params ) if (!DeviceIoControl( device, IOCTL_NSIPROXY_WINE_GET_PARAMETER, in, in_size, params->data, params->data_size, &received, NULL )) err = GetLastError();
- heap_free( in ); + free( in ); return err; }