Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jmorlan] 47568: [WIN32CSR] Consistently store console input events internally as unicode.
by jmorlan＠svn.reactos.org 04 Jun '10

04 Jun '10

Author: jmorlan Date: Fri Jun 4 18:31:56 2010 New Revision: 47568 URL: http://svn.reactos.org/svn/reactos?rev=47568&view=rev Log: [WIN32CSR] Consistently store console input events internally as unicode. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c [iso-8859-1] Fri Jun 4 18:31:56 2010 @@ -26,7 +26,7 @@ { PLIST_ENTRY CurrentEntry; ConsoleInput *Input; - PUCHAR Buffer; + PCHAR Buffer; PWCHAR UnicodeBuffer; ULONG i; ULONG nNumberOfCharsToRead, CharSize; @@ -42,7 +42,7 @@ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Buffer = Request->Data.ReadConsoleRequest.Buffer; + Buffer = (PCHAR)Request->Data.ReadConsoleRequest.Buffer; UnicodeBuffer = (PWCHAR)Buffer; Status = ConioLockConsole(ProcessData, Request->Data.ReadConsoleRequest.ConsoleHandle, &Console, GENERIC_READ); @@ -64,21 +64,20 @@ /* only pay attention to valid ascii chars, on key down */ if (KEY_EVENT == Input->InputEvent.EventType && Input->InputEvent.Event.KeyEvent.bKeyDown - && Input->InputEvent.Event.KeyEvent.uChar.AsciiChar != '\0') + && Input->InputEvent.Event.KeyEvent.uChar.UnicodeChar != L'\0') { /* * backspace handling - if we are in charge of echoing it then we handle it here * otherwise we treat it like a normal char. */ - if ('\b' == Input->InputEvent.Event.KeyEvent.uChar.AsciiChar && 0 + if (L'\b' == Input->InputEvent.Event.KeyEvent.uChar.UnicodeChar && 0 != (Console->Mode & ENABLE_ECHO_INPUT)) { /* echo if it has not already been done, and either we or the client has chars to be deleted */ if (! Input->Echoed && (0 != i || Request->Data.ReadConsoleRequest.nCharsCanBeDeleted)) { - ConioWriteConsole(Console, Console->ActiveBuffer, - &Input->InputEvent.Event.KeyEvent.uChar.AsciiChar, 1, TRUE); + ConioWriteConsole(Console, Console->ActiveBuffer, "\b", 1, TRUE); } if (0 != i) { @@ -101,17 +100,20 @@ else { if(Request->Data.ReadConsoleRequest.Unicode) - ConsoleInputAnsiCharToUnicodeChar(Console, &UnicodeBuffer[i], &Input->InputEvent.Event.KeyEvent.uChar.AsciiChar); + UnicodeBuffer[i] = Input->InputEvent.Event.KeyEvent.uChar.UnicodeChar; else - Buffer[i] = Input->InputEvent.Event.KeyEvent.uChar.AsciiChar; + ConsoleInputUnicodeCharToAnsiChar(Console, &Buffer[i], &Input->InputEvent.Event.KeyEvent.uChar.UnicodeChar); } /* echo to screen if enabled and we did not already echo the char */ if (0 != (Console->Mode & ENABLE_ECHO_INPUT) && ! Input->Echoed - && '\r' != Input->InputEvent.Event.KeyEvent.uChar.AsciiChar) - { - ConioWriteConsole(Console, Console->ActiveBuffer, - &Input->InputEvent.Event.KeyEvent.uChar.AsciiChar, 1, TRUE); + && L'\r' != Input->InputEvent.Event.KeyEvent.uChar.UnicodeChar) + { + CHAR AsciiChar; + WideCharToMultiByte(Console->OutputCodePage, 0, + &Input->InputEvent.Event.KeyEvent.uChar.UnicodeChar, 1, + &AsciiChar, 1, NULL, NULL); + ConioWriteConsole(Console, Console->ActiveBuffer, &AsciiChar, 1, TRUE); } } else @@ -215,15 +217,15 @@ if (0 != (Console->Mode & (ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT))) { - switch(KeyEventRecord->InputEvent.Event.KeyEvent.uChar.AsciiChar) - { - case '\r': + switch(KeyEventRecord->InputEvent.Event.KeyEvent.uChar.UnicodeChar) + { + case L'\r': /* first add the \r */ KeyEventRecord->InputEvent.EventType = KEY_EVENT; updown = KeyEventRecord->InputEvent.Event.KeyEvent.bKeyDown; KeyEventRecord->Echoed = FALSE; KeyEventRecord->InputEvent.Event.KeyEvent.wVirtualKeyCode = VK_RETURN; - KeyEventRecord->InputEvent.Event.KeyEvent.uChar.AsciiChar = '\r'; + KeyEventRecord->InputEvent.Event.KeyEvent.uChar.UnicodeChar = L'\r'; InsertTailList(&Console->InputEvents, &KeyEventRecord->ListEntry); Console->WaitingChars++; KeyEventRecord = HeapAlloc(Win32CsrApiHeap, 0, sizeof(ConsoleInput)); @@ -236,7 +238,7 @@ KeyEventRecord->InputEvent.Event.KeyEvent.bKeyDown = updown; KeyEventRecord->InputEvent.Event.KeyEvent.wVirtualKeyCode = 0; KeyEventRecord->InputEvent.Event.KeyEvent.wVirtualScanCode = 0; - KeyEventRecord->InputEvent.Event.KeyEvent.uChar.AsciiChar = '\n'; + KeyEventRecord->InputEvent.Event.KeyEvent.uChar.UnicodeChar = L'\n'; KeyEventRecord->Fake = TRUE; break; } @@ -247,17 +249,17 @@ /* if line input mode is enabled, only wake the client on enter key down */ if (0 == (Console->Mode & ENABLE_LINE_INPUT) || Console->EarlyReturn - || ('\n' == KeyEventRecord->InputEvent.Event.KeyEvent.uChar.AsciiChar + || (L'\n' == KeyEventRecord->InputEvent.Event.KeyEvent.uChar.UnicodeChar && KeyEventRecord->InputEvent.Event.KeyEvent.bKeyDown)) { - if ('\n' == KeyEventRecord->InputEvent.Event.KeyEvent.uChar.AsciiChar) + if (L'\n' == KeyEventRecord->InputEvent.Event.KeyEvent.uChar.UnicodeChar) { Console->WaitingLines++; } } KeyEventRecord->Echoed = FALSE; if (0 != (Console->Mode & (ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT)) - && '\b' == KeyEventRecord->InputEvent.Event.KeyEvent.uChar.AsciiChar + && L'\b' == KeyEventRecord->InputEvent.Event.KeyEvent.uChar.UnicodeChar && KeyEventRecord->InputEvent.Event.KeyEvent.bKeyDown) { /* walk the input queue looking for a char to backspace */ @@ -265,7 +267,7 @@ TempInput != (ConsoleInput *) &Console->InputEvents && (KEY_EVENT == TempInput->InputEvent.EventType || ! TempInput->InputEvent.Event.KeyEvent.bKeyDown - || '\b' == TempInput->InputEvent.Event.KeyEvent.uChar.AsciiChar); + || L'\b' == TempInput->InputEvent.Event.KeyEvent.uChar.UnicodeChar); TempInput = (ConsoleInput *) TempInput->ListEntry.Blink) { /* NOP */; @@ -277,9 +279,11 @@ RemoveEntryList(&TempInput->ListEntry); if (TempInput->Echoed) { - ConioWriteConsole(Console, Console->ActiveBuffer, - &KeyEventRecord->InputEvent.Event.KeyEvent.uChar.AsciiChar, - 1, TRUE); + CHAR AsciiChar; + WideCharToMultiByte(Console->OutputCodePage, 0, + &KeyEventRecord->InputEvent.Event.KeyEvent.uChar.UnicodeChar, 1, + &AsciiChar, 1, NULL, NULL); + ConioWriteConsole(Console, Console->ActiveBuffer, &AsciiChar, 1, TRUE); } HeapFree(Win32CsrApiHeap, 0, TempInput); RemoveEntryList(&KeyEventRecord->ListEntry); @@ -292,14 +296,16 @@ { /* echo chars if we are supposed to and client is waiting for some */ if (0 != (Console->Mode & ENABLE_ECHO_INPUT) && Console->EchoCount - && KeyEventRecord->InputEvent.Event.KeyEvent.uChar.AsciiChar + && KeyEventRecord->InputEvent.Event.KeyEvent.uChar.UnicodeChar && KeyEventRecord->InputEvent.Event.KeyEvent.bKeyDown - && '\r' != KeyEventRecord->InputEvent.Event.KeyEvent.uChar.AsciiChar) + && L'\r' != KeyEventRecord->InputEvent.Event.KeyEvent.uChar.UnicodeChar) { /* mark the char as already echoed */ - ConioWriteConsole(Console, Console->ActiveBuffer, - &KeyEventRecord->InputEvent.Event.KeyEvent.uChar.AsciiChar, - 1, TRUE); + CHAR AsciiChar; + WideCharToMultiByte(Console->OutputCodePage, 0, + &KeyEventRecord->InputEvent.Event.KeyEvent.uChar.UnicodeChar, 1, + &AsciiChar, 1, NULL, NULL); + ConioWriteConsole(Console, Console->ActiveBuffer, &AsciiChar, 1, TRUE); Console->EchoCount--; KeyEventRecord->Echoed = TRUE; } @@ -515,7 +521,6 @@ HeapFree(Win32CsrApiHeap, 0, ConInRec); return; } - /* FIXME - convert to ascii */ ConioProcessChar(Console, ConInRec); } @@ -568,7 +573,7 @@ { if (0 != (Console->Mode & ENABLE_LINE_INPUT) && Input->InputEvent.Event.KeyEvent.bKeyDown - && '\r' == Input->InputEvent.Event.KeyEvent.uChar.AsciiChar) + && L'\r' == Input->InputEvent.Event.KeyEvent.uChar.UnicodeChar) { Console->WaitingLines--; } @@ -782,11 +787,15 @@ Record->Fake = FALSE; //Record->InputEvent = *InputRecord++; memcpy(&Record->InputEvent, &InputRecord[i], sizeof(INPUT_RECORD)); - if (KEY_EVENT == Record->InputEvent.EventType) - { - /* FIXME - convert from unicode to ascii!! */ - ConioProcessChar(Console, Record); - } + if (!Request->Data.WriteConsoleInputRequest.Unicode && + Record->InputEvent.EventType == KEY_EVENT) + { + CHAR AsciiChar = Record->InputEvent.Event.KeyEvent.uChar.AsciiChar; + ConsoleInputAnsiCharToUnicodeChar(Console, + &Record->InputEvent.Event.KeyEvent.uChar.UnicodeChar, + &AsciiChar); + } + ConioProcessChar(Console, Record); } ConioUnlockConsole(Console);

1 0

[tkreuzer] 47567: [KS] - KSSTREAM_POINTER_OFFSET doesn't have an Alignment member on 64 bit systems. Comment the use out in these cases. It should probably be removed completely, as it's only an alignment / dummy value, but I leave this to the expert in this field. - ULONG -> ULONG_PTR for pointer casts
by tkreuzer＠svn.reactos.org 04 Jun '10

04 Jun '10

Author: tkreuzer Date: Fri Jun 4 17:58:43 2010 New Revision: 47567 URL: http://svn.reactos.org/svn/reactos?rev=47567&view=rev Log: [KS] - KSSTREAM_POINTER_OFFSET doesn't have an Alignment member on 64 bit systems. Comment the use out in these cases. It should probably be removed completely, as it's only an alignment / dummy value, but I leave this to the expert in this field. - ULONG -> ULONG_PTR for pointer casts Modified: trunk/reactos/drivers/ksfilter/ks/pin.c Modified: trunk/reactos/drivers/ksfilter/ks/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/pin.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/pin.c [iso-8859-1] Fri Jun 4 17:58:43 2010 @@ -1332,7 +1332,9 @@ else StreamPointer->StreamPointer.Offset = &StreamPointer->StreamPointer.OffsetOut; +#ifndef _WIN64 StreamPointer->StreamPointer.Offset->Alignment = 0; +#endif StreamPointer->StreamPointer.Offset->Count = 0; StreamPointer->StreamPointer.Offset->Data = NULL; StreamPointer->StreamPointer.Offset->Remaining = 0; @@ -1352,7 +1354,9 @@ /* FIXME */ ASSERT(Length); +#ifndef _WIN64 StreamPointer->StreamPointer.Offset->Alignment = 0; +#endif StreamPointer->StreamPointer.Context = NULL; StreamPointer->StreamPointer.Pin = &This->Pin; StreamPointer->StreamPointer.Offset->Count = Length; @@ -1543,7 +1547,7 @@ IKsPinImpl * This; PKSISTREAM_POINTER CurFrame; PKSISTREAM_POINTER NewFrame; - ULONG RefCount; + ULONG_PTR RefCount; NTSTATUS Status; ULONG Size; @@ -1562,7 +1566,7 @@ return STATUS_INSUFFICIENT_RESOURCES; /* get current irp stack location */ - RefCount = (ULONG)CurFrame->Irp->Tail.Overlay.DriverContext[0]; + RefCount = (ULONG_PTR)CurFrame->Irp->Tail.Overlay.DriverContext[0]; /* increment reference count */ RefCount++;

1 0

[gadamopoulos] 47566: [win32k] - CreateWindow: initialize window position after sending WM_GETMINMAXINFO message
by gadamopoulos＠svn.reactos.org 04 Jun '10

04 Jun '10

Author: gadamopoulos Date: Fri Jun 4 13:30:14 2010 New Revision: 47566 URL: http://svn.reactos.org/svn/reactos?rev=47566&view=rev Log: [win32k] - CreateWindow: initialize window position after sending WM_GETMINMAXINFO message Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Fri Jun 4 13:30:14 2010 @@ -1700,20 +1700,9 @@ Wnd->hModule = Cs->hInstance; Wnd->style = Cs->style & ~WS_VISIBLE; Wnd->ExStyle = Cs->dwExStyle; - Wnd->rcWindow.left = Cs->x; - Wnd->rcWindow.top = Cs->y; - Wnd->rcWindow.right = Cs->x + Cs->cx; - Wnd->rcWindow.bottom = Cs->y + Cs->cy; Wnd->cbwndExtra = Wnd->pcls->cbwndExtra; Wnd->spwndOwner = OwnerWindow ? OwnerWindow->Wnd : NULL; Wnd->spwndParent = ParentWindow ? ParentWindow->Wnd : NULL; - - if (Wnd->style & WS_CHILD && ParentWindow) - { - RECTL_vOffsetRect(&(Wnd->rcWindow), ParentWindow->Wnd->rcClient.left, - ParentWindow->Wnd->rcClient.top); - } - Wnd->rcClient = Wnd->rcWindow; IntReferenceMessageQueue(Window->pti->MessageQueue); if (Wnd->spwndParent != NULL && Cs->hwndParent != 0)

1 0

[tkreuzer] 47565: [HAL] - Move all amd64 specific files to one amd64 folder - Compile x86 specific timer code only on x86 - Use KeRegisterInterruptHandler instead of manual idt manipulation - add missing stubs for amd64
by tkreuzer＠svn.reactos.org 04 Jun '10

04 Jun '10

Author: tkreuzer Date: Fri Jun 4 12:59:19 2010 New Revision: 47565 URL: http://svn.reactos.org/svn/reactos?rev=47565&view=rev Log: [HAL] - Move all amd64 specific files to one amd64 folder - Compile x86 specific timer code only on x86 - Use KeRegisterInterruptHandler instead of manual idt manipulation - add missing stubs for amd64 Added: trunk/reactos/hal/halx86/amd64/ - copied from r47560, trunk/reactos/hal/halx86/generic/amd64/ trunk/reactos/hal/halx86/amd64/halinit.c (with props) trunk/reactos/hal/halx86/amd64/mps.S - copied unchanged from r47560, trunk/reactos/hal/halx86/mp/amd64/mps.S trunk/reactos/hal/halx86/amd64/processor.c (with props) trunk/reactos/hal/halx86/amd64/stubs.c (with props) Removed: trunk/reactos/hal/halx86/generic/amd64/ trunk/reactos/hal/halx86/mp/amd64/mps.S Modified: trunk/reactos/hal/halx86/amd64/x86bios.c trunk/reactos/hal/halx86/generic/timer.c trunk/reactos/hal/halx86/generic/usage.c trunk/reactos/hal/halx86/hal_generic.rbuild trunk/reactos/hal/halx86/halamd64.rbuild Added: trunk/reactos/hal/halx86/amd64/halinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/amd64/halinit.c… ============================================================================== --- trunk/reactos/hal/halx86/amd64/halinit.c (added) +++ trunk/reactos/hal/halx86/amd64/halinit.c [iso-8859-1] Fri Jun 4 12:59:19 2010 @@ -1,0 +1,31 @@ +/* + * PROJECT: ReactOS HAL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: hal/halx86/amd64/halinit.c + * PURPOSE: HAL Entrypoint and Initialization + * PROGRAMMERS: + */ + +/* INCLUDES ******************************************************************/ + +#include <hal.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS *******************************************************************/ + +/* PRIVATE FUNCTIONS *********************************************************/ + +/* FUNCTIONS *****************************************************************/ + +/* + * @implemented + */ +BOOLEAN +NTAPI +HalInitSystem(IN ULONG BootPhase, + IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + UNIMPLEMENTED; + return FALSE; +} Propchange: trunk/reactos/hal/halx86/amd64/halinit.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/hal/halx86/amd64/processor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/amd64/processor… ============================================================================== --- trunk/reactos/hal/halx86/amd64/processor.c (added) +++ trunk/reactos/hal/halx86/amd64/processor.c [iso-8859-1] Fri Jun 4 12:59:19 2010 @@ -1,0 +1,97 @@ +/* + * PROJECT: ReactOS HAL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: hal/halx86/amd64/processor.c + * PURPOSE: HAL Processor Routines + * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <hal.h> +#define NDEBUG +#include <debug.h> + +KAFFINITY HalpActiveProcessors; +KAFFINITY HalpDefaultInterruptAffinity; + +/* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +HaliHaltSystem(VOID) +{ + /* Disable interrupts and halt the CPU */ + _disable(); + __halt(); +} + +/* FUNCTIONS *****************************************************************/ + +/* + * @implemented + */ +VOID +NTAPI +HalInitializeProcessor(IN ULONG ProcessorNumber, + IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + /* Set default stall count */ + KeGetPcr()->StallScaleFactor = INITIAL_STALL_COUNT; + + /* Update the interrupt affinity and processor mask */ + InterlockedBitTestAndSet((PLONG)&HalpActiveProcessors, ProcessorNumber); + InterlockedBitTestAndSet((PLONG)&HalpDefaultInterruptAffinity, + ProcessorNumber); + + /* Register routines for KDCOM */ + //HalpRegisterKdSupportFunctions(); +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +HalAllProcessorsStarted(VOID) +{ + /* Do nothing */ + return TRUE; +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +HalStartNextProcessor(IN PLOADER_PARAMETER_BLOCK LoaderBlock, + IN PKPROCESSOR_STATE ProcessorState) +{ + /* Ready to start */ + return FALSE; +} + +/* + * @implemented + */ +VOID +NTAPI +HalProcessorIdle(VOID) +{ + /* Enable interrupts and halt the processor */ + _enable(); + __halt(); +} + +/* + * @implemented + */ +VOID +NTAPI +HalRequestIpi(KAFFINITY TargetProcessors) +{ + UNIMPLEMENTED; + __debugbreak(); +} + +/* EOF */ Propchange: trunk/reactos/hal/halx86/amd64/processor.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/hal/halx86/amd64/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/amd64/stubs.c?r… ============================================================================== --- trunk/reactos/hal/halx86/amd64/stubs.c (added) +++ trunk/reactos/hal/halx86/amd64/stubs.c [iso-8859-1] Fri Jun 4 12:59:19 2010 @@ -1,0 +1,97 @@ +/* + * PROJECT: ReactOS HAL + * LICENSE: GPL - See COPYING.ARM in the top level directory + * FILE: hal/halx86/amd64/stubs.c + * PURPOSE: HAL stubs + * PROGRAMMERS: + */ + +/* INCLUDES *******************************************************************/ + +#include <hal.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +LARGE_INTEGER HalpPerformanceFrequency; + + +/* FUNCTIONS ******************************************************************/ + +VOID +FASTCALL +HalClearSoftwareInterrupt( + IN KIRQL Irql) +{ + UNIMPLEMENTED; +} + +VOID +FASTCALL +HalRequestSoftwareInterrupt( + IN KIRQL Irql) +{ + UNIMPLEMENTED; +} + +BOOLEAN +NTAPI +HalBeginSystemInterrupt( + IN KIRQL Irql, + IN UCHAR Vector, + OUT PKIRQL OldIrql) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOLEAN +NTAPI +HalEnableSystemInterrupt( + IN UCHAR Vector, + IN KIRQL Irql, + IN KINTERRUPT_MODE InterruptMode) +{ + UNIMPLEMENTED; + return FALSE; +} + +VOID +NTAPI +HalDisableSystemInterrupt( + IN UCHAR Vector, + IN KIRQL Irql) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +HalEndSystemInterrupt( + IN KIRQL OldIrql, + IN PKTRAP_FRAME TrapFrame) +{ + UNIMPLEMENTED; +} + +LARGE_INTEGER +NTAPI +KeQueryPerformanceCounter( + OUT PLARGE_INTEGER PerformanceFrequency OPTIONAL) +{ + LARGE_INTEGER Result; + +// ASSERT(HalpPerformanceFrequency.QuadPart != 0); + + /* Does the caller want the frequency? */ + if (PerformanceFrequency) + { + /* Return value */ + *PerformanceFrequency = HalpPerformanceFrequency; + } + + Result.QuadPart = __rdtsc(); + return Result; +} + Propchange: trunk/reactos/hal/halx86/amd64/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/hal/halx86/amd64/x86bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/amd64/x86bios.c… ============================================================================== --- trunk/reactos/hal/halx86/amd64/x86bios.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/amd64/x86bios.c [iso-8859-1] Fri Jun 4 12:59:19 2010 @@ -12,7 +12,7 @@ //#define NDEBUG #include <debug.h> -#include "x86emu.h" +//#include "x86emu.h" /* This page serves as fallback for pages used by Mm */ #define DEFAULT_PAGE 0x21 @@ -216,6 +216,7 @@ return STATUS_SUCCESS; } +#if 0 BOOLEAN NTAPI x86BiosCall( @@ -261,11 +262,13 @@ return TRUE; } +#endif BOOLEAN NTAPI HalpBiosDisplayReset(VOID) { +#if 0 X86_BIOS_REGISTERS Registers; ULONG OldEflags; @@ -283,7 +286,7 @@ /* Restore previous flags */ __writeeflags(OldEflags); - +#endif return TRUE; } Modified: trunk/reactos/hal/halx86/generic/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/timer.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] Fri Jun 4 12:59:19 2010 @@ -109,6 +109,7 @@ HalpCurrentRollOver = RollOver; } +#ifdef _M_IX86 #ifndef _MINIHAL_ VOID FASTCALL @@ -163,6 +164,7 @@ } #endif +#endif /* PUBLIC FUNCTIONS ***********************************************************/ Modified: trunk/reactos/hal/halx86/generic/usage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/usage.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/usage.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/usage.c [iso-8859-1] Fri Jun 4 12:59:19 2010 @@ -509,17 +509,11 @@ IN PVOID Handler, IN KINTERRUPT_MODE Mode) { - UCHAR Entry; - - /* Convert the vector into the IDT entry */ - Entry = HalVectorToIDTEntry(SystemVector); - /* Register the vector */ HalpRegisterVector(Flags, BusVector, SystemVector, Irql); /* Connect the interrupt */ - ((PKIPCR)KeGetPcr())->IDT[Entry].ExtendedOffset = (USHORT)(((ULONG_PTR)Handler >> 16) & 0xFFFF); - ((PKIPCR)KeGetPcr())->IDT[Entry].Offset = (USHORT)((ULONG_PTR)Handler); + KeRegisterInterruptHandler(SystemVector, Handler); /* Enable the interrupt */ HalEnableSystemInterrupt(SystemVector, Irql, Mode); Modified: trunk/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic.rbu… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Fri Jun 4 12:59:19 2010 @@ -36,19 +36,6 @@ <file>trap.S</file> </directory> </if> - <if property="ARCH" value="amd64"> - <define name="_X86BIOS_" /> -  - <directory name="amd64"> - <file>x86bios.c</file> -  -  -  -  - <file>systimer.S</file> -  - </directory> - </if> </directory> <directory name="include"> <pch>hal.h</pch> Modified: trunk/reactos/hal/halx86/halamd64.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halamd64.rbuild… ============================================================================== --- trunk/reactos/hal/halx86/halamd64.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/halamd64.rbuild [iso-8859-1] Fri Jun 4 12:59:19 2010 @@ -8,6 +8,7 @@ <include base="ntoskrnl">include</include>  <define name="_DISABLE_TIDENTS" /> + <define name="_NTHALDLL_" /> <define name="_NTHAL_" /> <define name="_X86BIOS_" /> <library>hal_generic</library> @@ -19,18 +20,14 @@ <file>spinlock.c</file> </directory> - <directory name="up"> + <directory name="amd64"> + <file>x86bios.c</file> + <file>halinit.c</file> + <file>stubs.c</file> + <file>systimer.S</file> <file>processor.c</file> </directory> -  </module> </group> Removed: trunk/reactos/hal/halx86/mp/amd64/mps.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/amd64/mps.S?… ============================================================================== --- trunk/reactos/hal/halx86/mp/amd64/mps.S [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/amd64/mps.S (removed) @@ -1,96 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/amd64/generic/mps.S - * PURPOSE: Intel MultiProcessor specification support - * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - */ - -/* INCLUDES ******************************************************************/ - -#include <reactos/asm.h> -#include <ndk/amd64/asm.h> - -/* FUNCTIONS *****************************************************************/ - -#define BEFORE \ - cld; \ - push rax; \ - push rbx; \ - push rcx; \ - push rdx; \ - push rsi; \ - push rdi; \ - push fs; \ - push gs; \ - -#define AFTER \ - pop gs; \ - pop fs; \ - pop rdi; \ - pop rsi; \ - pop rdx; \ - pop rcx; \ - pop rbx; \ - pop rax; \ - -#ifdef CONFIG_SMP -PUBLIC MpsIpiInterrupt -MpsIpiInterrupt: - /* Save registers */ - BEFORE - - /* Call the C handler */ - call MpsIpiHandler - - /* Return to the caller */ - AFTER - iret -#endif - -PUBLIC MpsErrorInterrupt -MpsErrorInterrupt: - /* Save registers */ - BEFORE - - /* Call the C handler */ - call MpsErrorHandler - - /* Return to the caller */ - AFTER - iret - - -PUBLIC MpsSpuriousInterrupt -MpsSpuriousInterrupt: - /* Save registers */ - BEFORE - - /* Call the C handler */ - call MpsSpuriousHandler - - /* Return to the caller */ - AFTER - iret - -PUBLIC MpsTimerInterrupt -MpsTimerInterrupt: - /* Save registers */ - BEFORE - - mov ebx, 0xef - mov eax, 0xceafbeef - push rax - push rsp - push rbx - call MpsTimerHandler - pop rax - pop rax - pop rax - - /* Return to the caller */ - AFTER - iret - - -/* EOF */

