Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 64553: [NTVDM]: disable the cpu level dprints.
by hbelusca＠svn.reactos.org 05 Oct '14

05 Oct '14

Author: hbelusca Date: Sun Oct 5 22:47:37 2014 New Revision: 64553 URL: http://svn.reactos.org/svn/reactos?rev=64553&view=rev Log: [NTVDM]: disable the cpu level dprints. Modified: trunk/reactos/subsystems/ntvdm/cpu/cpu.c Modified: trunk/reactos/subsystems/ntvdm/cpu/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/cpu/cpu.c… ============================================================================== --- trunk/reactos/subsystems/ntvdm/cpu/cpu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/cpu/cpu.c [iso-8859-1] Sun Oct 5 22:47:37 2014 @@ -124,12 +124,12 @@ return; } CpuCallLevel++; - DPRINT1("CpuSimulate --> Level %d\n", CpuCallLevel); + DPRINT("CpuSimulate --> Level %d\n", CpuCallLevel); CpuRunning = TRUE; while (VdmRunning && CpuRunning) ClockUpdate(); - DPRINT1("CpuSimulate <-- Level %d\n", CpuCallLevel); + DPRINT("CpuSimulate <-- Level %d\n", CpuCallLevel); CpuCallLevel--; if (CpuCallLevel < 0) CpuCallLevel = 0;

1 0

[hpoussin] 64552: [MKHIVE] Create reparse points, and use them instead of pseudo-connections between cells
by hpoussin＠svn.reactos.org 05 Oct '14

05 Oct '14

