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

Rémi Bernon : user32: Remove hardcoded devices from GetRawInputDeviceList.
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: 0ac619ae7ab7dd90622371a5f58a1ff12d46eb8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ac619ae7ab7dd90622371a5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 26 12:38:03 2021 +0200 user32: Remove hardcoded devices from GetRawInputDeviceList. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index a2cf5769fcc..5c009624fe6 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -408,29 +408,24 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun if (!devices) { - *device_count = 2 + rawinput_devices_count; + *device_count = rawinput_devices_count; return 0; } - if (*device_count < 2 + rawinput_devices_count) + if (*device_count < rawinput_devices_count) { SetLastError(ERROR_INSUFFICIENT_BUFFER); - *device_count = 2 + rawinput_devices_count; + *device_count = rawinput_devices_count; return ~0U; } - devices[0].hDevice = WINE_MOUSE_HANDLE; - devices[0].dwType = RIM_TYPEMOUSE; - devices[1].hDevice = WINE_KEYBOARD_HANDLE; - devices[1].dwType = RIM_TYPEKEYBOARD; - for (i = 0; i < rawinput_devices_count; ++i) { - devices[2 + i].hDevice = rawinput_devices[i].handle; - devices[2 + i].dwType = rawinput_devices[i].info.dwType; + devices[i].hDevice = rawinput_devices[i].handle; + devices[i].dwType = rawinput_devices[i].info.dwType; } - return 2 + rawinput_devices_count; + return rawinput_devices_count; } /***********************************************************************

1 0

Nikolay Sivov : mfplat: Add MFllMulDiv().
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: 3e3490be39e4f09948fa5b12f3155283c6758ad0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e3490be39e4f09948fa5b12… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 3 20:02:43 2021 +0300 mfplat: Add MFllMulDiv(). Implementation is based on similar gstreamer utility code, adjusted for signed arguments, and with platform optimizations removed. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 181 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 39 ++++++++++ include/mfapi.h | 1 + 4 files changed, 222 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 5a35350f5c5..dad4039fa16 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -19,6 +19,7 @@ #include <stdarg.h> #include <string.h> #include <math.h> +#include <limits.h> #define COBJMACROS #define NONAMELESSUNION @@ -8928,3 +8929,183 @@ HRESULT WINAPI MFCreateDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **man return S_OK; } + + +/* + * MFllMulDiv implementation is derived from gstreamer utility functions code (gstutils.c), + * released under LGPL2. Full authors list follows. + * =================================================================================== + * Copyright (C) 1999,2000 Erik Walthinsen <omega(a)cse.ogi.edu> + * 2000 Wim Taymans <wtay(a)chello.be> + * 2002 Thomas Vander Stichele <thomas(a)apestaart.org> + * 2004 Wim Taymans <wim(a)fluendo.com> + * 2015 Jan Schmidt <jan(a)centricular.com> + * =================================================================================== + */ + +static void llmult128(ULARGE_INTEGER *c1, ULARGE_INTEGER *c0, LONGLONG val, LONGLONG num) +{ + ULARGE_INTEGER a1, b0, v, n; + + v.QuadPart = llabs(val); + n.QuadPart = llabs(num); + + /* do 128 bits multiply + * nh nl + * * vh vl + * ---------- + * a0 = vl * nl + * a1 = vl * nh + * b0 = vh * nl + * b1 = + vh * nh + * ------------------- + * c1h c1l c0h c0l + * + * "a0" is optimized away, result is stored directly in c0. "b1" is + * optimized away, result is stored directly in c1. + */ + c0->QuadPart = (ULONGLONG)v.LowPart * n.LowPart; + a1.QuadPart = (ULONGLONG)v.LowPart * n.HighPart; + b0.QuadPart = (ULONGLONG)v.HighPart * n.LowPart; + + /* add the high word of a0 to the low words of a1 and b0 using c1 as + * scrach space to capture the carry. the low word of the result becomes + * the final high word of c0 */ + c1->QuadPart = (ULONGLONG)c0->HighPart + a1.LowPart + b0.LowPart; + c0->HighPart = c1->LowPart; + + /* add the carry from the result above (found in the high word of c1) and + * the high words of a1 and b0 to b1, the result is c1. */ + c1->QuadPart = (ULONGLONG)v.HighPart * n.HighPart + c1->HighPart + a1.HighPart + b0.HighPart; +} + +static ULONGLONG lldiv128(ULARGE_INTEGER c1, ULARGE_INTEGER c0, LONGLONG denom) +{ + ULARGE_INTEGER q1, q0, rhat; + ULARGE_INTEGER v, cmp1, cmp2; + unsigned int s = 0; + + v.QuadPart = llabs(denom); + + /* 64bit numerator */ + if (c1.QuadPart == 0) + return c0.QuadPart / v.QuadPart; + + /* 96bit numerator, 32bit denominator */ + if (v.HighPart == 0 && c1.HighPart == 0) + { + ULONGLONG low = c0.LowPart, high = c0.HighPart + ((ULONGLONG)c1.LowPart << 32); + low += (high % v.LowPart) << 32; + return ((high / v.LowPart) << 32) + (low / v.LowPart); + } + + /* 128bit numerator, 32bit denominator */ + if (v.HighPart == 0) + return UI64_MAX; + + /* count number of leading zeroes */ + BitScanReverse(&s, v.HighPart); + s = 31 - s; + + if (s) + { + /* normalize divisor and dividend */ + v.QuadPart <<= s; + c1.QuadPart = (c1.QuadPart << s) | (c0.HighPart >> (32 - s)); + c0.QuadPart <<= s; + } + + q1.QuadPart = c1.QuadPart / v.HighPart; + rhat.QuadPart = c1.QuadPart - q1.QuadPart * v.HighPart; + + cmp1.HighPart = rhat.LowPart; + cmp1.LowPart = c0.HighPart; + cmp2.QuadPart = q1.QuadPart * v.LowPart; + + while (q1.HighPart || cmp2.QuadPart > cmp1.QuadPart) + { + q1.QuadPart--; + rhat.QuadPart += v.HighPart; + if (rhat.HighPart) + break; + cmp1.HighPart = rhat.LowPart; + cmp2.QuadPart -= v.LowPart; + } + c1.HighPart = c1.LowPart; + c1.LowPart = c0.HighPart; + c1.QuadPart -= q1.QuadPart * v.QuadPart; + q0.QuadPart = c1.QuadPart / v.HighPart; + rhat.QuadPart = c1.QuadPart - q0.QuadPart * v.HighPart; + + cmp1.HighPart = rhat.LowPart; + cmp1.LowPart = c0.LowPart; + cmp2.QuadPart = q0.QuadPart * v.LowPart; + + while (q0.HighPart || cmp2.QuadPart > cmp1.QuadPart) + { + q0.QuadPart--; + rhat.QuadPart += v.HighPart; + if (rhat.HighPart) + break; + cmp1.HighPart = rhat.LowPart; + cmp2.QuadPart -= v.LowPart; + } + q0.HighPart += q1.LowPart; + + return q0.QuadPart; +} + +/*********************************************************************** + * MFllMulDiv (mfplat.@) + */ +LONGLONG WINAPI MFllMulDiv(LONGLONG val, LONGLONG num, LONGLONG denom, LONGLONG factor) +{ +#define LLOVERFLOW (sign ? I64_MIN : I64_MAX) + unsigned int sign, factor_sign, denom_sign; + ULARGE_INTEGER c1, c0; + ULONGLONG ret; + + TRACE("%s, %s, %s, %s.\n", wine_dbgstr_longlong(val), wine_dbgstr_longlong(num), + wine_dbgstr_longlong(denom), wine_dbgstr_longlong(factor)); + + /* compute 128-bit numerator product */ + llmult128(&c1, &c0, val, num); + + sign = (val < 0) ^ (num < 0); + factor_sign = factor < 0; + denom_sign = denom < 0; + + factor = llabs(factor); + if (sign == factor_sign) + { + if (UI64_MAX - c0.QuadPart < factor) + { + if (c1.QuadPart == UI64_MAX) return LLOVERFLOW; + c1.QuadPart++; + } + c0.QuadPart += factor; + } + else + { + if (c0.QuadPart >= factor) + c0.QuadPart -= factor; + else + { + if (c1.QuadPart) + c1.QuadPart--; + else + sign = !sign; + + c0.QuadPart = factor - c0.QuadPart; + } + } + + if (c1.QuadPart >= denom) return LLOVERFLOW; + + /* compute quotient, fits in 64 bits */ + ret = lldiv128(c1, c0, denom); + sign ^= denom_sign; + if (ret >= I64_MAX) return LLOVERFLOW; + return sign ? -(LONGLONG)ret : ret; +#undef LLOVERFLOW +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index cbda9404aa9..d8558cee0cb 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -176,6 +176,6 @@ @ stdcall MFUnwrapMediaType(ptr ptr) @ stub MFValidateMediaTypeSize @ stdcall MFWrapMediaType(ptr ptr ptr ptr) -@ stub MFllMulDiv +@ stdcall -ret64 MFllMulDiv(int64 int64 int64 int64) @ stub PropVariantFromStream @ stub PropVariantToStream diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 89547be0a4f..b0c7298c28d 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <string.h> +#include <limits.h> #define COBJMACROS @@ -7130,6 +7131,43 @@ static void test_MFLockSharedWorkQueue(void) ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); } +static void test_MFllMulDiv(void) +{ + /* (a * b + d) / c */ + static const struct muldivtest + { + LONGLONG a; + LONGLONG b; + LONGLONG c; + LONGLONG d; + LONGLONG result; + } + muldivtests[] = + { + { 0, 0, 0, 0, _I64_MAX }, + { 1000000, 1000000, 2, 0, 500000000000 }, + { _I64_MAX, 3, _I64_MAX, 0, 3 }, + { _I64_MAX, 3, _I64_MAX, 1, 3 }, + { -10000, 3, 100, 0, -300 }, + { 2, 0, 3, 5, 1 }, + { 2, 1, 1, -3, -1 }, + /* a * b product does not fit in uint64_t */ + { _I64_MAX, 4, 8, 0, _I64_MAX / 2 }, + /* Large a * b product, large denominator */ + { _I64_MAX, 4, 0x100000000, 0, 0x1ffffffff }, + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(muldivtests); ++i) + { + LONGLONG result; + + result = MFllMulDiv(muldivtests[i].a, muldivtests[i].b, muldivtests[i].c, muldivtests[i].d); + ok(result == muldivtests[i].result, "%u: unexpected result %s, expected %s.\n", i, + wine_dbgstr_longlong(result), wine_dbgstr_longlong(muldivtests[i].result)); + } +} + START_TEST(mfplat) { char **argv; @@ -7194,6 +7232,7 @@ START_TEST(mfplat) test_dxgi_surface_buffer(); test_sample_allocator(); test_MFMapDX9FormatToDXGIFormat(); + test_MFllMulDiv(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index c1cf766c005..986f5b9e3e4 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -552,6 +552,7 @@ HRESULT WINAPI MFTEnumEx(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_IN HRESULT WINAPI MFInitAttributesFromBlob(IMFAttributes *attributes, const UINT8 *buffer, UINT size); HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WAVEFORMATEX *format, UINT32 size); HRESULT WINAPI MFInvokeCallback(IMFAsyncResult *result); +LONGLONG WINAPI MFllMulDiv(LONGLONG val, LONGLONG num, LONGLONG denom, LONGLONG factor); HRESULT WINAPI MFLockPlatform(void); HRESULT WINAPI MFLockSharedWorkQueue(const WCHAR *name, LONG base_priority, DWORD *taskid, DWORD *queue); DXGI_FORMAT WINAPI MFMapDX9FormatToDXGIFormat(DWORD format);

1 0

Nikolay Sivov : mfplat: Implement shared device manager API.
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: def07b3f69bd82357419f31449a7de875944a041 URL: https://source.winehq.org/git/wine.git/?a=commit;h=def07b3f69bd82357419f314… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 3 20:02:44 2021 +0300 mfplat: Implement shared device manager API. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 ++ dlls/mfplat/tests/mfplat.c | 39 ++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index dad4039fa16..f1d0aaad94d 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -8553,6 +8553,16 @@ HRESULT WINAPI CreatePropertyStore(IPropertyStore **store) return S_OK; } +struct shared_dxgi_manager +{ + IMFDXGIDeviceManager *manager; + unsigned int token; + unsigned int locks; +}; + +static struct shared_dxgi_manager shared_dm; +static CRITICAL_SECTION shared_dm_cs = { NULL, -1, 0, 0, 0, 0 }; + enum dxgi_device_handle_flags { DXGI_DEVICE_HANDLE_FLAG_OPEN = 0x1, @@ -8904,6 +8914,9 @@ static const IMFDXGIDeviceManagerVtbl dxgi_device_manager_vtbl = dxgi_device_manager_UnlockDevice, }; +/*********************************************************************** + * MFCreateDXGIDeviceManager (mfplat.@) + */ HRESULT WINAPI MFCreateDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **manager) { struct dxgi_device_manager *object; @@ -8930,6 +8943,58 @@ HRESULT WINAPI MFCreateDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **man return S_OK; } +/*********************************************************************** + * MFLockDXGIDeviceManager (mfplat.@) + */ +HRESULT WINAPI MFLockDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **manager) +{ + HRESULT hr = S_OK; + + TRACE("%p, %p.\n", token, manager); + + EnterCriticalSection(&shared_dm_cs); + + if (!shared_dm.manager) + hr = MFCreateDXGIDeviceManager(&shared_dm.token, &shared_dm.manager); + + if (SUCCEEDED(hr)) + { + *manager = shared_dm.manager; + IMFDXGIDeviceManager_AddRef(*manager); + shared_dm.locks++; + + if (token) *token = shared_dm.token; + } + + LeaveCriticalSection(&shared_dm_cs); + + return hr; +} + +/*********************************************************************** + * MFUnlockDXGIDeviceManager (mfplat.@) + */ +HRESULT WINAPI MFUnlockDXGIDeviceManager(void) +{ + TRACE("\n"); + + EnterCriticalSection(&shared_dm_cs); + + if (shared_dm.manager) + { + IMFDXGIDeviceManager_Release(shared_dm.manager); + if (!--shared_dm.locks) + { + shared_dm.manager = NULL; + shared_dm.token = 0; + } + } + + LeaveCriticalSection(&shared_dm_cs); + + return S_OK; +} + /* * MFllMulDiv implementation is derived from gstreamer utility functions code (gstutils.c), diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index d8558cee0cb..e8dc01c200c 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -131,6 +131,7 @@ @ stdcall MFInvokeCallback(ptr) @ stub MFJoinIoPort @ stdcall MFJoinWorkQueue(long long ptr) rtworkq.RtwqJoinWorkQueue +@ stdcall MFLockDXGIDeviceManager(ptr ptr) @ stdcall MFLockPlatform() rtworkq.RtwqLockPlatform @ stdcall MFLockSharedWorkQueue(wstr long ptr ptr) rtworkq.RtwqLockSharedWorkQueue @ stdcall MFLockWorkQueue(long) rtworkq.RtwqLockWorkQueue @@ -171,6 +172,7 @@ @ stub MFTraceFuncEnter @ stub MFUnblockThread @ stdcall MFUnjoinWorkQueue(long long) rtworkq.RtwqUnjoinWorkQueue +@ stdcall MFUnlockDXGIDeviceManager() @ stdcall MFUnlockPlatform() rtworkq.RtwqUnlockPlatform @ stdcall MFUnlockWorkQueue(long) rtworkq.RtwqUnlockWorkQueue @ stdcall MFUnwrapMediaType(ptr ptr) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index b0c7298c28d..65ab72bd57b 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -262,6 +262,8 @@ static HRESULT (WINAPI *pMFCreateDXGISurfaceBuffer)(REFIID riid, IUnknown *surfa IMFMediaBuffer **buffer); static HRESULT (WINAPI *pMFCreateVideoMediaTypeFromSubtype)(const GUID *subtype, IMFVideoMediaType **media_type); static HRESULT (WINAPI *pMFLockSharedWorkQueue)(const WCHAR *name, LONG base_priority, DWORD *taskid, DWORD *queue); +static HRESULT (WINAPI *pMFLockDXGIDeviceManager)(UINT *token, IMFDXGIDeviceManager **manager); +static HRESULT (WINAPI *pMFUnlockDXGIDeviceManager)(void); static HWND create_window(void) { @@ -935,6 +937,7 @@ static void init_functions(void) X(MFCreateVideoSampleAllocatorEx); X(MFGetPlaneSize); X(MFGetStrideForBitmapInfoHeader); + X(MFLockDXGIDeviceManager); X(MFLockSharedWorkQueue); X(MFMapDX9FormatToDXGIFormat); X(MFMapDXGIFormatToDX9Format); @@ -947,6 +950,7 @@ static void init_functions(void) X(MFTRegisterLocalByCLSID); X(MFTUnregisterLocal); X(MFTUnregisterLocalByCLSID); + X(MFUnlockDXGIDeviceManager); if ((mod = LoadLibraryA("d3d11.dll"))) { @@ -7168,6 +7172,40 @@ static void test_MFllMulDiv(void) } } +static void test_shared_dxgi_device_manager(void) +{ + IMFDXGIDeviceManager *manager; + HRESULT hr; + UINT token; + + if (!pMFLockDXGIDeviceManager) + { + win_skip("Shared DXGI device manager is not supported.\n"); + return; + } + + hr = pMFUnlockDXGIDeviceManager(); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + manager = NULL; + hr = pMFLockDXGIDeviceManager(NULL, &manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!manager, "Unexpected instance.\n"); + + hr = pMFLockDXGIDeviceManager(&token, &manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + EXPECT_REF(manager, 3); + + hr = pMFUnlockDXGIDeviceManager(); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + EXPECT_REF(manager, 2); + + hr = pMFUnlockDXGIDeviceManager(); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +} + START_TEST(mfplat) { char **argv; @@ -7233,6 +7271,7 @@ START_TEST(mfplat) test_sample_allocator(); test_MFMapDX9FormatToDXGIFormat(); test_MFllMulDiv(); + test_shared_dxgi_device_manager(); CoUninitialize(); }

1 0

Zhiyi Zhang : gdi32: Fix typos for GET_DC_PHYSDEV.
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: 3ba4412be60dafee310b5d3c71aa762aa8846564 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ba4412be60dafee310b5d3c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Apr 29 10:53:24 2021 +0800 gdi32: Fix typos for GET_DC_PHYSDEV. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/enhmfdrv/dc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index e8bff37a1bc..7fd404fc2cb 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -876,7 +876,7 @@ static BOOL CDECL windrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT b BOOL ret; lock_surface( physdev ); - dev = GET_NEXT_PHYSDEV( dev, pArc ); + dev = GET_NEXT_PHYSDEV( dev, pArcTo ); ret = dev->funcs->pArcTo( dev, left, top, right, bottom, xstart, ystart, xend, yend ); unlock_surface( physdev ); return ret; diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 1c87643ea96..67913f39f0c 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -365,7 +365,7 @@ BOOL CDECL EMFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, DWORD CDECL EMFDRV_SetLayout( PHYSDEV dev, DWORD layout ) { - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetMapMode ); + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetLayout ); EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); EMRSETLAYOUT emr; DWORD ret;

