Ros-diffs February 2012

ros-diffs@reactos.org

22 participants
577 discussions

[ion] 55697: [CSRSRV]: No longer accept connections from unknown processes.

by ion＠svn.reactos.org

Author: ion Date: Sun Feb 19 04:18:33 2012 New Revision: 55697 URL: http://svn.reactos.org/svn/reactos?rev=55697&view=rev Log: [CSRSRV]: No longer accept connections from unknown processes. Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] Sun Feb 19 04:18:33 2012 @@ -743,11 +743,10 @@ NTSTATUS Status; HANDLE ServerPort = NULL, ServerThread = NULL; PCSR_PROCESS ProcessData = NULL; - REMOTE_PORT_VIEW LpcRead; + REMOTE_PORT_VIEW RemotePortView; CLIENT_ID ClientId; BOOLEAN AllowConnection = FALSE; PCSR_CONNECTION_INFO ConnectInfo; - LpcRead.Length = sizeof(LpcRead); ServerPort = NULL; DPRINT("CSR: %s: Handling: %p\n", __FUNCTION__, Request); @@ -756,19 +755,17 @@ /* Save the process ID */ RtlZeroMemory(ConnectInfo, sizeof(CSR_CONNECTION_INFO)); - ConnectInfo->ProcessId = NtCurrentTeb()->ClientId.UniqueProcess; ProcessData = CsrGetProcessData(Request->ClientId.UniqueProcess); - if (ProcessData == NULL) - { - ProcessData = CsrCreateProcessData(Request->ClientId.UniqueProcess); - if (ProcessData == NULL) - { - DPRINT1("Unable to allocate or find data for process 0x%x\n", - Request->ClientId.UniqueProcess); - } - } - + if (!ProcessData) + { + DPRINT1("CSRSRV: Unknown process: %lx. Will be rejecting connection\n", + Request->ClientId.UniqueProcess); + } + + /* Acquire the Process Lock */ + CsrAcquireProcessLock(); + if ((ProcessData) && (ProcessData != CsrRootProcess)) { /* Attach the Shared Section */ @@ -788,28 +785,59 @@ AllowConnection = TRUE; } + /* Release the lock */ + CsrReleaseProcessLock(); + + /* Setup the Port View Structure */ + RemotePortView.Length = sizeof(REMOTE_PORT_VIEW); + RemotePortView.ViewSize = 0; + RemotePortView.ViewBase = NULL; + + /* Save the Process ID */ + ConnectInfo->ProcessId = NtCurrentTeb()->ClientId.UniqueProcess; + Status = NtAcceptConnectPort(&ServerPort, - NULL, + AllowConnection ? UlongToPtr(ProcessData->SequenceNumber) : 0, Request, AllowConnection, - 0, - & LpcRead); + NULL, + &RemotePortView); if (!NT_SUCCESS(Status)) { - DPRINT1("CSR: NtAcceptConnectPort() failed\n"); - return Status; - } - - ProcessData->ClientViewBase = (ULONG_PTR)LpcRead.ViewBase; - ProcessData->ClientViewBounds = LpcRead.ViewSize; - ProcessData->ClientPort = ServerPort; - - if (AllowConnection) Status = NtCompleteConnectPort(ServerPort); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CSR: NtCompleteConnectPort() failed\n"); - return Status; - } + DPRINT1("CSRSS: NtAcceptConnectPort - failed. Status == %X\n", Status); + } + else if (AllowConnection) + { + if (CsrDebug & 2) + { + DPRINT1("CSRSS: ClientId: %lx.%lx has ClientView: Base=%p, Size=%lx\n", + Request->ClientId.UniqueProcess, + Request->ClientId.UniqueThread, + RemotePortView.ViewBase, + RemotePortView.ViewSize); + } + + /* Set some Port Data in the Process */ + ProcessData->ClientPort = ServerPort; + ProcessData->ClientViewBase = (ULONG_PTR)RemotePortView.ViewBase; + ProcessData->ClientViewBounds = (ULONG_PTR)((ULONG_PTR)RemotePortView.ViewBase + + (ULONG_PTR)RemotePortView.ViewSize); + + /* Complete the connection */ + Status = NtCompleteConnectPort(ServerPort); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CSRSS: NtCompleteConnectPort - failed. Status == %X\n", Status); + } + } + else + { + DPRINT1("CSRSS: Rejecting Connection Request from ClientId: %lx.%lx\n", + Request->ClientId.UniqueProcess, + Request->ClientId.UniqueThread); + } + + if (!NT_SUCCESS(Status)) return Status; Status = RtlCreateUserThread(NtCurrentProcess(), NULL,

12 years, 7 months

[ion] 55696: [CSRSRV/WIN32CSR]: Remove all the code that was setting new values for DataLength/TotalLength in the LPC header. I have no idea why the code was doing this. I suspect it's partly to bl...

by ion＠svn.reactos.org

Author: ion Date: Sun Feb 19 03:51:36 2012 New Revision: 55696 URL: http://svn.reactos.org/svn/reactos?rev=55696&view=rev Log: [CSRSRV/WIN32CSR]: Remove all the code that was setting new values for DataLength/TotalLength in the LPC header. I have no idea why the code was doing this. I suspect it's partly to blame for why changing the structures of the CSRSS messages caused bizarre failures. Perhaps this behavior was needed with the original winsock-based LPC implementation that I rewrote back in 2006? Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c trunk/reactos/subsystems/win32/csrss/csrsrv/api/user.c trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c trunk/reactos/subsystems/win32/csrss/win32csr/conoutput.c trunk/reactos/subsystems/win32/csrss/win32csr/console.c trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c trunk/reactos/subsystems/win32/csrss/win32csr/handle.c Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] Sun Feb 19 03:51:36 2012 @@ -141,9 +141,6 @@ { PCSR_PROCESS NewProcessData; - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - NewProcessData = CsrCreateProcessData(Request->Data.CreateProcessRequest.NewProcessId); if (NewProcessData == NULL) { @@ -177,9 +174,6 @@ NTSTATUS Status; PCSR_PROCESS CsrProcess; - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - CurrentThread = NtCurrentTeb()->CsrClientThread; CsrProcess = CurrentThread->Process; @@ -230,8 +224,6 @@ { PLIST_ENTRY NextEntry; PCSR_THREAD Thread; - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); LOCK; @@ -254,16 +246,12 @@ CSR_API(CsrConnectProcess) { - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); return(STATUS_SUCCESS); } CSR_API(CsrGetShutdownParameters) { - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Request->Data.GetShutdownParametersRequest.Level = ProcessData->ShutdownLevel; Request->Data.GetShutdownParametersRequest.Flags = ProcessData->ShutdownFlags; @@ -273,8 +261,6 @@ CSR_API(CsrSetShutdownParameters) { - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); ProcessData->ShutdownLevel = Request->Data.SetShutdownParametersRequest.Level; ProcessData->ShutdownFlags = Request->Data.SetShutdownParametersRequest.Flags; Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/user.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/user.c [iso-8859-1] Sun Feb 19 03:51:36 2012 @@ -26,9 +26,6 @@ CSR_API(CsrRegisterServicesProcess) { - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - if (ServicesProcessIdValid == TRUE) { /* Only accept a single call */ Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] Sun Feb 19 03:51:36 2012 @@ -92,8 +92,6 @@ } } DPRINT1("CSR: Unknown request type 0x%x\n", Request->Type); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Request->Status = STATUS_INVALID_SYSTEM_SERVICE; } Modified: trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c [iso-8859-1] Sun Feb 19 03:51:36 2012 @@ -38,8 +38,6 @@ CharSize = (Request->Data.ReadConsoleRequest.Unicode ? sizeof(WCHAR) : sizeof(CHAR)); nNumberOfCharsToRead = Request->Data.ReadConsoleRequest.NrCharactersToRead; - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Buffer = (PCHAR)Request->Data.ReadConsoleRequest.Buffer; UnicodeBuffer = (PWCHAR)Buffer; @@ -432,8 +430,6 @@ DPRINT("CsrReadInputEvent\n"); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Request->Data.ReadInputRequest.Event = ProcessData->ConsoleEvent; Status = ConioLockConsole(ProcessData, Request->Data.ReadInputRequest.ConsoleHandle, &Console, GENERIC_READ); @@ -494,8 +490,6 @@ DPRINT("CsrFlushInputBuffer\n"); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Status = ConioLockConsole(ProcessData, Request->Data.FlushInputBufferRequest.ConsoleInput, &Console, @@ -528,9 +522,6 @@ DWORD NumEvents; DPRINT("CsrGetNumberOfConsoleInputEvents\n"); - - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = Request->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE); Status = ConioLockConsole(ProcessData, Request->Data.GetNumInputEventsRequest.ConsoleHandle, &Console, GENERIC_READ); if (! NT_SUCCESS(Status)) @@ -567,9 +558,6 @@ DPRINT("CsrPeekConsoleInput\n"); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Status = ConioLockConsole(ProcessData, Request->Data.GetNumInputEventsRequest.ConsoleHandle, &Console, GENERIC_READ); if(! NT_SUCCESS(Status)) { @@ -625,9 +613,6 @@ DPRINT("CsrWriteConsoleInput\n"); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Status = ConioLockConsole(ProcessData, Request->Data.WriteConsoleInputRequest.ConsoleHandle, &Console, GENERIC_WRITE); if (! NT_SUCCESS(Status)) { Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conoutput.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conoutput.c [iso-8859-1] Sun Feb 19 03:51:36 2012 @@ -371,13 +371,8 @@ + (Request->Data.WriteConsoleRequest.NrCharactersToWrite * CharSize)) { DPRINT1("Invalid request size\n"); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); return STATUS_INVALID_PARAMETER; } - - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Status = ConioLockScreenBuffer(ProcessData, Request->Data.WriteConsoleRequest.ConsoleHandle, &Buff, GENERIC_WRITE); if (! NT_SUCCESS(Status)) @@ -481,9 +476,6 @@ PCONSOLE_SCREEN_BUFFER_INFO pInfo; DPRINT("CsrGetScreenBufferInfo\n"); - - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Status = ConioLockScreenBuffer(ProcessData, Request->Data.ScreenBufferInfoRequest.ConsoleHandle, &Buff, GENERIC_READ); if (! NT_SUCCESS(Status)) @@ -518,9 +510,6 @@ DPRINT("CsrSetCursor\n"); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Status = ConioLockScreenBuffer(ProcessData, Request->Data.SetCursorRequest.ConsoleHandle, &Buff, GENERIC_WRITE); if (! NT_SUCCESS(Status)) { @@ -600,8 +589,6 @@ + (Request->Data.WriteConsoleOutputCharRequest.Length * CharSize)) { DPRINT1("Invalid request size\n"); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); return STATUS_INVALID_PARAMETER; } @@ -609,8 +596,6 @@ Request->Data.WriteConsoleOutputCharRequest.ConsoleHandle, &Buff, GENERIC_WRITE); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); if (NT_SUCCESS(Status)) { Console = Buff->Header.Console; @@ -695,9 +680,6 @@ DPRINT("CsrFillOutputChar\n"); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Status = ConioLockScreenBuffer(ProcessData, Request->Data.FillOutputRequest.ConsoleHandle, &Buff, GENERIC_WRITE); if (! NT_SUCCESS(Status)) { @@ -759,13 +741,8 @@ + Request->Data.WriteConsoleOutputAttribRequest.Length * sizeof(WORD)) { DPRINT1("Invalid request size\n"); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); return STATUS_INVALID_PARAMETER; } - - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Status = ConioLockScreenBuffer(ProcessData, Request->Data.WriteConsoleOutputAttribRequest.ConsoleHandle, @@ -824,8 +801,6 @@ DPRINT("CsrFillOutputAttrib\n"); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Status = ConioLockScreenBuffer(ProcessData, Request->Data.FillOutputAttribRequest.ConsoleHandle, &Buff, GENERIC_WRITE); if (! NT_SUCCESS(Status)) { @@ -882,9 +857,6 @@ DPRINT("CsrGetCursorInfo\n"); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Status = ConioLockScreenBuffer(ProcessData, Request->Data.GetCursorInfoRequest.ConsoleHandle, &Buff, GENERIC_READ); if (! NT_SUCCESS(Status)) { @@ -906,9 +878,6 @@ NTSTATUS Status; DPRINT("CsrSetCursorInfo\n"); - - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Status = ConioLockScreenBuffer(ProcessData, Request->Data.SetCursorInfoRequest.ConsoleHandle, &Buff, GENERIC_WRITE); if (! NT_SUCCESS(Status)) @@ -990,9 +959,6 @@ { return Status; } - - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Buff = HeapAlloc(Win32CsrApiHeap, HEAP_ZERO_MEMORY, sizeof(CSRSS_SCREEN_BUFFER)); @@ -1050,9 +1016,6 @@ DPRINT("CsrSetScreenBuffer\n"); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Status = ConioLockScreenBuffer(ProcessData, Request->Data.SetScreenBufferRequest.OutputHandle, &Buff, GENERIC_WRITE); if (! NT_SUCCESS(Status)) { @@ -1097,8 +1060,6 @@ DPRINT("CsrWriteConsoleOutput\n"); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Status = ConioLockScreenBuffer(ProcessData, Request->Data.WriteConsoleOutputRequest.ConsoleHandle, &Buff, @@ -1193,8 +1154,6 @@ DestinationOrigin = Request->Data.ScrollConsoleScreenBufferRequest.DestinationOrigin; Fill = Request->Data.ScrollConsoleScreenBufferRequest.Fill; - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Status = ConioLockScreenBuffer(ProcessData, ConsoleHandle, &Buff, GENERIC_WRITE); if (! NT_SUCCESS(Status)) { @@ -1277,8 +1236,6 @@ DPRINT("CsrReadConsoleOutputChar\n"); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = Request->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE); ReadBuffer = Request->Data.ReadConsoleOutputCharRequest.String; CharSize = (Request->Data.ReadConsoleOutputCharRequest.Unicode ? sizeof(WCHAR) : sizeof(CHAR)); @@ -1328,8 +1285,8 @@ Request->Data.ReadConsoleOutputCharRequest.CharsRead = (DWORD)((ULONG_PTR)ReadBuffer - (ULONG_PTR)Request->Data.ReadConsoleOutputCharRequest.String) / CharSize; if (Request->Data.ReadConsoleOutputCharRequest.CharsRead * CharSize + CSR_API_MESSAGE_HEADER_SIZE(CSRSS_READ_CONSOLE_OUTPUT_CHAR) > sizeof(CSR_API_MESSAGE)) { - Request->Header.u1.s1.TotalLength = Request->Data.ReadConsoleOutputCharRequest.CharsRead * CharSize + CSR_API_MESSAGE_HEADER_SIZE(CSRSS_READ_CONSOLE_OUTPUT_CHAR); - Request->Header.u1.s1.DataLength = Request->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE); + DPRINT1("Length won't fit in message\n"); + return STATUS_BUFFER_TOO_SMALL; } return STATUS_SUCCESS; @@ -1347,8 +1304,6 @@ DPRINT("CsrReadConsoleOutputAttrib\n"); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = Request->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE); ReadBuffer = Request->Data.ReadConsoleOutputAttribRequest.Attribute; Status = ConioLockScreenBuffer(ProcessData, Request->Data.ReadConsoleOutputAttribRequest.ConsoleHandle, &Buff, GENERIC_READ); @@ -1390,8 +1345,8 @@ + Request->Data.ReadConsoleOutputAttribRequest.NumAttrsToRead * sizeof(WORD); if (CurrentLength > sizeof(CSR_API_MESSAGE)) { - Request->Header.u1.s1.TotalLength = CurrentLength; - Request->Header.u1.s1.DataLength = CurrentLength - sizeof(PORT_MESSAGE); + DPRINT1("Length won't fit in message\n"); + return STATUS_BUFFER_TOO_SMALL; } return STATUS_SUCCESS; @@ -1415,9 +1370,6 @@ DPRINT("CsrReadConsoleOutput\n"); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Status = ConioLockScreenBuffer(ProcessData, Request->Data.ReadConsoleOutputRequest.ConsoleHandle, &Buff, GENERIC_READ); if (! NT_SUCCESS(Status)) { @@ -1489,9 +1441,6 @@ PCSRSS_CONSOLE Console; PCSRSS_SCREEN_BUFFER Buff; - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Status = ConioLockScreenBuffer(ProcessData, Request->Data.SetScreenBufferSize.OutputHandle, &Buff, GENERIC_WRITE); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/subsystems/win32/csrss/win32csr/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/console.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/console.c [iso-8859-1] Sun Feb 19 03:51:36 2012 @@ -180,9 +180,6 @@ DPRINT("CsrAllocConsole\n"); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - RtlEnterCriticalSection(&ProcessData->HandleTableLock); if (ProcessData->Console) { @@ -316,9 +313,6 @@ CSR_API(CsrFreeConsole) { - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - return Win32CsrReleaseConsole(ProcessData, 0, 0); } @@ -395,8 +389,6 @@ DPRINT("CsrSetConsoleMode\n"); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Status = Win32CsrLockObject(ProcessData, Request->Data.SetConsoleModeRequest.ConsoleHandle, (Object_t **) &Console, GENERIC_WRITE, 0); @@ -432,8 +424,6 @@ DPRINT("CsrGetConsoleMode\n"); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Status = Win32CsrLockObject(ProcessData, Request->Data.GetConsoleModeRequest.ConsoleHandle, (Object_t **) &Console, GENERIC_READ, 0); if (! NT_SUCCESS(Status)) @@ -467,8 +457,6 @@ DPRINT("CsrSetTitle\n"); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); if (!Win32CsrValidateBuffer(ProcessData, Request->Data.SetTitleRequest.Title, Request->Data.SetTitleRequest.Length, 1)) { @@ -513,8 +501,6 @@ DPRINT("CsrGetTitle\n"); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); if (!Win32CsrValidateBuffer(ProcessData, Request->Data.GetTitleRequest.Title, Request->Data.GetTitleRequest.Length, 1)) @@ -585,9 +571,6 @@ DPRINT("CsrHardwareStateProperty\n"); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Status = ConioLockConsole(ProcessData, Request->Data.ConsoleHardwareStateRequest.ConsoleHandle, &Console, @@ -626,9 +609,6 @@ DPRINT("CsrGetConsoleWindow\n"); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) { @@ -647,9 +627,6 @@ NTSTATUS Status; DPRINT("CsrSetConsoleIcon\n"); - - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) @@ -677,8 +654,6 @@ return Status; } - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Request->Data.GetConsoleCodePage.CodePage = Console->CodePage; ConioUnlockConsole(Console); return STATUS_SUCCESS; @@ -696,9 +671,6 @@ { return Status; } - - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); if (IsValidCodePage(Request->Data.SetConsoleCodePage.CodePage)) { @@ -724,8 +696,6 @@ return Status; } - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Request->Data.GetConsoleOutputCodePage.CodePage = Console->OutputCodePage; ConioUnlockConsole(Console); return STATUS_SUCCESS; @@ -743,9 +713,6 @@ { return Status; } - - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); if (IsValidCodePage(Request->Data.SetConsoleOutputCodePage.CodePage)) { @@ -769,9 +736,6 @@ DPRINT("CsrGetProcessList\n"); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Buffer = Request->Data.GetProcessListRequest.ProcessId; if (!Win32CsrValidateBuffer(ProcessData, Buffer, Request->Data.GetProcessListRequest.nMaxIds, sizeof(DWORD))) return STATUS_ACCESS_VIOLATION; @@ -806,9 +770,6 @@ PLIST_ENTRY current_entry; DWORD Group; NTSTATUS Status; - - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Status = ConioConsoleFromProcessData(ProcessData, &Console); if (! NT_SUCCESS(Status)) @@ -840,9 +801,6 @@ NTSTATUS Status; PCSRSS_CONSOLE Console; - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Status = ConioConsoleFromProcessData(ProcessData, &Console); if (NT_SUCCESS(Status)) { Modified: trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c [iso-8859-1] Sun Feb 19 03:51:36 2012 @@ -213,9 +213,6 @@ DPRINT("CsrCreateDesktop\n"); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - if (!BgInitialized) { BgInitialized = TRUE; @@ -265,9 +262,6 @@ PRIVATE_NOTIFY_DESKTOP nmh; DPRINT("CsrShowDesktop\n"); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - nmh.hdr.hwndFrom = Request->Data.ShowDesktopRequest.DesktopWindow; nmh.hdr.idFrom = 0; nmh.hdr.code = PM_SHOW_DESKTOP; @@ -291,9 +285,6 @@ PRIVATE_NOTIFY_DESKTOP nmh; DPRINT("CsrHideDesktop\n"); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - nmh.hdr.hwndFrom = Request->Data.ShowDesktopRequest.DesktopWindow; nmh.hdr.idFrom = 0; nmh.hdr.code = PM_HIDE_DESKTOP; Modified: trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c [iso-8859-1] Sun Feb 19 03:51:36 2012 @@ -18,9 +18,6 @@ CSR_API(CsrRegisterLogonProcess) { - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - if (Request->Data.RegisterLogonProcessRequest.Register) { if (0 != LogonProcess) @@ -46,10 +43,6 @@ CSR_API(CsrSetLogonNotifyWindow) { DWORD WindowCreator; - - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - - sizeof(PORT_MESSAGE); if (0 == GetWindowThreadProcessId(Request->Data.SetLogonNotifyWindowRequest.LogonNotifyWindow, &WindowCreator)) @@ -922,10 +915,6 @@ CSR_API(CsrExitReactos) { - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - - sizeof(PORT_MESSAGE); - if (0 == (Request->Data.ExitReactosRequest.Flags & EWX_INTERNAL_FLAG)) { return UserExitReactos((DWORD_PTR) Request->Header.ClientId.UniqueProcess, Modified: trunk/reactos/subsystems/win32/csrss/win32csr/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/handle.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/handle.c [iso-8859-1] Sun Feb 19 03:51:36 2012 @@ -263,9 +263,6 @@ { NTSTATUS Status = STATUS_SUCCESS; - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Request->Data.GetInputHandleRequest.Handle = INVALID_HANDLE_VALUE; RtlEnterCriticalSection(&ProcessData->HandleTableLock); @@ -309,9 +306,6 @@ CSR_API(CsrCloseHandle) { - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - return Win32CsrReleaseObject(ProcessData, Request->Data.CloseHandleRequest.Handle); } @@ -319,9 +313,6 @@ { ULONG_PTR Index; NTSTATUS Status = STATUS_SUCCESS; - - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Index = (ULONG_PTR)Request->Data.VerifyHandleRequest.Handle >> 2; RtlEnterCriticalSection(&ProcessData->HandleTableLock); @@ -341,9 +332,6 @@ ULONG_PTR Index; PCSRSS_HANDLE Entry; DWORD DesiredAccess; - - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Index = (ULONG_PTR)Request->Data.DuplicateHandleRequest.Handle >> 2; RtlEnterCriticalSection(&ProcessData->HandleTableLock); @@ -390,9 +378,6 @@ CSR_API(CsrGetInputWaitHandle) { - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Request->Data.GetConsoleInputWaitHandle.InputWaitHandle = ProcessData->ConsoleEvent; return STATUS_SUCCESS; }

12 years, 7 months

[janderwald] 55695: [USBSTOR] - Queue inquriry & format capacity command with an irp

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Feb 19 02:47:35 2012 New Revision: 55695 URL: http://svn.reactos.org/svn/reactos?rev=55695&view=rev Log: [USBSTOR] - Queue inquriry & format capacity command with an irp Modified: trunk/reactos/drivers/usb/usbstor/error.c trunk/reactos/drivers/usb/usbstor/pdo.c trunk/reactos/drivers/usb/usbstor/scsi.c trunk/reactos/drivers/usb/usbstor/usbstor.h Modified: trunk/reactos/drivers/usb/usbstor/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/error.… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/error.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/error.c [iso-8859-1] Sun Feb 19 02:47:35 2012 @@ -116,6 +116,14 @@ PCDB pCDB; // + // sanity checks + // + ASSERT(Context); + ASSERT(Context->PDODeviceExtension); + ASSERT(Context->PDODeviceExtension->Self); + ASSERT(Context->Irp); + + // // first perform a mass storage reset step 1 in 5.3.4 USB Mass Storage Bulk Only Specification // Status = USBSTOR_ResetDevice(Context->FDODeviceExtension->LowerDeviceObject, Context->FDODeviceExtension); @@ -134,91 +142,51 @@ } } - if (Context->Irp) - { - // - // get next stack location - // - Stack = IoGetCurrentIrpStackLocation(Context->Irp); - - // - // get request block - // - Request = (PSCSI_REQUEST_BLOCK)Stack->Parameters.Others.Argument1; - ASSERT(Request); - - // - // obtain request type - // - pCDB = (PCDB)Request->Cdb; - ASSERT(pCDB); - - // - // Cleanup the IRP context - if (pCDB->AsByte[0] == SCSIOP_READ_CAPACITY) - { - FreeItem(Context->TransferData); - } - - if (Status != STATUS_SUCCESS) - { - // - // Complete the master IRP - // - Context->Irp->IoStatus.Status = Status; - Context->Irp->IoStatus.Information = 0; - USBSTOR_QueueTerminateRequest(Context->PDODeviceExtension->LowerDeviceObject, Context->Irp); - IoCompleteRequest(Context->Irp, IO_NO_INCREMENT); - - // - // Start the next request - // - USBSTOR_QueueNextRequest(Context->PDODeviceExtension->LowerDeviceObject); - - // - // srb handling finished - // - Context->FDODeviceExtension->SrbErrorHandlingActive = FALSE; - - // - // clear timer srb - // - Context->FDODeviceExtension->LastTimerActiveSrb = NULL; - } + // + // get next stack location + // + Stack = IoGetCurrentIrpStackLocation(Context->Irp); + + // + // get request block + // + Request = (PSCSI_REQUEST_BLOCK)Stack->Parameters.Others.Argument1; + ASSERT(Request); + + // + // obtain request type + // + pCDB = (PCDB)Request->Cdb; + ASSERT(pCDB); + + if (Status != STATUS_SUCCESS) + { + // + // Complete the master IRP + // + Context->Irp->IoStatus.Status = Status; + Context->Irp->IoStatus.Information = 0; + USBSTOR_QueueTerminateRequest(Context->PDODeviceExtension->LowerDeviceObject, Context->Irp); + IoCompleteRequest(Context->Irp, IO_NO_INCREMENT); + + // + // Start the next request + // + USBSTOR_QueueNextRequest(Context->PDODeviceExtension->LowerDeviceObject); + + // + // srb handling finished + // + Context->FDODeviceExtension->SrbErrorHandlingActive = FALSE; + + // + // clear timer srb + // + Context->FDODeviceExtension->LastTimerActiveSrb = NULL; } else { - if (Status != STATUS_SUCCESS) - { - // - // Signal the context event - // - ASSERT(Context->Event); - KeSetEvent(Context->Event, 0, FALSE); - - // - // srb handling finished - // - Context->FDODeviceExtension->SrbErrorHandlingActive = FALSE; - - // - // clear timer srb - // - Context->FDODeviceExtension->LastTimerActiveSrb = NULL; - } - } - - if (NT_SUCCESS(Status)) - { - // - // FIXME: inquiry cmd / read format capacity are send w/o irp - // - ASSERT(Context); - ASSERT(Context->PDODeviceExtension); - ASSERT(Context->PDODeviceExtension->Self); - ASSERT(Context->Irp); - - DPRINT1("Retrying Count %x %p\n", Context->RetryCount, Context->PDODeviceExtension->Self); + DPRINT1("Retrying Count %lu %p\n", Context->RetryCount, Context->PDODeviceExtension->Self); // // re-schedule request Modified: trunk/reactos/drivers/usb/usbstor/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/pdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/pdo.c [iso-8859-1] Sun Feb 19 02:47:35 2012 @@ -957,6 +957,299 @@ } NTSTATUS +NTAPI +USBSTOR_CompletionRoutine( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Ctx) +{ + PKEVENT Event = (PKEVENT)Ctx; + + // + // signal event + // + KeSetEvent(Event, 0, FALSE); + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS +USBSTOR_AllocateIrp( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG DataTransferLength, + IN UCHAR OpCode, + IN PKEVENT Event, + OUT PSCSI_REQUEST_BLOCK *OutRequest, + OUT PIRP *OutIrp) +{ + PIRP Irp; + PIO_STACK_LOCATION IoStack; + PSCSI_REQUEST_BLOCK Request; + PCDB pCDB; + + // + // allocate irp + // + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + if (!Irp) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // get next stack location + // + IoStack = IoGetNextIrpStackLocation(Irp); + + // + // create scsi block + // + Request = (PSCSI_REQUEST_BLOCK)ExAllocatePool(NonPagedPool, sizeof(SCSI_REQUEST_BLOCK)); + if (!Request) + { + // + // no memory + // + IoFreeIrp(Irp); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // init request + // + RtlZeroMemory(Request, sizeof(SCSI_REQUEST_BLOCK)); + + // + // allocate data transfer block + // + Request->DataBuffer = ExAllocatePool(NonPagedPool, DataTransferLength); + if (!Request) + { + // + // no memory + // + IoFreeIrp(Irp); + ExFreePool(Request); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // allocate MDL + // + Irp->MdlAddress = IoAllocateMdl(Request->DataBuffer, DataTransferLength, FALSE, FALSE, NULL); + if (!Irp->MdlAddress) + { + // + // no memory + // + IoFreeIrp(Irp); + ExFreePool(Request); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // non paged pool + // + MmBuildMdlForNonPagedPool(Irp->MdlAddress); + + // + // init scsi block + // + Request->DataTransferLength = DataTransferLength; + Request->Function = SRB_FUNCTION_EXECUTE_SCSI; + Request->SrbFlags = SRB_FLAGS_DATA_IN; + + RtlZeroMemory(Request->DataBuffer, DataTransferLength); + + + // + // get SCSI command data block + // + pCDB = (PCDB)Request->Cdb; + + // + // set op code + // + pCDB->AsByte[0] = OpCode; + + // + // store result + // + IoStack->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; + IoStack->Parameters.Others.Argument1 = Request; + IoStack->DeviceObject = DeviceObject; + + // + // init event + // + KeInitializeEvent(Event, NotificationEvent, FALSE); + + // + // lets setup a completion routine + // + IoSetCompletionRoutine(Irp, USBSTOR_CompletionRoutine, (PVOID)Event, TRUE, TRUE, TRUE); + + // + // output result + // + *OutIrp = Irp; + *OutRequest = Request; + return STATUS_SUCCESS; +} + +NTSTATUS +USBSTOR_SendIrp( + IN PDEVICE_OBJECT PDODeviceObject, + IN ULONG DataTransferLength, + IN UCHAR OpCode, + OUT PVOID *OutData) +{ + NTSTATUS Status; + PIRP Irp; + KEVENT Event; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PSCSI_REQUEST_BLOCK Request; + + // + // let's allocate an irp + // + Status = USBSTOR_AllocateIrp(PDODeviceObject, sizeof(UFI_INQUIRY_RESPONSE), SCSIOP_INQUIRY, &Event, &Request, &Irp); + if (!NT_SUCCESS(Status)) + { + // + // failed + // + DPRINT1("[USBSTOR] Failed to build irp\n"); + return Status; + } + + // + // get device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)PDODeviceObject->DeviceExtension; + + // + // send irp + // + ASSERT(Irp); + ASSERT(PDODeviceExtension->LowerDeviceObject); + Status = IoCallDriver(PDODeviceExtension->Self, Irp); + + if (Status == STATUS_PENDING) + { + // + // wait for completion + // + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = Irp->IoStatus.Status; + } + + if (NT_SUCCESS(Status)) + { + // + // store result + // + *OutData = Request->DataBuffer; + } + + // + // free resources + // + ExFreePool(Request); + IoFreeIrp(Irp); + return Status; +} + +NTSTATUS +USBSTOR_SendInquiryIrp( + IN PDEVICE_OBJECT PDODeviceObject) +{ + NTSTATUS Status; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PUFI_INQUIRY_RESPONSE Response; + + // + // get device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)PDODeviceObject->DeviceExtension; + + // + // send request + // + Status = USBSTOR_SendIrp(PDODeviceObject, sizeof(UFI_INQUIRY_RESPONSE), SCSIOP_INQUIRY, (PVOID*)&Response); + if (!NT_SUCCESS(Status)) + { + // + // command failed + // + DPRINT1("USBSTOR_SendInquiryIrp Failed with %x\n", Status); + return Status; + } + + DPRINT1("Response %p\n", Response); + DPRINT1("DeviceType %x\n", Response->DeviceType); + DPRINT1("RMB %x\n", Response->RMB); + DPRINT1("Version %x\n", Response->Version); + DPRINT1("Format %x\n", Response->Format); + DPRINT1("Length %x\n", Response->Length); + DPRINT1("Reserved %x\n", Response->Reserved); + DPRINT1("Vendor %c%c%c%c%c%c%c%c\n", Response->Vendor[0], Response->Vendor[1], Response->Vendor[2], Response->Vendor[3], Response->Vendor[4], Response->Vendor[5], Response->Vendor[6], Response->Vendor[7]); + DPRINT1("Product %c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c\n", Response->Product[0], Response->Product[1], Response->Product[2], Response->Product[3], + Response->Product[4], Response->Product[5], Response->Product[6], Response->Product[7], + Response->Product[8], Response->Product[9], Response->Product[10], Response->Product[11], + Response->Product[12], Response->Product[13], Response->Product[14], Response->Product[15]); + + DPRINT1("Revision %c%c%c%c\n", Response->Revision[0], Response->Revision[1], Response->Revision[2], Response->Revision[3]); + + // + // store result + // + PDODeviceExtension->InquiryData = (PVOID)Response; + return Status; +} + +NTSTATUS +USBSTOR_SendFormatCapacityIrp( + IN PDEVICE_OBJECT PDODeviceObject) +{ + NTSTATUS Status; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PUCHAR Response; + + // + // get device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)PDODeviceObject->DeviceExtension; + + // + // send request + // + Status = USBSTOR_SendIrp(PDODeviceObject, 0xFC, SCSIOP_READ_FORMATTED_CAPACITY, (PVOID*)&Response); + if (!NT_SUCCESS(Status)) + { + // + // command failed + // + return Status; + } + + // + // check if its a floppy + // + PDODeviceExtension->IsFloppy = USBSTOR_IsFloppy(Response, 0xFC /*FIXME*/, &PDODeviceExtension->MediumTypeCode); + + // + // free response + // + ExFreePool(Response); + return Status; +} + + + +NTSTATUS USBSTOR_CreatePDO( IN PDEVICE_OBJECT DeviceObject, OUT PDEVICE_OBJECT *ChildDeviceObject) @@ -1013,9 +1306,10 @@ *ChildDeviceObject = PDO; // - // FIXME: send inquiry command by irp - // - USBSTOR_SendInquiryCmd(PDO, 0); + // send inquiry command by irp + // + Status = USBSTOR_SendInquiryIrp(PDO); + ASSERT(Status == STATUS_SUCCESS); // // check response data @@ -1028,15 +1322,12 @@ // // check if it is a floppy // - Status = USBSTOR_SendFormatCapacity(PDO, 0); - if (NT_SUCCESS(Status)) - { - // - // check if its a floppy - // - PDODeviceExtension->IsFloppy = USBSTOR_IsFloppy(PDODeviceExtension->FormatData, PAGE_SIZE /*FIXME*/, &PDODeviceExtension->MediumTypeCode); - DPRINT1("[USBSTOR] IsFloppy %x MediumTypeCode %x\n", PDODeviceExtension->IsFloppy, PDODeviceExtension->MediumTypeCode); - } + Status = USBSTOR_SendFormatCapacityIrp(PDO); + + // + // display result + // + DPRINT1("[USBSTOR] Status %x IsFloppy %x MediumTypeCode %x\n", Status, PDODeviceExtension->IsFloppy, PDODeviceExtension->MediumTypeCode); // // failing command is non critical @@ -1044,7 +1335,6 @@ Status = STATUS_SUCCESS; } - // // done // Modified: trunk/reactos/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/scsi.c… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/scsi.c [iso-8859-1] Sun Feb 19 02:47:35 2012 @@ -262,79 +262,75 @@ } - if (Context->Irp) - { - // - // get current stack location - // - IoStack = IoGetCurrentIrpStackLocation(Context->Irp); - - // - // get request block - // - Request = (PSCSI_REQUEST_BLOCK)IoStack->Parameters.Others.Argument1; - ASSERT(Request); - - Status = Irp->IoStatus.Status; - - Urb = &Context->Urb; - - // - // get SCSI command data block - // - pCDB = (PCDB)Request->Cdb; - Request->SrbStatus = SRB_STATUS_SUCCESS; - - // - // read capacity needs special work - // - if (pCDB->AsByte[0] == SCSIOP_READ_CAPACITY) + // + // get current stack location + // + IoStack = IoGetCurrentIrpStackLocation(Context->Irp); + + // + // get request block + // + Request = (PSCSI_REQUEST_BLOCK)IoStack->Parameters.Others.Argument1; + ASSERT(Request); + + Status = Irp->IoStatus.Status; + Urb = &Context->Urb; + + // + // get SCSI command data block + // + pCDB = (PCDB)Request->Cdb; + Request->SrbStatus = SRB_STATUS_SUCCESS; + + // + // read capacity needs special work + // + if (pCDB->AsByte[0] == SCSIOP_READ_CAPACITY) + { + // + // get output buffer + // + Response = (PUFI_CAPACITY_RESPONSE)Context->TransferData; + + // + // store in pdo + // + Context->PDODeviceExtension->BlockLength = NTOHL(Response->BlockLength); + Context->PDODeviceExtension->LastLogicBlockAddress = NTOHL(Response->LastLogicalBlockAddress); + + if (Request->DataTransferLength == sizeof(READ_CAPACITY_DATA_EX)) { // - // get output buffer - // - Response = (PUFI_CAPACITY_RESPONSE)Context->TransferData; - - // - // store in pdo - // - Context->PDODeviceExtension->BlockLength = NTOHL(Response->BlockLength); - Context->PDODeviceExtension->LastLogicBlockAddress = NTOHL(Response->LastLogicalBlockAddress); - - if (Request->DataTransferLength == sizeof(READ_CAPACITY_DATA_EX)) - { - // - // get input buffer - // - CapacityDataEx = (PREAD_CAPACITY_DATA_EX)Request->DataBuffer; - - // - // set result - // - CapacityDataEx->BytesPerBlock = Response->BlockLength; - CapacityDataEx->LogicalBlockAddress.QuadPart = Response->LastLogicalBlockAddress; - Irp->IoStatus.Information = sizeof(READ_CAPACITY_DATA_EX); - } - else - { - // - // get input buffer - // - CapacityData = (PREAD_CAPACITY_DATA)Request->DataBuffer; - - // - // set result - // - CapacityData->BytesPerBlock = Response->BlockLength; - CapacityData->LogicalBlockAddress = Response->LastLogicalBlockAddress; - Irp->IoStatus.Information = sizeof(READ_CAPACITY_DATA); - } - - // - // free response - // - FreeItem(Context->TransferData); - } + // get input buffer + // + CapacityDataEx = (PREAD_CAPACITY_DATA_EX)Request->DataBuffer; + + // + // set result + // + CapacityDataEx->BytesPerBlock = Response->BlockLength; + CapacityDataEx->LogicalBlockAddress.QuadPart = Response->LastLogicalBlockAddress; + Irp->IoStatus.Information = sizeof(READ_CAPACITY_DATA_EX); + } + else + { + // + // get input buffer + // + CapacityData = (PREAD_CAPACITY_DATA)Request->DataBuffer; + + // + // set result + // + CapacityData->BytesPerBlock = Response->BlockLength; + CapacityData->LogicalBlockAddress = Response->LastLogicalBlockAddress; + Irp->IoStatus.Information = sizeof(READ_CAPACITY_DATA); + } + + // + // free response + // + FreeItem(Context->TransferData); } // @@ -342,37 +338,26 @@ // FreeItem(Context->cbw); - if (Context->Irp) - { - // - // FIXME: check status - // - Context->Irp->IoStatus.Status = Irp->IoStatus.Status; - Context->Irp->IoStatus.Information = Context->TransferDataLength; - - // - // terminate current request - // - USBSTOR_QueueTerminateRequest(Context->PDODeviceExtension->LowerDeviceObject, Context->Irp); - - // - // complete request - // - IoCompleteRequest(Context->Irp, IO_NO_INCREMENT); - - // - // start next request - // - USBSTOR_QueueNextRequest(Context->PDODeviceExtension->LowerDeviceObject); - } - - if (Context->Event) - { - // - // signal event - // - KeSetEvent(Context->Event, 0, FALSE); - } + // + // FIXME: check status + // + Context->Irp->IoStatus.Status = Irp->IoStatus.Status; + Context->Irp->IoStatus.Information = Context->TransferDataLength; + + // + // terminate current request + // + USBSTOR_QueueTerminateRequest(Context->PDODeviceExtension->LowerDeviceObject, Context->Irp); + + // + // complete request + // + IoCompleteRequest(Context->Irp, IO_NO_INCREMENT); + + // + // start next request + // + USBSTOR_QueueNextRequest(Context->PDODeviceExtension->LowerDeviceObject); // // free our allocated irp @@ -639,7 +624,6 @@ USBSTOR_SendRequest( IN PDEVICE_OBJECT DeviceObject, IN PIRP OriginalRequest, - IN OPTIONAL PKEVENT Event, IN UCHAR CommandLength, IN PUCHAR Command, IN ULONG TransferDataLength, @@ -707,7 +691,6 @@ Context->TransferDataLength = TransferDataLength; Context->FDODeviceExtension = FDODeviceExtension; Context->PDODeviceExtension = PDODeviceExtension; - Context->Event = Event; Context->RetryCount = RetryCount; // @@ -836,31 +819,28 @@ NTSTATUS USBSTOR_SendFormatCapacity( IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, IN ULONG RetryCount) { UFI_READ_FORMAT_CAPACITY Cmd; - NTSTATUS Status; - KEVENT Event; PPDO_DEVICE_EXTENSION PDODeviceExtension; - PUCHAR Response; - - - // - // allocate inquiry response - // - Response = AllocateItem(NonPagedPool, PAGE_SIZE); - if (!Response) - { - // - // no memory - // - return STATUS_INSUFFICIENT_RESOURCES; - } + PIO_STACK_LOCATION IoStack; + PSCSI_REQUEST_BLOCK Request; + + // + // get current stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); // // get PDO device extension // PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // get request block + // + Request = (PSCSI_REQUEST_BLOCK)IoStack->Parameters.Others.Argument1; // // initialize inquiry cmd @@ -868,58 +848,35 @@ RtlZeroMemory(&Cmd, sizeof(UFI_READ_FORMAT_CAPACITY)); Cmd.Code = SCSIOP_READ_FORMATTED_CAPACITY; Cmd.LUN = (PDODeviceExtension->LUN & MAX_LUN) << 5; - Cmd.AllocationLengthLsb = 0xFC; // FIXME: compute some same value - - // - // initialize event - // - KeInitializeEvent(&Event, NotificationEvent, FALSE); + Cmd.AllocationLengthMsb = HTONS(Request->DataTransferLength & 0xFFFF) >> 8; + Cmd.AllocationLengthLsb = HTONS(Request->DataTransferLength & 0xFFFF) & 0xFF; // // now send the request // - Status = USBSTOR_SendRequest(DeviceObject, NULL, &Event, UFI_READ_FORMAT_CAPACITY_CMD_LEN, (PUCHAR)&Cmd, sizeof(UFI_INQUIRY_RESPONSE), (PUCHAR)Response, RetryCount); - - // - // wait for the action to complete - // - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - - // - // store inquiry data - // - PDODeviceExtension->FormatData = Response; - - // - // done - // - return Status; - + return USBSTOR_SendRequest(DeviceObject, Irp, UFI_READ_FORMAT_CAPACITY_CMD_LEN, (PUCHAR)&Cmd, Request->DataTransferLength, (PUCHAR)Request->DataBuffer, RetryCount); } NTSTATUS -USBSTOR_SendInquiryCmd( +USBSTOR_SendInquiry( IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, IN ULONG RetryCount) { UFI_INQUIRY_CMD Cmd; - NTSTATUS Status; - KEVENT Event; PPDO_DEVICE_EXTENSION PDODeviceExtension; - PUFI_INQUIRY_RESPONSE Response; - - - // - // allocate inquiry response - // - Response = AllocateItem(NonPagedPool, PAGE_SIZE); - if (!Response) - { - // - // no memory - // - return STATUS_INSUFFICIENT_RESOURCES; - } + PIO_STACK_LOCATION IoStack; + PSCSI_REQUEST_BLOCK Request; + + // + // get current stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // get request block + // + Request = (PSCSI_REQUEST_BLOCK)IoStack->Parameters.Others.Argument1; // // get PDO device extension @@ -935,48 +892,18 @@ Cmd.AllocationLength = sizeof(UFI_INQUIRY_RESPONSE); // - // initialize event - // - KeInitializeEvent(&Event, NotificationEvent, FALSE); + // sanity check + // + ASSERT(Request->DataTransferLength >= sizeof(UFI_INQUIRY_RESPONSE)); // // now send the request // - Status = USBSTOR_SendRequest(DeviceObject, NULL, &Event, UFI_INQUIRY_CMD_LEN, (PUCHAR)&Cmd, sizeof(UFI_INQUIRY_RESPONSE), (PUCHAR)Response, RetryCount); - - // - // wait for the action to complete - // - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - - DPRINT1("Response %p\n", Response); - DPRINT1("DeviceType %x\n", Response->DeviceType); - DPRINT1("RMB %x\n", Response->RMB); - DPRINT1("Version %x\n", Response->Version); - DPRINT1("Format %x\n", Response->Format); - DPRINT1("Length %x\n", Response->Length); - DPRINT1("Reserved %x\n", Response->Reserved); - DPRINT1("Vendor %c%c%c%c%c%c%c%c\n", Response->Vendor[0], Response->Vendor[1], Response->Vendor[2], Response->Vendor[3], Response->Vendor[4], Response->Vendor[5], Response->Vendor[6], Response->Vendor[7]); - DPRINT1("Product %c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c\n", Response->Product[0], Response->Product[1], Response->Product[2], Response->Product[3], - Response->Product[4], Response->Product[5], Response->Product[6], Response->Product[7], - Response->Product[8], Response->Product[9], Response->Product[10], Response->Product[11], - Response->Product[12], Response->Product[13], Response->Product[14], Response->Product[15]); - - DPRINT1("Revision %c%c%c%c\n", Response->Revision[0], Response->Revision[1], Response->Revision[2], Response->Revision[3]); - - // - // store inquiry data - // - PDODeviceExtension->InquiryData = (PVOID)Response; - - // - // done - // - return Status; + return USBSTOR_SendRequest(DeviceObject, Irp, UFI_INQUIRY_CMD_LEN, (PUCHAR)&Cmd, Request->DataTransferLength, (PUCHAR)Request->DataBuffer, RetryCount); } NTSTATUS -USBSTOR_SendCapacityCmd( +USBSTOR_SendCapacity( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN ULONG RetryCount) @@ -984,19 +911,11 @@ UFI_CAPACITY_CMD Cmd; PUFI_CAPACITY_RESPONSE Response; PPDO_DEVICE_EXTENSION PDODeviceExtension; - PFDO_DEVICE_EXTENSION FDODeviceExtension; // // get PDO device extension // PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - - // - // get FDO device extension - // - FDODeviceExtension = (PFDO_DEVICE_EXTENSION)PDODeviceExtension->LowerDeviceObject->DeviceExtension; - // // allocate capacity response @@ -1020,11 +939,11 @@ // // send request, response will be freed in completion routine // - return USBSTOR_SendRequest(DeviceObject, Irp, NULL, UFI_READ_CAPACITY_CMD_LEN, (PUCHAR)&Cmd, sizeof(UFI_CAPACITY_RESPONSE), (PUCHAR)Response, RetryCount); + return USBSTOR_SendRequest(DeviceObject, Irp, UFI_READ_CAPACITY_CMD_LEN, (PUCHAR)&Cmd, sizeof(UFI_CAPACITY_RESPONSE), (PUCHAR)Response, RetryCount); } NTSTATUS -USBSTOR_SendModeSenseCmd( +USBSTOR_SendModeSense( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN ULONG RetryCount) @@ -1213,7 +1132,7 @@ } NTSTATUS -USBSTOR_SendReadWriteCmd( +USBSTOR_SendReadWrite( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN ULONG RetryCount) @@ -1248,7 +1167,7 @@ // // informal debug print // - DPRINT("USBSTOR_SendReadWriteCmd DataTransferLength %lu, BlockLength %lu\n", Request->DataTransferLength, PDODeviceExtension->BlockLength); + DPRINT("USBSTOR_SendReadWrite DataTransferLength %lu, BlockLength %lu\n", Request->DataTransferLength, PDODeviceExtension->BlockLength); // // sanity check @@ -1279,16 +1198,16 @@ Temp = (Cmd.ContiguousLogicBlocksByte0 << 8 | Cmd.ContiguousLogicBlocksByte1); ASSERT(NTOHL(Temp == BlockCount)); - DPRINT("USBSTOR_SendReadWriteCmd BlockAddress %x%x%x%x BlockCount %lu BlockLength %lu\n", Cmd.LogicalBlockByte0, Cmd.LogicalBlockByte1, Cmd.LogicalBlockByte2, Cmd.LogicalBlockByte3, BlockCount, PDODeviceExtension->BlockLength); + DPRINT("USBSTOR_SendReadWrite BlockAddress %x%x%x%x BlockCount %lu BlockLength %lu\n", Cmd.LogicalBlockByte0, Cmd.LogicalBlockByte1, Cmd.LogicalBlockByte2, Cmd.LogicalBlockByte3, BlockCount, PDODeviceExtension->BlockLength); // // send request // - return USBSTOR_SendRequest(DeviceObject, Irp, NULL, UFI_READ_WRITE_CMD_LEN, (PUCHAR)&Cmd, Request->DataTransferLength, (PUCHAR)Request->DataBuffer, RetryCount); + return USBSTOR_SendRequest(DeviceObject, Irp, UFI_READ_WRITE_CMD_LEN, (PUCHAR)&Cmd, Request->DataTransferLength, (PUCHAR)Request->DataBuffer, RetryCount); } NTSTATUS -USBSTOR_SendTestUnitCmd( +USBSTOR_SendTestUnit( IN PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp, IN ULONG RetryCount) @@ -1328,7 +1247,7 @@ // // send the request // - return USBSTOR_SendRequest(DeviceObject, Irp, NULL, UFI_TEST_UNIT_CMD_LEN, (PUCHAR)&Cmd, 0, NULL, RetryCount); + return USBSTOR_SendRequest(DeviceObject, Irp, UFI_TEST_UNIT_CMD_LEN, (PUCHAR)&Cmd, 0, NULL, RetryCount); } @@ -1379,7 +1298,7 @@ ASSERT(Request->DataBuffer); DPRINT("SCSIOP_READ_CAPACITY Length %lu\n", Request->DataTransferLength); - Status = USBSTOR_SendCapacityCmd(DeviceObject, Irp, RetryCount); + Status = USBSTOR_SendCapacity(DeviceObject, Irp, RetryCount); } else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_MODE_SENSE) { @@ -1390,7 +1309,25 @@ // // send mode sense command // - Status = USBSTOR_SendModeSenseCmd(DeviceObject, Irp, RetryCount); + Status = USBSTOR_SendModeSense(DeviceObject, Irp, RetryCount); + } + else if (pCDB->AsByte[0] == SCSIOP_READ_FORMATTED_CAPACITY) + { + DPRINT("SCSIOP_READ_FORMATTED_CAPACITY DataTransferLength %lu\n", Request->DataTransferLength); + + // + // send read format capacity + // + Status = USBSTOR_SendFormatCapacity(DeviceObject, Irp, RetryCount); + } + else if (pCDB->AsByte[0] == SCSIOP_INQUIRY) + { + DPRINT("SCSIOP_INQUIRY DataTransferLength %lu\n", Request->DataTransferLength); + + // + // send read format capacity + // + Status = USBSTOR_SendInquiry(DeviceObject, Irp, RetryCount); } else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_READ || pCDB->MODE_SENSE.OperationCode == SCSIOP_WRITE) { @@ -1399,7 +1336,7 @@ // // send read / write command // - Status = USBSTOR_SendReadWriteCmd(DeviceObject, Irp, RetryCount); + Status = USBSTOR_SendReadWrite(DeviceObject, Irp, RetryCount); } else if (pCDB->AsByte[0] == SCSIOP_MEDIUM_REMOVAL) { @@ -1428,7 +1365,7 @@ // // send test unit command // - Status = USBSTOR_SendTestUnitCmd(DeviceObject, Irp, RetryCount); + Status = USBSTOR_SendTestUnit(DeviceObject, Irp, RetryCount); } else { Modified: trunk/reactos/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/usbsto… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/usbstor.h [iso-8859-1] Sun Feb 19 02:47:35 2012 @@ -330,16 +330,15 @@ PFDO_DEVICE_EXTENSION FDODeviceExtension; PPDO_DEVICE_EXTENSION PDODeviceExtension; PMDL TransferBufferMDL; - PKEVENT Event; ULONG ErrorIndex; ULONG RetryCount; }IRP_CONTEXT, *PIRP_CONTEXT; typedef struct _ERRORHANDLER_WORKITEM_DATA { - PDEVICE_OBJECT DeviceObject; - PIRP_CONTEXT Context; - WORK_QUEUE_ITEM WorkQueueItem; + PDEVICE_OBJECT DeviceObject; + PIRP_CONTEXT Context; + WORK_QUEUE_ITEM WorkQueueItem; PIRP Irp; } ERRORHANDLER_WORKITEM_DATA, *PERRORHANDLER_WORKITEM_DATA; @@ -449,18 +448,6 @@ IN ULONG RetryCount); NTSTATUS -USBSTOR_SendInquiryCmd( - IN PDEVICE_OBJECT DeviceObject, - IN ULONG RetryCount); - -NTSTATUS -USBSTOR_SendFormatCapacity( - IN PDEVICE_OBJECT DeviceObject, - IN ULONG RetryCount); - - - -NTSTATUS NTAPI USBSTOR_CSWCompletionRoutine( PDEVICE_OBJECT DeviceObject,

