Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 57486: [SHELL32] - Fix yet another missing "this->", spotted by Igor Sudarikov CORE-6722 #resolve #comment Good catch, thanks.
by tfaber＠svn.reactos.org 05 Oct '12

05 Oct '12

Author: tfaber Date: Fri Oct 5 10:51:54 2012 New Revision: 57486 URL: http://svn.reactos.org/svn/reactos?rev=57486&view=rev Log: [SHELL32] - Fix yet another missing "this->", spotted by Igor Sudarikov CORE-6722 #resolve #comment Good catch, thanks. Modified: trunk/reactos/dll/win32/shell32/folders/mycomp.cpp Modified: trunk/reactos/dll/win32/shell32/folders/mycomp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/mycomp.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/mycomp.cpp [iso-8859-1] Fri Oct 5 10:51:54 2012 @@ -727,7 +727,7 @@ } wcscpy(sName, lpName); - SHFree(sName); + SHFree(this->sName); this->sName = sName; TRACE("result %s\n", debugstr_w(sName)); return S_OK;

1 0

[tfaber] 57485: [SHELL32] - Fix what might finally be the last missing "this->" instances left over from the C++ conversion (used a regex this time)
by tfaber＠svn.reactos.org 04 Oct '12

04 Oct '12

Author: tfaber Date: Thu Oct 4 23:46:59 2012 New Revision: 57485 URL: http://svn.reactos.org/svn/reactos?rev=57485&view=rev Log: [SHELL32] - Fix what might finally be the last missing "this->" instances left over from the C++ conversion (used a regex this time) Modified: trunk/reactos/dll/win32/shell32/folders/cpanel.cpp trunk/reactos/dll/win32/shell32/folders/mycomp.cpp trunk/reactos/dll/win32/shell32/shlview.cpp Modified: trunk/reactos/dll/win32/shell32/folders/cpanel.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/cpanel.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/cpanel.cpp [iso-8859-1] Thu Oct 4 23:46:59 2012 @@ -540,7 +540,7 @@ // pObj = (IContextMenu *)this; this->apidl = apidl; - cidl = cidl; + this->cidl = cidl; pObj->AddRef(); hr = S_OK; } else if (IsEqualIID(riid, IID_IDataObject) && (cidl >= 1)) { Modified: trunk/reactos/dll/win32/shell32/folders/mycomp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/mycomp.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/mycomp.cpp [iso-8859-1] Thu Oct 4 23:46:59 2012 @@ -728,7 +728,7 @@ wcscpy(sName, lpName); SHFree(sName); - sName = sName; + this->sName = sName; TRACE("result %s\n", debugstr_w(sName)); return S_OK; } Modified: trunk/reactos/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] Thu Oct 4 23:46:59 2012 @@ -2828,7 +2828,7 @@ FIXME("partial stub: %p %08x %08x %p\n", this, aspects, advf, pAdvSink); /* FIXME: we set the AdviseSink, but never use it to send any advice */ - pAdvSink = pAdvSink; + this->pAdvSink = pAdvSink; dwAspects = aspects; dwAdvf = advf;

1 0

[ekohl] 57484: [LSASRV] Implement LsarEnumerateAccountRights. It is still WIP (Work In Progress).
by ekohl＠svn.reactos.org 04 Oct '12

04 Oct '12

Author: ekohl Date: Thu Oct 4 21:59:23 2012 New Revision: 57484 URL: http://svn.reactos.org/svn/reactos?rev=57484&view=rev Log: [LSASRV] Implement LsarEnumerateAccountRights. It is still WIP (Work In Progress). Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Thu Oct 4 21:59:23 2012 @@ -1633,22 +1633,109 @@ PRPC_SID AccountSid, PLSAPR_USER_RIGHT_SET UserRights) { - PLSA_DB_OBJECT PolicyObject; + LSAPR_HANDLE AccountHandle; + PLSAPR_PRIVILEGE_SET PrivilegeSet = NULL; + PRPC_UNICODE_STRING RightsBuffer = NULL; + PRPC_UNICODE_STRING PrivilegeString; + ULONG RightsCount; + ULONG RightsIndex; + ULONG PrivIndex; NTSTATUS Status; TRACE("LsarEnumerateAccountRights(%p %p %p)\n", PolicyHandle, AccountSid, UserRights); - Status = LsapValidateDbObject(PolicyHandle, - LsaDbPolicyObject, - ACCOUNT_VIEW, - &PolicyObject); - if (!NT_SUCCESS(Status)) + /* Open the account */ + Status = LsarOpenAccount(PolicyHandle, + AccountSid, + ACCOUNT_VIEW, + &AccountHandle); + if (!NT_SUCCESS(Status)) + { + ERR("LsarOpenAccount returned 0x%08lx\n", Status); return Status; - - UserRights->Entries = 0; - UserRights->UserRights = NULL; - return STATUS_OBJECT_NAME_NOT_FOUND; + } + + /* Enumerate the privileges */ + Status = LsarEnumeratePrivilegesAccount(AccountHandle, + &PrivilegeSet); + if (!NT_SUCCESS(Status)) + { + ERR("LsarEnumeratePrivilegesAccount returned 0x%08lx\n", Status); + goto done; + } + + /* FIXME: Get account rights */ + + + RightsCount = PrivilegeSet->PrivilegeCount; + + /* FIXME: Count account rights */ + + + /* We are done if there are no rights to be enumerated */ + if (RightsCount == 0) + { + UserRights->Entries = 0; + UserRights->UserRights = NULL; + Status = STATUS_SUCCESS; + goto done; + } + + /* Allocate a buffer for the account rights */ + RightsBuffer = MIDL_user_allocate(RightsCount * sizeof(RPC_UNICODE_STRING)); + if (RightsBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + /* Copy the privileges into the buffer */ + RightsIndex = 0; + for (PrivIndex = 0; PrivIndex < PrivilegeSet->PrivilegeCount; PrivIndex++) + { + PrivilegeString = NULL; + Status = LsarLookupPrivilegeName(PolicyHandle, + (PLUID)&PrivilegeSet->Privilege[PrivIndex].Luid, + (PRPC_UNICODE_STRING *)&PrivilegeString); + if (!NT_SUCCESS(Status)) + goto done; + + RightsBuffer[RightsIndex].Length = PrivilegeString->Length; + RightsBuffer[RightsIndex].MaximumLength = PrivilegeString->MaximumLength; + RightsBuffer[RightsIndex].Buffer = PrivilegeString->Buffer; + + MIDL_user_free(PrivilegeString); + RightsIndex++; + } + + /* FIXME: Copy account rights into the buffer */ + + + UserRights->Entries = RightsCount; + UserRights->UserRights = (PRPC_UNICODE_STRING)RightsBuffer; + +done: + if (!NT_SUCCESS(Status)) + { + if (RightsBuffer != NULL) + { + for (RightsIndex = 0; RightsIndex < RightsCount; RightsIndex++) + { + if (RightsBuffer[RightsIndex].Buffer != NULL) + MIDL_user_free(RightsBuffer[RightsIndex].Buffer); + } + + MIDL_user_free(RightsBuffer); + } + } + + if (PrivilegeSet != NULL) + MIDL_user_free(PrivilegeSet); + + LsarClose(&AccountHandle); + + return Status; }

1 0

[jimtabor] 57483: [NtUser] - Fix all but one DCE scroll test. - Old patch at least two year old or more.
by jimtabor＠svn.reactos.org 04 Oct '12

04 Oct '12

Author: jimtabor Date: Thu Oct 4 20:00:28 2012 New Revision: 57483 URL: http://svn.reactos.org/svn/reactos?rev=57483&view=rev Log: [NtUser] - Fix all but one DCE scroll test. - Old patch at least two year old or more. Modified: trunk/reactos/win32ss/user/ntuser/windc.c Modified: trunk/reactos/win32ss/user/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/windc.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] Thu Oct 4 20:00:28 2012 @@ -172,6 +172,88 @@ /* Make it dirty so that the vis rgn gets recomputed next time */ Dce->DCXFlags |= DCX_DCEDIRTY; + IntGdiSetHookFlags(Dce->hDC, DCHF_INVALIDATEVISRGN); +} + +static VOID FASTCALL +DceUpdateVisRgn(DCE *Dce, PWND Window, ULONG Flags) +{ + HANDLE hRgnVisible = NULL; + ULONG DcxFlags; + PWND DesktopWindow; + + if (Flags & DCX_PARENTCLIP) + { + PWND Parent; + + Parent = Window->spwndParent; + if(!Parent) + { + hRgnVisible = NULL; + goto noparent; + } + + if (Parent->style & WS_CLIPSIBLINGS) + { + DcxFlags = DCX_CLIPSIBLINGS | + (Flags & ~(DCX_CLIPCHILDREN | DCX_WINDOW)); + } + else + { + DcxFlags = Flags & ~(DCX_CLIPSIBLINGS | DCX_CLIPCHILDREN | DCX_WINDOW); + } + hRgnVisible = DceGetVisRgn(Parent, DcxFlags, Window->head.h, Flags); + } + else if (Window == NULL) + { + DesktopWindow = UserGetWindowObject(IntGetDesktopWindow()); + if (NULL != DesktopWindow) + { + hRgnVisible = IntSysCreateRectRgnIndirect(&DesktopWindow->rcWindow); + } + else + { + hRgnVisible = NULL; + } + } + else + { + hRgnVisible = DceGetVisRgn(Window, Flags, 0, 0); + } + +noparent: + if (Flags & DCX_INTERSECTRGN) + { + if(Dce->hrgnClip != NULL) + { + NtGdiCombineRgn(hRgnVisible, hRgnVisible, Dce->hrgnClip, RGN_AND); + } + else + { + if(hRgnVisible != NULL) + { + GreDeleteObject(hRgnVisible); + } + hRgnVisible = IntSysCreateRectRgn(0, 0, 0, 0); + } + } + else if (Flags & DCX_EXCLUDERGN && Dce->hrgnClip != NULL) + { + NtGdiCombineRgn(hRgnVisible, hRgnVisible, Dce->hrgnClip, RGN_DIFF); + } + + Dce->DCXFlags &= ~DCX_DCEDIRTY; + GdiSelectVisRgn(Dce->hDC, hRgnVisible); + + if (Window != NULL) + { + IntEngWindowChanged(Window, WOC_RGN_CLIENT); + } + + if (hRgnVisible != NULL) + { + GreDeleteObject(hRgnVisible); + } } static INT FASTCALL @@ -183,6 +265,11 @@ } /* Restore previous visible region */ + if (EndPaint) + { + DceUpdateVisRgn(dce, dce->pwndOrg, dce->DCXFlags); + } + if ((dce->DCXFlags & (DCX_INTERSECTRGN | DCX_EXCLUDERGN)) && ((dce->DCXFlags & DCX_CACHE) || EndPaint)) { @@ -193,9 +280,6 @@ { if (!(dce->DCXFlags & DCX_NORESETATTRS)) { - /* Make the DC clean so that SetDCState doesn't try to update the vis rgn */ - IntGdiSetHookFlags(dce->hDC, DCHF_VALIDATEVISRGN); - // Clean the DC if (!IntGdiCleanDC(dce->hDC)) return 0; @@ -205,6 +289,8 @@ * because SetDCState() disables hVisRgn updates * by removing dirty bit. */ dce->hwndCurrent = 0; + dce->pwndOrg = NULL; + dce->pwndClip = NULL; dce->DCXFlags &= DCX_CACHE; dce->DCXFlags |= DCX_DCEEMPTY; } @@ -237,86 +323,6 @@ return 1; // Released! } -static VOID FASTCALL -DceUpdateVisRgn(DCE *Dce, PWND Window, ULONG Flags) -{ - HANDLE hRgnVisible = NULL; - ULONG DcxFlags; - PWND DesktopWindow; - - if (Flags & DCX_PARENTCLIP) - { - PWND Parent; - - Parent = Window->spwndParent; - if(!Parent) - { - hRgnVisible = NULL; - goto noparent; - } - - if (Parent->style & WS_CLIPSIBLINGS) - { - DcxFlags = DCX_CLIPSIBLINGS | - (Flags & ~(DCX_CLIPCHILDREN | DCX_WINDOW)); - } - else - { - DcxFlags = Flags & ~(DCX_CLIPSIBLINGS | DCX_CLIPCHILDREN | DCX_WINDOW); - } - hRgnVisible = DceGetVisRgn(Parent, DcxFlags, Window->head.h, Flags); - } - else if (Window == NULL) - { - DesktopWindow = UserGetWindowObject(IntGetDesktopWindow()); - if (NULL != DesktopWindow) - { - hRgnVisible = IntSysCreateRectRgnIndirect(&DesktopWindow->rcWindow); - } - else - { - hRgnVisible = NULL; - } - } - else - { - hRgnVisible = DceGetVisRgn(Window, Flags, 0, 0); - } - -noparent: - if (Flags & DCX_INTERSECTRGN) - { - if(Dce->hrgnClip != NULL) - { - NtGdiCombineRgn(hRgnVisible, hRgnVisible, Dce->hrgnClip, RGN_AND); - } - else - { - if(hRgnVisible != NULL) - { - GreDeleteObject(hRgnVisible); - } - hRgnVisible = IntSysCreateRectRgn(0, 0, 0, 0); - } - } - else if (Flags & DCX_EXCLUDERGN && Dce->hrgnClip != NULL) - { - NtGdiCombineRgn(hRgnVisible, hRgnVisible, Dce->hrgnClip, RGN_DIFF); - } - - Dce->DCXFlags &= ~DCX_DCEDIRTY; - GdiSelectVisRgn(Dce->hDC, hRgnVisible); - - if (Window != NULL) - { - IntEngWindowChanged(Window, WOC_RGN_CLIENT); - } - - if (hRgnVisible != NULL) - { - GreDeleteObject(hRgnVisible); - } -} HDC FASTCALL UserGetDCEx(PWND Wnd OPTIONAL, HANDLE ClipRegion, ULONG Flags) @@ -325,6 +331,7 @@ ULONG DcxFlags; DCE* Dce = NULL; BOOL UpdateClipOrigin = FALSE; + BOOL bUpdateVisRgn = TRUE; HDC hDC = NULL; PPROCESSINFO ppi; PLIST_ENTRY pLE; @@ -360,12 +367,7 @@ TRACE("We have CLASS!!\n"); } } -/* else // For Testing! - { - ERR("We have POWNER!!\n"); - if (Window->Dce) ERR("We have POWNER with DCE!!\n"); - } -*/ + if (Wnd->style & WS_CLIPSIBLINGS) { Flags |= DCX_CLIPSIBLINGS; @@ -441,7 +443,7 @@ do { // The reason for this you may ask? -// Well, it seems ReactOS calls GetDC with out first creating a desktop DC window! +// Well, it seems ReactOS calls GetDC without first creating a desktop DC window! // Need to test for null here. Not sure if this is a bug or a feature. // First time use hax, need to use DceAllocDCE during window display init. if (!Dce) break; @@ -460,6 +462,7 @@ ((Dce->DCXFlags & DCX_CACHECOMPAREMASK) == DcxFlags)) { UpdateClipOrigin = TRUE; + //bUpdateVisRgn = FALSE; break; } } @@ -478,6 +481,7 @@ if (!Dce) return NULL; Dce->hwndCurrent = (Wnd ? Wnd->head.h : NULL); + Dce->pwndOrg = Dce->pwndClip = Wnd; } else // If we are here, we are POWNED or having CLASS. { @@ -486,9 +490,12 @@ Dce = CONTAINING_RECORD(pLE, DCE, List); do { // Check for Window handle than HDC match for CLASS. - if ((Dce->hwndCurrent == Wnd->head.h) || - (Dce->hDC == hDC)) + if (Dce->hwndCurrent == Wnd->head.h) + { + bUpdateVisRgn = FALSE; break; + } + if (Dce->hDC == hDC) break; pLE = Dce->List.Flink; Dce = CONTAINING_RECORD(pLE, DCE, List); } @@ -535,6 +542,7 @@ Flags |= DCX_INTERSECTRGN | DCX_KEEPCLIPRGN; Dce->DCXFlags |= DCX_INTERSECTRGN | DCX_KEEPCLIPRGN; ClipRegion = Wnd->hrgnUpdate; + bUpdateVisRgn = TRUE; } if (ClipRegion == HRGN_WINDOW) @@ -548,6 +556,7 @@ Dce->hrgnClip = IntSysCreateRectRgnIndirect(&Wnd->rcWindow); } Dce->DCXFlags &= ~DCX_KEEPCLIPRGN; + bUpdateVisRgn = TRUE; } else if (ClipRegion != NULL) { @@ -558,11 +567,14 @@ Dce->hrgnClip = NULL; } Dce->hrgnClip = ClipRegion; - } + bUpdateVisRgn = TRUE; + } + + if (IntGdiSetHookFlags(Dce->hDC, DCHF_VALIDATEVISRGN)) bUpdateVisRgn = TRUE; DceSetDrawable(Wnd, Dce->hDC, Flags, UpdateClipOrigin); - DceUpdateVisRgn(Dce, Wnd, Flags); + if (bUpdateVisRgn) DceUpdateVisRgn(Dce, Wnd, Flags); if (Dce->DCXFlags & DCX_CACHE) { @@ -697,6 +709,7 @@ DceUpdateVisRgn(pDCE, Window, pDCE->DCXFlags); pDCE->DCXFlags = DCX_DCEEMPTY|DCX_CACHE; pDCE->hwndCurrent = 0; + pDCE->pwndOrg = pDCE->pwndClip = NULL; TRACE("POWNED DCE going Cheap!! DCX_CACHE!! hDC-> %x \n", pDCE->hDC); if (!GreSetDCOwner( pDCE->hDC, GDI_OBJ_HMGR_NONE)) @@ -734,6 +747,7 @@ } pDCE->DCXFlags |= DCX_DCEEMPTY; pDCE->hwndCurrent = 0; + pDCE->pwndOrg = pDCE->pwndClip = NULL; } } pLE = pDCE->List.Flink; @@ -872,6 +886,7 @@ dc->ptlDCOrig.x = CurrentWindow->rcClient.left; dc->ptlDCOrig.y = CurrentWindow->rcClient.top; } + if (NULL != dc->rosdc.hClipRgn) { NtGdiOffsetRgn(dc->rosdc.hClipRgn, DeltaX, DeltaY); @@ -885,6 +900,7 @@ DC_UnlockDc(dc); DceUpdateVisRgn(pDCE, CurrentWindow, pDCE->DCXFlags); + IntGdiSetHookFlags(pDCE->hDC, DCHF_VALIDATEVISRGN); if (Window->head.h != pDCE->hwndCurrent) {

1 0

[ion] 57482: [RTL]: Implement and half-plement the Object Security APIs. In most cases, ultimately forward to an internal (unimplemented) worker function, but some APIs were implemented fully. Also...
by ion＠svn.reactos.org 04 Oct '12

04 Oct '12

Author: ion Date: Thu Oct 4 19:32:18 2012 New Revision: 57482 URL: http://svn.reactos.org/svn/reactos?rev=57482&view=rev Log: [RTL]: Implement and half-plement the Object Security APIs. In most cases, ultimately forward to an internal (unimplemented) worker function, but some APIs were implemented fully. Also add missing RtlCreateAndSetSD and export it (unimplemented). Modified: trunk/reactos/dll/ntdll/def/ntdll.spec trunk/reactos/lib/rtl/security.c Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Thu Oct 4 19:32:18 2012 @@ -508,7 +508,7 @@ @ stdcall RtlCopyUnicodeString(ptr ptr) @ stdcall RtlCreateAcl(ptr long long) @ stdcall RtlCreateActivationContext(ptr ptr) -;@ stdcall RtlCreateAndSetSD +@ stdcall RtlCreateAndSetSD(ptr long ptr ptr ptr) @ stdcall RtlCreateAtomTable(long ptr) @ stdcall RtlCreateBootStatusDataFile() @ stdcall RtlCreateEnvironment(long ptr) Modified: trunk/reactos/lib/rtl/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/security.c?rev=574… ============================================================================== --- trunk/reactos/lib/rtl/security.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/security.c [iso-8859-1] Thu Oct 4 19:32:18 2012 @@ -9,11 +9,71 @@ /* INCLUDES *****************************************************************/ #include <rtl.h> - #define NDEBUG #include <debug.h> -/* FUNCTIONS ***************************************************************/ +/* PRIVATE FUNCTIONS **********************************************************/ + +NTSTATUS +NTAPI +RtlpSetSecurityObject(IN PVOID Object, + IN SECURITY_INFORMATION SecurityInformation, + IN PSECURITY_DESCRIPTOR ModificationDescriptor, + OUT PSECURITY_DESCRIPTOR *ObjectsSecurityDescriptor, + IN ULONG AutoInheritFlags, + IN ULONG PoolType, + IN PGENERIC_MAPPING GenericMapping, + IN HANDLE Token OPTIONAL) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +RtlpNewSecurityObject(IN PSECURITY_DESCRIPTOR ParentDescriptor, + IN PSECURITY_DESCRIPTOR CreatorDescriptor, + OUT PSECURITY_DESCRIPTOR *NewDescriptor, + IN LPGUID *ObjectTypes, + IN ULONG GuidCount, + IN BOOLEAN IsDirectoryObject, + IN ULONG AutoInheritFlags, + IN HANDLE Token, + IN PGENERIC_MAPPING GenericMapping) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +RtlpConvertToAutoInheritSecurityObject(IN PSECURITY_DESCRIPTOR ParentDescriptor, + IN PSECURITY_DESCRIPTOR CreatorDescriptor, + OUT PSECURITY_DESCRIPTOR *NewDescriptor, + IN LPGUID ObjectType, + IN BOOLEAN IsDirectoryObject, + IN PGENERIC_MAPPING GenericMapping) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +RtlCreateAndSetSD(IN PVOID AceData, + IN ULONG AceCount, + IN PSID OwnerSid OPTIONAL, + IN PSID GroupSid OPTIONAL, + OUT PSECURITY_DESCRIPTOR *NewDescriptor) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} /* * @implemented @@ -22,18 +82,15 @@ NTAPI RtlDeleteSecurityObject(IN PSECURITY_DESCRIPTOR *ObjectDescriptor) { - DPRINT("RtlDeleteSecurityObject(%p)\n", ObjectDescriptor); - - RtlFreeHeap(RtlGetProcessHeap(), - 0, - *ObjectDescriptor); - + DPRINT1("RtlDeleteSecurityObject(%p)\n", ObjectDescriptor); + + /* Free the object from the heap */ + RtlFreeHeap(RtlGetProcessHeap(), 0, *ObjectDescriptor); return STATUS_SUCCESS; } - -/* - * @unimplemented +/* + * @implemented */ NTSTATUS NTAPI @@ -44,12 +101,22 @@ IN HANDLE Token, IN PGENERIC_MAPPING GenericMapping) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented + DPRINT1("RtlNewSecurityObject(%p)\n", ParentDescriptor); + + /* Call the internal API */ + return RtlpNewSecurityObject(ParentDescriptor, + CreatorDescriptor, + NewDescriptor, + NULL, + 0, + IsDirectoryObject, + 0, + Token, + GenericMapping); +} + +/* + * @implemented */ NTSTATUS NTAPI @@ -62,12 +129,22 @@ IN HANDLE Token, IN PGENERIC_MAPPING GenericMapping) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented + DPRINT1("RtlNewSecurityObjectEx(%p)\n", ParentDescriptor); + + /* Call the internal API */ + return RtlpNewSecurityObject(ParentDescriptor, + CreatorDescriptor, + NewDescriptor, + ObjectType ? &ObjectType : NULL, + ObjectType ? 1 : 0, + IsDirectoryObject, + AutoInheritFlags, + Token, + GenericMapping); +} + +/* + * @implemented */ NTSTATUS NTAPI @@ -81,28 +158,75 @@ IN HANDLE Token, IN PGENERIC_MAPPING GenericMapping) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -RtlConvertToAutoInheritSecurityObject(IN PSECURITY_DESCRIPTOR ParentDescriptor, - IN PSECURITY_DESCRIPTOR CreatorDescriptor, - OUT PSECURITY_DESCRIPTOR *NewDescriptor, - IN LPGUID ObjectType, - IN BOOLEAN IsDirectoryObject, - IN PGENERIC_MAPPING GenericMapping) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented + DPRINT1("RtlNewSecurityObjectWithMultipleInheritance(%p)\n", ParentDescriptor); + + /* Call the internal API */ + return RtlpNewSecurityObject(ParentDescriptor, + CreatorDescriptor, + NewDescriptor, + ObjectTypes, + GuidCount, + IsDirectoryObject, + AutoInheritFlags, + Token, + GenericMapping); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +RtlNewInstanceSecurityObject(IN BOOLEAN ParentDescriptorChanged, + IN BOOLEAN CreatorDescriptorChanged, + IN PLUID OldClientTokenModifiedId, + OUT PLUID NewClientTokenModifiedId, + IN PSECURITY_DESCRIPTOR ParentDescriptor, + IN PSECURITY_DESCRIPTOR CreatorDescriptor, + OUT PSECURITY_DESCRIPTOR *NewDescriptor, + IN BOOLEAN IsDirectoryObject, + IN HANDLE Token, + IN PGENERIC_MAPPING GenericMapping) +{ + TOKEN_STATISTICS TokenStats; + ULONG Size; + NTSTATUS Status; + DPRINT1("RtlNewInstanceSecurityObject(%p)\n", ParentDescriptor); + + /* Query the token statistics */ + Status = NtQueryInformationToken(Token, + TokenStatistics, + &TokenStats, + sizeof(TokenStats), + &Size); + if (!NT_SUCCESS(Status)) return Status; + + /* Return the LUID */ + *NewClientTokenModifiedId = TokenStats.ModifiedId; + + /* Check if the LUID changed */ + if (RtlEqualLuid(NewClientTokenModifiedId, OldClientTokenModifiedId)) + { + /* Did nothing change? */ + if (!(ParentDescriptorChanged) && !(CreatorDescriptorChanged)) + { + /* There's no new descriptor, we're done */ + *NewDescriptor = NULL; + return STATUS_SUCCESS; + } + } + + /* Call the standard API */ + return RtlNewSecurityObject(ParentDescriptor, + CreatorDescriptor, + NewDescriptor, + IsDirectoryObject, + Token, + GenericMapping); +} + +/* + * @implemented */ NTSTATUS NTAPI @@ -114,32 +238,42 @@ IN PGENERIC_MAPPING GenericMapping, OUT PSECURITY_DESCRIPTOR *NewDescriptor) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -RtlNewInstanceSecurityObject(IN BOOLEAN ParentDescriptorChanged, - IN BOOLEAN CreatorDescriptorChanged, - IN PLUID OldClientTokenModifiedI, - OUT PLUID NewClientTokenModifiedId, - IN PSECURITY_DESCRIPTOR ParentDescriptor, - IN PSECURITY_DESCRIPTOR CreatorDescriptor, - OUT PSECURITY_DESCRIPTOR *NewDescriptor, - IN BOOLEAN IsDirectoryObject, - IN HANDLE Token, - IN PGENERIC_MAPPING GenericMapping) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented + NTSTATUS Status; + PSECURITY_DESCRIPTOR Sd; + HANDLE TokenHandle; + DPRINT1("RtlCreateUserSecurityObject(%p)\n", AceData); + + /* Create the security descriptor based on the ACE Data */ + Status = RtlCreateAndSetSD(AceData, + AceCount, + OwnerSid, + GroupSid, + &Sd); + if (!NT_SUCCESS(Status)) return Status; + + /* Open the process token */ + Status = NtOpenProcessToken(NtCurrentProcess(), TOKEN_QUERY, &TokenHandle); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Create the security object */ + Status = RtlNewSecurityObject(NULL, + Sd, + NewDescriptor, + IsDirectoryObject, + TokenHandle, + GenericMapping); + + /* We're done, close the token handle */ + NtClose(TokenHandle); + +Quickie: + /* Free the SD and return status */ + RtlFreeHeap(RtlGetProcessHeap(), 0, Sd); + return Status; +} + +/* + * @implemented */ NTSTATUS NTAPI @@ -150,8 +284,81 @@ IN PGENERIC_MAPPING GenericMapping, OUT PACCESS_MASK RemainingDesiredAccess) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + BOOLEAN Granted, CallerToken; + TOKEN_STATISTICS TokenStats; + ULONG Size; + DPRINT1("RtlNewSecurityGrantedAccess(%p)\n", DesiredAccess); + + /* Has the caller passed a token? */ + if (!Token) + { + /* Remember that we'll have to close the handle */ + CallerToken = FALSE; + + /* Nope, open it */ + Status = NtOpenThreadToken(NtCurrentThread(), TOKEN_QUERY, TRUE, &Token); + if (!NT_SUCCESS(Status)) return Status; + } + else + { + /* Yep, use it */ + CallerToken = TRUE; + } + + /* Get information on the token */ + Status = NtQueryInformationToken(Token, + TokenStatistics, + &TokenStats, + sizeof(TokenStats), + &Size); + ASSERT(NT_SUCCESS(Status)); + + /* Windows doesn't do anything with the token statistics! */ + + /* Map the access and return it back decoded */ + RtlMapGenericMask(&DesiredAccess, GenericMapping); + *RemainingDesiredAccess = DesiredAccess; + + /* Check if one of the rights requested was the SACL right */ + if (DesiredAccess & ACCESS_SYSTEM_SECURITY) + { + /* Pretend that it's allowed FIXME: Do privilege check */ + DPRINT1("Missing privilege check for SE_SECURITY_PRIVILEGE"); + Granted = TRUE; + *RemainingDesiredAccess &= ~ACCESS_SYSTEM_SECURITY; + } + else + { + /* Nothing to grant */ + Granted = FALSE; + } + + /* If the caller did not pass in a token, close the handle to ours */ + if (!CallerToken) NtClose(Token); + + /* We need space to return only 1 privilege -- already part of the struct */ + Size = sizeof(PRIVILEGE_SET); + if (Size > *Length) + { + /* Tell the caller how much space we need and fail */ + *Length = Size; + return STATUS_BUFFER_TOO_SMALL; + } + + /* Check if the SACL right was granted... */ + RtlZeroMemory(&Privileges, Size); + if (Granted) + { + /* Yes, return it in the structure */ + Privileges->PrivilegeCount = 1; + Privileges->Privilege[0].Luid.LowPart = SE_SECURITY_PRIVILEGE; + Privileges->Privilege[0].Luid.HighPart = 0; + Privileges->Privilege[0].Attributes = SE_PRIVILEGE_USED_FOR_ACCESS; + } + + /* All done */ + return STATUS_SUCCESS; } /* @@ -212,7 +419,7 @@ /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI @@ -222,12 +429,19 @@ IN PGENERIC_MAPPING GenericMapping, IN HANDLE Token) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented + /* Call the internal API */ + return RtlpSetSecurityObject(NULL, + SecurityInformation, + ModificationDescriptor, + ObjectsSecurityDescriptor, + 0, + PagedPool, + GenericMapping, + Token); +} + +/* + * @implemented */ NTSTATUS NTAPI @@ -238,6 +452,46 @@ IN PGENERIC_MAPPING GenericMapping, IN HANDLE Token) { + /* Call the internal API */ + return RtlpSetSecurityObject(NULL, + SecurityInformation, + ModificationDescriptor, + ObjectsSecurityDescriptor, + AutoInheritFlags, + PagedPool, + GenericMapping, + Token); + +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +RtlConvertToAutoInheritSecurityObject(IN PSECURITY_DESCRIPTOR ParentDescriptor, + IN PSECURITY_DESCRIPTOR CreatorDescriptor, + OUT PSECURITY_DESCRIPTOR *NewDescriptor, + IN LPGUID ObjectType, + IN BOOLEAN IsDirectoryObject, + IN PGENERIC_MAPPING GenericMapping) +{ + /* Call the internal API */ + return RtlpConvertToAutoInheritSecurityObject(ParentDescriptor, + CreatorDescriptor, + NewDescriptor, + ObjectType, + IsDirectoryObject, + GenericMapping); +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +RtlRegisterSecureMemoryCacheCallback(IN PRTL_SECURE_MEMORY_CACHE_CALLBACK Callback) +{ UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } @@ -245,17 +499,6 @@ /* * @unimplemented */ -NTSTATUS -NTAPI -RtlRegisterSecureMemoryCacheCallback(IN PRTL_SECURE_MEMORY_CACHE_CALLBACK Callback) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ BOOLEAN NTAPI RtlFlushSecureMemoryCache(IN PVOID MemoryCache,

1 0

[ion] 57481: [RTL]: Add all the missing Rtl*Security*Object APIs and put them all in security.c. Move privilege functions into a new file, priv.c. No functional/code changes, just more stubs/export...
by ion＠svn.reactos.org 04 Oct '12

04 Oct '12

Author: ion Date: Thu Oct 4 18:48:15 2012 New Revision: 57481 URL: http://svn.reactos.org/svn/reactos?rev=57481&view=rev Log: [RTL]: Add all the missing Rtl*Security*Object APIs and put them all in security.c. Move privilege functions into a new file, priv.c. No functional/code changes, just more stubs/exports and moving things around. Added: trunk/reactos/lib/rtl/priv.c (with props) Modified: trunk/reactos/dll/ntdll/def/ntdll.spec trunk/reactos/lib/rtl/CMakeLists.txt trunk/reactos/lib/rtl/security.c Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Thu Oct 4 18:48:15 2012 @@ -491,7 +491,7 @@ ;@ stdcall RtlConvertPropertyToVariant @ stdcall RtlConvertSharedToExclusive(ptr) @ stdcall RtlConvertSidToUnicodeString(ptr ptr long) -;@ stdcall RtlConvertToAutoInheritSecurityObject +@ stdcall RtlConvertToAutoInheritSecurityObject(ptr ptr ptr ptr long ptr) ;@ stdcall RtlConvertUiListToApiList @ stdcall -arch=win32 -ret64 RtlConvertUlongToLargeInteger(long) ;@ stdcall RtlConvertVariantToProperty @@ -525,7 +525,7 @@ @ stdcall RtlCreateUnicodeString(ptr wstr) @ stdcall RtlCreateUnicodeStringFromAsciiz(ptr str) @ stdcall RtlCreateUserProcess(ptr long ptr ptr ptr ptr long ptr ptr ptr) -;@ stdcall RtlCreateUserSecurityObject +@ stdcall RtlCreateUserSecurityObject(ptr long ptr ptr long ptr ptr) @ stdcall RtlCreateUserThread(long ptr long ptr long long ptr ptr ptr ptr) @ stdcall RtlCustomCPToUnicodeN(ptr wstr long ptr str long) @ stdcall RtlCutoverTimeToSystemTime(ptr ptr ptr long) @@ -788,11 +788,11 @@ ;@ stdcall RtlMultiAppendUnicodeStringBuffer @ stdcall RtlMultiByteToUnicodeN(ptr long ptr ptr long) @ stdcall RtlMultiByteToUnicodeSize(ptr str long) -;@ stdcall RtlNewInstanceSecurityObject -;@ stdcall RtlNewSecurityGrantedAccess +@ stdcall RtlNewInstanceSecurityObject(long long ptr ptr ptr ptr ptr long ptr ptr) +@ stdcall RtlNewSecurityGrantedAccess(long ptr ptr ptr ptr ptr) @ stdcall RtlNewSecurityObject(ptr ptr ptr long ptr ptr) -;@ stdcall RtlNewSecurityObjectEx -;@ stdcall RtlNewSecurityObjectWithMultipleInheritance +@ stdcall RtlNewSecurityObjectEx(ptr ptr ptr ptr long long ptr ptr) +@ stdcall RtlNewSecurityObjectWithMultipleInheritance(ptr ptr ptr ptr long long long ptr ptr) @ stdcall RtlNormalizeProcessParams(ptr) @ stdcall RtlNtPathNameToDosPathName(ptr ptr ptr ptr) ; CHECKME @ stdcall RtlNtStatusToDosError(long) @@ -893,7 +893,7 @@ @ stdcall RtlSetSaclSecurityDescriptor(ptr long ptr long) @ stdcall RtlSetSecurityDescriptorRMControl(ptr ptr) @ stdcall RtlSetSecurityObject(long ptr ptr ptr ptr) -;@ stdcall RtlSetSecurityObjectEx +@ stdcall RtlSetSecurityObjectEx(long ptr ptr long ptr ptr) @ stdcall RtlSetThreadErrorMode(long ptr) @ stdcall RtlSetThreadIsCritical(long ptr long) @ stdcall RtlSetThreadPoolStartFunc(ptr ptr) Modified: trunk/reactos/lib/rtl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/lib/rtl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/CMakeLists.txt [iso-8859-1] Thu Oct 4 18:48:15 2012 @@ -39,6 +39,7 @@ nls.c path.c ppb.c + priv.c process.c propvar.c random.c Added: trunk/reactos/lib/rtl/priv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/priv.c?rev=57481&v… ============================================================================== --- trunk/reactos/lib/rtl/priv.c (added) +++ trunk/reactos/lib/rtl/priv.c [iso-8859-1] Thu Oct 4 18:48:15 2012 @@ -1,0 +1,185 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/rtl/priv.c + * PURPOSE: Security related functions and Security Objects + * PROGRAMMER: Eric Kohl + */ + +/* INCLUDES *****************************************************************/ + +#include <rtl.h> + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ***************************************************************/ + +/* + * @implemented + */ +NTSTATUS +NTAPI +RtlImpersonateSelf(IN SECURITY_IMPERSONATION_LEVEL ImpersonationLevel) +{ + HANDLE ProcessToken; + HANDLE ImpersonationToken; + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjAttr; + SECURITY_QUALITY_OF_SERVICE Sqos; + + PAGED_CODE_RTL(); + + Status = ZwOpenProcessToken(NtCurrentProcess(), + TOKEN_DUPLICATE, + &ProcessToken); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenProcessToken() failed (Status %lx)\n", Status); + return Status; + } + + Sqos.Length = sizeof(SECURITY_QUALITY_OF_SERVICE); + Sqos.ImpersonationLevel = ImpersonationLevel; + Sqos.ContextTrackingMode = 0; + Sqos.EffectiveOnly = FALSE; + + InitializeObjectAttributes(&ObjAttr, + NULL, + 0, + NULL, + NULL); + + ObjAttr.SecurityQualityOfService = &Sqos; + + Status = ZwDuplicateToken(ProcessToken, + TOKEN_IMPERSONATE, + &ObjAttr, + Sqos.EffectiveOnly, /* why both here _and_ in Sqos? */ + TokenImpersonation, + &ImpersonationToken); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtDuplicateToken() failed (Status %lx)\n", Status); + NtClose(ProcessToken); + return Status; + } + + Status = ZwSetInformationThread(NtCurrentThread(), + ThreadImpersonationToken, + &ImpersonationToken, + sizeof(HANDLE)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetInformationThread() failed (Status %lx)\n", Status); + } + + ZwClose(ImpersonationToken); + ZwClose(ProcessToken); + + return Status; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +RtlAcquirePrivilege(IN PULONG Privilege, + IN ULONG NumPriv, + IN ULONG Flags, + OUT PVOID *ReturnedState) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +VOID +NTAPI +RtlReleasePrivilege(IN PVOID ReturnedState) +{ + UNIMPLEMENTED; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +RtlAdjustPrivilege(IN ULONG Privilege, + IN BOOLEAN Enable, + IN BOOLEAN CurrentThread, + OUT PBOOLEAN Enabled) +{ + TOKEN_PRIVILEGES NewState; + TOKEN_PRIVILEGES OldState; + ULONG ReturnLength; + HANDLE TokenHandle; + NTSTATUS Status; + + PAGED_CODE_RTL(); + + DPRINT("RtlAdjustPrivilege() called\n"); + + if (CurrentThread) + { + Status = ZwOpenThreadToken(NtCurrentThread(), + TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, + FALSE, + &TokenHandle); + } + else + { + Status = ZwOpenProcessToken(NtCurrentProcess(), + TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, + &TokenHandle); + } + + if (!NT_SUCCESS (Status)) + { + DPRINT1("Retrieving token handle failed (Status %lx)\n", Status); + return Status; + } + + OldState.PrivilegeCount = 1; + + NewState.PrivilegeCount = 1; + NewState.Privileges[0].Luid.LowPart = Privilege; + NewState.Privileges[0].Luid.HighPart = 0; + NewState.Privileges[0].Attributes = (Enable) ? SE_PRIVILEGE_ENABLED : 0; + + Status = ZwAdjustPrivilegesToken(TokenHandle, + FALSE, + &NewState, + sizeof(TOKEN_PRIVILEGES), + &OldState, + &ReturnLength); + ZwClose (TokenHandle); + if (Status == STATUS_NOT_ALL_ASSIGNED) + { + DPRINT1("Failed to assign all privileges\n"); + return STATUS_PRIVILEGE_NOT_HELD; + } + + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtAdjustPrivilegesToken() failed (Status %lx)\n", Status); + return Status; + } + + if (OldState.PrivilegeCount == 0) + { + *Enabled = Enable; + } + else + { + *Enabled = (OldState.Privileges[0].Attributes & SE_PRIVILEGE_ENABLED); + } + + DPRINT("RtlAdjustPrivilege() done\n"); + + return STATUS_SUCCESS; +} Propchange: trunk/reactos/lib/rtl/priv.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/rtl/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/security.c?rev=574… ============================================================================== --- trunk/reactos/lib/rtl/security.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/security.c [iso-8859-1] Thu Oct 4 18:48:15 2012 @@ -14,175 +14,6 @@ #include <debug.h> /* FUNCTIONS ***************************************************************/ - -/* - * @implemented - */ -NTSTATUS -NTAPI -RtlImpersonateSelf(IN SECURITY_IMPERSONATION_LEVEL ImpersonationLevel) -{ - HANDLE ProcessToken; - HANDLE ImpersonationToken; - NTSTATUS Status; - OBJECT_ATTRIBUTES ObjAttr; - SECURITY_QUALITY_OF_SERVICE Sqos; - - PAGED_CODE_RTL(); - - Status = ZwOpenProcessToken(NtCurrentProcess(), - TOKEN_DUPLICATE, - &ProcessToken); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtOpenProcessToken() failed (Status %lx)\n", Status); - return Status; - } - - Sqos.Length = sizeof(SECURITY_QUALITY_OF_SERVICE); - Sqos.ImpersonationLevel = ImpersonationLevel; - Sqos.ContextTrackingMode = 0; - Sqos.EffectiveOnly = FALSE; - - InitializeObjectAttributes(&ObjAttr, - NULL, - 0, - NULL, - NULL); - - ObjAttr.SecurityQualityOfService = &Sqos; - - Status = ZwDuplicateToken(ProcessToken, - TOKEN_IMPERSONATE, - &ObjAttr, - Sqos.EffectiveOnly, /* why both here _and_ in Sqos? */ - TokenImpersonation, - &ImpersonationToken); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtDuplicateToken() failed (Status %lx)\n", Status); - NtClose(ProcessToken); - return Status; - } - - Status = ZwSetInformationThread(NtCurrentThread(), - ThreadImpersonationToken, - &ImpersonationToken, - sizeof(HANDLE)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetInformationThread() failed (Status %lx)\n", Status); - } - - ZwClose(ImpersonationToken); - ZwClose(ProcessToken); - - return Status; -} - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -RtlAcquirePrivilege(IN PULONG Privilege, - IN ULONG NumPriv, - IN ULONG Flags, - OUT PVOID *ReturnedState) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -VOID -NTAPI -RtlReleasePrivilege(IN PVOID ReturnedState) -{ - UNIMPLEMENTED; -} - -/* - * @implemented - */ -NTSTATUS -NTAPI -RtlAdjustPrivilege(IN ULONG Privilege, - IN BOOLEAN Enable, - IN BOOLEAN CurrentThread, - OUT PBOOLEAN Enabled) -{ - TOKEN_PRIVILEGES NewState; - TOKEN_PRIVILEGES OldState; - ULONG ReturnLength; - HANDLE TokenHandle; - NTSTATUS Status; - - PAGED_CODE_RTL(); - - DPRINT("RtlAdjustPrivilege() called\n"); - - if (CurrentThread) - { - Status = ZwOpenThreadToken(NtCurrentThread(), - TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, - FALSE, - &TokenHandle); - } - else - { - Status = ZwOpenProcessToken(NtCurrentProcess(), - TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, - &TokenHandle); - } - - if (!NT_SUCCESS (Status)) - { - DPRINT1("Retrieving token handle failed (Status %lx)\n", Status); - return Status; - } - - OldState.PrivilegeCount = 1; - - NewState.PrivilegeCount = 1; - NewState.Privileges[0].Luid.LowPart = Privilege; - NewState.Privileges[0].Luid.HighPart = 0; - NewState.Privileges[0].Attributes = (Enable) ? SE_PRIVILEGE_ENABLED : 0; - - Status = ZwAdjustPrivilegesToken(TokenHandle, - FALSE, - &NewState, - sizeof(TOKEN_PRIVILEGES), - &OldState, - &ReturnLength); - ZwClose (TokenHandle); - if (Status == STATUS_NOT_ALL_ASSIGNED) - { - DPRINT1("Failed to assign all privileges\n"); - return STATUS_PRIVILEGE_NOT_HELD; - } - - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtAdjustPrivilegesToken() failed (Status %lx)\n", Status); - return Status; - } - - if (OldState.PrivilegeCount == 0) - { - *Enabled = Enable; - } - else - { - *Enabled = (OldState.Privileges[0].Attributes & SE_PRIVILEGE_ENABLED); - } - - DPRINT("RtlAdjustPrivilege() done\n"); - - return STATUS_SUCCESS; -} /* * @implemented @@ -217,6 +48,111 @@ return STATUS_NOT_IMPLEMENTED; } +/* + * @unimplemented + */ +NTSTATUS +NTAPI +RtlNewSecurityObjectEx(IN PSECURITY_DESCRIPTOR ParentDescriptor, + IN PSECURITY_DESCRIPTOR CreatorDescriptor, + OUT PSECURITY_DESCRIPTOR *NewDescriptor, + IN LPGUID ObjectType, + IN BOOLEAN IsDirectoryObject, + IN ULONG AutoInheritFlags, + IN HANDLE Token, + IN PGENERIC_MAPPING GenericMapping) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +RtlNewSecurityObjectWithMultipleInheritance(IN PSECURITY_DESCRIPTOR ParentDescriptor, + IN PSECURITY_DESCRIPTOR CreatorDescriptor, + OUT PSECURITY_DESCRIPTOR *NewDescriptor, + IN LPGUID *ObjectTypes, + IN ULONG GuidCount, + IN BOOLEAN IsDirectoryObject, + IN ULONG AutoInheritFlags, + IN HANDLE Token, + IN PGENERIC_MAPPING GenericMapping) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +RtlConvertToAutoInheritSecurityObject(IN PSECURITY_DESCRIPTOR ParentDescriptor, + IN PSECURITY_DESCRIPTOR CreatorDescriptor, + OUT PSECURITY_DESCRIPTOR *NewDescriptor, + IN LPGUID ObjectType, + IN BOOLEAN IsDirectoryObject, + IN PGENERIC_MAPPING GenericMapping) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +RtlCreateUserSecurityObject(IN PVOID AceData, + IN ULONG AceCount, + IN PSID OwnerSid, + IN PSID GroupSid, + IN BOOLEAN IsDirectoryObject, + IN PGENERIC_MAPPING GenericMapping, + OUT PSECURITY_DESCRIPTOR *NewDescriptor) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +RtlNewInstanceSecurityObject(IN BOOLEAN ParentDescriptorChanged, + IN BOOLEAN CreatorDescriptorChanged, + IN PLUID OldClientTokenModifiedI, + OUT PLUID NewClientTokenModifiedId, + IN PSECURITY_DESCRIPTOR ParentDescriptor, + IN PSECURITY_DESCRIPTOR CreatorDescriptor, + OUT PSECURITY_DESCRIPTOR *NewDescriptor, + IN BOOLEAN IsDirectoryObject, + IN HANDLE Token, + IN PGENERIC_MAPPING GenericMapping) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +RtlNewSecurityGrantedAccess(IN ACCESS_MASK DesiredAccess, + OUT PPRIVILEGE_SET Privileges, + IN OUT PULONG Length, + IN HANDLE Token, + IN PGENERIC_MAPPING GenericMapping, + OUT PACCESS_MASK RemainingDesiredAccess) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} /* * @unimplemented @@ -295,6 +231,22 @@ */ NTSTATUS NTAPI +RtlSetSecurityObjectEx(IN SECURITY_INFORMATION SecurityInformation, + IN PSECURITY_DESCRIPTOR ModificationDescriptor, + OUT PSECURITY_DESCRIPTOR *ObjectsSecurityDescriptor, + IN ULONG AutoInheritFlags, + IN PGENERIC_MAPPING GenericMapping, + IN HANDLE Token) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI RtlRegisterSecureMemoryCacheCallback(IN PRTL_SECURE_MEMORY_CACHE_CALLBACK Callback) { UNIMPLEMENTED;

