=?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: shell32/tests: Don' t test functions directly when reporting DdeGetLastError().
Alexandre Julliard
julliard at winehq.org
Tue Jan 2 13:19:01 CST 2018
Module: wine
Branch: master
Commit: 5200f3472f5252fc73b32a3b640f84699059be8c
URL: https://source.winehq.org/git/wine.git/?a=commit;h=5200f3472f5252fc73b32a3b640f84699059be8c
Author: André Hentschel <nerv at dawncrow.de>
Date: Sat Dec 30 19:57:47 2017 +0100
shell32/tests: Don't test functions directly when reporting DdeGetLastError().
Signed-off-by: André Hentschel <nerv at dawncrow.de>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/shell32/tests/progman_dde.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c
index bfa9f65..28dad2c 100644
--- a/dlls/shell32/tests/progman_dde.c
+++ b/dlls/shell32/tests/progman_dde.c
@@ -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));
}
More information about the wine-cvs
mailing list