wine-commits November 2022

wine-commits@winehq.org

1 participants
1171 discussions

Alex Henrie : ole32: Fix memory leak on error path in composite_get_(left|right)most (Coverity).
by Alexandre Julliard 17 Nov '22

17 Nov '22

Module: wine Branch: master Commit: 02b226f75a0dd978904464d132222a98f806745a URL: https://gitlab.winehq.org/wine/wine/-/commit/02b226f75a0dd978904464d132222a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 16 21:27:51 2022 -0700 ole32: Fix memory leak on error path in composite_get_(left|right)most (Coverity). --- dlls/ole32/compositemoniker.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 26c950a072e..7f0ff55627e 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -1627,6 +1627,7 @@ static HRESULT composite_get_rightmost(CompositeMonikerImpl *composite, IMoniker if (!(node = moniker_tree_get_rightmost(root))) { WARN("Couldn't get right most component.\n"); + moniker_tree_release(root); return E_FAIL; } @@ -1663,6 +1664,7 @@ static HRESULT composite_get_leftmost(CompositeMonikerImpl *composite, IMoniker if (!(node = moniker_tree_get_leftmost(root))) { WARN("Couldn't get left most component.\n"); + moniker_tree_release(root); return E_FAIL; }

1 0

Alex Henrie : mstask: Use standard C functions for memory allocation in task.c.
by Alexandre Julliard 17 Nov '22

17 Nov '22

Module: wine Branch: master Commit: 9dcd2b3ce4fd5c51d499aed1fff7f038ceae84d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/9dcd2b3ce4fd5c51d499aed1fff7f0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 16 23:47:01 2022 -0700 mstask: Use standard C functions for memory allocation in task.c. --- dlls/mstask/mstask_private.h | 10 ---------- dlls/mstask/task.c | 38 +++++++++++++++++++------------------- 2 files changed, 19 insertions(+), 29 deletions(-) diff --git a/dlls/mstask/mstask_private.h b/dlls/mstask/mstask_private.h index aed4c80cbe9..326cd4743bd 100644 --- a/dlls/mstask/mstask_private.h +++ b/dlls/mstask/mstask_private.h @@ -32,14 +32,4 @@ extern HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, IT extern HRESULT task_set_trigger(ITask *task, WORD idx, const TASK_TRIGGER *trigger) DECLSPEC_HIDDEN; extern HRESULT task_get_trigger(ITask *task, WORD idx, TASK_TRIGGER *trigger) DECLSPEC_HIDDEN; -static inline WCHAR *heap_strdupW(const WCHAR *src) -{ - WCHAR *dst; - unsigned len; - if (!src) return NULL; - len = (lstrlenW(src) + 1) * sizeof(WCHAR); - if ((dst = heap_alloc(len))) memcpy(dst, src, len); - return dst; -} - #endif /* __MSTASK_PRIVATE_H__ */ diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 72592b27c09..d2a03aa8b56 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -89,11 +89,11 @@ static void TaskDestructor(TaskImpl *This) if (This->action) IExecAction_Release(This->action); ITaskDefinition_Release(This->task); - heap_free(This->data); - heap_free(This->task_name); - heap_free(This->accountName); - heap_free(This->trigger); - heap_free(This); + free(This->data); + free(This->task_name); + free(This->accountName); + free(This->trigger); + free(This); InterlockedDecrement(&dll_ref); } @@ -322,9 +322,9 @@ static HRESULT WINAPI MSTASK_ITask_CreateTrigger(ITask *iface, WORD *idx, ITaskT if (hr != S_OK) return hr; if (This->trigger) - new_trigger = heap_realloc(This->trigger, sizeof(This->trigger[0]) * (This->trigger_count + 1)); + new_trigger = realloc(This->trigger, sizeof(This->trigger[0]) * (This->trigger_count + 1)); else - new_trigger = heap_alloc(sizeof(This->trigger[0])); + new_trigger = malloc(sizeof(This->trigger[0])); if (!new_trigger) { ITaskTrigger_Release(*task_trigger); @@ -365,7 +365,7 @@ static HRESULT WINAPI MSTASK_ITask_DeleteTrigger(ITask *iface, WORD idx) This->trigger_count--; memmove(&This->trigger[idx], &This->trigger[idx + 1], (This->trigger_count - idx) * sizeof(This->trigger[0])); /* this shouldn't fail in practice since we're shrinking the memory block */ - This->trigger = heap_realloc(This->trigger, sizeof(This->trigger[0]) * This->trigger_count); + This->trigger = realloc(This->trigger, sizeof(This->trigger[0]) * This->trigger_count); return S_OK; } @@ -829,8 +829,8 @@ static HRESULT WINAPI MSTASK_ITask_SetWorkItemData(ITask *iface, WORD count, BYT { if (!data) return E_INVALIDARG; - heap_free(This->data); - This->data = heap_alloc(count); + free(This->data); + This->data = malloc(count); if (!This->data) return E_OUTOFMEMORY; memcpy(This->data, data, count); This->data_count = count; @@ -839,7 +839,7 @@ static HRESULT WINAPI MSTASK_ITask_SetWorkItemData(ITask *iface, WORD count, BYT { if (data) return E_INVALIDARG; - heap_free(This->data); + free(This->data); This->data = NULL; This->data_count = 0; } @@ -933,11 +933,11 @@ static HRESULT WINAPI MSTASK_ITask_SetAccountInformation( FIXME("Partial stub ignores passwords\n"); n = (lstrlenW(pwszAccountName) + 1); - tmp_account_name = heap_alloc(n * sizeof(WCHAR)); + tmp_account_name = malloc(n * sizeof(WCHAR)); if (!tmp_account_name) return E_OUTOFMEMORY; lstrcpyW(tmp_account_name, pwszAccountName); - heap_free(This->accountName); + free(This->accountName); This->accountName = tmp_account_name; This->is_dirty = TRUE; return S_OK; @@ -983,7 +983,7 @@ static HRESULT WINAPI MSTASK_ITask_SetApplicationName(ITask *iface, LPCWSTR appn { LPWSTR tmp_name; - tmp_name = heap_alloc(len * sizeof(WCHAR)); + tmp_name = malloc(len * sizeof(WCHAR)); if (!tmp_name) return E_OUTOFMEMORY; len = SearchPathW(NULL, appname, NULL, len, tmp_name, NULL); @@ -995,7 +995,7 @@ static HRESULT WINAPI MSTASK_ITask_SetApplicationName(ITask *iface, LPCWSTR appn else hr = HRESULT_FROM_WIN32(GetLastError()); - heap_free(tmp_name); + free(tmp_name); return hr; } @@ -1792,8 +1792,8 @@ failed: DeleteFileW(task_name); else if (remember) { - heap_free(This->task_name); - This->task_name = heap_strdupW(task_name); + free(This->task_name); + This->task_name = wcsdup(task_name); } } return hr; @@ -1901,7 +1901,7 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) hr = ITaskService_NewTask(service, 0, &taskdef); if (hr != S_OK) return hr; - This = heap_alloc(sizeof(*This)); + This = malloc(sizeof(*This)); if (!This) { ITaskDefinition_Release(taskdef); @@ -1914,7 +1914,7 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) This->task = taskdef; This->data = NULL; This->data_count = 0; - This->task_name = heap_strdupW(task_name); + This->task_name = wcsdup(task_name); This->flags = 0; This->status = SCHED_S_TASK_NOT_SCHEDULED; This->exit_code = 0;

