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
5200f347
Commit
5200f347
authored
Dec 30, 2017
by
André Hentschel
Committed by
Alexandre Julliard
Jan 02, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shell32/tests: Don't test functions directly when reporting DdeGetLastError().
Signed-off-by:
André Hentschel
<
nerv@dawncrow.de
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
6762fe85
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
6 deletions
+13
-6
progman_dde.c
dlls/shell32/tests/progman_dde.c
+13
-6
No files found.
dlls/shell32/tests/progman_dde.c
View file @
5200f347
...
@@ -460,6 +460,7 @@ START_TEST(progman_dde)
...
@@ -460,6 +460,7 @@ START_TEST(progman_dde)
UINT
err
;
UINT
err
;
HSZ
hszProgman
;
HSZ
hszProgman
;
HCONV
hConv
;
HCONV
hConv
;
BOOL
ret
;
init_function_pointers
();
init_function_pointers
();
init_strings
();
init_strings
();
...
@@ -472,7 +473,8 @@ START_TEST(progman_dde)
...
@@ -472,7 +473,8 @@ START_TEST(progman_dde)
hszProgman
=
DdeCreateStringHandleA
(
instance
,
"PROGMAN"
,
CP_WINANSI
);
hszProgman
=
DdeCreateStringHandleA
(
instance
,
"PROGMAN"
,
CP_WINANSI
);
ok
(
hszProgman
!=
NULL
,
"DdeCreateStringHandle() failed: %u
\n
"
,
DdeGetLastError
(
instance
));
ok
(
hszProgman
!=
NULL
,
"DdeCreateStringHandle() failed: %u
\n
"
,
DdeGetLastError
(
instance
));
hConv
=
DdeConnect
(
instance
,
hszProgman
,
hszProgman
,
NULL
);
hConv
=
DdeConnect
(
instance
,
hszProgman
,
hszProgman
,
NULL
);
ok
(
DdeFreeStringHandle
(
instance
,
hszProgman
),
"DdeFreeStringHandle() failed: %u
\n
"
,
DdeGetLastError
(
instance
));
ret
=
DdeFreeStringHandle
(
instance
,
hszProgman
);
ok
(
ret
,
"DdeFreeStringHandle() failed: %u
\n
"
,
DdeGetLastError
(
instance
));
/* Seeing failures on early versions of Windows Connecting to progman, exit if connection fails */
/* Seeing failures on early versions of Windows Connecting to progman, exit if connection fails */
if
(
hConv
==
NULL
)
if
(
hConv
==
NULL
)
{
{
...
@@ -485,8 +487,10 @@ START_TEST(progman_dde)
...
@@ -485,8 +487,10 @@ START_TEST(progman_dde)
test_request_groups
(
instance
,
hConv
);
test_request_groups
(
instance
,
hConv
);
/* Cleanup & Exit */
/* Cleanup & Exit */
ok
(
DdeDisconnect
(
hConv
),
"DdeDisonnect() failed: %u
\n
"
,
DdeGetLastError
(
instance
));
ret
=
DdeDisconnect
(
hConv
);
ok
(
DdeUninitialize
(
instance
),
"DdeUninitialize() failed: %u
\n
"
,
DdeGetLastError
(
instance
));
ok
(
ret
,
"DdeDisonnect() failed: %u
\n
"
,
DdeGetLastError
(
instance
));
ret
=
DdeUninitialize
(
instance
);
ok
(
ret
,
"DdeUninitialize() failed: %u
\n
"
,
DdeGetLastError
(
instance
));
/* 2nd Instance (Followup Tests) */
/* 2nd Instance (Followup Tests) */
/* Initialize DDE Instance */
/* Initialize DDE Instance */
...
@@ -499,12 +503,15 @@ START_TEST(progman_dde)
...
@@ -499,12 +503,15 @@ START_TEST(progman_dde)
ok
(
hszProgman
!=
NULL
,
"DdeCreateStringHandle() failed: %u
\n
"
,
DdeGetLastError
(
instance
));
ok
(
hszProgman
!=
NULL
,
"DdeCreateStringHandle() failed: %u
\n
"
,
DdeGetLastError
(
instance
));
hConv
=
DdeConnect
(
instance
,
hszProgman
,
hszProgman
,
NULL
);
hConv
=
DdeConnect
(
instance
,
hszProgman
,
hszProgman
,
NULL
);
ok
(
hConv
!=
NULL
,
"DdeConnect() failed: %u
\n
"
,
DdeGetLastError
(
instance
));
ok
(
hConv
!=
NULL
,
"DdeConnect() failed: %u
\n
"
,
DdeGetLastError
(
instance
));
ok
(
DdeFreeStringHandle
(
instance
,
hszProgman
),
"DdeFreeStringHandle() failed: %u
\n
"
,
DdeGetLastError
(
instance
));
ret
=
DdeFreeStringHandle
(
instance
,
hszProgman
);
ok
(
ret
,
"DdeFreeStringHandle() failed: %u
\n
"
,
DdeGetLastError
(
instance
));
/* Run Tests */
/* Run Tests */
test_progman_dde2
(
instance
,
hConv
);
test_progman_dde2
(
instance
,
hConv
);
/* Cleanup & Exit */
/* Cleanup & Exit */
ok
(
DdeDisconnect
(
hConv
),
"DdeDisonnect() failed: %u
\n
"
,
DdeGetLastError
(
instance
));
ret
=
DdeDisconnect
(
hConv
);
ok
(
DdeUninitialize
(
instance
),
"DdeUninitialize() failed: %u
\n
"
,
DdeGetLastError
(
instance
));
ok
(
ret
,
"DdeDisonnect() failed: %u
\n
"
,
DdeGetLastError
(
instance
));
ret
=
DdeUninitialize
(
instance
);
ok
(
ret
,
"DdeUninitialize() failed: %u
\n
"
,
DdeGetLastError
(
instance
));
}
}
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