May 2023 - Wine-commits - list.winehq.org

Rémi Bernon : winegstreamer: Only warn on wg_transform input buffer push errors.
by Alexandre Julliard 29 May '23

29 May '23

Module: wine Branch: master Commit: 2a2ed45566eb29c6bef7a610d52f25f65542a9a2 URL: https://gitlab.winehq.org/wine/wine/-/commit/2a2ed45566eb29c6bef7a610d52f25… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 24 09:38:10 2023 +0200 winegstreamer: Only warn on wg_transform input buffer push errors. Some GStreamer plugins such as openh264 return spurious errors when running the tests. They pass the tests successfull if we simply ignore them. It does not make much difference with returning the error, as they are not supposed to happen anyway, and most of the time the MFT clients don't expect or handle errors. --- dlls/winegstreamer/wg_transform.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index f75d1b4b6df..559e8f976d2 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -740,30 +740,25 @@ static NTSTATUS read_transform_output_data(GstBuffer *buffer, GstCaps *caps, gsi static bool get_transform_output(struct wg_transform *transform, struct wg_sample *sample) { - GstFlowReturn ret = GST_FLOW_OK; GstBuffer *input_buffer; + GstFlowReturn ret; /* Provide the sample for transform_request_sample to pick it up */ InterlockedIncrement(&sample->refcount); InterlockedExchangePointer((void **)&transform->output_wg_sample, sample); - while (!(transform->output_sample = gst_atomic_queue_pop(transform->output_queue))) + while (!(transform->output_sample = gst_atomic_queue_pop(transform->output_queue)) + && (input_buffer = gst_atomic_queue_pop(transform->input_queue))) { - if (!(input_buffer = gst_atomic_queue_pop(transform->input_queue))) - break; - if ((ret = gst_pad_push(transform->my_src, input_buffer))) - { - GST_ERROR("Failed to push transform input, error %d", ret); - break; - } + GST_WARNING("Failed to push transform input, error %d", ret); } /* Remove the sample so transform_request_sample cannot use it */ if (InterlockedExchangePointer((void **)&transform->output_wg_sample, NULL)) InterlockedDecrement(&sample->refcount); - return ret == GST_FLOW_OK; + return !!transform->output_sample; } NTSTATUS wg_transform_read_data(void *args) @@ -778,12 +773,6 @@ NTSTATUS wg_transform_read_data(void *args) NTSTATUS status; if (!transform->output_sample && !get_transform_output(transform, sample)) - { - wg_allocator_release_sample(transform->allocator, sample, false); - return STATUS_UNSUCCESSFUL; - } - - if (!transform->output_sample) { sample->size = 0; params->result = MF_E_TRANSFORM_NEED_MORE_INPUT;

1 0

Rémi Bernon : winegstreamer: Set the default H264 caps profile to "baseline".
by Alexandre Julliard 29 May '23

29 May '23

Module: wine Branch: master Commit: 34b990fe176672a46a63864b6e121ba88ffecb7e URL: https://gitlab.winehq.org/wine/wine/-/commit/34b990fe176672a46a63864b6e121b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 25 15:21:18 2023 +0200 winegstreamer: Set the default H264 caps profile to "baseline". Some elements such as openh264dec require it to be present. --- dlls/winegstreamer/wg_format.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index da0cd052804..a579a1101d1 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -571,11 +571,10 @@ static GstCaps *wg_format_to_caps_video_h264(const struct wg_format *format) GST_FIXME("H264 profile attribute %u not implemented.", format->u.video_h264.profile); /* fallthrough */ case eAVEncH264VProfile_unknown: - profile = NULL; + profile = "baseline"; break; } - if (profile) - gst_caps_set_simple(caps, "profile", G_TYPE_STRING, profile, NULL); + gst_caps_set_simple(caps, "profile", G_TYPE_STRING, profile, NULL); switch (format->u.video_h264.level) {

1 0

