January 2020 - Wine-Commits

Zhiyi Zhang : vulkan-1/tests: Fix some test failures.
by Alexandre Julliard Jan. 22, 2020

Jan. 22, 2020

Module: wine Branch: master Commit: 95d267369ade5e1509a9090498409915cab22a97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95d267369ade5e1509a90904… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jan 20 11:44:53 2020 +0800 vulkan-1/tests: Fix some test failures. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/tests/vulkan.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 9a93e2af6f..63fd48b33d 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -177,10 +177,9 @@ static void test_enumerate_physical_device2(void) ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); vr = vkEnumeratePhysicalDevices(vk_instance, &count, NULL); - ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); - if (!count) + if (vr || !count) { - skip("No physical devices.\n"); + skip("No physical devices. VkResult %d.\n", vr); vkDestroyInstance(vk_instance, NULL); return; } @@ -397,10 +396,9 @@ static void for_each_device(void (*test_func)(VkPhysicalDevice)) ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); vr = vkEnumeratePhysicalDevices(vk_instance, &count, NULL); - ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); - if (!count) + if (vr || !count) { - skip("No physical devices.\n"); + skip("No physical devices. VkResult %d.\n", vr); vkDestroyInstance(vk_instance, NULL); return; }

1 0

Zebediah Figura : shell32/tests: Fix some failures in test_contextmenu().
by Alexandre Julliard Jan. 22, 2020

Jan. 22, 2020

Module: wine Branch: master Commit: 49a71fcc7704e7b52762b77eb45691713cc2218b URL: https://source.winehq.org/git/wine.git/?a=commit;h=49a71fcc7704e7b52762b77e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 18 10:55:19 2020 -0600 shell32/tests: Fix some failures in test_contextmenu(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 43cbbfda2c..14d243a03b 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4356,23 +4356,19 @@ if (hr == S_OK) static void test_contextmenu(IContextMenu *menu, BOOL background) { HMENU hmenu = CreatePopupMenu(); - const int id_upper_limit = 32767; - const int baseItem = 0x40; - INT max_id, max_id_check; - UINT count, i; + UINT count, i, max_id; HRESULT hr; test_contextmenu_qi(menu, FALSE); - hr = IContextMenu_QueryContextMenu(menu, hmenu, 0, baseItem, id_upper_limit, CMF_NORMAL); + hr = IContextMenu_QueryContextMenu(menu, hmenu, 0, 64, 32767, CMF_NORMAL); ok(SUCCEEDED(hr), "Failed to query the menu, hr %#x.\n", hr); max_id = HRESULT_CODE(hr) - 1; /* returns max_id + 1 */ - ok(max_id <= id_upper_limit, "Got %d\n", max_id); + ok(max_id <= 32767, "Got %d\n", max_id); count = GetMenuItemCount(hmenu); ok(count, "Got %d\n", count); - max_id_check = 0; for (i = 0; i < count; i++) { MENUITEMINFOA mii; @@ -4387,26 +4383,20 @@ static void test_contextmenu(IContextMenu *menu, BOOL background) res = GetMenuItemInfoA(hmenu, i, TRUE, &mii); ok(res, "Failed to get menu item info, error %d.\n", GetLastError()); - ok((mii.wID <= id_upper_limit) || (mii.fType & MFT_SEPARATOR), - "Got non-separator ID out of range: %d (type: %x)\n", mii.wID, mii.fType); if (!(mii.fType & MFT_SEPARATOR)) { - max_id_check = (mii.wID > max_id_check) ? mii.wID : max_id_check; - hr = IContextMenu_GetCommandString(menu, mii.wID - baseItem, GCS_VERBA, 0, buf, sizeof(buf)); + ok(mii.wID >= 64 && mii.wID <= 64 + max_id, + "Expected between 64 and %d, got %d.\n", 64 + max_id, mii.wID); + hr = IContextMenu_GetCommandString(menu, mii.wID - 64, GCS_VERBA, 0, buf, sizeof(buf)); todo_wine_if(background) - ok(SUCCEEDED(hr) || hr == E_NOTIMPL, "for id 0x%x got 0x%08x (menustr: %s)\n", mii.wID - baseItem, hr, mii.dwTypeData); - if (SUCCEEDED(hr)) - trace("for id 0x%x got string %s (menu string: %s)\n", mii.wID - baseItem, buf, mii.dwTypeData); - else if (hr == E_NOTIMPL) - trace("for id 0x%x got E_NOTIMPL (menu string: %s)\n", mii.wID - baseItem, mii.dwTypeData); + ok(hr == S_OK || hr == E_NOTIMPL || hr == E_INVALIDARG, + "Got unexpected hr %#x for ID %d, string %s.\n", hr, mii.wID, debugstr_a(mii.dwTypeData)); + if (hr == S_OK) + trace("Got ID %d, verb %s, string %s.\n", mii.wID, debugstr_a(buf), debugstr_a(mii.dwTypeData)); + else + trace("Got ID %d, hr %#x, string %s.\n", mii.wID, hr, debugstr_a(mii.dwTypeData)); } } - max_id_check -= baseItem; - ok((max_id_check == max_id) || - (max_id_check == max_id-1) || /* Win 7 */ - (max_id_check == max_id-2) || /* Win 8 */ - (max_id_check == max_id-3), - "Not equal (or near equal), got %d and %d\n", max_id_check, max_id); if (count) {

1 0

Zebediah Figura : compobj: Reference the IMalloc pointer in CoInitialize().
by Alexandre Julliard Jan. 22, 2020

Jan. 22, 2020

Module: wine Branch: master Commit: 588af8ca85a4f79b301c4a323a18d60b8b5d4e02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=588af8ca85a4f79b301c4a32… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 15 00:24:31 2020 -0600 compobj: Reference the IMalloc pointer in CoInitialize(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42554 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/compobj.dll16/compobj.c | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/compobj.dll16/compobj.c b/dlls/compobj.dll16/compobj.c index 44a7091ef1..52e5d72688 100644 --- a/dlls/compobj.dll16/compobj.c +++ b/dlls/compobj.dll16/compobj.c @@ -67,6 +67,28 @@ typedef struct SEGPTR lpVtbl; } IMalloc16; +static ULONG call_IMalloc_AddRef(SEGPTR iface) +{ + IMalloc16 *malloc = MapSL(iface); + IMalloc16Vtbl *vtbl = MapSL(malloc->lpVtbl); + DWORD args[1], ret; + + args[0] = iface; + WOWCallback16Ex(vtbl->AddRef, WCB16_CDECL, sizeof(args), args, &ret); + return ret; +} + +static ULONG call_IMalloc_Release(SEGPTR iface) +{ + IMalloc16 *malloc = MapSL(iface); + IMalloc16Vtbl *vtbl = MapSL(malloc->lpVtbl); + DWORD args[1], ret; + + args[0] = iface; + WOWCallback16Ex(vtbl->Release, WCB16_CDECL, sizeof(args), args, &ret); + return ret; +} + static SEGPTR call_IMalloc_Alloc(SEGPTR iface, DWORD size) { IMalloc16 *malloc = MapSL(iface); @@ -288,8 +310,9 @@ SEGPTR WINAPI CoMemAlloc(DWORD size, MEMCTX context, DWORD unknown) HRESULT WINAPI CoInitialize16(SEGPTR malloc) { if (!malloc) - CoCreateStandardMalloc16(MEMCTX_TASK, &malloc); - compobj_malloc = malloc; + CoCreateStandardMalloc16(MEMCTX_TASK, &compobj_malloc); + else + call_IMalloc_AddRef(compobj_malloc = malloc); return S_OK; } @@ -301,8 +324,11 @@ HRESULT WINAPI CoInitialize16(SEGPTR malloc) */ void WINAPI CoUninitialize16(void) { - TRACE("()\n"); - CoFreeAllLibraries(); + TRACE("\n"); + + CoFreeAllLibraries(); + call_IMalloc_Release(compobj_malloc); + compobj_malloc = 0; } /***********************************************************************

1 0

Zebediah Figura : compobj: Get rid of _xmalloc16().
by Alexandre Julliard Jan. 22, 2020

Jan. 22, 2020

Module: wine Branch: master Commit: 9c530b7c1e5a9c6b164c6e2017e56132b43a34a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c530b7c1e5a9c6b164c6e20… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 15 00:24:28 2020 -0600 compobj: Get rid of _xmalloc16(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/compobj.dll16/compobj.c | 128 +++++++++++++++---------------------------- 1 file changed, 43 insertions(+), 85 deletions(-) diff --git a/dlls/compobj.dll16/compobj.c b/dlls/compobj.dll16/compobj.c index 3991de4432..dc5e315b4c 100644 --- a/dlls/compobj.dll16/compobj.c +++ b/dlls/compobj.dll16/compobj.c @@ -45,7 +45,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -typedef LPSTR LPOLESTR16; typedef LPCSTR LPCOLESTR16; #define CHARS_IN_GUID 39 @@ -68,6 +67,18 @@ typedef struct SEGPTR lpVtbl; } IMalloc16, *LPMALLOC16; +static SEGPTR call_IMalloc_Alloc(SEGPTR iface, DWORD size) +{ + IMalloc16 *malloc = MapSL(iface); + IMalloc16Vtbl *vtbl = MapSL(malloc->lpVtbl); + DWORD args[2], ret; + + args[0] = iface; + args[1] = size; + WOWCallback16Ex(vtbl->Alloc, WCB16_CDECL, sizeof(args), args, &ret); + return ret; +} + static HTASK16 hETask = 0; static WORD Table_ETask[62]; @@ -268,6 +279,24 @@ HRESULT WINAPI CoCreateStandardMalloc16(DWORD dwMemContext, return S_OK; } +/*********************************************************************** + * CoMemAlloc [COMPOBJ.151] + */ +SEGPTR WINAPI CoMemAlloc(DWORD size, MEMCTX context, DWORD unknown) +{ + SEGPTR malloc; + + TRACE("size %u, context %d, unknown %#x.\n", size, context, unknown); + if (context != MEMCTX_TASK) + FIXME("Ignoring context %d.\n", context); + if (unknown) + FIXME("Ignoring unknown parameter %#x.\n", unknown); + + if (CoGetMalloc16(0, (IMalloc16 **)&malloc)) + return 0; + return call_IMalloc_Alloc(malloc, size); +} + /****************************************************************************** * CoInitialize [COMPOBJ.2] * Set the win16 IMalloc used for memory management @@ -386,78 +415,23 @@ HRESULT WINAPI CLSIDFromString16( return S_OK; } -/****************************************************************************** - * _xmalloc16 [internal] - * Allocates size bytes from the standard ole16 allocator. - * - * RETURNS - * the allocated segmented pointer and a HRESULT - */ -static HRESULT -_xmalloc16(DWORD size, SEGPTR *ptr) { - LPMALLOC16 mllc; - DWORD args[2]; - - if (CoGetMalloc16(0,&mllc)) - return E_OUTOFMEMORY; - - args[0] = (DWORD)mllc; - args[1] = size; - /* No need for a Callback entry, we have WOWCallback16Ex which does - * everything we need. - */ - if (!WOWCallback16Ex( - (DWORD)((const IMalloc16Vtbl*)MapSL( - (SEGPTR)((LPMALLOC16)MapSL((SEGPTR)mllc))->lpVtbl ) - )->Alloc, - WCB16_CDECL, - 2*sizeof(DWORD), - (LPVOID)args, - (LPDWORD)ptr - )) { - ERR("CallTo16 IMalloc16 (%d) failed\n",size); - return E_FAIL; - } - return S_OK; -} - -/****************************************************************************** - * StringFromCLSID [COMPOBJ.19] - * StringFromIID [COMPOBJ.14] - * Converts a GUID into the respective string representation. - * The target string is allocated using the OLE IMalloc. - * - * RETURNS - * the string representation and HRESULT +/*********************************************************************** + * StringFromCLSID [COMPOBJ.151] */ - -HRESULT WINAPI StringFromCLSID16( - REFCLSID id, /* [in] the GUID to be converted */ - LPOLESTR16 *idstr ) /* [out] a pointer to a to-be-allocated segmented pointer pointing to the resulting string */ +HRESULT WINAPI StringFromCLSID16(REFCLSID id, SEGPTR *str) { WCHAR buffer[40]; - HRESULT ret; - - ret = _xmalloc16(40,(SEGPTR*)idstr); - if (ret != S_OK) - return ret; + if (!(*str = CoMemAlloc(40, MEMCTX_TASK, 0))) + return E_OUTOFMEMORY; StringFromGUID2( id, buffer, 40 ); - WideCharToMultiByte( CP_ACP, 0, buffer, -1, MapSL((SEGPTR)*idstr), 40, NULL, NULL ); - return ret; + WideCharToMultiByte( CP_ACP, 0, buffer, -1, MapSL(*str), 40, NULL, NULL ); + return S_OK; } -/****************************************************************************** - * ProgIDFromCLSID [COMPOBJ.62] - * - * Converts a class id into the respective Program ID. (By using a registry lookup) - * - * RETURNS - * S_OK on success - * riid associated with the progid +/*********************************************************************** + * ProgIDFromCLSID [COMPOBJ.151] */ -HRESULT WINAPI ProgIDFromCLSID16( - REFCLSID clsid, /* [in] class id as found in registry */ - LPOLESTR16 *lplpszProgID )/* [out] associated Program ID */ +HRESULT WINAPI ProgIDFromCLSID16(REFCLSID clsid, SEGPTR *str) { LPOLESTR progid; HRESULT ret; @@ -466,9 +440,8 @@ HRESULT WINAPI ProgIDFromCLSID16( if (ret == S_OK) { INT len = WideCharToMultiByte( CP_ACP, 0, progid, -1, NULL, 0, NULL, NULL ); - ret = _xmalloc16(len, (SEGPTR*)lplpszProgID); - if (ret == S_OK) - WideCharToMultiByte( CP_ACP, 0, progid, -1, MapSL((SEGPTR)*lplpszProgID), len, NULL, NULL ); + if ((*str = CoMemAlloc(len, MEMCTX_TASK, 0))) + WideCharToMultiByte( CP_ACP, 0, progid, -1, MapSL(*str), len, NULL, NULL ); CoTaskMemFree( progid ); } return ret; @@ -627,21 +600,6 @@ BOOL WINAPI COMPOBJ_DllEntryPoint(DWORD Reason, HINSTANCE16 hInst, WORD ds, WORD return TRUE; } -/*********************************************************************** - * CoMemAlloc [COMPOBJ.151] - */ -SEGPTR WINAPI CoMemAlloc(DWORD size, DWORD dwMemContext, DWORD x) { - HRESULT hres; - SEGPTR segptr; - - /* FIXME: check context handling */ - TRACE("(%d, 0x%08x, 0x%08x)\n", size, dwMemContext, x); - hres = _xmalloc16(size, &segptr); - if (hres != S_OK) - return 0; - return segptr; -} - /****************************************************************************** * CLSIDFromProgID [COMPOBJ.61] * @@ -680,7 +638,7 @@ HRESULT WINAPI CLSIDFromProgID16(LPCOLESTR16 progid, LPCLSID riid) /****************************************************************************** * StringFromGUID2 [COMPOBJ.76] */ -INT16 WINAPI StringFromGUID216(REFGUID id, LPOLESTR16 str, INT16 cmax) +INT16 WINAPI StringFromGUID216(REFGUID id, char *str, INT16 cmax) { static const char format[] = "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}"; if (!id || cmax < CHARS_IN_GUID) return 0;

1 0

Zebediah Figura : evr: Use wide character string literals.
by Alexandre Julliard Jan. 22, 2020

Jan. 22, 2020

Module: wine Branch: master Commit: 3ceda2e269550f9f83d8a6ff7c2de87608d3d5a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ceda2e269550f9f83d8a6ff… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 15 20:30:30 2020 -0600 evr: Use wide character string literals. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index acaa9927c1..d6f6603eaa 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -70,7 +70,6 @@ static const struct strmbase_renderer_ops renderer_ops = HRESULT evr_filter_create(IUnknown *outer, void **out) { - static const WCHAR sink_name[] = {'E','V','R',' ','I','n','p','u','t','0',0}; evr_filter *object; *out = NULL; @@ -80,7 +79,7 @@ HRESULT evr_filter_create(IUnknown *outer, void **out) return E_OUTOFMEMORY; strmbase_renderer_init(&object->renderer, outer, - &CLSID_EnhancedVideoRenderer, sink_name, &renderer_ops); + &CLSID_EnhancedVideoRenderer, L"EVR Input0", &renderer_ops); *out = &object->renderer.filter.IUnknown_inner;

1 0

Zebediah Figura : compobj: Always set the IMalloc pointer in CoInitialize().
by Alexandre Julliard Jan. 22, 2020

Jan. 22, 2020

Module: wine Branch: master Commit: ba3ca9970342a382f62dd1a792675f0f7e6c4531 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba3ca9970342a382f62dd1a7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 15 00:24:30 2020 -0600 compobj: Always set the IMalloc pointer in CoInitialize(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/compobj.dll16/compobj.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/compobj.dll16/compobj.c b/dlls/compobj.dll16/compobj.c index 701f0012ff..44a7091ef1 100644 --- a/dlls/compobj.dll16/compobj.c +++ b/dlls/compobj.dll16/compobj.c @@ -253,8 +253,6 @@ DWORD WINAPI CoBuildVersion16(void) */ HRESULT WINAPI CoGetMalloc16(MEMCTX context, SEGPTR *malloc) { - if (!compobj_malloc) - compobj_malloc = IMalloc16_Constructor(); *malloc = compobj_malloc; return S_OK; } @@ -275,17 +273,13 @@ HRESULT WINAPI CoCreateStandardMalloc16(MEMCTX context, SEGPTR *malloc) */ SEGPTR WINAPI CoMemAlloc(DWORD size, MEMCTX context, DWORD unknown) { - SEGPTR malloc; - TRACE("size %u, context %d, unknown %#x.\n", size, context, unknown); if (context != MEMCTX_TASK) FIXME("Ignoring context %d.\n", context); if (unknown) FIXME("Ignoring unknown parameter %#x.\n", unknown); - if (CoGetMalloc16(0, &malloc)) - return 0; - return call_IMalloc_Alloc(malloc, size); + return call_IMalloc_Alloc(compobj_malloc, size); } /*********************************************************************** @@ -293,6 +287,8 @@ SEGPTR WINAPI CoMemAlloc(DWORD size, MEMCTX context, DWORD unknown) */ HRESULT WINAPI CoInitialize16(SEGPTR malloc) { + if (!malloc) + CoCreateStandardMalloc16(MEMCTX_TASK, &malloc); compobj_malloc = malloc; return S_OK; }

1 0

Zebediah Figura : compobj: Implement reference counting for the standard allocator.
by Alexandre Julliard Jan. 22, 2020

Jan. 22, 2020

Module: wine Branch: master Commit: bfaf90137e4a2fb2d139df6e398f04c826e02405 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfaf90137e4a2fb2d139df6e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 15 00:24:33 2020 -0600 compobj: Implement reference counting for the standard allocator. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/compobj.dll16/compobj.c | 34 ++++++++++++++++++++-------------- dlls/compobj.dll16/compobj.dll16.spec | 2 +- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/compobj.dll16/compobj.c b/dlls/compobj.dll16/compobj.c index ff82f9087b..a634ebe637 100644 --- a/dlls/compobj.dll16/compobj.c +++ b/dlls/compobj.dll16/compobj.c @@ -111,8 +111,8 @@ static SEGPTR compobj_malloc; typedef struct { - IMalloc16 IMalloc16_iface; - DWORD ref; + IMalloc16 IMalloc16_iface; + LONG refcount; } IMalloc16Impl; static inline IMalloc16Impl *impl_from_IMalloc16(IMalloc16 *iface) @@ -139,21 +139,28 @@ HRESULT CDECL IMalloc16_fnQueryInterface(IMalloc16* iface,REFIID refiid,LPVOID * /****************************************************************************** * IMalloc16_AddRef [COMPOBJ.501] */ -ULONG CDECL IMalloc16_fnAddRef(IMalloc16* iface) { - IMalloc16Impl *This = impl_from_IMalloc16(iface); - - TRACE("(%p)->AddRef()\n",This); - return 1; /* cannot be freed */ +ULONG CDECL IMalloc16_fnAddRef(IMalloc16 *iface) +{ + IMalloc16Impl *malloc = impl_from_IMalloc16(iface); + ULONG refcount = InterlockedIncrement(&malloc->refcount); + TRACE("%p increasing refcount to %u.\n", malloc, refcount); + return refcount; } /****************************************************************************** * IMalloc16_Release [COMPOBJ.502] */ -ULONG CDECL IMalloc16_fnRelease(IMalloc16* iface) { - IMalloc16Impl *This = impl_from_IMalloc16(iface); - - TRACE("(%p)->Release()\n",This); - return 1; /* cannot be freed */ +ULONG CDECL IMalloc16_fnRelease(SEGPTR iface) +{ + IMalloc16Impl *malloc = impl_from_IMalloc16(MapSL(iface)); + ULONG refcount = InterlockedDecrement(&malloc->refcount); + TRACE("%p decreasing refcount to %u.\n", malloc, refcount); + if (!refcount) + { + UnMapLS(iface); + HeapFree(GetProcessHeap(), 0, malloc); + } + return refcount; } /****************************************************************************** @@ -257,11 +264,10 @@ static SEGPTR IMalloc16_Constructor(void) msegvt16 = MapLS( &vt16 ); } This->IMalloc16_iface.lpVtbl = msegvt16; - This->ref = 1; + This->refcount = 1; return MapLS(This); } - /****************************************************************************** * CoBuildVersion [COMPOBJ.1] */ diff --git a/dlls/compobj.dll16/compobj.dll16.spec b/dlls/compobj.dll16/compobj.dll16.spec index 8c0456504d..04d17155ae 100644 --- a/dlls/compobj.dll16/compobj.dll16.spec +++ b/dlls/compobj.dll16/compobj.dll16.spec @@ -209,7 +209,7 @@ # WINE internal relays (for Win16 interfaces) 500 cdecl IMalloc16_QueryInterface(ptr ptr ptr) IMalloc16_fnQueryInterface 501 cdecl IMalloc16_AddRef(ptr) IMalloc16_fnAddRef -502 cdecl IMalloc16_Release(ptr) IMalloc16_fnRelease +502 cdecl IMalloc16_Release(segptr) IMalloc16_fnRelease 503 cdecl IMalloc16_Alloc(ptr long) IMalloc16_fnAlloc 504 cdecl IMalloc16_Realloc(ptr segptr long) IMalloc16_fnRealloc 505 cdecl IMalloc16_Free(ptr segptr) IMalloc16_fnFree

1 0

Zhiyi Zhang : rasenh/tests: Fix a test failure.
by Alexandre Julliard Jan. 22, 2020

Jan. 22, 2020

Module: wine Branch: master Commit: 39f96c1fa9e8d3ae356ed475091b218e3e0da35d URL: https://source.winehq.org/git/wine.git/?a=commit;h=39f96c1fa9e8d3ae356ed475… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jan 20 11:43:37 2020 +0800 rasenh/tests: Fix a test failure. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/tests/rsaenh.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 3e782be279..3039971474 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -2388,8 +2388,11 @@ static void test_rsa_encrypt(void) /* It is not allowed to use the signature key for encryption/decryption */ result = CryptGetUserKey(hProv, AT_SIGNATURE, &hRSAKey); - ok (result, "%08x\n", GetLastError()); - if (!result) return; + if (!result) + { + skip("No signature key in provider %s found, error %#x.\n", szProviders[iProv], GetLastError()); + return; + } dwVal = 0xdeadbeef; dwLen = sizeof(DWORD);

1 0

Zebediah Figura : compobj: Manually define the IMalloc16 structure.
by Alexandre Julliard Jan. 22, 2020

Jan. 22, 2020

Module: wine Branch: master Commit: 4f7ebaf604faabe10e3bc4ba61eced505bfd8400 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f7ebaf604faabe10e3bc4ba… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 15 00:24:27 2020 -0600 compobj: Manually define the IMalloc16 structure. For clarity. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/compobj.dll16/compobj.c | 43 +++++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/dlls/compobj.dll16/compobj.c b/dlls/compobj.dll16/compobj.c index ffbd87a906..3991de4432 100644 --- a/dlls/compobj.dll16/compobj.c +++ b/dlls/compobj.dll16/compobj.c @@ -48,34 +48,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); typedef LPSTR LPOLESTR16; typedef LPCSTR LPCOLESTR16; -#define STDMETHOD16CALLTYPE __cdecl -#define STDMETHOD16(m) HRESULT (STDMETHOD16CALLTYPE *m) -#define STDMETHOD16_(t,m) t (STDMETHOD16CALLTYPE *m) - #define CHARS_IN_GUID 39 -/*********************************************************************** - * IMalloc16 interface - */ - -typedef struct IMalloc16 *LPMALLOC16; +typedef struct +{ + SEGPTR QueryInterface; + SEGPTR AddRef; + SEGPTR Release; + SEGPTR Alloc; + SEGPTR Realloc; + SEGPTR Free; + SEGPTR GetSize; + SEGPTR DidAlloc; + SEGPTR HeapMinimize; +} IMalloc16Vtbl; -#define INTERFACE IMalloc16 -DECLARE_INTERFACE_(IMalloc16,IUnknown) +typedef struct { - /*** IUnknown methods ***/ - STDMETHOD16_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; - STDMETHOD16_(ULONG,AddRef)(THIS) PURE; - STDMETHOD16_(ULONG,Release)(THIS) PURE; - /*** IMalloc16 methods ***/ - STDMETHOD16_(LPVOID,Alloc)(THIS_ DWORD cb) PURE; - STDMETHOD16_(LPVOID,Realloc)(THIS_ LPVOID pv, DWORD cb) PURE; - STDMETHOD16_(void,Free)(THIS_ LPVOID pv) PURE; - STDMETHOD16_(DWORD,GetSize)(THIS_ LPVOID pv) PURE; - STDMETHOD16_(INT16,DidAlloc)(THIS_ LPVOID pv) PURE; - STDMETHOD16_(LPVOID,HeapMinimize)(THIS) PURE; -}; -#undef INTERFACE + SEGPTR lpVtbl; +} IMalloc16, *LPMALLOC16; static HTASK16 hETask = 0; static WORD Table_ETask[62]; @@ -220,7 +211,7 @@ IMalloc16_Constructor(void) This = HeapAlloc( GetProcessHeap(), 0, sizeof(IMalloc16Impl) ); if (!msegvt16) { -#define VTENT(x) vt16.x = (void*)GetProcAddress16(hcomp,"IMalloc16_"#x);assert(vt16.x) +#define VTENT(x) vt16.x = (SEGPTR)GetProcAddress16(hcomp,"IMalloc16_"#x);assert(vt16.x) VTENT(QueryInterface); VTENT(AddRef); VTENT(Release); @@ -233,7 +224,7 @@ IMalloc16_Constructor(void) #undef VTENT msegvt16 = MapLS( &vt16 ); } - This->IMalloc16_iface.lpVtbl = (const IMalloc16Vtbl*)msegvt16; + This->IMalloc16_iface.lpVtbl = msegvt16; This->ref = 1; return (LPMALLOC16)MapLS( This ); }

1 0

Zebediah Figura : compobj: Reference the returned IMalloc pointer in CoGetMalloc().
by Alexandre Julliard Jan. 22, 2020

Jan. 22, 2020

Module: wine Branch: master Commit: 9af935a519e511625f6c5e57be7d1f1b48cded5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9af935a519e511625f6c5e57… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 15 00:24:32 2020 -0600 compobj: Reference the returned IMalloc pointer in CoGetMalloc(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42554 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/compobj.dll16/compobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/compobj.dll16/compobj.c b/dlls/compobj.dll16/compobj.c index 52e5d72688..ff82f9087b 100644 --- a/dlls/compobj.dll16/compobj.c +++ b/dlls/compobj.dll16/compobj.c @@ -275,7 +275,7 @@ DWORD WINAPI CoBuildVersion16(void) */ HRESULT WINAPI CoGetMalloc16(MEMCTX context, SEGPTR *malloc) { - *malloc = compobj_malloc; + call_IMalloc_AddRef(*malloc = compobj_malloc); return S_OK; }

1 0