Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[jgardou] 64550: [ADVAPI32] - Kill also the debug print in the W version.

by jgardou＠svn.reactos.org

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); }

9 years, 11 months

[jgardou] 64549: [ADVAPI32] - Clean up a leftover debug print

by jgardou＠svn.reactos.org

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); }

9 years, 11 months

[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

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);

9 years, 11 months

[hpoussin] 64547: [MKHIVE] Remove key name in our custom registry tree; use cell index instead

by hpoussin＠svn.reactos.org

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;

9 years, 11 months

[khornicek] 64546: [CHARMAP] - remove dead code CID 1237028 [SETUPAPI] - fix swapped arguments CID 1237062

by khornicek＠svn.reactos.org

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); }

9 years, 11 months

[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

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;

9 years, 11 months

[jgardou] 64544: [ADVAPI32] - Add a few debug prints.

by jgardou＠svn.reactos.org

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; }

9 years, 11 months

[ekohl] 64543: [DEVMGR] - Include "precomp.h" instead of <windef.h>. - Use UNIMPLEMENTED again.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Oct 5 12:40:22 2014 New Revision: 64543 URL: http://svn.reactos.org/svn/reactos?rev=64543&view=rev Log: [DEVMGR] - Include "precomp.h" instead of <windef.h>. - Use UNIMPLEMENTED again. Modified: trunk/reactos/dll/win32/devmgr/stubs.c Modified: trunk/reactos/dll/win32/devmgr/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/stubs.c?r… ============================================================================== --- trunk/reactos/dll/win32/devmgr/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/stubs.c [iso-8859-1] Sun Oct 5 12:40:22 2014 @@ -16,7 +16,7 @@ * 04-04-2004 Created */ -#include <windef.h> +#include "precomp.h" /*************************************************************************** @@ -51,7 +51,7 @@ LPCSTR lpMachineName, int nCmdShow) { - FIXME("unimplemented\n"); + UNIMPLEMENTED; return FALSE; } @@ -88,7 +88,7 @@ LPCWSTR lpMachineName, int nCmdShow) { - FIXME("unimplemented\n"); + UNIMPLEMENTED; return FALSE; } @@ -127,7 +127,7 @@ LPCSTR lpDeviceCmd, int nCmdShow) { - FIXME("unimplemented\n"); + UNIMPLEMENTED; } @@ -165,7 +165,7 @@ LPCWSTR lpDeviceCmd, int nCmdShow) { - FIXME("unimplemented\n"); + UNIMPLEMENTED; } @@ -208,7 +208,7 @@ UINT uNumberOfGuids, LPGUID lpGuids) { - FIXME("unimplemented\n"); + UNIMPLEMENTED; return FALSE; } @@ -252,6 +252,6 @@ UINT uNumberOfGuids, LPGUID lpGuids) { - FIXME("unimplemented\n"); - return FALSE; -} + UNIMPLEMENTED; + return FALSE; +}

9 years, 11 months

[ekohl] 64542: [DEVMGR] Replace UNIMPLMENTED by FIXME.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Oct 5 12:34:07 2014 New Revision: 64542 URL: http://svn.reactos.org/svn/reactos?rev=64542&view=rev Log: [DEVMGR] Replace UNIMPLMENTED by FIXME. Modified: trunk/reactos/dll/win32/devmgr/stubs.c Modified: trunk/reactos/dll/win32/devmgr/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/stubs.c?r… ============================================================================== --- trunk/reactos/dll/win32/devmgr/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/stubs.c [iso-8859-1] Sun Oct 5 12:34:07 2014 @@ -51,7 +51,7 @@ LPCSTR lpMachineName, int nCmdShow) { - UNIMPLEMENTED; + FIXME("unimplemented\n"); return FALSE; } @@ -88,7 +88,7 @@ LPCWSTR lpMachineName, int nCmdShow) { - UNIMPLEMENTED; + FIXME("unimplemented\n"); return FALSE; } @@ -127,7 +127,7 @@ LPCSTR lpDeviceCmd, int nCmdShow) { - UNIMPLEMENTED; + FIXME("unimplemented\n"); } @@ -165,7 +165,7 @@ LPCWSTR lpDeviceCmd, int nCmdShow) { - UNIMPLEMENTED; + FIXME("unimplemented\n"); } @@ -208,7 +208,7 @@ UINT uNumberOfGuids, LPGUID lpGuids) { - UNIMPLEMENTED; + FIXME("unimplemented\n"); return FALSE; } @@ -252,6 +252,6 @@ UINT uNumberOfGuids, LPGUID lpGuids) { - UNIMPLEMENTED; - return FALSE; -} + FIXME("unimplemented\n"); + return FALSE; +}