Nikolay Sivov : ole32/antimoniker: Use CRT allocation functions.
by Alexandre Julliard 29 May '23

29 May '23

Module: wine Branch: master Commit: 8e4b95e43ef04cc344fc66f9b1eb6b8d600dc7e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/8e4b95e43ef04cc344fc66f9b1eb6b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 27 10:35:13 2023 +0200 ole32/antimoniker: Use CRT allocation functions. --- dlls/ole32/antimoniker.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index 2a7be8e75cc..e4ee4a729d4 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> #include <stdarg.h> #include <string.h> @@ -27,10 +26,8 @@ #include "windef.h" #include "winbase.h" -#include "winerror.h" #include "objbase.h" #include "wine/debug.h" -#include "wine/heap.h" #include "moniker.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -140,7 +137,7 @@ static ULONG WINAPI AntiMonikerImpl_Release(IMoniker *iface) if (!refcount) { if (moniker->pMarshal) IUnknown_Release(moniker->pMarshal); - heap_free(moniker); + free(moniker); } return refcount; @@ -616,8 +613,7 @@ HRESULT create_anti_moniker(DWORD order, IMoniker **ret) { AntiMonikerImpl *moniker; - moniker = heap_alloc_zero(sizeof(*moniker)); - if (!moniker) + if (!(moniker = calloc(1, sizeof(*moniker)))) return E_OUTOFMEMORY; moniker->IMoniker_iface.lpVtbl = &VT_AntiMonikerImpl;

1 0

Nikolay Sivov : ole32/antimoniker: Fix Enum() return error code.
by Alexandre Julliard 29 May '23

29 May '23

Module: wine Branch: master Commit: d4cb70107d56416f19e44a962f732cf6cd696f86 URL: https://gitlab.winehq.org/wine/wine/-/commit/d4cb70107d56416f19e44a962f732c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 27 10:39:15 2023 +0200 ole32/antimoniker: Fix Enum() return error code. --- dlls/ole32/antimoniker.c | 10 +++------- dlls/ole32/tests/moniker.c | 4 +++- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index e4ee4a729d4..855bd47fb27 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -294,16 +294,12 @@ AntiMonikerImpl_ComposeWith(IMoniker* iface, IMoniker* pmkRight, return CreateGenericComposite(iface,pmkRight,ppmkComposite); } -/****************************************************************************** - * AntiMoniker_Enum - ******************************************************************************/ -static HRESULT WINAPI -AntiMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker** ppenumMoniker) +static HRESULT WINAPI AntiMonikerImpl_Enum(IMoniker *iface, BOOL forward, IEnumMoniker **ppenumMoniker) { - TRACE("(%p,%d,%p)\n",iface,fForward,ppenumMoniker); + TRACE("%p, %d, %p.\n", iface, forward, ppenumMoniker); if (ppenumMoniker == NULL) - return E_POINTER; + return E_INVALIDARG; *ppenumMoniker = NULL; diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index a507c63171c..9c583d27c47 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -3037,7 +3037,9 @@ static void test_anti_moniker(void) ok(!enummoniker, "Unexpected pointer.\n"); hr = IMoniker_Enum(moniker, FALSE, NULL); - todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + + hr = IMoniker_Enum(moniker, TRUE, NULL); ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); /* CommonPrefixWith() */

1 0

Nikolay Sivov : ole32/classmoniker: Use CRT allocation functions.
by Alexandre Julliard 29 May '23

29 May '23

