November 2023 - Wine-commits

Gabriel Ivăncescu : jscript: Fix value leak in Array.shift.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: 7008706739257212898edbe60feb0ff32d148408 URL: https://gitlab.winehq.org/wine/wine/-/commit/7008706739257212898edbe60feb0f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 3 20:47:59 2023 +0200 jscript: Fix value leak in Array.shift. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/array.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 36f45120055..7e5bcaeaefe 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -527,8 +527,10 @@ static HRESULT Array_shift(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigne hres = jsdisp_get_idx(jsthis, i, &v); if(hres == DISP_E_UNKNOWNNAME) hres = jsdisp_delete_idx(jsthis, i-1); - else if(SUCCEEDED(hres)) + else if(SUCCEEDED(hres)) { hres = jsdisp_propput_idx(jsthis, i-1, v); + jsval_release(v); + } } if(SUCCEEDED(hres)) {

1 0

Gabriel Ivăncescu : jscript: Fix array leak in Array.filter.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: 736eb107483732e3a4b6a319129fa92227317a16 URL: https://gitlab.winehq.org/wine/wine/-/commit/736eb107483732e3a4b6a319129fa9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 3 20:47:59 2023 +0200 jscript: Fix array leak in Array.filter. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/array.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 7e5bcaeaefe..078e2ce7d4c 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -1152,6 +1152,8 @@ static HRESULT Array_filter(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsign if(r) *r = jsval_obj(arr); + else + jsdisp_release(arr); done: jsdisp_release(jsthis); return hres;

1 0

