Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [msports] Notify the system of changes to the serial port settings.
by Eric Kohl 28 Sep '18

28 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f155de483f53429d7f138… commit f155de483f53429d7f13802740adf55cde000e85 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Sep 29 01:57:59 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Sep 29 01:57:59 2018 +0200 [msports] Notify the system of changes to the serial port settings. --- dll/win32/msports/serial.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dll/win32/msports/serial.c b/dll/win32/msports/serial.c index b248072a30..768fedf604 100644 --- a/dll/win32/msports/serial.c +++ b/dll/win32/msports/serial.c @@ -323,6 +323,12 @@ WritePortSettings( return; } + /* Notify the system */ + PostMessageW(HWND_BROADCAST, + WM_WININICHANGE, + 0, + (LPARAM)pPortData->szPortName); + TRACE("Done!\n"); }

1 0

01/01: [SERVICES] Control set code clean-up
by Eric Kohl 28 Sep '18

28 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f939e057c23e1585acab… commit 8f939e057c23e1585acab1b2f4d08bf7bf549a58 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Sep 29 01:31:02 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Sep 29 01:31:58 2018 +0200 [SERVICES] Control set code clean-up - Flush the new control set after the control set has been created. - Make sure that we create a new control set only on the first boot after setup. - Move the control set copy code to a separate function. - Get rid of the global control set values. --- base/system/services/controlset.c | 272 +++++++++++++++++++++----------------- base/system/services/services.c | 7 +- base/system/services/services.h | 4 +- 3 files changed, 157 insertions(+), 126 deletions(-) diff --git a/base/system/services/controlset.c b/base/system/services/controlset.c index 948f3ddc79..6cd74204c0 100644 --- a/base/system/services/controlset.c +++ b/base/system/services/controlset.c @@ -17,24 +17,16 @@ /* GLOBALS *******************************************************************/ -static DWORD dwCurrentControlSet; -static DWORD dwDefaultControlSet; -static DWORD dwFailedControlSet; -static DWORD dwLastKnownGoodControlSet; - /* FUNCTIONS *****************************************************************/ +#if (_WIN32_WINNT < 0x0600) static DWORD -ScmCopyKey(HKEY hDstKey, - HKEY hSrcKey) +ScmCopyTree( + HKEY hSrcKey, + HKEY hDstKey) { -#if (_WIN32_WINNT >= 0x0600) - return RegCopyTreeW(hSrcKey, - NULL, - hDstKey); -#else FILETIME LastWrite; DWORD dwSubKeys; DWORD dwValues; @@ -53,7 +45,7 @@ ScmCopyKey(HKEY hDstKey, HKEY hSrcSubKey; DWORD dwError; - DPRINT("ScmCopyKey()\n"); + DPRINT("ScmCopyTree()\n"); dwError = RegQueryInfoKey(hSrcKey, NULL, @@ -147,8 +139,8 @@ ScmCopyKey(HKEY hDstKey, return dwError; } - dwError = ScmCopyKey(hDstSubKey, - hSrcSubKey); + dwError = ScmCopyTree(hSrcSubKey, + hDstSubKey); if (dwError != ERROR_SUCCESS) { DPRINT1("Error: %lu\n", dwError); @@ -245,89 +237,93 @@ ScmCopyKey(HKEY hDstKey, lpNameBuffer); } - DPRINT("ScmCopyKey() done \n"); + DPRINT("ScmCopyTree() done \n"); return ERROR_SUCCESS; -#endif } +#endif static -BOOL -ScmGetControlSetValues(VOID) +DWORD +ScmGetControlSetValues( + PDWORD pdwCurrentControlSet, + PDWORD pdwDefaultControlSet, + PDWORD pdwFailedControlSet, + PDWORD pdwLastKnownGoodControlSet) { HKEY hSelectKey; DWORD dwType; DWORD dwSize; - LONG lError; + DWORD dwError; DPRINT("ScmGetControlSetValues() called\n"); - lError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"System\\Select", - 0, - KEY_READ, - &hSelectKey); - if (lError != ERROR_SUCCESS) - return FALSE; + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"System\\Select", + 0, + KEY_READ, + &hSelectKey); + if (dwError != ERROR_SUCCESS) + return dwError; dwSize = sizeof(DWORD); - lError = RegQueryValueExW(hSelectKey, - L"Current", - 0, - &dwType, - (LPBYTE)&dwCurrentControlSet, - &dwSize); - if (lError != ERROR_SUCCESS) + dwError = RegQueryValueExW(hSelectKey, + L"Current", + 0, + &dwType, + (LPBYTE)pdwCurrentControlSet, + &dwSize); + if (dwError != ERROR_SUCCESS) { - dwCurrentControlSet = 0; + *pdwCurrentControlSet = 0; } dwSize = sizeof(DWORD); - lError = RegQueryValueExW(hSelectKey, - L"Default", - 0, - &dwType, - (LPBYTE)&dwDefaultControlSet, - &dwSize); - if (lError != ERROR_SUCCESS) + dwError = RegQueryValueExW(hSelectKey, + L"Default", + 0, + &dwType, + (LPBYTE)pdwDefaultControlSet, + &dwSize); + if (dwError != ERROR_SUCCESS) { - dwDefaultControlSet = 0; + *pdwDefaultControlSet = 0; } dwSize = sizeof(DWORD); - lError = RegQueryValueExW(hSelectKey, - L"Failed", - 0, - &dwType, - (LPBYTE)&dwFailedControlSet, - &dwSize); - if (lError != ERROR_SUCCESS) + dwError = RegQueryValueExW(hSelectKey, + L"Failed", + 0, + &dwType, + (LPBYTE)pdwFailedControlSet, + &dwSize); + if (dwError != ERROR_SUCCESS) { - dwFailedControlSet = 0; + *pdwFailedControlSet = 0; } dwSize = sizeof(DWORD); - lError = RegQueryValueExW(hSelectKey, - L"LastKnownGood", - 0, - &dwType, - (LPBYTE)&dwLastKnownGoodControlSet, - &dwSize); - if (lError != ERROR_SUCCESS) + dwError = RegQueryValueExW(hSelectKey, + L"LastKnownGood", + 0, + &dwType, + (LPBYTE)pdwLastKnownGoodControlSet, + &dwSize); + if (dwError != ERROR_SUCCESS) { - dwLastKnownGoodControlSet = 0; + *pdwLastKnownGoodControlSet = 0; } RegCloseKey(hSelectKey); DPRINT("ControlSets:\n"); - DPRINT("Current: %lu\n", dwCurrentControlSet); - DPRINT("Default: %lu\n", dwDefaultControlSet); - DPRINT("Failed: %lu\n", dwFailedControlSet); - DPRINT("LastKnownGood: %lu\n", dwLastKnownGoodControlSet); + DPRINT("Current: %lu\n", *pdwCurrentControlSet); + DPRINT("Default: %lu\n", *pdwDefaultControlSet); + DPRINT("Failed: %lu\n", *pdwFailedControlSet); + DPRINT("LastKnownGood: %lu\n", *pdwLastKnownGoodControlSet); - return TRUE; + return dwError; } @@ -354,6 +350,7 @@ ScmSetLastKnownGoodControlSet( (LPBYTE)&dwControlSet, sizeof(dwControlSet)); + RegFlushKey(hSelectKey); RegCloseKey(hSelectKey); return dwError; @@ -396,91 +393,124 @@ ScmGetSetupInProgress(VOID) } -BOOL -ScmUpdateControlSets(VOID) +static +DWORD +ScmCopyControlSet( + DWORD dwSourceControlSet, + DWORD dwDestinationControlSet) { - WCHAR szCurrentControlSetName[32]; - WCHAR szNewControlSetName[32]; - HKEY hCurrentControlSetKey = NULL; - HKEY hNewControlSetKey = NULL; - DWORD dwNewControlSet, dwDisposition; + WCHAR szSourceControlSetName[32]; + WCHAR szDestinationControlSetName[32]; + HKEY hSourceControlSetKey = NULL; + HKEY hDestinationControlSetKey = NULL; + DWORD dwDisposition; DWORD dwError; - /* Do not create a new control set when the system setup is running */ - if (ScmGetSetupInProgress() != 0) - { - DPRINT1("No new control set because we are in setup mode!\n"); - return TRUE; - } - - /* Get the control set values */ - if (!ScmGetControlSetValues()) - return FALSE; - - /* Search for a new control set number */ - for (dwNewControlSet = 1; dwNewControlSet < 1000; dwNewControlSet++) - { - if ((dwNewControlSet != dwCurrentControlSet) && - (dwNewControlSet != dwDefaultControlSet) && - (dwNewControlSet != dwFailedControlSet) && - (dwNewControlSet != dwLastKnownGoodControlSet)) - break; - } - - /* Fail if we did not find an unused control set!*/ - if (dwNewControlSet >= 1000) - { - DPRINT1("Too many control sets!\n"); - return FALSE; - } - - /* Create the current control set name */ - swprintf(szCurrentControlSetName, L"SYSTEM\\ControlSet%03lu", dwCurrentControlSet); - DPRINT("Current control set: %S\n", szCurrentControlSetName); + /* Create the source control set name */ + swprintf(szSourceControlSetName, L"SYSTEM\\ControlSet%03lu", dwSourceControlSet); + DPRINT("Source control set: %S\n", szSourceControlSetName); - /* Create the new control set name */ - swprintf(szNewControlSetName, L"SYSTEM\\ControlSet%03lu", dwNewControlSet); - DPRINT("New control set: %S\n", szNewControlSetName); + /* Create the destination control set name */ + swprintf(szDestinationControlSetName, L"SYSTEM\\ControlSet%03lu", dwDestinationControlSet); + DPRINT("Destination control set: %S\n", szDestinationControlSetName); - /* Open the current control set key */ + /* Open the source control set key */ dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, - szCurrentControlSetName, + szSourceControlSetName, 0, KEY_READ, - &hCurrentControlSetKey); + &hSourceControlSetKey); if (dwError != ERROR_SUCCESS) goto done; - /* Create the new control set key */ + /* Create the destination control set key */ dwError = RegCreateKeyExW(HKEY_LOCAL_MACHINE, - szNewControlSetName, + szDestinationControlSetName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, - &hNewControlSetKey, + &hDestinationControlSetKey, &dwDisposition); if (dwError != ERROR_SUCCESS) goto done; - /* Copy the current control set to the new control set */ - dwError = ScmCopyKey(hNewControlSetKey, - hCurrentControlSetKey); + /* Copy the source control set to the destination control set */ +#if (_WIN32_WINNT >= 0x0600) + dwError = RegCopyTreeW(hSourceControlSetKey, + NULL, + hDestinationControlSetKey); +#else + dwError = ScmCopyTree(hSourceControlSetKey, + hDestinationControlSetKey); +#endif if (dwError != ERROR_SUCCESS) goto done; - /* Set the new 'LastKnownGood' control set */ - dwError = ScmSetLastKnownGoodControlSet(dwNewControlSet); + RegFlushKey(hDestinationControlSetKey); done: - if (hNewControlSetKey != NULL) - RegCloseKey(hNewControlSetKey); + if (hDestinationControlSetKey != NULL) + RegCloseKey(hDestinationControlSetKey); + + if (hSourceControlSetKey != NULL) + RegCloseKey(hSourceControlSetKey); + + return dwError; +} + + +DWORD +ScmCreateLastKnownGoodControlSet(VOID) +{ + DWORD dwCurrentControlSet, dwDefaultControlSet; + DWORD dwFailedControlSet, dwLastKnownGoodControlSet; + DWORD dwNewControlSet; + DWORD dwError; + + /* Get the control set values */ + dwError = ScmGetControlSetValues(&dwCurrentControlSet, + &dwDefaultControlSet, + &dwFailedControlSet, + &dwLastKnownGoodControlSet); + if (dwError != ERROR_SUCCESS) + return dwError; + + /* First boot after setup? */ + if ((ScmGetSetupInProgress() == 0) && + (dwCurrentControlSet == dwLastKnownGoodControlSet)) + { + DPRINT("First boot after setup!\n"); + + /* Search for a new control set number */ + for (dwNewControlSet = 1; dwNewControlSet < 1000; dwNewControlSet++) + { + if ((dwNewControlSet != dwCurrentControlSet) && + (dwNewControlSet != dwDefaultControlSet) && + (dwNewControlSet != dwFailedControlSet) && + (dwNewControlSet != dwLastKnownGoodControlSet)) + break; + } + + /* Fail if we did not find an unused control set!*/ + if (dwNewControlSet >= 1000) + { + DPRINT1("Too many control sets!\n"); + return ERROR_NO_MORE_ITEMS; + } + + /* Copy the current control set */ + dwError = ScmCopyControlSet(dwCurrentControlSet, + dwNewControlSet); + if (dwError != ERROR_SUCCESS) + return dwError; - if (hCurrentControlSetKey != NULL) - RegCloseKey(hCurrentControlSetKey); + /* Set the new 'LastKnownGood' control set */ + dwError = ScmSetLastKnownGoodControlSet(dwNewControlSet); + } - return (dwError == ERROR_SUCCESS); + return dwError; } /* EOF */ diff --git a/base/system/services/services.c b/base/system/services/services.c index 591c5a7062..75bfeeb195 100644 --- a/base/system/services/services.c +++ b/base/system/services/services.c @@ -178,10 +178,11 @@ wWinMain(HINSTANCE hInstance, /* FIXME: more initialization */ - /* Update the control sets */ - if (!ScmUpdateControlSets()) + /* Create the 'Last Known Good' control set */ + dwError = ScmCreateLastKnownGoodControlSet(); + if (dwError != ERROR_SUCCESS) { - DPRINT1("SERVICES: Failed to update the control sets\n"); + DPRINT1("SERVICES: Failed to create the 'Last Known Good' control set (Error %lu)\n", dwError); goto done; } diff --git a/base/system/services/services.h b/base/system/services/services.h index 57c873d670..74943372c6 100644 --- a/base/system/services/services.h +++ b/base/system/services/services.h @@ -159,8 +159,8 @@ ScmDecryptPassword( /* controlset.c */ -BOOL -ScmUpdateControlSets(VOID); +DWORD +ScmCreateLastKnownGoodControlSet(VOID); /* database.c */

