Skip to content

W
wine-cw
Commit 850dcad1 authored by Mike Hearn's avatar Mike Hearn Committed by Alexandre Julliard
Browse files
Options

Make STARTUPINFO.lpDesktop tests pass on NT.

parent 3a1391b8
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 6 deletions
dlls/kernel/tests/process.c
View file @ 850dcad1
...@@ -905,7 +905,7 @@ static void test_SuspendFlag(void) ...@@ -905,7 +905,7 @@ static void test_SuspendFlag(void)
{ {
char buffer[MAX_PATH]; char buffer[MAX_PATH];
PROCESS_INFORMATION info; PROCESS_INFORMATION info;
STARTUPINFOA startup; STARTUPINFOA startup, us;
DWORD exit_status; DWORD exit_status;
/* let's start simplistic */ /* let's start simplistic */
...@@ -928,8 +928,10 @@ static void test_SuspendFlag(void) ...@@ -928,8 +928,10 @@ static void test_SuspendFlag(void)
/* child process has changed result file, so let profile functions know about it */ /* child process has changed result file, so let profile functions know about it */
WritePrivateProfileStringA(NULL, NULL, NULL, resfile); WritePrivateProfileStringA(NULL, NULL, NULL, resfile);
GetStartupInfoA(&us);
okChildInt("StartupInfoA", "cb", startup.cb); okChildInt("StartupInfoA", "cb", startup.cb);
okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); okChildString("StartupInfoA", "lpDesktop", us.lpDesktop);
okChildString("StartupInfoA", "lpTitle", startup.lpTitle); okChildString("StartupInfoA", "lpTitle", startup.lpTitle);
okChildInt("StartupInfoA", "dwX", startup.dwX); okChildInt("StartupInfoA", "dwX", startup.dwX);
okChildInt("StartupInfoA", "dwY", startup.dwY); okChildInt("StartupInfoA", "dwY", startup.dwY);
...@@ -948,7 +950,7 @@ static void test_DebuggingFlag(void) ...@@ -948,7 +950,7 @@ static void test_DebuggingFlag(void)
{ {
char buffer[MAX_PATH]; char buffer[MAX_PATH];
PROCESS_INFORMATION info; PROCESS_INFORMATION info;
STARTUPINFOA startup; STARTUPINFOA startup, us;
DEBUG_EVENT de; DEBUG_EVENT de;
unsigned dbg = 0; unsigned dbg = 0;
...@@ -976,8 +978,10 @@ static void test_DebuggingFlag(void) ...@@ -976,8 +978,10 @@ static void test_DebuggingFlag(void)
/* child process has changed result file, so let profile functions know about it */ /* child process has changed result file, so let profile functions know about it */
WritePrivateProfileStringA(NULL, NULL, NULL, resfile); WritePrivateProfileStringA(NULL, NULL, NULL, resfile);
GetStartupInfoA(&us);
okChildInt("StartupInfoA", "cb", startup.cb); okChildInt("StartupInfoA", "cb", startup.cb);
okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); okChildString("StartupInfoA", "lpDesktop", us.lpDesktop);
okChildString("StartupInfoA", "lpTitle", startup.lpTitle); okChildString("StartupInfoA", "lpTitle", startup.lpTitle);
okChildInt("StartupInfoA", "dwX", startup.dwX); okChildInt("StartupInfoA", "dwX", startup.dwX);
okChildInt("StartupInfoA", "dwY", startup.dwY); okChildInt("StartupInfoA", "dwY", startup.dwY);
...@@ -996,7 +1000,7 @@ static void test_Console(void) ...@@ -996,7 +1000,7 @@ static void test_Console(void)
{ {
char buffer[MAX_PATH]; char buffer[MAX_PATH];
PROCESS_INFORMATION info; PROCESS_INFORMATION info;
STARTUPINFOA startup; STARTUPINFOA startup, us;
SECURITY_ATTRIBUTES sa; SECURITY_ATTRIBUTES sa;
CONSOLE_SCREEN_BUFFER_INFO sbi, sbiC; CONSOLE_SCREEN_BUFFER_INFO sbi, sbiC;
DWORD modeIn, modeOut, modeInC, modeOutC; DWORD modeIn, modeOut, modeInC, modeOutC;
...@@ -1059,8 +1063,10 @@ static void test_Console(void) ...@@ -1059,8 +1063,10 @@ static void test_Console(void)
SetConsoleCP(cpIn); SetConsoleCP(cpIn);
SetConsoleOutputCP(cpOut); SetConsoleOutputCP(cpOut);
GetStartupInfoA(&us);
okChildInt("StartupInfoA", "cb", startup.cb); okChildInt("StartupInfoA", "cb", startup.cb);
okChildString("StartupInfoA", "lpDesktop", startup.lpDesktop); okChildString("StartupInfoA", "lpDesktop", us.lpDesktop);
okChildString("StartupInfoA", "lpTitle", startup.lpTitle); okChildString("StartupInfoA", "lpTitle", startup.lpTitle);
okChildInt("StartupInfoA", "dwX", startup.dwX); okChildInt("StartupInfoA", "dwX", startup.dwX);
okChildInt("StartupInfoA", "dwY", startup.dwY); okChildInt("StartupInfoA", "dwY", startup.dwY);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment