Changeset 1975 for trunk/src/kernel32/heapstring.cpp

Timestamp:

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

Author:

sandervl

Message:

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

File:

• trunk/src/kernel32/heapstring.cpp (modified) (6 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 */