mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-14 10:47:18 +00:00
shell32/tests: Remove some obsolete workarounds from test_ShellWindows().
Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
25bb3b0be5
commit
a06d7de892
|
@ -1025,18 +1025,14 @@ static void test_ShellWindows(void)
|
||||||
|
|
||||||
hr = CoCreateInstance(&CLSID_ShellWindows, NULL, CLSCTX_LOCAL_SERVER,
|
hr = CoCreateInstance(&CLSID_ShellWindows, NULL, CLSCTX_LOCAL_SERVER,
|
||||||
&IID_IShellWindows, (void**)&shellwindows);
|
&IID_IShellWindows, (void**)&shellwindows);
|
||||||
#ifndef __i386__
|
|
||||||
todo_wine
|
|
||||||
#endif
|
|
||||||
ok(hr == S_OK, "got 0x%08x\n", hr);
|
ok(hr == S_OK, "got 0x%08x\n", hr);
|
||||||
/* TODO: remove when explorer startup with clean prefix is fixed */
|
/* TODO: remove when explorer startup with clean prefix is fixed */
|
||||||
if (hr != S_OK)
|
if (hr != S_OK)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (0) /* NULL out argument - currently crashes on Wine */ {
|
|
||||||
hr = IShellWindows_Register(shellwindows, NULL, 0, SWC_EXPLORER, NULL);
|
hr = IShellWindows_Register(shellwindows, NULL, 0, SWC_EXPLORER, NULL);
|
||||||
ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "got 0x%08x\n", hr);
|
ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "got 0x%08x\n", hr);
|
||||||
}
|
|
||||||
hr = IShellWindows_Register(shellwindows, NULL, 0, SWC_EXPLORER, &cookie);
|
hr = IShellWindows_Register(shellwindows, NULL, 0, SWC_EXPLORER, &cookie);
|
||||||
todo_wine
|
todo_wine
|
||||||
ok(hr == E_POINTER, "got 0x%08x\n", hr);
|
ok(hr == E_POINTER, "got 0x%08x\n", hr);
|
||||||
|
@ -1114,9 +1110,6 @@ todo_wine {
|
||||||
IUnknown *unk;
|
IUnknown *unk;
|
||||||
|
|
||||||
ok(disp != NULL, "got %p\n", disp);
|
ok(disp != NULL, "got %p\n", disp);
|
||||||
|
|
||||||
if (disp == NULL) goto skip_disp_tests;
|
|
||||||
|
|
||||||
ok(ret != HandleToUlong(hwnd), "got %d\n", ret);
|
ok(ret != HandleToUlong(hwnd), "got %d\n", ret);
|
||||||
|
|
||||||
/* IDispatch-related tests */
|
/* IDispatch-related tests */
|
||||||
|
@ -1194,7 +1187,6 @@ if (hr == S_OK) {
|
||||||
IServiceProvider_Release(sp);
|
IServiceProvider_Release(sp);
|
||||||
IDispatch_Release(disp);
|
IDispatch_Release(disp);
|
||||||
}
|
}
|
||||||
skip_disp_tests:
|
|
||||||
|
|
||||||
disp = (void*)0xdeadbeef;
|
disp = (void*)0xdeadbeef;
|
||||||
ret = 0xdead;
|
ret = 0xdead;
|
||||||
|
|
Loading…
Reference in a new issue