Module: wine Branch: master Commit: a9d3d435bcb56a38113e2c29819bd2104690e98c URL: https://gitlab.winehq.org/wine/wine/-/commit/a9d3d435bcb56a38113e2c29819bd2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 27 10:43:38 2023 +0200 ole32/classmoniker: Use CRT allocation functions. --- dlls/ole32/classmoniker.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index 6199a5a5182..4b95f577b84 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -30,7 +30,6 @@ #include "winbase.h" #include "winuser.h" #include "wine/debug.h" -#include "wine/heap.h" #include "ole2.h" #include "moniker.h" @@ -138,8 +137,8 @@ static ULONG WINAPI ClassMoniker_Release(IMoniker* iface) if (!ref) { if (moniker->pMarshal) IUnknown_Release(moniker->pMarshal); - heap_free(moniker->data); - heap_free(moniker); + free(moniker->data); + free(moniker); } return ref; @@ -187,8 +186,8 @@ static HRESULT WINAPI ClassMoniker_Load(IMoniker *iface, IStream *stream) if (moniker->header.data_len) { - heap_free(moniker->data); - if (!(moniker->data = heap_alloc(moniker->header.data_len))) + free(moniker->data); + if (!(moniker->data = malloc(moniker->header.data_len))) { WARN("Failed to allocate moniker data of size %lu.\n", moniker->header.data_len); moniker->header.data_len = 0; @@ -597,7 +596,7 @@ static HRESULT create_class_moniker(const CLSID *clsid, const WCHAR *data, { ClassMoniker *object; - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMoniker_iface.lpVtbl = &ClassMonikerVtbl; @@ -608,7 +607,7 @@ static HRESULT create_class_moniker(const CLSID *clsid, const WCHAR *data, { object->header.data_len = (data_len + 1) * sizeof(WCHAR); - if (!(object->data = heap_alloc(object->header.data_len))) + if (!(object->data = malloc(object->header.data_len))) { IMoniker_Release(&object->IMoniker_iface); return E_OUTOFMEMORY;

1 0

Nikolay Sivov : ole32/pointermoniker: Use CRT allocation functions.
by Alexandre Julliard 29 May '23

29 May '23

Module: wine Branch: master Commit: 894f1cde4acb862dbaa000e7fb9cb09b3d216f59 URL: https://gitlab.winehq.org/wine/wine/-/commit/894f1cde4acb862dbaa000e7fb9cb0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 27 10:45:37 2023 +0200 ole32/pointermoniker: Use CRT allocation functions. --- dlls/ole32/pointermoniker.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/pointermoniker.c b/dlls/ole32/pointermoniker.c index 0beab94c649..9b5ea8caf76 100644 --- a/dlls/ole32/pointermoniker.c +++ b/dlls/ole32/pointermoniker.c @@ -32,7 +32,6 @@ #include "objbase.h" #include "oleidl.h" #include "wine/debug.h" -#include "wine/heap.h" #include "moniker.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -110,7 +109,7 @@ static ULONG WINAPI PointerMonikerImpl_Release(IMoniker *iface) if (!refcount) { if (moniker->pObject) IUnknown_Release(moniker->pObject); - heap_free(moniker); + free(moniker); } return refcount; @@ -600,8 +599,7 @@ HRESULT WINAPI CreatePointerMoniker(IUnknown *object, IMoniker **ret) if (!ret) return E_INVALIDARG; - moniker = heap_alloc(sizeof(*moniker)); - if (!moniker) + if (!(moniker = calloc(1, sizeof(*moniker)))) { *ret = NULL; return E_OUTOFMEMORY; @@ -714,7 +712,7 @@ static ULONG WINAPI ObjrefMonikerImpl_Release(IMoniker *iface) if (!refcount) { if (moniker->pObject) IUnknown_Release(moniker->pObject); - heap_free(moniker); + free(moniker); } return refcount; @@ -1017,8 +1015,7 @@ HRESULT WINAPI CreateObjrefMoniker(IUnknown *obj, IMoniker **ret) if (!ret) return E_INVALIDARG; - moniker = heap_alloc(sizeof(*moniker)); - if (!moniker) + if (!(moniker = calloc(1, sizeof(*moniker)))) { *ret = NULL; return E_OUTOFMEMORY;

1 0