1 0

[tkreuzer] 47564: [NTOSKRNL] Implement KeRegisterInterruptHandler and KeQueryInterruptHandler for amd64
by tkreuzer＠svn.reactos.org 04 Jun '10

04 Jun '10

Author: tkreuzer Date: Fri Jun 4 12:51:44 2010 New Revision: 47564 URL: http://svn.reactos.org/svn/reactos?rev=47564&view=rev Log: [NTOSKRNL] Implement KeRegisterInterruptHandler and KeQueryInterruptHandler for amd64 Modified: trunk/reactos/ntoskrnl/include/internal/amd64/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] Fri Jun 4 12:51:44 2010 @@ -155,6 +155,52 @@ #else /* Nothing to do */ #endif +} + +/* Registers an interrupt handler with an IDT vector */ +FORCEINLINE +VOID +KeRegisterInterruptHandler(IN ULONG Vector, + IN PVOID Handler) +{ + UCHAR Entry; + PKIDTENTRY64 Idt; + + /* Get the entry from the HAL */ + Entry = HalVectorToIDTEntry(Vector); + + /* Now set the data */ + Idt = &KeGetPcr()->IdtBase[Entry]; + Idt->OffsetLow = (ULONG_PTR)Handler & 0xffff; + Idt->OffsetMiddle = ((ULONG_PTR)Handler >> 16) & 0xffff; + Idt->OffsetHigh = (ULONG_PTR)Handler >> 32; + Idt->Selector = KGDT64_R0_CODE; + Idt->IstIndex = 0; + Idt->Type = 0x0e; + Idt->Dpl = 0; + Idt->Present = 1; + Idt->Reserved0 = 0; + Idt->Reserved1 = 0; +} + +/* Returns the registered interrupt handler for a given IDT vector */ +FORCEINLINE +PVOID +KeQueryInterruptHandler(IN ULONG Vector) +{ + UCHAR Entry; + PKIDTENTRY64 Idt; + + /* Get the entry from the HAL */ + Entry = HalVectorToIDTEntry(Vector); + + /* Get the IDT entry */ + Idt = &KeGetPcr()->IdtBase[Entry]; + + /* Return the address */ + return (PVOID)((ULONG64)Idt->OffsetHigh << 32 | + (ULONG64)Idt->OffsetMiddle << 16 | + (ULONG64)Idt->OffsetLow); } VOID

1 0

[tkreuzer] 47563: [HAL] - Move memory functions from halinit.c to new memory.c - HalpAllocPhysicalMemory: MemoryFirmwareTemporary -> LoaderFirmwareTemporary (same value, different enum)
by tkreuzer＠svn.reactos.org 04 Jun '10

04 Jun '10

