Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sir_richard] 47598: [NTOS]: Fix Exp*PoolList macros. Also make then non-inlined, so we can see who called them in a stack trace. [NTOS]: Enable them. This boots on my system -- if it doesn't boot on yours, someone is corrupting your nonpaged pool. Reverting this patch is NOT the solution to your woes.
by sir_richard＠svn.reactos.org 05 Jun '10

05 Jun '10

Author: sir_richard Date: Sat Jun 5 20:26:15 2010 New Revision: 47598 URL: http://svn.reactos.org/svn/reactos?rev=47598&view=rev Log: [NTOS]: Fix Exp*PoolList macros. Also make then non-inlined, so we can see who called them in a stack trace. [NTOS]: Enable them. This boots on my system -- if it doesn't boot on yours, someone is corrupting your nonpaged pool. Reverting this patch is NOT the solution to your woes. Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Sat Jun 5 20:26:15 2010 @@ -39,30 +39,33 @@ * Pool list access debug macros, similar to Arthur's pfnlist.c work. * Microsoft actually implements similar checks in the Windows Server 2003 SP1 * pool code, but only for checked builds. + * * As of Vista, however, an MSDN Blog entry by a Security Team Manager indicates * that these checks are done even on retail builds, due to the increasing * number of kernel-mode attacks which depend on dangling list pointers and other * kinds of list-based attacks. + * * For now, I will leave these checks on all the time, but later they are likely * to be DBG-only, at least until there are enough kernel-mode security attacks * against ReactOS to warrant the performance hit. * - */ -FORCEINLINE + * For now, these are not made inline, so we can get good stack traces. + */ +NTAPI PLIST_ENTRY ExpDecodePoolLink(IN PLIST_ENTRY Link) { return (PLIST_ENTRY)((ULONG_PTR)Link & ~1); } -FORCEINLINE +NTAPI PLIST_ENTRY ExpEncodePoolLink(IN PLIST_ENTRY Link) { return (PLIST_ENTRY)((ULONG_PTR)Link | 1); } -FORCEINLINE +NTAPI VOID ExpCheckPoolLinks(IN PLIST_ENTRY ListHead) { @@ -77,52 +80,56 @@ } } -FORCEINLINE +NTAPI VOID ExpInitializePoolListHead(IN PLIST_ENTRY ListHead) { ListHead->Flink = ListHead->Blink = ExpEncodePoolLink(ListHead); } -FORCEINLINE +NTAPI BOOLEAN ExpIsPoolListEmpty(IN PLIST_ENTRY ListHead) { return (ExpDecodePoolLink(ListHead->Flink) == ListHead); } -FORCEINLINE +NTAPI VOID ExpRemovePoolEntryList(IN PLIST_ENTRY Entry) { PLIST_ENTRY Blink, Flink; Flink = ExpDecodePoolLink(Entry->Flink); Blink = ExpDecodePoolLink(Entry->Blink); + Flink->Blink = ExpEncodePoolLink(Blink); Blink->Flink = ExpEncodePoolLink(Flink); - Flink->Blink = ExpEncodePoolLink(Blink); -} - -FORCEINLINE +} + +NTAPI PLIST_ENTRY ExpRemovePoolHeadList(IN PLIST_ENTRY ListHead) { - PLIST_ENTRY Head; - Head = ExpDecodePoolLink(ListHead->Flink); - ExpRemovePoolEntryList(Head); - return Head; -} - -FORCEINLINE + PLIST_ENTRY Entry, Flink; + Entry = ExpDecodePoolLink(ListHead->Flink); + Flink = ExpDecodePoolLink(Entry->Flink); + ListHead->Flink = ExpEncodePoolLink(Flink); + Flink->Blink = ExpEncodePoolLink(ListHead); + return Entry; +} + +NTAPI PLIST_ENTRY ExpRemovePoolTailList(IN PLIST_ENTRY ListHead) { - PLIST_ENTRY Tail; - Tail = ExpDecodePoolLink(ListHead->Blink); - ExpRemovePoolEntryList(Tail); - return Tail; -} - -FORCEINLINE + PLIST_ENTRY Entry, Blink; + Entry = ExpDecodePoolLink(ListHead->Blink); + Blink = ExpDecodePoolLink(Entry->Blink); + ListHead->Blink = ExpEncodePoolLink(Blink); + Blink->Flink = ExpEncodePoolLink(ListHead); + return Entry; +} + +NTAPI VOID ExpInsertPoolTailList(IN PLIST_ENTRY ListHead, IN PLIST_ENTRY Entry) @@ -137,14 +144,14 @@ ExpCheckPoolLinks(ListHead); } -FORCEINLINE +NTAPI VOID ExpInsertPoolHeadList(IN PLIST_ENTRY ListHead, IN PLIST_ENTRY Entry) { PLIST_ENTRY Flink; ExpCheckPoolLinks(ListHead); - Flink = ExpDecodePoolLink(ListHead->Blink); + Flink = ExpDecodePoolLink(ListHead->Flink); Entry->Flink = ExpEncodePoolLink(Flink); Entry->Blink = ExpEncodePoolLink(ListHead); Flink->Blink = ExpEncodePoolLink(Entry); @@ -194,7 +201,7 @@ LastEntry = NextEntry + POOL_LISTS_PER_PAGE; while (NextEntry < LastEntry) { - InitializeListHead(NextEntry); + ExpInitializePoolListHead(NextEntry); NextEntry++; } } @@ -379,7 +386,7 @@ // // Are there any free entries available on this list? // - if (!IsListEmpty(ListHead)) + if (!ExpIsPoolListEmpty(ListHead)) { // // Acquire the pool lock now @@ -389,7 +396,7 @@ // // And make sure the list still has entries // - if (IsListEmpty(ListHead)) + if (ExpIsPoolListEmpty(ListHead)) { // // Someone raced us (and won) before we had a chance to acquire @@ -408,7 +415,9 @@ // there is a guarantee that any block on this list will either be // of the correct size, or perhaps larger. // - Entry = POOL_ENTRY(RemoveHeadList(ListHead)); + ExpCheckPoolLinks(ListHead); + Entry = POOL_ENTRY(ExpRemovePoolHeadList(ListHead)); + ExpCheckPoolLinks(ListHead); ASSERT(Entry->BlockSize >= i); ASSERT(Entry->PoolType == 0); @@ -508,13 +517,15 @@ // "full" entry, which contains enough bytes for a linked list // and thus can be used for allocations (up to 8 bytes...) // + ExpCheckPoolLinks(&PoolDesc->ListHeads[BlockSize - 1]); if (BlockSize != 1) { // // Insert the free entry into the free list for this size // - InsertTailList(&PoolDesc->ListHeads[BlockSize - 1], - POOL_FREE_BLOCK(FragmentEntry)); + ExpInsertPoolTailList(&PoolDesc->ListHeads[BlockSize - 1], + POOL_FREE_BLOCK(FragmentEntry)); + ExpCheckPoolLinks(POOL_FREE_BLOCK(FragmentEntry)); } } @@ -571,8 +582,10 @@ // // And insert the free entry into the free list for this block size // - InsertTailList(&PoolDesc->ListHeads[BlockSize - 1], - POOL_FREE_BLOCK(FragmentEntry)); + ExpCheckPoolLinks(&PoolDesc->ListHeads[BlockSize - 1]); + ExpInsertPoolTailList(&PoolDesc->ListHeads[BlockSize - 1], + POOL_FREE_BLOCK(FragmentEntry)); + ExpCheckPoolLinks(POOL_FREE_BLOCK(FragmentEntry)); // // Release the pool lock @@ -690,7 +703,10 @@ // The block is at least big enough to have a linked list, so go // ahead and remove it // - RemoveEntryList(POOL_FREE_BLOCK(NextEntry)); + ExpCheckPoolLinks(POOL_FREE_BLOCK(NextEntry)); + ExpRemovePoolEntryList(POOL_FREE_BLOCK(NextEntry)); + ExpCheckPoolLinks(ExpDecodePoolLink((POOL_FREE_BLOCK(NextEntry))->Flink)); + ExpCheckPoolLinks(ExpDecodePoolLink((POOL_FREE_BLOCK(NextEntry))->Blink)); } // @@ -727,7 +743,10 @@ // The block is at least big enough to have a linked list, so go // ahead and remove it // - RemoveEntryList(POOL_FREE_BLOCK(NextEntry)); + ExpCheckPoolLinks(POOL_FREE_BLOCK(NextEntry)); + ExpRemovePoolEntryList(POOL_FREE_BLOCK(NextEntry)); + ExpCheckPoolLinks(ExpDecodePoolLink((POOL_FREE_BLOCK(NextEntry))->Flink)); + ExpCheckPoolLinks(ExpDecodePoolLink((POOL_FREE_BLOCK(NextEntry))->Blink)); } // @@ -787,7 +806,8 @@ // // Insert this new free block, and release the pool lock // - InsertHeadList(&PoolDesc->ListHeads[BlockSize - 1], POOL_FREE_BLOCK(Entry)); + ExpInsertPoolHeadList(&PoolDesc->ListHeads[BlockSize - 1], POOL_FREE_BLOCK(Entry)); + ExpCheckPoolLinks(POOL_FREE_BLOCK(Entry)); ExUnlockPool(PoolDesc, OldIrql); }

1 0

[jmorlan] 47597: [WIN32CSR] - Implement basic support for history in line editing - Reorganize code to reflect that line input is more coupled to history than it is to character input
by jmorlan＠svn.reactos.org 05 Jun '10

05 Jun '10