Nikolay Sivov : ole32/itemmoniker: Use CRT allocation functions.
by Alexandre Julliard 29 May '23

29 May '23

Module: wine Branch: master Commit: 873d53d864bce7d1f7719d5562a88d7d7c0bf909 URL: https://gitlab.winehq.org/wine/wine/-/commit/873d53d864bce7d1f7719d5562a88d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 27 10:48:28 2023 +0200 ole32/itemmoniker: Use CRT allocation functions. --- dlls/ole32/itemmoniker.c | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 5c69266fc9c..f0c722bbf26 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -31,7 +31,6 @@ #include "winuser.h" #include "winnls.h" #include "wine/debug.h" -#include "wine/heap.h" #include "ole2.h" #include "moniker.h" @@ -100,7 +99,7 @@ static ULONG WINAPI container_lock_Release(IUnknown *iface) { IOleItemContainer_LockContainer(lock->container, FALSE); IOleItemContainer_Release(lock->container); - heap_free(lock); + free(lock); } return refcount; @@ -118,12 +117,12 @@ static HRESULT set_container_lock(IOleItemContainer *container, IBindCtx *pbc) struct container_lock *lock; HRESULT hr; - if (!(lock = heap_alloc(sizeof(*lock)))) + if (!(lock = malloc(sizeof(*lock)))) return E_OUTOFMEMORY; if (FAILED(hr = IOleItemContainer_LockContainer(container, TRUE))) { - heap_free(lock); + free(lock); return hr; } @@ -203,9 +202,9 @@ static ULONG WINAPI ItemMonikerImpl_Release(IMoniker* iface) if (!refcount) { if (moniker->pMarshal) IUnknown_Release(moniker->pMarshal); - heap_free(moniker->itemName); - heap_free(moniker->itemDelimiter); - heap_free(moniker); + free(moniker->itemName); + free(moniker->itemDelimiter); + free(moniker); } return refcount; @@ -253,18 +252,18 @@ static HRESULT item_moniker_load_string_record(IStream *stream, WCHAR **ret) if (!str_len) { - heap_free(*ret); + free(*ret); *ret = NULL; return S_OK; } - if (!(buffer = heap_alloc(str_len))) + if (!(buffer = malloc(str_len))) return E_OUTOFMEMORY; IStream_Read(stream, buffer, str_len, &read_len); if (read_len != str_len) { - heap_free(buffer); + free(buffer); return E_FAIL; } @@ -291,7 +290,7 @@ static HRESULT item_moniker_load_string_record(IStream *stream, WCHAR **ret) goto end; } - str = heap_alloc(str_len + sizeof(WCHAR)); + str = malloc(str_len + sizeof(WCHAR)); if (str) { memcpy(str, &buffer[i + 1], str_len); @@ -301,21 +300,21 @@ static HRESULT item_moniker_load_string_record(IStream *stream, WCHAR **ret) else { lenW = MultiByteToWideChar(CP_ACP, 0, buffer, -1, NULL, 0); - str = heap_alloc(lenW * sizeof(WCHAR)); + str = malloc(lenW * sizeof(WCHAR)); if (str) MultiByteToWideChar(CP_ACP, 0, buffer, -1, str, lenW); } if (str) { - heap_free(*ret); + free(*ret); *ret = str; } else hr = E_OUTOFMEMORY; end: - heap_free(buffer); + free(buffer); return hr; } @@ -361,13 +360,13 @@ static HRESULT WINAPI ItemMonikerImpl_Save(IMoniker *iface, IStream *stream, BOO if (This->itemDelimiter) { str_len = WideCharToMultiByte(CP_ACP, 0, This->itemDelimiter, -1, NULL, 0, NULL, NULL); - str = heap_alloc(str_len); + str = malloc(str_len); WideCharToMultiByte(CP_ACP, 0, This->itemDelimiter, -1, str, str_len, NULL, NULL); hr = IStream_Write(stream, &str_len, sizeof(str_len), NULL); hr = IStream_Write(stream, str, str_len, NULL); - heap_free(str); + free(str); } else { @@ -376,11 +375,11 @@ static HRESULT WINAPI ItemMonikerImpl_Save(IMoniker *iface, IStream *stream, BOO } str_len = WideCharToMultiByte(CP_ACP, 0, This->itemName, -1, NULL, 0, NULL, NULL); - str = heap_alloc(str_len); + str = malloc(str_len); WideCharToMultiByte(CP_ACP, 0, This->itemName, -1, str, str_len, NULL, NULL); hr = IStream_Write(stream, &str_len, sizeof(str_len), NULL); hr = IStream_Write(stream, str, str_len, NULL); - heap_free(str); + free(str); return hr; } @@ -940,7 +939,7 @@ HRESULT WINAPI CreateItemMoniker(const WCHAR *delimiter, const WCHAR *name, IMon TRACE("%s, %s, %p.\n", debugstr_w(delimiter), debugstr_w(name), ret); - if (!(moniker = heap_alloc_zero(sizeof(*moniker)))) + if (!(moniker = calloc(1, sizeof(*moniker)))) return E_OUTOFMEMORY; moniker->IMoniker_iface.lpVtbl = &VT_ItemMonikerImpl; @@ -948,7 +947,7 @@ HRESULT WINAPI CreateItemMoniker(const WCHAR *delimiter, const WCHAR *name, IMon moniker->ref = 1; str_len = (lstrlenW(name) + 1) * sizeof(WCHAR); - moniker->itemName = heap_alloc(str_len); + moniker->itemName = malloc(str_len); if (!moniker->itemName) { hr = E_OUTOFMEMORY; @@ -959,7 +958,7 @@ HRESULT WINAPI CreateItemMoniker(const WCHAR *delimiter, const WCHAR *name, IMon if (delimiter) { str_len = (lstrlenW(delimiter) + 1) * sizeof(WCHAR); - moniker->itemDelimiter = heap_alloc(str_len); + moniker->itemDelimiter = malloc(str_len); if (!moniker->itemDelimiter) { hr = E_OUTOFMEMORY;

