From f5fbeb377b6cadee8f281745e29d1e475a35f037 Mon Sep 17 00:00:00 2001
From: Sylvain Petreolle <spetreolle@yahoo.fr>
Date: Sat, 29 Jun 2013 17:35:05 +0000
Subject: [PATCH] [SHELL32] Properly disable DDE tests.

svn path=/trunk/; revision=59367
---
 rostests/winetests/shell32/CMakeLists.txt |  2 +-
 rostests/winetests/shell32/progman_dde.c  |  5 +++++
 rostests/winetests/shell32/shlexec.c      | 14 +++++++-------
 rostests/winetests/shell32/testlist.c     |  4 ++--
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/rostests/winetests/shell32/CMakeLists.txt b/rostests/winetests/shell32/CMakeLists.txt
index a4632114fc1..6f2663fc34f 100644
--- a/rostests/winetests/shell32/CMakeLists.txt
+++ b/rostests/winetests/shell32/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND SOURCE
     brsfolder.c
     ebrowser.c
     generated.c
-    #progman_dde.c FIXME: CORE-6559
+    progman_dde.c
     recyclebin.c
     shelldispatch.c
     shelllink.c
diff --git a/rostests/winetests/shell32/progman_dde.c b/rostests/winetests/shell32/progman_dde.c
index 1e3239da818..fcaa02751e7 100644
--- a/rostests/winetests/shell32/progman_dde.c
+++ b/rostests/winetests/shell32/progman_dde.c
@@ -695,6 +695,11 @@ static void DdeTestProgman2(DWORD instance, HCONV hConv, int testnum)
 
 START_TEST(progman_dde)
 {
+    if(!winetest_interactive)
+    {
+        skip("Skipping progman_dde() until we have a sane DDE implementation. CORE-6559.\n");
+        return;
+    }
     DWORD instance = 0;
     UINT err;
     HSZ hszProgman;
diff --git a/rostests/winetests/shell32/shlexec.c b/rostests/winetests/shell32/shlexec.c
index ef39a0dd656..db6f25d4967 100755
--- a/rostests/winetests/shell32/shlexec.c
+++ b/rostests/winetests/shell32/shlexec.c
@@ -58,7 +58,7 @@ static char tmpdir[MAX_PATH];
 static char child_file[MAX_PATH];
 static DLLVERSIONINFO dllver;
 static BOOL skip_noassoc_tests = FALSE;
-//static HANDLE dde_ready_event; FIXME: CORE-6559
+static HANDLE dde_ready_event;
 
 
 /***
@@ -2079,7 +2079,6 @@ typedef struct
     int todo;
 } dde_tests_t;
 
-#if CORE_6559_IS_FIXED
 static dde_tests_t dde_tests[] =
 {
     /* Test passing and not passing command-line
@@ -2276,7 +2275,6 @@ static void test_dde(void)
     CloseHandle(map);
     hook_WaitForInputIdle((void *) WaitForInputIdle);
 }
-#endif
 
 #define DDE_DEFAULT_APP_VARIANTS 2
 typedef struct
@@ -2287,7 +2285,6 @@ typedef struct
     int rc[DDE_DEFAULT_APP_VARIANTS];
 } dde_default_app_tests_t;
 
-#if CORE_6559_IS_FIXED
 static dde_default_app_tests_t dde_default_app_tests[] =
 {
     /* Windows XP and 98 handle default DDE app names in different ways.
@@ -2447,7 +2444,6 @@ static void test_dde_default_app(void)
     assert(DdeFreeStringHandle(ddeInst, hszApplication));
     assert(DdeUninitialize(ddeInst));
 }
-#endif
 
 static void init_test(void)
 {
@@ -2662,12 +2658,16 @@ START_TEST(shlexec)
     test_find_executable();
     test_lnks();
     test_exes();
-#if CORE_6559_IS_FIXED
+if(winetest_interactive)
+{
     test_dde();
     test_dde_default_app();
-#endif
+}
+else
+{
     win_skip("Skipping test_dde() until we have a sane DDE implementation. CORE-6559.\n");
     win_skip("Skipping test_dde_default_app() until we have a sane DDE implementation. CORE-6559.\n");
+}
     test_directory();
 
     cleanup_test();
diff --git a/rostests/winetests/shell32/testlist.c b/rostests/winetests/shell32/testlist.c
index 13476050fb9..757db385028 100644
--- a/rostests/winetests/shell32/testlist.c
+++ b/rostests/winetests/shell32/testlist.c
@@ -12,7 +12,7 @@ extern void func_autocomplete(void);
 extern void func_brsfolder(void);
 extern void func_ebrowser(void);
 extern void func_generated(void);
-//extern void func_progman_dde(void); FIXME: bug 7233
+extern void func_progman_dde(void);
 extern void func_recyclebin(void);
 extern void func_shelldispatch(void);
 extern void func_shelllink(void);
@@ -34,7 +34,7 @@ const struct test winetest_testlist[] =
     { "brsfolder", func_brsfolder },
     { "ebrowser", func_ebrowser },
     { "generated", func_generated },
-//    { "progman_dde", func_progman_dde }, FIXME: bug 7233
+    { "progman_dde", func_progman_dde },
     { "recyclebin", func_recyclebin },
     { "shelldispatch", func_shelldispatch },
     { "shelllink", func_shelllink },