From: Eric Pouech epouech@codeweavers.com
Signed-off-by: Eric Pouech epouech@codeweavers.com --- dlls/kernel32/tests/console.c | 114 ++++++++++++++++++++++++++++++++-- 1 file changed, 110 insertions(+), 4 deletions(-)
diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index f3fc5ed641e..b3794081201 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -4938,7 +4938,7 @@ static BOOL save_blackbox(const char* file, void* blackbox, int size) return TRUE; }
-enum inheritance_model {H_NULL, H_CONSOLE, H_FILE}; +enum inheritance_model {H_NULL, H_INVALID, H_DEVIL, H_CONSOLE, H_DISK, H_CHAR, H_PIPE};
#define ARG_STD 0x80000000 #define ARG_STARTUPINFO 0x00000000 @@ -4946,11 +4946,19 @@ enum inheritance_model {H_NULL, H_CONSOLE, H_FILE}; #define ARG_MODEL_MASK (~0xff000000)
#define STD_NULL (ARG_STD | H_NULL) +#define STD_INVALID (ARG_STD | H_INVALID) +#define STD_DEVIL (ARG_STD | H_DEVIL) #define STD_CONSOLE (ARG_STD | ARG_CP_INHERIT | H_CONSOLE) -#define STD_FILE (ARG_STD | ARG_CP_INHERIT | H_FILE) +#define STD_CHAR (ARG_STD | ARG_CP_INHERIT | H_CHAR) +#define STD_DISK (ARG_STD | ARG_CP_INHERIT | H_DISK) +#define STD_PIPE (ARG_STD | ARG_CP_INHERIT | H_PIPE) #define STINFO_NULL (ARG_STARTUPINFO | H_NULL) +#define STINFO_INVALID (ARG_STARTUPINFO | H_INVALID) +#define STINFO_DEVIL (ARG_STARTUPINFO | H_DEVIL) #define STINFO_CONSOLE (ARG_STARTUPINFO | ARG_CP_INHERIT | H_CONSOLE) -#define STINFO_FILE (ARG_STARTUPINFO | ARG_CP_INHERIT | H_FILE) +#define STINFO_CHAR (ARG_STARTUPINFO | ARG_CP_INHERIT | H_CHAR) +#define STINFO_DISK (ARG_STARTUPINFO | ARG_CP_INHERIT | H_DISK) +#define STINFO_PIPE (ARG_STARTUPINFO | ARG_CP_INHERIT | H_PIPE)
struct black_box { @@ -4969,6 +4977,7 @@ static BOOL check_child_console_bits(const char* exec, DWORD flags, unsigned arg DWORD ret; BOOL needs_close = FALSE; char blackbox_file[MAX_PATH]; + char file[MAX_PATH] = {'\0'}; HANDLE hin, hout, herr;
get_temp_file_name(blackbox_file); @@ -4983,6 +4992,14 @@ static BOOL check_child_console_bits(const char* exec, DWORD flags, unsigned arg case H_NULL: hin = hout = herr = NULL; break; + case H_INVALID: + hin = hout = herr = INVALID_HANDLE_VALUE; + break; + case H_DEVIL: + hin = (HANDLE)(ULONG_PTR)0x666000; + hout = (HANDLE)(ULONG_PTR)0x666100; + herr = (HANDLE)(ULONG_PTR)0x666200; + break; case H_CONSOLE: hin = CreateFileA("CONIN$", GENERIC_READ, 0, &sa, OPEN_EXISTING, 0, 0); ok(hin != INVALID_HANDLE_VALUE, "Couldn't create input to console\n"); @@ -4991,7 +5008,7 @@ static BOOL check_child_console_bits(const char* exec, DWORD flags, unsigned arg herr = hout; needs_close = TRUE; break; - case H_FILE: + case H_CHAR: hin = CreateFileA("NUL", GENERIC_READ, 0, &sa, OPEN_EXISTING, 0, 0); ok(hin != INVALID_HANDLE_VALUE, "Couldn't create input to console\n"); hout = CreateFileA("NUL", GENERIC_READ|GENERIC_WRITE, 0, &sa, OPEN_EXISTING, 0, 0); @@ -4999,6 +5016,21 @@ static BOOL check_child_console_bits(const char* exec, DWORD flags, unsigned arg herr = hout; needs_close = TRUE; break; + case H_DISK: + get_temp_file_name(file); + hin = CreateFileA(file, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, OPEN_EXISTING, 0, 0); + ok(hin != INVALID_HANDLE_VALUE, "Couldn't create input to console\n"); + hout = CreateFileA(file, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, OPEN_EXISTING, 0, 0); + ok(hout != INVALID_HANDLE_VALUE, "Couldn't create input to console\n"); + herr = hout; + needs_close = TRUE; + break; + case H_PIPE: + res = CreatePipe(&hin, &hout, &sa, 0); + ok(res, "Couldn't create anon pipe\n"); + needs_close = TRUE; + herr = hout; + break; default: ok(0, "Unsupported handle type %x\n", args & ARG_MODEL_MASK); return FALSE; @@ -5033,6 +5065,7 @@ static BOOL check_child_console_bits(const char* exec, DWORD flags, unsigned arg } if (res) res = load_blackbox(blackbox_file, result, sizeof(*result)); + if (file[0]) DeleteFileA(file); DeleteFileA(blackbox_file); return res; } @@ -5062,6 +5095,10 @@ static BOOL check_child_console_bits(const char* exec, DWORD flags, unsigned arg
#define CP_CHAR_VALID (CP_STREAM_(CP_STREAM_ATTR_TYPE | FILE_TYPE_CHAR, CP_INPUT_STREAM) | \ CP_STREAM_(CP_STREAM_ATTR_TYPE | FILE_TYPE_CHAR, CP_OUTPUT_STREAM)) +#define CP_DISK_VALID (CP_STREAM_(CP_STREAM_ATTR_TYPE | FILE_TYPE_DISK, CP_INPUT_STREAM) | \ + CP_STREAM_(CP_STREAM_ATTR_TYPE | FILE_TYPE_DISK, CP_OUTPUT_STREAM)) +#define CP_PIPE_VALID (CP_STREAM_(CP_STREAM_ATTR_TYPE | FILE_TYPE_PIPE, CP_INPUT_STREAM) | \ + CP_STREAM_(CP_STREAM_ATTR_TYPE | FILE_TYPE_PIPE, CP_OUTPUT_STREAM)) #define CP_UNKNOWN_VALID (CP_STREAM_(CP_STREAM_ATTR_TYPE | FILE_TYPE_UNKNOWN, CP_INPUT_STREAM) | \ CP_STREAM_(CP_STREAM_ATTR_TYPE | FILE_TYPE_UNKNOWN, CP_OUTPUT_STREAM))
@@ -5188,6 +5225,63 @@ static void test_CreateProcessCUI(void) {TRUE, CREATE_NEW_PROCESS_GROUP | DETACHED_PROCESS, STD_CONSOLE, FALSE, CP_GROUP_LEADER | CP_NO_STREAM}, {FALSE, CREATE_NEW_PROCESS_GROUP | DETACHED_PROCESS, STD_CONSOLE, FALSE, CP_GROUP_LEADER | CP_NO_STREAM}, }; + static struct std_handles_inh_tests + { + /* input */ + BOOL use_cui; + unsigned args; + /* output */ + DWORD expected; + BOOL is_todo; + DWORD is_broken; + } + std_handles_inh_tests[] = + { +/* 0*/ {FALSE, STINFO_DISK, CP_DISK_VALID}, + {FALSE, STD_DISK, CP_DISK_VALID}, + {FALSE, STINFO_PIPE, CP_PIPE_VALID}, + {FALSE, STD_PIPE, CP_PIPE_VALID}, + {FALSE, STINFO_CHAR, CP_CHAR_VALID}, +/* 5*/ {FALSE, STD_CHAR, CP_CHAR_VALID}, + + /* no handle inheritance flags in CreateProcess */ + {FALSE, ARG_STARTUPINFO | H_DISK, CP_NO_STREAM, .is_todo = TRUE, .is_broken = CP_UNKNOWN_VALID}, + {FALSE, ARG_STD | H_DISK, CP_NO_STREAM, .is_todo = TRUE}, + {FALSE, ARG_STARTUPINFO | H_CHAR, CP_NO_STREAM, .is_todo = TRUE, .is_broken = CP_UNKNOWN_VALID}, + {FALSE, ARG_STD | H_CHAR, CP_NO_STREAM, .is_todo = TRUE}, +/*10*/ {FALSE, ARG_STARTUPINFO | H_PIPE, CP_NO_STREAM, .is_todo = TRUE, .is_broken = CP_UNKNOWN_VALID}, + {FALSE, ARG_STD | H_PIPE, CP_NO_STREAM, .is_todo = TRUE}, + + {FALSE, STINFO_DEVIL, CP_NO_STREAM, .is_broken = CP_UNKNOWN_VALID}, + {FALSE, STD_DEVIL, CP_NO_STREAM, + .is_broken = CP_STREAM_(CP_STREAM_ATTR_INVALID, CP_INPUT_STREAM) | CP_STREAM_(CP_STREAM_ATTR_INVALID, CP_OUTPUT_STREAM)}, + {FALSE, STINFO_INVALID, CP_NO_STREAM, + .is_broken = CP_STREAM_(CP_STREAM_ATTR_INVALID, CP_INPUT_STREAM) | CP_STREAM_(CP_STREAM_ATTR_INVALID, CP_OUTPUT_STREAM)}, +/*15*/ {FALSE, STD_INVALID, CP_NO_STREAM}, + + {TRUE, STINFO_DISK, CP_WITH_CONSOLE | CP_WITH_HANDLE | CP_WITH_WINDOW | CP_DISK_VALID}, + {TRUE, STD_DISK, CP_WITH_CONSOLE | CP_WITH_HANDLE | CP_WITH_WINDOW | CP_DISK_VALID}, + {TRUE, STINFO_PIPE, CP_WITH_CONSOLE | CP_WITH_HANDLE | CP_WITH_WINDOW | CP_PIPE_VALID}, + {TRUE, STD_PIPE, CP_WITH_CONSOLE | CP_WITH_HANDLE | CP_WITH_WINDOW | CP_PIPE_VALID}, + + /* no handle inheritance flags in CreateProcess */ +/*20*/ {TRUE, ARG_STARTUPINFO | H_DISK, CP_WITH_CONSOLE | CP_WITH_HANDLE | CP_WITH_WINDOW | CP_NO_STREAM, .is_todo = TRUE, + .is_broken = CP_WITH_CONSOLE | CP_WITH_HANDLE | CP_WITH_WINDOW | CP_UNKNOWN_VALID}, + {TRUE, ARG_STD | H_DISK, CP_WITH_CONSOLE | CP_WITH_HANDLE | CP_WITH_WINDOW | CP_DISK_VALID}, + {TRUE, ARG_STARTUPINFO | H_CHAR, CP_WITH_CONSOLE | CP_WITH_HANDLE | CP_WITH_WINDOW | CP_NO_STREAM, .is_todo = TRUE, + .is_broken = CP_WITH_CONSOLE | CP_WITH_HANDLE | CP_WITH_WINDOW | CP_UNKNOWN_VALID}, + {TRUE, ARG_STD | H_CHAR, CP_WITH_CONSOLE | CP_WITH_HANDLE | CP_WITH_WINDOW | CP_CHAR_VALID}, + {TRUE, ARG_STARTUPINFO | H_PIPE, CP_WITH_CONSOLE | CP_WITH_HANDLE | CP_WITH_WINDOW | CP_NO_STREAM, .is_todo = TRUE, + .is_broken = CP_WITH_CONSOLE | CP_WITH_HANDLE | CP_WITH_WINDOW | CP_UNKNOWN_VALID}, +/*25*/ {TRUE, ARG_STD | H_PIPE, CP_WITH_CONSOLE | CP_WITH_HANDLE | CP_WITH_WINDOW | CP_PIPE_VALID}, + + {TRUE, STINFO_DEVIL, CP_WITH_CONSOLE | CP_WITH_HANDLE | CP_WITH_WINDOW | CP_NO_STREAM, .is_broken = CP_WITH_CONSOLE | CP_WITH_HANDLE | CP_WITH_WINDOW | CP_UNKNOWN_VALID}, + {TRUE, STD_DEVIL, CP_WITH_CONSOLE | CP_WITH_HANDLE | CP_WITH_WINDOW | CP_NO_STREAM}, + {TRUE, STINFO_INVALID, CP_WITH_CONSOLE | CP_WITH_HANDLE | CP_WITH_WINDOW | CP_NO_STREAM, + .is_broken = CP_WITH_CONSOLE | CP_WITH_HANDLE | CP_WITH_WINDOW | CP_STREAM_(CP_STREAM_ATTR_INVALID, CP_INPUT_STREAM) | CP_STREAM_(CP_STREAM_ATTR_INVALID, CP_OUTPUT_STREAM)}, + {TRUE, STD_INVALID, CP_WITH_CONSOLE | CP_WITH_HANDLE | CP_WITH_WINDOW | CP_NO_STREAM, + .is_broken = CP_WITH_CONSOLE | CP_WITH_HANDLE | CP_WITH_WINDOW | CP_UNKNOWN_VALID}, + };
hstd[0] = GetStdHandle(STD_INPUT_HANDLE); hstd[1] = GetStdHandle(STD_OUTPUT_HANDLE); @@ -5251,6 +5345,18 @@ static void test_CreateProcessCUI(void)
RtlGetCurrentPeb()->ProcessParameters->ConsoleFlags = saved_console_flags;
+ for (i = 0; i < ARRAY_SIZE(std_handles_inh_tests); i++) + { + res = check_child_console_bits(std_handles_inh_tests[i].use_cui ? cuiexec : guiexec, + 0, std_handles_inh_tests[i].args, + &result); + todo_wine_if(std_handles_inh_tests[i].is_todo) + ok(result.bitmask == std_handles_inh_tests[i].expected || + broken(std_handles_inh_tests[i].is_broken && result.bitmask == std_handles_inh_tests[i].is_broken), + "[%d] Unexpected result %x (%lx)\n", + i, result.bitmask, std_handles_inh_tests[i].expected); + } + DeleteFileA(guiexec); DeleteFileA(cuiexec);