Ros-diffs August 2016

ros-diffs@reactos.org

20 participants
462 discussions

[hbelusca] 72148: [APITESTS]: Add a test for advapi32!IsTextUnicode. CORE-11803

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Aug 7 16:35:56 2016 New Revision: 72148 URL: http://svn.reactos.org/svn/reactos?rev=72148&view=rev Log: [APITESTS]: Add a test for advapi32!IsTextUnicode. CORE-11803 Added: trunk/rostests/apitests/advapi32/IsTextUnicode.c (with props) Modified: trunk/rostests/apitests/advapi32/CMakeLists.txt trunk/rostests/apitests/advapi32/testlist.c Modified: trunk/rostests/apitests/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/CMakeLi… ============================================================================== --- trunk/rostests/apitests/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/CMakeLists.txt [iso-8859-1] Sun Aug 7 16:35:56 2016 @@ -3,6 +3,7 @@ CreateService.c DuplicateTokenEx.c HKEY_CLASSES_ROOT.c + IsTextUnicode.c LockDatabase.c QueryServiceConfig2.c RegEnumValueW.c Added: trunk/rostests/apitests/advapi32/IsTextUnicode.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/IsTextU… ============================================================================== --- trunk/rostests/apitests/advapi32/IsTextUnicode.c (added) +++ trunk/rostests/apitests/advapi32/IsTextUnicode.c [iso-8859-1] Sun Aug 7 16:35:56 2016 @@ -0,0 +1,96 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Tests for (Rtl)IsTextUnicode. + * PROGRAMMER: Hermes Belusca-Maito + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <winbase.h> + +START_TEST(IsTextUnicode) +{ +#define INVALID_FLAG 0xFFFFFFFF + +#define NEW_TEST(Buffer, Flags, ResultFlags, Success) \ + { (PVOID)(Buffer), sizeof((Buffer)), (Flags), (ResultFlags), (Success) } + + static struct + { + /* Input */ + PVOID Buffer; + INT Size; + INT Flags; + + /* Output */ + INT ResultFlags; + BOOL Success; + } Tests[] = + { + /* ANSI string */ + + // 0 + NEW_TEST("ANSI string", IS_TEXT_UNICODE_ASCII16, 0, FALSE), + NEW_TEST("ANSI string", IS_TEXT_UNICODE_STATISTICS, 0, FALSE), + NEW_TEST("ANSI string", INVALID_FLAG, 0, FALSE), + + /* UNICODE strings */ + + // 3 + NEW_TEST(L"a", IS_TEXT_UNICODE_ASCII16, IS_TEXT_UNICODE_ASCII16, TRUE), + NEW_TEST(L"a", IS_TEXT_UNICODE_UNICODE_MASK, IS_TEXT_UNICODE_STATISTICS | IS_TEXT_UNICODE_ASCII16, TRUE), + NEW_TEST(L"a", IS_TEXT_UNICODE_STATISTICS, IS_TEXT_UNICODE_STATISTICS, TRUE), + NEW_TEST(L"a", INVALID_FLAG, 0, TRUE), + + // 7 + NEW_TEST(L"UNICODE String 0", IS_TEXT_UNICODE_ASCII16, 0, FALSE), + NEW_TEST(L"UNICODE String 0", IS_TEXT_UNICODE_UNICODE_MASK, IS_TEXT_UNICODE_CONTROLS | IS_TEXT_UNICODE_STATISTICS, TRUE), + NEW_TEST(L"UNICODE String 0", IS_TEXT_UNICODE_STATISTICS, IS_TEXT_UNICODE_STATISTICS, TRUE), + NEW_TEST(L"UNICODE String 0", INVALID_FLAG, 0, TRUE), + + // 11 + NEW_TEST(L"\xFEFF" L"UNICODE String 1", IS_TEXT_UNICODE_ASCII16, 0, FALSE), + NEW_TEST(L"\xFEFF" L"UNICODE String 1", IS_TEXT_UNICODE_UNICODE_MASK, IS_TEXT_UNICODE_SIGNATURE | IS_TEXT_UNICODE_CONTROLS, TRUE), + NEW_TEST(L"\xFEFF" L"UNICODE String 1", IS_TEXT_UNICODE_STATISTICS, 0, FALSE), + NEW_TEST(L"\xFEFF" L"UNICODE String 1", INVALID_FLAG, 0, TRUE), + + // 15 + NEW_TEST(L"\xFFFE" L"UNICODE String 2", IS_TEXT_UNICODE_ASCII16, 0, FALSE), + NEW_TEST(L"\xFFFE" L"UNICODE String 2", IS_TEXT_UNICODE_UNICODE_MASK, IS_TEXT_UNICODE_CONTROLS, TRUE), + NEW_TEST(L"\xFFFE" L"UNICODE String 2", IS_TEXT_UNICODE_STATISTICS, 0, FALSE), + NEW_TEST(L"\xFFFE" L"UNICODE String 2", INVALID_FLAG, 0, FALSE), + + // 19 + NEW_TEST(L"UNICODE String 3 ÐÑÐ¸Ð²ÐµÑ!", IS_TEXT_UNICODE_ASCII16, 0, FALSE), + NEW_TEST(L"UNICODE String 3 ÐÑÐ¸Ð²ÐµÑ!", IS_TEXT_UNICODE_UNICODE_MASK, IS_TEXT_UNICODE_CONTROLS | IS_TEXT_UNICODE_STATISTICS, TRUE), + NEW_TEST(L"UNICODE String 3 ÐÑÐ¸Ð²ÐµÑ!", IS_TEXT_UNICODE_STATISTICS, IS_TEXT_UNICODE_STATISTICS, TRUE), + NEW_TEST(L"UNICODE String 3 ÐÑÐ¸Ð²ÐµÑ!", INVALID_FLAG, 0, TRUE), + + // 23 + NEW_TEST(L"\xFEFF" L"UNICODE String 4 ÐÑÐ¸Ð²ÐµÑ!", IS_TEXT_UNICODE_ASCII16, 0, FALSE), + NEW_TEST(L"\xFEFF" L"UNICODE String 4 ÐÑÐ¸Ð²ÐµÑ!", IS_TEXT_UNICODE_UNICODE_MASK, IS_TEXT_UNICODE_SIGNATURE | IS_TEXT_UNICODE_CONTROLS, TRUE), + NEW_TEST(L"\xFEFF" L"UNICODE String 4 ÐÑÐ¸Ð²ÐµÑ!", IS_TEXT_UNICODE_STATISTICS, 0, FALSE), + NEW_TEST(L"\xFEFF" L"UNICODE String 4 ÐÑÐ¸Ð²ÐµÑ!", INVALID_FLAG, 0, TRUE), + + // 27 + NEW_TEST(L"\xFFFE" L"UNICODE String 5 ÐÑÐ¸Ð²ÐµÑ!", IS_TEXT_UNICODE_ASCII16, 0, FALSE), + NEW_TEST(L"\xFFFE" L"UNICODE String 5 ÐÑÐ¸Ð²ÐµÑ!", IS_TEXT_UNICODE_UNICODE_MASK, IS_TEXT_UNICODE_CONTROLS, TRUE), + NEW_TEST(L"\xFFFE" L"UNICODE String 5 ÐÑÐ¸Ð²ÐµÑ!", IS_TEXT_UNICODE_STATISTICS, 0, FALSE), + NEW_TEST(L"\xFFFE" L"UNICODE String 5 ÐÑÐ¸Ð²ÐµÑ!", INVALID_FLAG, 0, FALSE), + }; + + UINT i; + BOOL Success; + INT Result; + + for (i = 0; i < ARRAYSIZE(Tests); ++i) + { + Result = Tests[i].Flags; + Success = IsTextUnicode(Tests[i].Buffer, Tests[i].Size, ((Result != INVALID_FLAG) ? &Result : NULL)); + ok(Success == Tests[i].Success, "IsTextUnicode(%u) returned 0x%x, expected %s\n", i, Success, (Tests[i].Success ? "TRUE" : "FALSE")); + if (Result != INVALID_FLAG) + ok(Result == Tests[i].ResultFlags, "IsTextUnicode(%u) Result returned 0x%x, expected 0x%x\n", i, Result, Tests[i].ResultFlags); + } +} Propchange: trunk/rostests/apitests/advapi32/IsTextUnicode.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/advapi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/testlis… ============================================================================== --- trunk/rostests/apitests/advapi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/testlist.c [iso-8859-1] Sun Aug 7 16:35:56 2016 @@ -6,6 +6,7 @@ extern void func_CreateService(void); extern void func_DuplicateTokenEx(void); extern void func_HKEY_CLASSES_ROOT(void); +extern void func_IsTextUnicode(void); extern void func_LockDatabase(void); extern void func_QueryServiceConfig2(void); extern void func_RegEnumValueW(void); @@ -18,6 +19,7 @@ { "CreateService", func_CreateService }, { "DuplicateTokenEx", func_DuplicateTokenEx }, { "HKEY_CLASSES_ROOT", func_HKEY_CLASSES_ROOT }, + { "IsTextUnicode" , func_IsTextUnicode }, { "LockDatabase" , func_LockDatabase }, { "QueryServiceConfig2", func_QueryServiceConfig2 }, { "RegEnumValueW", func_RegEnumValueW },

