[ros-diffs] [akhaldi] 57056: [SHELL32_WINETEST] * Skip tests that rely on DDE. See bug #7233 for more details.

Author: akhaldi
Date: Sat Aug 11 16:24:36 2012
New Revision: 57056

URL: http://svn.reactos.org/svn/reactos?rev=57056&view=rev
Log:
[SHELL32_WINETEST]
* Skip tests that rely on DDE. See bug #7233 for more details.

Modified:
    trunk/rostests/winetests/shell32/CMakeLists.txt
    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/CMakeLi…
==============================================================================
--- trunk/rostests/winetests/shell32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/shell32/CMakeLists.txt [iso-8859-1] Sat Aug 11 16:24:36 2012
@@ -12,7 +12,7 @@
     brsfolder.c
     ebrowser.c
     generated.c
-    progman_dde.c
+    #progman_dde.c FIXME: bug 7233
     recyclebin.c
     shelldispatch.c
     shelllink.c

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 Aug 11 16:24:36 2012
@@ -57,7 +57,7 @@
 static char child_file[MAX_PATH];
 static DLLVERSIONINFO dllver;
 static BOOL skip_noassoc_tests = FALSE;
-static HANDLE dde_ready_event;
+//static HANDLE dde_ready_event; FIXME: bug 7233
 
 
 /***
@@ -1624,6 +1624,7 @@
     int todo;
 } dde_tests_t;
 
+#if BUG_7233_IS_FIXED
 static dde_tests_t dde_tests[] =
 {
     /* Test passing and not passing command-line
@@ -1820,6 +1821,7 @@
     CloseHandle(map);
     hook_WaitForInputIdle((void *) WaitForInputIdle);
 }
+#endif
 
 #define DDE_DEFAULT_APP_VARIANTS 2
 typedef struct
@@ -1830,6 +1832,7 @@
     int rc[DDE_DEFAULT_APP_VARIANTS];
 } dde_default_app_tests_t;
 
+#if BUG_7233_IS_FIXED
 static dde_default_app_tests_t dde_default_app_tests[] =
 {
     /* Windows XP and 98 handle default DDE app names in different ways.
@@ -1988,6 +1991,7 @@
     assert(DdeFreeStringHandle(ddeInst, hszApplication));
     assert(DdeUninitialize(ddeInst));
 }
+#endif
 
 static void init_test(void)
 {
@@ -2278,8 +2282,12 @@
     test_lnks();
     test_exes();
     test_exes_long();
+#if BUG_7233_IS_FIXED
     test_dde();
     test_dde_default_app();
+#endif
+    win_skip("Skipping test_dde() until we have a sane DDE implementation. Bug
7233.\n");
+    win_skip("Skipping test_dde_default_app() until we have a sane DDE
implementation. Bug 7233.\n");
     test_commandline();
     test_directory();
 

Modified: trunk/rostests/winetests/shell32/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/testlis…
==============================================================================
--- trunk/rostests/winetests/shell32/testlist.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/shell32/testlist.c [iso-8859-1] Sat Aug 11 16:24:36 2012
@@ -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);
+//extern void func_progman_dde(void); FIXME: bug 7233
 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 },
+//    { "progman_dde", func_progman_dde }, FIXME: bug 7233
     { "recyclebin", func_recyclebin },
     { "shelldispatch", func_shelldispatch },
     { "shelllink", func_shelllink },