Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 58557: [CONSRV] Fix what I broke in revision r58447, namely at which process the terminal window belongs to.
by hbelusca＠svn.reactos.org 20 Mar '13

20 Mar '13

Author: hbelusca Date: Wed Mar 20 00:41:47 2013 New Revision: 58557 URL: http://svn.reactos.org/svn/reactos?rev=58557&view=rev Log: [CONSRV] Fix what I broke in revision r58447, namely at which process the terminal window belongs to. Modified: branches/ros-csrss/win32ss/user/consrv/conio.h branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/consrv/guiconsole.c branches/ros-csrss/win32ss/user/consrv/handle.c Modified: branches/ros-csrss/win32ss/user/consrv/conio.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] Wed Mar 20 00:41:47 2013 @@ -106,6 +106,7 @@ DWORD ShiftState, UINT VirtualKeyCode, BOOL Down); + VOID (WINAPI *RefreshInternalInfo)(struct _CONSOLE* Console); /* * External interface (functions corresponding to the Console API) @@ -132,6 +133,10 @@ #define ConioResizeBuffer(Console, Buff, Size) (Console)->TermIFace.Vtbl->ResizeBuffer((Console), (Buff), (Size)) #define ConioProcessKeyCallback(Console, Msg, KeyStateMenu, ShiftState, VirtualKeyCode, Down) \ (Console)->TermIFace.Vtbl->ProcessKeyCallback((Console), (Msg), (KeyStateMenu), (ShiftState), (VirtualKeyCode), (Down)) +#define ConioGetConsoleWindowHandle(Console) \ + (Console)->TermIFace.Vtbl->GetConsoleWindowHandle((Console)) +#define ConioRefreshInternalInfo(Console) \ + (Console)->TermIFace.Vtbl->RefreshInternalInfo((Console)) typedef struct _TERMINAL_IFACE { @@ -194,25 +199,6 @@ COLORREF Colors[16]; /* Colour palette */ } CONSOLE, *PCONSOLE; - -/**************************************************************\ -\** Define the Console Leader Process for the console window **/ -#define GWLP_CONSOLEWND_ALLOC (2 * sizeof(LONG_PTR)) -#define GWLP_CONSOLE_LEADER_PID 0 -#define GWLP_CONSOLE_LEADER_TID 4 - -#define SetConsoleWndConsoleLeaderCID(GuiData) \ -do { \ - PCONSOLE_PROCESS_DATA ProcessData; \ - CLIENT_ID ConsoleLeaderCID; \ - ProcessData = CONTAINING_RECORD((GuiData)->Console->ProcessList.Blink, \ - CONSOLE_PROCESS_DATA, \ - ConsoleLink); \ - ConsoleLeaderCID = ProcessData->Process->ClientId; \ - SetWindowLongPtrW((GuiData)->hWindow, GWLP_CONSOLE_LEADER_PID, (LONG_PTR)(ConsoleLeaderCID.UniqueProcess)); \ - SetWindowLongPtrW((GuiData)->hWindow, GWLP_CONSOLE_LEADER_TID, (LONG_PTR)(ConsoleLeaderCID.UniqueThread )); \ -} while(0) -/**************************************************************/ /* CONSOLE_SELECTION_INFO dwFlags values */ #define CONSOLE_NO_SELECTION 0x0 Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] Wed Mar 20 00:41:47 2013 @@ -1034,7 +1034,7 @@ Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); if (!NT_SUCCESS(Status)) return Status; - GetWindowRequest->WindowHandle = Console->TermIFace.Vtbl->GetConsoleWindowHandle(Console); + GetWindowRequest->WindowHandle = ConioGetConsoleWindowHandle(Console); ConSrvReleaseConsole(Console, TRUE); return STATUS_SUCCESS; Modified: branches/ros-csrss/win32ss/user/consrv/guiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/g… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/guiconsole.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/guiconsole.c [iso-8859-1] Wed Mar 20 00:41:47 2013 @@ -64,6 +64,27 @@ PCONSOLE Console; /* Pointer to the owned console */ GUI_CONSOLE_INFO GuiInfo; /* GUI terminal settings */ } GUI_CONSOLE_DATA, *PGUI_CONSOLE_DATA; + + +/**************************************************************\ +\** Define the Console Leader Process for the console window **/ +#define GWLP_CONSOLEWND_ALLOC (2 * sizeof(LONG_PTR)) +#define GWLP_CONSOLE_LEADER_PID 0 +#define GWLP_CONSOLE_LEADER_TID 4 + +#define SetConsoleWndConsoleLeaderCID(GuiData) \ +do { \ + PCONSOLE_PROCESS_DATA ProcessData; \ + CLIENT_ID ConsoleLeaderCID; \ + ProcessData = CONTAINING_RECORD((GuiData)->Console->ProcessList.Blink, \ + CONSOLE_PROCESS_DATA, \ + ConsoleLink); \ + ConsoleLeaderCID = ProcessData->Process->ClientId; \ + SetWindowLongPtrW((GuiData)->hWindow, GWLP_CONSOLE_LEADER_PID, (LONG_PTR)(ConsoleLeaderCID.UniqueProcess)); \ + SetWindowLongPtrW((GuiData)->hWindow, GWLP_CONSOLE_LEADER_TID, (LONG_PTR)(ConsoleLeaderCID.UniqueThread )); \ +} while(0) +/**************************************************************/ + static BOOL ConsInitialized = FALSE; static HICON ghDefaultIcon = NULL; @@ -1619,8 +1640,6 @@ WindowCount++; SetWindowLongW(hWnd, GWL_USERDATA, WindowCount); - // SetConsoleWndConsoleLeaderCID(Console); - DPRINT1("Set icons via PM_CREATE_CONSOLE\n"); if (GuiData->hIcon == NULL) { @@ -2066,6 +2085,15 @@ } static VOID WINAPI +GuiRefreshInternalInfo(PCONSOLE Console) +{ + PGUI_CONSOLE_DATA GuiData = Console->TermIFace.Data; + + /* Update the console leader information held by the window */ + SetConsoleWndConsoleLeaderCID(GuiData); +} + +static VOID WINAPI GuiChangeTitle(PCONSOLE Console) { PGUI_CONSOLE_DATA GuiData = Console->TermIFace.Data; @@ -2133,6 +2161,7 @@ GuiUpdateScreenInfo, GuiResizeBuffer, GuiProcessKeyCallback, + GuiRefreshInternalInfo, GuiChangeTitle, GuiChangeIcon, GuiGetConsoleWindowHandle Modified: branches/ros-csrss/win32ss/user/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/h… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] Wed Mar 20 00:41:47 2013 @@ -449,6 +449,9 @@ /* Add a reference count because the process is tied to the console */ _InterlockedIncrement(&ProcessData->Console->ReferenceCount); + /* Update the internal info of the terminal */ + ConioRefreshInternalInfo(ProcessData->Console); + return STATUS_SUCCESS; } @@ -501,6 +504,9 @@ /* Add a reference count because the process is tied to the console */ _InterlockedIncrement(&ProcessData->Console->ReferenceCount); + /* Update the internal info of the terminal */ + ConioRefreshInternalInfo(ProcessData->Console); + return STATUS_SUCCESS; } @@ -528,8 +534,8 @@ /* Remove ourselves from the console's list of processes */ RemoveEntryList(&ProcessData->ConsoleLink); - /* Update the console leader process */ - // SetConsoleWndConsoleLeaderCID(Console); + /* Update the internal info of the terminal */ + ConioRefreshInternalInfo(Console); /* Release the console */ ConSrvReleaseConsole(Console, TRUE);

1 0

[hbelusca] 58556: [CONSRV] Use a new helper function ConSrvConsoleProcessCtrlEvent to send control events to processes belonging to a given console.
by hbelusca＠svn.reactos.org 19 Mar '13

19 Mar '13

Author: hbelusca Date: Tue Mar 19 23:40:20 2013 New Revision: 58556 URL: http://svn.reactos.org/svn/reactos?rev=58556&view=rev Log: [CONSRV] Use a new helper function ConSrvConsoleProcessCtrlEvent to send control events to processes belonging to a given console. Modified: branches/ros-csrss/win32ss/user/consrv/coninput.c branches/ros-csrss/win32ss/user/consrv/conio.h branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/consrv/guiconsole.c Modified: branches/ros-csrss/win32ss/user/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/coninput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/coninput.c [iso-8859-1] Tue Mar 19 23:40:20 2013 @@ -227,18 +227,9 @@ (er.Event.KeyEvent.wVirtualKeyCode == 'C')) && (er.Event.KeyEvent.dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED) || KeyState[VK_CONTROL] & 0x80)) { - PCONSOLE_PROCESS_DATA current; - PLIST_ENTRY current_entry; - DPRINT1("Console_Api Ctrl-C\n"); - - current_entry = Console->ProcessList.Flink; - while (current_entry != &Console->ProcessList) - { - current = CONTAINING_RECORD(current_entry, CONSOLE_PROCESS_DATA, ConsoleLink); - current_entry = current_entry->Flink; - ConSrvConsoleCtrlEvent(CTRL_C_EVENT, current); - } + ConSrvConsoleProcessCtrlEvent(Console, 0, CTRL_C_EVENT); + if (Console->LineBuffer && !Console->LineComplete) { /* Line input is in progress; end it */ Modified: branches/ros-csrss/win32ss/user/consrv/conio.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] Tue Mar 19 23:40:20 2013 @@ -238,10 +238,9 @@ IN PCSR_PROCESS ConsoleLeaderProcess); VOID FASTCALL ConioPause(PCONSOLE Console, UINT Flags); VOID FASTCALL ConioUnpause(PCONSOLE Console, UINT Flags); -VOID FASTCALL ConSrvConsoleCtrlEvent(DWORD Event, PCONSOLE_PROCESS_DATA ProcessData); -VOID FASTCALL ConSrvConsoleCtrlEventTimeout(DWORD Event, - PCONSOLE_PROCESS_DATA ProcessData, - DWORD Timeout); +ULONG FASTCALL ConSrvConsoleProcessCtrlEvent(PCONSOLE Console, + ULONG ProcessGroupId, + DWORD Event); /* coninput.c */ #define ConSrvGetInputBuffer(ProcessData, Handle, Ptr, Access, LockConsole) \ Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] Tue Mar 19 23:40:20 2013 @@ -28,17 +28,20 @@ /* PRIVATE FUNCTIONS **********************************************************/ -BOOL FASTCALL +#ifdef TUI_CONSOLE +static BOOL DtbgIsDesktopVisible(VOID) { return !((BOOL)NtUserCallNoParam(NOPARAM_ROUTINE_ISCONSOLEMODE)); } - -VOID FASTCALL +#endif + +static ULONG ConSrvConsoleCtrlEventTimeout(DWORD Event, PCONSOLE_PROCESS_DATA ProcessData, DWORD Timeout) { + ULONG Status = ERROR_SUCCESS; HANDLE Thread; DPRINT("ConSrvConsoleCtrlEvent Parent ProcessId = %x\n", ProcessData->Process->ClientId.UniqueProcess); @@ -50,20 +53,59 @@ UlongToPtr(Event), 0, NULL); if (NULL == Thread) { - DPRINT1("Failed thread creation (Error: 0x%x)\n", GetLastError()); - return; - } - - DPRINT("We succeeded at creating ProcessData->CtrlDispatcher remote thread, ProcessId = %x, Process = 0x%p\n", ProcessData->Process->ClientId.UniqueProcess, ProcessData->Process); - WaitForSingleObject(Thread, Timeout); - CloseHandle(Thread); - } -} - -VOID FASTCALL -ConSrvConsoleCtrlEvent(DWORD Event, PCONSOLE_PROCESS_DATA ProcessData) -{ - ConSrvConsoleCtrlEventTimeout(Event, ProcessData, 0); + Status = GetLastError(); + DPRINT1("Failed thread creation (Error: 0x%x)\n", Status); + } + else + { + DPRINT("We succeeded at creating ProcessData->CtrlDispatcher remote thread, ProcessId = %x, Process = 0x%p\n", ProcessData->Process->ClientId.UniqueProcess, ProcessData->Process); + WaitForSingleObject(Thread, Timeout); + CloseHandle(Thread); + } + } + + return Status; +} + +static ULONG +ConSrvConsoleCtrlEvent(DWORD Event, + PCONSOLE_PROCESS_DATA ProcessData) +{ + return ConSrvConsoleCtrlEventTimeout(Event, ProcessData, 0); +} + +ULONG FASTCALL +ConSrvConsoleProcessCtrlEvent(PCONSOLE Console, + ULONG ProcessGroupId, + DWORD Event) +{ + ULONG Status = ERROR_SUCCESS; + PLIST_ENTRY current_entry; + PCONSOLE_PROCESS_DATA current; + + /* + * Loop through the process list, from the most recent process + * (the active one) to the oldest one (the first created, i.e. + * the console leader process), and for each, send an event + * (new processes are inserted at the head of the console process list). + */ + current_entry = Console->ProcessList.Flink; + while (current_entry != &Console->ProcessList) + { + current = CONTAINING_RECORD(current_entry, CONSOLE_PROCESS_DATA, ConsoleLink); + current_entry = current_entry->Flink; + + /* + * Only processes belonging to the same process group are signaled. + * If the process group ID is zero, then all the processes are signaled. + */ + if (ProcessGroupId == 0 || current->Process->ProcessGroupId == ProcessGroupId) + { + Status = ConSrvConsoleCtrlEvent(Event, current); + } + } + + return Status; } VOID FASTCALL @@ -1107,29 +1149,15 @@ NTSTATUS Status; PCONSOLE_GENERATECTRLEVENT GenerateCtrlEventRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GenerateCtrlEventRequest; PCONSOLE Console; - PCONSOLE_PROCESS_DATA current; - PLIST_ENTRY current_entry; - DWORD Group; Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); if (!NT_SUCCESS(Status)) return Status; - Group = GenerateCtrlEventRequest->ProcessGroup; - Status = STATUS_INVALID_PARAMETER; - for (current_entry = Console->ProcessList.Flink; - current_entry != &Console->ProcessList; - current_entry = current_entry->Flink) - { - current = CONTAINING_RECORD(current_entry, CONSOLE_PROCESS_DATA, ConsoleLink); - if (Group == 0 || current->Process->ProcessGroupId == Group) - { - ConSrvConsoleCtrlEvent(GenerateCtrlEventRequest->Event, current); - Status = STATUS_SUCCESS; - } - } + Status = ConSrvConsoleProcessCtrlEvent(Console, + GenerateCtrlEventRequest->ProcessGroup, + GenerateCtrlEventRequest->Event); ConSrvReleaseConsole(Console, TRUE); - return Status; } Modified: branches/ros-csrss/win32ss/user/consrv/guiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/g… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/guiconsole.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/guiconsole.c [iso-8859-1] Tue Mar 19 23:40:20 2013 @@ -1040,29 +1040,15 @@ GuiConsoleHandleClose(PGUI_CONSOLE_DATA GuiData) { PCONSOLE Console = GuiData->Console; - PLIST_ENTRY current_entry; - PCONSOLE_PROCESS_DATA current; /// LOCK /// EnterCriticalSection(&Console->Lock); /* - * Loop through the process list, from the most recent process - * (the active one) to the oldest one (the first created, - * i.e. the console leader process), and for each, send a - * CTRL-CLOSE event (new processes are inserted at the head - * of the console process list). + * FIXME: Windows will wait up to 5 seconds for the thread to exit. + * We shouldn't wait here, though, since the console lock is entered. + * A copy of the thread list probably needs to be made. */ - current_entry = Console->ProcessList.Flink; - while (current_entry != &Console->ProcessList) - { - current = CONTAINING_RECORD(current_entry, CONSOLE_PROCESS_DATA, ConsoleLink); - current_entry = current_entry->Flink; - - /* FIXME: Windows will wait up to 5 seconds for the thread to exit. - * We shouldn't wait here, though, since the console lock is entered. - * A copy of the thread list probably needs to be made. */ - ConSrvConsoleCtrlEvent(CTRL_CLOSE_EVENT, current); - } + ConSrvConsoleProcessCtrlEvent(Console, 0, CTRL_CLOSE_EVENT); /// LOCK /// LeaveCriticalSection(&Console->Lock); }

1 0

[hbelusca] 58555: [CONSRV] Code beautification, no changes.
by hbelusca＠svn.reactos.org 19 Mar '13

19 Mar '13

Author: hbelusca Date: Tue Mar 19 22:05:38 2013 New Revision: 58555 URL: http://svn.reactos.org/svn/reactos?rev=58555&view=rev Log: [CONSRV] Code beautification, no changes. Modified: branches/ros-csrss/win32ss/user/consrv/coninput.c branches/ros-csrss/win32ss/user/consrv/conoutput.c branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/consrv/consrv.h branches/ros-csrss/win32ss/user/consrv/handle.c branches/ros-csrss/win32ss/user/consrv/lineinput.c Modified: branches/ros-csrss/win32ss/user/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/coninput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/coninput.c [iso-8859-1] Tue Mar 19 22:05:38 2013 @@ -673,7 +673,7 @@ } -/* PUBLIC APIS ****************************************************************/ +/* PUBLIC SERVER APIS *********************************************************/ CSR_API(SrvReadConsole) { Modified: branches/ros-csrss/win32ss/user/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/conoutput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/conoutput.c [iso-8859-1] Tue Mar 19 22:05:38 2013 @@ -593,7 +593,7 @@ } -/* PUBLIC APIS ****************************************************************/ +/* PUBLIC SERVER APIS *********************************************************/ CSR_API(SrvReadConsoleOutput) { Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] Tue Mar 19 22:05:38 2013 @@ -6,7 +6,7 @@ * PROGRAMMERS: */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #define COBJMACROS #define NONAMELESSUNION @@ -26,7 +26,7 @@ #include <debug.h> -/* FUNCTIONS *****************************************************************/ +/* PRIVATE FUNCTIONS **********************************************************/ BOOL FASTCALL DtbgIsDesktopVisible(VOID) @@ -507,6 +507,9 @@ RtlFreeHeap(ConSrvHeap, 0, Console); } + +/* PUBLIC SERVER APIS *********************************************************/ + CSR_API(SrvOpenConsole) { NTSTATUS Status = STATUS_SUCCESS; @@ -598,7 +601,6 @@ * and recreate a new one later on. */ ConSrvRemoveConsole(ProcessData); - // ConSrvFreeHandlesTable(ProcessData); /* Initialize a new Console owned by the Console Leader Process */ Status = ConSrvAllocateConsole(ProcessData, @@ -689,7 +691,6 @@ * and recreate a new one later on. */ ConSrvRemoveConsole(TargetProcessData); - // ConSrvFreeHandlesTable(TargetProcessData); /* * Inherit the console from the parent, Modified: branches/ros-csrss/win32ss/user/consrv/consrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/consrv.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/consrv.h [iso-8859-1] Tue Mar 19 22:05:38 2013 @@ -149,13 +149,6 @@ CSR_API(SrvVerifyConsoleIoHandle); CSR_API(SrvDuplicateHandle); -NTSTATUS FASTCALL ConSrvInitHandlesTable(IN OUT PCONSOLE_PROCESS_DATA ProcessData, - OUT PHANDLE pInputHandle, - OUT PHANDLE pOutputHandle, - OUT PHANDLE pErrorHandle); -NTSTATUS FASTCALL ConSrvInheritHandlesTable(IN PCONSOLE_PROCESS_DATA SourceProcessData, - IN PCONSOLE_PROCESS_DATA TargetProcessData); -VOID FASTCALL ConSrvFreeHandlesTable(PCONSOLE_PROCESS_DATA ProcessData); NTSTATUS FASTCALL ConSrvInsertObject(PCONSOLE_PROCESS_DATA ProcessData, PHANDLE Handle, Object_t *Object, Modified: branches/ros-csrss/win32ss/user/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/h… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] Tue Mar 19 22:05:38 2013 @@ -6,7 +6,7 @@ * PROGRAMMERS: */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #include "consrv.h" #include "conio.h" @@ -15,7 +15,7 @@ #include <debug.h> -/* PRIVATE FUNCTIONS *********************************************************/ +/* PRIVATE FUNCTIONS **********************************************************/ static INT AdjustHandleCounts(PCONSOLE_IO_HANDLE Entry, INT Change) @@ -103,10 +103,10 @@ } -/* FUNCTIONS *****************************************************************/ - -/* static */ NTSTATUS -FASTCALL +/* Forward declaration, used in ConSrvInitHandlesTable */ +static VOID ConSrvFreeHandlesTable(PCONSOLE_PROCESS_DATA ProcessData); + +static NTSTATUS ConSrvInitHandlesTable(IN OUT PCONSOLE_PROCESS_DATA ProcessData, OUT PHANDLE pInputHandle, OUT PHANDLE pOutputHandle, @@ -181,8 +181,7 @@ return STATUS_SUCCESS; } -NTSTATUS -FASTCALL +static NTSTATUS ConSrvInheritHandlesTable(IN PCONSOLE_PROCESS_DATA SourceProcessData, IN PCONSOLE_PROCESS_DATA TargetProcessData) { @@ -234,8 +233,7 @@ return Status; } -VOID -FASTCALL +static VOID ConSrvFreeHandlesTable(PCONSOLE_PROCESS_DATA ProcessData) { DPRINT1("ConSrvFreeHandlesTable\n"); @@ -756,6 +754,7 @@ } +/* PUBLIC SERVER APIS *********************************************************/ CSR_API(SrvCloseHandle) { Modified: branches/ros-csrss/win32ss/user/consrv/lineinput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/lineinput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/lineinput.c [iso-8859-1] Tue Mar 19 22:05:38 2013 @@ -6,7 +6,7 @@ * PROGRAMMERS: Jeffrey Morlan */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #include "consrv.h" #include "conio.h" @@ -24,7 +24,8 @@ UNICODE_STRING ExeName; } HISTORY_BUFFER, *PHISTORY_BUFFER; -/* FUNCTIONS *****************************************************************/ + +/* PRIVATE FUNCTIONS **********************************************************/ static PHISTORY_BUFFER HistoryCurrentBuffer(PCONSOLE Console) @@ -140,14 +141,294 @@ VOID FASTCALL HistoryDeleteBuffer(PHISTORY_BUFFER Hist) { - if (!Hist) - return; + if (!Hist) return; + while (Hist->NumEntries != 0) RtlFreeUnicodeString(&Hist->Entries[--Hist->NumEntries]); + RtlFreeHeap(ConSrvHeap, 0, Hist->Entries); RemoveEntryList(&Hist->ListEntry); RtlFreeHeap(ConSrvHeap, 0, Hist); } + +static VOID +LineInputSetPos(PCONSOLE Console, UINT Pos) +{ + if (Pos != Console->LinePos && Console->InputBuffer.Mode & ENABLE_ECHO_INPUT) + { + PCONSOLE_SCREEN_BUFFER Buffer = Console->ActiveBuffer; + UINT OldCursorX = Buffer->CursorPosition.X; + UINT OldCursorY = Buffer->CursorPosition.Y; + INT XY = OldCursorY * Buffer->ScreenBufferSize.X + OldCursorX; + + XY += (Pos - Console->LinePos); + if (XY < 0) + XY = 0; + else if (XY >= Buffer->ScreenBufferSize.Y * Buffer->ScreenBufferSize.X) + XY = Buffer->ScreenBufferSize.Y * Buffer->ScreenBufferSize.X - 1; + + Buffer->CursorPosition.X = XY % Buffer->ScreenBufferSize.X; + Buffer->CursorPosition.Y = XY / Buffer->ScreenBufferSize.X; + ConioSetScreenInfo(Console, Buffer, OldCursorX, OldCursorY); + } + + Console->LinePos = Pos; +} + +static VOID +LineInputEdit(PCONSOLE 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->InputBuffer.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(PCONSOLE 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(PCONSOLE 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_INSERT: + /* Toggle between insert and overstrike */ + Console->LineInsertToggle = !Console->LineInsertToggle; + ConioSetCursorInfo(Console, Console->ActiveBuffer); + 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->InputBuffer.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->InputBuffer.Mode & ENABLE_ECHO_INPUT) + ConioWriteConsole(Console, Console->ActiveBuffer, "\r", 1, TRUE); + + /* Add \n if processed input. There should usually be room for it, + * but an exception to the rule exists: the buffer could have been + * pre-filled with LineMaxSize - 1 characters. */ + if (Console->InputBuffer.Mode & ENABLE_PROCESSED_INPUT && + Console->LineSize < Console->LineMaxSize) + { + Console->LineBuffer[Console->LineSize++] = L'\n'; + if (Console->InputBuffer.Mode & ENABLE_ECHO_INPUT) + ConioWriteConsole(Console, Console->ActiveBuffer, "\n", 1, TRUE); + } + Console->LineComplete = TRUE; + Console->LinePos = 0; + } + else if (KeyEvent->uChar.UnicodeChar != L'\0') + { + if (KeyEvent->uChar.UnicodeChar < 0x20 && + Console->LineWakeupMask & (1 << KeyEvent->uChar.UnicodeChar)) + { + /* Control key client wants to handle itself (e.g. for tab completion) */ + Console->LineBuffer[Console->LineSize++] = L' '; + Console->LineBuffer[Console->LinePos] = KeyEvent->uChar.UnicodeChar; + Console->LineComplete = TRUE; + Console->LinePos = 0; + } + else + { + /* Normal character */ + BOOL Overstrike = Console->LineInsertToggle && Console->LinePos != Console->LineSize; + LineInputEdit(Console, Overstrike, 1, &KeyEvent->uChar.UnicodeChar); + } + } +} + + +/* PUBLIC SERVER APIS *********************************************************/ CSR_API(SrvGetConsoleCommandHistoryLength) { @@ -337,280 +618,4 @@ return Status; } -static VOID -LineInputSetPos(PCONSOLE Console, UINT Pos) -{ - if (Pos != Console->LinePos && Console->InputBuffer.Mode & ENABLE_ECHO_INPUT) - { - PCONSOLE_SCREEN_BUFFER Buffer = Console->ActiveBuffer; - UINT OldCursorX = Buffer->CursorPosition.X; - UINT OldCursorY = Buffer->CursorPosition.Y; - INT XY = OldCursorY * Buffer->ScreenBufferSize.X + OldCursorX; - - XY += (Pos - Console->LinePos); - if (XY < 0) - XY = 0; - else if (XY >= Buffer->ScreenBufferSize.Y * Buffer->ScreenBufferSize.X) - XY = Buffer->ScreenBufferSize.Y * Buffer->ScreenBufferSize.X - 1; - - Buffer->CursorPosition.X = XY % Buffer->ScreenBufferSize.X; - Buffer->CursorPosition.Y = XY / Buffer->ScreenBufferSize.X; - ConioSetScreenInfo(Console, Buffer, OldCursorX, OldCursorY); - } - - Console->LinePos = Pos; -} - -static VOID -LineInputEdit(PCONSOLE 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->InputBuffer.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(PCONSOLE 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(PCONSOLE 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_INSERT: - /* Toggle between insert and overstrike */ - Console->LineInsertToggle = !Console->LineInsertToggle; - ConioSetCursorInfo(Console, Console->ActiveBuffer); - 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->InputBuffer.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->InputBuffer.Mode & ENABLE_ECHO_INPUT) - ConioWriteConsole(Console, Console->ActiveBuffer, "\r", 1, TRUE); - - /* Add \n if processed input. There should usually be room for it, - * but an exception to the rule exists: the buffer could have been - * pre-filled with LineMaxSize - 1 characters. */ - if (Console->InputBuffer.Mode & ENABLE_PROCESSED_INPUT && - Console->LineSize < Console->LineMaxSize) - { - Console->LineBuffer[Console->LineSize++] = L'\n'; - if (Console->InputBuffer.Mode & ENABLE_ECHO_INPUT) - ConioWriteConsole(Console, Console->ActiveBuffer, "\n", 1, TRUE); - } - Console->LineComplete = TRUE; - Console->LinePos = 0; - } - else if (KeyEvent->uChar.UnicodeChar != L'\0') - { - if (KeyEvent->uChar.UnicodeChar < 0x20 && - Console->LineWakeupMask & (1 << KeyEvent->uChar.UnicodeChar)) - { - /* Control key client wants to handle itself (e.g. for tab completion) */ - Console->LineBuffer[Console->LineSize++] = L' '; - Console->LineBuffer[Console->LinePos] = KeyEvent->uChar.UnicodeChar; - Console->LineComplete = TRUE; - Console->LinePos = 0; - } - else - { - /* Normal character */ - BOOL Overstrike = Console->LineInsertToggle && Console->LinePos != Console->LineSize; - LineInputEdit(Console, Overstrike, 1, &KeyEvent->uChar.UnicodeChar); - } - } -} - /* EOF */

