Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 24496: Move unmaintained stuff (cis, os2, rosky, vms, and msvc6) to a respective branch [01/02]
by fireball＠svn.reactos.org 13 Oct '06

13 Oct '06

Author: fireball Date: Fri Oct 13 13:00:21 2006 New Revision: 24496 URL: http://svn.reactos.org/svn/reactos?rev=24496&view=rev Log: Move unmaintained stuff (cis, os2, rosky, vms, and msvc6) to a respective branch [01/02] Added: branches/unmaintained/ branches/unmaintained/cis/ - copied from r24495, trunk/cis/ branches/unmaintained/msvc6/ - copied from r24495, trunk/msvc6/ branches/unmaintained/os2/ - copied from r24495, trunk/os2/ branches/unmaintained/rosky/ - copied from r24495, trunk/rosky/ branches/unmaintained/vms/ - copied from r24495, trunk/vms/ Modified: branches/unmaintained/msvc6/def_converter/makefile branches/unmaintained/msvc6/iface/native/genntdll.c branches/unmaintained/msvc6/iface/native/makefile branches/unmaintained/msvc6/ntoskrnl/ke_i386_bthread.c branches/unmaintained/msvc6/ntoskrnl/mm_mminit_msvc.c branches/unmaintained/os2/apps/bepslep/Makefile branches/unmaintained/os2/lib/doscalls/devices/ioctl_async.cpp branches/unmaintained/os2/lib/doscalls/doscalls.def branches/unmaintained/os2/lib/doscalls/doscalls.def.bak branches/unmaintained/os2/lib/doscalls/doscalls.edf branches/unmaintained/os2/lib/doscalls/makefile Modified: branches/unmaintained/msvc6/def_converter/makefile URL: http://svn.reactos.org/svn/reactos/branches/unmaintained/msvc6/def_converte… ============================================================================== --- branches/unmaintained/msvc6/def_converter/makefile (original) +++ branches/unmaintained/msvc6/def_converter/makefile Fri Oct 13 13:00:21 2006 @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.1 2004/02/06 08:21:54 fireball Exp $ +# $Id$ # # ReactOS Operating System - .def converter for HAL and the kernel # Modified: branches/unmaintained/msvc6/iface/native/genntdll.c URL: http://svn.reactos.org/svn/reactos/branches/unmaintained/msvc6/iface/native… ============================================================================== --- branches/unmaintained/msvc6/iface/native/genntdll.c (original) +++ branches/unmaintained/msvc6/iface/native/genntdll.c Fri Oct 13 13:00:21 2006 @@ -1,4 +1,4 @@ -/* $Id: genntdll.c,v 1.1 2004/02/06 08:21:56 fireball Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS version of ntdll Modified: branches/unmaintained/msvc6/iface/native/makefile URL: http://svn.reactos.org/svn/reactos/branches/unmaintained/msvc6/iface/native… ============================================================================== --- branches/unmaintained/msvc6/iface/native/makefile (original) +++ branches/unmaintained/msvc6/iface/native/makefile Fri Oct 13 13:00:21 2006 @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.1 2004/02/06 08:21:56 fireball Exp $ +# $Id$ # # ReactOS Operating System - MSVC6 Zw functions stubs to call generator # Modified: branches/unmaintained/msvc6/ntoskrnl/ke_i386_bthread.c URL: http://svn.reactos.org/svn/reactos/branches/unmaintained/msvc6/ntoskrnl/ke_… ============================================================================== --- branches/unmaintained/msvc6/ntoskrnl/ke_i386_bthread.c (original) +++ branches/unmaintained/msvc6/ntoskrnl/ke_i386_bthread.c Fri Oct 13 13:00:21 2006 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: ke_i386_bthread.c,v 1.1 2004/02/06 08:21:56 fireball Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel Modified: branches/unmaintained/msvc6/ntoskrnl/mm_mminit_msvc.c URL: http://svn.reactos.org/svn/reactos/branches/unmaintained/msvc6/ntoskrnl/mm_… ============================================================================== --- branches/unmaintained/msvc6/ntoskrnl/mm_mminit_msvc.c (original) +++ branches/unmaintained/msvc6/ntoskrnl/mm_mminit_msvc.c Fri Oct 13 13:00:21 2006 @@ -1,4 +1,4 @@ -/* $Id: mm_mminit_msvc.c,v 1.1 2004/02/06 08:22:01 fireball Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top directory * PROJECT: ReactOS kernel Modified: branches/unmaintained/os2/apps/bepslep/Makefile URL: http://svn.reactos.org/svn/reactos/branches/unmaintained/os2/apps/bepslep/M… ============================================================================== --- branches/unmaintained/os2/apps/bepslep/Makefile (original) +++ branches/unmaintained/os2/apps/bepslep/Makefile Fri Oct 13 13:00:21 2006 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 2003/01/07 16:23:10 robd Exp $ +# $Id$ # # Modified: branches/unmaintained/os2/lib/doscalls/devices/ioctl_async.cpp URL: http://svn.reactos.org/svn/reactos/branches/unmaintained/os2/lib/doscalls/d… ============================================================================== --- branches/unmaintained/os2/lib/doscalls/devices/ioctl_async.cpp (original) +++ branches/unmaintained/os2/lib/doscalls/devices/ioctl_async.cpp Fri Oct 13 13:00:21 2006 @@ -1,4 +1,4 @@ -/* $Id: ioctl_async.cpp,v 1.2 2004/01/31 01:29:11 robertk Exp $ +/* $Id$ */ /* * Modified: branches/unmaintained/os2/lib/doscalls/doscalls.def URL: http://svn.reactos.org/svn/reactos/branches/unmaintained/os2/lib/doscalls/d… ============================================================================== --- branches/unmaintained/os2/lib/doscalls/doscalls.def (original) +++ branches/unmaintained/os2/lib/doscalls/doscalls.def Fri Oct 13 13:00:21 2006 @@ -1,4 +1,4 @@ -; $Id: doscalls.def,v 1.6 2004/01/31 01:29:11 robertk Exp $ +; $Id$ ; ; Def for doscalls.dll - part of the OS/2-sub system ; for ReactOS. Provides Access to OS/2 kernel services. Modified: branches/unmaintained/os2/lib/doscalls/doscalls.def.bak URL: http://svn.reactos.org/svn/reactos/branches/unmaintained/os2/lib/doscalls/d… ============================================================================== --- branches/unmaintained/os2/lib/doscalls/doscalls.def.bak (original) +++ branches/unmaintained/os2/lib/doscalls/doscalls.def.bak Fri Oct 13 13:00:21 2006 @@ -1,4 +1,4 @@ -; $Id: doscalls.def.bak,v 1.1 2002/09/04 22:19:47 robertk Exp $ +; $Id$ ; ; Def for doscalls.dll - part of the OS/2-sub system ; for ReactOS. Provides Access to OS/2 kernel services. Modified: branches/unmaintained/os2/lib/doscalls/doscalls.edf URL: http://svn.reactos.org/svn/reactos/branches/unmaintained/os2/lib/doscalls/d… ============================================================================== --- branches/unmaintained/os2/lib/doscalls/doscalls.edf (original) +++ branches/unmaintained/os2/lib/doscalls/doscalls.edf Fri Oct 13 13:00:21 2006 @@ -1,4 +1,4 @@ -; $Id: doscalls.edf,v 1.4 2004/01/31 01:29:11 robertk Exp $ +; $Id$ ; ; Def for doscalls.dll - part of the OS/2-sub system ; for ReactOS. Provides Access to OS/2 kernel services. Modified: branches/unmaintained/os2/lib/doscalls/makefile URL: http://svn.reactos.org/svn/reactos/branches/unmaintained/os2/lib/doscalls/m… ============================================================================== --- branches/unmaintained/os2/lib/doscalls/makefile (original) +++ branches/unmaintained/os2/lib/doscalls/makefile Fri Oct 13 13:00:21 2006 @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.7 2004/01/31 01:29:11 robertk Exp $ +# $Id$ PATH_TO_TOP = ../../../reactos

1 0

[arty] 24495: Fixen. Delete is still broken. We now use BalancedRoot->Parent as the nil element and distinguish it from the embedded element. Fix null and root macros, assert macro and some other stuff.
by arty＠svn.reactos.org 13 Oct '06

13 Oct '06

Author: arty Date: Fri Oct 13 11:02:04 2006 New Revision: 24495 URL: http://svn.reactos.org/svn/reactos?rev=24495&view=rev Log: Fixen. Delete is still broken. We now use BalancedRoot->Parent as the nil element and distinguish it from the embedded element. Fix null and root macros, assert macro and some other stuff. Modified: trunk/reactos/lib/rtl/austin/avl.c trunk/reactos/lib/rtl/austin/macros.h trunk/reactos/lib/rtl/austin/tree.c trunk/reactos/lib/rtl/austin/tree.h trunk/reactos/lib/rtl/austin/udict.h trunk/reactos/lib/rtl/generictable.c Modified: trunk/reactos/lib/rtl/austin/avl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/austin/avl.c?rev=2… ============================================================================== --- trunk/reactos/lib/rtl/austin/avl.c (original) +++ trunk/reactos/lib/rtl/austin/avl.c Fri Oct 13 11:02:04 2006 @@ -36,8 +36,11 @@ void avl_init(udict_t *ud) { - ud->sentinel.left = ud->sentinel.right = ud->sentinel.parent = - &ud->sentinel; + ud->BalancedRoot.left = ud->BalancedRoot.right = + ud->BalancedRoot.parent = (udict_node_t*) + ud->AllocateRoutine(ud, sizeof(udict_node_t)); + ud->BalancedRoot.parent->left = ud->BalancedRoot.parent->right = + ud->BalancedRoot.parent->parent = ud->BalancedRoot.parent; } void RotateLeft(udict_node_t **top) @@ -197,7 +200,7 @@ node->right = nil; node->balance = BALANCED; - if (Insert(ud, node, &nil->left, nil)) { + if (Insert(ud, node, &ud->BalancedRoot.left, nil)) { nil->balance = LEFTHEAVY; }/*if*/ @@ -253,6 +256,7 @@ /* root has been deleted */ if (child == nil) { parent->balance = BALANCED; + ud->BalancedRoot.left = nil; }/*if*/ }/*if*/ @@ -297,9 +301,16 @@ }/*while*/ }/*avl_delete*/ +void *avl_get_data(udict_node_t *here) { + return data(here); +} + int avl_search(udict_t *ud, void *_key, udict_node_t *here, udict_node_t **where) { int result; + + if (avl_is_nil(ud, here)) + return TableInsertAsLeft; result = ud->compare(ud, _key, key(here)); @@ -309,14 +320,14 @@ } if (result == LESS) { - if( here->left == &ud->sentinel ) { + if( here->left == tree_null_priv(ud) ) { *where = here; return TableInsertAsLeft; } return avl_search(ud, _key, here->left, where); }/*if*/ else { - if( here->right == &ud->sentinel ) { + if( here->right == tree_null_priv(ud) ) { *where = here; return TableInsertAsRight; } @@ -326,7 +337,7 @@ int avl_is_nil(udict_t *ud, udict_node_t *node) { - return &ud->sentinel == node; + return tree_null_priv(ud) == node; } udict_node_t *avl_first(udict_t *ud) Modified: trunk/reactos/lib/rtl/austin/macros.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/austin/macros.h?re… ============================================================================== --- trunk/reactos/lib/rtl/austin/macros.h (original) +++ trunk/reactos/lib/rtl/austin/macros.h Fri Oct 13 11:02:04 2006 @@ -47,5 +47,5 @@ #define nodefree FreeRoutine #define context TableContext -#define assert(x) { if(x) { RtlAssert(#x, __FILE__, __LINE__, NULL); } } +#define assert(x) { if(!(x)) { RtlAssert(#x, __FILE__, __LINE__, NULL); } } Modified: trunk/reactos/lib/rtl/austin/tree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/austin/tree.c?rev=… ============================================================================== --- trunk/reactos/lib/rtl/austin/tree.c (original) +++ trunk/reactos/lib/rtl/austin/tree.c Fri Oct 13 11:02:04 2006 @@ -82,7 +82,7 @@ if (node == delparent->left) { delparent->left = child; } else { - assert (node == delparent->right); + //assert (node == delparent->right); delparent->right = child; } } Modified: trunk/reactos/lib/rtl/austin/tree.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/austin/tree.h?rev=… ============================================================================== --- trunk/reactos/lib/rtl/austin/tree.h (original) +++ trunk/reactos/lib/rtl/austin/tree.h Fri Oct 13 11:02:04 2006 @@ -36,6 +36,6 @@ void udict_tree_rotate_left(udict_node_t *, udict_node_t *); void udict_tree_rotate_right(udict_node_t *, udict_node_t *); -#define tree_root_priv(T) ((T)->sentinel.left) -#define tree_null_priv(L) (&(L)->sentinel) +#define tree_root_priv(T) ((T)->BalancedRoot.left) +#define tree_null_priv(L) ((L)->BalancedRoot.parent) #define TREE_DEPTH_MAX 64 Modified: trunk/reactos/lib/rtl/austin/udict.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/austin/udict.h?rev… ============================================================================== --- trunk/reactos/lib/rtl/austin/udict.h (original) +++ trunk/reactos/lib/rtl/austin/udict.h Fri Oct 13 11:02:04 2006 @@ -56,9 +56,9 @@ } udict_rb_color_t; typedef enum { - udict_balanced, - udict_leftheavy, - udict_rightheavy + udict_balanced = 0, + udict_leftheavy = -1, + udict_rightheavy = 1 } udict_avl_balance_t; typedef union { Modified: trunk/reactos/lib/rtl/generictable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/generictable.c?rev… ============================================================================== --- trunk/reactos/lib/rtl/generictable.c (original) +++ trunk/reactos/lib/rtl/generictable.c Fri Oct 13 11:02:04 2006 @@ -60,7 +60,7 @@ PRTL_BALANCED_LINKS OurNodeOrParent; TABLE_SEARCH_RESULT OurSearchResult; - if( Table->NumberGenericTableElements ) + if( !Table->NumberGenericTableElements ) { *SearchResult = TableEmptyTree; *NodeOrParent = NULL; @@ -68,7 +68,8 @@ } OurSearchResult = avl_search - (Table, Buffer, &Table->BalancedRoot, &OurNodeOrParent); + (Table, Buffer, + Table->BalancedRoot.LeftChild, &OurNodeOrParent); if(SearchResult) *SearchResult = OurSearchResult; if(NodeOrParent) *NodeOrParent = OurNodeOrParent; @@ -129,7 +130,7 @@ if( Result == TableFoundNode ) { - avl_delete_node(Table, Buffer); + avl_delete_node(Table, Node); Table->FreeRoutine(Table, Node); return TRUE; } @@ -169,18 +170,15 @@ if( Restart ) { Table->RestartKey = avl_first(Table); + } + else + { + Table->RestartKey = avl_next(Table, Table->RestartKey); + } + if( !Table->RestartKey ) + return NULL; + else return avl_data(Table->RestartKey); - } - else - { - Table->RestartKey = avl_next(Table, Table->RestartKey); - if( avl_is_nil(Table, Table->RestartKey) ) - return NULL; - else - return avl_data(Table->RestartKey); - } - - return 0; } /* @@ -363,25 +361,19 @@ if(NewElement) *NewElement = FALSE; - if( Table->NumberGenericTableElements ) - { - OurSearchResult = TableEmptyTree; - OurNodeOrParent = NULL; - return NULL; - } - OurSearchResult = avl_search - (Table, Buffer, &Table->BalancedRoot, &OurNodeOrParent); + (Table, Buffer, + Table->BalancedRoot.LeftChild, &OurNodeOrParent); if(NodeOrParent) *NodeOrParent = OurNodeOrParent; if(SearchResult) *SearchResult = OurSearchResult; if(OurSearchResult == TableFoundNode) { - if(NewElement) - *NewElement = TRUE; - RtlCopyMemory(avl_data(OurNodeOrParent), Buffer, BufferSize); - return avl_data(OurNodeOrParent); + RtlDeleteElementGenericTableAvl(Table, Buffer); + return RtlInsertElementGenericTableFullAvl + (Table, Buffer, BufferSize, + NewElement, NodeOrParent, SearchResult); } else { @@ -392,6 +384,7 @@ if( !NewNode ) return NULL; + NewNode->Balance = 0; RtlCopyMemory(avl_data(NewNode), Buffer, BufferSize); OurNodeOrParent = NewNode;

1 0

[fireball] 24494: - Fix a mistake in low memory pages allocation algorithm (commit-reviewers, where are you? :))
by fireball＠svn.reactos.org 12 Oct '06

12 Oct '06

Author: fireball Date: Fri Oct 13 00:46:07 2006 New Revision: 24494 URL: http://svn.reactos.org/svn/reactos?rev=24494&view=rev Log: - Fix a mistake in low memory pages allocation algorithm (commit-reviewers, where are you? :)) Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c Fri Oct 13 00:46:07 2006 @@ -362,7 +362,7 @@ if (AvailablePagesSoFar >= PagesNeeded) { - return Index; + return Index - AvailablePagesSoFar + 1; } } }

1 0

[hpoussin] 24493: Read object security descriptors from .inf file. Apply them for registry keys and services and display a message for files
by hpoussin＠svn.reactos.org 12 Oct '06

12 Oct '06

Author: hpoussin Date: Thu Oct 12 13:01:16 2006 New Revision: 24493 URL: http://svn.reactos.org/svn/reactos?rev=24493&view=rev Log: Read object security descriptors from .inf file. Apply them for registry keys and services and display a message for files Modified: trunk/reactos/dll/win32/setupapi/devinst.c trunk/reactos/dll/win32/setupapi/install.c trunk/reactos/dll/win32/setupapi/queue.c trunk/reactos/dll/win32/setupapi/setupapi_private.h Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c Thu Oct 12 13:01:16 2006 @@ -2270,8 +2270,8 @@ SetLastError(ERROR_NOT_ENOUGH_MEMORY); goto cleanup; } - strcpyW(DriverKey, L"{"); - strcatW(DriverKey, lpGuidString); + DriverKey[0] = '{'; + strcpyW(&DriverKey[1], lpGuidString); strcatW(DriverKey, L"}\\"); pDeviceInstance = &DriverKey[strlenW(DriverKey)]; rc = RegOpenKeyExW(RootKey, Modified: trunk/reactos/dll/win32/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/install… ============================================================================== --- trunk/reactos/dll/win32/setupapi/install.c (original) +++ trunk/reactos/dll/win32/setupapi/install.c Thu Oct 12 13:01:16 2006 @@ -89,6 +89,7 @@ static const WCHAR ProfileItems[] = {'P','r','o','f','i','l','e','I','t','e','m','s',0}; static const WCHAR Include[] = {'I','n','c','l','u','d','e',0}; static const WCHAR Needs[] = {'N','e','e','d','s',0}; +static const WCHAR DotSecurity[] = {'.','S','e','c','u','r','i','t','y',0}; /*********************************************************************** @@ -386,12 +387,49 @@ static BOOL registry_callback( HINF hinf, PCWSTR field, void *arg ) { struct registry_callback_info *info = arg; - INFCONTEXT context; + LPWSTR security_key, security_descriptor; + INFCONTEXT context, security_context; + PSECURITY_DESCRIPTOR sd = NULL; + SECURITY_ATTRIBUTES security_attributes = { 0, }; HKEY root_key, hkey; + DWORD required; BOOL ok = SetupFindFirstLineW( hinf, field, NULL, &context ); - - for (; ok; ok = SetupFindNextLine( &context, &context )) + if (!ok) + return TRUE; + + /* Check for .Security section */ + security_key = MyMalloc( (strlenW( field ) + strlenW( DotSecurity )) * sizeof(WCHAR) + sizeof(UNICODE_NULL) ); + if (!security_key) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + strcpyW( security_key, field ); + strcatW( security_key, DotSecurity ); + ok = SetupFindFirstLineW( hinf, security_key, NULL, &security_context ); + MyFree(security_key); + if (ok) + { + if (!SetupGetLineText( &security_context, NULL, NULL, NULL, NULL, 0, &required )) + return FALSE; + security_descriptor = MyMalloc( required * sizeof(WCHAR) ); + if (!security_descriptor) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + if (!SetupGetLineText( &security_context, NULL, NULL, NULL, security_descriptor, required, NULL )) + return FALSE; + ok = ConvertStringSecurityDescriptorToSecurityDescriptorW( security_descriptor, SDDL_REVISION_1, &sd, NULL ); + MyFree( security_descriptor ); + if (!ok) + return FALSE; + security_attributes.nLength = sizeof(SECURITY_ATTRIBUTES); + security_attributes.lpSecurityDescriptor = sd; + } + + for (ok = TRUE; ok; ok = SetupFindNextLine( &context, &context )) { WCHAR buffer[MAX_INF_STRING_LENGTH]; INT flags; @@ -423,7 +461,8 @@ { if (RegOpenKeyW( root_key, buffer, &hkey )) continue; /* ignore if it doesn't exist */ } - else if (RegCreateKeyW( root_key, buffer, &hkey )) + else if (RegCreateKeyExW( root_key, buffer, 0, NULL, 0, MAXIMUM_ALLOWED, + sd ? &security_attributes : NULL, &hkey, NULL )) { ERR( "could not create key %p %s\n", root_key, debugstr_w(buffer) ); continue; @@ -438,10 +477,12 @@ if (!do_reg_operation( hkey, buffer, &context, flags )) { if (hkey != root_key) RegCloseKey( hkey ); + if (sd) LocalFree( sd ); return FALSE; } if (hkey != root_key) RegCloseKey( hkey ); } + if (sd) LocalFree( sd ); return TRUE; } @@ -1274,6 +1315,8 @@ LPWSTR DisplayName = NULL; LPWSTR Description = NULL; LPWSTR Dependencies = NULL; + LPWSTR SecurityDescriptor = NULL; + PSECURITY_DESCRIPTOR sd = NULL; INT ServiceType, StartType, ErrorControl; DWORD dwRegType; DWORD tagId = (DWORD)-1; @@ -1304,7 +1347,7 @@ hService = OpenServiceW( hSCManager, ServiceName, - GENERIC_READ | GENERIC_WRITE); + DELETE | SERVICE_QUERY_CONFIG | SERVICE_CHANGE_CONFIG | WRITE_DAC); if (hService == NULL && GetLastError() != ERROR_SERVICE_DOES_NOT_EXIST) goto cleanup; @@ -1322,7 +1365,7 @@ hSCManager, ServiceName, DisplayName, - 0, + WRITE_DAC, ServiceType, StartType, ErrorControl, @@ -1365,6 +1408,17 @@ (ServiceFlags & SPSVCINST_NOCLOBBER_DEPENDENCIES && ServiceConfig->lpDependencies) ? NULL : Dependencies, NULL, NULL, (ServiceFlags & SPSVCINST_NOCLOBBER_DISPLAYNAME && ServiceConfig->lpDisplayName) ? NULL : DisplayName); + if (!ret) + goto cleanup; + } + + /* Set security */ + if (GetLineText(hInf, ServiceSection, L"Security", &SecurityDescriptor)) + { + ret = ConvertStringSecurityDescriptorToSecurityDescriptorW(SecurityDescriptor, SDDL_REVISION_1, &sd, NULL); + if (!ret) + goto cleanup; + ret = SetServiceObjectSecurity(hService, DACL_SECURITY_INFORMATION, sd); if (!ret) goto cleanup; } @@ -1462,12 +1516,15 @@ CloseServiceHandle(hService); if (hGroupOrderListKey != NULL) RegCloseKey(hGroupOrderListKey); + if (sd != NULL) + LocalFree(sd); MyFree(ServiceConfig); MyFree(ServiceBinary); MyFree(LoadOrderGroup); MyFree(DisplayName); MyFree(Description); MyFree(Dependencies); + MyFree(SecurityDescriptor); MyFree(GroupOrder); TRACE("Returning %d\n", ret); Modified: trunk/reactos/dll/win32/setupapi/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/queue.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/queue.c (original) +++ trunk/reactos/dll/win32/setupapi/queue.c Thu Oct 12 13:01:16 2006 @@ -22,6 +22,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(setupapi); +/* Unicode constants */ +static const WCHAR DotSecurity[] = {'.','S','e','c','u','r','i','t','y',0}; + /* context structure for the default queue callback */ struct default_callback_context { @@ -313,6 +316,7 @@ } if (!op->src_path && !(op->style & SP_COPY_SOURCE_ABSOLUTE)) { + len = len2 = 0; if (!(op->style & SP_COPY_SOURCEPATH_ABSOLUTE)) { /* retrieve relative path for this disk */ @@ -331,7 +335,7 @@ ptr = op->src_path + strlenW(op->src_path); if (len2 && ptr > op->src_path && ptr[-1] != '\\') *ptr++ = '\\'; } - if (!SetupGetStringFieldW( &disk_ctx, 4, ptr, len2, NULL )) *ptr = 0; + if (!SetupGetStringFieldW( &file_ctx, 2, ptr, len2, NULL )) *ptr = 0; } } if (!op->src_root) op->src_root = PARSER_get_src_root(hinf); @@ -486,6 +490,8 @@ op->src_tag = strdupW( params->SourceTagfile ); op->dst_path = strdupW( params->TargetDirectory ); op->dst_file = strdupW( params->TargetFilename ); + if (params->SecurityDescriptor) + FIXME( "Need to apply %s to %s\n", debugstr_w( params->SecurityDescriptor ), debugstr_w( op->dst_file )); /* some defaults */ if (!op->src_file) op->src_file = op->dst_file; @@ -731,12 +737,43 @@ PCWSTR section, DWORD style ) { SP_FILE_COPY_PARAMS_W params; - INFCONTEXT context; + LPWSTR security_key, security_descriptor = NULL; + INFCONTEXT context, security_context; WCHAR dest[MAX_PATH], src[MAX_PATH]; INT flags; + DWORD required; + BOOL ret; TRACE( "hinf=%p/%p section=%s root=%s\n", hinf, hlist, debugstr_w(section), debugstr_w(src_root) ); + + /* Check for .Security section */ + security_key = MyMalloc( (strlenW( section ) + strlenW( DotSecurity )) * sizeof(WCHAR) + sizeof(UNICODE_NULL) ); + if (!security_key) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + strcpyW( security_key, section ); + strcatW( security_key, DotSecurity ); + ret = SetupFindFirstLineW( hinf, security_key, NULL, &security_context ); + MyFree(security_key); + if (ret) + { + if (!SetupGetLineText( &security_context, NULL, NULL, NULL, NULL, 0, &required )) + return FALSE; + security_descriptor = MyMalloc( required * sizeof(WCHAR) ); + if (!security_descriptor) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + if (!SetupGetLineText( &security_context, NULL, NULL, NULL, security_descriptor, required, NULL )) + { + MyFree( security_descriptor ); + return FALSE; + } + } params.cbSize = sizeof(params); params.QueueHandle = queue; @@ -747,23 +784,29 @@ params.TargetFilename = dest; params.CopyStyle = style; params.LayoutInf = hinf; - params.SecurityDescriptor = NULL; - + params.SecurityDescriptor = security_descriptor; + + ret = FALSE; if (!hlist) hlist = hinf; if (!hinf) hinf = hlist; - if (!SetupFindFirstLineW( hlist, section, NULL, &context )) return FALSE; - if (!(params.TargetDirectory = get_destination_dir( hinf, section ))) return FALSE; + if (!SetupFindFirstLineW( hlist, section, NULL, &context )) goto done; + if (!(params.TargetDirectory = get_destination_dir( hinf, section ))) goto done; do { if (!SetupGetStringFieldW( &context, 1, dest, sizeof(dest)/sizeof(WCHAR), NULL )) - return FALSE; + goto done; if (!SetupGetStringFieldW( &context, 2, src, sizeof(src)/sizeof(WCHAR), NULL )) *src = 0; if (!SetupGetIntField( &context, 4, &flags )) flags = 0; /* FIXME */ params.SourceFilename = *src ? src : NULL; - if (!SetupQueueCopyIndirectW( &params )) return FALSE; + if (!SetupQueueCopyIndirectW( &params )) goto done; } while (SetupFindNextLine( &context, &context )); - return TRUE; + ret = TRUE; + +done: + if (security_descriptor) + MyFree( security_descriptor ); + return ret; } Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi_private.h (original) +++ trunk/reactos/dll/win32/setupapi/setupapi_private.h Thu Oct 12 13:01:16 2006 @@ -32,6 +32,7 @@ #include <cfgmgr32.h> #include <fdi.h> #include <regstr.h> +#include <sddl.h> #include <setupapi.h> #include <shlobj.h> #include <wine/debug.h>

1 0

[hpoussin] 24492: Better stubs for RpcImpersonateClient and RpcRevertToSelf (taken from Wine)
by hpoussin＠svn.reactos.org 12 Oct '06

12 Oct '06

Author: hpoussin Date: Thu Oct 12 12:57:21 2006 New Revision: 24492 URL: http://svn.reactos.org/svn/reactos?rev=24492&view=rev Log: Better stubs for RpcImpersonateClient and RpcRevertToSelf (taken from Wine) Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.c trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_bindi… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_binding.c (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_binding.c Thu Oct 12 12:57:21 2006 @@ -1163,6 +1163,7 @@ RPC_STATUS WINAPI RpcImpersonateClient(RPC_BINDING_HANDLE BindingHandle) { FIXME("(%p): stub\n", BindingHandle); + ImpersonateSelf(SecurityImpersonation); return RPC_S_OK; } @@ -1189,3 +1190,13 @@ FIXME("(%p): stub\n", BindingHandle); return RPC_S_OK; } + +/*********************************************************************** + * RpcRevertToSelf (RPCRT4.@) + */ +RPC_STATUS WINAPI RpcRevertToSelf(void) +{ + FIXME("stub\n"); + RevertToSelf(); + return RPC_S_OK; +} Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.sp… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec Thu Oct 12 12:57:21 2006 @@ -458,7 +458,7 @@ @ stub RpcProtseqVectorFreeW @ stdcall RpcRaiseException(long) @ stub RpcRegisterAsyncInfo -@ stub RpcRevertToSelf +@ stdcall RpcRevertToSelf() @ stdcall RpcRevertToSelfEx(ptr) @ stdcall RpcServerInqBindings(ptr) @ stub RpcServerInqCallAttributesA # wxp

1 0

[hpoussin] 24491: Send right security descriptor to InitializeObjectAttributes, so ntoskrnl won't fail The code was working because we never tried to call RegCreateKeyEx with a security descriptor...
by hpoussin＠svn.reactos.org 11 Oct '06

11 Oct '06

Author: hpoussin Date: Thu Oct 12 03:11:59 2006 New Revision: 24491 URL: http://svn.reactos.org/svn/reactos?rev=24491&view=rev Log: Send right security descriptor to InitializeObjectAttributes, so ntoskrnl won't fail The code was working because we never tried to call RegCreateKeyEx with a security descriptor... Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c Thu Oct 12 03:11:59 2006 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/advapi32/reg/reg.c @@ -981,6 +980,9 @@ TRACE("RegCreateKeyExA() called\n"); + if (lpSecurityAttributes && lpSecurityAttributes->nLength != sizeof(SECURITY_ATTRIBUTES)) + return ERROR_INVALID_USER_BUFFER; + /* get the real parent key */ Status = MapDefaultKey (&ParentKey, hKey); @@ -1002,7 +1004,7 @@ &SubKeyString, OBJ_CASE_INSENSITIVE, (HANDLE)ParentKey, - (PSECURITY_DESCRIPTOR)lpSecurityAttributes); + lpSecurityAttributes ? (PSECURITY_DESCRIPTOR)lpSecurityAttributes->lpSecurityDescriptor : NULL); Status = CreateNestedKey(phkResult, &Attributes, (lpClass == NULL)? NULL : &ClassString, @@ -1051,6 +1053,9 @@ TRACE("RegCreateKeyExW() called\n"); + if (lpSecurityAttributes && lpSecurityAttributes->nLength != sizeof(SECURITY_ATTRIBUTES)) + return ERROR_INVALID_USER_BUFFER; + /* get the real parent key */ Status = MapDefaultKey (&ParentKey, hKey); @@ -1068,7 +1073,7 @@ &SubKeyString, OBJ_CASE_INSENSITIVE, (HANDLE)ParentKey, - (PSECURITY_DESCRIPTOR)lpSecurityAttributes); + lpSecurityAttributes ? (PSECURITY_DESCRIPTOR)lpSecurityAttributes->lpSecurityDescriptor : NULL); Status = CreateNestedKey(phkResult, &Attributes, (lpClass == NULL)? NULL : &ClassString,

1 0

[hpoussin] 24490: Replace incomplete and broken implementations of ConvertStringSecurityDescriptorToSecurityDescriptorW and ConvertStringSidToSidW by new ones
by hpoussin＠svn.reactos.org 11 Oct '06

11 Oct '06

Author: hpoussin Date: Thu Oct 12 02:14:05 2006 New Revision: 24490 URL: http://svn.reactos.org/svn/reactos?rev=24490&view=rev Log: Replace incomplete and broken implementations of ConvertStringSecurityDescriptorToSecurityDescriptorW and ConvertStringSidToSidW by new ones Modified: trunk/reactos/dll/win32/advapi32/advapi32.rbuild trunk/reactos/dll/win32/advapi32/sec/ac.c trunk/reactos/dll/win32/advapi32/sec/misc.c trunk/reactos/dll/win32/advapi32/sec/sid.c Modified: trunk/reactos/dll/win32/advapi32/advapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.rbuild (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.rbuild Thu Oct 12 02:14:05 2006 @@ -7,6 +7,8 @@ <define name="WINVER">0x600</define> <define name="_WIN32_IE">0x0500</define> <define name="_WIN32_WINNT">0x0600</define> + <define name="UNICODE"></define> + <define name="_UNICODE"></define> <library>scm_client</library> <library>lsa_client</library> <library>ntdll</library> Modified: trunk/reactos/dll/win32/advapi32/sec/ac.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/ac.… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/ac.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/ac.c Thu Oct 12 02:14:05 2006 @@ -536,7 +536,7 @@ PACL pAcl, PFN_OBJECT_MGR_FUNCTS pfnArray OPTIONAL, PGENERIC_MAPPING pGenericMapping, - PINHERITED_FROM pInheritArray + PINHERITED_FROMA pInheritArray ) { /* That's all this function does, at least up to w2k3... Even MS was too @@ -609,14 +609,14 @@ //ASSERT(sizeof(TRUSTEE_W) == sizeof(TRUSTEE_A)); - TrusteeForm = GetTrusteeForm(pTrusteeA); + TrusteeForm = GetTrusteeFormA(pTrusteeA); switch (TrusteeForm) { case TRUSTEE_IS_NAME: { /* directly copy the array, this works as the size of the EXPLICIT_ACCESS_A structure matches the size of the EXPLICIT_ACCESS_W version */ - lpStr = GetTrusteeName(pTrusteeA); + lpStr = GetTrusteeNameA(pTrusteeA); if (lpStr != NULL) BufferSize = strlen(lpStr) + 1; @@ -800,7 +800,7 @@ Size = cCountOfExplicitEntries * sizeof(EXPLICIT_ACCESS_W); for (i = 0; i != cCountOfExplicitEntries; i++) { - TrusteeForm = GetTrusteeForm(&pListOfExplicitEntriesA[i].Trustee); + TrusteeForm = GetTrusteeFormA(&pListOfExplicitEntriesA[i].Trustee); switch (TrusteeForm) { @@ -852,7 +852,7 @@ peaw[i].grfInheritance = pListOfExplicitEntriesA[i].grfInheritance; /* convert or copy the TRUSTEE structure */ - TrusteeForm = GetTrusteeForm(&pListOfExplicitEntriesA[i].Trustee); + TrusteeForm = GetTrusteeFormA(&pListOfExplicitEntriesA[i].Trustee); switch (TrusteeForm) { case TRUSTEE_IS_NAME: Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/mis… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/misc.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/misc.c Thu Oct 12 02:14:05 2006 @@ -916,7 +916,7 @@ { *pdwAccountName = dwSrcLen; RtlCopyMemory ( pAccountName, TranslatedName->Name.Buffer, TranslatedName->Name.Length ); - pAccountName[TranslatedName->Name.Length / sizeof(WCHAR)] = L'\0'; + pAccountName[TranslatedName->Name.Length / sizeof(WCHAR)] = L'\0'; } if ( peUse ) *peUse = TranslatedName->Use; @@ -936,7 +936,7 @@ { *pdwDomainName = dwSrcLen; RtlCopyMemory ( pDomainName, ReferencedDomain->Domains[0].Name.Buffer, ReferencedDomain->Domains[0].Name.Length ); - pDomainName[ReferencedDomain->Domains[0].Name.Length / sizeof(WCHAR)] = L'\0'; + pDomainName[ReferencedDomain->Domains[0].Name.Length / sizeof(WCHAR)] = L'\0'; } } } @@ -1960,7 +1960,7 @@ NULL, NULL); - pifnProgressData->fnProgress(pObjectNameA, + pifnProgressData->fnProgress((LPWSTR)pObjectNameA, /* FIXME: wrong cast!! */ Status, pInvokeSetting, pifnProgressData->Args, Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sid.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/sid.c Thu Oct 12 02:14:05 2006 @@ -1,9 +1,9 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * WINE COPYRIGHT: * Copyright 1999, 2000 Juergen Schmied <juergen.schmied(a)debitel.net> * Copyright 2003 CodeWeavers Inc. (Ulrich Czekalla) + * Copyright 2006 Hervé Poussineau * * PROJECT: ReactOS system libraries * FILE: lib/advapi32/sec/sid.c @@ -11,25 +11,20 @@ */ #include <advapi32.h> +#include <sddl.h> #include <wine/debug.h> #include <wine/unicode.h> WINE_DEFAULT_DEBUG_CHANNEL(advapi); - -static BOOL ParseStringSidToSid(LPCWSTR StringSid, PSID pSid, LPDWORD cBytes); -static BOOL ParseStringAclToAcl(LPCWSTR StringAcl, LPDWORD lpdwFlags, - PACL pAcl, LPDWORD cBytes); -static BYTE ParseAceStringFlags(LPCWSTR* StringAcl); -static BYTE ParseAceStringType(LPCWSTR* StringAcl); -static DWORD ParseAceStringRights(LPCWSTR* StringAcl); -static DWORD ParseAclStringFlags(LPCWSTR* StringAcl); - -typedef struct _ACEFLAG -{ - LPCWSTR wstr; - DWORD value; -} ACEFLAG, *LPACEFLAG; +#define MAX_GUID_STRING_LEN 39 + +typedef struct RECORD +{ + LPCWSTR key; + DWORD value; +} RECORD; + typedef struct _MAX_SID { @@ -91,18 +86,6 @@ static const SID sidWorld = { SID_REVISION, 1, { SECURITY_WORLD_SID_AUTHORITY} , { SECURITY_WORLD_RID } }; /* - * ACE access rights - */ -static const WCHAR SDDL_READ_CONTROL[] = {'R','C',0}; -static const WCHAR SDDL_WRITE_DAC[] = {'W','D',0}; -static const WCHAR SDDL_WRITE_OWNER[] = {'W','O',0}; -static const WCHAR SDDL_STANDARD_DELETE[] = {'S','D',0}; -static const WCHAR SDDL_GENERIC_ALL[] = {'G','A',0}; -static const WCHAR SDDL_GENERIC_READ[] = {'G','R',0}; -static const WCHAR SDDL_GENERIC_WRITE[] = {'G','W',0}; -static const WCHAR SDDL_GENERIC_EXECUTE[] = {'G','X',0}; - -/* * ACE types */ static const WCHAR SDDL_ACCESS_ALLOWED[] = {'A',0}; @@ -113,6 +96,19 @@ static const WCHAR SDDL_ALARM[] = {'A','L',0}; static const WCHAR SDDL_OBJECT_AUDIT[] = {'O','U',0}; static const WCHAR SDDL_OBJECT_ALARM[] = {'O','L',0}; + +/* + * SDDL ADS Rights + */ +#define ADS_RIGHT_DS_CREATE_CHILD 0x0001 +#define ADS_RIGHT_DS_DELETE_CHILD 0x0002 +#define ADS_RIGHT_ACTRL_DS_LIST 0x0004 +#define ADS_RIGHT_DS_SELF 0x0008 +#define ADS_RIGHT_DS_READ_PROP 0x0010 +#define ADS_RIGHT_DS_WRITE_PROP 0x0020 +#define ADS_RIGHT_DS_DELETE_TREE 0x0040 +#define ADS_RIGHT_DS_LIST_OBJECT 0x0080 +#define ADS_RIGHT_DS_CONTROL_ACCESS 0x0100 /* * ACE flags @@ -184,532 +180,343 @@ return !status; } -#define WINE_SIZE_OF_WORLD_ACCESS_ACL (sizeof(ACL) + FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + sizeof(sidWorld)) - - -/* some helper functions - taken from winehq cvs 20050916 */ -/****************************************************************************** - * ComputeStringSidSize - */ -static DWORD ComputeStringSidSize(LPCWSTR StringSid) -{ - int ctok = 0; - DWORD size = sizeof(SID); - - while (*StringSid) - { - if (*StringSid == '-') - ctok++; - StringSid++; - } - - if (ctok > 3) - size += (ctok - 3) * sizeof(DWORD); - - return size; -} - -/****************************************************************************** - * ParseAceStringType - */ -static const ACEFLAG AceType[] = -{ - { SDDL_ACCESS_ALLOWED, ACCESS_ALLOWED_ACE_TYPE }, - { SDDL_ALARM, SYSTEM_ALARM_ACE_TYPE }, - { SDDL_AUDIT, SYSTEM_AUDIT_ACE_TYPE }, - { SDDL_ACCESS_DENIED, ACCESS_DENIED_ACE_TYPE }, - { SDDL_OBJECT_ACCESS_ALLOWED, ACCESS_ALLOWED_OBJECT_ACE_TYPE }, - { SDDL_OBJECT_ACCESS_DENIED, ACCESS_DENIED_OBJECT_ACE_TYPE }, - { SDDL_OBJECT_ALARM, SYSTEM_ALARM_OBJECT_ACE_TYPE }, - { SDDL_OBJECT_AUDIT, SYSTEM_AUDIT_OBJECT_ACE_TYPE }, - { NULL, 0 }, +static BOOL +FindKeyInTable( + IN const RECORD* Table, + IN LPCWSTR Key, + OUT SIZE_T* pKeyLength, + OUT DWORD* pItem) +{ + const RECORD* pRecord = Table; + while (pRecord->key != NULL) + { + if (wcsncmp(pRecord->key, Key, wcslen(pRecord->key)) == 0) + { + *pKeyLength = wcslen(pRecord->key); + *pItem = pRecord->value; + return TRUE; + } + pRecord++; + } + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; +} + +static BOOL +ParseSidString( + IN LPCWSTR Buffer, + OUT PSID* pSid, + OUT SIZE_T* pLength) +{ + WCHAR str[SDDL_ALIAS_SIZE + 1]; + LPWSTR strSid; + LPCWSTR end; + BOOL ret; + DWORD i; + + wcsncpy(str, Buffer, SDDL_ALIAS_SIZE); + for (i = SDDL_ALIAS_SIZE; i > 0; i--) + { + str[i] = UNICODE_NULL; + if (ConvertStringSidToSidW(str, pSid)) + { + *pLength = i; + return TRUE; + } + } + + end = wcschr(Buffer, SDDL_ACE_ENDC); + if (!end) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + strSid = (LPWSTR)LocalAlloc(0, (end - Buffer) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + if (!strSid) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + wcsncpy(strSid, Buffer, end - Buffer + 1); + strSid[end - Buffer] = UNICODE_NULL; + *pLength = end - Buffer; + ret = ConvertStringSidToSidW(strSid, pSid); + LocalFree(strSid); + return ret; +} + +static const RECORD DaclFlagTable[] = +{ + { SDDL_PROTECTED, SE_DACL_PROTECTED }, + { SDDL_AUTO_INHERIT_REQ, SE_DACL_AUTO_INHERIT_REQ }, + { SDDL_AUTO_INHERITED, SE_DACL_AUTO_INHERITED }, + { NULL, 0 }, }; -static BYTE ParseAceStringType(LPCWSTR* StringAcl) -{ - UINT len = 0; - LPCWSTR szAcl = *StringAcl; - const ACEFLAG *lpaf = AceType; - - while (lpaf->wstr && - (len = strlenW(lpaf->wstr)) && - strncmpW(lpaf->wstr, szAcl, len)) - lpaf++; - - if (!lpaf->wstr) - return 0; - - *StringAcl += len; - return lpaf->value; -} - - -/****************************************************************************** - * ParseAceStringFlags - */ -static const ACEFLAG AceFlags[] = -{ - { SDDL_CONTAINER_INHERIT, CONTAINER_INHERIT_ACE }, - { SDDL_AUDIT_FAILURE, FAILED_ACCESS_ACE_FLAG }, - { SDDL_INHERITED, INHERITED_ACE }, - { SDDL_INHERIT_ONLY, INHERIT_ONLY_ACE }, - { SDDL_NO_PROPAGATE, NO_PROPAGATE_INHERIT_ACE }, - { SDDL_OBJECT_INHERIT, OBJECT_INHERIT_ACE }, - { SDDL_AUDIT_SUCCESS, SUCCESSFUL_ACCESS_ACE_FLAG }, - { NULL, 0 }, +static const RECORD SaclFlagTable[] = +{ + { SDDL_PROTECTED, SE_SACL_PROTECTED }, + { SDDL_AUTO_INHERIT_REQ, SE_SACL_AUTO_INHERIT_REQ }, + { SDDL_AUTO_INHERITED, SE_SACL_AUTO_INHERITED }, + { NULL, 0 }, }; -static BYTE ParseAceStringFlags(LPCWSTR* StringAcl) -{ - UINT len = 0; - BYTE flags = 0; - LPCWSTR szAcl = *StringAcl; - - while (*szAcl != ';') - { - const ACEFLAG *lpaf = AceFlags; - - while (lpaf->wstr && - (len = strlenW(lpaf->wstr)) && - strncmpW(lpaf->wstr, szAcl, len)) - lpaf++; - - if (!lpaf->wstr) - return 0; - - flags |= lpaf->value; - szAcl += len; - } - - *StringAcl = szAcl; - return flags; -} - - -/****************************************************************************** - * ParseAceStringRights - */ -static const ACEFLAG AceRights[] = -{ - { SDDL_GENERIC_ALL, GENERIC_ALL }, - { SDDL_GENERIC_READ, GENERIC_READ }, - { SDDL_GENERIC_WRITE, GENERIC_WRITE }, - { SDDL_GENERIC_EXECUTE, GENERIC_EXECUTE }, - { SDDL_READ_CONTROL, READ_CONTROL }, - { SDDL_STANDARD_DELETE, DELETE }, - { SDDL_WRITE_DAC, WRITE_DAC }, - { SDDL_WRITE_OWNER, WRITE_OWNER }, - { NULL, 0 }, +static const RECORD AceFlagTable[] = +{ + { SDDL_CONTAINER_INHERIT, CONTAINER_INHERIT_ACE }, + { SDDL_OBJECT_INHERIT, OBJECT_INHERIT_ACE }, + { SDDL_NO_PROPAGATE, NO_PROPAGATE_INHERIT_ACE }, + { SDDL_INHERIT_ONLY, INHERIT_ONLY_ACE }, + { SDDL_INHERITED, INHERITED_ACE }, + { SDDL_AUDIT_SUCCESS, SUCCESSFUL_ACCESS_ACE_FLAG }, + { SDDL_AUDIT_FAILURE, FAILED_ACCESS_ACE_FLAG }, + { NULL, 0 }, }; -static DWORD ParseAceStringRights(LPCWSTR* StringAcl) -{ - UINT len = 0; - DWORD rights = 0; - LPCWSTR szAcl = *StringAcl; - - if ((*szAcl == '0') && (*(szAcl + 1) == 'x')) - { - LPCWSTR p = szAcl; - - while (*p && *p != ';') - p++; - - if (p - szAcl <= 8) - { - rights = strtoulW(szAcl, NULL, 16); - *StringAcl = p; - } - else - WARN("Invalid rights string format: %s\n", debugstr_wn(szAcl, p - szAcl)); - } - else - { - while (*szAcl != ';') - { - const ACEFLAG *lpaf = AceRights; - - while (lpaf->wstr && - (len = strlenW(lpaf->wstr)) && - strncmpW(lpaf->wstr, szAcl, len)) - { - lpaf++; - } - - if (!lpaf->wstr) - return 0; - - rights |= lpaf->value; - szAcl += len; - } - } - - *StringAcl = szAcl; - return rights; -} - -/****************************************************************************** - * ParseStringAclToAcl - * - * dacl_flags(string_ace1)(string_ace2)... (string_acen) - */ -static BOOL ParseStringAclToAcl(LPCWSTR StringAcl, LPDWORD lpdwFlags, - PACL pAcl, LPDWORD cBytes) -{ - DWORD val; - DWORD sidlen; - DWORD length = sizeof(ACL); - PACCESS_ALLOWED_ACE pAce = NULL; /* pointer to current ACE */ - - TRACE("%s\n", debugstr_w(StringAcl)); - - if (!StringAcl) - return FALSE; - - if (pAcl) /* pAce is only useful if we're setting values */ - pAce = (PACCESS_ALLOWED_ACE) ((LPBYTE)pAcl + sizeof(PACL)); - - /* Parse ACL flags */ - *lpdwFlags = ParseAclStringFlags(&StringAcl); - - /* Parse ACE */ - while (*StringAcl == '(') - { - StringAcl++; - - /* Parse ACE type */ - val = ParseAceStringType(&StringAcl); - if (pAce) - pAce->Header.AceType = (BYTE) val; - if (*StringAcl != ';') - goto lerr; - StringAcl++; - - /* Parse ACE flags */ - val = ParseAceStringFlags(&StringAcl); - if (pAce) - pAce->Header.AceFlags = (BYTE) val; - if (*StringAcl != ';') - goto lerr; - StringAcl++; - - /* Parse ACE rights */ - val = ParseAceStringRights(&StringAcl); - if (pAce) - pAce->Mask = val; - if (*StringAcl != ';') - goto lerr; - StringAcl++; - - /* Parse ACE object guid */ - if (*StringAcl != ';') - { - FIXME("Support for *_OBJECT_ACE_TYPE not implemented\n"); - goto lerr; - } - StringAcl++; - - /* Parse ACE inherit object guid */ - if (*StringAcl != ';') - { - FIXME("Support for *_OBJECT_ACE_TYPE not implemented\n"); - goto lerr; - } - StringAcl++; - - /* Parse ACE account sid */ - if (ParseStringSidToSid(StringAcl, pAce ? (PSID)&pAce->SidStart : NULL, &sidlen)) - { - while (*StringAcl && *StringAcl != ')') - StringAcl++; - } - - if (*StringAcl != ')') - goto lerr; - StringAcl++; - - length += FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + sidlen; - } - - *cBytes = length; - return TRUE; - -lerr: - WARN("Invalid ACE string format\n"); - return FALSE; -} - -/****************************************************************************** - * ParseStringSecurityDescriptorToSecurityDescriptor - */ -static BOOL ParseStringSecurityDescriptorToSecurityDescriptor( - LPCWSTR StringSecurityDescriptor, - SECURITY_DESCRIPTOR* SecurityDescriptor, - LPDWORD cBytes) -{ - BOOL bret = FALSE; - WCHAR toktype; - WCHAR tok[MAX_PATH]; - LPCWSTR lptoken; - LPBYTE lpNext = NULL; - DWORD len; - - *cBytes = 0; - - if (SecurityDescriptor) - lpNext = ((LPBYTE) SecurityDescriptor) + sizeof(SECURITY_DESCRIPTOR); - - while (*StringSecurityDescriptor) - { - toktype = *StringSecurityDescriptor; - - /* Expect char identifier followed by ':' */ - StringSecurityDescriptor++; - if (*StringSecurityDescriptor != ':') - { - SetLastError(ERROR_INVALID_PARAMETER); - goto lend; - } - StringSecurityDescriptor++; - - /* Extract token */ - lptoken = StringSecurityDescriptor; - while (*lptoken && *lptoken != ':') - lptoken++; - - if (*lptoken) - lptoken--; - - len = lptoken - StringSecurityDescriptor; - memcpy( tok, StringSecurityDescriptor, len * sizeof(WCHAR) ); - tok[len] = 0; - - switch (toktype) - { - case 'O': - { - DWORD bytes; - - if (!ParseStringSidToSid(tok, (PSID)lpNext, &bytes)) - goto lend; - - if (SecurityDescriptor) - { - SecurityDescriptor->Owner = (PSID) ((DWORD) lpNext - - (DWORD) SecurityDescriptor); - lpNext += bytes; /* Advance to next token */ - } - - *cBytes += bytes; - - break; - } - - case 'G': - { - DWORD bytes; - - if (!ParseStringSidToSid(tok, (PSID)lpNext, &bytes)) - goto lend; - - if (SecurityDescriptor) - { - SecurityDescriptor->Group = (PSID) ((DWORD) lpNext - - (DWORD) SecurityDescriptor); - lpNext += bytes; /* Advance to next token */ - } - - *cBytes += bytes; - - break; - } - - case 'D': - { - DWORD flags; - DWORD bytes; - - if (!ParseStringAclToAcl(tok, &flags, (PACL)lpNext, &bytes)) - goto lend; - - if (SecurityDescriptor) - { - SecurityDescriptor->Control |= SE_DACL_PRESENT | flags; - SecurityDescriptor->Dacl = (PACL) ((DWORD) lpNext - - (DWORD) SecurityDescriptor); - lpNext += bytes; /* Advance to next token */ +static BOOL +ParseFlagsString( + IN LPCWSTR Buffer, + IN const RECORD* FlagTable, + IN WCHAR LimitChar, + OUT DWORD* pFlags, + OUT SIZE_T* pLength) +{ + LPCWSTR ptr = Buffer; + SIZE_T PartialLength; + DWORD Flag; + + *pFlags = 0; + while (*ptr != LimitChar) + { + if (!FindKeyInTable(FlagTable, ptr, &PartialLength, &Flag)) + return FALSE; + *pFlags |= Flag; + ptr += PartialLength; + } + *pLength = ptr - Buffer; + return TRUE; +} + +static const RECORD AccessMaskTable[] = +{ + { SDDL_GENERIC_ALL, GENERIC_ALL }, + { SDDL_GENERIC_READ, GENERIC_READ }, + { SDDL_GENERIC_WRITE, GENERIC_WRITE }, + { SDDL_GENERIC_EXECUTE, GENERIC_EXECUTE }, + { SDDL_READ_CONTROL, READ_CONTROL }, + { SDDL_STANDARD_DELETE, DELETE }, + { SDDL_WRITE_DAC, WRITE_DAC }, + { SDDL_WRITE_OWNER, WRITE_OWNER }, + { SDDL_READ_PROPERTY, ADS_RIGHT_DS_READ_PROP }, + { SDDL_WRITE_PROPERTY, ADS_RIGHT_DS_WRITE_PROP }, + { SDDL_CREATE_CHILD, ADS_RIGHT_DS_CREATE_CHILD }, + { SDDL_DELETE_CHILD, ADS_RIGHT_DS_DELETE_CHILD }, + { SDDL_LIST_CHILDREN, ADS_RIGHT_ACTRL_DS_LIST }, + { SDDL_SELF_WRITE, ADS_RIGHT_DS_SELF }, + { SDDL_LIST_OBJECT, ADS_RIGHT_DS_LIST_OBJECT }, + { SDDL_DELETE_TREE, ADS_RIGHT_DS_DELETE_TREE }, + { SDDL_CONTROL_ACCESS, ADS_RIGHT_DS_CONTROL_ACCESS }, + { SDDL_FILE_ALL, FILE_ALL_ACCESS }, + { SDDL_FILE_READ, FILE_GENERIC_READ }, + { SDDL_FILE_WRITE, FILE_GENERIC_WRITE }, + { SDDL_FILE_EXECUTE, FILE_GENERIC_EXECUTE }, + { SDDL_KEY_ALL, KEY_ALL_ACCESS }, + { SDDL_KEY_READ, KEY_READ }, + { SDDL_KEY_WRITE, KEY_WRITE }, + { SDDL_KEY_EXECUTE, KEY_EXECUTE }, + { NULL, 0 }, +}; + +static BOOL +ParseAccessMaskString( + IN LPCWSTR Buffer, + OUT DWORD* pAccessMask, + OUT SIZE_T* pLength) +{ + /* FIXME: Allow hexadecimal string for access rights! */ + + return ParseFlagsString(Buffer, AccessMaskTable, SDDL_SEPERATORC, pAccessMask, pLength); +} + +static BOOL +ParseGuidString( + IN LPCWSTR Buffer, + OUT GUID* pGuid, + OUT BOOL* pIsGuidValid, + OUT SIZE_T* pLength) +{ + WCHAR GuidStr[MAX_GUID_STRING_LEN + 1]; + LPCWSTR end; + + end = wcschr(Buffer, SDDL_SEPERATORC); + if (!end) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + *pLength = end - Buffer; + *pIsGuidValid = (end != Buffer); + if (!*pIsGuidValid) + return TRUE; + + if (end - Buffer > MAX_GUID_STRING_LEN - 1) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + GuidStr[end - Buffer] = UNICODE_NULL; + wcsncpy(GuidStr, Buffer, end - Buffer); + if (RPC_S_OK != UuidFromStringW((unsigned short*)&GuidStr, pGuid)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + return TRUE; +} + +static const RECORD AceTypeTable[] = +{ + { SDDL_OBJECT_ACCESS_ALLOWED, ACCESS_ALLOWED_OBJECT_ACE_TYPE }, + { SDDL_OBJECT_ACCESS_DENIED, ACCESS_DENIED_OBJECT_ACE_TYPE }, + { SDDL_AUDIT, SYSTEM_AUDIT_ACE_TYPE }, + { SDDL_ALARM, SYSTEM_ALARM_ACE_TYPE }, + { SDDL_OBJECT_AUDIT, SYSTEM_AUDIT_OBJECT_ACE_TYPE }, + { SDDL_OBJECT_ALARM, SYSTEM_ALARM_OBJECT_ACE_TYPE }, + { SDDL_ACCESS_ALLOWED, ACCESS_ALLOWED_ACE_TYPE }, + { SDDL_ACCESS_DENIED, ACCESS_DENIED_ACE_TYPE }, + { NULL, 0 }, +}; + +static BOOL +ParseAceString( + IN LPCWSTR Buffer, + IN PACL pAcl, + OUT SIZE_T* pLength) +{ + LPCWSTR ptr = Buffer; + SIZE_T PartialLength; + DWORD aceType, aceFlags, accessMask; + GUID object, inheritObject; + BOOL objectValid, inheritObjectValid; + PSID sid = NULL; + BOOL ret; + + if (*ptr != SDDL_ACE_BEGINC) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + ptr++; /* Skip SDDL_ACE_BEGINC */ + + if (!FindKeyInTable(AceTypeTable, ptr, &PartialLength, &aceType)) + return FALSE; + ptr += PartialLength; + + if (*ptr != SDDL_SEPERATORC) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + ptr++; /* Skip SDDL_SEPERATORC */ + + if (!ParseFlagsString(ptr, AceFlagTable, SDDL_SEPERATORC, &aceFlags, &PartialLength)) + return FALSE; + ptr += PartialLength + 1; + + if (!ParseAccessMaskString(ptr, &accessMask, &PartialLength)) + return FALSE; + ptr += PartialLength + 1; + + if (!ParseGuidString(ptr, &object, &objectValid, &PartialLength)) + return FALSE; + ptr += PartialLength + 1; + + if (!ParseGuidString(ptr, &inheritObject, &inheritObjectValid, &PartialLength)) + return FALSE; + ptr += PartialLength + 1; + + if (!ParseSidString(ptr, &sid, &PartialLength)) + return FALSE; + ptr += PartialLength; + if (*ptr != SDDL_ACE_ENDC) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + ptr++; /* Skip SDDL_ACE_ENDC */ + *pLength = ptr - Buffer; + + switch (aceType) + { + case ACCESS_ALLOWED_ACE_TYPE: + ret = AddAccessAllowedAceEx( + pAcl, + ACL_REVISION_DS, + aceFlags, + accessMask, + sid); + break; + case ACCESS_ALLOWED_OBJECT_ACE_TYPE: + ret = AddAccessAllowedObjectAce( + pAcl, + ACL_REVISION_DS, + aceFlags, + accessMask, + objectValid ? &object : NULL, + inheritObjectValid ? &inheritObject : NULL, + sid); + break; + case ACCESS_DENIED_ACE_TYPE: + ret = AddAccessDeniedAceEx( + pAcl, + ACL_REVISION_DS, + aceFlags, + accessMask, + sid); + break; + case ACCESS_DENIED_OBJECT_ACE_TYPE: + ret = AddAccessDeniedObjectAce( + pAcl, + ACL_REVISION_DS, + aceFlags, + accessMask, + objectValid ? &object : NULL, + inheritObjectValid ? &inheritObject : NULL, + sid); + break; + case SYSTEM_AUDIT_ACE_TYPE: + ret = AddAuditAccessAceEx( + pAcl, + ACL_REVISION_DS, + aceFlags, + accessMask, + sid, + FALSE, + FALSE); + break; + case SYSTEM_AUDIT_OBJECT_ACE_TYPE: + ret = AddAuditAccessObjectAce( + pAcl, + ACL_REVISION_DS, + aceFlags, + accessMask, + objectValid ? &object : NULL, + inheritObjectValid ? &inheritObject : NULL, + sid, + FALSE, + FALSE); + break; + case SYSTEM_ALARM_ACE_TYPE: + case SYSTEM_ALARM_OBJECT_ACE_TYPE: + default: + { + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + ret = FALSE; } - - *cBytes += bytes; - - break; - } - - case 'S': - { - DWORD flags; - DWORD bytes; - - if (!ParseStringAclToAcl(tok, &flags, (PACL)lpNext, &bytes)) - goto lend; - - if (SecurityDescriptor) - { - SecurityDescriptor->Control |= SE_SACL_PRESENT | flags; - SecurityDescriptor->Sacl = (PACL) ((DWORD) lpNext - - (DWORD) SecurityDescriptor); - lpNext += bytes; /* Advance to next token */ - } - - *cBytes += bytes; - - break; - } - - default: - FIXME("Unknown token\n"); - SetLastError(ERROR_INVALID_PARAMETER); - goto lend; - } - - StringSecurityDescriptor = lptoken; - } - - bret = TRUE; - -lend: - return bret; -} - -/****************************************************************************** - * ParseAclStringFlags - */ -static DWORD ParseAclStringFlags(LPCWSTR* StringAcl) -{ - DWORD flags = 0; - LPCWSTR szAcl = *StringAcl; - - while (*szAcl != '(') - { - if (*szAcl == 'P') - { - flags |= SE_DACL_PROTECTED; - } - else if (*szAcl == 'A') - { - szAcl++; - if (*szAcl == 'R') - flags |= SE_DACL_AUTO_INHERIT_REQ; - else if (*szAcl == 'I') - flags |= SE_DACL_AUTO_INHERITED; - } - szAcl++; - } - - *StringAcl = szAcl; - return flags; -} - -/****************************************************************************** - * ParseStringSidToSid - */ -static BOOL ParseStringSidToSid(LPCWSTR StringSid, PSID pSid, LPDWORD cBytes) -{ - BOOL bret = FALSE; - SID* pisid=pSid; - - TRACE("%s, %p, %p\n", debugstr_w(StringSid), pSid, cBytes); - if (!StringSid) - { - SetLastError(ERROR_INVALID_PARAMETER); - TRACE("StringSid is NULL, returning FALSE\n"); - return FALSE; - } - - *cBytes = ComputeStringSidSize(StringSid); - if (!pisid) /* Simply compute the size */ - { - TRACE("only size requested, returning TRUE\n"); - return TRUE; - } - - if (*StringSid != 'S' || *StringSid != '-') /* S-R-I-S-S */ - { - DWORD i = 0, identAuth; - DWORD csubauth = ((*cBytes - sizeof(SID)) / sizeof(DWORD)) + 1; - - StringSid += 2; /* Advance to Revision */ - pisid->Revision = atoiW(StringSid); - - if (pisid->Revision != SDDL_REVISION) - { - TRACE("Revision %d is unknown\n", pisid->Revision); - goto lend; /* ERROR_INVALID_SID */ - } - if (csubauth == 0) - { - TRACE("SubAuthorityCount is 0\n"); - goto lend; /* ERROR_INVALID_SID */ - } - - pisid->SubAuthorityCount = csubauth; - - /* Advance to identifier authority */ - while (*StringSid && *StringSid != '-') - StringSid++; - if (*StringSid == '-') - StringSid++; - - /* MS' implementation can't handle values greater than 2^32 - 1, so - * we don't either; assume most significant bytes are always 0 - */ - pisid->IdentifierAuthority.Value[0] = 0; - pisid->IdentifierAuthority.Value[1] = 0; - identAuth = atoiW(StringSid); - pisid->IdentifierAuthority.Value[5] = identAuth & 0xff; - pisid->IdentifierAuthority.Value[4] = (identAuth & 0xff00) >> 8; - pisid->IdentifierAuthority.Value[3] = (identAuth & 0xff0000) >> 16; - pisid->IdentifierAuthority.Value[2] = (identAuth & 0xff000000) >> 24; - - /* Advance to first sub authority */ - while (*StringSid && *StringSid != '-') - StringSid++; - if (*StringSid == '-') - StringSid++; - - while (*StringSid) - { - while (*StringSid && *StringSid != '-') - StringSid++; - - pisid->SubAuthority[i++] = atoiW(StringSid); - } - - if (i != pisid->SubAuthorityCount) - goto lend; /* ERROR_INVALID_SID */ - - bret = TRUE; - } - else /* String constant format - Only available in winxp and above */ - { - pisid->Revision = SDDL_REVISION; - pisid->SubAuthorityCount = 1; - - FIXME("String constant not supported: %s\n", debugstr_wn(StringSid, 2)); - - /* TODO: Lookup string of well-known SIDs in table */ - pisid->IdentifierAuthority.Value[5] = 0; - pisid->SubAuthority[0] = 0; - - bret = TRUE; - } - -lend: - if (!bret) - SetLastError(ERROR_INVALID_SID); - - TRACE("returning %s\n", bret ? "TRUE" : "FALSE"); - return bret; + } + LocalFree(sid); + return ret; } /* Exported functions */ @@ -793,60 +600,190 @@ return TRUE; } -/* Winehq cvs 20050916 */ /****************************************************************************** * ConvertStringSecurityDescriptorToSecurityDescriptorW [ADVAPI32.@] * @implemented */ -BOOL WINAPI ConvertStringSecurityDescriptorToSecurityDescriptorW( - LPCWSTR StringSecurityDescriptor, - DWORD StringSDRevision, - PSECURITY_DESCRIPTOR* SecurityDescriptor, - PULONG SecurityDescriptorSize) -{ - DWORD cBytes; - SECURITY_DESCRIPTOR* psd; - BOOL bret = FALSE; - - TRACE("%s\n", debugstr_w(StringSecurityDescriptor)); - - if (GetVersion() & 0x80000000) - { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - goto lend; - } - else if (StringSDRevision != SID_REVISION) - { - SetLastError(ERROR_UNKNOWN_REVISION); - goto lend; - } - - /* Compute security descriptor length */ - if (!ParseStringSecurityDescriptorToSecurityDescriptor(StringSecurityDescriptor, - NULL, &cBytes)) - goto lend; - - psd = *SecurityDescriptor = (SECURITY_DESCRIPTOR*) LocalAlloc( - GMEM_ZEROINIT, cBytes); - - psd->Revision = SID_REVISION; - psd->Control |= SE_SELF_RELATIVE; - - if (!ParseStringSecurityDescriptorToSecurityDescriptor(StringSecurityDescriptor, - psd, &cBytes)) - { - LocalFree(psd); - goto lend; - } - - if (SecurityDescriptorSize) - *SecurityDescriptorSize = cBytes; - - bret = TRUE; - -lend: - TRACE(" ret=%d\n", bret); - return bret; +BOOL WINAPI +ConvertStringSecurityDescriptorToSecurityDescriptorW( + IN LPCWSTR StringSecurityDescriptor, + IN DWORD StringSDRevision, + OUT PSECURITY_DESCRIPTOR* SecurityDescriptor, + OUT PULONG SecurityDescriptorSize) +{ + PSECURITY_DESCRIPTOR sd = NULL; + BOOL ret = FALSE; + + if (!StringSecurityDescriptor) + SetLastError(ERROR_INVALID_PARAMETER); + else if (StringSDRevision != SDDL_REVISION_1) + SetLastError(ERROR_INVALID_PARAMETER); + else + { + LPCWSTR ptr = StringSecurityDescriptor; + DWORD numberOfAces = 0; + DWORD relativeSdSize; + SIZE_T MaxAclSize; + PSECURITY_DESCRIPTOR relativeSd = NULL; + PSID pSid; + PACL pAcl; + BOOL present, dummy; + /* An easy way to know how much space we need for an ACL is to count + * the number of ACEs and say that we have 1 SID by ACE + */ + ptr = wcschr(StringSecurityDescriptor, SDDL_ACE_BEGINC); + while (ptr != NULL) + { + numberOfAces++; + ptr = wcschr(ptr + 1, SDDL_ACE_BEGINC); + } + MaxAclSize = sizeof(ACL) + numberOfAces * + (sizeof(ACCESS_ALLOWED_OBJECT_ACE) + SECURITY_MAX_SID_SIZE); + + sd = (SECURITY_DESCRIPTOR*)LocalAlloc(0, sizeof(SECURITY_DESCRIPTOR)); + if (!sd) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + ret = InitializeSecurityDescriptor(sd, SECURITY_DESCRIPTOR_REVISION); + if (!ret) + goto cleanup; + + /* Now, really parse the string */ + ptr = StringSecurityDescriptor; + while (*ptr) + { + if (ptr[1] != SDDL_DELIMINATORC) + { + SetLastError(ERROR_INVALID_PARAMETER); + ret = FALSE; + goto cleanup; + } + ptr += 2; + switch (ptr[-2]) + { + case 'O': + case 'G': + { + PSID pSid; + SIZE_T Length; + + ret = ParseSidString(ptr, &pSid, &Length); + if (!ret) + goto cleanup; + if (ptr[-2] == 'O') + ret = SetSecurityDescriptorOwner(sd, pSid, FALSE); + else + ret = SetSecurityDescriptorGroup(sd, pSid, FALSE); + if (!ret) + { + LocalFree(pSid); + goto cleanup; + } + ptr += Length; + break; + } + case 'D': + case 'S': + { + DWORD aclFlags; + SIZE_T Length; + BOOL isDacl = (ptr[-2] == 'D'); + + if (isDacl) + ret = ParseFlagsString(ptr, DaclFlagTable, SDDL_ACE_BEGINC, &aclFlags, &Length); + else + ret = ParseFlagsString(ptr, SaclFlagTable, SDDL_ACE_BEGINC, &aclFlags, &Length); + if (!ret) + goto cleanup; + pAcl = (PACL)LocalAlloc(0, MaxAclSize); + if (!pAcl) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + ret = FALSE; + goto cleanup; + } + if (!InitializeAcl(pAcl, (DWORD)MaxAclSize, ACL_REVISION_DS)) + { + LocalFree(pAcl); + goto cleanup; + } + if (aclFlags != 0) + { + ret = SetSecurityDescriptorControl( + sd, + (SECURITY_DESCRIPTOR_CONTROL)aclFlags, + (SECURITY_DESCRIPTOR_CONTROL)aclFlags); + if (!ret) + { + LocalFree(pAcl); + goto cleanup; + } + } + ptr += Length; + while (*ptr == SDDL_ACE_BEGINC) + { + ret = ParseAceString(ptr, pAcl, &Length); + if (!ret) + { + LocalFree(pAcl); + goto cleanup; + } + ptr += Length; + } + if (isDacl) + ret = SetSecurityDescriptorDacl(sd, TRUE, pAcl, FALSE); + else + ret = SetSecurityDescriptorSacl(sd, TRUE, pAcl, FALSE); + if (!ret) + { + LocalFree(pAcl); + goto cleanup; + } + break; + } + default: + { + SetLastError(ERROR_INVALID_PARAMETER); + ret = FALSE; + goto cleanup; + } + } + } + + relativeSdSize = 0; + while (TRUE) + { + if (relativeSd) + LocalFree(relativeSd); + relativeSd = LocalAlloc(0, relativeSdSize); + if (!relativeSd) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + ret = MakeSelfRelativeSD(sd, relativeSd, &relativeSdSize); + if (ret || GetLastError() != ERROR_INSUFFICIENT_BUFFER) + break; + } + if (SecurityDescriptorSize) + *SecurityDescriptorSize = relativeSdSize; + *SecurityDescriptor = relativeSd; + +cleanup: + if (GetSecurityDescriptorOwner(sd, &pSid, &dummy)) + LocalFree(pSid); + if (GetSecurityDescriptorGroup(sd, &pSid, &dummy)) + LocalFree(pSid); + if (GetSecurityDescriptorDacl(sd, &present, &pAcl, &dummy) && present) + LocalFree(pAcl); + if (GetSecurityDescriptorSacl(sd, &present, &pAcl, &dummy) && present) + LocalFree(pAcl); + LocalFree(sd); + return ret; + } + return FALSE; } /* Winehq cvs 20050916 */ @@ -1204,16 +1141,206 @@ return bRetVal; } -/* - * @unimplemented - */ -BOOL STDCALL +/****************************************************************************** + * ComputeStringSidSize + */ +static DWORD ComputeStringSidSize(LPCWSTR StringSid) +{ + DWORD size = sizeof(SID); + + if (StringSid[0] == 'S' && StringSid[1] == '-') /* S-R-I-S-S */ + { + int ctok = 0; + while (*StringSid) + { + if (*StringSid == '-') + ctok++; + StringSid++; + } + + if (ctok > 3) + size += (ctok - 3) * sizeof(DWORD); + } + else /* String constant format - Only available in winxp and above */ + { + int i; + + for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) + if (!strncmpW(WellKnownSids[i].wstr, StringSid, 2)) + size += (WellKnownSids[i].Sid.SubAuthorityCount - 1) * sizeof(DWORD); + } + + return size; +} + +static const RECORD SidTable[] = +{ + { SDDL_ACCOUNT_OPERATORS, WinBuiltinAccountOperatorsSid }, + { SDDL_ALIAS_PREW2KCOMPACC, WinBuiltinPreWindows2000CompatibleAccessSid }, + { SDDL_ANONYMOUS, WinAnonymousSid }, + { SDDL_AUTHENTICATED_USERS, WinAuthenticatedUserSid }, + { SDDL_BUILTIN_ADMINISTRATORS, WinBuiltinAdministratorsSid }, + { SDDL_BUILTIN_GUESTS, WinBuiltinGuestsSid }, + { SDDL_BACKUP_OPERATORS, WinBuiltinBackupOperatorsSid }, + { SDDL_BUILTIN_USERS, WinBuiltinUsersSid }, + { SDDL_CERT_SERV_ADMINISTRATORS, WinAccountCertAdminsSid /* FIXME: DOMAIN_GROUP_RID_CERT_ADMINS */ }, + { SDDL_CREATOR_GROUP, WinCreatorGroupSid }, + { SDDL_CREATOR_OWNER, WinCreatorOwnerSid }, + { SDDL_DOMAIN_ADMINISTRATORS, WinAccountDomainAdminsSid /* FIXME: DOMAIN_GROUP_RID_ADMINS */ }, + { SDDL_DOMAIN_COMPUTERS, WinAccountComputersSid /* FIXME: DOMAIN_GROUP_RID_COMPUTERS */ }, + { SDDL_DOMAIN_DOMAIN_CONTROLLERS, WinAccountControllersSid /* FIXME: DOMAIN_GROUP_RID_CONTROLLERS */ }, + { SDDL_DOMAIN_GUESTS, WinAccountDomainGuestsSid /* FIXME: DOMAIN_GROUP_RID_GUESTS */ }, + { SDDL_DOMAIN_USERS, WinAccountDomainUsersSid /* FIXME: DOMAIN_GROUP_RID_USERS */ }, + { SDDL_ENTERPRISE_ADMINS, WinAccountEnterpriseAdminsSid /* FIXME: DOMAIN_GROUP_RID_ENTERPRISE_ADMINS */ }, + { SDDL_ENTERPRISE_DOMAIN_CONTROLLERS, WinLogonIdsSid /* FIXME: SECURITY_SERVER_LOGON_RID */ }, + { SDDL_EVERYONE, WinWorldSid }, + { SDDL_GROUP_POLICY_ADMINS, WinAccountPolicyAdminsSid /* FIXME: DOMAIN_GROUP_RID_POLICY_ADMINS */ }, + { SDDL_INTERACTIVE, WinInteractiveSid }, + { SDDL_LOCAL_ADMIN, WinAccountAdministratorSid /* FIXME: DOMAIN_USER_RID_ADMIN */ }, + { SDDL_LOCAL_GUEST, WinAccountGuestSid /* FIXME: DOMAIN_USER_RID_GUEST */ }, + { SDDL_LOCAL_SERVICE, WinLocalServiceSid }, + { SDDL_LOCAL_SYSTEM, WinLocalSystemSid }, + { SDDL_NETWORK, WinNetworkSid }, + { SDDL_NETWORK_CONFIGURATION_OPS, WinBuiltinNetworkConfigurationOperatorsSid }, + { SDDL_NETWORK_SERVICE, WinNetworkServiceSid }, + { SDDL_PRINTER_OPERATORS, WinBuiltinPrintOperatorsSid }, + { SDDL_PERSONAL_SELF, WinSelfSid }, + { SDDL_POWER_USERS, WinBuiltinPowerUsersSid }, + { SDDL_RAS_SERVERS, WinAccountRasAndIasServersSid /* FIXME: DOMAIN_ALIAS_RID_RAS_SERVERS */ }, + { SDDL_REMOTE_DESKTOP, WinBuiltinRemoteDesktopUsersSid }, + { SDDL_REPLICATOR, WinBuiltinReplicatorSid }, + { SDDL_RESTRICTED_CODE, WinRestrictedCodeSid }, + { SDDL_SCHEMA_ADMINISTRATORS, WinAccountSchemaAdminsSid /* FIXME: DOMAIN_GROUP_RID_SCHEMA_ADMINS */ }, + { SDDL_SERVER_OPERATORS, WinBuiltinSystemOperatorsSid }, + { SDDL_SERVICE, WinServiceSid }, + { NULL, 0 }, +}; + +/* + * @implemented + */ +BOOL WINAPI ConvertStringSidToSidW( - IN LPCWSTR StringSid, - OUT PSID* sid) -{ - FIXME("unimplemented!\n", __FUNCTION__); - return FALSE; + IN LPCWSTR StringSid, + OUT PSID* sid) +{ + DWORD size; + DWORD i, cBytes, identAuth, csubauth; + BOOL ret; + SID* pisid; + + TRACE("%s %p\n", StringSid, sid); + + if (!StringSid) + { + SetLastError(ERROR_INVALID_SID); + return FALSE; + } + for (i = 0; i < sizeof(SidTable) / sizeof(SidTable[0]) - 1; i++) + { + if (wcscmp(StringSid, SidTable[i].key) == 0) + { + WELL_KNOWN_SID_TYPE knownSid = (WELL_KNOWN_SID_TYPE)SidTable[i].value; + size = SECURITY_MAX_SID_SIZE; + *sid = LocalAlloc(0, size); + if (!*sid) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + ret = CreateWellKnownSid( + knownSid, + NULL, + *sid, + &size); + if (!ret) + { + SetLastError(ERROR_INVALID_SID); + LocalFree(*sid); + } + return ret; + } + } + + /* That's probably a string S-R-I-S-S... */ + if (StringSid[0] != 'S' || StringSid[1] != '-') + { + SetLastError(ERROR_INVALID_SID); + return FALSE; + } + + cBytes = ComputeStringSidSize(StringSid); + pisid = (SID*)LocalAlloc( 0, cBytes ); + if (!pisid) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + i = 0; + ret = FALSE; + csubauth = ((cBytes - sizeof(SID)) / sizeof(DWORD)) + 1; + + StringSid += 2; /* Advance to Revision */ + pisid->Revision = atoiW(StringSid); + + if (pisid->Revision != SDDL_REVISION) + { + TRACE("Revision %d is unknown\n", pisid->Revision); + goto lend; /* ERROR_INVALID_SID */ + } + if (csubauth == 0) + { + TRACE("SubAuthorityCount is 0\n"); + goto lend; /* ERROR_INVALID_SID */ + } + + pisid->SubAuthorityCount = csubauth; + + /* Advance to identifier authority */ + while (*StringSid && *StringSid != '-') + StringSid++; + if (*StringSid == '-') + StringSid++; + + /* MS' implementation can't handle values greater than 2^32 - 1, so + * we don't either; assume most significant bytes are always 0 + */ + pisid->IdentifierAuthority.Value[0] = 0; + pisid->IdentifierAuthority.Value[1] = 0; + identAuth = atoiW(StringSid); + pisid->IdentifierAuthority.Value[5] = identAuth & 0xff; + pisid->IdentifierAuthority.Value[4] = (identAuth & 0xff00) >> 8; + pisid->IdentifierAuthority.Value[3] = (identAuth & 0xff0000) >> 16; + pisid->IdentifierAuthority.Value[2] = (identAuth & 0xff000000) >> 24; + + /* Advance to first sub authority */ + while (*StringSid && *StringSid != '-') + StringSid++; + if (*StringSid == '-') + StringSid++; + + while (*StringSid) + { + while (*StringSid && *StringSid != '-') + StringSid++; + if (*StringSid == '-') + StringSid++; + + pisid->SubAuthority[i++] = atoiW(StringSid); + } + + if (i != pisid->SubAuthorityCount) + goto lend; /* ERROR_INVALID_SID */ + + *sid = pisid; + ret = TRUE; + +lend: + if (!ret) + SetLastError(ERROR_INVALID_SID); + + TRACE("returning %s\n", ret ? "TRUE" : "FALSE"); + return ret; }