Author: jmorlan Date: Sat Jun 5 20:17:42 2010 New Revision: 47597 URL: http://svn.reactos.org/svn/reactos?rev=47597&view=rev Log: [WIN32CSR] - Implement basic support for history in line editing - Reorganize code to reflect that line input is more coupled to history than it is to character input Added: trunk/reactos/subsystems/win32/csrss/win32csr/lineinput.c - copied, changed from r47581, trunk/reactos/subsystems/win32/csrss/win32csr/history.c Removed: trunk/reactos/subsystems/win32/csrss/win32csr/history.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c trunk/reactos/subsystems/win32/csrss/win32csr/conio.h trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild 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] Sat Jun 5 20:17:42 2010 @@ -21,162 +21,6 @@ MultiByteToWideChar((Console)->CodePage, 0, (sChar), 1, (dWChar), 1) /* FUNCTIONS *****************************************************************/ - -static VOID -ConioLineInputSetPos(PCSRSS_CONSOLE Console, UINT Pos) -{ - if (Pos != Console->LinePos && Console->Mode & ENABLE_ECHO_INPUT) - { - PCSRSS_SCREEN_BUFFER Buffer = Console->ActiveBuffer; - UINT OldCursorX = Buffer->CurrentX; - UINT OldCursorY = Buffer->CurrentY; - INT XY = OldCursorY * Buffer->MaxX + OldCursorX; - - XY += (Pos - Console->LinePos); - if (XY < 0) - XY = 0; - else if (XY >= Buffer->MaxY * Buffer->MaxX) - XY = Buffer->MaxY * Buffer->MaxX - 1; - - Buffer->CurrentX = XY % Buffer->MaxX; - Buffer->CurrentY = XY / Buffer->MaxX; - ConioSetScreenInfo(Console, Buffer, OldCursorX, OldCursorY); - } - - Console->LinePos = Pos; -} - -static VOID -ConioLineInputEdit(PCSRSS_CONSOLE Console, UINT NumToDelete, UINT NumToInsert, WCHAR *Insertion) -{ - UINT Pos = Console->LinePos; - UINT NewSize = Console->LineSize - NumToDelete + NumToInsert; - INT i; - - /* Make sure there's always enough room for ending \r\n */ - if (NewSize + 2 > Console->LineMaxSize) - return; - - memmove(&Console->LineBuffer[Pos + NumToInsert], - &Console->LineBuffer[Pos + NumToDelete], - (Console->LineSize - (Pos + NumToDelete)) * sizeof(WCHAR)); - memcpy(&Console->LineBuffer[Pos], Insertion, NumToInsert * sizeof(WCHAR)); - - if (Console->Mode & ENABLE_ECHO_INPUT) - { - for (i = Pos; i < NewSize; i++) - { - CHAR AsciiChar; - WideCharToMultiByte(Console->OutputCodePage, 0, - &Console->LineBuffer[i], 1, - &AsciiChar, 1, NULL, NULL); - ConioWriteConsole(Console, Console->ActiveBuffer, &AsciiChar, 1, TRUE); - } - for (; i < Console->LineSize; i++) - { - ConioWriteConsole(Console, Console->ActiveBuffer, " ", 1, TRUE); - } - Console->LinePos = i; - } - - Console->LineSize = NewSize; - ConioLineInputSetPos(Console, Pos + NumToInsert); -} - -static VOID -ConioLineInputKeyDown(PCSRSS_CONSOLE Console, KEY_EVENT_RECORD *KeyEvent) -{ - UINT Pos = Console->LinePos; - switch (KeyEvent->wVirtualKeyCode) - { - case VK_ESCAPE: - /* Clear entire line */ - ConioLineInputSetPos(Console, 0); - ConioLineInputEdit(Console, Console->LineSize, 0, NULL); - return; - case VK_HOME: - /* Move to start of line. With ctrl, erase everything left of cursor */ - ConioLineInputSetPos(Console, 0); - if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) - ConioLineInputEdit(Console, Pos, 0, NULL); - return; - case VK_END: - /* Move to end of line. With ctrl, erase everything right of cursor */ - if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) - ConioLineInputEdit(Console, Console->LineSize - Pos, 0, NULL); - else - ConioLineInputSetPos(Console, Console->LineSize); - return; - case VK_LEFT: - /* Move left. With ctrl, move to beginning of previous word */ - if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) - { - while (Pos > 0 && Console->LineBuffer[Pos - 1] == L' ') Pos--; - while (Pos > 0 && Console->LineBuffer[Pos - 1] != L' ') Pos--; - } - else - { - Pos -= (Pos > 0); - } - ConioLineInputSetPos(Console, Pos); - return; - case VK_RIGHT: - /* Move right. With ctrl, move to beginning of next word */ - if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) - { - while (Pos < Console->LineSize && Console->LineBuffer[Pos] != L' ') Pos++; - while (Pos < Console->LineSize && Console->LineBuffer[Pos] == L' ') Pos++; - } - else - { - Pos += (Pos < Console->LineSize); - } - ConioLineInputSetPos(Console, Pos); - return; - case VK_DELETE: - /* Remove character to right of cursor */ - if (Pos != Console->LineSize) - ConioLineInputEdit(Console, 1, 0, NULL); - return; - case VK_F6: - /* Insert a ^Z character */ - KeyEvent->uChar.UnicodeChar = 26; - break; - } - - if (KeyEvent->uChar.UnicodeChar == L'\b' && Console->Mode & ENABLE_PROCESSED_INPUT) - { - /* backspace handling - if processed input enabled then we handle it here - * otherwise we treat it like a normal char. */ - if (Pos > 0) - { - ConioLineInputSetPos(Console, Pos - 1); - ConioLineInputEdit(Console, 1, 0, NULL); - } - } - else if (KeyEvent->uChar.UnicodeChar == L'\r') - { - HistoryAddEntry(Console); - - ConioLineInputSetPos(Console, Console->LineSize); - Console->LineBuffer[Console->LineSize++] = L'\r'; - if (Console->Mode & ENABLE_ECHO_INPUT) - ConioWriteConsole(Console, Console->ActiveBuffer, "\r", 1, TRUE); - if (Console->Mode & ENABLE_PROCESSED_INPUT) - { - Console->LineBuffer[Console->LineSize++] = L'\n'; - if (Console->Mode & ENABLE_ECHO_INPUT) - ConioWriteConsole(Console, Console->ActiveBuffer, "\n", 1, TRUE); - } - Console->LineComplete = TRUE; - Console->LinePos = 0; - } - else if (KeyEvent->uChar.UnicodeChar != L'\0') - { - /* Normal character */ - ConioLineInputEdit(Console, 0, 1, &KeyEvent->uChar.UnicodeChar); - } -} CSR_API(CsrReadConsole) { @@ -224,6 +68,7 @@ Console->LineComplete = FALSE; Console->LineSize = 0; Console->LinePos = 0; + Console->LineUpPressed = FALSE; } /* If we don't have a complete line yet, process the pending input */ @@ -241,7 +86,7 @@ if (KEY_EVENT == Input->InputEvent.EventType && Input->InputEvent.Event.KeyEvent.bKeyDown) { - ConioLineInputKeyDown(Console, &Input->InputEvent.Event.KeyEvent); + LineInputKeyDown(Console, &Input->InputEvent.Event.KeyEvent); } HeapFree(Win32CsrApiHeap, 0, Input); } Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.h [iso-8859-1] Sat Jun 5 20:17:42 2010 @@ -80,6 +80,7 @@ WORD LineSize; /* current size of line */ WORD LinePos; /* current position within line */ BOOLEAN LineComplete; /* user pressed enter, ready to send back to client */ + BOOLEAN LineUpPressed; LIST_ENTRY HistoryBuffers; WORD HistoryBufferSize; /* size for newly created history buffers */ WORD NumberOfHistoryBuffers; /* maximum number of history buffers allowed */ @@ -220,9 +221,8 @@ CSR_API(CsrGetConsoleAliasesExes); CSR_API(CsrGetConsoleAliasesExesLength); -/* history.c */ +/* lineinput.c */ struct tagHISTORY_BUFFER; -VOID FASTCALL HistoryAddEntry(PCSRSS_CONSOLE Console); VOID FASTCALL HistoryDeleteBuffer(struct tagHISTORY_BUFFER *Hist); CSR_API(CsrGetCommandHistoryLength); CSR_API(CsrGetCommandHistory); @@ -230,5 +230,6 @@ CSR_API(CsrSetHistoryNumberCommands); CSR_API(CsrGetHistoryInfo); CSR_API(CsrSetHistoryInfo); +VOID FASTCALL LineInputKeyDown(PCSRSS_CONSOLE Console, KEY_EVENT_RECORD *KeyEvent); /* EOF */ Removed: trunk/reactos/subsystems/win32/csrss/win32csr/history.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/history.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/history.c (removed) @@ -1,304 +1,0 @@ -/* - * PROJECT: ReactOS CSRSS - * LICENSE: GPL - See COPYING in the top level directory - * FILE: subsystems/win32/csrss/win32csr/history.c - * PURPOSE: Console input history functions - * PROGRAMMERS: Jeffrey Morlan - */ - -/* INCLUDES ******************************************************************/ - -#define NDEBUG -#include "w32csr.h" -#include <debug.h> - -typedef struct tagHISTORY_BUFFER -{ - LIST_ENTRY ListEntry; - WORD MaxEntries; - WORD NumEntries; - PUNICODE_STRING Entries; - UNICODE_STRING ExeName; -} HISTORY_BUFFER, *PHISTORY_BUFFER; - -/* FUNCTIONS *****************************************************************/ - -static PHISTORY_BUFFER -HistoryGetBuffer(PCSRSS_CONSOLE Console) -{ - /* TODO: use actual EXE name sent from process that called ReadConsole */ - UNICODE_STRING ExeName = { 14, 14, L"cmd.exe" }; - PLIST_ENTRY Entry = Console->HistoryBuffers.Flink; - PHISTORY_BUFFER Hist; - - for (; Entry != &Console->HistoryBuffers; Entry = Entry->Flink) - { - Hist = CONTAINING_RECORD(Entry, HISTORY_BUFFER, ListEntry); - if (RtlEqualUnicodeString(&ExeName, &Hist->ExeName, FALSE)) - return Hist; - } - - /* Couldn't find the buffer, create a new one */ - Hist = HeapAlloc(Win32CsrApiHeap, 0, sizeof(HISTORY_BUFFER) + ExeName.Length); - if (!Hist) - return NULL; - Hist->MaxEntries = Console->HistoryBufferSize; - Hist->NumEntries = 0; - Hist->Entries = HeapAlloc(Win32CsrApiHeap, 0, Hist->MaxEntries * sizeof(UNICODE_STRING)); - if (!Hist->Entries) - { - HeapFree(Win32CsrApiHeap, 0, Hist); - return NULL; - } - Hist->ExeName.Length = Hist->ExeName.MaximumLength = ExeName.Length; - Hist->ExeName.Buffer = (PWCHAR)(Hist + 1); - memcpy(Hist->ExeName.Buffer, ExeName.Buffer, ExeName.Length); - InsertHeadList(&Console->HistoryBuffers, &Hist->ListEntry); - return Hist; -} - -VOID FASTCALL -HistoryAddEntry(PCSRSS_CONSOLE Console) -{ - UNICODE_STRING NewEntry; - PHISTORY_BUFFER Hist; - INT i; - - NewEntry.Length = NewEntry.MaximumLength = Console->LineSize * sizeof(WCHAR); - NewEntry.Buffer = Console->LineBuffer; - - if (!(Hist = HistoryGetBuffer(Console))) - return; - - /* Don't add blank or duplicate entries */ - if (NewEntry.Length == 0 || Hist->MaxEntries == 0 || - (Hist->NumEntries > 0 && - RtlEqualUnicodeString(&Hist->Entries[Hist->NumEntries - 1], &NewEntry, FALSE))) - { - return; - } - - if (Console->HistoryNoDup) - { - /* Check if this line has been entered before */ - for (i = Hist->NumEntries - 1; i >= 0; i--) - { - if (RtlEqualUnicodeString(&Hist->Entries[i], &NewEntry, FALSE)) - { - /* Just rotate the list to bring this entry to the end */ - NewEntry = Hist->Entries[i]; - memmove(&Hist->Entries[i], &Hist->Entries[i + 1], - (Hist->NumEntries - (i + 1)) * sizeof(UNICODE_STRING)); - Hist->Entries[Hist->NumEntries - 1] = NewEntry; - return; - } - } - } - - if (Hist->NumEntries == Hist->MaxEntries) - { - /* List is full, remove oldest entry */ - RtlFreeUnicodeString(&Hist->Entries[0]); - memmove(&Hist->Entries[0], &Hist->Entries[1], - --Hist->NumEntries * sizeof(UNICODE_STRING)); - } - - if (NT_SUCCESS(RtlDuplicateUnicodeString(0, &NewEntry, &Hist->Entries[Hist->NumEntries]))) - Hist->NumEntries++; -} - -static PHISTORY_BUFFER -HistoryFindBuffer(PCSRSS_CONSOLE Console, PUNICODE_STRING ExeName) -{ - PLIST_ENTRY Entry = Console->HistoryBuffers.Flink; - while (Entry != &Console->HistoryBuffers) - { - /* For the history APIs, the caller is allowed to give only part of the name */ - PHISTORY_BUFFER Hist = CONTAINING_RECORD(Entry, HISTORY_BUFFER, ListEntry); - if (RtlPrefixUnicodeString(ExeName, &Hist->ExeName, TRUE)) - return Hist; - Entry = Entry->Flink; - } - return NULL; -} - -VOID FASTCALL -HistoryDeleteBuffer(PHISTORY_BUFFER Hist) -{ - while (Hist->NumEntries != 0) - RtlFreeUnicodeString(&Hist->Entries[--Hist->NumEntries]); - HeapFree(Win32CsrApiHeap, 0, Hist->Entries); - RemoveEntryList(&Hist->ListEntry); - HeapFree(Win32CsrApiHeap, 0, Hist); -} - -CSR_API(CsrGetCommandHistoryLength) -{ - PCSRSS_CONSOLE Console; - NTSTATUS Status; - PHISTORY_BUFFER Hist; - ULONG Length = 0; - INT i; - - if (!Win32CsrValidateBuffer(ProcessData, - Request->Data.GetCommandHistoryLength.ExeName.Buffer, - Request->Data.GetCommandHistoryLength.ExeName.Length, 1)) - { - return STATUS_ACCESS_VIOLATION; - } - - Status = ConioConsoleFromProcessData(ProcessData, &Console); - if (NT_SUCCESS(Status)) - { - Hist = HistoryFindBuffer(Console, &Request->Data.GetCommandHistory.ExeName); - if (Hist) - { - for (i = 0; i < Hist->NumEntries; i++) - Length += Hist->Entries[i].Length + sizeof(WCHAR); - } - Request->Data.GetCommandHistoryLength.Length = Length; - ConioUnlockConsole(Console); - } - return Status; -} - -CSR_API(CsrGetCommandHistory) -{ - PCSRSS_CONSOLE Console; - NTSTATUS Status; - PHISTORY_BUFFER Hist; - PBYTE Buffer = (PBYTE)Request->Data.GetCommandHistory.History; - ULONG BufferSize = Request->Data.GetCommandHistory.Length; - INT i; - - if (!Win32CsrValidateBuffer(ProcessData, Buffer, BufferSize, 1) || - !Win32CsrValidateBuffer(ProcessData, - Request->Data.GetCommandHistory.ExeName.Buffer, - Request->Data.GetCommandHistory.ExeName.Length, 1)) - { - return STATUS_ACCESS_VIOLATION; - } - - Status = ConioConsoleFromProcessData(ProcessData, &Console); - if (NT_SUCCESS(Status)) - { - Hist = HistoryFindBuffer(Console, &Request->Data.GetCommandHistory.ExeName); - if (Hist) - { - for (i = 0; i < Hist->NumEntries; i++) - { - if (BufferSize < (Hist->Entries[i].Length + sizeof(WCHAR))) - { - Status = STATUS_BUFFER_OVERFLOW; - break; - } - memcpy(Buffer, Hist->Entries[i].Buffer, Hist->Entries[i].Length); - Buffer += Hist->Entries[i].Length; - *(PWCHAR)Buffer = L'\0'; - Buffer += sizeof(WCHAR); - } - } - Request->Data.GetCommandHistory.Length = Buffer - (PBYTE)Request->Data.GetCommandHistory.History; - ConioUnlockConsole(Console); - } - return Status; -} - -CSR_API(CsrExpungeCommandHistory) -{ - PCSRSS_CONSOLE Console; - PHISTORY_BUFFER Hist; - NTSTATUS Status; - - if (!Win32CsrValidateBuffer(ProcessData, - Request->Data.ExpungeCommandHistory.ExeName.Buffer, - Request->Data.ExpungeCommandHistory.ExeName.Length, 1)) - { - return STATUS_ACCESS_VIOLATION; - } - - Status = ConioConsoleFromProcessData(ProcessData, &Console); - if (NT_SUCCESS(Status)) - { - Hist = HistoryFindBuffer(Console, &Request->Data.ExpungeCommandHistory.ExeName); - if (Hist) - HistoryDeleteBuffer(Hist); - ConioUnlockConsole(Console); - } - return Status; -} - -CSR_API(CsrSetHistoryNumberCommands) -{ - PCSRSS_CONSOLE Console; - PHISTORY_BUFFER Hist; - NTSTATUS Status; - WORD MaxEntries = Request->Data.SetHistoryNumberCommands.NumCommands; - PUNICODE_STRING OldEntryList, NewEntryList; - - if (!Win32CsrValidateBuffer(ProcessData, - Request->Data.SetHistoryNumberCommands.ExeName.Buffer, - Request->Data.SetHistoryNumberCommands.ExeName.Length, 1)) - { - return STATUS_ACCESS_VIOLATION; - } - - Status = ConioConsoleFromProcessData(ProcessData, &Console); - if (NT_SUCCESS(Status)) - { - Hist = HistoryFindBuffer(Console, &Request->Data.SetHistoryNumberCommands.ExeName); - if (Hist) - { - OldEntryList = Hist->Entries; - NewEntryList = HeapAlloc(Win32CsrApiHeap, 0, - MaxEntries * sizeof(UNICODE_STRING)); - if (!NewEntryList) - { - Status = STATUS_NO_MEMORY; - } - else - { - /* If necessary, shrink by removing oldest entries */ - for (; Hist->NumEntries > MaxEntries; Hist->NumEntries--) - RtlFreeUnicodeString(Hist->Entries++); - - Hist->MaxEntries = MaxEntries; - Hist->Entries = memcpy(NewEntryList, Hist->Entries, - Hist->NumEntries * sizeof(UNICODE_STRING)); - HeapFree(Win32CsrApiHeap, 0, OldEntryList); - } - } - ConioUnlockConsole(Console); - } - return Status; -} - -CSR_API(CsrGetHistoryInfo) -{ - PCSRSS_CONSOLE Console; - NTSTATUS Status = ConioConsoleFromProcessData(ProcessData, &Console); - if (NT_SUCCESS(Status)) - { - Request->Data.SetHistoryInfo.HistoryBufferSize = Console->HistoryBufferSize; - Request->Data.SetHistoryInfo.NumberOfHistoryBuffers = Console->NumberOfHistoryBuffers; - Request->Data.SetHistoryInfo.dwFlags = Console->HistoryNoDup; - ConioUnlockConsole(Console); - } - return Status; -} - -CSR_API(CsrSetHistoryInfo) -{ - PCSRSS_CONSOLE Console; - NTSTATUS Status = ConioConsoleFromProcessData(ProcessData, &Console); - if (NT_SUCCESS(Status)) - { - Console->HistoryBufferSize = (WORD)Request->Data.SetHistoryInfo.HistoryBufferSize; - Console->NumberOfHistoryBuffers = (WORD)Request->Data.SetHistoryInfo.NumberOfHistoryBuffers; - Console->HistoryNoDup = Request->Data.SetHistoryInfo.dwFlags & HISTORY_NO_DUP_FLAG; - ConioUnlockConsole(Console); - } - return Status; -} - -/* EOF */ Copied: trunk/reactos/subsystems/win32/csrss/win32csr/lineinput.c (from r47581, trunk/reactos/subsystems/win32/csrss/win32csr/history.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/history.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lineinput.c [iso-8859-1] Sat Jun 5 20:17:42 2010 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS CSRSS * LICENSE: GPL - See COPYING in the top level directory - * FILE: subsystems/win32/csrss/win32csr/history.c - * PURPOSE: Console input history functions + * FILE: subsystems/win32/csrss/win32csr/lineinput.c + * PURPOSE: Console line input functions * PROGRAMMERS: Jeffrey Morlan */ @@ -15,6 +15,7 @@ typedef struct tagHISTORY_BUFFER { LIST_ENTRY ListEntry; + WORD Position; WORD MaxEntries; WORD NumEntries; PUNICODE_STRING Entries; @@ -24,7 +25,7 @@ /* FUNCTIONS *****************************************************************/ static PHISTORY_BUFFER -HistoryGetBuffer(PCSRSS_CONSOLE Console) +HistoryCurrentBuffer(PCSRSS_CONSOLE Console) { /* TODO: use actual EXE name sent from process that called ReadConsole */ UNICODE_STRING ExeName = { 14, 14, L"cmd.exe" }; @@ -57,7 +58,7 @@ return Hist; } -VOID FASTCALL +static VOID HistoryAddEntry(PCSRSS_CONSOLE Console) { UNICODE_STRING NewEntry; @@ -67,7 +68,7 @@ NewEntry.Length = NewEntry.MaximumLength = Console->LineSize * sizeof(WCHAR); NewEntry.Buffer = Console->LineBuffer; - if (!(Hist = HistoryGetBuffer(Console))) + if (!(Hist = HistoryCurrentBuffer(Console))) return; /* Don't add blank or duplicate entries */ @@ -90,6 +91,7 @@ memmove(&Hist->Entries[i], &Hist->Entries[i + 1], (Hist->NumEntries - (i + 1)) * sizeof(UNICODE_STRING)); Hist->Entries[Hist->NumEntries - 1] = NewEntry; + Hist->Position = Hist->NumEntries - 1; return; } } @@ -105,6 +107,17 @@ if (NT_SUCCESS(RtlDuplicateUnicodeString(0, &NewEntry, &Hist->Entries[Hist->NumEntries]))) Hist->NumEntries++; + Hist->Position = Hist->NumEntries - 1; +} + +static VOID +HistoryGetCurrentEntry(PCSRSS_CONSOLE Console, PUNICODE_STRING Entry) +{ + PHISTORY_BUFFER Hist; + if (!(Hist = HistoryCurrentBuffer(Console)) || Hist->NumEntries == 0) + Entry->Length = 0; + else + *Entry = Hist->Entries[Hist->Position]; } static PHISTORY_BUFFER @@ -125,6 +138,8 @@ VOID FASTCALL HistoryDeleteBuffer(PHISTORY_BUFFER Hist) { + if (!Hist) + return; while (Hist->NumEntries != 0) RtlFreeUnicodeString(&Hist->Entries[--Hist->NumEntries]); HeapFree(Win32CsrApiHeap, 0, Hist->Entries); @@ -221,8 +236,7 @@ if (NT_SUCCESS(Status)) { Hist = HistoryFindBuffer(Console, &Request->Data.ExpungeCommandHistory.ExeName); - if (Hist) - HistoryDeleteBuffer(Hist); + HistoryDeleteBuffer(Hist); ConioUnlockConsole(Console); } return Status; @@ -260,7 +274,10 @@ { /* If necessary, shrink by removing oldest entries */ for (; Hist->NumEntries > MaxEntries; Hist->NumEntries--) + { RtlFreeUnicodeString(Hist->Entries++); + Hist->Position += (Hist->Position == 0); + } Hist->MaxEntries = MaxEntries; Hist->Entries = memcpy(NewEntryList, Hist->Entries, @@ -301,4 +318,257 @@ return Status; } +static VOID +LineInputSetPos(PCSRSS_CONSOLE Console, UINT Pos) +{ + if (Pos != Console->LinePos && Console->Mode & ENABLE_ECHO_INPUT) + { + PCSRSS_SCREEN_BUFFER Buffer = Console->ActiveBuffer; + UINT OldCursorX = Buffer->CurrentX; + UINT OldCursorY = Buffer->CurrentY; + INT XY = OldCursorY * Buffer->MaxX + OldCursorX; + + XY += (Pos - Console->LinePos); + if (XY < 0) + XY = 0; + else if (XY >= Buffer->MaxY * Buffer->MaxX) + XY = Buffer->MaxY * Buffer->MaxX - 1; + + Buffer->CurrentX = XY % Buffer->MaxX; + Buffer->CurrentY = XY / Buffer->MaxX; + ConioSetScreenInfo(Console, Buffer, OldCursorX, OldCursorY); + } + + Console->LinePos = Pos; +} + +static VOID +LineInputEdit(PCSRSS_CONSOLE Console, UINT NumToDelete, UINT NumToInsert, WCHAR *Insertion) +{ + UINT Pos = Console->LinePos; + UINT NewSize = Console->LineSize - NumToDelete + NumToInsert; + INT i; + + /* Make sure there's always enough room for ending \r\n */ + if (NewSize + 2 > Console->LineMaxSize) + return; + + memmove(&Console->LineBuffer[Pos + NumToInsert], + &Console->LineBuffer[Pos + NumToDelete], + (Console->LineSize - (Pos + NumToDelete)) * sizeof(WCHAR)); + memcpy(&Console->LineBuffer[Pos], Insertion, NumToInsert * sizeof(WCHAR)); + + if (Console->Mode & ENABLE_ECHO_INPUT) + { + for (i = Pos; i < NewSize; i++) + { + CHAR AsciiChar; + WideCharToMultiByte(Console->OutputCodePage, 0, + &Console->LineBuffer[i], 1, + &AsciiChar, 1, NULL, NULL); + ConioWriteConsole(Console, Console->ActiveBuffer, &AsciiChar, 1, TRUE); + } + for (; i < Console->LineSize; i++) + { + ConioWriteConsole(Console, Console->ActiveBuffer, " ", 1, TRUE); + } + Console->LinePos = i; + } + + Console->LineSize = NewSize; + LineInputSetPos(Console, Pos + NumToInsert); +} + +static VOID +LineInputRecallHistory(PCSRSS_CONSOLE Console, INT Offset) +{ + PHISTORY_BUFFER Hist; + + if (!(Hist = HistoryCurrentBuffer(Console)) || Hist->NumEntries == 0) + return; + + Offset += Hist->Position; + Offset = max(Offset, 0); + Offset = min(Offset, Hist->NumEntries - 1); + Hist->Position = Offset; + + LineInputSetPos(Console, 0); + LineInputEdit(Console, Console->LineSize, + Hist->Entries[Offset].Length / sizeof(WCHAR), + Hist->Entries[Offset].Buffer); +} + +VOID FASTCALL +LineInputKeyDown(PCSRSS_CONSOLE Console, KEY_EVENT_RECORD *KeyEvent) +{ + UINT Pos = Console->LinePos; + PHISTORY_BUFFER Hist; + UNICODE_STRING Entry; + INT HistPos; + + switch (KeyEvent->wVirtualKeyCode) + { + case VK_ESCAPE: + /* Clear entire line */ + LineInputSetPos(Console, 0); + LineInputEdit(Console, Console->LineSize, 0, NULL); + return; + case VK_HOME: + /* Move to start of line. With ctrl, erase everything left of cursor */ + LineInputSetPos(Console, 0); + if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) + LineInputEdit(Console, Pos, 0, NULL); + return; + case VK_END: + /* Move to end of line. With ctrl, erase everything right of cursor */ + if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) + LineInputEdit(Console, Console->LineSize - Pos, 0, NULL); + else + LineInputSetPos(Console, Console->LineSize); + return; + case VK_LEFT: + /* Move left. With ctrl, move to beginning of previous word */ + if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) + { + while (Pos > 0 && Console->LineBuffer[Pos - 1] == L' ') Pos--; + while (Pos > 0 && Console->LineBuffer[Pos - 1] != L' ') Pos--; + } + else + { + Pos -= (Pos > 0); + } + LineInputSetPos(Console, Pos); + return; + case VK_RIGHT: + case VK_F1: + /* Move right. With ctrl, move to beginning of next word */ + if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) + { + while (Pos < Console->LineSize && Console->LineBuffer[Pos] != L' ') Pos++; + while (Pos < Console->LineSize && Console->LineBuffer[Pos] == L' ') Pos++; + LineInputSetPos(Console, Pos); + return; + } + else + { + /* Recall one character (but don't overwrite current line) */ + HistoryGetCurrentEntry(Console, &Entry); + if (Pos < Console->LineSize) + LineInputSetPos(Console, Pos + 1); + else if (Pos * sizeof(WCHAR) < Entry.Length) + LineInputEdit(Console, 0, 1, &Entry.Buffer[Pos]); + } + return; + case VK_DELETE: + /* Remove character to right of cursor */ + if (Pos != Console->LineSize) + LineInputEdit(Console, 1, 0, NULL); + return; + case VK_PRIOR: + /* Recall first history entry */ + LineInputRecallHistory(Console, -((WORD)-1)); + return; + case VK_NEXT: + /* Recall last history entry */ + LineInputRecallHistory(Console, +((WORD)-1)); + return; + case VK_UP: + case VK_F5: + /* Recall previous history entry. On first time, actually recall the + * current (usually last) entry; on subsequent times go back. */ + LineInputRecallHistory(Console, Console->LineUpPressed ? -1 : 0); + Console->LineUpPressed = TRUE; + return; + case VK_DOWN: + /* Recall next history entry */ + LineInputRecallHistory(Console, +1); + return; + case VK_F3: + /* Recall remainder of current history entry */ + HistoryGetCurrentEntry(Console, &Entry); + if (Pos * sizeof(WCHAR) < Entry.Length) + { + UINT InsertSize = (Entry.Length / sizeof(WCHAR) - Pos); + UINT DeleteSize = min(Console->LineSize - Pos, InsertSize); + LineInputEdit(Console, DeleteSize, InsertSize, &Entry.Buffer[Pos]); + } + return; + case VK_F6: + /* Insert a ^Z character */ + KeyEvent->uChar.UnicodeChar = 26; + break; + case VK_F7: + if (KeyEvent->dwControlKeyState & (LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED)) + HistoryDeleteBuffer(HistoryCurrentBuffer(Console)); + return; + case VK_F8: + /* Search for history entries starting with input. */ + if (!(Hist = HistoryCurrentBuffer(Console)) || Hist->NumEntries == 0) + return; + + /* Like Up/F5, on first time start from current (usually last) entry, + * but on subsequent times start at previous entry. */ + if (Console->LineUpPressed) + Hist->Position = (Hist->Position ? Hist->Position : Hist->NumEntries) - 1; + Console->LineUpPressed = TRUE; + + Entry.Length = Console->LinePos * sizeof(WCHAR); + Entry.Buffer = Console->LineBuffer; + + /* Keep going backwards, even wrapping around to the end, + * until we get back to starting point */ + HistPos = Hist->Position; + do + { + if (RtlPrefixUnicodeString(&Entry, &Hist->Entries[HistPos], FALSE)) + { + Hist->Position = HistPos; + LineInputEdit(Console, Console->LineSize - Pos, + Hist->Entries[HistPos].Length / sizeof(WCHAR) - Pos, + &Hist->Entries[HistPos].Buffer[Pos]); + /* Cursor stays where it was */ + LineInputSetPos(Console, Pos); + return; + } + if (--HistPos < 0) HistPos += Hist->NumEntries; + } while (HistPos != Hist->Position); + return; + } + + if (KeyEvent->uChar.UnicodeChar == L'\b' && Console->Mode & ENABLE_PROCESSED_INPUT) + { + /* backspace handling - if processed input enabled then we handle it here + * otherwise we treat it like a normal char. */ + if (Pos > 0) + { + LineInputSetPos(Console, Pos - 1); + LineInputEdit(Console, 1, 0, NULL); + } + } + else if (KeyEvent->uChar.UnicodeChar == L'\r') + { + HistoryAddEntry(Console); + + /* TODO: Expand aliases */ + + LineInputSetPos(Console, Console->LineSize); + Console->LineBuffer[Console->LineSize++] = L'\r'; + if (Console->Mode & ENABLE_ECHO_INPUT) + ConioWriteConsole(Console, Console->ActiveBuffer, "\r", 1, TRUE); + if (Console->Mode & ENABLE_PROCESSED_INPUT) + { + Console->LineBuffer[Console->LineSize++] = L'\n'; + if (Console->Mode & ENABLE_ECHO_INPUT) + ConioWriteConsole(Console, Console->ActiveBuffer, "\n", 1, TRUE); + } + Console->LineComplete = TRUE; + Console->LinePos = 0; + } + else if (KeyEvent->uChar.UnicodeChar != L'\0') + { + /* Normal character */ + LineInputEdit(Console, 0, 1, &KeyEvent->uChar.UnicodeChar); + } +} + /* EOF */ Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] Sat Jun 5 20:17:42 2010 @@ -26,7 +26,7 @@ <file>guiconsole.c</file> <file>handle.c</file> <file>harderror.c</file> - <file>history.c</file> + <file>lineinput.c</file> <file>tuiconsole.c</file> <file>appswitch.c</file> <file>win32csr.rc</file>

