user32/tests: Skip DDE tests on win9x

André Hentschel nerv at dawncrow.de
Tue Nov 30 11:51:57 CST 2010


the dde tests have various errors on win9x/me and are crashing here and there,
so cut them down to only the initialistation tests.
i know about the discussion about quitting the win9x tests,
but for now is still try to make the testsuite a bit better
---
 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);
-- 

Best Regards, André Hentschel



More information about the wine-patches mailing list