December 2019 - Wine-Commits

Alexandre Julliard : msvcrt/tests: Add some tests for wcstoi64().
by Alexandre Julliard Dec. 17, 2019

Dec. 17, 2019

Module: wine Branch: master Commit: d1444cb12add39a8ef79f38b1814a8e0e23aa007 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1444cb12add39a8ef79f38b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 17 14:16:48 2019 +0100 msvcrt/tests: Add some tests for wcstoi64(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 95 ++++++++++++++++++---------------------------- 1 file changed, 37 insertions(+), 58 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index f4c4657791..1dfa05c744 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -3078,17 +3078,33 @@ static void test__stricmp(void) static void test__wcstoi64(void) { - static const WCHAR digit[] = { '9', 0 }; - static const WCHAR space[] = { ' ', 0 }; - static const WCHAR stock[] = { 0x3231, 0 }; /* PARENTHESIZED IDEOGRAPH STOCK */ - static const WCHAR cjk_1[] = { 0x4e00, 0 }; /* CJK Ideograph, First */ - static const WCHAR tamil[] = { 0x0bef, 0 }; /* TAMIL DIGIT NINE */ - static const WCHAR thai[] = { 0x0e59, 0 }; /* THAI DIGIT NINE */ - static const WCHAR fullwidth[] = { 0xff19, 0 }; /* FULLWIDTH DIGIT NINE */ - static const WCHAR superscript1[] = { 0xb9, 0 }; /* SUPERSCRIPT ONE */ - static const WCHAR minus_0x91[] = { '-', 0x0e50, 'x', 0xff19, '1', 0 }; - static const WCHAR plus_071[] = { '+', 0x0e50, 0xff17, '1', 0 }; - static const WCHAR hex[] = { 0xff19, 'f', 0x0e59, 0xff46, 0 }; + static const struct { WCHAR str[24]; __int64 res; unsigned __int64 ures; int base; } tests[] = + { + { L"9", 9, 9, 10 }, + { L" ", 0, 0 }, + { L"-1234", -1234, -1234 }, + { { 0x3231 }, 0, 0 }, /* PARENTHESIZED IDEOGRAPH STOCK */ + { { 0x4e00 }, 0, 0 }, /* CJK Ideograph, First */ + { { 0x0bef }, 0, 0 }, /* TAMIL DIGIT NINE */ + { { 0x0e59 }, 9, 9 }, /* THAI DIGIT NINE */ + { { 0xff19 }, 9, 9 }, /* FULLWIDTH DIGIT NINE */ + { { 0x00b9 }, 0, 0 }, /* SUPERSCRIPT ONE */ + { { '-',0x0e50,'x',0xff19,'1' }, -0x91, -0x91 }, + { { '+',0x0e50,0xff17,'1' }, 071, 071 }, + { { 0xff19,'f',0x0e59,0xff46 }, 0x9f9, 0x9f9, 16 }, + { L"4294967295", 4294967295, 4294967295 }, + { L"4294967296", 4294967296, 4294967296 }, + { L"9223372036854775807", 9223372036854775807, 9223372036854775807 }, + { L"9223372036854775808", _I64_MAX, 9223372036854775808u }, + { L"18446744073709551615", _I64_MAX, _UI64_MAX }, + { L"18446744073709551616", _I64_MAX, _UI64_MAX }, + { L"-4294967295", -4294967295, -4294967295 }, + { L"-4294967296", -4294967296, -4294967296 }, + { L"-9223372036854775807", -9223372036854775807, -9223372036854775807 }, + { L"-9223372036854775808", _I64_MIN, 9223372036854775808u }, + { L"-18446744073709551615", _I64_MIN, 1 }, + { L"-18446744073709551616", _I64_MIN, 1 }, + }; static const WCHAR zeros[] = { 0x660, 0x6f0, 0x966, 0x9e6, 0xa66, 0xae6, 0xb66, 0xc66, 0xce6, 0xd66, 0xe50, 0xed0, 0xf20, 0x1040, 0x17e0, 0x1810, 0xff10 @@ -3104,51 +3120,16 @@ static void test__wcstoi64(void) return; } - res = p_wcstoi64(digit, NULL, 10); - ok(res == 9, "res != 9\n"); - res = p_wcstoi64(space, &endpos, 0); - ok(endpos == space, "endpos != space\n"); - res = p_wcstoi64(stock, &endpos, 10); - ok(res == 0, "res != 0\n"); - ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); - res = p_wcstoi64(cjk_1, NULL, 0); - ok(res == 0, "res != 0\n"); - res = p_wcstoi64(tamil, &endpos, 10); - ok(res == 0, "res != 0\n"); - ok(endpos == tamil, "Incorrect endpos (%p-%p)\n", tamil, endpos); - res = p_wcstoi64(thai, NULL, 10); - ok(res == 9, "res != 9\n"); - res = p_wcstoi64(fullwidth, NULL, 10); - ok(res == 9, "res != 9\n"); - res = p_wcstoi64(superscript1, NULL, 10); - ok(res == 0, "res != 0\n"); - res = p_wcstoi64(hex, NULL, 16); - ok(res == 0x9f9, "res != 0x9f9\n"); - res = p_wcstoi64(minus_0x91, NULL, 0); - ok(res == -0x91, "res != -0x91\n"); - res = p_wcstoi64(plus_071, NULL, 0); - ok(res == 071, "res != 071\n"); - - ures = p_wcstoui64(digit, NULL, 10); - ok(ures == 9, "ures != 9\n"); - ures = p_wcstoui64(space, &endpos, 0); - ok(endpos == space, "endpos != space\n"); - ures = p_wcstoui64(stock, &endpos, 10); - ok(ures == 0, "ures != 0\n"); - ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); - ures = p_wcstoui64(tamil, &endpos, 10); - ok(ures == 0, "ures != 0\n"); - ok(endpos == tamil, "Incorrect endpos (%p-%p)\n", tamil, endpos); - ures = p_wcstoui64(thai, NULL, 10); - ok(ures == 9, "ures != 9\n"); - ures = p_wcstoui64(fullwidth, NULL, 10); - ok(ures == 9, "ures != 9\n"); - ures = p_wcstoui64(superscript1, NULL, 10); - ok(ures == 0, "ures != 0\n"); - ures = p_wcstoui64(hex, NULL, 16); - ok(ures == 0x9f9, "ures != 0x9f9\n"); - ures = p_wcstoui64(plus_071, NULL, 0); - ok(ures == 071, "ures != 071\n"); + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + res = p_wcstoi64( tests[i].str, &endpos, tests[i].base ); + ok( res == tests[i].res, "%u: %s res %s\n", + i, wine_dbgstr_w(tests[i].str), wine_dbgstr_longlong(res) ); + if (!res) ok( endpos == tests[i].str, "%u: wrong endpos %p/%p\n", i, endpos, tests[i].str ); + ures = p_wcstoui64( tests[i].str, &endpos, tests[i].base ); + ok( ures == tests[i].ures, "%u: %s res %s\n", + i, wine_dbgstr_w(tests[i].str), wine_dbgstr_longlong(ures) ); + } /* Test various unicode digits */ for (i = 0; i < ARRAY_SIZE(zeros); ++i) { @@ -3159,8 +3140,6 @@ static void test__wcstoi64(void) res = p_wcstoi64(tmp, NULL, 16); ok(res == 4, "with zero = U+%04X: got %d, expected 4\n", zeros[i], (int)res); } - - return; } static void test_atoi(void)

1 0

Alexandre Julliard : msvcrt: Fix wcstoul() to behave identically to strtoul().
by Alexandre Julliard Dec. 17, 2019

Dec. 17, 2019

Module: wine Branch: master Commit: 763868243399c6230afe03110b28c2ae271845f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=763868243399c6230afe0311… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 17 15:27:31 2019 +0100 msvcrt: Fix wcstoul() to behave identically to strtoul(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48261 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/wcs.c | 5 +++- 2 files changed, 64 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 1dfa05c744..f814a22bdb 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -3142,6 +3142,65 @@ static void test__wcstoi64(void) } } +static void test__wcstol(void) +{ + static const struct { WCHAR str[24]; long res; unsigned long ures; int base; } tests[] = + { + { L"9", 9, 9, 10 }, + { L" ", 0, 0 }, + { L"-1234", -1234, -1234 }, + { { 0x3231 }, 0, 0 }, /* PARENTHESIZED IDEOGRAPH STOCK */ + { { 0x4e00 }, 0, 0 }, /* CJK Ideograph, First */ + { { 0x0bef }, 0, 0 }, /* TAMIL DIGIT NINE */ + { { 0x0e59 }, 9, 9 }, /* THAI DIGIT NINE */ + { { 0xff19 }, 9, 9 }, /* FULLWIDTH DIGIT NINE */ + { { 0x00b9 }, 0, 0 }, /* SUPERSCRIPT ONE */ + { { '-',0x0e50,'x',0xff19,'1' }, -0x91, -0x91 }, + { { '+',0x0e50,0xff17,'1' }, 071, 071 }, + { { 0xff19,'f',0x0e59,0xff46 }, 0x9f9, 0x9f9, 16 }, + { L"2147483647", 2147483647, 2147483647 }, + { L"2147483648", LONG_MAX, 2147483648 }, + { L"4294967295", LONG_MAX, 4294967295 }, + { L"4294967296", LONG_MAX, ULONG_MAX }, + { L"9223372036854775807", LONG_MAX, ULONG_MAX }, + { L"-2147483647", -2147483647, -2147483647 }, + { L"-2147483648", LONG_MIN, LONG_MIN }, + { L"-4294967295", LONG_MIN, 1 }, + { L"-4294967296", LONG_MIN, 1 }, + { L"-9223372036854775807", LONG_MIN, 1 }, + }; + static const WCHAR zeros[] = { + 0x660, 0x6f0, 0x966, 0x9e6, 0xa66, 0xae6, 0xb66, 0xc66, 0xce6, + 0xd66, 0xe50, 0xed0, 0xf20, 0x1040, 0x17e0, 0x1810, 0xff10 + }; + int i; + + long res; + unsigned long ures; + WCHAR *endpos; + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + res = wcstol( tests[i].str, &endpos, tests[i].base ); + ok( res == tests[i].res, "%u: %s res %08lx\n", + i, wine_dbgstr_w(tests[i].str), res ); + if (!res) ok( endpos == tests[i].str, "%u: wrong endpos %p/%p\n", i, endpos, tests[i].str ); + ures = wcstoul( tests[i].str, &endpos, tests[i].base ); + ok( ures == tests[i].ures, "%u: %s res %08lx\n", + i, wine_dbgstr_w(tests[i].str), ures ); + } + + /* Test various unicode digits */ + for (i = 0; i < ARRAY_SIZE(zeros); ++i) { + WCHAR tmp[] = {zeros[i] + 4, zeros[i], zeros[i] + 5, 0}; + res = wcstol(tmp, NULL, 0); + ok(res == 405, "with zero = U+%04X: got %d, expected 405\n", zeros[i], (int)res); + tmp[1] = zeros[i] + 10; + res = wcstol(tmp, NULL, 16); + ok(res == 4, "with zero = U+%04X: got %d, expected 4\n", zeros[i], (int)res); + } +} + static void test_atoi(void) { int r; @@ -4066,6 +4125,7 @@ START_TEST(string) test__atodbl(); test__stricmp(); test__wcstoi64(); + test__wcstol(); test_atoi(); test_atol(); test_atof(); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 1ae292423c..8b240e97c0 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2487,11 +2487,14 @@ unsigned __int64 CDECL MSVCRT__wcstoui64(const MSVCRT_wchar_t *nptr, MSVCRT_ulong __cdecl MSVCRT__wcstoul_l(const MSVCRT_wchar_t *s, MSVCRT_wchar_t **end, int base, MSVCRT__locale_t locale) { - unsigned __int64 ret = MSVCRT__wcstoui64_l(s, end, base, locale); + __int64 ret = MSVCRT__wcstoi64_l(s, end, base, locale); if(ret > MSVCRT_ULONG_MAX) { ret = MSVCRT_ULONG_MAX; *MSVCRT__errno() = MSVCRT_ERANGE; + }else if(ret < -(__int64)MSVCRT_ULONG_MAX) { + ret = 1; + *MSVCRT__errno() = MSVCRT_ERANGE; } return ret; }

1 0

Zebediah Figura : rpcrt4: Fix ITypeInfo ref count handling.
by Alexandre Julliard Dec. 17, 2019

Dec. 17, 2019

Module: wine Branch: master Commit: 53efccdb6589b2fbe8370d2216d1652bf53b984b URL: https://source.winehq.org/git/wine.git/?a=commit;h=53efccdb6589b2fbe8370d22… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Dec 16 15:49:17 2019 -0600 rpcrt4: Fix ITypeInfo ref count handling. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_typelib.c | 60 +++++++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 25 deletions(-) diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index 5c48010030..dd3043e78b 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -1199,10 +1199,10 @@ err: } /* Common helper for Create{Proxy,Stub}FromTypeInfo(). */ -static HRESULT get_iface_info(ITypeInfo **typeinfo, WORD *funcs, WORD *parentfuncs, - GUID *parentiid) +static HRESULT get_iface_info(ITypeInfo *typeinfo, WORD *funcs, WORD *parentfuncs, + GUID *parentiid, ITypeInfo **real_typeinfo) { - ITypeInfo *real_typeinfo, *parentinfo; + ITypeInfo *parentinfo; TYPEATTR *typeattr; ITypeLib *typelib; TLIBATTR *libattr; @@ -1214,59 +1214,62 @@ static HRESULT get_iface_info(ITypeInfo **typeinfo, WORD *funcs, WORD *parentfun /* Dual interfaces report their size to be sizeof(IDispatchVtbl) and their * implemented type to be IDispatch. We need to retrieve the underlying * interface to get that information. */ - hr = ITypeInfo_GetTypeAttr(*typeinfo, &typeattr); + hr = ITypeInfo_GetTypeAttr(typeinfo, &typeattr); if (FAILED(hr)) return hr; typekind = typeattr->typekind; - ITypeInfo_ReleaseTypeAttr(*typeinfo, typeattr); + ITypeInfo_ReleaseTypeAttr(typeinfo, typeattr); if (typekind == TKIND_DISPATCH) { - hr = ITypeInfo_GetRefTypeOfImplType(*typeinfo, -1, &reftype); + hr = ITypeInfo_GetRefTypeOfImplType(typeinfo, -1, &reftype); if (FAILED(hr)) return hr; - hr = ITypeInfo_GetRefTypeInfo(*typeinfo, reftype, &real_typeinfo); + hr = ITypeInfo_GetRefTypeInfo(typeinfo, reftype, real_typeinfo); if (FAILED(hr)) return hr; - - ITypeInfo_Release(*typeinfo); - *typeinfo = real_typeinfo; } + else + ITypeInfo_AddRef(*real_typeinfo = typeinfo); - hr = ITypeInfo_GetContainingTypeLib(*typeinfo, &typelib, NULL); + hr = ITypeInfo_GetContainingTypeLib(*real_typeinfo, &typelib, NULL); if (FAILED(hr)) - return hr; + goto err; hr = ITypeLib_GetLibAttr(typelib, &libattr); if (FAILED(hr)) { ITypeLib_Release(typelib); - return hr; + goto err; } syskind = libattr->syskind; ITypeLib_ReleaseTLibAttr(typelib, libattr); ITypeLib_Release(typelib); - hr = ITypeInfo_GetTypeAttr(*typeinfo, &typeattr); + hr = ITypeInfo_GetTypeAttr(*real_typeinfo, &typeattr); if (FAILED(hr)) - return hr; + goto err; *funcs = typeattr->cFuncs; *parentfuncs = typeattr->cbSizeVft / (syskind == SYS_WIN64 ? 8 : 4) - *funcs; - ITypeInfo_ReleaseTypeAttr(*typeinfo, typeattr); + ITypeInfo_ReleaseTypeAttr(*real_typeinfo, typeattr); - hr = ITypeInfo_GetRefTypeOfImplType(*typeinfo, 0, &reftype); + hr = ITypeInfo_GetRefTypeOfImplType(*real_typeinfo, 0, &reftype); if (FAILED(hr)) - return hr; - hr = ITypeInfo_GetRefTypeInfo(*typeinfo, reftype, &parentinfo); + goto err; + hr = ITypeInfo_GetRefTypeInfo(*real_typeinfo, reftype, &parentinfo); if (FAILED(hr)) - return hr; + goto err; hr = ITypeInfo_GetTypeAttr(parentinfo, &typeattr); if (FAILED(hr)) - return hr; + goto err; *parentiid = typeattr->guid; ITypeInfo_ReleaseTypeAttr(parentinfo, typeattr); ITypeInfo_Release(parentinfo); + return S_OK; + +err: + ITypeInfo_Release(*real_typeinfo); return hr; } @@ -1355,19 +1358,21 @@ HRESULT WINAPI CreateProxyFromTypeInfo(ITypeInfo *typeinfo, IUnknown *outer, { struct typelib_proxy *proxy; WORD funcs, parentfuncs, i; + ITypeInfo *real_typeinfo; GUID parentiid; HRESULT hr; TRACE("typeinfo %p, outer %p, iid %s, proxy_buffer %p, out %p.\n", typeinfo, outer, debugstr_guid(iid), proxy_buffer, out); - hr = get_iface_info(&typeinfo, &funcs, &parentfuncs, &parentiid); + hr = get_iface_info(typeinfo, &funcs, &parentfuncs, &parentiid, &real_typeinfo); if (FAILED(hr)) return hr; if (!(proxy = heap_alloc_zero(sizeof(*proxy)))) { ERR("Failed to allocate proxy object.\n"); + ITypeInfo_Release(real_typeinfo); return E_OUTOFMEMORY; } @@ -1379,6 +1384,7 @@ HRESULT WINAPI CreateProxyFromTypeInfo(ITypeInfo *typeinfo, IUnknown *outer, { ERR("Failed to allocate proxy vtbl.\n"); heap_free(proxy); + ITypeInfo_Release(real_typeinfo); return E_OUTOFMEMORY; } proxy->proxy_vtbl->header.pStublessProxyInfo = &proxy->proxy_info; @@ -1388,8 +1394,9 @@ HRESULT WINAPI CreateProxyFromTypeInfo(ITypeInfo *typeinfo, IUnknown *outer, for (i = 0; i < funcs; i++) proxy->proxy_vtbl->Vtbl[parentfuncs + i] = (void *)-1; - hr = build_format_strings(typeinfo, funcs, parentfuncs, &proxy->stub_desc.pFormatTypes, + hr = build_format_strings(real_typeinfo, funcs, parentfuncs, &proxy->stub_desc.pFormatTypes, &proxy->proxy_info.ProcFormatString, &proxy->offset_table); + ITypeInfo_Release(real_typeinfo); if (FAILED(hr)) { heap_free(proxy->proxy_vtbl); @@ -1490,27 +1497,30 @@ HRESULT WINAPI CreateStubFromTypeInfo(ITypeInfo *typeinfo, REFIID iid, { WORD funcs, parentfuncs, i; struct typelib_stub *stub; + ITypeInfo *real_typeinfo; GUID parentiid; HRESULT hr; TRACE("typeinfo %p, iid %s, server %p, stub_buffer %p.\n", typeinfo, debugstr_guid(iid), server, stub_buffer); - hr = get_iface_info(&typeinfo, &funcs, &parentfuncs, &parentiid); + hr = get_iface_info(typeinfo, &funcs, &parentfuncs, &parentiid, &real_typeinfo); if (FAILED(hr)) return hr; if (!(stub = heap_alloc_zero(sizeof(*stub)))) { ERR("Failed to allocate stub object.\n"); + ITypeInfo_Release(real_typeinfo); return E_OUTOFMEMORY; } init_stub_desc(&stub->stub_desc); stub->server_info.pStubDesc = &stub->stub_desc; - hr = build_format_strings(typeinfo, funcs, parentfuncs, &stub->stub_desc.pFormatTypes, + hr = build_format_strings(real_typeinfo, funcs, parentfuncs, &stub->stub_desc.pFormatTypes, &stub->server_info.ProcString, &stub->offset_table); + ITypeInfo_Release(real_typeinfo); if (FAILED(hr)) { heap_free(stub);

1 0

Nikolay Sivov : ole32/tests: Add some tests for combined antimonikers.
by Alexandre Julliard Dec. 17, 2019

Dec. 17, 2019

Module: wine Branch: master Commit: b46722b83ca10fb4a51f64c4e792a9163372f545 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b46722b83ca10fb4a51f64c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 17 10:51:58 2019 +0300 ole32/tests: Add some tests for combined antimonikers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 104 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 102 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 51fad3ae2f..984f3a753c 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1933,10 +1933,26 @@ todo_wine } } +static void stream_write_dword(IStream *stream, DWORD value) +{ + LARGE_INTEGER pos; + HRESULT hr; + + pos.QuadPart = 0; + hr = IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "Failed to seek, hr %#x.\n", hr); + + hr = IStream_Write(stream, &value, sizeof(value), NULL); + ok(hr == S_OK, "Stream write failed, hr %#x.\n", hr); + + hr = IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "Failed to seek, hr %#x.\n", hr); +} + static void test_anti_moniker(void) { + IMoniker *moniker, *moniker2, *moniker3; HRESULT hr; - IMoniker *moniker; DWORD moniker_type; DWORD hash; IBindCtx *bindctx; @@ -1944,6 +1960,8 @@ static void test_anti_moniker(void) IMoniker *inverse; IUnknown *unknown; static const WCHAR expected_display_name[] = { '\\','.','.',0 }; + IStream *stream; + WCHAR *name; hr = CreateAntiMoniker(&moniker); ok_ole_success(hr, CreateAntiMoniker); @@ -1997,8 +2015,90 @@ todo_wine hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); ok(hr == E_NOTIMPL, "IMoniker_BindToStorage should return E_NOTIMPL, not 0x%08x\n", hr); - IBindCtx_Release(bindctx); + /* ComposeWith */ + hr = CreateAntiMoniker(&moniker2); + ok(hr == S_OK, "Failed to create moniker, hr %#x.\n", hr); + + moniker3 = moniker; + hr = IMoniker_ComposeWith(moniker, moniker2, TRUE, &moniker3); + ok(hr == MK_E_NEEDGENERIC, "Unexpected hr %#x.\n", hr); + ok(!moniker3, "Unexpected interface.\n"); + + hr = IMoniker_ComposeWith(moniker, moniker2, FALSE, &moniker3); + ok(hr == S_OK, "Failed to compose, hr %#x.\n", hr); + hr = IMoniker_IsSystemMoniker(moniker3, &moniker_type); + ok(hr == S_OK, "Failed to get moniker type, hr %#x.\n", hr); + ok(moniker_type == MKSYS_GENERICCOMPOSITE, "Unexpected moniker type %d.\n", moniker_type); + IMoniker_Release(moniker3); + + IMoniker_Release(moniker2); + + /* Load with composed number > 1. */ + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); + + stream_write_dword(stream, 2); + + hr = IMoniker_Load(moniker, stream); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_Hash(moniker, &hash); + ok(hr == S_OK, "Failed to get hash value, hr %#x.\n", hr); +todo_wine + ok(hash == 0x80000002, "Unexpected hash value %#x.\n", hash); + /* Display name reflects anti combination. */ + hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &name); + ok(hr == S_OK, "Failed to get display name, hr %#x.\n", hr); +todo_wine + ok(!lstrcmpW(name, L"\\..\\.."), "Unexpected display name %s.\n", wine_dbgstr_w(name)); + CoTaskMemFree(name); + + /* Limit is at 0xfffff. */ + stream_write_dword(stream, 0xfffff); + + hr = IMoniker_Load(moniker, stream); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_Hash(moniker, &hash); + ok(hr == S_OK, "Failed to get hash value, hr %#x.\n", hr); +todo_wine + ok(hash == 0x800fffff, "Unexpected hash value %#x.\n", hash); + + stream_write_dword(stream, 0xfffff + 1); + + hr = IMoniker_Load(moniker, stream); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_Hash(moniker, &hash); + ok(hr == S_OK, "Failed to get hash value, hr %#x.\n", hr); +todo_wine + ok(hash == 0x800fffff, "Unexpected hash value %#x.\n", hash); + + /* Zero combining counter is also valid. */ + stream_write_dword(stream, 0); + + hr = IMoniker_Load(moniker, stream); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_Hash(moniker, &hash); + ok(hr == S_OK, "Failed to get hash value, hr %#x.\n", hr); +todo_wine + ok(hash == 0x80000000, "Unexpected hash value %#x.\n", hash); + + hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &name); + ok(hr == S_OK, "Failed to get display name, hr %#x.\n", hr); +todo_wine + ok(!lstrcmpW(name, L""), "Unexpected display name %s.\n", wine_dbgstr_w(name)); + CoTaskMemFree(name); + + IStream_Release(stream); + + IBindCtx_Release(bindctx); IMoniker_Release(moniker); }

1 0

Nikolay Sivov : ole32/tests: Add tests for system moniker identification queries.
by Alexandre Julliard Dec. 17, 2019

Dec. 17, 2019

Module: wine Branch: master Commit: 0c9205ad1d3821bbcf3d7a4fd9c7b2b369977953 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c9205ad1d3821bbcf3d7a4f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 17 10:51:55 2019 +0300 ole32/tests: Add tests for system moniker identification queries. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 64 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 61 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index d911ce57e9..4fec233a57 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -31,6 +31,7 @@ #include "ocidl.h" #include "comcat.h" #include "olectl.h" +#include "initguid.h" #include "wine/test.h" @@ -62,6 +63,13 @@ static const CLSID CLSID_TestMoniker = {0xb9, 0x3e, 0x2f, 0xf9, 0xc8, 0x32, 0x23, 0xd7} }; +DEFINE_OLEGUID(CLSID_FileMoniker, 0x303, 0, 0); +DEFINE_OLEGUID(CLSID_ItemMoniker, 0x304, 0, 0); +DEFINE_OLEGUID(CLSID_AntiMoniker, 0x305, 0, 0); +DEFINE_OLEGUID(CLSID_CompositeMoniker, 0x309, 0, 0); +DEFINE_OLEGUID(CLSID_ClassMoniker, 0x31a, 0, 0); +DEFINE_OLEGUID(CLSID_PointerMoniker, 0x306, 0, 0); + static LONG cLocks; static void LockModule(void) @@ -1543,7 +1551,15 @@ static void test_class_moniker(void) hr = CreateClassMoniker(&CLSID_StdComponentCategoriesMgr, &moniker); ok_ole_success(hr, CreateClassMoniker); - if (!moniker) return; + + hr = IMoniker_QueryInterface(moniker, &CLSID_ClassMoniker, (void **)&unknown); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n"); + IUnknown_Release(unknown); + } test_moniker("class moniker", moniker, expected_class_moniker_marshal_data, sizeof(expected_class_moniker_marshal_data), @@ -1603,11 +1619,21 @@ static void test_file_moniker(WCHAR* path) { IStream *stream; IMoniker *moniker1 = NULL, *moniker2 = NULL; + IUnknown *unk; HRESULT hr; hr = CreateFileMoniker(path, &moniker1); ok_ole_success(hr, CreateFileMoniker); + hr = IMoniker_QueryInterface(moniker1, &CLSID_FileMoniker, (void **)&unk); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(unk == (IUnknown *)moniker1, "Unexpected interface.\n"); + IUnknown_Release(unk); + } + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok_ole_success(hr, CreateStreamOnHGlobal); @@ -1719,6 +1745,15 @@ static void test_item_moniker(void) hr = CreateItemMoniker(NULL, wszObjectName, &moniker); ok(hr == S_OK, "Failed to create item moniker, hr %#x.\n", hr); + hr = IMoniker_QueryInterface(moniker, &CLSID_ItemMoniker, (void **)&unknown); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n"); + IUnknown_Release(unknown); + } + test_moniker("item moniker 2", moniker, expected_item_moniker_marshal_data2, sizeof(expected_item_moniker_marshal_data2), expected_item_moniker_saved_data2, sizeof(expected_item_moniker_saved_data2), @@ -1860,7 +1895,15 @@ static void test_anti_moniker(void) hr = CreateAntiMoniker(&moniker); ok_ole_success(hr, CreateAntiMoniker); - if (!moniker) return; + + hr = IMoniker_QueryInterface(moniker, &CLSID_AntiMoniker, (void **)&unknown); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n"); + IUnknown_Release(unknown); + } test_moniker("anti moniker", moniker, expected_anti_moniker_marshal_data, sizeof(expected_anti_moniker_marshal_data), @@ -1932,6 +1975,13 @@ static void test_generic_composite_moniker(void) hr = CreateGenericComposite(moniker1, moniker2, &moniker); ok_ole_success(hr, CreateGenericComposite); + /* Generic composite is special, as it does not addref in this case. */ + hr = IMoniker_QueryInterface(moniker, &CLSID_CompositeMoniker, (void **)&unknown); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n"); + test_moniker("generic composite moniker", moniker, expected_gc_moniker_marshal_data, sizeof(expected_gc_moniker_marshal_data), expected_gc_moniker_saved_data, sizeof(expected_gc_moniker_saved_data), @@ -2007,7 +2057,15 @@ static void test_pointer_moniker(void) hr = CreatePointerMoniker((IUnknown *)&Test_ClassFactory, &moniker); ok_ole_success(hr, CreatePointerMoniker); - if (!moniker) return; + + hr = IMoniker_QueryInterface(moniker, &CLSID_PointerMoniker, (void **)&unknown); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n"); + IUnknown_Release(unknown); + } ok_more_than_one_lock();

1 0

Alexandre Julliard : advapi32/tests: Use debug.h functions.
by Alexandre Julliard Dec. 17, 2019

Dec. 17, 2019

Module: wine Branch: master Commit: 4429b9f803de199c4fb8460049d8296baec5a407 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4429b9f803de199c4fb84600… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 17 16:00:12 2019 +0100 advapi32/tests: Use debug.h functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 95 ++++-------------------------------------- dlls/advapi32/tests/security.c | 16 ++----- dlls/shell32/tests/shlexec.c | 4 +- 3 files changed, 14 insertions(+), 101 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 675426d4a9..e4d4893bd4 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -59,88 +59,11 @@ static DWORD (WINAPI *pEnumDynamicTimeZoneInformation)(const DWORD, static BOOL limited_user; - -/* Debugging functions from wine/libs/wine/debug.c */ - -/* allocate some tmp string space */ -/* FIXME: this is not 100% thread-safe */ -static char *get_temp_buffer( int size ) -{ - static char *list[32]; - static UINT pos; - char *ret; - UINT idx; - - idx = ++pos % ARRAY_SIZE(list); - if (list[idx]) - ret = HeapReAlloc( GetProcessHeap(), 0, list[idx], size ); - else - ret = HeapAlloc( GetProcessHeap(), 0, size ); - if (ret) list[idx] = ret; - return ret; -} - -static const char *wine_debugstr_an( const char *str, int n ) -{ - static const char hex[16] = "0123456789abcdef"; - char *dst, *res; - size_t size; - - if (!((ULONG_PTR)str >> 16)) - { - if (!str) return "(null)"; - res = get_temp_buffer( 6 ); - sprintf( res, "#%04x", LOWORD(str) ); - return res; - } - if (n == -1) n = strlen(str); - if (n < 0) n = 0; - size = 10 + min( 300, n * 4 ); - dst = res = get_temp_buffer( size ); - *dst++ = '"'; - while (n-- > 0 && dst <= res + size - 9) - { - unsigned char c = *str++; - switch (c) - { - case '\n': *dst++ = '\\'; *dst++ = 'n'; break; - case '\r': *dst++ = '\\'; *dst++ = 'r'; break; - case '\t': *dst++ = '\\'; *dst++ = 't'; break; - case '"': *dst++ = '\\'; *dst++ = '"'; break; - case '\\': *dst++ = '\\'; *dst++ = '\\'; break; - default: - if (c >= ' ' && c <= 126) - *dst++ = c; - else - { - *dst++ = '\\'; - *dst++ = 'x'; - *dst++ = hex[(c >> 4) & 0x0f]; - *dst++ = hex[c & 0x0f]; - } - } - } - *dst++ = '"'; - if (n > 0) - { - *dst++ = '.'; - *dst++ = '.'; - *dst++ = '.'; - } - *dst++ = 0; - return res; -} - static const char *dbgstr_SYSTEMTIME(const SYSTEMTIME *st) { - static int index; - static char buf[2][64]; - - index %= ARRAY_SIZE(buf); - sprintf(buf[index], "%02d-%02d-%04d %02d:%02d:%02d.%03d", - st->wMonth, st->wDay, st->wYear, - st->wHour, st->wMinute, st->wSecond, st->wMilliseconds); - return buf[index++]; + return wine_dbg_sprintf("%02d-%02d-%04d %02d:%02d:%02d.%03d", + st->wMonth, st->wDay, st->wYear, + st->wHour, st->wMinute, st->wSecond, st->wMilliseconds); } #define ADVAPI32_GET_PROC(func) \ @@ -263,8 +186,8 @@ static void _test_hkey_main_Value_A(int line, LPCSTR name, LPCSTR string, else { lok(memcmp(value, string, cbData) == 0, "RegQueryValueExA/2 failed: %s/%d != %s/%d\n", - wine_debugstr_an((char*)value, cbData), cbData, - wine_debugstr_an(string, full_byte_len), full_byte_len); + debugstr_an((char*)value, cbData), cbData, + debugstr_an(string, full_byte_len), full_byte_len); lok(*(value+cbData) == 0xbd, "RegQueryValueExA/2 overflowed at offset %u: %02x != bd\n", cbData, *(value+cbData)); } HeapFree(GetProcessHeap(), 0, value); @@ -2089,7 +2012,7 @@ static void test_string_termination(void) ok(ret == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", ret); ok(outsize == insize, "wrong size: %u != %u\n", outsize, insize); ok(memcmp(buffer, string, outsize) == 0, "bad string: %s/%u != %s\n", - wine_debugstr_an((char*)buffer, outsize), outsize, string); + debugstr_an((char*)buffer, outsize), outsize, string); ok(buffer[insize] == 0xbd, "buffer overflow at %u %02x\n", insize, buffer[insize]); /* RegQueryValueExA adds a trailing '\0' if there is room */ @@ -2099,7 +2022,7 @@ static void test_string_termination(void) ok(ret == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", ret); ok(outsize == insize, "wrong size: %u != %u\n", outsize, insize); ok(memcmp(buffer, string, outsize) == 0, "bad string: %s/%u != %s\n", - wine_debugstr_an((char*)buffer, outsize), outsize, string); + debugstr_an((char*)buffer, outsize), outsize, string); ok(buffer[insize] == 0, "buffer overflow at %u %02x\n", insize, buffer[insize]); /* RegEnumValueA may return a string with no trailing '\0' */ @@ -2111,7 +2034,7 @@ static void test_string_termination(void) ok(strcmp(name, "stringtest") == 0, "wrong name: %s\n", name); ok(outsize == insize, "wrong size: %u != %u\n", outsize, insize); ok(memcmp(buffer, string, outsize) == 0, "bad string: %s/%u != %s\n", - wine_debugstr_an((char*)buffer, outsize), outsize, string); + debugstr_an((char*)buffer, outsize), outsize, string); ok(buffer[insize] == 0xbd, "buffer overflow at %u %02x\n", insize, buffer[insize]); /* RegEnumValueA adds a trailing '\0' if there is room */ @@ -2123,7 +2046,7 @@ static void test_string_termination(void) ok(strcmp(name, "stringtest") == 0, "wrong name: %s\n", name); ok(outsize == insize, "wrong size: %u != %u\n", outsize, insize); ok(memcmp(buffer, string, outsize) == 0, "bad string: %s/%u != %s\n", - wine_debugstr_an((char*)buffer, outsize), outsize, string); + debugstr_an((char*)buffer, outsize), outsize, string); ok(buffer[insize] == 0, "buffer overflow at %u %02x\n", insize, buffer[insize]); RegDeleteKeyA(subkey, ""); diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index bddcdef6bb..8bcd16cb95 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -140,27 +140,17 @@ static HMODULE hmod; static int myARGC; static char** myARGV; -#define SID_SLOTS 4 -static char debugsid_str[SID_SLOTS][256]; -static int debugsid_index = 0; static const char* debugstr_sid(PSID sid) { LPSTR sidstr; DWORD le = GetLastError(); - char* res = debugsid_str[debugsid_index]; - debugsid_index = (debugsid_index + 1) % SID_SLOTS; + const char *res; if (!ConvertSidToStringSidA(sid, &sidstr)) - sprintf(res, "ConvertSidToStringSidA failed le=%u", GetLastError()); - else if (strlen(sidstr) > sizeof(*debugsid_str) - 1) - { - memcpy(res, sidstr, sizeof(*debugsid_str) - 4); - strcpy(res + sizeof(*debugsid_str) - 4, "..."); - LocalFree(sidstr); - } + res = wine_dbg_sprintf("ConvertSidToStringSidA failed le=%u", GetLastError()); else { - strcpy(res, sidstr); + res = __wine_dbg_strdup(sidstr); LocalFree(sidstr); } /* Restore the last error in case ConvertSidToStringSidA() modified it */ diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 496006985c..12ef18c1d8 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -117,7 +117,7 @@ static char* decodeA(const char* str) return ptr; } -static void WINAPIV WINETEST_PRINTF_ATTR(2,3) childPrintf(HANDLE h, const char* fmt, ...) +static void WINAPIV __WINE_PRINTF_ATTR(2,3) childPrintf(HANDLE h, const char* fmt, ...) { __ms_va_list valist; char buffer[1024]; @@ -351,7 +351,7 @@ static void dump_child_(const char* file, int line) ***/ static char shell_call[2048]; -static void WINAPIV WINETEST_PRINTF_ATTR(2,3) _okShell(int condition, const char *msg, ...) +static void WINAPIV __WINE_PRINTF_ATTR(2,3) _okShell(int condition, const char *msg, ...) { __ms_va_list valist; char buffer[2048];

1 0

Alexandre Julliard : include: Allow using debug.h in tests.
by Alexandre Julliard Dec. 17, 2019

Dec. 17, 2019

Module: wine Branch: master Commit: c8f338369695d360e021f2cbd82a18b2c0eb1514 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8f338369695d360e021f2cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 17 15:54:38 2019 +0100 include: Allow using debug.h in tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxdiagn/tests/container.c | 29 -------- dlls/kernel32/tests/debugger.c | 2 +- dlls/kernel32/tests/process.c | 2 +- dlls/mshtml/tests/dom.c | 30 +-------- dlls/mshtml/tests/xmlhttprequest.c | 32 +-------- dlls/ole32/tests/ole_server.c | 8 +-- include/wine/debug.h | 4 -- include/wine/test.h | 135 ++----------------------------------- 8 files changed, 14 insertions(+), 228 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c8f338369695d360e021…

1 0

Nikolay Sivov : ole32/tests: Test inverse moniker type.
by Alexandre Julliard Dec. 17, 2019

Dec. 17, 2019

Module: wine Branch: master Commit: acb2eef982470d5390c97956e22aeb256301eec1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acb2eef982470d5390c97956… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 17 10:51:57 2019 +0300 ole32/tests: Test inverse moniker type. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index a275671a69..51fad3ae2f 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1609,7 +1609,10 @@ todo_wine IBindCtx_Release(bindctx); hr = IMoniker_Inverse(moniker, &inverse); - ok_ole_success(hr, IMoniker_Inverse); + ok(hr == S_OK, "Failed to get inverse, hr %#x.\n", hr); + hr = IMoniker_IsSystemMoniker(inverse, &moniker_type); + ok(hr == S_OK, "Failed to get moniker type, hr %#x.\n", hr); + ok(moniker_type == MKSYS_ANTIMONIKER, "Unexpected moniker type %d.\n", moniker_type); IMoniker_Release(inverse); IMoniker_Release(moniker); @@ -1617,8 +1620,9 @@ todo_wine static void test_file_moniker(WCHAR* path) { + IMoniker *moniker1 = NULL, *moniker2 = NULL, *inverse; + DWORD moniker_type; IStream *stream; - IMoniker *moniker1 = NULL, *moniker2 = NULL; IUnknown *unk; HRESULT hr; @@ -1634,6 +1638,13 @@ todo_wine IUnknown_Release(unk); } + hr = IMoniker_Inverse(moniker1, &inverse); + ok(hr == S_OK, "Failed to get inverse, hr %#x.\n", hr); + hr = IMoniker_IsSystemMoniker(inverse, &moniker_type); + ok(hr == S_OK, "Failed to get moniker type, hr %#x.\n", hr); + ok(moniker_type == MKSYS_ANTIMONIKER, "Unexpected moniker type %d.\n", moniker_type); + IMoniker_Release(inverse); + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok_ole_success(hr, CreateStreamOnHGlobal); @@ -1892,7 +1903,10 @@ todo_wine IBindCtx_Release(bindctx); hr = IMoniker_Inverse(moniker, &inverse); - ok_ole_success(hr, IMoniker_Inverse); + ok(hr == S_OK, "Failed to get inverse, hr %#x.\n", hr); + hr = IMoniker_IsSystemMoniker(inverse, &moniker_type); + ok(hr == S_OK, "Failed to get moniker type, hr %#x.\n", hr); + ok(moniker_type == MKSYS_ANTIMONIKER, "Unexpected moniker type %d.\n", moniker_type); IMoniker_Release(inverse); IMoniker_Release(moniker); @@ -2068,7 +2082,10 @@ todo_wine IBindCtx_Release(bindctx); hr = IMoniker_Inverse(moniker, &inverse); - ok_ole_success(hr, IMoniker_Inverse); + ok(hr == S_OK, "Failed to get inverse, hr %#x.\n", hr); + hr = IMoniker_IsSystemMoniker(inverse, &moniker_type); + ok(hr == S_OK, "Failed to get moniker type, hr %#x.\n", hr); + ok(moniker_type == MKSYS_GENERICCOMPOSITE, "Unexpected moniker type %d.\n", moniker_type); IMoniker_Release(inverse); IMoniker_Release(moniker); @@ -2150,7 +2167,10 @@ todo_wine moniker_type); hr = IMoniker_Inverse(moniker, &inverse); - ok_ole_success(hr, IMoniker_Inverse); + ok(hr == S_OK, "Failed to get inverse, hr %#x.\n", hr); + hr = IMoniker_IsSystemMoniker(inverse, &moniker_type); + ok(hr == S_OK, "Failed to get moniker type, hr %#x.\n", hr); + ok(moniker_type == MKSYS_ANTIMONIKER, "Unexpected moniker type %d.\n", moniker_type); IMoniker_Release(inverse); hr = CreateBindCtx(0, &bindctx);

1 0

Alexandre Julliard : ntdll: Fix loading the main binary as PE file with an explicit dll override.
by Alexandre Julliard Dec. 17, 2019

Dec. 17, 2019

Module: wine Branch: master Commit: f391ae901e1cd2c6823df3d6a37232a7b6a84c2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f391ae901e1cd2c6823df3d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 17 12:04:31 2019 +0100 ntdll: Fix loading the main binary as PE file with an explicit dll override. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 2f203447ed..567e74ebd7 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2693,12 +2693,6 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, const UNICODE_STRING *nt_na if (!module_ptr) module_ptr = &module; status = find_builtin_dll( name, pwm, module_ptr, &image_info, &st, &so_name ); - if (status == STATUS_DLL_NOT_FOUND && *module_ptr) - { - /* builtin not found, load the module we got previously */ - TRACE( "loading %s from PE file %s\n", debugstr_w(name), debugstr_us(nt_name) ); - return load_native_dll( load_path, nt_name, module_ptr, &image_info, flags, pwm, &st ); - } if (status) return status; if (*pwm) @@ -3007,6 +3001,8 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WC case LO_BUILTIN_NATIVE: case LO_DEFAULT: nts = load_builtin_dll( load_path, &nt_name, &module, flags, pwm ); + if (nts == STATUS_DLL_NOT_FOUND) + nts = load_native_dll( load_path, &nt_name, &module, &image_info, flags, pwm, &st ); break; default: nts = STATUS_DLL_NOT_FOUND; @@ -3024,11 +3020,11 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WC nts = load_native_dll( load_path, &nt_name, &module, &image_info, flags, pwm, &st ); break; case LO_BUILTIN: - nts = load_builtin_dll( load_path, &nt_name, NULL, flags, pwm ); + nts = load_builtin_dll( load_path, &nt_name, &module, flags, pwm ); break; case LO_BUILTIN_NATIVE: case LO_DEFAULT: - nts = load_builtin_dll( load_path, &nt_name, NULL, flags, pwm ); + nts = load_builtin_dll( load_path, &nt_name, &module, flags, pwm ); if (nts == STATUS_SUCCESS && loadorder == LO_DEFAULT && (MODULE_InitDLL( *pwm, DLL_WINE_PREATTACH, NULL ) != STATUS_SUCCESS)) { @@ -3036,6 +3032,8 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WC TRACE( "%s pre-attach returned FALSE, preferring native\n", debugstr_us(&nt_name) ); LdrUnloadDll( (*pwm)->ldr.BaseAddress ); nts = STATUS_DLL_NOT_FOUND; + /* map the dll again if it was unmapped */ + if (!module && open_dll_file( &nt_name, pwm, &module, &image_info, &st )) break; } if (nts == STATUS_DLL_NOT_FOUND) nts = load_native_dll( load_path, &nt_name, &module, &image_info, flags, pwm, &st );

1 0

André Hentschel : mapi32: Fix some spec file entries.
by Alexandre Julliard Dec. 16, 2019

Dec. 16, 2019

Module: wine Branch: master Commit: 04aa1a32e64bc7a37e6327d153b4fe8392af582a URL: https://source.winehq.org/git/wine.git/?a=commit;h=04aa1a32e64bc7a37e6327d1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Dec 15 17:29:28 2019 +0100 mapi32: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mapi32/mapi32.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mapi32/mapi32.spec b/dlls/mapi32/mapi32.spec index 0b5acbb737..32d0b7a458 100644 --- a/dlls/mapi32/mapi32.spec +++ b/dlls/mapi32/mapi32.spec @@ -95,7 +95,7 @@ 152 stub OpenTnefStreamEx 153 stub GetTnefStreamCodepage(a)12 154 stub GetTnefStreamCodepage -155 stdcall UlFromSzHex(a)4(ptr) UlFromSzHex +155 stdcall UlFromSzHex(a)4(wstr) UlFromSzHex 156 stub UNKOBJ_ScAllocate(a)12 157 stub UNKOBJ_ScAllocateMore(a)16 158 stub UNKOBJ_Free(a)8 @@ -144,7 +144,7 @@ 204 stub EncodeID(a)12 205 stub FDecodeID(a)12 206 stub CchOfEncoding(a)4 -207 stdcall CbOfEncoded(a)4(ptr) CbOfEncoded +207 stdcall CbOfEncoded(a)4(str) CbOfEncoded 208 stdcall MAPISendDocuments(long str str str long) 209 stdcall MAPILogon(long str str long long ptr) 210 stdcall MAPILogoff(ptr long long long)

1 0