1 0

01/01: [NTOSKRNL] Unlock file if required on last process handle close
by Pierre Schweitzer 28 Sep '18

28 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5472c1db82570a1ecd928… commit 5472c1db82570a1ecd928c8c617320ee12ebfe15 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Sep 28 23:34:28 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Sep 28 23:34:28 2018 +0200 [NTOSKRNL] Unlock file if required on last process handle close --- ntoskrnl/io/iomgr/file.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/io/iomgr/file.c b/ntoskrnl/io/iomgr/file.c index 15504adaca..8e3b626cdf 100644 --- a/ntoskrnl/io/iomgr/file.c +++ b/ntoskrnl/io/iomgr/file.c @@ -1938,6 +1938,7 @@ IopCloseFile(IN PEPROCESS Process OPTIONAL, NTSTATUS Status; PDEVICE_OBJECT DeviceObject; KIRQL OldIrql; + IO_STATUS_BLOCK IoStatusBlock; IOTRACE(IO_FILE_DEBUG, "ObjectBody: %p\n", ObjectBody); /* If this isn't the last handle for the current process, quit */ @@ -1946,8 +1947,70 @@ IopCloseFile(IN PEPROCESS Process OPTIONAL, /* Check if the file is locked and has more then one handle opened */ if ((FileObject->LockOperation) && (SystemHandleCount != 1)) { - DPRINT1("We need to unlock this file!\n"); - ASSERT(FALSE); + /* Check if this is a direct open or not */ + if (BooleanFlagOn(FileObject->Flags, FO_DIRECT_DEVICE_OPEN)) + { + /* Get the attached device */ + DeviceObject = IoGetAttachedDevice(FileObject->DeviceObject); + } + else + { + /* Get the FO's device */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); + } + + /* Check if this is a sync FO and lock it */ + if (BooleanFlagOn(FileObject->Flags, FO_SYNCHRONOUS_IO)) + { + IopLockFileObject(FileObject); + } + + /* Go the FastIO path if possible, otherwise fall back to IRP */ + if (DeviceObject->DriverObject->FastIoDispatch == NULL || + DeviceObject->DriverObject->FastIoDispatch->FastIoUnlockAll == NULL || + !DeviceObject->DriverObject->FastIoDispatch->FastIoUnlockAll(FileObject, PsGetCurrentProcess(), &IoStatusBlock, DeviceObject)) + { + /* Clear and set up Events */ + KeClearEvent(&FileObject->Event); + KeInitializeEvent(&Event, SynchronizationEvent, FALSE); + + /* Allocate an IRP */ + Irp = IopAllocateIrpMustSucceed(DeviceObject->StackSize); + + /* Set it up */ + Irp->UserEvent = &Event; + Irp->UserIosb = &Irp->IoStatus; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->RequestorMode = KernelMode; + Irp->Flags = IRP_SYNCHRONOUS_API; + Irp->Overlay.AsynchronousParameters.UserApcRoutine = NULL; + + /* Set up Stack Pointer Data */ + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = IRP_MJ_LOCK_CONTROL; + StackPtr->MinorFunction = IRP_MN_UNLOCK_ALL; + StackPtr->FileObject = FileObject; + + /* Queue the IRP */ + IopQueueIrpToThread(Irp); + + /* Call the FS Driver */ + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + /* Wait for completion */ + KeWaitForSingleObject(&Event, UserRequest, KernelMode, FALSE, NULL); + } + + /* IO will unqueue & free for us */ + } + + /* Release the lock if we were holding it */ + if (BooleanFlagOn(FileObject->Flags, FO_SYNCHRONOUS_IO)) + { + IopUnlockFileObject(FileObject); + } } /* Make sure this is the last handle */

