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

Timestamp:

Aug 10, 2000, 4:19:58 AM (25 years ago)

Author:

phaller

Message:

.

File:

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

trunk/src/kernel32/console.cpp

@@ -1 @@
-/* $Id: console.cpp,v 1.20 2000-07-25 18:22:47 sandervl Exp $ */
+/* $Id: console.cpp,v 1.21 2000-08-10 02:19:54 phaller Exp $ */
 
 /*
@@ -2768 +2768 @@
                nSize);
 
-  /* @@@PH Ascii2Unicode */
-
   return (nSize < ulLength) ? nSize : ulLength;
 }
@@ -3700 +3698 @@
  *****************************************************************************/
 
-BOOL WIN32API SetConsoleTitleW(LPTSTR lpszTitle)
+BOOL WIN32API SetConsoleTitleW(LPWSTR lpszTitle)
 {
 #ifdef DEBUG_LOCAL2
@@ -3707 +3705 @@
 #endif
 
-  /* @@@PH Unicode2Ascii */
-
+  if (lpszTitle == NULL)                                 /* check parameters */
+    return FALSE;
+  
   if (ConsoleGlobals.pszWindowTitle != NULL)           /* previously set name */
     free (ConsoleGlobals.pszWindowTitle);                     /* then free it */
-
-  ConsoleGlobals.pszWindowTitle = strdup(lpszTitle);     /* copy the new name */
+  
+  /* create an ascii copy of the lpszTitle */
+  int iLength = UniStrlen(lpszTitle);
+  
+  ConsoleGlobals.pszWindowTitle = (PSZ)malloc(iLength+1);
+  ConsoleGlobals.pszWindowTitle[iLength] = 0;
+  lstrcpynWtoA(ConsoleGlobals.pszWindowTitle,
+               lpszTitle,
+               iLength);
 
   WinSetWindowText(ConsoleGlobals.hwndFrame,           /* set new title text */