January 2023 - Wine-commits

Paul Gofman : msmpeg2vdec: Add stub dll.
by Alexandre Julliard 27 Jan '23

27 Jan '23

Module: wine Branch: master Commit: f0e3e38aca81933a8262f3115973fdcc8c2d1c2d URL: https://gitlab.winehq.org/wine/wine/-/commit/f0e3e38aca81933a8262f3115973fd… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Dec 30 21:11:51 2022 -0600 msmpeg2vdec: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/msmpeg2vdec/Makefile.in | 1 + dlls/msmpeg2vdec/msmpeg2vdec.spec | 8 ++++++++ 4 files changed, 12 insertions(+) diff --git a/configure b/configure index 1e3ffabaebb..eb8512993f1 100755 --- a/configure +++ b/configure @@ -1235,6 +1235,7 @@ enable_msimtf enable_msisip enable_msisys_ocx enable_msls31 +enable_msmpeg2vdec enable_msnet32 enable_mspatcha enable_msports @@ -21390,6 +21391,7 @@ wine_fn_config_makefile dlls/msimtf enable_msimtf wine_fn_config_makefile dlls/msisip enable_msisip wine_fn_config_makefile dlls/msisys.ocx enable_msisys_ocx wine_fn_config_makefile dlls/msls31 enable_msls31 +wine_fn_config_makefile dlls/msmpeg2vdec enable_msmpeg2vdec wine_fn_config_makefile dlls/msnet32 enable_msnet32 wine_fn_config_makefile dlls/mspatcha enable_mspatcha wine_fn_config_makefile dlls/mspatcha/tests enable_tests diff --git a/configure.ac b/configure.ac index c7217274b80..39ad3c89cc6 100644 --- a/configure.ac +++ b/configure.ac @@ -2765,6 +2765,7 @@ WINE_CONFIG_MAKEFILE(dlls/msimtf) WINE_CONFIG_MAKEFILE(dlls/msisip) WINE_CONFIG_MAKEFILE(dlls/msisys.ocx) WINE_CONFIG_MAKEFILE(dlls/msls31) +WINE_CONFIG_MAKEFILE(dlls/msmpeg2vdec) WINE_CONFIG_MAKEFILE(dlls/msnet32) WINE_CONFIG_MAKEFILE(dlls/mspatcha) WINE_CONFIG_MAKEFILE(dlls/mspatcha/tests) diff --git a/dlls/msmpeg2vdec/Makefile.in b/dlls/msmpeg2vdec/Makefile.in new file mode 100644 index 00000000000..d2dbf5adda0 --- /dev/null +++ b/dlls/msmpeg2vdec/Makefile.in @@ -0,0 +1 @@ +MODULE = msmpeg2vdec.dll diff --git a/dlls/msmpeg2vdec/msmpeg2vdec.spec b/dlls/msmpeg2vdec/msmpeg2vdec.spec new file mode 100644 index 00000000000..2ba3ab602f1 --- /dev/null +++ b/dlls/msmpeg2vdec/msmpeg2vdec.spec @@ -0,0 +1,8 @@ +@ stub GetH264DecoderFunctionTable +@ stub ?GetSurface(a)CVIDEOfilter@@QEAAJHPEAEJ(a)Z +@ stub ?GetSurfaceSize(a)CVIDEOfilter@@QEAAJHPEAJ(a)Z +@ stub ?LoadSurface(a)CVIDEOfilter@@QEAAJHPEAEK(a)Z +@ stdcall -private DllCanUnloadNow() +@ stub DllGetClassObject +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

1 0

Francois Gouget : d3d12/tests: Don't check the refcount after releasing the dxgi adapter.
by Alexandre Julliard 27 Jan '23

27 Jan '23

Module: wine Branch: master Commit: 9b38ae997f6a5920694a5c97ff601827336b0575 URL: https://gitlab.winehq.org/wine/wine/-/commit/9b38ae997f6a5920694a5c97ff6018… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 13 16:07:49 2023 +0100 d3d12/tests: Don't check the refcount after releasing the dxgi adapter. The refcount is >= 1 on Windows 10 1709 and 1809 but 0 on more recent versions. So its value is not really important. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54299 --- dlls/d3d12/tests/d3d12.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 33c8ad8dfff..5d3f8a36a2d 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -884,8 +884,7 @@ static void test_create_device(void) ok(refcount == 1, "Got unexpected refcount %lu.\n", refcount); hr = D3D12CreateDevice((IUnknown *)adapter, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - refcount = IDXGIAdapter_Release(adapter); - ok(refcount >= 1, "Got unexpected refcount %lu.\n", refcount); + IDXGIAdapter_Release(adapter); adapter = NULL; luid = ID3D12Device_GetAdapterLuid(device);

1 0

Hans Leidekker : winhttp/tests: Fix test failures with the UTF-8 code page.
by Alexandre Julliard 26 Jan '23

26 Jan '23

Module: wine Branch: master Commit: 8e942f9e413b1bfbe70a1269e7c02fa534fe61ff URL: https://gitlab.winehq.org/wine/wine/-/commit/8e942f9e413b1bfbe70a1269e7c02f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 26 16:45:14 2023 +0100 winhttp/tests: Fix test failures with the UTF-8 code page. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=52936 --- dlls/winhttp/tests/url.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index da51117e41e..fadf8b850ca 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -304,8 +304,8 @@ static void WinHttpCreateUrl_test( void ) SetLastError( 0xdeadbeef ); ret = WinHttpCreateUrl( &uc, ICU_ESCAPE, url, &len ); err = GetLastError(); - ok( !ret, "expected failure\n" ); - ok( err == ERROR_INVALID_PARAMETER, "got %lu\n", err ); + ok( !ret || GetACP() == CP_UTF8, "expected failure\n" ); + ok( err == ERROR_INVALID_PARAMETER || (!err && GetACP() == CP_UTF8), "got %lu\n", err ); /* extra info with Unicode characters, no ICU_ESCAPE */ memset( &uc, 0, sizeof(uc) ); @@ -344,8 +344,8 @@ static void WinHttpCreateUrl_test( void ) SetLastError( 0xdeadbeef ); ret = WinHttpCreateUrl( &uc, ICU_ESCAPE, url, &len ); err = GetLastError(); - ok( !ret, "expected failure\n" ); - ok( err == ERROR_INVALID_PARAMETER, "got %lu\n", err ); + ok( !ret || GetACP() == CP_UTF8, "expected failure\n" ); + ok( err == ERROR_INVALID_PARAMETER || (!err && GetACP() == CP_UTF8), "got %lu\n", err ); /* path with Unicode characters, no ICU_ESCAPE */ memset( &uc, 0, sizeof(uc) );

1 0

Brendan Shanks : include/msvcrt: Add __WINE_(DEALLOC|MALLOC) attributes to _strdup and _wcsdup.
by Alexandre Julliard 26 Jan '23

26 Jan '23

Module: wine Branch: master Commit: 3a688e81a6de77bbed1a21d9649339950847cd0a URL: https://gitlab.winehq.org/wine/wine/-/commit/3a688e81a6de77bbed1a21d9649339… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Dec 5 11:36:31 2022 -0800 include/msvcrt: Add __WINE_(DEALLOC|MALLOC) attributes to _strdup and _wcsdup. --- include/msvcrt/corecrt.h | 12 ++++++++++++ include/msvcrt/corecrt_wstring.h | 3 ++- include/msvcrt/string.h | 3 ++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index aba9bc9422e..9f403c7d10e 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -342,4 +342,16 @@ typedef struct threadlocaleinfostruct { #define __WINE_CRT_SCANF_ATTR(fmt,args) #endif +#if defined(__GNUC__) && (__GNUC__ > 10) +#define __WINE_DEALLOC(...) __attribute__((malloc (__VA_ARGS__))) +#else +#define __WINE_DEALLOC(...) +#endif + +#if defined(__GNUC__) && (__GNUC__ > 2) +#define __WINE_MALLOC __attribute__((malloc)) +#else +#define __WINE_MALLOC +#endif + #endif /* __WINE_CORECRT_H */ diff --git a/include/msvcrt/corecrt_wstring.h b/include/msvcrt/corecrt_wstring.h index bcf9f947625..4d012800f65 100644 --- a/include/msvcrt/corecrt_wstring.h +++ b/include/msvcrt/corecrt_wstring.h @@ -7,6 +7,7 @@ #define _WSTRING_DEFINED #include <corecrt.h> +#include <corecrt_malloc.h> #ifdef __cplusplus extern "C" { @@ -29,7 +30,7 @@ static inline void* memccpy(void *s1, const void *s2, int c, size_t n) { return _ACRTIMP void* __cdecl memmove(void*,const void*,size_t); -_ACRTIMP wchar_t* __cdecl _wcsdup(const wchar_t*); +_ACRTIMP wchar_t* __cdecl _wcsdup(const wchar_t*) __WINE_DEALLOC(free) __WINE_MALLOC; _ACRTIMP int __cdecl _wcsicmp(const wchar_t*,const wchar_t*); _ACRTIMP int __cdecl _wcsicoll(const wchar_t*,const wchar_t*); _ACRTIMP int __cdecl _wcsicoll_l(const wchar_t*, const wchar_t*, _locale_t); diff --git a/include/msvcrt/string.h b/include/msvcrt/string.h index 5e3d51076c6..18d424b1e6a 100644 --- a/include/msvcrt/string.h +++ b/include/msvcrt/string.h @@ -8,6 +8,7 @@ #ifndef __WINE_STRING_H #define __WINE_STRING_H +#include <corecrt_malloc.h> #include <corecrt_wstring.h> #ifndef _NLSCMP_DEFINED @@ -22,7 +23,7 @@ extern "C" { _ACRTIMP size_t __cdecl __strncnt(const char*,size_t); _ACRTIMP int __cdecl _strcmpi(const char*,const char*); _ACRTIMP int __cdecl _strcoll_l(const char*, const char*, _locale_t); -_ACRTIMP char* __cdecl _strdup(const char*); +_ACRTIMP char* __cdecl _strdup(const char*) __WINE_DEALLOC(free) __WINE_MALLOC; _ACRTIMP char* __cdecl _strerror(const char*); _ACRTIMP errno_t __cdecl strerror_s(char*,size_t,int); _ACRTIMP int __cdecl _stricmp(const char*,const char*);

1 0

Brendan Shanks : include/msvcrt: Add __WINE_(ALLOC_SIZE|DEALLOC|MALLOC) attributes to _aligned_malloc functions.
by Alexandre Julliard 26 Jan '23

26 Jan '23

Module: wine Branch: master Commit: d36cbc4a5741c3e41c9ce91f485c311375e0235a URL: https://gitlab.winehq.org/wine/wine/-/commit/d36cbc4a5741c3e41c9ce91f485c31… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Dec 5 11:40:00 2022 -0800 include/msvcrt: Add __WINE_(ALLOC_SIZE|DEALLOC|MALLOC) attributes to _aligned_malloc functions. --- include/msvcrt/corecrt.h | 6 ++++++ include/msvcrt/corecrt_malloc.h | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index 9f403c7d10e..4dc2ca53208 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -342,6 +342,12 @@ typedef struct threadlocaleinfostruct { #define __WINE_CRT_SCANF_ATTR(fmt,args) #endif +#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))) +#define __WINE_ALLOC_SIZE(...) __attribute__((__alloc_size__(__VA_ARGS__))) +#else +#define __WINE_ALLOC_SIZE(...) +#endif + #if defined(__GNUC__) && (__GNUC__ > 10) #define __WINE_DEALLOC(...) __attribute__((malloc (__VA_ARGS__))) #else diff --git a/include/msvcrt/corecrt_malloc.h b/include/msvcrt/corecrt_malloc.h index 4c0d35f7e08..4dfb9367a11 100644 --- a/include/msvcrt/corecrt_malloc.h +++ b/include/msvcrt/corecrt_malloc.h @@ -36,10 +36,10 @@ _ACRTIMP void* __cdecl _expand(void*,size_t); _ACRTIMP size_t __cdecl _msize(void*); _ACRTIMP void __cdecl _aligned_free(void*); -_ACRTIMP void* __cdecl _aligned_malloc(size_t,size_t); -_ACRTIMP void* __cdecl _aligned_offset_malloc(size_t,size_t,size_t); -_ACRTIMP void* __cdecl _aligned_realloc(void*,size_t,size_t); -_ACRTIMP void* __cdecl _aligned_offset_realloc(void*,size_t,size_t,size_t); +_ACRTIMP void* __cdecl _aligned_malloc(size_t,size_t) __WINE_ALLOC_SIZE(1) __WINE_DEALLOC(_aligned_free) __WINE_MALLOC; +_ACRTIMP void* __cdecl _aligned_offset_malloc(size_t,size_t,size_t) __WINE_ALLOC_SIZE(1) __WINE_DEALLOC(_aligned_free) __WINE_MALLOC; +_ACRTIMP void* __cdecl _aligned_realloc(void*,size_t,size_t) __WINE_ALLOC_SIZE(2) __WINE_DEALLOC(_aligned_free); +_ACRTIMP void* __cdecl _aligned_offset_realloc(void*,size_t,size_t,size_t) __WINE_ALLOC_SIZE(2) __WINE_DEALLOC(_aligned_free); #ifdef __cplusplus }

1 0

Brendan Shanks : include/msvcrt: Add __WINE_(ALLOC_SIZE|DEALLOC) attributes to _recalloc.
by Alexandre Julliard 26 Jan '23

26 Jan '23

Module: wine Branch: master Commit: 21c4260792e8bbf7629c3269bbbcb30359c7152c URL: https://gitlab.winehq.org/wine/wine/-/commit/21c4260792e8bbf7629c3269bbbcb3… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Dec 14 10:37:33 2022 -0800 include/msvcrt: Add __WINE_(ALLOC_SIZE|DEALLOC) attributes to _recalloc. --- include/msvcrt/corecrt_malloc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/msvcrt/corecrt_malloc.h b/include/msvcrt/corecrt_malloc.h index 4dfb9367a11..ab3f03fcb04 100644 --- a/include/msvcrt/corecrt_malloc.h +++ b/include/msvcrt/corecrt_malloc.h @@ -30,7 +30,7 @@ _ACRTIMP void* __cdecl calloc(size_t,size_t); _ACRTIMP void __cdecl free(void*); _ACRTIMP void* __cdecl malloc(size_t); _ACRTIMP void* __cdecl realloc(void*,size_t); -_ACRTIMP void* __cdecl _recalloc(void*,size_t,size_t); +_ACRTIMP void* __cdecl _recalloc(void*,size_t,size_t) __WINE_ALLOC_SIZE(2,3) __WINE_DEALLOC(free); _ACRTIMP void* __cdecl _expand(void*,size_t); _ACRTIMP size_t __cdecl _msize(void*);

1 0

Hans Leidekker : adsldp/tests: Avoid test failures when the server is down.
by Alexandre Julliard 26 Jan '23

26 Jan '23

Module: wine Branch: master Commit: aabdb15458aaee80b157175bc31cbaf3d57bf5e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/aabdb15458aaee80b157175bc31cba… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 26 20:40:13 2023 +0100 adsldp/tests: Avoid test failures when the server is down. --- dlls/adsldp/tests/ldap.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index 23cca695c3a..80b41df5ea7 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -190,6 +190,11 @@ static void test_ParseDisplayName(void) count = 0xdeadbeef; hr = MkParseDisplayName(bc, test[i].path, &count, &mk); + if (hr == HRESULT_FROM_WIN32(ERROR_DS_SERVER_DOWN)) + { + skip("server is down\n"); + break; + } todo_wine_if(i == 0 || i == 1 || i == 11 || i == 12) ok(hr == test[i].hr, "%d: got %#lx, expected %#lx\n", i, hr, test[i].hr); if (hr == S_OK)

1 0

Nikolay Sivov : propsys: Add InitPropVariantFromStringVector().
by Alexandre Julliard 26 Jan '23

26 Jan '23

