Ignore:
Timestamp:
Jun 21, 1999, 8:53:51 PM (26 years ago)
Author:
phaller
Message:

Fix: Console HandleManager fix. (just too stupid, sorry :)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/kernel32/conbuffer.cpp

    r120 r149  
    1 /* $Id: conbuffer.cpp,v 1.2 1999-06-19 10:54:39 sandervl Exp $ */
     1/* $Id: conbuffer.cpp,v 1.3 1999-06-21 18:53:50 phaller Exp $ */
    22
    33/*
    … …  
    122122           lpHMDeviceName,
    123123           lpFileName,
    124            pHMHandleData->hWinHandle,
     124           pHMHandleData->hHMHandle,
    125125           lpSecurityAttributes,
    126126           pHMHandleDataTemplate);
    … …  
    223223  WriteLog("KERNEL32/CONSOLE:HMDeviceConsoleBufferClass::ReadFile %s(%08x,%08x,%08x,%08x,%08x)\n",
    224224           lpHMDeviceName,
    225            pHMHandleData->hWinHandle,
     225           pHMHandleData->hHMHandle,
    226226           lpBuffer,
    227227           nNumberOfBytesToRead,
    … …  
    260260  WriteLog("KERNEL32/CONSOLE:HMDeviceConsoleBufferClass:WriteFile %s(%08x,%08x,%08x,%08x,%08x)\n",
    261261           lpHMDeviceName,
    262            pHMHandleData->hWinHandle,
     262           pHMHandleData->hHMHandle,
    263263           lpBuffer,
    264264           nNumberOfBytesToWrite,
    … …  
    343343                                                          /* write character */
    344344      *(pConsoleBuffer->ppszLine[pConsoleBuffer->coordCursorPosition.Y] +
    345         pConsoleBuffer->coordCursorPosition.X * 2) = pszBuffer[ulCounter];
     345        pConsoleBuffer->coordCursorPosition.X * 2) = ucChar;
    346346
    347347      pConsoleBuffer->coordCursorPosition.X++;
    … …  
    374374
    375375                                          /* update screen if active console */
    376   if (pHMHandleData->hWinHandle == pConsoleGlobals->hConsoleBuffer)
     376  if (pHMHandleData->hHMHandle == pConsoleGlobals->hConsoleBuffer)
    377377    pConsoleGlobals->fUpdateRequired = TRUE;      /* update with next WM_TIMER */
    378378
    … …  
    752752  WriteLog("KERNEL32/CONSOLE:HMDeviceConsoleBufferClass:_DeviceRequest %s(%08x,%08x,%08x,%08x,%08x,%08x) unknown request\n",
    753753           lpHMDeviceName,
    754            pHMHandleData->hWinHandle,
     754           pHMHandleData->hHMHandle,
    755755           ulRequestCode,
    756756           arg1,
    … …  
    846846
    847847                                          /* update screen if active console */
    848         if (pHMHandleData->hWinHandle == pConsoleGlobals->hConsoleBuffer)
     848        if (pHMHandleData->hHMHandle == pConsoleGlobals->hConsoleBuffer)
    849849          pConsoleGlobals->fUpdateRequired = TRUE;/* update with next WM_TIMER */
    850850
    … …  
    855855
    856856                                          /* update screen if active console */
    857   if (pHMHandleData->hWinHandle == pConsoleGlobals->hConsoleBuffer)
     857  if (pHMHandleData->hHMHandle == pConsoleGlobals->hConsoleBuffer)
    858858    pConsoleGlobals->fUpdateRequired = TRUE;      /* update with next WM_TIMER */
    859859
    … …  
    946946
    947947                                          /* update screen if active console */
    948         if (pHMHandleData->hWinHandle == pConsoleGlobals->hConsoleBuffer)
     948        if (pHMHandleData->hHMHandle == pConsoleGlobals->hConsoleBuffer)
    949949          pConsoleGlobals->fUpdateRequired = TRUE;/* update with next WM_TIMER */
    950950
    … …  
    955955
    956956                                          /* update screen if active console */
    957   if (pHMHandleData->hWinHandle == pConsoleGlobals->hConsoleBuffer)
     957  if (pHMHandleData->hHMHandle == pConsoleGlobals->hConsoleBuffer)
    958958    pConsoleGlobals->fUpdateRequired = TRUE;      /* update with next WM_TIMER */
    959959
    … …  
    10461046
    10471047                                          /* update screen if active console */
    1048         if (pHMHandleData->hWinHandle == pConsoleGlobals->hConsoleBuffer)
     1048        if (pHMHandleData->hHMHandle == pConsoleGlobals->hConsoleBuffer)
    10491049          pConsoleGlobals->fUpdateRequired = TRUE;/* update with next WM_TIMER */
    10501050
    … …  
    10551055
    10561056                                          /* update screen if active console */
    1057   if (pHMHandleData->hWinHandle == pConsoleGlobals->hConsoleBuffer)
     1057  if (pHMHandleData->hHMHandle == pConsoleGlobals->hConsoleBuffer)
    10581058    pConsoleGlobals->fUpdateRequired = TRUE;      /* update with next WM_TIMER */
    10591059
    … …  
    19311931
    19321932                                          /* update screen if active console */
    1933   if (pHMHandleData->hWinHandle == pConsoleGlobals->hConsoleBuffer)
     1933  if (pHMHandleData->hHMHandle == pConsoleGlobals->hConsoleBuffer)
    19341934    pConsoleGlobals->fUpdateRequired = TRUE;      /* update with next WM_TIMER */
    19351935
    … …  
    20552055
    20562056                                          /* update screen if active console */
    2057   if (pHMHandleData->hWinHandle == pConsoleGlobals->hConsoleBuffer)
     2057  if (pHMHandleData->hHMHandle == pConsoleGlobals->hConsoleBuffer)
    20582058    pConsoleGlobals->fUpdateRequired = TRUE;      /* update with next WM_TIMER */
    20592059
    … …  
    20952095
    20962096              /* if we're the active buffer, remove cursor from screen first */
    2097   if (pHMHandleData->hWinHandle == pConsoleGlobals->hConsoleBuffer)
     2097  if (pHMHandleData->hHMHandle == pConsoleGlobals->hConsoleBuffer)
    20982098    iConsoleCursorShow(pConsoleBuffer,
    20992099                       CONSOLECURSOR_HIDE);
    … …  
    22832283
    22842284                                          /* update screen if active console */
    2285   if (pHMHandleData->hWinHandle == pConsoleGlobals->hConsoleBuffer)
     2285  if (pHMHandleData->hHMHandle == pConsoleGlobals->hConsoleBuffer)
    22862286    pConsoleGlobals->fUpdateRequired = TRUE;      /* update with next WM_TIMER */
    22872287
    … …  
    23382338
    23392339                              /* set new buffer handle to the global console */
    2340   pConsoleGlobals->hConsoleBuffer  = pHMHandleData->hWinHandle;
     2340  pConsoleGlobals->hConsoleBuffer  = pHMHandleData->hHMHandle;
    23412341  pConsoleGlobals->fUpdateRequired = TRUE;      /* update with next WM_TIMER */
    23422342
    … …  
    24492449                                          /* update window contents (scroll) */
    24502450                                          /* update screen if active console */
    2451   if (pHMHandleData->hWinHandle == pConsoleGlobals->hConsoleBuffer)
     2451  if (pHMHandleData->hHMHandle == pConsoleGlobals->hConsoleBuffer)
    24522452    pConsoleGlobals->fUpdateRequired = TRUE;      /* update with next WM_TIMER */
    24532453
    … …  
    26412641
    26422642                                          /* update screen if active console */
    2643   if (pHMHandleData->hWinHandle == pConsoleGlobals->hConsoleBuffer)
     2643  if (pHMHandleData->hHMHandle == pConsoleGlobals->hConsoleBuffer)
    26442644    pConsoleGlobals->fUpdateRequired = TRUE;      /* update with next WM_TIMER */
    26452645
    … …  
    27472747
    27482748                                          /* update screen if active console */
    2749   if (pHMHandleData->hWinHandle == pConsoleGlobals->hConsoleBuffer)
     2749  if (pHMHandleData->hHMHandle == pConsoleGlobals->hConsoleBuffer)
    27502750    pConsoleGlobals->fUpdateRequired = TRUE;      /* update with next WM_TIMER */
    27512751
    … …  
    28372837
    28382838                                          /* update screen if active console */
    2839         if (pHMHandleData->hWinHandle == pConsoleGlobals->hConsoleBuffer)
     2839        if (pHMHandleData->hHMHandle == pConsoleGlobals->hConsoleBuffer)
    28402840          pConsoleGlobals->fUpdateRequired = TRUE;/* update with next WM_TIMER */
    28412841
    … …  
    28462846
    28472847                                          /* update screen if active console */
    2848   if (pHMHandleData->hWinHandle == pConsoleGlobals->hConsoleBuffer)
     2848  if (pHMHandleData->hHMHandle == pConsoleGlobals->hConsoleBuffer)
    28492849    pConsoleGlobals->fUpdateRequired = TRUE;      /* update with next WM_TIMER */
    28502850
    … …  
    29372937
    29382938                                          /* update screen if active console */
    2939         if (pHMHandleData->hWinHandle == pConsoleGlobals->hConsoleBuffer)
     2939        if (pHMHandleData->hHMHandle == pConsoleGlobals->hConsoleBuffer)
    29402940          pConsoleGlobals->fUpdateRequired = TRUE;/* update with next WM_TIMER */
    29412941
    … …  
    29462946
    29472947                                          /* update screen if active console */
    2948   if (pHMHandleData->hWinHandle == pConsoleGlobals->hConsoleBuffer)
     2948  if (pHMHandleData->hHMHandle == pConsoleGlobals->hConsoleBuffer)
    29492949    pConsoleGlobals->fUpdateRequired = TRUE;      /* update with next WM_TIMER */
    29502950
    … …  
    30383038
    30393039                                          /* update screen if active console */
    3040         if (pHMHandleData->hWinHandle == pConsoleGlobals->hConsoleBuffer)
     3040        if (pHMHandleData->hHMHandle == pConsoleGlobals->hConsoleBuffer)
    30413041          pConsoleGlobals->fUpdateRequired = TRUE;/* update with next WM_TIMER */
    30423042
    … …  
    30473047
    30483048                                          /* update screen if active console */
    3049   if (pHMHandleData->hWinHandle == pConsoleGlobals->hConsoleBuffer)
     3049  if (pHMHandleData->hHMHandle == pConsoleGlobals->hConsoleBuffer)
    30503050    pConsoleGlobals->fUpdateRequired = TRUE;      /* update with next WM_TIMER */
    30513051
Note: See TracChangeset for help on using the changeset viewer.