1 0

[hpoussin] 24489: Add some definitions
by hpoussin＠svn.reactos.org 11 Oct '06

11 Oct '06

Author: hpoussin Date: Thu Oct 12 01:57:22 2006 New Revision: 24489 URL: http://svn.reactos.org/svn/reactos?rev=24489&view=rev Log: Add some definitions Modified: trunk/reactos/include/psdk/sddl.h Modified: trunk/reactos/include/psdk/sddl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sddl.h?rev=24… ============================================================================== --- trunk/reactos/include/psdk/sddl.h (original) +++ trunk/reactos/include/psdk/sddl.h Thu Oct 12 01:57:22 2006 @@ -39,12 +39,94 @@ #define SDDL_SACL TEXT("S") /* + * SDDL Security descriptor controls + */ +#define SDDL_PROTECTED TEXT("P") +#define SDDL_AUTO_INHERIT_REQ TEXT("AR") +#define SDDL_AUTO_INHERITED TEXT("AI") + +/* + * SDDL Rights + */ +#define SDDL_READ_PROPERTY TEXT("RP") +#define SDDL_WRITE_PROPERTY TEXT("WP") +#define SDDL_CREATE_CHILD TEXT("CC") +#define SDDL_DELETE_CHILD TEXT("DC") +#define SDDL_LIST_CHILDREN TEXT("LC") +#define SDDL_SELF_WRITE TEXT("SW") +#define SDDL_LIST_OBJECT TEXT("LO") +#define SDDL_DELETE_TREE TEXT("DT") +#define SDDL_CONTROL_ACCESS TEXT("CR") +#define SDDL_READ_CONTROL TEXT("RC") +#define SDDL_WRITE_DAC TEXT("WD") +#define SDDL_WRITE_OWNER TEXT("WO") +#define SDDL_STANDARD_DELETE TEXT("SD") +#define SDDL_GENERIC_ALL TEXT("GA") +#define SDDL_GENERIC_READ TEXT("GR") +#define SDDL_GENERIC_WRITE TEXT("GW") +#define SDDL_GENERIC_EXECUTE TEXT("GX") +#define SDDL_FILE_ALL TEXT("FA") +#define SDDL_FILE_READ TEXT("FR") +#define SDDL_FILE_WRITE TEXT("FW") +#define SDDL_FILE_EXECUTE TEXT("FX") +#define SDDL_KEY_ALL TEXT("KA") +#define SDDL_KEY_READ TEXT("KR") +#define SDDL_KEY_WRITE TEXT("KW") +#define SDDL_KEY_EXECUTE TEXT("KX") + +#define SDDL_ALIAS_SIZE 2 + +/* + * SDDL User aliases + */ +#define SDDL_DOMAIN_ADMINISTRATORS TEXT("DA") +#define SDDL_DOMAIN_GUESTS TEXT("DG") +#define SDDL_DOMAIN_USERS TEXT("DU") +#define SDDL_ENTERPRISE_DOMAIN_CONTROLLERS TEXT("ED") +#define SDDL_DOMAIN_DOMAIN_CONTROLLERS TEXT("DD") +#define SDDL_DOMAIN_COMPUTERS TEXT("DC") +#define SDDL_BUILTIN_ADMINISTRATORS TEXT("BA") +#define SDDL_BUILTIN_GUESTS TEXT("BG") +#define SDDL_BUILTIN_USERS TEXT("BU") +#define SDDL_LOCAL_ADMIN TEXT("LA") +#define SDDL_LOCAL_GUEST TEXT("LG") +#define SDDL_ACCOUNT_OPERATORS TEXT("AO") +#define SDDL_BACKUP_OPERATORS TEXT("BO") +#define SDDL_PRINTER_OPERATORS TEXT("PO") +#define SDDL_SERVER_OPERATORS TEXT("SO") +#define SDDL_AUTHENTICATED_USERS TEXT("AU") +#define SDDL_PERSONAL_SELF TEXT("PS") +#define SDDL_CREATOR_OWNER TEXT("CO") +#define SDDL_CREATOR_GROUP TEXT("CG") +#define SDDL_LOCAL_SYSTEM TEXT("SY") +#define SDDL_POWER_USERS TEXT("PU") +#define SDDL_EVERYONE TEXT("WD") +#define SDDL_REPLICATOR TEXT("RE") +#define SDDL_INTERACTIVE TEXT("IU") +#define SDDL_NETWORK TEXT("NU") +#define SDDL_SERVICE TEXT("SU") +#define SDDL_RESTRICTED_CODE TEXT("RC") +#define SDDL_ANONYMOUS TEXT("AN") +#define SDDL_SCHEMA_ADMINISTRATORS TEXT("SA") +#define SDDL_CERT_SERV_ADMINISTRATORS TEXT("CA") +#define SDDL_RAS_SERVERS TEXT("RS") +#define SDDL_ENTERPRISE_ADMINS TEXT("EA") +#define SDDL_GROUP_POLICY_ADMINS TEXT("PA") +#define SDDL_ALIAS_PREW2KCOMPACC TEXT("RU") +#define SDDL_LOCAL_SERVICE TEXT("LS") +#define SDDL_NETWORK_SERVICE TEXT("NS") +#define SDDL_REMOTE_DESKTOP TEXT("RD") +#define SDDL_NETWORK_CONFIGURATION_OPS TEXT("NO") +#define SDDL_PERFMON_USERS TEXT("MU") +#define SDDL_PERFLOG_USERS TEXT("LU") + +/* * SDDL Separators - character version */ -#define SDDL_SEPERATORC TEXT(";") -#define SDDL_DELIMINATORC TEXT(":") -#define SDDL_ACE_BEGINC TEXT("(") -#define SDDL_ACE_ENDC TEXT(")") +#define SDDL_SEPERATORC TEXT(';') +#define SDDL_DELIMINATORC TEXT(':') +#define SDDL_ACE_BEGINC TEXT('(') +#define SDDL_ACE_ENDC TEXT(')') /* * SDDL Separators - string version

1 0

[hpoussin] 24488: Don't try to signal init event, as it has been removed in r24413/24414
by hpoussin＠svn.reactos.org 11 Oct '06

11 Oct '06

Author: hpoussin Date: Wed Oct 11 22:25:22 2006 New Revision: 24488 URL: http://svn.reactos.org/svn/reactos?rev=24488&view=rev Log: Don't try to signal init event, as it has been removed in r24413/24414 Modified: trunk/reactos/base/setup/usetup/usetup.c Modified: trunk/reactos/base/setup/usetup/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.c… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.c (original) +++ trunk/reactos/base/setup/usetup/usetup.c Wed Oct 11 22:25:22 2006 @@ -3475,49 +3475,11 @@ static VOID -SignalInitEvent() -{ - NTSTATUS Status; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING UnicodeString = RTL_CONSTANT_STRING(L"\\ReactOSInitDone"); - HANDLE ReactOSInitEvent; - - InitializeObjectAttributes(&ObjectAttributes, - &UnicodeString, - 0, - 0, - NULL); - Status = NtOpenEvent(&ReactOSInitEvent, - EVENT_ALL_ACCESS, - &ObjectAttributes); - if (NT_SUCCESS(Status)) - { - LARGE_INTEGER Timeout; - /* This will cause the boot screen image to go away (if displayed) */ - NtPulseEvent(ReactOSInitEvent, NULL); - - /* Wait for the display mode to be changed (if in graphics mode) */ - Timeout.QuadPart = -50000000LL; /* 5 second timeout */ - NtWaitForSingleObject(ReactOSInitEvent, FALSE, &Timeout); - - NtClose(ReactOSInitEvent); - } - else - { - /* We don't really care if this fails */ - DPRINT1("USETUP: Failed to open ReactOS init notification event\n"); - } -} - - -static VOID RunUSetup(VOID) { INPUT_RECORD Ir; PAGE_NUMBER Page; BOOL ret; - - SignalInitEvent(); ret = AllocConsole(); if (!ret)

1 0

[weiden] 24487: Fixed InterlockedExchangeAdd
by weiden＠svn.reactos.org 11 Oct '06

11 Oct '06

Author: weiden Date: Wed Oct 11 21:41:42 2006 New Revision: 24487 URL: http://svn.reactos.org/svn/reactos?rev=24487&view=rev Log: Fixed InterlockedExchangeAdd Modified: trunk/reactos/include/psdk/intrin.h Modified: trunk/reactos/include/psdk/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/intrin.h (original) +++ trunk/reactos/include/psdk/intrin.h Wed Oct 11 21:41:42 2006 @@ -265,7 +265,7 @@ static __inline__ __attribute__((always_inline)) long _InterlockedExchangeAdd(volatile long * const Addend, const long Value) { long retval = Value; - __asm__("lock; xaddl %[retval], %[Addend]" : "=r" (retval) : "rm" (Addend)); + __asm__("lock; xaddl %[retval], %[Addend]" : [retval] "=r" (retval) : [Addend] "rm" (Addend)); return retval; }

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