Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
61e70dfb
Commit
61e70dfb
authored
Feb 20, 2016
by
Frédéric Delanoy
Committed by
Alexandre Julliard
Feb 22, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
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
>
parent
5c2cff30
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
25 deletions
+4
-25
progman_dde.c
dlls/shell32/tests/progman_dde.c
+1
-10
shelllink.c
dlls/shell32/tests/shelllink.c
+3
-15
No files found.
dlls/shell32/tests/progman_dde.c
View file @
61e70dfb
...
...
@@ -486,19 +486,10 @@ static HWND ShowGroupTest(DWORD instance, HCONV hConv, const char *command, UINT
DdeExecuteCommand
(
instance
,
hConv
,
command
,
&
hData
,
&
error
,
testParams
);
/* todo_wine... Is expected to fail, wine stubbed functions DO fail */
/* 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
"
,
groupName
,
GetStringFromError
(
expected_result
),
GetStringFromError
(
error
),
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
)
{
...
...
dlls/shell32/tests/shelllink.c
View file @
61e70dfb
...
...
@@ -351,12 +351,8 @@ static void test_get_set(void)
*/
#define lok ok_(__FILE__, line)
#define lok_todo_4(todo_flag,a,b,c,d) \
if ((todo & todo_flag) == 0) lok((a), (b), (c), (d)); \
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 lok_todo_4(todo_flag,a,b,c,d) todo_wine_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));
#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
)
...
...
@@ -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
);
r
=
IPersistFile_Save
(
pf
,
path
,
TRUE
);
if
(
save_fails
)
{
todo_wine
{
lok
(
r
==
S_OK
,
"save failed (0x%08x)
\n
"
,
r
);
}
}
else
{
todo_wine_if
(
save_fails
)
lok
(
r
==
S_OK
,
"save failed (0x%08x)
\n
"
,
r
);
}
/* test GetCurFile after ::Save */
r
=
IPersistFile_GetCurFile
(
pf
,
&
str
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment