From a76f1549b61a6d13f3eb33e9c588c4185b7f4b2c Mon Sep 17 00:00:00 2001
From: Johannes Anderwald <johannes.anderwald@reactos.org>
Date: Thu, 30 Nov 2006 16:48:13 +0000
Subject: [PATCH] - various msvc compability fixes - 2 errors remaining:
 conio.c(2104) : error C2065: 'CONSOLE_INPUT_MODE_VALID' : undeclared
 identifier conio.c(2108) : error C2065: 'CONSOLE_OUTPUT_MODE_VALID' :
 undeclared identifier

those two constants should be moved into the NDK(declared in wincon.h)...

svn path=/trunk/; revision=24993
---
 .../subsystems/win32/csrss/win32csr/conio.c   | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/reactos/subsystems/win32/csrss/win32csr/conio.c b/reactos/subsystems/win32/csrss/win32csr/conio.c
index 57b064b778f..3622d495f72 100644
--- a/reactos/subsystems/win32/csrss/win32csr/conio.c
+++ b/reactos/subsystems/win32/csrss/win32csr/conio.c
@@ -13,9 +13,6 @@
 #define NDEBUG
 #include <debug.h>
 
-/* FIXME: Is there a way to create real aliasses with gcc? [CSH] */
-#define ALIAS(Name, Target) typeof(Target) Name = Target
-
 /* GLOBALS *******************************************************************/
 
 #define ConioInitRect(Rect, Top, Left, Bottom, Right) \
@@ -110,7 +107,7 @@ CsrInitConsoleScreenBuffer(PCSRSS_CONSOLE Console,
   Buffer->Header.ReferenceCount = 0;
   Buffer->ShowX = 0;
   Buffer->ShowY = 0;
-  Buffer->Buffer = HeapAlloc(Win32CsrApiHeap, HEAP_ZERO_MEMORY, Buffer->MaxX * Buffer->MaxY * sizeof(WCHAR));
+  Buffer->Buffer = HeapAlloc(Win32CsrApiHeap, HEAP_ZERO_MEMORY, Buffer->MaxX * Buffer->MaxY * 2);
   if (NULL == Buffer->Buffer)
     {
       return STATUS_INSUFFICIENT_RESOURCES;
@@ -721,7 +718,7 @@ ConioPhysicalToLogical(PCSRSS_SCREEN_BUFFER Buff,
      }
 }
 
-inline BOOLEAN ConioIsEqualRect(
+BOOLEAN __inline ConioIsEqualRect(
   RECT *Rect1,
   RECT *Rect2)
 {
@@ -729,7 +726,7 @@ inline BOOLEAN ConioIsEqualRect(
     (Rect1->top == Rect2->top) && (Rect1->bottom == Rect2->bottom));
 }
 
-inline BOOLEAN ConioGetIntersection(
+BOOLEAN __inline ConioGetIntersection(
   RECT *Intersection,
   RECT *Rect1,
   RECT *Rect2)
@@ -755,7 +752,7 @@ inline BOOLEAN ConioGetIntersection(
   return TRUE;
 }
 
-inline BOOLEAN ConioGetUnion(
+BOOLEAN __inline ConioGetUnion(
   RECT *Union,
   RECT *Rect1,
   RECT *Rect2)
@@ -788,7 +785,7 @@ inline BOOLEAN ConioGetUnion(
   return TRUE;
 }
 
-inline BOOLEAN ConioSubtractRect(
+BOOLEAN __inline ConioSubtractRect(
   RECT *Subtraction,
   RECT *Rect1,
   RECT *Rect2)
@@ -1519,7 +1516,7 @@ CSR_API(CsrSetCursor)
   return Request->Status = STATUS_SUCCESS;
 }
 
-static FASTCALL VOID
+static VOID FASTCALL
 ConioComputeUpdateRect(PCSRSS_SCREEN_BUFFER Buff, RECT *UpdateRect, COORD *Start, UINT Length)
 {
   if (Buff->MaxX <= Start->X + Length)
@@ -2527,13 +2524,17 @@ CSR_API(CsrScrollConsoleScreenBuffer)
   RECT ClipRectangle;
   NTSTATUS Status;
   BOOLEAN DoFill;
+  HANDLE ConsoleHandle;
+  BOOLEAN UseClipRectangle;
+  COORD DestinationOrigin;
+  CHAR_INFO Fill;
 
   DPRINT("CsrScrollConsoleScreenBuffer\n");
 
-  ALIAS(ConsoleHandle,Request->Data.ScrollConsoleScreenBufferRequest.ConsoleHandle);
-  ALIAS(UseClipRectangle,Request->Data.ScrollConsoleScreenBufferRequest.UseClipRectangle);
-  ALIAS(DestinationOrigin,Request->Data.ScrollConsoleScreenBufferRequest.DestinationOrigin);
-  ALIAS(Fill,Request->Data.ScrollConsoleScreenBufferRequest.Fill);
+  ConsoleHandle = Request->Data.ScrollConsoleScreenBufferRequest.ConsoleHandle;
+  UseClipRectangle = Request->Data.ScrollConsoleScreenBufferRequest.UseClipRectangle;
+  DestinationOrigin = Request->Data.ScrollConsoleScreenBufferRequest.DestinationOrigin;
+  Fill = Request->Data.ScrollConsoleScreenBufferRequest.Fill;
 
   Status = ConioConsoleFromProcessData(ProcessData, &Console);
   if (! NT_SUCCESS(Status))