9 years, 11 months

[ekohl] 64541: [DEVMGR] Use a new debug channel 'devmgr' instead of DPRINTFs.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Oct 5 12:25:05 2014 New Revision: 64541 URL: http://svn.reactos.org/svn/reactos?rev=64541&view=rev Log: [DEVMGR] Use a new debug channel 'devmgr' instead of DPRINTFs. Modified: trunk/reactos/dll/win32/devmgr/advprop.c trunk/reactos/dll/win32/devmgr/devprblm.c trunk/reactos/dll/win32/devmgr/hwpage.c trunk/reactos/dll/win32/devmgr/hwresource.c trunk/reactos/dll/win32/devmgr/misc.c trunk/reactos/dll/win32/devmgr/precomp.h trunk/reactos/dll/win32/devmgr/stubs.c Modified: trunk/reactos/dll/win32/devmgr/advprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/advprop.c… ============================================================================== --- trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] Sun Oct 5 12:25:05 2014 @@ -31,8 +31,6 @@ #include <winver.h> -#define NDEBUG -#include <debug.h> static UINT WINAPI EnumDeviceDriverFilesCallback(IN PVOID Context, @@ -440,14 +438,14 @@ if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken)) { - DPRINT("OpenProcessToken failed\n"); + ERR("OpenProcessToken failed\n"); return; } /* Get the LUID for the Shutdown privilege */ if (!LookupPrivilegeValueW(NULL, SE_SHUTDOWN_NAME, &Privileges.Privileges[0].Luid)) { - DPRINT("LookupPrivilegeValue failed\n"); + ERR("LookupPrivilegeValue failed\n"); CloseHandle(hToken); return; } @@ -458,7 +456,7 @@ if (!AdjustTokenPrivileges(hToken, FALSE, &Privileges, 0, NULL, NULL)) { - DPRINT("AdjustTokenPrivileges failed\n"); + ERR("AdjustTokenPrivileges failed\n"); CloseHandle(hToken); return; } @@ -466,7 +464,7 @@ /* Finally shut down the system */ if (!ExitWindowsEx(EWX_REBOOT, SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER | SHTDN_REASON_FLAG_PLANNED)) { - DPRINT("ExitWindowsEx failed\n"); + ERR("ExitWindowsEx failed\n"); CloseHandle(hToken); } } @@ -1587,8 +1585,8 @@ else { /* FIXME - display an error message */ - DPRINT1("Failed to enable/disable device! LastError: %d\n", - GetLastError()); + FIXME("Failed to enable/disable device! LastError: %d\n", + GetLastError()); } } else @@ -2411,7 +2409,7 @@ 0, &DevIdSize)) { - DPRINT1("SetupDiGetDeviceInstanceId unexpectedly returned TRUE!\n"); + ERR("SetupDiGetDeviceInstanceId unexpectedly returned TRUE!\n"); return -1; } @@ -2903,7 +2901,7 @@ if (dwFlags & ~(DPF_EXTENDED | DPF_DEVICE_STATUS_ACTION)) { - DPRINT1("DevPropertiesExW: Invalid flags: 0x%x\n", + FIXME("DevPropertiesExW: Invalid flags: 0x%x\n", dwFlags & ~(DPF_EXTENDED | DPF_DEVICE_STATUS_ACTION)); SetLastError(ERROR_INVALID_FLAGS); return -1; @@ -2911,7 +2909,7 @@ if (bShowDevMgr) { - DPRINT("DevPropertiesExW doesn't support bShowDevMgr!\n"); + FIXME("DevPropertiesExW doesn't support bShowDevMgr!\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); } else @@ -3132,7 +3130,7 @@ szDeviceID, szMachineName)) { - DPRINT1("DeviceProperties_RunDLLW DeviceID: %S, MachineName: %S\n", szDeviceID, szMachineName); + ERR("DeviceProperties_RunDLLW DeviceID: %S, MachineName: %S\n", szDeviceID, szMachineName); return; } Modified: trunk/reactos/dll/win32/devmgr/devprblm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devprblm.… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devprblm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devprblm.c [iso-8859-1] Sun Oct 5 12:25:05 2014 @@ -27,8 +27,6 @@ #include "precomp.h" -#define NDEBUG -#include <debug.h> BOOL ShowDeviceProblemWizard(IN HWND hWndParent OPTIONAL, Modified: trunk/reactos/dll/win32/devmgr/hwpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/hwpage.c?… ============================================================================== --- trunk/reactos/dll/win32/devmgr/hwpage.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/hwpage.c [iso-8859-1] Sun Oct 5 12:25:05 2014 @@ -27,8 +27,6 @@ #include "precomp.h" -#define NDEBUG -#include <debug.h> typedef struct _HWDEVINFO { @@ -314,8 +312,8 @@ } else { - DPRINT1("Unable to allocate memory for %d SP_DEVINFO_DATA structures!\n", - ClassDevInfo->ItemCount + 1); + ERR("Unable to allocate memory for %d SP_DEVINFO_DATA structures!\n", + ClassDevInfo->ItemCount + 1); break; } } @@ -326,7 +324,7 @@ sizeof(HWDEVINFO)); if (ClassDevInfo->HwDevInfo == NULL) { - DPRINT1("Unable to allocate memory for a SP_DEVINFO_DATA structures!\n"); + ERR("Unable to allocate memory for a SP_DEVINFO_DATA structures!\n"); break; } } Modified: trunk/reactos/dll/win32/devmgr/hwresource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/hwresourc… ============================================================================== --- trunk/reactos/dll/win32/devmgr/hwresource.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/hwresource.c [iso-8859-1] Sun Oct 5 12:25:05 2014 @@ -9,8 +9,6 @@ #include "precomp.h" -#define NDEBUG -#include <debug.h> typedef struct { Modified: trunk/reactos/dll/win32/devmgr/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/misc.c?re… ============================================================================== --- trunk/reactos/dll/win32/devmgr/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/misc.c [iso-8859-1] Sun Oct 5 12:25:05 2014 @@ -27,8 +27,6 @@ #include "precomp.h" -#define NDEBUG -#include <debug.h> HINSTANCE hDllInstance = NULL; @@ -954,7 +952,7 @@ DeviceInfoData, &InstallParams)) { - DPRINT1("SetupDiSetDeviceInstallParams() failed with error 0x%lx\n", GetLastError()); + ERR("SetupDiSetDeviceInstallParams() failed with error 0x%lx\n", GetLastError()); goto Cleanup; } @@ -990,7 +988,7 @@ KEY_QUERY_VALUE); if (hKey == INVALID_HANDLE_VALUE) { - DPRINT1("SetupDiOpenDevRegKey() failed with error 0x%lx\n", GetLastError()); + ERR("SetupDiOpenDevRegKey() failed with error 0x%lx\n", GetLastError()); goto Cleanup; } @@ -1004,14 +1002,14 @@ &dwLength); if (rc != ERROR_SUCCESS) { + ERR("RegQueryValueEx() failed with error 0x%lx\n", GetLastError()); SetLastError(rc); - DPRINT1("RegQueryValueEx() failed with error 0x%lx\n", GetLastError()); goto Cleanup; } else if (dwType != REG_SZ) { + ERR("Expected registry type REG_SZ (%lu), got %lu\n", REG_SZ, dwType); SetLastError(ERROR_GEN_FAILURE); - DPRINT1("Expected registry type REG_SZ (%lu), got %lu\n", REG_SZ, dwType); goto Cleanup; } InfPath[(dwLength / sizeof(WCHAR)) - 1] = L'\0'; @@ -1024,7 +1022,7 @@ DeviceInfoData, &InstallParams)) { - DPRINT1("SetupDiSetDeviceInstallParams() failed with error 0x%lx\n", GetLastError()); + ERR("SetupDiSetDeviceInstallParams() failed with error 0x%lx\n", GetLastError()); goto Cleanup; } @@ -1033,7 +1031,7 @@ DeviceInfoData, SPDIT_CLASSDRIVER)) { - DPRINT1("SetupDiBuildDriverInfoList() failed with error 0x%lx\n", GetLastError()); + ERR("SetupDiBuildDriverInfoList() failed with error 0x%lx\n", GetLastError()); goto Cleanup; } @@ -1047,14 +1045,14 @@ &dwLength); if (rc != ERROR_SUCCESS) { + ERR("RegQueryValueEx() failed with error 0x%lx\n", GetLastError()); SetLastError(rc); - DPRINT1("RegQueryValueEx() failed with error 0x%lx\n", GetLastError()); goto Cleanup; } else if (dwType != REG_SZ) { + ERR("Expected registry type REG_SZ (%lu), got %lu\n", REG_SZ, dwType); SetLastError(ERROR_GEN_FAILURE); - DPRINT1("Expected registry type REG_SZ (%lu), got %lu\n", REG_SZ, dwType); goto Cleanup; } InfPath[(dwLength / sizeof(WCHAR)) - 1] = L'\0'; @@ -1077,7 +1075,7 @@ NULL) && GetLastError() != ERROR_INSUFFICIENT_BUFFER) { - DPRINT1("SetupDiGetDriverInfoDetail() failed with error 0x%lx\n", GetLastError()); + ERR("SetupDiGetDriverInfoDetail() failed with error 0x%lx\n", GetLastError()); goto Cleanup; } if (!wcsicmp(DriverInfoDetailData.SectionName, @@ -1092,7 +1090,7 @@ } if (GetLastError() != ERROR_NO_MORE_ITEMS) { - DPRINT1("SetupDiEnumDriverInfo() failed with error 0x%lx\n", GetLastError()); + ERR("SetupDiEnumDriverInfo() failed with error 0x%lx\n", GetLastError()); goto Cleanup; } Modified: trunk/reactos/dll/win32/devmgr/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/devmgr/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/precomp.h [iso-8859-1] Sun Oct 5 12:25:05 2014 @@ -14,12 +14,13 @@ #include <setupapi.h> #include <cfgmgr32.h> #include <dll/devmgr/devmgr.h> +#include <wine/debug.h> #include "resource.h" +WINE_DEFAULT_DEBUG_CHANNEL(devmgr); + extern HINSTANCE hDllInstance; - -ULONG DbgPrint(PCCH Format,...); typedef INT_PTR (WINAPI *PPROPERTYSHEETW)(LPCPROPSHEETHEADERW); typedef HPROPSHEETPAGE (WINAPI *PCREATEPROPERTYSHEETPAGEW)(LPCPROPSHEETPAGEW); Modified: trunk/reactos/dll/win32/devmgr/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/stubs.c?r… ============================================================================== --- trunk/reactos/dll/win32/devmgr/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/stubs.c [iso-8859-1] Sun Oct 5 12:25:05 2014 @@ -18,8 +18,6 @@ #include <windef.h> -#define NDEBUG -#include <debug.h> /*************************************************************************** * NAME EXPORTED

9 years, 11 months

← Newer
1
...
59
60
61
62
63
64
65
...
73
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 October 2014