Changeset 3976 for trunk/src/kernel32

Timestamp:

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

Author:

phaller

Message:

.

Location:

trunk/src/kernel32

Files:

• conin.cpp (modified) (3 diffs)
• console.cpp (modified) (4 diffs)
• console2.h (modified) (2 diffs)
• heapstring.cpp (modified) (3 diffs)
• oslibdos.cpp (modified) (2 diffs)

trunk/src/kernel32/conin.cpp

@@ -1 @@
-/* $Id: conin.cpp,v 1.9 2000-03-03 11:15:57 sandervl Exp $ */
+/* $Id: conin.cpp,v 1.10 2000-08-10 02:19:53 phaller Exp $ */
 
 /*
@@ -149 +149 @@
           {
             // continue until buffer full or CR entered
+            // Note: CRLF is actually returned at the end of the buffer!
             if (InputRecord.Event.KeyEvent.uChar.AsciiChar == 0x0d)
               fLoop = FALSE;
           }
           else
-            fLoop = FALSE; // return on any single key in buffer :)
+            // return on any single key in buffer :)
+            // fLoop = FALSE;
+            // @@@PH 2000/08/10 changed behaviour to return ALL input events
+            // recorded in the console.
+            fLoop = (iConsoleInputQueryEvents() != 0);
 
           // record key stroke
@@ -162 +167 @@
             {
               case 0x03: // ctrl-c is filtered!
-              case 0x0a: // LF
+                // @@@PH we're supposed to call a ctrl-c break handler here!
+                break;
+              
               case 0x0d: // CR
-                // do NOT insert those keys into the resulting buffer
+                // CR is automatically expanded to CRLF if in line input mode!
+                if (pConsoleInput->dwConsoleMode & ENABLE_LINE_INPUT)
+                {
+                  *pszTarget = 0x0d; // CR
+                  pszTarget++;
+                  ulCounter++;
+                  if (ulCounter < nNumberOfBytesToRead)  // check for room
+                  {
+                    *pszTarget = 0x0a; // LF
+                    pszTarget++;
+                    ulCounter++;
+                  }
+                  
+                  if (pConsoleInput->dwConsoleMode & ENABLE_ECHO_INPUT)
+                    HMWriteFile(pConsoleGlobals->hConsoleBuffer,
+                        pszTarget-2,
+                        2,
+                        &ulPostCounter,                      /* dummy result */
+                        NULL);
+                  
+                }
+              
                 break;
 

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 */

trunk/src/kernel32/console2.h

@@ -1 @@
-/* $Id: console2.h,v 1.8 2000-07-06 21:18:41 sandervl Exp $ */
+/* $Id: console2.h,v 1.9 2000-08-10 02:19:56 phaller Exp $ */
 
 /*
@@ -620 +620 @@
 BOOL   WIN32API SetConsoleTitleA              (LPTSTR        lpszTitle);
 
-BOOL   WIN32API SetConsoleTitleW              (LPTSTR        lpszTitle);
+BOOL   WIN32API SetConsoleTitleW              (LPWSTR        lpszTitle);
 
 BOOL   WIN32API SetConsoleWindowInfo          (HANDLE        hConsoleOutput,

trunk/src/kernel32/heapstring.cpp

@@ -1 @@
-/* $Id: heapstring.cpp,v 1.30 2000-07-10 18:38:51 sandervl Exp $ */
+/* $Id: heapstring.cpp,v 1.31 2000-08-10 02:19:57 phaller Exp $ */
 
 /*
@@ -524 +524 @@
                          (void**)&out_buf, &out_bytes_left,
                          &num_subs);
-
+    
+    /* @@@PH 2000/08/10
+     * this causes the last character in the converted
+     * target string to be chopped off. I.e. causes CMD.EXE
+     * to loose the CRLF functionality.
+     */
+     /*
     unilen -= 1+out_bytes_left; //end + left bytes
     astring[unilen] = 0; //terminate
+    */
 
     return unilen; //length of string (excluding terminator)
@@ -621 +628 @@
                         &out_buf,        &uni_chars_left,
                         &num_subs );
-
+    
+    /* @@@PH 2000/08/10
+     * this causes the last character in the converted
+     * target string to be chopped off. I.e. causes CMD.EXE
+     * to enter command correctly.
+     */
+    /*
     asciilen -= 1+uni_chars_left; //end + left bytes
 
     unicode[asciilen] = 0; // always terminate string
+    */
+      
     return asciilen; //length of string (excluding terminator)
   }

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.35 2000-07-12 18:21:45 sandervl Exp $ */
+/* $Id: oslibdos.cpp,v 1.36 2000-08-10 02:19:58 phaller Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -1857 +1857 @@
 
    fsname = (char *)&fsinfo->szName[0] + fsinfo->cbName + 1;
+  
+  /* @@@PH 2000/08/10 CMD.EXE querys with nFileSystemNameSize == 0
+   * however does NOT expect to receive an error.
+   */
+   strncpy(lpFileSystemNameBuffer,
+           fsname,
+           nFileSystemNameSize);
+  /*
    if(strlen(fsname) < nFileSystemNameSize) {
         strcpy(lpFileSystemNameBuffer, fsname);
    }
    else return ERROR_BUFFER_OVERFLOW_W;
+   */
    return 0;
 }