Changeset 3804 for trunk/src/kernel32/console.cpp

Timestamp:

Jul 6, 2000, 11:18:45 PM (25 years ago)

Author:

sandervl

Message:

strncpy call changes + language api updates/fixes

File:

• trunk/src/kernel32/console.cpp (modified) (6 diffs)

trunk/src/kernel32/console.cpp

@@ -1 @@
-/* $Id: console.cpp,v 1.18 2000-02-16 14:25:34 sandervl Exp $ */
+/* $Id: console.cpp,v 1.19 2000-07-06 21:18:39 sandervl Exp $ */
 
 /*
@@ -83 +83 @@
 #include "conprop.h"
 #include "unicode.h"
+#include "heapstring.h"
 
 #define DBG_LOCALLOG    DBG_console
@@ -2707 +2708 @@
 
 DWORD WIN32API GetConsoleTitleA(LPTSTR lpConsoleTitle,
-                                   DWORD  nSize)
+                                DWORD  nSize)
 {
   ULONG ulLength;                                          /* length of text */
@@ -2725 +2726 @@
           ConsoleGlobals.pszWindowTitle,
           nSize);
+  lpConsoleTitle[nSize-1] = 0;
 
   return (nSize < ulLength) ? nSize : ulLength;
@@ -2743 +2745 @@
  *****************************************************************************/
 
-DWORD WIN32API GetConsoleTitleW(LPTSTR lpConsoleTitle,
-                                   DWORD  nSize)
+DWORD WIN32API GetConsoleTitleW(LPWSTR lpConsoleTitle,
+                                DWORD  nSize)
 {
   ULONG ulLength;                                          /* length of text */
 
 #ifdef DEBUG_LOCAL2
-  WriteLog("KERNEL32/CONSOLE: OS2GetConsoleTitleW(%08x,%08x).\n",
+  WriteLog("KERNEL32/CONSOLE: GetConsoleTitleW(%08x,%08x)",
            lpConsoleTitle,
            nSize);
@@ -2759 +2761 @@
   ulLength = strlen(ConsoleGlobals.pszWindowTitle);        /* length of text */
 
-  strncpy(lpConsoleTitle,
-          ConsoleGlobals.pszWindowTitle,
-          nSize);
+  lstrcpynAtoW(lpConsoleTitle,
+               ConsoleGlobals.pszWindowTitle,
+               nSize);
 
   /* @@@PH Ascii2Unicode */