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

Timestamp:

Oct 27, 1999, 8:36:36 PM (26 years ago)

Author:

phaller

Message:

Fix: console (unicode) updates

File:

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

trunk/src/kernel32/conbuffer.cpp

@@ -1 @@
-/* $Id: conbuffer.cpp,v 1.4 1999-07-12 17:45:50 phaller Exp $ */
+/* $Id: conbuffer.cpp,v 1.5 1999-10-27 18:36:33 phaller Exp $ */
 
 /*
@@ -18 +18 @@
 #endif
 
-#undef DEBUG_LOCAL
-#undef DEBUG_LOCAL2
+//#undef DEBUG_LOCAL
+//#undef DEBUG_LOCAL2
 
 
@@ -73 +73 @@
 #include "ConBuffer.H"
 #include "Console2.h"
+#include <heapstring.h>
 
 
@@ -289 +290 @@
 
         case 8: /* Backspace */
+          // not correct if deleting expanded tab character
           if (pConsoleBuffer->coordCursorPosition.X > 0)
             pConsoleBuffer->coordCursorPosition.X--;
+
+          //@@@PH overwrite old character
+          *(pConsoleBuffer->ppszLine[pConsoleBuffer->coordCursorPosition.Y] +
+            pConsoleBuffer->coordCursorPosition.X * 2) = 0x20;
           break;
 
@@ -319 +325 @@
           break;
 
+        case 13: /* CARRIAGE RETURN */
+          pConsoleBuffer->coordCursorPosition.X = 0;
+          //@@@PH test break;
+
         case 10: /* LINEFEED */
           pConsoleBuffer->coordCursorPosition.Y++;
@@ -329 +339 @@
             pConsoleBuffer->coordCursorPosition.Y--;
           }
-          break;
-
-        case 13: /* CARRIAGE RETURN */
-          pConsoleBuffer->coordCursorPosition.X = 0;
           break;
 
@@ -2521 +2527 @@
 {
   PCONSOLEBUFFER pConsoleBuffer = (PCONSOLEBUFFER)pHMHandleData->lpHandlerData;
+  DWORD          rc;
+  LPSTR          pszAscii;
 
 #ifdef DEBUG_LOCAL2
@@ -2531 +2539 @@
 #endif
 
-  /* @@@PH AScii -> unicode translation */
+  /* Ascii -> unicode translation */
+  pszAscii = (LPSTR)HEAP_malloc(cchToWrite);
+  if (pszAscii == NULL)
+     return ERROR_NOT_ENOUGH_MEMORY;
+
+  lstrcpynWtoA(pszAscii, (LPWSTR)lpvBuffer, cchToWrite);
 
   /* simply forward the request to that routine */
-  return (HMDeviceConsoleBufferClass::WriteFile(pHMHandleData,
-                                                lpvBuffer,
-                                                cchToWrite,
-                                                lpcchWritten,
-                                                NULL));
+  rc = HMDeviceConsoleBufferClass::WriteFile(pHMHandleData,
+                                             pszAscii,
+                                             cchToWrite,
+                                             lpcchWritten,
+                                             NULL);
+  // free memory again
+  HEAP_free(pszAscii);
+  return (rc);
 }