Skip to content

W
wine-cw
Commit aea21ea2 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard
Browse files
Options

wshom/tests: Build without -DWINE_NO_LONG_TYPES.

Signed-off-by: 's avatarNikolay Sivov <nsivov@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent f1d8aacd
Show whitespace changes
Inline Side-by-side
Showing with 108 additions and 111 deletions
dlls/wshom.ocx/tests/Makefile.in
View file @ aea21ea2
EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = wshom.ocx TESTDLL = wshom.ocx
IMPORTS = oleaut32 ole32 advapi32 IMPORTS = oleaut32 ole32 advapi32
......
dlls/wshom.ocx/tests/wshom.c
View file @ aea21ea2
...@@ -28,9 +28,6 @@ ...@@ -28,9 +28,6 @@
DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
#define EXPECT_HR(hr,hr_exp) \
ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp)
#define test_provideclassinfo(a, b) _test_provideclassinfo((IDispatch*)a, b, __LINE__) #define test_provideclassinfo(a, b) _test_provideclassinfo((IDispatch*)a, b, __LINE__)
static void _test_provideclassinfo(IDispatch *disp, const GUID *guid, int line) static void _test_provideclassinfo(IDispatch *disp, const GUID *guid, int line)
{ {
...@@ -40,13 +37,13 @@ static void _test_provideclassinfo(IDispatch *disp, const GUID *guid, int line) ...@@ -40,13 +37,13 @@ static void _test_provideclassinfo(IDispatch *disp, const GUID *guid, int line)
HRESULT hr; HRESULT hr;
hr = IDispatch_QueryInterface(disp, &IID_IProvideClassInfo, (void **)&classinfo); hr = IDispatch_QueryInterface(disp, &IID_IProvideClassInfo, (void **)&classinfo);
ok_(__FILE__,line) (hr == S_OK, "Failed to get IProvideClassInfo, %#x.\n", hr); ok_(__FILE__,line) (hr == S_OK, "Failed to get IProvideClassInfo, %#lx.\n", hr);
hr = IProvideClassInfo_GetClassInfo(classinfo, &ti); hr = IProvideClassInfo_GetClassInfo(classinfo, &ti);
ok_(__FILE__,line) (hr == S_OK, "GetClassInfo() failed, %#x.\n", hr); ok_(__FILE__,line) (hr == S_OK, "GetClassInfo() failed, %#lx.\n", hr);
hr = ITypeInfo_GetTypeAttr(ti, &attr); hr = ITypeInfo_GetTypeAttr(ti, &attr);
ok_(__FILE__,line) (hr == S_OK, "GetTypeAttr() failed, %#x.\n", hr); ok_(__FILE__,line) (hr == S_OK, "GetTypeAttr() failed, %#lx.\n", hr);
ok_(__FILE__,line) (IsEqualGUID(&attr->guid, guid), "Unexpected typeinfo %s, expected %s\n", wine_dbgstr_guid(&attr->guid), ok_(__FILE__,line) (IsEqualGUID(&attr->guid, guid), "Unexpected typeinfo %s, expected %s\n", wine_dbgstr_guid(&attr->guid),
wine_dbgstr_guid(guid)); wine_dbgstr_guid(guid));
...@@ -89,45 +86,45 @@ static void test_wshshell(void) ...@@ -89,45 +86,45 @@ static void test_wshshell(void)
hr = CoCreateInstance(&CLSID_WshShell, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, hr = CoCreateInstance(&CLSID_WshShell, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER,
&IID_IDispatch, (void**)&disp); &IID_IDispatch, (void**)&disp);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IDispatch_QueryInterface(disp, &IID_IWshShell3, (void**)&shell); hr = IDispatch_QueryInterface(disp, &IID_IWshShell3, (void**)&shell);
EXPECT_HR(hr, S_OK); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
test_provideclassinfo(disp, &IID_IWshShell3); test_provideclassinfo(disp, &IID_IWshShell3);
hr = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); hr = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex);
EXPECT_HR(hr, E_NOINTERFACE); ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
IDispatch_Release(disp); IDispatch_Release(disp);
hr = IUnknown_QueryInterface(shell, &IID_IWshShell3, (void**)&sh3); hr = IUnknown_QueryInterface(shell, &IID_IWshShell3, (void**)&sh3);
EXPECT_HR(hr, S_OK); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IWshShell3_QueryInterface(sh3, &IID_IObjectWithSite, (void**)&unk); hr = IWshShell3_QueryInterface(sh3, &IID_IObjectWithSite, (void**)&unk);
ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
hr = IWshShell3_QueryInterface(sh3, &IID_IWshShell, (void**)&unk); hr = IWshShell3_QueryInterface(sh3, &IID_IWshShell, (void**)&unk);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
IUnknown_Release(unk); IUnknown_Release(unk);
hr = IWshShell3_QueryInterface(sh3, &IID_IWshShell2, (void**)&unk); hr = IWshShell3_QueryInterface(sh3, &IID_IWshShell2, (void**)&unk);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
IUnknown_Release(unk); IUnknown_Release(unk);
hr = IWshShell3_get_SpecialFolders(sh3, &coll); hr = IWshShell3_get_SpecialFolders(sh3, &coll);
EXPECT_HR(hr, S_OK); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
test_provideclassinfo(coll, &IID_IWshCollection); test_provideclassinfo(coll, &IID_IWshCollection);
hr = IWshCollection_QueryInterface(coll, &IID_IFolderCollection, (void**)&folders); hr = IWshCollection_QueryInterface(coll, &IID_IFolderCollection, (void**)&folders);
EXPECT_HR(hr, E_NOINTERFACE); ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr);
hr = IWshCollection_QueryInterface(coll, &IID_IDispatch, (void**)&disp); hr = IWshCollection_QueryInterface(coll, &IID_IDispatch, (void**)&disp);
EXPECT_HR(hr, S_OK); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = IDispatch_GetTypeInfo(disp, 0, 0, &ti); hr = IDispatch_GetTypeInfo(disp, 0, 0, &ti);
EXPECT_HR(hr, S_OK); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
hr = ITypeInfo_GetTypeAttr(ti, &tattr); hr = ITypeInfo_GetTypeAttr(ti, &tattr);
EXPECT_HR(hr, S_OK); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(IsEqualIID(&tattr->guid, &IID_IWshCollection), "got wrong type guid\n"); ok(IsEqualIID(&tattr->guid, &IID_IWshCollection), "got wrong type guid\n");
ITypeInfo_ReleaseTypeAttr(ti, tattr); ITypeInfo_ReleaseTypeAttr(ti, tattr);
...@@ -140,12 +137,12 @@ static void test_wshshell(void) ...@@ -140,12 +137,12 @@ static void test_wshshell(void)
dp.cArgs = 1; dp.cArgs = 1;
dp.cNamedArgs = 0; dp.cNamedArgs = 0;
hr = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 1033, DISPATCH_PROPERTYGET, &dp, &res, &ei, &err); hr = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 1033, DISPATCH_PROPERTYGET, &dp, &res, &ei, &err);
EXPECT_HR(hr, DISP_E_MEMBERNOTFOUND); ok(hr == DISP_E_MEMBERNOTFOUND, "Unexpected hr %#lx.\n", hr);
/* try Item() directly, it returns directory path apparently */ /* try Item() directly, it returns directory path apparently */
V_VT(&res) = VT_EMPTY; V_VT(&res) = VT_EMPTY;
hr = IWshCollection_Item(coll, &arg, &res); hr = IWshCollection_Item(coll, &arg, &res);
EXPECT_HR(hr, S_OK); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(V_VT(&res) == VT_BSTR, "got res type %d\n", V_VT(&res)); ok(V_VT(&res) == VT_BSTR, "got res type %d\n", V_VT(&res));
CHECK_BSTR_LENGTH(V_BSTR(&res)); CHECK_BSTR_LENGTH(V_BSTR(&res));
SysFreeString(str); SysFreeString(str);
...@@ -154,54 +151,54 @@ static void test_wshshell(void) ...@@ -154,54 +151,54 @@ static void test_wshshell(void)
/* CreateShortcut() */ /* CreateShortcut() */
str = SysAllocString(L"file.lnk"); str = SysAllocString(L"file.lnk");
hr = IWshShell3_CreateShortcut(sh3, str, &shortcut); hr = IWshShell3_CreateShortcut(sh3, str, &shortcut);
EXPECT_HR(hr, S_OK); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
SysFreeString(str); SysFreeString(str);
hr = IDispatch_QueryInterface(shortcut, &IID_IWshShortcut, (void**)&shcut); hr = IDispatch_QueryInterface(shortcut, &IID_IWshShortcut, (void**)&shcut);
EXPECT_HR(hr, S_OK); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
test_provideclassinfo(shortcut, &IID_IWshShortcut); test_provideclassinfo(shortcut, &IID_IWshShortcut);
hr = IWshShortcut_get_Arguments(shcut, NULL); hr = IWshShortcut_get_Arguments(shcut, NULL);
ok(hr == E_POINTER, "got 0x%08x\n", hr); ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr);
hr = IWshShortcut_get_IconLocation(shcut, NULL); hr = IWshShortcut_get_IconLocation(shcut, NULL);
ok(hr == E_POINTER, "got 0x%08x\n", hr); ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr);
IWshShortcut_Release(shcut); IWshShortcut_Release(shcut);
IDispatch_Release(shortcut); IDispatch_Release(shortcut);
/* ExpandEnvironmentStrings */ /* ExpandEnvironmentStrings */
hr = IWshShell3_ExpandEnvironmentStrings(sh3, NULL, NULL); hr = IWshShell3_ExpandEnvironmentStrings(sh3, NULL, NULL);
ok(hr == E_POINTER, "got 0x%08x\n", hr); ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr);
str = SysAllocString(L"%PATH%"); str = SysAllocString(L"%PATH%");
hr = IWshShell3_ExpandEnvironmentStrings(sh3, str, NULL); hr = IWshShell3_ExpandEnvironmentStrings(sh3, str, NULL);
ok(hr == E_POINTER, "got 0x%08x\n", hr); ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr);
SysFreeString(str); SysFreeString(str);
V_VT(&arg) = VT_BSTR; V_VT(&arg) = VT_BSTR;
V_BSTR(&arg) = SysAllocString(L"SYSTEM"); V_BSTR(&arg) = SysAllocString(L"SYSTEM");
hr = IWshShell3_get_Environment(sh3, &arg, &env); hr = IWshShell3_get_Environment(sh3, &arg, &env);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
VariantClear(&arg); VariantClear(&arg);
hr = IWshEnvironment_get_Item(env, NULL, NULL); hr = IWshEnvironment_get_Item(env, NULL, NULL);
ok(hr == E_POINTER, "got 0x%08x\n", hr); ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr);
test_provideclassinfo(env, &IID_IWshEnvironment); test_provideclassinfo(env, &IID_IWshEnvironment);
ret = (BSTR)0x1; ret = (BSTR)0x1;
hr = IWshEnvironment_get_Item(env, NULL, &ret); hr = IWshEnvironment_get_Item(env, NULL, &ret);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(ret && !*ret, "got %p\n", ret); ok(ret && !*ret, "got %p\n", ret);
SysFreeString(ret); SysFreeString(ret);
/* invalid var name */ /* invalid var name */
str = SysAllocString(L"file.lnk"); str = SysAllocString(L"file.lnk");
hr = IWshEnvironment_get_Item(env, str, NULL); hr = IWshEnvironment_get_Item(env, str, NULL);
ok(hr == E_POINTER, "got 0x%08x\n", hr); ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr);
ret = NULL; ret = NULL;
hr = IWshEnvironment_get_Item(env, str, &ret); hr = IWshEnvironment_get_Item(env, str, &ret);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(ret && *ret == 0, "got %s\n", wine_dbgstr_w(ret)); ok(ret && *ret == 0, "got %s\n", wine_dbgstr_w(ret));
CHECK_BSTR_LENGTH(ret); CHECK_BSTR_LENGTH(ret);
SysFreeString(ret); SysFreeString(ret);
...@@ -210,7 +207,7 @@ static void test_wshshell(void) ...@@ -210,7 +207,7 @@ static void test_wshshell(void)
/* valid name */ /* valid name */
str = SysAllocString(L"PATH"); str = SysAllocString(L"PATH");
hr = IWshEnvironment_get_Item(env, str, &ret); hr = IWshEnvironment_get_Item(env, str, &ret);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(ret && *ret != 0, "got %s\n", wine_dbgstr_w(ret)); ok(ret && *ret != 0, "got %s\n", wine_dbgstr_w(ret));
CHECK_BSTR_LENGTH(ret); CHECK_BSTR_LENGTH(ret);
SysFreeString(ret); SysFreeString(ret);
...@@ -225,24 +222,24 @@ static void test_wshshell(void) ...@@ -225,24 +222,24 @@ static void test_wshshell(void)
str = SysAllocString(L"notepad.exe"); str = SysAllocString(L"notepad.exe");
hr = IWshShell3_Run(sh3, str, &arg, &arg2, NULL); hr = IWshShell3_Run(sh3, str, &arg, &arg2, NULL);
ok(hr == E_POINTER, "got 0x%08x\n", hr); ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr);
retval = 10; retval = 10;
hr = IWshShell3_Run(sh3, str, NULL, &arg2, &retval); hr = IWshShell3_Run(sh3, str, NULL, &arg2, &retval);
ok(hr == E_POINTER, "got 0x%08x\n", hr); ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr);
ok(retval == 10, "got %u\n", retval); ok(retval == 10, "Unexpected retval %lu.\n", retval);
retval = 10; retval = 10;
hr = IWshShell3_Run(sh3, str, &arg, NULL, &retval); hr = IWshShell3_Run(sh3, str, &arg, NULL, &retval);
ok(hr == E_POINTER, "got 0x%08x\n", hr); ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr);
ok(retval == 10, "got %u\n", retval); ok(retval == 10, "Unexpected retval %lu.\n", retval);
retval = 10; retval = 10;
V_VT(&arg2) = VT_ERROR; V_VT(&arg2) = VT_ERROR;
V_ERROR(&arg2) = 0; V_ERROR(&arg2) = 0;
hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval);
ok(hr == DISP_E_TYPEMISMATCH, "got 0x%08x\n", hr); ok(hr == DISP_E_TYPEMISMATCH, "Unexpected hr %#lx.\n", hr);
ok(retval == 10, "got %u\n", retval); ok(retval == 10, "Unexpected retval %lu.\n", retval);
SysFreeString(str); SysFreeString(str);
V_VT(&arg2) = VT_BOOL; V_VT(&arg2) = VT_BOOL;
...@@ -251,15 +248,15 @@ static void test_wshshell(void) ...@@ -251,15 +248,15 @@ static void test_wshshell(void)
retval = 0xdeadbeef; retval = 0xdeadbeef;
str = SysAllocString(L"cmd.exe /c rd /s /q c:\\nosuchdir"); str = SysAllocString(L"cmd.exe /c rd /s /q c:\\nosuchdir");
hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "got %u\n", retval); todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "Unexpected retval %lu.\n", retval);
SysFreeString(str); SysFreeString(str);
retval = 0xdeadbeef; retval = 0xdeadbeef;
str = SysAllocString(L"\"cmd.exe \" /c rd /s /q c:\\nosuchdir"); str = SysAllocString(L"\"cmd.exe \" /c rd /s /q c:\\nosuchdir");
hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "got %u\n", retval); todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "Unexpected retval %lu.\n", retval);
SysFreeString(str); SysFreeString(str);
GetSystemDirectoryW(path, ARRAY_SIZE(path)); GetSystemDirectoryW(path, ARRAY_SIZE(path));
...@@ -282,8 +279,8 @@ static void test_wshshell(void) ...@@ -282,8 +279,8 @@ static void test_wshshell(void)
retval = 0xdeadbeef; retval = 0xdeadbeef;
str = SysAllocString(buf); str = SysAllocString(buf);
hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "got %u\n", retval); todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "Unexpected retval %lu.\n", retval);
SysFreeString(str); SysFreeString(str);
DeleteFileW(path2); DeleteFileW(path2);
...@@ -296,45 +293,45 @@ static void test_wshshell(void) ...@@ -296,45 +293,45 @@ static void test_wshshell(void)
str = NULL; str = NULL;
hr = IWshShell3_get_CurrentDirectory(sh3, &str); hr = IWshShell3_get_CurrentDirectory(sh3, &str);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(str && str[0] != 0, "got empty string\n"); ok(str && str[0] != 0, "got empty string\n");
CHECK_BSTR_LENGTH(str); CHECK_BSTR_LENGTH(str);
SysFreeString(str); SysFreeString(str);
hr = IWshShell3_put_CurrentDirectory(sh3, NULL); hr = IWshShell3_put_CurrentDirectory(sh3, NULL);
ok(hr == E_INVALIDARG || ok(hr == E_INVALIDARG ||
broken(hr == HRESULT_FROM_WIN32(ERROR_NOACCESS)), "got 0x%08x\n", hr); broken(hr == HRESULT_FROM_WIN32(ERROR_NOACCESS)), "Unexpected hr %#lx.\n", hr);
str = SysAllocString(emptyW); str = SysAllocString(emptyW);
hr = IWshShell3_put_CurrentDirectory(sh3, str); hr = IWshShell3_put_CurrentDirectory(sh3, str);
ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Unexpected hr %#lx.\n", hr);
SysFreeString(str); SysFreeString(str);
str = SysAllocString(L"deadparrot"); str = SysAllocString(L"deadparrot");
hr = IWshShell3_put_CurrentDirectory(sh3, str); hr = IWshShell3_put_CurrentDirectory(sh3, str);
ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Unexpected hr %#lx.\n", hr);
SysFreeString(str); SysFreeString(str);
/* Exec */ /* Exec */
hr = IWshShell3_Exec(sh3, NULL, NULL); hr = IWshShell3_Exec(sh3, NULL, NULL);
ok(hr == E_POINTER, "got 0x%08x\n", hr); ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr);
hr = IWshShell3_Exec(sh3, NULL, &shexec); hr = IWshShell3_Exec(sh3, NULL, &shexec);
ok(hr == DISP_E_EXCEPTION, "got 0x%08x\n", hr); ok(hr == DISP_E_EXCEPTION, "Unexpected hr %#lx.\n", hr);
str = SysAllocString(emptyW); str = SysAllocString(emptyW);
hr = IWshShell3_Exec(sh3, str, &shexec); hr = IWshShell3_Exec(sh3, str, &shexec);
ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Unexpected hr %#lx.\n", hr);
SysFreeString(str); SysFreeString(str);
str = SysAllocString(L"%deadbeaf% /c echo test"); str = SysAllocString(L"%deadbeaf% /c echo test");
hr = IWshShell3_Exec(sh3, str, &shexec); hr = IWshShell3_Exec(sh3, str, &shexec);
ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Unexpected hr %#lx.\n", hr);
SysFreeString(str); SysFreeString(str);
str = SysAllocString(L"%ComSpec% /c echo test"); str = SysAllocString(L"%ComSpec% /c echo test");
hr = IWshShell3_Exec(sh3, str, &shexec); hr = IWshShell3_Exec(sh3, str, &shexec);
ok(hr == HRESULT_FROM_WIN32(ERROR_SUCCESS), "got 0x%08x\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
SysFreeString(str); SysFreeString(str);
IWshCollection_Release(coll); IWshCollection_Release(coll);
...@@ -380,49 +377,49 @@ static void test_registry(void) ...@@ -380,49 +377,49 @@ static void test_registry(void)
hr = CoCreateInstance(&CLSID_WshShell, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, hr = CoCreateInstance(&CLSID_WshShell, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER,
&IID_IWshShell3, (void**)&sh3); &IID_IWshShell3, (void**)&sh3);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
/* RegRead() */ /* RegRead() */
V_VT(&value) = VT_I2; V_VT(&value) = VT_I2;
hr = IWshShell3_RegRead(sh3, NULL, &value); hr = IWshShell3_RegRead(sh3, NULL, &value);
ok(hr == E_POINTER, "got 0x%08x\n", hr); ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr);
ok(V_VT(&value) == VT_I2, "got %d\n", V_VT(&value)); ok(V_VT(&value) == VT_I2, "got %d\n", V_VT(&value));
name = SysAllocString(L"HKEY_broken_key"); name = SysAllocString(L"HKEY_broken_key");
hr = IWshShell3_RegRead(sh3, name, NULL); hr = IWshShell3_RegRead(sh3, name, NULL);
ok(hr == E_POINTER, "got 0x%08x\n", hr); ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr);
V_VT(&value) = VT_I2; V_VT(&value) = VT_I2;
hr = IWshShell3_RegRead(sh3, name, &value); hr = IWshShell3_RegRead(sh3, name, &value);
ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "got 0x%08x\n", hr); ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "Unexpected hr %#lx.\n", hr);
ok(V_VT(&value) == VT_I2, "got %d\n", V_VT(&value)); ok(V_VT(&value) == VT_I2, "got %d\n", V_VT(&value));
SysFreeString(name); SysFreeString(name);
name = SysAllocString(L"HKEY_CURRENT_USERa"); name = SysAllocString(L"HKEY_CURRENT_USERa");
V_VT(&value) = VT_I2; V_VT(&value) = VT_I2;
hr = IWshShell3_RegRead(sh3, name, &value); hr = IWshShell3_RegRead(sh3, name, &value);
ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "got 0x%08x\n", hr); ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "Unexpected hr %#lx.\n", hr);
ok(V_VT(&value) == VT_I2, "got %d\n", V_VT(&value)); ok(V_VT(&value) == VT_I2, "got %d\n", V_VT(&value));
SysFreeString(name); SysFreeString(name);
ret = RegCreateKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Test", &root); ret = RegCreateKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Test", &root);
ok(ret == 0, "got %d\n", ret); ok(!ret, "Unexpected retval %ld.\n", ret);
ret = RegSetValueExA(root, "regsz", 0, REG_SZ, (const BYTE*)"foobar", 7); ret = RegSetValueExA(root, "regsz", 0, REG_SZ, (const BYTE*)"foobar", 7);
ok(ret == 0, "got %d\n", ret); ok(!ret, "Unexpected retval %ld.\n", ret);
ret = RegSetValueExA(root, "regsz2", 0, REG_SZ, (const BYTE*)"foobar\0f", 9); ret = RegSetValueExA(root, "regsz2", 0, REG_SZ, (const BYTE*)"foobar\0f", 9);
ok(ret == 0, "got %d\n", ret); ok(!ret, "Unexpected retval %ld.\n", ret);
ret = RegSetValueExA(root, "regmultisz", 0, REG_MULTI_SZ, (const BYTE*)"foo\0bar\0", 9); ret = RegSetValueExA(root, "regmultisz", 0, REG_MULTI_SZ, (const BYTE*)"foo\0bar\0", 9);
ok(ret == 0, "got %d\n", ret); ok(!ret, "Unexpected retval %ld.\n", ret);
dwvalue = 10; dwvalue = 10;
ret = RegSetValueExA(root, "regdword", 0, REG_DWORD, (const BYTE*)&dwvalue, sizeof(dwvalue)); ret = RegSetValueExA(root, "regdword", 0, REG_DWORD, (const BYTE*)&dwvalue, sizeof(dwvalue));
ok(ret == 0, "got %d\n", ret); ok(!ret, "Unexpected retval %ld.\n", ret);
dwvalue = 11; dwvalue = 11;
ret = RegSetValueExA(root, "regbinary", 0, REG_BINARY, (const BYTE*)&dwvalue, sizeof(dwvalue)); ret = RegSetValueExA(root, "regbinary", 0, REG_BINARY, (const BYTE*)&dwvalue, sizeof(dwvalue));
ok(ret == 0, "got %d\n", ret); ok(!ret, "Unexpected retval %ld.\n", ret);
/* REG_SZ */ /* REG_SZ */
lstrcpyW(pathW, keypathW); lstrcpyW(pathW, keypathW);
...@@ -430,7 +427,7 @@ static void test_registry(void) ...@@ -430,7 +427,7 @@ static void test_registry(void)
name = SysAllocString(pathW); name = SysAllocString(pathW);
VariantInit(&value); VariantInit(&value);
hr = IWshShell3_RegRead(sh3, name, &value); hr = IWshShell3_RegRead(sh3, name, &value);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value));
ok(!lstrcmpW(V_BSTR(&value), L"foobar"), "got %s\n", wine_dbgstr_w(V_BSTR(&value))); ok(!lstrcmpW(V_BSTR(&value), L"foobar"), "got %s\n", wine_dbgstr_w(V_BSTR(&value)));
CHECK_BSTR_LENGTH(V_BSTR(&value)); CHECK_BSTR_LENGTH(V_BSTR(&value));
...@@ -443,7 +440,7 @@ static void test_registry(void) ...@@ -443,7 +440,7 @@ static void test_registry(void)
name = SysAllocString(pathW); name = SysAllocString(pathW);
VariantInit(&value); VariantInit(&value);
hr = IWshShell3_RegRead(sh3, name, &value); hr = IWshShell3_RegRead(sh3, name, &value);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value));
ok(SysStringLen(V_BSTR(&value)) == 6, "len %d\n", SysStringLen(V_BSTR(&value))); ok(SysStringLen(V_BSTR(&value)) == 6, "len %d\n", SysStringLen(V_BSTR(&value)));
CHECK_BSTR_LENGTH(V_BSTR(&value)); CHECK_BSTR_LENGTH(V_BSTR(&value));
...@@ -456,9 +453,9 @@ static void test_registry(void) ...@@ -456,9 +453,9 @@ static void test_registry(void)
name = SysAllocString(pathW); name = SysAllocString(pathW);
VariantInit(&value); VariantInit(&value);
hr = IWshShell3_RegRead(sh3, name, &value); hr = IWshShell3_RegRead(sh3, name, &value);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(V_VT(&value) == VT_I4, "got %d\n", V_VT(&value)); ok(V_VT(&value) == VT_I4, "got %d\n", V_VT(&value));
ok(V_I4(&value) == 10, "got %d\n", V_I4(&value)); ok(V_I4(&value) == 10, "Unexpected value %ld.\n", V_I4(&value));
SysFreeString(name); SysFreeString(name);
/* REG_BINARY */ /* REG_BINARY */
...@@ -467,26 +464,26 @@ static void test_registry(void) ...@@ -467,26 +464,26 @@ static void test_registry(void)
name = SysAllocString(pathW); name = SysAllocString(pathW);
VariantInit(&value); VariantInit(&value);
hr = IWshShell3_RegRead(sh3, name, &value); hr = IWshShell3_RegRead(sh3, name, &value);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(V_VT(&value) == (VT_ARRAY|VT_VARIANT), "got 0x%x\n", V_VT(&value)); ok(V_VT(&value) == (VT_ARRAY|VT_VARIANT), "got 0x%x\n", V_VT(&value));
dim = SafeArrayGetDim(V_ARRAY(&value)); dim = SafeArrayGetDim(V_ARRAY(&value));
ok(dim == 1, "got %u\n", dim); ok(dim == 1, "got %u\n", dim);
hr = SafeArrayGetLBound(V_ARRAY(&value), 1, &bound); hr = SafeArrayGetLBound(V_ARRAY(&value), 1, &bound);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(bound == 0, "got %u\n", bound); ok(bound == 0, "Unexpected value %lu.\n", bound);
hr = SafeArrayGetUBound(V_ARRAY(&value), 1, &bound); hr = SafeArrayGetUBound(V_ARRAY(&value), 1, &bound);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(bound == 3, "got %u\n", bound); ok(bound == 3, "Unexpected value %lu.\n", bound);
hr = SafeArrayGetVartype(V_ARRAY(&value), &vartype); hr = SafeArrayGetVartype(V_ARRAY(&value), &vartype);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(vartype == VT_VARIANT, "got %d\n", vartype); ok(vartype == VT_VARIANT, "got %d\n", vartype);
bound = 0; bound = 0;
hr = SafeArrayGetElement(V_ARRAY(&value), &bound, &v); hr = SafeArrayGetElement(V_ARRAY(&value), &bound, &v);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(V_VT(&v) == VT_UI1, "got %d\n", V_VT(&v)); ok(V_VT(&v) == VT_UI1, "got %d\n", V_VT(&v));
ok(V_UI1(&v) == 11, "got %u\n", V_UI1(&v)); ok(V_UI1(&v) == 11, "got %u\n", V_UI1(&v));
VariantClear(&v); VariantClear(&v);
...@@ -499,7 +496,7 @@ static void test_registry(void) ...@@ -499,7 +496,7 @@ static void test_registry(void)
name = SysAllocString(pathW); name = SysAllocString(pathW);
VariantInit(&value); VariantInit(&value);
hr = IWshShell3_RegRead(sh3, name, &value); hr = IWshShell3_RegRead(sh3, name, &value);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(V_VT(&value) == (VT_ARRAY|VT_VARIANT), "got 0x%x\n", V_VT(&value)); ok(V_VT(&value) == (VT_ARRAY|VT_VARIANT), "got 0x%x\n", V_VT(&value));
SysFreeString(name); SysFreeString(name);
...@@ -507,20 +504,20 @@ static void test_registry(void) ...@@ -507,20 +504,20 @@ static void test_registry(void)
ok(dim == 1, "got %u\n", dim); ok(dim == 1, "got %u\n", dim);
hr = SafeArrayGetLBound(V_ARRAY(&value), 1, &bound); hr = SafeArrayGetLBound(V_ARRAY(&value), 1, &bound);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(bound == 0, "got %u\n", bound); ok(bound == 0, "Unexpected value %lu.\n", bound);
hr = SafeArrayGetUBound(V_ARRAY(&value), 1, &bound); hr = SafeArrayGetUBound(V_ARRAY(&value), 1, &bound);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(bound == 1, "got %u\n", bound); ok(bound == 1, "Unexpected value %lu.\n", bound);
hr = SafeArrayGetVartype(V_ARRAY(&value), &vartype); hr = SafeArrayGetVartype(V_ARRAY(&value), &vartype);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(vartype == VT_VARIANT, "got %d\n", vartype); ok(vartype == VT_VARIANT, "got %d\n", vartype);
bound = 0; bound = 0;
hr = SafeArrayGetElement(V_ARRAY(&value), &bound, &v); hr = SafeArrayGetElement(V_ARRAY(&value), &bound, &v);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(V_VT(&v) == VT_BSTR, "got %d\n", V_VT(&v)); ok(V_VT(&v) == VT_BSTR, "got %d\n", V_VT(&v));
ok(!lstrcmpW(V_BSTR(&v), L"foo"), "got %s\n", wine_dbgstr_w(V_BSTR(&v))); ok(!lstrcmpW(V_BSTR(&v), L"foo"), "got %s\n", wine_dbgstr_w(V_BSTR(&v)));
CHECK_BSTR_LENGTH(V_BSTR(&v)); CHECK_BSTR_LENGTH(V_BSTR(&v));
...@@ -530,7 +527,7 @@ static void test_registry(void) ...@@ -530,7 +527,7 @@ static void test_registry(void)
name = SysAllocString(L"HKEY_CURRENT_USER\\Software\\Wine\\Test\\regsz1"); name = SysAllocString(L"HKEY_CURRENT_USER\\Software\\Wine\\Test\\regsz1");
V_VT(&value) = VT_I2; V_VT(&value) = VT_I2;
hr = IWshShell3_RegRead(sh3, name, &value); hr = IWshShell3_RegRead(sh3, name, &value);
ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Unexpected hr %#lx.\n", hr);
ok(V_VT(&value) == VT_I2, "got %d\n", V_VT(&value)); ok(V_VT(&value) == VT_I2, "got %d\n", V_VT(&value));
VariantClear(&value); VariantClear(&value);
SysFreeString(name); SysFreeString(name);
...@@ -539,76 +536,76 @@ static void test_registry(void) ...@@ -539,76 +536,76 @@ static void test_registry(void)
/* RegWrite() */ /* RegWrite() */
ret = RegCreateKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Test", &root); ret = RegCreateKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Test", &root);
ok(ret == 0, "got %d\n", ret); ok(!ret, "Unexpected retval %ld.\n", ret);
hr = IWshShell3_RegWrite(sh3, NULL, NULL, NULL); hr = IWshShell3_RegWrite(sh3, NULL, NULL, NULL);
ok(hr == E_POINTER, "got 0x%08x\n", hr); ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr);
lstrcpyW(pathW, keypathW); lstrcpyW(pathW, keypathW);
lstrcatW(pathW, regszW); lstrcatW(pathW, regszW);
name = SysAllocString(pathW); name = SysAllocString(pathW);
hr = IWshShell3_RegWrite(sh3, name, NULL, NULL); hr = IWshShell3_RegWrite(sh3, name, NULL, NULL);
ok(hr == E_POINTER, "got 0x%08x\n", hr); ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr);
VariantInit(&value); VariantInit(&value);
hr = IWshShell3_RegWrite(sh3, name, &value, NULL); hr = IWshShell3_RegWrite(sh3, name, &value, NULL);
ok(hr == E_POINTER, "got 0x%08x\n", hr); ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr);
hr = IWshShell3_RegWrite(sh3, name, &value, &value); hr = IWshShell3_RegWrite(sh3, name, &value, &value);
ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
/* type is optional */ /* type is optional */
V_VT(&v) = VT_ERROR; V_VT(&v) = VT_ERROR;
V_ERROR(&v) = DISP_E_PARAMNOTFOUND; V_ERROR(&v) = DISP_E_PARAMNOTFOUND;
hr = IWshShell3_RegWrite(sh3, name, &value, &v); hr = IWshShell3_RegWrite(sh3, name, &value, &v);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
/* default type is REG_SZ */ /* default type is REG_SZ */
V_VT(&value) = VT_I4; V_VT(&value) = VT_I4;
V_I4(&value) = 12; V_I4(&value) = 12;
hr = IWshShell3_RegWrite(sh3, name, &value, &v); hr = IWshShell3_RegWrite(sh3, name, &value, &v);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
type = REG_NONE; type = REG_NONE;
ret = RegQueryValueExA(root, "regsz", 0, &type, NULL, NULL); ret = RegQueryValueExA(root, "regsz", 0, &type, NULL, NULL);
ok(ret == ERROR_SUCCESS, "got %d\n", ret); ok(!ret, "Unexpected retval %ld.\n", ret);
ok(type == REG_SZ, "got %d\n", type); ok(type == REG_SZ, "Unexpected type %ld.\n", type);
ret = RegDeleteValueA(root, "regsz"); ret = RegDeleteValueA(root, "regsz");
ok(ret == ERROR_SUCCESS, "got %d\n", ret); ok(!ret, "Unexpected retval %ld.\n", ret);
V_VT(&value) = VT_BSTR; V_VT(&value) = VT_BSTR;
V_BSTR(&value) = SysAllocString(regszW); V_BSTR(&value) = SysAllocString(regszW);
hr = IWshShell3_RegWrite(sh3, name, &value, &v); hr = IWshShell3_RegWrite(sh3, name, &value, &v);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
VariantClear(&value); VariantClear(&value);
type = REG_NONE; type = REG_NONE;
ret = RegQueryValueExA(root, "regsz", 0, &type, NULL, NULL); ret = RegQueryValueExA(root, "regsz", 0, &type, NULL, NULL);
ok(ret == ERROR_SUCCESS, "got %d\n", ret); ok(!ret, "Unexpected retval %ld.\n", ret);
ok(type == REG_SZ, "got %d\n", type); ok(type == REG_SZ, "Unexpected type %ld.\n", type);
ret = RegDeleteValueA(root, "regsz"); ret = RegDeleteValueA(root, "regsz");
ok(ret == ERROR_SUCCESS, "got %d\n", ret); ok(!ret, "Unexpected retval %ld.\n", ret);
V_VT(&value) = VT_R4; V_VT(&value) = VT_R4;
V_R4(&value) = 1.2; V_R4(&value) = 1.2;
hr = IWshShell3_RegWrite(sh3, name, &value, &v); hr = IWshShell3_RegWrite(sh3, name, &value, &v);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
VariantClear(&value); VariantClear(&value);
type = REG_NONE; type = REG_NONE;
ret = RegQueryValueExA(root, "regsz", 0, &type, NULL, NULL); ret = RegQueryValueExA(root, "regsz", 0, &type, NULL, NULL);
ok(ret == ERROR_SUCCESS, "got %d\n", ret); ok(!ret, "Unexpected retval %ld.\n", ret);
ok(type == REG_SZ, "got %d\n", type); ok(type == REG_SZ, "Unexpected type %ld.\n", type);
ret = RegDeleteValueA(root, "regsz"); ret = RegDeleteValueA(root, "regsz");
ok(ret == ERROR_SUCCESS, "got %d\n", ret); ok(!ret, "Unexpected retval %ld.\n", ret);
V_VT(&value) = VT_R4; V_VT(&value) = VT_R4;
V_R4(&value) = 1.2; V_R4(&value) = 1.2;
V_VT(&v) = VT_I2; V_VT(&v) = VT_I2;
V_I2(&v) = 1; V_I2(&v) = 1;
hr = IWshShell3_RegWrite(sh3, name, &value, &v); hr = IWshShell3_RegWrite(sh3, name, &value, &v);
ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
VariantClear(&value); VariantClear(&value);
SysFreeString(name); SysFreeString(name);
...@@ -627,17 +624,17 @@ static void test_popup(void) ...@@ -627,17 +624,17 @@ static void test_popup(void)
hr = CoCreateInstance(&CLSID_WshShell, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, hr = CoCreateInstance(&CLSID_WshShell, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER,
&IID_IWshShell, (void **)&sh); &IID_IWshShell, (void **)&sh);
ok(hr == S_OK, "Failed to create WshShell object, hr %#x.\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
button = 123; button = 123;
text = SysAllocString(L"Text"); text = SysAllocString(L"Text");
hr = IWshShell_Popup(sh, NULL, NULL, NULL, NULL, &button); hr = IWshShell_Popup(sh, NULL, NULL, NULL, NULL, &button);
ok(hr == E_POINTER, "Unexpected retval %#x.\n", hr); ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr);
ok(button == 123, "Unexpected button id %d.\n", button); ok(button == 123, "Unexpected button id %d.\n", button);
hr = IWshShell_Popup(sh, text, NULL, NULL, NULL, &button); hr = IWshShell_Popup(sh, text, NULL, NULL, NULL, &button);
ok(hr == E_POINTER, "Unexpected retval %#x.\n", hr); ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr);
ok(button == 123, "Unexpected button id %d.\n", button); ok(button == 123, "Unexpected button id %d.\n", button);
V_VT(&optional) = VT_ERROR; V_VT(&optional) = VT_ERROR;
...@@ -653,11 +650,11 @@ static void test_popup(void) ...@@ -653,11 +650,11 @@ static void test_popup(void)
V_BSTR(&title) = NULL; V_BSTR(&title) = NULL;
hr = IWshShell_Popup(sh, text, &timeout, &optional, &type, &button); hr = IWshShell_Popup(sh, text, &timeout, &optional, &type, &button);
ok(hr == S_OK, "Unexpected retval %#x.\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(button == -1, "Unexpected button id %d.\n", button); ok(button == -1, "Unexpected button id %d.\n", button);
hr = IWshShell_Popup(sh, text, &timeout, &title, &optional, &button); hr = IWshShell_Popup(sh, text, &timeout, &title, &optional, &button);
ok(hr == S_OK, "Unexpected retval %#x.\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(button == -1, "Unexpected button id %d.\n", button); ok(button == -1, "Unexpected button id %d.\n", button);
SysFreeString(text); SysFreeString(text);
...@@ -673,8 +670,9 @@ START_TEST(wshom) ...@@ -673,8 +670,9 @@ START_TEST(wshom)
hr = CoCreateInstance(&CLSID_WshShell, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, hr = CoCreateInstance(&CLSID_WshShell, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER,
&IID_IUnknown, (void**)&unk); &IID_IUnknown, (void**)&unk);
if (FAILED(hr)) { if (FAILED(hr))
win_skip("Could not create WshShell object: %08x\n", hr); {
win_skip("Could not create WshShell object: %#lx.\n", hr);
return; return;
} }
IUnknown_Release(unk); IUnknown_Release(unk);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment