Changeset 10471 for trunk/src/kernel32/conbuffer.cpp

Timestamp:

Feb 19, 2004, 2:03:07 PM (22 years ago)

Author:

sandervl

Message:

DBCS fixes for console & resource functions

File:

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

trunk/src/kernel32/conbuffer.cpp

@@ -1 @@
-/* $Id: conbuffer.cpp,v 1.19 2003-04-11 12:08:35 sandervl Exp $ */
+/* $Id: conbuffer.cpp,v 1.20 2004-02-19 13:03:05 sandervl Exp $ */
 
 /*
@@ -2498 +2498 @@
 }
 
-
 /*****************************************************************************
  * Name      : DWORD HMDeviceConsoleBufferClass::WriteConsoleW
@@ -2524 +2523 @@
   DWORD          rc;
   LPSTR          pszAscii;
+  int            alen;
 
 #ifdef DEBUG_LOCAL2
@@ -2534 +2534 @@
 #endif
 
+  alen = WideCharToMultiByte( GetConsoleCP(), 0, (LPCWSTR)lpvBuffer, cchToWrite, 0, 0, 0, 0 );
   /* Ascii -> unicode translation */
-  pszAscii = (LPSTR)HEAP_malloc(cchToWrite+1);
+  pszAscii = (LPSTR)HEAP_malloc(( alen + 1 ) * sizeof( WCHAR ));
   if (pszAscii == NULL)
      return ERROR_NOT_ENOUGH_MEMORY;
 
-  lstrcpynWtoA(pszAscii, (LPWSTR)lpvBuffer, cchToWrite+1);
+  WideCharToMultiByte( GetConsoleCP(), 0, (LPWSTR)lpvBuffer, cchToWrite, pszAscii, alen, 0, 0 );
+  pszAscii[ alen ] = 0;
 
   /* simply forward the request to that routine */
   rc = HMDeviceConsoleBufferClass::WriteFile(pHMHandleData,
                                              pszAscii,
-                                             cchToWrite,
+                                             alen,
                                              lpcchWritten,
                                              NULL, NULL);
 
+  *lpcchWritten = MultiByteToWideChar( GetConsoleCP(), 0, pszAscii, *lpcchWritten, 0, 0 );
   // free memory again
   HEAP_free(pszAscii);