Ros-diffs December 2012

ros-diffs@reactos.org

12 participants
287 discussions

[jgardou] 57822: [INCLUDE/CRT] - Add _MCW_DN definition

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Dec 8 17:40:28 2012 New Revision: 57822 URL: http://svn.reactos.org/svn/reactos?rev=57822&view=rev Log: [INCLUDE/CRT] - Add _MCW_DN definition Modified: trunk/reactos/include/crt/float.h Modified: trunk/reactos/include/crt/float.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/float.h?rev=57… ============================================================================== --- trunk/reactos/include/crt/float.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/float.h [iso-8859-1] Sat Dec 8 17:40:28 2012 @@ -41,6 +41,7 @@ #define _MCW_IC 0x00040000 /* Infinity */ #define _MCW_RC 0x00000300 /* Rounding */ #define _MCW_PC 0x00030000 /* Precision */ +#define _MCW_DN 0x03000000 /* Denormal */ /* Control word values for unNew (use with related unMask above) */ #define _EM_INVALID 0x00000010

11 years, 9 months

[ekohl] 57821: [LSASRV] - Add a trusted flag to the lsa object type. - Inherit the trusted flag from the policy object when an account or secret object is created or opened. - Set the trusted flag ...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Dec 8 17:18:17 2012 New Revision: 57821 URL: http://svn.reactos.org/svn/reactos?rev=57821&view=rev Log: [LSASRV] - Add a trusted flag to the lsa object type. - Inherit the trusted flag from the policy object when an account or secret object is created or opened. - Set the trusted flag for a policy object in LsaIOpenPolicyTrusted. Modified: trunk/reactos/dll/win32/lsasrv/database.c trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/lsasrv/policy.c Modified: trunk/reactos/dll/win32/lsasrv/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/database.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] Sat Dec 8 17:18:17 2012 @@ -304,6 +304,7 @@ L"Policy", LsaDbPolicyObject, 0, + TRUE, &PolicyObject); if (!NT_SUCCESS(Status)) goto done; @@ -434,6 +435,7 @@ L"Policy", LsaDbPolicyObject, 0, + TRUE, &PolicyObject); if (!NT_SUCCESS(Status)) goto done; @@ -596,6 +598,7 @@ IN LPWSTR ObjectName, IN LSA_DB_OBJECT_TYPE ObjectType, IN ACCESS_MASK DesiredAccess, + IN BOOLEAN Trusted, OUT PLSA_DB_OBJECT *DbObject) { PLSA_DB_OBJECT NewObject; @@ -698,6 +701,7 @@ NewObject->Access = DesiredAccess; NewObject->KeyHandle = ObjectKeyHandle; NewObject->ParentObject = ParentObject; + NewObject->Trusted = Trusted; if (ParentObject != NULL) ParentObject->RefCount++; @@ -714,6 +718,7 @@ IN LPWSTR ObjectName, IN LSA_DB_OBJECT_TYPE ObjectType, IN ACCESS_MASK DesiredAccess, + IN BOOLEAN Trusted, OUT PLSA_DB_OBJECT *DbObject) { PLSA_DB_OBJECT NewObject; @@ -809,6 +814,7 @@ NewObject->Access = DesiredAccess; NewObject->KeyHandle = ObjectKeyHandle; NewObject->ParentObject = ParentObject; + NewObject->Trusted = Trusted; if (ParentObject != NULL) ParentObject->RefCount++; Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sat Dec 8 17:18:17 2012 @@ -258,6 +258,7 @@ L"Policy", LsaDbPolicyObject, DesiredAccess, + FALSE, &PolicyObject); RtlLeaveCriticalSection(&PolicyHandleTableLock); @@ -592,6 +593,7 @@ SidString, LsaDbAccountObject, DesiredAccess, + PolicyObject->Trusted, &AccountObject); if (!NT_SUCCESS(Status)) { @@ -1036,6 +1038,7 @@ SecretName->Buffer, LsaDbSecretObject, DesiredAccess, + PolicyObject->Trusted, &SecretObject); if (!NT_SUCCESS(Status)) { @@ -1131,6 +1134,7 @@ SidString, LsaDbAccountObject, DesiredAccess, + PolicyObject->Trusted, &AccountObject); if (!NT_SUCCESS(Status)) { @@ -1241,6 +1245,7 @@ return Status; } + /* Get the size of the Privilgs attribute */ Status = LsapGetObjectAttribute(AccountObject, L"Privilgs", NULL, @@ -1348,7 +1353,7 @@ } } - /* Set the new priivliege set */ + /* Set the new privilege set */ Status = LsapSetObjectAttribute(AccountObject, L"Privilgs", NewPrivileges, @@ -1591,6 +1596,7 @@ SecretName->Buffer, LsaDbSecretObject, DesiredAccess, + PolicyObject->Trusted, &SecretObject); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Sat Dec 8 17:18:17 2012 @@ -47,6 +47,7 @@ ULONG RefCount; ACCESS_MASK Access; HANDLE KeyHandle; + BOOLEAN Trusted; struct _LSA_DB_OBJECT *ParentObject; } LSA_DB_OBJECT, *PLSA_DB_OBJECT; @@ -87,6 +88,7 @@ IN LPWSTR ObjectName, IN LSA_DB_OBJECT_TYPE HandleType, IN ACCESS_MASK DesiredAccess, + IN BOOLEAN Trusted, OUT PLSA_DB_OBJECT *DbObject); NTSTATUS @@ -95,6 +97,7 @@ IN LPWSTR ObjectName, IN LSA_DB_OBJECT_TYPE ObjectType, IN ACCESS_MASK DesiredAccess, + IN BOOLEAN Trusted, OUT PLSA_DB_OBJECT *DbObject); NTSTATUS Modified: trunk/reactos/dll/win32/lsasrv/policy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/policy.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/policy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/policy.c [iso-8859-1] Sat Dec 8 17:18:17 2012 @@ -29,6 +29,7 @@ L"Policy", LsaDbPolicyObject, POLICY_ALL_ACCESS, + TRUE, &PolicyObject); if (NT_SUCCESS(Status))

11 years, 9 months

[jgardou] 57820: [SHELL32] - Use CPL_STARTWPARMSW since we are sending a unicode string

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Dec 8 16:34:08 2012 New Revision: 57820 URL: http://svn.reactos.org/svn/reactos?rev=57820&view=rev Log: [SHELL32] - Use CPL_STARTWPARMSW since we are sending a unicode string Modified: trunk/reactos/dll/win32/shell32/control.cpp Modified: trunk/reactos/dll/win32/shell32/control.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/control.… ============================================================================== --- trunk/reactos/dll/win32/shell32/control.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/control.cpp [iso-8859-1] Sat Dec 8 16:34:08 2012 @@ -432,7 +432,7 @@ /* Start the applet */ TRACE("Starting applet %d\n", i); if (!pApplet->proc(pApplet->hWnd, CPL_DBLCLK, i, pApplet->info[i].lData)) - pApplet->proc(pApplet->hWnd, CPL_STARTWPARMSA, i, (LPARAM)pwszArg); + pApplet->proc(pApplet->hWnd, CPL_STARTWPARMSW, i, (LPARAM)pwszArg); } else ERR("Applet not found: %ls\n", pwszArg ? pwszArg : L"NULL");

11 years, 9 months

[hbelusca] 57819: [CONSRV] - Delete all the remnants of Win32CsrValidateBuffer calls, which were replaced by standard CsrValidateMessageBuffer calls, and therefore delete the unused server.c file. ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Dec 8 16:13:16 2012 New Revision: 57819 URL: http://svn.reactos.org/svn/reactos?rev=57819&view=rev Log: [CONSRV] - Delete all the remnants of Win32CsrValidateBuffer calls, which were replaced by standard CsrValidateMessageBuffer calls, and therefore delete the unused server.c file. - Adapt WriteConsole API to use CSR waits. This replaces the old event-based waiting. TODO: Dereference all the waits in Console->WriteWaitQueue. Removed: branches/ros-csrss/win32ss/user/consrv/server.c Modified: branches/ros-csrss/include/reactos/subsys/win/conmsg.h branches/ros-csrss/win32ss/user/consrv/CMakeLists.txt branches/ros-csrss/win32ss/user/consrv/alias.c branches/ros-csrss/win32ss/user/consrv/conio.h branches/ros-csrss/win32ss/user/consrv/conoutput.c branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/consrv/consrv.h branches/ros-csrss/win32ss/user/consrv/lineinput.c Modified: branches/ros-csrss/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/win/conmsg.h [iso-8859-1] Sat Dec 8 16:13:16 2012 @@ -135,7 +135,6 @@ BOOL Unicode; ULONG NrCharactersToWrite; ULONG NrCharactersWritten; - // HANDLE UnpauseEvent; ULONG BufferSize; PVOID Buffer; Modified: branches/ros-csrss/win32ss/user/consrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/C… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/CMakeLists.txt [iso-8859-1] Sat Dec 8 16:13:16 2012 @@ -15,7 +15,6 @@ handle.c init.c lineinput.c - server.c tuiconsole.c consrv.rc ${CMAKE_CURRENT_BINARY_DIR}/consrv.def) Modified: branches/ros-csrss/win32ss/user/consrv/alias.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/a… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/alias.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/alias.c [iso-8859-1] Sat Dec 8 16:13:16 2012 @@ -438,15 +438,6 @@ return STATUS_BUFFER_TOO_SMALL; } -/* - if (!Win32CsrValidateBuffer(CsrGetClientThread()->Process, lpTarget, - ConsoleAlias->TargetLength, 1)) - { - ConioUnlockConsole(Console); - return STATUS_ACCESS_VIOLATION; - } -*/ - wcscpy(lpTarget, Entry->lpTarget); ConsoleAlias->TargetLength = Length; ConioUnlockConsole(Console); @@ -496,17 +487,6 @@ return STATUS_BUFFER_OVERFLOW; } -/* - if (!Win32CsrValidateBuffer(CsrGetClientThread()->Process, - GetAllConsoleAliases->AliasesBuffer, - GetAllConsoleAliases->AliasesBufferLength, - 1)) - { - ConioUnlockConsole(Console); - return STATUS_ACCESS_VIOLATION; - } -*/ - BytesWritten = IntGetAllConsoleAliases(Header, GetAllConsoleAliases->AliasesBuffer, GetAllConsoleAliases->AliasesBufferLength); @@ -592,17 +572,6 @@ return STATUS_INVALID_PARAMETER; } -/* - if (!Win32CsrValidateBuffer(CsrGetClientThread()->Process, - GetConsoleAliasesExes->ExeNames, - GetConsoleAliasesExes->Length, - 1)) - { - ConioUnlockConsole(Console); - return STATUS_ACCESS_VIOLATION; - } -*/ - BytesWritten = IntGetConsoleAliasesExes(Console->Aliases, GetConsoleAliasesExes->ExeNames, GetConsoleAliasesExes->Length); Modified: branches/ros-csrss/win32ss/user/consrv/conio.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] Sat Dec 8 16:13:16 2012 @@ -52,8 +52,8 @@ LONG ReferenceCount; CRITICAL_SECTION Lock; struct tagCSRSS_CONSOLE *Prev, *Next; /* Next and Prev consoles in console wheel */ - HANDLE ActiveEvent; + HANDLE ActiveEvent; /* Event set when an input event is added in its queue */ LIST_ENTRY ReadWaitQueue; /* List head for the queue of read wait blocks */ LIST_ENTRY InputEvents; /* List head for input event queue */ @@ -83,8 +83,10 @@ LIST_ENTRY ProcessList; struct tagALIAS_HEADER *Aliases; CONSOLE_SELECTION_INFO Selection; + BYTE PauseFlags; HANDLE UnpauseEvent; + LIST_ENTRY WriteWaitQueue; /* List head for the queue of write wait blocks */ } CSRSS_CONSOLE, *PCSRSS_CONSOLE; typedef struct tagCSRSS_CONSOLE_VTBL Modified: branches/ros-csrss/win32ss/user/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/conoutput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/conoutput.c [iso-8859-1] Sat Dec 8 16:13:16 2012 @@ -131,22 +131,6 @@ for (i = 0; i < Length; i++) { - if (Console->UnpauseEvent) - { -/** FIXME: Added in 47359 for pausing - Status = NtDuplicateObject(NtCurrentProcess(), - Console->UnpauseEvent, - Process->ProcessHandle, - &WriteConsoleRequest->UnpauseEvent, - SYNCHRONIZE, 0, 0); - ConioUnlockScreenBuffer(Buff); - return (NT_SUCCESS(Status) ? STATUS_PENDING : Status); -**/ - - /* Wait on the console unpause event till it becomes signaled */ - WaitForSingleObject(Console->UnpauseEvent, INFINITE); - } - if (Buff->Mode & ENABLE_PROCESSED_OUTPUT) { /* --- LF --- */ @@ -446,6 +430,122 @@ return Size; } +static NTSTATUS +DoWriteConsole(IN PCSR_API_MESSAGE ApiMessage, + IN PCSR_THREAD ClientThread, + IN BOOL CreateWaitBlock OPTIONAL); + +// Wait function CSR_WAIT_FUNCTION +static BOOLEAN +WriteConsoleThread(IN PLIST_ENTRY WaitList, + IN PCSR_THREAD WaitThread, + IN PCSR_API_MESSAGE WaitApiMessage, + IN PVOID WaitContext, + IN PVOID WaitArgument1, + IN PVOID WaitArgument2, + IN ULONG WaitFlags) +{ + NTSTATUS Status; + + Status = DoWriteConsole(WaitApiMessage, + WaitThread, + FALSE); + + if (Status != STATUS_PENDING) + { + WaitApiMessage->Status = Status; + } + + return (Status == STATUS_PENDING ? FALSE : TRUE); +} + +static NTSTATUS +DoWriteConsole(IN PCSR_API_MESSAGE ApiMessage, + IN PCSR_THREAD ClientThread, + IN BOOL CreateWaitBlock OPTIONAL) +{ + NTSTATUS Status = STATUS_SUCCESS; + PCSRSS_WRITE_CONSOLE WriteConsoleRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.WriteConsoleRequest; + PCSRSS_CONSOLE Console; + PCSRSS_SCREEN_BUFFER Buff; + PCHAR Buffer; + DWORD Written = 0; + ULONG Length; + + Status = ConioLockScreenBuffer(ConsoleGetPerProcessData(ClientThread->Process), WriteConsoleRequest->ConsoleHandle, &Buff, GENERIC_WRITE); + if (!NT_SUCCESS(Status)) return Status; + + Console = Buff->Header.Console; + + // if (Console->PauseFlags & (PAUSED_FROM_KEYBOARD | PAUSED_FROM_SCROLLBAR | PAUSED_FROM_SELECTION)) + if (Console->PauseFlags && Console->UnpauseEvent != NULL) + { + if (CreateWaitBlock) + { + if (!CsrCreateWait(&Console->WriteWaitQueue, + WriteConsoleThread, + ClientThread, + ApiMessage, + NULL, + NULL)) + { + ConioUnlockScreenBuffer(Buff); + return STATUS_NO_MEMORY; + } + } + + /* Wait until we un-pause the console */ + ConioUnlockScreenBuffer(Buff); + return STATUS_PENDING; + } + + if(WriteConsoleRequest->Unicode) + { + Length = WideCharToMultiByte(Console->OutputCodePage, 0, + (PWCHAR)WriteConsoleRequest->Buffer, + WriteConsoleRequest->NrCharactersToWrite, + NULL, 0, NULL, NULL); + Buffer = RtlAllocateHeap(GetProcessHeap(), 0, Length); + if (Buffer) + { + WideCharToMultiByte(Console->OutputCodePage, 0, + (PWCHAR)WriteConsoleRequest->Buffer, + WriteConsoleRequest->NrCharactersToWrite, + Buffer, Length, NULL, NULL); + } + else + { + Status = STATUS_NO_MEMORY; + } + } + else + { + Buffer = (PCHAR)WriteConsoleRequest->Buffer; + } + + if (Buffer) + { + if (NT_SUCCESS(Status)) + { + Status = ConioWriteConsole(Console, Buff, Buffer, + WriteConsoleRequest->NrCharactersToWrite, TRUE); + if (NT_SUCCESS(Status)) + { + Written = WriteConsoleRequest->NrCharactersToWrite; + } + } + if (WriteConsoleRequest->Unicode) + { + RtlFreeHeap(GetProcessHeap(), 0, Buffer); + } + } + + WriteConsoleRequest->NrCharactersWritten = Written; + + ConioUnlockScreenBuffer(Buff); + return Status; +} + /* PUBLIC APIS ****************************************************************/ @@ -485,15 +585,6 @@ Status = ConioLockScreenBuffer(ProcessData, ReadConsoleOutputRequest->ConsoleHandle, &Buff, GENERIC_READ); if (!NT_SUCCESS(Status)) return Status; -/* - if (!Win32CsrValidateBuffer(ProcessData->Process, CharInfo, - BufferSize.X * BufferSize.Y, sizeof(CHAR_INFO))) - { - ConioUnlockScreenBuffer(Buff); - return STATUS_ACCESS_VIOLATION; - } -*/ - /* FIXME: Is this correct? */ CodePage = ProcessData->Console->OutputCodePage; @@ -546,13 +637,6 @@ { NTSTATUS Status; PCSRSS_WRITE_CONSOLE WriteConsoleRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.WriteConsoleRequest; - PCHAR Buffer; - PCSRSS_SCREEN_BUFFER Buff; - // PCSR_PROCESS Process = CsrGetClientThread()->Process; - PCSRSS_CONSOLE Console; - DWORD Written = 0; - ULONG Length; - // ULONG CharSize = (WriteConsoleRequest->Unicode ? sizeof(WCHAR) : sizeof(CHAR)); DPRINT("SrvWriteConsole\n"); @@ -564,68 +648,12 @@ return STATUS_INVALID_PARAMETER; } - Status = ConioLockScreenBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), WriteConsoleRequest->ConsoleHandle, &Buff, GENERIC_WRITE); - if (!NT_SUCCESS(Status)) return Status; - - Console = Buff->Header.Console; - -/** FIXME: Added in 47359 for pausing - if (Console->UnpauseEvent) - { - Status = NtDuplicateObject(NtCurrentProcess(), - Console->UnpauseEvent, - Process->ProcessHandle, - &WriteConsoleRequest->UnpauseEvent, - SYNCHRONIZE, 0, 0); - ConioUnlockScreenBuffer(Buff); - return (NT_SUCCESS(Status) ? STATUS_PENDING : Status); - } -**/ - - if(WriteConsoleRequest->Unicode) - { - Length = WideCharToMultiByte(Console->OutputCodePage, 0, - (PWCHAR)WriteConsoleRequest->Buffer, - WriteConsoleRequest->NrCharactersToWrite, - NULL, 0, NULL, NULL); - Buffer = RtlAllocateHeap(GetProcessHeap(), 0, Length); - if (Buffer) - { - WideCharToMultiByte(Console->OutputCodePage, 0, - (PWCHAR)WriteConsoleRequest->Buffer, - WriteConsoleRequest->NrCharactersToWrite, - Buffer, Length, NULL, NULL); - } - else - { - Status = STATUS_NO_MEMORY; - } - } - else - { - Buffer = (PCHAR)WriteConsoleRequest->Buffer; - } - - if (Buffer) - { - if (NT_SUCCESS(Status)) - { - Status = ConioWriteConsole(Console, Buff, Buffer, - WriteConsoleRequest->NrCharactersToWrite, TRUE); - if (NT_SUCCESS(Status)) - { - Written = WriteConsoleRequest->NrCharactersToWrite; - } - } - if (WriteConsoleRequest->Unicode) - { - RtlFreeHeap(GetProcessHeap(), 0, Buffer); - } - } - - ConioUnlockScreenBuffer(Buff); - - WriteConsoleRequest->NrCharactersWritten = Written; + Status = DoWriteConsole(ApiMessage, + CsrGetClientThread(), + TRUE); + + if (Status == STATUS_PENDING) + *ReplyCode = CsrReplyPending; return Status; } @@ -667,15 +695,6 @@ if (!NT_SUCCESS(Status)) return Status; Console = Buff->Header.Console; - -/* - if (!Win32CsrValidateBuffer(ProcessData->Process, CharInfo, - BufferSize.X * BufferSize.Y, sizeof(CHAR_INFO))) - { - ConioUnlockScreenBuffer(Buff); - return STATUS_ACCESS_VIOLATION; - } -*/ WriteRegion = WriteConsoleOutputRequest->WriteRegion; Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] Sat Dec 8 16:13:16 2012 @@ -115,6 +115,7 @@ InitializeListHead(&Console->BufferList); Console->ActiveBuffer = NULL; InitializeListHead(&Console->ReadWaitQueue); + InitializeListHead(&Console->WriteWaitQueue); InitializeListHead(&Console->InputEvents); InitializeListHead(&Console->HistoryBuffers); Console->CodePage = GetOEMCP(); @@ -426,6 +427,7 @@ DPRINT("ConioDeleteConsole\n"); /* TODO: Dereference all the waits in Console->ReadWaitQueue */ + /* TODO: Dereference all the waits in Console->WriteWaitQueue */ /* Drain input event queue */ while (Console->InputEvents.Flink != &Console->InputEvents) @@ -476,11 +478,18 @@ ConioUnpause(PCSRSS_CONSOLE Console, UINT Flags) { Console->PauseFlags &= ~Flags; + + // if ((Console->PauseFlags & (PAUSED_FROM_KEYBOARD | PAUSED_FROM_SCROLLBAR | PAUSED_FROM_SELECTION)) == 0) if (Console->PauseFlags == 0 && Console->UnpauseEvent) { SetEvent(Console->UnpauseEvent); CloseHandle(Console->UnpauseEvent); Console->UnpauseEvent = NULL; + + CsrNotifyWait(&Console->WriteWaitQueue, + WaitAll, + NULL, + NULL); } } @@ -569,13 +578,6 @@ { return STATUS_INVALID_PARAMETER; } -/* - if (!Win32CsrValidateBuffer(Process, TitleRequest->Title, - TitleRequest->Length, 1)) - { - return STATUS_ACCESS_VIOLATION; - } -*/ Status = ConioConsoleFromProcessData(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console); if(NT_SUCCESS(Status)) @@ -626,13 +628,6 @@ { return STATUS_INVALID_PARAMETER; } -/* - if (!Win32CsrValidateBuffer(Process, TitleRequest->Title, - TitleRequest->Length, 1)) - { - return STATUS_ACCESS_VIOLATION; - } -*/ Status = ConioConsoleFromProcessData(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console); if (!NT_SUCCESS(Status)) @@ -846,11 +841,6 @@ Buffer = GetProcessListRequest->pProcessIds; -/* - if (!Win32CsrValidateBuffer(ProcessData, Buffer, GetProcessListRequest->nMaxIds, sizeof(DWORD))) - return STATUS_ACCESS_VIOLATION; -*/ - Status = ConioConsoleFromProcessData(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console); if (!NT_SUCCESS(Status)) return Status; Modified: branches/ros-csrss/win32ss/user/consrv/consrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/consrv.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/consrv.h [iso-8859-1] Sat Dec 8 16:13:16 2012 @@ -140,14 +140,6 @@ CSR_API(SrvGetConsoleHistory); CSR_API(SrvSetConsoleHistory); -/* server.c */ -#if 0 -BOOL FASTCALL Win32CsrValidateBuffer(PCSR_PROCESS ProcessData, - PVOID Buffer, - SIZE_T NumElements, - SIZE_T ElementSize); -#endif - #endif // __CONSRV_H__ /* EOF */ Modified: branches/ros-csrss/win32ss/user/consrv/lineinput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/lineinput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/lineinput.c [iso-8859-1] Sat Dec 8 16:13:16 2012 @@ -166,14 +166,6 @@ { return STATUS_INVALID_PARAMETER; } -/* - if (!Win32CsrValidateBuffer(ProcessData->Process, - GetCommandHistoryLength->ExeName.Buffer, - GetCommandHistoryLength->ExeName.Length, 1)) - { - return STATUS_ACCESS_VIOLATION; - } -*/ Status = ConioConsoleFromProcessData(ProcessData, &Console); if (NT_SUCCESS(Status)) @@ -212,15 +204,6 @@ { return STATUS_INVALID_PARAMETER; } -/* - if (!Win32CsrValidateBuffer(ProcessData->Process, Buffer, BufferSize, 1) || - !Win32CsrValidateBuffer(ProcessData->Process, - GetCommandHistory->ExeName.Buffer, - GetCommandHistory->ExeName.Length, 1)) - { - return STATUS_ACCESS_VIOLATION; - } -*/ Status = ConioConsoleFromProcessData(ProcessData, &Console); if (NT_SUCCESS(Status)) @@ -262,14 +245,6 @@ { return STATUS_INVALID_PARAMETER; } -/* - if (!Win32CsrValidateBuffer(ProcessData->Process, - ExpungeCommandHistory->ExeName.Buffer, - ExpungeCommandHistory->ExeName.Length, 1)) - { - return STATUS_ACCESS_VIOLATION; - } -*/ Status = ConioConsoleFromProcessData(ProcessData, &Console); if (NT_SUCCESS(Status)) @@ -298,14 +273,6 @@ { return STATUS_INVALID_PARAMETER; } -/* - if (!Win32CsrValidateBuffer(ProcessData->Process, - SetHistoryNumberCommands->ExeName.Buffer, - SetHistoryNumberCommands->ExeName.Length, 1)) - { - return STATUS_ACCESS_VIOLATION; - } -*/ Status = ConioConsoleFromProcessData(ProcessData, &Console); if (NT_SUCCESS(Status)) Removed: branches/ros-csrss/win32ss/user/consrv/server.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/s… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/server.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/server.c (removed) @@ -1,42 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/consrv/init.c - * PURPOSE: Server APIs - * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) - */ - -#include "consrv.h" - -#define NDEBUG -#include <debug.h> - -#if 0 -/* Ensure that a captured buffer is safe to access */ -BOOL FASTCALL -Win32CsrValidateBuffer(PCSR_PROCESS ProcessData, PVOID Buffer, - SIZE_T NumElements, SIZE_T ElementSize) -{ - /* Check that the following conditions are true: - * 1. The start of the buffer is somewhere within the process's - * shared memory section view. - * 2. The remaining space in the view is at least as large as the buffer. - * (NB: Please don't try to "optimize" this by using multiplication - * instead of division; remember that 2147483648 * 2 = 0.) - * 3. The buffer is DWORD-aligned. - */ - ULONG_PTR Offset = (BYTE *)Buffer - (BYTE *)ProcessData->ClientViewBase; - if (Offset >= ProcessData->ClientViewBounds - || NumElements > (ProcessData->ClientViewBounds - Offset) / ElementSize - || (Offset & (sizeof(DWORD) - 1)) != 0) - { - DPRINT1("Invalid buffer %p(%u*%u); section view is %p(%u)\n", - Buffer, NumElements, ElementSize, - ProcessData->ClientViewBase, ProcessData->ClientViewBounds); - return FALSE; - } - return TRUE; -} -#endif - -/* EOF */

11 years, 9 months

[hbelusca] 57818: [CONSRV] "Reply Already Sent" and not already done !

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Dec 8 00:45:41 2012 New Revision: 57818 URL: http://svn.reactos.org/svn/reactos?rev=57818&view=rev Log: [CONSRV] "Reply Already Sent" and not already done ! Modified: branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h branches/ros-csrss/subsystems/win32/csrsrv/api.c Modified: branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] Sat Dec 8 00:45:41 2012 @@ -133,7 +133,7 @@ CsrReplyImmediately = 0, CsrReplyPending = 1, CsrReplyDeadClient = 2, - CsrReplyAlreadyDone = 3 + CsrReplyAlreadySent = 3 } CSR_REPLY_CODE, *PCSR_REPLY_CODE; Modified: branches/ros-csrss/subsystems/win32/csrsrv/api.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/api.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/api.c [iso-8859-1] Sat Dec 8 00:45:41 2012 @@ -817,7 +817,7 @@ Teb->CsrClientThread = CurrentThread; - if (ReplyCode == CsrReplyAlreadyDone) + if (ReplyCode == CsrReplyAlreadySent) { if (ReceiveMsg.CsrCaptureData) {

11 years, 9 months

[hbelusca] 57817: [KERNEL32] - Simplify IntGetConsoleInput and IntReadConsole. [CONSRV] - Implement event waiting for reading console input buffer with CSR wait blocks. This replaces the event-base...

by hbelusca＠svn.reactos.org

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

11 years, 9 months

[janderwald] 57816: [HIDUSB] - Retry retrieving report descriptor with old hid version - #CORE-6575 for details

by janderwald＠svn.reactos.org

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

11 years, 9 months

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

by tfaber＠svn.reactos.org

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

11 years, 9 months

[janderwald] 57814: [NDIS] - Fix several bugs in NdisOpenFile - Introduced in rev 5990 (5/9/2003)

by janderwald＠svn.reactos.org

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

11 years, 9 months

[janderwald] 57813: [LIBUSB] - Set USBD status when a device is successfully configured and transferred length for vendor class requests - Add error msg when copying of interface descriptor fails

by janderwald＠svn.reactos.org

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

11 years, 9 months

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 December 2012