Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 57817: [KERNEL32] - Simplify IntGetConsoleInput and IntReadConsole. [CONSRV] - Implement event waiting for reading console input buffer with CSR wait blocks. This replaces the event-base...
by hbelusca＠svn.reactos.org 08 Dec '12

08 Dec '12

Author: hbelusca Date: Sat Dec 8 00:39:24 2012 New Revision: 57817 URL: http://svn.reactos.org/svn/reactos?rev=57817&view=rev Log: [KERNEL32] - Simplify IntGetConsoleInput and IntReadConsole. [CONSRV] - Implement event waiting for reading console input buffer with CSR wait blocks. This replaces the event-based waiting which, after being moved from client-side (kernel32) to server-side (see r57721), made all consoles hang when one of them was waiting for new input. TODO: Dereference all the waits in Console->ReadWaitQueue. Modified: branches/ros-csrss/dll/win32/kernel32/client/console/readwrite.c branches/ros-csrss/include/reactos/subsys/win/conmsg.h branches/ros-csrss/win32ss/user/consrv/coninput.c branches/ros-csrss/win32ss/user/consrv/conio.h branches/ros-csrss/win32ss/user/consrv/console.c Modified: branches/ros-csrss/dll/win32/kernel32/client/console/readwrite.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… ============================================================================== --- branches/ros-csrss/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] Sat Dec 8 00:39:24 2012 @@ -57,6 +57,7 @@ ReadConsoleRequest->BufferSize, (PVOID*)&ReadConsoleRequest->Buffer); + /* Set up the data to send to the Console Server */ ReadConsoleRequest->ConsoleHandle = hConsoleInput; ReadConsoleRequest->Unicode = bUnicode; ReadConsoleRequest->NrCharactersToRead = (WORD)nNumberOfCharsToRead; @@ -71,31 +72,42 @@ ReadConsoleRequest->CtrlWakeupMask = pInputControl->dwCtrlWakeupMask; } + /* Call the server */ Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, CaptureBuffer, CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepReadConsole), sizeof(CSRSS_READ_CONSOLE)); - if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status)) + + /* Check for success */ + if (NT_SUCCESS(Status) || NT_SUCCESS(Status = ApiMessage.Status)) + { + memcpy(lpBuffer, + ReadConsoleRequest->Buffer, + ReadConsoleRequest->NrCharactersRead * CharSize); + + if (lpNumberOfCharsRead != NULL) + *lpNumberOfCharsRead = ReadConsoleRequest->NrCharactersRead; + + if (pInputControl && pInputControl->nLength == sizeof(CONSOLE_READCONSOLE_CONTROL)) + pInputControl->dwControlKeyState = ReadConsoleRequest->ControlKeyState; + } + else { DPRINT1("CSR returned error in ReadConsole\n"); - CsrFreeCaptureBuffer(CaptureBuffer); - BaseSetLastNTError(Status); - return FALSE; - } - - memcpy(lpBuffer, - ReadConsoleRequest->Buffer, - ReadConsoleRequest->NrCharactersRead * CharSize); - - if (lpNumberOfCharsRead != NULL) - *lpNumberOfCharsRead = ReadConsoleRequest->NrCharactersRead; - - if (pInputControl && pInputControl->nLength == sizeof(CONSOLE_READCONSOLE_CONTROL)) - pInputControl->dwControlKeyState = ReadConsoleRequest->ControlKeyState; + + if (lpNumberOfCharsRead != NULL) + *lpNumberOfCharsRead = 0; + + /* Error out */ + BaseSetLastNTError(Status /* ApiMessage.Status */); + } CsrFreeCaptureBuffer(CaptureBuffer); - return TRUE; + /* Return TRUE or FALSE */ + // return TRUE; + return (ReadConsoleRequest->NrCharactersRead > 0); + // return NT_SUCCESS(ApiMessage.Status); } @@ -142,10 +154,7 @@ GetConsoleInputRequest->ConsoleHandle = hConsoleInput; GetConsoleInputRequest->Unicode = bUnicode; GetConsoleInputRequest->bRead = bRead; - if (bRead == TRUE) - { - GetConsoleInputRequest->InputsRead = 0; - } + GetConsoleInputRequest->InputsRead = 0; GetConsoleInputRequest->Length = nLength; /* Call the server */ @@ -155,9 +164,30 @@ sizeof(CSRSS_GET_CONSOLE_INPUT)); DPRINT("Server returned: %x\n", ApiMessage.Status); -/** For Read only ** - if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status)) - { + /* Check for success */ + if (NT_SUCCESS(Status) || NT_SUCCESS(Status = ApiMessage.Status)) + { + /* Return the number of events read */ + DPRINT("Events read: %lx\n", GetConsoleInputRequest->InputsRead); + + if (lpNumberOfEventsRead != NULL) + *lpNumberOfEventsRead = GetConsoleInputRequest->InputsRead; + + /* Copy into the buffer */ + DPRINT("Copying to buffer\n"); + RtlCopyMemory(lpBuffer, + GetConsoleInputRequest->InputRecord, + sizeof(INPUT_RECORD) * GetConsoleInputRequest->InputsRead); + } + else + { + if (lpNumberOfEventsRead != NULL) + *lpNumberOfEventsRead = 0; + + /* Error out */ + BaseSetLastNTError(ApiMessage.Status); + +/********* // BaseSetLastNTError(Status); ???? if (GetConsoleInputRequest->InputsRead == 0) { @@ -170,75 +200,15 @@ /\* FIXME - fail gracefully in case we already read at least one record? *\/ // break; } - } -**/ - - /** - ** TODO: !! Simplify the function !! - **/ - if (bRead == TRUE) // ReadConsoleInput call. - { - /* Check for success */ - if (NT_SUCCESS(Status) || NT_SUCCESS(Status = ApiMessage.Status)) - { - /* Return the number of events read */ - DPRINT("Events read: %lx\n", GetConsoleInputRequest->InputsRead/*Length*/); - - if (lpNumberOfEventsRead != NULL) - *lpNumberOfEventsRead = GetConsoleInputRequest->InputsRead/*Length*/; - - /* Copy into the buffer */ - DPRINT("Copying to buffer\n"); - RtlCopyMemory(lpBuffer, - GetConsoleInputRequest->InputRecord, - sizeof(INPUT_RECORD) * GetConsoleInputRequest->InputsRead/*Length*/); - } - else - { - if (lpNumberOfEventsRead != NULL) - *lpNumberOfEventsRead = 0; - - /* Error out */ - BaseSetLastNTError(ApiMessage.Status); - } - - /* Release the capture buffer */ - CsrFreeCaptureBuffer(CaptureBuffer); - - return (GetConsoleInputRequest->InputsRead > 0); - } - else // PeekConsoleInput call. - { - /* Check for success */ - if (NT_SUCCESS(Status) || NT_SUCCESS(ApiMessage.Status)) - { - /* Return the number of events read */ - DPRINT("Events read: %lx\n", GetConsoleInputRequest->Length); - - if (lpNumberOfEventsRead != NULL) - *lpNumberOfEventsRead = GetConsoleInputRequest->Length; - - /* Copy into the buffer */ - DPRINT("Copying to buffer\n"); - RtlCopyMemory(lpBuffer, - GetConsoleInputRequest->InputRecord, - sizeof(INPUT_RECORD) * GetConsoleInputRequest->Length); - } - else - { - if (lpNumberOfEventsRead != NULL) - *lpNumberOfEventsRead = 0; - - /* Error out */ - BaseSetLastNTError(ApiMessage.Status); - } - - /* Release the capture buffer */ - CsrFreeCaptureBuffer(CaptureBuffer); - - /* Return TRUE or FALSE */ - return NT_SUCCESS(ApiMessage.Status); - } +*********/ + } + + /* Release the capture buffer */ + CsrFreeCaptureBuffer(CaptureBuffer); + + /* Return TRUE or FALSE */ + return (GetConsoleInputRequest->InputsRead > 0); + // return NT_SUCCESS(ApiMessage.Status); } Modified: branches/ros-csrss/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/win/conmsg.h [iso-8859-1] Sat Dec 8 00:39:24 2012 @@ -147,7 +147,6 @@ BOOL Unicode; WORD NrCharactersToRead; WORD NrCharactersRead; - HANDLE EventHandle; UNICODE_STRING ExeName; DWORD CtrlWakeupMask; @@ -326,14 +325,10 @@ BOOL Unicode; BOOL bRead; // TRUE --> Read ; FALSE --> Peek - DWORD Length; - INPUT_RECORD* InputRecord; - - /** For Read **/ ULONG InputsRead; - // INPUT_RECORD Input; - BOOL MoreEvents; - HANDLE Event; + + ULONG Length; + PINPUT_RECORD InputRecord; } CSRSS_GET_CONSOLE_INPUT, *PCSRSS_GET_CONSOLE_INPUT; typedef struct 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] Sat Dec 8 00:39:24 2012 @@ -25,6 +25,13 @@ MultiByteToWideChar((Console)->CodePage, 0, (sChar), 1, (dWChar), 1) +typedef struct _GET_INPUT_INFO +{ + PCONSOLE_PROCESS_DATA ProcessData; + PCSRSS_CONSOLE Console; +} GET_INPUT_INFO, *PGET_INPUT_INFO; + + /* PRIVATE FUNCTIONS **********************************************************/ static VOID FASTCALL @@ -79,7 +86,13 @@ return STATUS_INSUFFICIENT_RESOURCES; ConInRec->InputEvent = *InputEvent; InsertTailList(&Console->InputEvents, &ConInRec->ListEntry); + SetEvent(Console->ActiveEvent); + CsrNotifyWait(&Console->ReadWaitQueue, + WaitAny, + NULL, + NULL); + return STATUS_SUCCESS; } @@ -289,6 +302,322 @@ ConioProcessChar(Console, &er); } +static NTSTATUS +WaitBeforeReading(IN PGET_INPUT_INFO InputInfo, + IN PCSR_API_MESSAGE ApiMessage, + IN CSR_WAIT_FUNCTION WaitFunction OPTIONAL, + IN BOOL CreateWaitBlock OPTIONAL) +{ + if (CreateWaitBlock) + { + PGET_INPUT_INFO CapturedInputInfo; + + CapturedInputInfo = HeapAlloc(ConSrvHeap, 0, sizeof(GET_INPUT_INFO)); + if (!CapturedInputInfo) return STATUS_NO_MEMORY; + + memmove(CapturedInputInfo, InputInfo, sizeof(GET_INPUT_INFO)); + + if (!CsrCreateWait(&InputInfo->Console->ReadWaitQueue, + WaitFunction, + CsrGetClientThread(), + ApiMessage, + CapturedInputInfo, + NULL)) + { + HeapFree(ConSrvHeap, 0, CapturedInputInfo); + return STATUS_NO_MEMORY; + } + } + + /* Wait for input */ + return STATUS_PENDING; +} + +static NTSTATUS +ReadInputBuffer(IN PGET_INPUT_INFO InputInfo, + IN BOOL Wait, + IN PCSR_API_MESSAGE ApiMessage, + IN BOOL CreateWaitBlock OPTIONAL); + +// Wait function CSR_WAIT_FUNCTION +static BOOLEAN +ReadInputBufferThread(IN PLIST_ENTRY WaitList, + IN PCSR_THREAD WaitThread, + IN PCSR_API_MESSAGE WaitApiMessage, + IN PVOID WaitContext, + IN PVOID WaitArgument1, + IN PVOID WaitArgument2, + IN ULONG WaitFlags) +{ + NTSTATUS Status; + PCSRSS_GET_CONSOLE_INPUT GetConsoleInputRequest = &((PCONSOLE_API_MESSAGE)WaitApiMessage)->Data.GetConsoleInputRequest; + PGET_INPUT_INFO InputInfo = (PGET_INPUT_INFO)WaitContext; + + Status = ReadInputBuffer(InputInfo, + GetConsoleInputRequest->bRead, + WaitApiMessage, + FALSE); + + if (Status != STATUS_PENDING) + { + WaitApiMessage->Status = Status; + HeapFree(ConSrvHeap, 0, InputInfo); + } + + return (Status == STATUS_PENDING ? FALSE : TRUE); +} + +static NTSTATUS +ReadInputBuffer(IN PGET_INPUT_INFO InputInfo, + IN BOOL Wait, // TRUE --> Read ; FALSE --> Peek + IN PCSR_API_MESSAGE ApiMessage, + IN BOOL CreateWaitBlock OPTIONAL) +{ + if (IsListEmpty(&InputInfo->Console->InputEvents)) + { + if (Wait) + { + return WaitBeforeReading(InputInfo, + ApiMessage, + ReadInputBufferThread, + CreateWaitBlock); + } + else + { + /* No input available and we don't wait, so we return success */ + return STATUS_SUCCESS; + } + } + else + { + PCSRSS_GET_CONSOLE_INPUT GetConsoleInputRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetConsoleInputRequest; + PLIST_ENTRY CurrentInput; + ConsoleInput* Input; + ULONG Length = GetConsoleInputRequest->Length; + PINPUT_RECORD InputRecord = GetConsoleInputRequest->InputRecord; + + /* Only get input if there is any */ + CurrentInput = InputInfo->Console->InputEvents.Flink; + + while ( CurrentInput != &InputInfo->Console->InputEvents && + GetConsoleInputRequest->InputsRead < Length ) + { + Input = CONTAINING_RECORD(CurrentInput, ConsoleInput, ListEntry); + + GetConsoleInputRequest->InputsRead++; + *InputRecord = Input->InputEvent; + + if (GetConsoleInputRequest->Unicode == FALSE) + { + ConioInputEventToAnsi(InputInfo->Console, InputRecord); + } + + InputRecord++; + CurrentInput = CurrentInput->Flink; + + if (Wait) // TRUE --> Read, we remove inputs from the buffer ; FALSE --> Peek, we keep inputs. + { + RemoveEntryList(&Input->ListEntry); + HeapFree(ConSrvHeap, 0, Input); + } + } + + if (IsListEmpty(&InputInfo->Console->InputEvents)) + { + ResetEvent(InputInfo->Console->ActiveEvent); + } + + /* We read all the inputs available, we return success */ + return STATUS_SUCCESS; + } +} + +static NTSTATUS +ReadChars(IN PGET_INPUT_INFO InputInfo, + IN PCSR_API_MESSAGE ApiMessage, + IN BOOL CreateWaitBlock OPTIONAL); + +// Wait function CSR_WAIT_FUNCTION +static BOOLEAN +ReadCharsThread(IN PLIST_ENTRY WaitList, + IN PCSR_THREAD WaitThread, + IN PCSR_API_MESSAGE WaitApiMessage, + IN PVOID WaitContext, + IN PVOID WaitArgument1, + IN PVOID WaitArgument2, + IN ULONG WaitFlags) +{ + NTSTATUS Status; + PGET_INPUT_INFO InputInfo = (PGET_INPUT_INFO)WaitContext; + + Status = ReadChars(InputInfo, + WaitApiMessage, + FALSE); + + if (Status != STATUS_PENDING) + { + WaitApiMessage->Status = Status; + HeapFree(ConSrvHeap, 0, InputInfo); + } + + return (Status == STATUS_PENDING ? FALSE : TRUE); +} + +static NTSTATUS +ReadChars(IN PGET_INPUT_INFO InputInfo, + IN PCSR_API_MESSAGE ApiMessage, + IN BOOL CreateWaitBlock OPTIONAL) +{ + BOOL WaitForMoreToRead = TRUE; // TRUE : Wait if more to read ; FALSE : Don't wait. + + PCSRSS_READ_CONSOLE ReadConsoleRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.ReadConsoleRequest; + PLIST_ENTRY CurrentEntry; + ConsoleInput *Input; + PCHAR Buffer = (PCHAR)ReadConsoleRequest->Buffer; + PWCHAR UnicodeBuffer = (PWCHAR)Buffer; + ULONG nNumberOfCharsToRead = ReadConsoleRequest->NrCharactersToRead; + + /* We haven't read anything (yet) */ + + if (InputInfo->Console->Mode & ENABLE_LINE_INPUT) + { + if (InputInfo->Console->LineBuffer == NULL) + { + /* Starting a new line */ + InputInfo->Console->LineMaxSize = max(256, nNumberOfCharsToRead); + InputInfo->Console->LineBuffer = HeapAlloc(ConSrvHeap, 0, InputInfo->Console->LineMaxSize * sizeof(WCHAR)); + if (InputInfo->Console->LineBuffer == NULL) + { + return STATUS_NO_MEMORY; + } + InputInfo->Console->LineComplete = FALSE; + InputInfo->Console->LineUpPressed = FALSE; + InputInfo->Console->LineInsertToggle = 0; + InputInfo->Console->LineWakeupMask = ReadConsoleRequest->CtrlWakeupMask; + InputInfo->Console->LineSize = ReadConsoleRequest->NrCharactersRead; + InputInfo->Console->LinePos = InputInfo->Console->LineSize; + + /* + * Pre-filling the buffer is only allowed in the Unicode API, + * so we don't need to worry about ANSI <-> Unicode conversion. + */ + memcpy(InputInfo->Console->LineBuffer, Buffer, InputInfo->Console->LineSize * sizeof(WCHAR)); + if (InputInfo->Console->LineSize == InputInfo->Console->LineMaxSize) + { + InputInfo->Console->LineComplete = TRUE; + InputInfo->Console->LinePos = 0; + } + } + + /* If we don't have a complete line yet, process the pending input */ + while ( !InputInfo->Console->LineComplete && + !IsListEmpty(&InputInfo->Console->InputEvents) ) + { + /* Remove input event from queue */ + CurrentEntry = RemoveHeadList(&InputInfo->Console->InputEvents); + if (IsListEmpty(&InputInfo->Console->InputEvents)) + { + ResetEvent(InputInfo->Console->ActiveEvent); + } + Input = CONTAINING_RECORD(CurrentEntry, ConsoleInput, ListEntry); + + /* Only pay attention to key down */ + if (KEY_EVENT == Input->InputEvent.EventType + && Input->InputEvent.Event.KeyEvent.bKeyDown) + { + LineInputKeyDown(InputInfo->Console, &Input->InputEvent.Event.KeyEvent); + ReadConsoleRequest->ControlKeyState = Input->InputEvent.Event.KeyEvent.dwControlKeyState; + } + HeapFree(ConSrvHeap, 0, Input); + } + + /* Check if we have a complete line to read from */ + if (InputInfo->Console->LineComplete) + { + while ( ReadConsoleRequest->NrCharactersRead < nNumberOfCharsToRead && + InputInfo->Console->LinePos != InputInfo->Console->LineSize ) + { + WCHAR Char = InputInfo->Console->LineBuffer[InputInfo->Console->LinePos++]; + + if (ReadConsoleRequest->Unicode) + { + UnicodeBuffer[ReadConsoleRequest->NrCharactersRead] = Char; + } + else + { + ConsoleInputUnicodeCharToAnsiChar(InputInfo->Console, + &Buffer[ReadConsoleRequest->NrCharactersRead], + &Char); + } + + ReadConsoleRequest->NrCharactersRead++; + } + + if (InputInfo->Console->LinePos == InputInfo->Console->LineSize) + { + /* Entire line has been read */ + HeapFree(ConSrvHeap, 0, InputInfo->Console->LineBuffer); + InputInfo->Console->LineBuffer = NULL; + } + + WaitForMoreToRead = FALSE; + } + } + else + { + /* Character input */ + while ( ReadConsoleRequest->NrCharactersRead < nNumberOfCharsToRead && + !IsListEmpty(&InputInfo->Console->InputEvents) ) + { + /* Remove input event from queue */ + CurrentEntry = RemoveHeadList(&InputInfo->Console->InputEvents); + if (IsListEmpty(&InputInfo->Console->InputEvents)) + { + ResetEvent(InputInfo->Console->ActiveEvent); + } + Input = CONTAINING_RECORD(CurrentEntry, ConsoleInput, ListEntry); + + /* Only pay attention to valid ascii chars, on key down */ + if (KEY_EVENT == Input->InputEvent.EventType + && Input->InputEvent.Event.KeyEvent.bKeyDown + && Input->InputEvent.Event.KeyEvent.uChar.UnicodeChar != L'\0') + { + WCHAR Char = Input->InputEvent.Event.KeyEvent.uChar.UnicodeChar; + + if (ReadConsoleRequest->Unicode) + { + UnicodeBuffer[ReadConsoleRequest->NrCharactersRead] = Char; + } + else + { + ConsoleInputUnicodeCharToAnsiChar(InputInfo->Console, + &Buffer[ReadConsoleRequest->NrCharactersRead], + &Char); + } + + ReadConsoleRequest->NrCharactersRead++; + + /* Did read something */ + WaitForMoreToRead = FALSE; + } + HeapFree(ConSrvHeap, 0, Input); + } + } + + /* We haven't completed a read, so start a wait */ + if (WaitForMoreToRead == TRUE) + { + return WaitBeforeReading(InputInfo, + ApiMessage, + ReadCharsThread, + CreateWaitBlock); + } + else /* We read all what we wanted, we return success */ + { + return STATUS_SUCCESS; + } +} + /* PUBLIC APIS ****************************************************************/ @@ -298,16 +627,9 @@ PCSRSS_GET_CONSOLE_INPUT GetConsoleInputRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetConsoleInputRequest; PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process); PCSRSS_CONSOLE Console; - PLIST_ENTRY CurrentInput; - ConsoleInput* Input; - - DWORD Length; - PINPUT_RECORD InputRecord; + GET_INPUT_INFO InputInfo; DPRINT("SrvGetConsoleInput\n"); - - Status = ConioLockConsole(ProcessData, GetConsoleInputRequest->ConsoleHandle, &Console, GENERIC_READ); - if(!NT_SUCCESS(Status)) return Status; if (!CsrValidateMessageBuffer(ApiMessage, (PVOID*)&GetConsoleInputRequest->InputRecord, @@ -317,130 +639,23 @@ return STATUS_INVALID_PARAMETER; } - InputRecord = GetConsoleInputRequest->InputRecord; - Length = GetConsoleInputRequest->Length; - -/* - if (!Win32CsrValidateBuffer(ProcessData->Process, InputRecord, Length, sizeof(INPUT_RECORD))) - { - ConioUnlockConsole(Console); - return STATUS_ACCESS_VIOLATION; - } -*/ - - if (GetConsoleInputRequest->bRead) // Read input. - { - GetConsoleInputRequest->Event = ProcessData->ConsoleEvent; - - while (Length > 0) - { - BOOLEAN Done = FALSE; - - // GetConsoleInputRequest->Event = ProcessData->ConsoleEvent; - - /* only get input if there is any */ - CurrentInput = Console->InputEvents.Flink; - while (CurrentInput != &Console->InputEvents) - { - Input = CONTAINING_RECORD(CurrentInput, ConsoleInput, ListEntry); - CurrentInput = CurrentInput->Flink; - - if (Done) - { - GetConsoleInputRequest->MoreEvents = TRUE; - break; - } - - RemoveEntryList(&Input->ListEntry); - - if (!Done) - { - GetConsoleInputRequest->InputsRead++; - *InputRecord = Input->InputEvent; - /* HACK */ Length--; - - // GetConsoleInputRequest->Input = Input->InputEvent; - if (GetConsoleInputRequest->Unicode == FALSE) - { - // ConioInputEventToAnsi(Console, &GetConsoleInputRequest->Input); - ConioInputEventToAnsi(Console, InputRecord); - } - - InputRecord++; - Done = TRUE; - } - - HeapFree(ConSrvHeap, 0, Input); - } - - if (Done) - Status = STATUS_SUCCESS; - else - Status = STATUS_PENDING; - - if (IsListEmpty(&Console->InputEvents)) - { - ResetEvent(Console->ActiveEvent); - } - - if (Status == STATUS_PENDING) - { - if (GetConsoleInputRequest->InputsRead == 0) - { - Status = NtWaitForSingleObject(GetConsoleInputRequest->Event, FALSE, 0); - if (!NT_SUCCESS(Status)) - { - // BaseSetLastNTError(Status); - break; - } - } - else - { - /* nothing more to read (waiting for more input??), let's just bail */ - break; - } - } - else // Status != STATUS_PENDING ; == STATUS_SUCCESS - { - if (!GetConsoleInputRequest->MoreEvents) - { - /* nothing more to read, bail */ - break; - } - } - } - } - else // Peek input. - { - UINT NumInputs = 0; - - if (!IsListEmpty(&Console->InputEvents)) - { - CurrentInput = Console->InputEvents.Flink; - - while (CurrentInput != &Console->InputEvents && NumInputs < Length) - { - Input = CONTAINING_RECORD(CurrentInput, ConsoleInput, ListEntry); - - ++NumInputs; - *InputRecord = Input->InputEvent; - - if (GetConsoleInputRequest->Unicode == FALSE) - { - ConioInputEventToAnsi(Console, InputRecord); - } - - InputRecord++; - CurrentInput = CurrentInput->Flink; - } - } - - GetConsoleInputRequest->Length = NumInputs; - - Status = STATUS_SUCCESS; - } + Status = ConioLockConsole(ProcessData, GetConsoleInputRequest->ConsoleHandle, &Console, GENERIC_READ); + if(!NT_SUCCESS(Status)) return Status; + + GetConsoleInputRequest->InputsRead = 0; + + InputInfo.ProcessData = ProcessData; // ConsoleGetPerProcessData(CsrGetClientThread()->Process); + InputInfo.Console = Console; + + Status = ReadInputBuffer(&InputInfo, + GetConsoleInputRequest->bRead, + ApiMessage, + TRUE); ConioUnlockConsole(Console); + + if (Status == STATUS_PENDING) + *ReplyCode = CsrReplyPending; return Status; } @@ -471,14 +686,6 @@ InputRecord = WriteConsoleInputRequest->InputRecord; Length = WriteConsoleInputRequest->Length; -/* - if (!Win32CsrValidateBuffer(ProcessData->Process, InputRecord, Length, sizeof(INPUT_RECORD))) - { - ConioUnlockConsole(Console); - return STATUS_ACCESS_VIOLATION; - } -*/ - for (i = 0; i < Length && NT_SUCCESS(Status); i++) { if (!WriteConsoleInputRequest->Unicode && @@ -504,20 +711,11 @@ { NTSTATUS Status; PCSRSS_READ_CONSOLE ReadConsoleRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.ReadConsoleRequest; - PLIST_ENTRY CurrentEntry; - ConsoleInput *Input; - PCHAR Buffer; - PWCHAR UnicodeBuffer; - ULONG i = 0; - ULONG nNumberOfCharsToRead, CharSize; PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process); PCSRSS_CONSOLE Console; + GET_INPUT_INFO InputInfo; DPRINT("SrvReadConsole\n"); - - CharSize = (ReadConsoleRequest->Unicode ? sizeof(WCHAR) : sizeof(CHAR)); - - nNumberOfCharsToRead = ReadConsoleRequest->NrCharactersToRead; if (!CsrValidateMessageBuffer(ApiMessage, (PVOID*)&ReadConsoleRequest->Buffer, @@ -527,154 +725,28 @@ return STATUS_INVALID_PARAMETER; } - Buffer = (PCHAR)ReadConsoleRequest->Buffer; - UnicodeBuffer = (PWCHAR)Buffer; - -/* - if (!Win32CsrValidateBuffer(ProcessData->Process, Buffer, nNumberOfCharsToRead, CharSize)) - return STATUS_ACCESS_VIOLATION; -*/ - - Status = ConioLockConsole(ProcessData, ReadConsoleRequest->ConsoleHandle, - &Console, GENERIC_READ); + // if (Request->Data.ReadConsoleRequest.NrCharactersRead * sizeof(WCHAR) > nNumberOfCharsToRead * CharSize) + if (ReadConsoleRequest->NrCharactersRead > ReadConsoleRequest->NrCharactersToRead) + { + return STATUS_INVALID_PARAMETER; + } + + Status = ConioLockConsole(ProcessData, ReadConsoleRequest->ConsoleHandle, &Console, GENERIC_READ); if (!NT_SUCCESS(Status)) return Status; - Status = STATUS_SUCCESS; - ReadConsoleRequest->EventHandle = ProcessData->ConsoleEvent; - -/*** HACK: Enclosing do { ... } while (...) loop coming from kernel32 ***/ -do -{ + ReadConsoleRequest->NrCharactersRead = 0; + + InputInfo.ProcessData = ProcessData; // ConsoleGetPerProcessData(CsrGetClientThread()->Process); + InputInfo.Console = Console; + + Status = ReadChars(&InputInfo, + ApiMessage, + TRUE); + + ConioUnlockConsole(Console); + if (Status == STATUS_PENDING) - { - Status = NtWaitForSingleObject(ReadConsoleRequest->EventHandle, - FALSE, - 0); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Wait for console input failed!\n"); - break; - } - } -/******/ - - if (ReadConsoleRequest->NrCharactersRead * sizeof(WCHAR) > nNumberOfCharsToRead * CharSize) - { - // return STATUS_INVALID_PARAMETER; - Status = STATUS_INVALID_PARAMETER; - break; - // goto done; - } - - // ReadConsoleRequest->EventHandle = ProcessData->ConsoleEvent; - - Status = STATUS_PENDING; /* we haven't read anything (yet) */ - if (Console->Mode & ENABLE_LINE_INPUT) - { - if (Console->LineBuffer == NULL) - { - /* Starting a new line */ - Console->LineMaxSize = max(256, nNumberOfCharsToRead); - Console->LineBuffer = HeapAlloc(ConSrvHeap, 0, Console->LineMaxSize * sizeof(WCHAR)); - if (Console->LineBuffer == NULL) - { - Status = STATUS_NO_MEMORY; - goto done; - } - Console->LineComplete = FALSE; - Console->LineUpPressed = FALSE; - Console->LineInsertToggle = 0; - Console->LineWakeupMask = ReadConsoleRequest->CtrlWakeupMask; - Console->LineSize = ReadConsoleRequest->NrCharactersRead; - Console->LinePos = Console->LineSize; - /* pre-filling the buffer is only allowed in the Unicode API, - * so we don't need to worry about conversion */ - memcpy(Console->LineBuffer, Buffer, Console->LineSize * sizeof(WCHAR)); - if (Console->LineSize == Console->LineMaxSize) - { - Console->LineComplete = TRUE; - Console->LinePos = 0; - } - } - - /* If we don't have a complete line yet, process the pending input */ - while (!Console->LineComplete && !IsListEmpty(&Console->InputEvents)) - { - /* remove input event from queue */ - CurrentEntry = RemoveHeadList(&Console->InputEvents); - if (IsListEmpty(&Console->InputEvents)) - { - ResetEvent(Console->ActiveEvent); - } - Input = CONTAINING_RECORD(CurrentEntry, ConsoleInput, ListEntry); - - /* only pay attention to key down */ - if (KEY_EVENT == Input->InputEvent.EventType - && Input->InputEvent.Event.KeyEvent.bKeyDown) - { - LineInputKeyDown(Console, &Input->InputEvent.Event.KeyEvent); - ReadConsoleRequest->ControlKeyState = Input->InputEvent.Event.KeyEvent.dwControlKeyState; - } - HeapFree(ConSrvHeap, 0, Input); - } - - /* Check if we have a complete line to read from */ - if (Console->LineComplete) - { - while (i < nNumberOfCharsToRead && Console->LinePos != Console->LineSize) - { - WCHAR Char = Console->LineBuffer[Console->LinePos++]; - if (ReadConsoleRequest->Unicode) - UnicodeBuffer[i++] = Char; - else - ConsoleInputUnicodeCharToAnsiChar(Console, &Buffer[i++], &Char); - } - if (Console->LinePos == Console->LineSize) - { - /* Entire line has been read */ - HeapFree(ConSrvHeap, 0, Console->LineBuffer); - Console->LineBuffer = NULL; - } - Status = STATUS_SUCCESS; - } - } - else - { - /* Character input */ - while (i < nNumberOfCharsToRead && !IsListEmpty(&Console->InputEvents)) - { - /* remove input event from queue */ - CurrentEntry = RemoveHeadList(&Console->InputEvents); - if (IsListEmpty(&Console->InputEvents)) - { - ResetEvent(Console->ActiveEvent); - } - Input = CONTAINING_RECORD(CurrentEntry, ConsoleInput, ListEntry); - - /* only pay attention to valid ascii chars, on key down */ - if (KEY_EVENT == Input->InputEvent.EventType - && Input->InputEvent.Event.KeyEvent.bKeyDown - && Input->InputEvent.Event.KeyEvent.uChar.UnicodeChar != L'\0') - { - WCHAR Char = Input->InputEvent.Event.KeyEvent.uChar.UnicodeChar; - if (ReadConsoleRequest->Unicode) - UnicodeBuffer[i++] = Char; - else - ConsoleInputUnicodeCharToAnsiChar(Console, &Buffer[i++], &Char); - Status = STATUS_SUCCESS; /* did read something */ - } - HeapFree(ConSrvHeap, 0, Input); - } - } -done: - ReadConsoleRequest->NrCharactersRead = i; - -/******/ -} -while (Status == STATUS_PENDING); -/*** HACK: Enclosing do { ... } while (...) loop coming from kernel32 ***/ - - ConioUnlockConsole(Console); + *ReplyCode = CsrReplyPending; return Status; } 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] Sat Dec 8 00:39:24 2012 @@ -53,6 +53,9 @@ CRITICAL_SECTION Lock; struct tagCSRSS_CONSOLE *Prev, *Next; /* Next and Prev consoles in console wheel */ HANDLE ActiveEvent; + + LIST_ENTRY ReadWaitQueue; /* List head for the queue of read wait blocks */ + LIST_ENTRY InputEvents; /* List head for input event queue */ PWCHAR LineBuffer; /* current line being input, in line buffered mode */ WORD LineMaxSize; /* maximum size of line in characters (including CR+LF) */ 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] Sat Dec 8 00:39:24 2012 @@ -114,6 +114,7 @@ Console->Mode = ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT | ENABLE_PROCESSED_INPUT | ENABLE_MOUSE_INPUT; InitializeListHead(&Console->BufferList); Console->ActiveBuffer = NULL; + InitializeListHead(&Console->ReadWaitQueue); InitializeListHead(&Console->InputEvents); InitializeListHead(&Console->HistoryBuffers); Console->CodePage = GetOEMCP(); @@ -423,6 +424,8 @@ ConsoleInput *Event; DPRINT("ConioDeleteConsole\n"); + + /* TODO: Dereference all the waits in Console->ReadWaitQueue */ /* Drain input event queue */ while (Console->InputEvents.Flink != &Console->InputEvents)

