shell32/tests: Use todo_wine_if() in tests.
Signed-off-by: Frédéric Delanoy <frederic.delanoy@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
5c2cff30aa
commit
61e70dfbc7
|
@ -486,19 +486,10 @@ static HWND ShowGroupTest(DWORD instance, HCONV hConv, const char *command, UINT
|
||||||
DdeExecuteCommand(instance, hConv, command, &hData, &error, testParams);
|
DdeExecuteCommand(instance, hConv, command, &hData, &error, testParams);
|
||||||
/* todo_wine... Is expected to fail, wine stubbed functions DO fail */
|
/* todo_wine... Is expected to fail, wine stubbed functions DO fail */
|
||||||
/* TODO REMOVE THIS CODE!!! */
|
/* TODO REMOVE THIS CODE!!! */
|
||||||
if (expected_result == DMLERR_NOTPROCESSED)
|
todo_wine_if (expected_result != DMLERR_NOTPROCESSED)
|
||||||
{
|
|
||||||
ok (expected_result == error, "ShowGroup %s: Expected Error %s, received %s.%s\n",
|
ok (expected_result == error, "ShowGroup %s: Expected Error %s, received %s.%s\n",
|
||||||
groupName, GetStringFromError(expected_result), GetStringFromError(error),
|
groupName, GetStringFromError(expected_result), GetStringFromError(error),
|
||||||
GetStringFromTestParams(testParams));
|
GetStringFromTestParams(testParams));
|
||||||
} else {
|
|
||||||
todo_wine
|
|
||||||
{
|
|
||||||
ok (expected_result == error, "ShowGroup %s: Expected Error %s, received %s.%s\n",
|
|
||||||
groupName, GetStringFromError(expected_result), GetStringFromError(error),
|
|
||||||
GetStringFromTestParams(testParams));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (error == DMLERR_NO_ERROR)
|
if (error == DMLERR_NO_ERROR)
|
||||||
{
|
{
|
||||||
|
|
|
@ -351,12 +351,8 @@ static void test_get_set(void)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define lok ok_(__FILE__, line)
|
#define lok ok_(__FILE__, line)
|
||||||
#define lok_todo_4(todo_flag,a,b,c,d) \
|
#define lok_todo_4(todo_flag,a,b,c,d) todo_wine_if ((todo & todo_flag) != 0) lok((a), (b), (c), (d));
|
||||||
if ((todo & todo_flag) == 0) lok((a), (b), (c), (d)); \
|
#define lok_todo_2(todo_flag,a,b) todo_wine_if ((todo & todo_flag) != 0) lok((a), (b));
|
||||||
else todo_wine lok((a), (b), (c), (d));
|
|
||||||
#define lok_todo_2(todo_flag,a,b) \
|
|
||||||
if ((todo & todo_flag) == 0) lok((a), (b)); \
|
|
||||||
else todo_wine lok((a), (b));
|
|
||||||
#define check_lnk(a,b,c) check_lnk_(__LINE__, (a), (b), (c))
|
#define check_lnk(a,b,c) check_lnk_(__LINE__, (a), (b), (c))
|
||||||
|
|
||||||
void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int save_fails)
|
void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int save_fails)
|
||||||
|
@ -433,16 +429,8 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int save_fails)
|
||||||
lok(str == NULL, "got %p\n", str);
|
lok(str == NULL, "got %p\n", str);
|
||||||
|
|
||||||
r = IPersistFile_Save(pf, path, TRUE);
|
r = IPersistFile_Save(pf, path, TRUE);
|
||||||
if (save_fails)
|
todo_wine_if (save_fails)
|
||||||
{
|
|
||||||
todo_wine {
|
|
||||||
lok(r == S_OK, "save failed (0x%08x)\n", r);
|
lok(r == S_OK, "save failed (0x%08x)\n", r);
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
lok(r == S_OK, "save failed (0x%08x)\n", r);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* test GetCurFile after ::Save */
|
/* test GetCurFile after ::Save */
|
||||||
r = IPersistFile_GetCurFile(pf, &str);
|
r = IPersistFile_GetCurFile(pf, &str);
|
||||||
|
|
Loading…
Reference in New Issue