8 years, 2 months

[tfaber] 72147: [FASTFAT] - Update FCB hashes after changing the path name CORE-11377

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Aug 7 14:24:45 2016 New Revision: 72147 URL: http://svn.reactos.org/svn/reactos?rev=72147&view=rev Log: [FASTFAT] - Update FCB hashes after changing the path name CORE-11377 Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] Sun Aug 7 14:24:45 2016 @@ -347,6 +347,7 @@ ULONG Index; ULONG ShortIndex; + ASSERT(pFCB->Hash.Hash == vfatNameHash(0, &pFCB->PathNameU)); Index = pFCB->Hash.Hash % pVCB->HashTableSize; ShortIndex = pFCB->ShortHash.Hash % pVCB->HashTableSize; @@ -376,6 +377,7 @@ RtlCopyMemory(&Fcb->entry, &DirContext->DirEntry, sizeof (DIR_ENTRY)); RtlCopyUnicodeString(&Fcb->ShortNameU, &DirContext->ShortNameU); + Fcb->Hash.Hash = vfatNameHash(0, &Fcb->PathNameU); if (Vcb->Flags & VCB_IS_FATX) { Fcb->ShortHash.Hash = Fcb->Hash.Hash; @@ -457,7 +459,7 @@ Fcb->PathNameBuffer = Fcb->PathNameU.Buffer; Fcb->DirNameU.Buffer = Fcb->PathNameU.Buffer; vfatSplitPathName(&Fcb->PathNameU, &Fcb->DirNameU, &Fcb->LongNameU); - + Fcb->Hash.Hash = vfatNameHash(0, &Fcb->PathNameU); if (pVCB->Flags & VCB_IS_FATX) { Fcb->ShortHash.Hash = Fcb->Hash.Hash;

8 years, 2 months

[dchapyshev] 72146: [INPUT] - Create an empty project for re-working keyboard layouts management

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sun Aug 7 13:07:23 2016 New Revision: 72146 URL: http://svn.reactos.org/svn/reactos?rev=72146&view=rev Log: [INPUT] - Create an empty project for re-working keyboard layouts management Added: trunk/reactos/dll/cpl/input_new/ trunk/reactos/dll/cpl/input_new/CMakeLists.txt (with props) trunk/reactos/dll/cpl/input_new/input.c (with props) trunk/reactos/dll/cpl/input_new/input.h (with props) trunk/reactos/dll/cpl/input_new/input.rc (with props) trunk/reactos/dll/cpl/input_new/input.spec (with props) trunk/reactos/dll/cpl/input_new/lang/ trunk/reactos/dll/cpl/input_new/lang/bg-BG.rc (with props) trunk/reactos/dll/cpl/input_new/lang/cs-CZ.rc (with props) trunk/reactos/dll/cpl/input_new/lang/de-DE.rc (with props) trunk/reactos/dll/cpl/input_new/lang/el-GR.rc (with props) trunk/reactos/dll/cpl/input_new/lang/en-US.rc (with props) trunk/reactos/dll/cpl/input_new/lang/es-ES.rc (with props) trunk/reactos/dll/cpl/input_new/lang/fr-FR.rc (with props) trunk/reactos/dll/cpl/input_new/lang/he-IL.rc (with props) trunk/reactos/dll/cpl/input_new/lang/it-IT.rc (with props) trunk/reactos/dll/cpl/input_new/lang/no-NO.rc (with props) trunk/reactos/dll/cpl/input_new/lang/pl-PL.rc (with props) trunk/reactos/dll/cpl/input_new/lang/pt-BR.rc (with props) trunk/reactos/dll/cpl/input_new/lang/ro-RO.rc (with props) trunk/reactos/dll/cpl/input_new/lang/ru-RU.rc (with props) trunk/reactos/dll/cpl/input_new/lang/sk-SK.rc (with props) trunk/reactos/dll/cpl/input_new/lang/sq-AL.rc (with props) trunk/reactos/dll/cpl/input_new/lang/tr-TR.rc (with props) trunk/reactos/dll/cpl/input_new/lang/uk-UA.rc (with props) trunk/reactos/dll/cpl/input_new/lang/zh-CN.rc (with props) trunk/reactos/dll/cpl/input_new/lang/zh-TW.rc (with props) trunk/reactos/dll/cpl/input_new/resource.h (with props) trunk/reactos/dll/cpl/input_new/resources/ trunk/reactos/dll/cpl/input_new/resources/keyboard-shortcuts.ico (with props) Modified: trunk/reactos/dll/cpl/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/cpl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/CMakeLists.txt?rev… Added: trunk/reactos/dll/cpl/input_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/CMakeLis… Added: trunk/reactos/dll/cpl/input_new/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/input.c?… Added: trunk/reactos/dll/cpl/input_new/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/input.h?… Added: trunk/reactos/dll/cpl/input_new/input.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/input.rc… Added: trunk/reactos/dll/cpl/input_new/input.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/input.sp… Added: trunk/reactos/dll/cpl/input_new/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/lang/bg-… Added: trunk/reactos/dll/cpl/input_new/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/lang/cs-… Added: trunk/reactos/dll/cpl/input_new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/lang/de-… Added: trunk/reactos/dll/cpl/input_new/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/lang/el-… Added: trunk/reactos/dll/cpl/input_new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/lang/en-… Added: trunk/reactos/dll/cpl/input_new/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/lang/es-… Added: trunk/reactos/dll/cpl/input_new/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/lang/fr-… Added: trunk/reactos/dll/cpl/input_new/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/lang/he-… Added: trunk/reactos/dll/cpl/input_new/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/lang/it-… Added: trunk/reactos/dll/cpl/input_new/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/lang/no-… Added: trunk/reactos/dll/cpl/input_new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/lang/pl-… Added: trunk/reactos/dll/cpl/input_new/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/lang/pt-… Added: trunk/reactos/dll/cpl/input_new/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/lang/ro-… Added: trunk/reactos/dll/cpl/input_new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/lang/ru-… Added: trunk/reactos/dll/cpl/input_new/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/lang/sk-… Added: trunk/reactos/dll/cpl/input_new/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/lang/sq-… Added: trunk/reactos/dll/cpl/input_new/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/lang/tr-… Added: trunk/reactos/dll/cpl/input_new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/lang/uk-… Added: trunk/reactos/dll/cpl/input_new/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/lang/zh-… Added: trunk/reactos/dll/cpl/input_new/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/lang/zh-… Added: trunk/reactos/dll/cpl/input_new/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/resource… Added: trunk/reactos/dll/cpl/input_new/resources/keyboard-shortcuts.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/resource…

8 years, 2 months

[pschweitzer] 72145: [FASTFAT] After renaming a directory, rename any children FCB that would still exist in the FSD. This will allow next directory opening to properly work and open correct data. ...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Aug 7 12:29:48 2016 New Revision: 72145 URL: http://svn.reactos.org/svn/reactos?rev=72145&view=rev Log: [FASTFAT] After renaming a directory, rename any children FCB that would still exist in the FSD. This will allow next directory opening to properly work and open correct data. This defeats corruption on directory renaming. Unfortunately, this solution is not ideal and our driver should be reworked so that it quits using a hash table and it quits storing the whole path in the FCBs. Deep thanks to Wim Hueskes and Thomas Faber for their help debugging the issue! CORE-11377 Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c trunk/reactos/drivers/filesystems/fastfat/finfo.c trunk/reactos/drivers/filesystems/fastfat/vfat.h Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] Sun Aug 7 12:29:48 2016 @@ -425,6 +425,53 @@ Fcb->RFCB.FileSize.QuadPart = Size; Fcb->RFCB.ValidDataLength.QuadPart = Size; Fcb->RFCB.AllocationSize.QuadPart = ROUND_UP_64(Size, Vcb->FatInfo.BytesPerCluster); +} + +NTSTATUS +vfatSetFCBNewDirName( + PDEVICE_EXTENSION pVCB, + PVFATFCB Fcb, + PVFATFCB ParentFcb) +{ + NTSTATUS Status; + UNICODE_STRING NewNameU; + + /* Get full path name */ + Status = vfatMakeFullName(ParentFcb, &Fcb->LongNameU, &Fcb->ShortNameU, &NewNameU); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Delete old name */ + if (Fcb->PathNameBuffer) + { + ExFreePoolWithTag(Fcb->PathNameBuffer, TAG_FCB); + } + Fcb->PathNameU = NewNameU; + + /* Delete from table */ + vfatDelFCBFromTable(pVCB, Fcb); + + /* Split it properly */ + Fcb->PathNameBuffer = Fcb->PathNameU.Buffer; + Fcb->DirNameU.Buffer = Fcb->PathNameU.Buffer; + vfatSplitPathName(&Fcb->PathNameU, &Fcb->DirNameU, &Fcb->LongNameU); + + if (pVCB->Flags & VCB_IS_FATX) + { + Fcb->ShortHash.Hash = Fcb->Hash.Hash; + } + else + { + Fcb->ShortHash.Hash = vfatNameHash(0, &Fcb->DirNameU); + Fcb->ShortHash.Hash = vfatNameHash(Fcb->ShortHash.Hash, &Fcb->ShortNameU); + } + + vfatAddFCBToTable(pVCB, Fcb); + vfatReleaseFCB(pVCB, ParentFcb); + + return STATUS_SUCCESS; } NTSTATUS Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Sun Aug 7 12:29:48 2016 @@ -487,6 +487,36 @@ return FALSE; } +static +VOID +VfatRenameChildFCB( + PDEVICE_EXTENSION DeviceExt, + PVFATFCB FCB) +{ + PLIST_ENTRY Entry; + PVFATFCB Child; + + if (IsListEmpty(&FCB->ParentListHead)) + return; + + for (Entry = FCB->ParentListHead.Flink; Entry != &FCB->ParentListHead; Entry = Entry->Flink) + { + NTSTATUS Status; + + Child = CONTAINING_RECORD(Entry, VFATFCB, ParentListEntry); + DPRINT("Found %wZ with still %lu references (parent: %lu)!\n", &Child->PathNameU, Child->RefCount, FCB->RefCount); + + Status = vfatSetFCBNewDirName(DeviceExt, Child, FCB); + if (!NT_SUCCESS(Status)) + continue; + + if (vfatFCBIsDirectory(Child)) + { + VfatRenameChildFCB(DeviceExt, Child); + } + } +} + /* * FUNCTION: Set the file name information */ @@ -911,6 +941,11 @@ } } + if (NT_SUCCESS(Status) && vfatFCBIsDirectory(FCB)) + { + VfatRenameChildFCB(DeviceExt, FCB); + } + ASSERT(OldReferences == OldParent->RefCount + 1); // removed file ASSERT(NewReferences == ParentFCB->RefCount - 1); // new file Cleanup: Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] Sun Aug 7 12:29:48 2016 @@ -818,6 +818,12 @@ PUNICODE_STRING pFileNameU); NTSTATUS +vfatSetFCBNewDirName( + PDEVICE_EXTENSION pVCB, + PVFATFCB Fcb, + PVFATFCB ParentFcb); + +NTSTATUS vfatUpdateFCB( PDEVICE_EXTENSION pVCB, PVFATFCB Fcb,

