Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 65025: [NTFS] Fix some debug prints
by hpoussin＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: hpoussin Date: Sun Oct 26 19:09:52 2014 New Revision: 65025 URL: http://svn.reactos.org/svn/reactos?rev=65025&view=rev Log: [NTFS] Fix some debug prints Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] Sun Oct 26 19:09:52 2014 @@ -85,7 +85,7 @@ PCWSTR Name, ULONG NameLength) { - DPRINT1("FindAttributeHelper(%p, %p, %p, 0x%x, %S, %u)\n", Vcb, AttrRecord, AttrRecordEnd, Type, Name, NameLength); + DPRINT("FindAttributeHelper(%p, %p, %p, 0x%x, %S, %u)\n", Vcb, AttrRecord, AttrRecordEnd, Type, Name, NameLength); while (AttrRecord < AttrRecordEnd) { @@ -146,7 +146,7 @@ PWCHAR AttrName; AttrName = (PWCHAR)((PCHAR)AttrRecord + AttrRecord->NameOffset); - DPRINT("%s, %s\n", AttrName, Name); + DPRINT("%.*S, %.*S\n", AttrRecord->NameLength, AttrName, NameLength, Name); if (RtlCompareMemory(AttrName, Name, NameLength << 1) == (NameLength << 1)) { /* Found it, fill up the context and return. */ @@ -180,7 +180,7 @@ PNTFS_ATTR_RECORD AttrRecord; PNTFS_ATTR_RECORD AttrRecordEnd; - DPRINT1("FindAttribute(%p, %p, %u, %S, %u, %p)\n", Vcb, MftRecord, Type, Name, NameLength, AttrCtx); + DPRINT("FindAttribute(%p, %p, 0x%x, %S, %u, %p)\n", Vcb, MftRecord, Type, Name, NameLength, AttrCtx); AttrRecord = (PNTFS_ATTR_RECORD)((PCHAR)MftRecord + MftRecord->AttributeOffset); AttrRecordEnd = (PNTFS_ATTR_RECORD)((PCHAR)MftRecord + Vcb->NtfsInfo.BytesPerFileRecord); @@ -397,12 +397,12 @@ { ULONGLONG BytesRead; - DPRINT1("ReadFileRecord(%p, %I64x, %p)\n", Vcb, index, file); + DPRINT("ReadFileRecord(%p, %I64x, %p)\n", Vcb, index, file); BytesRead = ReadAttribute(Vcb, Vcb->MFTContext, index * Vcb->NtfsInfo.BytesPerFileRecord, (PCHAR)file, Vcb->NtfsInfo.BytesPerFileRecord); if (BytesRead != Vcb->NtfsInfo.BytesPerFileRecord) { - DPRINT1("ReadFileRecord failed: %u read, %u expected\n", BytesRead, Vcb->NtfsInfo.BytesPerFileRecord); + DPRINT1("ReadFileRecord failed: %I64u read, %u expected\n", BytesRead, Vcb->NtfsInfo.BytesPerFileRecord); return STATUS_PARTIAL_COPY; } @@ -507,7 +507,7 @@ NTSTATUS Status; ULONG CurrentEntry = 0; - DPRINT1("NtfsFindMftRecord(%p, %I64d, %wZ, %p, %u, %p)\n", Vcb, MFTIndex, FileName, FirstEntry, DirSearch, OutMFTIndex); + DPRINT("NtfsFindMftRecord(%p, %I64d, %wZ, %p, %u, %p)\n", Vcb, MFTIndex, FileName, FirstEntry, DirSearch, OutMFTIndex); MftRecord = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, @@ -686,13 +686,13 @@ NTSTATUS Status; ULONG FirstEntry = 0; - DPRINT1("NtfsLookupFileAt(%p, %wZ, %p, %p, %I64x)\n", Vcb, PathName, FileRecord, DataContext, CurrentMFTIndex); + DPRINT("NtfsLookupFileAt(%p, %wZ, %p, %p, %I64x)\n", Vcb, PathName, FileRecord, DataContext, CurrentMFTIndex); FsRtlDissectName(*PathName, &Current, &Remaining); while (Current.Length != 0) { - DPRINT1("Current: %wZ\n", &Current); + DPRINT("Current: %wZ\n", &Current); Status = NtfsFindMftRecord(Vcb, CurrentMFTIndex, &Current, &FirstEntry, FALSE, &CurrentMFTIndex); if (!NT_SUCCESS(Status)) @@ -762,11 +762,12 @@ { NTSTATUS Status; - DPRINT1("NtfsFindFileAt(%p, %wZ, %p, %p, %p, %p, %I64x)\n", Vcb, SearchPattern, FirstEntry, FileRecord, DataContext, MFTIndex, CurrentMFTIndex); + DPRINT("NtfsFindFileAt(%p, %wZ, %p, %p, %p, %p, %I64x)\n", Vcb, SearchPattern, FirstEntry, FileRecord, DataContext, MFTIndex, CurrentMFTIndex); Status = NtfsFindMftRecord(Vcb, CurrentMFTIndex, SearchPattern, FirstEntry, TRUE, &CurrentMFTIndex); if (!NT_SUCCESS(Status)) { + DPRINT("NtfsFindFileAt: NtfsFindMftRecord() failed with status 0x%08lx\n", Status); return Status; }

1 0

[pschweitzer] 65024: [FASTFAT] Acquire DirResource in DoQuery() before attempting to play with FCBs. This is dedicated to Thomas ; -)
by pschweitzer＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: pschweitzer Date: Sun Oct 26 18:48:30 2014 New Revision: 65024 URL: http://svn.reactos.org/svn/reactos?rev=65024&view=rev Log: [FASTFAT] Acquire DirResource in DoQuery() before attempting to play with FCBs. This is dedicated to Thomas ;-) Modified: trunk/reactos/drivers/filesystems/fastfat/dir.c Modified: trunk/reactos/drivers/filesystems/fastfat/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/dir.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/dir.c [iso-8859-1] Sun Oct 26 18:48:30 2014 @@ -504,6 +504,13 @@ DirContext.ShortNameU.Buffer = ShortNameBuffer; DirContext.ShortNameU.MaximumLength = sizeof(ShortNameBuffer); + if (!ExAcquireResourceExclusiveLite(&IrpContext->DeviceExt->DirResource, + (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) + { + ExReleaseResourceLite(&pFcb->MainResource); + return VfatQueueRequest(IrpContext); + } + while ((Status == STATUS_SUCCESS) && (BufferLength > 0)) { Status = FindFile(IrpContext->DeviceExt, @@ -579,6 +586,7 @@ IrpContext->Irp->IoStatus.Information = Stack->Parameters.QueryDirectory.Length - BufferLength; } + ExReleaseResourceLite(&IrpContext->DeviceExt->DirResource); ExReleaseResourceLite(&pFcb->MainResource); return Status;

1 0

[ekohl] 65023: [NTOS:SE] Remove the old access check code in SepAccessCheckEx and use the new code instead. The new access check code is a lot better than the old code, but it makes the boot and in...
by ekohl＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: ekohl Date: Sun Oct 26 18:39:58 2014 New Revision: 65023 URL: http://svn.reactos.org/svn/reactos?rev=65023&view=rev Log: [NTOS:SE] Remove the old access check code in SepAccessCheckEx and use the new code instead. The new access check code is a lot better than the old code, but it makes the boot and install fail. This is caused by some kernel objects which are accessed using insufficient access rights. Therefore I added a little hack that shows a warning when insufficient rights are granted for an object and access is granted anyway. Modified: trunk/reactos/ntoskrnl/se/accesschk.c Modified: trunk/reactos/ntoskrnl/se/accesschk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/accesschk.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/se/accesschk.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/accesschk.c [iso-8859-1] Sun Oct 26 18:39:58 2014 @@ -17,8 +17,6 @@ /* PRIVATE FUNCTIONS **********************************************************/ - -#define OLD_ACCESS_CHECK BOOLEAN NTAPI SepAccessCheckEx(IN PSECURITY_DESCRIPTOR SecurityDescriptor, @@ -48,6 +46,8 @@ NTSTATUS Status; PAGED_CODE(); + DPRINT("SepAccessCheckEx()\n"); + /* Check for no access desired */ if (!DesiredAccess) { @@ -210,11 +210,6 @@ { if (SepSidInToken(Token, Sid)) { -#ifdef OLD_ACCESS_CHECK - PreviouslyGrantedAccess = 0; - Status = STATUS_ACCESS_DENIED; - goto ReturnCommonStatus; -#else /* Map access rights from the ACE */ TempAccess = CurrentAce->AccessMask; RtlMapGenericMask(&TempAccess, GenericMapping); @@ -222,25 +217,21 @@ /* Leave if a remaining right must be denied */ if (RemainingAccess & TempAccess) break; -#endif } } else if (CurrentAce->Header.AceType == ACCESS_ALLOWED_ACE_TYPE) { if (SepSidInToken(Token, Sid)) { -#ifdef OLD_ACCESS_CHECK - TempAccess = CurrentAce->AccessMask; - RtlMapGenericMask(&TempAccess, GenericMapping); - PreviouslyGrantedAccess |= TempAccess; -#else /* Map access rights from the ACE */ TempAccess = CurrentAce->AccessMask; + DPRINT("TempAccess 0x%08lx\n", TempAccess); RtlMapGenericMask(&TempAccess, GenericMapping); /* Remove granted rights */ + DPRINT("RemainingAccess 0x%08lx TempAccess 0x%08lx\n", RemainingAccess, TempAccess); RemainingAccess &= ~TempAccess; -#endif + DPRINT("RemainingAccess 0x%08lx\n", RemainingAccess); } } else @@ -253,58 +244,35 @@ CurrentAce = (PACE)((ULONG_PTR)CurrentAce + CurrentAce->Header.AceSize); } -#ifdef OLD_ACCESS_CHECK - DPRINT("PreviouslyGrantedAccess %08lx\n DesiredAccess %08lx\n", - PreviouslyGrantedAccess, DesiredAccess); - - PreviouslyGrantedAccess &= DesiredAccess; - - if ((PreviouslyGrantedAccess & ~VALID_INHERIT_FLAGS) == - (DesiredAccess & ~VALID_INHERIT_FLAGS)) - { - Status = STATUS_SUCCESS; - goto ReturnCommonStatus; - } - else - { - DPRINT1("HACK: Should deny access for caller: granted 0x%lx, desired 0x%lx (generic mapping %p).\n", - PreviouslyGrantedAccess, DesiredAccess, GenericMapping); - //*AccessStatus = STATUS_ACCESS_DENIED; - //return FALSE; - PreviouslyGrantedAccess = DesiredAccess; - Status = STATUS_SUCCESS; - goto ReturnCommonStatus; - } -#else DPRINT("DesiredAccess %08lx\nPreviouslyGrantedAccess %08lx\nRemainingAccess %08lx\n", DesiredAccess, PreviouslyGrantedAccess, RemainingAccess); /* Fail if some rights have not been granted */ if (RemainingAccess != 0) { - *GrantedAccess = 0; + DPRINT1("HACK: RemainingAccess = 0x%08lx DesiredAccess = 0x%08lx\n", RemainingAccess, DesiredAccess); +#if 0 + /* HACK HACK HACK */ Status = STATUS_ACCESS_DENIED; goto ReturnCommonStatus; +#endif } /* Set granted access rights */ PreviouslyGrantedAccess |= DesiredAccess; - DPRINT("GrantedAccess %08lx\n", *GrantedAccess); - /* Fail if no rights have been granted */ if (PreviouslyGrantedAccess == 0) { + DPRINT1("PreviouslyGrantedAccess == 0 DesiredAccess = %08lx\n", DesiredAccess); Status = STATUS_ACCESS_DENIED; goto ReturnCommonStatus; } Status = STATUS_SUCCESS; goto ReturnCommonStatus; -#endif ReturnCommonStatus: - ResultListLength = UseResultList ? ObjectTypeListLength : 1; for (i = 0; i < ResultListLength; i++) {

1 0

[akhaldi] 65022: [ADVAPI32] * Update GetAclInformation(). CORE-8540
by akhaldi＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: akhaldi Date: Sun Oct 26 17:51:59 2014 New Revision: 65022 URL: http://svn.reactos.org/svn/reactos?rev=65022&view=rev Log: [ADVAPI32] * Update GetAclInformation(). CORE-8540 Modified: trunk/reactos/dll/win32/advapi32/wine/security.c Modified: trunk/reactos/dll/win32/advapi32/wine/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/wine/se… ============================================================================== --- trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] Sun Oct 26 17:51:59 2014 @@ -1100,29 +1100,17 @@ return set_ntstatus(RtlGetAce(pAcl, dwAceIndex, pAce)); } -/* - * @implemented - */ -BOOL -WINAPI -GetAclInformation(PACL pAcl, - LPVOID pAclInformation, - DWORD nAclInformationLength, - ACL_INFORMATION_CLASS dwAclInformationClass) -{ - NTSTATUS Status; - - Status = RtlQueryInformationAcl(pAcl, - pAclInformation, - nAclInformationLength, - dwAclInformationClass); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; +/****************************************************************************** + * GetAclInformation [ADVAPI32.@] + */ +BOOL WINAPI GetAclInformation( + PACL pAcl, + LPVOID pAclInformation, + DWORD nAclInformationLength, + ACL_INFORMATION_CLASS dwAclInformationClass) +{ + return set_ntstatus(RtlQueryInformationAcl(pAcl, pAclInformation, + nAclInformationLength, dwAclInformationClass)); } /*

1 0

[tfaber] 65021: [CRT] - Fix strlen/wcslen FPO specification. Spotted by Timo. - Also add FPO info for memset, memchr, memmove/memcpy
by tfaber＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: tfaber Date: Sun Oct 26 17:32:00 2014 New Revision: 65021 URL: http://svn.reactos.org/svn/reactos?rev=65021&view=rev Log: [CRT] - Fix strlen/wcslen FPO specification. Spotted by Timo. - Also add FPO info for memset, memchr, memmove/memcpy Modified: trunk/reactos/lib/sdk/crt/mem/i386/memchr_asm.s trunk/reactos/lib/sdk/crt/mem/i386/memmove_asm.s trunk/reactos/lib/sdk/crt/mem/i386/memset_asm.s trunk/reactos/lib/sdk/crt/string/i386/tcsnlen.inc Modified: trunk/reactos/lib/sdk/crt/mem/i386/memchr_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/i386/memch… ============================================================================== --- trunk/reactos/lib/sdk/crt/mem/i386/memchr_asm.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mem/i386/memchr_asm.s [iso-8859-1] Sun Oct 26 17:32:00 2014 @@ -14,7 +14,8 @@ PUBLIC _memchr .code -_memchr: +FUNC _memchr + FPO 0, 3, 4, 1, 1, FRAME_NONFPO push ebp mov ebp, esp push edi @@ -33,5 +34,6 @@ pop edi leave ret +ENDFUNC END Modified: trunk/reactos/lib/sdk/crt/mem/i386/memmove_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/i386/memmo… ============================================================================== --- trunk/reactos/lib/sdk/crt/mem/i386/memmove_asm.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mem/i386/memmove_asm.s [iso-8859-1] Sun Oct 26 17:32:00 2014 @@ -11,7 +11,8 @@ .code _memcpy: -_memmove: +FUNC _memmove + FPO 0, 3, 5, 2, 1, FRAME_NONFPO push ebp mov ebp, esp @@ -116,5 +117,6 @@ dec esi dec edi jmp .L8 +ENDFUNC END Modified: trunk/reactos/lib/sdk/crt/mem/i386/memset_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/i386/memse… ============================================================================== --- trunk/reactos/lib/sdk/crt/mem/i386/memset_asm.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mem/i386/memset_asm.s [iso-8859-1] Sun Oct 26 17:32:00 2014 @@ -9,7 +9,8 @@ PUBLIC _memset .code -_memset: +FUNC _memset + FPO 0, 3, 4, 1, 1, FRAME_NONFPO push ebp mov ebp, esp push edi @@ -45,5 +46,6 @@ mov eax, [ebp + 8] leave ret +ENDFUNC END Modified: trunk/reactos/lib/sdk/crt/string/i386/tcsnlen.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/tc… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/i386/tcsnlen.inc [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/i386/tcsnlen.inc [iso-8859-1] Sun Oct 26 17:32:00 2014 @@ -6,7 +6,7 @@ .code FUNC _tcsnlen - FPO 0, 1, 1, 1, 0, FRAME_FPO + FPO 0, 2, 1, 1, 0, FRAME_FPO push edi mov edi, [esp + 8] mov ecx, [esp + 12]

1 0

[gadamopoulos] 65020: [browseui] - Improve CBaseBar::TranslateAcceleratorIO stub - Returning always TRUE means that creating a basebar ended up eating all messages - Fixes the hang that happened wh...
by gadamopoulos＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: gadamopoulos Date: Sun Oct 26 17:16:19 2014 New Revision: 65020 URL: http://svn.reactos.org/svn/reactos?rev=65020&view=rev Log: [browseui] - Improve CBaseBar::TranslateAcceleratorIO stub - Returning always TRUE means that creating a basebar ended up eating all messages - Fixes the hang that happened when we clicked on the folders button in the toolbar Modified: branches/shell-experiments/dll/win32/browseui/basebar.cpp Modified: branches/shell-experiments/dll/win32/browseui/basebar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/basebar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/basebar.cpp [iso-8859-1] Sun Oct 26 17:16:19 2014 @@ -296,7 +296,7 @@ HRESULT STDMETHODCALLTYPE CBaseBar::TranslateAcceleratorIO(LPMSG lpMsg) { // forward to contained bar - return S_OK; + return S_FALSE; } HRESULT STDMETHODCALLTYPE CBaseBar::SetClient(IUnknown *punkClient)

1 0

[dquintana] 65019: [BROWSEUI] * Sidebars are not implemented, but it's ok. No need to force a debug break in there.
by dquintana＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: dquintana Date: Sun Oct 26 17:06:58 2014 New Revision: 65019 URL: http://svn.reactos.org/svn/reactos?rev=65019&view=rev Log: [BROWSEUI] * Sidebars are not implemented, but it's ok. No need to force a debug break in there. Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Sun Oct 26 17:06:58 2014 @@ -1179,8 +1179,6 @@ VARIANT vaIn; HRESULT hResult; - __debugbreak(); - hResult = GetBaseBar(vertical, (IUnknown **)&theBaseBar); if (FAILED_UNEXPECTEDLY(hResult)) return hResult;

1 0

[hbelusca] 65018: [NTVDM]: Temporarily fix for r65015 before a proper fix.
by hbelusca＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: hbelusca Date: Sun Oct 26 16:56:14 2014 New Revision: 65018 URL: http://svn.reactos.org/svn/reactos?rev=65018&view=rev Log: [NTVDM]: Temporarily fix for r65015 before a proper fix. Modified: trunk/reactos/subsystems/ntvdm/bios/vidbios.c Modified: trunk/reactos/subsystems/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/vidb… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] Sun Oct 26 16:56:14 2014 @@ -2296,8 +2296,15 @@ { BYTE Page; COORD Resolution; + PVGA_REGISTERS VgaMode; + + /* + * IBM standard modes do not clear the screen if the + * high bit of AL is set (EGA or higher only). + * See Ralf Brown: http://www.ctyme.com/intr/rb-0069.htm + * for more information. + */ BOOLEAN DoNotClear = !!(ModeNumber & 0x80); - PVGA_REGISTERS VgaMode; /* Retrieve the real mode number and check its validity */ ModeNumber &= 0x7F; @@ -2308,8 +2315,13 @@ return FALSE; } - /* Check if this is the same mode */ - if (ModeNumber == Bda->VideoMode) return TRUE; + /* Check if this is the current mode */ + if (ModeNumber == Bda->VideoMode) + { + /* Just clear the VGA memory if needed */ + if (!DoNotClear) VgaClearMemory(); + return TRUE; + } VgaMode = VideoModes[ModeNumber]; @@ -2320,12 +2332,7 @@ VgaChangePalette(ModeNumber); - /* - * IBM standard modes do not clear the screen if the - * high bit of AL is set (EGA or higher only). - * See Ralf Brown: http://www.ctyme.com/intr/rb-0069.htm - * for more information. - */ + /* Clear the VGA memory if needed */ if (!DoNotClear) VgaClearMemory(); // Bda->CrtModeControl;

1 0

[akhaldi] 65017: [ADVAPI32] * Update GetAce(). CORE-8540
by akhaldi＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: akhaldi Date: Sun Oct 26 16:48:36 2014 New Revision: 65017 URL: http://svn.reactos.org/svn/reactos?rev=65017&view=rev Log: [ADVAPI32] * Update GetAce(). CORE-8540 Modified: trunk/reactos/dll/win32/advapi32/wine/security.c Modified: trunk/reactos/dll/win32/advapi32/wine/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/wine/se… ============================================================================== --- trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] Sun Oct 26 16:48:36 2014 @@ -1092,28 +1092,12 @@ (PACE*)pAce); } - -/* - * @implemented - */ -BOOL -WINAPI -GetAce(PACL pAcl, - DWORD dwAceIndex, - LPVOID *pAce) -{ - NTSTATUS Status; - - Status = RtlGetAce(pAcl, - dwAceIndex, - pAce); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; +/****************************************************************************** + * GetAce [ADVAPI32.@] + */ +BOOL WINAPI GetAce(PACL pAcl,DWORD dwAceIndex,LPVOID *pAce ) +{ + return set_ntstatus(RtlGetAce(pAcl, dwAceIndex, pAce)); } /*

1 0

[akhaldi] 65016: [ADVAPI32] * Update DeleteAce(). CORE-8540
by akhaldi＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: akhaldi Date: Sun Oct 26 15:59:57 2014 New Revision: 65016 URL: http://svn.reactos.org/svn/reactos?rev=65016&view=rev Log: [ADVAPI32] * Update DeleteAce(). CORE-8540 Modified: trunk/reactos/dll/win32/advapi32/wine/security.c Modified: trunk/reactos/dll/win32/advapi32/wine/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/wine/se… ============================================================================== --- trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] Sun Oct 26 15:59:57 2014 @@ -1072,25 +1072,12 @@ return TRUE; } -/* - * @implemented - */ -BOOL -WINAPI -DeleteAce(PACL pAcl, - DWORD dwAceIndex) -{ - NTSTATUS Status; - - Status = RtlDeleteAce(pAcl, - dwAceIndex); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; +/****************************************************************************** + * DeleteAce [ADVAPI32.@] + */ +BOOL WINAPI DeleteAce(PACL pAcl, DWORD dwAceIndex) +{ + return set_ntstatus(RtlDeleteAce(pAcl, dwAceIndex)); } /*

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