1 0

Nikolay Sivov : ole32/compositemoniker: Use CRT allocation functions.
by Alexandre Julliard 29 May '23

29 May '23

Module: wine Branch: master Commit: b3c773af71e867062ccf5c3ef70069d1f1af759b URL: https://gitlab.winehq.org/wine/wine/-/commit/b3c773af71e867062ccf5c3ef70069… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 27 10:51:11 2023 +0200 ole32/compositemoniker: Use CRT allocation functions. --- dlls/ole32/compositemoniker.c | 51 +++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 7f0ff55627e..d322604adce 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -32,7 +32,6 @@ #include "moniker.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -153,7 +152,7 @@ static ULONG WINAPI CompositeMonikerImpl_Release(IMoniker* iface) { if (moniker->left) IMoniker_Release(moniker->left); if (moniker->right) IMoniker_Release(moniker->right); - heap_free(moniker); + free(moniker); } return refcount; @@ -483,7 +482,7 @@ static HRESULT composite_get_components_alloc(IMoniker *iface, unsigned int *cou else *count = 1; - if (!(*components = heap_alloc(*count * sizeof(**components)))) + if (!(*components = malloc(*count * sizeof(**components)))) return E_OUTOFMEMORY; index = 0; @@ -507,7 +506,7 @@ static HRESULT WINAPI CompositeMonikerImpl_Enum(IMoniker *iface, BOOL forward, I return hr; hr = create_enumerator(monikers, count, forward, ret_enum); - heap_free(monikers); + free(monikers); return hr; } @@ -533,7 +532,7 @@ static HRESULT WINAPI CompositeMonikerImpl_IsEqual(IMoniker *iface, IMoniker *ot if (FAILED(hr = composite_get_components_alloc(iface, &count, &components))) return hr; if (FAILED(hr = composite_get_components_alloc(other, &count, &other_components))) { - heap_free(components); + free(components); return hr; } @@ -543,8 +542,8 @@ static HRESULT WINAPI CompositeMonikerImpl_IsEqual(IMoniker *iface, IMoniker *ot break; } - heap_free(other_components); - heap_free(components); + free(other_components); + free(components); return hr; } @@ -724,15 +723,15 @@ static HRESULT WINAPI CompositeMonikerImpl_CommonPrefixWith(IMoniker *iface, IMo if (FAILED(hr = composite_get_components_alloc(iface, &count, &components))) return hr; if (FAILED(hr = composite_get_components_alloc(other, &count, &other_components))) { - heap_free(components); + free(components); return hr; } count = min(moniker->comp_count, other_moniker->comp_count); - if (!(prefix_components = heap_calloc(count, sizeof(*prefix_components)))) + if (!(prefix_components = calloc(count, sizeof(*prefix_components)))) { - heap_free(components); - heap_free(other_components); + free(components); + free(other_components); return E_OUTOFMEMORY; } @@ -748,12 +747,12 @@ static HRESULT WINAPI CompositeMonikerImpl_CommonPrefixWith(IMoniker *iface, IMo if (hr == S_OK) break; } - heap_free(components); - heap_free(other_components); + free(components); + free(other_components); if (!prefix_len) { - heap_free(prefix_components); + free(prefix_components); return MK_E_NOPREFIX; } @@ -766,7 +765,7 @@ static HRESULT WINAPI CompositeMonikerImpl_CommonPrefixWith(IMoniker *iface, IMo if (FAILED(hr)) break; last = c; } - heap_free(prefix_components); + free(prefix_components); if (SUCCEEDED(hr)) { @@ -839,7 +838,7 @@ static HRESULT WINAPI CompositeMonikerImpl_RelativePathTo(IMoniker *iface, IMoni if (FAILED(hr = composite_get_components_alloc(iface, &this_count, &components))) return hr; if (FAILED(hr = composite_get_components_alloc(other, &other_count, &other_components))) { - heap_free(components); + free(components); return hr; } @@ -897,8 +896,8 @@ static HRESULT WINAPI CompositeMonikerImpl_RelativePathTo(IMoniker *iface, IMoni if (other_tail) IMoniker_Release(other_tail); - heap_free(other_components); - heap_free(components); + free(other_components); + free(components); return hr; } @@ -1296,8 +1295,8 @@ static ULONG WINAPI EnumMonikerImpl_Release(IEnumMoniker *iface) { for (i = 0; i < e->count; ++i) IMoniker_Release(e->monikers[i]); - heap_free(e->monikers); - heap_free(e); + free(e->monikers); + free(e); } return refcount; @@ -1385,16 +1384,16 @@ static HRESULT create_enumerator(IMoniker **components, unsigned int count, BOOL EnumMonikerImpl *object; unsigned int i; - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IEnumMoniker_iface.lpVtbl = &VT_EnumMonikerImpl; object->ref = 1; object->count = count; - if (!(object->monikers = heap_calloc(count, sizeof(*object->monikers)))) + if (!(object->monikers = calloc(count, sizeof(*object->monikers)))) { - heap_free(object); + free(object); return E_OUTOFMEMORY; } @@ -1473,7 +1472,7 @@ static HRESULT moniker_get_tree_representation(IMoniker *moniker, struct comp_no CompositeMonikerImpl *comp_moniker; struct comp_node *node; - if (!(node = heap_alloc_zero(sizeof(*node)))) + if (!(node = calloc(1, sizeof(*node)))) return E_OUTOFMEMORY; node->parent = parent; @@ -1511,7 +1510,7 @@ static void moniker_tree_node_release(struct comp_node *node) { if (node->moniker) IMoniker_Release(node->moniker); - heap_free(node); + free(node); } static void moniker_tree_release(struct comp_node *node) @@ -1750,7 +1749,7 @@ static HRESULT create_composite(IMoniker *left, IMoniker *right, IMoniker **moni *moniker = NULL; - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMoniker_iface.lpVtbl = &VT_CompositeMonikerImpl;

1 0

Nikolay Sivov : ole32/filemoniker: Use CRT allocation functions.
by Alexandre Julliard 29 May '23

29 May '23

Module: wine Branch: master Commit: 0f72487b2570ff5b402ef6cd0b6613b3af0ab725 URL: https://gitlab.winehq.org/wine/wine/-/commit/0f72487b2570ff5b402ef6cd0b6613… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 27 10:59:28 2023 +0200 ole32/filemoniker: Use CRT allocation functions. --- dlls/ole32/filemoniker.c | 77 +++++++++++++++++++++++------------------------- 1 file changed, 37 insertions(+), 40 deletions(-)

1 0

Nikolay Sivov : ole32/git: Use CRT allocation functions.
by Alexandre Julliard 29 May '23

29 May '23

Module: wine Branch: master Commit: 7ab7e299c3694ae4323b99ab3bbaf604906d6a32 URL: https://gitlab.winehq.org/wine/wine/-/commit/7ab7e299c3694ae4323b99ab3bbaf6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 27 11:03:40 2023 +0200 ole32/git: Use CRT allocation functions. --- dlls/ole32/git.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index 50848a2a020..4e432723914 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -182,7 +182,7 @@ StdGlobalInterfaceTable_RegisterInterfaceInGlobal( zero.QuadPart = 0; IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); - entry = HeapAlloc(GetProcessHeap(), 0, sizeof(StdGITEntry)); + entry = malloc(sizeof(*entry)); if (!entry) { CoReleaseMarshalData(stream); @@ -240,8 +240,8 @@ StdGlobalInterfaceTable_RevokeInterfaceFromGlobal( return hr; } IStream_Release(entry->stream); - - HeapFree(GetProcessHeap(), 0, entry); + + free(entry); return S_OK; } @@ -306,7 +306,7 @@ HRESULT WINAPI GlobalInterfaceTable_CreateInstance(IClassFactory *iface, IUnknow if (!std_git) { - git = heap_alloc(sizeof(*git)); + git = malloc(sizeof(*git)); if (!git) return E_OUTOFMEMORY; git->IGlobalInterfaceTable_iface.lpVtbl = &StdGlobalInterfaceTableImpl_Vtbl; @@ -315,7 +315,7 @@ HRESULT WINAPI GlobalInterfaceTable_CreateInstance(IClassFactory *iface, IUnknow if (InterlockedCompareExchangePointer((void **)&std_git, &git->IGlobalInterfaceTable_iface, NULL)) { - heap_free(git); + free(git); } else TRACE("Created the GIT %p\n", git); @@ -326,20 +326,20 @@ HRESULT WINAPI GlobalInterfaceTable_CreateInstance(IClassFactory *iface, IUnknow void release_std_git(void) { - StdGlobalInterfaceTableImpl *git; - StdGITEntry *entry, *entry2; + StdGlobalInterfaceTableImpl *git; + StdGITEntry *entry, *entry2; - if (!std_git) return; + if (!std_git) return; - git = impl_from_IGlobalInterfaceTable(std_git); - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &git->list, StdGITEntry, entry) - { - list_remove(&entry->entry); + git = impl_from_IGlobalInterfaceTable(std_git); + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &git->list, StdGITEntry, entry) + { + list_remove(&entry->entry); - CoReleaseMarshalData(entry->stream); - IStream_Release(entry->stream); - HeapFree(GetProcessHeap(), 0, entry); - } + CoReleaseMarshalData(entry->stream); + IStream_Release(entry->stream); + free(entry); + } - HeapFree(GetProcessHeap(), 0, git); + free(git); }

1 0