Author: hpoussin Date: Sun Oct 5 21:30:57 2014 New Revision: 64552 URL: http://svn.reactos.org/svn/reactos?rev=64552&view=rev Log: [MKHIVE] Create reparse points, and use them instead of pseudo-connections between cells Modified: trunk/reactos/tools/mkhive/cmi.c trunk/reactos/tools/mkhive/cmi.h trunk/reactos/tools/mkhive/mkhive.h trunk/reactos/tools/mkhive/registry.c trunk/reactos/tools/mkhive/registry.h Modified: trunk/reactos/tools/mkhive/cmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/cmi.c?rev=645… ============================================================================== --- trunk/reactos/tools/mkhive/cmi.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/cmi.c [iso-8859-1] Sun Oct 5 21:30:57 2014 @@ -330,16 +330,19 @@ NTSTATUS CmiAddSubKey( IN PCMHIVE RegistryHive, - IN PCM_KEY_NODE ParentKeyCell, IN HCELL_INDEX ParentKeyCellOffset, IN PCUNICODE_STRING SubKeyName, IN ULONG CreateOptions, OUT PCM_KEY_NODE *pSubKeyCell, OUT HCELL_INDEX *pBlockOffset) { + PCM_KEY_NODE ParentKeyCell; HCELL_INDEX NKBOffset; NTSTATUS Status; + ParentKeyCell = (PCM_KEY_NODE)HvGetCell(&RegistryHive->Hive, ParentKeyCellOffset); + if (!ParentKeyCell) + return STATUS_UNSUCCESSFUL; VERIFY_KEY_CELL(ParentKeyCell); /* Create the new key */ @@ -396,18 +399,22 @@ NTSTATUS CmiScanForSubKey( IN PCMHIVE RegistryHive, - IN PCM_KEY_NODE KeyCell, + IN HCELL_INDEX ParentKeyCellOffset, IN PCUNICODE_STRING SubKeyName, IN ULONG Attributes, OUT PCM_KEY_NODE *pSubKeyCell, OUT HCELL_INDEX *pBlockOffset) { + PCM_KEY_NODE KeyCell; PCM_KEY_FAST_INDEX HashBlock; PCM_KEY_NODE CurSubKeyCell; BOOLEAN CaseInsensitive; ULONG Storage; ULONG i; + KeyCell = (PCM_KEY_NODE)HvGetCell(&RegistryHive->Hive, ParentKeyCellOffset); + if (!KeyCell) + return STATUS_UNSUCCESSFUL; VERIFY_KEY_CELL(KeyCell); ASSERT(RegistryHive); @@ -528,13 +535,13 @@ NTSTATUS CmiAddValueKey( IN PCMHIVE RegistryHive, - IN PCM_KEY_NODE KeyCell, IN HCELL_INDEX KeyCellOffset, IN PCUNICODE_STRING ValueName, OUT PCM_KEY_VALUE *pValueCell, OUT HCELL_INDEX *pValueCellOffset) { PVALUE_LIST_CELL ValueListCell; + PCM_KEY_NODE KeyCell; PCM_KEY_VALUE NewValueCell; HCELL_INDEX ValueListCellOffset; HCELL_INDEX NewValueCellOffset; @@ -542,6 +549,9 @@ HSTORAGE_TYPE Storage; NTSTATUS Status; + KeyCell = HvGetCell(&RegistryHive->Hive, KeyCellOffset); + if (!KeyCell) + return STATUS_UNSUCCESSFUL; Storage = (KeyCell->Flags & KEY_IS_VOLATILE) ? Volatile : Stable; if (KeyCell->ValueList.List == HCELL_NIL) { @@ -614,15 +624,19 @@ NTSTATUS CmiScanForValueKey( IN PCMHIVE RegistryHive, - IN PCM_KEY_NODE KeyCell, + IN HCELL_INDEX KeyCellOffset, IN PCUNICODE_STRING ValueName, OUT PCM_KEY_VALUE *pValueCell, OUT HCELL_INDEX *pValueCellOffset) { + PCM_KEY_NODE KeyCell; PVALUE_LIST_CELL ValueListCell; PCM_KEY_VALUE CurValueCell; ULONG i; + KeyCell = (PCM_KEY_NODE)HvGetCell(&RegistryHive->Hive, KeyCellOffset); + if (!KeyCell) + return STATUS_UNSUCCESSFUL; *pValueCell = NULL; *pValueCellOffset = HCELL_NIL; Modified: trunk/reactos/tools/mkhive/cmi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/cmi.h?rev=645… ============================================================================== --- trunk/reactos/tools/mkhive/cmi.h [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/cmi.h [iso-8859-1] Sun Oct 5 21:30:57 2014 @@ -33,7 +33,6 @@ NTSTATUS CmiAddSubKey( IN PCMHIVE RegistryHive, - IN PCM_KEY_NODE ParentKeyCell, IN HCELL_INDEX ParentKeyCellOffset, IN PCUNICODE_STRING SubKeyName, IN ULONG CreateOptions, @@ -43,7 +42,7 @@ NTSTATUS CmiScanForSubKey( IN PCMHIVE RegistryHive, - IN PCM_KEY_NODE KeyCell, + IN HCELL_INDEX ParentKeyCellOffset, IN PCUNICODE_STRING SubKeyName, IN ULONG Attributes, OUT PCM_KEY_NODE *pSubKeyCell, @@ -52,7 +51,6 @@ NTSTATUS CmiAddValueKey( IN PCMHIVE RegistryHive, - IN PCM_KEY_NODE KeyCell, IN HCELL_INDEX KeyCellOffset, IN PCUNICODE_STRING ValueName, OUT PCM_KEY_VALUE *pValueCell, @@ -61,7 +59,7 @@ NTSTATUS CmiScanForValueKey( IN PCMHIVE RegistryHive, - IN PCM_KEY_NODE KeyCell, + IN HCELL_INDEX KeyCellOffset, IN PCUNICODE_STRING ValueName, OUT PCM_KEY_VALUE *pValueCell, OUT HCELL_INDEX *pValueCellOffset); Modified: trunk/reactos/tools/mkhive/mkhive.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.h?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.h [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/mkhive.h [iso-8859-1] Sun Oct 5 21:30:57 2014 @@ -51,6 +51,9 @@ #define BitScanForward64 _BitScanForward64 #define BitScanReverse64 _BitScanReverse64 #endif + +typedef DWORD REGSAM; +typedef LPVOID LPSECURITY_ATTRIBUTES; NTSTATUS NTAPI RtlAnsiStringToUnicodeString( Modified: trunk/reactos/tools/mkhive/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/registry.c?re… ============================================================================== --- trunk/reactos/tools/mkhive/registry.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/registry.c [iso-8859-1] Sun Oct 5 21:30:57 2014 @@ -51,8 +51,7 @@ static PMEMKEY CreateInMemoryStructure( IN PCMHIVE RegistryHive, - IN HCELL_INDEX KeyCellOffset, - IN PCUNICODE_STRING KeyName) + IN HCELL_INDEX KeyCellOffset) { PMEMKEY Key; @@ -60,54 +59,50 @@ if (!Key) return NULL; - InitializeListHead (&Key->SubKeyList); - InitializeListHead (&Key->KeyList); - Key->RegistryHive = RegistryHive; - Key->KeyCellOffset = Key->KeyCellOffsetInParentHive = KeyCellOffset; - Key->KeyCell = (PCM_KEY_NODE)HvGetCell (&RegistryHive->Hive, Key->KeyCellOffset); - if (!Key->KeyCell) - { - free(Key); - return NULL; - } - Key->KeyCell->SubKeyLists[Stable] = HCELL_NIL; - Key->KeyCell->SubKeyLists[Volatile] = HCELL_NIL; + Key->KeyCellOffset = KeyCellOffset; return Key; } + +LIST_ENTRY CmiReparsePointsHead; static LONG RegpOpenOrCreateKey( IN HKEY hParentKey, IN PCWSTR KeyName, IN BOOL AllowCreation, + IN BOOL Volatile, OUT PHKEY Key) { PWSTR LocalKeyName; PWSTR End; UNICODE_STRING KeyString; NTSTATUS Status; - PMEMKEY ParentKey; + PREPARSE_POINT CurrentReparsePoint; PMEMKEY CurrentKey; + PCMHIVE ParentRegistryHive; + HCELL_INDEX ParentCellOffset; PLIST_ENTRY Ptr; PCM_KEY_NODE SubKeyCell; HCELL_INDEX BlockOffset; - BOOLEAN ParentIsSystem = FALSE; DPRINT("RegpCreateOpenKey('%S')\n", KeyName); if (*KeyName == L'\\') { KeyName++; - ParentKey = RootKey; + ParentRegistryHive = RootKey->RegistryHive; + ParentCellOffset = RootKey->KeyCellOffset; } else if (hParentKey == NULL) { - ParentKey = RootKey; + ParentRegistryHive = RootKey->RegistryHive; + ParentCellOffset = RootKey->KeyCellOffset; } else { - ParentKey = HKEY_TO_MEMKEY(RootKey); + ParentRegistryHive = HKEY_TO_MEMKEY(RootKey)->RegistryHive; + ParentCellOffset = HKEY_TO_MEMKEY(RootKey)->KeyCellOffset; } LocalKeyName = (PWSTR)KeyName; @@ -130,77 +125,55 @@ } } - /* Redirect from 'CurrentControlSet' to 'ControlSet001' */ - if (!strncmpiW(LocalKeyName, L"CurrentControlSet", 17) && ParentIsSystem) - { - RtlInitUnicodeString(&KeyString, L"ControlSet001"); - ParentIsSystem = FALSE; - } - else - { - ParentIsSystem = (strncmpiW(LocalKeyName, L"SYSTEM", 6) == 0); - } - Status = CmiScanForSubKey( - ParentKey->RegistryHive, - ParentKey->KeyCell, + ParentRegistryHive, + ParentCellOffset, &KeyString, OBJ_CASE_INSENSITIVE, &SubKeyCell, &BlockOffset); if (NT_SUCCESS(Status)) { - /* Check subkey in memory structure */ - Ptr = ParentKey->SubKeyList.Flink; - while (Ptr != &ParentKey->SubKeyList) + /* Search for a possible reparse point */ + Ptr = CmiReparsePointsHead.Flink; + while (Ptr != &CmiReparsePointsHead) { - CurrentKey = CONTAINING_RECORD(Ptr, MEMKEY, KeyList); - if (CurrentKey->KeyCellOffsetInParentHive == BlockOffset) + CurrentReparsePoint = CONTAINING_RECORD(Ptr, REPARSE_POINT, ListEntry); + if (CurrentReparsePoint->SourceHive == ParentRegistryHive && + CurrentReparsePoint->SourceKeyCellOffset == BlockOffset) { - goto nextsubkey; + ParentRegistryHive = CurrentReparsePoint->DestinationHive; + BlockOffset = CurrentReparsePoint->DestinationKeyCellOffset; + break; } - Ptr = Ptr->Flink; } - /* If we go there, this means that key exists, but we don't know it */ - ASSERT(FALSE); } - - if (AllowCreation && Status == STATUS_OBJECT_NAME_NOT_FOUND) + else if (Status == STATUS_OBJECT_NAME_NOT_FOUND && AllowCreation) { Status = CmiAddSubKey( - ParentKey->RegistryHive, - ParentKey->KeyCell, - ParentKey->KeyCellOffset, + ParentRegistryHive, + ParentCellOffset, &KeyString, - 0, + Volatile ? REG_OPTION_VOLATILE : 0, &SubKeyCell, &BlockOffset); - if (NT_SUCCESS(Status)) - { - /* Now, SubKeyCell/BlockOffset are valid */ - CurrentKey = CreateInMemoryStructure( - ParentKey->RegistryHive, - BlockOffset, - &KeyString); - if (!CurrentKey) - return ERROR_OUTOFMEMORY; - /* Add CurrentKey in ParentKey */ - InsertTailList(&ParentKey->SubKeyList, &CurrentKey->KeyList); - } } if (!NT_SUCCESS(Status)) return ERROR_UNSUCCESSFUL; nextsubkey: - ParentKey = CurrentKey; + ParentCellOffset = BlockOffset; if (End) LocalKeyName = End + 1; else break; } - *Key = MEMKEY_TO_HKEY(ParentKey); + CurrentKey = CreateInMemoryStructure(ParentRegistryHive, ParentCellOffset); + if (!CurrentKey) + return ERROR_OUTOFMEMORY; + *Key = MEMKEY_TO_HKEY(CurrentKey); return ERROR_SUCCESS; } @@ -211,7 +184,7 @@ IN LPCWSTR lpSubKey, OUT PHKEY phkResult) { - return RegpOpenOrCreateKey(hKey, lpSubKey, TRUE, phkResult); + return RegpOpenOrCreateKey(hKey, lpSubKey, TRUE, FALSE, phkResult); } static PWSTR @@ -270,7 +243,26 @@ IN LPCWSTR lpSubKey, OUT PHKEY phkResult) { - return RegpOpenOrCreateKey(hKey, lpSubKey, FALSE, phkResult); + return RegpOpenOrCreateKey(hKey, lpSubKey, FALSE, FALSE, phkResult); +} + +LONG WINAPI +RegCreateKeyExW( + IN HKEY hKey, + IN LPCWSTR lpSubKey, + IN DWORD Reserved, + IN LPWSTR lpClass OPTIONAL, + IN DWORD dwOptions, + IN REGSAM samDesired, + IN LPSECURITY_ATTRIBUTES lpSecurityAttributes OPTIONAL, + OUT PHKEY phkResult, + OUT LPDWORD lpdwDisposition OPTIONAL) +{ + return RegpOpenOrCreateKey(hKey, + lpSubKey, + TRUE, + (dwOptions & REG_OPTION_VOLATILE) != 0, + phkResult); } LONG WINAPI @@ -308,7 +300,7 @@ Status = CmiScanForValueKey( ParentKey->RegistryHive, - ParentKey->KeyCell, + ParentKey->KeyCellOffset, &ValueString, ValueCell, ValueCellOffset); @@ -316,7 +308,6 @@ { Status = CmiAddValueKey( ParentKey->RegistryHive, - ParentKey->KeyCell, ParentKey->KeyCellOffset, &ValueString, ValueCell, @@ -427,9 +418,6 @@ HvMarkCellDirty(&Key->RegistryHive->Hive, ValueCell->Data, FALSE); HvMarkCellDirty(&Key->RegistryHive->Hive, ValueCellOffset, FALSE); } - - if (cbData > Key->KeyCell->MaxValueDataLen) - Key->KeyCell->MaxValueDataLen = cbData; HvMarkCellDirty(&Key->RegistryHive->Hive, Key->KeyCellOffset, FALSE); @@ -482,27 +470,46 @@ IN LPCWSTR Path) { NTSTATUS Status; + PREPARSE_POINT ReparsePoint; PMEMKEY NewKey; LONG rc; + ReparsePoint = (PREPARSE_POINT)malloc(sizeof(REPARSE_POINT)); + if (!ReparsePoint) + return FALSE; + Status = CmiInitializeTempHive(HiveToConnect); if (!NT_SUCCESS(Status)) { DPRINT1("CmiInitializeTempHive() failed with status 0x%08x\n", Status); + free(ReparsePoint); return FALSE; } /* Create key */ - rc = RegCreateKeyW( + rc = RegCreateKeyExW( RootKey, Path, - (PHKEY)&NewKey); + 0, + NULL, + REG_OPTION_VOLATILE, + 0, + NULL, + (PHKEY)&NewKey, + NULL); if (rc != ERROR_SUCCESS) + { + free(ReparsePoint); return FALSE; - + } + + ReparsePoint->SourceHive = NewKey->RegistryHive; + ReparsePoint->SourceKeyCellOffset = NewKey->KeyCellOffset; NewKey->RegistryHive = HiveToConnect; NewKey->KeyCellOffset = HiveToConnect->Hive.BaseBlock->RootCell; - NewKey->KeyCell = (PCM_KEY_NODE)HvGetCell (&HiveToConnect->Hive, NewKey->KeyCellOffset); + ReparsePoint->DestinationHive = NewKey->RegistryHive; + ReparsePoint->DestinationKeyCellOffset = NewKey->KeyCellOffset; + InsertTailList(&CmiReparsePointsHead, &ReparsePoint->ListEntry); return TRUE; } @@ -513,9 +520,11 @@ { UNICODE_STRING RootKeyName = RTL_CONSTANT_STRING(L"\\"); NTSTATUS Status; - HKEY ControlSetKey; + PMEMKEY ControlSetKey, CurrentControlSetKey; + PREPARSE_POINT ReparsePoint; InitializeListHead(&CmiHiveListHead); + InitializeListHead(&CmiReparsePointsHead); Status = CmiInitializeTempHive(&RootHive); if (!NT_SUCCESS(Status)) @@ -526,8 +535,7 @@ RootKey = CreateInMemoryStructure( &RootHive, - RootHive.Hive.BaseBlock->RootCell, - &RootKeyName); + RootHive.Hive.BaseBlock->RootCell); /* Create DEFAULT key */ ConnectRegistry( @@ -563,7 +571,27 @@ RegCreateKeyW( NULL, L"Registry\\Machine\\SYSTEM\\ControlSet001", - &ControlSetKey); + (HKEY*)&ControlSetKey); + + /* Create 'CurrentControlSet' key */ + RegCreateKeyExW( + NULL, + L"Registry\\Machine\\SYSTEM\\CurrentControlSet", + 0, + NULL, + REG_OPTION_VOLATILE, + 0, + NULL, + (HKEY*)&CurrentControlSetKey, + NULL); + + /* Connect 'CurrentControlSet' to 'ControlSet001' */ + ReparsePoint = (PREPARSE_POINT)malloc(sizeof(REPARSE_POINT)); + ReparsePoint->SourceHive = CurrentControlSetKey->RegistryHive; + ReparsePoint->SourceKeyCellOffset = CurrentControlSetKey->KeyCellOffset; + ReparsePoint->DestinationHive = ControlSetKey->RegistryHive; + ReparsePoint->DestinationKeyCellOffset = ControlSetKey->KeyCellOffset; + InsertTailList(&CmiReparsePointsHead, &ReparsePoint->ListEntry); } VOID Modified: trunk/reactos/tools/mkhive/registry.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/registry.h?re… ============================================================================== --- trunk/reactos/tools/mkhive/registry.h [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/registry.h [iso-8859-1] Sun Oct 5 21:30:57 2014 @@ -6,15 +6,19 @@ #pragma once +typedef struct _REPARSE_POINT +{ + LIST_ENTRY ListEntry; + PCMHIVE SourceHive; + HCELL_INDEX SourceKeyCellOffset; + PCMHIVE DestinationHive; + HCELL_INDEX DestinationKeyCellOffset; +} REPARSE_POINT, *PREPARSE_POINT; + typedef struct _MEMKEY { - LIST_ENTRY KeyList; - LIST_ENTRY SubKeyList; - /* Information on hard disk structure */ - HCELL_INDEX KeyCellOffsetInParentHive; HCELL_INDEX KeyCellOffset; - PCM_KEY_NODE KeyCell; PCMHIVE RegistryHive; } MEMKEY, *PMEMKEY;

1 0

[jgardou] 64551: [NTOS/MM] - Silence some DPRINTs
by jgardou＠svn.reactos.org 05 Oct '14

05 Oct '14

Author: jgardou Date: Sun Oct 5 20:37:30 2014 New Revision: 64551 URL: http://svn.reactos.org/svn/reactos?rev=64551&view=rev Log: [NTOS/MM] - Silence some DPRINTs Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Sun Oct 5 20:37:30 2014 @@ -906,7 +906,7 @@ PMMPFN Pfn1; MMPTE TempPte; PMMPTE PointerToPteForProtoPage; - DPRINT1("Transition fault on 0x%p with PTE 0x%p in process %s\n", + DPRINT("Transition fault on 0x%p with PTE 0x%p in process %s\n", FaultingAddress, PointerPte, CurrentProcess->ImageFileName); /* Windowss does this check */ @@ -923,7 +923,7 @@ /* Get the PFN and the PFN entry */ PageFrameIndex = TempPte.u.Trans.PageFrameNumber; - DPRINT1("Transition PFN: %lx\n", PageFrameIndex); + DPRINT("Transition PFN: %lx\n", PageFrameIndex); Pfn1 = MiGetPfnEntry(PageFrameIndex); /* One more transition fault! */ @@ -957,7 +957,7 @@ if (Pfn1->u3.e1.PageLocation == ActiveAndValid) { /* All Windows does here is a bunch of sanity checks */ - DPRINT1("Transition in active list\n"); + DPRINT("Transition in active list\n"); ASSERT((Pfn1->PteAddress >= MiAddressToPte(MmPagedPoolStart)) && (Pfn1->PteAddress <= MiAddressToPte(MmPagedPoolEnd))); ASSERT(Pfn1->u2.ShareCount != 0); @@ -966,7 +966,7 @@ else { /* Otherwise, the page is removed from its list */ - DPRINT1("Transition page in free/zero list\n"); + DPRINT("Transition page in free/zero list\n"); MiUnlinkPageFromList(Pfn1); MiReferenceUnusedPageAndBumpLockCount(Pfn1); }

1 0

[jgardou] 64550: [ADVAPI32] - Kill also the debug print in the W version.
by jgardou＠svn.reactos.org 05 Oct '14

05 Oct '14

Author: jgardou Date: Sun Oct 5 20:19:49 2014 New Revision: 64550 URL: http://svn.reactos.org/svn/reactos?rev=64550&view=rev Log: [ADVAPI32] - Kill also the debug print in the W version. Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/lo… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] Sun Oct 5 20:19:49 2014 @@ -207,7 +207,6 @@ /* Resume the main thread */ if (!(dwCreationFlags & CREATE_SUSPENDED)) { - ERR("Resuming thread!\n"); ResumeThread(lpProcessInformation->hThread); }

1 0

[jgardou] 64549: [ADVAPI32] - Clean up a leftover debug print
by jgardou＠svn.reactos.org 05 Oct '14

05 Oct '14

Author: jgardou Date: Sun Oct 5 20:17:43 2014 New Revision: 64549 URL: http://svn.reactos.org/svn/reactos?rev=64549&view=rev Log: [ADVAPI32] - Clean up a leftover debug print Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/lo… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] Sun Oct 5 20:17:43 2014 @@ -143,7 +143,6 @@ /* Resume the main thread */ if (!(dwCreationFlags & CREATE_SUSPENDED)) { - ERR("Resuming thread!\n"); ResumeThread(lpProcessInformation->hThread); }

1 0

[hpoussin] 64548: [MKHIVE] Remove dead code and unused structure fields Use MEMKEY/PMEMKEY names to represent registry key node in memory.
by hpoussin＠svn.reactos.org 05 Oct '14

05 Oct '14

Author: hpoussin Date: Sun Oct 5 19:46:00 2014 New Revision: 64548 URL: http://svn.reactos.org/svn/reactos?rev=64548&view=rev Log: [MKHIVE] Remove dead code and unused structure fields Use MEMKEY/PMEMKEY names to represent registry key node in memory. Modified: trunk/reactos/tools/mkhive/registry.c trunk/reactos/tools/mkhive/registry.h Modified: trunk/reactos/tools/mkhive/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/registry.c?re… ============================================================================== --- trunk/reactos/tools/mkhive/registry.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/registry.c [iso-8859-1] Sun Oct 5 19:46:00 2014 @@ -41,35 +41,27 @@ #define REG_DATA_IN_OFFSET 0x80000000 static CMHIVE RootHive; -static MEMKEY RootKey; +static PMEMKEY RootKey; CMHIVE DefaultHive; /* \Registry\User\.DEFAULT */ CMHIVE SamHive; /* \Registry\Machine\SAM */ CMHIVE SecurityHive; /* \Registry\Machine\SECURITY */ CMHIVE SoftwareHive; /* \Registry\Machine\SOFTWARE */ CMHIVE SystemHive; /* \Registry\Machine\SYSTEM */ -static MEMKEY +static PMEMKEY CreateInMemoryStructure( IN PCMHIVE RegistryHive, IN HCELL_INDEX KeyCellOffset, IN PCUNICODE_STRING KeyName) { - MEMKEY Key; - - Key = (MEMKEY) malloc (sizeof(KEY)); + PMEMKEY Key; + + Key = (PMEMKEY) malloc (sizeof(MEMKEY)); if (!Key) return NULL; InitializeListHead (&Key->SubKeyList); - InitializeListHead (&Key->ValueList); InitializeListHead (&Key->KeyList); - - Key->SubKeyCount = 0; - Key->ValueCount = 0; - - Key->DataType = 0; - Key->DataSize = 0; - Key->Data = NULL; Key->RegistryHive = RegistryHive; Key->KeyCellOffset = Key->KeyCellOffsetInParentHive = KeyCellOffset; @@ -81,7 +73,6 @@ } Key->KeyCell->SubKeyLists[Stable] = HCELL_NIL; Key->KeyCell->SubKeyLists[Volatile] = HCELL_NIL; - Key->LinkedKey = NULL; return Key; } @@ -96,8 +87,8 @@ PWSTR End; UNICODE_STRING KeyString; NTSTATUS Status; - MEMKEY ParentKey; - MEMKEY CurrentKey; + PMEMKEY ParentKey; + PMEMKEY CurrentKey; PLIST_ENTRY Ptr; PCM_KEY_NODE SubKeyCell; HCELL_INDEX BlockOffset; @@ -163,7 +154,7 @@ Ptr = ParentKey->SubKeyList.Flink; while (Ptr != &ParentKey->SubKeyList) { - CurrentKey = CONTAINING_RECORD(Ptr, KEY, KeyList); + CurrentKey = CONTAINING_RECORD(Ptr, MEMKEY, KeyList); if (CurrentKey->KeyCellOffsetInParentHive == BlockOffset) { goto nextsubkey; @@ -196,7 +187,6 @@ return ERROR_OUTOFMEMORY; /* Add CurrentKey in ParentKey */ InsertTailList(&ParentKey->SubKeyList, &CurrentKey->KeyList); - ParentKey->SubKeyCount++; } } if (!NT_SUCCESS(Status)) @@ -240,24 +230,6 @@ } LONG WINAPI -RegCreateKeyA( - IN HKEY hKey, - IN LPCSTR lpSubKey, - OUT PHKEY phkResult) -{ - PWSTR lpSubKeyW; - LONG rc; - - lpSubKeyW = MultiByteToWideChar(lpSubKey); - if (!lpSubKeyW) - return ERROR_OUTOFMEMORY; - - rc = RegCreateKeyW(hKey, lpSubKeyW, phkResult); - free(lpSubKeyW); - return rc; -} - -LONG WINAPI RegDeleteKeyW( IN HKEY hKey, IN LPCWSTR lpSubKey) @@ -327,7 +299,7 @@ OUT PCM_KEY_VALUE *ValueCell, OUT PHCELL_INDEX ValueCellOffset) { - MEMKEY ParentKey; + PMEMKEY ParentKey; UNICODE_STRING ValueString; NTSTATUS Status; @@ -364,7 +336,7 @@ IN const UCHAR* lpData, IN USHORT cbData) { - MEMKEY Key, DestKey; + PMEMKEY Key, DestKey; PHKEY phKey; PCM_KEY_VALUE ValueCell; HCELL_INDEX ValueCellOffset; @@ -381,10 +353,6 @@ Key = HKEY_TO_MEMKEY(hKey); DestKey = HKEY_TO_MEMKEY(*phKey); - /* Create the link in memory */ - Key->DataType = REG_LINK; - Key->LinkedKey = DestKey; - /* Create the link in registry hive (if applicable) */ if (Key->RegistryHive != DestKey->RegistryHive) return STATUS_SUCCESS; @@ -467,59 +435,6 @@ DPRINT("Return status 0x%08x\n", Status); return Status; -} - -LONG WINAPI -RegSetValueExA( - IN HKEY hKey, - IN LPCSTR lpValueName OPTIONAL, - IN ULONG Reserved, - IN ULONG dwType, - IN const UCHAR* lpData, - IN ULONG cbData) -{ - LPWSTR lpValueNameW = NULL; - const UCHAR* lpDataW; - USHORT cbDataW; - LONG rc = ERROR_SUCCESS; - - DPRINT("RegSetValueA(%s)\n", lpValueName); - if (lpValueName) - { - lpValueNameW = MultiByteToWideChar(lpValueName); - if (!lpValueNameW) - return ERROR_OUTOFMEMORY; - } - - if ((dwType == REG_SZ || dwType == REG_EXPAND_SZ || dwType == REG_MULTI_SZ) - && cbData != 0) - { - ANSI_STRING AnsiString; - UNICODE_STRING Data; - - if (lpData[cbData - 1] != '\0') - cbData++; - RtlInitAnsiString(&AnsiString, NULL); - AnsiString.Buffer = (PSTR)lpData; - AnsiString.Length = (USHORT)cbData - 1; - AnsiString.MaximumLength = (USHORT)cbData; - RtlAnsiStringToUnicodeString (&Data, &AnsiString, TRUE); - lpDataW = (const UCHAR*)Data.Buffer; - cbDataW = Data.MaximumLength; - } - else - { - lpDataW = lpData; - cbDataW = (USHORT)cbData; - } - - if (rc == ERROR_SUCCESS) - rc = RegSetValueExW(hKey, lpValueNameW, 0, dwType, lpDataW, cbDataW); - if (lpValueNameW) - free(lpValueNameW); - if (lpData != lpDataW) - free((PVOID)lpDataW); - return rc; } LONG WINAPI @@ -552,58 +467,12 @@ } LONG WINAPI -RegQueryValueExA( - IN HKEY hKey, - IN LPCSTR lpValueName, - IN PULONG lpReserved, - OUT PULONG lpType, - OUT PUCHAR lpData, - OUT PSIZE_T lpcbData) -{ - LPWSTR lpValueNameW = NULL; - LONG rc; - - if (lpValueName) - { - lpValueNameW = MultiByteToWideChar(lpValueName); - if (!lpValueNameW) - return ERROR_OUTOFMEMORY; - } - - rc = RegQueryValueExW(hKey, lpValueNameW, lpReserved, lpType, lpData, lpcbData); - if (lpValueNameW) - free(lpValueNameW); - return rc; -} - -LONG WINAPI RegDeleteValueW( IN HKEY hKey, IN LPCWSTR lpValueName OPTIONAL) { DPRINT1("RegDeleteValueW() unimplemented\n"); return ERROR_UNSUCCESSFUL; -} - -LONG WINAPI -RegDeleteValueA( - IN HKEY hKey, - IN LPCSTR lpValueName OPTIONAL) -{ - LPWSTR lpValueNameW; - LONG rc; - - if (lpValueName) - { - lpValueNameW = MultiByteToWideChar(lpValueName); - if (!lpValueNameW) - return ERROR_OUTOFMEMORY; - rc = RegDeleteValueW(hKey, lpValueNameW); - free(lpValueNameW); - } - else - rc = RegDeleteValueW(hKey, NULL); - return rc; } static BOOL @@ -613,7 +482,7 @@ IN LPCWSTR Path) { NTSTATUS Status; - MEMKEY NewKey; + PMEMKEY NewKey; LONG rc; Status = CmiInitializeTempHive(HiveToConnect); Modified: trunk/reactos/tools/mkhive/registry.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/registry.h?re… ============================================================================== --- trunk/reactos/tools/mkhive/registry.h [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/registry.h [iso-8859-1] Sun Oct 5 19:46:00 2014 @@ -6,45 +6,19 @@ #pragma once -typedef struct _REG_VALUE -{ - LIST_ENTRY ValueList; - - /* value name */ - ULONG NameSize; - PCHAR Name; - - /* value data */ - ULONG DataType; - ULONG DataSize; - PCHAR Data; -} VALUE, *PVALUE; - -typedef struct _REG_KEY +typedef struct _MEMKEY { LIST_ENTRY KeyList; LIST_ENTRY SubKeyList; - LIST_ENTRY ValueList; - - ULONG SubKeyCount; - ULONG ValueCount; - - /* default data */ - ULONG DataType; - ULONG DataSize; - PCHAR Data; /* Information on hard disk structure */ HCELL_INDEX KeyCellOffsetInParentHive; HCELL_INDEX KeyCellOffset; PCM_KEY_NODE KeyCell; PCMHIVE RegistryHive; +} MEMKEY, *PMEMKEY; - /* Used when linking to another key */ - struct _REG_KEY* LinkedKey; -} KEY, *FRLDRHKEY, **PFRLDRHKEY, *MEMKEY, **PMEMKEY; - -#define HKEY_TO_MEMKEY(hKey) ((MEMKEY)(hKey)) +#define HKEY_TO_MEMKEY(hKey) ((PMEMKEY)(hKey)) #define MEMKEY_TO_HKEY(memKey) ((HKEY)(memKey)) extern CMHIVE DefaultHive; /* \Registry\User\.DEFAULT */ @@ -73,49 +47,6 @@ #define REG_FULL_RESOURCE_DESCRIPTOR 9 #define REG_RESOURCE_REQUIREMENTS_LIST 10 -LONG WINAPI -RegCreateKeyA( - IN HKEY hKey, - IN LPCSTR lpSubKey, - OUT PHKEY phkResult); - -LONG WINAPI -RegOpenKeyA( - IN HKEY hKey, - IN LPCSTR lpSubKey, - OUT PHKEY phkResult); - -LONG WINAPI -RegQueryValueExA(HKEY Key, - LPCSTR ValueName, - PULONG Reserved, - PULONG Type, - PUCHAR Data, - PSIZE_T DataSize); - -LONG WINAPI -RegSetValueExA( - IN HKEY hKey, - IN LPCSTR lpValueName OPTIONAL, - ULONG Reserved, - IN ULONG dwType, - IN const UCHAR* lpData, - IN ULONG cbData); - -LONG WINAPI -RegDeleteValueA(HKEY Key, - LPCSTR ValueName); - -LONG WINAPI -RegDeleteKeyA(HKEY Key, - LPCSTR Name); - -USHORT -RegGetSubKeyCount (HKEY Key); - -ULONG -RegGetValueCount (HKEY Key); - VOID RegInitializeRegistry(VOID);

1 0

[hpoussin] 64547: [MKHIVE] Remove key name in our custom registry tree; use cell index instead
by hpoussin＠svn.reactos.org 05 Oct '14

05 Oct '14

Author: hpoussin Date: Sun Oct 5 19:45:37 2014 New Revision: 64547 URL: http://svn.reactos.org/svn/reactos?rev=64547&view=rev Log: [MKHIVE] Remove key name in our custom registry tree; use cell index instead Modified: trunk/reactos/tools/mkhive/registry.c trunk/reactos/tools/mkhive/registry.h Modified: trunk/reactos/tools/mkhive/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/registry.c?re… ============================================================================== --- trunk/reactos/tools/mkhive/registry.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/registry.c [iso-8859-1] Sun Oct 5 19:45:37 2014 @@ -67,24 +67,15 @@ Key->SubKeyCount = 0; Key->ValueCount = 0; - Key->NameSize = KeyName->Length; - /* FIXME: It's not enough to allocate this way, because later - this memory gets overwritten with bigger names */ - Key->Name = malloc (Key->NameSize); - if (!Key->Name) - return NULL; - memcpy(Key->Name, KeyName->Buffer, KeyName->Length); - Key->DataType = 0; Key->DataSize = 0; Key->Data = NULL; Key->RegistryHive = RegistryHive; - Key->KeyCellOffset = KeyCellOffset; + Key->KeyCellOffset = Key->KeyCellOffsetInParentHive = KeyCellOffset; Key->KeyCell = (PCM_KEY_NODE)HvGetCell (&RegistryHive->Hive, Key->KeyCellOffset); if (!Key->KeyCell) { - free(Key->Name); free(Key); return NULL; } @@ -110,6 +101,7 @@ PLIST_ENTRY Ptr; PCM_KEY_NODE SubKeyCell; HCELL_INDEX BlockOffset; + BOOLEAN ParentIsSystem = FALSE; DPRINT("RegpCreateOpenKey('%S')\n", KeyName); @@ -148,23 +140,14 @@ } /* Redirect from 'CurrentControlSet' to 'ControlSet001' */ - if (!strncmpW(LocalKeyName, L"CurrentControlSet", 17) && - ParentKey->NameSize == 12 && - !memcmp(ParentKey->Name, L"SYSTEM", 12)) + if (!strncmpiW(LocalKeyName, L"CurrentControlSet", 17) && ParentIsSystem) + { RtlInitUnicodeString(&KeyString, L"ControlSet001"); - - /* Check subkey in memory structure */ - Ptr = ParentKey->SubKeyList.Flink; - while (Ptr != &ParentKey->SubKeyList) + ParentIsSystem = FALSE; + } + else { - CurrentKey = CONTAINING_RECORD(Ptr, KEY, KeyList); - if (CurrentKey->NameSize == KeyString.Length - && strncmpiW(CurrentKey->Name, KeyString.Buffer, KeyString.Length / sizeof(WCHAR)) == 0) - { - goto nextsubkey; - } - - Ptr = Ptr->Flink; + ParentIsSystem = (strncmpiW(LocalKeyName, L"SYSTEM", 6) == 0); } Status = CmiScanForSubKey( @@ -174,6 +157,24 @@ OBJ_CASE_INSENSITIVE, &SubKeyCell, &BlockOffset); + if (NT_SUCCESS(Status)) + { + /* Check subkey in memory structure */ + Ptr = ParentKey->SubKeyList.Flink; + while (Ptr != &ParentKey->SubKeyList) + { + CurrentKey = CONTAINING_RECORD(Ptr, KEY, KeyList); + if (CurrentKey->KeyCellOffsetInParentHive == BlockOffset) + { + goto nextsubkey; + } + + Ptr = Ptr->Flink; + } + /* If we go there, this means that key exists, but we don't know it */ + ASSERT(FALSE); + } + if (AllowCreation && Status == STATUS_OBJECT_NAME_NOT_FOUND) { Status = CmiAddSubKey( @@ -184,21 +185,22 @@ 0, &SubKeyCell, &BlockOffset); + if (NT_SUCCESS(Status)) + { + /* Now, SubKeyCell/BlockOffset are valid */ + CurrentKey = CreateInMemoryStructure( + ParentKey->RegistryHive, + BlockOffset, + &KeyString); + if (!CurrentKey) + return ERROR_OUTOFMEMORY; + /* Add CurrentKey in ParentKey */ + InsertTailList(&ParentKey->SubKeyList, &CurrentKey->KeyList); + ParentKey->SubKeyCount++; + } } if (!NT_SUCCESS(Status)) return ERROR_UNSUCCESSFUL; - - /* Now, SubKeyCell/BlockOffset are valid */ - CurrentKey = CreateInMemoryStructure( - ParentKey->RegistryHive, - BlockOffset, - &KeyString); - if (!CurrentKey) - return ERROR_OUTOFMEMORY; - - /* Add CurrentKey in ParentKey */ - InsertTailList(&ParentKey->SubKeyList, &CurrentKey->KeyList); - ParentKey->SubKeyCount++; nextsubkey: ParentKey = CurrentKey; @@ -700,7 +702,6 @@ { /* FIXME: clean up the complete hive */ - free(RootKey->Name); free(RootKey); } Modified: trunk/reactos/tools/mkhive/registry.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/registry.h?re… ============================================================================== --- trunk/reactos/tools/mkhive/registry.h [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/registry.h [iso-8859-1] Sun Oct 5 19:45:37 2014 @@ -29,15 +29,13 @@ ULONG SubKeyCount; ULONG ValueCount; - ULONG NameSize; - PWCHAR Name; - /* default data */ ULONG DataType; ULONG DataSize; PCHAR Data; /* Information on hard disk structure */ + HCELL_INDEX KeyCellOffsetInParentHive; HCELL_INDEX KeyCellOffset; PCM_KEY_NODE KeyCell; PCMHIVE RegistryHive;

1 0

[khornicek] 64546: [CHARMAP] - remove dead code CID 1237028 [SETUPAPI] - fix swapped arguments CID 1237062
by khornicek＠svn.reactos.org 05 Oct '14

05 Oct '14

Author: khornicek Date: Sun Oct 5 14:55:15 2014 New Revision: 64546 URL: http://svn.reactos.org/svn/reactos?rev=64546&view=rev Log: [CHARMAP] - remove dead code CID 1237028 [SETUPAPI] - fix swapped arguments CID 1237062 Modified: trunk/reactos/base/applications/charmap/settings.c trunk/reactos/dll/win32/setupapi/misc.c Modified: trunk/reactos/base/applications/charmap/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/settings.c [iso-8859-1] Sun Oct 5 14:55:15 2014 @@ -90,8 +90,9 @@ } RegQueryValueEx(hKey, _T("Advanced"), NULL, &type, (LPBYTE)&dwAdvanChecked, &size); + if(dwAdvanChecked == TRUE) - SendDlgItemMessage(hCharmapDlg, IDC_CHECK_ADVANCED, BM_CLICK, (dwAdvanChecked ? MF_CHECKED : MF_UNCHECKED), 0); + SendDlgItemMessage(hCharmapDlg, IDC_CHECK_ADVANCED, BM_CLICK, MF_CHECKED, 0); RegCloseKey(hKey); } Modified: trunk/reactos/dll/win32/setupapi/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/misc.c?… ============================================================================== --- trunk/reactos/dll/win32/setupapi/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/misc.c [iso-8859-1] Sun Oct 5 14:55:15 2014 @@ -1090,7 +1090,7 @@ posX = ((nOwnerWidth - nWindowWidth) / 2) + ptOrigin.x; posY = ((nOwnerHeight - nWindowHeight) / 2) + ptOrigin.y; - MoveWindow(hwnd, posX, posY, nWindowHeight, nWindowWidth, 0); + MoveWindow(hwnd, posX, posY, nWindowWidth, nWindowHeight, 0); }

1 0

[jgardou] 64545: [NTOS/SE] - Do not fail when setting the same primary token for a process. - Fake equality of tokens when both of them are (not) restricted. CORE-8554 #resolve #comment JRE-7u65 no...
by jgardou＠svn.reactos.org 05 Oct '14

05 Oct '14

Author: jgardou Date: Sun Oct 5 14:20:08 2014 New Revision: 64545 URL: http://svn.reactos.org/svn/reactos?rev=64545&view=rev Log: [NTOS/SE] - Do not fail when setting the same primary token for a process. - Fake equality of tokens when both of them are (not) restricted. CORE-8554 #resolve #comment JRE-7u65 now installs fine Modified: trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=64… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Sun Oct 5 14:20:08 2014 @@ -108,6 +108,8 @@ } /* FIXME: Check if every privilege that is present in either token is also present in the other one */ + DPRINT1("FIXME: Pretending tokens are equal!\n"); + IsEqual = TRUE; } *Equal = IsEqual; @@ -231,7 +233,30 @@ PAGED_CODE(); if (NewToken->TokenType != TokenPrimary) return(STATUS_BAD_TOKEN_TYPE); - if (NewToken->TokenInUse) return(STATUS_TOKEN_ALREADY_IN_USE); + if (NewToken->TokenInUse) + { + BOOLEAN IsEqual; + NTSTATUS Status; + + /* Maybe we're trying to set the same token */ + OldToken = PsReferencePrimaryToken(Process); + if (OldToken == NewToken) + { + /* So it's a nop. */ + PsDereferencePrimaryToken(OldToken); + return STATUS_SUCCESS; + } + + Status = SepCompareTokens(OldToken, NewToken, &IsEqual); + if (!NT_SUCCESS(Status)) + { + PsDereferencePrimaryToken(OldToken); + return Status; + } + + PsDereferencePrimaryToken(OldToken); + return IsEqual ? STATUS_SUCCESS : STATUS_TOKEN_ALREADY_IN_USE; + } /* Mark new token in use */ NewToken->TokenInUse = 1;

1 0

[jgardou] 64544: [ADVAPI32] - Add a few debug prints.
by jgardou＠svn.reactos.org 05 Oct '14

05 Oct '14

Author: jgardou Date: Sun Oct 5 14:19:53 2014 New Revision: 64544 URL: http://svn.reactos.org/svn/reactos?rev=64544&view=rev Log: [ADVAPI32] - Add a few debug prints. Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c trunk/reactos/dll/win32/advapi32/sec/misc.c trunk/reactos/dll/win32/advapi32/token/token.c Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/lo… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] Sun Oct 5 14:19:53 2014 @@ -105,6 +105,10 @@ PROCESS_ACCESS_TOKEN AccessToken; NTSTATUS Status; + TRACE("%p %s %s %p %p %d 0x%08x %p %s %p %p\n", hToken, debugstr_a(lpApplicationName), + debugstr_a(lpCommandLine), lpProcessAttributes, lpThreadAttributes, bInheritHandles, + dwCreationFlags, lpEnvironment, debugstr_a(lpCurrentDirectory), lpStartupInfo, lpProcessInformation); + /* Create the process with a suspended main thread */ if (!CreateProcessA(lpApplicationName, lpCommandLine, @@ -117,6 +121,7 @@ lpStartupInfo, lpProcessInformation)) { + ERR("CreateProcessA failed! GLE: %d\n", GetLastError()); return FALSE; } @@ -130,6 +135,7 @@ sizeof(AccessToken)); if (!NT_SUCCESS (Status)) { + ERR("NtSetInformationProcess failed: 0x%08x\n", Status); SetLastError(RtlNtStatusToDosError(Status)); return FALSE; } @@ -137,6 +143,7 @@ /* Resume the main thread */ if (!(dwCreationFlags & CREATE_SUSPENDED)) { + ERR("Resuming thread!\n"); ResumeThread(lpProcessInformation->hThread); } @@ -163,6 +170,10 @@ PROCESS_ACCESS_TOKEN AccessToken; NTSTATUS Status; + TRACE("%p %s %s %p %p %d 0x%08x %p %s %p %p\n", hToken, debugstr_w(lpApplicationName), + debugstr_w(lpCommandLine), lpProcessAttributes, lpThreadAttributes, bInheritHandles, + dwCreationFlags, lpEnvironment, debugstr_w(lpCurrentDirectory), lpStartupInfo, lpProcessInformation); + /* Create the process with a suspended main thread */ if (!CreateProcessW(lpApplicationName, lpCommandLine, @@ -175,6 +186,7 @@ lpStartupInfo, lpProcessInformation)) { + ERR("CreateProcessW failed! GLE: %d\n", GetLastError()); return FALSE; } @@ -188,6 +200,7 @@ sizeof(AccessToken)); if (!NT_SUCCESS (Status)) { + ERR("NtSetInformationProcess failed: 0x%08x\n", Status); SetLastError(RtlNtStatusToDosError(Status)); return FALSE; } @@ -195,6 +208,7 @@ /* Resume the main thread */ if (!(dwCreationFlags & CREATE_SUSPENDED)) { + ERR("Resuming thread!\n"); ResumeThread(lpProcessInformation->hThread); } Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/mis… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] Sun Oct 5 14:19:53 2014 @@ -526,6 +526,7 @@ &NewToken); if (!NT_SUCCESS(Status)) { + ERR("NtDuplicateToken failed: Status %08x\n", Status); SetLastError(RtlNtStatusToDosError(Status)); return FALSE; } @@ -552,6 +553,7 @@ if (!NT_SUCCESS(Status)) { + ERR("NtSetInformationThread failed: Status %08x\n", Status); SetLastError(RtlNtStatusToDosError(Status)); return FALSE; } Modified: trunk/reactos/dll/win32/advapi32/token/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/token/t… ============================================================================== --- trunk/reactos/dll/win32/advapi32/token/token.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/token/token.c [iso-8859-1] Sun Oct 5 14:19:53 2014 @@ -218,14 +218,19 @@ { NTSTATUS Status; + TRACE("%p, %x, %p.\n", ProcessHandle, DesiredAccess, TokenHandle); + Status = NtOpenProcessToken(ProcessHandle, DesiredAccess, TokenHandle); if (!NT_SUCCESS(Status)) { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } + ERR("NtOpenProcessToken failed! Status %08x.\n", Status); + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + TRACE("Returning token %p.\n", *TokenHandle); return TRUE; } @@ -297,6 +302,9 @@ NTSTATUS Status; SECURITY_QUALITY_OF_SERVICE Sqos; + TRACE("%p 0x%08x 0x%08x 0x%08x %p\n", ExistingTokenHandle, dwDesiredAccess, + ImpersonationLevel, TokenType, DuplicateTokenHandle); + Sqos.Length = sizeof(SECURITY_QUALITY_OF_SERVICE); Sqos.ImpersonationLevel = ImpersonationLevel; Sqos.ContextTrackingMode = 0; @@ -329,9 +337,12 @@ DuplicateTokenHandle); if (!NT_SUCCESS(Status)) { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } + ERR("NtDuplicateToken failed: Status %08x\n", Status); + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + TRACE("Returning token %p.\n", *DuplicateTokenHandle); return TRUE; }

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