8 years, 2 months

[tfaber] 72144: [NTOS:CC] - Define CcPfEnablePrefetcher CORE-11799

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Aug 7 07:00:56 2016 New Revision: 72144 URL: http://svn.reactos.org/svn/reactos?rev=72144&view=rev Log: [NTOS:CC] - Define CcPfEnablePrefetcher CORE-11799 Modified: trunk/reactos/ntoskrnl/cc/cacheman.c Modified: trunk/reactos/ntoskrnl/cc/cacheman.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/cacheman.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cc/cacheman.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/cacheman.c [iso-8859-1] Sun Aug 7 07:00:56 2016 @@ -13,6 +13,7 @@ #define NDEBUG #include <debug.h> +BOOLEAN CcPfEnablePrefetcher; PFSN_PREFETCHER_GLOBALS CcPfGlobals; /* FUNCTIONS *****************************************************************/

8 years, 2 months

[dchapyshev] 72143: [KBSWITCH] - Use strsafe functions - Use Shell Hooks in dll for detecting keyboard layout switching - Fix bug in loading kbsdll * Detection switch keyboard layout is now working...

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Aug 6 20:48:33 2016 New Revision: 72143 URL: http://svn.reactos.org/svn/reactos?rev=72143&view=rev Log: [KBSWITCH] - Use strsafe functions - Use Shell Hooks in dll for detecting keyboard layout switching - Fix bug in loading kbsdll * Detection switch keyboard layout is now working in Windovs, but does not work in ReactOS (WH_SHELL not work in win32k) Modified: trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.c trunk/reactos/base/applications/kbswitch/kbswitch.c trunk/reactos/base/applications/kbswitch/kbswitch.h Modified: trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.c [iso-8859-1] Sat Aug 6 20:48:33 2016 @@ -7,48 +7,15 @@ #include "../kbswitch.h" -HHOOK hKeyboardHook, hLangHook, hWinHook; -HINSTANCE hInstance; -HWND hKbSwitchWnd; +HHOOK hWinHook = NULL; +HHOOK hShellHook = NULL; +HINSTANCE hInstance = NULL; +HWND hKbSwitchWnd = NULL; static VOID SendMessageToMainWnd(UINT Msg, WPARAM wParam, LPARAM lParam) { PostMessage(hKbSwitchWnd, Msg, wParam, lParam); -} - -/* Not used yet */ -LRESULT CALLBACK -KeyboardHookProc(int code, WPARAM wParam, LPARAM lParam) -{ - return CallNextHookEx(hKeyboardHook, code, wParam, lParam); -} - -LRESULT CALLBACK -LangHookProc(int code, WPARAM wParam, LPARAM lParam) -{ - PMSG msg; - msg = (PMSG) lParam; - - switch (msg->message) - { - case WM_INPUTLANGCHANGEREQUEST: - { - SendMessageToMainWnd(WM_LANG_CHANGED, wParam, msg->lParam); - } - break; - - case WM_HOTKEY: - { - if (msg->hwnd) - { - SendMessageToMainWnd(WM_LOAD_LAYOUT, (WPARAM)msg->hwnd, msg->lParam); - } - } - break; - } - - return CallNextHookEx(hLangHook, code, wParam, lParam); } LRESULT CALLBACK @@ -69,18 +36,6 @@ } } break; - - case HCBT_CREATEWND: - { - RegisterHotKey((HWND)wParam, id, MOD_ALT, VK_F10); - } - break; - - case HCBT_DESTROYWND: - { - UnregisterHotKey((HWND)wParam, id); - } - break; } GlobalDeleteAtom(id); @@ -88,25 +43,40 @@ return CallNextHookEx(hWinHook, code, wParam, lParam); } +LRESULT CALLBACK +ShellHookProc(int code, WPARAM wParam, LPARAM lParam) +{ + switch (code) + { + case HSHELL_LANGUAGE: + { + SendMessageToMainWnd(WM_LANG_CHANGED, wParam, lParam); + } + break; + } + + return CallNextHookEx(hShellHook, code, wParam, lParam); +} + BOOL WINAPI KbSwitchSetHooks(VOID) { - hKeyboardHook = SetWindowsHookEx(WH_KEYBOARD, KeyboardHookProc, hInstance, 0); - hLangHook = SetWindowsHookEx(WH_GETMESSAGE, LangHookProc, hInstance, 0); hWinHook = SetWindowsHookEx(WH_CBT, WinHookProc, hInstance, 0); + hShellHook = SetWindowsHookEx(WH_SHELL, ShellHookProc, hInstance, 0); - if ((hKeyboardHook)&&(hLangHook)&&(hWinHook)) - return TRUE; - else + if (!hWinHook || !hShellHook) + { return FALSE; + } + + return TRUE; } VOID WINAPI KbSwitchDeleteHooks(VOID) { - if (hKeyboardHook) UnhookWindowsHookEx(hKeyboardHook); - if (hLangHook) UnhookWindowsHookEx(hLangHook); if (hWinHook) UnhookWindowsHookEx(hWinHook); + if (hShellHook) UnhookWindowsHookEx(hShellHook); } BOOL WINAPI @@ -117,10 +87,15 @@ switch (dwReason) { case DLL_PROCESS_ATTACH: + { hInstance = hinstDLL; hKbSwitchWnd = FindWindow(szKbSwitcherName, NULL); - if (!hKbSwitchWnd) return FALSE; - break; + if (!hKbSwitchWnd) + { + return FALSE; + } + } + break; } return TRUE; Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Sat Aug 6 20:48:33 2016 @@ -10,15 +10,15 @@ #define WM_NOTIFYICONMSG (WM_USER + 248) -PROC KbSwitchSetHooks = NULL; -PROC KbSwitchDeleteHooks = NULL; +PKBSWITCHSETHOOKS KbSwitchSetHooks = NULL; +PKBSWITCHDELETEHOOKS KbSwitchDeleteHooks = NULL; static BOOL -GetLayoutID(LPTSTR szLayoutNum, LPTSTR szLCID); +GetLayoutID(LPTSTR szLayoutNum, LPTSTR szLCID, SIZE_T LCIDLength); static BOOL -GetLayoutName(LPTSTR szLayoutNum, LPTSTR szName); +GetLayoutName(LPTSTR szLayoutNum, LPTSTR szName, SIZE_T NameLength); HINSTANCE hInst; HANDLE hProcessHeap; @@ -41,9 +41,9 @@ if (GetLocaleInfo(lId, LOCALE_SISO639LANGNAME, szBuf, - sizeof(szBuf) / sizeof(TCHAR)) == 0) - { - lstrcpy(szBuf, _T("??")); + ARRAYSIZE(szBuf)) == 0) + { + StringCchCopy(szBuf, ARRAYSIZE(szBuf), _T("??")); } hdcsrc = GetDC(NULL); @@ -103,9 +103,10 @@ TCHAR szLCID[CCH_LAYOUT_ID + 1]; TCHAR szName[MAX_PATH]; - GetLayoutID(_T("1"), szLCID); - GetLayoutName(_T("1"), szName); - + GetLayoutID(_T("1"), szLCID, ARRAYSIZE(szLCID)); + GetLayoutName(_T("1"), szName, ARRAYSIZE(szName)); + + memset(&tnid, 0, sizeof(tnid)); tnid.cbSize = sizeof(NOTIFYICONDATA); tnid.hWnd = hwnd; tnid.uID = 1; @@ -113,7 +114,7 @@ tnid.uCallbackMessage = WM_NOTIFYICONMSG; tnid.hIcon = CreateTrayIcon(szLCID); - lstrcpyn(tnid.szTip, szName, sizeof(tnid.szTip) / sizeof(TCHAR)); + StringCchCopy(tnid.szTip, ARRAYSIZE(tnid.szTip), szName); Shell_NotifyIcon(NIM_ADD, &tnid); } @@ -123,6 +124,7 @@ { NOTIFYICONDATA tnid; + memset(&tnid, 0, sizeof(tnid)); tnid.cbSize = sizeof(NOTIFYICONDATA); tnid.hWnd = hwnd; tnid.uID = 1; @@ -135,6 +137,7 @@ { NOTIFYICONDATA tnid; + memset(&tnid, 0, sizeof(tnid)); tnid.cbSize = sizeof(NOTIFYICONDATA); tnid.hWnd = hwnd; tnid.uID = 1; @@ -142,13 +145,13 @@ tnid.uCallbackMessage = WM_NOTIFYICONMSG; tnid.hIcon = CreateTrayIcon(szLCID); - lstrcpyn(tnid.szTip, szName, sizeof(tnid.szTip) / sizeof(TCHAR)); + StringCchCopy(tnid.szTip, ARRAYSIZE(tnid.szTip), szName); Shell_NotifyIcon(NIM_MODIFY, &tnid); } static BOOL -GetLayoutID(LPTSTR szLayoutNum, LPTSTR szLCID) +GetLayoutID(LPTSTR szLayoutNum, LPTSTR szLCID, SIZE_T LCIDLength) { DWORD dwBufLen; DWORD dwRes; @@ -178,7 +181,7 @@ if (RegQueryValueEx(hKey, szTempLCID, NULL, NULL, (LPBYTE)szLCID, &dwBufLen) != ERROR_SUCCESS) { // No substitute found, then use the old LCID - lstrcpy(szLCID, szTempLCID); + StringCchCopy(szLCID, LCIDLength, szTempLCID); } RegCloseKey(hKey); @@ -186,24 +189,24 @@ else { // Substitutes key couldn't be opened, so use the old LCID - lstrcpy(szLCID, szTempLCID); + StringCchCopy(szLCID, LCIDLength, szTempLCID); } return TRUE; } VOID -GetLayoutIDByHkl(HKL hKl, LPTSTR szLayoutID) +GetLayoutIDByHkl(HKL hKl, LPTSTR szLayoutID, SIZE_T LayoutIDLength) { /* FIXME!!! This way of getting layout ID incorrect! This will not work correctly for 0001040a, 00010410, etc */ - wsprintf(szLayoutID, _T("%08x"), LOWORD(hKl)); + StringCchPrintf(szLayoutID, LayoutIDLength, _T("%08x"), LOWORD(hKl)); } static BOOL -GetLayoutName(LPTSTR szLayoutNum, LPTSTR szName) +GetLayoutName(LPTSTR szLayoutNum, LPTSTR szName, SIZE_T NameLength) { HKEY hKey; DWORD dwBufLen; @@ -212,20 +215,22 @@ HANDLE hLib; UINT i, j, k; - if(!GetLayoutID(szLayoutNum, szLCID)) + if (!GetLayoutID(szLayoutNum, szLCID, ARRAYSIZE(szLCID))) return FALSE; - wsprintf(szBuf, _T("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\%s"), szLCID); + StringCchPrintf(szBuf, ARRAYSIZE(szBuf), _T("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\%s"), szLCID); if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, (LPCTSTR)szBuf, 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) { - dwBufLen = sizeof(szBuf); + dwBufLen = sizeof(szDispName); if (RegQueryValueEx(hKey, _T("Layout Display Name"), NULL, NULL, (LPBYTE)szDispName, &dwBufLen) == ERROR_SUCCESS) { if (szDispName[0] == '@') { - for (i = 0; i < _tcslen(szDispName); i++) + size_t len = _tcslen(szDispName); + + for (i = 0; i < len; i++) { if ((szDispName[i] == ',') && (szDispName[i + 1] == '-')) { @@ -239,14 +244,14 @@ else szDispName[i] = szDispName[i + 1]; } - if (ExpandEnvironmentStrings(szDispName, szPath, MAX_PATH)) + if (ExpandEnvironmentStrings(szDispName, szPath, ARRAYSIZE(szPath))) { hLib = LoadLibrary(szPath); if (hLib) { - if (LoadString(hLib, _ttoi(szIndex), szPath, sizeof(szPath) / sizeof(TCHAR)) != 0) + if (LoadString(hLib, _ttoi(szIndex), szPath, ARRAYSIZE(szPath)) != 0) { - _tcscpy(szName, szPath); + StringCchCopy(szName, NameLength, szPath); RegCloseKey(hKey); FreeLibrary(hLib); return TRUE; @@ -257,7 +262,7 @@ } } - dwBufLen = sizeof(szBuf); + dwBufLen = NameLength * sizeof(TCHAR); if (RegQueryValueEx(hKey, _T("Layout Text"), NULL, NULL, (LPBYTE)szName, &dwBufLen) == ERROR_SUCCESS) { @@ -287,10 +292,10 @@ TCHAR szLangName[MAX_PATH]; _ultot(uLayoutNum, szLayoutNum, 10); - GetLayoutID(szLayoutNum, szLCID); + GetLayoutID(szLayoutNum, szLCID, ARRAYSIZE(szLCID)); // Switch to the new keyboard layout - GetLocaleInfo((LANGID)_tcstoul(szLCID, NULL, 16), LOCALE_SLANGUAGE, (LPTSTR)szLangName, sizeof(szLangName) / sizeof(TCHAR)); + GetLocaleInfo((LANGID)_tcstoul(szLCID, NULL, 16), LOCALE_SLANGUAGE, (LPTSTR)szLangName, ARRAYSIZE(szLangName)); UpdateTrayIcon(hwnd, szLCID, szLangName); hKl = LoadKeyboardLayout(szLCID, KLF_ACTIVATE); @@ -313,19 +318,19 @@ // Add the keyboard layouts to the popup menu if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) { - for(dwIndex = 0; ; dwIndex++) + for (dwIndex = 0; ; dwIndex++) { dwSize = sizeof(szLayoutNum); - if(RegEnumValue(hKey, dwIndex, szLayoutNum, &dwSize, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) + if (RegEnumValue(hKey, dwIndex, szLayoutNum, &dwSize, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) break; - if(!GetLayoutName(szLayoutNum, szName)) + if (!GetLayoutName(szLayoutNum, szName, ARRAYSIZE(szName))) break; AppendMenu(hMenu, MF_STRING, _ttoi(szLayoutNum), szName); } - (void)CheckMenuItem(hMenu, ulCurrentLayoutNum, MF_CHECKED); + CheckMenuItem(hMenu, ulCurrentLayoutNum, MF_CHECKED); RegCloseKey(hKey); } @@ -337,13 +342,18 @@ SetHooks(VOID) { hDllLib = LoadLibrary(_T("kbsdll.dll")); - if (!hDllLib) return FALSE; - - KbSwitchSetHooks = (PROC) GetProcAddress(hDllLib, MAKEINTRESOURCEA(1)); - KbSwitchDeleteHooks = (PROC) GetProcAddress(hDllLib, MAKEINTRESOURCEA(2)); - - if ((KbSwitchSetHooks == NULL)||(KbSwitchDeleteHooks == NULL)) + if (!hDllLib) + { return FALSE; + } + + KbSwitchSetHooks = (PKBSWITCHSETHOOKS) GetProcAddress(hDllLib, "KbSwitchSetHooks"); + KbSwitchDeleteHooks = (PKBSWITCHDELETEHOOKS) GetProcAddress(hDllLib, "KbSwitchDeleteHooks"); + + if (KbSwitchSetHooks == NULL || KbSwitchDeleteHooks == NULL) + { + return FALSE; + } return KbSwitchSetHooks(); } @@ -362,21 +372,21 @@ ULONG Ret = ulCurrentLayoutNum; _ultot(ulCurrentLayoutNum, szLayoutNum, 10); - if (!GetLayoutID(szLayoutNum, szLayoutID)) + if (!GetLayoutID(szLayoutNum, szLayoutID, ARRAYSIZE(szLayoutID))) { return -1; } _ultot(Ret + 1, szLayoutNum, 10); - if (GetLayoutID(szLayoutNum, szLayoutID)) + if (GetLayoutID(szLayoutNum, szLayoutID, ARRAYSIZE(szLayoutID))) { return (Ret + 1); } else { _ultot(Ret - 1, szLayoutNum, 10); - if (GetLayoutID(szLayoutNum, szLayoutID)) + if (GetLayoutID(szLayoutNum, szLayoutID, ARRAYSIZE(szLayoutID))) return (Ret - 1); else return -1; @@ -408,8 +418,8 @@ case WM_LANG_CHANGED: { - GetLayoutIDByHkl((HKL)lParam, szLCID); - GetLocaleInfo((LANGID)_tcstoul(szLCID, NULL, 16), LOCALE_SLANGUAGE, (LPTSTR)szLangName, sizeof(szLangName) / sizeof(TCHAR)); + GetLayoutIDByHkl((HKL)lParam, szLCID, ARRAYSIZE(szLCID)); + GetLocaleInfo((LANGID)_tcstoul(szLCID, NULL, 16), LOCALE_SLANGUAGE, (LPTSTR)szLangName, ARRAYSIZE(szLangName)); UpdateTrayIcon(hwnd, szLCID, szLangName); return 0; @@ -424,8 +434,8 @@ case WM_WINDOW_ACTIVATE: { - GetLayoutIDByHkl(GetKeyboardLayout(GetWindowThreadProcessId((HWND)wParam, 0)), szLCID); - GetLocaleInfo((LANGID)_tcstoul(szLCID, NULL, 16), LOCALE_SLANGUAGE, (LPTSTR)szLangName, sizeof(szLangName) / sizeof(TCHAR)); + GetLayoutIDByHkl(GetKeyboardLayout(GetWindowThreadProcessId((HWND)wParam, 0)), szLCID, ARRAYSIZE(szLCID)); + GetLocaleInfo((LANGID)_tcstoul(szLCID, NULL, 16), LOCALE_SLANGUAGE, (LPTSTR)szLangName, ARRAYSIZE(szLangName)); UpdateTrayIcon(hwnd, szLCID, szLangName); return 0; @@ -526,11 +536,11 @@ switch (GetUserDefaultUILanguage()) { - case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT): - SetProcessDefaultLayout(LAYOUT_RTL); - break; - default: - break; + case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT): + SetProcessDefaultLayout(LAYOUT_RTL); + break; + default: + break; } hMutex = CreateMutex(NULL, FALSE, szKbSwitcherName); Modified: trunk/reactos/base/applications/kbswitch/kbswitch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.h [iso-8859-1] Sat Aug 6 20:48:33 2016 @@ -1,3 +1,5 @@ +#pragma once + #include <stdarg.h> #include <windef.h> #include <winbase.h> @@ -7,6 +9,7 @@ #include <wingdi.h> #include <shellapi.h> #include <tchar.h> +#include <strsafe.h> #include "resource.h" @@ -21,4 +24,7 @@ #define WM_WINDOW_ACTIVATE (WM_USER + 10300) #define WM_LOAD_LAYOUT (WM_USER + 10400) +typedef BOOL (WINAPI *PKBSWITCHSETHOOKS) (VOID); +typedef VOID (WINAPI *PKBSWITCHDELETEHOOKS) (VOID); + TCHAR szKbSwitcherName[] = _T("kbswitcher");

8 years, 2 months

[dchapyshev] 72142: [WIN32K] - Detect Alt+Shift hotkeys and send input language change request message to window * Switching the keyboard layout works now. The code needs to be improved

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Aug 6 17:43:57 2016 New Revision: 72142 URL: http://svn.reactos.org/svn/reactos?rev=72142&view=rev Log: [WIN32K] - Detect Alt+Shift hotkeys and send input language change request message to window * Switching the keyboard layout works now. The code needs to be improved Modified: trunk/reactos/win32ss/user/ntuser/keyboard.c Modified: trunk/reactos/win32ss/user/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/keyboa… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/keyboard.c [iso-8859-1] Sat Aug 6 17:43:57 2016 @@ -922,6 +922,22 @@ } } + // TODO: When initializing win32k: Reading from the registry hotkey combination + // to switch the keyboard layout and store it to global variable. + // Using this combination of hotkeys in this function + if (wVk == VK_LSHIFT && IS_KEY_DOWN(gafAsyncKeyState, VK_LMENU)) + { + PKL pkl = pti->KeyboardLayout; + + if (pkl != NULL) + { + UserPostMessage(UserHMGetHandle(Wnd), + WM_INPUTLANGCHANGEREQUEST, + INPUTLANGCHANGE_FORWARD, + (LPARAM)pkl->hkl); + } + } + /* If it is VK_PACKET, high word of wParam is used for wchar */ if (!bPacket) {