1 0

01/01: [SERVICES] RChangeServiceConfigW / RCreateServiceW: Use SecureZeroMemory to wipe clear-text passwords after use.
by Eric Kohl 28 Sep '18

28 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=04683639f06a6e8d46694… commit 04683639f06a6e8d4669448e2c583f3c885e8efa Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Fri Sep 28 17:51:12 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Fri Sep 28 17:51:12 2018 +0200 [SERVICES] RChangeServiceConfigW / RCreateServiceW: Use SecureZeroMemory to wipe clear-text passwords after use. --- base/system/services/rpcserver.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/base/system/services/rpcserver.c b/base/system/services/rpcserver.c index f21df10e57..7f251c8760 100644 --- a/base/system/services/rpcserver.c +++ b/base/system/services/rpcserver.c @@ -2244,8 +2244,8 @@ done: if (lpClearTextPassword != NULL) { /* Wipe and release the password buffer */ - ZeroMemory(lpClearTextPassword, - (wcslen(lpClearTextPassword) + 1) * sizeof(WCHAR)); + SecureZeroMemory(lpClearTextPassword, + (wcslen(lpClearTextPassword) + 1) * sizeof(WCHAR)); HeapFree(GetProcessHeap(), 0, lpClearTextPassword); } @@ -2648,8 +2648,8 @@ done: if (lpClearTextPassword != NULL) { /* Wipe and release the password buffer */ - ZeroMemory(lpClearTextPassword, - (wcslen(lpClearTextPassword) + 1) * sizeof(WCHAR)); + SecureZeroMemory(lpClearTextPassword, + (wcslen(lpClearTextPassword) + 1) * sizeof(WCHAR)); HeapFree(GetProcessHeap(), 0, lpClearTextPassword); }

1 0

01/01: [SERVICES] Fixed a missing comma
by Eric Kohl 28 Sep '18

28 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b9aeb5bfbd6f3a558cca1… commit b9aeb5bfbd6f3a558cca13260d467b3db250844d Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Fri Sep 28 17:29:31 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Fri Sep 28 17:29:31 2018 +0200 [SERVICES] Fixed a missing comma --- base/system/services/services.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/system/services/services.h b/base/system/services/services.h index cbbf6eb008..57c873d670 100644 --- a/base/system/services/services.h +++ b/base/system/services/services.h @@ -160,7 +160,7 @@ ScmDecryptPassword( /* controlset.c */ BOOL -ScmUpdateControlSets(VOID) +ScmUpdateControlSets(VOID); /* database.c */

1 0

01/01: [SERVICES] Create a new control set on a non-setup boot.
by Eric Kohl 28 Sep '18

28 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea6dac3438a7ec3b333f4… commit ea6dac3438a7ec3b333f4cb3fb738177e9e62c0a Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Fri Sep 28 16:24:07 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Fri Sep 28 16:24:07 2018 +0200 [SERVICES] Create a new control set on a non-setup boot. --- base/system/services/controlset.c | 381 ++++++++++++++++++++++++++++++++++++++ base/system/services/services.c | 6 +- base/system/services/services.h | 3 +- 3 files changed, 386 insertions(+), 4 deletions(-) diff --git a/base/system/services/controlset.c b/base/system/services/controlset.c index 19bbb53877..948f3ddc79 100644 --- a/base/system/services/controlset.c +++ b/base/system/services/controlset.c @@ -25,6 +25,234 @@ static DWORD dwLastKnownGoodControlSet; /* FUNCTIONS *****************************************************************/ +static +DWORD +ScmCopyKey(HKEY hDstKey, + HKEY hSrcKey) +{ +#if (_WIN32_WINNT >= 0x0600) + return RegCopyTreeW(hSrcKey, + NULL, + hDstKey); +#else + FILETIME LastWrite; + DWORD dwSubKeys; + DWORD dwValues; + DWORD dwType; + DWORD dwMaxSubKeyNameLength; + DWORD dwSubKeyNameLength; + DWORD dwMaxValueNameLength; + DWORD dwValueNameLength; + DWORD dwMaxValueLength; + DWORD dwValueLength; + DWORD dwDisposition; + DWORD i; + LPWSTR lpNameBuffer; + LPBYTE lpDataBuffer; + HKEY hDstSubKey; + HKEY hSrcSubKey; + DWORD dwError; + + DPRINT("ScmCopyKey()\n"); + + dwError = RegQueryInfoKey(hSrcKey, + NULL, + NULL, + NULL, + &dwSubKeys, + &dwMaxSubKeyNameLength, + NULL, + &dwValues, + &dwMaxValueNameLength, + &dwMaxValueLength, + NULL, + NULL); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("RegQueryInfoKey() failed (Error %lu)\n", dwError); + return dwError; + } + + dwMaxSubKeyNameLength++; + dwMaxValueNameLength++; + + DPRINT("dwSubKeys %lu\n", dwSubKeys); + DPRINT("dwMaxSubKeyNameLength %lu\n", dwMaxSubKeyNameLength); + DPRINT("dwValues %lu\n", dwValues); + DPRINT("dwMaxValueNameLength %lu\n", dwMaxValueNameLength); + DPRINT("dwMaxValueLength %lu\n", dwMaxValueLength); + + /* Copy subkeys */ + if (dwSubKeys != 0) + { + lpNameBuffer = HeapAlloc(GetProcessHeap(), + 0, + dwMaxSubKeyNameLength * sizeof(WCHAR)); + if (lpNameBuffer == NULL) + { + DPRINT1("Buffer allocation failed\n"); + return ERROR_NOT_ENOUGH_MEMORY; + } + + for (i = 0; i < dwSubKeys; i++) + { + dwSubKeyNameLength = dwMaxSubKeyNameLength; + dwError = RegEnumKeyExW(hSrcKey, + i, + lpNameBuffer, + &dwSubKeyNameLength, + NULL, + NULL, + NULL, + &LastWrite); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Subkey enumeration failed (Error %lu)\n", dwError); + HeapFree(GetProcessHeap(), + 0, + lpNameBuffer); + return dwError; + } + + dwError = RegCreateKeyExW(hDstKey, + lpNameBuffer, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE, + NULL, + &hDstSubKey, + &dwDisposition); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Subkey creation failed (Error %lu)\n", dwError); + HeapFree(GetProcessHeap(), + 0, + lpNameBuffer); + return dwError; + } + + dwError = RegOpenKeyExW(hSrcKey, + lpNameBuffer, + 0, + KEY_READ, + &hSrcSubKey); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", dwError); + RegCloseKey(hDstSubKey); + HeapFree(GetProcessHeap(), + 0, + lpNameBuffer); + return dwError; + } + + dwError = ScmCopyKey(hDstSubKey, + hSrcSubKey); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", dwError); + RegCloseKey (hSrcSubKey); + RegCloseKey (hDstSubKey); + HeapFree(GetProcessHeap(), + 0, + lpNameBuffer); + return dwError; + } + + RegCloseKey(hSrcSubKey); + RegCloseKey(hDstSubKey); + } + + HeapFree(GetProcessHeap(), + 0, + lpNameBuffer); + } + + /* Copy values */ + if (dwValues != 0) + { + lpNameBuffer = HeapAlloc(GetProcessHeap(), + 0, + dwMaxValueNameLength * sizeof(WCHAR)); + if (lpNameBuffer == NULL) + { + DPRINT1("Buffer allocation failed\n"); + return ERROR_NOT_ENOUGH_MEMORY; + } + + lpDataBuffer = HeapAlloc(GetProcessHeap(), + 0, + dwMaxValueLength); + if (lpDataBuffer == NULL) + { + DPRINT1("Buffer allocation failed\n"); + HeapFree(GetProcessHeap(), + 0, + lpNameBuffer); + return ERROR_NOT_ENOUGH_MEMORY; + } + + for (i = 0; i < dwValues; i++) + { + dwValueNameLength = dwMaxValueNameLength; + dwValueLength = dwMaxValueLength; + dwError = RegEnumValueW(hSrcKey, + i, + lpNameBuffer, + &dwValueNameLength, + NULL, + &dwType, + lpDataBuffer, + &dwValueLength); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", dwError); + HeapFree(GetProcessHeap(), + 0, + lpDataBuffer); + HeapFree(GetProcessHeap(), + 0, + lpNameBuffer); + return dwError; + } + + dwError = RegSetValueExW(hDstKey, + lpNameBuffer, + 0, + dwType, + lpDataBuffer, + dwValueLength); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", dwError); + HeapFree(GetProcessHeap(), + 0, + lpDataBuffer); + HeapFree(GetProcessHeap(), + 0, + lpNameBuffer); + return dwError; + } + } + + HeapFree(GetProcessHeap(), + 0, + lpDataBuffer); + + HeapFree(GetProcessHeap(), + 0, + lpNameBuffer); + } + + DPRINT("ScmCopyKey() done \n"); + + return ERROR_SUCCESS; +#endif +} + + +static BOOL ScmGetControlSetValues(VOID) { @@ -102,4 +330,157 @@ ScmGetControlSetValues(VOID) return TRUE; } + +static +DWORD +ScmSetLastKnownGoodControlSet( + DWORD dwControlSet) +{ + HKEY hSelectKey; + DWORD dwError; + + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"System\\Select", + 0, + KEY_WRITE, + &hSelectKey); + if (dwError != ERROR_SUCCESS) + return dwError; + + dwError = RegSetValueExW(hSelectKey, + L"LastKnownGood", + 0, + REG_DWORD, + (LPBYTE)&dwControlSet, + sizeof(dwControlSet)); + + RegCloseKey(hSelectKey); + + return dwError; +} + + +static +DWORD +ScmGetSetupInProgress(VOID) +{ + DWORD dwError; + HKEY hKey; + DWORD dwType; + DWORD dwSize; + DWORD dwSetupInProgress = (DWORD)-1; + + DPRINT("ScmGetSetupInProgress()\n"); + + /* Open key */ + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\Setup", + 0, + KEY_QUERY_VALUE, + &hKey); + if (dwError == ERROR_SUCCESS) + { + /* Read key */ + dwSize = sizeof(DWORD); + RegQueryValueExW(hKey, + L"SystemSetupInProgress", + NULL, + &dwType, + (LPBYTE)&dwSetupInProgress, + &dwSize); + RegCloseKey(hKey); + } + + DPRINT("SetupInProgress: %lu\n", dwSetupInProgress); + return dwSetupInProgress; +} + + +BOOL +ScmUpdateControlSets(VOID) +{ + WCHAR szCurrentControlSetName[32]; + WCHAR szNewControlSetName[32]; + HKEY hCurrentControlSetKey = NULL; + HKEY hNewControlSetKey = NULL; + DWORD dwNewControlSet, dwDisposition; + DWORD dwError; + + /* Do not create a new control set when the system setup is running */ + if (ScmGetSetupInProgress() != 0) + { + DPRINT1("No new control set because we are in setup mode!\n"); + return TRUE; + } + + /* Get the control set values */ + if (!ScmGetControlSetValues()) + return FALSE; + + /* Search for a new control set number */ + for (dwNewControlSet = 1; dwNewControlSet < 1000; dwNewControlSet++) + { + if ((dwNewControlSet != dwCurrentControlSet) && + (dwNewControlSet != dwDefaultControlSet) && + (dwNewControlSet != dwFailedControlSet) && + (dwNewControlSet != dwLastKnownGoodControlSet)) + break; + } + + /* Fail if we did not find an unused control set!*/ + if (dwNewControlSet >= 1000) + { + DPRINT1("Too many control sets!\n"); + return FALSE; + } + + /* Create the current control set name */ + swprintf(szCurrentControlSetName, L"SYSTEM\\ControlSet%03lu", dwCurrentControlSet); + DPRINT("Current control set: %S\n", szCurrentControlSetName); + + /* Create the new control set name */ + swprintf(szNewControlSetName, L"SYSTEM\\ControlSet%03lu", dwNewControlSet); + DPRINT("New control set: %S\n", szNewControlSetName); + + /* Open the current control set key */ + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + szCurrentControlSetName, + 0, + KEY_READ, + &hCurrentControlSetKey); + if (dwError != ERROR_SUCCESS) + goto done; + + /* Create the new control set key */ + dwError = RegCreateKeyExW(HKEY_LOCAL_MACHINE, + szNewControlSetName, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE, + NULL, + &hNewControlSetKey, + &dwDisposition); + if (dwError != ERROR_SUCCESS) + goto done; + + /* Copy the current control set to the new control set */ + dwError = ScmCopyKey(hNewControlSetKey, + hCurrentControlSetKey); + if (dwError != ERROR_SUCCESS) + goto done; + + /* Set the new 'LastKnownGood' control set */ + dwError = ScmSetLastKnownGoodControlSet(dwNewControlSet); + +done: + if (hNewControlSetKey != NULL) + RegCloseKey(hNewControlSetKey); + + if (hCurrentControlSetKey != NULL) + RegCloseKey(hCurrentControlSetKey); + + return (dwError == ERROR_SUCCESS); +} + /* EOF */ diff --git a/base/system/services/services.c b/base/system/services/services.c index bd7f24ccc0..591c5a7062 100644 --- a/base/system/services/services.c +++ b/base/system/services/services.c @@ -178,10 +178,10 @@ wWinMain(HINSTANCE hInstance, /* FIXME: more initialization */ - /* Read the control set values */ - if (!ScmGetControlSetValues()) + /* Update the control sets */ + if (!ScmUpdateControlSets()) { - DPRINT1("SERVICES: Failed to read the control set values\n"); + DPRINT1("SERVICES: Failed to update the control sets\n"); goto done; } diff --git a/base/system/services/services.h b/base/system/services/services.h index ce1b46eafa..cbbf6eb008 100644 --- a/base/system/services/services.h +++ b/base/system/services/services.h @@ -159,7 +159,8 @@ ScmDecryptPassword( /* controlset.c */ -BOOL ScmGetControlSetValues(VOID); +BOOL +ScmUpdateControlSets(VOID) /* database.c */

1 0

03/03: [ADVAPI32] Improve a bit CreateProcessAsUser().
by Hermès Bélusca-Maïto 27 Sep '18

27 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c446ce0d625b8c86e204b… commit c446ce0d625b8c86e204b86e8e66503f10c8c580 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Sep 28 00:36:59 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Sep 28 00:45:04 2018 +0200 [ADVAPI32] Improve a bit CreateProcessAsUser(). - Check whether the user-provided token is a primary token. - Do not fail when the RtlAdjustPrivilege() call fails (see the code comment for an explanation). TL;DR is: that call may indeed fail but the privilege may also not be necessary because the user-provided token is a restricted version of the caller's primary token. And this is situation is perfectly fine. This fixes Java 7 installation, CORE-14874. --- dll/win32/advapi32/misc/logon.c | 86 ++++++++++++++++++++++++++++++----------- 1 file changed, 64 insertions(+), 22 deletions(-) diff --git a/dll/win32/advapi32/misc/logon.c b/dll/win32/advapi32/misc/logon.c index f4e3f851df..0b9d60320f 100644 --- a/dll/win32/advapi32/misc/logon.c +++ b/dll/win32/advapi32/misc/logon.c @@ -145,9 +145,30 @@ CreateProcessAsUserCommon( if (hToken != NULL) { + TOKEN_TYPE Type; + ULONG ReturnLength; OBJECT_ATTRIBUTES ObjectAttributes; HANDLE hTokenDup; - BOOLEAN PrivilegeSet = FALSE; + BOOLEAN PrivilegeSet = FALSE, HavePrivilege; + + /* Check whether the user-provided token is a primary token */ + // GetTokenInformation(); + Status = NtQueryInformationToken(hToken, + TokenType, + &Type, + sizeof(Type), + &ReturnLength); + if (!NT_SUCCESS(Status)) + { + ERR("NtQueryInformationToken() failed, Status 0x%08x\n", Status); + goto Quit; + } + if (Type != TokenPrimary) + { + ERR("Wrong token type for token 0x%p, expected TokenPrimary, got %ld\n", hToken, Type); + Status = STATUS_BAD_TOKEN_TYPE; + goto Quit; + } /* Duplicate the token for this new process */ InitializeObjectAttributes(&ObjectAttributes, @@ -163,32 +184,43 @@ CreateProcessAsUserCommon( &hTokenDup); if (!NT_SUCCESS(Status)) { - ERR("NtDuplicateToken failed, Status 0x%08x\n", Status); - TerminateProcess(lpProcessInformation->hProcess, Status); - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; + ERR("NtDuplicateToken() failed, Status 0x%08x\n", Status); + goto Quit; } // FIXME: Do we always need SecurityImpersonation? - if (!ImpersonateSelf(SecurityImpersonation)) + Status = RtlImpersonateSelf(SecurityImpersonation); + if (!NT_SUCCESS(Status)) { - ERR("ImpersonateSelf(SecurityImpersonation) failed, last error: %d\n", GetLastError()); + ERR("RtlImpersonateSelf(SecurityImpersonation) failed, Status 0x%08x\n", Status); NtClose(hTokenDup); - TerminateProcess(lpProcessInformation->hProcess, RtlGetLastNtStatus()); - // SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; + goto Quit; } - /* Acquire the process primary token assignment privilege */ - Status = RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, TRUE, TRUE, &PrivilegeSet); - if (!NT_SUCCESS(Status)) + /* + * Attempt to acquire the process primary token assignment privilege + * in case we actually need it. + * The call will either succeed or fail when the caller has (or has not) + * enough rights. + * The last situation may not be dramatic for us. Indeed it may happen + * that the user-provided token is a restricted version of the caller's + * primary token (aka. a "child" token), or both tokens inherit (i.e. are + * children, and are together "siblings") from a common parent token. + * In this case the NT kernel allows us to assign the token to the child + * process without the need for the assignment privilege, which is fine. + * On the contrary, if the user-provided token is completely arbitrary, + * then the NT kernel will enforce the presence of the assignment privilege: + * because we failed (by assumption) to assign the privilege, the process + * token assignment will fail as required. It is then the job of the + * caller to manually acquire the necessary privileges. + */ + Status = RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, + TRUE, TRUE, &PrivilegeSet); + HavePrivilege = NT_SUCCESS(Status); + if (!HavePrivilege) { - ERR("RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE) failed, Status 0x%08lx\n", Status); - RevertToSelf(); - NtClose(hTokenDup); - TerminateProcess(lpProcessInformation->hProcess, Status); - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; + ERR("RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE) failed, Status 0x%08lx, " + "attempting to continue without it...\n", Status); } AccessToken.Token = hTokenDup; @@ -200,8 +232,12 @@ CreateProcessAsUserCommon( (PVOID)&AccessToken, sizeof(AccessToken)); - /* Restore the privileges */ - RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, PrivilegeSet, TRUE, &PrivilegeSet); + /* Restore the privilege */ + if (HavePrivilege) + { + RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, + PrivilegeSet, TRUE, &PrivilegeSet); + } RevertToSelf(); @@ -211,7 +247,13 @@ CreateProcessAsUserCommon( /* Check whether NtSetInformationProcess() failed */ if (!NT_SUCCESS(Status)) { - ERR("NtSetInformationProcess failed, Status 0x%08x\n", Status); + ERR("NtSetInformationProcess() failed, Status 0x%08x\n", Status); + goto Quit; + } + + if (!NT_SUCCESS(Status)) + { +Quit: TerminateProcess(lpProcessInformation->hProcess, Status); SetLastError(RtlNtStatusToDosError(Status)); return FALSE;

1 0

02/03: [NTOS:PS] In PspSetPrimaryToken(), check also for sibling token to determine whether it is required to have the SeAssignPrimaryTokenPrivilege.
by Hermès Bélusca-Maïto 27 Sep '18

27 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89c5191d3f1f74f42b31d… commit 89c5191d3f1f74f42b31d833226dfbd09585ea88 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Sep 26 01:33:02 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Sep 28 00:45:03 2018 +0200 [NTOS:PS] In PspSetPrimaryToken(), check also for sibling token to determine whether it is required to have the SeAssignPrimaryTokenPrivilege. In addition, it is the presence or absence of the 'Token' pointer that indicates whether or not we should use instead the provided token handle. --- ntoskrnl/ps/security.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/ntoskrnl/ps/security.c b/ntoskrnl/ps/security.c index f696d0f3e5..e245dde563 100644 --- a/ntoskrnl/ps/security.c +++ b/ntoskrnl/ps/security.c @@ -217,18 +217,18 @@ PspSetPrimaryToken(IN PEPROCESS Process, IN PACCESS_TOKEN Token OPTIONAL) { KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - BOOLEAN IsChild; + BOOLEAN IsChildOrSibling; PACCESS_TOKEN NewToken = Token; NTSTATUS Status, AccessStatus; BOOLEAN Result, SdAllocated; PSECURITY_DESCRIPTOR SecurityDescriptor = NULL; SECURITY_SUBJECT_CONTEXT SubjectContext; + PSTRACE(PS_SECURITY_DEBUG, "Process: %p Token: %p\n", Process, Token); - /* Make sure we got a handle */ - if (TokenHandle) + /* Reference the token by handle if we don't already have a token object */ + if (!Token) { - /* Reference it */ Status = ObReferenceObjectByHandle(TokenHandle, TOKEN_ASSIGN_PRIMARY, SeTokenObjectType, @@ -238,24 +238,38 @@ PspSetPrimaryToken(IN PEPROCESS Process, if (!NT_SUCCESS(Status)) return Status; } - /* Check if this is a child */ - Status = SeIsTokenChild(NewToken, &IsChild); + /* + * Check whether this token is a child or sibling of the current process token. + * NOTE: On Windows Vista+ both of these checks (together with extra steps) + * are now performed by a new SeIsTokenAssignableToProcess() helper. + */ + Status = SeIsTokenChild(NewToken, &IsChildOrSibling); if (!NT_SUCCESS(Status)) { /* Failed, dereference */ - if (TokenHandle) ObDereferenceObject(NewToken); + if (!Token) ObDereferenceObject(NewToken); return Status; } + if (!IsChildOrSibling) + { + Status = SeIsTokenSibling(NewToken, &IsChildOrSibling); + if (!NT_SUCCESS(Status)) + { + /* Failed, dereference */ + if (!Token) ObDereferenceObject(NewToken); + return Status; + } + } /* Check if this was an independent token */ - if (!IsChild) + if (!IsChildOrSibling) { /* Make sure we have the privilege to assign a new one */ if (!SeSinglePrivilegeCheck(SeAssignPrimaryTokenPrivilege, PreviousMode)) { /* Failed, dereference */ - if (TokenHandle) ObDereferenceObject(NewToken); + if (!Token) ObDereferenceObject(NewToken); return STATUS_PRIVILEGE_NOT_HELD; } } @@ -314,7 +328,7 @@ PspSetPrimaryToken(IN PEPROCESS Process, } /* Dereference the token */ - if (TokenHandle) ObDereferenceObject(NewToken); + if (!Token) ObDereferenceObject(NewToken); return Status; }

1 0

01/03: [NTOS:SE] Fixes for NT tokens.
by Hermès Bélusca-Maïto 27 Sep '18

27 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7f9282927b8cbb5f6633d… commit 7f9282927b8cbb5f6633d24c69f9f1d3c7dcb42d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Sep 26 00:51:38 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Sep 28 00:45:01 2018 +0200 [NTOS:SE] Fixes for NT tokens. - SeIsTokenChild(): Correctly check whether a caller-provided token is a child from the current process' primary token by looking at its ParentTokenId member. - Add a SeIsTokenSibling() helper to determine whether a caller-provided token and the current process' primary token are siblings, by comparing their ParentTokenId's and AuthenticationId's. NOTE: Children tokens are created through CreateRestrictedToken(); sibling tokens are created through DuplicateToken() (amongst others). See slide 49 of https://www.slideshare.net/Shakacon/social-engineering-the-windows-kernel-b… or https://googleprojectzero.blogspot.com/2016/01/raising-dead.html for some details. --- ntoskrnl/include/internal/se.h | 7 ++++++ ntoskrnl/se/token.c | 56 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 56 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/include/internal/se.h b/ntoskrnl/include/internal/se.h index 993c6ceb11..6095bd9e01 100644 --- a/ntoskrnl/include/internal/se.h +++ b/ntoskrnl/include/internal/se.h @@ -314,6 +314,13 @@ SeIsTokenChild( OUT PBOOLEAN IsChild ); +NTSTATUS +NTAPI +SeIsTokenSibling( + IN PTOKEN Token, + OUT PBOOLEAN IsSibling +); + NTSTATUS NTAPI SepCreateImpersonationTokenDacl( diff --git a/ntoskrnl/se/token.c b/ntoskrnl/se/token.c index 0b20030b8d..f41ef93f52 100644 --- a/ntoskrnl/se/token.c +++ b/ntoskrnl/se/token.c @@ -717,25 +717,67 @@ SeIsTokenChild(IN PTOKEN Token, OUT PBOOLEAN IsChild) { PTOKEN ProcessToken; - LUID ProcessLuid, CallerLuid; + LUID ProcessTokenId, CallerParentId; /* Assume failure */ *IsChild = FALSE; /* Reference the process token */ ProcessToken = PsReferencePrimaryToken(PsGetCurrentProcess()); + if (!ProcessToken) + return STATUS_UNSUCCESSFUL; - /* Get the ID */ - ProcessLuid = ProcessToken->AuthenticationId; + /* Get its token ID */ + ProcessTokenId = ProcessToken->TokenId; /* Dereference the token */ ObFastDereferenceObject(&PsGetCurrentProcess()->Token, ProcessToken); - /* Get our LUID */ - CallerLuid = Token->AuthenticationId; + /* Get our parent token ID */ + CallerParentId = Token->ParentTokenId; - /* Compare the LUIDs */ - if (RtlEqualLuid(&CallerLuid, &ProcessLuid)) *IsChild = TRUE; + /* Compare the token IDs */ + if (RtlEqualLuid(&CallerParentId, &ProcessTokenId)) + *IsChild = TRUE; + + /* Return success */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +SeIsTokenSibling(IN PTOKEN Token, + OUT PBOOLEAN IsSibling) +{ + PTOKEN ProcessToken; + LUID ProcessParentId, ProcessAuthId; + LUID CallerParentId, CallerAuthId; + + /* Assume failure */ + *IsSibling = FALSE; + + /* Reference the process token */ + ProcessToken = PsReferencePrimaryToken(PsGetCurrentProcess()); + if (!ProcessToken) + return STATUS_UNSUCCESSFUL; + + /* Get its parent and authentication IDs */ + ProcessParentId = ProcessToken->ParentTokenId; + ProcessAuthId = ProcessToken->AuthenticationId; + + /* Dereference the token */ + ObFastDereferenceObject(&PsGetCurrentProcess()->Token, ProcessToken); + + /* Get our parent and authentication IDs */ + CallerParentId = Token->ParentTokenId; + CallerAuthId = Token->AuthenticationId; + + /* Compare the token IDs */ + if (RtlEqualLuid(&CallerParentId, &ProcessParentId) && + RtlEqualLuid(&CallerAuthId, &ProcessAuthId)) + { + *IsSibling = TRUE; + } /* Return success */ return STATUS_SUCCESS;

1 0

01/01: [DWNL] Add translations (for Romanian & Italian)
by Bișoc George 27 Sep '18

27 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3caab66e223f59476fac8… commit 3caab66e223f59476fac8d62937dadcaf86ddfd1 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Tue Sep 25 16:50:13 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Sep 28 00:23:48 2018 +0200 [DWNL] Add translations (for Romanian & Italian) And include them as well. --- base/applications/network/dwnl/dwnl.rc | 6 ++++++ base/applications/network/dwnl/lang/it-IT.rc | 32 ++++++++++++++++++++++++++++ base/applications/network/dwnl/lang/ro-RO.rc | 32 ++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+) diff --git a/base/applications/network/dwnl/dwnl.rc b/base/applications/network/dwnl/dwnl.rc index 5077a012ee..5b2aa1351e 100644 --- a/base/applications/network/dwnl/dwnl.rc +++ b/base/applications/network/dwnl/dwnl.rc @@ -20,9 +20,15 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif diff --git a/base/applications/network/dwnl/lang/it-IT.rc b/base/applications/network/dwnl/lang/it-IT.rc new file mode 100644 index 0000000000..51c952e8ca --- /dev/null +++ b/base/applications/network/dwnl/lang/it-IT.rc @@ -0,0 +1,32 @@ +/* + * PROJECT: ReactOS File Download Utility + * LICENSE: See COPYING in the top level directory + * PURPOSE: Italian resource file + * COPYRIGHT: Copyright 2018 Bișoc George (fraizeraust99 at gmail dot com) + */ + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "Uso: dwnl URL [DESTINAZIONE]\n" + IDS_RESOLVING "Risolvere %s... " + IDS_DONE "fatto.\n" + IDS_LENGTH_FULL "Lunghezza: %I64u [%s]\n" + IDS_LENGTH "Lunghezza: %I64u\n" + IDS_FILE_SAVED "\nIl file è stato salvato.\n" + IDS_CONNECTING_TO_FULL "Connettersi a %s [%s]... " + IDS_CONNECTING_TO "Connettersi a %s... " + IDS_REDIRECTING_TO "Reindirizzato a %s... " + IDS_SEND_REQUEST "Invio richiesta... " + IDS_BYTES_DOWNLOADED "%I64u byte scaricati" + IDS_BYTES_DOWNLOADED_FULL "%2d%% (%I64u byte scaricati)" +END + +STRINGTABLE +BEGIN + IDS_ERROR_DOWNLOAD "\nERRORE: Download fallito.\n" + IDS_ERROR_CODE "\nERRORE: %u\n" + IDS_ERROR_FILENAME "\nERRORE: Impossibile determinare il nome del file, si prega di specificare una destinazione.\n" + IDS_ERROR_PROTOCOL "\nERRORE: Protocollo non supportato.\n" +END diff --git a/base/applications/network/dwnl/lang/ro-RO.rc b/base/applications/network/dwnl/lang/ro-RO.rc new file mode 100644 index 0000000000..fd43ceca87 --- /dev/null +++ b/base/applications/network/dwnl/lang/ro-RO.rc @@ -0,0 +1,32 @@ +/* + * PROJECT: ReactOS File Download Utility + * LICENSE: See COPYING in the top level directory + * PURPOSE: Romanian resource file + * COPYRIGHT: Copyright 2018 Bișoc George (fraizeraust99 at gmail dot com) + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "Uz: dwnl URL [DESTINAȚIE]\n" + IDS_RESOLVING "Rezolvare %s... " + IDS_DONE "terminat.\n" + IDS_LENGTH_FULL "Lungime: %I64u [%s]\n" + IDS_LENGTH "Lungime: %I64u\n" + IDS_FILE_SAVED "\nFișier descărcat.\n" + IDS_CONNECTING_TO_FULL "Conectare la %s [%s]... " + IDS_CONNECTING_TO "Conectare la %s... " + IDS_REDIRECTING_TO "Redirecționare la %s... " + IDS_SEND_REQUEST "Trimitere cerere... " + IDS_BYTES_DOWNLOADED "%I64u octeți descărcați" + IDS_BYTES_DOWNLOADED_FULL "%2d%% (%I64u octeți descărcați)" +END + +STRINGTABLE +BEGIN + IDS_ERROR_DOWNLOAD "\nEROARE: Descărcare eșuată.\n" + IDS_ERROR_CODE "\nEROARE: %u\n" + IDS_ERROR_FILENAME "\nEROARE: Determinarea numelui de fișier este imposibilă, specificați destinația numelui de fișier.\n" + IDS_ERROR_PROTOCOL "\nEROARE: Protocol nerecunoscut.\n" +END

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