[spetreolle] 59367: [SHELL32] Properly disable DDE tests.

Author: spetreolle
Date: Sat Jun 29 17:35:05 2013
New Revision: 59367

URL: http://svn.reactos.org/svn/reactos?rev=59367&view=rev
Log:
[SHELL32]
Properly disable DDE tests.

Modified:
    trunk/rostests/winetests/shell32/CMakeLists.txt
    trunk/rostests/winetests/shell32/progman_dde.c
    trunk/rostests/winetests/shell32/shlexec.c
    trunk/rostests/winetests/shell32/testlist.c

Modified: trunk/rostests/winetests/shell32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/CMakeLis...
==============================================================================
--- trunk/rostests/winetests/shell32/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/winetests/shell32/CMakeLists.txt	[iso-8859-1] Sat Jun 29 17:35:05 2013
@@ -10,7 +10,7 @@
     brsfolder.c
     ebrowser.c
     generated.c
-    #progman_dde.c FIXME: CORE-6559
+    progman_dde.c
     recyclebin.c
     shelldispatch.c
     shelllink.c

Modified: trunk/rostests/winetests/shell32/progman_dde.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/progman_...
==============================================================================
--- trunk/rostests/winetests/shell32/progman_dde.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/shell32/progman_dde.c	[iso-8859-1] Sat Jun 29 17:35:05 2013
@@ -695,6 +695,11 @@

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;

Modified: trunk/rostests/winetests/shell32/shlexec.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlexec....
==============================================================================
--- trunk/rostests/winetests/shell32/shlexec.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/shell32/shlexec.c	[iso-8859-1] Sat Jun 29 17:35:05 2013
@@ -58,7 +58,7 @@
 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 @@
     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 @@
     CloseHandle(map);
     hook_WaitForInputIdle((void *) WaitForInputIdle);
 }
-#endif

#define DDE_DEFAULT_APP_VARIANTS 2
 typedef struct
@@ -2287,7 +2285,6 @@
     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 @@
     assert(DdeFreeStringHandle(ddeInst, hszApplication));
     assert(DdeUninitialize(ddeInst));
 }
-#endif

static void init_test(void)
 {
@@ -2662,12 +2658,16 @@
     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();

Modified: trunk/rostests/winetests/shell32/testlist.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/testlist...
==============================================================================
--- trunk/rostests/winetests/shell32/testlist.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/shell32/testlist.c	[iso-8859-1] Sat Jun 29 17:35:05 2013
@@ -12,7 +12,7 @@
 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 @@
     { "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 },