8 years, 2 months

[ekohl] 72141: [LSASRV] Move ServiceInit() into a separate file.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Aug 6 17:07:59 2016 New Revision: 72141 URL: http://svn.reactos.org/svn/reactos?rev=72141&view=rev Log: [LSASRV] Move ServiceInit() into a separate file. Added: trunk/reactos/dll/win32/lsasrv/service.c (with props) Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt trunk/reactos/dll/win32/lsasrv/lsasrv.c Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] Sat Aug 6 17:07:59 2016 @@ -21,6 +21,7 @@ privileges.c registry.c security.c + service.c session.c srm.c utils.c 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] Sat Aug 6 17:07:59 2016 @@ -208,14 +208,6 @@ } -NTSTATUS WINAPI -ServiceInit(VOID) -{ - TRACE("ServiceInit() called\n"); - return STATUS_SUCCESS; -} - - void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) { return RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, len); Added: trunk/reactos/dll/win32/lsasrv/service.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/service.c… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/service.c (added) +++ trunk/reactos/dll/win32/lsasrv/service.c [iso-8859-1] Sat Aug 6 17:07:59 2016 @@ -0,0 +1,24 @@ +/* + * PROJECT: Local Security Authority Server DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/lsasrv/service.c + * PURPOSE: Main file + * COPYRIGHT: Copyright 2016 Eric Kohl + */ + +/* INCLUDES ****************************************************************/ + +#include "lsasrv.h" + +/* FUNCTIONS ***************************************************************/ + + +NTSTATUS +WINAPI +ServiceInit(VOID) +{ + TRACE("ServiceInit() called\n"); + return STATUS_SUCCESS; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/lsasrv/service.c ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 2 months

