Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 32804: - Update Russian translation
by dchapyshev＠svn.reactos.org 01 Apr '08

01 Apr '08

Author: dchapyshev Date: Tue Apr 1 09:43:35 2008 New Revision: 32804 URL: http://svn.reactos.org/svn/reactos?rev=32804&view=rev Log: - Update Russian translation Modified: trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc Modified: trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc [iso-8859-1] Tue Apr 1 09:43:35 2008 @@ -97,13 +97,13 @@ IDD_SAVE_SCHEME_AS DIALOG 9, 23, 225, 54 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Save Scheme As" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Save this sound scheme as:", -1, 7, 7, 212, 9 +CAPTION "Ñîõðàíèòü ñõåìó êàê" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Ñîõðàíèòü ýòó ñõåìó êàê:", -1, 7, 7, 212, 9 EDITTEXT 8960, 7, 17, 211, 14, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, 93, 36, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 157, 36, 60, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 157, 36, 60, 14 END IDD_SPEAKERS DIALOG 0, 0, 257, 204 @@ -169,7 +169,7 @@ ICON 4393, 10241, 26, 26, 20, 20 LTEXT "This computer cannot play audio because the ReactOS Audio service is not enabled.", 10245, 60, 25, 150, 40 AUTOCHECKBOX "&Enable ReactOS Audio", 10253, 60, 68, 150, 9 - LTEXT "Notes", 10246, 58, 87, 150, 11 + LTEXT "Ïðèìå÷àíèÿ", 10246, 58, 87, 150, 11 LTEXT "1. You must be an administrator to enable this service. If you are not logged on as administrator, you will be prompted for an administrator name and password.", 10247, 60, 100, 150, 40 LTEXT "2. After you enable ReactOS Audio you will have to restart the computer.", 10248, 60, 140, 150, 40 END @@ -213,7 +213,7 @@ CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 LTEXT "High", 9502, 202, 164, 17, 8 AUTOCHECKBOX "&Move all slide indicators at the same time", 9504, 5, 185, 216, 9 - PUSHBUTTON "Restore &Defaults", 9505, 110, 199, 110, 14 + PUSHBUTTON "&Âîñòàíîâèòü óìîë÷àíèÿ", 9505, 110, 199, 110, 14 END IDD_SETUP2 DIALOG 0, 0, 227, 206 @@ -232,15 +232,15 @@ BEGIN IDS_CPLNAME "Çâóê è àóäèîóñòðîéñòâà" IDS_CPLDESCRIPTION "Èçìåíåíèå çâóêîâûõ ñõåì âàøåãî êîìïüþòåðà, íàñòðîéêà êîëîíîê è çàïèñûâàþùèõ óñòðîéñòâ." - IDS_NO_SOUND "(None)" - - 5825 "Program error" - 5826 "Close program" + IDS_NO_SOUND "(Íåò)" + + 5825 "Îøèáêà ïðîãðàììû" + 5826 "Çàêðûòèå ïðîãðàììû" 5827 "Critical Battery Alarm" 5828 "Device Connect" 5829 "Device Disconnect" 5830 "Device Failed to Connect" - 5831 "Empty Recycle Bin" + 5831 "Î÷èñòêà êàðçèíû" 5832 "Low Battery Alarm" 5833 "Maximize" 5834 "Menu command" @@ -248,19 +248,19 @@ 5836 "Minimize" 5837 "New Mail Notification" 5838 "Start Navigation" - 5839 "Open program" + 5839 "Îòêðûòèå ïðîãðàììû" 5840 "Print Complete" 5841 "Restore Down" 5842 "Restore Up" 5843 "Asterisk" 5844 "Default sound" 5845 "Exclamation" - 5846 "Exit ReactOS" + 5846 "Âûõîä èç ReactOS" 5847 "Critical Stop" 5848 "System Notification" 5849 "Question" - 5850 "Start ReactOS" + 5850 "Çàïóñê ReactOS" 5851 "Start Menu" - 5852 "ReactOS Logoff" + 5852 "Çàâåðøåíèå ñåàíñà ReactOS" 5853 "ReactOS Logon" END

1 0

[fireball] 32803: - Fix ExReleaseResourceLock(), spotted by Alex.
by fireball＠svn.reactos.org 01 Apr '08

01 Apr '08

Author: fireball Date: Tue Apr 1 07:58:11 2008 New Revision: 32803 URL: http://svn.reactos.org/svn/reactos?rev=32803&view=rev Log: - Fix ExReleaseResourceLock(), spotted by Alex. Modified: trunk/reactos/ntoskrnl/ex/resource.c Modified: trunk/reactos/ntoskrnl/ex/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/resource.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/resource.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/resource.c [iso-8859-1] Tue Apr 1 07:58:11 2008 @@ -49,7 +49,7 @@ UNREFERENCED_PARAMETER(LockHandle); /* Simply enable interrupts */ - _disable(); + _enable(); } #else

1 0

[jimtabor] 32802: Move implemented functions out of stubs.
by jimtabor＠svn.reactos.org 01 Apr '08

01 Apr '08

Author: jimtabor Date: Mon Mar 31 20:41:19 2008 New Revision: 32802 URL: http://svn.reactos.org/svn/reactos?rev=32802&view=rev Log: Move implemented functions out of stubs. Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c trunk/reactos/dll/win32/kernel32/thread/thread.c Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] Mon Mar 31 20:41:19 2008 @@ -645,62 +645,6 @@ /* * @unimplemented */ -BOOL -STDCALL -RegisterWaitForSingleObject( - PHANDLE phNewWaitObject, - HANDLE hObject, - WAITORTIMERCALLBACK Callback, - PVOID Context, - ULONG dwMilliseconds, - ULONG dwFlags - ) -{ - NTSTATUS status; - -// TRACE("%p %p %p %p %d %d\n", -// phNewWaitObject,hObject,Callback,Context,dwMilliseconds,dwFlags); - - status = RtlRegisterWait( phNewWaitObject, hObject, Callback, Context, dwMilliseconds, dwFlags ); - if (status != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError(status) ); - return FALSE; - } - return TRUE; -} - -/* - * @unimplemented - */ -HANDLE -STDCALL -RegisterWaitForSingleObjectEx( - HANDLE hObject, - WAITORTIMERCALLBACK Callback, - PVOID Context, - ULONG dwMilliseconds, - ULONG dwFlags - ) -{ - NTSTATUS status; - HANDLE hNewWaitObject; - -// TRACE("%p %p %p %d %d\n", -// hObject,Callback,Context,dwMilliseconds,dwFlags); - - status = RtlRegisterWait( &hNewWaitObject, hObject, Callback, Context, dwMilliseconds, dwFlags ); - if (status != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError(status) ); - return NULL; - } - return hNewWaitObject; -} - -/* - * @unimplemented - */ ULONG STDCALL RemoveVectoredExceptionHandler( @@ -803,51 +747,6 @@ { STUB; return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -UnregisterWait( - HANDLE WaitHandle - ) -{ - NTSTATUS status; - -// TRACE("%p\n",WaitHandle); - - status = RtlDeregisterWaitEx( WaitHandle, NULL ); - if (status != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError(status) ); - return FALSE; - } - return TRUE; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -UnregisterWaitEx( - HANDLE WaitHandle, - HANDLE CompletionEvent - ) -{ - NTSTATUS status; - -// TRACE("%p\n",WaitHandle); - - status = RtlDeregisterWaitEx( WaitHandle, CompletionEvent ); - if (status != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError(status) ); - return FALSE; - } - return TRUE; } /* Modified: trunk/reactos/dll/win32/kernel32/thread/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/thread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/thread/thread.c [iso-8859-1] Mon Mar 31 20:41:19 2008 @@ -927,4 +927,105 @@ return TRUE; } + +/* + * @implemented + */ +BOOL +STDCALL +RegisterWaitForSingleObject( + PHANDLE phNewWaitObject, + HANDLE hObject, + WAITORTIMERCALLBACK Callback, + PVOID Context, + ULONG dwMilliseconds, + ULONG dwFlags + ) +{ + NTSTATUS Status = RtlRegisterWait( phNewWaitObject, + hObject, + Callback, + Context, + dwMilliseconds, + dwFlags ); + + if (Status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(Status) ); + return FALSE; + } + return TRUE; +} + + +/* + * @implemented + */ +HANDLE +STDCALL +RegisterWaitForSingleObjectEx( + HANDLE hObject, + WAITORTIMERCALLBACK Callback, + PVOID Context, + ULONG dwMilliseconds, + ULONG dwFlags + ) +{ + NTSTATUS Status; + HANDLE hNewWaitObject; + + Status = RtlRegisterWait( &hNewWaitObject, + hObject, + Callback, + Context, + dwMilliseconds, + dwFlags ); + + if (Status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(Status) ); + return NULL; + } + return hNewWaitObject; +} + + +/* + * @implemented + */ +BOOL +STDCALL +UnregisterWait( + HANDLE WaitHandle + ) +{ + NTSTATUS Status = RtlDeregisterWaitEx( WaitHandle, NULL ); + if (Status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(Status) ); + return FALSE; + } + return TRUE; +} + + +/* + * @implemented + */ +BOOL +STDCALL +UnregisterWaitEx( + HANDLE WaitHandle, + HANDLE CompletionEvent + ) +{ + NTSTATUS Status = RtlDeregisterWaitEx( WaitHandle, CompletionEvent ); + if (Status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(Status) ); + return FALSE; + } + return TRUE; +} + /* EOF */

1 0

[jimtabor] 32801: Move thread pool functions prototypes to ndk.
by jimtabor＠svn.reactos.org 01 Apr '08

01 Apr '08

Author: jimtabor Date: Mon Mar 31 20:07:09 2008 New Revision: 32801 URL: http://svn.reactos.org/svn/reactos?rev=32801&view=rev Log: Move thread pool functions prototypes to ndk. Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] Mon Mar 31 20:07:09 2008 @@ -7,11 +7,6 @@ #define NDEBUG #include <debug.h> - -NTSTATUS NTAPI RtlRegisterWait(PHANDLE, HANDLE, WAITORTIMERCALLBACKFUNC, PVOID, ULONG, ULONG); -NTSTATUS NTAPI RtlDeregisterWaitEx(HANDLE, HANDLE); -NTSTATUS NTAPI RtlDeregisterWait(HANDLE); - #define STUB \ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); \ Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Mon Mar 31 20:07:09 2008 @@ -1972,10 +1972,37 @@ NTSYSAPI NTSTATUS NTAPI +RtlDeregisterWaitEx( + IN HANDLE hWaitHandle, + IN HANDLE hCompletionEvent +); + +NTSYSAPI +NTSTATUS +NTAPI +RtlDeregisterWait( + IN HANDLE hWaitHandle +); + +NTSYSAPI +NTSTATUS +NTAPI RtlQueueWorkItem( IN WORKERCALLBACKFUNC Function, IN PVOID Context OPTIONAL, IN ULONG Flags +); + +NTSYSAPI +NTSTATUS +NTAPI +RtlRegisterWait( + IN PHANDLE phNewWaitObject, + IN HANDLE hObject, + IN WAITORTIMERCALLBACKFUNC Callback, + IN PVOID pvContext, + IN ULONG ulMilliseconds, + IN ULONG ulFlags ); //

1 0

[jimtabor] 32800: SeSetSecurityDescriptorInfo/Ex check the security object pointer for null. http://msdn2.microsoft.com/en-us/library/ms800810.aspx
by jimtabor＠svn.reactos.org 01 Apr '08

01 Apr '08

Author: jimtabor Date: Mon Mar 31 19:31:56 2008 New Revision: 32800 URL: http://svn.reactos.org/svn/reactos?rev=32800&view=rev Log: SeSetSecurityDescriptorInfo/Ex check the security object pointer for null. http://msdn2.microsoft.com/en-us/library/ms800810.aspx Modified: trunk/reactos/ntoskrnl/se/sd.c Modified: trunk/reactos/ntoskrnl/se/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sd.c?rev=32800… ============================================================================== --- trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] Mon Mar 31 19:31:56 2008 @@ -906,9 +906,12 @@ ULONG Control = 0; ULONG_PTR Current; SECURITY_INFORMATION SecurityInformation; - - + ObjectSd = *ObjectsSecurityDescriptor; + + if (!ObjectSd) + return STATUS_NO_SECURITY_ON_OBJECT; // The object does not have a security descriptor. + SecurityInformation = *_SecurityInformation; /* Get owner and owner size */ @@ -1083,6 +1086,11 @@ IN PGENERIC_MAPPING GenericMapping ) { + PISECURITY_DESCRIPTOR ObjectSd = *ObjectsSecurityDescriptor; + + if (!ObjectSd) + return STATUS_NO_SECURITY_ON_OBJECT; // The object does not have a security descriptor. + UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; }

