Changeset 1975 for trunk/src

Timestamp:

Dec 5, 1999, 11:02:31 AM (26 years ago)

Author:

sandervl

Message:

Changed definition of lstrcpy(n)AtoW/WtoA + CreateProcessA logging change

Location:

trunk/src/kernel32

Files:

• heapstring.cpp (modified) (6 diffs)
• wprocess.cpp (modified) (3 diffs)

trunk/src/kernel32/heapstring.cpp

@@ -1 @@
-/* $Id: heapstring.cpp,v 1.19 1999-11-09 19:22:32 sandervl Exp $ */
+/* $Id: heapstring.cpp,v 1.20 1999-12-05 10:02:30 sandervl Exp $ */
 
 /*
@@ -509 +509 @@
 
 int WIN32API lstrcpynWtoA(LPSTR  astring,
-                          LPWSTR ustring,
+                          LPCWSTR ustring,
                           int    unilen)
 {
@@ -588 +588 @@
 // @@@PH 0 termination is NOT necessarily included !
 int WIN32API lstrcpynAtoW(LPWSTR unicode,
-                          LPSTR  ascii,
+                          LPCSTR  ascii,
                           int    asciilen)
 {
@@ -623 +623 @@
     }
 
-    in_buf        = ascii;
+    in_buf        = (LPSTR)ascii;
 
     //@@@PH what's this?
@@ -679 +679 @@
  *****************************************************************************/
 
-LPSTR WIN32API lstrcpyWtoA(LPSTR ascii, LPWSTR unicode)
+LPSTR WIN32API lstrcpyWtoA(LPSTR ascii, LPCWSTR unicode)
 {
   //@@@PH huh? wuz dat?
   if (unicode == NULL)
   {
-    if (unicode != NULL) unicode[0] = 0; //CB: set at least end
+    if (unicode != NULL) ((LPWSTR)unicode)[0] = 0; //CB: set at least end
     return NULL;
   }
@@ -712 +712 @@
  *****************************************************************************/
 
-LPWSTR WIN32API lstrcpyAtoW(LPWSTR unicode, LPSTR ascii)
+LPWSTR WIN32API lstrcpyAtoW(LPWSTR unicode, LPCSTR ascii)
 {
   /* achimha for security, strlen might trap if garbage in */

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.54 1999-12-01 18:40:49 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.55 1999-12-05 10:02:31 sandervl Exp $ */
 
 /*
@@ -624 +624 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API CreateProcessA(LPCSTR lpszImageName, LPSTR lpszCommandLine,
-                       PSECURITY_ATTRIBUTES arg3,
-                             PSECURITY_ATTRIBUTES arg4, BOOL arg5, DWORD arg6,
-                             PVOID arg7, LPCSTR arg8, LPSTARTUPINFOA arg9,
-                             LPPROCESS_INFORMATION arg10)
+BOOL WINAPI CreateProcessA( LPCSTR lpApplicationName, LPSTR lpCommandLine,
+                            LPSECURITY_ATTRIBUTES lpProcessAttributes,
+                            LPSECURITY_ATTRIBUTES lpThreadAttributes,
+                            BOOL bInheritHandles, DWORD dwCreationFlags,
+                            LPVOID lpEnvironment, LPCSTR lpCurrentDirectory,
+                            LPSTARTUPINFOA lpStartupInfo,
+                            LPPROCESS_INFORMATION lpProcessInfo )
 {
  BOOL  rc;
@@ -634 +636 @@
  BOOL  fAllocStr = FALSE;
 
-    if(O32_CreateProcess(lpszImageName, lpszCommandLine, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10) == TRUE)
+    dprintf(("KERNEL32: CreateProcessA %s cline:%s inherit:%d cFlags:%x Env:%x CurDir:%s StartupFlags:%x\n",
+            lpApplicationName, lpCommandLine, bInheritHandles, dwCreationFlags,
+            lpEnvironment, lpCurrentDirectory, lpStartupInfo));
+
+    if(O32_CreateProcess(lpApplicationName, lpCommandLine, lpProcessAttributes,
+                         lpThreadAttributes, bInheritHandles, dwCreationFlags,
+                         lpEnvironment, lpCurrentDirectory, lpStartupInfo,
+                         lpProcessInfo) == TRUE)
         return(TRUE);
 
     //probably a win32 exe, so run it in the pe loader
-    if(lpszImageName) {
-         if(lpszCommandLine) {
-                cmdline = (char *)malloc(strlen(lpszImageName)+strlen(lpszCommandLine) + 16);
-                sprintf(cmdline, "PE.EXE %s %s", lpszImageName, lpszCommandLine);
+    if(lpApplicationName) {
+       if(lpCommandLine) {
+          cmdline = (char *)malloc(strlen(lpApplicationName)+strlen(lpCommandLine) + 16); 
+          sprintf(cmdline, "PE.EXE %s %s", lpApplicationName, lpCommandLine);
                 fAllocStr = TRUE;
          }
          else {
-                cmdline = (char *)malloc(strlen(lpszImageName) + 16);
-                sprintf(cmdline, "PE.EXE %s", lpszImageName);
+          cmdline = (char *)malloc(strlen(lpApplicationName) + 16);
+          sprintf(cmdline, "PE.EXE %s", lpApplicationName);
                 fAllocStr = TRUE;
          }
     }
     else {
-        cmdline = (char *)malloc(strlen(lpszCommandLine) + 16);
-        sprintf(cmdline, "PE.EXE %s", lpszCommandLine);
+        cmdline = (char *)malloc(strlen(lpCommandLine) + 16);
+        sprintf(cmdline, "PE.EXE %s", lpCommandLine);
         fAllocStr = TRUE;
     }
     dprintf(("KERNEL32:  CreateProcess %s\n", cmdline));
-    rc = O32_CreateProcess("PE.EXE", (LPCSTR)cmdline, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
+    rc = O32_CreateProcess("PE.EXE", (LPCSTR)cmdline,lpProcessAttributes,
+                         lpThreadAttributes, bInheritHandles, dwCreationFlags,
+                         lpEnvironment, lpCurrentDirectory, lpStartupInfo,
+                         lpProcessInfo);
     if(fAllocStr)
         free(cmdline);
 
-    dprintf(("KERNEL32:  CreateProcess returned %d\n", rc));
+    if(lpProcessInfo)
+      dprintf(("KERNEL32:  CreateProcess returned %d hPro:%x hThr:%x pid:%x tid:%x\n",
+               rc, lpProcessInfo->hProcess, lpProcessInfo->hThread,
+                   lpProcessInfo->dwProcessId,lpProcessInfo->dwThreadId));
+    else
+      dprintf(("KERNEL32:  CreateProcess returned %d\n", rc));
     return(rc);
 }