André Hentschel : user32/tests: Skip DDE tests on win9x.
Alexandre Julliard
julliard at winehq.org
Wed Dec 1 12:56:47 CST 2010
Module: wine
Branch: master
Commit: 7e5da86076cb8b184e100949e427ddef30c5cdfd
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e5da86076cb8b184e100949e427ddef30c5cdfd
Author: André Hentschel <nerv at dawncrow.de>
Date: Tue Nov 30 18:51:57 2010 +0100
user32/tests: Skip DDE tests on win9x.
---
dlls/user32/tests/dde.c | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c
index 529c527..b382240 100644
--- a/dlls/user32/tests/dde.c
+++ b/dlls/user32/tests/dde.c
@@ -2043,12 +2043,6 @@ static void test_DdeCreateStringHandle(void)
dde_inst = 0xdeadbeef;
SetLastError(0xdeadbeef);
ret = DdeInitializeW(&dde_inst, client_ddeml_callback, APPCMD_CLIENTONLY, 0);
- if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
- {
- win_skip("DdeInitializeW is unimplemented\n");
- return;
- }
-
ok(ret == DMLERR_INVALIDPARAMETER, "DdeInitializeW should fail, but got %04x instead\n", ret);
ok(DdeGetLastError(dde_inst) == DMLERR_INVALIDPARAMETER, "expected DMLERR_INVALIDPARAMETER\n");
@@ -2696,6 +2690,7 @@ START_TEST(dde)
char buffer[MAX_PATH];
STARTUPINFO startup;
PROCESS_INFORMATION proc;
+ DWORD dde_inst = 0xdeadbeef;
argc = winetest_get_mainargs(&argv);
if (argc == 3)
@@ -2714,6 +2709,14 @@ START_TEST(dde)
test_initialisation();
+ SetLastError(0xdeadbeef);
+ DdeInitializeW(&dde_inst, client_ddeml_callback, APPCMD_CLIENTONLY, 0);
+ if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
+ {
+ win_skip("Skipping tests on win9x because of brokenness\n");
+ return;
+ }
+
ZeroMemory(&startup, sizeof(STARTUPINFO));
sprintf(buffer, "%s dde ddeml", argv[0]);
startup.cb = sizeof(startup);
More information about the wine-cvs
mailing list