12 years, 7 months

[ion] 55694: Missed these guys.

by ion＠svn.reactos.org

Author: ion Date: Sun Feb 19 02:25:31 2012 New Revision: 55694 URL: http://svn.reactos.org/svn/reactos?rev=55694&view=rev Log: Missed these guys. Modified: trunk/reactos/base/system/autochk/autochk.c trunk/reactos/base/system/smss2/pagefile.c trunk/reactos/base/system/smss2/smloop.c trunk/reactos/base/system/smss2/smss.c trunk/reactos/base/system/smss2/smsubsys.c Modified: trunk/reactos/base/system/autochk/autochk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/autochk/autoch… ============================================================================== --- trunk/reactos/base/system/autochk/autochk.c [iso-8859-1] (original) +++ trunk/reactos/base/system/autochk/autochk.c [iso-8859-1] Sun Feb 19 02:25:31 2012 @@ -326,7 +326,7 @@ NtDrivePath[wcslen(NtDrivePath)-1] = 0; RtlInitUnicodeString(&DrivePathU, NtDrivePath); - DPRINT1("AUTOCHK: Checking %wZ\n", &DrivePathU); + DPRINT("AUTOCHK: Checking %wZ\n", &DrivePathU); Status = ChkdskFunc(&DrivePathU, TRUE, // FixErrors TRUE, // Verbose Modified: trunk/reactos/base/system/smss2/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/pagefile… ============================================================================== --- trunk/reactos/base/system/smss2/pagefile.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/pagefile.c [iso-8859-1] Sun Feb 19 02:25:31 2012 @@ -96,7 +96,7 @@ } /* Parse the specified and get the name and arguments out of it */ - DPRINT1("SMSS:PFILE: Paging file specifier `%wZ' \n", PageFileToken); + DPRINT("SMSS:PFILE: Paging file specifier `%wZ' \n", PageFileToken); Status = SmpParseCommandLine(PageFileToken, NULL, &PageFileName, @@ -212,7 +212,7 @@ /* This means no duplicates exist, so insert our descriptor! */ InsertTailList(&SmpPagingFileDescriptorList, &Descriptor->Entry); SmpNumberOfPagingFiles++; - DPRINT1("SMSS:PFILE: Created descriptor for `%wZ' (`%wZ') \n", + DPRINT("SMSS:PFILE: Created descriptor for `%wZ' (`%wZ') \n", PageFileToken, &Descriptor->Name); return STATUS_SUCCESS; } @@ -241,7 +241,7 @@ HANDLE FileHandle; FILE_STANDARD_INFORMATION StandardInfo; - DPRINT1("SMSS:PFILE: Trying to get size for `%wZ'\n", FileName); + DPRINT("SMSS:PFILE: Trying to get size for `%wZ'\n", FileName); Size->QuadPart = 0; InitializeObjectAttributes(&ObjectAttributes, @@ -350,7 +350,7 @@ VolumeName.Length = wcslen(PathString) * sizeof(WCHAR); VolumeName.MaximumLength = VolumeName.Length + sizeof(UNICODE_NULL); VolumeName.Buffer[STANDARD_DRIVE_LETTER_OFFSET] = Volume->DriveLetter; - DPRINT1("SMSS:PFILE: Querying volume `%wZ' for free space \n", &VolumeName); + DPRINT("SMSS:PFILE: Querying volume `%wZ' for free space \n", &VolumeName); /* Open the volume */ InitializeObjectAttributes(&ObjectAttributes, @@ -395,10 +395,6 @@ SizeInfo.SectorsPerAllocationUnit; FinalFreeSpace.QuadPart = FreeSpace.QuadPart * SizeInfo.BytesPerSector; Volume->FreeSpace = FinalFreeSpace; - DPRINT1("AUs: %I64x Sectors: %lx Bytes Per Sector: %lx\n", - SizeInfo.AvailableAllocationUnits.QuadPart, - SizeInfo.SectorsPerAllocationUnit, - SizeInfo.BytesPerSector); /* Check if there's less than 32MB free so we don't starve the disk */ if (FinalFreeSpace.QuadPart <= 0x2000000) @@ -460,7 +456,7 @@ Status = NtCreatePagingFile(Name, MinSize, MaxSize, Priority); if (NT_SUCCESS(Status)) { - DPRINT1("SMSS:PFILE: NtCreatePagingFile (%wZ, %I64X, %I64X) succeeded. \n", + DPRINT("SMSS:PFILE: NtCreatePagingFile (%wZ, %I64X, %I64X) succeeded. \n", Name, MinSize->QuadPart, MaxSize->QuadPart); @@ -508,7 +504,7 @@ if (!(Descriptor->Flags & SMP_PAGEFILE_DUMP_PROCESSED)) { /* Try to find a crash dump and extract it */ - DPRINT1("SMSS:PFILE: Checking for crash dump in `%wZ' on boot volume \n", + DPRINT("SMSS:PFILE: Checking for crash dump in `%wZ' on boot volume \n", &Descriptor->Name); SmpCheckForCrashDump(&Descriptor->Name); @@ -521,7 +517,7 @@ } else { - DPRINT1("Queried free space for boot volume `%wC: %I64x'\n", + DPRINT("Queried free space for boot volume `%wC: %I64x'\n", Volume->DriveLetter, Volume->FreeSpace.QuadPart); } @@ -532,7 +528,7 @@ else { /* Crashdumps can only be on the boot volume */ - DPRINT1("SMSS:PFILE: Skipping crash dump checking for `%wZ' on non boot" + DPRINT("SMSS:PFILE: Skipping crash dump checking for `%wZ' on non boot" "volume `%wC' \n", &Descriptor->Name, Volume->DriveLetter); @@ -545,10 +541,10 @@ /* Check how big we can make the pagefile */ Status = SmpGetPagingFileSize(&Descriptor->Name, &PageFileSize); if (PageFileSize.QuadPart > 0) ShouldDelete = TRUE; - DPRINT1("SMSS:PFILE: Detected size %I64X for future paging file `%wZ'\n", + DPRINT("SMSS:PFILE: Detected size %I64X for future paging file `%wZ'\n", PageFileSize, &Descriptor->Name); - DPRINT1("SMSS:PFILE: Free space on volume `%wC' is %I64X \n", + DPRINT("SMSS:PFILE: Free space on volume `%wC' is %I64X \n", Volume->DriveLetter, Volume->FreeSpace.QuadPart); @@ -562,7 +558,7 @@ { Descriptor->ActualMaxSize = PageFileSize; } - DPRINT1("SMSS:PFILE: min %I64X, max %I64X, real min %I64X \n", + DPRINT("SMSS:PFILE: min %I64X, max %I64X, real min %I64X \n", Descriptor->ActualMinSize.QuadPart, Descriptor->ActualMaxSize.QuadPart, MinimumSize->QuadPart); @@ -697,7 +693,7 @@ /* Capture the min and max */ MinSize = Descriptor->MinSize.QuadPart; MaxSize = Descriptor->MaxSize.QuadPart; - DPRINT1("SMSS:PFILE: Validating sizes for `%wZ' %I64X %I64X\n", + DPRINT("SMSS:PFILE: Validating sizes for `%wZ' %I64X %I64X\n", &Descriptor->Name, MinSize, MaxSize); /* Don't let minimum be bigger than maximum */ @@ -732,7 +728,7 @@ if (WasTooBig) { /* Notify debugger output and write a flag in the descriptor */ - DPRINT1("SMSS:PFILE: Trimmed size of `%wZ' to maximum allowed \n", + DPRINT("SMSS:PFILE: Trimmed size of `%wZ' to maximum allowed \n", &Descriptor->Name); Descriptor->Flags |= SMP_PAGEFILE_WAS_TOO_BIG; } @@ -972,10 +968,6 @@ SizeInfo.SectorsPerAllocationUnit; FinalFreeSpace.QuadPart = FreeSpace.QuadPart * SizeInfo.BytesPerSector; Volume->FreeSpace = FinalFreeSpace; - DPRINT1("AUs: %I64x Sectors: %lx Bytes Per Sector: %lx\n", - SizeInfo.AvailableAllocationUnits.QuadPart, - SizeInfo.SectorsPerAllocationUnit, - SizeInfo.BytesPerSector); /* Check if there's less than 32MB free so we don't starve the disk */ if (FinalFreeSpace.QuadPart <= 0x2000000) @@ -992,7 +984,7 @@ /* All done, add this volume to our descriptor list */ InsertTailList(&SmpVolumeDescriptorList, &Volume->Entry); Volume->Flags |= SMP_VOLUME_INSERTED; - DPRINT1("SMSS:PFILE: Created volume descriptor for`%wZ' \n", &VolumePath); + DPRINT("SMSS:PFILE: Created volume descriptor for`%wZ' \n", &VolumePath); } /* We must've found at least the boot volume */ @@ -1045,7 +1037,7 @@ if (Descriptor->Flags & SMP_PAGEFILE_SYSTEM_MANAGED) { /* This is a system-managed descriptor. Create the correct file */ - DPRINT1("SMSS:PFILE: Creating a system managed paging file (`%wZ')\n", + DPRINT("SMSS:PFILE: Creating a system managed paging file (`%wZ')\n", &Descriptor->Name); Status = SmpCreateSystemManagedPagingFile(Descriptor, FALSE); if (!NT_SUCCESS(Status)) @@ -1062,7 +1054,7 @@ SmpValidatePagingFileSizes(Descriptor); /* Check if this is an ANY pagefile or a FIXED pagefile */ - DPRINT1("SMSS:PFILE: Creating a normal paging file (`%wZ') \n", + DPRINT("SMSS:PFILE: Creating a normal paging file (`%wZ') \n", &Descriptor->Name); if (Descriptor->Name.Buffer[STANDARD_DRIVE_LETTER_OFFSET] == L'?') { Modified: trunk/reactos/base/system/smss2/smloop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smloop.c… ============================================================================== --- trunk/reactos/base/system/smss2/smloop.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smloop.c [iso-8859-1] Sun Feb 19 02:25:31 2012 @@ -204,14 +204,12 @@ if (SbApiMsg->h.ClientId.UniqueProcess == SmUniqueProcessId) { /* No need to get any handle -- assume session 0 */ - DPRINT1("SM connecting to SM\n"); ProcessHandle = NULL; SessionId = 0; } else { /* Reference the foreign process */ - DPRINT1("Incoming request from %lx\n", SbApiMsg->h.ClientId.UniqueProcess); InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); Status = NtOpenProcess(&ProcessHandle, PROCESS_QUERY_INFORMATION, @@ -274,7 +272,6 @@ /* Now send the actual accept reply (which could be a rejection) */ PortView.Length = sizeof(PortView); - DPRINT1("Accepting: %d connection with context: %p\n", Accept, ClientContext); Status = NtAcceptConnectPort(&PortHandle, ClientContext, &SbApiMsg->h, @@ -303,7 +300,6 @@ SbApiMsg->ConnectionInfo.SbApiPortName[119] = UNICODE_NULL; RtlCreateUnicodeString(&SubsystemPort, SbApiMsg->ConnectionInfo.SbApiPortName); - DPRINT1("Connecting back to %wZ\n", &SubsystemPort); Status = NtConnectPort(&CidSubsystem->SbApiPort, &SubsystemPort, &SecurityQos, @@ -363,7 +359,6 @@ while (TRUE) { /* Begin waiting on a request */ - DPRINT1("API Loop: %p\n", SmApiPort); Status = NtReplyWaitReceivePort(SmApiPort, (PVOID*)&ClientContext, &ReplyMsg->h, @@ -383,7 +378,6 @@ /* A new connection */ case LPC_CONNECTION_REQUEST: /* Create the right structures for it */ - DPRINT1("New connection request\n"); SmpHandleConnectionRequest(SmApiPort, (PSB_API_MSG)&RequestMsg); ReplyMsg = NULL; break; @@ -423,7 +417,6 @@ else { /* It's totally okay, so call the dispatcher for it */ - DPRINT1("Calling dispatcher for ID: %lx\n", RequestMsg.ApiNumber); Status = SmpApiDispatch[RequestMsg.ApiNumber](&RequestMsg, ClientContext, SmApiPort); Modified: trunk/reactos/base/system/smss2/smss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smss.c?r… ============================================================================== --- trunk/reactos/base/system/smss2/smss.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smss.c [iso-8859-1] Sun Feb 19 02:25:31 2012 @@ -47,7 +47,6 @@ NTSTATUS Status; RTL_USER_PROCESS_INFORMATION LocalProcessInfo; PRTL_USER_PROCESS_PARAMETERS ProcessParameters; - DPRINT1("Executing image: %wZ\n", FileName); /* Use the input process information if we have it, otherwise use local */ ProcessInfo = ProcessInformation; Modified: trunk/reactos/base/system/smss2/smsubsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smsubsys… ============================================================================== --- trunk/reactos/base/system/smss2/smsubsys.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smsubsys.c [iso-8859-1] Sun Feb 19 02:25:31 2012 @@ -150,7 +150,6 @@ PVOID State; PSB_CREATE_PROCESS_MSG CreateProcess = &SbApiMsg.CreateProcess; PSB_CREATE_SESSION_MSG CreateSession = &SbApiMsg.CreateSession; - DPRINT1("Loading subsystem: %wZ\n", FileName); /* Make sure this is a found subsystem */ if (Flags & SMP_INVALID_PATH) @@ -202,7 +201,6 @@ /* Allocate a new subsystem! */ NewSubsystem = RtlAllocateHeap(SmpHeap, SmBaseTag, sizeof(SMP_SUBSYSTEM)); - DPRINT1("new subsystem created: %p\n", NewSubsystem); if (!NewSubsystem) { RtlLeaveCriticalSection(&SmpKnownSubSysLock); @@ -279,7 +277,6 @@ else { /* This must be CSRSS itself, so just launch it and that's it */ - DPRINT1("Executing CSRSS\n"); Status = SmpExecuteImage(FileName, Directory, CommandLine, @@ -314,7 +311,6 @@ SmpWindowsSubSysProcess = ProcessInformation.ProcessHandle; } ASSERT(NT_SUCCESS(Status)); - DPRINT1("CSRSS is up and running: %lx %lx\n", SmpWindowsSubSysProcessId, SmpWindowsSubSysProcess); } else { @@ -399,7 +395,6 @@ } /* Okay, everything looks good to go, initialize this subsystem now! */ - DPRINT1("Resuming the subsystem!\n"); Status = NtResumeThread(ProcessInformation.ThreadHandle, NULL); if (!NT_SUCCESS(Status)) { @@ -436,15 +431,12 @@ else { /* This a session 0 subsystem, just wait for it to initialize */ - DPRINT1("Waiting on the subsystem to initialize...\n"); NtWaitForSingleObject(NewSubsystem->Event, FALSE, NULL); - DPRINT1("Subsystem is ready!!!\n"); } /* Subsystem is created, resumed, and initialized. Close handles and exit */ NtClose(ProcessInformation.ThreadHandle); Status = STATUS_SUCCESS; - DPRINT1("Returning success\n"); goto Quickie2; Quickie: @@ -537,7 +529,6 @@ { /* Execute each one and move on */ RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry); - DPRINT1("SetupExecute entry: %wZ\n", &RegEntry->Name); SmpExecuteCommand(&RegEntry->Name, 0, NULL, 0); NextEntry = NextEntry->Flink; } @@ -548,7 +539,6 @@ { /* Get the entry and check if this is the special Win32k entry */ RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry); - DPRINT1("Subsystem: %wZ\n", &RegEntry->Name); if (!_wcsicmp(RegEntry->Name.Buffer, L"Kmode")) { /* Translate it */ @@ -581,7 +571,6 @@ AttachedSessionId = *MuSessionId; /* Start Win32k.sys on this session */ - DPRINT1("Starting win32k.sys...\n"); RtlInitUnicodeString(&DestinationString, L"\\SystemRoot\\System32\\win32k.sys"); Status = NtSetSystemInformation(SystemExtendServiceTableInformation, @@ -608,7 +597,6 @@ { /* Get each entry and check if it's the internal debug or not */ RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry); - DPRINT1("Subsystem (required): %wZ\n", &RegEntry->Name); if (_wcsicmp(RegEntry->Name.Buffer, L"debug")) { /* Load the required subsystem */ @@ -641,7 +629,6 @@ { /* Get the custom initial command */ RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry); - DPRINT1("Initial command found: %wZ\n", &RegEntry->Name); /* Write the initial command and wait for 5 seconds (why??!) */ *InitialCommand = RegEntry->Name; @@ -653,7 +640,6 @@ /* Use the default Winlogon initial command */ RtlInitUnicodeString(InitialCommand, L"winlogon.exe"); InitialCommandBuffer[0] = UNICODE_NULL; - DPRINT1("Initial command found: %wZ\n", InitialCommand); /* Check if there's a debugger for Winlogon */ Status2 = LdrQueryImageFileExecutionOptions(InitialCommand, @@ -678,7 +664,6 @@ { /* Execute each one */ RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry); - DPRINT1("Initial command (custom): %wZ\n", &RegEntry->Name); SmpExecuteCommand(&RegEntry->Name, *MuSessionId, NULL, 0); NextEntry = NextEntry->Flink; }