1 0

[janderwald] 57816: [HIDUSB] - Retry retrieving report descriptor with old hid version - #CORE-6575 for details
by janderwald＠svn.reactos.org 07 Dec '12

07 Dec '12

Author: janderwald Date: Fri Dec 7 18:44:14 2012 New Revision: 57816 URL: http://svn.reactos.org/svn/reactos?rev=57816&view=rev Log: [HIDUSB] - Retry retrieving report descriptor with old hid version - #CORE-6575 for details Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidusb/hidusb.… ============================================================================== --- trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] Fri Dec 7 18:44:14 2012 @@ -651,10 +651,15 @@ { // // failed to get descriptor - // - DPRINT("[HIDUSB] failed to get report descriptor with %x\n", Status); - ASSERT(FALSE); - return Status; + // try with old hid version + // + BufferLength = HidDeviceExtension->HidDescriptor->DescriptorList[0].wReportLength; + Status = Hid_GetDescriptor(DeviceObject, URB_FUNCTION_GET_DESCRIPTOR_FROM_ENDPOINT, sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST), &Report, &BufferLength, HidDeviceExtension->HidDescriptor->DescriptorList[0].bReportType, 0, 0 /* FIXME*/); + if (!NT_SUCCESS(Status)) + { + DPRINT("[HIDUSB] failed to get report descriptor with %x\n", Status); + return Status; + } } // @@ -1298,7 +1303,7 @@ // // print status // - DPRINT("Status %x\n", Status); + DPRINT1("Status %x\n", Status); return Status; }