1 0

[hbelusca] 58554: [WIN32SS] "Internal Message!" : this is just an informative message, not an error.
by hbelusca＠svn.reactos.org 19 Mar '13

19 Mar '13

Author: hbelusca Date: Tue Mar 19 01:28:50 2013 New Revision: 58554 URL: http://svn.reactos.org/svn/reactos?rev=58554&view=rev Log: [WIN32SS] "Internal Message!" : this is just an informative message, not an error. Modified: trunk/reactos/win32ss/user/ntuser/message.c Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Tue Mar 19 01:28:50 2013 @@ -1557,7 +1557,7 @@ { if (Win32Thread->TIF_flags & TIF_INCLEANUP) RETURN( FALSE); - ERR("SMWCB: Internal Message!\n"); + TRACE("SMWCB: Internal Message!\n"); Result = (ULONG_PTR)handle_internal_message( Window, Msg, wParam, lParam ); if (uResult) *uResult = Result; RETURN( TRUE);

1 0

[fireball] 58553: [CMD] - Victor Martinez: ECHO command should write CRLF. Fixes regressions in several apps that depend on console output. CORE-6916 #resolve #comment Committed in r58553.
by fireball＠svn.reactos.org 18 Mar '13

18 Mar '13

Author: fireball Date: Mon Mar 18 21:23:35 2013 New Revision: 58553 URL: http://svn.reactos.org/svn/reactos?rev=58553&view=rev Log: [CMD] - Victor Martinez: ECHO command should write CRLF. Fixes regressions in several apps that depend on console output. CORE-6916 #resolve #comment Committed in r58553. Modified: trunk/reactos/base/shell/cmd/echo.c Modified: trunk/reactos/base/shell/cmd/echo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/echo.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/echo.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/echo.c [iso-8859-1] Mon Mar 18 21:23:35 2013 @@ -83,7 +83,7 @@ { /* skip the first character */ ConOutPuts(param + 1); - ConOutPuts(_T("\n")); + ConOutPuts(_T("\r\n")); } return 0; }

1 0

[ekohl] 58552: [SAMSRV] - Add missing flags for SamrQueryInformationUser.UserAllInformation.
by ekohl＠svn.reactos.org 18 Mar '13

18 Mar '13

Author: ekohl Date: Mon Mar 18 15:16:10 2013 New Revision: 58552 URL: http://svn.reactos.org/svn/reactos?rev=58552&view=rev Log: [SAMSRV] - Add missing flags for SamrQueryInformationUser.UserAllInformation. Modified: trunk/reactos/include/ddk/ntsam.h Modified: trunk/reactos/include/ddk/ntsam.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntsam.h?rev=58… ============================================================================== --- trunk/reactos/include/ddk/ntsam.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntsam.h [iso-8859-1] Mon Mar 18 15:16:10 2013 @@ -224,6 +224,19 @@ #define USER_ALL_SECURITYDESCRIPTOR 0x10000000 #define USER_ALL_OWFPASSWORD 0x20000000 #define USER_ALL_UNDEFINED_MASK 0xC0000000 + +#define USER_ALL_READ_GENERAL_MASK 0x0000003F +#define USER_ALL_READ_LOGON_MASK 0x0003FFC0 +#define USER_ALL_READ_ACCOUNT_MASK 0x003C0000 +#define USER_ALL_READ_PREFERENCES_MASK 0x00C00000 +#define USER_ALL_READ_TRUSTED_MASK 0x1F000000 +#define USER_ALL_READ_CANT_MASK 0xC0000000 + +#define USER_ALL_WRITE_ACCOUNT_MASK 0x003827DB +#define USER_ALL_WRITE_PREFERENCES_MASK 0x00C00020 +#define USER_ALL_WRITE_FORCE_PASSWORD_CHANGE_MASK 0x0B000000 +#define USER_ALL_WRITE_TRUSTED_MASK 0x1404D800 +#define USER_ALL_WRITE_CANT_MASK 0xC0030004 /* Values used by USER_PWD_CHANGE_FAILURE_INFORMATION.ExtendedFailureReason */ #define SAM_PWD_CHANGE_NO_ERROR 0

