December 2019 - Wine-Commits

Nikolay Sivov : ole32/tests: Add equality tests for antimonikers.
by Alexandre Julliard Dec. 18, 2019

Dec. 18, 2019

Module: wine Branch: master Commit: 06479cb789d2f5768d78c10615cb84b550dfbac5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06479cb789d2f5768d78c106… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 18 12:06:50 2019 +0300 ole32/tests: Add equality tests for antimonikers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 7b4bf5c0fa..7e77847837 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2025,6 +2025,9 @@ todo_wine IMoniker_Release(moniker2); /* Load with composed number > 1. */ + hr = CreateAntiMoniker(&moniker2); + ok(hr == S_OK, "Failed to create moniker, hr %#x.\n", hr); + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); @@ -2034,6 +2037,14 @@ todo_wine todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMoniker_IsEqual(moniker, moniker2); +todo_wine + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker2, moniker); +todo_wine + ok(hr == S_FALSE, "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 @@ -2076,6 +2087,14 @@ todo_wine todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMoniker_IsEqual(moniker, moniker2); +todo_wine + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker2, moniker); +todo_wine + ok(hr == S_FALSE, "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 @@ -2087,10 +2106,27 @@ todo_wine ok(!lstrcmpW(name, L""), "Unexpected display name %s.\n", wine_dbgstr_w(name)); CoTaskMemFree(name); + /* Back to initial value. */ + stream_write_dword(stream, 1); + + hr = IMoniker_Load(moniker, stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker, moniker2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker2, moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IStream_Release(stream); IBindCtx_Release(bindctx); IMoniker_Release(moniker); + IMoniker_Release(moniker2); } static void test_generic_composite_moniker(void)

1 0

Francois Gouget : testbot/LogUtils: Highlight TestLauncher errors.
by Alexandre Julliard Dec. 18, 2019

Dec. 18, 2019

Module: tools Branch: master Commit: b7c2334ea3a741112f75070bde9e2007793ecb6d URL: https://source.winehq.org/git/tools.git/?a=commit;h=b7c2334ea3a741112f75070… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 18 14:12:53 2019 +0100 testbot/LogUtils: Highlight TestLauncher errors. Such as when it cannot parse the subtests list (typically because a missing library prevented the test from running at all). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 17a0286..c577426 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -186,6 +186,7 @@ sub GetLogLineCategory($) $Line =~ /^[a-zA-Z.]+:error: / or # TestBot error $Line =~ /^BotError:/ or + $Line =~ /^Error:/ or # X errors $Line =~ /^X Error of failed request: / or $Line =~ / opcode of failed request: /)

1 0

Alexandre Julliard : ntdll: Silence the timezone fixme when the registry is empty.
by Alexandre Julliard Dec. 17, 2019

Dec. 17, 2019

Module: wine Branch: master Commit: 238c6be5b81cbfcf8cd147b1cbb25d16803efbe1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=238c6be5b81cbfcf8cd147b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 17 19:38:42 2019 +0100 ntdll: Silence the timezone fixme when the registry is empty. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48300 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/time.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 7f79c3e4ff..1d5c4f2b31 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -854,6 +854,8 @@ static void find_reg_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi, const char* NtClose(hkey); + if (idx == 1) return; /* registry info not initialized yet */ + FIXME("Can't find matching timezone information in the registry for " "%s, bias %d, std (d/m/y): %u/%02u/%04u, dlt (d/m/y): %u/%02u/%04u\n", tz_name, tzi->Bias,

1 0

Alexandre Julliard : winmm/tests: Fix a constant conversion warning.
by Alexandre Julliard Dec. 17, 2019

Dec. 17, 2019

Module: wine Branch: master Commit: ef35796376e01688a4dd28fea00782877eeac344 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef35796376e01688a4dd28fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 17 16:50:40 2019 +0100 winmm/tests: Fix a constant conversion warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/wave.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index a2f2a82880..f9fc5c5aad 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -161,7 +161,7 @@ static char* wave_generate_silence(WAVEFORMATEX* wfx, double duration, DWORD* si for (i=0;i<nb_samples;i++) { if (wfx->wBitsPerSample==8) { for (j = 0; j < wfx->nChannels; j++) - *b++=128; + *b++=(char)128; } else if (wfx->wBitsPerSample==16) { for (j = 0; j < wfx->nChannels; j++) { b[0]=0;

1 0

Alexandre Julliard : d3dx9_36/tests: Fix some constant conversion warnings.
by Alexandre Julliard Dec. 17, 2019

Dec. 17, 2019

Module: wine Branch: master Commit: 863da013a216bb50b925bbb9e3987b21206fb782 URL: https://source.winehq.org/git/wine.git/?a=commit;h=863da013a216bb50b925bbb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 17 16:29:18 2019 +0100 d3dx9_36/tests: Fix some constant conversion warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/mesh.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index da9b80c578..3882bb404a 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -7484,9 +7484,9 @@ static void test_weld_vertices(void) {{ 2.0f, 3.0f, 0.f}, {0, 0, 0, 0}}, {{ 0.0f, 0.0f, 0.f}, {0, 0, 0, 0}}, - {{ 3.0f, 3.0f, 0.f}, {65535, 65535, 65535, 65535}}, + {{ 3.0f, 3.0f, 0.f}, {-1, -1, -1, -1}}, {{ 3.0f, 0.0f, 0.f}, {0, 0, 0, 0}}, - {{ 1.0f, 0.0f, 0.f}, {65534, 65534, 65534, 65534}}, + {{ 1.0f, 0.0f, 0.f}, {-2, -2, -2, -2}}, }; const DWORD indices22[] = {0, 1, 2, 3, 4, 5}; const DWORD attributes22[] = {0, 0}; @@ -7501,7 +7501,7 @@ static void test_weld_vertices(void) {{ 2.0f, 3.0f, 0.f}, {0, 0, 0, 0}}, {{ 0.0f, 0.0f, 0.f}, {0, 0, 0, 0}}, - {{ 2.0f, 3.0f, 0.f}, {65535, 65535, 65535, 65535}}, + {{ 2.0f, 3.0f, 0.f}, {-1, -1, -1, -1}}, {{ 3.0f, 0.0f, 0.f}, {0, 0, 0, 0}}, }; const DWORD exp_indices22[] = {0, 1, 2, 3, 4, 2};

1 0

Alexandre Julliard : oledb32/tests: Fix a constant conversion warning.
by Alexandre Julliard Dec. 17, 2019

Dec. 17, 2019

Module: wine Branch: master Commit: b5157c528d220fea70c6f227831eea008840ed1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5157c528d220fea70c6f227… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 17 16:49:56 2019 +0100 oledb32/tests: Fix a constant conversion warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/tests/convert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 28401e68c9..8ec64d40ae 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -3092,7 +3092,7 @@ static void test_getconversionsize(void) SAFEARRAYBOUND rgsabound[1]; int i4 = 200; WORD i2 = 201; - char i1 = 203; + char i1 = (char)203; FLOAT f4 = 1.0; LONGLONG i8 = 202; DATE dbdate;

1 0

Alexandre Julliard : msvcp120/tests: Don't use const pointers to avoid compiler warnings.
by Alexandre Julliard Dec. 17, 2019

Dec. 17, 2019

Module: wine Branch: master Commit: 74b3f392ab24378c81ad88cb2d7572e93c1b26f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74b3f392ab24378c81ad88cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 17 16:50:53 2019 +0100 msvcp120/tests: Don't use const pointers to avoid compiler warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 9c3f22a367..7a382ac6fa 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -115,17 +115,12 @@ struct thiscall_thunk #include "poppack.h" static void * (WINAPI *call_thiscall_func1)( void *func, void *this ); -static void * (WINAPI *call_thiscall_func2)( void *func, void *this, const void *a ); -static void * (WINAPI *call_thiscall_func3)( void *func, void *this, const void *a, - const void *b ); -static void * (WINAPI *call_thiscall_func4)( void *func, void *this, const void *a, - const void *b, const void *c ); -static void * (WINAPI *call_thiscall_func5)( void *func, void *this, const void *a, - const void *b, const void *c, const void *d ); -static void * (WINAPI *call_thiscall_func6)( void *func, void *this, const void *a, - const void *b, const void *c, const void *d, const void *e ); -static void * (WINAPI *call_thiscall_func7)( void *func, void *this, const void *a, - const void *b, const void *c, const void *d, const void *e, const void *f ); +static void * (WINAPI *call_thiscall_func2)( void *func, void *this, void *a ); +static void * (WINAPI *call_thiscall_func3)( void *func, void *this, void *a, void *b ); +static void * (WINAPI *call_thiscall_func4)( void *func, void *this, void *a, void *b, void *c ); +static void * (WINAPI *call_thiscall_func5)( void *func, void *this, void *a, void *b, void *c, void *d ); +static void * (WINAPI *call_thiscall_func6)( void *func, void *this, void *a, void *b, void *c, void *d, void *e ); +static void * (WINAPI *call_thiscall_func7)( void *func, void *this, void *a, void *b, void *c, void *d, void *e, void *f ); static void init_thiscall_thunk(void) { @@ -146,17 +141,12 @@ static void init_thiscall_thunk(void) } #define call_func1(func,_this) call_thiscall_func1(func,_this) -#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)(a)) -#define call_func3(func,_this,a,b) call_thiscall_func3(func,_this,(const void*)(a),\ - (const void*)(b)) -#define call_func4(func,_this,a,b,c) call_thiscall_func4(func,_this,(const void*)(a),\ - (const void*)(b),(const void*)(c)) -#define call_func5(func,_this,a,b,c,d) call_thiscall_func5(func,_this,(const void*)(a),\ - (const void*)(b),(const void*)(c),(const void*)(d)) -#define call_func6(func,_this,a,b,c,d,e) call_thiscall_func6(func,_this,(const void*)(a),\ - (const void*)(b),(const void*)(c),(const void*)(d),(const void*)(e)) -#define call_func7(func,_this,a,b,c,d,e,f) call_thiscall_func7(func,_this,(const void*)(a),\ - (const void*)(b),(const void*)(c),(const void*)(d),(const void*)(e),(const void*)(f)) +#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(void*)(a)) +#define call_func3(func,_this,a,b) call_thiscall_func3(func,_this,(void*)(a),(void*)(b)) +#define call_func4(func,_this,a,b,c) call_thiscall_func4(func,_this,(void*)(a),(void*)(b),(void*)(c)) +#define call_func5(func,_this,a,b,c,d) call_thiscall_func5(func,_this,(void*)(a),(void*)(b),(void*)(c),(void*)(d)) +#define call_func6(func,_this,a,b,c,d,e) call_thiscall_func6(func,_this,(void*)(a),(void*)(b),(void*)(c),(void*)(d),(void*)(e)) +#define call_func7(func,_this,a,b,c,d,e,f) call_thiscall_func7(func,_this,(void*)(a),(void*)(b),(void*)(c),(void*)(d),(void*)(e),(void*)(f)) #else #define init_thiscall_thunk()

1 0

Nikolay Sivov : ole32/tests: Remove trace noise from moniker tests.
by Alexandre Julliard Dec. 17, 2019

Dec. 17, 2019

Module: wine Branch: master Commit: 9a436d3924af846f473bae1dba6b155ef54f48f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a436d3924af846f473bae1d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 17 10:51:59 2019 +0300 ole32/tests: Remove trace noise from moniker tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 984f3a753c..7b4bf5c0fa 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -41,14 +41,13 @@ #define CHECK_EXPECTED_METHOD(method_name) \ do { \ - trace("%s\n", method_name); \ - ok(*expected_method_list != NULL, "Extra method %s called\n", method_name); \ - if (*expected_method_list) \ - { \ - ok(!strcmp(*expected_method_list, method_name), "Expected %s to be called instead of %s\n", \ - *expected_method_list, method_name); \ - expected_method_list++; \ - } \ + ok(*expected_method_list != NULL, "Extra method %s called\n", method_name); \ + if (*expected_method_list) \ + { \ + ok(!strcmp(*expected_method_list, method_name), "Expected %s to be called instead of %s\n", \ + *expected_method_list, method_name); \ + expected_method_list++; \ + } \ } while(0) static char const * const *expected_method_list; @@ -116,8 +115,6 @@ static ULONG WINAPI ExternalConnection_Release(IExternalConnection *iface) static DWORD WINAPI ExternalConnection_AddConnection(IExternalConnection *iface, DWORD extconn, DWORD reserved) { - trace("add connection\n"); - ok(extconn == EXTCONN_STRONG, "extconn = %d\n", extconn); ok(!reserved, "reserved = %x\n", reserved); return ++external_connections; @@ -126,8 +123,6 @@ static DWORD WINAPI ExternalConnection_AddConnection(IExternalConnection *iface, static DWORD WINAPI ExternalConnection_ReleaseConnection(IExternalConnection *iface, DWORD extconn, DWORD reserved, BOOL fLastReleaseCloses) { - trace("release connection\n"); - ok(extconn == EXTCONN_STRONG, "extconn = %d\n", extconn); ok(!reserved, "reserved = %x\n", reserved); @@ -838,7 +833,6 @@ static int count_moniker_matches(IBindCtx * pbc, IEnumMoniker * spEM) CoTaskMemFree(szDisplayn); } } - trace("Total number of monikers is %i\n", monCnt); return matchCnt; } @@ -1071,7 +1065,6 @@ todo_wine ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); matchCnt = count_moniker_matches(pbc, spEM1); - trace("Number of matches is %i\n", matchCnt); grflags= grflags | ROTFLAGS_REGISTRATIONKEEPSALIVE; hr = IRunningObjectTable_Register(pprot, grflags, lpEM1, pmk1, &pdwReg1); @@ -1088,12 +1081,10 @@ todo_wine matchCnt = count_moniker_matches(pbc, spEM2); ok(matchCnt==2, "Number of matches should be equal to 2 not %i\n", matchCnt); - trace("IEnumMoniker::Clone\n"); IEnumMoniker_Clone(spEM2, &spEM3); matchCnt = count_moniker_matches(pbc, spEM3); ok(matchCnt==0, "Number of matches should be equal to 0 not %i\n", matchCnt); - trace("IEnumMoniker::Reset\n"); IEnumMoniker_Reset(spEM3); matchCnt = count_moniker_matches(pbc, spEM3);

1 0

Nikolay Sivov : ole32/tests: Add some tests for item moniker equality.
by Alexandre Julliard Dec. 17, 2019

Dec. 17, 2019

Module: wine Branch: master Commit: 7b07188d7a4c87dcab0eeb68cd194a86cfb6a0c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b07188d7a4c87dcab0eeb68… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 17 10:51:56 2019 +0300 ole32/tests: Add some tests for item moniker equality. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 4fec233a57..a275671a69 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1728,6 +1728,23 @@ static void test_item_moniker(void) { item_moniker_unicode_item_stream, sizeof(item_moniker_unicode_item_stream), L"!B" }, { item_moniker_unicode_delim_item_stream, sizeof(item_moniker_unicode_delim_item_stream), L"!C" }, }; + static const struct + { + const WCHAR *delim1; + const WCHAR *item1; + const WCHAR *delim2; + const WCHAR *item2; + HRESULT hr; + } isequal_tests[] = + { + { L"!", L"Item1", L"!", L"ITEM1", S_OK }, + { NULL, L"Item1", L"!", L"ITEM1", S_OK }, + { L"", L"Item1", L"!", L"ITEM1", S_OK }, + { L"&", L"Item1", L"!", L"ITEM1", S_OK }, + {L"&&", L"Item1", L"&", L"&Item1", S_FALSE }, + { NULL, L"Item1", NULL, L"Item2", S_FALSE }, + { NULL, L"Item1", NULL, L"ITEM1", S_OK }, + }; IMoniker *moniker, *moniker2; HRESULT hr; DWORD moniker_type, i; @@ -1879,6 +1896,27 @@ todo_wine IMoniker_Release(inverse); IMoniker_Release(moniker); + + /* IsEqual */ + for (i = 0; i < ARRAY_SIZE(isequal_tests); ++i) + { + hr = CreateItemMoniker(isequal_tests[i].delim1, isequal_tests[i].item1, &moniker); + ok(hr == S_OK, "Failed to create moniker, hr %#x.\n", hr); + + hr = CreateItemMoniker(isequal_tests[i].delim2, isequal_tests[i].item2, &moniker2); + ok(hr == S_OK, "Failed to create moniker, hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker, moniker2); + todo_wine_if(i == 4 || i == 5) + ok(hr == isequal_tests[i].hr, "%d: unexpected result %#x.\n", i, hr); + + hr = IMoniker_IsEqual(moniker2, moniker); + todo_wine_if(i == 4 || i == 5) + ok(hr == isequal_tests[i].hr, "%d: unexpected result %#x.\n", i, hr); + + IMoniker_Release(moniker); + IMoniker_Release(moniker2); + } } static void test_anti_moniker(void)

1 0

Alistair Leslie-Hughes : oledb32/tests: Add PromptNew interactive test.
by Alexandre Julliard Dec. 17, 2019

Dec. 17, 2019

Module: wine Branch: master Commit: b5c02b217e25763afab8e5cb66a2d2735e1aaf4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5c02b217e25763afab8e5cb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Dec 17 01:03:03 2019 +0000 oledb32/tests: Add PromptNew interactive test. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/tests/database.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 8ff55b9d2a..83a4767b90 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -940,6 +940,26 @@ static void test_dslocator(void) hr = IDataSourceLocator_QueryInterface(dslocator, &IID_IRpcOptions, (void **)&opts); ok(hr == E_NOINTERFACE, "got %08x\n", hr); + if (winetest_interactive) + { + IDispatch *disp = NULL; + + hr = IDataSourceLocator_PromptNew(dslocator, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = IDataSourceLocator_PromptNew(dslocator, &disp); + if (hr == S_OK) + { + ok(disp != NULL, "got %08x\n", hr); + IDispatch_Release(disp); + } + else + { + ok(hr == S_FALSE, "got %08x\n", hr); + ok(!disp, "got %08x\n", hr); + } + } + IDataInitialize_Release(datainit2); IDataInitialize_Release(datainit);

1 0