1 0

Nikolay Sivov : d2d1/tests: Use d2d error code name for unsupported pixel format error code.
by Alexandre Julliard 17 Nov '22

17 Nov '22

Module: wine Branch: master Commit: 5de27f63a101e43e506605950bb2af2fa74cc0fb URL: https://gitlab.winehq.org/wine/wine/-/commit/5de27f63a101e43e506605950bb2af… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 17 08:44:37 2022 +0300 d2d1/tests: Use d2d error code name for unsupported pixel format error code. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 47efba66447..bfa28ead732 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -5201,15 +5201,15 @@ static void test_shared_bitmap(BOOL d3d11) { { DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_IGNORE }, { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE } }, - { { DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_UNKNOWN }, { 0 }, WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT }, + { { DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_UNKNOWN }, { 0 }, D2DERR_UNSUPPORTED_PIXEL_FORMAT }, - { { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_UNKNOWN }, { 0 }, WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT }, + { { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_UNKNOWN }, { 0 }, D2DERR_UNSUPPORTED_PIXEL_FORMAT }, { { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE }, { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE } }, - { { DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_STRAIGHT }, { 0 }, WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT }, - { { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_STRAIGHT }, { 0 }, WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT }, + { { DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_STRAIGHT }, { 0 }, D2DERR_UNSUPPORTED_PIXEL_FORMAT }, + { { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_STRAIGHT }, { 0 }, D2DERR_UNSUPPORTED_PIXEL_FORMAT }, }; unsigned int i; @@ -8974,7 +8974,7 @@ static void check_rt_bitmap_surface_(unsigned int line, ID2D1RenderTarget *rt, B { hr = ID2D1RenderTarget_CreateCompatibleRenderTarget(rt, NULL, NULL, NULL, D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE, &compatible_rt); - ok_(__FILE__, line)(hr == WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT, "Unexpected hr %#lx.\n", hr); + ok_(__FILE__, line)(hr == D2DERR_UNSUPPORTED_PIXEL_FORMAT, "Unexpected hr %#lx.\n", hr); } ID2D1DeviceContext_Release(context); @@ -9032,19 +9032,19 @@ static void test_bitmap_surface(BOOL d3d11) { { DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_PREMULTIPLIED }, { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED } }, - { { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_STRAIGHT }, { 0 }, WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT }, + { { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_STRAIGHT }, { 0 }, D2DERR_UNSUPPORTED_PIXEL_FORMAT }, { { DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_IGNORE }, { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE } }, - { { DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_UNKNOWN }, { 0 }, WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT }, + { { DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_UNKNOWN }, { 0 }, D2DERR_UNSUPPORTED_PIXEL_FORMAT }, - { { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_UNKNOWN }, { 0 }, WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT }, + { { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_UNKNOWN }, { 0 }, D2DERR_UNSUPPORTED_PIXEL_FORMAT }, { { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE }, { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE } }, - { { DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_STRAIGHT }, { 0 }, WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT }, + { { DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_STRAIGHT }, { 0 }, D2DERR_UNSUPPORTED_PIXEL_FORMAT }, }; D2D1_HWND_RENDER_TARGET_PROPERTIES hwnd_rt_desc; D2D1_RENDER_TARGET_PROPERTIES rt_desc; @@ -9104,7 +9104,7 @@ static void test_bitmap_surface(BOOL d3d11) bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(device_context, ctx.surface, &bitmap_desc, &bitmap); - todo_wine_if(bitmap_format_tests[i].hr == WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT) + todo_wine_if(bitmap_format_tests[i].hr == D2DERR_UNSUPPORTED_PIXEL_FORMAT) ok(hr == bitmap_format_tests[i].hr, "%u: Got unexpected hr %#lx.\n", i, hr); if (SUCCEEDED(hr) && hr == bitmap_format_tests[i].hr) @@ -9125,7 +9125,7 @@ static void test_bitmap_surface(BOOL d3d11) surface2 = create_surface(ctx.device, DXGI_FORMAT_A8_UNORM); hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(device_context, surface2, NULL, &bitmap); - ok(hr == S_OK || broken(hr == WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT) /* Win7 */, + ok(hr == S_OK || broken(hr == D2DERR_UNSUPPORTED_PIXEL_FORMAT) /* Win7 */, "Got unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr))

1 0

Nikolay Sivov : d2d1: Derive shared bitmap format from the source bitmap.
by Alexandre Julliard 17 Nov '22

17 Nov '22

Module: wine Branch: master Commit: a50dbd6c15f5d55cf47ca9900d7ad3c8788f9648 URL: https://gitlab.winehq.org/wine/wine/-/commit/a50dbd6c15f5d55cf47ca9900d7ad3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 17 07:32:05 2022 +0300 d2d1: Derive shared bitmap format from the source bitmap. --- dlls/d2d1/bitmap.c | 12 ++++++++-- dlls/d2d1/tests/d2d1.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 1cba26f5ca4..316d0f25ad6 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -544,15 +544,23 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, goto failed; } - if (!desc) + if (desc) + { + d = *desc; + if (d.pixelFormat.format == DXGI_FORMAT_UNKNOWN) + d.pixelFormat.format = src_impl->format.format; + if (d.pixelFormat.alphaMode == D2D1_ALPHA_MODE_UNKNOWN) + d.pixelFormat.alphaMode = src_impl->format.alphaMode; + } + else { d.pixelFormat = src_impl->format; d.dpiX = src_impl->dpi_x; d.dpiY = src_impl->dpi_y; d.bitmapOptions = src_impl->options; d.colorContext = NULL; - desc = &d; } + desc = &d; if (!format_supported(&desc->pixelFormat)) { diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 1935955ec84..47efba66447 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -5254,6 +5254,68 @@ static void test_shared_bitmap(BOOL d3d11) } } + ID2D1Bitmap_Release(bitmap1); + + /* Create from another bitmap, with a different description. */ + set_size_u(&size, 4, 4); + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + hr = ID2D1RenderTarget_CreateBitmap(rt2, size, NULL, 0, &bitmap_desc, &bitmap1); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + if (SUCCEEDED(hr)) + { + static const struct bitmap_format_test + { + D2D1_PIXEL_FORMAT original; + D2D1_PIXEL_FORMAT result; + HRESULT hr; + } + bitmap_format_tests[] = + { + { { DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_PREMULTIPLIED }, + { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED } }, + + { { DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_IGNORE }, + { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE } }, + + { { DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_UNKNOWN }, + { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED } }, + + { { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_UNKNOWN }, + { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED } }, + + { { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE }, + { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE } }, + + { { DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_STRAIGHT }, { 0 }, D2DERR_UNSUPPORTED_PIXEL_FORMAT }, + { { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_STRAIGHT }, { 0 }, D2DERR_UNSUPPORTED_PIXEL_FORMAT }, + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(bitmap_format_tests); ++i) + { + bitmap_desc.pixelFormat = bitmap_format_tests[i].original; + + hr = ID2D1RenderTarget_CreateSharedBitmap(rt2, &IID_ID2D1Bitmap, bitmap1, &bitmap_desc, &bitmap2); + ok(hr == bitmap_format_tests[i].hr, "%u: Got unexpected hr %#lx.\n", i, hr); + + if (SUCCEEDED(hr) && hr == bitmap_format_tests[i].hr) + { + pixel_format = ID2D1Bitmap_GetPixelFormat(bitmap2); + ok(pixel_format.format == bitmap_format_tests[i].result.format, "%u: unexpected pixel format %#x.\n", + i, pixel_format.format); + ok(pixel_format.alphaMode == bitmap_format_tests[i].result.alphaMode, "%u: unexpected alpha mode %d.\n", + i, pixel_format.alphaMode); + } + + if (SUCCEEDED(hr)) + ID2D1Bitmap_Release(bitmap2); + } + } + ID2D1RenderTarget_Release(rt2); ID2D1Bitmap_Release(bitmap1);

