Ros-diffs August 2016

ros-diffs@reactos.org

20 participants
462 discussions

[dchapyshev] 72428: Maybe strcasecmp?
by dchapyshev＠svn.reactos.org 22 Aug '16

22 Aug '16

Author: dchapyshev Date: Mon Aug 22 13:22:32 2016 New Revision: 72428 URL: http://svn.reactos.org/svn/reactos?rev=72428&view=rev Log: Maybe strcasecmp? Modified: trunk/reactos/sdk/tools/utf16le/utf16le.cpp Modified: trunk/reactos/sdk/tools/utf16le/utf16le.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/utf16le/utf16le.… ============================================================================== --- trunk/reactos/sdk/tools/utf16le/utf16le.cpp [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/utf16le/utf16le.cpp [iso-8859-1] Mon Aug 22 13:22:32 2016 @@ -279,7 +279,7 @@ utf_converter::bom_types bom_type = utf_converter::bom; - if (argc == 4 && stricmp(argv[3], "nobom") == 0) + if (argc == 4 && strcasecmp(argv[3], "nobom") == 0) { bom_type = utf_converter::nobom; }

1 0

[dchapyshev] 72427: [UTF16LE] Try to fix build
by dchapyshev＠svn.reactos.org 22 Aug '16

22 Aug '16

Author: dchapyshev Date: Mon Aug 22 13:18:26 2016 New Revision: 72427 URL: http://svn.reactos.org/svn/reactos?rev=72427&view=rev Log: [UTF16LE] Try to fix build Modified: trunk/reactos/sdk/tools/utf16le/utf16le.cpp Modified: trunk/reactos/sdk/tools/utf16le/utf16le.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/utf16le/utf16le.… ============================================================================== --- trunk/reactos/sdk/tools/utf16le/utf16le.cpp [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/utf16le/utf16le.cpp [iso-8859-1] Mon Aug 22 13:18:26 2016 @@ -279,12 +279,12 @@ utf_converter::bom_types bom_type = utf_converter::bom; - if (argc == 4 && _stricmp(argv[3], "nobom") == 0) + if (argc == 4 && stricmp(argv[3], "nobom") == 0) { bom_type = utf_converter::nobom; } - utf_converter conv(argv[1],argv[2], bom_type); + utf_converter conv(argv[1], argv[2], bom_type); if ((err = conv.getError())!=utf_converter::none) {

1 0

[dchapyshev] 72426: [UTF16LE] - Implement ability to disable BOM writing
by dchapyshev＠svn.reactos.org 22 Aug '16

22 Aug '16

Author: dchapyshev Date: Mon Aug 22 13:14:41 2016 New Revision: 72426 URL: http://svn.reactos.org/svn/reactos?rev=72426&view=rev Log: [UTF16LE] - Implement ability to disable BOM writing Modified: trunk/reactos/sdk/tools/utf16le/utf16le.cpp Modified: trunk/reactos/sdk/tools/utf16le/utf16le.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/utf16le/utf16le.… ============================================================================== --- trunk/reactos/sdk/tools/utf16le/utf16le.cpp [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/utf16le/utf16le.cpp [iso-8859-1] Mon Aug 22 13:14:41 2016 @@ -13,6 +13,7 @@ #include <fstream> #include <iostream> +#include <string.h> //#define DISPLAY_DETECTED_UNICODE @@ -25,14 +26,16 @@ // due to ambiguous BOM enum enc_types { detect, utf8, utf16le, utf16be, utf32le, utf32be }; enum err_types { none, iopen, oopen, eof, read, write, decode }; + enum bom_types { bom, nobom }; protected: err_types error; enc_types encoding; + bom_types bom_type; unsigned char buffer[4], fill, index; // need 4 char buffer for optional BOM handling fstream inputfile,outputfile; static const unsigned char utf8table[64]; public: - utf_converter(string ifname, string ofname, enc_types enc = detect) : error(none), encoding(enc), fill(0), index(0) + utf_converter(string ifname, string ofname, bom_types ofbom = bom, enc_types enc = detect) : error(none), bom_type(ofbom), encoding(enc), fill(0), index(0) { enc_types tmp_enc; inputfile.open(ifname.c_str(), ios::in | ios::binary); @@ -230,10 +233,15 @@ } void convert2utf16le() { - wchar_t c; - unsigned char buffer[2] = {0xff, 0xfe}; - outputfile.write(reinterpret_cast<char*>(&buffer),2); // write BOM - c = get_wchar_t(); + unsigned char buffer[2] = { 0xff, 0xfe }; + + if (bom_type == bom) + { + outputfile.write(reinterpret_cast<char*>(&buffer), 2); // write BOM + } + + wchar_t c = get_wchar_t(); + while (!inputfile.eof()) { buffer[0] = c & 0xff; @@ -262,12 +270,22 @@ int main(int argc, char* argv[]) { utf_converter::err_types err; + if (argc < 3) { cout << "usage: " << argv[0] << " inputfile outputfile" << endl; return -1; } - utf_converter conv(argv[1],argv[2]); + + utf_converter::bom_types bom_type = utf_converter::bom; + + if (argc == 4 && _stricmp(argv[3], "nobom") == 0) + { + bom_type = utf_converter::nobom; + } + + utf_converter conv(argv[1],argv[2], bom_type); + if ((err = conv.getError())!=utf_converter::none) { switch (err) @@ -282,7 +300,11 @@ cerr << "Unknown error." << endl; } return -1; - } else - conv.convert2utf16le(); + } + else + { + conv.convert2utf16le(); + } + return 0; }

