Changeset 4525 for trunk/src

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

Location:

trunk/src/kernel32

Files:

• conbuffer.cpp (modified) (2 diffs)
• conin.cpp (modified) (3 diffs)
• console.cpp (modified) (2 diffs)
• heapstring.cpp (modified) (4 diffs)

trunk/src/kernel32/conbuffer.cpp

@@ -1 @@
-/* $Id: conbuffer.cpp,v 1.13 2000-10-20 11:46:44 sandervl Exp $ */
+/* $Id: conbuffer.cpp,v 1.14 2000-10-23 19:35:09 sandervl Exp $ */
 
 /*
@@ -2538 +2538 @@
 
   /* Ascii -> unicode translation */
-  pszAscii = (LPSTR)HEAP_malloc(cchToWrite);
+  pszAscii = (LPSTR)HEAP_malloc(cchToWrite+1);
   if (pszAscii == NULL)
      return ERROR_NOT_ENOUGH_MEMORY;
 
-  lstrcpynWtoA(pszAscii, (LPWSTR)lpvBuffer, cchToWrite);
+  lstrcpynWtoA(pszAscii, (LPWSTR)lpvBuffer, cchToWrite+1);
 
   /* simply forward the request to that routine */

trunk/src/kernel32/conin.cpp

@@ -1 @@
-/* $Id: conin.cpp,v 1.13 2000-10-20 11:46:45 sandervl Exp $ */
+/* $Id: conin.cpp,v 1.14 2000-10-23 19:35:10 sandervl Exp $ */
 
 /*
@@ -37 +37 @@
 #include <misc.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include "conwin.h"          // Windows Header for console only
@@ -745 +746 @@
   /* Ascii -> unicode translation */
   if (dwResult == TRUE)
-    lstrcpynAtoW((LPWSTR)lpvBuffer, lpstrAscii, *lpcchRead);
+    lstrcpynAtoW((LPWSTR)lpvBuffer, lpstrAscii, min(cchToRead, *lpcchRead+1));
 
   HEAP_free(lpstrAscii);

trunk/src/kernel32/console.cpp

@@ -1 @@
-/* $Id: console.cpp,v 1.22 2000-10-20 11:46:46 sandervl Exp $ */
+/* $Id: console.cpp,v 1.23 2000-10-23 19:35:10 sandervl Exp $ */
 
 /*
@@ -3772 +3772 @@
   lstrcpynWtoA(ConsoleGlobals.pszWindowTitle,
                lpszTitle,
-               iLength);
+               iLength+1); //must add one (lstrcpynWtoA terminates string)
 
   WinSetWindowText(ConsoleGlobals.hwndFrame,           /* set new title text */

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;
 }