1 0

[tfaber] 57815: [SPIDER] - Only dissolve a stack of cards if they're of the same color - Allow easier recognition of suit in concealed cards - Patch by Marcel Leyendeckers, m dot leyendeckers at gm...
by tfaber＠svn.reactos.org 07 Dec '12

07 Dec '12

Author: tfaber Date: Fri Dec 7 18:00:30 2012 New Revision: 57815 URL: http://svn.reactos.org/svn/reactos?rev=57815&view=rev Log: [SPIDER] - Only dissolve a stack of cards if they're of the same color - Allow easier recognition of suit in concealed cards - Patch by Marcel Leyendeckers, m dot leyendeckers at gmx dot de CORE-6808 #resolve #comment Committed. Thanks! Modified: trunk/reactos/base/applications/games/spider/spigame.cpp Modified: trunk/reactos/base/applications/games/spider/spigame.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/spigame.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/spigame.cpp [iso-8859-1] Fri Dec 7 18:00:30 2012 @@ -249,7 +249,8 @@ int i, max = NUM_ONECOLOR_CARDS - dragcards.NumCards() - 1; /* Dragged cards have been checked to be in order, check stack cards */ - if (stackLookingGood(mystack, max)) + if (mystack[0].Suit() == dragcard.Suit() && + stackLookingGood(mystack, max)) { CardStack s = stackobj.GetCardStack(); CardStack f; @@ -279,8 +280,8 @@ { int i, pos; - /* Compute the value for yRowStackCardOffset based on the height of the card, so the card number isn't hidden on larger cards */ - yRowStackCardOffset = (int)(__cardheight / 6.7); + /* Compute the value for yRowStackCardOffset based on the height of the card, so the card number and suite isn't hidden on larger cards except Ace */ + yRowStackCardOffset = (int)(__cardheight / 6.4); pDeck = SpiderWnd.CreateRegion(0, true, 0, 0, -15, 0); pDeck->SetFaceDirection(CS_FACE_DOWN, 0);