12 years, 7 months

[ion] 55693: [NTOSKRNL]: Implement ThreadBreakOnTermination for the SET case. Cleanup some dbgprints.

by ion＠svn.reactos.org

Author: ion Date: Sun Feb 19 02:24:52 2012 New Revision: 55693 URL: http://svn.reactos.org/svn/reactos?rev=55693&view=rev Log: [NTOSKRNL]: Implement ThreadBreakOnTermination for the SET case. Cleanup some dbgprints. Modified: trunk/reactos/hal/halx86/acpi/halacpi.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/ps/query.c trunk/reactos/subsystems/win32/win32k/eng/mouse.c Modified: trunk/reactos/hal/halx86/acpi/halacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/acpi/halacpi.c?… ============================================================================== --- trunk/reactos/hal/halx86/acpi/halacpi.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/acpi/halacpi.c [iso-8859-1] Sun Feb 19 02:24:52 2012 @@ -190,7 +190,6 @@ } /* Validate the signature */ - DPRINT1("ACPI DSDT at 0x%p\n", Header); if (Header->Signature != DSDT_SIGNATURE) { /* Fail and unmap */ @@ -231,7 +230,6 @@ if (!Xsdt) return NULL; /* Won't be using the RSDT */ - DPRINT1("ACPI XSDT at 0x%p\n", Xsdt); Rsdt = NULL; } @@ -333,12 +331,6 @@ MmUnmapIoSpace(Header, 2 * PAGE_SIZE); } - DPRINT1("Failed to find ACPI table %c%c%c%c\n", - (Signature & 0xFF), - (Signature & 0xFF00) >> 8, - (Signature & 0xFF0000) >> 16, - (Signature & 0xFF000000) >> 24); - /* Didn't find anything */ return NULL; } @@ -532,8 +524,7 @@ /* Get the boot table */ BootTable = HalAcpiGetTable(LoaderBlock, BOOT_SIGNATURE); HalpSimpleBootFlagTable = BootTable; - DPRINT1("ACPI BOOT at 0x%p\n", HalpSimpleBootFlagTable); - + /* Validate it */ if ((BootTable) && (BootTable->Header.Length >= sizeof(BOOT_TABLE)) && @@ -693,7 +684,6 @@ } /* Validate it */ - DPRINT1("ACPI RSDT at 0x%p\n", Rsdt); if ((Rsdt->Header.Signature != RSDT_SIGNATURE) && (Rsdt->Header.Signature != XSDT_SIGNATURE)) { @@ -772,8 +762,6 @@ } } - DPRINT1("ACPI %d.0 detected\n", (Rsdt->Header.Revision + 1)); - /* Done */ return Status; } @@ -786,15 +774,15 @@ PAGED_CODE(); /* Is this in the init phase? */ - if (!TimerPort ) + if (!TimerPort) { /* Get the data from the FADT */ TimerPort = HalpFixedAcpiDescTable.pm_tmr_blk_io_port; TimerValExt = HalpFixedAcpiDescTable.flags & ACPI_TMR_VAL_EXT; + DPRINT1("ACPI Timer at: %Xh (EXT: %d)\n", TimerPort, TimerValExt); } /* FIXME: Now proceed to the timer initialization */ - DPRINT1("ACPI Timer at: %Xh (EXT: %d)\n", TimerPort, TimerValExt); //HalaAcpiTimerInit(TimerPort, TimerValExt); } @@ -808,7 +796,6 @@ PHYSICAL_ADDRESS PhysicalAddress; /* Only do this once */ - DPRINT("You are booting the ACPI HAL!\n"); if (HalpProcessedACPIPhase0) return STATUS_SUCCESS; /* Setup the ACPI table cache */ @@ -825,7 +812,6 @@ } /* Assume typical size, otherwise whatever the descriptor table says */ - DPRINT1("ACPI FACP at 0x%p\n", Fadt); TableLength = sizeof(FADT); if (Fadt->Header.Length < sizeof(FADT)) TableLength = Fadt->Header.Length; @@ -837,14 +823,12 @@ /* Get the debug table for KD */ HalpDebugPortTable = HalAcpiGetTable(LoaderBlock, DBGP_SIGNATURE); - DPRINT1("ACPI DBGP at 0x%p\n", HalpDebugPortTable); /* Initialize NUMA through the SRAT */ HalpNumaInitializeStaticConfiguration(LoaderBlock); /* Initialize hotplug through the SRAT */ HalpDynamicSystemResourceConfiguration(LoaderBlock); - DPRINT1("ACPI SRAT at 0x%p\n", HalpAcpiSrat); if (HalpAcpiSrat) { DPRINT1("Your machine has a SRAT, but NUMA/HotPlug are not supported!\n"); @@ -885,6 +869,38 @@ /* Setup the boot table */ HalpInitBootTable(LoaderBlock); + + /* Debugging code */ + { + PLIST_ENTRY ListHead, NextEntry; + PACPI_CACHED_TABLE CachedTable; + + /* Loop cached tables */ + ListHead = &HalpAcpiTableCacheList; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) + { + /* Get the table */ + CachedTable = CONTAINING_RECORD(NextEntry, ACPI_CACHED_TABLE, Links); + + /* Compare signatures */ + if ((CachedTable->Header.Signature == RSDT_SIGNATURE) || + (CachedTable->Header.Signature == XSDT_SIGNATURE)) + { + DPRINT1("ACPI %d.0 Detected. Tables: ", (CachedTable->Header.Revision + 1)); + } + + DbgPrint("[%c%c%c%c] ", + (CachedTable->Header.Signature & 0xFF), + (CachedTable->Header.Signature & 0xFF00) >> 8, + (CachedTable->Header.Signature & 0xFF0000) >> 16, + (CachedTable->Header.Signature & 0xFF000000) >> 24); + + /* Keep going */ + NextEntry = NextEntry->Flink; + } + DbgPrint("\n"); + } /* Return success */ return STATUS_SUCCESS; Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sun Feb 19 02:24:52 2012 @@ -2467,7 +2467,7 @@ if (NT_SUCCESS(IopQueryDeviceCapabilities(DeviceNode, &DeviceCaps)) && DeviceCaps.RawDeviceOK) { - DPRINT1("%wZ is using parent bus driver (%wZ)\n", &DeviceNode->InstancePath, &ParentDeviceNode->ServiceName); + DPRINT("%wZ is using parent bus driver (%wZ)\n", &DeviceNode->InstancePath, &ParentDeviceNode->ServiceName); DeviceNode->ServiceName.Length = 0; DeviceNode->ServiceName.MaximumLength = 0; Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Sun Feb 19 02:24:52 2012 @@ -1551,7 +1551,6 @@ /* Set and assert the flags, and return */ PspSetProcessFlag(Process, PSF_PROCESS_IN_SESSION_BIT); ASSERT(MiSessionLeaderExists == 1); - if (NT_SUCCESS(Status)) DPRINT1("New session created: %lx\n", *SessionId); return Status; } Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=55… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Sun Feb 19 02:24:52 2012 @@ -1727,6 +1727,7 @@ PEPROCESS Process; ULONG_PTR DisableBoost = 0; ULONG_PTR IdealProcessor = 0; + ULONG_PTR Break = 0; PTEB Teb; ULONG_PTR TlsIndex = 0; PVOID *ExpansionSlots; @@ -2121,10 +2122,51 @@ /* All done */ break; + + case ThreadBreakOnTermination: + + /* Check buffer length */ + if (ThreadInformationLength != sizeof(ULONG)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + /* Enter SEH for direct buffer read */ + _SEH2_TRY + { + Break = *(PULONG)ThreadInformation; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get exception code */ + Break = 0; + Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(break); + } + _SEH2_END; + + /* Setting 'break on termination' requires the SeDebugPrivilege */ + if (!SeSinglePrivilegeCheck(SeDebugPrivilege, PreviousMode)) + { + Status = STATUS_PRIVILEGE_NOT_HELD; + break; + } + + /* Set or clear the flag */ + if (Break) + { + PspSetCrossThreadFlag(Thread, CT_BREAK_ON_TERMINATION_BIT); + } + else + { + PspClearCrossThreadFlag(Thread, CT_BREAK_ON_TERMINATION_BIT); + } + break; default: /* We don't implement it yet */ - DPRINT1("Not implemented: %lx\n", ThreadInformationClass); + DPRINT1("Not implemented: %d\n", ThreadInformationClass); Status = STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] Sun Feb 19 02:24:52 2012 @@ -148,7 +148,7 @@ if (!pgp->psurfSave) { - DPRINT1("No SaveSurface!\n"); + DPRINT("No SaveSurface!\n"); return; }

12 years, 7 months

[ion] 55692: [CSRSRV/WIN32CSR]: Make Win32CSR much closer to a real CSRSS Server DLL than before, and make calling the Server callbacks compatible with the correct CSR_SERVER_DLL structure. API dis...

by ion＠svn.reactos.org

Author: ion Date: Sun Feb 19 01:53:58 2012 New Revision: 55692 URL: http://svn.reactos.org/svn/reactos?rev=55692&view=rev Log: [CSRSRV/WIN32CSR]: Make Win32CSR much closer to a real CSRSS Server DLL than before, and make calling the Server callbacks compatible with the correct CSR_SERVER_DLL structure. API dispatching is still all wrong, though. Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c trunk/reactos/subsystems/win32/csrss/csrsrv/server.c trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.spec Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] Sun Feb 19 01:53:58 2012 @@ -20,8 +20,6 @@ UNICODE_STRING CsrSbApiPortName; HANDLE CsrSbApiPort = 0; PCSR_THREAD CsrSbApiRequestThreadPtr; -static unsigned ServerProcCount; -static CSRPLUGIN_SERVER_PROCS *ServerProcs = NULL; HANDLE CsrSmApiPort; HANDLE hSbApiPort = (HANDLE) 0; HANDLE hApiPort = (HANDLE) 0; @@ -37,44 +35,26 @@ /* PRIVATE FUNCTIONS **********************************************************/ -static NTSTATUS FASTCALL -CsrpAddServerProcs(CSRPLUGIN_SERVER_PROCS *Procs) -{ - CSRPLUGIN_SERVER_PROCS *NewProcs; - - DPRINT("CSR: %s called\n", __FUNCTION__); - - NewProcs = RtlAllocateHeap(CsrHeap, 0, - (ServerProcCount + 1) - * sizeof(CSRPLUGIN_SERVER_PROCS)); - if (NULL == NewProcs) - { - return STATUS_NO_MEMORY; - } - if (0 != ServerProcCount) - { - RtlCopyMemory(NewProcs, ServerProcs, - ServerProcCount * sizeof(CSRPLUGIN_SERVER_PROCS)); - RtlFreeHeap(CsrHeap, 0, ServerProcs); - } - NewProcs[ServerProcCount] = *Procs; - ServerProcs = NewProcs; - ServerProcCount++; - - return STATUS_SUCCESS; -} - VOID CallHardError(IN PCSR_THREAD ThreadData, IN PHARDERROR_MSG HardErrorMessage) { unsigned i; + PCSR_SERVER_DLL ServerDll; DPRINT("CSR: %s called\n", __FUNCTION__); - for (i = 0; i < ServerProcCount; i++) - { - ServerProcs[i].HardErrorProc(ThreadData, HardErrorMessage); + /* Notify the Server DLLs */ + for (i = 0; i < CSR_SERVER_DLL_MAX; i++) + { + /* Get the current Server DLL */ + ServerDll = CsrLoadedServerDll[i]; + + /* Make sure it's valid and that it has callback */ + if ((ServerDll) && (ServerDll->HardErrorCallback)) + { + ServerDll->HardErrorCallback(ThreadData, HardErrorMessage); + } } } @@ -84,13 +64,21 @@ { NTSTATUS Status = STATUS_SUCCESS; unsigned i; + PCSR_SERVER_DLL ServerDll; DPRINT("CSR: %s called\n", __FUNCTION__); - for (i = 0; i < ServerProcCount; i++) - { - Status = ServerProcs[i].ProcessInheritProc(SourceProcessData, TargetProcessData); - if (!NT_SUCCESS(Status)) break; + /* Notify the Server DLLs */ + for (i = 0; i < CSR_SERVER_DLL_MAX; i++) + { + /* Get the current Server DLL */ + ServerDll = CsrLoadedServerDll[i]; + + /* Make sure it's valid and that it has callback */ + if ((ServerDll) && (ServerDll->NewProcessCallback)) + { + Status = ServerDll->NewProcessCallback(SourceProcessData, TargetProcessData); + } } return Status; @@ -101,65 +89,24 @@ { ULONG Result = 0; unsigned i; + PCSR_SERVER_DLL ServerDll; DPRINT("CSR: %s called\n", __FUNCTION__); - for (i = 0; i < ServerProcCount; i++) - Result = ServerProcs[i].ProcessDeletedProc(ProcessData, 0, FALSE); + /* Notify the Server DLLs */ + for (i = 0; i < CSR_SERVER_DLL_MAX; i++) + { + /* Get the current Server DLL */ + ServerDll = CsrLoadedServerDll[i]; + + /* Make sure it's valid and that it has callback */ + if ((ServerDll) && (ServerDll->ShutdownProcessCallback)) + { + Result = ServerDll->ShutdownProcessCallback(ProcessData, 0, FALSE); + } + } return Result; -} - -/********************************************************************** - * CsrpInitWin32Csr/3 - * - * TODO: this function should be turned more general to load an - * TODO: hosted server DLL as received from the command line; - * TODO: for instance: ServerDll=winsrv:ConServerDllInitialization,2 - * TODO: ^method ^dll ^api ^sid - * TODO: - * TODO: CsrpHostServerDll (LPWSTR DllName, - * TODO: LPWSTR ApiName, - * TODO: DWORD ServerId) - */ -static NTSTATUS -CsrpInitWin32Csr (VOID) -{ - NTSTATUS Status; - UNICODE_STRING DllName; - HINSTANCE hInst; - ANSI_STRING ProcName; - CSRPLUGIN_INITIALIZE_PROC InitProc; - PCSRSS_API_DEFINITION ApiDefinitions; - CSRPLUGIN_SERVER_PROCS ServerProcs; - - DPRINT("CSR: %s called\n", __FUNCTION__); - - RtlInitUnicodeString(&DllName, L"win32csr.dll"); - Status = LdrLoadDll(NULL, 0, &DllName, (PVOID *) &hInst); - if (! NT_SUCCESS(Status)) - { - return Status; - } - RtlInitAnsiString(&ProcName, "Win32CsrInitialization"); - Status = LdrGetProcedureAddress(hInst, &ProcName, 0, (PVOID *) &InitProc); - if (! NT_SUCCESS(Status)) - { - return Status; - } - - if (! (*InitProc)(&ApiDefinitions, &ServerProcs)) - { - return STATUS_UNSUCCESSFUL; - } - - Status = CsrApiRegisterDefinitions(ApiDefinitions); - if (! NT_SUCCESS(Status)) - { - return Status; - } - Status = CsrpAddServerProcs(&ServerProcs); - return Status; } CSRSS_API_DEFINITION NativeDefinitions[] = @@ -819,12 +766,19 @@ if (NT_SUCCESS(Status)) ServerString[-1] = ANSI_NULL; /* Load it */ - if (CsrDebug & 1) DPRINT1("CSRSS: Should be loading ServerDll=%s:%s\n", ParameterValue, EntryPoint); + if (CsrDebug & 1) DPRINT1("CSRSS: Loading ServerDll=%s:%s\n", ParameterValue, EntryPoint); /* Hackito ergo sum */ - BasepFakeStaticServerData(); - Status = STATUS_SUCCESS; + if (strstr(ParameterValue, "basesrv")) + { + DPRINT1("Fake basesrv init\n"); + BasepFakeStaticServerData(); + } +// else +// { +// Status = CsrLoadServerDll(ParameterValue, EntryPoint, 2); +// } if (!NT_SUCCESS(Status)) { DPRINT1("CSRSS: *** Failed loading ServerDll=%s (Status == 0x%x)\n", @@ -1103,10 +1057,11 @@ return Status; } - Status = CsrpInitWin32Csr(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CSRSRV failed in %s with status %lx\n", "CsrpInitWin32Csr", Status); + /* Initialize Win32csr */ + Status = CsrLoadServerDll("win32csr", "Win32CsrInitialization", 2); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CSRSRV failed in %s with status %lx\n", "CsrLoadServerDll", Status); } /* Initialize the API Port for SM communication */ Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/server.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/server.c [iso-8859-1] Sun Feb 19 01:53:58 2012 @@ -230,10 +230,7 @@ /* ReactOS Specific hax */ if (ServerDll->HighestApiSupported == 0xDEADBABE) { - DPRINT1("Registering: %p\n", (PVOID)ServerDll->DispatchTable); Status = CsrApiRegisterDefinitions((PVOID)ServerDll->DispatchTable); - DPRINT1("Status: %lx\n", Status); - goto LoadFailed; } } else Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Sun Feb 19 01:53:58 2012 @@ -326,7 +326,7 @@ NTSTATUS WINAPI -#if 0 +#if 1 Win32CsrInitialization(IN PCSR_SERVER_DLL ServerDll) #else Win32CsrInitialization(PCSRSS_API_DEFINITION *ApiDefinitions, @@ -347,7 +347,7 @@ CsrInitConsoleSupport(); /* HACK */ -#if 0 +#if 1 ServerDll->DispatchTable = (PVOID)Win32CsrApiDefinitions; ServerDll->HighestApiSupported = 0xDEADBABE; @@ -374,7 +374,7 @@ else DPRINT1("Cannot start Raw Input Thread!\n"); - return TRUE; + return STATUS_SUCCESS; } /* EOF */ Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.spec [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.spec [iso-8859-1] Sun Feb 19 01:53:58 2012 @@ -1,1 +1,1 @@ -@ stdcall Win32CsrInitialization(ptr ptr) +@ stdcall Win32CsrInitialization(ptr)

12 years, 7 months

[janderwald] 55691: [USBEHCI] - Remove assertion which no longer holds - Delete old queue head after a new queue head has been sucessfully fetched

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Feb 19 00:16:50 2012 New Revision: 55691 URL: http://svn.reactos.org/svn/reactos?rev=55691&view=rev Log: [USBEHCI] - Remove assertion which no longer holds - Delete old queue head after a new queue head has been sucessfully fetched Modified: trunk/reactos/drivers/usb/usbehci/usb_queue.cpp trunk/reactos/drivers/usb/usbehci/usb_request.cpp Modified: trunk/reactos/drivers/usb/usbehci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usb_qu… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usb_queue.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usb_queue.cpp [iso-8859-1] Sun Feb 19 00:16:50 2012 @@ -770,15 +770,15 @@ if ((Request->IsRequestComplete() == FALSE) && (UrbStatus == USBD_STATUS_SUCCESS)) { // - // let IUSBRequest free the queue head - // - Request->FreeQueueHead(CurrentQH); - - // // request is incomplete, get new queue head // if (Request->GetQueueHead(&NewQueueHead) == STATUS_SUCCESS) { + // + // let IUSBRequest free the queue head + // + Request->FreeQueueHead(CurrentQH); + // // first acquire request lock // Modified: trunk/reactos/drivers/usb/usbehci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usb_re… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] Sun Feb 19 00:16:50 2012 @@ -731,7 +731,6 @@ // *OutDescriptorLength = Length; } - NTSTATUS CUSBRequest::BuildTransferDescriptorChain( @@ -1193,11 +1192,6 @@ &ChainDescriptorLength); // - // FIXME: handle errors - // - //ASSERT(ChainDescriptorLength == m_TransferBufferLength); - - // // move to next offset // m_TransferBufferLengthCompleted += ChainDescriptorLength;

12 years, 7 months

[ion] 55690: [NTOSKRNL]: When you rewrite my ASM code, get it right, dumbasses. Thanks Stefan.

by ion＠svn.reactos.org

Author: ion Date: Sun Feb 19 00:08:50 2012 New Revision: 55690 URL: http://svn.reactos.org/svn/reactos?rev=55690&view=rev Log: [NTOSKRNL]: When you rewrite my ASM code, get it right, dumbasses. Thanks Stefan. Modified: trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h [iso-8859-1] Sun Feb 19 00:08:50 2012 @@ -171,7 +171,7 @@ } /* Make sure we're not attached and that APCs are not disabled */ - if ((KeGetCurrentThread()->ApcStateIndex != CurrentApcEnvironment) || + if ((KeGetCurrentThread()->ApcStateIndex != OriginalApcEnvironment) || (KeGetCurrentThread()->CombinedApcDisable != 0)) { /* Fail */

12 years, 7 months

[ion] 55689: [CSRSRV]: Remove a bunch of hacks and don't attach the shared section when CSRSS is connecting to itself (which happens because our Win32k does that). Things are cleaner now :)

by ion＠svn.reactos.org