1 0

Alex Henrie : dpnet: Remove unused function heap_strdupW.
by Alexandre Julliard 17 Nov '22

17 Nov '22

Module: wine Branch: master Commit: f6f89bf67d6327b4e5741d38c706b8aade8ad898 URL: https://gitlab.winehq.org/wine/wine/-/commit/f6f89bf67d6327b4e5741d38c706b8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 16 22:08:55 2022 -0700 dpnet: Remove unused function heap_strdupW. --- dlls/dpnet/dpnet_private.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 9458a5123aa..2e36b9ffeee 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -21,7 +21,6 @@ #ifndef __WINE_DPNET_PRIVATE_H #define __WINE_DPNET_PRIVATE_H -#include "wine/heap.h" #include <wine/list.h> #include "winsock2.h" @@ -150,12 +149,4 @@ typedef struct { #define FE(x) { x, #x } #define GE(x) { &x, #x } -static inline WCHAR *heap_strdupW( const WCHAR *src ) -{ - WCHAR *dst; - if (!src) return NULL; - if ((dst = heap_alloc( (lstrlenW( src ) + 1) * sizeof(WCHAR) ))) lstrcpyW( dst, src ); - return dst; -} - #endif

1 0

Alex Henrie : dpnet: Use standard C functions for memory allocation in server.c.
by Alexandre Julliard 17 Nov '22

17 Nov '22

Module: wine Branch: master Commit: e2d94b5cdf7aa5ff8f145ba841fe8a79eb0aad5f URL: https://gitlab.winehq.org/wine/wine/-/commit/e2d94b5cdf7aa5ff8f145ba841fe8a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 16 22:08:27 2022 -0700 dpnet: Use standard C functions for memory allocation in server.c. --- dlls/dpnet/server.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dpnet/server.c b/dlls/dpnet/server.c index 8a8ed04642d..923d0d5bfa5 100644 --- a/dlls/dpnet/server.c +++ b/dlls/dpnet/server.c @@ -95,9 +95,9 @@ static ULONG WINAPI IDirectPlay8ServerImpl_Release(IDirectPlay8Server *iface) if (!ref) { - heap_free(This->servername); - heap_free(This->data); - heap_free(This); + free(This->servername); + free(This->data); + free(This); } return ref; @@ -182,12 +182,12 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_SetServerInfo(IDirectPlay8Server *i if (pdpnPlayerInfo->dwInfoFlags & DPNINFO_NAME) { - heap_free(This->servername); + free(This->servername); This->servername = NULL; if(pdpnPlayerInfo->pwszName) { - This->servername = heap_strdupW(pdpnPlayerInfo->pwszName); + This->servername = wcsdup(pdpnPlayerInfo->pwszName); if (!This->servername) return E_OUTOFMEMORY; } @@ -195,7 +195,7 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_SetServerInfo(IDirectPlay8Server *i if (pdpnPlayerInfo->dwInfoFlags & DPNINFO_DATA) { - heap_free(This->data); + free(This->data); This->data = NULL; This->datasize = 0; @@ -204,7 +204,7 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_SetServerInfo(IDirectPlay8Server *i if(pdpnPlayerInfo->dwDataSize && pdpnPlayerInfo->pvData) { - This->data = heap_alloc(pdpnPlayerInfo->dwDataSize); + This->data = malloc(pdpnPlayerInfo->dwDataSize); if (!This->data) return E_OUTOFMEMORY; @@ -460,7 +460,7 @@ HRESULT DPNET_CreateDirectPlay8Server(IClassFactory *iface, IUnknown *pUnkOuter, if(pUnkOuter) return CLASS_E_NOAGGREGATION; - server = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectPlay8ServerImpl)); + server = calloc(1, sizeof(IDirectPlay8ServerImpl)); if (!server) return E_OUTOFMEMORY;

1 0

Alex Henrie : dpnet: Use standard C functions for memory allocation in peer.c.
by Alexandre Julliard 17 Nov '22

17 Nov '22

Module: wine Branch: master Commit: 8ef070b6c27eddf5faa162e0896646fb7e3c2674 URL: https://gitlab.winehq.org/wine/wine/-/commit/8ef070b6c27eddf5faa162e0896646… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 16 22:07:40 2022 -0700 dpnet: Use standard C functions for memory allocation in peer.c. --- dlls/dpnet/peer.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index bbcda6a72c2..143be9aa5eb 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -92,10 +92,10 @@ static ULONG WINAPI IDirectPlay8PeerImpl_Release(IDirectPlay8Peer *iface) if(!RefCount) { - heap_free(This->username); - heap_free(This->data); + free(This->username); + free(This->data); - heap_free(This); + free(This); } return RefCount; @@ -389,12 +389,12 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_SetPeerInfo(IDirectPlay8Peer *iface, if (pdpnPlayerInfo->dwInfoFlags & DPNINFO_NAME) { - heap_free(This->username); + free(This->username); This->username = NULL; if(pdpnPlayerInfo->pwszName) { - This->username = heap_strdupW(pdpnPlayerInfo->pwszName); + This->username = wcsdup(pdpnPlayerInfo->pwszName); if (!This->username) return E_OUTOFMEMORY; } @@ -402,10 +402,10 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_SetPeerInfo(IDirectPlay8Peer *iface, if (pdpnPlayerInfo->dwInfoFlags & DPNINFO_DATA) { - heap_free(This->data); + free(This->data); This->datasize = pdpnPlayerInfo->dwDataSize; - This->data = heap_alloc(pdpnPlayerInfo->dwDataSize); + This->data = malloc(pdpnPlayerInfo->dwDataSize); if (!This->data) return E_OUTOFMEMORY; @@ -638,7 +638,7 @@ HRESULT DPNET_CreateDirectPlay8Peer(IClassFactory *iface, IUnknown *pUnkOuter, R IDirectPlay8PeerImpl* Client; HRESULT ret; - Client = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectPlay8PeerImpl)); + Client = calloc(1, sizeof(IDirectPlay8PeerImpl)); *ppobj = NULL;

1 0

Alex Henrie : dpnet: Use standard C functions for memory allocation in client.c.
by Alexandre Julliard 17 Nov '22

17 Nov '22