1 0

[sir_richard] 47596: [NTOS]: Add some paranoid-invariant list access checks to the pool code. They serve a dual purpose: catch pool corruption by broken drivers/kernel code, as well as catch malicious modification of the pool links as part of a kernel-mode exploit. [NTOS]: Not yet used, thanks to Arthur for the idea. See comment for more information.
by sir_richard＠svn.reactos.org 05 Jun '10

05 Jun '10

Author: sir_richard Date: Sat Jun 5 20:02:45 2010 New Revision: 47596 URL: http://svn.reactos.org/svn/reactos?rev=47596&view=rev Log: [NTOS]: Add some paranoid-invariant list access checks to the pool code. They serve a dual purpose: catch pool corruption by broken drivers/kernel code, as well as catch malicious modification of the pool links as part of a kernel-mode exploit. [NTOS]: Not yet used, thanks to Arthur for the idea. See comment for more information. Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Sat Jun 5 20:02:45 2010 @@ -34,7 +34,124 @@ #define POOL_BLOCK(x, i) (PPOOL_HEADER)((ULONG_PTR)(x) + ((i) * POOL_BLOCK_SIZE)) #define POOL_NEXT_BLOCK(x) POOL_BLOCK((x), (x)->BlockSize) #define POOL_PREV_BLOCK(x) POOL_BLOCK((x), -(x)->PreviousSize) - + +/* + * Pool list access debug macros, similar to Arthur's pfnlist.c work. + * Microsoft actually implements similar checks in the Windows Server 2003 SP1 + * pool code, but only for checked builds. + * As of Vista, however, an MSDN Blog entry by a Security Team Manager indicates + * that these checks are done even on retail builds, due to the increasing + * number of kernel-mode attacks which depend on dangling list pointers and other + * kinds of list-based attacks. + * For now, I will leave these checks on all the time, but later they are likely + * to be DBG-only, at least until there are enough kernel-mode security attacks + * against ReactOS to warrant the performance hit. + * + */ +FORCEINLINE +PLIST_ENTRY +ExpDecodePoolLink(IN PLIST_ENTRY Link) +{ + return (PLIST_ENTRY)((ULONG_PTR)Link & ~1); +} + +FORCEINLINE +PLIST_ENTRY +ExpEncodePoolLink(IN PLIST_ENTRY Link) +{ + return (PLIST_ENTRY)((ULONG_PTR)Link | 1); +} + +FORCEINLINE +VOID +ExpCheckPoolLinks(IN PLIST_ENTRY ListHead) +{ + if ((ExpDecodePoolLink(ExpDecodePoolLink(ListHead->Flink)->Blink) != ListHead) || + (ExpDecodePoolLink(ExpDecodePoolLink(ListHead->Blink)->Flink) != ListHead)) + { + KeBugCheckEx(BAD_POOL_HEADER, + 3, + (ULONG_PTR)ListHead, + (ULONG_PTR)ExpDecodePoolLink(ExpDecodePoolLink(ListHead->Flink)->Blink), + (ULONG_PTR)ExpDecodePoolLink(ExpDecodePoolLink(ListHead->Blink)->Flink)); + } +} + +FORCEINLINE +VOID +ExpInitializePoolListHead(IN PLIST_ENTRY ListHead) +{ + ListHead->Flink = ListHead->Blink = ExpEncodePoolLink(ListHead); +} + +FORCEINLINE +BOOLEAN +ExpIsPoolListEmpty(IN PLIST_ENTRY ListHead) +{ + return (ExpDecodePoolLink(ListHead->Flink) == ListHead); +} + +FORCEINLINE +VOID +ExpRemovePoolEntryList(IN PLIST_ENTRY Entry) +{ + PLIST_ENTRY Blink, Flink; + Flink = ExpDecodePoolLink(Entry->Flink); + Blink = ExpDecodePoolLink(Entry->Blink); + Blink->Flink = ExpEncodePoolLink(Flink); + Flink->Blink = ExpEncodePoolLink(Blink); +} + +FORCEINLINE +PLIST_ENTRY +ExpRemovePoolHeadList(IN PLIST_ENTRY ListHead) +{ + PLIST_ENTRY Head; + Head = ExpDecodePoolLink(ListHead->Flink); + ExpRemovePoolEntryList(Head); + return Head; +} + +FORCEINLINE +PLIST_ENTRY +ExpRemovePoolTailList(IN PLIST_ENTRY ListHead) +{ + PLIST_ENTRY Tail; + Tail = ExpDecodePoolLink(ListHead->Blink); + ExpRemovePoolEntryList(Tail); + return Tail; +} + +FORCEINLINE +VOID +ExpInsertPoolTailList(IN PLIST_ENTRY ListHead, + IN PLIST_ENTRY Entry) +{ + PLIST_ENTRY Blink; + ExpCheckPoolLinks(ListHead); + Blink = ExpDecodePoolLink(ListHead->Blink); + Entry->Flink = ExpEncodePoolLink(ListHead); + Entry->Blink = ExpEncodePoolLink(Blink); + Blink->Flink = ExpEncodePoolLink(Entry); + ListHead->Blink = ExpEncodePoolLink(Entry); + ExpCheckPoolLinks(ListHead); +} + +FORCEINLINE +VOID +ExpInsertPoolHeadList(IN PLIST_ENTRY ListHead, + IN PLIST_ENTRY Entry) +{ + PLIST_ENTRY Flink; + ExpCheckPoolLinks(ListHead); + Flink = ExpDecodePoolLink(ListHead->Blink); + Entry->Flink = ExpEncodePoolLink(Flink); + Entry->Blink = ExpEncodePoolLink(ListHead); + Flink->Blink = ExpEncodePoolLink(Entry); + ListHead->Flink = ExpEncodePoolLink(Entry); + ExpCheckPoolLinks(ListHead); +} + /* PRIVATE FUNCTIONS **********************************************************/ VOID

1 0

[sir_richard] 47595: [NTOS]: Defensive programming on the pool macros.
by sir_richard＠svn.reactos.org 05 Jun '10

05 Jun '10

Author: sir_richard Date: Sat Jun 5 19:54:19 2010 New Revision: 47595 URL: http://svn.reactos.org/svn/reactos?rev=47595&view=rev Log: [NTOS]: Defensive programming on the pool macros. Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Sat Jun 5 19:54:19 2010 @@ -29,11 +29,11 @@ PKGUARDED_MUTEX ExpPagedPoolMutex; /* Pool block/header/list access macros */ -#define POOL_ENTRY(x) (PPOOL_HEADER)((ULONG_PTR)x - sizeof(POOL_HEADER)) -#define POOL_FREE_BLOCK(x) (PLIST_ENTRY)((ULONG_PTR)x + sizeof(POOL_HEADER)) -#define POOL_BLOCK(x, i) (PPOOL_HEADER)((ULONG_PTR)x + ((i) * POOL_BLOCK_SIZE)) -#define POOL_NEXT_BLOCK(x) POOL_BLOCK(x, x->BlockSize) -#define POOL_PREV_BLOCK(x) POOL_BLOCK(x, -x->PreviousSize) +#define POOL_ENTRY(x) (PPOOL_HEADER)((ULONG_PTR)(x) - sizeof(POOL_HEADER)) +#define POOL_FREE_BLOCK(x) (PLIST_ENTRY)((ULONG_PTR)(x) + sizeof(POOL_HEADER)) +#define POOL_BLOCK(x, i) (PPOOL_HEADER)((ULONG_PTR)(x) + ((i) * POOL_BLOCK_SIZE)) +#define POOL_NEXT_BLOCK(x) POOL_BLOCK((x), (x)->BlockSize) +#define POOL_PREV_BLOCK(x) POOL_BLOCK((x), -(x)->PreviousSize) /* PRIVATE FUNCTIONS **********************************************************/

1 0

[sir_richard] 47594: [NTOS]: Use logical math operations on the various block<->entry<->free_list_head operations in the pool code, instead of works-by-chance-and-assumption pointer math operations. This will now allow pool implementations where the pool header is not the size of a pool block (and the size of a LIST_ENTRY, by definition, although, even that, could change, if we choose to implement a cache-aligned overhead).
by sir_richard＠svn.reactos.org 05 Jun '10

05 Jun '10

