Changeset 1291 for trunk/src

Timestamp:

Oct 14, 1999, 5:15:22 PM (26 years ago)

Author:

phaller

Message:

Fix: GetStartupInfo extended

File:

• trunk/src/kernel32/KERNEL32.CPP (modified) (5 diffs)

trunk/src/kernel32/KERNEL32.CPP

@@ -1 @@
-/* $Id: KERNEL32.CPP,v 1.21 1999-10-04 22:25:01 phaller Exp $ */
+/* $Id: KERNEL32.CPP,v 1.22 1999-10-14 15:15:22 phaller Exp $ */
 
 /*
@@ -19 +19 @@
  * Includes                                                                  *
  *****************************************************************************/
+
+#include <odin.h>
+#include <odinwrap.h>
+#include <os2sel.h>
+
 #include <os2win.h>
 #include <winnt.h>
@@ -37 +42 @@
  * Defines                                                                   *
  *****************************************************************************/
+
+ODINDEBUGCHANNEL(KERNEL32-KERNEL32)
 
                 /* this define enables certain less important debug messages */
@@ -675 +682 @@
 //Borrowed from Wine
 //******************************************************************************
-VOID WIN32API GetStartupInfoA(LPSTARTUPINFOA lpStartupInfo)
-{
-  dprintf(("KERNEL32:  GetStartupInfo\n"));
-  lpStartupInfo->cb = sizeof(STARTUPINFOA);
-  lpStartupInfo->lpReserved = "<Reserved>";
-  lpStartupInfo->lpDesktop = "Desktop";
-  lpStartupInfo->lpTitle = "Title";
-
-  lpStartupInfo->cbReserved2 = 0;
-  lpStartupInfo->lpReserved2 = NULL; /* must be NULL for VC runtime */
-
+ODINPROCEDURE1(GetStartupInfoA,LPSTARTUPINFOA,lpStartupInfo)
+{
+  lpStartupInfo->cb               = sizeof(STARTUPINFOA);
+  lpStartupInfo->lpReserved       = "<Reserved>";
+  lpStartupInfo->lpDesktop        = "Desktop";
+  lpStartupInfo->lpTitle          = "Title";
+  lpStartupInfo->dwX              = 0;
+  lpStartupInfo->dwY              = 0;
+  lpStartupInfo->dwXSize          = 640;
+  lpStartupInfo->dwYSize          = 480;
+  lpStartupInfo->dwXCountChars    = 80;      // for console
+  lpStartupInfo->dwYCountChars    = 25;
+  lpStartupInfo->dwFillAttribute  = 0x0720;
+  lpStartupInfo->dwFlags          = STARTF_USESHOWWINDOW   |
+                                    STARTF_USEPOSITION     |
+                                    STARTF_USESIZE         |
+                                    STARTF_USECOUNTCHARS   |
+                                    STARTF_USEFILLATTRIBUTE|
+                                    STARTF_USESTDHANDLES;
+  lpStartupInfo->wShowWindow      = SW_SHOWDEFAULT;
+  lpStartupInfo->cbReserved2      = 0;
+  lpStartupInfo->lpReserved2      = NULL; /* must be NULL for VC runtime */
   /* @@@PH 98/07/13 Handlemanager support */
-  lpStartupInfo->hStdInput   = GetStdHandle(STD_INPUT_HANDLE);
-  lpStartupInfo->hStdOutput  = GetStdHandle(STD_OUTPUT_HANDLE);
-  lpStartupInfo->hStdError   = GetStdHandle(STD_ERROR_HANDLE);
+  lpStartupInfo->hStdInput        = GetStdHandle(STD_INPUT_HANDLE);
+  lpStartupInfo->hStdOutput       = GetStdHandle(STD_OUTPUT_HANDLE);
+  lpStartupInfo->hStdError        = GetStdHandle(STD_ERROR_HANDLE);
   return;
 }
@@ -695 +713 @@
 //Borrowed from Wine
 //******************************************************************************
-VOID WIN32API GetStartupInfoW(LPSTARTUPINFOW lpStartupInfo)
-{
- static WCHAR lpReserved[] = {'<', 'R','e','s','e','r','v','e','d','>', 0};
- static WCHAR lpDesktop[]  = {'D', 'e','s','k','t','o','p', 0};
- static WCHAR lpTitle[]    = {'T', 'i','t','l','e', 0};
-
-  dprintf(("KERNEL32: GetStartupInfoW\n"));
+ODINPROCEDURE1(GetStartupInfoW,LPSTARTUPINFOW,lpStartupInfo)
+{
+  static WCHAR lpReserved[] = {'<', 'R','e','s','e','r','v','e','d','>', 0};
+  static WCHAR lpDesktop[]  = {'D', 'e','s','k','t','o','p', 0};
+  static WCHAR lpTitle[]    = {'T', 'i','t','l','e', 0};
+
+  // forward call to ascii variant
+  GetStartupInfoA((LPSTARTUPINFOA)lpStartupInfo);
   lpStartupInfo->cb          = sizeof(STARTUPINFOW);
   lpStartupInfo->lpReserved  = lpReserved;
   lpStartupInfo->lpDesktop   = lpDesktop;
   lpStartupInfo->lpTitle     = lpTitle;
-
-  lpStartupInfo->cbReserved2 = 0;
-  lpStartupInfo->lpReserved2 = NULL; /* must be NULL for VC runtime */
-
-  /* @@@PH 98/07/13 Handlemanager support */
-  lpStartupInfo->hStdInput   = GetStdHandle(STD_INPUT_HANDLE);
-  lpStartupInfo->hStdOutput  = GetStdHandle(STD_OUTPUT_HANDLE);
-  lpStartupInfo->hStdError   = GetStdHandle(STD_ERROR_HANDLE);
   return;
 }