1 0

[ekohl] 57480: [LSASRV] LsapLookupNames: If a name was found, add its domain SID to the domains list and set the domain index accordingly.
by ekohl＠svn.reactos.org 04 Oct '12

04 Oct '12

Author: ekohl Date: Thu Oct 4 18:22:55 2012 New Revision: 57480 URL: http://svn.reactos.org/svn/reactos?rev=57480&view=rev Log: [LSASRV] LsapLookupNames: If a name was found, add its domain SID to the domains list and set the domain index accordingly. Modified: trunk/reactos/dll/win32/lsasrv/sids.c Modified: trunk/reactos/dll/win32/lsasrv/sids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/sids.c?re… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/sids.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/sids.c [iso-8859-1] Thu Oct 4 18:22:55 2012 @@ -830,6 +830,54 @@ } +static NTSTATUS +LsapAddDomainToDomainsList(PLSAPR_REFERENCED_DOMAIN_LIST ReferencedDomains, + PUNICODE_STRING Name, + PSID Sid, + PULONG Index) +{ + ULONG i; + + i = 0; + while (i < ReferencedDomains->Entries && + ReferencedDomains->Domains[i].Sid != NULL) + { + if (RtlEqualSid(Sid, ReferencedDomains->Domains[i].Sid)) + { + *Index = i; + return STATUS_SUCCESS; + } + + i++; + } + + ReferencedDomains->Domains[i].Sid = MIDL_user_allocate(RtlLengthSid(Sid)); + if (ReferencedDomains->Domains[i].Sid == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + RtlCopySid(RtlLengthSid(Sid), ReferencedDomains->Domains[i].Sid, Sid); + + ReferencedDomains->Domains[i].Name.Length = Name->Length; + ReferencedDomains->Domains[i].Name.MaximumLength = Name->MaximumLength; + ReferencedDomains->Domains[i].Name.Buffer = MIDL_user_allocate(Name->MaximumLength); + if (ReferencedDomains->Domains[i].Sid == NULL) + { + MIDL_user_free(ReferencedDomains->Domains[i].Sid); + ReferencedDomains->Domains[i].Sid = NULL; + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlCopyMemory(ReferencedDomains->Domains[i].Name.Buffer, + Name->Buffer, + Name->MaximumLength); + + ReferencedDomains->Entries++; + *Index = i; + + return STATUS_SUCCESS; +} + + NTSTATUS LsapLookupNames(DWORD Count, PRPC_UNICODE_STRING Names, @@ -845,6 +893,7 @@ PRPC_UNICODE_STRING DomainNames = NULL; PRPC_UNICODE_STRING AccountNames = NULL; ULONG SidsBufferLength; + ULONG DomainIndex; // ULONG DomainSidLength; // ULONG AccountSidLength; // PSID DomainSid; @@ -853,7 +902,7 @@ ULONG Mapped = 0; NTSTATUS Status = STATUS_SUCCESS; - PWELL_KNOWN_SID ptr; + PWELL_KNOWN_SID ptr, ptr2; //TRACE("()\n"); @@ -878,7 +927,6 @@ goto done; } - DomainsBuffer->Entries = 0; //Count; DomainsBuffer->Domains = MIDL_user_allocate(Count * sizeof(LSA_TRUST_INFORMATION)); if (DomainsBuffer->Domains == NULL) { @@ -886,6 +934,8 @@ Status = STATUS_INSUFFICIENT_RESOURCES; goto done; } + DomainsBuffer->Entries = 0; + DomainsBuffer->MaxEntries = Count; for (i = 0; i < Count; i++) { @@ -911,7 +961,7 @@ //TRACE("Domain name: %wZ\n", &DomainNames[i]); //TRACE("Account name: %wZ\n", &AccountNames[i]); - + ptr2 = NULL; ptr = LsapLookupWellKnownName((PUNICODE_STRING)&AccountNames[i]); if (ptr != NULL) { @@ -922,24 +972,33 @@ SidsBuffer[i].DomainIndex = -1; SidsBuffer[i].Flags = 0; -#if 0 - if (DomainNames[i].Buffer != NULL) + if (DomainNames[i].Length != 0) { - ptr2= LsapLookupWellKnownName((PUNICODE_STRING)&DomainNames[i].Buffer); + ptr2= LsapLookupWellKnownName((PUNICODE_STRING)&DomainNames[i]); if (ptr2 != NULL) { - + Status = LsapAddDomainToDomainsList(DomainsBuffer, + &ptr2->Name, + ptr2->Sid, + &DomainIndex); + if (NT_SUCCESS(Status)) + SidsBuffer[i].DomainIndex = DomainIndex; } } - else if (ptr->Domain.Length != 0) + + if (ptr2 == NULL && ptr->Domain.Length != 0) { - + ptr2= LsapLookupWellKnownName(&ptr->Domain); + if (ptr2 != NULL) + { + Status = LsapAddDomainToDomainsList(DomainsBuffer, + &ptr2->Name, + ptr2->Sid, + &DomainIndex); + if (NT_SUCCESS(Status)) + SidsBuffer[i].DomainIndex = DomainIndex; + } } - else - { - - } -#endif Mapped++; continue;