1 0

[ekohl] 58551: [SAMSRV] Implement SamrQueryInformationUser.UserAllInformation.
by ekohl＠svn.reactos.org 18 Mar '13

18 Mar '13

Author: ekohl Date: Mon Mar 18 15:12:30 2013 New Revision: 58551 URL: http://svn.reactos.org/svn/reactos?rev=58551&view=rev Log: [SAMSRV] Implement SamrQueryInformationUser.UserAllInformation. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Mon Mar 18 15:12:30 2013 @@ -6179,6 +6179,255 @@ } +static NTSTATUS +SampQueryUserAll(PSAM_DB_OBJECT UserObject, + PSAMPR_USER_INFO_BUFFER *Buffer) +{ + PSAMPR_USER_INFO_BUFFER InfoBuffer = NULL; + SAM_USER_FIXED_DATA FixedData; + ULONG Length = 0; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_USER_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Length = sizeof(SAM_USER_FIXED_DATA); + Status = SampGetObjectAttribute(UserObject, + L"F", + NULL, + (PVOID)&FixedData, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + if (UserObject->Access & USER_READ_GENERAL) + { + /* Get the Name string */ + Status = SampGetObjectAttributeString(UserObject, + L"Name", + &InfoBuffer->All.UserName); + if (!NT_SUCCESS(Status)) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + /* Get the FullName string */ + Status = SampGetObjectAttributeString(UserObject, + L"FullName", + &InfoBuffer->All.FullName); + if (!NT_SUCCESS(Status)) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + /* Get the user ID*/ + InfoBuffer->All.UserId = FixedData.UserId; + + /* Get the primary group ID */ + InfoBuffer->All.PrimaryGroupId = FixedData.PrimaryGroupId; + + /* Get the AdminComment string */ + Status = SampGetObjectAttributeString(UserObject, + L"AdminComment", + &InfoBuffer->All.AdminComment); + if (!NT_SUCCESS(Status)) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + /* Get the UserComment string */ + Status = SampGetObjectAttributeString(UserObject, + L"UserComment", + &InfoBuffer->All.UserComment); + if (!NT_SUCCESS(Status)) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + InfoBuffer->All.WhichFields |= USER_ALL_READ_GENERAL_MASK; +// USER_ALL_USERNAME | +// USER_ALL_FULLNAME | +// USER_ALL_USERID | +// USER_ALL_PRIMARYGROUPID | +// USER_ALL_ADMINCOMMENT | +// USER_ALL_USERCOMMENT; + } + + if (UserObject->Access & USER_READ_LOGON) + { + /* Get the HomeDirectory string */ + Status = SampGetObjectAttributeString(UserObject, + L"HomeDirectory", + &InfoBuffer->All.HomeDirectory); + if (!NT_SUCCESS(Status)) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + /* Get the HomeDirectoryDrive string */ + Status = SampGetObjectAttributeString(UserObject, + L"HomeDirectoryDrive", + &InfoBuffer->Home.HomeDirectoryDrive); + if (!NT_SUCCESS(Status)) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + /* Get the ScriptPath string */ + Status = SampGetObjectAttributeString(UserObject, + L"ScriptPath", + &InfoBuffer->All.ScriptPath); + if (!NT_SUCCESS(Status)) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + /* Get the ProfilePath string */ + Status = SampGetObjectAttributeString(UserObject, + L"ProfilePath", + &InfoBuffer->All.ProfilePath); + if (!NT_SUCCESS(Status)) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + /* Get the WorkStations string */ + Status = SampGetObjectAttributeString(UserObject, + L"WorkStations", + &InfoBuffer->All.WorkStations); + if (!NT_SUCCESS(Status)) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + InfoBuffer->All.LastLogon.LowPart = FixedData.LastLogon.LowPart; + InfoBuffer->All.LastLogon.HighPart = FixedData.LastLogon.HighPart; + + InfoBuffer->All.LastLogoff.LowPart = FixedData.LastLogoff.LowPart; + InfoBuffer->All.LastLogoff.HighPart = FixedData.LastLogoff.HighPart; + +// USER_ALL_LOGONHOURS + + InfoBuffer->All.BadPasswordCount = FixedData.BadPasswordCount; + + InfoBuffer->All.LogonCount = FixedData.LogonCount; + +// USER_ALL_PASSWORDCANCHANGE +// USER_ALL_PASSWORDMUSTCHANGE + + InfoBuffer->All. WhichFields |= /* USER_ALL_READ_LOGON_MASK; */ + USER_ALL_HOMEDIRECTORY | + USER_ALL_HOMEDIRECTORYDRIVE | + USER_ALL_SCRIPTPATH | + USER_ALL_PROFILEPATH | + USER_ALL_WORKSTATIONS | + USER_ALL_LASTLOGON | + USER_ALL_LASTLOGOFF | +// USER_ALL_LOGONHOURS | + USER_ALL_BADPASSWORDCOUNT | + USER_ALL_LOGONCOUNT; +// USER_ALL_PASSWORDCANCHANGE | +// USER_ALL_PASSWORDMUSTCHANGE; + } + + if (UserObject->Access & USER_READ_ACCOUNT) + { + InfoBuffer->All.PasswordLastSet.LowPart = FixedData.PasswordLastSet.LowPart; + InfoBuffer->All.PasswordLastSet.HighPart = FixedData.PasswordLastSet.HighPart; + + InfoBuffer->All.AccountExpires.LowPart = FixedData.AccountExpires.LowPart; + InfoBuffer->All.AccountExpires.HighPart = FixedData.AccountExpires.HighPart; + + InfoBuffer->All.UserAccountControl = FixedData.UserAccountControl; + + /* Get the Parameters string */ + Status = SampGetObjectAttributeString(UserObject, + L"Parameters", + &InfoBuffer->All.Parameters); + if (!NT_SUCCESS(Status)) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + InfoBuffer->All. WhichFields |= USER_ALL_READ_ACCOUNT_MASK; +// USER_ALL_PASSWORDLASTSET | +// USER_ALL_ACCOUNTEXPIRES | +// USER_ALL_USERACCOUNTCONTROL | +// USER_ALL_PARAMETERS; + } + + if (UserObject->Access & USER_READ_PREFERENCES) + { + InfoBuffer->All.CountryCode = FixedData.CountryCode; + + InfoBuffer->All.CodePage = FixedData.CodePage; + + InfoBuffer->All. WhichFields |= USER_ALL_READ_PREFERENCES_MASK; +// USER_ALL_COUNTRYCODE | +// USER_ALL_CODEPAGE; + } + + *Buffer = InfoBuffer; + +done: + if (!NT_SUCCESS(Status)) + { + if (InfoBuffer != NULL) + { + if (InfoBuffer->All.UserName.Buffer != NULL) + midl_user_free(InfoBuffer->All.UserName.Buffer); + + if (InfoBuffer->All.FullName.Buffer != NULL) + midl_user_free(InfoBuffer->All.FullName.Buffer); + + if (InfoBuffer->All.AdminComment.Buffer != NULL) + midl_user_free(InfoBuffer->All.AdminComment.Buffer); + + if (InfoBuffer->All.UserComment.Buffer != NULL) + midl_user_free(InfoBuffer->All.UserComment.Buffer); + + if (InfoBuffer->All.HomeDirectory.Buffer != NULL) + midl_user_free(InfoBuffer->All.HomeDirectory.Buffer); + + if (InfoBuffer->All.HomeDirectoryDrive.Buffer != NULL) + midl_user_free(InfoBuffer->All.HomeDirectoryDrive.Buffer); + + if (InfoBuffer->All.ScriptPath.Buffer != NULL) + midl_user_free(InfoBuffer->All.ScriptPath.Buffer); + + if (InfoBuffer->All.ProfilePath.Buffer != NULL) + midl_user_free(InfoBuffer->All.ProfilePath.Buffer); + + if (InfoBuffer->All.WorkStations.Buffer != NULL) + midl_user_free(InfoBuffer->All.WorkStations.Buffer); + + if (InfoBuffer->All.LogonHours.LogonHours != NULL) + midl_user_free(InfoBuffer->All.LogonHours.LogonHours); + + if (InfoBuffer->All.Parameters.Buffer != NULL) + midl_user_free(InfoBuffer->All.Parameters.Buffer); + + midl_user_free(InfoBuffer); + } + } + + return Status; +} + + /* Function 36 */ NTSTATUS NTAPI @@ -6232,6 +6481,7 @@ break; case UserInternal1Information: + case UserAllInformation: DesiredAccess = 0; break; @@ -6341,7 +6591,11 @@ Buffer); break; -// case UserAllInformation: + case UserAllInformation: + Status = SampQueryUserAll(UserObject, + Buffer); + break; + // case UserInternal4Information: // case UserInternal5Information: // case UserInternal4InformationNew:

1 0

[hbelusca] 58550: [KERNEL32] Fix a memory leak
by hbelusca＠svn.reactos.org 17 Mar '13

17 Mar '13

Author: hbelusca Date: Sun Mar 17 22:56:49 2013 New Revision: 58550 URL: http://svn.reactos.org/svn/reactos?rev=58550&view=rev Log: [KERNEL32] Fix a memory leak Modified: trunk/reactos/dll/win32/kernel32/client/fiber.c Modified: trunk/reactos/dll/win32/kernel32/client/fiber.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/fiber.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/fiber.c [iso-8859-1] Sun Mar 17 22:56:49 2013 @@ -195,6 +195,9 @@ Fiber = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(FIBER)); if (!Fiber) { + /* Free the activation context stack */ + RtlFreeActivationContextStack(ActivationContextStack); + /* Fail */ SetLastError(ERROR_NOT_ENOUGH_MEMORY); return NULL;

1 0

[hbelusca] 58549: [KERNEL32] - We can now free the fiber activation context stack since RtlFreeActivationContextStack is implemented. - Free the thread activation context stack if we fail at creati...
by hbelusca＠svn.reactos.org 17 Mar '13

17 Mar '13

Author: hbelusca Date: Sun Mar 17 22:50:51 2013 New Revision: 58549 URL: http://svn.reactos.org/svn/reactos?rev=58549&view=rev Log: [KERNEL32] - We can now free the fiber activation context stack since RtlFreeActivationContextStack is implemented. - Free the thread activation context stack if we fail at creating a remote thread. Modified: trunk/reactos/dll/win32/kernel32/client/fiber.c trunk/reactos/dll/win32/kernel32/client/thread.c Modified: trunk/reactos/dll/win32/kernel32/client/fiber.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/fiber.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/fiber.c [iso-8859-1] Sun Mar 17 22:50:51 2013 @@ -15,15 +15,15 @@ typedef struct _FIBER /* Field offsets: */ { /* 32 bit 64 bit */ /* this must be the first field */ - LPVOID Parameter; /* 0x00 0x00 */ - struct _EXCEPTION_REGISTRATION_RECORD * ExceptionList; /* 0x04 0x08 */ - LPVOID StackBase; /* 0x08 0x10 */ - LPVOID StackLimit; /* 0x0C 0x18 */ - LPVOID DeallocationStack; /* 0x10 0x20 */ + PVOID Parameter; /* 0x00 0x00 */ + PEXCEPTION_REGISTRATION_RECORD ExceptionList; /* 0x04 0x08 */ + PVOID StackBase; /* 0x08 0x10 */ + PVOID StackLimit; /* 0x0C 0x18 */ + PVOID DeallocationStack; /* 0x10 0x20 */ CONTEXT Context; /* 0x14 0x28 */ ULONG GuaranteedStackBytes; /* 0x2E0 */ PVOID FlsData; /* 0x2E4 */ - PVOID ActivationContextStack; /* 0x2E8 */ + PACTIVATION_CONTEXT_STACK ActivationContextStack; /* 0x2E8 */ } FIBER, *PFIBER; /* PRIVATE FUNCTIONS **********************************************************/ @@ -171,7 +171,7 @@ PFIBER Fiber; NTSTATUS Status; INITIAL_TEB InitialTeb; - PVOID ActivationContextStack = NULL; + PACTIVATION_CONTEXT_STACK ActivationContextStack = NULL; DPRINT("Creating Fiber\n"); /* Check for invalid flags */ @@ -210,9 +210,8 @@ /* Free the fiber */ RtlFreeHeap(GetProcessHeap(), 0, Fiber); - /* Free the activation context */ - DPRINT1("Leaking activation stack because nobody implemented free"); - //RtlFreeActivationContextStack(&ActivationContextStack); + /* Free the activation context stack */ + RtlFreeActivationContextStack(ActivationContextStack); /* Failure */ BaseSetLastNTError(Status); @@ -271,9 +270,8 @@ /* Get rid of FLS */ if (Fiber->FlsData) BaseRundownFls(Fiber->FlsData); - /* Get rid of the activation stack */ - DPRINT1("Leaking activation stack because nobody implemented free"); - //RtlFreeActivationContextStack(Fiber->ActivationContextStack); + /* Get rid of the activation context stack */ + RtlFreeActivationContextStack(Fiber->ActivationContextStack); /* Free the fiber data */ RtlFreeHeap(GetProcessHeap(), 0, lpFiber); Modified: trunk/reactos/dll/win32/kernel32/client/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/thread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/thread.c [iso-8859-1] Sun Mar 17 22:50:51 2013 @@ -171,7 +171,7 @@ ULONG Dummy; PTEB Teb; THREAD_BASIC_INFORMATION ThreadBasicInfo; - PVOID ActivationContextStack = NULL; + PACTIVATION_CONTEXT_STACK ActivationContextStack = NULL; ACTIVATION_CONTEXT_BASIC_INFORMATION ActCtxInfo; ULONG_PTR Cookie; ULONG ReturnLength; @@ -191,7 +191,7 @@ dwCreationFlags & STACK_SIZE_PARAM_IS_A_RESERVATION ? dwStackSize : 0, &InitialTeb); - if(!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { BaseSetLastNTError(Status); return NULL; @@ -260,7 +260,7 @@ Teb->ActivationContextStackPointer = ActivationContextStack; /* Query the Context */ - // WARNING!!! THIS IS USING THE WIN32 FLAG BECAUSE REACTOS CONTINUES TO BE A POS!!! /// + // WARNING!!! THIS IS USING THE WIN32 FLAG BECAUSE REACTOS CONTINUES TO BE A POS!!! /// Status = RtlQueryInformationActivationContext(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX, NULL, 0, @@ -274,6 +274,11 @@ ERROR_DBGBREAK("SXS: %s - Failing thread create because " "RtlQueryInformationActivationContext() failed with status %08lx\n", __FUNCTION__, Status); + + /* Free the activation context stack */ + // RtlFreeThreadActivationContextStack(); + RtlFreeActivationContextStack(Teb->ActivationContextStackPointer); + return NULL; } @@ -291,6 +296,11 @@ ERROR_DBGBREAK("SXS: %s - Failing thread create because " "RtlActivateActivationContextEx() failed with status %08lx\n", __FUNCTION__, Status); + + /* Free the activation context stack */ + // RtlFreeThreadActivationContextStack(); + RtlFreeActivationContextStack(Teb->ActivationContextStackPointer); + return NULL; } } @@ -299,7 +309,6 @@ /* Notify CSR */ if (!BaseRunningInServerProcess) { - /* Notify CSR */ Status = BasepNotifyCsrOfThread(hThread, &ClientId); ASSERT(NT_SUCCESS(Status)); }