Author: tkreuzer Date: Fri Jun 4 12:17:55 2010 New Revision: 47563 URL: http://svn.reactos.org/svn/reactos?rev=47563&view=rev Log: [HAL] - Move memory functions from halinit.c to new memory.c - HalpAllocPhysicalMemory: MemoryFirmwareTemporary -> LoaderFirmwareTemporary (same value, different enum) Added: trunk/reactos/hal/halx86/generic/memory.c (with props) Modified: trunk/reactos/hal/halx86/generic/halinit.c trunk/reactos/hal/halx86/hal_generic.rbuild Modified: trunk/reactos/hal/halx86/generic/halinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/halinit… ============================================================================== --- trunk/reactos/hal/halx86/generic/halinit.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/halinit.c [iso-8859-1] Fri Jun 4 12:17:55 2010 @@ -14,222 +14,9 @@ /* GLOBALS *******************************************************************/ -/* Share with Mm headers? */ -#define MM_HAL_VA_START (PVOID)0xFFC00000 -#define MM_HAL_HEAP_START (PVOID)((ULONG_PTR)MM_HAL_VA_START + (1024 * 1024)) - BOOLEAN HalpPciLockSettings; -ULONG HalpUsedAllocDescriptors; -MEMORY_ALLOCATION_DESCRIPTOR HalpAllocationDescriptorArray[64]; -PVOID HalpHeapStart = MM_HAL_HEAP_START; /* PRIVATE FUNCTIONS *********************************************************/ - -ULONG -NTAPI -HalpAllocPhysicalMemory(IN PLOADER_PARAMETER_BLOCK LoaderBlock, - IN ULONG MaxAddress, - IN ULONG PageCount, - IN BOOLEAN Aligned) -{ - ULONG UsedDescriptors, Alignment, PhysicalAddress; - PFN_NUMBER MaxPage, BasePage; - PLIST_ENTRY NextEntry; - PMEMORY_ALLOCATION_DESCRIPTOR MdBlock, NewBlock, FreeBlock; - - /* Highest page we'll go */ - MaxPage = MaxAddress >> PAGE_SHIFT; - - /* We need at least two blocks */ - if ((HalpUsedAllocDescriptors + 2) > 64) return 0; - - /* Remember how many we have now */ - UsedDescriptors = HalpUsedAllocDescriptors; - - /* Loop the loader block memory descriptors */ - NextEntry = LoaderBlock->MemoryDescriptorListHead.Flink; - while (NextEntry != &LoaderBlock->MemoryDescriptorListHead) - { - /* Get the block */ - MdBlock = CONTAINING_RECORD(NextEntry, - MEMORY_ALLOCATION_DESCRIPTOR, - ListEntry); - - /* No alignment by default */ - Alignment = 0; - - /* Unless requested, in which case we use a 64KB block alignment */ - if (Aligned) Alignment = ((MdBlock->BasePage + 0x0F) & ~0x0F) - MdBlock->BasePage; - - /* Search for free memory */ - if ((MdBlock->MemoryType == LoaderFree) || - (MdBlock->MemoryType == MemoryFirmwareTemporary)) - { - /* Make sure the page is within bounds, including alignment */ - BasePage = MdBlock->BasePage; - if ((BasePage) && - (MdBlock->PageCount >= PageCount + Alignment) && - (BasePage + PageCount + Alignment < MaxPage)) - { - - /* We found an address */ - PhysicalAddress = (BasePage + Alignment) << PAGE_SHIFT; - break; - } - } - - /* Keep trying */ - NextEntry = NextEntry->Flink; - } - - /* If we didn't find anything, get out of here */ - if (NextEntry == &LoaderBlock->MemoryDescriptorListHead) return 0; - - /* Okay, now get a descriptor */ - NewBlock = &HalpAllocationDescriptorArray[HalpUsedAllocDescriptors]; - NewBlock->PageCount = PageCount; - NewBlock->BasePage = MdBlock->BasePage + Alignment; - NewBlock->MemoryType = LoaderHALCachedMemory; - - /* Update count */ - UsedDescriptors++; - HalpUsedAllocDescriptors = UsedDescriptors; - - /* Check if we had any alignment */ - if (Alignment) - { - /* Check if we had leftovers */ - if ((MdBlock->PageCount - Alignment) != PageCount) - { - /* Get the next descriptor */ - FreeBlock = &HalpAllocationDescriptorArray[UsedDescriptors]; - FreeBlock->PageCount = MdBlock->PageCount - Alignment - PageCount; - FreeBlock->BasePage = MdBlock->BasePage + Alignment + PageCount; - - /* One more */ - HalpUsedAllocDescriptors++; - - /* Insert it into the list */ - InsertHeadList(&MdBlock->ListEntry, &FreeBlock->ListEntry); - } - - /* Use this descriptor */ - NewBlock->PageCount = Alignment; - InsertHeadList(&MdBlock->ListEntry, &NewBlock->ListEntry); - } - else - { - /* Consume memory from this block */ - MdBlock->BasePage += PageCount; - MdBlock->PageCount -= PageCount; - - /* Insert the descriptor */ - InsertTailList(&MdBlock->ListEntry, &NewBlock->ListEntry); - - /* Remove the entry if the whole block was allocated */ - if (!MdBlock->PageCount == 0) RemoveEntryList(&MdBlock->ListEntry); - } - - /* Return the address */ - return PhysicalAddress; -} - -PVOID -NTAPI -HalpMapPhysicalMemory64(IN PHYSICAL_ADDRESS PhysicalAddress, - IN ULONG PageCount) -{ - PHARDWARE_PTE PointerPte; - ULONG UsedPages = 0; - PVOID VirtualAddress, BaseAddress; - - /* Start at the current HAL heap base */ - BaseAddress = HalpHeapStart; - VirtualAddress = BaseAddress; - - /* Loop until we have all the pages required */ - while (UsedPages < PageCount) - { - /* If this overflows past the HAL heap, it means there's no space */ - if (VirtualAddress == NULL) return NULL; - - /* Get the PTE for this address */ - PointerPte = HalAddressToPte(VirtualAddress); - - /* Go to the next page */ - VirtualAddress = (PVOID)((ULONG_PTR)VirtualAddress + PAGE_SIZE); - - /* Check if the page is available */ - if (PointerPte->Valid) - { - /* PTE has data, skip it and start with a new base address */ - BaseAddress = VirtualAddress; - UsedPages = 0; - continue; - } - - /* PTE is available, keep going on this run */ - UsedPages++; - } - - /* Take the base address of the page plus the actual offset in the address */ - VirtualAddress = (PVOID)((ULONG_PTR)BaseAddress + - BYTE_OFFSET(PhysicalAddress.LowPart)); - - /* If we are starting at the heap, move the heap */ - if (BaseAddress == HalpHeapStart) - { - /* Past this allocation */ - HalpHeapStart = (PVOID)((ULONG_PTR)BaseAddress + (PageCount * PAGE_SIZE)); - } - - /* Loop pages that can be mapped */ - while (UsedPages--) - { - /* Fill out the PTE */ - PointerPte = HalAddressToPte(BaseAddress); - PointerPte->PageFrameNumber = PhysicalAddress.QuadPart >> PAGE_SHIFT; - PointerPte->Valid = 1; - PointerPte->Write = 1; - - /* Move to the next address */ - PhysicalAddress.QuadPart += PAGE_SIZE; - BaseAddress = (PVOID)((ULONG_PTR)BaseAddress + PAGE_SIZE); - } - - /* Flush the TLB and return the address */ - HalpFlushTLB(); - return VirtualAddress; -} - -VOID -NTAPI -HalpUnmapVirtualAddress(IN PVOID VirtualAddress, - IN ULONG PageCount) -{ - PHARDWARE_PTE PointerPte; - ULONG i; - - /* Only accept valid addresses */ - if (VirtualAddress < MM_HAL_VA_START) return; - - /* Align it down to page size */ - VirtualAddress = (PVOID)((ULONG_PTR)VirtualAddress & ~(PAGE_SIZE - 1)); - - /* Loop PTEs */ - PointerPte = HalAddressToPte(VirtualAddress); - for (i = 0; i < PageCount; i++) - { - *(PULONG)PointerPte = 0; - PointerPte++; - } - - /* Flush the TLB */ - HalpFlushTLB(); - - /* Put the heap back */ - if (HalpHeapStart > VirtualAddress) HalpHeapStart = VirtualAddress; -} VOID NTAPI Added: trunk/reactos/hal/halx86/generic/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/memory.… ============================================================================== --- trunk/reactos/hal/halx86/generic/memory.c (added) +++ trunk/reactos/hal/halx86/generic/memory.c [iso-8859-1] Fri Jun 4 12:17:55 2010 @@ -1,0 +1,234 @@ +/* + * PROJECT: ReactOS HAL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: hal/halx86/generic/memory.c + * PURPOSE: HAL memory management + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES ******************************************************************/ + +#include <hal.h> +#define NDEBUG +#include <debug.h> + +/* Share with Mm headers? */ +#define MM_HAL_VA_START (PVOID)0xFFC00000 +#define MM_HAL_HEAP_START (PVOID)((ULONG_PTR)MM_HAL_VA_START + (1024 * 1024)) + +/* GLOBALS *******************************************************************/ + +ULONG HalpUsedAllocDescriptors; +MEMORY_ALLOCATION_DESCRIPTOR HalpAllocationDescriptorArray[64]; +PVOID HalpHeapStart = MM_HAL_HEAP_START; + + +/* PRIVATE FUNCTIONS *********************************************************/ + + +ULONG +NTAPI +HalpAllocPhysicalMemory(IN PLOADER_PARAMETER_BLOCK LoaderBlock, + IN ULONG MaxAddress, + IN ULONG PageCount, + IN BOOLEAN Aligned) +{ + ULONG UsedDescriptors, Alignment, PhysicalAddress; + PFN_NUMBER MaxPage, BasePage; + PLIST_ENTRY NextEntry; + PMEMORY_ALLOCATION_DESCRIPTOR MdBlock, NewBlock, FreeBlock; + + /* Highest page we'll go */ + MaxPage = MaxAddress >> PAGE_SHIFT; + + /* We need at least two blocks */ + if ((HalpUsedAllocDescriptors + 2) > 64) return 0; + + /* Remember how many we have now */ + UsedDescriptors = HalpUsedAllocDescriptors; + + /* Loop the loader block memory descriptors */ + NextEntry = LoaderBlock->MemoryDescriptorListHead.Flink; + while (NextEntry != &LoaderBlock->MemoryDescriptorListHead) + { + /* Get the block */ + MdBlock = CONTAINING_RECORD(NextEntry, + MEMORY_ALLOCATION_DESCRIPTOR, + ListEntry); + + /* No alignment by default */ + Alignment = 0; + + /* Unless requested, in which case we use a 64KB block alignment */ + if (Aligned) Alignment = ((MdBlock->BasePage + 0x0F) & ~0x0F) - MdBlock->BasePage; + + /* Search for free memory */ + if ((MdBlock->MemoryType == LoaderFree) || + (MdBlock->MemoryType == LoaderFirmwareTemporary)) + { + /* Make sure the page is within bounds, including alignment */ + BasePage = MdBlock->BasePage; + if ((BasePage) && + (MdBlock->PageCount >= PageCount + Alignment) && + (BasePage + PageCount + Alignment < MaxPage)) + { + + /* We found an address */ + PhysicalAddress = (BasePage + Alignment) << PAGE_SHIFT; + break; + } + } + + /* Keep trying */ + NextEntry = NextEntry->Flink; + } + + /* If we didn't find anything, get out of here */ + if (NextEntry == &LoaderBlock->MemoryDescriptorListHead) return 0; + + /* Okay, now get a descriptor */ + NewBlock = &HalpAllocationDescriptorArray[HalpUsedAllocDescriptors]; + NewBlock->PageCount = PageCount; + NewBlock->BasePage = MdBlock->BasePage + Alignment; + NewBlock->MemoryType = LoaderHALCachedMemory; + + /* Update count */ + UsedDescriptors++; + HalpUsedAllocDescriptors = UsedDescriptors; + + /* Check if we had any alignment */ + if (Alignment) + { + /* Check if we had leftovers */ + if ((MdBlock->PageCount - Alignment) != PageCount) + { + /* Get the next descriptor */ + FreeBlock = &HalpAllocationDescriptorArray[UsedDescriptors]; + FreeBlock->PageCount = MdBlock->PageCount - Alignment - PageCount; + FreeBlock->BasePage = MdBlock->BasePage + Alignment + PageCount; + + /* One more */ + HalpUsedAllocDescriptors++; + + /* Insert it into the list */ + InsertHeadList(&MdBlock->ListEntry, &FreeBlock->ListEntry); + } + + /* Use this descriptor */ + NewBlock->PageCount = Alignment; + InsertHeadList(&MdBlock->ListEntry, &NewBlock->ListEntry); + } + else + { + /* Consume memory from this block */ + MdBlock->BasePage += PageCount; + MdBlock->PageCount -= PageCount; + + /* Insert the descriptor */ + InsertTailList(&MdBlock->ListEntry, &NewBlock->ListEntry); + + /* Remove the entry if the whole block was allocated */ + if (!MdBlock->PageCount == 0) RemoveEntryList(&MdBlock->ListEntry); + } + + /* Return the address */ + return PhysicalAddress; +} + +PVOID +NTAPI +HalpMapPhysicalMemory64(IN PHYSICAL_ADDRESS PhysicalAddress, + IN ULONG PageCount) +{ + PHARDWARE_PTE PointerPte; + ULONG UsedPages = 0; + PVOID VirtualAddress, BaseAddress; + + /* Start at the current HAL heap base */ + BaseAddress = HalpHeapStart; + VirtualAddress = BaseAddress; + + /* Loop until we have all the pages required */ + while (UsedPages < PageCount) + { + /* If this overflows past the HAL heap, it means there's no space */ + if (VirtualAddress == NULL) return NULL; + + /* Get the PTE for this address */ + PointerPte = HalAddressToPte(VirtualAddress); + + /* Go to the next page */ + VirtualAddress = (PVOID)((ULONG_PTR)VirtualAddress + PAGE_SIZE); + + /* Check if the page is available */ + if (PointerPte->Valid) + { + /* PTE has data, skip it and start with a new base address */ + BaseAddress = VirtualAddress; + UsedPages = 0; + continue; + } + + /* PTE is available, keep going on this run */ + UsedPages++; + } + + /* Take the base address of the page plus the actual offset in the address */ + VirtualAddress = (PVOID)((ULONG_PTR)BaseAddress + + BYTE_OFFSET(PhysicalAddress.LowPart)); + + /* If we are starting at the heap, move the heap */ + if (BaseAddress == HalpHeapStart) + { + /* Past this allocation */ + HalpHeapStart = (PVOID)((ULONG_PTR)BaseAddress + (PageCount * PAGE_SIZE)); + } + + /* Loop pages that can be mapped */ + while (UsedPages--) + { + /* Fill out the PTE */ + PointerPte = HalAddressToPte(BaseAddress); + PointerPte->PageFrameNumber = PhysicalAddress.QuadPart >> PAGE_SHIFT; + PointerPte->Valid = 1; + PointerPte->Write = 1; + + /* Move to the next address */ + PhysicalAddress.QuadPart += PAGE_SIZE; + BaseAddress = (PVOID)((ULONG_PTR)BaseAddress + PAGE_SIZE); + } + + /* Flush the TLB and return the address */ + HalpFlushTLB(); + return VirtualAddress; +} + +VOID +NTAPI +HalpUnmapVirtualAddress(IN PVOID VirtualAddress, + IN ULONG PageCount) +{ + PHARDWARE_PTE PointerPte; + ULONG i; + + /* Only accept valid addresses */ + if (VirtualAddress < MM_HAL_VA_START) return; + + /* Align it down to page size */ + VirtualAddress = (PVOID)((ULONG_PTR)VirtualAddress & ~(PAGE_SIZE - 1)); + + /* Loop PTEs */ + PointerPte = HalAddressToPte(VirtualAddress); + for (i = 0; i < PageCount; i++) + { + *(PULONG)PointerPte = 0; + PointerPte++; + } + + /* Flush the TLB */ + HalpFlushTLB(); + + /* Put the heap back */ + if (HalpHeapStart > VirtualAddress) HalpHeapStart = VirtualAddress; +} + Propchange: trunk/reactos/hal/halx86/generic/memory.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic.rbu… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Fri Jun 4 12:17:55 2010 @@ -20,7 +20,7 @@ <file>display.c</file> <file>dma.c</file> <file>drive.c</file> - <file>halinit.c</file> + <file>memory.c</file> <file>misc.c</file> <file>profil.c</file> <file>reboot.c</file> @@ -29,6 +29,7 @@ <file>usage.c</file> <if property="ARCH" value="i386"> <file>bios.c</file> + <file>halinit.c</file> <directory name="i386"> <file>portio.c</file> <file>systimer.S</file> @@ -46,7 +47,7 @@  <file>systimer.S</file>  - </directory> + </directory> </if> </directory> <directory name="include">