[hbelusca] 72140: [EVENTVWR] Don't hardcode a fixed size for the memory buffer holding the event details data to be copied into the clipboard, but instead compute it using the real lengths of the d...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Aug 6 16:21:02 2016 New Revision: 72140 URL: http://svn.reactos.org/svn/reactos?rev=72140&view=rev Log: [EVENTVWR] Don't hardcode a fixed size for the memory buffer holding the event details data to be copied into the clipboard, but instead compute it using the real lengths of the different strings. Use also StringCbPrintfW instead. Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.h trunk/reactos/base/applications/mscutils/eventvwr/evtdetctl.c Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.h [iso-8859-1] Sat Aug 6 16:21:02 2016 @@ -29,6 +29,8 @@ #define ROUND_DOWN(n, align) (((ULONG)n) & ~((align) - 1l)) #define ROUND_UP(n, align) ROUND_DOWN(((ULONG)n) + (align) - 1, (align)) + +#include <strsafe.h> #include <commctrl.h> #include <commdlg.h> Modified: trunk/reactos/base/applications/mscutils/eventvwr/evtdetctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/evtdetctl.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/evtdetctl.c [iso-8859-1] Sat Aug 6 16:21:02 2016 @@ -10,8 +10,6 @@ #include "eventvwr.h" #include "evtdetctl.h" - -#define ENTRY_SIZE 2056 // FIXME: #define EVENT_MESSAGE_EVENTTEXT_BUFFER 1024*10 @@ -262,17 +260,17 @@ { LOGFONTW tmpFont = {0}; HFONT hFont; - HDC hDc; - - hDc = GetDC(NULL); - - tmpFont.lfHeight = -MulDiv(8, GetDeviceCaps(hDc, LOGPIXELSY), 72); + HDC hDC; + + hDC = GetDC(NULL); + + tmpFont.lfHeight = -MulDiv(8, GetDeviceCaps(hDC, LOGPIXELSY), 72); tmpFont.lfWeight = FW_NORMAL; wcscpy(tmpFont.lfFaceName, L"Courier New"); hFont = CreateFontIndirectW(&tmpFont); - ReleaseDC(NULL, hDc); + ReleaseDC(NULL, hDC); return hFont; } @@ -281,7 +279,7 @@ VOID CopyEventEntry(HWND hWnd) { - WCHAR output[4130], tmpHeader[512]; + WCHAR tmpHeader[512]; WCHAR szEventType[MAX_PATH]; WCHAR szSource[MAX_PATH]; WCHAR szCategory[MAX_PATH]; @@ -290,41 +288,58 @@ WCHAR szTime[MAX_PATH]; WCHAR szUser[MAX_PATH]; WCHAR szComputer[MAX_PATH]; - WCHAR evtDesc[ENTRY_SIZE]; + WCHAR evtDesc[EVENT_MESSAGE_EVENTTEXT_BUFFER]; + ULONG size = 0; + LPWSTR output; HGLOBAL hMem; + /* Try to open the clipboard */ if (!OpenClipboard(hWnd)) return; - /* First, empty the clipboard before we begin to use it */ + /* Get the formatted text needed to place the content into */ + size += LoadStringW(hInst, IDS_COPY, tmpHeader, ARRAYSIZE(tmpHeader)); + + /* Grab all the information and get it ready for the clipboard */ + size += GetDlgItemTextW(hWnd, IDC_EVENTTYPESTATIC, szEventType, ARRAYSIZE(szEventType)); + size += GetDlgItemTextW(hWnd, IDC_EVENTSOURCESTATIC, szSource, ARRAYSIZE(szSource)); + size += GetDlgItemTextW(hWnd, IDC_EVENTCATEGORYSTATIC, szCategory, ARRAYSIZE(szCategory)); + size += GetDlgItemTextW(hWnd, IDC_EVENTIDSTATIC, szEventID, ARRAYSIZE(szEventID)); + size += GetDlgItemTextW(hWnd, IDC_EVENTDATESTATIC, szDate, ARRAYSIZE(szDate)); + size += GetDlgItemTextW(hWnd, IDC_EVENTTIMESTATIC, szTime, ARRAYSIZE(szTime)); + size += GetDlgItemTextW(hWnd, IDC_EVENTUSERSTATIC, szUser, ARRAYSIZE(szUser)); + size += GetDlgItemTextW(hWnd, IDC_EVENTCOMPUTERSTATIC, szComputer, ARRAYSIZE(szComputer)); + size += GetDlgItemTextW(hWnd, IDC_EVENTTEXTEDIT, evtDesc, ARRAYSIZE(evtDesc)); + + size++; /* Null-termination */ + size *= sizeof(WCHAR); + + /* + * Consolidate the information into one big piece and + * sort out the memory needed to write to the clipboard. + */ + hMem = GlobalAlloc(GMEM_MOVEABLE, size); + if (hMem == NULL) goto Quit; + + output = GlobalLock(hMem); + if (output == NULL) + { + GlobalFree(hMem); + goto Quit; + } + + StringCbPrintfW(output, size, + tmpHeader, szEventType, szSource, szCategory, szEventID, + szDate, szTime, szUser, szComputer, evtDesc); + + GlobalUnlock(hMem); + + /* We succeeded, empty the clipboard and write the data in it */ EmptyClipboard(); - - /* Get the formatted text needed to place the content into */ - LoadStringW(hInst, IDS_COPY, tmpHeader, ARRAYSIZE(tmpHeader)); - - /* Grab all the information and get it ready for the clipboard */ - GetDlgItemTextW(hWnd, IDC_EVENTTYPESTATIC, szEventType, ARRAYSIZE(szEventType)); - GetDlgItemTextW(hWnd, IDC_EVENTSOURCESTATIC, szSource, ARRAYSIZE(szSource)); - GetDlgItemTextW(hWnd, IDC_EVENTCATEGORYSTATIC, szCategory, ARRAYSIZE(szCategory)); - GetDlgItemTextW(hWnd, IDC_EVENTIDSTATIC, szEventID, ARRAYSIZE(szEventID)); - GetDlgItemTextW(hWnd, IDC_EVENTDATESTATIC, szDate, ARRAYSIZE(szDate)); - GetDlgItemTextW(hWnd, IDC_EVENTTIMESTATIC, szTime, ARRAYSIZE(szTime)); - GetDlgItemTextW(hWnd, IDC_EVENTUSERSTATIC, szUser, ARRAYSIZE(szUser)); - GetDlgItemTextW(hWnd, IDC_EVENTCOMPUTERSTATIC, szComputer, ARRAYSIZE(szComputer)); - GetDlgItemTextW(hWnd, IDC_EVENTTEXTEDIT, evtDesc, ARRAYSIZE(evtDesc)); - - /* Consolidate the information into on big piece */ - wsprintfW(output, tmpHeader, szEventType, szSource, szCategory, szEventID, szDate, szTime, szUser, szComputer, evtDesc); - - /* Sort out the memory needed to write to the clipboard */ - hMem = GlobalAlloc(GMEM_MOVEABLE, ENTRY_SIZE); - memcpy(GlobalLock(hMem), output, ENTRY_SIZE); - GlobalUnlock(hMem); - - /* Write the final content to the clipboard */ SetClipboardData(CF_UNICODETEXT, hMem); - /* Close the clipboard once we're done with it */ +Quit: + /* Close the clipboard once we are done with it */ CloseClipboard(); }

8 years, 2 months