1 0

[janderwald] 57814: [NDIS] - Fix several bugs in NdisOpenFile - Introduced in rev 5990 (5/9/2003)
by janderwald＠svn.reactos.org 07 Dec '12

07 Dec '12

Author: janderwald Date: Fri Dec 7 10:33:49 2012 New Revision: 57814 URL: http://svn.reactos.org/svn/reactos?rev=57814&view=rev Log: [NDIS] - Fix several bugs in NdisOpenFile - Introduced in rev 5990 (5/9/2003) Modified: trunk/reactos/drivers/network/ndis/ndis/misc.c Modified: trunk/reactos/drivers/network/ndis/ndis/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] Fri Dec 7 10:33:49 2012 @@ -273,7 +273,7 @@ InitializeObjectAttributes ( &ObjectAttributes, &FullFileName, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE|OBJ_KERNEL_HANDLE, NULL, NULL ); @@ -285,14 +285,14 @@ NULL, // PLARGE_INTEGER AllocationSize 0, // ULONG FileAttributes FILE_SHARE_READ, // ULONG ShareAccess - FILE_CREATE, // ULONG CreateDisposition + FILE_OPEN, // ULONG CreateDisposition FILE_SYNCHRONOUS_IO_NONALERT, // ULONG CreateOptions 0, // PVOID EaBuffer 0 ); // ULONG EaLength if ( !NT_SUCCESS(*Status) ) { - NDIS_DbgPrint(MIN_TRACE, ("ZwCreateFile failed (%x)\n", *Status)); + NDIS_DbgPrint(MIN_TRACE, ("ZwCreateFile failed (%x) Name %wZ\n", *Status, FileName)); *Status = NDIS_STATUS_FAILURE; }