1 0

Ziqing Hui : windowscodecs: Add test data index to win_skip messages for DDS tests.
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: b719f00a3d8b4face49abf381bda672421baa5ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=b719f00a3d8b4face49abf38… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat May 1 11:14:44 2021 +0800 windowscodecs: Add test data index to win_skip messages for DDS tests. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 492416c0ce4..a5f1d6754a9 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -827,9 +827,9 @@ static void test_dds_decoder_image_parameters(void) hr = init_decoder(decoder, stream, test_data[i].init_hr, i, test_data[i].wine_init); if (hr != S_OK) { if (test_data[i].expected_parameters.Dimension == WICDdsTextureCube) { - win_skip("Cube map is not supported\n"); + win_skip("Test %u: Cube map is not supported\n", i); } else { - win_skip("Uncompressed DDS image is not supported\n"); + win_skip("Test %u: Uncompressed DDS image is not supported\n", i); } goto next; } @@ -1240,9 +1240,9 @@ static void test_dds_decoder(void) hr = init_decoder(decoder, stream, test_data[i].init_hr, i, test_data[i].wine_init); if (hr != S_OK) { if (test_data[i].expected_parameters.Dimension == WICDdsTextureCube) { - win_skip("Cube map is not supported\n"); + win_skip("Test %u: Cube map is not supported\n", i); } else { - win_skip("Uncompressed DDS image is not supported\n"); + win_skip("Test %u: Uncompressed DDS image is not supported\n", i); } goto next; }