1 0

[jmorlan] 47562: [KERNEL32], [WIN32CSR] - Make Get/SetConsoleTitle more compatible with windows; in particular, transfer title via capture buffer to allow for longer titles. - Tighten up capture buffer validation in win32csr.
by jmorlan＠svn.reactos.org 04 Jun '10

04 Jun '10

Author: jmorlan Date: Fri Jun 4 08:36:12 2010 New Revision: 47562 URL: http://svn.reactos.org/svn/reactos?rev=47562&view=rev Log: [KERNEL32], [WIN32CSR] - Make Get/SetConsoleTitle more compatible with windows; in particular, transfer title via capture buffer to allow for longer titles. - Tighten up capture buffer validation in win32csr. Modified: trunk/reactos/dll/win32/kernel32/misc/console.c trunk/reactos/include/reactos/subsys/csrss/csrss.h trunk/reactos/subsystems/win32/csrss/win32csr/alias.c trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c trunk/reactos/subsystems/win32/csrss/win32csr/conoutput.c trunk/reactos/subsystems/win32/csrss/win32csr/console.c trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.h Modified: trunk/reactos/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/console.c [iso-8859-1] Fri Jun 4 08:36:12 2010 @@ -3418,6 +3418,64 @@ } +static DWORD +IntGetConsoleTitle(LPVOID lpConsoleTitle, DWORD nSize, BOOL bUnicode) +{ + CSR_API_MESSAGE Request; + PCSR_CAPTURE_BUFFER CaptureBuffer; + ULONG CsrRequest = MAKE_CSR_API(GET_TITLE, CSR_CONSOLE); + NTSTATUS Status; + + if (nSize == 0) + return 0; + + Request.Data.GetTitleRequest.Length = nSize * (bUnicode ? 1 : sizeof(WCHAR)); + CaptureBuffer = CsrAllocateCaptureBuffer(1, Request.Data.GetTitleRequest.Length); + if (CaptureBuffer == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + + CsrAllocateMessagePointer(CaptureBuffer, + Request.Data.GetTitleRequest.Length, + (PVOID*)&Request.Data.GetTitleRequest.Title); + + Status = CsrClientCallServer(&Request, CaptureBuffer, CsrRequest, sizeof(CSR_API_MESSAGE)); + if (!NT_SUCCESS(Status) || !(NT_SUCCESS(Status = Request.Status))) + { + CsrFreeCaptureBuffer(CaptureBuffer); + SetLastErrorByStatus(Status); + return 0; + } + + if (bUnicode) + { + if (nSize >= sizeof(WCHAR)) + wcscpy((LPWSTR)lpConsoleTitle, Request.Data.GetTitleRequest.Title); + } + else + { + if (nSize < Request.Data.GetTitleRequest.Length / sizeof(WCHAR) || + !WideCharToMultiByte(CP_ACP, // ANSI code page + 0, // performance and mapping flags + Request.Data.GetTitleRequest.Title, // address of wide-character string + -1, // number of characters in string + (LPSTR)lpConsoleTitle, // address of buffer for new string + nSize, // size of buffer + NULL, // FAST + NULL)) + { + /* Yes, if the buffer isn't big enough, it returns 0... Bad API */ + *(LPSTR)lpConsoleTitle = '\0'; + Request.Data.GetTitleRequest.Length = 0; + } + } + CsrFreeCaptureBuffer(CaptureBuffer); + + return Request.Data.GetTitleRequest.Length / sizeof(WCHAR); +} + /*-------------------------------------------------------------- * GetConsoleTitleW * @@ -3428,48 +3486,8 @@ GetConsoleTitleW(LPWSTR lpConsoleTitle, DWORD nSize) { - PCSR_API_MESSAGE Request; - ULONG CsrRequest; - NTSTATUS Status; - - Request = RtlAllocateHeap(RtlGetProcessHeap(), - 0, - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_GET_TITLE) + CSRSS_MAX_TITLE_LENGTH * sizeof(WCHAR)); - if (Request == NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - CsrRequest = MAKE_CSR_API(GET_TITLE, CSR_CONSOLE); - - Status = CsrClientCallServer(Request, - NULL, - CsrRequest, - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_GET_TITLE) + CSRSS_MAX_TITLE_LENGTH * sizeof(WCHAR)); - if (!NT_SUCCESS(Status) || !(NT_SUCCESS(Status = Request->Status))) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, Request); - SetLastErrorByStatus(Status); - return 0; - } - - if (nSize * sizeof(WCHAR) <= Request->Data.GetTitleRequest.Length) - { - nSize--; - } - else - { - nSize = Request->Data.GetTitleRequest.Length / sizeof (WCHAR); - } - memcpy(lpConsoleTitle, Request->Data.GetTitleRequest.Title, nSize * sizeof(WCHAR)); - lpConsoleTitle[nSize] = L'\0'; - - RtlFreeHeap(RtlGetProcessHeap(), 0, Request); - - return nSize; -} - + return IntGetConsoleTitle(lpConsoleTitle, nSize, TRUE); +} /*-------------------------------------------------------------- * GetConsoleTitleA @@ -3483,28 +3501,7 @@ GetConsoleTitleA(LPSTR lpConsoleTitle, DWORD nSize) { - WCHAR WideTitle [CSRSS_MAX_TITLE_LENGTH + 1]; - DWORD nWideTitle = CSRSS_MAX_TITLE_LENGTH + 1; - DWORD nWritten; - - if (!lpConsoleTitle || !nSize) return 0; - nWideTitle = GetConsoleTitleW((LPWSTR) WideTitle, nWideTitle); - if (!nWideTitle) return 0; - - if ((nWritten = WideCharToMultiByte(CP_ACP, // ANSI code page - 0, // performance and mapping flags - (LPWSTR) WideTitle, // address of wide-character string - nWideTitle, // number of characters in string - lpConsoleTitle, // address of buffer for new string - nSize - 1, // size of buffer - NULL, // FAST - NULL))) // FAST - { - lpConsoleTitle[nWritten] = '\0'; - return nWritten; - } - - return 0; + return IntGetConsoleTitle(lpConsoleTitle, nSize, FALSE); } @@ -3517,40 +3514,32 @@ WINAPI SetConsoleTitleW(LPCWSTR lpConsoleTitle) { - PCSR_API_MESSAGE Request; - ULONG CsrRequest; - NTSTATUS Status; - unsigned int c; - - Request = RtlAllocateHeap(RtlGetProcessHeap(), 0, - max(sizeof(CSR_API_MESSAGE), - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_SET_TITLE) + - min(wcslen(lpConsoleTitle), CSRSS_MAX_TITLE_LENGTH) * sizeof(WCHAR))); - if (Request == NULL) + CSR_API_MESSAGE Request; + PCSR_CAPTURE_BUFFER CaptureBuffer; + ULONG CsrRequest = MAKE_CSR_API(SET_TITLE, CSR_CONSOLE); + NTSTATUS Status; + + Request.Data.SetTitleRequest.Length = wcslen(lpConsoleTitle) * sizeof(WCHAR); + + CaptureBuffer = CsrAllocateCaptureBuffer(1, Request.Data.SetTitleRequest.Length); + if (CaptureBuffer == NULL) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } - CsrRequest = MAKE_CSR_API(SET_TITLE, CSR_CONSOLE); - - for (c = 0; lpConsoleTitle[c] && c < CSRSS_MAX_TITLE_LENGTH; c++) - Request->Data.SetTitleRequest.Title[c] = lpConsoleTitle[c]; - - Request->Data.SetTitleRequest.Length = c * sizeof(WCHAR); - Status = CsrClientCallServer(Request, - NULL, - CsrRequest, - max(sizeof(CSR_API_MESSAGE), - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_SET_TITLE) + c * sizeof(WCHAR))); - if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request->Status)) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, Request); + CsrCaptureMessageBuffer(CaptureBuffer, + (PVOID)lpConsoleTitle, + Request.Data.SetTitleRequest.Length, + (PVOID*)&Request.Data.SetTitleRequest.Title); + + Status = CsrClientCallServer(&Request, CaptureBuffer, CsrRequest, sizeof(CSR_API_MESSAGE)); + CsrFreeCaptureBuffer(CaptureBuffer); + if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) + { SetLastErrorByStatus(Status); - return(FALSE); - } - - RtlFreeHeap(RtlGetProcessHeap(), 0, Request); + return FALSE; + } return TRUE; } @@ -3567,43 +3556,18 @@ WINAPI SetConsoleTitleA(LPCSTR lpConsoleTitle) { - PCSR_API_MESSAGE Request; - ULONG CsrRequest; - NTSTATUS Status; - unsigned int c; - - Request = RtlAllocateHeap(RtlGetProcessHeap(), - 0, - max(sizeof(CSR_API_MESSAGE), - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_SET_TITLE) + - min(strlen(lpConsoleTitle), CSRSS_MAX_TITLE_LENGTH) * sizeof(WCHAR))); - if (Request == NULL) + ULONG Length = strlen(lpConsoleTitle) + 1; + LPWSTR WideTitle = HeapAlloc(GetProcessHeap(), 0, Length * sizeof(WCHAR)); + BOOL Ret; + if (!WideTitle) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } - - CsrRequest = MAKE_CSR_API(SET_TITLE, CSR_CONSOLE); - - for (c = 0; lpConsoleTitle[c] && c < CSRSS_MAX_TITLE_LENGTH; c++) - Request->Data.SetTitleRequest.Title[c] = lpConsoleTitle[c]; - - Request->Data.SetTitleRequest.Length = c * sizeof(WCHAR); - Status = CsrClientCallServer(Request, - NULL, - CsrRequest, - max(sizeof(CSR_API_MESSAGE), - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_SET_TITLE) + c * sizeof(WCHAR))); - if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request->Status)) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, Request); - SetLastErrorByStatus(Status); - return(FALSE); - } - - RtlFreeHeap(RtlGetProcessHeap(), 0, Request); - - return TRUE; + MultiByteToWideChar(CP_ACP, 0, lpConsoleTitle, -1, WideTitle, Length); + Ret = SetConsoleTitleW(WideTitle); + HeapFree(GetProcessHeap(), 0, WideTitle); + return Ret; } Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] Fri Jun 4 08:36:12 2010 @@ -207,13 +207,13 @@ typedef struct { DWORD Length; - WCHAR Title[0]; + PWCHAR Title; } CSRSS_SET_TITLE, *PCSRSS_SET_TITLE; typedef struct { DWORD Length; - WCHAR Title[0]; + PWCHAR Title; } CSRSS_GET_TITLE, *PCSRSS_GET_TITLE; typedef struct @@ -487,11 +487,6 @@ #define CSRSS_MAX_READ_CONSOLE (LPC_MAX_DATA_LENGTH - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_READ_CONSOLE)) #define CSRSS_MAX_READ_CONSOLE_OUTPUT_CHAR (LPC_MAX_DATA_LENGTH - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_READ_CONSOLE_OUTPUT_CHAR)) #define CSRSS_MAX_READ_CONSOLE_OUTPUT_ATTRIB (LPC_MAX_DATA_LENGTH - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_READ_CONSOLE_OUTPUT_ATTRIB)) -#define CSRSS_MAX_GET_PROCESS_LIST (LPC_MAX_DATA_LENGTH - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_GET_PROCESS_LIST)) - -/* WCHARs, not bytes! */ -#define CSRSS_MAX_TITLE_LENGTH 80 -#define CSRSS_MAX_ALIAS_TARGET_LENGTH 80 #define CREATE_PROCESS (0x0) #define TERMINATE_PROCESS (0x1) Modified: trunk/reactos/subsystems/win32/csrss/win32csr/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/alias.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/alias.c [iso-8859-1] Fri Jun 4 08:36:12 2010 @@ -31,21 +31,6 @@ } ALIAS_HEADER, *PALIAS_HEADER; -/* Ensure that a buffer is contained within the process's shared memory section. */ -static BOOL -ValidateBuffer(PCSRSS_PROCESS_DATA ProcessData, PVOID Buffer, ULONG Size) -{ - ULONG Offset = (BYTE *)Buffer - (BYTE *)ProcessData->CsrSectionViewBase; - if (Offset >= ProcessData->CsrSectionViewSize - || Size > (ProcessData->CsrSectionViewSize - Offset)) - { - DPRINT1("Invalid buffer %p %d; not within %p %d\n", - Buffer, Size, ProcessData->CsrSectionViewBase, ProcessData->CsrSectionViewSize); - return FALSE; - } - return TRUE; -} - static PALIAS_HEADER IntFindAliasHeader(PALIAS_HEADER RootHeader, LPCWSTR lpExeName) @@ -415,7 +400,8 @@ return STATUS_BUFFER_TOO_SMALL; } - if (!ValidateBuffer(ProcessData, lpTarget, Request->Data.GetConsoleAlias.TargetBufferLength)) + if (!Win32CsrValidateBuffer(ProcessData, lpTarget, + Request->Data.GetConsoleAlias.TargetBufferLength, 1)) { ConioUnlockConsole(Console); return STATUS_ACCESS_VIOLATION; @@ -457,9 +443,10 @@ return STATUS_BUFFER_OVERFLOW; } - if (!ValidateBuffer(ProcessData, - Request->Data.GetAllConsoleAlias.AliasBuffer, - Request->Data.GetAllConsoleAlias.AliasBufferLength)) + if (!Win32CsrValidateBuffer(ProcessData, + Request->Data.GetAllConsoleAlias.AliasBuffer, + Request->Data.GetAllConsoleAlias.AliasBufferLength, + 1)) { ConioUnlockConsole(Console); return STATUS_ACCESS_VIOLATION; @@ -532,9 +519,10 @@ return STATUS_INVALID_PARAMETER; } - if (!ValidateBuffer(ProcessData, - Request->Data.GetConsoleAliasesExes.ExeNames, - Request->Data.GetConsoleAliasesExes.Length)) + if (!Win32CsrValidateBuffer(ProcessData, + Request->Data.GetConsoleAliasesExes.ExeNames, + Request->Data.GetConsoleAliasesExes.Length, + 1)) { ConioUnlockConsole(Console); return STATUS_ACCESS_VIOLATION; Modified: trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c [iso-8859-1] Fri Jun 4 08:36:12 2010 @@ -678,7 +678,6 @@ { NTSTATUS Status; PCSRSS_CONSOLE Console; - DWORD Size; DWORD Length; PLIST_ENTRY CurrentItem; PINPUT_RECORD InputRecord; @@ -698,10 +697,8 @@ InputRecord = Request->Data.PeekConsoleInputRequest.InputRecord; Length = Request->Data.PeekConsoleInputRequest.Length; - Size = Length * sizeof(INPUT_RECORD); - - if (((PVOID)InputRecord < ProcessData->CsrSectionViewBase) - || (((ULONG_PTR)InputRecord + Size) > ((ULONG_PTR)ProcessData->CsrSectionViewBase + ProcessData->CsrSectionViewSize))) + + if (!Win32CsrValidateBuffer(ProcessData, InputRecord, Length, sizeof(INPUT_RECORD))) { ConioUnlockConsole(Console); return STATUS_ACCESS_VIOLATION; @@ -749,7 +746,6 @@ PCSRSS_CONSOLE Console; NTSTATUS Status; DWORD Length; - DWORD Size; DWORD i; ConsoleInput* Record; @@ -766,10 +762,8 @@ InputRecord = Request->Data.WriteConsoleInputRequest.InputRecord; Length = Request->Data.WriteConsoleInputRequest.Length; - Size = Length * sizeof(INPUT_RECORD); - - if (((PVOID)InputRecord < ProcessData->CsrSectionViewBase) - || (((ULONG_PTR)InputRecord + Size) > ((ULONG_PTR)ProcessData->CsrSectionViewBase + ProcessData->CsrSectionViewSize))) + + if (!Win32CsrValidateBuffer(ProcessData, InputRecord, Length, sizeof(INPUT_RECORD))) { ConioUnlockConsole(Console); return STATUS_ACCESS_VIOLATION; Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conoutput.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conoutput.c [iso-8859-1] Fri Jun 4 08:36:12 2010 @@ -1084,7 +1084,6 @@ COORD BufferSize; NTSTATUS Status; PBYTE Ptr; - DWORD PSize; DPRINT("CsrWriteConsoleOutput\n"); @@ -1101,12 +1100,10 @@ Console = Buff->Header.Console; BufferSize = Request->Data.WriteConsoleOutputRequest.BufferSize; - PSize = BufferSize.X * BufferSize.Y * sizeof(CHAR_INFO); BufferCoord = Request->Data.WriteConsoleOutputRequest.BufferCoord; CharInfo = Request->Data.WriteConsoleOutputRequest.CharInfo; - if (((PVOID)CharInfo < ProcessData->CsrSectionViewBase) || - (((ULONG_PTR)CharInfo + PSize) > - ((ULONG_PTR)ProcessData->CsrSectionViewBase + ProcessData->CsrSectionViewSize))) + if (!Win32CsrValidateBuffer(ProcessData, CharInfo, + BufferSize.X * BufferSize.Y, sizeof(CHAR_INFO))) { ConioUnlockScreenBuffer(Buff); return STATUS_ACCESS_VIOLATION; @@ -1395,8 +1392,6 @@ PCHAR_INFO CharInfo; PCHAR_INFO CurCharInfo; PCSRSS_SCREEN_BUFFER Buff; - DWORD Size; - DWORD Length; DWORD SizeX, SizeY; NTSTATUS Status; COORD BufferSize; @@ -1423,14 +1418,12 @@ ReadRegion = Request->Data.ReadConsoleOutputRequest.ReadRegion; BufferSize = Request->Data.ReadConsoleOutputRequest.BufferSize; BufferCoord = Request->Data.ReadConsoleOutputRequest.BufferCoord; - Length = BufferSize.X * BufferSize.Y; - Size = Length * sizeof(CHAR_INFO); /* FIXME: Is this correct? */ CodePage = ProcessData->Console->OutputCodePage; - if (((PVOID)CharInfo < ProcessData->CsrSectionViewBase) - || (((ULONG_PTR)CharInfo + Size) > ((ULONG_PTR)ProcessData->CsrSectionViewBase + ProcessData->CsrSectionViewSize))) + if (!Win32CsrValidateBuffer(ProcessData, CharInfo, + BufferSize.X * BufferSize.Y, sizeof(CHAR_INFO))) { ConioUnlockScreenBuffer(Buff); return STATUS_ACCESS_VIOLATION; Modified: trunk/reactos/subsystems/win32/csrss/win32csr/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/console.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/console.c [iso-8859-1] Fri Jun 4 08:36:12 2010 @@ -455,19 +455,15 @@ DPRINT("CsrSetTitle\n"); - if (Request->Header.u1.s1.TotalLength - < CSR_API_MESSAGE_HEADER_SIZE(CSRSS_SET_TITLE) - + Request->Data.SetTitleRequest.Length) - { - DPRINT1("Invalid request size\n"); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - return STATUS_INVALID_PARAMETER; - } - - Status = ConioConsoleFromProcessData(ProcessData, &Console); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); + Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); + Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); + if (!Win32CsrValidateBuffer(ProcessData, Request->Data.SetTitleRequest.Title, + Request->Data.SetTitleRequest.Length, 1)) + { + return STATUS_ACCESS_VIOLATION; + } + + Status = ConioConsoleFromProcessData(ProcessData, &Console); if(NT_SUCCESS(Status)) { Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, Request->Data.SetTitleRequest.Length); @@ -507,6 +503,13 @@ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); + + if (!Win32CsrValidateBuffer(ProcessData, Request->Data.GetTitleRequest.Title, + Request->Data.GetTitleRequest.Length, 1)) + { + return STATUS_ACCESS_VIOLATION; + } + Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { @@ -515,19 +518,16 @@ } /* Copy title of the console to the user title buffer */ - RtlZeroMemory(&Request->Data.GetTitleRequest, sizeof(CSRSS_GET_TITLE)); + if (Request->Data.GetTitleRequest.Length >= sizeof(WCHAR)) + { + Length = min(Request->Data.GetTitleRequest.Length - sizeof(WCHAR), Console->Title.Length); + memcpy(Request->Data.GetTitleRequest.Title, Console->Title.Buffer, Length); + Request->Data.GetTitleRequest.Title[Length / sizeof(WCHAR)] = L'\0'; + } + Request->Data.GetTitleRequest.Length = Console->Title.Length; - memcpy (Request->Data.GetTitleRequest.Title, Console->Title.Buffer, - Console->Title.Length); - Length = CSR_API_MESSAGE_HEADER_SIZE(CSRSS_SET_TITLE) + Console->Title.Length; - - ConioUnlockConsole(Console); - - if (Length > sizeof(CSR_API_MESSAGE)) - { - Request->Header.u1.s1.TotalLength = Length; - Request->Header.u1.s1.DataLength = Length - sizeof(PORT_MESSAGE); - } + + ConioUnlockConsole(Console); return STATUS_SUCCESS; } @@ -754,7 +754,6 @@ PLIST_ENTRY current_entry; ULONG nItems = 0; NTSTATUS Status; - ULONG_PTR Offset; DPRINT("CsrGetProcessList\n"); @@ -762,13 +761,8 @@ Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Buffer = Request->Data.GetProcessListRequest.ProcessId; - Offset = (PBYTE)Buffer - (PBYTE)ProcessData->CsrSectionViewBase; - if (Offset >= ProcessData->CsrSectionViewSize - || (Request->Data.GetProcessListRequest.nMaxIds * sizeof(DWORD)) > (ProcessData->CsrSectionViewSize - Offset) - || Offset & (sizeof(DWORD) - 1)) - { + if (!Win32CsrValidateBuffer(ProcessData, Buffer, Request->Data.GetProcessListRequest.nMaxIds, sizeof(DWORD))) return STATUS_ACCESS_VIOLATION; - } Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Fri Jun 4 08:36:12 2010 @@ -100,6 +100,32 @@ return TRUE; } +/* Ensure that a captured buffer is safe to access */ +BOOL FASTCALL +Win32CsrValidateBuffer(PCSRSS_PROCESS_DATA ProcessData, PVOID Buffer, + SIZE_T NumElements, SIZE_T ElementSize) +{ + /* Check that the following conditions are true: + * 1. The start of the buffer is somewhere within the process's + * shared memory section view. + * 2. The remaining space in the view is at least as large as the buffer. + * (NB: Please don't try to "optimize" this by using multiplication + * instead of division; remember that 2147483648 * 2 = 0.) + * 3. The buffer is DWORD-aligned. + */ + ULONG_PTR Offset = (BYTE *)Buffer - (BYTE *)ProcessData->CsrSectionViewBase; + if (Offset >= ProcessData->CsrSectionViewSize + || NumElements > (ProcessData->CsrSectionViewSize - Offset) / ElementSize + || (Offset & (sizeof(DWORD) - 1)) != 0) + { + DPRINT1("Invalid buffer %p(%u*%u); section view is %p(%u)\n", + Buffer, NumElements, ElementSize, + ProcessData->CsrSectionViewBase, ProcessData->CsrSectionViewSize); + return FALSE; + } + return TRUE; +} + NTSTATUS FASTCALL Win32CsrEnumProcesses(CSRSS_ENUM_PROCESS_PROC EnumProc, PVOID Context) Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.h [iso-8859-1] Fri Jun 4 08:36:12 2010 @@ -63,6 +63,10 @@ CSR_API(CsrDuplicateHandle); CSR_API(CsrGetInputWaitHandle); +BOOL FASTCALL Win32CsrValidateBuffer(PCSRSS_PROCESS_DATA ProcessData, + PVOID Buffer, + SIZE_T NumElements, + SIZE_T ElementSize); NTSTATUS FASTCALL Win32CsrEnumProcesses(CSRSS_ENUM_PROCESS_PROC EnumProc, PVOID Context);