1 0

[dchapyshev] 72425: [KERNEL32] - Update Russian translation
by dchapyshev＠svn.reactos.org 22 Aug '16

22 Aug '16

Author: dchapyshev Date: Mon Aug 22 12:15:00 2016 New Revision: 72425 URL: http://svn.reactos.org/svn/reactos?rev=72425&view=rev Log: [KERNEL32] - Update Russian translation Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/lang/ru-RU.rc [iso-8859-1] Mon Aug 22 12:15:00 2016 @@ -226,7 +226,7 @@ 84+NLSRC_OFFSET "Ð¤ÑÐ°Ð½ÑÐ¸Ñ" 86+NLSRC_OFFSET "ÐÐ°Ð¼Ð±Ð¸Ñ" 87+NLSRC_OFFSET "ÐÐ°Ð±Ð¾Ð½" - 88+NLSRC_OFFSET "ÐÐ¶Ð¾ÑÐ´Ð¶Ð¸Ñ" + 88+NLSRC_OFFSET "ÐÑÑÐ·Ð¸Ñ" 89+NLSRC_OFFSET "ÐÐ°Ð½Ð°" 90+NLSRC_OFFSET "ÐÐ¸Ð±ÑÐ°Ð»ÑÐ°Ñ" 91+NLSRC_OFFSET "ÐÑÐµÐ½Ð°Ð´Ð°"

1 0

[tthompson] 72424: [NTFS] +NtfsDumpFileRecord() - Provides diagnostic information about a file record.
by tthompson＠svn.reactos.org 22 Aug '16

22 Aug '16

Author: tthompson Date: Mon Aug 22 11:08:22 2016 New Revision: 72424 URL: http://svn.reactos.org/svn/reactos?rev=72424&view=rev Log: [NTFS] +NtfsDumpFileRecord() - Provides diagnostic information about a file record. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] Mon Aug 22 11:08:22 2016 @@ -1460,6 +1460,46 @@ return NtfsLookupFileAt(Vcb, PathName, FileRecord, MFTIndex, NTFS_FILE_ROOT); } +/** +* @name NtfsDumpFileRecord +* @implemented +* +* Provides diagnostic information about a file record. Prints a hex dump +* of the entire record (based on the size reported by FileRecord->ByesInUse), +* then prints a dump of each attribute. +* +* @param Vcb +* Pointer to a DEVICE_EXTENSION describing the volume. +* +* @param FileRecord +* Pointer to the file record to be analyzed. +* +* @remarks +* FileRecord must be a complete file record at least FileRecord->BytesAllocated +* in size, and not just the header. +* +*/ +VOID +NtfsDumpFileRecord(PDEVICE_EXTENSION Vcb, + PFILE_RECORD_HEADER FileRecord) +{ + ULONG i, j; + + // dump binary data, 8 bytes at a time + for (i = 0; i < FileRecord->BytesInUse; i += 8) + { + // display current offset, in hex + DbgPrint("\t%03x\t", i); + + // display hex value of each of the next 8 bytes + for (j = 0; j < 8; j++) + DbgPrint("%02x ", *(PUCHAR)((ULONG_PTR)FileRecord + i + j)); + DbgPrint("\n"); + } + + NtfsDumpFileAttributes(Vcb, FileRecord); +} + NTSTATUS NtfsFindFileAt(PDEVICE_EXTENSION Vcb, PUNICODE_STRING SearchPattern, Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Mon Aug 22 11:08:22 2016 @@ -907,6 +907,10 @@ PULONGLONG MFTIndex, ULONGLONG CurrentMFTIndex); +VOID +NtfsDumpFileRecord(PDEVICE_EXTENSION Vcb, + PFILE_RECORD_HEADER FileRecord); + NTSTATUS NtfsFindFileAt(PDEVICE_EXTENSION Vcb, PUNICODE_STRING SearchPattern,

1 0

[tthompson] 72423: [NTFS] *UpdateFileRecord() - Fix a DPRINT
by tthompson＠svn.reactos.org 22 Aug '16

22 Aug '16

Author: tthompson Date: Mon Aug 22 08:27:35 2016 New Revision: 72423 URL: http://svn.reactos.org/svn/reactos?rev=72423&view=rev Log: [NTFS] *UpdateFileRecord() - Fix a DPRINT Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] Mon Aug 22 08:27:35 2016 @@ -1092,7 +1092,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("UpdateFileRecord failed: %I64u written, %lu expected\n", BytesWritten, Vcb->NtfsInfo.BytesPerFileRecord); + DPRINT1("UpdateFileRecord failed: %lu written, %lu expected\n", BytesWritten, Vcb->NtfsInfo.BytesPerFileRecord); } // remove the fixup array (so the file record pointer can still be used)

1 0

[tthompson] 72422: [NTFS] Add some fixes to attrib.c, as suggested by Pierre Schweitzer: *ConvertLargeMCBToDataRuns() - Use MS portable type, ULONG, for variable i. *FreeClusters(), AddRun() - Chec...
by tthompson＠svn.reactos.org 22 Aug '16

22 Aug '16

Author: tthompson Date: Mon Aug 22 08:11:12 2016 New Revision: 72422 URL: http://svn.reactos.org/svn/reactos?rev=72422&view=rev Log: [NTFS] Add some fixes to attrib.c, as suggested by Pierre Schweitzer: *ConvertLargeMCBToDataRuns() - Use MS portable type, ULONG, for variable i. *FreeClusters(), AddRun() - Check for invalid parameter before allocating memory, and confirm the memory is allocated. *ConvertDataRunsToLargeMCB(), AddRun() - Avoid code duplication by using ExRaiseStatus() in try block, and return accurate status via _SEH2_GetExceptionCode(). Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] Mon Aug 22 08:11:12 2016 @@ -62,7 +62,9 @@ * * @return * STATUS_SUCCESS on success. STATUS_INVALID_PARAMETER if AttrContext describes a resident attribute. -* STATUS_INSUFFICIENT_RESOURCES if ConvertDataRunsToLargeMCB() fails. +* STATUS_INSUFFICIENT_RESOURCES if ConvertDataRunsToLargeMCB() fails or if we fail to allocate a +* buffer for the new data runs. +* STATUS_INSUFFICIENT_RESOURCES or STATUS_UNSUCCESSFUL if FsRtlAddLargeMcbEntry() fails. * STATUS_BUFFER_TOO_SMALL if ConvertLargeMCBToDataRuns() fails. * STATUS_NOT_IMPLEMENTED if we need to migrate the attribute to an attribute list (TODO). * @@ -95,6 +97,11 @@ return STATUS_INVALID_PARAMETER; RunBuffer = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, TAG_NTFS); + if (!RunBuffer) + { + DPRINT1("ERROR: Couldn't allocate memory for data runs!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } // Convert the data runs to a map control block Status = ConvertDataRunsToLargeMCB(DataRun, &DataRunsMCB, &NextVBN); @@ -112,14 +119,12 @@ NextAssignedCluster, RunLength)) { - FsRtlUninitializeLargeMcb(&DataRunsMCB); - ExFreePoolWithTag(RunBuffer, TAG_NTFS); - return STATUS_INSUFFICIENT_RESOURCES; + ExRaiseStatus(STATUS_UNSUCCESSFUL); } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { FsRtlUninitializeLargeMcb(&DataRunsMCB); ExFreePoolWithTag(RunBuffer, TAG_NTFS); - _SEH2_YIELD(return STATUS_INSUFFICIENT_RESOURCES); + _SEH2_YIELD(_SEH2_GetExceptionCode()); } _SEH2_END; @@ -200,7 +205,7 @@ * Pointer to an unitialized LARGE_MCB structure. * * @return -* STATUS_SUCCESS on success, STATUS_INSUFFICIENT_RESOURCES if we fail to +* STATUS_SUCCESS on success, STATUS_INSUFFICIENT_RESOURCES or STATUS_UNSUCCESSFUL if we fail to * initialize the mcb or add an entry. * * @remarks @@ -223,7 +228,7 @@ _SEH2_TRY{ FsRtlInitializeLargeMcb(DataRunsMCB, NonPagedPool); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - _SEH2_YIELD(return STATUS_INSUFFICIENT_RESOURCES); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; while (*DataRun != 0) @@ -242,12 +247,11 @@ DataRunStartLCN, DataRunLength)) { - FsRtlUninitializeLargeMcb(DataRunsMCB); - return STATUS_INSUFFICIENT_RESOURCES; + ExRaiseStatus(STATUS_UNSUCCESSFUL); } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { FsRtlUninitializeLargeMcb(DataRunsMCB); - _SEH2_YIELD(return STATUS_INSUFFICIENT_RESOURCES); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; } @@ -292,7 +296,7 @@ LONGLONG DataRunOffset; ULONGLONG LastLCN = 0; LONGLONG Vbn, Lbn, Count; - int i; + ULONG i; DPRINT("\t[Vbn, Lbn, Count]\n"); @@ -436,7 +440,8 @@ * @return * STATUS_SUCCESS on success. STATUS_INVALID_PARAMETER if AttrContext describes a resident attribute, * or if the caller requested more clusters be freed than the attribute has been allocated. -* STATUS_INSUFFICIENT_RESOURCES if ConvertDataRunsToLargeMCB() fails. +* STATUS_INSUFFICIENT_RESOURCES if allocating a buffer for the data runs fails or +* if ConvertDataRunsToLargeMCB() fails. * STATUS_BUFFER_TOO_SMALL if ConvertLargeMCBToDataRuns() fails. * * @@ -460,7 +465,7 @@ ULONGLONG NextVBN = AttrContext->Record.NonResident.LowestVCN; // Allocate some memory for the RunBuffer - PUCHAR RunBuffer = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, TAG_NTFS); + PUCHAR RunBuffer; ULONG RunBufferOffset = 0; PFILE_RECORD_HEADER BitmapRecord; @@ -472,8 +477,14 @@ if (!AttrContext->Record.IsNonResident) { - ExFreePoolWithTag(RunBuffer, TAG_NTFS); return STATUS_INVALID_PARAMETER; + } + + RunBuffer = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, TAG_NTFS); + if (!RunBuffer) + { + DPRINT1("ERROR: Couldn't allocate memory for data runs!\n"); + return STATUS_INSUFFICIENT_RESOURCES; } // Convert the data runs to a map control block

1 0

[ekohl] 72421: [LSASRV] Implement LsarSetSecurityObject.
by ekohl＠svn.reactos.org 21 Aug '16

21 Aug '16

Author: ekohl Date: Sun Aug 21 21:39:02 2016 New Revision: 72421 URL: http://svn.reactos.org/svn/reactos?rev=72421&view=rev Log: [LSASRV] Implement LsarSetSecurityObject. 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] Sun Aug 21 21:39:02 2016 @@ -13,6 +13,26 @@ static RTL_CRITICAL_SECTION PolicyHandleTableLock; +static +GENERIC_MAPPING +LsapPolicyMapping = {POLICY_READ, + POLICY_WRITE, + POLICY_EXECUTE, + POLICY_ALL_ACCESS}; + +static +GENERIC_MAPPING +LsapAccountMapping = {ACCOUNT_READ, + ACCOUNT_WRITE, + ACCOUNT_EXECUTE, + ACCOUNT_ALL_ACCESS}; + +static +GENERIC_MAPPING +LsapSecretMapping = {SECRET_READ, + SECRET_WRITE, + SECRET_EXECUTE, + SECRET_ALL_ACCESS}; /* FUNCTIONS ***************************************************************/ @@ -259,8 +279,142 @@ SECURITY_INFORMATION SecurityInformation, PLSAPR_SR_SECURITY_DESCRIPTOR SecurityDescriptor) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PLSA_DB_OBJECT DbObject = NULL; + ACCESS_MASK DesiredAccess = 0; + PSECURITY_DESCRIPTOR RelativeSd = NULL; + ULONG RelativeSdSize = 0; + HANDLE TokenHandle = NULL; + PGENERIC_MAPPING Mapping; + NTSTATUS Status; + + TRACE("LsarSetSecurityObject(%p %lx %p)\n", + ObjectHandle, SecurityInformation, SecurityDescriptor); + + if ((SecurityDescriptor == NULL) || + (SecurityDescriptor->SecurityDescriptor == NULL) || + !RtlValidSecurityDescriptor((PSECURITY_DESCRIPTOR)SecurityDescriptor->SecurityDescriptor)) + return ERROR_INVALID_PARAMETER; + + if (SecurityInformation == 0 || + SecurityInformation & ~(OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION + | DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION)) + return ERROR_INVALID_PARAMETER; + + if (SecurityInformation & SACL_SECURITY_INFORMATION) + DesiredAccess |= ACCESS_SYSTEM_SECURITY; + + if (SecurityInformation & DACL_SECURITY_INFORMATION) + DesiredAccess |= WRITE_DAC; + + if (SecurityInformation & (OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION)) + DesiredAccess |= WRITE_OWNER; + + if ((SecurityInformation & OWNER_SECURITY_INFORMATION) && + (((PISECURITY_DESCRIPTOR)SecurityDescriptor)->Owner == NULL)) + return ERROR_INVALID_PARAMETER; + + if ((SecurityInformation & GROUP_SECURITY_INFORMATION) && + (((PISECURITY_DESCRIPTOR)SecurityDescriptor)->Group == NULL)) + return ERROR_INVALID_PARAMETER; + + /* Validate the ObjectHandle */ + Status = LsapValidateDbObject(ObjectHandle, + LsaDbIgnoreObject, + DesiredAccess, + &DbObject); + if (!NT_SUCCESS(Status)) + { + ERR("LsapValidateDbObject failed (Status 0x%08lx)\n", Status); + return Status; + } + + /* Get the mapping for the object type */ + switch (DbObject->ObjectType) + { + case LsaDbPolicyObject: + Mapping = &LsapPolicyMapping; + break; + + case LsaDbAccountObject: + Mapping = &LsapAccountMapping; + break; + +// case LsaDbDomainObject: +// Mapping = &LsapDomainMapping; +// break; + + case LsaDbSecretObject: + Mapping = &LsapSecretMapping; + break; + + default: + return STATUS_INVALID_HANDLE; + } + + /* Get the size of the SD */ + Status = LsapGetObjectAttribute(DbObject, + L"SecDesc", + NULL, + &RelativeSdSize); + if (!NT_SUCCESS(Status)) + return Status; + + /* Allocate a buffer for the SD */ + RelativeSd = RtlAllocateHeap(RtlGetProcessHeap(), 0, RelativeSdSize); + if (RelativeSd == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + /* Get the SD */ + Status = LsapGetObjectAttribute(DbObject, + L"SecDesc", + RelativeSd, + &RelativeSdSize); + if (!NT_SUCCESS(Status)) + goto done; + +#if 0 + RpcImpersonateClient(NULL); + + Status = NtOpenThreadToken(NtCurrentThread(), + 8, + TRUE, + &hToken); + if (!NT_SUCCESS(Status)) + goto done; + + RpcRevertToSelf(); +#endif + + /* Build the new security descriptor */ + Status = RtlSetSecurityObject(SecurityInformation, + (PSECURITY_DESCRIPTOR)SecurityDescriptor->SecurityDescriptor, + &RelativeSd, + Mapping, + TokenHandle); + if (!NT_SUCCESS(Status)) + { + ERR("RtlSetSecurityObject failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Set the modified SD */ + Status = LsapSetObjectAttribute(DbObject, + L"SecDesc", + RelativeSd, + RtlLengthSecurityDescriptor(RelativeSd)); + if (!NT_SUCCESS(Status)) + { + ERR("LsapSetObjectAttribute failed (Status 0x%08lx)\n", Status); + } + +done: + if (TokenHandle != NULL) + NtClose(TokenHandle); + + if (RelativeSd != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, RelativeSd); + + return Status; }

1 0

[ekohl] 72420: [INCLUDE] Add the RtlLengthSecurityDescriptor prototype to the NDK.
by ekohl＠svn.reactos.org 21 Aug '16

21 Aug '16

Author: ekohl Date: Sun Aug 21 21:31:40 2016 New Revision: 72420 URL: http://svn.reactos.org/svn/reactos?rev=72420&view=rev Log: [INCLUDE] Add the RtlLengthSecurityDescriptor prototype to the NDK. Modified: trunk/reactos/base/system/services/config.c trunk/reactos/sdk/include/ndk/rtlfuncs.h Modified: trunk/reactos/base/system/services/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/confi… ============================================================================== --- trunk/reactos/base/system/services/config.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/config.c [iso-8859-1] Sun Aug 21 21:31:40 2016 @@ -15,10 +15,6 @@ #define NDEBUG #include <debug.h> -ULONG -NTAPI -RtlLengthSecurityDescriptor( - _In_ PSECURITY_DESCRIPTOR SecurityDescriptor); /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/sdk/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ndk/rtlfuncs.h… ============================================================================== --- trunk/reactos/sdk/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ndk/rtlfuncs.h [iso-8859-1] Sun Aug 21 21:31:40 2016 @@ -1468,6 +1468,13 @@ ULONG NTAPI RtlLengthRequiredSid(IN ULONG SubAuthorityCount); + +_IRQL_requires_max_(APC_LEVEL) +NTSYSAPI +ULONG +NTAPI +RtlLengthSecurityDescriptor( + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor); NTSYSAPI ULONG

