Ros-diffs January 2021

ros-diffs@reactos.org

15 participants
146 discussions

[reactos] 01/01: [XDK] Even the DBG_UNREFERENCED_PARAMETER() should use (void)P. Addendum to 46ca069e.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9aa73da9487abde59f0a6… commit 9aa73da9487abde59f0a60b41b569fcd09567339 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jan 18 22:23:24 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jan 18 22:23:24 2021 +0100 [XDK] Even the DBG_UNREFERENCED_PARAMETER() should use (void)P. Addendum to 46ca069e. --- sdk/include/xdk/ntbasedef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/xdk/ntbasedef.h b/sdk/include/xdk/ntbasedef.h index 671ec27b0ec..91c926257fb 100644 --- a/sdk/include/xdk/ntbasedef.h +++ b/sdk/include/xdk/ntbasedef.h @@ -315,7 +315,7 @@ /* Use to silence unused variable warnings when it is intentional */ #define UNREFERENCED_PARAMETER(P) ((void)(P)) -#define DBG_UNREFERENCED_PARAMETER(P) {(P)=(P);} +#define DBG_UNREFERENCED_PARAMETER(P) ((void)(P)) #define DBG_UNREFERENCED_LOCAL_VARIABLE(L) ((void)(L)) /* Void Pointers */

3 years, 8 months