1 0

[ion] 57479: [NDK]: forgot this ,sorry.
by ion＠svn.reactos.org 04 Oct '12

04 Oct '12

Author: ion Date: Thu Oct 4 17:08:51 2012 New Revision: 57479 URL: http://svn.reactos.org/svn/reactos?rev=57479&view=rev Log: [NDK]: forgot this ,sorry. Modified: trunk/reactos/include/ndk/rtlfuncs.h 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] Thu Oct 4 17:08:51 2012 @@ -2013,6 +2013,9 @@ IN SIZE_T Length, IN ULONG Pattern ); + +#define RtlEqualMemory(Destination, Source, Length) \ + (!memcmp(Destination, Source, Length)) #define RtlCopyBytes RtlCopyMemory #define RtlFillBytes RtlFillMemory

1 0

[ion] 57478: [RTL]: Cleanup, comment, and fix SID functions. For example, RtlEqualPrefixSid actually checks only the prefix, not the entire SID.
by ion＠svn.reactos.org 04 Oct '12

04 Oct '12

Author: ion Date: Thu Oct 4 16:55:53 2012 New Revision: 57478 URL: http://svn.reactos.org/svn/reactos?rev=57478&view=rev Log: [RTL]: Cleanup, comment, and fix SID functions. For example, RtlEqualPrefixSid actually checks only the prefix, not the entire SID. Modified: trunk/reactos/lib/rtl/access.c trunk/reactos/lib/rtl/sid.c Modified: trunk/reactos/lib/rtl/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/access.c?rev=57478… ============================================================================== --- trunk/reactos/lib/rtl/access.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/access.c [iso-8859-1] Thu Oct 4 16:55:53 2012 @@ -8,7 +8,6 @@ /* INCLUDES *****************************************************************/ #include <rtl.h> - #define NDEBUG #include <debug.h> @@ -19,11 +18,13 @@ */ BOOLEAN NTAPI -RtlAreAllAccessesGranted(ACCESS_MASK GrantedAccess, - ACCESS_MASK DesiredAccess) +RtlAreAllAccessesGranted(IN ACCESS_MASK GrantedAccess, + IN ACCESS_MASK DesiredAccess) { - PAGED_CODE_RTL(); - return ((GrantedAccess & DesiredAccess) == DesiredAccess); + PAGED_CODE_RTL(); + + /* Return if there's no leftover bits after granting all of them */ + return !(~GrantedAccess & DesiredAccess); } /* @@ -31,11 +32,13 @@ */ BOOLEAN NTAPI -RtlAreAnyAccessesGranted(ACCESS_MASK GrantedAccess, - ACCESS_MASK DesiredAccess) +RtlAreAnyAccessesGranted(IN ACCESS_MASK GrantedAccess, + IN ACCESS_MASK DesiredAccess) { PAGED_CODE_RTL(); - return ((GrantedAccess & DesiredAccess) != 0); + + /* Return if there's any leftover bits after granting all of them */ + return (GrantedAccess & DesiredAccess); } /* @@ -43,19 +46,18 @@ */ VOID NTAPI -RtlMapGenericMask(PACCESS_MASK AccessMask, - PGENERIC_MAPPING GenericMapping) +RtlMapGenericMask(IN OUT PACCESS_MASK AccessMask, + IN PGENERIC_MAPPING GenericMapping) { PAGED_CODE_RTL(); + /* Convert mappings */ if (*AccessMask & GENERIC_READ) *AccessMask |= GenericMapping->GenericRead; - if (*AccessMask & GENERIC_WRITE) *AccessMask |= GenericMapping->GenericWrite; - if (*AccessMask & GENERIC_EXECUTE) *AccessMask |= GenericMapping->GenericExecute; - if (*AccessMask & GENERIC_ALL) *AccessMask |= GenericMapping->GenericAll; + /* Clear generic flags */ *AccessMask &= ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); } Modified: trunk/reactos/lib/rtl/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sid.c?rev=57478&r1… ============================================================================== --- trunk/reactos/lib/rtl/sid.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/sid.c [iso-8859-1] Thu Oct 4 16:55:53 2012 @@ -9,7 +9,6 @@ /* INCLUDES *****************************************************************/ #include <rtl.h> - #define NDEBUG #include <debug.h> @@ -22,19 +21,31 @@ RtlValidSid(IN PSID Sid_) { PISID Sid = Sid_; - - PAGED_CODE_RTL(); - - if ((Sid->Revision != SID_REVISION) || - (Sid->SubAuthorityCount > SID_MAX_SUB_AUTHORITIES)) - { + PAGED_CODE_RTL(); + + /* Use SEH in case any pointer is invalid */ + _SEH2_TRY + { + /* Validate the revision and subauthority count */ + if ((Sid) && + (((Sid->Revision & 0xF) != SID_REVISION) || + (Sid->SubAuthorityCount > SID_MAX_SUB_AUTHORITIES))) + { + /* It's not, fail */ + return FALSE; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Access violation, SID is not valid */ return FALSE; } - + _SEH2_END; + + /* All good */ return TRUE; } - /* * @implemented */ @@ -44,10 +55,10 @@ { PAGED_CODE_RTL(); + /* Return the required length */ return (ULONG)FIELD_OFFSET(SID, SubAuthority[SubAuthorityCount]); } - /* * @implemented @@ -59,18 +70,16 @@ IN UCHAR SubAuthorityCount) { PISID Sid = Sid_; - - PAGED_CODE_RTL(); - + PAGED_CODE_RTL(); + + /* Fill out the header */ Sid->Revision = SID_REVISION; Sid->SubAuthorityCount = SubAuthorityCount; - memcpy(&Sid->IdentifierAuthority, - IdentifierAuthority, - sizeof(SID_IDENTIFIER_AUTHORITY)); - + Sid->IdentifierAuthority = *IdentifierAuthority; + + /* All good */ return STATUS_SUCCESS; } - /* * @implemented @@ -81,13 +90,12 @@ IN ULONG SubAuthority) { PISID Sid = Sid_; - - PAGED_CODE_RTL(); - + PAGED_CODE_RTL(); + + /* Return the offset */ return (PULONG)&Sid->SubAuthority[SubAuthority]; } - /* * @implemented */ @@ -96,12 +104,25 @@ RtlSubAuthorityCountSid(IN PSID Sid_) { PISID Sid = Sid_; - - PAGED_CODE_RTL(); - + PAGED_CODE_RTL(); + + /* Return the offset to the count */ return &Sid->SubAuthorityCount; } +/* + * @implemented + */ +PSID_IDENTIFIER_AUTHORITY +NTAPI +RtlIdentifierAuthoritySid(IN PSID Sid_) +{ + PISID Sid = Sid_; + PAGED_CODE_RTL(); + + /* Return the offset to the identifier authority */ + return &Sid->IdentifierAuthority; +} /* * @implemented @@ -111,22 +132,15 @@ RtlEqualSid(IN PSID Sid1_, IN PSID Sid2_) { - PISID Sid1 = Sid1_; - PISID Sid2 = Sid2_; - SIZE_T SidLen; - - PAGED_CODE_RTL(); - - if (Sid1->Revision != Sid2->Revision || - (*RtlSubAuthorityCountSid(Sid1)) != (*RtlSubAuthorityCountSid(Sid2))) - { - return FALSE; - } - - SidLen = RtlLengthSid(Sid1); - return RtlCompareMemory(Sid1, Sid2, SidLen) == SidLen; -} - + PISID Sid1 = Sid1_, Sid2 = Sid2_; + PAGED_CODE_RTL(); + + /* Quick compare of the revision and the count */ + if (*(PUSHORT)&Sid1->Revision != *(PUSHORT)&Sid2->Revision) return FALSE; + + /* Get the length and compare it the long way */ + return RtlEqualMemory(Sid1, Sid2, RtlLengthSid(Sid1)); +} /* * @implemented @@ -136,233 +150,213 @@ RtlLengthSid(IN PSID Sid_) { PISID Sid = Sid_; - - PAGED_CODE_RTL(); - + PAGED_CODE_RTL(); + + /* The offset to the last index + 1 (since it's a count) is the length */ return (ULONG)FIELD_OFFSET(SID, SubAuthority[Sid->SubAuthorityCount]); } - /* * @implemented */ NTSTATUS NTAPI -RtlCopySid(ULONG BufferLength, - PSID Dest, - PSID Src) -{ - PAGED_CODE_RTL(); - - if (BufferLength < RtlLengthSid(Src)) - { - return STATUS_UNSUCCESSFUL; - } - - memmove(Dest, - Src, - RtlLengthSid(Src)); - +RtlCopySid(IN ULONG BufferLength, + IN PSID Dest, + IN PSID Src) +{ + ULONG SidLength; + PAGED_CODE_RTL(); + + /* Make sure the buffer is large enough*/ + SidLength = RtlLengthSid(Src); + if (SidLength > BufferLength) return STATUS_BUFFER_TOO_SMALL; + + /* And then copy the SID */ + RtlMoveMemory(Dest, Src, SidLength); return STATUS_SUCCESS; } +/* + * @implemented + */ +PVOID +NTAPI +RtlFreeSid(IN PSID Sid) +{ + PAGED_CODE_RTL(); + + /* Free the SID and always return NULL */ + RtlpFreeMemory(Sid, TAG_SID); + return NULL; +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +RtlEqualPrefixSid(IN PSID Sid1_, + IN PSID Sid2_) +{ + PISID Sid1 = Sid1_, Sid2 = Sid2_; + ULONG i; + PAGED_CODE_RTL(); + + /* Revisions have to match */ + if (Sid1->Revision != Sid2->Revision) return FALSE; + + /* The identifier authorities have to match */ + if ((Sid1->IdentifierAuthority.Value[0] == Sid2->IdentifierAuthority.Value[0]) && + (Sid1->IdentifierAuthority.Value[1] == Sid2->IdentifierAuthority.Value[1]) && + (Sid1->IdentifierAuthority.Value[2] == Sid2->IdentifierAuthority.Value[2]) && + (Sid1->IdentifierAuthority.Value[3] == Sid2->IdentifierAuthority.Value[3]) && + (Sid1->IdentifierAuthority.Value[4] == Sid2->IdentifierAuthority.Value[4]) && + (Sid1->IdentifierAuthority.Value[5] == Sid2->IdentifierAuthority.Value[5])) + { + /* The subauthority counts have to match */ + if (Sid1->SubAuthorityCount == Sid2->SubAuthorityCount) + { + /* If there aren't any in SID1, means none in SID2 either, so equal */ + if (!Sid1->SubAuthorityCount) return TRUE; + + /* Now compare all the subauthority values BUT the last one */ + for (i = 0; i < (Sid1->SubAuthorityCount - 1); i++) + { + /* Does any mismatch? */ + if (Sid1->SubAuthority[i] != Sid2->SubAuthority[i]) + { + /* Prefix doesn't match, fail */ + return FALSE; + } + } + + /* Everything that should matches, does, return success */ + return TRUE; + } + } + + /* Identifiers don't match, fail */ + return FALSE; +} /* * @implemented */ NTSTATUS NTAPI -RtlCopySidAndAttributesArray(ULONG Count, - PSID_AND_ATTRIBUTES Src, - ULONG SidAreaSize, - PSID_AND_ATTRIBUTES Dest, - PVOID SidArea, - PVOID* RemainingSidArea, - PULONG RemainingSidAreaSize) -{ - ULONG SidLength; - ULONG Length; - ULONG i; - - PAGED_CODE_RTL(); - - Length = SidAreaSize; - +RtlCopySidAndAttributesArray(IN ULONG Count, + IN PSID_AND_ATTRIBUTES Src, + IN ULONG SidAreaSize, + IN PSID_AND_ATTRIBUTES Dest, + IN PVOID SidArea, + OUT PVOID* RemainingSidArea, + OUT PULONG RemainingSidAreaSize) +{ + ULONG SidLength, i; + PAGED_CODE_RTL(); + + /* Loop all the attributes */ for (i = 0; i < Count; i++) { - if (RtlLengthSid(Src[i].Sid) > Length) - { - return STATUS_BUFFER_TOO_SMALL; - } - + /* Make sure this SID can fit in the buffer */ SidLength = RtlLengthSid(Src[i].Sid); - Length = Length - SidLength; + if (SidLength > SidAreaSize) return STATUS_BUFFER_TOO_SMALL; + + /* Consume remaining buffer space for this SID */ + SidAreaSize -= SidLength; + + /* Copy the SID and attributes */ Dest[i].Sid = SidArea; Dest[i].Attributes = Src[i].Attributes; - RtlCopySid(SidLength, - SidArea, - Src[i].Sid); + RtlCopySid(SidLength, SidArea, Src[i].Sid); + + /* Push the buffer area where the SID will reset */ SidArea = (PVOID)((ULONG_PTR)SidArea + SidLength); } + /* Return how much space is left, and where the buffer is at now */ *RemainingSidArea = SidArea; - *RemainingSidAreaSize = Length; - + *RemainingSidAreaSize = SidAreaSize; return STATUS_SUCCESS; } - -/* - * @implemented - */ -PSID_IDENTIFIER_AUTHORITY -NTAPI -RtlIdentifierAuthoritySid(IN PSID Sid_) -{ - PISID Sid = Sid_; - - PAGED_CODE_RTL(); - - return &Sid->IdentifierAuthority; -} - - /* * @implemented */ NTSTATUS NTAPI -RtlAllocateAndInitializeSid(PSID_IDENTIFIER_AUTHORITY IdentifierAuthority, - UCHAR SubAuthorityCount, - ULONG SubAuthority0, - ULONG SubAuthority1, - ULONG SubAuthority2, - ULONG SubAuthority3, - ULONG SubAuthority4, - ULONG SubAuthority5, - ULONG SubAuthority6, - ULONG SubAuthority7, - PSID *Sid) +RtlAllocateAndInitializeSid(IN PSID_IDENTIFIER_AUTHORITY IdentifierAuthority, + IN UCHAR SubAuthorityCount, + IN ULONG SubAuthority0, + IN ULONG SubAuthority1, + IN ULONG SubAuthority2, + IN ULONG SubAuthority3, + IN ULONG SubAuthority4, + IN ULONG SubAuthority5, + IN ULONG SubAuthority6, + IN ULONG SubAuthority7, + OUT PSID *Sid) { PISID pSid; - - PAGED_CODE_RTL(); - - if (SubAuthorityCount > 8) - return STATUS_INVALID_SID; - - if (Sid == NULL) - return STATUS_INVALID_PARAMETER; - - pSid = RtlpAllocateMemory(RtlLengthRequiredSid(SubAuthorityCount), - TAG_SID); - if (pSid == NULL) - return STATUS_NO_MEMORY; - + PAGED_CODE_RTL(); + + /* SIDs can only have up to 8 subauthorities */ + if (SubAuthorityCount > 8) return STATUS_INVALID_SID; + + /* Allocate memory to hold the SID */ + pSid = RtlpAllocateMemory(RtlLengthRequiredSid(SubAuthorityCount), TAG_SID); + if (!pSid) return STATUS_NO_MEMORY; + + /* Fill out the header */ pSid->Revision = SID_REVISION; pSid->SubAuthorityCount = SubAuthorityCount; - memcpy(&pSid->IdentifierAuthority, - IdentifierAuthority, - sizeof(SID_IDENTIFIER_AUTHORITY)); - + pSid->IdentifierAuthority = *IdentifierAuthority; + + /* Iteraratively drop into each successive lower count */ switch (SubAuthorityCount) { - case 8: - pSid->SubAuthority[7] = SubAuthority7; - case 7: - pSid->SubAuthority[6] = SubAuthority6; - case 6: - pSid->SubAuthority[5] = SubAuthority5; - case 5: - pSid->SubAuthority[4] = SubAuthority4; - case 4: - pSid->SubAuthority[3] = SubAuthority3; - case 3: - pSid->SubAuthority[2] = SubAuthority2; - case 2: - pSid->SubAuthority[1] = SubAuthority1; - case 1: - pSid->SubAuthority[0] = SubAuthority0; - break; - } - + /* And copy the needed subahority */ + case 8: pSid->SubAuthority[7] = SubAuthority7; + case 7: pSid->SubAuthority[6] = SubAuthority6; + case 6: pSid->SubAuthority[5] = SubAuthority5; + case 5: pSid->SubAuthority[4] = SubAuthority4; + case 4: pSid->SubAuthority[3] = SubAuthority3; + case 3: pSid->SubAuthority[2] = SubAuthority2; + case 2: pSid->SubAuthority[1] = SubAuthority1; + case 1: pSid->SubAuthority[0] = SubAuthority0; + default: break; + } + + /* Return the allocated SID */ *Sid = pSid; - return STATUS_SUCCESS; } - -/* - * @implemented - * - * RETURNS - * Docs says FreeSid does NOT return a value - * even thou it's defined to return a PVOID... - */ -PVOID -NTAPI -RtlFreeSid(IN PSID Sid) -{ - PAGED_CODE_RTL(); - - RtlpFreeMemory(Sid, TAG_SID); - return NULL; -} - - -/* - * @implemented - */ -BOOLEAN -NTAPI -RtlEqualPrefixSid(IN PSID Sid1_, - IN PSID Sid2_) -{ - PISID Sid1 = Sid1_; - PISID Sid2 = Sid2_; - SIZE_T SidLen; - - PAGED_CODE_RTL(); - - if (Sid1->SubAuthorityCount == Sid2->SubAuthorityCount) - { - SidLen = FIELD_OFFSET(SID, - SubAuthority[Sid1->SubAuthorityCount]); - return RtlCompareMemory(Sid1, - Sid2, - SidLen) == SidLen; - } - - return FALSE; -} - - /* * @implemented */ NTSTATUS NTAPI -RtlConvertSidToUnicodeString(PUNICODE_STRING String, - PSID Sid_, - BOOLEAN AllocateBuffer) +RtlConvertSidToUnicodeString(IN PUNICODE_STRING String, + IN PSID Sid_, + IN BOOLEAN AllocateBuffer) { WCHAR Buffer[256]; PWSTR wcs; SIZE_T Length; ULONG i; PISID Sid = Sid_; - - PAGED_CODE_RTL(); - - if (RtlValidSid (Sid) == FALSE) - return STATUS_INVALID_SID; + PAGED_CODE_RTL(); + + if (!RtlValidSid(Sid)) return STATUS_INVALID_SID; wcs = Buffer; - wcs += swprintf(wcs, L"S-%u-", Sid->Revision); - - if (Sid->IdentifierAuthority.Value[0] == 0 && - Sid->IdentifierAuthority.Value[1] == 0) + wcs += swprintf(wcs, L"S-1-"); + + if ((Sid->IdentifierAuthority.Value[0] == 0) && + (Sid->IdentifierAuthority.Value[1] == 0)) { wcs += swprintf(wcs, L"%lu", @@ -385,33 +379,27 @@ for (i = 0; i < Sid->SubAuthorityCount; i++) { - wcs += swprintf(wcs, - L"-%u", - Sid->SubAuthority[i]); + wcs += swprintf(wcs, L"-%u", Sid->SubAuthority[i]); } if (AllocateBuffer) { - if (!RtlCreateUnicodeString(String, - Buffer)) + if (!RtlCreateUnicodeString(String, Buffer)) return STATUS_NO_MEMORY; + } + else + { + Length = (wcs - Buffer) * sizeof(WCHAR); + + if (Length > String->MaximumLength) return STATUS_BUFFER_TOO_SMALL; + + String->Length = (USHORT)Length; + RtlCopyMemory(String->Buffer, Buffer, Length); + + if (Length < String->MaximumLength) { - return STATUS_NO_MEMORY; + String->Buffer[Length / sizeof(WCHAR)] = UNICODE_NULL; } } - else - { - Length = (wcs - Buffer) * sizeof(WCHAR); - - if (Length > String->MaximumLength) - return STATUS_BUFFER_TOO_SMALL; - - String->Length = (USHORT)Length; - RtlCopyMemory(String->Buffer, - Buffer, - Length); - if (Length < String->MaximumLength) - String->Buffer[Length / sizeof(WCHAR)] = 0; - } return STATUS_SUCCESS; }

1 0

[jgardou] 57477: [APITESTS/USER32] Improve GetIconInfo tests: -Stop leaking each handle we create -Show Icons sensitivity to screen bit depth
by jgardou＠svn.reactos.org 04 Oct '12

04 Oct '12

Author: jgardou Date: Thu Oct 4 13:38:26 2012 New Revision: 57477 URL: http://svn.reactos.org/svn/reactos?rev=57477&view=rev Log: [APITESTS/USER32] Improve GetIconInfo tests: -Stop leaking each handle we create -Show Icons sensitivity to screen bit depth Modified: trunk/rostests/apitests/user32/GetIconInfo.c Modified: trunk/rostests/apitests/user32/GetIconInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/GetIconIn… ============================================================================== --- trunk/rostests/apitests/user32/GetIconInfo.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/GetIconInfo.c [iso-8859-1] Thu Oct 4 13:38:26 2012 @@ -7,7 +7,7 @@ // FIXME user32 void -Test_GetIconInfo(BOOL fIcon) +Test_GetIconInfo(BOOL fIcon, DWORD screen_bpp) { HICON hicon; ICONINFO iconinfo, iconinfo2; @@ -41,6 +41,7 @@ ok(iconinfo2.hbmMask != NULL, "\n"); ok(iconinfo2.hbmMask != iconinfo.hbmMask, "\n"); ok(iconinfo2.hbmColor == NULL, "\n"); + DeleteObject(iconinfo2.hbmMask); ok(GetIconInfo(hicon, &iconinfo2), "\n"); ok(iconinfo2.fIcon == iconinfo.fIcon, "\n"); @@ -57,6 +58,8 @@ ok(iconinfo2.hbmMask != NULL, "\n"); ok(iconinfo2.hbmMask != iconinfo.hbmMask, "\n"); ok(iconinfo2.hbmColor == NULL, "\n"); + DeleteObject(iconinfo2.hbmMask); + ok(DestroyIcon(hicon), "\n"); iconinfo.hbmColor = CreateBitmap(2, 2, 1, 1, NULL); hicon = CreateIconIndirect(&iconinfo); @@ -77,7 +80,7 @@ ok(iconinfo2.hbmMask != NULL, "\n"); ok(iconinfo2.hbmMask != iconinfo.hbmMask, "\n"); ok(iconinfo2.hbmColor != NULL, "\n"); - ok(iconinfo2.hbmMask != iconinfo.hbmColor, "\n"); + ok(iconinfo2.hbmColor != iconinfo.hbmColor, "\n"); ok(GetObject(iconinfo2.hbmMask, sizeof(bitmap), &bitmap), "GetObject failed\n"); ok(bitmap.bmType == 0, "\n"); @@ -94,8 +97,11 @@ ok(bitmap.bmHeight == 16, "\n"); ok(bitmap.bmWidthBytes == 8 * bitmap.bmBitsPixel / 8, "\n"); ok(bitmap.bmPlanes == 1, "\n"); - ok(bitmap.bmBitsPixel == 32, "\n"); - ok(bitmap.bmBits == NULL, "\n"); + ok(bitmap.bmBitsPixel == screen_bpp, "\n"); + ok(bitmap.bmBits == NULL, "\n"); + DeleteObject(iconinfo2.hbmMask); + DeleteObject(iconinfo2.hbmColor); + ok(DestroyIcon(hicon), "\n"); DeleteObject(iconinfo.hbmMask); iconinfo.hbmMask = NULL; @@ -126,11 +132,13 @@ ok(bitmap.bmType == 0, "\n"); ok(bitmap.bmWidth == 8, "%ld\n", bitmap.bmWidth); ok(bitmap.bmHeight == 16, "%ld\n", bitmap.bmHeight); - ok(bitmap.bmWidthBytes == 32, "%ld\n", bitmap.bmWidthBytes); + ok(bitmap.bmWidthBytes == screen_bpp, "%ld\n", bitmap.bmWidthBytes); ok(bitmap.bmPlanes == 1, "%d\n", bitmap.bmPlanes); - ok(bitmap.bmBitsPixel == 32, "%d\n", bitmap.bmBitsPixel); - ok(bitmap.bmBits == NULL, "\n"); - + ok(bitmap.bmBitsPixel == screen_bpp, "%d\n", bitmap.bmBitsPixel); + ok(bitmap.bmBits == NULL, "\n"); + DeleteObject(iconinfo2.hbmMask); + DeleteObject(iconinfo2.hbmColor); + ok(DestroyIcon(hicon), "\n"); } @@ -140,9 +148,15 @@ ICONINFO iconinfo2; BITMAP bitmap; DWORD data[] = {0, 0, 0, 0, 0, 0}; - - Test_GetIconInfo(0); - Test_GetIconInfo(1); + DWORD bpp, screenbpp, creationbpp; + DEVMODEW dm; + + /* Test icons behaviour regarding display settings */ + EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &dm); + screenbpp = dm.dmBitsPerPel; + + Test_GetIconInfo(0, screenbpp); + Test_GetIconInfo(1, screenbpp); hcursor = LoadCursor(GetModuleHandle(NULL), "TESTCURSOR"); ok(hcursor != 0, "should not fail, error %ld\n", GetLastError()); @@ -152,33 +166,82 @@ ok(iconinfo2.yHotspot == 29, "%ld\n", iconinfo2.yHotspot); ok(iconinfo2.hbmMask != NULL, "\n"); ok(iconinfo2.hbmColor != NULL, "\n"); - - hcursor = LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_TEST)); - ok(hcursor != 0, "should not fail\n"); - ok(GetIconInfo(hcursor, &iconinfo2), "\n"); - ok(iconinfo2.fIcon == 1, "\n"); - ok(iconinfo2.xHotspot == 16, "%ld\n", iconinfo2.xHotspot); - ok(iconinfo2.yHotspot == 16, "%ld\n", iconinfo2.yHotspot); - ok(iconinfo2.hbmMask != NULL, "\n"); - ok(iconinfo2.hbmColor != NULL, "\n"); - - ok(GetObject(iconinfo2.hbmMask, sizeof(bitmap), &bitmap), "GetObject failed\n"); - ok(bitmap.bmType == 0, "\n"); - ok(bitmap.bmWidth == 32, "%ld\n", bitmap.bmWidth); - ok(bitmap.bmHeight == 32, "\n"); - ok(bitmap.bmWidthBytes == 4, "\n"); - ok(bitmap.bmPlanes == 1, "\n"); - ok(bitmap.bmBitsPixel == 1, "\n"); - ok(bitmap.bmBits == NULL, "\n"); - - ok(GetObject(iconinfo2.hbmColor, sizeof(bitmap), &bitmap), "GetObject failed\n"); - ok(bitmap.bmType == 0, "\n"); - ok(bitmap.bmWidth == 32, "\n"); - ok(bitmap.bmHeight == 32, "\n"); - ok(bitmap.bmWidthBytes == 32 * bitmap.bmBitsPixel / 8, "\n"); - ok(bitmap.bmPlanes == 1, "\n"); - ok(bitmap.bmBitsPixel == 32, "\n"); - ok(bitmap.bmBits == NULL, "\n"); + /* Delete objects */ + DeleteObject(iconinfo2.hbmColor); + DeleteObject(iconinfo2.hbmMask); + /* Delete cursor */ + DestroyCursor(hcursor); + + /* To sum it up: + * There are two criteria when using icons: performance and aesthetics (=alpha channel). + * Performance asks for bit parity with the screen display. + * Aesthetics needs a 32bpp bitmap. + * The behaviour is basically : aesthetics first if already loaded. + * ie: if the 32bpp bitmap were already loaded because of previous display settings, always use it. + * Otherwise, use the bitmap matching the screen bit depth. + */ + + /* if we use LR_SHARED here, and reverse the loop (32->16), then hbmColor.bmBitsPixel is always 32. */ + for(creationbpp = 16; creationbpp <=32; creationbpp += 8) + { + dm.dmBitsPerPel = creationbpp; + if(ChangeDisplaySettingsExW(NULL, &dm, NULL, 0, NULL) != DISP_CHANGE_SUCCESSFUL) + { + skip("Unable to change bpp to %lu.\n", creationbpp); + continue; + } + hcursor = LoadImage(GetModuleHandle(NULL), + MAKEINTRESOURCE(IDI_TEST), + IMAGE_ICON, + 0, + 0, + LR_DEFAULTCOLOR); + ok(hcursor != 0, "should not fail\n"); + + /* If we reverse the loop here (32->16 bpp), then hbmColor.bmBitsPixel is always 32 */ + for(bpp = 16; bpp <=32; bpp += 8) + { + dm.dmBitsPerPel = bpp; + if(ChangeDisplaySettingsExW(NULL, &dm, NULL, 0, NULL) != DISP_CHANGE_SUCCESSFUL) + { + skip("Unable to change bpp to %lu.\n", bpp); + continue; + } + ok(GetIconInfo(hcursor, &iconinfo2), "\n"); + ok(iconinfo2.fIcon == 1, "\n"); + ok(iconinfo2.xHotspot == 24, "%ld\n", iconinfo2.xHotspot); + ok(iconinfo2.yHotspot == 24, "%ld\n", iconinfo2.yHotspot); + ok(iconinfo2.hbmMask != NULL, "\n"); + ok(iconinfo2.hbmColor != NULL, "\n"); + + ok(GetObject(iconinfo2.hbmMask, sizeof(bitmap), &bitmap), "GetObject failed\n"); + ok(bitmap.bmType == 0, "\n"); + ok(bitmap.bmWidth == 48, "%ld\n", bitmap.bmWidth); + ok(bitmap.bmHeight == 48, "\n"); + ok(bitmap.bmWidthBytes == 6, "\n"); + ok(bitmap.bmPlanes == 1, "\n"); + ok(bitmap.bmBitsPixel == 1, "\n"); + ok(bitmap.bmBits == NULL, "\n"); + + ok(GetObject(iconinfo2.hbmColor, sizeof(bitmap), &bitmap), "GetObject failed\n"); + ok(bitmap.bmType == 0, "\n"); + ok(bitmap.bmWidth == 48, "\n"); + ok(bitmap.bmHeight == 48, "\n"); + ok(bitmap.bmWidthBytes == 48 * bitmap.bmBitsPixel / 8, "\n"); + ok(bitmap.bmPlanes == 1, "\n"); + ok(bitmap.bmBitsPixel == (creationbpp == 32 ? 32 : bpp), "creationbpp: %lu, bpp: %lu:\n", creationbpp, bpp); + ok(bitmap.bmBits == NULL, "\n"); + + /* Delete objects */ + DeleteObject(iconinfo2.hbmColor); + DeleteObject(iconinfo2.hbmMask); + } + ok(DestroyIcon(hcursor), "\n"); + } + /* Restore display settings */ + dm.dmBitsPerPel = screenbpp; + if(ChangeDisplaySettingsExW(NULL, &dm, NULL, 0, NULL) != DISP_CHANGE_SUCCESSFUL) + trace("Unable to go back to previous display settings. Sorry.\n"); hcursor = CreateCursor(NULL, 1, 2, 4, 4, data, data); ok(hcursor != 0, "should not fail\n"); @@ -197,7 +260,12 @@ ok(bitmap.bmPlanes == 1, "\n"); ok(bitmap.bmBitsPixel == 1, "\n"); ok(bitmap.bmBits == NULL, "\n"); - + + /* Delete objects */ + DeleteObject(iconinfo2.hbmColor); + DeleteObject(iconinfo2.hbmMask); + /* Delete cursor */ + DestroyCursor(hcursor); }

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