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

Timestamp:

Dec 14, 1999, 8:14:28 PM (26 years ago)

Author:

sandervl

Message:

cmd line fix, mmap fix + EB's string fixes

File:

• trunk/src/kernel32/heapstring.cpp (modified) (5 diffs)

trunk/src/kernel32/heapstring.cpp

@@ -1 @@
-/* $Id: heapstring.cpp,v 1.22 1999-12-09 00:52:20 sandervl Exp $ */
+/* $Id: heapstring.cpp,v 1.23 1999-12-14 19:14:27 sandervl Exp $ */
 
 /*
@@ -138 +138 @@
            arg2));
 
-  return O32_lstrcat(arg1, arg2);
+  if(arg2 == NULL)
+    return arg1;
+  strcat(arg1, arg2);
+  return arg1;
 }
 
@@ -159 +162 @@
            arg1,
            arg2));
+
+  if(arg2 == NULL)
+    return arg1;
 
   UniStrcat( (UniChar*) arg1, (UniChar*) arg2 );
@@ -326 +332 @@
  *****************************************************************************/
 
-ODINFUNCTION2(LPSTR,lstrcpyA,LPSTR, dest,
-                             LPCSTR,src)
+LPSTR WIN32API lstrcpyA(LPSTR dest, LPCSTR src)
 {
   if ( (src == NULL) || (dest == NULL) ) // stupid parameter checking
@@ -348 +353 @@
  *****************************************************************************/
 
-ODINFUNCTION2(LPWSTR,lstrcpyW,LPWSTR, dest,
-                              LPCWSTR,src)
+LPWSTR WIN32API lstrcpyW(LPWSTR dest, LPCWSTR src)
 {
   if ( (src == NULL) || (dest == NULL) ) // stupid parameter checking