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

Timestamp:

Nov 9, 1999, 3:19:47 PM (26 years ago)

Author:

sandervl

Message:

heapstring fixes + dll renaming support added

File:

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

trunk/src/kernel32/heapstring.cpp

@@ -1 @@
-/* $Id: heapstring.cpp,v 1.17 1999-11-05 09:16:57 sandervl Exp $ */
+/* $Id: heapstring.cpp,v 1.18 1999-11-09 14:19:46 sandervl Exp $ */
 
 /*
@@ -539 +539 @@
     }
 
-    uni_chars_left = unilen-1; //elements
+    //SvL: Determine length of unicode string
+    uni_chars_left = UniStrlen((UniChar*)ustring)+1;
+    uni_chars_left = min(uni_chars_left, unilen);
+    unilen = uni_chars_left;
+
     out_bytes_left = uni_chars_left; //size in bytes == elements
     in_buf  = (UniChar*)ustring;
@@ -625 +629 @@
     //in_bytes_left = asciilen-1; //buffer size in bytes
 
-    in_bytes_left = asciilen; //buffer size in bytes
+    //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
+    
     out_buf = (UniChar*)unicode;
 
@@ -637 +644 @@
     //@@@PH what's this?
     //unicode[asciilen-1-in_bytes_left] = 0;
-
-    //if (rc != ULS_SUCCESS && in_bytes_left > 0) //CB: never the case during my tests
-    //   dprintf(("KERNEL32: AsciiToUnicode failed, %d bytes left!\n",in_bytes_left));
 
     //@@@PH what's this?