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

Timestamp:

Dec 9, 1999, 1:52:21 AM (26 years ago)

Author:

sandervl

Message:

code heap added + changed back winres fix (breaks Notes) + heapstring fixes

File:

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

trunk/src/kernel32/heapstring.cpp

@@ -1 @@
-/* $Id: heapstring.cpp,v 1.21 1999-12-06 20:39:38 sandervl Exp $ */
+/* $Id: heapstring.cpp,v 1.22 1999-12-09 00:52:20 sandervl Exp $ */
 
 /*
@@ -552 +552 @@
     astring[unilen] = 0; //terminate
 
-    return unilen;
-
+    return unilen; //length of string (excluding terminator)
   }
   else
@@ -628 +627 @@
     //SvL: Determine length of ascii string
     in_bytes_left = strlen(in_buf)+1;
-    in_bytes_left = min(in_bytes_left, asciilen); //buffer size in bytes
+    in_bytes_left = asciilen = min(in_bytes_left, asciilen); //buffer size in bytes
     
     out_buf = (UniChar*)unicode;
@@ -639 +638 @@
                         &num_subs );
 
-    //@@@PH what's this?
-    //unicode[asciilen-1-in_bytes_left] = 0;
-
-    //@@@PH what's this?
-    //return asciilen - 1;
-    return asciilen;
+    asciilen -= 1+uni_chars_left; //end + left bytes
+
+    unicode[asciilen] = 0; // always terminate string
+    return asciilen; //length of string (excluding terminator)
   }
   else