Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 57827: [USETUP] Finish to translate "ReactOS xxxxx Setup".
by hbelusca＠svn.reactos.org 08 Dec '12

08 Dec '12

Author: hbelusca Date: Sat Dec 8 21:09:57 2012 New Revision: 57827 URL: http://svn.reactos.org/svn/reactos?rev=57827&view=rev Log: [USETUP] Finish to translate "ReactOS xxxxx Setup". Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/it-IT.h Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Sat Dec 8 21:09:57 2012 @@ -1265,7 +1265,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Sat Dec 8 21:09:57 2012 @@ -1253,7 +1253,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, {

1 0

[janderwald] 57826: [USBCCGP] - Add debugging function to analyze configuration descriptor - Remove assert CORE-6574
by janderwald＠svn.reactos.org 08 Dec '12

08 Dec '12

Author: janderwald Date: Sat Dec 8 19:52:10 2012 New Revision: 57826 URL: http://svn.reactos.org/svn/reactos?rev=57826&view=rev Log: [USBCCGP] - Add debugging function to analyze configuration descriptor - Remove assert CORE-6574 Modified: trunk/reactos/drivers/usb/usbccgp/descriptor.c Modified: trunk/reactos/drivers/usb/usbccgp/descriptor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/descri… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/descriptor.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/descriptor.c [iso-8859-1] Sat Dec 8 19:52:10 2012 @@ -268,6 +268,41 @@ return STATUS_SUCCESS; } +VOID +DumpFullConfigurationDescriptor( + IN PFDO_DEVICE_EXTENSION FDODeviceExtension, + IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor) +{ + PUSB_COMMON_DESCRIPTOR Descriptor; + + Descriptor = (PUSB_COMMON_DESCRIPTOR)ConfigurationDescriptor; + + DbgPrint("Bogus ConfigurationDescriptor Found\n"); + DbgPrint("InterfaceCount %x\n", ConfigurationDescriptor->bNumInterfaces); + + do + { + if (((ULONG_PTR)Descriptor + Descriptor->bLength) <= ((ULONG_PTR)ConfigurationDescriptor + ConfigurationDescriptor->wTotalLength)) + break; + + DbgPrint("Descriptor Type %x Length %lu Offset %lu\n", Descriptor->bDescriptorType, Descriptor->bLength, ((ULONG_PTR)Descriptor - (ULONG_PTR)ConfigurationDescriptor)); + + // check for invalid descriptors + if (!Descriptor->bLength) + { + DbgPrint("Bogus Descriptor!!!\n"); + break; + } + + // advance to next descriptor + Descriptor = (PUSB_COMMON_DESCRIPTOR)((ULONG_PTR)Descriptor + Descriptor->bLength); + + }while(TRUE); + + +} + + NTSTATUS NTAPI USBCCGP_ScanConfigurationDescriptor( @@ -309,7 +344,6 @@ // parse configuration descriptor // InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(ConfigurationDescriptor, ConfigurationDescriptor, InterfaceIndex, -1, -1, -1, -1); - ASSERT(InterfaceDescriptor); if (InterfaceDescriptor) { // @@ -319,6 +353,17 @@ FDODeviceExtension->InterfaceListCount++; CurrentPosition = (PVOID)((ULONG_PTR)InterfaceDescriptor + InterfaceDescriptor->bLength); } + else + { + DumpFullConfigurationDescriptor(FDODeviceExtension, ConfigurationDescriptor); + + // + // see issue + // CORE-6574 Test 3 (USB Web Cam) + // + if (FDODeviceExtension->DeviceDescriptor && FDODeviceExtension->DeviceDescriptor->idVendor == 0x0458 && FDODeviceExtension->DeviceDescriptor->idProduct == 0x705f) + ASSERT(FALSE); + } // // move to next interface

1 0

[janderwald] 57825: [HIDCLASS] - Handle device initialization errors CORE-6575
by janderwald＠svn.reactos.org 08 Dec '12

08 Dec '12

Author: janderwald Date: Sat Dec 8 19:17:35 2012 New Revision: 57825 URL: http://svn.reactos.org/svn/reactos?rev=57825&view=rev Log: [HIDCLASS] - Handle device initialization errors CORE-6575 Modified: trunk/reactos/drivers/hid/hidclass/fdo.c Modified: trunk/reactos/drivers/hid/hidclass/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/fdo.c… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/fdo.c [iso-8859-1] Sat Dec 8 19:17:35 2012 @@ -350,7 +350,13 @@ // query capabilities // Status = HidClassFDO_QueryCapabilities(DeviceObject, &FDODeviceExtension->Capabilities); - ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + { + DPRINT1("[HIDCLASS] Failed to retrieve capabilities %x\n", Status); + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } // // lets start the lower device too @@ -369,13 +375,25 @@ // lets get the descriptors // Status = HidClassFDO_GetDescriptors(DeviceObject); - ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + { + DPRINT1("[HIDCLASS] Failed to retrieve the descriptors %x\n", Status); + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } // // now get the the collection description // Status = HidP_GetCollectionDescription(FDODeviceExtension->ReportDescriptor, FDODeviceExtension->HidDescriptor.DescriptorList[0].wReportLength, NonPagedPool, &FDODeviceExtension->Common.DeviceDescription); - ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + { + DPRINT1("[HIDCLASS] Failed to retrieve the collection description %x\n", Status); + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } // // complete request

1 0

[jgardou] 57824: [CRT] - Fix build
by jgardou＠svn.reactos.org 08 Dec '12

08 Dec '12

Author: jgardou Date: Sat Dec 8 17:46:27 2012 New Revision: 57824 URL: http://svn.reactos.org/svn/reactos?rev=57824&view=rev Log: [CRT] - Fix build Modified: trunk/reactos/lib/sdk/crt/float/i386/cntrlfp.c Modified: trunk/reactos/lib/sdk/crt/float/i386/cntrlfp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/i386/cnt… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/i386/cntrlfp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/float/i386/cntrlfp.c [iso-8859-1] Sat Dec 8 17:46:27 2012 @@ -125,7 +125,7 @@ if (!MSVCRT_CHECK_PMT( !(newval & mask & ~(_MCW_EM | _MCW_IC | _MCW_RC | _MCW_PC | _MCW_DN)))) { if (cur) *cur = _controlfp( 0, 0 ); /* retrieve it anyway */ - return MSVCRT_EINVAL; + return EINVAL; } val = _controlfp( newval, mask ); if (cur) *cur = val;

1 0

[jgardou] 57823: [MSVCRT] - Properly implement and export _fpcontrol_s
by jgardou＠svn.reactos.org 08 Dec '12

08 Dec '12

Author: jgardou Date: Sat Dec 8 17:44:38 2012 New Revision: 57823 URL: http://svn.reactos.org/svn/reactos?rev=57823&view=rev Log: [MSVCRT] - Properly implement and export _fpcontrol_s Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec trunk/reactos/lib/sdk/crt/float/i386/cntrlfp.c Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Sat Dec 8 17:44:38 2012 @@ -302,7 +302,7 @@ @ extern _commode @ cdecl _control87(long long) @ cdecl _controlfp(long long) -# @ cdecl _controlfp_s(ptr long long) +@ cdecl _controlfp_s(ptr long long) @ cdecl _copysign( double double ) @ varargs _cprintf(str) # stub _cprintf_l Modified: trunk/reactos/lib/sdk/crt/float/i386/cntrlfp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/i386/cnt… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/i386/cntrlfp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/float/i386/cntrlfp.c [iso-8859-1] Sat Dec 8 17:44:38 2012 @@ -120,15 +120,15 @@ int CDECL _controlfp_s(unsigned int *cur, unsigned int newval, unsigned int mask) { #ifdef __i386__ - unsigned int flags; + unsigned int val; - FIXME("(%p %u %u) semi-stub\n", cur, newval, mask); - - flags = _control87( newval, mask & ~_EM_DENORMAL ); - - if(cur) - *cur = flags; - + if (!MSVCRT_CHECK_PMT( !(newval & mask & ~(_MCW_EM | _MCW_IC | _MCW_RC | _MCW_PC | _MCW_DN)))) + { + if (cur) *cur = _controlfp( 0, 0 ); /* retrieve it anyway */ + return MSVCRT_EINVAL; + } + val = _controlfp( newval, mask ); + if (cur) *cur = val; return 0; #else FIXME(":Not Implemented!\n");

1 0

[jgardou] 57822: [INCLUDE/CRT] - Add _MCW_DN definition
by jgardou＠svn.reactos.org 08 Dec '12

08 Dec '12

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

1 0

[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 08 Dec '12

08 Dec '12

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))

1 0

[jgardou] 57820: [SHELL32] - Use CPL_STARTWPARMSW since we are sending a unicode string
by jgardou＠svn.reactos.org 08 Dec '12

08 Dec '12

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");

1 0

[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 08 Dec '12

08 Dec '12

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 */

1 0

[hbelusca] 57818: [CONSRV] "Reply Already Sent" and not already done !
by hbelusca＠svn.reactos.org 08 Dec '12

08 Dec '12

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) {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs