From 850dcad17d1c9285c6b24634042cbcdd00add615 Mon Sep 17 00:00:00 2001 From: Mike Hearn Date: Tue, 20 Jul 2004 01:20:50 +0000 Subject: [PATCH] Make STARTUPINFO.lpDesktop tests pass on NT. --- dlls/kernel/tests/process.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/kernel/tests/process.c b/dlls/kernel/tests/process.c index 0d745c89e2a..490c1b7fa08 100644 --- a/dlls/kernel/tests/process.c +++ b/dlls/kernel/tests/process.c @@ -905,7 +905,7 @@ static void test_SuspendFlag(void) { char buffer[MAX_PATH]; PROCESS_INFORMATION info; - STARTUPINFOA startup; + STARTUPINFOA startup, us; DWORD exit_status; /* let's start simplistic */ @@ -928,8 +928,10 @@ static void test_SuspendFlag(void) /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + GetStartupInfoA(&us); + okChildInt("StartupInfoA", "cb", startup.cb); - okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); + okChildString("StartupInfoA", "lpDesktop", us.lpDesktop); okChildString("StartupInfoA", "lpTitle", startup.lpTitle); okChildInt("StartupInfoA", "dwX", startup.dwX); okChildInt("StartupInfoA", "dwY", startup.dwY); @@ -948,7 +950,7 @@ static void test_DebuggingFlag(void) { char buffer[MAX_PATH]; PROCESS_INFORMATION info; - STARTUPINFOA startup; + STARTUPINFOA startup, us; DEBUG_EVENT de; unsigned dbg = 0; @@ -976,8 +978,10 @@ static void test_DebuggingFlag(void) /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + GetStartupInfoA(&us); + okChildInt("StartupInfoA", "cb", startup.cb); - okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); + okChildString("StartupInfoA", "lpDesktop", us.lpDesktop); okChildString("StartupInfoA", "lpTitle", startup.lpTitle); okChildInt("StartupInfoA", "dwX", startup.dwX); okChildInt("StartupInfoA", "dwY", startup.dwY); @@ -996,7 +1000,7 @@ static void test_Console(void) { char buffer[MAX_PATH]; PROCESS_INFORMATION info; - STARTUPINFOA startup; + STARTUPINFOA startup, us; SECURITY_ATTRIBUTES sa; CONSOLE_SCREEN_BUFFER_INFO sbi, sbiC; DWORD modeIn, modeOut, modeInC, modeOutC; @@ -1059,8 +1063,10 @@ static void test_Console(void) SetConsoleCP(cpIn); SetConsoleOutputCP(cpOut); + GetStartupInfoA(&us); + okChildInt("StartupInfoA", "cb", startup.cb); - okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); + okChildString("StartupInfoA", "lpDesktop", us.lpDesktop); okChildString("StartupInfoA", "lpTitle", startup.lpTitle); okChildInt("StartupInfoA", "dwX", startup.dwX); okChildInt("StartupInfoA", "dwY", startup.dwY);