Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 17:42:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32]

Browse source 
Properly disable DDE tests.

svn path=/trunk/; revision=59367
This commit is contained in:
Sylvain Petreolle 2013-06-29 17:35:05 +00:00
parent d405d25f8c
commit f5fbeb377b
4 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rostests/winetests/shell32/CMakeLists.txt
View file

@ -10,7 +10,7 @@ list(APPEND SOURCE
brsfolder.c brsfolder.c
ebrowser.c ebrowser.c
generated.c generated.c
#progman_dde.c FIXME: CORE-6559 progman_dde.c
recyclebin.c recyclebin.c
shelldispatch.c shelldispatch.c
shelllink.c shelllink.c

5
rostests/winetests/shell32/progman_dde.c
View file

@ -695,6 +695,11 @@ static void DdeTestProgman2(DWORD instance, HCONV hConv, int testnum)
START_TEST(progman_dde) 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; DWORD instance = 0;
UINT err; UINT err;
HSZ hszProgman; HSZ hszProgman;

14
rostests/winetests/shell32/shlexec.c
View file

@ -58,7 +58,7 @@ static char tmpdir[MAX_PATH];
static char child_file[MAX_PATH]; static char child_file[MAX_PATH];
static DLLVERSIONINFO dllver; static DLLVERSIONINFO dllver;
static BOOL skip_noassoc_tests = FALSE; 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; int todo;
} dde_tests_t; } dde_tests_t;
#if CORE_6559_IS_FIXED
static dde_tests_t dde_tests[] = static dde_tests_t dde_tests[] =
{ {
/* Test passing and not passing command-line /* Test passing and not passing command-line
@ -2276,7 +2275,6 @@ static void test_dde(void)
CloseHandle(map); CloseHandle(map);
hook_WaitForInputIdle((void *) WaitForInputIdle); hook_WaitForInputIdle((void *) WaitForInputIdle);
} }
#endif
#define DDE_DEFAULT_APP_VARIANTS 2 #define DDE_DEFAULT_APP_VARIANTS 2
typedef struct typedef struct
@ -2287,7 +2285,6 @@ typedef struct
int rc[DDE_DEFAULT_APP_VARIANTS]; int rc[DDE_DEFAULT_APP_VARIANTS];
} dde_default_app_tests_t; } dde_default_app_tests_t;
#if CORE_6559_IS_FIXED
static dde_default_app_tests_t dde_default_app_tests[] = static dde_default_app_tests_t dde_default_app_tests[] =
{ {
/* Windows XP and 98 handle default DDE app names in different ways. /* 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(DdeFreeStringHandle(ddeInst, hszApplication));
assert(DdeUninitialize(ddeInst)); assert(DdeUninitialize(ddeInst));
} }
#endif
static void init_test(void) static void init_test(void)
{ {
@ -2662,12 +2658,16 @@ START_TEST(shlexec)
test_find_executable(); test_find_executable();
test_lnks(); test_lnks();
test_exes(); test_exes();
#if CORE_6559_IS_FIXED if(winetest_interactive)
{
test_dde(); test_dde();
test_dde_default_app(); 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() 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"); win_skip("Skipping test_dde_default_app() until we have a sane DDE implementation. CORE-6559.\n");
}
test_directory(); test_directory();
cleanup_test(); cleanup_test();

4
rostests/winetests/shell32/testlist.c
View file

@ -12,7 +12,7 @@ extern void func_autocomplete(void);
extern void func_brsfolder(void); extern void func_brsfolder(void);
extern void func_ebrowser(void); extern void func_ebrowser(void);
extern void func_generated(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_recyclebin(void);
extern void func_shelldispatch(void); extern void func_shelldispatch(void);
extern void func_shelllink(void); extern void func_shelllink(void);
@ -34,7 +34,7 @@ const struct test winetest_testlist[] =
{ "brsfolder", func_brsfolder }, { "brsfolder", func_brsfolder },
{ "ebrowser", func_ebrowser }, { "ebrowser", func_ebrowser },
{ "generated", func_generated }, { "generated", func_generated },
// { "progman_dde", func_progman_dde }, FIXME: bug 7233 { "progman_dde", func_progman_dde },
{ "recyclebin", func_recyclebin }, { "recyclebin", func_recyclebin },
{ "shelldispatch", func_shelldispatch }, { "shelldispatch", func_shelldispatch },
{ "shelllink", func_shelllink }, { "shelllink", func_shelllink },