1 0

[tkreuzer] 47561: revert 47559 and 47560 (once again... sigh)
by tkreuzer＠svn.reactos.org 04 Jun '10

04 Jun '10

Author: tkreuzer Date: Fri Jun 4 02:49:33 2010 New Revision: 47561 URL: http://svn.reactos.org/svn/reactos?rev=47561&view=rev Log: revert 47559 and 47560 (once again... sigh) Modified: trunk/reactos/include/ddk/ntddk.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=47…

1 0

[tkreuzer] 47560: try to fix build
by tkreuzer＠svn.reactos.org 04 Jun '10

04 Jun '10

Author: tkreuzer Date: Fri Jun 4 02:26:49 2010 New Revision: 47560 URL: http://svn.reactos.org/svn/reactos?rev=47560&view=rev Log: try to fix build Modified: trunk/reactos/include/ddk/ntddk.h Modified: trunk/reactos/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=47… ============================================================================== --- trunk/reactos/include/ddk/ntddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddk.h [iso-8859-1] Fri Jun 4 02:26:49 2010 @@ -1043,6 +1043,8 @@ PHYSICAL_COUNTER_RESOURCE_DESCRIPTOR Descriptors[ANYSIZE_ARRAY]; } PHYSICAL_COUNTER_RESOURCE_LIST, *PPHYSICAL_COUNTER_RESOURCE_LIST; +#endif // 0 + typedef VOID (NTAPI *PciPin2Line)( IN struct _BUS_HANDLER *BusHandler, @@ -1079,6 +1081,8 @@ PCI_SLOT_NUMBER ParentSlot; PVOID Reserved[4]; } PCIBUSDATA, *PPCIBUSDATA; + +#if 0 // Someone (testbot? RosBE for linux?) doesn't like too many types it seems... #ifndef _PCIINTRF_X_ #define _PCIINTRF_X_

1 0

[tkreuzer] 47559: [DDK] Merge the rest of the old header-branch version of ntddk.h, but with a large number of additional types #if 0'ed out
by tkreuzer＠svn.reactos.org 04 Jun '10

04 Jun '10

Author: tkreuzer Date: Fri Jun 4 02:19:39 2010 New Revision: 47559 URL: http://svn.reactos.org/svn/reactos?rev=47559&view=rev Log: [DDK] Merge the rest of the old header-branch version of ntddk.h, but with a large number of additional types #if 0'ed out Modified: trunk/reactos/include/ddk/ntddk.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=47…

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs