mirror of
https://github.com/reactos/reactos.git
synced 2024-06-30 18:01:07 +00:00
Replace incomplete and broken implementations of ConvertStringSecurityDescriptorToSecurityDescriptorW and ConvertStringSidToSidW by new ones
svn path=/trunk/; revision=24490
This commit is contained in:
parent
dc1d41df49
commit
47ef13cf4a
|
@ -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>
|
||||
|
|
|
@ -536,7 +536,7 @@ GetInheritanceSourceA (
|
|||
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 @@ InternalTrusteeAToW(IN PTRUSTEE_A pTrusteeA,
|
|||
|
||||
//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 @@ InternalExplicitAccessAToW(IN ULONG cCountOfExplicitEntries,
|
|||
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 @@ InternalExplicitAccessAToW(IN ULONG cCountOfExplicitEntries,
|
|||
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:
|
||||
|
|
|
@ -1960,7 +1960,7 @@ InternalfnProgressW(LPWSTR pObjectName,
|
|||
NULL,
|
||||
NULL);
|
||||
|
||||
pifnProgressData->fnProgress(pObjectNameA,
|
||||
pifnProgressData->fnProgress((LPWSTR)pObjectNameA, /* FIXME: wrong cast!! */
|
||||
Status,
|
||||
pInvokeSetting,
|
||||
pifnProgressData->Args,
|
||||
|
|
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue