Changeset 10471 for trunk/src/kernel32/console.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/console.cpp (modified) (6 diffs)

trunk/src/kernel32/console.cpp

@@ -1 @@
-/* $Id: console.cpp,v 1.32 2002-12-27 13:42:08 sandervl Exp $ */
+/* $Id: console.cpp,v 1.33 2004-02-19 13:03:06 sandervl Exp $ */
 
 /*
@@ -61 +61 @@
 #define  INCL_DOSSEMAPHORES
 #define  INCL_DOSERRORS
+#define  INCL_DOSEXCEPTIONS
 #define  INCL_DOSPROCESS
 #define  INCL_DOSMODULEMGR
+#define  INCL_DOSDEVICES
 #define  INCL_VIO
 #define  INCL_KBD
@@ -177 +179 @@
   if (ConsoleGlobals.hevConsole != NULLHANDLE) /* we're already initialized ?*/
     return (NO_ERROR);                             /* then abort immediately */
+
+  rc = DosSetSignalExceptionFocus(SIG_SETFOCUS, &ulPostCount);
+  if(rc) {
+      dprintf(("DosSetSignalExceptionFocus failed with %d", rc));
+  }
 
   if(flVioConsole == TRUE)
@@ -2695 +2702 @@
  *****************************************************************************/
 
+
 DWORD WIN32API GetConsoleTitleW(LPWSTR lpConsoleTitle,
                                 DWORD  nSize)
 {
-  ULONG ulLength;                                          /* length of text */
-
   if (ConsoleGlobals.pszWindowTitle == NULL)    /* is there a window title ? */
     return 0;                                           /* abort immediately */
 
-  ulLength = strlen(ConsoleGlobals.pszWindowTitle);        /* length of text */
-
-  lstrcpynAtoW(lpConsoleTitle,
-               ConsoleGlobals.pszWindowTitle,
-               nSize);
-
-  return (nSize < ulLength) ? nSize : ulLength;
+  MultiByteToWideChar( GetConsoleCP(), 0, ConsoleGlobals.pszWindowTitle, -1,
+        lpConsoleTitle, nSize );
+  lpConsoleTitle[ nSize - 1 ] = 0;
+
+  return lstrlenW( lpConsoleTitle );
 }
 
@@ -3443 +3447 @@
 BOOL WIN32API SetConsoleTitleW(LPWSTR lpszTitle)
 {
+  int alen;
+
   if (lpszTitle == NULL)                                 /* check parameters */
     return FALSE;
@@ -3449 +3455 @@
     free (ConsoleGlobals.pszWindowTitle);                     /* then free it */
 
+  alen = WideCharToMultiByte( GetConsoleCP(), 0, lpszTitle, -1, 0, 0, 0, 0 );
   /* create an ascii copy of the lpszTitle */
-  int iLength = lstrlenW(lpszTitle);
-
-  ConsoleGlobals.pszWindowTitle = (PSZ)malloc(iLength+1);
-  ConsoleGlobals.pszWindowTitle[iLength] = 0;
-  lstrcpynWtoA(ConsoleGlobals.pszWindowTitle,
-               lpszTitle,
-               iLength+1); //must add one (lstrcpynWtoA terminates string)
+  ConsoleGlobals.pszWindowTitle = (PSZ)malloc( alen );
+  WideCharToMultiByte( GetConsoleCP(), 0, lpszTitle, -1,
+        ConsoleGlobals.pszWindowTitle, alen, 0, 0 );
 
   WinSetWindowText(ConsoleGlobals.hwndFrame,           /* set new title text */