[ekohl] 72139: [LSASRV] Implement LsarAddAccountRigths and fix some bugs along the way: - LsarGetSystemAccessAccount: Fix an uninitialized varable. - LsarOpenAccount, LsarCreateAccount: Make these ...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Aug 6 15:07:41 2016 New Revision: 72139 URL: http://svn.reactos.org/svn/reactos?rev=72139&view=rev Log: [LSASRV] Implement LsarAddAccountRigths and fix some bugs along the way: - LsarGetSystemAccessAccount: Fix an uninitialized varable. - LsarOpenAccount, LsarCreateAccount: Make these functions wrappers around the real implementation in LsarpCreateAccount and LsarpOpenAccount. - LsarEnumerateAccountRights: Fix the use of the wrong array index. - LsarAddAccountRights: Implement it. - LsarpLookupPrivilegeValue: Return a pointer to an LUID instead of an NTSTATUS. It is much earier to use it this way. - LsapLookupAccountRightValue: Implement it. Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/lsasrv/privileges.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] Sat Aug 6 15:07:41 2016 @@ -537,42 +537,24 @@ } -/* Function 10 */ -NTSTATUS WINAPI LsarCreateAccount( - LSAPR_HANDLE PolicyHandle, +NTSTATUS +LsarpCreateAccount( + PLSA_DB_OBJECT PolicyObject, PRPC_SID AccountSid, ACCESS_MASK DesiredAccess, - LSAPR_HANDLE *AccountHandle) -{ - PLSA_DB_OBJECT PolicyObject; - PLSA_DB_OBJECT AccountObject = NULL; + PLSA_DB_OBJECT *AccountObject) +{ LPWSTR SidString = NULL; PSECURITY_DESCRIPTOR AccountSd = NULL; ULONG AccountSdSize; NTSTATUS Status = STATUS_SUCCESS; - /* Validate the AccountSid */ - if (!RtlValidSid(AccountSid)) - return STATUS_INVALID_PARAMETER; - - /* Validate the PolicyHandle */ - Status = LsapValidateDbObject(PolicyHandle, - LsaDbPolicyObject, - POLICY_CREATE_ACCOUNT, - &PolicyObject); - if (!NT_SUCCESS(Status)) - { - ERR("LsapValidateDbObject returned 0x%08lx\n", Status); - return Status; - } - /* Create SID string */ if (!ConvertSidToStringSid((PSID)AccountSid, &SidString)) { ERR("ConvertSidToStringSid failed\n"); - Status = STATUS_INVALID_PARAMETER; - goto done; + return STATUS_INVALID_PARAMETER; } /* Create a security descriptor for the account */ @@ -581,7 +563,7 @@ if (!NT_SUCCESS(Status)) { ERR("LsapCreateAccountSd returned 0x%08lx\n", Status); - return Status; + goto done; } /* Create the Account object */ @@ -591,7 +573,7 @@ LsaDbAccountObject, DesiredAccess, PolicyObject->Trusted, - &AccountObject); + AccountObject); if (!NT_SUCCESS(Status)) { ERR("LsapCreateDbObject failed (Status 0x%08lx)\n", Status); @@ -599,7 +581,7 @@ } /* Set the Sid attribute */ - Status = LsapSetObjectAttribute(AccountObject, + Status = LsapSetObjectAttribute(*AccountObject, L"Sid", (PVOID)AccountSid, GetLengthSid(AccountSid)); @@ -607,7 +589,7 @@ goto done; /* Set the SecDesc attribute */ - Status = LsapSetObjectAttribute(AccountObject, + Status = LsapSetObjectAttribute(*AccountObject, L"SecDesc", AccountSd, AccountSdSize); @@ -619,17 +601,47 @@ if (AccountSd != NULL) RtlFreeHeap(RtlGetProcessHeap(), 0, AccountSd); - if (!NT_SUCCESS(Status)) - { - if (AccountObject != NULL) - LsapCloseDbObject(AccountObject); - } - else + return Status; +} + + +/* Function 10 */ +NTSTATUS WINAPI LsarCreateAccount( + LSAPR_HANDLE PolicyHandle, + PRPC_SID AccountSid, + ACCESS_MASK DesiredAccess, + LSAPR_HANDLE *AccountHandle) +{ + PLSA_DB_OBJECT PolicyObject; + PLSA_DB_OBJECT AccountObject = NULL; + NTSTATUS Status = STATUS_SUCCESS; + + /* Validate the AccountSid */ + if (!RtlValidSid(AccountSid)) + return STATUS_INVALID_PARAMETER; + + /* Validate the PolicyHandle */ + Status = LsapValidateDbObject(PolicyHandle, + LsaDbPolicyObject, + POLICY_CREATE_ACCOUNT, + &PolicyObject); + if (!NT_SUCCESS(Status)) + { + ERR("LsapValidateDbObject returned 0x%08lx\n", Status); + return Status; + } + + + Status = LsarpCreateAccount(PolicyObject, + AccountSid, + DesiredAccess, + &AccountObject); + if (NT_SUCCESS(Status)) { *AccountHandle = (LSAPR_HANDLE)AccountObject; } - return STATUS_SUCCESS; + return Status; } @@ -1089,40 +1101,23 @@ } -/* Function 17 */ -NTSTATUS WINAPI LsarOpenAccount( - LSAPR_HANDLE PolicyHandle, - PRPC_SID AccountSid, - ACCESS_MASK DesiredAccess, - LSAPR_HANDLE *AccountHandle) -{ - PLSA_DB_OBJECT PolicyObject; - PLSA_DB_OBJECT AccountObject = NULL; +static +NTSTATUS +LsarpOpenAccount( + IN PLSA_DB_OBJECT PolicyObject, + IN PRPC_SID AccountSid, + IN ACCESS_MASK DesiredAccess, + OUT PLSA_DB_OBJECT *AccountObject) +{ LPWSTR SidString = NULL; NTSTATUS Status = STATUS_SUCCESS; - - /* Validate the AccountSid */ - if (!RtlValidSid(AccountSid)) - return STATUS_INVALID_PARAMETER; - - /* Validate the PolicyHandle */ - Status = LsapValidateDbObject(PolicyHandle, - LsaDbPolicyObject, - 0, - &PolicyObject); - if (!NT_SUCCESS(Status)) - { - ERR("LsapValidateDbObject returned 0x%08lx\n", Status); - return Status; - } /* Create SID string */ if (!ConvertSidToStringSid((PSID)AccountSid, &SidString)) { ERR("ConvertSidToStringSid failed\n"); - Status = STATUS_INVALID_PARAMETER; - goto done; + return STATUS_INVALID_PARAMETER; } /* Create the Account object */ @@ -1132,34 +1127,50 @@ LsaDbAccountObject, DesiredAccess, PolicyObject->Trusted, - &AccountObject); + AccountObject); if (!NT_SUCCESS(Status)) { ERR("LsapOpenDbObject failed (Status 0x%08lx)\n", Status); - goto done; - } - - /* Set the Sid attribute */ - Status = LsapSetObjectAttribute(AccountObject, - L"Sid", - (PVOID)AccountSid, - GetLengthSid(AccountSid)); - -done: + } + if (SidString != NULL) LocalFree(SidString); - if (!NT_SUCCESS(Status)) - { - if (AccountObject != NULL) - LsapCloseDbObject(AccountObject); - } - else - { - *AccountHandle = (LSAPR_HANDLE)AccountObject; - } - return Status; +} + + +/* Function 17 */ +NTSTATUS WINAPI LsarOpenAccount( + LSAPR_HANDLE PolicyHandle, + PRPC_SID AccountSid, + ACCESS_MASK DesiredAccess, + LSAPR_HANDLE *AccountHandle) +{ + PLSA_DB_OBJECT PolicyObject; + NTSTATUS Status; + + /* Validate the AccountSid */ + if (!RtlValidSid(AccountSid)) + return STATUS_INVALID_PARAMETER; + + /* Validate the PolicyHandle */ + Status = LsapValidateDbObject(PolicyHandle, + LsaDbPolicyObject, + 0, + &PolicyObject); + if (!NT_SUCCESS(Status)) + { + ERR("LsapValidateDbObject returned 0x%08lx\n", Status); + return Status; + } + + + /* Open the Account object */ + return LsarpOpenAccount(PolicyObject, + AccountSid, + DesiredAccess, + (PLSA_DB_OBJECT *)AccountHandle); } @@ -1281,7 +1292,7 @@ PrivilegeCount = CurrentPrivileges->PrivilegeCount; TRACE("Current privilege count: %lu\n", PrivilegeCount); - /* Calculate the number privileges in the combined privilege set */ + /* Calculate the number of privileges in the combined privilege set */ for (i = 0; i < Privileges->PrivilegeCount; i++) { bFound = FALSE; @@ -1623,7 +1634,7 @@ ACCESS_MASK *SystemAccess) { PLSA_DB_OBJECT AccountObject; - ULONG Size; + ULONG Size = sizeof(ACCESS_MASK); NTSTATUS Status; /* Validate the account handle */ @@ -2045,6 +2056,7 @@ PRPC_UNICODE_STRING Name, PLUID Value) { + PLUID pValue; NTSTATUS Status; TRACE("LsarLookupPrivilegeValue(%p, %wZ, %p)\n", @@ -2062,10 +2074,13 @@ TRACE("Privilege: %wZ\n", Name); - Status = LsarpLookupPrivilegeValue(Name, - Value); - - return Status; + pValue = LsarpLookupPrivilegeValue(Name); + if (pValue == NULL) + return STATUS_NO_SUCH_PRIVILEGE; + + RtlCopyLuid(Value, pValue); + + return STATUS_SUCCESS; } @@ -2194,9 +2209,9 @@ PLSAPR_PRIVILEGE_SET PrivilegeSet = NULL; PRPC_UNICODE_STRING RightsBuffer = NULL; PRPC_UNICODE_STRING PrivilegeString; - ACCESS_MASK SystemAccess; + ACCESS_MASK SystemAccess = 0; ULONG RightsCount = 0; - ULONG RightsIndex; + ULONG Index; ULONG i; NTSTATUS Status; @@ -2210,25 +2225,25 @@ &AccountHandle); if (!NT_SUCCESS(Status)) { - ERR("LsarOpenAccount returned 0x%08lx\n", Status); + WARN("LsarOpenAccount returned 0x%08lx\n", Status); return Status; } /* Enumerate the privileges */ Status = LsarEnumeratePrivilegesAccount(AccountHandle, &PrivilegeSet); - if (!NT_SUCCESS(Status)) - { - ERR("LsarEnumeratePrivilegesAccount returned 0x%08lx\n", Status); + if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND) + { + WARN("LsarEnumeratePrivilegesAccount returned 0x%08lx\n", Status); goto done; } /* Get account rights */ Status = LsarGetSystemAccessAccount(AccountHandle, &SystemAccess); - if (!NT_SUCCESS(Status)) - { - ERR("LsarGetSystemAccessAccount returned 0x%08lx\n", Status); + if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND) + { + WARN("LsarGetSystemAccessAccount returned 0x%08lx\n", Status); goto done; } @@ -2259,22 +2274,28 @@ } /* Copy the privileges into the buffer */ - RightsIndex = 0; - for (i = 0; i < PrivilegeSet->PrivilegeCount; i++) - { - PrivilegeString = NULL; - Status = LsarLookupPrivilegeName(PolicyHandle, - (PLUID)&PrivilegeSet->Privilege[i].Luid, - &PrivilegeString); - if (!NT_SUCCESS(Status)) - goto done; - - RightsBuffer[i].Length = PrivilegeString->Length; - RightsBuffer[i].MaximumLength = PrivilegeString->MaximumLength; - RightsBuffer[i].Buffer = PrivilegeString->Buffer; - - MIDL_user_free(PrivilegeString); - RightsIndex++; + Index = 0; + if (PrivilegeSet) + { + for (i = 0; i < PrivilegeSet->PrivilegeCount; i++) + { + PrivilegeString = NULL; + Status = LsarLookupPrivilegeName(PolicyHandle, + (PLUID)&PrivilegeSet->Privilege[i].Luid, + &PrivilegeString); + if (!NT_SUCCESS(Status)) + { + WARN("LsarLookupPrivilegeName returned 0x%08lx\n", Status); + goto done; + } + + RightsBuffer[Index].Length = PrivilegeString->Length; + RightsBuffer[Index].MaximumLength = PrivilegeString->MaximumLength; + RightsBuffer[Index].Buffer = PrivilegeString->Buffer; + + MIDL_user_free(PrivilegeString); + Index++; + } } /* Copy account rights into the buffer */ @@ -2285,14 +2306,17 @@ Status = LsapLookupAccountRightName(1 << i, &PrivilegeString); if (!NT_SUCCESS(Status)) + { + WARN("LsarLookupAccountRightName returned 0x%08lx\n", Status); goto done; - - RightsBuffer[i].Length = PrivilegeString->Length; - RightsBuffer[i].MaximumLength = PrivilegeString->MaximumLength; - RightsBuffer[i].Buffer = PrivilegeString->Buffer; + } + + RightsBuffer[Index].Length = PrivilegeString->Length; + RightsBuffer[Index].MaximumLength = PrivilegeString->MaximumLength; + RightsBuffer[Index].Buffer = PrivilegeString->Buffer; MIDL_user_free(PrivilegeString); - RightsIndex++; + Index++; } } @@ -2304,10 +2328,10 @@ { if (RightsBuffer != NULL) { - for (RightsIndex = 0; RightsIndex < RightsCount; RightsIndex++) + for (Index = 0; Index < RightsCount; Index++) { - if (RightsBuffer[RightsIndex].Buffer != NULL) - MIDL_user_free(RightsBuffer[RightsIndex].Buffer); + if (RightsBuffer[Index].Buffer != NULL) + MIDL_user_free(RightsBuffer[Index].Buffer); } MIDL_user_free(RightsBuffer); @@ -2329,8 +2353,215 @@ PRPC_SID AccountSid, PLSAPR_USER_RIGHT_SET UserRights) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PLSA_DB_OBJECT PolicyObject; + PLSA_DB_OBJECT AccountObject = NULL; + ULONG ulNewPrivileges = 0, ulNewRights = 0; + ACCESS_MASK SystemAccess = 0; + ULONG Size, Value, i, j; + PPRIVILEGE_SET PrivilegeSet = NULL; + ULONG PrivilegeSetBufferSize = 0; + ULONG PrivilegeCount; + BOOLEAN bFound; + PLUID pLuid; + NTSTATUS Status; + + TRACE("LsarAddAccountRights(%p %p %p)\n", + PolicyHandle, AccountSid, UserRights); + + /* Validate the PolicyHandle */ + Status = LsapValidateDbObject(PolicyHandle, + LsaDbPolicyObject, + POLICY_LOOKUP_NAMES, + &PolicyObject); + if (!NT_SUCCESS(Status)) + { + WARN("LsapValidateDbObject returned 0x%08lx\n", Status); + return Status; + } + + /* Validate the AccountSid */ + if (!RtlValidSid(AccountSid)) + { + Status = STATUS_INVALID_PARAMETER; + goto done; + } + + /* Validate the UserRights */ + if (UserRights == NULL) + { + Status = STATUS_INVALID_PARAMETER; + goto done; + } + + /* Validate the privilege and account right names */ + for (i = 0; i < UserRights->Entries; i++) + { + pLuid = LsarpLookupPrivilegeValue(&UserRights->UserRights[i]); + if (pLuid != NULL) + { + ulNewPrivileges++; + } + else + { + Status = LsapLookupAccountRightValue(&UserRights->UserRights[i], NULL); + if (Status == STATUS_SUCCESS) + ulNewRights++; + else + goto done; + } + } + + TRACE("ulNewPrivileges: %lu\n", ulNewPrivileges); + TRACE("ulNewRights: %lu\n", ulNewRights); + + /* Open the account */ + Status = LsarpOpenAccount(PolicyObject, + AccountSid, + 0, + &AccountObject); + if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND) + { + WARN("LsarpOpenAccount returned 0x%08lx\n", Status); + goto done; + } + else if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + { + /* Create a new account if it does not yet exist */ + Status = LsarpCreateAccount(PolicyObject, + AccountSid, + 0, + &AccountObject); + if (!NT_SUCCESS(Status)) + { + WARN("LsarpCreateAccount returned 0x%08lx\n", Status); + goto done; + } + } + + if (ulNewPrivileges > 0) + { + Size = 0; + + /* Get the size of the Privilgs attribute */ + Status = LsapGetObjectAttribute(AccountObject, + L"Privilgs", + NULL, + &Size); + if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND) + goto done; + + /* Calculate the required privilege set buffer size */ + if (Size == 0) + PrivilegeSetBufferSize = sizeof(PRIVILEGE_SET) + + (ulNewPrivileges - 1) * sizeof(LUID_AND_ATTRIBUTES); + else + PrivilegeSetBufferSize = Size + + ulNewPrivileges * sizeof(LUID_AND_ATTRIBUTES); + + /* Allocate the privilege set buffer */ + PrivilegeSet = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + PrivilegeSetBufferSize); + if (PrivilegeSet == NULL) + return STATUS_NO_MEMORY; + + /* Get the privilege set */ + if (Size != 0) + { + Status = LsapGetObjectAttribute(AccountObject, + L"Privilgs", + PrivilegeSet, + &Size); + if (!NT_SUCCESS(Status)) + { + WARN("LsapGetObjectAttribute() failed (Status 0x%08lx)\n", Status); + goto done; + } + } + + PrivilegeCount = PrivilegeSet->PrivilegeCount; + TRACE("Privilege count: %lu\n", PrivilegeCount); + + for (i = 0; i < UserRights->Entries; i++) + { + pLuid = LsarpLookupPrivilegeValue(&UserRights->UserRights[i]); + if (pLuid == NULL) + continue; + + bFound = FALSE; + for (j = 0; j < PrivilegeSet->PrivilegeCount; j++) + { + if (RtlEqualLuid(&(PrivilegeSet->Privilege[j].Luid), pLuid)) + { + bFound = TRUE; + break; + } + } + + if (bFound == FALSE) + { + /* Copy the new privilege */ + RtlCopyMemory(&(PrivilegeSet->Privilege[PrivilegeSet->PrivilegeCount]), + pLuid, + sizeof(LUID)); + PrivilegeSet->PrivilegeCount++; + } + } + + /* Store the extended privilege set */ + if (PrivilegeCount != PrivilegeSet->PrivilegeCount) + { + Size = sizeof(PRIVILEGE_SET) + + (PrivilegeSet->PrivilegeCount - 1) * sizeof(LUID_AND_ATTRIBUTES); + + Status = LsapSetObjectAttribute(AccountObject, + L"Privilgs", + PrivilegeSet, + Size); + if (!NT_SUCCESS(Status)) + { + WARN("LsapSetObjectAttribute() failed (Status 0x%08lx)\n", Status); + goto done; + } + } + } + + if (ulNewRights > 0) + { + Size = 0; + + /* Get the system access flags, if the attribute exists */ + Status = LsapGetObjectAttribute(AccountObject, + L"ActSysAc", + &SystemAccess, + &Size); + if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND) + goto done; + + /* Set the new access rights */ + for (i = 0; i < UserRights->Entries; i++) + { + Status = LsapLookupAccountRightValue(&UserRights->UserRights[i], + &Value); + if (Status == STATUS_SUCCESS) + SystemAccess |= Value; + } + + /* Set the system access flags */ + Status = LsapSetObjectAttribute(AccountObject, + L"ActSysAc", + &SystemAccess, + sizeof(ACCESS_MASK)); + } + +done: + if (PrivilegeSet != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, PrivilegeSet); + + if (AccountObject != NULL) + LsapCloseDbObject(AccountObject); + + return Status; } Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Sat Aug 6 15:07:41 2016 @@ -315,9 +315,9 @@ PRPC_UNICODE_STRING *DisplayName, USHORT *LanguageReturned); -NTSTATUS -LsarpLookupPrivilegeValue(PRPC_UNICODE_STRING Name, - PLUID Value); +PLUID +LsarpLookupPrivilegeValue( + IN PRPC_UNICODE_STRING Name); NTSTATUS LsarpEnumeratePrivileges(DWORD *EnumerationContext, @@ -327,6 +327,11 @@ NTSTATUS LsapLookupAccountRightName(ULONG RightValue, PRPC_UNICODE_STRING *Name); + +NTSTATUS +LsapLookupAccountRightValue( + IN PRPC_UNICODE_STRING Name, + OUT PULONG Value OPTIONAL); /* registry.h */ NTSTATUS Modified: trunk/reactos/dll/win32/lsasrv/privileges.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/privilege… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/privileges.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/privileges.c [iso-8859-1] Sat Aug 6 15:07:41 2016 @@ -152,25 +152,23 @@ return STATUS_SUCCESS; } -NTSTATUS -LsarpLookupPrivilegeValue(PRPC_UNICODE_STRING Name, - PLUID Value) + +PLUID +LsarpLookupPrivilegeValue( + IN PRPC_UNICODE_STRING Name) { ULONG Priv; if (Name->Length == 0 || Name->Buffer == NULL) - return STATUS_NO_SUCH_PRIVILEGE; + return NULL; for (Priv = 0; Priv < sizeof(WellKnownPrivileges) / sizeof(WellKnownPrivileges[0]); Priv++) { if (_wcsicmp(Name->Buffer, WellKnownPrivileges[Priv].Name) == 0) - { - *Value = WellKnownPrivileges[Priv].Luid; - return STATUS_SUCCESS; - } - } - - return STATUS_NO_SUCH_PRIVILEGE; + return (PLUID)&(WellKnownPrivileges[Priv].Luid); + } + + return NULL; } @@ -307,4 +305,28 @@ return STATUS_NO_SUCH_PRIVILEGE; } + +NTSTATUS +LsapLookupAccountRightValue( + IN PRPC_UNICODE_STRING Name, + OUT PULONG Value OPTIONAL) +{ + ULONG i; + + if (Name->Length == 0 || Name->Buffer == NULL) + return STATUS_NO_SUCH_PRIVILEGE; + + for (i = 0; i < sizeof(WellKnownRights) / sizeof(WellKnownRights[0]); i++) + { + if (_wcsicmp(Name->Buffer, WellKnownRights[i].Name) == 0) + { + if (Value != NULL) + *Value = WellKnownRights[i].Flag; + return STATUS_SUCCESS; + } + } + + return STATUS_NO_SUCH_PRIVILEGE; +} + /* EOF */

8 years, 2 months

← Newer
1
...
36
37
38
39
40
41
42
...
47
Older →

Jump to page:

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