Author: ion Date: Sun Feb 19 00:04:05 2012 New Revision: 55689 URL: http://svn.reactos.org/svn/reactos?rev=55689&view=rev Log: [CSRSRV]: Remove a bunch of hacks and don't attach the shared section when CSRSS is connecting to itself (which happens because our Win32k does that). Things are cleaner now :) Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c trunk/reactos/subsystems/win32/csrss/csrsrv/server.c Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] Sun Feb 19 00:04:05 2012 @@ -771,25 +771,7 @@ } } - if (ProcessData->ProcessHandle == NULL) - { - OBJECT_ATTRIBUTES ObjectAttributes; - - InitializeObjectAttributes(&ObjectAttributes, - NULL, - 0, - NULL, - NULL); - DPRINT1("WARNING: CSR PROCESS WITH NO CSR PROCESS HANDLE???\n"); - ClientId.UniqueThread = 0; - Status = NtOpenProcess(&ProcessData->ProcessHandle, - PROCESS_ALL_ACCESS, - &ObjectAttributes, - &Request->ClientId); - DPRINT1("Status: %lx. Handle: %lx\n", Status, ProcessData->ProcessHandle); - } - - if (ProcessData) + if ((ProcessData) && (ProcessData != CsrRootProcess)) { /* Attach the Shared Section */ Status = CsrSrvAttachSharedSection(ProcessData, ConnectInfo); @@ -802,6 +784,10 @@ { DPRINT1("Shared section map failed: %lx\n", Status); } + } + else if (ProcessData == CsrRootProcess) + { + AllowConnection = TRUE; } Status = NtAcceptConnectPort(&ServerPort, Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/server.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/server.c [iso-8859-1] Sun Feb 19 00:04:05 2012 @@ -494,12 +494,6 @@ ViewUnmap, SEC_NO_CHANGE, PAGE_EXECUTE_READ); - if (Status == STATUS_CONFLICTING_ADDRESSES) - { - /* I Think our csrss tries to connect to itself... */ - DPRINT1("Multiple mapping hack\n"); - Status = STATUS_SUCCESS; - } if (!NT_SUCCESS(Status)) return Status; }

12 years, 7 months

[ion] 55688: [NTOSKRNL]: Implement SeCheckPrivilegedObject and call it in the two cases where it's needed (when changing process priority) instead of spamming the debug log that we're not doing the...

by ion＠svn.reactos.org

Author: ion Date: Sat Feb 18 23:59:31 2012 New Revision: 55688 URL: http://svn.reactos.org/svn/reactos?rev=55688&view=rev Log: [NTOSKRNL]: Implement SeCheckPrivilegedObject and call it in the two cases where it's needed (when changing process priority) instead of spamming the debug log that we're not doing the check. [NTOSKRNL]: Implement ProcessUserModeIOPL info level (and implement Ke386SetIopl) instead of spamming we can't do this. [NTOSKRNL]: Implement ProcessExecuteOptions info level (and implement MmSetExecuteOptions) instead of spamming we can't do this. [NDK]: Add NoExecute Flags based on ProcessHacker. No longer spammed to death for every process all the time. Modified: trunk/reactos/include/ndk/mmtypes.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/include/internal/se.h trunk/reactos/ntoskrnl/ke/i386/v86vdm.c trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/ps/query.c trunk/reactos/ntoskrnl/se/priv.c Modified: trunk/reactos/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] Sat Feb 18 23:59:31 2012 @@ -63,8 +63,18 @@ #define MAP_PROCESS 1 #define MAP_SYSTEM 2 +// +// Flags for ProcessExecutionOptions +// +#define MEM_EXECUTE_OPTION_DISABLE 0x1 +#define MEM_EXECUTE_OPTION_ENABLE 0x2 +#define MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION 0x4 +#define MEM_EXECUTE_OPTION_PERMANENT 0x8 +#define MEM_EXECUTE_OPTION_EXECUTE_DISPATCH_ENABLE 0x10 +#define MEM_EXECUTE_OPTION_IMAGE_DISPATCH_ENABLE 0x20 +#define MEM_EXECUTE_OPTION_VALID_FLAGS 0x3F + #ifndef NTOS_MODE_USER - // // Virtual Memory Flags // Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Sat Feb 18 23:59:31 2012 @@ -729,6 +729,10 @@ VOID NTAPI +Ke386SetIOPL(VOID); + +VOID +NTAPI KiCheckForKernelApcDelivery(VOID); LONG Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Sat Feb 18 23:59:31 2012 @@ -1503,6 +1503,10 @@ NTAPI MmReleaseMmInfo(struct _EPROCESS *Process); +NTSTATUS +NTAPI +MmSetExecuteOptions(IN ULONG ExecuteOptions); + VOID NTAPI MmDeleteProcessPageDirectory(struct _EPROCESS *Process); Modified: trunk/reactos/ntoskrnl/include/internal/se.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/se.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/se.h [iso-8859-1] Sat Feb 18 23:59:31 2012 @@ -226,6 +226,15 @@ KPROCESSOR_MODE PreviousMode ); +BOOLEAN +NTAPI +SeCheckPrivilegedObject( + IN LUID PrivilegeValue, + IN HANDLE ObjectHandle, + IN ACCESS_MASK DesiredAccess, + IN KPROCESSOR_MODE PreviousMode +); + NTSTATUS NTAPI SepDuplicateToken( Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86vdm.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] Sat Feb 18 23:59:31 2012 @@ -563,6 +563,34 @@ /* Exit to V86 mode */ KiEoiHelper(TrapFrame); } + +VOID +NTAPI +Ke386SetIOPL(VOID) +{ + + PKTHREAD Thread = KeGetCurrentThread(); + PKPROCESS Process = Thread->ApcState.Process; + PKTRAP_FRAME TrapFrame; + CONTEXT Context; + + /* IOPL was enabled for this process/thread */ + Process->Iopl = TRUE; + Thread->Iopl = TRUE; + + /* Get the trap frame on exit */ + TrapFrame = KeGetTrapFrame(Thread); + + /* Convert to a context */ + Context.ContextFlags = CONTEXT_CONTROL; + KeTrapFrameToContext(TrapFrame, NULL, &Context); + + /* Set the IOPL flag */ + Context.EFlags |= EFLAGS_IOPL; + + /* Convert back to a trap frame */ + KeContextToTrapFrame(&Context, NULL, TrapFrame, CONTEXT_CONTROL, UserMode); +} /* PUBLIC FUNCTIONS ***********************************************************/ Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Sat Feb 18 23:59:31 2012 @@ -1094,4 +1094,73 @@ return Status; } +NTSTATUS +NTAPI +MmSetExecuteOptions(IN ULONG ExecuteOptions) +{ + + PKPROCESS CurrentProcess = &PsGetCurrentProcess()->Pcb; + KLOCK_QUEUE_HANDLE ProcessLock; + NTSTATUS Status = STATUS_ACCESS_DENIED; + ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); + + /* Only accept valid flags */ + if (ExecuteOptions & ~MEM_EXECUTE_OPTION_VALID_FLAGS) + { + /* Fail */ + DPRINT1("Invalid no-execute options\n"); + return STATUS_INVALID_PARAMETER; + } + + /* Change the NX state in the process lock */ + KiAcquireProcessLock(CurrentProcess, &ProcessLock); + + /* Don't change anything if the permanent flag was set */ + if (!CurrentProcess->Flags.Permanent) + { + /* Start by assuming it's not disabled */ + CurrentProcess->Flags.ExecuteDisable = FALSE; + + /* Now process each flag and turn the equivalent bit on */ + if (ExecuteOptions & MEM_EXECUTE_OPTION_DISABLE) + { + CurrentProcess->Flags.ExecuteDisable = TRUE; + } + if (ExecuteOptions & MEM_EXECUTE_OPTION_ENABLE) + { + CurrentProcess->Flags.ExecuteEnable = TRUE; + } + if (ExecuteOptions & MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION) + { + CurrentProcess->Flags.DisableThunkEmulation = TRUE; + } + if (ExecuteOptions & MEM_EXECUTE_OPTION_PERMANENT) + { + CurrentProcess->Flags.Permanent = TRUE; + } + if (ExecuteOptions & MEM_EXECUTE_OPTION_EXECUTE_DISPATCH_ENABLE) + { + CurrentProcess->Flags.ExecuteDispatchEnable = TRUE; + } + if (ExecuteOptions & MEM_EXECUTE_OPTION_IMAGE_DISPATCH_ENABLE) + { + CurrentProcess->Flags.ImageDispatchEnable = TRUE; + } + + /* These are turned on by default if no-execution is also eanbled */ + if (CurrentProcess->Flags.ExecuteEnable) + { + CurrentProcess->Flags.ExecuteDispatchEnable = TRUE; + CurrentProcess->Flags.ImageDispatchEnable = TRUE; + } + + /* All good */ + Status = STATUS_SUCCESS; + } + + /* Release the lock and return status */ + KiReleaseProcessLock(&ProcessLock); + return Status; +} + /* EOF */ Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=55… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Sat Feb 18 23:59:31 2012 @@ -928,6 +928,8 @@ KAFFINITY ValidAffinity, Affinity = 0; ULONG DefaultHardErrorMode = 0, BasePriority = 0, MemoryPriority = 0; ULONG DisableBoost = 0, DebugFlags = 0, EnableFixup = 0, Boost = 0; + ULONG NoExecute = 0; + BOOLEAN HasPrivilege; PLIST_ENTRY Next; PETHREAD Thread; PAGED_CODE(); @@ -1189,8 +1191,17 @@ if ((PriorityClass.PriorityClass != Process->PriorityClass) && (PriorityClass.PriorityClass == PROCESS_PRIORITY_CLASS_REALTIME)) { - /* TODO: Check privileges */ - DPRINT1("Should check privilege\n"); + /* Check the privilege */ + HasPrivilege = SeCheckPrivilegedObject(SeIncreaseBasePriorityPrivilege, + ProcessHandle, + PROCESS_SET_INFORMATION, + PreviousMode); + if (!HasPrivilege) + { + ObDereferenceObject(Process); + DPRINT1("Privilege to change priority to realtime lacking\n"); + return STATUS_PRIVILEGE_NOT_HELD; + } } /* Check if we have a job */ @@ -1284,7 +1295,16 @@ /* Check if the new base is higher */ if (BasePriority > Process->Pcb.BasePriority) { - DPRINT1("Should check privilege\n"); + HasPrivilege = SeCheckPrivilegedObject(SeIncreaseBasePriorityPrivilege, + ProcessHandle, + PROCESS_SET_INFORMATION, + PreviousMode); + if (!HasPrivilege) + { + ObDereferenceObject(Process); + DPRINT1("Privilege to change priority from %lx to %lx lacking\n", BasePriority, Process->Pcb.BasePriority); + return STATUS_PRIVILEGE_NOT_HELD; + } } /* Call Ke */ @@ -1595,12 +1615,61 @@ KeSetAutoAlignmentProcess(&Process->Pcb, FALSE); Status = STATUS_SUCCESS; break; - + + case ProcessUserModeIOPL: + + /* Only TCB can do this */ + if (!SeSinglePrivilegeCheck(SeTcbPrivilege, PreviousMode)) + { + /* Fail */ + DPRINT1("Need TCB to set IOPL\n"); + Status = STATUS_PRIVILEGE_NOT_HELD; + break; + } + + /* Only supported on x86 */ +#if defined (_X86_) + Ke386SetIOPL(); +#endif + /* Done */ + break; + + case ProcessExecuteFlags: + + /* Check buffer length */ + if (ProcessInformationLength != sizeof(ULONG)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + if (ProcessHandle != NtCurrentProcess()) + { + Status = STATUS_INVALID_PARAMETER; + break; + } + + /* Enter SEH for direct buffer read */ + _SEH2_TRY + { + NoExecute = *(PULONG)ProcessInformation; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get exception code */ + Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(break); + } + _SEH2_END; + + /* Call Mm for the update */ + Status = MmSetExecuteOptions(NoExecute); + break; + /* We currently don't implement any of these */ case ProcessLdtInformation: case ProcessLdtSize: case ProcessIoPortHandlers: - case ProcessUserModeIOPL: case ProcessWx86Information: DPRINT1("VDM/16-bit Request not implemented: %lx\n", ProcessInformationClass); Status = STATUS_NOT_IMPLEMENTED; @@ -1623,11 +1692,6 @@ case ProcessHandleTracing: DPRINT1("Handle tracing not implemented\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - - case ProcessExecuteFlags: - DPRINT1("No execute support not implemented\n"); Status = STATUS_NOT_IMPLEMENTED; break; Modified: trunk/reactos/ntoskrnl/se/priv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/priv.c?rev=556… ============================================================================== --- trunk/reactos/ntoskrnl/se/priv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/priv.c [iso-8859-1] Sat Feb 18 23:59:31 2012 @@ -426,6 +426,44 @@ return Result; } +BOOLEAN +NTAPI +SeCheckPrivilegedObject(IN LUID PrivilegeValue, + IN HANDLE ObjectHandle, + IN ACCESS_MASK DesiredAccess, + IN KPROCESSOR_MODE PreviousMode) +{ + SECURITY_SUBJECT_CONTEXT SubjectContext; + PRIVILEGE_SET Priv; + BOOLEAN Result; + + PAGED_CODE(); + + SeCaptureSubjectContext(&SubjectContext); + + Priv.PrivilegeCount = 1; + Priv.Control = PRIVILEGE_SET_ALL_NECESSARY; + Priv.Privilege[0].Luid = PrivilegeValue; + Priv.Privilege[0].Attributes = SE_PRIVILEGE_ENABLED; + + Result = SePrivilegeCheck(&Priv, &SubjectContext, PreviousMode); + if (PreviousMode != KernelMode) + { +#if 0 + SePrivilegeObjectAuditAlarm(ObjectHandle, + &SubjectContext, + DesiredAccess, + &PrivilegeValue, + Result, + PreviousMode); +#endif + } + + SeReleaseSubjectContext(&SubjectContext); + + return Result; +} + /* SYSTEM CALLS ***************************************************************/ NTSTATUS

12 years, 7 months

← Newer
1
...
22
23
24
25
26
27
28
...
58
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2012