Changeset 4525 for trunk/src/kernel32/conin.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/conin.cpp (modified) (3 diffs)

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