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

Timestamp:

Oct 23, 2000, 9:35:11 PM (25 years ago)

Author:

sandervl

Message:

lstrcpynAtoW/WtoA fixes (Wine depends on 0 terminating of these functions) + console changes for methods that depended on the old behaviour

File:

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

trunk/src/kernel32/heapstring.cpp

@@ -1 @@
-/* $Id: heapstring.cpp,v 1.33 2000-10-02 13:05:37 phaller Exp $ */
+/* $Id: heapstring.cpp,v 1.34 2000-10-23 19:35:11 sandervl Exp $ */
 
 /*
@@ -493 +493 @@
   UniChar* in_buf;
   char*    out_buf;
+
+  dprintf2(("KERNEL32: HeapString: lstrcpynWtoA(%08x,%08xh,%d)\n",
+           astring,
+           ustring,
+           unilen));
 
   if (ustring == NULL)
@@ -552 +557 @@
 }
 
+//lstrcpynWtoA and lstrcpynAtoW must zero-terminate the string
+//because Wine code depends on this behaviour (i.e. comdlg32)
 int WIN32API lstrcpynWtoA(LPSTR  astring,
                           LPCWSTR ustring,
                           int    unilen)
 {
-    return lstrcpynCtoA(astring, ustring, unilen, GetWindowsUconvObject());
+ int ret;
+
+    ret = lstrcpynCtoA(astring, ustring, unilen, GetWindowsUconvObject());
+    astring[unilen-1] = 0;
+    return ret;
 }
 
@@ -660 +671 @@
 }
 
+//lstrcpynWtoA and lstrcpynAtoW must zero-terminate the string
+//because Wine code depends on this behaviour (i.e. comdlg32)
 int WIN32API lstrcpynAtoW(LPWSTR unicode,
                           LPCSTR  ascii,
                           int    asciilen)
 {
-    return lstrcpynAtoC(unicode, ascii, asciilen, GetWindowsUconvObject());
+ int ret;
+
+    ret = lstrcpynAtoC(unicode, ascii, asciilen, GetWindowsUconvObject());
+    unicode[asciilen-1] = 0;
+    return ret;
 }