Author: sir_richard Date: Sat Jun 5 19:53:17 2010 New Revision: 47594 URL: http://svn.reactos.org/svn/reactos?rev=47594&view=rev Log: [NTOS]: Use logical math operations on the various block<->entry<->free_list_head operations in the pool code, instead of works-by-chance-and-assumption pointer math operations. This will now allow pool implementations where the pool header is not the size of a pool block (and the size of a LIST_ENTRY, by definition, although, even that, could change, if we choose to implement a cache-aligned overhead). Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Sat Jun 5 19:53:17 2010 @@ -28,6 +28,13 @@ PVOID PoolTrackTable; PKGUARDED_MUTEX ExpPagedPoolMutex; +/* Pool block/header/list access macros */ +#define POOL_ENTRY(x) (PPOOL_HEADER)((ULONG_PTR)x - sizeof(POOL_HEADER)) +#define POOL_FREE_BLOCK(x) (PLIST_ENTRY)((ULONG_PTR)x + sizeof(POOL_HEADER)) +#define POOL_BLOCK(x, i) (PPOOL_HEADER)((ULONG_PTR)x + ((i) * POOL_BLOCK_SIZE)) +#define POOL_NEXT_BLOCK(x) POOL_BLOCK(x, x->BlockSize) +#define POOL_PREV_BLOCK(x) POOL_BLOCK(x, -x->PreviousSize) + /* PRIVATE FUNCTIONS **********************************************************/ VOID @@ -68,7 +75,11 @@ // NextEntry = PoolDescriptor->ListHeads; LastEntry = NextEntry + POOL_LISTS_PER_PAGE; - while (NextEntry < LastEntry) InitializeListHead(NextEntry++); + while (NextEntry < LastEntry) + { + InitializeListHead(NextEntry); + NextEntry++; + } } VOID @@ -239,8 +250,7 @@ // request would've been treated as a POOL_MAX_ALLOC earlier and resulted in // the direct allocation of pages. // - i = (NumberOfBytes + sizeof(POOL_HEADER) + sizeof(LIST_ENTRY) - 1) / - sizeof(POOL_HEADER); + i = (NumberOfBytes + sizeof(POOL_HEADER) + (POOL_BLOCK_SIZE - 1)) / POOL_BLOCK_SIZE; // // Loop in the free lists looking for a block if this size. Start with the @@ -281,7 +291,7 @@ // there is a guarantee that any block on this list will either be // of the correct size, or perhaps larger. // - Entry = (PPOOL_HEADER)RemoveHeadList(ListHead) - 1; + Entry = POOL_ENTRY(RemoveHeadList(ListHead)); ASSERT(Entry->BlockSize >= i); ASSERT(Entry->PoolType == 0); @@ -302,7 +312,7 @@ // turn it into a fragment that contains the leftover data // that we don't need to satisfy the caller's request // - FragmentEntry = Entry + i; + FragmentEntry = POOL_BLOCK(Entry, i); FragmentEntry->BlockSize = Entry->BlockSize - i; // @@ -314,7 +324,7 @@ // Now get the block that follows the new fragment and check // if it's still on the same page as us (and not at the end) // - NextEntry = FragmentEntry + FragmentEntry->BlockSize; + NextEntry = POOL_NEXT_BLOCK(FragmentEntry); if (PAGE_ALIGN(NextEntry) != NextEntry) { // @@ -346,14 +356,14 @@ // This is the entry that will actually end up holding the // allocation! // - Entry += Entry->BlockSize; + Entry = POOL_NEXT_BLOCK(Entry); Entry->PreviousSize = FragmentEntry->BlockSize; // // And now let's go to the entry after that one and check if // it's still on the same page, and not at the end // - NextEntry = Entry + i; + NextEntry = POOL_BLOCK(Entry, i); if (PAGE_ALIGN(NextEntry) != NextEntry) { // @@ -387,7 +397,7 @@ // Insert the free entry into the free list for this size // InsertTailList(&PoolDesc->ListHeads[BlockSize - 1], - (PLIST_ENTRY)FragmentEntry + 1); + POOL_FREE_BLOCK(FragmentEntry)); } } @@ -402,7 +412,9 @@ // Return the pool allocation // Entry->PoolTag = Tag; - return ++Entry; + (POOL_FREE_BLOCK(Entry))->Flink = NULL; + (POOL_FREE_BLOCK(Entry))->Blink = NULL; + return POOL_FREE_BLOCK(Entry); } } while (++ListHead != &PoolDesc->ListHeads[POOL_LISTS_PER_PAGE]); @@ -410,6 +422,7 @@ // There were no free entries left, so we have to allocate a new fresh page // Entry = MiAllocatePoolPages(PoolType, PAGE_SIZE); + ASSERT(Entry != NULL); Entry->Ulong1 = 0; Entry->BlockSize = i; Entry->PoolType = PoolType + 1; @@ -420,8 +433,8 @@ // to create now. The free bytes are the whole page minus what was allocated // and then converted into units of block headers. // - BlockSize = (PAGE_SIZE / sizeof(POOL_HEADER)) - i; - FragmentEntry = Entry + i; + BlockSize = (PAGE_SIZE / POOL_BLOCK_SIZE) - i; + FragmentEntry = POOL_BLOCK(Entry, i); FragmentEntry->Ulong1 = 0; FragmentEntry->BlockSize = BlockSize; FragmentEntry->PreviousSize = i; @@ -442,8 +455,8 @@ // And insert the free entry into the free list for this block size // InsertTailList(&PoolDesc->ListHeads[BlockSize - 1], - (PLIST_ENTRY)FragmentEntry + 1); - + POOL_FREE_BLOCK(FragmentEntry)); + // // Release the pool lock // @@ -454,7 +467,7 @@ // And return the pool allocation // Entry->PoolTag = Tag; - return ++Entry; + return POOL_FREE_BLOCK(Entry); } /* @@ -485,7 +498,7 @@ POOL_TYPE PoolType; PPOOL_DESCRIPTOR PoolDesc; BOOLEAN Combined = FALSE; - +#if 1 // // Check for paged pool // @@ -498,6 +511,7 @@ ExFreePagedPool(P); return; } +#endif // // Quickly deal with big page allocations @@ -526,7 +540,7 @@ // // Get the pointer to the next entry // - NextEntry = Entry + BlockSize; + NextEntry = POOL_BLOCK(Entry, BlockSize); // // Acquire the pool lock @@ -559,7 +573,7 @@ // The block is at least big enough to have a linked list, so go // ahead and remove it // - RemoveEntryList((PLIST_ENTRY)NextEntry + 1); + RemoveEntryList(POOL_FREE_BLOCK(NextEntry)); } // @@ -577,7 +591,7 @@ // // Great, grab that entry and check if it's free // - NextEntry = Entry - Entry->PreviousSize; + NextEntry = POOL_PREV_BLOCK(Entry); if (NextEntry->PoolType == 0) { // @@ -596,7 +610,7 @@ // The block is at least big enough to have a linked list, so go // ahead and remove it // - RemoveEntryList((PLIST_ENTRY)NextEntry + 1); + RemoveEntryList(POOL_FREE_BLOCK(NextEntry)); } // @@ -618,7 +632,7 @@ // page, they could've all been combined). // if ((PAGE_ALIGN(Entry) == Entry) && - (PAGE_ALIGN(Entry + Entry->BlockSize) == Entry + Entry->BlockSize)) + (PAGE_ALIGN(POOL_NEXT_BLOCK(Entry)) == POOL_NEXT_BLOCK(Entry))) { // // In this case, release the pool lock, and free the page @@ -644,7 +658,7 @@ // Get the first combined block (either our original to begin with, or // the one after the original, depending if we combined with the previous) // - NextEntry = Entry + BlockSize; + NextEntry = POOL_NEXT_BLOCK(Entry); // // As long as the next block isn't on a page boundary, have it point @@ -656,7 +670,7 @@ // // Insert this new free block, and release the pool lock // - InsertHeadList(&PoolDesc->ListHeads[BlockSize - 1], (PLIST_ENTRY)Entry + 1); + InsertHeadList(&PoolDesc->ListHeads[BlockSize - 1], POOL_FREE_BLOCK(Entry)); ExUnlockPool(PoolDesc, OldIrql); }

1 0

[cgutman] 47593: [NTOSKRNL] - Print the base address of the process that we killed to make debugging much easier
by cgutman＠svn.reactos.org 05 Jun '10

05 Jun '10

Author: cgutman Date: Sat Jun 5 19:51:12 2010 New Revision: 47593 URL: http://svn.reactos.org/svn/reactos?rev=47593&view=rev Log: [NTOSKRNL] - Print the base address of the process that we killed to make debugging much easier Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] Sat Jun 5 19:51:12 2010 @@ -1082,10 +1082,11 @@ } /* 3rd strike, kill the process */ - DPRINT1("Kill %.16s, ExceptionCode: %lx, ExceptionAddress: %lx\n", + DPRINT1("Kill %.16s, ExceptionCode: %lx, ExceptionAddress: %lx, BaseAddress: %lx\n", PsGetCurrentProcess()->ImageFileName, ExceptionRecord->ExceptionCode, - ExceptionRecord->ExceptionAddress); + ExceptionRecord->ExceptionAddress, + PsGetCurrentProcess()->SectionBaseAddress); ZwTerminateProcess(NtCurrentProcess(), ExceptionRecord->ExceptionCode); KeBugCheckEx(KMODE_EXCEPTION_NOT_HANDLED,

1 0

[sir_richard] 47592: [NTOS]: Define the POOL_HEADER for x64. [NTOS]: Define POOL_BLOCK_SIZE definition to set the minimum pool block size. In NT, this is equal to a LIST_ENTRY structure, because the Pool Allocator must be able to store a LIST_ENTRY into a freed pool block. This also determines the alignment of pool allocations. So 8 on x86, 16 on x64. [NTOS]: Don't depend on LIST_ENTRY, but use POOL_BLOCK_SIZE instead (on IA64, if we ever want to support this, the pool block size is different fr
by sir_richard＠svn.reactos.org 05 Jun '10

05 Jun '10

Author: sir_richard Date: Sat Jun 5 18:53:54 2010 New Revision: 47592 URL: http://svn.reactos.org/svn/reactos?rev=47592&view=rev Log: [NTOS]: Define the POOL_HEADER for x64. [NTOS]: Define POOL_BLOCK_SIZE definition to set the minimum pool block size. In NT, this is equal to a LIST_ENTRY structure, because the Pool Allocator must be able to store a LIST_ENTRY into a freed pool block. This also determines the alignment of pool allocations. So 8 on x86, 16 on x64. [NTOS]: Don't depend on LIST_ENTRY, but use POOL_BLOCK_SIZE instead (on IA64, if we ever want to support this, the pool block size is different from a LIST_ENTRY/POOL_HEADER). [NTOS]: The following ASSERTs must hold: the POOL_HEADER must be as big as the the smallest pool block (POOL_BLOCK_SIZE), which must be at least as big as a LIST_ENTRY structure. 8 == 8 == 8 on x86, 16 == 16 == 16 on x64. Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sat Jun 5 18:53:54 2010 @@ -225,13 +225,18 @@ // Special IRQL value (found in assertions) // #define MM_NOIRQL (KIRQL)0xFFFFFFFF - + // // FIXFIX: These should go in ex.h after the pool merge // -#define POOL_LISTS_PER_PAGE (PAGE_SIZE / sizeof(LIST_ENTRY)) +#ifdef _M_AMD64 +#define POOL_BLOCK_SIZE 16 +#else +#define POOL_BLOCK_SIZE 8 +#endif +#define POOL_LISTS_PER_PAGE (PAGE_SIZE / POOL_BLOCK_SIZE) #define BASE_POOL_TYPE_MASK 1 -#define POOL_MAX_ALLOC (PAGE_SIZE - (sizeof(POOL_HEADER) + sizeof(LIST_ENTRY))) +#define POOL_MAX_ALLOC (PAGE_SIZE - (sizeof(POOL_HEADER) + POOL_BLOCK_SIZE)) typedef struct _POOL_DESCRIPTOR { @@ -256,16 +261,30 @@ { struct { +#ifdef _M_AMD64 + ULONG PreviousSize:8; + ULONG PoolIndex:8; + ULONG BlockSize:8; + ULONG PoolType:8; +#else USHORT PreviousSize:9; USHORT PoolIndex:7; USHORT BlockSize:9; USHORT PoolType:7; +#endif }; ULONG Ulong1; }; +#ifdef _M_AMD64 + ULONG PoolTag; +#endif union { +#ifdef _M_AMD64 + PEPROCESS ProcessBilled; +#else ULONG PoolTag; +#endif struct { USHORT AllocatorBackTraceIndex; @@ -274,11 +293,8 @@ }; } POOL_HEADER, *PPOOL_HEADER; -// -// Everything depends on this -// -C_ASSERT(sizeof(POOL_HEADER) == 8); -C_ASSERT(sizeof(POOL_HEADER) == sizeof(LIST_ENTRY)); +C_ASSERT(sizeof(POOL_HEADER) == POOL_BLOCK_SIZE); +C_ASSERT(POOL_BLOCK_SIZE == sizeof(LIST_ENTRY)); extern ULONG ExpNumberOfPagedPools; extern POOL_DESCRIPTOR NonPagedPoolDescriptor;

1 0

[tkreuzer] 47591: [WIN32K] - Simplify the logic of the mapping functions a bit, by using either FILEVIEW or ENGSECTION, not both. - Set FILEVIEW::LastWriteTime
by tkreuzer＠svn.reactos.org 05 Jun '10

05 Jun '10

