[gadamopoulos] 48349: [win32csr] - Fix compilation with msvc

Author: gadamopoulos
Date: Thu Jul 29 10:20:41 2010
New Revision: 48349

URL: http://svn.reactos.org/svn/reactos?rev=48349&view=rev
Log:
[win32csr]
- Fix compilation with msvc

Modified:
    trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c
    trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c

Modified: trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win3...
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c [iso-8859-1] Thu Jul 29 10:20:41 2010
@@ -179,6 +179,8 @@
 ConioProcessChar(PCSRSS_CONSOLE Console,
                  PINPUT_RECORD InputEvent)
 {
+    ConsoleInput *ConInRec;
+
     /* Check for pause or unpause */
     if (InputEvent->EventType == KEY_EVENT && InputEvent->Event.KeyEvent.bKeyDown)
     {
@@ -207,7 +209,7 @@
     }

/* add event to the queue */
-    ConsoleInput *ConInRec = RtlAllocateHeap(Win32CsrApiHeap, 0, sizeof(ConsoleInput));
+    ConInRec = RtlAllocateHeap(Win32CsrApiHeap, 0, sizeof(ConsoleInput));
     if (ConInRec == NULL)
         return STATUS_INSUFFICIENT_RESOURCES;
     ConInRec->InputEvent = *InputEvent;

Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win3...
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] Thu Jul 29 10:20:41 2010
@@ -1500,11 +1500,13 @@
 {
     PCSRSS_CONSOLE Console;
     PGUI_CONSOLE_DATA GuiData;
+    DWORD windx, windy;
+
     GuiConsoleGetDataPointers(hWnd, &Console, &GuiData);
     if((Console == NULL)|| (GuiData == NULL)) return;

-    DWORD windx = CONGUI_MIN_WIDTH * GuiData->CharWidth + 2 * (GetSystemMetrics(SM_CXFRAME) + GetSystemMetrics(SM_CXEDGE));
-    DWORD windy = CONGUI_MIN_HEIGHT * GuiData->CharHeight + 2 * (GetSystemMetrics(SM_CYFRAME) + GetSystemMetrics(SM_CYEDGE)) + GetSystemMetrics(SM_CYCAPTION);
+    windx = CONGUI_MIN_WIDTH * GuiData->CharWidth + 2 * (GetSystemMetrics(SM_CXFRAME) + GetSystemMetrics(SM_CXEDGE));
+    windy = CONGUI_MIN_HEIGHT * GuiData->CharHeight + 2 * (GetSystemMetrics(SM_CYFRAME) + GetSystemMetrics(SM_CYEDGE)) + GetSystemMetrics(SM_CYCAPTION);

minMaxInfo->ptMinTrackSize.x = windx;
     minMaxInfo->ptMinTrackSize.y = windy;
@@ -1529,18 +1531,19 @@
     if ((GuiData->WindowSizeLock == FALSE) && (wParam == SIZE_RESTORED || wParam == SIZE_MAXIMIZED || wParam == SIZE_MINIMIZED))
     {
         PCSRSS_SCREEN_BUFFER Buff = Console->ActiveBuffer;
+        DWORD windx, windy, charx, chary;

GuiData->WindowSizeLock = TRUE;

-        DWORD windx = LOWORD(lParam);
-        DWORD windy = HIWORD(lParam);
+        windx = LOWORD(lParam);
+        windy = HIWORD(lParam);

// Compensate for existing scroll bars (because lParam values do not accommodate scroll bar)
         if(Console->Size.X < Buff->MaxX) windy += GetSystemMetrics(SM_CYHSCROLL);    // window currently has a horizontal scrollbar
         if(Console->Size.Y < Buff->MaxY) windx += GetSystemMetrics(SM_CXVSCROLL);    // window currently has a vertical scrollbar

-        DWORD charx = windx / GuiData->CharWidth;
-        DWORD chary = windy / GuiData->CharHeight;
+        charx = windx / GuiData->CharWidth;
+        chary = windy / GuiData->CharHeight;

// Character alignment (round size up or down)
         if((windx % GuiData->CharWidth) >= (GuiData->CharWidth / 2)) ++charx;