[reactos] 01/01: [XDK] Remove UNREFERENCE_LOCAL_VARIABLE macro

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=46ca069e422996575a20d… commit 46ca069e422996575a20dd76f2a62b59c5183060 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue Jan 19 00:15:02 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Jan 19 00:15:02 2021 +0300 [XDK] Remove UNREFERENCE_LOCAL_VARIABLE macro Change UNREFERENCED_PARAMETER to (VOID)P to support const parameters --- dll/win32/kernel32/client/proc.c | 9 ++++----- modules/rostests/kmtests/ntos_ke/KeSpinLock.c | 2 +- sdk/include/xdk/ntbasedef.h | 3 +-- sdk/include/xdk/winnt_old.h | 2 +- sdk/include/xdk/x86/ke.h | 2 +- win32ss/drivers/videoprt/videoprt.c | 11 ++--------- win32ss/user/ntuser/object.h | 1 - 7 files changed, 10 insertions(+), 20 deletions(-) diff --git a/dll/win32/kernel32/client/proc.c b/dll/win32/kernel32/client/proc.c index cba4cf6a1e6..e107c19b029 100644 --- a/dll/win32/kernel32/client/proc.c +++ b/dll/win32/kernel32/client/proc.c @@ -1606,12 +1606,11 @@ FatalAppExitW(IN UINT uAction, #endif &Response); -#if DBG /* Give the user a chance to abort */ - if ((NT_SUCCESS(Status)) && (Response == ResponseCancel)) return; -#else - UNREFERENCED_LOCAL_VARIABLE(Status); -#endif + if ((NT_SUCCESS(Status)) && (Response == ResponseCancel)) + { + return; + } /* Otherwise kill the process */ ExitProcess(0); diff --git a/modules/rostests/kmtests/ntos_ke/KeSpinLock.c b/modules/rostests/kmtests/ntos_ke/KeSpinLock.c index 30838b3271a..d761d8e9a25 100644 --- a/modules/rostests/kmtests/ntos_ke/KeSpinLock.c +++ b/modules/rostests/kmtests/ntos_ke/KeSpinLock.c @@ -166,7 +166,7 @@ BOOLEAN TryNoRaise(PKSPIN_LOCK SpinLock, PCHECK_DATA CheckData) { #define CheckSpinLockLock(SpinLock, CheckData, Value) do \ { \ PKTHREAD Thread = KeGetCurrentThread(); \ - UNREFERENCED_LOCAL_VARIABLE(Thread); \ + (VOID)Thread; \ if (KmtIsMultiProcessorBuild) \ { \ ok_eq_bool(Ret, (Value) == 0); \ diff --git a/sdk/include/xdk/ntbasedef.h b/sdk/include/xdk/ntbasedef.h index c87be90a7a0..671ec27b0ec 100644 --- a/sdk/include/xdk/ntbasedef.h +++ b/sdk/include/xdk/ntbasedef.h @@ -314,8 +314,7 @@ #endif /* DEPRECATE_DDK_FUNCTIONS */ /* Use to silence unused variable warnings when it is intentional */ -#define UNREFERENCED_PARAMETER(P) {(P)=(P);} -#define UNREFERENCED_LOCAL_VARIABLE(L) ((void)(L)) +#define UNREFERENCED_PARAMETER(P) ((void)(P)) #define DBG_UNREFERENCED_PARAMETER(P) {(P)=(P);} #define DBG_UNREFERENCED_LOCAL_VARIABLE(L) ((void)(L)) diff --git a/sdk/include/xdk/winnt_old.h b/sdk/include/xdk/winnt_old.h index dff77bab5c3..75e86392711 100644 --- a/sdk/include/xdk/winnt_old.h +++ b/sdk/include/xdk/winnt_old.h @@ -4262,7 +4262,7 @@ VOID MemoryBarrier(VOID) { LONG Barrier, *Dummy = &Barrier; - UNREFERENCED_LOCAL_VARIABLE(Dummy); + (VOID)Dummy; __asm__ __volatile__("xchgl %%eax, %[Barrier]" : : [Barrier] "m" (Barrier) : "memory"); } #endif diff --git a/sdk/include/xdk/x86/ke.h b/sdk/include/xdk/x86/ke.h index 4b66e2a9d37..b367a93d1b5 100644 --- a/sdk/include/xdk/x86/ke.h +++ b/sdk/include/xdk/x86/ke.h @@ -52,7 +52,7 @@ VOID KeMemoryBarrier(VOID) { LONG Barrier, *Dummy = &Barrier; - UNREFERENCED_LOCAL_VARIABLE(Dummy); + (VOID)Dummy; #if defined(__GNUC__) __asm__ __volatile__ ("xchg %%eax, %0" : : "m" (Barrier) : "%eax"); diff --git a/win32ss/drivers/videoprt/videoprt.c b/win32ss/drivers/videoprt/videoprt.c index edce0febccd..6c54e16fbef 100644 --- a/win32ss/drivers/videoprt/videoprt.c +++ b/win32ss/drivers/videoprt/videoprt.c @@ -1477,14 +1477,10 @@ VideoPortAcquireDeviceLock( IN PVOID HwDeviceExtension) { PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; - NTSTATUS Status; - - UNREFERENCED_LOCAL_VARIABLE(Status); TRACE_(VIDEOPRT, "VideoPortAcquireDeviceLock\n"); DeviceExtension = VIDEO_PORT_GET_DEVICE_EXTENSION(HwDeviceExtension); - Status = KeWaitForMutexObject(&DeviceExtension->DeviceLock, Executive, - KernelMode, FALSE, NULL); + KeWaitForMutexObject(&DeviceExtension->DeviceLock, Executive, KernelMode, FALSE, NULL); // ASSERT(Status == STATUS_SUCCESS); } @@ -1497,13 +1493,10 @@ VideoPortReleaseDeviceLock( IN PVOID HwDeviceExtension) { PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; - LONG Status; - - UNREFERENCED_LOCAL_VARIABLE(Status); TRACE_(VIDEOPRT, "VideoPortReleaseDeviceLock\n"); DeviceExtension = VIDEO_PORT_GET_DEVICE_EXTENSION(HwDeviceExtension); - Status = KeReleaseMutex(&DeviceExtension->DeviceLock, FALSE); + KeReleaseMutex(&DeviceExtension->DeviceLock, FALSE); //ASSERT(Status == STATUS_SUCCESS); } diff --git a/win32ss/user/ntuser/object.h b/win32ss/user/ntuser/object.h index b30a77b5cc6..9fb1b7f6637 100644 --- a/win32ss/user/ntuser/object.h +++ b/win32ss/user/ntuser/object.h @@ -40,7 +40,6 @@ UserDerefObjectCo(PVOID obj) PTHREADINFO W32Thread; PSINGLE_LIST_ENTRY ReferenceEntry; PUSER_REFERENCE_ENTRY UserReferenceEntry; - UNREFERENCED_LOCAL_VARIABLE(UserReferenceEntry); ASSERT(obj != NULL); W32Thread = PsGetCurrentThreadWin32Thread();

3 years, 8 months

[reactos] 01/01: [HDAUDBUS] Return failure from HDA_SendVerbs on a timeout

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=af0f8581ad2df8ba90662… commit af0f8581ad2df8ba90662da624c490a04033cb46 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Mon Jan 18 04:02:32 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Mon Jan 18 04:02:32 2021 +0300 [HDAUDBUS] Return failure from HDA_SendVerbs on a timeout Addendum to 48b3c61b5d6cddc20f322c40ddcc987f2a75ff1d --- drivers/wdm/audio/hdaudbus/fdo.cpp | 23 +++++++++++++++++------ drivers/wdm/audio/hdaudbus/hdaudbus.h | 2 +- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/drivers/wdm/audio/hdaudbus/fdo.cpp b/drivers/wdm/audio/hdaudbus/fdo.cpp index 2cb977eba29..7088ee933c3 100644 --- a/drivers/wdm/audio/hdaudbus/fdo.cpp +++ b/drivers/wdm/audio/hdaudbus/fdo.cpp @@ -134,7 +134,7 @@ HDA_DpcForIsr( } -VOID +NTSTATUS HDA_SendVerbs( IN PDEVICE_OBJECT DeviceObject, IN PHDA_CODEC_ENTRY Codec, @@ -188,13 +188,15 @@ HDA_SendVerbs( if (waitStatus == STATUS_TIMEOUT) { DPRINT1("HDA_SendVerbs: timeout! Queued: %u\n", Queued); - break; + return STATUS_INVALID_DEVICE_REQUEST; } } if (Responses != NULL) { memcpy(Responses, Codec->Responses, Codec->ResponseCount * sizeof(ULONG)); } + + return STATUS_SUCCESS; } NTSTATUS @@ -234,7 +236,13 @@ HDA_InitCodec( verbs[2] = MAKE_VERB(codecAddress, 0, VID_GET_PARAMETER, PID_SUB_NODE_COUNT); /* get basic info */ - HDA_SendVerbs(DeviceObject, Entry, verbs, (PULONG)&Response, 3); + Status = HDA_SendVerbs(DeviceObject, Entry, verbs, (PULONG)&Response, 3); + if (!NT_SUCCESS(Status)) + { + FreeItem(Entry); + DeviceExtension->Codecs[codecAddress] = NULL; + return Status; + } /* store codec details */ Entry->Major = Response.major; @@ -252,10 +260,13 @@ HDA_InitCodec( /* get function type */ verbs[0] = MAKE_VERB(codecAddress, NodeId, VID_GET_PARAMETER, PID_FUNCTION_GROUP_TYPE); - HDA_SendVerbs(DeviceObject, Entry, verbs, &GroupType, 1); - DPRINT1("NodeId %u GroupType %x\n", NodeId, GroupType); + Status = HDA_SendVerbs(DeviceObject, Entry, verbs, &GroupType, 1); + DPRINT1("Status %x NodeId %u GroupType %x\n", Status, NodeId, GroupType); - if ((GroupType & FUNCTION_GROUP_NODETYPE_MASK) == FUNCTION_GROUP_NODETYPE_AUDIO) { + + if (NT_SUCCESS(Status) && + (GroupType & FUNCTION_GROUP_NODETYPE_MASK) == FUNCTION_GROUP_NODETYPE_AUDIO) + { if (Entry->AudioGroupCount >= HDA_MAX_AUDIO_GROUPS) { DPRINT1("Too many audio groups in node %u. Skipping.\n", NodeId); diff --git a/drivers/wdm/audio/hdaudbus/hdaudbus.h b/drivers/wdm/audio/hdaudbus/hdaudbus.h index e4412a5d133..5c4c4ab8aa4 100644 --- a/drivers/wdm/audio/hdaudbus/hdaudbus.h +++ b/drivers/wdm/audio/hdaudbus/hdaudbus.h @@ -139,7 +139,7 @@ HDA_FDOQueryBusRelations( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -VOID +NTSTATUS HDA_SendVerbs( IN PDEVICE_OBJECT DeviceObject, IN PHDA_CODEC_ENTRY Codec,

3 years, 8 months

[reactos] 01/01: [INF] Add default security settings for ReactOS Server

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=497ca5420514c63bdcd4c… commit 497ca5420514c63bdcd4cb77fd63a03519f1340a Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jan 17 15:12:18 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 17 15:12:18 2021 +0100 [INF] Add default security settings for ReactOS Server --- media/inf/defltsv.inf | 161 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) diff --git a/media/inf/defltsv.inf b/media/inf/defltsv.inf new file mode 100644 index 00000000000..d64c30d339a --- /dev/null +++ b/media/inf/defltsv.inf @@ -0,0 +1,161 @@ +; defltsv.inf +; Default security settings for ReactOS Server + +[Version] +Signature = "$Windows NT$" + +[Application Log] +MaximumLogSize = 16384 +AuditLogRetentionPeriod = 0 +;RetentionDays = 7 +RestrictGuestAccess = 1 + +[Security Log] +MaximumLogSize = 16384 +AuditLogRetentionPeriod = 0 +;RetentionDays = 7 +RestrictGuestAccess = 1 + +[System Log] +MaximumLogSize = 16384 +AuditLogRetentionPeriod = 0 +;RetentionDays = 7 +RestrictGuestAccess = 1 + +[Event Audit] +AuditSystemEvents = 0; +AuditObjectAccess = 0; +AuditPrivilegeUse = 0; +AuditPolicyChange = 0; +AuditAccountManage = 0; +AuditProcessTracking = 0; +AuditAccountLogon = 1; +AuditLogonEvents = 1; + +[Privilege Rights] +SeAssignPrimaryTokenPrivilege = *S-1-5-19, *S-1-5-20 +SeAuditPrivilege = *S-1-5-19, *S-1-5-20 +SeBackupPrivilege = *S-1-5-32-544, *S-1-5-32-551 +SeBatchLogonRight = +SeChangeNotifyPrivilege = *S-1-1-0, *S-1-5-32-544, *S-1-5-32-545, *S-1-5-32-547, *S-1-5-32-551 +SeCreateGlobalPrivilege = *S-1-5-6, *S-1-5-32-544 +SeCreatePagefilePrivilege = *S-1-5-32-544 +SeCreatePermanentPrivilege = +SeCreateTokenPrivilege = +SeDebugPrivilege = *S-1-5-32-544 +SeDenyBatchLogonRight = +SeDenyInteractiveLogonRight = +SeDenyNetworkLogonRight = +SeDenyRemoteInteractiveLogonRight = +SeDenyServiceLogonRight = +SeEnableDelegationPrivilege = +SeImpersonatePrivilege = *S-1-5-6, *S-1-5-32-544 +SeIncreaseBasePriorityPrivilege = *S-1-5-32-544 +SeIncreaseQuotaPrivilege = *S-1-5-19, *S-1-5-20, *S-1-5-32-544 +SeInteractiveLogonRight = *S-1-5-32-544, *S-1-5-32-545, *S-1-5-32-547, *S-1-5-32-551 +SeLoadDriverPrivilege = *S-1-5-32-544 +SeLockMemoryPrivilege = +SeMachineAccountPrivilege = +SeManageVolumePrivilege = *S-1-5-32-544 +SeNetworkLogonRight = *S-1-1-0, *S-1-5-32-544, *S-1-5-32-545, *S-1-5-32-547, *S-1-5-32-551 +SeProfileSingleProcessPrivilege = *S-1-5-32-544, *S-1-5-32-547 +SeRemoteInteractiveLogonRight = *S-1-5-32-544, *S-1-5-32-555 +SeRemoteShutdownPrivilege = *S-1-5-32-544 +SeRestorePrivilege = *S-1-5-32-544, *S-1-5-32-551 +SeSecurityPrivilege = *S-1-5-32-544 +SeServiceLogonRight = +SeShutdownPrivilege = *S-1-5-32-544, *S-1-5-32-547, *S-1-5-32-551 +SeSyncAgentPrivilege = +SeSystemEnvironmentPrivilege = *S-1-5-32-544 +SeSystemProfilePrivilege = *S-1-5-32-544 +SeSystemTimePrivilege = *S-1-5-19, *S-1-5-32-544, *S-1-5-32-547 +SeTakeOwnershipPrivilege = *S-1-5-32-544 +SeTcbPrivilege = +SeUndockPrivilege = *S-1-5-32-544, *S-1-5-32-547 + +[Group Membership] +%SceInfUsers%__Memberof = +%SceInfUsers%__Members = %SceInfAuthUsers%, %SceInfInteractive% + +[Registry Values] +; Full registry path = Type, Value +; +; Type: +; 1: REG_SZ +; 2: REG_EXPAND_SZ +; 3: REG_BINARY +; 4: REG_DWORD +; 7: REG_MULTI_SZ + +MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\System\DisableCAD = 4, 0 +MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\System\DontDisplayLastUserName = 4, 0 +MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\System\LegalNoticeCaption = 1, "" +MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\System\LegalNoticeText = 7, "" +MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\System\ShutdownWithoutLogon = 4, 0 +MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\System\UndockWithoutLogon = 4, 1 + +[Strings] +SceInfAuthUsers = "Authenticated Users" +SceInfInteractive = "INTERACTIVE" +SceInfGuest = "Guest" +SceInfUsers = "Users" + +[Strings.0404] +SceInfAuthUsers = "經過身份驗證的使用者" +SceInfInteractive = "INTERACTIVE" +SceInfGuest = "來賓" +SceInfUsers = "使用者" + +[Strings.0407] +SceInfAuthUsers = "Authentifizierte Benutzer" +SceInfInteractive = "INTERAKTIV" +SceInfGuest = "Gast" +SceInfUsers = "Benutzer" + +[Strings.0410] +SceInfAuthUsers = "Utenti autenticati" +SceInfInteractive = "INTERATTIVO" +SceInfGuest = "Guest" +SceInfUsers = "Utenti" + +[Strings.0415] +SceInfAuthUsers = "Użytkownicy uwierzytelnieni" +SceInfInteractive = "INTERAKTYWNA" +SceInfGuest = "Gość" +SceInfUsers = "Użytkownicy" + +[Strings.0418] +SceInfAuthUsers = "Utilizatori autentificați" +SceInfInteractive = "INTERACTIV" +SceInfGuest = "Oaspete" +SceInfUsers = "Utilizatori" + +[Strings.0419] +SceInfAuthUsers = "Авторизованные пользователи" +SceInfInteractive = "INTERACTIVE" +SceInfGuest = "Гость" +SceInfUsers = "Пользователи" + +[Strings.041c] +SceInfAuthUsers = "Përdorues vërtetuar" +SceInfInteractive = "INTERAKTIVE" +SceInfGuest = "Vizitorë" +SceInfUsers = "Përdoruesit" + +[Strings.041f] +SceInfAuthUsers = "Kimliği Doğrulanmış Kullanıcılar" +SceInfInteractive = "ETKLİEŞİMLİ" +SceInfGuest = "Konuk" +SceInfUsers = "Kullanıcılar" + +[Strings.0804] +SceInfAuthUsers = "经过身份验证的用户" +SceInfInteractive = "INTERACTIVE" +SceInfGuest = "来宾" +SceInfUsers = "用户" + +[Strings.0816] +SceInfAuthUsers = "Utilizadores autenticados" +SceInfInteractive = "INTERACTIVE" +SceInfGuest = "Convidado" +SceInfUsers = "Utilizadores"

3 years, 8 months

[reactos] 01/01: [SYSSETUP][INF] Add audit events setup

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9011382e28567c85569a8… commit 9011382e28567c85569a8e9c86b68c01ae6ef113 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jan 17 11:46:34 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 17 11:46:34 2021 +0100 [SYSSETUP][INF] Add audit events setup --- dll/win32/syssetup/security.c | 142 ++++++++++++++++++++++++++++++++++++++++++ media/inf/defltwk.inf | 10 +++ 2 files changed, 152 insertions(+) diff --git a/dll/win32/syssetup/security.c b/dll/win32/syssetup/security.c index 2ac2c3a4917..ff2c329dc2e 100644 --- a/dll/win32/syssetup/security.c +++ b/dll/win32/syssetup/security.c @@ -756,6 +756,146 @@ ApplyEventlogSettings( } +static +VOID +ApplyAuditEvents( + _In_ HINF hSecurityInf) +{ + LSA_OBJECT_ATTRIBUTES ObjectAttributes; + INFCONTEXT InfContext; + WCHAR szOptionName[256]; + INT nValue; + LSA_HANDLE PolicyHandle = NULL; + POLICY_AUDIT_EVENTS_INFO AuditInfo; + PULONG AuditOptions = NULL; + NTSTATUS Status; + + DPRINT("ApplyAuditEvents(%p)\n", hSecurityInf); + + if (!SetupFindFirstLineW(hSecurityInf, + L"Event Audit", + NULL, + &InfContext)) + { + DPRINT1("SetupFindFirstLineW failed\n"); + return; + } + + ZeroMemory(&ObjectAttributes, sizeof(LSA_OBJECT_ATTRIBUTES)); + + Status = LsaOpenPolicy(NULL, + &ObjectAttributes, + POLICY_SET_AUDIT_REQUIREMENTS, + &PolicyHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("LsaOpenPolicy failed (Status %08lx)\n", Status); + return; + } + + AuditOptions = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + (AuditCategoryAccountLogon + 1) * sizeof(ULONG)); + if (AuditOptions == NULL) + { + DPRINT1("Failed to allocate the auditiing options array!\n"); + goto done; + } + + AuditInfo.AuditingMode = TRUE; + AuditInfo.EventAuditingOptions = AuditOptions; + AuditInfo.MaximumAuditEventCount = AuditCategoryAccountLogon + 1; + + do + { + /* Retrieve the group name */ + if (!SetupGetStringFieldW(&InfContext, + 0, + szOptionName, + ARRAYSIZE(szOptionName), + NULL)) + { + DPRINT1("SetupGetStringFieldW() failed\n"); + continue; + } + + DPRINT("Option: '%S'\n", szOptionName); + + if (!SetupGetIntField(&InfContext, + 1, + &nValue)) + { + DPRINT1("SetupGetStringFieldW() failed\n"); + continue; + } + + DPRINT("Value: %d\n", nValue); + + if ((nValue < POLICY_AUDIT_EVENT_UNCHANGED) || (nValue > POLICY_AUDIT_EVENT_NONE)) + { + DPRINT1("Invalid audit option!\n"); + continue; + } + + if (_wcsicmp(szOptionName, L"AuditSystemEvents") == 0) + { + AuditOptions[AuditCategorySystem] = (ULONG)nValue; + } + else if (_wcsicmp(szOptionName, L"AuditLogonEvents") == 0) + { + AuditOptions[AuditCategoryLogon] = (ULONG)nValue; + } + else if (_wcsicmp(szOptionName, L"AuditObjectAccess") == 0) + { + AuditOptions[AuditCategoryObjectAccess] = (ULONG)nValue; + } + else if (_wcsicmp(szOptionName, L"AuditPrivilegeUse") == 0) + { + AuditOptions[AuditCategoryPrivilegeUse] = (ULONG)nValue; + } + else if (_wcsicmp(szOptionName, L"AuditProcessTracking") == 0) + { + AuditOptions[AuditCategoryDetailedTracking] = (ULONG)nValue; + } + else if (_wcsicmp(szOptionName, L"AuditPolicyChange") == 0) + { + AuditOptions[AuditCategoryPolicyChange] = (ULONG)nValue; + } + else if (_wcsicmp(szOptionName, L"AuditAccountManage") == 0) + { + AuditOptions[AuditCategoryAccountManagement] = (ULONG)nValue; + } + else if (_wcsicmp(szOptionName, L"AuditDSAccess") == 0) + { + AuditOptions[AuditCategoryDirectoryServiceAccess] = (ULONG)nValue; + } + else if (_wcsicmp(szOptionName, L"AuditAccountLogon") == 0) + { + AuditOptions[AuditCategoryAccountLogon] = (ULONG)nValue; + } + else + { + DPRINT1("Invalid auditing option '%S'\n", szOptionName); + } + } + while (SetupFindNextLine(&InfContext, &InfContext)); + + Status = LsaSetInformationPolicy(PolicyHandle, + PolicyAuditEventsInformation, + (PVOID)&AuditInfo); + if (Status != STATUS_SUCCESS) + { + DPRINT1("LsaSetInformationPolicy() failed (Status 0x%08lx)\n", Status); + } + +done: + if (AuditOptions != NULL) + HeapFree(GetProcessHeap(), 0, AuditOptions); + + if (PolicyHandle != NULL) + LsaClose(PolicyHandle); +} + + VOID InstallSecurity(VOID) { @@ -782,6 +922,8 @@ InstallSecurity(VOID) ApplyEventlogSettings(hSecurityInf, L"Security Log", L"Security"); ApplyEventlogSettings(hSecurityInf, L"System Log", L"System"); + ApplyAuditEvents(hSecurityInf); + SetupCloseInfFile(hSecurityInf); } diff --git a/media/inf/defltwk.inf b/media/inf/defltwk.inf index 6675540e95a..540edd39416 100644 --- a/media/inf/defltwk.inf +++ b/media/inf/defltwk.inf @@ -22,6 +22,16 @@ AuditLogRetentionPeriod = 1 RetentionDays = 7 RestrictGuestAccess = 1 +[Event Audit] +AuditSystemEvents = 0; +AuditObjectAccess = 0; +AuditPrivilegeUse = 0; +AuditPolicyChange = 0; +AuditAccountManage = 0; +AuditProcessTracking = 0; +AuditAccountLogon = 0; +AuditLogonEvents = 0; + [Privilege Rights] SeAssignPrimaryTokenPrivilege = *S-1-5-19, *S-1-5-20 SeAuditPrivilege = *S-1-5-19, *S-1-5-20

3 years, 8 months

[reactos] 01/01: [INF] Fix typos in defltwk.inf

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=37cf6e109d9403ed8db4a… commit 37cf6e109d9403ed8db4abea96b9f04b5add6920 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jan 17 11:32:40 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 17 11:33:08 2021 +0100 [INF] Fix typos in defltwk.inf --- media/inf/defltwk.inf | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/media/inf/defltwk.inf b/media/inf/defltwk.inf index d1796298c67..6675540e95a 100644 --- a/media/inf/defltwk.inf +++ b/media/inf/defltwk.inf @@ -85,66 +85,66 @@ MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\System\UndockWithoutL [Strings] SceInfAuthUsers = "Authenticated Users" -ScsInfInteractive = "INTERACTIVE" +SceInfInteractive = "INTERACTIVE" SceInfGuest = "Guest" SceInfUsers = "Users" [Strings.0404] SceInfAuthUsers = "經過身份驗證的使用者" -ScsInfInteractive = "INTERACTIVE" +SceInfInteractive = "INTERACTIVE" SceInfGuest = "來賓" SceInfUsers = "使用者" [Strings.0407] SceInfAuthUsers = "Authentifizierte Benutzer" -ScsInfInteractive = "INTERAKTIV" +SceInfInteractive = "INTERAKTIV" SceInfGuest = "Gast" SceInfUsers = "Benutzer" [Strings.0410] SceInfAuthUsers = "Utenti autenticati" -ScsInfInteractive = "INTERATTIVO" +SceInfInteractive = "INTERATTIVO" SceInfGuest = "Guest" SceInfUsers = "Utenti" [Strings.0415] SceInfAuthUsers = "Użytkownicy uwierzytelnieni" -ScsInfInteractive = "INTERAKTYWNA" +SceInfInteractive = "INTERAKTYWNA" SceInfGuest = "Gość" SceInfUsers = "Użytkownicy" [Strings.0418] SceInfAuthUsers = "Utilizatori autentificați" -ScsInfInteractive = "INTERACTIV" +SceInfInteractive = "INTERACTIV" SceInfGuest = "Oaspete" SceInfUsers = "Utilizatori" [Strings.0419] SceInfAuthUsers = "Авторизованные пользователи" -ScsInfInteractive = "INTERACTIVE" +SceInfInteractive = "INTERACTIVE" SceInfGuest = "Гость" SceInfUsers = "Пользователи" [Strings.041c] SceInfAuthUsers = "Përdorues vërtetuar" -ScsInfInteractive = "INTERAKTIVE" +SceInfInteractive = "INTERAKTIVE" SceInfGuest = "Vizitorë" SceInfUsers = "Përdoruesit" [Strings.041f] SceInfAuthUsers = "Kimliği Doğrulanmış Kullanıcılar" -ScsInfInteractive = "ETKLİEŞİMLİ" +SceInfInteractive = "ETKLİEŞİMLİ" SceInfGuest = "Konuk" SceInfUsers = "Kullanıcılar" [Strings.0804] SceInfAuthUsers = "经过身份验证的用户" -ScsInfInteractive = "INTERACTIVE" +SceInfInteractive = "INTERACTIVE" SceInfGuest = "来宾" SceInfUsers = "用户" [Strings.0816] SceInfAuthUsers = "Utilizadores autenticados" -ScsInfInteractive = "INTERACTIVE" +SceInfInteractive = "INTERACTIVE" SceInfGuest = "Convidado" SceInfUsers = "Utilizadores"

3 years, 8 months

[reactos] 01/01: [SCSIPORT] Use pointer alignment for MiniPortDeviceExtension

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=66cf1d20f4894017a5cc2… commit 66cf1d20f4894017a5cc2ce9aaa1190b61854718 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sun Jan 17 01:46:35 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sun Jan 17 01:46:35 2021 +0300 [SCSIPORT] Use pointer alignment for MiniPortDeviceExtension This seems logical and some miniport drivers (uniata) actually rely on that. CORE-17424 --- drivers/storage/port/scsiport/scsiport.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/storage/port/scsiport/scsiport.h b/drivers/storage/port/scsiport/scsiport.h index d3ee010cab1..4933c4c9bb9 100644 --- a/drivers/storage/port/scsiport/scsiport.h +++ b/drivers/storage/port/scsiport/scsiport.h @@ -217,6 +217,12 @@ typedef struct _SCSI_PORT_SAVE_INTERRUPT * part is the miniport-specific device extension. */ +#ifdef _WIN64 +#define ALIGNAS_PTR DECLSPEC_ALIGN(8) +#else +#define ALIGNAS_PTR DECLSPEC_ALIGN(4) +#endif + // FDO typedef struct _SCSI_PORT_DEVICE_EXTENSION { @@ -312,7 +318,9 @@ typedef struct _SCSI_PORT_DEVICE_EXTENSION BOOLEAN DeviceStarted; UINT8 TotalLUCount; - UCHAR MiniPortDeviceExtension[1]; /* must be the last entry */ + // use the pointer alignment here, some miniport drivers rely on this + // moreover, it has to be the last member + ALIGNAS_PTR UCHAR MiniPortDeviceExtension[]; } SCSI_PORT_DEVICE_EXTENSION, *PSCSI_PORT_DEVICE_EXTENSION; typedef struct _RESETBUS_PARAMS

3 years, 8 months

[reactos] 01/01: [INF] Add 'Group Membership' section, missing Guest user rights and translated strings

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5c27b2fd6db0d57f10f7… commit e5c27b2fd6db0d57f10f76759c0a87011612f6bb Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jan 16 15:55:41 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jan 16 15:55:41 2021 +0100 [INF] Add 'Group Membership' section, missing Guest user rights and translated strings --- media/inf/defltwk.inf | 64 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 62 insertions(+), 2 deletions(-) diff --git a/media/inf/defltwk.inf b/media/inf/defltwk.inf index 0a5dd887970..d1796298c67 100644 --- a/media/inf/defltwk.inf +++ b/media/inf/defltwk.inf @@ -34,8 +34,8 @@ SeCreatePermanentPrivilege = SeCreateTokenPrivilege = SeDebugPrivilege = *S-1-5-32-544 SeDenyBatchLogonRight = -SeDenyInteractiveLogonRight = -SeDenyNetworkLogonRight = +SeDenyInteractiveLogonRight = %SceInfGuest% +SeDenyNetworkLogonRight = %SceInfGuest% SeDenyRemoteInteractiveLogonRight = SeDenyServiceLogonRight = SeEnableDelegationPrivilege = @@ -63,6 +63,9 @@ SeTakeOwnershipPrivilege = *S-1-5-32-544 SeTcbPrivilege = SeUndockPrivilege = *S-1-5-32-544, *S-1-5-32-545 +[Group Membership] +%SceInfUsers%__Memberof = +%SceInfUsers%__Members = %SceInfAuthUsers%, %SceInfInteractive% [Registry Values] ; Full registry path = Type, Value @@ -81,10 +84,67 @@ MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\System\ShutdownWithou MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\System\UndockWithoutLogon = 4, 1 [Strings] +SceInfAuthUsers = "Authenticated Users" +ScsInfInteractive = "INTERACTIVE" SceInfGuest = "Guest" +SceInfUsers = "Users" + +[Strings.0404] +SceInfAuthUsers = "經過身份驗證的使用者" +ScsInfInteractive = "INTERACTIVE" +SceInfGuest = "來賓" +SceInfUsers = "使用者" [Strings.0407] +SceInfAuthUsers = "Authentifizierte Benutzer" +ScsInfInteractive = "INTERAKTIV" SceInfGuest = "Gast" +SceInfUsers = "Benutzer" + +[Strings.0410] +SceInfAuthUsers = "Utenti autenticati" +ScsInfInteractive = "INTERATTIVO" +SceInfGuest = "Guest" +SceInfUsers = "Utenti" + +[Strings.0415] +SceInfAuthUsers = "Użytkownicy uwierzytelnieni" +ScsInfInteractive = "INTERAKTYWNA" +SceInfGuest = "Gość" +SceInfUsers = "Użytkownicy" + +[Strings.0418] +SceInfAuthUsers = "Utilizatori autentificați" +ScsInfInteractive = "INTERACTIV" +SceInfGuest = "Oaspete" +SceInfUsers = "Utilizatori" [Strings.0419] +SceInfAuthUsers = "Авторизованные пользователи" +ScsInfInteractive = "INTERACTIVE" SceInfGuest = "Гость" +SceInfUsers = "Пользователи" + +[Strings.041c] +SceInfAuthUsers = "Përdorues vërtetuar" +ScsInfInteractive = "INTERAKTIVE" +SceInfGuest = "Vizitorë" +SceInfUsers = "Përdoruesit" + +[Strings.041f] +SceInfAuthUsers = "Kimliği Doğrulanmış Kullanıcılar" +ScsInfInteractive = "ETKLİEŞİMLİ" +SceInfGuest = "Konuk" +SceInfUsers = "Kullanıcılar" + +[Strings.0804] +SceInfAuthUsers = "经过身份验证的用户" +ScsInfInteractive = "INTERACTIVE" +SceInfGuest = "来宾" +SceInfUsers = "用户" + +[Strings.0816] +SceInfAuthUsers = "Utilizadores autenticados" +ScsInfInteractive = "INTERACTIVE" +SceInfGuest = "Convidado" +SceInfUsers = "Utilizadores"

3 years, 8 months

[reactos] 01/01: [INF] Add Russian (ru-RU) translation to defltwk.inf

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5db1718cc524ac16eb67… commit a5db1718cc524ac16eb674f297adf0667595fcdd Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Jan 16 15:24:52 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Jan 16 15:24:52 2021 +0300 [INF] Add Russian (ru-RU) translation to defltwk.inf Addendum to baf9ff45. --- media/inf/defltwk.inf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/media/inf/defltwk.inf b/media/inf/defltwk.inf index 5aa1acf4b48..0a5dd887970 100644 --- a/media/inf/defltwk.inf +++ b/media/inf/defltwk.inf @@ -85,3 +85,6 @@ SceInfGuest = "Guest" [Strings.0407] SceInfGuest = "Gast" + +[Strings.0419] +SceInfGuest = "Гость"

3 years, 8 months

[reactos] 01/01: [SYSETUP][INF] Add name support for account privilege setup

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=baf9ff45bb7f289b02d1b… commit baf9ff45bb7f289b02d1bcc22f85d4a5196f8139 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jan 16 13:18:08 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jan 16 13:18:08 2021 +0100 [SYSETUP][INF] Add name support for account privilege setup --- dll/win32/syssetup/security.c | 32 +++++++++++++++++++++++++++++--- media/inf/defltwk.inf | 10 ++++++++-- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/dll/win32/syssetup/security.c b/dll/win32/syssetup/security.c index 0bf4167ebc0..2ac2c3a4917 100644 --- a/dll/win32/syssetup/security.c +++ b/dll/win32/syssetup/security.c @@ -282,7 +282,8 @@ InstallPrivileges( PSID AccountSid = NULL; NTSTATUS Status; LSA_HANDLE PolicyHandle = NULL; - LSA_UNICODE_STRING RightString; + LSA_UNICODE_STRING RightString, AccountName; + PLSA_REFERENCED_DOMAIN_LIST ReferencedDomains = NULL; PLSA_TRANSLATED_SID2 Sids = NULL; DPRINT("InstallPrivileges()\n"); @@ -351,8 +352,33 @@ InstallPrivileges( else { DPRINT("Account name: %S\n", szSidString); - continue; - + + ReferencedDomains = NULL; + Sids = NULL; + RtlInitUnicodeString(&AccountName, szSidString); + Status = LsaLookupNames2(PolicyHandle, + 0, + 1, + &AccountName, + &ReferencedDomains, + &Sids); + if (ReferencedDomains != NULL) + { + LsaFreeMemory(ReferencedDomains); + } + + if (!NT_SUCCESS(Status)) + { + DPRINT1("LsaLookupNames2() failed (Status 0x%08lx)\n", Status); + + if (Sids != NULL) + { + LsaFreeMemory(Sids); + Sids = NULL; + } + + continue; + } } RtlInitUnicodeString(&RightString, szPrivilegeString); diff --git a/media/inf/defltwk.inf b/media/inf/defltwk.inf index d23b0d861ea..5aa1acf4b48 100644 --- a/media/inf/defltwk.inf +++ b/media/inf/defltwk.inf @@ -42,7 +42,7 @@ SeEnableDelegationPrivilege = SeImpersonatePrivilege = *S-1-5-6, *S-1-5-32-544 SeIncreaseBasePriorityPrivilege = *S-1-5-32-544 SeIncreaseQuotaPrivilege = *S-1-5-19, *S-1-5-20, *S-1-5-32-544 -SeInteractiveLogonRight = *S-1-5-32-544, *S-1-5-32-545, *S-1-5-32-547, *S-1-5-32-551 +SeInteractiveLogonRight = *S-1-5-32-544, *S-1-5-32-545, *S-1-5-32-547, *S-1-5-32-551, %SceInfGuest% SeLoadDriverPrivilege = *S-1-5-32-544 SeLockMemoryPrivilege = SeMachineAccountPrivilege = @@ -78,4 +78,10 @@ MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\System\DontDisplayLas MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\System\LegalNoticeCaption = 1, "" MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\System\LegalNoticeText = 7, "" MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\System\ShutdownWithoutLogon = 4, 1 -MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\System\UndockWithoutLogon = 4, 1 \ No newline at end of file +MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\System\UndockWithoutLogon = 4, 1 + +[Strings] +SceInfGuest = "Guest" + +[Strings.0407] +SceInfGuest = "Gast"

3 years, 8 months

← Newer
1
2
3
4
5
6
7
8
...
15
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 January 2021