1 0

[ekohl] 72419: [LSASRV] Implement LsaIFree_LSAPR_TRANSLATED_SIDS.
by ekohl＠svn.reactos.org 21 Aug '16

21 Aug '16

Author: ekohl Date: Sun Aug 21 21:24:10 2016 New Revision: 72419 URL: http://svn.reactos.org/svn/reactos?rev=72419&view=rev Log: [LSASRV] Implement LsaIFree_LSAPR_TRANSLATED_SIDS. Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.c trunk/reactos/dll/win32/lsasrv/lsasrv.spec Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] Sun Aug 21 21:24:10 2016 @@ -216,7 +216,7 @@ VOID NTAPI LsaIFree_LSAPR_SR_SECURITY_DESCRIPTOR( - PLSAPR_SR_SECURITY_DESCRIPTOR Ptr) + IN PLSAPR_SR_SECURITY_DESCRIPTOR Ptr) { if (Ptr != NULL) { @@ -231,7 +231,7 @@ VOID NTAPI LsaIFree_LSAPR_TRANSLATED_NAMES( - PLSAPR_TRANSLATED_NAMES Ptr) + IN PLSAPR_TRANSLATED_NAMES Ptr) { ULONG i; @@ -247,6 +247,21 @@ midl_user_free(Ptr->Names); } + + midl_user_free(Ptr); + } +} + + +VOID +NTAPI +LsaIFree_LSAPR_TRANSLATED_SIDS( + IN PLSAPR_TRANSLATED_SIDS Ptr) +{ + if (Ptr != NULL) + { + if (Ptr->Sids != NULL) + midl_user_free(Ptr->Sids); midl_user_free(Ptr); } Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.sp… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.spec [iso-8859-1] Sun Aug 21 21:24:10 2016 @@ -40,7 +40,7 @@ @ stdcall LsaIFree_LSAPR_REFERENCED_DOMAIN_LIST(ptr) @ stdcall LsaIFree_LSAPR_SR_SECURITY_DESCRIPTOR(ptr) @ stdcall LsaIFree_LSAPR_TRANSLATED_NAMES(ptr) - @ stub LsaIFree_LSAPR_TRANSLATED_SIDS + @ stdcall LsaIFree_LSAPR_TRANSLATED_SIDS(ptr) @ stub LsaIFree_LSAPR_TRUSTED_DOMAIN_INFO @ stub LsaIFree_LSAPR_TRUSTED_ENUM_BUFFER @ stub LsaIFree_LSAPR_TRUSTED_ENUM_BUFFER_EX

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2016