1 0

[fireball] 32799: The default object security method should not directly call Se* routines on the Security Descriptors, since they belong to the object manger security descriptor cache, and they need to be referenced and dereferenced in order to make sure they don't disappear from beneath the caller. Additionally, the code for the "Set" operation should actually go in SeSetSecurityDescriptorInfo API, which was unimplemented. By simply copying the code over, this API is now implemented, and the r
by fireball＠svn.reactos.org 31 Mar '08

31 Mar '08

Author: fireball Date: Mon Mar 31 15:07:02 2008 New Revision: 32799 URL: http://svn.reactos.org/svn/reactos?rev=32799&view=rev Log: The default object security method should not directly call Se* routines on the Security Descriptors, since they belong to the object manger security descriptor cache, and they need to be referenced and dereferenced in order to make sure they don't disappear from beneath the caller. Additionally, the code for the "Set" operation should actually go in SeSetSecurityDescriptorInfo API, which was unimplemented. By simply copying the code over, this API is now implemented, and the routine works as expected. Also, the default method was not handling "delete" requests, but was ignoring them, resulting in memory leaks and never-dereferenced descriptors. Thanks to Alex for finding these bugs. Alex also says SeSetSecurityDescriptorInfo should call the Rtl package (RtlSetObjectSecurity) but we don't implement those functions yet. Modified: trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/ob/obsecure.c trunk/reactos/ntoskrnl/se/sd.c trunk/reactos/ntoskrnl/se/semgr.c Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h [iso-8859-1] Mon Mar 31 15:07:02 2008 @@ -374,12 +374,6 @@ OUT PSECURITY_DESCRIPTOR *DestinationSD ); -NTSTATUS -NTAPI -ObpRemoveSecurityDescriptor( - IN PSECURITY_DESCRIPTOR SecurityDescriptor -); - PSECURITY_DESCRIPTOR NTAPI ObpReferenceCachedSecurityDescriptor( @@ -436,6 +430,44 @@ IN BOOLEAN LockHeld, IN KPROCESSOR_MODE AccessMode, OUT PNTSTATUS AccessStatus +); + +// +// Default Object Security Callback Routines +// +NTSTATUS +NTAPI +ObAssignObjectSecurityDescriptor( + IN PVOID Object, + IN PSECURITY_DESCRIPTOR SecurityDescriptor OPTIONAL, + IN POOL_TYPE PoolType +); + +NTSTATUS +NTAPI +ObDeassignSecurity( + IN OUT PSECURITY_DESCRIPTOR *SecurityDescriptor +); + +NTSTATUS +NTAPI +ObQuerySecurityDescriptorInfo( + IN PVOID Object, + IN PSECURITY_INFORMATION SecurityInformation, + OUT PSECURITY_DESCRIPTOR SecurityDescriptor, + IN OUT PULONG Length, + IN PSECURITY_DESCRIPTOR *OutputSecurityDescriptor +); + +NTSTATUS +NTAPI +ObSetSecurityDescriptorInfo( + IN PVOID Object, + IN PSECURITY_INFORMATION SecurityInformation, + IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor, + IN OUT PSECURITY_DESCRIPTOR *OutputSecurityDescriptor, + IN POOL_TYPE PoolType, + IN PGENERIC_MAPPING GenericMapping ); // Modified: trunk/reactos/ntoskrnl/ob/obsecure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obsecure.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obsecure.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obsecure.c [iso-8859-1] Mon Mar 31 15:07:02 2008 @@ -14,6 +14,157 @@ #include <debug.h> /* PRIVATE FUNCTIONS *********************************************************/ + +NTSTATUS +NTAPI +ObAssignObjectSecurityDescriptor(IN PVOID Object, + IN PSECURITY_DESCRIPTOR SecurityDescriptor OPTIONAL, + IN POOL_TYPE PoolType) +{ + POBJECT_HEADER ObjectHeader; + NTSTATUS Status; + PSECURITY_DESCRIPTOR NewSd; + PAGED_CODE(); + + /* Get the object header */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); + if (!SecurityDescriptor) + { + /* Nothing to assign */ + ObjectHeader->SecurityDescriptor = NULL; + return STATUS_SUCCESS; + } + + /* Add it to our internal cache */ + Status = ObpAddSecurityDescriptor(SecurityDescriptor, &NewSd); + if (NT_SUCCESS(Status)) + { + /* Free the old copy */ + ExFreePool(SecurityDescriptor); + + /* Set the new pointer */ + ASSERT(NewSd); + ObjectHeader->SecurityDescriptor = NewSd; + } + + /* Return status */ + return Status; +} + +NTSTATUS +NTAPI +ObDeassignSecurity(IN OUT PSECURITY_DESCRIPTOR *SecurityDescriptor) +{ + /* Dereference it */ + ObpDereferenceCachedSecurityDescriptor(*SecurityDescriptor); + + /* Don't free again later */ + *SecurityDescriptor = NULL; + + /* All done */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +ObQuerySecurityDescriptorInfo(IN PVOID Object, + IN PSECURITY_INFORMATION SecurityInformation, + OUT PSECURITY_DESCRIPTOR SecurityDescriptor, + IN OUT PULONG Length, + IN PSECURITY_DESCRIPTOR *OutputSecurityDescriptor) +{ + POBJECT_HEADER ObjectHeader; + NTSTATUS Status; + PSECURITY_DESCRIPTOR ObjectSd; + PAGED_CODE(); + + /* Get the object header */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); + + /* Get the SD */ + ObjectSd = ObpReferenceCachedSecurityDescriptor(ObjectHeader->SecurityDescriptor); + + /* Query the information */ + Status = SeQuerySecurityDescriptorInfo(SecurityInformation, + SecurityDescriptor, + Length, + &ObjectSd); + + /* Check if we have an object SD and dereference it, if so */ + if (ObjectSd) ObpDereferenceCachedSecurityDescriptor(ObjectSd); + + /* Return status */ + return Status; +} + +NTSTATUS +NTAPI +ObSetSecurityDescriptorInfo(IN PVOID Object, + IN PSECURITY_INFORMATION SecurityInformation, + IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor, + IN OUT PSECURITY_DESCRIPTOR *OutputSecurityDescriptor, + IN POOL_TYPE PoolType, + IN PGENERIC_MAPPING GenericMapping) +{ + NTSTATUS Status; + POBJECT_HEADER ObjectHeader; + PSECURITY_DESCRIPTOR OldDescriptor, NewDescriptor, CachedDescriptor; + PAGED_CODE(); + + /* Get the object header */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); + while (TRUE) + { + /* Reference the old descriptor */ + OldDescriptor = ObpReferenceCachedSecurityDescriptor(ObjectHeader->SecurityDescriptor); + NewDescriptor = OldDescriptor; + + /* Set the SD information */ + Status = SeSetSecurityDescriptorInfo(Object, + SecurityInformation, + SecurityDescriptor, + &NewDescriptor, + PoolType, + GenericMapping); + if (NT_SUCCESS(Status)) + { + /* Now add this to the cache */ + Status = ObpAddSecurityDescriptor(NewDescriptor, &CachedDescriptor); + + /* Let go of our uncached copy */ + ExFreePool(NewDescriptor); + + /* Check for success */ + if (NT_SUCCESS(Status)) + { + /* Dereference the old one */ + ASSERT(OldDescriptor == ObjectHeader->SecurityDescriptor); + + /* Now set this as the new descriptor */ + ObjectHeader->SecurityDescriptor = CachedDescriptor; + + /* And dereference the old one */ + ObpDereferenceCachedSecurityDescriptor(OldDescriptor); + break; + } + else + { + /* We failed, dereference the old one */ + ObpDereferenceCachedSecurityDescriptor(OldDescriptor); + break; + } + } + else + { + /* We failed, dereference the old one */ + if (OldDescriptor) ObpDereferenceCachedSecurityDescriptor(OldDescriptor); + break; + } + } + + /* Return status */ + return Status; +} BOOLEAN NTAPI Modified: trunk/reactos/ntoskrnl/se/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sd.c?rev=32799… ============================================================================== --- trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] Mon Mar 31 15:07:02 2008 @@ -882,18 +882,190 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS STDCALL SeSetSecurityDescriptorInfo(IN PVOID Object OPTIONAL, - IN PSECURITY_INFORMATION SecurityInformation, - IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN OUT PSECURITY_DESCRIPTOR *ObjectsSecurityDescriptor, - IN POOL_TYPE PoolType, - IN PGENERIC_MAPPING GenericMapping) + IN PSECURITY_INFORMATION _SecurityInformation, + IN PSECURITY_DESCRIPTOR _SecurityDescriptor, + IN OUT PSECURITY_DESCRIPTOR *ObjectsSecurityDescriptor, + IN POOL_TYPE PoolType, + IN PGENERIC_MAPPING GenericMapping) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PISECURITY_DESCRIPTOR ObjectSd; + PISECURITY_DESCRIPTOR NewSd; + PISECURITY_DESCRIPTOR SecurityDescriptor = _SecurityDescriptor; + PSID Owner = 0; + PSID Group = 0; + PACL Dacl = 0; + PACL Sacl = 0; + ULONG OwnerLength = 0; + ULONG GroupLength = 0; + ULONG DaclLength = 0; + ULONG SaclLength = 0; + ULONG Control = 0; + ULONG_PTR Current; + SECURITY_INFORMATION SecurityInformation; + + + ObjectSd = *ObjectsSecurityDescriptor; + SecurityInformation = *_SecurityInformation; + + /* Get owner and owner size */ + if (SecurityInformation & OWNER_SECURITY_INFORMATION) + { + if (SecurityDescriptor->Owner != NULL) + { + if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) + Owner = (PSID)((ULONG_PTR)SecurityDescriptor->Owner + + (ULONG_PTR)SecurityDescriptor); + else + Owner = (PSID)SecurityDescriptor->Owner; + OwnerLength = ROUND_UP(RtlLengthSid(Owner), 4); + } + Control |= (SecurityDescriptor->Control & SE_OWNER_DEFAULTED); + } + else + { + if (ObjectSd->Owner != NULL) + { + Owner = (PSID)((ULONG_PTR)ObjectSd->Owner + (ULONG_PTR)ObjectSd); + OwnerLength = ROUND_UP(RtlLengthSid(Owner), 4); + } + Control |= (ObjectSd->Control & SE_OWNER_DEFAULTED); + } + + /* Get group and group size */ + if (SecurityInformation & GROUP_SECURITY_INFORMATION) + { + if (SecurityDescriptor->Group != NULL) + { + if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) + Group = (PSID)((ULONG_PTR)SecurityDescriptor->Group + + (ULONG_PTR)SecurityDescriptor); + else + Group = (PSID)SecurityDescriptor->Group; + GroupLength = ROUND_UP(RtlLengthSid(Group), 4); + } + Control |= (SecurityDescriptor->Control & SE_GROUP_DEFAULTED); + } + else + { + if (ObjectSd->Group != NULL) + { + Group = (PSID)((ULONG_PTR)ObjectSd->Group + (ULONG_PTR)ObjectSd); + GroupLength = ROUND_UP(RtlLengthSid(Group), 4); + } + Control |= (ObjectSd->Control & SE_GROUP_DEFAULTED); + } + + /* Get DACL and DACL size */ + if (SecurityInformation & DACL_SECURITY_INFORMATION) + { + if ((SecurityDescriptor->Control & SE_DACL_PRESENT) && + (SecurityDescriptor->Dacl != NULL)) + { + if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) + Dacl = (PACL)((ULONG_PTR)SecurityDescriptor->Dacl + + (ULONG_PTR)SecurityDescriptor); + else + Dacl = (PACL)SecurityDescriptor->Dacl; + + DaclLength = ROUND_UP((ULONG)Dacl->AclSize, 4); + } + Control |= (SecurityDescriptor->Control & (SE_DACL_DEFAULTED | SE_DACL_PRESENT)); + } + else + { + if ((ObjectSd->Control & SE_DACL_PRESENT) && + (ObjectSd->Dacl != NULL)) + { + Dacl = (PACL)((ULONG_PTR)ObjectSd->Dacl + (ULONG_PTR)ObjectSd); + DaclLength = ROUND_UP((ULONG)Dacl->AclSize, 4); + } + Control |= (ObjectSd->Control & (SE_DACL_DEFAULTED | SE_DACL_PRESENT)); + } + + /* Get SACL and SACL size */ + if (SecurityInformation & SACL_SECURITY_INFORMATION) + { + if ((SecurityDescriptor->Control & SE_SACL_PRESENT) && + (SecurityDescriptor->Sacl != NULL)) + { + if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) + Sacl = (PACL)((ULONG_PTR)SecurityDescriptor->Sacl + + (ULONG_PTR)SecurityDescriptor); + else + Sacl = (PACL)SecurityDescriptor->Sacl; + SaclLength = ROUND_UP((ULONG)Sacl->AclSize, 4); + } + Control |= (SecurityDescriptor->Control & (SE_SACL_DEFAULTED | SE_SACL_PRESENT)); + } + else + { + if ((ObjectSd->Control & SE_SACL_PRESENT) && + (ObjectSd->Sacl != NULL)) + { + Sacl = (PACL)((ULONG_PTR)ObjectSd->Sacl + (ULONG_PTR)ObjectSd); + SaclLength = ROUND_UP((ULONG)Sacl->AclSize, 4); + } + Control |= (ObjectSd->Control & (SE_SACL_DEFAULTED | SE_SACL_PRESENT)); + } + + NewSd = ExAllocatePool(NonPagedPool, + sizeof(SECURITY_DESCRIPTOR) + OwnerLength + GroupLength + + DaclLength + SaclLength); + if (NewSd == NULL) + { + ObDereferenceObject(Object); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlCreateSecurityDescriptor(NewSd, + SECURITY_DESCRIPTOR_REVISION1); + /* We always build a self-relative descriptor */ + NewSd->Control = (USHORT)Control | SE_SELF_RELATIVE; + + Current = (ULONG_PTR)NewSd + sizeof(SECURITY_DESCRIPTOR); + + if (OwnerLength != 0) + { + RtlCopyMemory((PVOID)Current, + Owner, + OwnerLength); + NewSd->Owner = (PSID)(Current - (ULONG_PTR)NewSd); + Current += OwnerLength; + } + + if (GroupLength != 0) + { + RtlCopyMemory((PVOID)Current, + Group, + GroupLength); + NewSd->Group = (PSID)(Current - (ULONG_PTR)NewSd); + Current += GroupLength; + } + + if (DaclLength != 0) + { + RtlCopyMemory((PVOID)Current, + Dacl, + DaclLength); + NewSd->Dacl = (PACL)(Current - (ULONG_PTR)NewSd); + Current += DaclLength; + } + + if (SaclLength != 0) + { + RtlCopyMemory((PVOID)Current, + Sacl, + SaclLength); + NewSd->Sacl = (PACL)(Current - (ULONG_PTR)NewSd); + Current += SaclLength; + } + + *ObjectsSecurityDescriptor = NewSd; + return STATUS_SUCCESS; } /* Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=32… ============================================================================== --- trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] Mon Mar 31 15:07:02 2008 @@ -233,222 +233,63 @@ } NTSTATUS -STDCALL -SeDefaultObjectMethod(PVOID Object, - SECURITY_OPERATION_CODE OperationType, - PSECURITY_INFORMATION _SecurityInformation, - PSECURITY_DESCRIPTOR _SecurityDescriptor, - PULONG ReturnLength, - PSECURITY_DESCRIPTOR *OldSecurityDescriptor, - POOL_TYPE PoolType, - PGENERIC_MAPPING GenericMapping) -{ - PISECURITY_DESCRIPTOR ObjectSd; - PISECURITY_DESCRIPTOR NewSd; - PISECURITY_DESCRIPTOR SecurityDescriptor = _SecurityDescriptor; - POBJECT_HEADER Header = OBJECT_TO_OBJECT_HEADER(Object); - PSID Owner = 0; - PSID Group = 0; - PACL Dacl = 0; - PACL Sacl = 0; - ULONG OwnerLength = 0; - ULONG GroupLength = 0; - ULONG DaclLength = 0; - ULONG SaclLength = 0; - ULONG Control = 0; - ULONG_PTR Current; - NTSTATUS Status; - SECURITY_INFORMATION SecurityInformation; - - if (OperationType == SetSecurityDescriptor) - { - ObjectSd = Header->SecurityDescriptor; - SecurityInformation = *_SecurityInformation; - - /* Get owner and owner size */ - if (SecurityInformation & OWNER_SECURITY_INFORMATION) - { - if (SecurityDescriptor->Owner != NULL) - { - if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) - Owner = (PSID)((ULONG_PTR)SecurityDescriptor->Owner + - (ULONG_PTR)SecurityDescriptor); - else - Owner = (PSID)SecurityDescriptor->Owner; - OwnerLength = ROUND_UP(RtlLengthSid(Owner), 4); - } - Control |= (SecurityDescriptor->Control & SE_OWNER_DEFAULTED); - } - else - { - if (ObjectSd->Owner != NULL) - { - Owner = (PSID)((ULONG_PTR)ObjectSd->Owner + (ULONG_PTR)ObjectSd); - OwnerLength = ROUND_UP(RtlLengthSid(Owner), 4); - } - Control |= (ObjectSd->Control & SE_OWNER_DEFAULTED); - } - - /* Get group and group size */ - if (SecurityInformation & GROUP_SECURITY_INFORMATION) - { - if (SecurityDescriptor->Group != NULL) - { - if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) - Group = (PSID)((ULONG_PTR)SecurityDescriptor->Group + - (ULONG_PTR)SecurityDescriptor); - else - Group = (PSID)SecurityDescriptor->Group; - GroupLength = ROUND_UP(RtlLengthSid(Group), 4); - } - Control |= (SecurityDescriptor->Control & SE_GROUP_DEFAULTED); - } - else - { - if (ObjectSd->Group != NULL) - { - Group = (PSID)((ULONG_PTR)ObjectSd->Group + (ULONG_PTR)ObjectSd); - GroupLength = ROUND_UP(RtlLengthSid(Group), 4); - } - Control |= (ObjectSd->Control & SE_GROUP_DEFAULTED); - } - - /* Get DACL and DACL size */ - if (SecurityInformation & DACL_SECURITY_INFORMATION) - { - if ((SecurityDescriptor->Control & SE_DACL_PRESENT) && - (SecurityDescriptor->Dacl != NULL)) - { - if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) - Dacl = (PACL)((ULONG_PTR)SecurityDescriptor->Dacl + - (ULONG_PTR)SecurityDescriptor); - else - Dacl = (PACL)SecurityDescriptor->Dacl; - - DaclLength = ROUND_UP((ULONG)Dacl->AclSize, 4); - } - Control |= (SecurityDescriptor->Control & (SE_DACL_DEFAULTED | SE_DACL_PRESENT)); - } - else - { - if ((ObjectSd->Control & SE_DACL_PRESENT) && - (ObjectSd->Dacl != NULL)) - { - Dacl = (PACL)((ULONG_PTR)ObjectSd->Dacl + (ULONG_PTR)ObjectSd); - DaclLength = ROUND_UP((ULONG)Dacl->AclSize, 4); - } - Control |= (ObjectSd->Control & (SE_DACL_DEFAULTED | SE_DACL_PRESENT)); - } - - /* Get SACL and SACL size */ - if (SecurityInformation & SACL_SECURITY_INFORMATION) - { - if ((SecurityDescriptor->Control & SE_SACL_PRESENT) && - (SecurityDescriptor->Sacl != NULL)) - { - if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) - Sacl = (PACL)((ULONG_PTR)SecurityDescriptor->Sacl + - (ULONG_PTR)SecurityDescriptor); - else - Sacl = (PACL)SecurityDescriptor->Sacl; - SaclLength = ROUND_UP((ULONG)Sacl->AclSize, 4); - } - Control |= (SecurityDescriptor->Control & (SE_SACL_DEFAULTED | SE_SACL_PRESENT)); - } - else - { - if ((ObjectSd->Control & SE_SACL_PRESENT) && - (ObjectSd->Sacl != NULL)) - { - Sacl = (PACL)((ULONG_PTR)ObjectSd->Sacl + (ULONG_PTR)ObjectSd); - SaclLength = ROUND_UP((ULONG)Sacl->AclSize, 4); - } - Control |= (ObjectSd->Control & (SE_SACL_DEFAULTED | SE_SACL_PRESENT)); - } - - NewSd = ExAllocatePool(NonPagedPool, - sizeof(SECURITY_DESCRIPTOR) + OwnerLength + GroupLength + - DaclLength + SaclLength); - if (NewSd == NULL) - { - ObDereferenceObject(Object); - return STATUS_INSUFFICIENT_RESOURCES; - } - - RtlCreateSecurityDescriptor(NewSd, - SECURITY_DESCRIPTOR_REVISION1); - /* We always build a self-relative descriptor */ - NewSd->Control = (USHORT)Control | SE_SELF_RELATIVE; - - Current = (ULONG_PTR)NewSd + sizeof(SECURITY_DESCRIPTOR); - - if (OwnerLength != 0) - { - RtlCopyMemory((PVOID)Current, - Owner, - OwnerLength); - NewSd->Owner = (PSID)(Current - (ULONG_PTR)NewSd); - Current += OwnerLength; - } - - if (GroupLength != 0) - { - RtlCopyMemory((PVOID)Current, - Group, - GroupLength); - NewSd->Group = (PSID)(Current - (ULONG_PTR)NewSd); - Current += GroupLength; - } - - if (DaclLength != 0) - { - RtlCopyMemory((PVOID)Current, - Dacl, - DaclLength); - NewSd->Dacl = (PACL)(Current - (ULONG_PTR)NewSd); - Current += DaclLength; - } - - if (SaclLength != 0) - { - RtlCopyMemory((PVOID)Current, - Sacl, - SaclLength); - NewSd->Sacl = (PACL)(Current - (ULONG_PTR)NewSd); - Current += SaclLength; - } - - /* Add the new SD */ - Status = ObpAddSecurityDescriptor(NewSd, - &Header->SecurityDescriptor); - if (NT_SUCCESS(Status)) - { - /* Remove the old security descriptor */ - ObpRemoveSecurityDescriptor(ObjectSd); - } - else - { - /* Restore the old security descriptor */ - Header->SecurityDescriptor = ObjectSd; - } - - ExFreePool(NewSd); - } - else if (OperationType == QuerySecurityDescriptor) - { - Status = SeQuerySecurityDescriptorInfo(_SecurityInformation, +NTAPI +SeDefaultObjectMethod(IN PVOID Object, + IN SECURITY_OPERATION_CODE OperationType, + IN PSECURITY_INFORMATION SecurityInformation, + IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor, + IN OUT PULONG ReturnLength OPTIONAL, + IN OUT PSECURITY_DESCRIPTOR *OldSecurityDescriptor, + IN POOL_TYPE PoolType, + IN PGENERIC_MAPPING GenericMapping) +{ + PAGED_CODE(); + + /* Select the operation type */ + switch (OperationType) + { + /* Setting a new descriptor */ + case SetSecurityDescriptor: + + /* Sanity check */ + ASSERT((PoolType == PagedPool) || (PoolType == NonPagedPool)); + + /* Set the information */ + return ObSetSecurityDescriptorInfo(Object, + SecurityInformation, SecurityDescriptor, - ReturnLength, - &Header->SecurityDescriptor); - } - else if (OperationType == AssignSecurityDescriptor) - { - /* Assign the security descriptor to the object header */ - Status = ObpAddSecurityDescriptor(SecurityDescriptor, - &Header->SecurityDescriptor); - } - - + OldSecurityDescriptor, + PoolType, + GenericMapping); + + case QuerySecurityDescriptor: + + /* Query the information */ + return ObQuerySecurityDescriptorInfo(Object, + SecurityInformation, + SecurityDescriptor, + ReturnLength, + OldSecurityDescriptor); + + case DeleteSecurityDescriptor: + + /* De-assign it */ + return ObDeassignSecurity(OldSecurityDescriptor); + + case AssignSecurityDescriptor: + + /* Assign it */ + ObAssignObjectSecurityDescriptor(Object, SecurityDescriptor, PoolType); + return STATUS_SUCCESS; + + default: + + /* Bug check */ + KeBugCheckEx(SECURITY_SYSTEM, 0, STATUS_INVALID_PARAMETER, 0, 0); + } + + /* Should never reach here */ + ASSERT(FALSE); return STATUS_SUCCESS; }

1 0

[fireball] 32798: - Fix PARTITION_STYLE enum to include PARTITION_STYLE_RAW. - Add a few storage-related IOCTLs and GUIDs definitions.
by fireball＠svn.reactos.org 31 Mar '08

31 Mar '08

Author: fireball Date: Mon Mar 31 13:22:46 2008 New Revision: 32798 URL: http://svn.reactos.org/svn/reactos?rev=32798&view=rev Log: - Fix PARTITION_STYLE enum to include PARTITION_STYLE_RAW. - Add a few storage-related IOCTLs and GUIDs definitions. Modified: trunk/reactos/include/ddk/ntdddisk.h trunk/reactos/include/ddk/ntddstor.h trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/ntdddisk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdddisk.h?rev… ============================================================================== --- trunk/reactos/include/ddk/ntdddisk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntdddisk.h [iso-8859-1] Mon Mar 31 13:22:46 2008 @@ -173,6 +173,8 @@ #define SMART_SEND_DRIVE_COMMAND \ CTL_CODE(IOCTL_DISK_BASE, 0x0021, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_DISK_UPDATE_PROPERTIES \ + CTL_CODE(IOCTL_DISK_BASE, 0x50, METHOD_BUFFERED, FILE_ANY_ACCESS) #define PARTITION_ENTRY_UNUSED 0x00 #define PARTITION_FAT_12 0x01 Modified: trunk/reactos/include/ddk/ntddstor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddstor.h?rev… ============================================================================== --- trunk/reactos/include/ddk/ntddstor.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddstor.h [iso-8859-1] Mon Mar 31 13:22:46 2008 @@ -84,6 +84,12 @@ #define IOCTL_STORAGE_RESERVE \ CTL_CODE(IOCTL_STORAGE_BASE, 0x0204, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_GET_HOTPLUG_INFO \ + CTL_CODE(IOCTL_STORAGE_BASE, 0x0305, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_STORAGE_SET_HOTPLUG_INFO \ + CTL_CODE(IOCTL_STORAGE_BASE, 0x0306, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) + #define IOCTL_STORAGE_RESET_BUS \ CTL_CODE(IOCTL_STORAGE_BASE, 0x0400, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) @@ -121,6 +127,21 @@ DEFINE_GUID(GUID_DEVINTERFACE_STORAGEPORT, 0x2accfe60L, 0xc130, 0x11d2, 0xb0, 0x82, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b); +DEFINE_GUID(GUID_DEVINTERFACE_HIDDEN_VOLUME, + 0x7f108a28L, 0x9833, 0x4b3b, 0xb7, 0x80, 0x2c, 0x6b, 0x5f, 0xa5, 0xc0, 0x62); + +/* Aliases for storage guids */ +#define DiskClassGuid GUID_DEVINTERFACE_DISK +#define CdRomClassGuid GUID_DEVINTERFACE_CDROM +#define PartitionClassGuid GUID_DEVINTERFACE_PARTITION +#define TapeClassGuid GUID_DEVINTERFACE_TAPE +#define WriteOnceDiskClassGuid GUID_DEVINTERFACE_WRITEONCEDISK +#define VolumeClassGuid GUID_DEVINTERFACE_VOLUME +#define MediumChangerClassGuid GUID_DEVINTERFACE_MEDIUMCHANGER +#define FloppyClassGuid GUID_DEVINTERFACE_FLOPPY +#define CdChangerClassGuid GUID_DEVINTERFACE_CDCHANGER +#define StoragePortClassGuid GUID_DEVINTERFACE_STORAGEPORT +#define HiddenVolumeClassGuid GUID_DEVINTERFACE_HIDDEN_VOLUME typedef enum _STORAGE_MEDIA_TYPE { DDS_4mm = 0x20, Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Mon Mar 31 13:22:46 2008 @@ -5262,7 +5262,8 @@ */ typedef enum _PARTITION_STYLE { PARTITION_STYLE_MBR, - PARTITION_STYLE_GPT + PARTITION_STYLE_GPT, + PARTITION_STYLE_RAW } PARTITION_STYLE; typedef struct _CREATE_DISK_MBR {

1 0

[cfinck] 32797: - Check the revision to build and cancel if it's older than 30846. The Buildslaves have Gentoo x64 installed and the ROS source code doesn't compile under this OS with revs older than 30846. - Remove some cleaning steps, which are not needed, if we build r30846 or later.
by cfinck＠svn.reactos.org 31 Mar '08

31 Mar '08

Author: cfinck Date: Mon Mar 31 11:44:48 2008 New Revision: 32797 URL: http://svn.reactos.org/svn/reactos?rev=32797&view=rev Log: - Check the revision to build and cancel if it's older than 30846. The Buildslaves have Gentoo x64 installed and the ROS source code doesn't compile under this OS with revs older than 30846. - Remove some cleaning steps, which are not needed, if we build r30846 or later. Added: trunk/tools/buildbot/scripts/Linux/checkrev (with props) Modified: trunk/tools/buildbot/scripts/Linux/build.32 trunk/tools/buildbot/scripts/Linux/build.64 trunk/tools/buildbot/scripts/Linux/makeclean trunk/tools/buildbot/scripts/Linux/uploadiso Modified: trunk/tools/buildbot/scripts/Linux/build.32 URL: http://svn.reactos.org/svn/reactos/trunk/tools/buildbot/scripts/Linux/build… ============================================================================== --- trunk/tools/buildbot/scripts/Linux/build.32 [iso-8859-1] (original) +++ trunk/tools/buildbot/scripts/Linux/build.32 [iso-8859-1] Mon Mar 31 11:44:48 2008 @@ -3,6 +3,8 @@ TIME="$(dirname $0)/time" $TIME bash -c "( + source "checkrev" + export CCACHE_DIR=/opt/buildbot/ccache export CCACHE_PATH=/usr/local/rosbe/bin:$PATH export CCACHE_HARDLINK=1 Modified: trunk/tools/buildbot/scripts/Linux/build.64 URL: http://svn.reactos.org/svn/reactos/trunk/tools/buildbot/scripts/Linux/build… ============================================================================== --- trunk/tools/buildbot/scripts/Linux/build.64 [iso-8859-1] (original) +++ trunk/tools/buildbot/scripts/Linux/build.64 [iso-8859-1] Mon Mar 31 11:44:48 2008 @@ -3,6 +3,8 @@ TIME="$(dirname $0)/time" $TIME bash -c "( + source "checkrev" + export CCACHE_DIR=/opt/buildbot/ccache export CCACHE_PATH=/usr/local/rosbe/bin:$PATH export CCACHE_HARDLINK=1 Added: trunk/tools/buildbot/scripts/Linux/checkrev URL: http://svn.reactos.org/svn/reactos/trunk/tools/buildbot/scripts/Linux/check… ============================================================================== --- trunk/tools/buildbot/scripts/Linux/checkrev (added) +++ trunk/tools/buildbot/scripts/Linux/checkrev [iso-8859-1] Mon Mar 31 11:44:48 2008 @@ -1,0 +1,8 @@ +#!/bin/bash + +LIMIT=30846 + +if [ $REV -lt $LIMIT ]; then + echo "* This Buildslave cannot build revisions older than $LIMIT" + exit 1 +fi Propchange: trunk/tools/buildbot/scripts/Linux/checkrev ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/buildbot/scripts/Linux/makeclean URL: http://svn.reactos.org/svn/reactos/trunk/tools/buildbot/scripts/Linux/makec… ============================================================================== --- trunk/tools/buildbot/scripts/Linux/makeclean [iso-8859-1] (original) +++ trunk/tools/buildbot/scripts/Linux/makeclean [iso-8859-1] Mon Mar 31 11:44:48 2008 @@ -6,6 +6,12 @@ OUTPUT=${ROS_OUTPUT:=output-i386} $TIME bash -c "( + echo -e '\n* Getting revision number...' + export REV=$(svnversion .) + echo -e "* Revision $REV.\n" + + source "checkrev" + echo -e '\n* Cleaning...' if [ -f makefile.auto ]; then @@ -17,11 +23,10 @@ rm -rf $OBJ echo ' * output-i386' rm -rf $OUTPUT + echo ' * reactos' + rm -rf "reactos." echo ' * CD images' rm -f *.iso - - echo -e '\n* Deleting unversioned files from the source...' - ../../svn-clean --exclude '^.buildbot-sourcedata' if [ $# -eq 1 ]; then echo -e '\n* Recreating config.rbuild...' @@ -30,9 +35,5 @@ fi fi - echo -e '\n* Compiling tools...' - ../../build clean - echo -e '* Done compiling tools.' - exit 0 )" Modified: trunk/tools/buildbot/scripts/Linux/uploadiso URL: http://svn.reactos.org/svn/reactos/trunk/tools/buildbot/scripts/Linux/uploa… ============================================================================== --- trunk/tools/buildbot/scripts/Linux/uploadiso [iso-8859-1] (original) +++ trunk/tools/buildbot/scripts/Linux/uploadiso [iso-8859-1] Mon Mar 31 11:44:48 2008 @@ -1,4 +1,6 @@ #!/bin/bash + +source "checkrev" KEY=../../fezile.cute.se.key SSHUSER=rosbuild @@ -22,10 +24,6 @@ echo "* There are no ISO files to process." exit 2 fi - -echo "* Getting revision number..." -REV=$(svnversion .) -echo -e "* Revision $REV.\n" BOOT=bootcd-$REV-$1 LIVE=livecd-$REV-$1

1 0

[fireball] 32796: - Fix a typo in the debug message.
by fireball＠svn.reactos.org 31 Mar '08

31 Mar '08

Author: fireball Date: Mon Mar 31 10:58:59 2008 New Revision: 32796 URL: http://svn.reactos.org/svn/reactos?rev=32796&view=rev Log: - Fix a typo in the debug message. Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Mon Mar 31 10:58:59 2008 @@ -886,7 +886,7 @@ NTSTATUS Status; UNICODE_STRING DriverName; - DPRINT("IopInitializeBootDrivers()"); + DPRINT("IopInitializeBootDrivers()\n"); /* Use IopRootDeviceNode for now */ Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, NULL, &DeviceNode);

1 0

[cfinck] 32795: First detect the mouse and then the keyboard as it was done in the old i8042prt driver. If we do it the other way round, some systems throw away settings like the keyboard translation, when detecting the mouse. All known keyboard and mouse detection problems should be fixed now! :-) See issue #2790 for more details.
by cfinck＠svn.reactos.org 31 Mar '08

31 Mar '08

Author: cfinck Date: Mon Mar 31 10:52:30 2008 New Revision: 32795 URL: http://svn.reactos.org/svn/reactos?rev=32795&view=rev Log: First detect the mouse and then the keyboard as it was done in the old i8042prt driver. If we do it the other way round, some systems throw away settings like the keyboard translation, when detecting the mouse. All known keyboard and mouse detection problems should be fixed now! :-) See issue #2790 for more details. Modified: trunk/reactos/drivers/input/i8042prt/pnp.c Modified: trunk/reactos/drivers/input/i8042prt/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/pnp… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/pnp.c [iso-8859-1] Mon Mar 31 10:52:30 2008 @@ -413,11 +413,14 @@ WARN_(I8042PRT, "i8042BasicDetect() failed with status 0x%08lx\n", Status); return STATUS_UNSUCCESSFUL; } + + /* First detect the mouse and then the keyboard! + If we do it the other way round, some systems throw away settings like the keyboard translation, when detecting the mouse. */ + TRACE_(I8042PRT, "Detecting mouse\n"); + i8042DetectMouse(DeviceExtension); + TRACE_(I8042PRT, "Detecting keyboard\n"); i8042DetectKeyboard(DeviceExtension); - - TRACE_(I8042PRT, "Detecting mouse\n"); - i8042DetectMouse(DeviceExtension); INFO_(I8042PRT, "Keyboard present: %s\n", DeviceExtension->Flags & KEYBOARD_PRESENT ? "YES" : "NO"); INFO_(I8042PRT, "Mouse present : %s\n", DeviceExtension->Flags & MOUSE_PRESENT ? "YES" : "NO");

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