1 0

[hbelusca] 58548: [NDK-RTL] The parameter of RtlAllocateActivationContextStack is of type PACTIVATION_CONTEXT_STACK*.
by hbelusca＠svn.reactos.org 17 Mar '13

17 Mar '13

Author: hbelusca Date: Sun Mar 17 22:31:40 2013 New Revision: 58548 URL: http://svn.reactos.org/svn/reactos?rev=58548&view=rev Log: [NDK-RTL] The parameter of RtlAllocateActivationContextStack is of type PACTIVATION_CONTEXT_STACK*. Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c trunk/reactos/include/asm/genincdata.c trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/lib/rtl/actctx.c Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Sun Mar 17 22:31:40 2013 @@ -508,7 +508,7 @@ /* Allocate an Activation Context Stack */ DPRINT("ActivationContextStack %p\n", NtCurrentTeb()->ActivationContextStackPointer); - Status = RtlAllocateActivationContextStack((PVOID*)&NtCurrentTeb()->ActivationContextStackPointer); + Status = RtlAllocateActivationContextStack(&NtCurrentTeb()->ActivationContextStackPointer); if (!NT_SUCCESS(Status)) { DPRINT1("Warning: Unable to allocate ActivationContextStack\n"); @@ -1709,7 +1709,7 @@ } /* Allocate an Activation Context Stack */ - Status = RtlAllocateActivationContextStack((PVOID *)&Teb->ActivationContextStackPointer); + Status = RtlAllocateActivationContextStack(&Teb->ActivationContextStackPointer); if (!NT_SUCCESS(Status)) return Status; // FIXME: Loader private heap is missing Modified: trunk/reactos/include/asm/genincdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/genincdata.c?r… ============================================================================== --- trunk/reactos/include/asm/genincdata.c [iso-8859-1] (original) +++ trunk/reactos/include/asm/genincdata.c [iso-8859-1] Sun Mar 17 22:31:40 2013 @@ -31,14 +31,14 @@ { /* 32 bit 64 bit */ /* this must be the first field */ PVOID Parameter; /* 0x00 0x00 */ - struct _EXCEPTION_REGISTRATION_RECORD * ExceptionList; /* 0x04 0x08 */ + PEXCEPTION_REGISTRATION_RECORD ExceptionList; /* 0x04 0x08 */ PVOID StackBase; /* 0x08 0x10 */ PVOID StackLimit; /* 0x0C 0x18 */ PVOID DeallocationStack; /* 0x10 0x20 */ CONTEXT Context; /* 0x14 0x28 */ ULONG GuaranteedStackBytes; /* 0x2E0 */ PVOID FlsData; /* 0x2E4 */ - PVOID ActivationContextStack; /* 0x2E8 */ + PVOID /* PACTIVATION_CONTEXT_STACK */ ActivationContextStack; /* 0x2E8 */ } FIBER, *PFIBER; typedef struct Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sun Mar 17 22:31:40 2013 @@ -3503,7 +3503,7 @@ NTSTATUS NTAPI RtlAllocateActivationContextStack( - _In_ PVOID *Context + _In_ PACTIVATION_CONTEXT_STACK *Stack ); NTSYSAPI Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=58548… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Sun Mar 17 22:31:40 2013 @@ -2429,7 +2429,7 @@ VOID NTAPI -RtlFreeActivationContextStack(PACTIVATION_CONTEXT_STACK Stack) +RtlFreeActivationContextStack(IN PACTIVATION_CONTEXT_STACK Stack) { PRTL_ACTIVATION_CONTEXT_STACK_FRAME ActiveFrame, PrevFrame; @@ -2775,15 +2775,15 @@ NTSTATUS NTAPI -RtlAllocateActivationContextStack(IN PVOID *Context) +RtlAllocateActivationContextStack(IN PACTIVATION_CONTEXT_STACK *Stack) { PACTIVATION_CONTEXT_STACK ContextStack; /* Check if it's already allocated */ - if (*Context) return STATUS_SUCCESS; + if (*Stack) return STATUS_SUCCESS; /* Allocate space for the context stack */ - ContextStack = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof (ACTIVATION_CONTEXT_STACK) ); + ContextStack = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ACTIVATION_CONTEXT_STACK)); if (!ContextStack) { return STATUS_NO_MEMORY; @@ -2796,7 +2796,7 @@ ContextStack->NextCookieSequenceNumber = 1; ContextStack->StackId = 1; //TODO: Timer-based - *Context = ContextStack; + *Stack = ContextStack; return STATUS_SUCCESS; }

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