1 0

[janderwald] 57813: [LIBUSB] - Set USBD status when a device is successfully configured and transferred length for vendor class requests - Add error msg when copying of interface descriptor fails
by janderwald＠svn.reactos.org 07 Dec '12

07 Dec '12

Author: janderwald Date: Fri Dec 7 09:33:05 2012 New Revision: 57813 URL: http://svn.reactos.org/svn/reactos?rev=57813&view=rev Log: [LIBUSB] - Set USBD status when a device is successfully configured and transferred length for vendor class requests - Add error msg when copying of interface descriptor fails Modified: trunk/reactos/lib/drivers/libusb/hub_controller.cpp trunk/reactos/lib/drivers/libusb/usb_device.cpp Modified: trunk/reactos/lib/drivers/libusb/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/hub_con… ============================================================================== --- trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] Fri Dec 7 09:33:05 2012 @@ -1044,6 +1044,7 @@ { PUSBDEVICE UsbDevice; PUSBD_INTERFACE_INFORMATION InterfaceInfo; + NTSTATUS Status; // // is the request for the Root Hub @@ -1110,7 +1111,13 @@ // // select configuration // - return UsbDevice->SelectConfiguration(Urb->UrbSelectConfiguration.ConfigurationDescriptor, &Urb->UrbSelectConfiguration.Interface, &Urb->UrbSelectConfiguration.ConfigurationHandle); + Status = UsbDevice->SelectConfiguration(Urb->UrbSelectConfiguration.ConfigurationDescriptor, &Urb->UrbSelectConfiguration.Interface, &Urb->UrbSelectConfiguration.ConfigurationHandle); + if (NT_SUCCESS(Status)) + { + // successfully configured device + Urb->UrbSelectConfiguration.Hdr.Status = USBD_STATUS_SUCCESS; + } + return Status; } } @@ -1843,7 +1850,7 @@ PUSBDEVICE UsbDevice; USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; - DPRINT("CHubController::HandleVendorDevice Request %x\n", Urb->UrbControlVendorClassRequest.Request); + //DPRINT("CHubController::HandleVendorDevice Request %x\n", Urb->UrbControlVendorClassRequest.Request); // // sanity check @@ -1891,6 +1898,12 @@ // issue request // Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, Urb->UrbControlVendorClassRequest.TransferBufferLength, Urb->UrbControlVendorClassRequest.TransferBuffer); + if (NT_SUCCESS(Status)) + { + // success + Urb->UrbControlVendorClassRequest.Hdr.Status = USBD_STATUS_SUCCESS; + Irp->IoStatus.Information = Urb->UrbControlVendorClassRequest.TransferBufferLength; + } return Status; } Modified: trunk/reactos/lib/drivers/libusb/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/usb_dev… ============================================================================== --- trunk/reactos/lib/drivers/libusb/usb_device.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/usb_device.cpp [iso-8859-1] Fri Dec 7 09:33:05 2012 @@ -1123,6 +1123,7 @@ if (!NT_SUCCESS(Status)) { // failed + DPRINT1("[LIBUSB] Failed to copy interface descriptor Index %lu InterfaceDescriptor %p InterfaceInfo %p\n", ConfigurationIndex, InterfaceDescriptor, InterfaceInfo); break; }

1 0

[janderwald] 57812: [LIBUSB] - Fix build
by janderwald＠svn.reactos.org 07 Dec '12

07 Dec '12

Author: janderwald Date: Fri Dec 7 08:21:35 2012 New Revision: 57812 URL: http://svn.reactos.org/svn/reactos?rev=57812&view=rev Log: [LIBUSB] - Fix build Modified: trunk/reactos/lib/drivers/libusb/hub_controller.cpp Modified: trunk/reactos/lib/drivers/libusb/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/hub_con… ============================================================================== --- trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] Fri Dec 7 08:21:35 2012 @@ -1842,7 +1842,6 @@ NTSTATUS Status = STATUS_NOT_IMPLEMENTED; PUSBDEVICE UsbDevice; USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; - PVOID TransferBuffer = NULL; DPRINT("CHubController::HandleVendorDevice Request %x\n", Urb->UrbControlVendorClassRequest.Request);

1 0

[janderwald] 57811: [LIBUSB] - Set status and transferred byte length - Display error msg when request fails - Remove asserts - CORE-6574 CORE-6676
by janderwald＠svn.reactos.org 07 Dec '12

07 Dec '12

Author: janderwald Date: Fri Dec 7 08:18:45 2012 New Revision: 57811 URL: http://svn.reactos.org/svn/reactos?rev=57811&view=rev Log: [LIBUSB] - Set status and transferred byte length - Display error msg when request fails - Remove asserts - CORE-6574 CORE-6676 Modified: trunk/reactos/lib/drivers/libusb/hub_controller.cpp Modified: trunk/reactos/lib/drivers/libusb/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/hub_con… ============================================================================== --- trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] Fri Dec 7 08:18:45 2012 @@ -740,6 +740,12 @@ Status = STATUS_SUCCESS; break; } + case IRP_MN_SURPRISE_REMOVAL: + { + DPRINT("[USBLIB] HandlePnp IRP_MN_SURPRISE_REMOVAL\n"); + Status = STATUS_SUCCESS; + break; + } default: { // @@ -1479,7 +1485,10 @@ // submit setup packet // Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, Urb->UrbControlDescriptorRequest.TransferBufferLength, Urb->UrbControlDescriptorRequest.TransferBuffer); - ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + { + DPRINT1("[USBLIB] HandleGetDescriptorFromInterface failed with %x\n", Status); + } // // done @@ -1499,7 +1508,7 @@ PUSBDEVICE UsbDevice; ULONG Length, BufferLength; - DPRINT("[USBLIB] HandleGetDescriptor\n"); + DPRINT("[USBLIB] HandleGetDescriptor Type %x\n", Urb->UrbControlDescriptorRequest.DescriptorType); // // check descriptor type @@ -1520,6 +1529,8 @@ // copy root hub device descriptor // RtlCopyMemory((PUCHAR)Urb->UrbControlDescriptorRequest.TransferBuffer, &m_DeviceDescriptor, sizeof(USB_DEVICE_DESCRIPTOR)); + Irp->IoStatus.Information = sizeof(USB_DEVICE_DESCRIPTOR); + Urb->UrbControlDescriptorRequest.Hdr.Status = USBD_STATUS_SUCCESS; Status = STATUS_SUCCESS; } else @@ -1546,6 +1557,8 @@ // retrieve device descriptor from device // UsbDevice->GetDeviceDescriptor((PUSB_DEVICE_DESCRIPTOR)Urb->UrbControlDescriptorRequest.TransferBuffer); + Irp->IoStatus.Information = sizeof(USB_DEVICE_DESCRIPTOR); + Urb->UrbControlDescriptorRequest.Hdr.Status = USBD_STATUS_SUCCESS; Status = STATUS_SUCCESS; } break; @@ -1678,7 +1691,9 @@ // // store result size // + Irp->IoStatus.Information = Length; Urb->UrbControlDescriptorRequest.TransferBufferLength = Length; + Urb->UrbControlDescriptorRequest.Hdr.Status = USBD_STATUS_SUCCESS; Status = STATUS_SUCCESS; } break; @@ -1827,6 +1842,7 @@ NTSTATUS Status = STATUS_NOT_IMPLEMENTED; PUSBDEVICE UsbDevice; USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; + PVOID TransferBuffer = NULL; DPRINT("CHubController::HandleVendorDevice Request %x\n", Urb->UrbControlVendorClassRequest.Request); @@ -1876,7 +1892,6 @@ // issue request // Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, Urb->UrbControlVendorClassRequest.TransferBufferLength, Urb->UrbControlVendorClassRequest.TransferBuffer); - PC_ASSERT(NT_SUCCESS(Status)); return Status; }

1 0

[hbelusca] 57810: [CSRSRV/BASESRV/CONSRV/WINSRV] - Add a useful CHECK_API_MSG_SIZE macro to check whether a server message structure can hold in a CSR_API_MESSAGE structure. These checks are requir...
by hbelusca＠svn.reactos.org 06 Dec '12

06 Dec '12

Author: hbelusca Date: Thu Dec 6 23:43:31 2012 New Revision: 57810 URL: http://svn.reactos.org/svn/reactos?rev=57810&view=rev Log: [CSRSRV/BASESRV/CONSRV/WINSRV] - Add a useful CHECK_API_MSG_SIZE macro to check whether a server message structure can hold in a CSR_API_MESSAGE structure. These checks are required because LPC will use the generic CSR_API_MESSAGE structure for communicating all the different servers' messages, and thus we avoid possible buffer overflows with this method. - Effectively use this macro for all the server message structures. - Remove a hack regarding the maximum data size we can pass through the CSR LPC port. - Remove the now unused CSRSS_HEADER_SIZE symbol. Modified: branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h branches/ros-csrss/include/reactos/subsys/win/basemsg.h branches/ros-csrss/include/reactos/subsys/win/conmsg.h branches/ros-csrss/include/reactos/subsys/win/winmsg.h branches/ros-csrss/subsystems/win32/csrsrv/api.c Modified: branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h [iso-8859-1] Thu Dec 6 23:43:31 2012 @@ -64,6 +64,10 @@ HANDLE ProcessId; } CSR_CONNECTION_INFO, *PCSR_CONNECTION_INFO; +// We must have a size at most equal to the maximum acceptable LPC data size. +C_ASSERT(sizeof(CSR_CONNECTION_INFO) <= LPC_MAX_DATA_LENGTH); + + typedef struct _CSR_IDENTIFY_ALTERTABLE_THREAD { CLIENT_ID Cid; @@ -97,8 +101,6 @@ ULONG_PTR PointerOffsetsArray[ANYSIZE_ARRAY]; } CSR_CAPTURE_BUFFER, *PCSR_CAPTURE_BUFFER; -/* Keep in sync with definition below. */ -// #define CSRSS_HEADER_SIZE (sizeof(PORT_MESSAGE) + sizeof(ULONG) + sizeof(NTSTATUS)) typedef struct _CSR_API_MESSAGE { @@ -117,11 +119,38 @@ CSR_CLIENT_CONNECT CsrClientConnect; CSR_SET_PRIORITY_CLASS SetPriorityClass; CSR_IDENTIFY_ALTERTABLE_THREAD IdentifyAlertableThread; + + // + // This padding is used to make the CSR_API_MESSAGE structure + // large enough to hold full other API_MESSAGE-type structures + // used by other servers. These latter structures's sizes must + // be checked against the size of CSR_API_MESSAGE by using the + // CHECK_API_MSG_SIZE macro defined below. + // + // This is required because LPC will use this generic structure + // for communicating all the different servers' messages, and + // thus we avoid possible buffer overflows with this method. + // The problems there are, that we have to manually adjust the + // size of the padding to hope that all the servers' messaging + // structures will hold in it, or, that we have to be careful + // to not define too big messaging structures for the servers. + // + // Finally, the overall message structure size must be at most + // equal to the maximum acceptable LPC message size. + // + ULONG_PTR Padding[35]; } Data; }; }; } CSR_API_MESSAGE, *PCSR_API_MESSAGE; +// We must have a size at most equal to the maximum acceptable LPC message size. +C_ASSERT(sizeof(CSR_API_MESSAGE) <= LPC_MAX_MESSAGE_LENGTH); + +// Macro to check that the total size of servers' message structures +// are at most equal to the size of the CSR_API_MESSAGE structure. +#define CHECK_API_MSG_SIZE(type) C_ASSERT(sizeof(type) <= sizeof(CSR_API_MESSAGE)) + #endif // _CSRMSG_H /* EOF */ Modified: branches/ros-csrss/include/reactos/subsys/win/basemsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/win/basemsg.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/win/basemsg.h [iso-8859-1] Thu Dec 6 23:43:31 2012 @@ -203,6 +203,9 @@ } Data; } BASE_API_MESSAGE, *PBASE_API_MESSAGE; +// Check that a BASE_API_MESSAGE can hold in a CSR_API_MESSAGE. +CHECK_API_MSG_SIZE(BASE_API_MESSAGE); + #endif // _BASEMSG_H /* EOF */ Modified: branches/ros-csrss/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/win/conmsg.h [iso-8859-1] Thu Dec 6 23:43:31 2012 @@ -618,6 +618,9 @@ } Data; } CONSOLE_API_MESSAGE, *PCONSOLE_API_MESSAGE; +// Check that a CONSOLE_API_MESSAGE can hold in a CSR_API_MESSAGE. +CHECK_API_MSG_SIZE(CONSOLE_API_MESSAGE); + #endif // _CONMSG_H /* EOF */ Modified: branches/ros-csrss/include/reactos/subsys/win/winmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/win/winmsg.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/win/winmsg.h [iso-8859-1] Thu Dec 6 23:43:31 2012 @@ -83,6 +83,9 @@ } Data; } USER_API_MESSAGE, *PUSER_API_MESSAGE; +// Check that a USER_API_MESSAGE can hold in a CSR_API_MESSAGE. +CHECK_API_MSG_SIZE(USER_API_MESSAGE); + #endif // _WINMSG_H /* EOF */ Modified: branches/ros-csrss/subsystems/win32/csrsrv/api.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/api.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/api.c [iso-8859-1] Thu Dec 6 23:43:31 2012 @@ -919,13 +919,13 @@ &CsrApiPortName, 0, NULL, - NULL /* FIXME*/); + NULL /* FIXME: Use the Security Descriptor */); /* Create the Port Object */ Status = NtCreatePort(&CsrApiPort, &ObjectAttributes, - LPC_MAX_DATA_LENGTH, // HACK: the real value is: sizeof(CSR_CONNECTION_INFO), - LPC_MAX_MESSAGE_LENGTH, // HACK: the real value is: sizeof(CSR_API_MESSAGE), + sizeof(CSR_CONNECTION_INFO), + sizeof(CSR_API_MESSAGE), 16 * PAGE_SIZE); if (NT_SUCCESS(Status)) {

1 0

[hbelusca] 57809: [NTDLL/CSRSRV] Re-fix part of the capture-buffer offset setting, based on what I understood from all my previous investigations. It reverts a little part of r57673 but fixing some...
by hbelusca＠svn.reactos.org 06 Dec '12

06 Dec '12