Module: wine Branch: master Commit: 3a1146d8e63d7ceff38441fee08f7f7080527020 URL: https://gitlab.winehq.org/wine/wine/-/commit/3a1146d8e63d7ceff38441fee08f7f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 10 15:21:00 2022 +0300 propsys: Add InitPropVariantFromStringVector(). --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 32 ++++++++++++++++++++++++++++++++ dlls/propsys/tests/propsys.c | 39 +++++++++++++++++++++++++++++++++++---- include/propvarutil.h | 1 + 4 files changed, 69 insertions(+), 5 deletions(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 7391cf4aaa2..cf7a4c299f4 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -41,7 +41,7 @@ @ stub InitPropVariantFromResource @ stub InitPropVariantFromStrRet @ stub InitPropVariantFromStringAsVector -@ stub InitPropVariantFromStringVector +@ stdcall InitPropVariantFromStringVector(ptr long ptr) @ stub InitPropVariantFromUInt16Vector @ stub InitPropVariantFromUInt32Vector @ stub InitPropVariantFromUInt64Vector diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index cd92912fde5..86670a51adf 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -657,6 +657,38 @@ HRESULT WINAPI InitPropVariantFromCLSID(REFCLSID clsid, PROPVARIANT *ppropvar) return S_OK; } +HRESULT WINAPI InitPropVariantFromStringVector(PCWSTR *strs, ULONG count, PROPVARIANT *ppropvar) +{ + unsigned int i; + + TRACE("(%p %lu %p)\n", strs, count, ppropvar); + + ppropvar->calpwstr.pElems = CoTaskMemAlloc(count * sizeof(*ppropvar->calpwstr.pElems)); + if(!ppropvar->calpwstr.pElems) + return E_OUTOFMEMORY; + + ppropvar->vt = VT_LPWSTR | VT_VECTOR; + ppropvar->calpwstr.cElems = 0; + if (count) + memset(ppropvar->calpwstr.pElems, 0, count * sizeof(*ppropvar->calpwstr.pElems)); + + for (i = 0; i < count; ++i) + { + if (strs[i]) + { + if (!(ppropvar->calpwstr.pElems[i] = CoTaskMemAlloc((wcslen(strs[i]) + 1)*sizeof(**strs)))) + { + PropVariantClear(ppropvar); + return E_OUTOFMEMORY; + } + } + wcscpy(ppropvar->calpwstr.pElems[i], strs[i]); + ppropvar->calpwstr.cElems++; + } + + return S_OK; +} + HRESULT WINAPI InitVariantFromBuffer(const VOID *pv, UINT cb, VARIANT *pvar) { SAFEARRAY *arr; diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 47a7930a18b..fb9decd7ab0 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -1419,6 +1419,35 @@ static void test_InitPropVariantFromCLSID(void) PropVariantClear(&propvar); } +static void test_InitPropVariantFromStringVector(void) +{ + static const WCHAR *strs[2] = { L"abc", L"def" }; + PROPVARIANT propvar; + HRESULT hr; + + memset(&propvar, 0, sizeof(propvar)); + propvar.vt = VT_I4; + propvar.lVal = 15; + + hr = InitPropVariantFromStringVector(NULL, 0, &propvar); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(propvar.vt == (VT_LPWSTR|VT_VECTOR), "Unexpected type %#x.\n", propvar.vt); + ok(!propvar.calpwstr.cElems, "Unexpected number of elements.\n"); + ok(!!propvar.calpwstr.pElems, "Unexpected vector pointer.\n"); + PropVariantClear(&propvar); + + hr = InitPropVariantFromStringVector(strs, 2, &propvar); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(propvar.vt == (VT_LPWSTR|VT_VECTOR), "Unexpected type %#x.\n", propvar.vt); + ok(propvar.calpwstr.cElems == 2, "Unexpected number of elements.\n"); + ok(!!propvar.calpwstr.pElems, "Unexpected vector pointer.\n"); + ok(propvar.calpwstr.pElems[0] != strs[0], "Unexpected string pointer.\n"); + ok(!wcscmp(propvar.calpwstr.pElems[0], strs[0]), "Unexpected string %s.\n", debugstr_w(propvar.calpwstr.pElems[0])); + ok(propvar.calpwstr.pElems[1] != strs[1], "Unexpected string pointer.\n"); + ok(!wcscmp(propvar.calpwstr.pElems[1], strs[1]), "Unexpected string %s.\n", debugstr_w(propvar.calpwstr.pElems[1])); + PropVariantClear(&propvar); +} + static void test_PropVariantToDouble(void) { PROPVARIANT propvar; @@ -2252,11 +2281,15 @@ static void test_VariantToStringWithDefault(void) START_TEST(propsys) { + test_InitPropVariantFromGUIDAsString(); + test_InitPropVariantFromBuffer(); + test_InitPropVariantFromCLSID(); + test_InitPropVariantFromStringVector(); + test_InitVariantFromFileTime(); + test_PSStringFromPropertyKey(); test_PSPropertyKeyFromString(); test_PSRefreshPropertySchema(); - test_InitPropVariantFromGUIDAsString(); - test_InitPropVariantFromBuffer(); test_PropVariantToGUID(); test_PropVariantToStringAlloc(); test_PropVariantCompareEx(); @@ -2264,7 +2297,6 @@ START_TEST(propsys) test_PropVariantChangeType_LPWSTR(); test_PropVariantToBoolean(); test_PropVariantToStringWithDefault(); - test_InitPropVariantFromCLSID(); test_PropVariantToDouble(); test_PropVariantToString(); test_PropVariantToBuffer(); @@ -2273,6 +2305,5 @@ START_TEST(propsys) test_PSCreateMemoryPropertyStore(); test_propertystore(); test_PSCreatePropertyStoreFromObject(); - test_InitVariantFromFileTime(); test_VariantToStringWithDefault(); } diff --git a/include/propvarutil.h b/include/propvarutil.h index b82c3d90274..575c498b230 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -81,6 +81,7 @@ HRESULT WINAPI VariantToGUID(const VARIANT *pvar, GUID *guid); INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2, PROPVAR_COMPARE_UNIT uint, PROPVAR_COMPARE_FLAGS flags); HRESULT WINAPI InitPropVariantFromFileTime(const FILETIME *pftIn, PROPVARIANT *ppropvar); +HRESULT WINAPI InitPropVariantFromStringVector(PCWSTR *strs, ULONG count, PROPVARIANT *ppropvar); HRESULT WINAPI PropVariantToDouble(REFPROPVARIANT propvarIn, double *ret); HRESULT WINAPI PropVariantToInt16(REFPROPVARIANT propvarIn, SHORT *ret);

1 0

Jacek Caban : ieframe/tests: Relax session count test.
by Alexandre Julliard 26 Jan '23

26 Jan '23

Module: wine Branch: master Commit: 26e5482acf7a6951d16171662216d4bd8082d623 URL: https://gitlab.winehq.org/wine/wine/-/commit/26e5482acf7a6951d16171662216d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 14:55:41 2023 +0100 ieframe/tests: Relax session count test. --- dlls/ieframe/tests/webbrowser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 584da6e9022..15ce0272654 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2021,7 +2021,7 @@ static void test_ClientSite(IWebBrowser2 *unk, IOleClientSite *client, BOOL stop if(client) { DWORD count = pSetQueryNetSessionCount(SESSION_QUERY); - ok(count == session_count + 1, "count = %lu expected %lu\n", count, session_count + 1); + ok(count >= session_count + 1, "count = %lu expected %lu\n", count, session_count + 1); CHECK_CALLED(GetContainer); CHECK_CALLED(Site_GetWindow);

1 0

Santino Mazza : mshtml/tests: Test for get_all and get_body in document fragments.
by Alexandre Julliard 26 Jan '23

26 Jan '23

Module: wine Branch: master Commit: d8030d1543f4e3d43de6fc17052f7896b7e609f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/d8030d1543f4e3d43de6fc17052f78… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Fri Dec 16 11:20:25 2022 -0300 mshtml/tests: Test for get_all and get_body in document fragments. --- dlls/mshtml/tests/dom.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 68 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c9c52776fa9..e817438fa48 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -10987,7 +10987,7 @@ static IHTMLDocument2 *create_docfrag(IHTMLDocument2 *doc) static void test_docfrag(IHTMLDocument2 *doc) { IHTMLDocument2 *frag, *owner_doc, *doc_node; - IHTMLElement *div, *body, *br; + IHTMLElement *div, *main_body, *frag_body, *br,*html; IHTMLElementCollection *col; IHTMLLocation *location; HRESULT hres; @@ -11001,20 +11001,38 @@ static void test_docfrag(IHTMLDocument2 *doc) ET_BR }; + static const elem_type_t empty_types[] = {}; + + static const elem_type_t frag_types[] = { + ET_HTML, + ET_DIV, + ET_DIV, + ET_BODY + }; + frag = create_docfrag(doc); test_disp((IUnknown*)frag, &DIID_DispHTMLDocument, &CLSID_HTMLDocument, L"[object]"); - body = (void*)0xdeadbeef; - hres = IHTMLDocument2_get_body(frag, &body); + frag_body = (void*)0xdeadbeef; + hres = IHTMLDocument2_get_body(frag, &frag_body); ok(hres == S_OK, "get_body failed: %08lx\n", hres); - ok(!body, "body != NULL\n"); + ok(!frag_body, "body != NULL\n"); location = (void*)0xdeadbeef; hres = IHTMLDocument2_get_location(frag, &location); ok(hres == E_UNEXPECTED, "get_location failed: %08lx\n", hres); ok(location == (void*)0xdeadbeef, "location changed\n"); + col = NULL; + hres = IHTMLDocument2_get_all(frag, &col); + todo_wine ok(hres == S_OK, "get_all failed: %08lx\n", hres); + todo_wine ok(col != NULL, "got null elements collection\n"); + if (col) { + test_elem_collection((IUnknown *) col, empty_types, ARRAY_SIZE(empty_types)); + IHTMLElementCollection_Release(col); + } + br = test_create_elem(doc, L"BR"); test_elem_source_index(br, -1); test_node_append_child((IUnknown*)frag, (IUnknown*)br); @@ -11033,6 +11051,52 @@ static void test_docfrag(IHTMLDocument2 *doc) test_elem_collection((IUnknown*)col, all_types, ARRAY_SIZE(all_types)); IHTMLElementCollection_Release(col); + html = test_create_elem(doc, L"HTML"); + test_elem_source_index(html, -1); + test_node_append_child((IUnknown*)frag, (IUnknown*)html); + test_elem_source_index(html, 0); + + div = test_create_elem(doc, L"DIV"); + test_elem_source_index(div, -1); + test_node_append_child((IUnknown*)html, (IUnknown*)div); + test_elem_source_index(div, 1); + IHTMLElement_Release(div); + + div = test_create_elem(doc, L"DIV"); + test_elem_source_index(div, -1); + test_node_append_child((IUnknown*)html, (IUnknown*)div); + test_elem_source_index(div, 2); + + frag_body = test_create_elem(doc, L"BODY"); + test_elem_source_index(frag_body, -1); + test_node_append_child((IUnknown*)div, (IUnknown*)frag_body); + test_elem_source_index(frag_body, 3); + IHTMLElement_Release(frag_body); + IHTMLElement_Release(div); + IHTMLElement_Release(html); + + hres = IHTMLDocument2_get_body(doc, &main_body); + ok(hres == S_OK, "get_body failed: %08lx\n", hres); + ok(main_body != NULL, "body == NULL\n"); + + hres = IHTMLDocument2_get_body(frag, &frag_body); + ok(hres == S_OK, "get_body failed: %08lx\n", hres); + todo_wine ok(frag_body != NULL, "body == NULL\n"); + if (frag_body) { + todo_wine ok(!iface_cmp((IUnknown *) frag_body, (IUnknown *) main_body), "frag_body == main_body\n"); + IHTMLElement_Release(frag_body); + } + IHTMLElement_Release(main_body); + + col = NULL; + hres = IHTMLDocument2_get_all(frag, &col); + todo_wine ok(hres == S_OK, "get_all failed: %08lx\n", hres); + todo_wine ok(col != NULL, "got null elements collection\n"); + if (col) { + test_elem_collection((IUnknown *) col, frag_types, ARRAY_SIZE(frag_types)); + IHTMLElementCollection_Release(col); + } + div = test_create_elem(frag, L"div"); owner_doc = get_owner_doc((IUnknown*)div); doc_node = get_doc_node(doc);

1 0