July 2022 - Wine-commits - list.winehq.org

Zebediah Figura : d3d10core/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: 0b51ef9f03c758f99b278d5fa983349f650a529b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b51ef9f03c758f99b278d5f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jul 3 20:29:54 2022 -0500 d3d10core/tests: Build without -DWINE_NO_LONG_TYPES. --- dlls/d3d10core/tests/Makefile.in | 1 - dlls/d3d10core/tests/d3d10core.c | 1446 +++++++++++++++++++------------------- 2 files changed, 712 insertions(+), 735 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0b51ef9f03c758f99b27…

1 0

Nikolay Sivov : d2d1/tests: Add missing return value check (Coverity).
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: 05d8283a9dcb2aabb2ed28a36f3796d5f7c36488 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05d8283a9dcb2aabb2ed28a3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 2 17:53:24 2022 +0300 d2d1/tests: Add missing return value check (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 334e9f1adea..fed0e9bdf96 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10934,7 +10934,11 @@ static void test_effect_register(BOOL d3d11) hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, test->effect_xml, test->binding, test->binding_count, effect_impl_create); ok(hr == test->hr, "Got unexpected hr %#lx, expected %#lx.\n", hr, test->hr); - ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + if (SUCCEEDED(hr)) + { + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + } winetest_pop_context(); }

1 0

Nikolay Sivov : d2d1/effect: Check that "Inputs" property was specified in the description.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: ffab990bd6be33e4817c09fd88c8880851df00da URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffab990bd6be33e4817c09fd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 2 20:13:46 2022 +0300 d2d1/effect: Check that "Inputs" property was specified in the description. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/factory.c | 3 ++- dlls/d2d1/tests/d2d1.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 699b8c05669..0a8a3bbd5b1 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -921,7 +921,8 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromStream(ID2D1Facto if (!parse_effect_get_property(effect, L"DisplayName") || !parse_effect_get_property(effect, L"Author") || !parse_effect_get_property(effect, L"Category") - || !parse_effect_get_property(effect, L"Description")) + || !parse_effect_get_property(effect, L"Description") + || !parse_effect_get_property(effect, L"Inputs")) { WARN("Missing required properties.\n"); d2d_effect_registration_cleanup(effect); diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index fed0e9bdf96..05ebf10e666 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10855,7 +10855,6 @@ static void test_effect_register(BOOL d3d11) winetest_push_context("Test %u", i); hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, test->xml, NULL, 0, effect_impl_create); - todo_wine_if(i == 5) ok(hr == test->hr, "Got unexpected hr %#lx, expected %#lx.\n", hr, test->hr); if (hr == S_OK) {

1 0

Ziqing Hui : d2d1/effect: Keep builtin effects in the same list as the custom once.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: 97abb6d2bad51d8c5d63ec1531519d5d642427a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97abb6d2bad51d8c5d63ec15… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat Jul 2 23:02:49 2022 +0300 d2d1/effect: Keep builtin effects in the same list as the custom once. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 6 ++++ dlls/d2d1/effect.c | 76 ++++++++++++++++++++---------------------------- dlls/d2d1/factory.c | 40 ++++++++++++++++++++++--- dlls/d2d1/tests/d2d1.c | 5 ++++ 4 files changed, 78 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=97abb6d2bad51d8c5d63…

1 0

Nikolay Sivov : d2d1: Implement GetRegisteredEffects().
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: 5284e1db832d48fb485a34577637fbe5f9af5ec1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5284e1db832d48fb485a3457… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 2 23:21:04 2022 +0300 d2d1: Implement GetRegisteredEffects(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/factory.c | 30 +++++++++++++++++++++-- dlls/d2d1/tests/d2d1.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 856af97cd43..a160d7071c2 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -1037,10 +1037,36 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_UnregisterEffect(ID2D1Factory3 *ifa static HRESULT STDMETHODCALLTYPE d2d_factory_GetRegisteredEffects(ID2D1Factory3 *iface, CLSID *effects, UINT32 effect_count, UINT32 *returned, UINT32 *registered) { - FIXME("iface %p, effects %p, effect_count %u, returned %p, registered %p stub!\n", + struct d2d_factory *factory = impl_from_ID2D1Factory3(iface); + struct d2d_effect_registration *effect; + UINT32 ret, reg; + + TRACE("iface %p, effects %p, effect_count %u, returned %p, registered %p.\n", iface, effects, effect_count, returned, registered); - return E_NOTIMPL; + if (!returned) returned = &ret; + if (!registered) registered = ® + + *registered = 0; + *returned = 0; + + d2d_factory_init_builtin_effects(factory); + + LIST_FOR_EACH_ENTRY(effect, &factory->effects, struct d2d_effect_registration, entry) + { + if (effects && effect_count) + { + *effects = effect->id; + effects++; + effect_count--; + *returned += 1; + } + + *registered += 1; + } + + if (!effects) return S_OK; + return *returned == *registered ? S_OK : D2DERR_INSUFFICIENT_BUFFER; } static HRESULT STDMETHODCALLTYPE d2d_factory_GetEffectProperties(ID2D1Factory3 *iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 585016890a6..335659c24b3 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -11935,6 +11935,69 @@ static void test_effect_grayscale(BOOL d3d11) release_test_context(&ctx); } +static void test_registered_effects(BOOL d3d11) +{ + UINT32 ret, count, count2, count3; + struct d2d1_test_context ctx; + ID2D1Factory1 *factory; + CLSID *effects; + HRESULT hr; + + if (!init_test_context(&ctx, d3d11)) + return; + + factory = ctx.factory1; + + count = 0; + hr = ID2D1Factory1_GetRegisteredEffects(factory, NULL, 0, NULL, &count); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(count > 0, "Unexpected effect count %u.\n", count); + + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, effect_xml_a, + NULL, 0, effect_impl_create); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + count2 = 0; + hr = ID2D1Factory1_GetRegisteredEffects(factory, NULL, 0, NULL, &count2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(count2 == count + 1, "Unexpected effect count %u.\n", count2); + + effects = calloc(count2, sizeof(*effects)); + + count3 = 0; + hr = ID2D1Factory1_GetRegisteredEffects(factory, effects, 0, NULL, &count3); + ok(hr == D2DERR_INSUFFICIENT_BUFFER, "Unexpected hr %#lx.\n", hr); + ok(count2 == count3, "Unexpected effect count %u.\n", count3); + + ret = 999; + hr = ID2D1Factory1_GetRegisteredEffects(factory, effects, 0, &ret, NULL); + ok(hr == D2DERR_INSUFFICIENT_BUFFER, "Unexpected hr %#lx.\n", hr); + ok(!ret, "Unexpected count %u.\n", ret); + + ret = 0; + hr = ID2D1Factory1_GetRegisteredEffects(factory, effects, 1, &ret, NULL); + ok(hr == D2DERR_INSUFFICIENT_BUFFER, "Unexpected hr %#lx.\n", hr); + ok(ret == 1, "Unexpected count %u.\n", ret); + ok(!IsEqualGUID(effects, &CLSID_TestEffect), "Unexpected clsid.\n"); + + ret = 0; + hr = ID2D1Factory1_GetRegisteredEffects(factory, effects, count2, &ret, NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(ret == count2, "Unexpected count %u.\n", ret); + ok(IsEqualGUID(&effects[ret - 1], &CLSID_TestEffect), "Unexpected clsid.\n"); + + free(effects); + + ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + + count2 = 0; + hr = ID2D1Factory1_GetRegisteredEffects(factory, NULL, 0, NULL, &count2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(count2 == count, "Unexpected effect count %u.\n", count2); + + release_test_context(&ctx); +} + static void test_stroke_contains_point(BOOL d3d11) { ID2D1TransformedGeometry *transformed_geometry; @@ -12749,6 +12812,7 @@ START_TEST(d2d1) queue_test(test_effect_2d_affine); queue_test(test_effect_crop); queue_test(test_effect_grayscale); + queue_test(test_registered_effects); queue_d3d10_test(test_stroke_contains_point); queue_test(test_image_bounds); queue_test(test_bitmap_map);

1 0

Nikolay Sivov : d2d1/tests: Use CRT allocation functions.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: 7918bfc5cd6d31d652f2b76602dc61b4febe3607 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7918bfc5cd6d31d652f2b766… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 3 13:59:47 2022 +0300 d2d1/tests: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 335659c24b3..1a964475168 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -28,7 +28,6 @@ #include "initguid.h" #include "dwrite.h" #include "wincodec.h" -#include "wine/heap.h" DEFINE_GUID(CLSID_TestEffect, 0xb9ee12e9,0x32d9,0xe659,0xac,0x61,0x2d,0x7c,0xea,0x69,0x28,0x78); DEFINE_GUID(GUID_TestVertexShader, 0x5bcdcfae,0x1e92,0x4dc1,0x94,0xfa,0x3b,0x01,0xca,0x54,0x59,0x20); @@ -358,7 +357,7 @@ static void queue_d3d1x_test(void (*test)(BOOL d3d11), BOOL d3d11) if (mt_test_count >= mt_tests_size) { mt_tests_size = max(16, mt_tests_size * 2); - mt_tests = heap_realloc(mt_tests, mt_tests_size * sizeof(*mt_tests)); + mt_tests = realloc(mt_tests, mt_tests_size * sizeof(*mt_tests)); } mt_tests[mt_test_count].test = test; mt_tests[mt_test_count++].d3d11 = d3d11; @@ -408,7 +407,7 @@ static void run_queued_tests(void) GetSystemInfo(&si); thread_count = si.dwNumberOfProcessors; - threads = heap_calloc(thread_count, sizeof(*threads)); + threads = calloc(thread_count, sizeof(*threads)); for (i = 0, test_idx = 0; i < thread_count; ++i) { threads[i] = CreateThread(NULL, 0, thread_func, &test_idx, 0, NULL); @@ -419,7 +418,7 @@ static void run_queued_tests(void) { CloseHandle(threads[i]); } - heap_free(threads); + free(threads); } static void set_point(D2D1_POINT_2F *point, float x, float y) @@ -10680,7 +10679,7 @@ static ULONG STDMETHODCALLTYPE effect_impl_Release(ID2D1EffectImpl *iface) { if (effect_impl->effect_context) ID2D1EffectContext_Release(effect_impl->effect_context); - heap_free(effect_impl); + free(effect_impl); } return refcount; @@ -10718,7 +10717,7 @@ static HRESULT STDMETHODCALLTYPE effect_impl_create(IUnknown **effect_impl) { struct effect_impl *object; - if (!(object = heap_alloc(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->ID2D1EffectImpl_iface.lpVtbl = &effect_impl_vtbl;

1 0

Nikolay Sivov : rpcss: Use CRT memory allocation functions.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: 201ed0858fc5fcb64999b2752647d93afddd5e61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=201ed0858fc5fcb64999b275… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 3 14:37:49 2022 +0300 rpcss: Use CRT memory allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- programs/rpcss/epmp.c | 6 +++--- programs/rpcss/irotp.c | 22 ++++++++++------------ programs/rpcss/rpcss_main.c | 11 +++++------ 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/programs/rpcss/epmp.c b/programs/rpcss/epmp.c index 2a13aaccb8b..0d4cb9af982 100644 --- a/programs/rpcss/epmp.c +++ b/programs/rpcss/epmp.c @@ -57,7 +57,7 @@ static void delete_registered_ept_entry(struct registered_ept_entry *entry) I_RpcFree(entry->endpoint); I_RpcFree(entry->address); list_remove(&entry->entry); - HeapFree(GetProcessHeap(), 0, entry); + free(entry); } static struct registered_ept_entry *find_ept_entry( @@ -106,7 +106,7 @@ void __cdecl ept_insert(handle_t h, for (i = 0; i < num_ents; i++) { - struct registered_ept_entry *entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*entry)); + struct registered_ept_entry *entry = malloc(sizeof(*entry)); if (!entry) { /* FIXME: cleanup code to delete added entries */ @@ -121,7 +121,7 @@ void __cdecl ept_insert(handle_t h, { WINE_WARN("TowerExplode failed %lu\n", rpc_status); *status = rpc_status; - HeapFree(GetProcessHeap(), 0, entry); + free(entry); break; /* FIXME: more cleanup? */ } diff --git a/programs/rpcss/irotp.c b/programs/rpcss/irotp.c index 47a88852a2d..daf48daf0a7 100644 --- a/programs/rpcss/irotp.c +++ b/programs/rpcss/irotp.c @@ -61,10 +61,10 @@ static inline void rot_entry_release(struct rot_entry *rot_entry) { if (!InterlockedDecrement(&rot_entry->refs)) { - HeapFree(GetProcessHeap(), 0, rot_entry->object); - HeapFree(GetProcessHeap(), 0, rot_entry->moniker); - HeapFree(GetProcessHeap(), 0, rot_entry->moniker_data); - HeapFree(GetProcessHeap(), 0, rot_entry); + free(rot_entry->object); + free(rot_entry->moniker); + free(rot_entry->moniker_data); + free(rot_entry); } } @@ -88,12 +88,11 @@ HRESULT __cdecl IrotRegister( return E_INVALIDARG; } - rot_entry = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*rot_entry)); - if (!rot_entry) + if (!(rot_entry = calloc(1, sizeof(*rot_entry)))) return E_OUTOFMEMORY; rot_entry->refs = 1; - rot_entry->object = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(InterfaceData, abData[obj->ulCntData])); + rot_entry->object = malloc(FIELD_OFFSET(InterfaceData, abData[obj->ulCntData])); if (!rot_entry->object) { rot_entry_release(rot_entry); @@ -104,7 +103,7 @@ HRESULT __cdecl IrotRegister( rot_entry->last_modified = *time; - rot_entry->moniker = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(InterfaceData, abData[mk->ulCntData])); + rot_entry->moniker = malloc(FIELD_OFFSET(InterfaceData, abData[mk->ulCntData])); if (!rot_entry->moniker) { rot_entry_release(rot_entry); @@ -113,8 +112,7 @@ HRESULT __cdecl IrotRegister( rot_entry->moniker->ulCntData = mk->ulCntData; memcpy(&rot_entry->moniker->abData, mk->abData, mk->ulCntData); - rot_entry->moniker_data = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(MonikerComparisonData, abData[data->ulCntData])); - if (!rot_entry->moniker_data) + if (!(rot_entry->moniker_data = malloc(FIELD_OFFSET(MonikerComparisonData, abData[data->ulCntData])))) { rot_entry_release(rot_entry); return E_OUTOFMEMORY; @@ -370,10 +368,10 @@ void __RPC_USER IrotContextHandle_rundown(IrotContextHandle ctxt_handle) void * __RPC_USER MIDL_user_allocate(SIZE_T size) { - return HeapAlloc(GetProcessHeap(), 0, size); + return malloc(size); } void __RPC_USER MIDL_user_free(void * p) { - HeapFree(GetProcessHeap(), 0, p); + free(p); } diff --git a/programs/rpcss/rpcss_main.c b/programs/rpcss/rpcss_main.c index 2fef34d1171..dfe5ced7c07 100644 --- a/programs/rpcss/rpcss_main.c +++ b/programs/rpcss/rpcss_main.c @@ -31,7 +31,6 @@ #include "irpcss.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -58,14 +57,14 @@ HRESULT __cdecl irpcss_server_register(handle_t h, const GUID *clsid, unsigned i struct registered_class *entry; static LONG next_cookie; - if (!(entry = heap_alloc_zero(sizeof(*entry)))) + if (!(entry = calloc(1, sizeof(*entry)))) return E_OUTOFMEMORY; entry->clsid = *clsid; entry->single_use = !(flags & (REGCLS_MULTIPLEUSE | REGCLS_MULTI_SEPARATE)); - if (!(entry->object = heap_alloc(FIELD_OFFSET(MInterfacePointer, abData[object->ulCntData])))) + if (!(entry->object = malloc(FIELD_OFFSET(MInterfacePointer, abData[object->ulCntData])))) { - heap_free(entry); + free(entry); return E_OUTOFMEMORY; } entry->object->ulCntData = object->ulCntData; @@ -82,8 +81,8 @@ HRESULT __cdecl irpcss_server_register(handle_t h, const GUID *clsid, unsigned i static void scm_revoke_class(struct registered_class *_class) { list_remove(&_class->entry); - heap_free(_class->object); - heap_free(_class); + free(_class->object); + free(_class); } HRESULT __cdecl irpcss_server_revoke(handle_t h, unsigned int cookie)

1 0

Nikolay Sivov : wscript: Use CRT memory allocation functions.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: a0bef9f322d4f7fa5341ae2bae45a8be07ed7463 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0bef9f322d4f7fa5341ae2b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 3 14:42:13 2022 +0300 wscript: Use CRT memory allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- programs/wscript/host.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/programs/wscript/host.c b/programs/wscript/host.c index 463f5ee7aa6..44336deac13 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -28,7 +28,6 @@ #include "wscript.h" #include <wine/debug.h> -#include <wine/heap.h> WINE_DEFAULT_DEBUG_CHANNEL(wscript); @@ -81,13 +80,13 @@ static void print_string(const WCHAR *string) } lena = WideCharToMultiByte(GetOEMCP(), 0, string, len, NULL, 0, NULL, NULL); - buf = heap_alloc(len); + buf = malloc(len); if(!buf) return; WideCharToMultiByte(GetOEMCP(), 0, string, len, buf, lena, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), buf, lena, &count, FALSE); - heap_free(buf); + free(buf); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), "\r\n", 2, &count, FALSE); } @@ -334,8 +333,8 @@ static HRESULT WINAPI Host_Echo(IHost *iface, SAFEARRAY *args) return hres; argc = ubound-lbound+1; - strs = heap_alloc_zero(argc*sizeof(*strs)); - if(!strs) { + if (!(strs = calloc(argc, sizeof(*strs)))) + { SafeArrayUnaccessData(args); return E_OUTOFMEMORY; } @@ -353,7 +352,7 @@ static HRESULT WINAPI Host_Echo(IHost *iface, SAFEARRAY *args) SafeArrayUnaccessData(args); if(SUCCEEDED(hres)) { - ptr = output = heap_alloc((len+1)*sizeof(WCHAR)); + ptr = output = malloc((len+1)*sizeof(WCHAR)); if(output) { for(i=0; i < argc; i++) { if(i) @@ -370,13 +369,13 @@ static HRESULT WINAPI Host_Echo(IHost *iface, SAFEARRAY *args) for(i=0; i < argc; i++) SysFreeString(strs[i]); - heap_free(strs); + free(strs); if(FAILED(hres)) return hres; print_string(output); - heap_free(output); + free(output); return S_OK; }

1 0

Nikolay Sivov : wordpad: Use CRT allocation functions.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: ee1f96ebfbd06b16e6bb0982ea9e2e3b08d2658b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee1f96ebfbd06b16e6bb0982… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 3 15:06:58 2022 +0300 wordpad: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- programs/wordpad/print.c | 8 +++----- programs/wordpad/registry.c | 6 ++---- programs/wordpad/wordpad.c | 34 ++++++++++++++++------------------ programs/wordpad/wordpad.h | 2 ++ 4 files changed, 23 insertions(+), 27 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index acc583eefc5..d73c2d7757e 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -749,7 +749,7 @@ void close_preview(HWND hMainWnd) preview.window.right = 0; preview.window.bottom = 0; preview.page = 0; - HeapFree(GetProcessHeap(), 0, preview.pageEnds); + free(preview.pageEnds); preview.pageEnds = NULL; preview.pageCapacity = 0; if (preview.zoomlevel > 0) @@ -783,13 +783,11 @@ static void draw_preview(HWND hEditorWnd, FORMATRANGE* lpFr, RECT* paper, int pa if (!preview.pageEnds) { preview.pageCapacity = 32; - preview.pageEnds = HeapAlloc(GetProcessHeap(), 0, - sizeof(int) * preview.pageCapacity); + preview.pageEnds = malloc(sizeof(int) * preview.pageCapacity); if (!preview.pageEnds) return; } else if (page >= preview.pageCapacity) { int *new_buffer; - new_buffer = HeapReAlloc(GetProcessHeap(), 0, preview.pageEnds, - sizeof(int) * preview.pageCapacity * 2); + new_buffer = realloc(preview.pageEnds, sizeof(int) * preview.pageCapacity * 2); if (!new_buffer) return; preview.pageCapacity *= 2; preview.pageEnds = new_buffer; diff --git a/programs/wordpad/registry.c b/programs/wordpad/registry.c index 138111614bf..2de81c5d583 100644 --- a/programs/wordpad/registry.c +++ b/programs/wordpad/registry.c @@ -51,9 +51,7 @@ static LRESULT registry_get_handle(HKEY *hKey, LPDWORD action, LPCWSTR subKey) if(subKey) { WCHAR backslash[] = {'\\',0}; - key = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - (lstrlenW(wszProgramKey)+lstrlenW(subKey)+lstrlenW(backslash)+1) - *sizeof(WCHAR)); + key = calloc(lstrlenW(wszProgramKey)+lstrlenW(subKey)+lstrlenW(backslash)+1, sizeof(WCHAR)); if(!key) return 1; @@ -73,7 +71,7 @@ static LRESULT registry_get_handle(HKEY *hKey, LPDWORD action, LPCWSTR subKey) } if(subKey) - HeapFree(GetProcessHeap(), 0, key); + free(key); return ret; } diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 7f79eccc8bb..4a3aa2375bf 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -239,8 +239,7 @@ static void set_caption(LPCWSTR wszNewFileName) else wszNewFileName = file_basename((LPWSTR)wszNewFileName); - wszCaption = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - lstrlenW(wszNewFileName)*sizeof(WCHAR)+sizeof(wszSeparator)+sizeof(wszAppTitle)); + wszCaption = calloc(1, lstrlenW(wszNewFileName)*sizeof(WCHAR)+sizeof(wszSeparator)+sizeof(wszAppTitle)); if(!wszCaption) return; @@ -253,7 +252,7 @@ static void set_caption(LPCWSTR wszNewFileName) SetWindowTextW(hMainWnd, wszCaption); - HeapFree(GetProcessHeap(), 0, wszCaption); + free(wszCaption); } static BOOL validate_endptr(LPCWSTR endptr, UNIT *punit) @@ -615,8 +614,8 @@ static BOOL array_reserve(void **elements, size_t *capacity, size_t count, size_ if (new_capacity < count) new_capacity = max_capacity; - new_elements = *elements ? HeapReAlloc(GetProcessHeap(), 0, *elements, new_capacity * size) : - HeapAlloc(GetProcessHeap(), 0, new_capacity * size); + new_elements = *elements ? realloc(*elements, new_capacity * size) : + malloc(new_capacity * size); if (!new_elements) return FALSE; @@ -638,7 +637,7 @@ static void add_font(struct font_array *fonts, LPCWSTR fontName, DWORD fontType, fontHeight = ntmc->ntmTm.tmHeight - ntmc->ntmTm.tmInternalLeading; idx = fonts->count; - fonts->fonts[idx].name = HeapAlloc( GetProcessHeap(), 0, (lstrlenW(fontName) + 1)*sizeof(WCHAR) ); + fonts->fonts[idx].name = malloc((lstrlenW(fontName) + 1)*sizeof(WCHAR) ); lstrcpyW( fonts->fonts[idx].name, fontName ); fonts->fonts[idx].lParam = MAKELONG(fontType, fontHeight); @@ -685,7 +684,7 @@ static void populate_font_list(HWND hListWnd) { if (!lstrcmpiW(font_array.fonts[i].name, font_array.fonts[j].name)) { - HeapFree(GetProcessHeap(), 0, font_array.fonts[i].name); + free(font_array.fonts[i].name); font_array.fonts[i].name = NULL; } else if (++j != i) @@ -707,9 +706,9 @@ static void populate_font_list(HWND hListWnd) SendMessageW(hListWnd, CBEM_INSERTITEMW, 0, (LPARAM)&cbitem); - HeapFree(GetProcessHeap(), 0, font_array.fonts[i].name); + free(font_array.fonts[i].name); } - HeapFree(GetProcessHeap(), 0, font_array.fonts); + free(font_array.fonts); ZeroMemory(&fmt, sizeof(fmt)); fmt.cbSize = sizeof(fmt); @@ -1015,8 +1014,7 @@ static BOOL prompt_save_changes(void) else displayFileName = file_basename(wszFileName); - text = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - (lstrlenW(displayFileName)+lstrlenW(wszSaveChanges))*sizeof(WCHAR)); + text = calloc(lstrlenW(displayFileName)+lstrlenW(wszSaveChanges), sizeof(WCHAR)); if(!text) return FALSE; @@ -1025,7 +1023,7 @@ static BOOL prompt_save_changes(void) ret = MessageBoxW(hMainWnd, text, wszAppTitle, MB_YESNOCANCEL | MB_ICONEXCLAMATION); - HeapFree(GetProcessHeap(), 0, text); + free(text); switch(ret) { @@ -2401,20 +2399,20 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) case ID_EDIT_GETTEXT: { int nLen = GetWindowTextLengthW(hwndEditor); - LPWSTR data = HeapAlloc( GetProcessHeap(), 0, (nLen+1)*sizeof(WCHAR) ); + LPWSTR data = malloc((nLen+1)*sizeof(WCHAR) ); TEXTRANGEW tr; GetWindowTextW(hwndEditor, data, nLen+1); MessageBoxW(NULL, data, wszAppTitle, MB_OK); - HeapFree( GetProcessHeap(), 0, data); - data = HeapAlloc(GetProcessHeap(), 0, (nLen+1)*sizeof(WCHAR)); + free(data); + data = malloc((nLen+1)*sizeof(WCHAR)); tr.chrg.cpMin = 0; tr.chrg.cpMax = nLen; tr.lpstrText = data; SendMessageW(hwndEditor, EM_GETTEXTRANGE, 0, (LPARAM)&tr); MessageBoxW(NULL, data, wszAppTitle, MB_OK); - HeapFree( GetProcessHeap(), 0, data ); + free(data); /* SendMessage(hwndEditor, EM_SETSEL, 0, -1); */ return 0; @@ -2449,12 +2447,12 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) WCHAR *data = NULL; SendMessageW(hwndEditor, EM_EXGETSEL, 0, (LPARAM)&range); - data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data) * (range.cpMax-range.cpMin+1)); + data = malloc(sizeof(*data) * (range.cpMax-range.cpMin+1)); SendMessageW(hwndEditor, EM_GETSELTEXT, 0, (LPARAM)data); sprintf(buf, "Start = %ld, End = %ld", range.cpMin, range.cpMax); MessageBoxA(hWnd, buf, "Editor", MB_OK); MessageBoxW(hWnd, data, wszAppTitle, MB_OK); - HeapFree( GetProcessHeap(), 0, data); + free(data); /* SendMessage(hwndEditor, EM_SETSEL, 0, -1); */ return 0; } diff --git a/programs/wordpad/wordpad.h b/programs/wordpad/wordpad.h index 0baf8c924dd..6dae06b38eb 100644 --- a/programs/wordpad/wordpad.h +++ b/programs/wordpad/wordpad.h @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdlib.h> + #include <windef.h> #include <winuser.h>

1 0

Nikolay Sivov : winepath: Use CRT allocation functions.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: 5675994602c8758756a7f94becd1b8d8a6a7e70d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5675994602c8758756a7f94b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 3 15:50:09 2022 +0300 winepath: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- programs/winepath/winepath.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/winepath/winepath.c b/programs/winepath/winepath.c index 17cfdc1d2eb..88c64b91a42 100644 --- a/programs/winepath/winepath.c +++ b/programs/winepath/winepath.c @@ -195,7 +195,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) if (outputformats & UNIXFORMAT) { WCHAR *ntpath, *tail; int ntpathlen=lstrlenW(argv[i]); - ntpath=HeapAlloc(GetProcessHeap(), 0, sizeof(*ntpath)*(ntpathlen+1)); + ntpath = malloc(sizeof(*ntpath)*(ntpathlen+1)); lstrcpyW(ntpath, argv[i]); tail=NULL; while (1) @@ -215,7 +215,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) { printf("%s%c", unix_name, separator); } - HeapFree( GetProcessHeap(), 0, unix_name ); + free( unix_name ); break; } @@ -247,7 +247,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) tail=slash; *tail='\0'; } - HeapFree(GetProcessHeap(), 0, ntpath); + free(ntpath); } if (outputformats & WINDOWSFORMAT) { WCHAR* windows_name; @@ -255,17 +255,17 @@ int __cdecl wmain(int argc, WCHAR *argv[]) DWORD size; size=WideCharToMultiByte(CP_UNIXCP, 0, argv[i], -1, NULL, 0, NULL, NULL); - unix_name=HeapAlloc(GetProcessHeap(), 0, size); + unix_name = malloc(size); WideCharToMultiByte(CP_UNIXCP, 0, argv[i], -1, unix_name, size, NULL, NULL); if ((windows_name = wine_get_dos_file_name_ptr(unix_name))) { WideCharToMultiByte(CP_UNIXCP, 0, windows_name, -1, path, MAX_PATH, NULL, NULL); printf("%s%c", path, separator); - HeapFree( GetProcessHeap(), 0, windows_name ); + free( windows_name ); } else printf("%c", separator); - HeapFree( GetProcessHeap(), 0, unix_name ); + free( unix_name ); } }

1 0