Make STARTUPINFO.lpDesktops test pass on NT

Mike Hearn mike at navi.cx
Sat Jul 17 12:43:04 CDT 2004


Mike Hearn <mike at navi.cx>
Make STARTUPINFO.lpDesktop tests pass on NT

Index: dlls/kernel/tests/process.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/tests/process.c,v
retrieving revision 1.15
diff -u -p -r1.15 process.c
--- dlls/kernel/tests/process.c 6 Feb 2004 05:24:34 -0000       1.15
+++ dlls/kernel/tests/process.c 17 Jul 2004 17:39:04 -0000
@@ -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);





More information about the wine-patches mailing list