1 0

Ziqing Hui : windowscodecs: Implement DdsEncoder_Initialize.
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: 0500d4906b4003d044ad3fab8f2df6a8f755c9c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0500d4906b4003d044ad3fab… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat May 1 11:14:50 2021 +0800 windowscodecs: Implement DdsEncoder_Initialize. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 31 ++++++++++++++++++++++++++++--- dlls/windowscodecs/tests/ddsformat.c | 4 ---- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index ef6571842dd..e8a4f0e5c28 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -1754,10 +1754,35 @@ static ULONG WINAPI DdsEncoder_Release(IWICBitmapEncoder *iface) } static HRESULT WINAPI DdsEncoder_Initialize(IWICBitmapEncoder *iface, - IStream *pIStream, WICBitmapEncoderCacheOption cacheOption) + IStream *stream, WICBitmapEncoderCacheOption cacheOption) { - FIXME("(%p,%p,%u): stub\n", iface, pIStream, cacheOption); - return E_NOTIMPL; + DdsEncoder *This = impl_from_IWICBitmapEncoder(iface); + HRESULT hr; + + TRACE("(%p,%p,%u)\n", iface, stream, cacheOption); + + if (cacheOption != WICBitmapEncoderNoCache) + FIXME("Cache option %#x is not supported.\n", cacheOption); + + if (!stream) return E_INVALIDARG; + + EnterCriticalSection(&This->lock); + + if (This->stream) + { + hr = WINCODEC_ERR_WRONGSTATE; + goto end; + } + + This->stream = stream; + IStream_AddRef(stream); + + hr = S_OK; + +end: + LeaveCriticalSection(&This->lock); + + return hr; } static HRESULT WINAPI DdsEncoder_GetContainerFormat(IWICBitmapEncoder *iface, GUID *format) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index a5f1d6754a9..16adbb92726 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -1287,11 +1287,9 @@ static void test_dds_encoder_initialize(void) if (!encoder) goto end; hr = IWICBitmapEncoder_Initialize(encoder, NULL, WICBitmapEncoderNoCache); - todo_wine ok(hr == E_INVALIDARG, "Initialize got unexpected hr %#x\n", hr); hr = IWICBitmapEncoder_Initialize(encoder, (IStream *)stream, WICBitmapEncoderNoCache); - todo_wine ok(hr == S_OK, "Initialize failed, hr %#x\n", hr); IWICBitmapEncoder_Release(encoder); @@ -1302,11 +1300,9 @@ static void test_dds_encoder_initialize(void) if (!encoder) goto end; hr = IWICBitmapEncoder_Initialize(encoder, (IStream *)stream, WICBitmapEncoderNoCache); - todo_wine ok(hr == S_OK, "Initialize failed, hr %#x\n", hr); hr = IWICBitmapEncoder_Initialize(encoder, (IStream *)stream, WICBitmapEncoderNoCache); - todo_wine ok(hr == WINCODEC_ERR_WRONGSTATE, "Initialize got unexpected hr %#x\n", hr); end:

1 0

Zebediah Figura : ntoskrnl/tests: Open the HID device with FILE_SHARE_READ | FILE_SHARE_WRITE.
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: 4084200765d4dd085d73910ee035d009ad81a554 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4084200765d4dd085d73910e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 1 17:23:16 2021 -0500 ntoskrnl/tests: Open the HID device with FILE_SHARE_READ | FILE_SHARE_WRITE. Fixes a test failure on Windows 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 9fe4cd03175..5e2520a3e12 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1537,7 +1537,8 @@ static void test_hid_device(void) todo_wine ok(found, "didn't find device\n"); - file = CreateFileA(iface_detail->DevicePath, FILE_READ_ACCESS, 0, NULL, OPEN_EXISTING, 0, NULL); + file = CreateFileA(iface_detail->DevicePath, FILE_READ_ACCESS, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); CloseHandle(file);

1 0

Sven Baars : ntdll: Fix some memory leaks (Valgrind).
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: 2d218c924dec978f3ac41e5ab771d944f3c63491 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d218c924dec978f3ac41e5a… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun May 2 16:36:19 2021 +0200 ntdll: Fix some memory leaks (Valgrind). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 2 +- dlls/ntdll/unix/file.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index fc5c462e04f..3ac1ed9ab63 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -912,7 +912,7 @@ static void rebuild_argv(void) */ static void prepend_argv( const char **args, int count ) { - char **new_argv = malloc( (main_argc + count) * sizeof(*new_argv) ); + char **new_argv; char *p, *end; BOOL write_strings = FALSE; int i, total = 0, new_argc = main_argc + count - 1; diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 2f18325fb90..c033bb06fa3 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3298,7 +3298,12 @@ static NTSTATUS nt_to_unix_file_name_no_root( const UNICODE_STRING *nameW, char /* check if prefix exists (except for DOS drives to avoid extra stat calls) */ - if (wcschr( prefix, '/' )) return STATUS_OBJECT_PATH_NOT_FOUND; + if (wcschr( prefix, '/' )) + { + free( unix_name ); + return STATUS_OBJECT_PATH_NOT_FOUND; + } + if (prefix_len != 2 || prefix[1] != ':') { unix_name[pos] = 0;

1 0

Sven Baars : ntdll/tests: Use FindClose() to close handles returned by FindFirstFileW() (Valgrind).
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: fc8bf8d33d24ccb1f7c266f01a0798509d49d0ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc8bf8d33d24ccb1f7c266f0… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun May 2 16:36:20 2021 +0200 ntdll/tests: Use FindClose() to close handles returned by FindFirstFileW() (Valgrind). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index d469b449a74..b7b46365911 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2319,7 +2319,7 @@ static void test_file_link_information(void) "Link did not change casing on existing target file: got %s\n", wine_dbgstr_w(find_data.cFileName)); } - CloseHandle( handle ); + FindClose( handle ); HeapFree( GetProcessHeap(), 0, fli ); delete_object( oldpath ); delete_object( newpath ); @@ -2904,7 +2904,7 @@ static void test_file_link_information(void) "Link did not change casing on same file: got %s\n", wine_dbgstr_w(find_data.cFileName)); } - CloseHandle( handle ); + FindClose( handle ); HeapFree( GetProcessHeap(), 0, fli ); delete_object( oldpath ); }

1 0

Damjan Jovanovic : shell32: Implement IID_IContextMenu in CreateViewObject() methods for shell folders that support it.
by Alexandre Julliard 03 May '21

03 May '21

Module: wine Branch: master Commit: ad412b11a7ea17b708994ed6609f8ed0cbfb169b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad412b11a7ea17b708994ed6… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon May 3 03:12:07 2021 +0200 shell32: Implement IID_IContextMenu in CreateViewObject() methods for shell folders that support it. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39841 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/cpanelfolder.c | 6 ++-- dlls/shell32/recyclebin.c | 2 ++ dlls/shell32/shfldr_desktop.c | 3 +- dlls/shell32/shfldr_fs.c | 3 +- dlls/shell32/shfldr_mycomp.c | 3 +- dlls/shell32/shfldr_netplaces.c | 10 +++--- dlls/shell32/shfldr_printers.c | 5 ++- dlls/shell32/shfldr_unixfs.c | 2 ++ dlls/shell32/tests/shlfolder.c | 72 +++++++++++++++++++++++++++++++++++++++++ 9 files changed, 91 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 114eb6babd3..f2e845e5dab 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -524,15 +524,15 @@ static HRESULT WINAPI ISF_ControlPanel_fnCreateViewObject(IShellFolder2 *iface, if (IsEqualIID(riid, &IID_IDropTarget)) { WARN("IDropTarget not implemented\n"); hr = E_NOTIMPL; - } else if (IsEqualIID(riid, &IID_IContextMenu)) { - WARN("IContextMenu not implemented\n"); - hr = E_NOTIMPL; } else if (IsEqualIID(riid, &IID_IShellView)) { pShellView = IShellView_Constructor((IShellFolder *) iface); if (pShellView) { hr = IShellView_QueryInterface(pShellView, riid, ppvOut); IShellView_Release(pShellView); } + } else { + FIXME("invalid/unsupported interface %s\n", shdebugstr_guid(riid)); + hr = E_NOINTERFACE; } } TRACE("--(%p)->(interface=%p)\n", This, ppvOut); diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 49e7f5da322..971239a5f20 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -490,6 +490,8 @@ static HRESULT WINAPI RecycleBin_CreateViewObject(IShellFolder2 *iface, HWND hwn *ppv = tmp; return ret; } + else + FIXME("invalid/unsupported interface %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 938871ee066..26f8c8cbd06 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -428,8 +428,7 @@ static HRESULT WINAPI ISF_Desktop_fnCreateViewObject (IShellFolder2 * iface, } else if (IsEqualIID (riid, &IID_IContextMenu)) { - WARN ("IContextMenu not implemented\n"); - hr = E_NOTIMPL; + hr = BackgroundMenu_Constructor((IShellFolder*)iface, TRUE, riid, ppvOut); } else if (IsEqualIID (riid, &IID_IShellView)) { diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 22f568a592f..5b616c5242e 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -467,8 +467,7 @@ IShellFolder_fnCreateViewObject (IShellFolder2 * iface, HWND hwndOwner, if (IsEqualIID (riid, &IID_IDropTarget)) { hr = IShellFolder2_QueryInterface (iface, &IID_IDropTarget, ppvOut); } else if (IsEqualIID (riid, &IID_IContextMenu)) { - FIXME ("IContextMenu not implemented\n"); - hr = E_NOTIMPL; + hr = BackgroundMenu_Constructor((IShellFolder*)iface, FALSE, riid, ppvOut); } else if (IsEqualIID (riid, &IID_IShellView)) { pShellView = IShellView_Constructor ((IShellFolder *) iface); if (pShellView) { diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 6a31e8ce1e6..7f5aaeb13fc 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -438,8 +438,7 @@ static HRESULT WINAPI ISF_MyComputer_fnCreateViewObject (IShellFolder2 *iface, } else if (IsEqualIID (riid, &IID_IContextMenu)) { - WARN ("IContextMenu not implemented\n"); - hr = E_NOTIMPL; + hr = BackgroundMenu_Constructor((IShellFolder*)iface, FALSE, riid, ppvOut); } else if (IsEqualIID (riid, &IID_IShellView)) { diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c index 71b21c5e73d..e74336544f3 100644 --- a/dlls/shell32/shfldr_netplaces.c +++ b/dlls/shell32/shfldr_netplaces.c @@ -321,11 +321,6 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnCreateViewObject (IShellFolder2 * ifac WARN ("IDropTarget not implemented\n"); hr = E_NOTIMPL; } - else if (IsEqualIID (riid, &IID_IContextMenu)) - { - WARN ("IContextMenu not implemented\n"); - hr = E_NOTIMPL; - } else if (IsEqualIID (riid, &IID_IShellView)) { pShellView = IShellView_Constructor ((IShellFolder *) iface); @@ -335,6 +330,11 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnCreateViewObject (IShellFolder2 * ifac IShellView_Release (pShellView); } } + else + { + FIXME ("invalid/unsupported interface %s\n", shdebugstr_guid (riid)); + hr = E_NOINTERFACE; + } TRACE ("-- (%p)->(interface=%p)\n", This, ppvOut); return hr; } diff --git a/dlls/shell32/shfldr_printers.c b/dlls/shell32/shfldr_printers.c index 8e25e58857b..76375525c52 100644 --- a/dlls/shell32/shfldr_printers.c +++ b/dlls/shell32/shfldr_printers.c @@ -195,7 +195,10 @@ static HRESULT WINAPI IShellFolder_Printers_fnCreateViewObject(IShellFolder2 *if } } else - WARN("unsupported interface %s\n", shdebugstr_guid (riid)); + { + FIXME("unsupported interface %s\n", shdebugstr_guid (riid)); + hr = E_NOINTERFACE; + } return hr; } diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 48d5fe4ecb6..cdd3951efb0 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1117,6 +1117,8 @@ static HRESULT WINAPI ShellFolder2_CreateViewObject(IShellFolder2* iface, HWND h } } else if (IsEqualIID(&IID_IDropTarget, riid)) { hr = IShellFolder2_QueryInterface(iface, &IID_IDropTarget, ppv); + } else if (IsEqualIID(&IID_IContextMenu, riid)) { + hr = BackgroundMenu_Constructor((IShellFolder*)iface, FALSE, riid, ppv); } return hr; diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index a2c15d9f40e..cb238c959cd 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4471,6 +4471,77 @@ static void test_GetUIObject(void) Cleanup(); } +static void test_CreateViewObject_contextmenu(void) +{ + IShellFolder *desktop; + IShellFolder *folder; + IContextMenu *cmenu; + WCHAR path[MAX_PATH]; + LPITEMIDLIST pidl; + HRESULT hr; + DWORD ret; + + hr = CoCreateInstance(&CLSID_ControlPanel, NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder, (void**)&folder); + ok(SUCCEEDED(hr), "got 0x%08x\n", hr); + hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + if (SUCCEEDED(hr)) + IContextMenu_Release(cmenu); + IShellFolder_Release(folder); + + hr = CoCreateInstance(&CLSID_MyComputer, NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder, (void**)&folder); + ok(SUCCEEDED(hr), "got 0x%08x\n", hr); + hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (SUCCEEDED(hr)) + IContextMenu_Release(cmenu); + IShellFolder_Release(folder); + + hr = CoCreateInstance(&CLSID_NetworkPlaces, NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder, (void**)&folder); + ok(SUCCEEDED(hr), "got 0x%08x\n", hr); + hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + if (SUCCEEDED(hr)) + IContextMenu_Release(cmenu); + IShellFolder_Release(folder); + + hr = CoCreateInstance(&CLSID_Printers, NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder, (void**)&folder); + ok(SUCCEEDED(hr), "got 0x%08x\n", hr); + hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + if (SUCCEEDED(hr)) + IContextMenu_Release(cmenu); + IShellFolder_Release(folder); + + hr = CoCreateInstance(&CLSID_RecycleBin, NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder, (void**)&folder); + ok(SUCCEEDED(hr), "got 0x%08x\n", hr); + hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + if (SUCCEEDED(hr)) + IContextMenu_Release(cmenu); + IShellFolder_Release(folder); + + hr = SHGetDesktopFolder(&desktop); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IShellFolder_CreateViewObject(desktop, NULL, &IID_IContextMenu, (void**)&cmenu); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (SUCCEEDED(hr)) + IContextMenu_Release(cmenu); + ret = GetCurrentDirectoryW(MAX_PATH, path); + ok(ret, "got %d\n", GetLastError()); + hr = IShellFolder_ParseDisplayName(desktop, NULL, NULL, path, NULL, &pidl, 0); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IShellFolder_BindToObject(desktop, pidl, NULL, &IID_IShellFolder, (void**)&folder); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IContextMenu, (void**)&cmenu); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (SUCCEEDED(hr)) + IContextMenu_Release(cmenu); + IShellFolder_Release(folder); + ILFree(pidl); + IShellFolder_Release(desktop); +} + #define verify_pidl(i,p) r_verify_pidl(__LINE__, i, p) static void r_verify_pidl(unsigned l, LPCITEMIDLIST pidl, const WCHAR *path) { @@ -5313,6 +5384,7 @@ START_TEST(shlfolder) test_ShellItemArrayEnumItems(); test_desktop_IPersist(); test_GetUIObject(); + test_CreateViewObject_contextmenu(); test_SHSimpleIDListFromPath(); test_ParseDisplayNamePBC(); test_SHGetNameFromIDList();

1 0