Author: hbelusca Date: Thu Dec 6 22:24:27 2012 New Revision: 57809 URL: http://svn.reactos.org/svn/reactos?rev=57809&view=rev Log: [NTDLL/CSRSRV] Re-fix part of the capture-buffer offset setting, based on what I understood from all my previous investigations. It reverts a little part of r57673 but fixing some existing bugs there. Modified: branches/ros-csrss/dll/ntdll/csr/connect.c branches/ros-csrss/subsystems/win32/csrsrv/api.c Modified: branches/ros-csrss/dll/ntdll/csr/connect.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/csr/connect… ============================================================================== --- branches/ros-csrss/dll/ntdll/csr/connect.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/ntdll/csr/connect.c [iso-8859-1] Thu Dec 6 22:24:27 2012 @@ -51,7 +51,8 @@ IN ULONG DataLength) { NTSTATUS Status; - ULONG i; + ULONG PointerCount; + PULONG_PTR OffsetPointer; /* Fill out the Port Message Header. */ ApiMessage->Header.u2.ZeroInit = 0; @@ -90,13 +91,16 @@ * a server pointer, and each pointer to these message pointers * is converted into an offset. */ - for (i = 0 ; i < CaptureBuffer->PointerCount ; ++i) + PointerCount = CaptureBuffer->PointerCount; + OffsetPointer = CaptureBuffer->PointerOffsetsArray; + while (PointerCount--) { - if (CaptureBuffer->PointerOffsetsArray[i] != 0) + if (*OffsetPointer != 0) { - *(PULONG_PTR)CaptureBuffer->PointerOffsetsArray[i] += CsrPortMemoryDelta; - CaptureBuffer->PointerOffsetsArray[i] -= (ULONG_PTR)ApiMessage; + *(PULONG_PTR)*OffsetPointer += CsrPortMemoryDelta; + *OffsetPointer -= (ULONG_PTR)ApiMessage; } + ++OffsetPointer; } } @@ -120,13 +124,16 @@ * pointers, and convert back these message server pointers * into client pointers. */ - for (i = 0 ; i < CaptureBuffer->PointerCount ; ++i) + PointerCount = CaptureBuffer->PointerCount; + OffsetPointer = CaptureBuffer->PointerOffsetsArray; + while (PointerCount--) { - if (CaptureBuffer->PointerOffsetsArray[i] != 0) + if (*OffsetPointer != 0) { - CaptureBuffer->PointerOffsetsArray[i] += (ULONG_PTR)ApiMessage; - *(PULONG_PTR)CaptureBuffer->PointerOffsetsArray[i] -= CsrPortMemoryDelta; + *OffsetPointer += (ULONG_PTR)ApiMessage; + *(PULONG_PTR)*OffsetPointer -= CsrPortMemoryDelta; } + ++OffsetPointer; } } Modified: branches/ros-csrss/subsystems/win32/csrsrv/api.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/api.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/api.c [iso-8859-1] Thu Dec 6 22:24:27 2012 @@ -1125,7 +1125,9 @@ PCSR_CAPTURE_BUFFER LocalCaptureBuffer = NULL, RemoteCaptureBuffer = NULL; SIZE_T BufferDistance; ULONG Length = 0; - ULONG i; + ULONG PointerCount; + PULONG_PTR OffsetPointer; + ULONG_PTR CurrentOffset; /* Use SEH to make sure this is valid */ _SEH2_TRY @@ -1182,19 +1184,23 @@ * All the pointer offsets correspond to pointers which point * to the remote data buffer instead of the local one. */ - for (i = 0 ; i < RemoteCaptureBuffer->PointerCount ; ++i) - { - if (RemoteCaptureBuffer->PointerOffsetsArray[i] != 0) - { - /* Temporarily transform the offset into a pointer */ - RemoteCaptureBuffer->PointerOffsetsArray[i] += (ULONG_PTR)ApiMessage; + PointerCount = RemoteCaptureBuffer->PointerCount; + OffsetPointer = RemoteCaptureBuffer->PointerOffsetsArray; + while (PointerCount--) + { + CurrentOffset = *OffsetPointer; + + if (CurrentOffset != 0) + { + /* Get the pointer corresponding to the offset */ + CurrentOffset += (ULONG_PTR)ApiMessage; /* Validate the bounds of the current pointed pointer */ - if ((*(PULONG_PTR)RemoteCaptureBuffer->PointerOffsetsArray[i] >= CsrThread->Process->ClientViewBase) && - (*(PULONG_PTR)RemoteCaptureBuffer->PointerOffsetsArray[i] < CsrThread->Process->ClientViewBounds)) + if ((*(PULONG_PTR)CurrentOffset >= CsrThread->Process->ClientViewBase) && + (*(PULONG_PTR)CurrentOffset < CsrThread->Process->ClientViewBounds)) { /* Modify the pointed pointer to take into account its new position */ - *(PULONG_PTR)RemoteCaptureBuffer->PointerOffsetsArray[i] += BufferDistance; + *(PULONG_PTR)CurrentOffset += BufferDistance; } else { @@ -1203,10 +1209,9 @@ DbgBreakPoint(); ApiMessage->Status = STATUS_INVALID_PARAMETER; } - - /* Transform back into an offset */ - RemoteCaptureBuffer->PointerOffsetsArray[i] -= (ULONG_PTR)ApiMessage; - } + } + + ++OffsetPointer; } /* Check if we got success */ @@ -1249,7 +1254,9 @@ { PCSR_CAPTURE_BUFFER RemoteCaptureBuffer, LocalCaptureBuffer; SIZE_T BufferDistance; - ULONG i; + ULONG PointerCount; + PULONG_PTR OffsetPointer; + ULONG_PTR CurrentOffset; /* Get the remote capture buffer */ RemoteCaptureBuffer = ApiMessage->CsrCaptureData; @@ -1272,19 +1279,22 @@ * to the local data buffer instead of the remote one (revert * the logic of CsrCaptureArguments). */ - for (i = 0 ; i < RemoteCaptureBuffer->PointerCount ; ++i) - { - if (RemoteCaptureBuffer->PointerOffsetsArray[i] != 0) - { - /* Temporarily transform the offset into a pointer */ - RemoteCaptureBuffer->PointerOffsetsArray[i] += (ULONG_PTR)ApiMessage; + PointerCount = RemoteCaptureBuffer->PointerCount; + OffsetPointer = RemoteCaptureBuffer->PointerOffsetsArray; + while (PointerCount--) + { + CurrentOffset = *OffsetPointer; + + if (CurrentOffset != 0) + { + /* Get the pointer corresponding to the offset */ + CurrentOffset += (ULONG_PTR)ApiMessage; /* Modify the pointed pointer to take into account its new position */ - *(PULONG_PTR)RemoteCaptureBuffer->PointerOffsetsArray[i] -= BufferDistance; - - /* Transform back into an offset */ - RemoteCaptureBuffer->PointerOffsetsArray[i] -= (ULONG_PTR)ApiMessage; - } + *(PULONG_PTR)CurrentOffset -= BufferDistance; + } + + ++OffsetPointer; } /* Copy the data back */ @@ -1328,7 +1338,8 @@ { PCSR_CAPTURE_BUFFER CaptureBuffer = ApiMessage->CsrCaptureData; SIZE_T BufferDistance = (ULONG_PTR)Buffer - (ULONG_PTR)ApiMessage; - ULONG i; + ULONG PointerCount; + PULONG_PTR OffsetPointer; /* * Check whether we have a valid buffer pointer, elements @@ -1364,16 +1375,20 @@ if ((CaptureBuffer->Size - (ULONG_PTR)*Buffer + (ULONG_PTR)CaptureBuffer) >= (ElementCount * ElementSize)) { - for (i = 0 ; i < CaptureBuffer->PointerCount ; ++i) + /* Perform the validation test */ + PointerCount = CaptureBuffer->PointerCount; + OffsetPointer = CaptureBuffer->PointerOffsetsArray; + while (PointerCount--) { /* * The pointer offset must be equal to the delta between * the addresses of the buffer and of the API message. */ - if (CaptureBuffer->PointerOffsetsArray[i] == BufferDistance) + if (*OffsetPointer == BufferDistance) { return TRUE; } + ++OffsetPointer; } } }

1 0

[hbelusca] 57808: [NTDLL] Correct some comments.
by hbelusca＠svn.reactos.org 06 Dec '12

06 Dec '12

Author: hbelusca Date: Thu Dec 6 21:52:09 2012 New Revision: 57808 URL: http://svn.reactos.org/svn/reactos?rev=57808&view=rev Log: [NTDLL] Correct some comments. Modified: branches/ros-csrss/dll/ntdll/csr/capture.c Modified: branches/ros-csrss/dll/ntdll/csr/capture.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/csr/capture… ============================================================================== --- branches/ros-csrss/dll/ntdll/csr/capture.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/ntdll/csr/capture.c [iso-8859-1] Thu Dec 6 21:52:09 2012 @@ -93,7 +93,7 @@ /* Validate size */ if (BufferSize >= MAXLONG) return NULL; - /* Add the size of the header and for each pointer to the pointers */ + /* Add the size of the header and for each offset to the pointers */ BufferSize += FIELD_OFFSET(CSR_CAPTURE_BUFFER, PointerOffsetsArray) + (ArgumentCount * sizeof(ULONG_PTR)); /* Align it to a 4-byte boundary */ @@ -107,7 +107,7 @@ CaptureBuffer->Size = BufferSize; CaptureBuffer->PointerCount = 0; - /* Initialize all the pointers */ + /* Initialize all the offsets */ RtlZeroMemory(CaptureBuffer->PointerOffsetsArray, ArgumentCount * sizeof(ULONG_PTR));

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