Author: tkreuzer Date: Sat Jun 5 17:58:01 2010 New Revision: 47591 URL: http://svn.reactos.org/svn/reactos?rev=47591&view=rev Log: [WIN32K] - Simplify the logic of the mapping functions a bit, by using either FILEVIEW or ENGSECTION, not both. - Set FILEVIEW::LastWriteTime Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/mapping.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/mapping.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/mapping.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/mapping.c [iso-8859-1] Sat Jun 5 17:58:01 2010 @@ -25,10 +25,10 @@ typedef struct _FILEVIEW { - ULARGE_INTEGER LastWriteTime; + LARGE_INTEGER LastWriteTime; PVOID pvKView; PVOID pvViewFD; - ULONG cjView; + SIZE_T cjView; PVOID pSection; } FILEVIEW, *PFILEVIEW; @@ -60,7 +60,6 @@ EngCreateSection( IN ULONG fl, IN SIZE_T cjSize, - HANDLE hFile, IN ULONG ulTag) { NTSTATUS Status; @@ -79,7 +78,7 @@ &liSize, PAGE_READWRITE, SEC_COMMIT, - hFile, + NULL, NULL); if (!NT_SUCCESS(Status)) { @@ -219,7 +218,7 @@ if (cjSize == 0) return NULL; /* Allocate a section object */ - pSection = EngCreateSection(fl, cjSize, NULL, ulTag); + pSection = EngCreateSection(fl, cjSize, ulTag); /* Map the section in session space */ Status = MmMapViewInSessionSpace(pSection->pvSectionObject, @@ -251,8 +250,10 @@ HANDLE hRootDir; UNICODE_STRING ustrFileName; IO_STATUS_BLOCK IoStatusBlock; + FILE_BASIC_INFORMATION FileInformation; HANDLE hFile; NTSTATUS Status; + LARGE_INTEGER liSize; if (fl & FVF_FONTFILE) { @@ -297,18 +298,41 @@ NULL, 0); - /* Check for auto size */ - if (cjSizeOfModule == 0) - { - } - - /* Allocate a section object */ - pFileView->pSection = EngCreateSection(fl, cjSizeOfModule, hFile, '1234'); + Status = ZwQueryInformationFile(hFile, + &IoStatusBlock, + &FileInformation, + sizeof(FILE_BASIC_INFORMATION), + FileBasicInformation); + if (NT_SUCCESS(Status)) + { + pFileView->LastWriteTime = FileInformation.LastWriteTime; + } + + /* Create a section from the file */ + liSize.QuadPart = cjSizeOfModule; + Status = MmCreateSection(&pFileView->pSection, + SECTION_ALL_ACCESS, + NULL, + cjSizeOfModule ? &liSize : NULL, + fl & FVF_READONLY ? PAGE_EXECUTE_READ : PAGE_EXECUTE_READWRITE, + SEC_COMMIT, + hFile, + NULL); /* Close the file handle */ ZwClose(hFile); - pFileView->cjView = cjSizeOfModule; + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create a section Status=0x%x\n", Status); + EngFreeMem(pFileView); + return NULL; + } + + + pFileView->pvKView = NULL; + pFileView->pvViewFD = NULL; + pFileView->cjView = 0; return pFileView; } @@ -338,26 +362,23 @@ OUT PULONG pulSize) { PFILEVIEW pFileView = (PFILEVIEW)h; - PENGSECTION pSection = pFileView->pSection; - NTSTATUS Status; + NTSTATUS Status; + + pFileView->cjView = 0; /* Map the section in session space */ - Status = MmMapViewInSessionSpace(pSection->pvSectionObject, - &pSection->pvMappedBase, - &pSection->cjViewSize); - if (NT_SUCCESS(Status)) - { - *pulSize = pSection->cjViewSize; - } - else + Status = MmMapViewInSessionSpace(pFileView->pSection, + &pFileView->pvKView, + &pFileView->cjView); + if (!NT_SUCCESS(Status)) { DPRINT1("Failed to map a section Status=0x%x\n", Status); *pulSize = 0; - EngFreeSectionMem(pSection, NULL); return NULL; } - return pSection->pvMappedBase; + *pulSize = pFileView->cjView; + return pFileView->pvKView; } VOID @@ -365,10 +386,18 @@ EngFreeModule(IN HANDLE h) { PFILEVIEW pFileView = (PFILEVIEW)h; - PENGSECTION pSection = pFileView->pSection; - - /* Free the section */ - EngFreeSectionMem(pSection, pSection->pvMappedBase); + NTSTATUS Status; + + /* Unmap the section */ + Status = MmUnmapViewInSessionSpace(pFileView->pvKView); + if (!NT_SUCCESS(Status)) + { + DPRINT1("MmUnmapViewInSessionSpace failed: 0x%lx\n", Status); + ASSERT(FALSE); + } + + /* Dereference the section */ + ObDereferenceObject(pFileView->pSection); /* Free the file view memory */ EngFreeMem(pFileView);

1 0

[fireball] 47590: - Sync up to Wine-1.2-rc2.
by fireball＠svn.reactos.org 05 Jun '10

05 Jun '10

Author: fireball Date: Sat Jun 5 17:03:58 2010 New Revision: 47590 URL: http://svn.reactos.org/svn/reactos?rev=47590&view=rev Log: - Sync up to Wine-1.2-rc2. Modified: branches/arwinss/reactos/dll/win32/gdi32/ (props changed) branches/arwinss/reactos/dll/win32/gdi32/bidi.c branches/arwinss/reactos/dll/win32/gdi32/dib.c branches/arwinss/reactos/dll/win32/gdi32/font.c branches/arwinss/reactos/dll/win32/gdi32/freetype.c branches/arwinss/reactos/dll/win32/gdi32/gdi_private.h branches/arwinss/reactos/dll/win32/user32/ (props changed) branches/arwinss/reactos/dll/win32/user32/caret.c branches/arwinss/reactos/dll/win32/user32/cursoricon.c branches/arwinss/reactos/dll/win32/user32/exticon.c branches/arwinss/reactos/dll/win32/user32/nonclient.c branches/arwinss/reactos/dll/win32/user32/win.c branches/arwinss/reactos/dll/win32/winex11.drv/brush.c branches/arwinss/reactos/dll/win32/winex11.drv/event.c branches/arwinss/reactos/dll/win32/winex11.drv/graphics.c branches/arwinss/reactos/dll/win32/winex11.drv/ime.c branches/arwinss/reactos/dll/win32/winex11.drv/settings.c branches/arwinss/reactos/dll/win32/winex11.drv/window.c branches/arwinss/reactos/dll/win32/winex11.drv/xrender.c Propchange: branches/arwinss/reactos/dll/win32/gdi32/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jun 5 17:03:58 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/gdi32:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 /trunk/reactos/dll/win32/gdi32:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 -/vendor/wine/dlls/gdi32/current:43136,43149,43398,43708,44151,44715,45044,45206,45455,45646,45910,46314,46696,46915,47274,47321 +/vendor/wine/dlls/gdi32/current:43136,43149,43398,43708,44151,44715,45044,45206,45455,45646,45910,46314,46696,46915,47274,47321,47585 Modified: branches/arwinss/reactos/dll/win32/gdi32/bidi.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/bidi.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/bidi.c [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -361,7 +361,8 @@ LPWSTR lpOutString, /* [out] Reordered string */ INT uCountOut, /* [in] Size of output buffer */ UINT *lpOrder, /* [out] Logical -> Visual order map */ - WORD **lpGlyphs /* [out] reordered, mirrored, shaped glyphs to display */ + WORD **lpGlyphs, /* [out] reordered, mirrored, shaped glyphs to display */ + INT *cGlyphs /* [out] number of glyphs generated */ ) { WORD *chartype; @@ -646,6 +647,8 @@ done += i; } + if (cGlyphs) + *cGlyphs = glyph_i; HeapFree(GetProcessHeap(), 0, chartype); HeapFree(GetProcessHeap(), 0, levels); Modified: branches/arwinss/reactos/dll/win32/gdi32/dib.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/dib.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/dib.c [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -647,18 +647,24 @@ DIB_GetDIBImageBytes( bmp->bitmap.bmWidth, bmp->bitmap.bmHeight, bmp->bitmap.bmBitsPixel ); - info->bmiHeader.biCompression = (bmp->bitmap.bmBitsPixel > 8) ? BI_BITFIELDS : BI_RGB; - switch(bmp->bitmap.bmBitsPixel) + if (bmp->dib) { - case 15: - info->bmiHeader.biBitCount = 16; - break; - case 24: - info->bmiHeader.biBitCount = 32; - break; - default: + info->bmiHeader.biBitCount = bmp->dib->dsBm.bmBitsPixel; + switch (bmp->dib->dsBm.bmBitsPixel) + { + case 16: + case 32: + info->bmiHeader.biCompression = BI_BITFIELDS; + break; + default: + info->bmiHeader.biCompression = BI_RGB; + break; + } + } + else + { + info->bmiHeader.biCompression = (bmp->bitmap.bmBitsPixel > 8) ? BI_BITFIELDS : BI_RGB; info->bmiHeader.biBitCount = bmp->bitmap.bmBitsPixel; - break; } info->bmiHeader.biXPelsPerMeter = 0; info->bmiHeader.biYPelsPerMeter = 0; @@ -827,9 +833,13 @@ case 16: if (info->bmiHeader.biCompression == BI_BITFIELDS) { - ((PDWORD)info->bmiColors)[0] = 0xf800; - ((PDWORD)info->bmiColors)[1] = 0x07e0; - ((PDWORD)info->bmiColors)[2] = 0x001f; + if (bmp->dib) memcpy( info->bmiColors, bmp->dib->dsBitfields, 3 * sizeof(DWORD) ); + else + { + ((PDWORD)info->bmiColors)[0] = 0xf800; + ((PDWORD)info->bmiColors)[1] = 0x07e0; + ((PDWORD)info->bmiColors)[2] = 0x001f; + } } break; @@ -837,9 +847,13 @@ case 32: if (info->bmiHeader.biCompression == BI_BITFIELDS) { - ((PDWORD)info->bmiColors)[0] = 0xff0000; - ((PDWORD)info->bmiColors)[1] = 0x00ff00; - ((PDWORD)info->bmiColors)[2] = 0x0000ff; + if (bmp->dib) memcpy( info->bmiColors, bmp->dib->dsBitfields, 3 * sizeof(DWORD) ); + else + { + ((PDWORD)info->bmiColors)[0] = 0xff0000; + ((PDWORD)info->bmiColors)[1] = 0x00ff00; + ((PDWORD)info->bmiColors)[2] = 0x0000ff; + } } break; } @@ -1236,10 +1250,22 @@ &planes, &bpp, &compression, &sizeImage )) == -1)) return 0; - if (compression != BI_RGB && compression != BI_BITFIELDS) - { - TRACE("can't create a compressed (%u) dibsection\n", compression); + switch (bpp) + { + case 16: + case 32: + if (compression == BI_BITFIELDS) break; + /* fall through */ + case 1: + case 4: + case 8: + case 24: + if (compression == BI_RGB) break; + WARN( "invalid %u bpp compression %u\n", bpp, compression ); return 0; + default: + FIXME( "should fail %u bpp compression %u\n", bpp, compression ); + break; } if (!(dib = HeapAlloc( GetProcessHeap(), 0, sizeof(*dib) ))) return 0; Modified: branches/arwinss/reactos/dll/win32/gdi32/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/font.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/font.c [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -1702,16 +1702,21 @@ if( !(flags & (ETO_GLYPH_INDEX | ETO_IGNORELANGUAGE)) && count > 0 ) { + INT cGlyphs; reordered_str = HeapAlloc(GetProcessHeap(), 0, count*sizeof(WCHAR)); BIDI_Reorder( hdc, str, count, GCP_REORDER, ((flags&ETO_RTLREADING)!=0 || (GetTextAlign(hdc)&TA_RTLREADING)!=0)? WINE_GCPW_FORCE_RTL:WINE_GCPW_FORCE_LTR, - reordered_str, count, NULL, &glyphs ); + reordered_str, count, NULL, &glyphs, &cGlyphs); flags |= ETO_IGNORELANGUAGE; if (glyphs) + { flags |= ETO_GLYPH_INDEX; + if (cGlyphs != count) + count = cGlyphs; + } } else if(flags & ETO_GLYPH_INDEX) glyphs = reordered_str; @@ -2874,7 +2879,7 @@ } else { BIDI_Reorder(NULL, lpString, uCount, dwFlags, WINE_GCPW_FORCE_LTR, lpResults->lpOutString, - nSet, lpResults->lpOrder, NULL ); + nSet, lpResults->lpOrder, NULL, NULL ); } /* FIXME: Will use the placement chars */ Modified: branches/arwinss/reactos/dll/win32/gdi32/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/freetype.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/freetype.c [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -5107,22 +5107,19 @@ { for ( x = 0; x < src_width / hmul; x++ ) { - unsigned int alpha = (src[hmul * x + rgb_interval * 0] + - src[hmul * x + rgb_interval * 1] + - src[hmul * x + rgb_interval * 2]) / 3; if ( rgb ) { - dst[x] = ((src[hmul * x + rgb_interval * 0] * alpha / 255) << 16) | - ((src[hmul * x + rgb_interval * 1] * alpha / 255) << 8) | - ((src[hmul * x + rgb_interval * 2] * alpha / 255) << 0) | - (alpha << 24); + dst[x] = ((unsigned int)src[hmul * x + rgb_interval * 0] << 16) | + ((unsigned int)src[hmul * x + rgb_interval * 1] << 8) | + ((unsigned int)src[hmul * x + rgb_interval * 2] << 0) | + ((unsigned int)src[hmul * x + rgb_interval * 1] << 24) ; } else { - dst[x] = ((src[hmul * x + rgb_interval * 2] * alpha / 255) << 16) | - ((src[hmul * x + rgb_interval * 1] * alpha / 255) << 8) | - ((src[hmul * x + rgb_interval * 0] * alpha / 255) << 0) | - (alpha << 24); + dst[x] = ((unsigned int)src[hmul * x + rgb_interval * 2] << 16) | + ((unsigned int)src[hmul * x + rgb_interval * 1] << 8) | + ((unsigned int)src[hmul * x + rgb_interval * 0] << 0) | + ((unsigned int)src[hmul * x + rgb_interval * 1] << 24) ; } } src += src_pitch * vmul; Modified: branches/arwinss/reactos/dll/win32/gdi32/gdi_private.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/gdi_private.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/gdi_private.h [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -356,7 +356,7 @@ #define WINE_GCPW_LOOSE_MASK 2 extern BOOL BIDI_Reorder( HDC hDC, LPCWSTR lpString, INT uCount, DWORD dwFlags, DWORD dwWineGCP_Flags, - LPWSTR lpOutString, INT uCountOut, UINT *lpOrder, WORD **lpGlyphs ) DECLSPEC_HIDDEN; + LPWSTR lpOutString, INT uCountOut, UINT *lpOrder, WORD **lpGlyphs, INT* cGlyphs ) DECLSPEC_HIDDEN; /* bitmap.c */ extern HBITMAP BITMAP_CopyBitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; Propchange: branches/arwinss/reactos/dll/win32/user32/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jun 5 17:03:58 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/user32:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 /trunk/reactos/dll/win32/user32:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688 -/vendor/wine/dlls/user32/current:43136,43149,43398,43708,44151,44715,45044,45206,45455,45646,45910,46314,46696,46915,47274,47321 +/vendor/wine/dlls/user32/current:43136,43149,43398,43708,44151,44715,45044,45206,45455,45646,45910,46314,46696,46915,47274,47321,47585 Modified: branches/arwinss/reactos/dll/win32/user32/caret.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/caret.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/caret.c [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -270,7 +270,7 @@ } } SERVER_END_REQ; - if (ret && !hidden) + if (ret && !hidden && (x != r.left || y != r.top)) { if (old_state) CARET_DisplayCaret( hwnd, &r ); r.right += x - r.left; Modified: branches/arwinss/reactos/dll/win32/user32/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/cursoricon.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/cursoricon.c [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -1830,6 +1830,43 @@ return TRUE; } +/* copy an icon bitmap, even when it can't be selected into a DC */ +/* helper for CreateIconIndirect */ +static void stretch_blt_icon( HDC hdc_dst, int dst_x, int dst_y, int dst_width, int dst_height, + HBITMAP src, int width, int height ) +{ + HDC hdc = CreateCompatibleDC( 0 ); + + if (!SelectObject( hdc, src )) /* do it the hard way */ + { + BITMAPINFO *info; + void *bits; + + if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) return; + info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info->bmiHeader.biWidth = width; + info->bmiHeader.biHeight = height; + info->bmiHeader.biPlanes = GetDeviceCaps( hdc_dst, PLANES ); + info->bmiHeader.biBitCount = GetDeviceCaps( hdc_dst, BITSPIXEL ); + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biSizeImage = height * get_dib_width_bytes( width, info->bmiHeader.biBitCount ); + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + bits = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ); + if (bits && GetDIBits( hdc, src, 0, height, bits, info, DIB_RGB_COLORS )) + StretchDIBits( hdc_dst, dst_x, dst_y, dst_width, dst_height, + 0, 0, width, height, bits, info, DIB_RGB_COLORS, SRCCOPY ); + + HeapFree( GetProcessHeap(), 0, bits ); + HeapFree( GetProcessHeap(), 0, info ); + } + else StretchBlt( hdc_dst, dst_x, dst_y, dst_width, dst_height, hdc, 0, 0, width, height, SRCCOPY ); + + DeleteDC( hdc ); +} + /********************************************************************** * CreateIconIndirect (USER32.@) */ @@ -1839,7 +1876,7 @@ HICON hObj; HBITMAP color = 0, mask; int width, height; - HDC src, dst; + HDC hdc; TRACE("color %p, mask %p, hotspot %ux%u, fIcon %d\n", iconinfo->hbmColor, iconinfo->hbmMask, @@ -1875,28 +1912,22 @@ mask = CreateBitmap( width, height, 1, 1, NULL ); } - src = CreateCompatibleDC( 0 ); - dst = CreateCompatibleDC( 0 ); - - SelectObject( src, iconinfo->hbmMask ); - SelectObject( dst, mask ); - StretchBlt( dst, 0, 0, width, height, src, 0, 0, bmpAnd.bmWidth, bmpAnd.bmHeight, SRCCOPY ); + hdc = CreateCompatibleDC( 0 ); + SelectObject( hdc, mask ); + stretch_blt_icon( hdc, 0, 0, width, height, iconinfo->hbmMask, bmpAnd.bmWidth, bmpAnd.bmHeight ); if (color) { - SelectObject( src, iconinfo->hbmColor ); - SelectObject( dst, color ); - BitBlt( dst, 0, 0, width, height, src, 0, 0, SRCCOPY ); + SelectObject( hdc, color ); + stretch_blt_icon( hdc, 0, 0, width, height, iconinfo->hbmColor, width, height ); } else if (iconinfo->hbmColor) { - SelectObject( src, iconinfo->hbmColor ); - BitBlt( dst, 0, height, width, height, src, 0, 0, SRCCOPY ); + stretch_blt_icon( hdc, 0, height, width, height, iconinfo->hbmColor, width, height ); } else height /= 2; - DeleteDC( src ); - DeleteDC( dst ); + DeleteDC( hdc ); hObj = alloc_icon_handle(); if (hObj) Modified: branches/arwinss/reactos/dll/win32/user32/exticon.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/exticon.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/exticon.c [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -37,7 +37,7 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "wine/winbase16.h" +#include "winnls.h" #include "user_private.h" #include "wine/debug.h" @@ -64,6 +64,26 @@ WORD idCount; /* How many images */ icoICONDIRENTRY idEntries[1]; /* An entry for each image (idCount of 'em) */ } icoICONDIR, *LPicoICONDIR; + +typedef struct +{ + WORD offset; + WORD length; + WORD flags; + WORD id; + WORD handle; + WORD usage; +} NE_NAMEINFO; + +typedef struct +{ + WORD type_id; + WORD count; + DWORD resloader; +} NE_TYPEINFO; + +#define NE_RSCTYPE_ICON 0x8003 +#define NE_RSCTYPE_GROUP_ICON 0x800e #include "poppack.h" Modified: branches/arwinss/reactos/dll/win32/user32/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/nonclient.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/nonclient.c [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -1548,19 +1548,19 @@ break; case SC_MINIMIZE: - if (hwnd == GetForegroundWindow()) + if (hwnd == GetActiveWindow()) ShowOwnedPopups(hwnd,FALSE); ShowWindow( hwnd, SW_MINIMIZE ); break; case SC_MAXIMIZE: - if (IsIconic(hwnd) && hwnd == GetForegroundWindow()) + if (IsIconic(hwnd) && hwnd == GetActiveWindow()) ShowOwnedPopups(hwnd,TRUE); ShowWindow( hwnd, SW_MAXIMIZE ); break; case SC_RESTORE: - if (IsIconic(hwnd) && hwnd == GetForegroundWindow()) + if (IsIconic(hwnd) && hwnd == GetActiveWindow()) ShowOwnedPopups(hwnd,TRUE); ShowWindow( hwnd, SW_RESTORE ); break; Modified: branches/arwinss/reactos/dll/win32/user32/win.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/win.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/win.c [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -1149,9 +1149,14 @@ if((cs->style & WS_VISIBLE) && IsZoomed(top_child)) { TRACE("Restoring current maximized child %p\n", top_child); - SendMessageW( top_child, WM_SETREDRAW, FALSE, 0 ); - ShowWindow( top_child, SW_SHOWNORMAL ); - SendMessageW( top_child, WM_SETREDRAW, TRUE, 0 ); + if (cs->style & WS_MAXIMIZE) + { + /* if the new window is maximized don't bother repainting */ + SendMessageW( top_child, WM_SETREDRAW, FALSE, 0 ); + ShowWindow( top_child, SW_SHOWNORMAL ); + SendMessageW( top_child, WM_SETREDRAW, TRUE, 0 ); + } + else ShowWindow( top_child, SW_SHOWNORMAL ); } } } Modified: branches/arwinss/reactos/dll/win32/winex11.drv/brush.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/brush.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/brush.c [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -309,6 +309,7 @@ DeleteObject( hBitmap ); GlobalUnlock( (HGLOBAL)logbrush.lbHatch ); } + break; } return hbrush; Modified: branches/arwinss/reactos/dll/win32/winex11.drv/event.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/event.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/event.c [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -523,7 +523,6 @@ if (IsWindowEnabled(hwnd)) { HMENU hSysMenu; - POINT pt; if (GetClassLongW(hwnd, GCL_STYLE) & CS_NOCLOSE) return; hSysMenu = GetSystemMenu(hwnd, FALSE); @@ -554,10 +553,12 @@ break; } } - /* Simulate clicking the caption Close button */ - GetCursorPos( &pt ); - PostMessageW( hwnd, WM_NCLBUTTONDOWN, HTCLOSE, MAKELPARAM( pt.x, pt.y ) ); - PostMessageW( hwnd, WM_LBUTTONUP, HTCLOSE, MAKELPARAM( pt.x, pt.y ) ); + + /* Simulate pressing Alt+F4 */ + keybd_event(VK_MENU, 0, 0, 0); + keybd_event(VK_F4, 0, 0, 0); + keybd_event(VK_F4, 0, KEYEVENTF_KEYUP, 0); + keybd_event(VK_MENU, 0, KEYEVENTF_KEYUP, 0); } } else if (protocol == x11drv_atom(WM_TAKE_FOCUS)) @@ -942,6 +943,8 @@ static void handle_wm_state_notify( struct x11drv_win_data *data, XPropertyEvent *event, BOOL update_window ) { + DWORD style; + switch(event->state) { case PropertyDelete: @@ -967,25 +970,37 @@ if (!update_window || !data->managed || !data->mapped) return; + style = GetWindowLongW( data->hwnd, GWL_STYLE ); + if (data->iconic && data->wm_state == NormalState) /* restore window */ { data->iconic = FALSE; if (is_net_wm_state_maximized( event->display, data )) { - TRACE( "restoring to max %p/%lx\n", data->hwnd, data->whole_window ); - SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_MAXIMIZE, 0 ); - } - else + if ((style & WS_MAXIMIZEBOX) && !(style & WS_DISABLED)) + { + TRACE( "restoring to max %p/%lx\n", data->hwnd, data->whole_window ); + SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_MAXIMIZE, 0 ); + } + else TRACE( "not restoring to max win %p/%lx style %08x\n", + data->hwnd, data->whole_window, style ); + } + else if (style & (WS_MINIMIZE | WS_MAXIMIZE)) { TRACE( "restoring win %p/%lx\n", data->hwnd, data->whole_window ); SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); } + else TRACE( "not restoring win %p/%lx style %08x\n", data->hwnd, data->whole_window, style ); } else if (!data->iconic && data->wm_state == IconicState) { - TRACE( "minimizing win %p/%lx\n", data->hwnd, data->whole_window ); data->iconic = TRUE; - SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_MINIMIZE, 0 ); + if ((style & WS_MINIMIZEBOX) && !(style & WS_DISABLED)) + { + TRACE( "minimizing win %p/%lx\n", data->hwnd, data->whole_window ); + SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_MINIMIZE, 0 ); + } + else TRACE( "not minimizing win %p/%lx style %08x\n", data->hwnd, data->whole_window, style ); } } Modified: branches/arwinss/reactos/dll/win32/winex11.drv/graphics.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/graphics.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/graphics.c [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -36,6 +36,7 @@ #define PI M_PI #endif #include <string.h> +#include <limits.h> #include "windef.h" #include "winbase.h" @@ -131,10 +132,10 @@ for (j = data->rdh.nCount-1; j >= 0; j--) { tmp = rect[j]; - xrect[j].x = tmp.left; - xrect[j].y = tmp.top; - xrect[j].width = tmp.right - tmp.left; - xrect[j].height = tmp.bottom - tmp.top; + xrect[j].x = max( min( tmp.left, SHRT_MAX), SHRT_MIN); + xrect[j].y = max( min( tmp.top, SHRT_MAX), SHRT_MIN); + xrect[j].width = max( min( tmp.right - xrect[j].x, USHRT_MAX), 0); + xrect[j].height = max( min( tmp.bottom - xrect[j].y, USHRT_MAX), 0); } } else @@ -142,10 +143,10 @@ for (i = 0; i < data->rdh.nCount; i++) { tmp = rect[i]; - xrect[i].x = tmp.left; - xrect[i].y = tmp.top; - xrect[i].width = tmp.right - tmp.left; - xrect[i].height = tmp.bottom - tmp.top; + xrect[i].x = max( min( tmp.left, SHRT_MAX), SHRT_MIN); + xrect[i].y = max( min( tmp.top, SHRT_MAX), SHRT_MIN); + xrect[i].width = max( min( tmp.right - xrect[i].x, USHRT_MAX), 0); + xrect[i].height = max( min( tmp.bottom - xrect[i].y, USHRT_MAX), 0); } } return data; Modified: branches/arwinss/reactos/dll/win32/winex11.drv/ime.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/ime.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/ime.c [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -189,7 +189,7 @@ return currentOffset; } -static HIMCC updateCompStr(HIMCC old, LPWSTR compstr, DWORD len) +static HIMCC updateCompStr(HIMCC old, LPCWSTR compstr, DWORD len) { /* we need to make sure the CompStr, CompClaus and CompAttr fields are all * set and correct */ @@ -923,7 +923,7 @@ if (dwCompLen && lpComp) { - newCompStr = updateCompStr(lpIMC->hCompStr, (LPWSTR)lpComp, dwCompLen / sizeof(WCHAR)); + newCompStr = updateCompStr(lpIMC->hCompStr, (LPCWSTR)lpComp, dwCompLen / sizeof(WCHAR)); ImmDestroyIMCC(lpIMC->hCompStr); lpIMC->hCompStr = newCompStr; Modified: branches/arwinss/reactos/dll/win32/winex11.drv/settings.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/settings.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/settings.c [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -245,7 +245,7 @@ return FALSE; #define set_value(name, data) \ - if (RegSetValueExA(hkey, name, 0, REG_DWORD, (LPBYTE)(data), sizeof(DWORD))) \ + if (RegSetValueExA(hkey, name, 0, REG_DWORD, (const BYTE*)(data), sizeof(DWORD))) \ ret = FALSE set_value("DefaultSettings.BitsPerPel", &dm->dmBitsPerPel); Modified: branches/arwinss/reactos/dll/win32/winex11.drv/window.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/window.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/window.c [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -215,15 +215,12 @@ /*********************************************************************** - * X11DRV_is_window_rect_mapped + * is_window_rect_mapped * * Check if the X whole window should be mapped based on its rectangle */ static BOOL is_window_rect_mapped( const RECT *rect ) { - /* don't map if rect is empty */ - if (IsRectEmpty( rect )) return FALSE; - /* don't map if rect is off-screen */ if (rect->left >= virtual_screen_rect.right || rect->top >= virtual_screen_rect.bottom || @@ -246,19 +243,6 @@ /* Metacity needs the window to be resizable to make it fullscreen */ return (data->whole_rect.left <= 0 && data->whole_rect.right >= screen_width && data->whole_rect.top <= 0 && data->whole_rect.bottom >= screen_height); -} - - -/*********************************************************************** - * get_window_owner - */ -static HWND get_window_owner( HWND hwnd ) -{ - RECT rect; - HWND owner = GetWindow( hwnd, GW_OWNER ); - /* ignore the zero-size owners used by Delphi apps */ - if (owner && GetWindowRect( owner, &rect ) && IsRectEmpty( &rect )) owner = 0; - return owner; } @@ -456,6 +440,16 @@ if (!data->whole_window) return; data->shaped = FALSE; + + if (IsRectEmpty( &data->window_rect )) /* set an empty shape */ + { + static XRectangle empty_rect; + wine_tsx11_lock(); + XShapeCombineRectangles( display, data->whole_window, ShapeBounding, 0, 0, + &empty_rect, 1, ShapeSet, YXBanded ); + wine_tsx11_unlock(); + return; + } if (hrgn == (HRGN)1) /* hack: win_region == 1 means retrieve region from server */ { @@ -1019,6 +1013,8 @@ { size_hints->max_width = data->whole_rect.right - data->whole_rect.left; size_hints->max_height = data->whole_rect.bottom - data->whole_rect.top; + if (size_hints->max_width <= 0 ||size_hints->max_height <= 0) + size_hints->max_width = size_hints->max_height = 1; size_hints->min_width = size_hints->max_width; size_hints->min_height = size_hints->max_height; size_hints->flags |= PMinSize | PMaxSize; @@ -1121,7 +1117,7 @@ * * Retrieve an owner's window, creating it if necessary. */ -static Window get_owner_whole_window( HWND owner ) +static Window get_owner_whole_window( HWND owner, BOOL force_managed ) { struct x11drv_win_data *data; @@ -1133,7 +1129,7 @@ !(data = X11DRV_create_win_data( owner ))) return (Window)GetPropA( owner, whole_window_prop ); } - else if (!data->managed) /* make it managed */ + else if (!data->managed && force_managed) /* make it managed */ { SetWindowPos( owner, 0, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOSIZE | SWP_NOMOVE | @@ -1168,8 +1164,8 @@ { style = GetWindowLongW( data->hwnd, GWL_STYLE ); ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); - owner = get_window_owner( data->hwnd ); - if ((owner_win = get_owner_whole_window( owner ))) group_leader = owner_win; + owner = GetWindow( data->hwnd, GW_OWNER ); + if ((owner_win = get_owner_whole_window( owner, data->managed ))) group_leader = owner_win; } wine_tsx11_lock(); @@ -1182,6 +1178,7 @@ /* set the WM_WINDOW_TYPE */ if (style & WS_THICKFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); else if (ex_style & WS_EX_APPWINDOW) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); + else if (style & WS_MINIMIZEBOX) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); else if (style & WS_DLGFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); else if (ex_style & WS_EX_DLGMODALFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); else if ((style & WS_POPUP) && owner) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); @@ -1258,7 +1255,7 @@ new_state |= (1 << NET_WM_STATE_ABOVE); if (ex_style & WS_EX_TOOLWINDOW) new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR) | (1 << NET_WM_STATE_SKIP_PAGER); - if (!(ex_style & WS_EX_APPWINDOW) && get_window_owner( data->hwnd )) + if (!(ex_style & WS_EX_APPWINDOW) && GetWindow( data->hwnd, GW_OWNER )) new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR); if (!data->mapped) /* set the _NET_WM_STATE atom directly */ @@ -1501,6 +1498,8 @@ XReconfigureWMWindow( display, data->whole_window, DefaultScreen(display), mask, &changes ); #ifdef HAVE_LIBXSHAPE + if (IsRectEmpty( old_window_rect ) != IsRectEmpty( &data->window_rect )) + sync_window_region( display, data, (HRGN)1 ); if (data->shaped) { int old_x_offset = old_window_rect->left - old_whole_rect->left; @@ -1688,7 +1687,7 @@ sync_window_text( display, data->whole_window, text ); /* set the window region */ - if (win_rgn) sync_window_region( display, data, win_rgn ); + if (win_rgn || IsRectEmpty( &data->window_rect )) sync_window_region( display, data, win_rgn ); /* set the window opacity */ if (!GetLayeredWindowAttributes( data->hwnd, &key, &alpha, &layered_flags )) layered_flags = 0; @@ -2331,7 +2330,8 @@ if (data->mapped) { if (((swp_flags & SWP_HIDEWINDOW) && !(new_style & WS_VISIBLE)) || - (!event_type && !is_window_rect_mapped( rectWindow ))) + (event_type != ConfigureNotify && + !is_window_rect_mapped( rectWindow ) && is_window_rect_mapped( &old_window_rect ))) unmap_window( display, data ); } Modified: branches/arwinss/reactos/dll/win32/winex11.drv/xrender.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/xrender.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/xrender.c [iso-8859-1] Sat Jun 5 17:03:58 2010 @@ -193,6 +193,7 @@ MAKE_FUNCPTR(FcPatternDestroy) MAKE_FUNCPTR(FcPatternAddInteger) MAKE_FUNCPTR(FcPatternAddString) +MAKE_FUNCPTR(FcPatternGetBool) MAKE_FUNCPTR(FcPatternGetInteger) MAKE_FUNCPTR(FcPatternGetString) static void *fontconfig_handle; @@ -408,6 +409,7 @@ LOAD_FUNCPTR(FcPatternDestroy); LOAD_FUNCPTR(FcPatternAddInteger); LOAD_FUNCPTR(FcPatternAddString); + LOAD_FUNCPTR(FcPatternGetBool); LOAD_FUNCPTR(FcPatternGetInteger); LOAD_FUNCPTR(FcPatternGetString); #undef LOAD_FUNCPTR @@ -936,14 +938,17 @@ if ((match = pFcFontMatch( NULL, pattern, &result ))) { int rgba; - + FcBool antialias; + + if (pFcPatternGetBool( match, FC_ANTIALIAS, 0, &antialias ) != FcResultMatch) + antialias = TRUE; if (pFcPatternGetInteger( match, FC_RGBA, 0, &rgba ) == FcResultMatch) { FcChar8 *file; if (pFcPatternGetString( match, FC_FILE, 0, &file ) != FcResultMatch) file = NULL; - TRACE( "fontconfig returned rgba %u for font %s file %s\n", - rgba, debugstr_w(plfsz->lf.lfFaceName), debugstr_a((char *)file) ); + TRACE( "fontconfig returned rgba %u antialias %u for font %s file %s\n", + rgba, antialias, debugstr_w(plfsz->lf.lfFaceName), debugstr_a((char *)file) ); switch (rgba) { @@ -951,7 +956,7 @@ case FC_RGBA_BGR: entry->aa_default = AA_BGR; break; case FC_RGBA_VRGB: entry->aa_default = AA_VRGB; break; case FC_RGBA_VBGR: entry->aa_default = AA_VBGR; break; - case FC_RGBA_NONE: entry->aa_default = AA_None; break; + case FC_RGBA_NONE: entry->aa_default = antialias ? AA_Grey : AA_None; break; } } pFcPatternDestroy( match ); @@ -959,6 +964,30 @@ pFcPatternDestroy( pattern ); } #endif /* SONAME_LIBFONTCONFIG */ + + /* now check Xft resources */ + { + char *value; + BOOL antialias = TRUE; + + wine_tsx11_lock(); + if ((value = XGetDefault( gdi_display, "Xft", "antialias" ))) + { + if (tolower(value[0]) == 'f' || tolower(value[0]) == 'n' || + value[0] == '0' || !strcasecmp( value, "off" )) + antialias = FALSE; + } + if ((value = XGetDefault( gdi_display, "Xft", "rgba" ))) + { + TRACE( "Xft resource returned rgba '%s' antialias %u\n", value, antialias ); + if (!strcmp( value, "rgb" )) entry->aa_default = AA_RGB; + else if (!strcmp( value, "bgr" )) entry->aa_default = AA_BGR; + else if (!strcmp( value, "vrgb" )) entry->aa_default = AA_VRGB; + else if (!strcmp( value, "vbgr" )) entry->aa_default = AA_VBGR; + else if (!strcmp( value, "none" )) entry->aa_default = antialias ? AA_Grey : AA_None; + } + wine_tsx11_unlock(); + } } else entry->aa_default = AA_None;

1 0

[sir_richard] 47589: [NTOS]: Don't assume that ANY fault in the system address range, not associated to a memory area, might be ARM3. Instead, since this hack only exists for early boot page pool support, make only treat this as an ARM3 fault when it happens in the paged pool area or higher. Leads to more direct Mm crashes when invalid page access happens, instead of infinite "PAGE FAULT ON PAGE TABLES".
by sir_richard＠svn.reactos.org 05 Jun '10

05 Jun '10

Author: sir_richard Date: Sat Jun 5 16:59:50 2010 New Revision: 47589 URL: http://svn.reactos.org/svn/reactos?rev=47589&view=rev Log: [NTOS]: Don't assume that ANY fault in the system address range, not associated to a memory area, might be ARM3. Instead, since this hack only exists for early boot page pool support, make only treat this as an ARM3 fault when it happens in the paged pool area or higher. Leads to more direct Mm crashes when invalid page access happens, instead of infinite "PAGE FAULT ON PAGE TABLES". Modified: trunk/reactos/ntoskrnl/mm/mmfault.c Modified: trunk/reactos/ntoskrnl/mm/mmfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mmfault.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] Sat Jun 5 16:59:50 2010 @@ -284,13 +284,13 @@ * can go away. */ MemoryArea = MmLocateMemoryAreaByAddress(MmGetKernelAddressSpace(), Address); - if ((!(MemoryArea) && ((ULONG_PTR)Address >= (ULONG_PTR)MmSystemRangeStart)) || + if ((!(MemoryArea) && ((ULONG_PTR)Address >= (ULONG_PTR)MmPagedPoolStart)) || ((MemoryArea) && (MemoryArea->Type == MEMORY_AREA_OWNED_BY_ARM3))) { // // Hand it off to more competent hands... // - DPRINT1("ARM3 fault\n"); + DPRINT1("ARM3 fault %p\n", MemoryArea); return MmArmAccessFault(StoreInstruction, Address, Mode, TrapInformation); }

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