Changeset 297 for trunk/src/kernel32

Timestamp:

Jul 12, 1999, 7:45:51 PM (26 years ago)

Author:

phaller

Message:

Fix: Console buffer fixes.

Location:

trunk/src/kernel32

Files:

• conbuffer.cpp (modified) (5 diffs)
• console.cpp (modified) (6 diffs)

trunk/src/kernel32/conbuffer.cpp

@@ -1 @@
-/* $Id: conbuffer.cpp,v 1.3 1999-06-21 18:53:50 phaller Exp $ */
+/* $Id: conbuffer.cpp,v 1.4 1999-07-12 17:45:50 phaller Exp $ */
 
 /*
@@ -1809 +1809 @@
     case 0:
       for (iY = 0;
-           iY <= srctDest.Bottom - srctDest.Top;
+           iY < srctDest.Bottom - srctDest.Top;
            iY++)
       {
@@ -1834 +1834 @@
     case 1:
       for (iY = 0;
-           iY <= srctDest.Bottom - srctDest.Top;
+           iY < srctDest.Bottom - srctDest.Top;
            iY++)
       {
@@ -1858 +1858 @@
      ***************/
     case 2:
-      for (iY = srctDest.Bottom - srctDest.Top;
+      for (iY = srctDest.Bottom - srctDest.Top - 1;
            iY >= 0;
            iY--)
@@ -1883 +1883 @@
      ****************/
     case 3:
-      for (iY = srctDest.Bottom - srctDest.Top;
+      for (iY = srctDest.Bottom - srctDest.Top - 1;
            iY >= 0;
            iY--)

trunk/src/kernel32/console.cpp

@@ -1 @@
-/* $Id: console.cpp,v 1.9 1999-07-12 17:20:03 phaller Exp $ */
+/* $Id: console.cpp,v 1.10 1999-07-12 17:45:51 phaller Exp $ */
 
 /*
@@ -197 +197 @@
 void static iConsoleInputQueueLock()
 {
-  DosRequestMutexSem(ConsoleInput.hmtxInputQueue,
-                     SEM_INDEFINITE_WAIT);
+  APIRET rc;
+
+  rc = DosRequestMutexSem(ConsoleInput.hmtxInputQueue,
+                          SEM_INDEFINITE_WAIT);
+  if (rc != NO_ERROR)
+     dprintf(("KERNEL32: Console:iConsoleInputQueueLock error %08xh\n",
+              rc));
 }
 
@@ -216 +221 @@
 void static iConsoleInputQueueUnlock()
 {
-  DosReleaseMutexSem(ConsoleInput.hmtxInputQueue);
+  APIRET rc;
+
+  rc = DosReleaseMutexSem(ConsoleInput.hmtxInputQueue);
+  if (rc != NO_ERROR)
+     dprintf(("KERNEL32: Console:iConsoleInputQueueUnlock error %08xh\n",
+              rc));
 }
 
@@ -596 +606 @@
                                 /* Set new title: Win32 Console - Terminated */
   fResult = SetConsoleTitleA(szBuffer);
+
+  DosCloseEventSem(ConsoleGlobals.hevConsole);      /* close other semaphore */
+  DosCloseEventSem(ConsoleInput.hevInputQueue);     /* close other semaphore */
+  DosCloseMutexSem(ConsoleInput.hmtxInputQueue);          /* close semaphore */
+
 
                                           /* terminate console immediately ? */
@@ -718 +733 @@
   DosCloseEventSem(ConsoleInput.hevInputQueue);     /* close other semaphore */
   DosCloseEventSem(ConsoleGlobals.hevConsole);
-  ConsoleGlobals.hevConsole  = NULLHANDLE;          /* for ConsoleIsActive() */
-  ConsoleInput.hevInputQueue = NULLHANDLE;
+  DosCloseMutexSem(ConsoleInput.hmtxInputQueue);          /* close semaphore */
+
+  ConsoleGlobals.hevConsole   = NULLHANDLE;         /* for ConsoleIsActive() */
+  ConsoleInput.hevInputQueue  = NULLHANDLE;
+  ConsoleInput.hmtxInputQueue = NULLHANDLE;
 
   /* @@@PH we've got to exit the process here ! */
@@ -1335 +1353 @@
               0,
               ConsoleGlobals.hvpsConsole);
+
     ConsoleGlobals.fUpdateRequired = FALSE;          /* no more required ... */
   }