Module: wine Branch: master Commit: a407ba9fe1a2e81ee70c8afb6d445417bd163166 URL: https://gitlab.winehq.org/wine/wine/-/commit/a407ba9fe1a2e81ee70c8afb6d4454… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 16 22:06:41 2022 -0700 dpnet: Use standard C functions for memory allocation in client.c. --- dlls/dpnet/client.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index 4af8daf6d3e..c3d25f5ea6b 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -87,9 +87,9 @@ static ULONG WINAPI IDirectPlay8ClientImpl_Release(IDirectPlay8Client *iface) if (!ref) { - heap_free(This->username); - heap_free(This->data); - heap_free(This); + free(This->username); + free(This->data); + free(This); } return ref; } @@ -217,12 +217,12 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_SetClientInfo(IDirectPlay8Client *i if (pdpnPlayerInfo->dwInfoFlags & DPNINFO_NAME) { - heap_free(This->username); + free(This->username); This->username = NULL; if(pdpnPlayerInfo->pwszName) { - This->username = heap_strdupW(pdpnPlayerInfo->pwszName); + This->username = wcsdup(pdpnPlayerInfo->pwszName); if (!This->username) return E_OUTOFMEMORY; } @@ -230,7 +230,7 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_SetClientInfo(IDirectPlay8Client *i if (pdpnPlayerInfo->dwInfoFlags & DPNINFO_DATA) { - heap_free(This->data); + free(This->data); This->data = NULL; This->datasize = 0; @@ -239,7 +239,7 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_SetClientInfo(IDirectPlay8Client *i if(pdpnPlayerInfo->dwDataSize && pdpnPlayerInfo->pvData) { - This->data = heap_alloc(pdpnPlayerInfo->dwDataSize); + This->data = malloc(pdpnPlayerInfo->dwDataSize); if (!This->data) return E_OUTOFMEMORY; @@ -393,7 +393,7 @@ HRESULT DPNET_CreateDirectPlay8Client(IClassFactory *iface, IUnknown *pUnkOuter, if(pUnkOuter) return CLASS_E_NOAGGREGATION; - client = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectPlay8ClientImpl)); + client = calloc(1, sizeof(IDirectPlay8ClientImpl)); if (!client) return E_OUTOFMEMORY; @@ -448,7 +448,7 @@ static ULONG WINAPI lobbyclient_Release(IDirectPlay8LobbyClient *iface) if (!ref) { - HeapFree(GetProcessHeap(), 0, This); + free(This); } return ref; @@ -564,7 +564,7 @@ HRESULT DPNET_CreateDirectPlay8LobbyClient(IClassFactory *iface, IUnknown *outer TRACE("%p (%p, %s, %p)\n", iface, outer, debugstr_guid(riid), obj); - client = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*client)); + client = calloc(1, sizeof(*client)); if (!client) { *obj = NULL;

1 0

Nikolay Sivov : oleaut32/tests: Add a test for VT_NULL input for VarFormatDateTime().
by Alexandre Julliard 17 Nov '22

17 Nov '22

Module: wine Branch: master Commit: 41f456f3a48896a10392836a76008f916563c32d URL: https://gitlab.winehq.org/wine/wine/-/commit/41f456f3a48896a10392836a76008f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 16 17:25:17 2022 +0300 oleaut32/tests: Add a test for VT_NULL input for VarFormatDateTime(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/tests/varformat.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 16506d8e97f..bc3b6c175f9 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -659,6 +659,19 @@ static void test_VarFormatCurrency(void) VariantClear(&in); } +static void test_VarFormatDateTime(void) +{ + VARIANT in; + HRESULT hr; + BSTR str; + + V_VT(&in) = VT_NULL; + str = (void *)0xdeadbeef; + hr = VarFormatDateTime(&in, 0, 0, &str); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!str, "Unexpected out string %p.\n", str); +} + START_TEST(varformat) { test_VarFormatNumber(); @@ -667,4 +680,5 @@ START_TEST(varformat) test_VarFormatFromTokens(); test_GetAltMonthNames(); test_VarFormatCurrency(); + test_VarFormatDateTime(); }

1 0

Alex Henrie : msxml3: Remove unused function heap_strdupW.
by Alexandre Julliard 17 Nov '22

17 Nov '22

Module: wine Branch: master Commit: 0a5932e1a714d2938b397bdd85bbcfefd4bd8011 URL: https://gitlab.winehq.org/wine/wine/-/commit/0a5932e1a714d2938b397bdd85bbcf… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 16 23:54:09 2022 -0700 msxml3: Remove unused function heap_strdupW. This function has not been used since commit 5b43c42c8832f3e6d0b70a54b01938f43b950647. --- dlls/msxml3/msxml_private.h | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 8003c1a9650..e41b7c9979d 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -85,22 +85,6 @@ static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t siz return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); } -static inline LPWSTR heap_strdupW(LPCWSTR str) -{ - LPWSTR ret = NULL; - - if(str) { - DWORD size; - - size = (lstrlenW(str)+1)*sizeof(WCHAR); - ret = heap_alloc(size); - if(ret) - memcpy(ret, str, size); - } - - return ret; -} - /* XSLProcessor parameter list */ struct xslprocessor_par {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2022