From bc06faa8cd156d16269a6af844589156a03c840e Mon Sep 17 00:00:00 2001
From: Rex Jolliff <rex@lvcablemodem.com>
Date: Sun, 6 Dec 1998 00:04:04 +0000
Subject: [PATCH] Fixed a bug introduced by a change in ZwAllocateVirtualMemory
 call

svn path=/trunk/; revision=112
---
 reactos/apps/utils/shell/shell.c | 10 ++++------
 reactos/ntoskrnl/mm/virtual.c    |  2 +-
 reactos/ntoskrnl/tst/test.c      |  9 +++++----
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/reactos/apps/utils/shell/shell.c b/reactos/apps/utils/shell/shell.c
index 095c3f5871f..6141078cafa 100644
--- a/reactos/apps/utils/shell/shell.c
+++ b/reactos/apps/utils/shell/shell.c
@@ -15,9 +15,6 @@ void debug_printf(char* fmt, ...)
    va_end(args);
 }
 
-#define VIDMEM_BASE 0xb8000
-static char* vidmem = (char *)(VIDMEM_BASE + IDMAP_BASE);
-
 void main()
 {
    KEY_EVENT_RECORD KeyEvent[2];
@@ -26,13 +23,11 @@ void main()
    HANDLE DefaultHeap;
    PVOID Buffer;
 
-   vidmem[(80 * 50 - 1) * 2] = '0';    
    NtDisplayString("Simple Shell Starting...\n");
    
 //   DefaultHeap = HeapCreate(0,1024*1024,1024*1024);
 //   Buffer = HeapAlloc(DefaultHeap,0,1024);
    
-   vidmem[(80 * 50 - 1) * 2] = '1';
    FileHandle = CreateFile("\\Device\\Keyboard",
 			   FILE_GENERIC_READ,
 			   0,
@@ -41,8 +36,9 @@ void main()
 			   0,
 			   NULL);
    
-   vidmem[(80 * 50 - 1) * 2] = '2';
+NtDisplayString("#1\n");
    debug_printf("C:\\");
+NtDisplayString("#2\n");
    for(;;)
      {
 	ReadFile(FileHandle,
@@ -50,6 +46,8 @@ void main()
 		 sizeof(KeyEvent),
 		 &Result,
 		 NULL);
+NtDisplayString("#3\n");
 	debug_printf("%c",KeyEvent[0].AsciiChar);
+NtDisplayString("#4\n");
      }
 }
diff --git a/reactos/ntoskrnl/mm/virtual.c b/reactos/ntoskrnl/mm/virtual.c
index cf147486767..1cff82f21c4 100644
--- a/reactos/ntoskrnl/mm/virtual.c
+++ b/reactos/ntoskrnl/mm/virtual.c
@@ -312,7 +312,7 @@ ZwAllocateVirtualMemory(
    
    DbgPrint("ZwAllocateVirtualMemory(ProcessHandle %x, *BaseAddress %x, "
 	    "ZeroBits %d, RegionSize %d, AllocationType %x, Protect %x)\n",
-	    ProcessHandle,*BaseAddress,ZeroBits,RegionSize,AllocationType,
+	    ProcessHandle,*BaseAddress,ZeroBits,*RegionSize,AllocationType,
 	    Protect);
    
    Status = ObReferenceObjectByHandle(ProcessHandle,
diff --git a/reactos/ntoskrnl/tst/test.c b/reactos/ntoskrnl/tst/test.c
index 97649093a06..9cdbd6a9c0b 100644
--- a/reactos/ntoskrnl/tst/test.c
+++ b/reactos/ntoskrnl/tst/test.c
@@ -97,7 +97,7 @@ VOID ExExecuteShell(VOID)
    ANSI_STRING afilename;
    UNICODE_STRING ufilename;
    LARGE_INTEGER SectionOffset;
-   ULONG Size;
+   ULONG Size, StackSize;
    CONTEXT Context;
    
    ZwCreateProcess(&ShellHandle,
@@ -130,12 +130,12 @@ VOID ExExecuteShell(VOID)
    BaseAddress = (PVOID)0x10000;
    SectionOffset.HighPart = 0;
    SectionOffset.LowPart = 0;
-   Size = 0x6000;
+   Size = 0x8000;
    ZwMapViewOfSection(SectionHandle,
 		      ShellHandle,
 		      &BaseAddress,
 		      0,
-                      0x6000,
+                      0x8000,
 		      &SectionOffset,
 		      &Size,
 		      0,
@@ -155,10 +155,11 @@ VOID ExExecuteShell(VOID)
    Context.SegGs = USER_DS;
    
    BaseAddress = 0x1000;
+   StackSize = 0x1000;
    ZwAllocateVirtualMemory(ShellHandle,
 			   &BaseAddress,
 			   0,
-			   PAGESIZE,
+			   &StackSize,
 			   MEM_COMMIT,
 			   PAGE_READWRITE);