Skip to content

W
wine-winehq
Commit 5200f347 authored by André Hentschel's avatar André Hentschel Committed by Alexandre Julliard
Browse files
Options

shell32/tests: Don't test functions directly when reporting DdeGetLastError().

Signed-off-by: 's avatarAndré Hentschel <nerv@dawncrow.de> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 6762fe85
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 6 deletions
dlls/shell32/tests/progman_dde.c
View file @ 5200f347
......@@ -460,6 +460,7 @@ START_TEST(progman_dde)
UINT err;
HSZ hszProgman;
HCONV hConv;
BOOL ret;
init_function_pointers();
init_strings();
......@@ -472,7 +473,8 @@ START_TEST(progman_dde)
hszProgman = DdeCreateStringHandleA(instance, "PROGMAN", CP_WINANSI);
ok(hszProgman != NULL, "DdeCreateStringHandle() failed: %u\n", DdeGetLastError(instance));
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 */
if (hConv == NULL)
{
......@@ -485,8 +487,10 @@ START_TEST(progman_dde)
test_request_groups(instance, hConv);
/* Cleanup & Exit */
ok(DdeDisconnect(hConv), "DdeDisonnect() failed: %u\n", DdeGetLastError(instance));
ok(DdeUninitialize(instance), "DdeUninitialize() failed: %u\n", DdeGetLastError(instance));
ret = DdeDisconnect(hConv);
ok(ret, "DdeDisonnect() failed: %u\n", DdeGetLastError(instance));
ret = DdeUninitialize(instance);
ok(ret, "DdeUninitialize() failed: %u\n", DdeGetLastError(instance));
/* 2nd Instance (Followup Tests) */
/* Initialize DDE Instance */
......@@ -499,12 +503,15 @@ START_TEST(progman_dde)
ok(hszProgman != NULL, "DdeCreateStringHandle() failed: %u\n", DdeGetLastError(instance));
hConv = DdeConnect(instance, hszProgman, hszProgman, NULL);
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 */
test_progman_dde2(instance, hConv);
/* Cleanup & Exit */
ok(DdeDisconnect(hConv), "DdeDisonnect() failed: %u\n", DdeGetLastError(instance));
ok(DdeUninitialize(instance), "DdeUninitialize() failed: %u\n", DdeGetLastError(instance));
ret = DdeDisconnect(hConv);
ok(ret, "DdeDisonnect() failed: %u\n", DdeGetLastError(instance));
ret = DdeUninitialize(instance);
ok(ret, "DdeUninitialize() failed: %u\n", DdeGetLastError(instance));
}
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