Changeset 250 for trunk/src/kernel32/KERNEL32.CPP

Timestamp:

Jun 30, 1999, 3:25:28 PM (26 years ago)

Author:

sandervl

Message:

Unicode changes

File:

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

trunk/src/kernel32/KERNEL32.CPP

@@ -1 @@
-/* $Id: KERNEL32.CPP,v 1.8 1999-06-28 07:55:16 sandervl Exp $ */
+/* $Id: KERNEL32.CPP,v 1.9 1999-06-30 13:25:01 sandervl Exp $ */
 
 /*
@@ -14 +14 @@
  * Copyright 1998 Knut St. Osmundsen
  *
- * @(#) KERNEL32.CPP            1.0.1   1998/06/12 PH added HandleManager support
+ * @(#) KERNEL32.CPP            1.0.1   1998/06/12 PH added HandleManager support
  */
 
@@ -699 +699 @@
   //PH: looks like either \0 or arg3 terminate the copy
   //return strncpy(arg1, arg2, arg3);
-  for (;*p2 && arg3; arg3--)
+  for (;*p2 && (arg3 > 1); arg3--)
     *p1++ = *p2++;
 
+  *p1 = 0; //CB: copy arg-1, set end 0
+
   return arg1;
 }
@@ -709 +711 @@
 {
     dprintf(("KERNEL32:  OS2lstrcpynW"));
-    UniStrncpy( (UniChar*)dest, (UniChar*)src, arg3 );
+    if (arg3 == 0) return NULL;
+    UniStrncpy( (UniChar*)dest, (UniChar*)src, arg3-1); //CB: copy arg3-1 characters
+    dest[arg3-1] = 0; //CB: set end
     return dest;
 }
@@ -1155 +1159 @@
 
 
+