Gabriel Ivăncescu : jscript: Don't addref before calling jsdisp_propput_name.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: aa18bbedea6cee6c80b027c1137a5657e7a5e9ca URL: https://gitlab.winehq.org/wine/wine/-/commit/aa18bbedea6cee6c80b027c1137a56… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 3 20:47:59 2023 +0200 jscript: Don't addref before calling jsdisp_propput_name. It already increases refcount. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/engine.c | 2 +- dlls/jscript/jsregexp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 1bf5bb77858..76e6a271bdf 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -758,7 +758,7 @@ static HRESULT detach_scope(script_ctx_t *ctx, call_frame_t *frame, scope_chain_ if (scope == frame->base_scope && func->name && func->local_ref == INVALID_LOCAL_REF && ctx->version >= SCRIPTLANGUAGEVERSION_ES5) - jsdisp_propput_name(jsobj, func->name, jsval_obj(jsdisp_addref(frame->function_instance))); + jsdisp_propput_name(jsobj, func->name, jsval_obj(frame->function_instance)); index = scope->scope_index; for(i = 0; i < frame->function->local_scopes[index].locals_cnt; i++) diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index 378dee9bc53..70673ec190e 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -390,7 +390,7 @@ static HRESULT create_match_array(script_ctx_t *ctx, jsstr_t *input_str, if(FAILED(hres)) break; - hres = jsdisp_propput_name(array, L"input", jsval_string(jsstr_addref(input_str))); + hres = jsdisp_propput_name(array, L"input", jsval_string(input_str)); if(FAILED(hres)) break;

1 0

Gabriel Ivăncescu : jscript: Fix value arg leak in transform_json_object.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: 8f82586fd9720d8771d91d081f77b8ad4fb72e8b URL: https://gitlab.winehq.org/wine/wine/-/commit/8f82586fd9720d8771d91d081f77b8… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 3 20:47:59 2023 +0200 jscript: Fix value arg leak in transform_json_object. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/json.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c index e07ad863348..277a5e01144 100644 --- a/dlls/jscript/json.c +++ b/dlls/jscript/json.c @@ -295,7 +295,7 @@ static jsval_t transform_json_object(struct transform_json_object_ctx *proc_ctx, if(!obj) { FIXME("non-JS obj in JSON object: %p\n", get_object(args[1])); proc_ctx->hres = E_NOTIMPL; - return jsval_undefined(); + goto ret; }else if(is_class(obj, JSCLASS_ARRAY)) { unsigned i, length = array_get_length(obj); WCHAR buf[14], *buf_end; @@ -306,13 +306,13 @@ static jsval_t transform_json_object(struct transform_json_object_ctx *proc_ctx, str = idx_to_str(i, buf_end); if(!(jsstr = jsstr_alloc(str))) { proc_ctx->hres = E_OUTOFMEMORY; - return jsval_undefined(); + goto ret; } res = transform_json_object(proc_ctx, obj, jsstr); jsstr_release(jsstr); if(is_undefined(res)) { if(FAILED(proc_ctx->hres)) - return jsval_undefined(); + goto ret; if(FAILED(jsdisp_get_id(obj, str, 0, &id))) continue; proc_ctx->hres = disp_delete((IDispatch*)&obj->IDispatchEx_iface, id, &b); @@ -321,7 +321,7 @@ static jsval_t transform_json_object(struct transform_json_object_ctx *proc_ctx, jsval_release(res); } if(FAILED(proc_ctx->hres)) - return jsval_undefined(); + goto ret; } }else { id = DISPID_STARTENUM; @@ -330,7 +330,7 @@ static jsval_t transform_json_object(struct transform_json_object_ctx *proc_ctx, if(proc_ctx->hres == S_FALSE) break; if(FAILED(proc_ctx->hres) || FAILED(proc_ctx->hres = jsdisp_get_prop_name(obj, id, &jsstr))) - return jsval_undefined(); + goto ret; res = transform_json_object(proc_ctx, obj, jsstr); if(is_undefined(res)) { if(SUCCEEDED(proc_ctx->hres)) @@ -344,7 +344,7 @@ static jsval_t transform_json_object(struct transform_json_object_ctx *proc_ctx, } jsstr_release(jsstr); if(FAILED(proc_ctx->hres)) - return jsval_undefined(); + goto ret; } } } @@ -352,6 +352,8 @@ static jsval_t transform_json_object(struct transform_json_object_ctx *proc_ctx, args[0] = jsval_string(name); proc_ctx->hres = disp_call_value(proc_ctx->ctx, proc_ctx->reviver, jsval_obj(holder), DISPATCH_METHOD, ARRAY_SIZE(args), args, &res); +ret: + jsval_release(args[1]); return FAILED(proc_ctx->hres) ? jsval_undefined() : res; }

1 0

Gabriel Ivăncescu : jscript/tests: Fix variant leak after conversion when testing VariantChangeType.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: 59e00860a7daeb2bea933622f581b0eb2c34cf1d URL: https://gitlab.winehq.org/wine/wine/-/commit/59e00860a7daeb2bea933622f581b0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 3 20:47:59 2023 +0200 jscript/tests: Fix variant leak after conversion when testing VariantChangeType. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/tests/caller.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/jscript/tests/caller.c b/dlls/jscript/tests/caller.c index 8a1ebb83a33..99b6a21e7fb 100644 --- a/dlls/jscript/tests/caller.c +++ b/dlls/jscript/tests/caller.c @@ -173,6 +173,7 @@ static void test_change_type(IVariantChangeType *change_type, VARIANT *src, cons else { call_change_type(change_type, &v, src, VT_UNKNOWN); ok(V_UNKNOWN(&v) == V_UNKNOWN(src), "V_UNKNOWN(v) != V_UNKNOWN(src)\n"); + VariantClear(&v); } if(V_VT(src) != VT_DISPATCH) @@ -180,6 +181,7 @@ static void test_change_type(IVariantChangeType *change_type, VARIANT *src, cons else { call_change_type(change_type, &v, src, VT_DISPATCH); ok(V_DISPATCH(&v) == V_DISPATCH(src), "V_DISPATCH(v) != V_DISPATCH(src)\n"); + VariantClear(&v); } }

1 0

Gabriel Ivăncescu : jscript/tests: Fix Date object leak in test_default_value.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: febdb0a121a7497098fef744685291dff7840c29 URL: https://gitlab.winehq.org/wine/wine/-/commit/febdb0a121a7497098fef744685291… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 3 20:47:59 2023 +0200 jscript/tests: Fix Date object leak in test_default_value. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/tests/run.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index c5d9c47e63c..509f01e3211 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -3069,6 +3069,7 @@ static void test_default_value(void) V_VT(&v) = VT_EMPTY; hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); ok(hres == E_UNEXPECTED, "Invoke failed: %08lx\n", hres); + IDispatch_Release(disp); hres = parse_script_expr(L"new Date()", &v, &script); ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres);

1 0

Gabriel Ivăncescu : mshtml/tests: Fix BindInfo leak in htmldoc test.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: cb4939eb0ebfe24d6a818e3de060363a58ef9535 URL: https://gitlab.winehq.org/wine/wine/-/commit/cb4939eb0ebfe24d6a818e3de06036… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 3 20:47:59 2023 +0200 mshtml/tests: Fix BindInfo leak in htmldoc test. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/htmldoc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 4db4777dca4..f2ad881df39 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -836,6 +836,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, hres = IInternetProtocolSink_ReportResult(pOIProtSink, S_OK, 0, NULL); ok(hres == S_OK, "ReportResult failed: %08lx\n", hres); + ReleaseBindInfo(&bindinfo); return S_OK; }

1 0

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

03 Nov '23

Module: wine Branch: master Commit: b1d29765660b5cf7784031d31a84d74fde2f83b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/b1d29765660b5cf7784031d31a84d7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 22:17:16 2023 -0600 netio: Use CRT allocation functions. --- dlls/netio.sys/netio.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index 05b5d6d2a69..46c9541536c 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -31,8 +31,6 @@ #include "winsock2.h" #include "ws2tcpip.h" -#include "wine/heap.h" - WINE_DEFAULT_DEBUG_CHANNEL(netio); struct _WSK_CLIENT @@ -270,7 +268,7 @@ static NTSTATUS WINAPI wsk_close_socket(WSK_SOCKET *socket, IRP *irp) unlock_socket(s); DeleteCriticalSection(&s->cs_socket); - heap_free(socket); + free(socket); irp->IoStatus.Information = 0; dispatch_irp(irp, status); @@ -313,7 +311,7 @@ static void create_accept_socket(struct wsk_socket_internal *socket, struct wsk_ SOCKADDR *local_address, *remote_address; struct wsk_socket_internal *accept_socket; - if (!(accept_socket = heap_alloc_zero(sizeof(*accept_socket)))) + if (!(accept_socket = calloc(1, sizeof(*accept_socket)))) { ERR("No memory.\n"); dispatch_pending_io(io, STATUS_NO_MEMORY, 0); @@ -761,7 +759,7 @@ static NTSTATUS WINAPI wsk_socket(WSK_CLIENT *client, ADDRESS_FAMILY address_fam goto done; } - if (!(socket = heap_alloc_zero(sizeof(*socket)))) + if (!(socket = calloc(1, sizeof(*socket)))) { status = STATUS_NO_MEMORY; closesocket(s); @@ -789,7 +787,7 @@ static NTSTATUS WINAPI wsk_socket(WSK_CLIENT *client, ADDRESS_FAMILY address_fam default: FIXME("Flags %#lx not implemented.\n", flags); closesocket(s); - heap_free(socket); + free(socket); status = STATUS_NOT_IMPLEMENTED; goto done; } @@ -855,7 +853,7 @@ static void WINAPI get_address_info_callback(TP_CALLBACK_INSTANCE *instance, voi context->irp->IoStatus.Information = 0; dispatch_irp(context->irp, sock_error_to_ntstatus(ret)); - heap_free(context); + free(context); } static NTSTATUS WINAPI wsk_get_address_info(WSK_CLIENT *client, UNICODE_STRING *node_name, @@ -873,7 +871,7 @@ static NTSTATUS WINAPI wsk_get_address_info(WSK_CLIENT *client, UNICODE_STRING * if (!irp) return STATUS_INVALID_PARAMETER; - if (!(context = heap_alloc(sizeof(*context)))) + if (!(context = malloc(sizeof(*context)))) { ERR("No memory.\n"); status = STATUS_NO_MEMORY; @@ -894,7 +892,7 @@ static NTSTATUS WINAPI wsk_get_address_info(WSK_CLIENT *client, UNICODE_STRING * ERR("Could not submit thread pool callback.\n"); status = STATUS_UNSUCCESSFUL; dispatch_irp(irp, status); - heap_free(context); + free(context); return status; } TRACE("Submitted threadpool callback, context %p.\n", context); @@ -959,7 +957,7 @@ NTSTATUS WINAPI WskRegister(WSK_CLIENT_NPI *wsk_client_npi, WSK_REGISTRATION *ws TRACE("wsk_client_npi %p, wsk_registration %p.\n", wsk_client_npi, wsk_registration); - if (!(client = heap_alloc(sizeof(*client)))) + if (!(client = malloc(sizeof(*client)))) { ERR("No memory.\n"); return STATUS_NO_MEMORY; @@ -979,7 +977,7 @@ void WINAPI WskDeregister(WSK_REGISTRATION *wsk_registration) { TRACE("wsk_registration %p.\n", wsk_registration); - heap_free(wsk_registration->ReservedRegistrationContext); + free(wsk_registration->ReservedRegistrationContext); } static void WINAPI driver_unload(DRIVER_OBJECT *driver)

1 0

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

03 Nov '23

Module: wine Branch: master Commit: 48801b6dd7d5a5b5c7d8f4c371bc285a686b6d64 URL: https://gitlab.winehq.org/wine/wine/-/commit/48801b6dd7d5a5b5c7d8f4c371bc28… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 22:24:01 2023 -0600 wtsapi32: Use CRT allocation functions. --- dlls/wtsapi32/wtsapi32.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index f4072e7090b..785082d12a3 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -26,7 +26,6 @@ #include "lmcons.h" #include "wtsapi32.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(wtsapi); @@ -149,7 +148,7 @@ BOOL WINAPI WTSEnumerateProcessesExW(HANDLE server, DWORD *level, DWORD session_ nt_process = (SYSTEM_PROCESS_INFORMATION *)((char *)nt_process + nt_process->NextEntryOffset); } - if (!(info = heap_alloc(size))) + if (!(info = malloc(size))) { free(nt_info); SetLastError(ERROR_OUTOFMEMORY); @@ -315,7 +314,7 @@ BOOL WINAPI WTSEnumerateSessionsA(HANDLE server, DWORD reserved, DWORD version, size += sizeof(**session_info) + len; } - if (!(*session_info = heap_alloc(size))) + if (!(*session_info = malloc(size))) { WTSFreeMemory(infoW); SetLastError(ERROR_OUTOFMEMORY); @@ -355,7 +354,7 @@ BOOL WINAPI WTSEnumerateSessionsW(HANDLE server, DWORD reserved, DWORD version, if (!session_info || !count) return FALSE; - if (!(*session_info = heap_alloc(sizeof(**session_info) + sizeof(session_name)))) + if (!(*session_info = malloc(sizeof(**session_info) + sizeof(session_name)))) { SetLastError(ERROR_OUTOFMEMORY); return FALSE; @@ -378,7 +377,7 @@ BOOL WINAPI WTSEnumerateSessionsW(HANDLE server, DWORD reserved, DWORD version, */ void WINAPI WTSFreeMemory(PVOID pMemory) { - heap_free(pMemory); + free(pMemory); } /************************************************************ @@ -387,7 +386,7 @@ void WINAPI WTSFreeMemory(PVOID pMemory) BOOL WINAPI WTSFreeMemoryExA(WTS_TYPE_CLASS type, void *ptr, ULONG nmemb) { TRACE("%d %p %ld\n", type, ptr, nmemb); - heap_free(ptr); + free(ptr); return TRUE; } @@ -397,7 +396,7 @@ BOOL WINAPI WTSFreeMemoryExA(WTS_TYPE_CLASS type, void *ptr, ULONG nmemb) BOOL WINAPI WTSFreeMemoryExW(WTS_TYPE_CLASS type, void *ptr, ULONG nmemb) { TRACE("%d %p %ld\n", type, ptr, nmemb); - heap_free(ptr); + free(ptr); return TRUE; } @@ -481,7 +480,7 @@ BOOL WINAPI WTSQuerySessionInformationA(HANDLE server, DWORD session_id, WTS_INF return FALSE; } - if (!(*buffer = heap_alloc(*count))) + if (!(*buffer = malloc(*count))) { WTSFreeMemory(bufferW); return FALSE; @@ -490,7 +489,7 @@ BOOL WINAPI WTSQuerySessionInformationA(HANDLE server, DWORD session_id, WTS_INF if (!(*count = WideCharToMultiByte(CP_ACP, 0, bufferW, -1, *buffer, *count, NULL, NULL))) { WTSFreeMemory(bufferW); - heap_free(*buffer); + free(*buffer); return FALSE; } @@ -515,7 +514,7 @@ BOOL WINAPI WTSQuerySessionInformationW(HANDLE server, DWORD session_id, WTS_INF { WTS_CONNECTSTATE_CLASS *state; - if (!(state = heap_alloc(sizeof(*state)))) return FALSE; + if (!(state = malloc(sizeof(*state)))) return FALSE; *state = WTSActive; *buffer = (WCHAR *)state; *count = sizeof(*state); @@ -526,7 +525,7 @@ BOOL WINAPI WTSQuerySessionInformationW(HANDLE server, DWORD session_id, WTS_INF { USHORT *protocol; - if (!(protocol = heap_alloc(sizeof(*protocol)))) return FALSE; + if (!(protocol = malloc(sizeof(*protocol)))) return FALSE; FIXME("returning 0 protocol type\n"); *protocol = 0; *buffer = (WCHAR *)protocol; @@ -539,7 +538,7 @@ BOOL WINAPI WTSQuerySessionInformationW(HANDLE server, DWORD session_id, WTS_INF DWORD size = UNLEN + 1; WCHAR *username; - if (!(username = heap_alloc(size * sizeof(WCHAR)))) return FALSE; + if (!(username = malloc(size * sizeof(WCHAR)))) return FALSE; GetUserNameW(username, &size); *buffer = username; *count = size * sizeof(WCHAR); @@ -551,7 +550,7 @@ BOOL WINAPI WTSQuerySessionInformationW(HANDLE server, DWORD session_id, WTS_INF DWORD size = MAX_COMPUTERNAME_LENGTH + 1; WCHAR *computername; - if (!(computername = heap_alloc(size * sizeof(WCHAR)))) return FALSE; + if (!(computername = malloc(size * sizeof(WCHAR)))) return FALSE; GetComputerNameW(computername, &size); *buffer = computername; /* GetComputerNameW() return size doesn't include terminator */

1 0

Alex Henrie : gdiplus/tests: Use CRT allocation functions.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: c2afbc8c0414db624b1a955a3eb063a8bf62f8d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/c2afbc8c0414db624b1a955a3eb063… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 1 22:55:19 2023 -0600 gdiplus/tests: Use CRT allocation functions. --- dlls/gdiplus/tests/graphics.c | 12 ++++++------ dlls/gdiplus/tests/graphicspath.c | 8 ++++---- dlls/gdiplus/tests/image.c | 20 ++++++++++---------- dlls/gdiplus/tests/metafile.c | 8 ++++---- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 724be3f1030..de174257994 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -176,7 +176,7 @@ typedef struct node{ /* Linked list prepend function. */ static void log_state(GraphicsState data, node ** log) { - node * new_entry = HeapAlloc(GetProcessHeap(), 0, sizeof(node)); + node * new_entry = malloc(sizeof(node)); new_entry->data = data; new_entry->next = *log; @@ -209,7 +209,7 @@ static void check_no_duplicates(node * log) temp = orig; do{ temp2 = temp->next; - HeapFree(GetProcessHeap(), 0, temp); + free(temp); temp = temp2; }while(temp); @@ -7198,19 +7198,19 @@ static HDC create_printer_dc(void) if (!pOpenPrinterA(buffer, &hprn, NULL)) goto done; pGetPrinterA(hprn, 2, NULL, 0, &len); - pbuf = HeapAlloc(GetProcessHeap(), 0, len); + pbuf = malloc(len); if (!pGetPrinterA(hprn, 2, (LPBYTE)pbuf, len, &len)) goto done; pGetPrinterDriverA(hprn, NULL, 3, NULL, 0, &len); - dbuf = HeapAlloc(GetProcessHeap(), 0, len); + dbuf = malloc(len); if (!pGetPrinterDriverA(hprn, NULL, 3, (LPBYTE)dbuf, len, &len)) goto done; hdc = CreateDCA(dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName, pbuf->pDevMode); trace("hdc %p for driver '%s' printer '%s' port '%s'\n", hdc, dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName); done: - HeapFree(GetProcessHeap(), 0, dbuf); - HeapFree(GetProcessHeap(), 0, pbuf); + free(dbuf); + free(pbuf); if (hprn) pClosePrinter(hprn); if (winspool) FreeLibrary(winspool); return hdc; diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 823e1cf38ed..f6e0264b786 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -94,8 +94,8 @@ static void _ok_path_fudge(GpPath* path, const path_test_t *expected, INT expect ok_(__FILE__,line)(size == expected_size, "Path size %d does not match expected size %d\n", size, expected_size); - points = HeapAlloc(GetProcessHeap(), 0, size * sizeof(GpPointF)); - types = HeapAlloc(GetProcessHeap(), 0, size); + points = malloc(size * sizeof(GpPointF)); + types = malloc(size); if(GdipGetPathPoints(path, points, size) != Ok || GdipGetPathTypes(path, types, size) != Ok){ skip("Cannot perform path comparisons due to failure to retrieve path.\n"); @@ -125,8 +125,8 @@ static void _ok_path_fudge(GpPath* path, const path_test_t *expected, INT expect } end: - HeapFree(GetProcessHeap(), 0, types); - HeapFree(GetProcessHeap(), 0, points); + free(types); + free(points); } static void test_constructor_destructor(void) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 4d93e28d951..8fc9aa78225 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3797,7 +3797,7 @@ static void check_properties_id_list(GpImage *image, const struct property_test_ if (count_broken != ~0 && count_broken == prop_count) td = td_broken; - prop_id = HeapAlloc(GetProcessHeap(), 0, prop_count * sizeof(*prop_id)); + prop_id = malloc(prop_count * sizeof(*prop_id)); status = GdipGetPropertyIdList(image, prop_count, prop_id); expect(Ok, status); @@ -3821,7 +3821,7 @@ static void check_properties_id_list(GpImage *image, const struct property_test_ if (prop_size) *prop_size += size; - prop_item = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + prop_item = calloc(1, size); status = GdipGetPropertyItem(image, prop_id[i], size, prop_item); size -= sizeof(*prop_item); expect(Ok, status); @@ -3845,12 +3845,12 @@ static void check_properties_id_list(GpImage *image, const struct property_test_ trace("(id %#lx) %s\n", prop_item->id, dbgstr_hexdata(prop_item->value, prop_item->length)); } - HeapFree(GetProcessHeap(), 0, prop_item); + free(prop_item); winetest_pop_context(); } - HeapFree(GetProcessHeap(), 0, prop_id); + free(prop_id); } static void check_properties_get_all(GpImage *image, const struct property_test_data *td, UINT count, @@ -3872,7 +3872,7 @@ static void check_properties_get_all(GpImage *image, const struct property_test_ if (count_broken != ~0 && count_broken == total_count) td = td_broken; - prop_item = HeapAlloc(GetProcessHeap(), 0, total_size); + prop_item = malloc(total_size); status = GdipGetAllPropertyItems(image, total_size, total_count, prop_item); expect(Ok, status); @@ -3902,7 +3902,7 @@ static void check_properties_get_all(GpImage *image, const struct property_test_ winetest_pop_context(); } - HeapFree(GetProcessHeap(), 0, prop_item); + free(prop_item); } static void test_image_properties(void) @@ -4072,7 +4072,7 @@ static void test_image_properties(void) expect(InvalidParameter, status); status = GdipGetAllPropertyItems(image, prop_size, prop_count, NULL); expect(InvalidParameter, status); - prop_item = HeapAlloc(GetProcessHeap(), 0, prop_size); + prop_item = malloc(prop_size); expected = (image_type == ImageTypeMetafile) ? NotImplemented : InvalidParameter; if (prop_count != 1) { @@ -4091,7 +4091,7 @@ static void test_image_properties(void) status = GdipGetAllPropertyItems(image, prop_size, prop_count, prop_item); ok(status == expected || broken(status == Ok && prop_count == 0), /* XP */ "Expected %d, got %d\n", expected, status); - HeapFree(GetProcessHeap(), 0, prop_item); + free(prop_item); GdipDisposeImage(image); @@ -6132,7 +6132,7 @@ static BYTE *init_bitmap(UINT *width, UINT *height, UINT *stride) *stride = (*width * 3 + 3) & ~3; trace("width %d, height %d, stride %d\n", *width, *height, *stride); - src = HeapAlloc(GetProcessHeap(), 0, *stride * *height); + src = malloc(*stride * *height); scale = 256 / *width; if (!scale) scale = 1; @@ -6263,7 +6263,7 @@ static void test_GdipInitializePalette(void) GdipFree(palette); GdipDisposeImage((GpImage *)bitmap); - HeapFree(GetProcessHeap(), 0, data); + free(data); } static void test_graphics_clear(void) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 0b7c8ad9827..f3ab27c0bd2 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -3502,19 +3502,19 @@ static HDC create_printer_dc(void) if (!pOpenPrinterA(buffer, &hprn, NULL)) goto done; pGetPrinterA(hprn, 2, NULL, 0, &len); - pbuf = HeapAlloc(GetProcessHeap(), 0, len); + pbuf = malloc(len); if (!pGetPrinterA(hprn, 2, (LPBYTE)pbuf, len, &len)) goto done; pGetPrinterDriverA(hprn, NULL, 3, NULL, 0, &len); - dbuf = HeapAlloc(GetProcessHeap(), 0, len); + dbuf = malloc(len); if (!pGetPrinterDriverA(hprn, NULL, 3, (LPBYTE)dbuf, len, &len)) goto done; hdc = CreateDCA(dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName, pbuf->pDevMode); trace("hdc %p for driver '%s' printer '%s' port '%s'\n", hdc, dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName); done: - HeapFree(GetProcessHeap(), 0, dbuf); - HeapFree(GetProcessHeap(), 0, pbuf); + free(dbuf); + free(pbuf); if (hprn) pClosePrinter(hprn); if (winspool) FreeLibrary(winspool); return hdc;

1 0