Ros-diffs July 2021

ros-diffs@reactos.org

18 participants
142 discussions

[reactos] 01/02: [NTOS:SE] Move SQOS capturing in its own file

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7fb0d13a46e6087e4b1f4… commit 7fb0d13a46e6087e4b1f45d0fb4b0fbab31b32a4 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sun Jul 4 18:01:25 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Mon Jul 5 09:39:06 2021 +0200 [NTOS:SE] Move SQOS capturing in its own file * Quality of service kernel stuff bears nothing with security descriptors in anyway, so just have a file … [View More]specifically for it * Annotate the function arguments parameters with SAL * Document the functions --- ntoskrnl/include/internal/se.h | 18 ++-- ntoskrnl/ntos.cmake | 1 + ntoskrnl/se/sd.c | 172 ----------------------------- ntoskrnl/se/sqos.c | 239 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 249 insertions(+), 181 deletions(-) diff --git a/ntoskrnl/include/internal/se.h b/ntoskrnl/include/internal/se.h index 03639470c72..aa01ef58088 100644 --- a/ntoskrnl/include/internal/se.h +++ b/ntoskrnl/include/internal/se.h @@ -465,20 +465,20 @@ SepDuplicateToken( NTSTATUS NTAPI SepCaptureSecurityQualityOfService( - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN KPROCESSOR_MODE AccessMode, - IN POOL_TYPE PoolType, - IN BOOLEAN CaptureIfKernel, - OUT PSECURITY_QUALITY_OF_SERVICE *CapturedSecurityQualityOfService, - OUT PBOOLEAN Present + _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ KPROCESSOR_MODE AccessMode, + _In_ POOL_TYPE PoolType, + _In_ BOOLEAN CaptureIfKernel, + _Out_ PSECURITY_QUALITY_OF_SERVICE *CapturedSecurityQualityOfService, + _Out_ PBOOLEAN Present ); VOID NTAPI SepReleaseSecurityQualityOfService( - IN PSECURITY_QUALITY_OF_SERVICE CapturedSecurityQualityOfService OPTIONAL, - IN KPROCESSOR_MODE AccessMode, - IN BOOLEAN CaptureIfKernel + _In_opt_ PSECURITY_QUALITY_OF_SERVICE CapturedSecurityQualityOfService, + _In_ KPROCESSOR_MODE AccessMode, + _In_ BOOLEAN CaptureIfKernel ); NTSTATUS diff --git a/ntoskrnl/ntos.cmake b/ntoskrnl/ntos.cmake index 6e1edf2d944..4b56e74896e 100644 --- a/ntoskrnl/ntos.cmake +++ b/ntoskrnl/ntos.cmake @@ -280,6 +280,7 @@ list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/se/sd.c ${REACTOS_SOURCE_DIR}/ntoskrnl/se/semgr.c ${REACTOS_SOURCE_DIR}/ntoskrnl/se/sid.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/se/sqos.c ${REACTOS_SOURCE_DIR}/ntoskrnl/se/srm.c ${REACTOS_SOURCE_DIR}/ntoskrnl/se/token.c ${REACTOS_SOURCE_DIR}/ntoskrnl/vf/driver.c diff --git a/ntoskrnl/se/sd.c b/ntoskrnl/se/sd.c index 7ab6ee9d2bd..72eff599ce5 100644 --- a/ntoskrnl/se/sd.c +++ b/ntoskrnl/se/sd.c @@ -215,178 +215,6 @@ SeSetWorldSecurityDescriptor(SECURITY_INFORMATION SecurityInformation, return STATUS_SUCCESS; } - -NTSTATUS -NTAPI -SepCaptureSecurityQualityOfService(IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN KPROCESSOR_MODE AccessMode, - IN POOL_TYPE PoolType, - IN BOOLEAN CaptureIfKernel, - OUT PSECURITY_QUALITY_OF_SERVICE *CapturedSecurityQualityOfService, - OUT PBOOLEAN Present) -{ - PSECURITY_QUALITY_OF_SERVICE CapturedQos; - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - ASSERT(CapturedSecurityQualityOfService); - ASSERT(Present); - - if (ObjectAttributes != NULL) - { - if (AccessMode != KernelMode) - { - SECURITY_QUALITY_OF_SERVICE SafeQos; - - _SEH2_TRY - { - ProbeForRead(ObjectAttributes, - sizeof(OBJECT_ATTRIBUTES), - sizeof(ULONG)); - if (ObjectAttributes->Length == sizeof(OBJECT_ATTRIBUTES)) - { - if (ObjectAttributes->SecurityQualityOfService != NULL) - { - ProbeForRead(ObjectAttributes->SecurityQualityOfService, - sizeof(SECURITY_QUALITY_OF_SERVICE), - sizeof(ULONG)); - - if (((PSECURITY_QUALITY_OF_SERVICE)ObjectAttributes->SecurityQualityOfService)->Length == - sizeof(SECURITY_QUALITY_OF_SERVICE)) - { - /* - * Don't allocate memory here because ExAllocate should bugcheck - * the system if it's buggy, SEH would catch that! So make a local - * copy of the qos structure. - */ - RtlCopyMemory(&SafeQos, - ObjectAttributes->SecurityQualityOfService, - sizeof(SECURITY_QUALITY_OF_SERVICE)); - *Present = TRUE; - } - else - { - Status = STATUS_INVALID_PARAMETER; - } - } - else - { - *CapturedSecurityQualityOfService = NULL; - *Present = FALSE; - } - } - else - { - Status = STATUS_INVALID_PARAMETER; - } - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (NT_SUCCESS(Status)) - { - if (*Present) - { - CapturedQos = ExAllocatePoolWithTag(PoolType, - sizeof(SECURITY_QUALITY_OF_SERVICE), - TAG_QOS); - if (CapturedQos != NULL) - { - RtlCopyMemory(CapturedQos, - &SafeQos, - sizeof(SECURITY_QUALITY_OF_SERVICE)); - *CapturedSecurityQualityOfService = CapturedQos; - } - else - { - Status = STATUS_INSUFFICIENT_RESOURCES; - } - } - else - { - *CapturedSecurityQualityOfService = NULL; - } - } - } - else - { - if (ObjectAttributes->Length == sizeof(OBJECT_ATTRIBUTES)) - { - if (CaptureIfKernel) - { - if (ObjectAttributes->SecurityQualityOfService != NULL) - { - if (((PSECURITY_QUALITY_OF_SERVICE)ObjectAttributes->SecurityQualityOfService)->Length == - sizeof(SECURITY_QUALITY_OF_SERVICE)) - { - CapturedQos = ExAllocatePoolWithTag(PoolType, - sizeof(SECURITY_QUALITY_OF_SERVICE), - TAG_QOS); - if (CapturedQos != NULL) - { - RtlCopyMemory(CapturedQos, - ObjectAttributes->SecurityQualityOfService, - sizeof(SECURITY_QUALITY_OF_SERVICE)); - *CapturedSecurityQualityOfService = CapturedQos; - *Present = TRUE; - } - else - { - Status = STATUS_INSUFFICIENT_RESOURCES; - } - } - else - { - Status = STATUS_INVALID_PARAMETER; - } - } - else - { - *CapturedSecurityQualityOfService = NULL; - *Present = FALSE; - } - } - else - { - *CapturedSecurityQualityOfService = (PSECURITY_QUALITY_OF_SERVICE)ObjectAttributes->SecurityQualityOfService; - *Present = (ObjectAttributes->SecurityQualityOfService != NULL); - } - } - else - { - Status = STATUS_INVALID_PARAMETER; - } - } - } - else - { - *CapturedSecurityQualityOfService = NULL; - *Present = FALSE; - } - - return Status; -} - - -VOID -NTAPI -SepReleaseSecurityQualityOfService(IN PSECURITY_QUALITY_OF_SERVICE CapturedSecurityQualityOfService OPTIONAL, - IN KPROCESSOR_MODE AccessMode, - IN BOOLEAN CaptureIfKernel) -{ - PAGED_CODE(); - - if (CapturedSecurityQualityOfService != NULL && - (AccessMode != KernelMode || CaptureIfKernel)) - { - ExFreePoolWithTag(CapturedSecurityQualityOfService, TAG_QOS); - } -} - /* PUBLIC FUNCTIONS ***********************************************************/ static diff --git a/ntoskrnl/se/sqos.c b/ntoskrnl/se/sqos.c new file mode 100644 index 00000000000..995c19680ba --- /dev/null +++ b/ntoskrnl/se/sqos.c @@ -0,0 +1,239 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Security Quality of Service (SQoS) implementation support + * COPYRIGHT: Copyright David Welch <welch(a)cwcom.net> + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS *******************************************************************/ + +/** + * @brief + * Captures the security quality of service data given the object + * attributes from an object. + * + * @param[in] ObjectAttributes + * Attributes of an object where SQOS is to be retrieved. If the caller + * doesn't fill object attributes to the function, it automatically assumes + * SQOS is not present, or if, there's no SQOS present in the object attributes list + * of the object itself. + * + * @param[in] AccessMode + * Processor access mode. + * + * @param[in] PoolType + * The pool type for the captured SQOS to be used for allocation. + * + * @param[in] CaptureIfKernel + * Capture access condition. To be set to TRUE if the capture is done within the kernel, + * FALSE if the capture is done in a kernel mode driver or user mode otherwise. + * + * @param[out] CapturedSecurityQualityOfService + * The captured SQOS data from the object. + * + * @param[out] Present + * Returns TRUE if SQOS is present in an object, FALSE otherwise. FALSE is also immediately + * returned if no object attributes is given to the call. + * + * @return + * STATUS_SUCCESS if SQOS from the object has been fully and successfully captured. STATUS_INVALID_PARAMETER + * if the caller submits an invalid object attributes list. STATUS_INSUFFICIENT_RESOURCES if the function has + * failed to allocate some resources in the pool for the captured SQOS. A failure NTSTATUS code is returned + * otherwise. + */ +NTSTATUS +NTAPI +SepCaptureSecurityQualityOfService( + _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ KPROCESSOR_MODE AccessMode, + _In_ POOL_TYPE PoolType, + _In_ BOOLEAN CaptureIfKernel, + _Out_ PSECURITY_QUALITY_OF_SERVICE *CapturedSecurityQualityOfService, + _Out_ PBOOLEAN Present) +{ + PSECURITY_QUALITY_OF_SERVICE CapturedQos; + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); + + ASSERT(CapturedSecurityQualityOfService); + ASSERT(Present); + + if (ObjectAttributes != NULL) + { + if (AccessMode != KernelMode) + { + SECURITY_QUALITY_OF_SERVICE SafeQos; + + _SEH2_TRY + { + ProbeForRead(ObjectAttributes, + sizeof(OBJECT_ATTRIBUTES), + sizeof(ULONG)); + if (ObjectAttributes->Length == sizeof(OBJECT_ATTRIBUTES)) + { + if (ObjectAttributes->SecurityQualityOfService != NULL) + { + ProbeForRead(ObjectAttributes->SecurityQualityOfService, + sizeof(SECURITY_QUALITY_OF_SERVICE), + sizeof(ULONG)); + + if (((PSECURITY_QUALITY_OF_SERVICE)ObjectAttributes->SecurityQualityOfService)->Length == + sizeof(SECURITY_QUALITY_OF_SERVICE)) + { + /* + * Don't allocate memory here because ExAllocate should bugcheck + * the system if it's buggy, SEH would catch that! So make a local + * copy of the qos structure. + */ + RtlCopyMemory(&SafeQos, + ObjectAttributes->SecurityQualityOfService, + sizeof(SECURITY_QUALITY_OF_SERVICE)); + *Present = TRUE; + } + else + { + Status = STATUS_INVALID_PARAMETER; + } + } + else + { + *CapturedSecurityQualityOfService = NULL; + *Present = FALSE; + } + } + else + { + Status = STATUS_INVALID_PARAMETER; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (NT_SUCCESS(Status)) + { + if (*Present) + { + CapturedQos = ExAllocatePoolWithTag(PoolType, + sizeof(SECURITY_QUALITY_OF_SERVICE), + TAG_QOS); + if (CapturedQos != NULL) + { + RtlCopyMemory(CapturedQos, + &SafeQos, + sizeof(SECURITY_QUALITY_OF_SERVICE)); + *CapturedSecurityQualityOfService = CapturedQos; + } + else + { + Status = STATUS_INSUFFICIENT_RESOURCES; + } + } + else + { + *CapturedSecurityQualityOfService = NULL; + } + } + } + else + { + if (ObjectAttributes->Length == sizeof(OBJECT_ATTRIBUTES)) + { + if (CaptureIfKernel) + { + if (ObjectAttributes->SecurityQualityOfService != NULL) + { + if (((PSECURITY_QUALITY_OF_SERVICE)ObjectAttributes->SecurityQualityOfService)->Length == + sizeof(SECURITY_QUALITY_OF_SERVICE)) + { + CapturedQos = ExAllocatePoolWithTag(PoolType, + sizeof(SECURITY_QUALITY_OF_SERVICE), + TAG_QOS); + if (CapturedQos != NULL) + { + RtlCopyMemory(CapturedQos, + ObjectAttributes->SecurityQualityOfService, + sizeof(SECURITY_QUALITY_OF_SERVICE)); + *CapturedSecurityQualityOfService = CapturedQos; + *Present = TRUE; + } + else + { + Status = STATUS_INSUFFICIENT_RESOURCES; + } + } + else + { + Status = STATUS_INVALID_PARAMETER; + } + } + else + { + *CapturedSecurityQualityOfService = NULL; + *Present = FALSE; + } + } + else + { + *CapturedSecurityQualityOfService = (PSECURITY_QUALITY_OF_SERVICE)ObjectAttributes->SecurityQualityOfService; + *Present = (ObjectAttributes->SecurityQualityOfService != NULL); + } + } + else + { + Status = STATUS_INVALID_PARAMETER; + } + } + } + else + { + *CapturedSecurityQualityOfService = NULL; + *Present = FALSE; + } + + return Status; +} + +/** + * @brief + * Releases (frees) the captured SQOS data from an object in the memory pool. + * + * @param[in] CapturedSecurityQualityOfService + * The captured SQOS data to be released. + * + * @param[in] AccessMode + * Processor access mode. + * + * @param[in] CaptureIfKernel + * Capture access condition. To be set to TRUE if the capture is done within the kernel, + * FALSE if the capture is done in a kernel mode driver or user mode otherwise. + * + * @return + * Nothing. + */ +VOID +NTAPI +SepReleaseSecurityQualityOfService( + _In_opt_ PSECURITY_QUALITY_OF_SERVICE CapturedSecurityQualityOfService, + _In_ KPROCESSOR_MODE AccessMode, + _In_ BOOLEAN CaptureIfKernel) +{ + PAGED_CODE(); + + if (CapturedSecurityQualityOfService != NULL && + (AccessMode != KernelMode || CaptureIfKernel)) + { + ExFreePoolWithTag(CapturedSecurityQualityOfService, TAG_QOS); + } +} + +/* EOF */ [View Less]

3 years, 11 months

[reactos] 01/01: [KDGDB] Support "int 0x2c" for x86 & amd64 targets

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6e0d8de01310017918288… commit 6e0d8de01310017918288bd65edad73343093a57 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Jun 30 00:29:27 2021 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Mon Jul 5 10:55:47 2021 +0200 [KDGDB] Support "int 0x2c" for x86 & amd64 targets --- drivers/base/kdgdb/gdb_input.c | 47 ++++++++++++++---------------------------- 1 file changed, 16 … [View More]insertions(+), 31 deletions(-) diff --git a/drivers/base/kdgdb/gdb_input.c b/drivers/base/kdgdb/gdb_input.c index 822efb88042..54dda4b9bb5 100644 --- a/drivers/base/kdgdb/gdb_input.c +++ b/drivers/base/kdgdb/gdb_input.c @@ -914,8 +914,8 @@ handle_gdb_c( ULONG_PTR ProgramCounter = KdpGetContextPc(&CurrentContext); /* See if we should update the program counter */ - if (Exception && (Exception->ExceptionRecord.ExceptionCode == STATUS_BREAKPOINT) - && ((*(KD_BREAKPOINT_TYPE*)ProgramCounter) == KD_BREAKPOINT_VALUE)) + if ((Exception->ExceptionRecord.ExceptionCode == STATUS_BREAKPOINT) + && ((*(KD_BREAKPOINT_TYPE*)ProgramCounter) == KD_BREAKPOINT_VALUE)) { /* We must get past the breakpoint instruction */ KdpSetContextPc(&CurrentContext, ProgramCounter + KD_BREAKPOINT_SIZE); @@ -924,34 +924,21 @@ handle_gdb_c( KdpManipulateStateHandler = ContinueManipulateStateHandler; return KdPacketReceived; } - } - - return ContinueManipulateStateHandler(State, MessageData, MessageLength, KdContext); -} - -static -KDSTATUS -handle_gdb_C( - _Out_ DBGKD_MANIPULATE_STATE64* State, - _Out_ PSTRING MessageData, - _Out_ PULONG MessageLength, - _Inout_ PKD_CONTEXT KdContext) -{ - KDSTATUS Status; - - /* Tell GDB everything is fine, we will handle it */ - Status = send_gdb_packet("OK"); - if (Status != KdPacketReceived) - return Status; +#if defined(_M_IX86) || defined(_M_AMD64) + if ((Exception->ExceptionRecord.ExceptionCode == STATUS_ASSERTION_FAILURE) + && ((*(KD_BREAKPOINT_TYPE*)ProgramCounter) == 0xCD) + && (*((KD_BREAKPOINT_TYPE*)ProgramCounter + 1) == 0x2C)) + { + /* INT 2C (a.k.a. runtime check failure) */ + KdpSetContextPc(&CurrentContext, ProgramCounter + 2); - if (CurrentStateChange.NewState == DbgKdExceptionStateChange) - { - /* Debugger didn't handle the exception, report it back to the kernel */ - State->u.Continue2.ContinueStatus = CurrentStateChange.u.Exception.ExceptionRecord.ExceptionCode; - State->ApiNumber = DbgKdContinueApi2; - return KdPacketReceived; + SetContextManipulateHandler(State, MessageData, MessageLength, KdContext); + KdpManipulateStateHandler = ContinueManipulateStateHandler; + return KdPacketReceived; + } +#endif } - /* We should never reach this ? */ + return ContinueManipulateStateHandler(State, MessageData, MessageLength, KdContext); } @@ -1033,10 +1020,8 @@ gdb_receive_and_interpret_packet( Status = LOOP_IF_SUCCESS(send_gdb_packet("OK")); break; case 'c': - Status = handle_gdb_c(State, MessageData, MessageLength, KdContext); - break; case 'C': - Status = handle_gdb_C(State, MessageData, MessageLength, KdContext); + Status = handle_gdb_c(State, MessageData, MessageLength, KdContext); break; case 'g': Status = LOOP_IF_SUCCESS(gdb_send_registers()); [View Less]

3 years, 11 months

[reactos] 01/01: [CMAKE] Cache compiler paths to make some utilities happy

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e278b59d3a57ab1916e47… commit e278b59d3a57ab1916e47662e0bdff1cd11e9076 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Jul 5 09:56:41 2021 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Mon Jul 5 09:56:41 2021 +0200 [CMAKE] Cache compiler paths to make some utilities happy VS code being one of them --- toolchain-gcc.cmake | 6 +++--- 1 file changed, 3 insertions(+)… [View More]

3 years, 11 months

[reactos] 01/01: [SAMSRV] Start work on the display cache

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb8edf90a002cefd0d99a… commit fb8edf90a002cefd0d99adb4316f12e6d6840418 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jul 4 12:45:19 2021 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jul 4 12:45:19 2021 +0200 [SAMSRV] Start work on the display cache Initialize the cache and fill it on demand --- dll/win32/samsrv/CMakeLists.txt | 1 + dll/win32/samsrv/display.c | 202 … [View More]++++++++++++++++++++++++++++++++++++++++ dll/win32/samsrv/samrpc.c | 41 +++++++- dll/win32/samsrv/samsrv.c | 4 + dll/win32/samsrv/samsrv.h | 18 ++++ 5 files changed, 264 insertions(+), 2 deletions(-) diff --git a/dll/win32/samsrv/CMakeLists.txt b/dll/win32/samsrv/CMakeLists.txt index f3303d61eed..c62b0cf2bf7 100644 --- a/dll/win32/samsrv/CMakeLists.txt +++ b/dll/win32/samsrv/CMakeLists.txt @@ -9,6 +9,7 @@ spec2def(samsrv.dll samsrv.spec ADD_IMPORTLIB) list(APPEND SOURCE alias.c database.c + display.c domain.c group.c registry.c diff --git a/dll/win32/samsrv/display.c b/dll/win32/samsrv/display.c new file mode 100644 index 00000000000..3a5087dade5 --- /dev/null +++ b/dll/win32/samsrv/display.c @@ -0,0 +1,202 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Security Account Manager (SAM) Server + * FILE: reactos/dll/win32/samsrv/display.c + * PURPOSE: Display cache + * + * PROGRAMMERS: Eric Kohl + */ + +#include "samsrv.h" + +#include <winuser.h> + +/* GLOBALS *****************************************************************/ + +typedef struct _USER_ENTRY +{ + LIST_ENTRY ListEntry; + SAMPR_DOMAIN_DISPLAY_USER User; +} USER_ENTRY, *PUSER_ENTRY; + + +static LIST_ENTRY UserListHead; +static BOOLEAN UserListFilled = FALSE; +static ULONG UserListCount = 0; + +//static LIST_HEAD MachineListHead; +//static LIST_HEAD GroupListHead; + + + +/* FUNCTIONS ***************************************************************/ + +static +NTSTATUS +SampFillUserDisplayCache( + _In_ PSAM_DB_OBJECT DomainObject) +{ + HANDLE UsersKeyHandle = NULL; + WCHAR UserKeyName[64]; + ULONG EnumIndex; + ULONG NameLength; + ULONG Rid; + PSAM_DB_OBJECT UserObject; + SAM_USER_FIXED_DATA FixedUserData; + ULONG Size; + ULONG DataType; + PUSER_ENTRY UserEntry; + NTSTATUS Status; + + FIXME("SampFillUserDisplayCache(%p)\n", DomainObject); + + if (UserListFilled) + { + FIXME("Already filled!\n"); + return STATUS_SUCCESS; + } + + Status = SampRegOpenKey(DomainObject->KeyHandle, + L"Users", + KEY_ALL_ACCESS, /* FIXME */ + &UsersKeyHandle); + if (!NT_SUCCESS(Status)) + goto done; + + for (EnumIndex = 0; ; EnumIndex++) + { + FIXME("EnumIndex: %lu\n", EnumIndex); + NameLength = 64 * sizeof(WCHAR); + Status = SampRegEnumerateSubKey(UsersKeyHandle, + EnumIndex, + NameLength, + UserKeyName); + if (!NT_SUCCESS(Status)) + { + if (Status == STATUS_NO_MORE_ENTRIES) + Status = STATUS_SUCCESS; + break; + } + + FIXME("User name: %S\n", UserKeyName); + FIXME("Name length: %lu\n", NameLength); + + Rid = wcstoul(UserKeyName, NULL, 16); + if (Rid == 0 || Rid == ULONG_MAX) + continue; + + FIXME("Rid: 0x%lx\n", Rid); + Status = SampOpenDbObject(DomainObject, + L"Users", + UserKeyName, + Rid, + SamDbUserObject, + 0, + &UserObject); + if (NT_SUCCESS(Status)) + { + Size = sizeof(SAM_USER_FIXED_DATA); + Status = SampGetObjectAttribute(UserObject, + L"F", + &DataType, + (LPVOID)&FixedUserData, + &Size); + if (NT_SUCCESS(Status)) + { + FIXME("Account control: 0x%lx\n", FixedUserData.UserAccountControl); + + if (FixedUserData.UserAccountControl & USER_NORMAL_ACCOUNT) + { + UserEntry = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(USER_ENTRY)); + if (UserEntry != NULL) + { + + UserEntry->User.Rid = Rid; + UserEntry->User.AccountControl = FixedUserData.UserAccountControl; + + /* FIXME: Add remaining attributes */ + + InsertTailList(&UserListHead, &UserEntry->ListEntry); + UserListCount++; + } + } + } + + SampCloseDbObject(UserObject); + } + } + +done: + if (Status == STATUS_SUCCESS) + UserListFilled = TRUE; + + FIXME("SampFillUserDisplayCache() done (Status 0x%08lx)\n", Status); + + return Status; +} + + + +NTSTATUS +SampInitializeDisplayCache(VOID) +{ + TRACE("SampInitializeDisplayCache()\n"); + + InitializeListHead(&UserListHead); + UserListFilled = FALSE; + UserListCount = 0; + +// InitializeListHead(&MachineListHead); +// MachineListFilled = FALSE; +// MachineListCount = 0; + +// InitializeListHead(&GroupListHead); +// GroupListFilled = FALSE; +// GroupListCount = 0; + + return STATUS_SUCCESS; +} + + +NTSTATUS +SampShutdownDisplayCache(VOID) +{ + TRACE("SampShutdownDisplayCache()\n"); + return STATUS_SUCCESS; +} + + +NTSTATUS +SampFillDisplayCache( + _In_ PSAM_DB_OBJECT DomainObject, + _In_ DOMAIN_DISPLAY_INFORMATION DisplayInformationClass) +{ + NTSTATUS Status; + + TRACE("SampFillDisplayCache()\n"); + + switch (DisplayInformationClass) + { + case DomainDisplayUser: + Status = SampFillUserDisplayCache(DomainObject); + break; +/* + case DomainDisplayMachine: + Status = SampFillMachineDisplayCache(DomainObject); + break; + + case DomainDisplayGroup: + Status = SampFillGroupDisplayCache(DomainObject); + break; +*/ + default: + Status = STATUS_INVALID_INFO_CLASS; + break; + } + + return Status; +} + +/* EOF */ diff --git a/dll/win32/samsrv/samrpc.c b/dll/win32/samsrv/samrpc.c index 518ac75e0b5..a693324f1d3 100644 --- a/dll/win32/samsrv/samrpc.c +++ b/dll/win32/samsrv/samrpc.c @@ -125,6 +125,7 @@ void __RPC_USER midl_user_free(void __RPC_FAR * ptr) void __RPC_USER SAMPR_HANDLE_rundown(SAMPR_HANDLE hHandle) { + FIXME("SAMPR_HANDLE_rundown(%p)\n", hHandle); } @@ -487,6 +488,12 @@ SamrShutdownSamServer(IN SAMPR_HANDLE ServerHandle) /* Shut the server down */ RpcMgmtStopServerListening(0); + Status = SampShutdownDisplayCache(); + if (!NT_SUCCESS(Status)) + { + ERR("SampShutdownDisplayCache() failed (Status 0x%08lx)\n", Status); + } + return STATUS_SUCCESS; } @@ -9428,12 +9435,42 @@ SamrQueryDisplayInformation3(IN SAMPR_HANDLE DomainHandle, OUT unsigned long *TotalReturned, OUT PSAMPR_DISPLAY_INFO_BUFFER Buffer) { - TRACE("SamrQueryDisplayInformation3(%p %lu %lu %lu %lu %p %p %p)\n", + PSAM_DB_OBJECT DomainObject; + NTSTATUS Status; + + FIXME("SamrQueryDisplayInformation3(%p %lu %lu %lu %lu %p %p %p)\n", DomainHandle, DisplayInformationClass, Index, EntryCount, PreferredMaximumLength, TotalAvailable, TotalReturned, Buffer); - UNIMPLEMENTED; + RtlAcquireResourceShared(&SampResource, + TRUE); + + /* Validate the domain handle */ + Status = SampValidateDbObject(DomainHandle, + SamDbDomainObject, + DOMAIN_LIST_ACCOUNTS, + &DomainObject); + if (!NT_SUCCESS(Status)) + { + ERR("SampValidateDbObject() failed (Status 0x%08lx)\n", Status); + goto done; + } + + Status = SampFillDisplayCache(DomainObject, + DisplayInformationClass); + if (!NT_SUCCESS(Status)) + { + ERR("SampFillDisplayCache() failed (Status 0x%08lx)\n", Status); + goto done; + } + +done: + TRACE("returns with status 0x%08lx\n", Status); + + RtlReleaseResource(&SampResource); + +// return Status; return STATUS_NOT_IMPLEMENTED; } diff --git a/dll/win32/samsrv/samsrv.c b/dll/win32/samsrv/samsrv.c index 5e4fd9d96f3..57aa5fb6bb7 100644 --- a/dll/win32/samsrv/samsrv.c +++ b/dll/win32/samsrv/samsrv.c @@ -120,6 +120,10 @@ SamIInitialize(VOID) return Status; } + Status = SampInitializeDisplayCache(); + if (!NT_SUCCESS(Status)) + return Status; + RtlInitializeResource(&SampResource); /* Initialize the SAM database */ diff --git a/dll/win32/samsrv/samsrv.h b/dll/win32/samsrv/samsrv.h index e16308c9338..0211e4ebf18 100644 --- a/dll/win32/samsrv/samsrv.h +++ b/dll/win32/samsrv/samsrv.h @@ -122,6 +122,7 @@ extern ENCRYPTED_LM_OWF_PASSWORD EmptyLmHash; extern RTL_RESOURCE SampResource; extern NT_PRODUCT_TYPE SampProductType; + /* alias.c */ NTSTATUS @@ -207,6 +208,21 @@ SampSetObjectAttributeString(PSAM_DB_OBJECT DbObject, LPWSTR AttributeName, PRPC_UNICODE_STRING String); + +/* display.c */ + +NTSTATUS +SampInitializeDisplayCache(VOID); + +NTSTATUS +SampShutdownDisplayCache(VOID); + +NTSTATUS +SampFillDisplayCache( + _In_ PSAM_DB_OBJECT DomainObject, + _In_ DOMAIN_DISPLAY_INFORMATION DisplayInformationClass); + + /* domain.c */ NTSTATUS @@ -233,6 +249,7 @@ SampCreateAccountSid(IN PSAM_DB_OBJECT DomainObject, IN ULONG ulRelativeId, IN OUT PSID *AccountSid); + /* group.h */ NTSTATUS @@ -343,6 +360,7 @@ SampCreateUserSD(IN PSID UserSid, OUT PSECURITY_DESCRIPTOR *UserSd, OUT PULONG Size); + /* setup.c */ BOOL [View Less]

3 years, 11 months

[reactos] 01/01: [SAMLIB] Add function names to trace messages

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=556cef5be30306a8fda9f… commit 556cef5be30306a8fda9f806451d69c2af012d12 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jul 4 12:31:22 2021 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jul 4 12:31:22 2021 +0200 [SAMLIB] Add function names to trace messages --- dll/win32/samlib/samlib.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dll/win32/samlib/… [View More]

3 years, 11 months

[reactos] 02/02: [NPFS] The function call expects a pool type value, not a boolean value

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aa59e3ad001333e885c1a… commit aa59e3ad001333e885c1acbca33699570374d7c0 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sat Jul 3 18:22:45 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun Jul 4 11:02:05 2021 +0200 [NPFS] The function call expects a pool type value, not a boolean value --- drivers/filesystems/npfs/seinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) … [View More]

3 years, 11 months

[reactos] 01/02: [NTOS:SE] Allocate pool memory for security descriptor based on the caller pool type request

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ff0a32511667a0e704a8d… commit ff0a32511667a0e704a8d58121a9a2baa128ddda Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sat Jul 3 18:20:43 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun Jul 4 11:01:54 2021 +0200 [NTOS:SE] Allocate pool memory for security descriptor based on the caller pool type request We're indiscriminately allocate the pool as non paged all the … [View More]

3 years, 11 months

[reactos] 01/01: [IMM32] Rewrite ImmGetDescriptionA/W (#3780)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89f5f5bb95c6109a6fcea… commit 89f5f5bb95c6109a6fcea95a45b68cc24ae16cef Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Jul 4 08:18:15 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jul 4 08:18:15 2021 +0900 [IMM32] Rewrite ImmGetDescriptionA/W (#3780) CORE-11700 --- dll/win32/imm32/imm.c | 36 ++++++++++++++++++++++++++++++++++++ sdk/include/… [View More]reactos/imm32_undoc.h | 23 +++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 45be160a528..ca026d473f0 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -37,9 +37,12 @@ #include "winreg.h" #include "wine/list.h" #ifdef __REACTOS__ +#include <stdlib.h> #include <ndk/umtypes.h> #include <ndk/pstypes.h> #include "../../../win32ss/include/ntuser.h" +#include <imm32_undoc.h> +#include <strsafe.h> #endif WINE_DEFAULT_DEBUG_CHANNEL(imm); @@ -1765,6 +1768,22 @@ HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) UINT WINAPI ImmGetDescriptionA( HKL hKL, LPSTR lpszDescription, UINT uBufLen) { +#ifdef __REACTOS__ + IMEINFOEX info; + size_t cch; + + TRACE("ImmGetDescriptionA(%p,%p,%d)\n", hKL, lpszDescription, uBufLen); + + if (!ImmGetImeInfoEx(&info, ImeInfoExKeyboardLayout, &hKL) || !IS_IME_KBDLAYOUT(hKL)) + return 0; + + StringCchLengthW(info.wszImeDescription, _countof(info.wszImeDescription), &cch); + cch = WideCharToMultiByte(CP_ACP, 0, info.wszImeDescription, (INT)cch, + lpszDescription, uBufLen, NULL, NULL); + if (uBufLen) + lpszDescription[cch] = 0; + return cch; +#else WCHAR *buf; DWORD len; @@ -1793,6 +1812,7 @@ UINT WINAPI ImmGetDescriptionA( return 0; return len - 1; +#endif } /*********************************************************************** @@ -1800,6 +1820,21 @@ UINT WINAPI ImmGetDescriptionA( */ UINT WINAPI ImmGetDescriptionW(HKL hKL, LPWSTR lpszDescription, UINT uBufLen) { +#ifdef __REACTOS__ + IMEINFOEX info; + size_t cch; + + TRACE("ImmGetDescriptionW(%p, %p, %d)\n", hKL, lpszDescription, uBufLen); + + if (!ImmGetImeInfoEx(&info, ImeInfoExKeyboardLayout, &hKL) || !IS_IME_KBDLAYOUT(hKL)) + return 0; + + if (uBufLen != 0) + StringCchCopyW(lpszDescription, uBufLen, info.wszImeDescription); + + StringCchLengthW(info.wszImeDescription, _countof(info.wszImeDescription), &cch); + return (UINT)cch; +#else static const WCHAR name[] = { 'W','i','n','e',' ','X','I','M',0 }; FIXME("(%p, %p, %d): semi stub\n", hKL, lpszDescription, uBufLen); @@ -1808,6 +1843,7 @@ UINT WINAPI ImmGetDescriptionW(HKL hKL, LPWSTR lpszDescription, UINT uBufLen) if (!uBufLen) return lstrlenW( name ); lstrcpynW( lpszDescription, name, uBufLen ); return lstrlenW( lpszDescription ); +#endif } /*********************************************************************** diff --git a/sdk/include/reactos/imm32_undoc.h b/sdk/include/reactos/imm32_undoc.h new file mode 100644 index 00000000000..32858af1068 --- /dev/null +++ b/sdk/include/reactos/imm32_undoc.h @@ -0,0 +1,23 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Private header for imm32.dll + * COPYRIGHT: Copyright 2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#pragma once + +#define KBDLAYOUT_MASK 0xF000 +#define KBDLAYOUT_IME 0xE000 +#define IS_IME_KBDLAYOUT(hKL) ((HIWORD(hKL) & KBDLAYOUT_MASK) == KBDLAYOUT_IME) + +#ifdef __cplusplus +extern "C" { +#endif + +BOOL WINAPI +ImmGetImeInfoEx(PIMEINFOEX pImeInfoEx, IMEINFOEXCLASS SearchType, PVOID pvSearchKey); + +#ifdef __cplusplus +} // extern "C" +#endif [View Less]

3 years, 11 months

[reactos] 01/01: [WORDPAD] Fix icons for toolbar and formatbar (#3792) CORE-5823

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e068c684522ededfb0ffd… commit e068c684522ededfb0ffd70e8af736bb14c7b392 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sat Jul 3 15:55:05 2021 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jul 3 22:55:05 2021 +0200 [WORDPAD] Fix icons for toolbar and formatbar (#3792) CORE-5823 * CORE-5823 Fix icons for toolbar and formatbar in Wordpad. which regressed by SVN r47776 == git … [View More]

3 years, 11 months

[reactos] 04/04: [SERVMAN] Add Portuguese (pt-PT) Translation

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=879dd8f207c0185969f92… commit 879dd8f207c0185969f92391f9e1330534eeb193 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Thu Jun 24 16:44:45 2021 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sat Jul 3 21:50:13 2021 +0200 [SERVMAN] Add Portuguese (pt-PT) Translation --- base/applications/mscutils/servman/lang/pt-PT.rc | 337 +++++++++++++++++++++++ base/applications/mscutils/… [View More]servman/servman.rc | 5 +- 2 files changed, 341 insertions(+), 1 deletion(-) diff --git a/base/applications/mscutils/servman/lang/pt-PT.rc b/base/applications/mscutils/servman/lang/pt-PT.rc new file mode 100644 index 00000000000..e3655c5ae15 --- /dev/null +++ b/base/applications/mscutils/servman/lang/pt-PT.rc @@ -0,0 +1,337 @@ +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +IDR_MAINMENU MENU +BEGIN + POPUP "&Ficheiro" + BEGIN + MENUITEM "&Exportar...", ID_EXPORT + MENUITEM SEPARATOR + MENUITEM "&Sair", ID_EXIT + END + POPUP "&Acção" + BEGIN + MENUITEM "&Ligar a...", ID_CONNECT, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Iniciar", ID_START, GRAYED + MENUITEM "&Parar", ID_STOP, GRAYED + MENUITEM "Pau&sa", ID_PAUSE, GRAYED + MENUITEM "&Retomar", ID_RESUME, GRAYED + MENUITEM "Re&iniciar", ID_RESTART, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Actualizar\tF5", ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "&Editar...", ID_EDIT, GRAYED + MENUITEM "&Criar...", ID_CREATE, GRAYED + MENUITEM "&Apagar...", ID_DELETE, GRAYED + MENUITEM SEPARATOR + MENUITEM "Proprie&dades...", ID_PROP, GRAYED + END + POPUP "&Ver" + BEGIN + MENUITEM "Icones &grandes", ID_VIEW_LARGE + MENUITEM "Icones &pequenos", ID_VIEW_SMALL + MENUITEM "&Lista", ID_VIEW_LIST + MENUITEM "&Detalhes", ID_VIEW_DETAILS + MENUITEM SEPARATOR + MENUITEM "Per&sonalizar...", ID_VIEW_CUST, GRAYED + END + POPUP "&Ajuda" + BEGIN + MENUITEM "&Ajuda", ID_HELP + MENUITEM "A&cerca", ID_ABOUT + END +END + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&Iniciar", ID_START, GRAYED + MENUITEM "&Parar", ID_STOP, GRAYED + MENUITEM "Pa&usa", ID_PAUSE, GRAYED + MENUITEM "&Retomar", ID_RESUME, GRAYED + MENUITEM "Rei&niciar", ID_RESTART, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Actualizar", ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "&Editar...", ID_EDIT, GRAYED + MENUITEM "Apa&gar...", ID_DELETE, GRAYED + MENUITEM SEPARATOR + MENUITEM "P&ropriedades...", ID_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&juda...", ID_HELP + END +END + +IDA_SERVMAN ACCELERATORS +BEGIN + VK_F5, ID_REFRESH, VIRTKEY +END + +IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232 +CAPTION "Geral" +FONT 8, "MS Shell Dlg", 0, 0 +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_GROUP | WS_TABSTOP +BEGIN + LTEXT "", IDC_SERV_NAME, 70, 11, 176, 11, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_DISP_NAME, 70, 29, 176, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY + EDITTEXT IDC_DESCRIPTION, 70, 46, 176, 24, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_MULTILINE | ES_READONLY + EDITTEXT IDC_EXEPATH, 6, 86, 239, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY + COMBOBOX IDC_START_TYPE, 70, 107, 176, 40, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "&Iniciar", IDC_START, 6, 155, 54, 15, WS_DISABLED + PUSHBUTTON "&Parar", IDC_STOP, 68, 155, 54, 15, WS_DISABLED + PUSHBUTTON "Pa&usa", IDC_PAUSE, 130, 155, 54, 15, WS_DISABLED + PUSHBUTTON "&Retomar", IDC_RESUME, 192, 155, 54, 15, WS_DISABLED + LTEXT "Nome do serviço:", IDC_STATIC, 7, 11, 53, 11 + LTEXT "Mostrar nome:", IDC_STATIC, 7, 29, 53, 11 + LTEXT "Descrição:", IDC_STATIC, 7, 51, 53, 11 + LTEXT "Caminho do executável:", IDC_STATIC, 7, 73, 102, 9 + LTEXT "Tipo de arranque:", IDC_STATIC, 7, 108, 60, 11 + LTEXT "Estado do serviço:", IDC_STATIC, 7, 133, 53, 18 + LTEXT "", IDC_SERV_STATUS, 70, 135, 176, 11, WS_CHILD | WS_VISIBLE + LTEXT "Pode especificar os parâmetros de arranque aplicáveis quando iniciar o serviço a partir daqui.", IDC_STATIC, 7, 177, 240, 15 + LTEXT "Parâmetros de arranque:", IDC_STATIC, 7, 200, 58, 18 + EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Editar", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED +END + +IDD_LOGON DIALOGEX 6, 6, 253, 232 +CAPTION "Iniciar sessão" +FONT 8, "MS Shell Dlg", 0, 0 +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_GROUP | WS_TABSTOP +BEGIN + LTEXT "Iniciar sessão como:", IDC_STATIC, 7, 7, 238, 8 + AUTORADIOBUTTON "&Conta do sistema local", IDC_LOGON_SYSTEMACCOUNT, 7, 22, 238, 10, BS_TOP | BS_MULTILINE | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Esta conta:", IDC_LOGON_THISACCOUNT, 7, 52, 60, 10, BS_TOP | BS_MULTILINE | WS_CHILD | WS_VISIBLE + AUTOCHECKBOX "Permitir a interacção entre o serviço e o ambiente de trabalho", IDC_LOGON_INTERACTIVE, 18, 34, 227, 10, WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP | BS_TOP | BS_MULTILINE + EDITTEXT IDC_LOGON_ACCOUNTNAME, 72, 50, 103, 14, ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Procurar...", IDC_LOGON_SEARCH, 185, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "&Palavra-passe:", IDC_LOGON_PW1TEXT, 18, 71, 47, 8, WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_GROUP + EDITTEXT IDC_LOGON_PASSWORD1, 72, 68, 104, 14, ES_LEFT | ES_PASSWORD | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + LTEXT "&Confirmar palavra-passe:", IDC_LOGON_PW2TEXT, 18, 84, 47, 18, WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_GROUP + EDITTEXT IDC_LOGON_PASSWORD2, 72, 86, 104, 14, ES_LEFT | ES_PASSWORD | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP + LTEXT "Pode activar ou desactivar este serviço para os perfis de hardware listados abaixo:", IDC_STATIC, 7, 114, 250, 8, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_LOGON_HWPROFILE, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP, 7, 124, 238, 65 + PUSHBUTTON "&Activar", IDC_LOGON_HWENABLE, 116, 197, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "&Desactivar", IDC_LOGON_HWDISABLE, 185, 197, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED +END + +IDD_RECOVERY DIALOGEX 6, 6, 253, 232 +CAPTION "Recuperação" +FONT 8, "MS Shell Dlg", 0, 0 +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_GROUP | WS_TABSTOP +BEGIN + LTEXT "Seleccione a resposta do computador se ocorrer uma falha neste serviço.", IDC_STATIC, 7, 7, 238, 8 + LTEXT "&Primeira falha:", IDC_STATIC, 7, 24, 92, 8 + COMBOBOX IDC_FIRST_FAILURE, 104, 22, 141, 147, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST + LTEXT "&Segunda falha:", IDC_STATIC, 7, 41, 92, 8 + COMBOBOX IDC_SECOND_FAILURE, 104, 39, 141, 147, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST + LTEXT "Falhas seguintes:", IDC_STATIC, 7, 58, 92, 8 + COMBOBOX IDC_SUBSEQUENT_FAILURES, 104, 56, 141, 147, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST + LTEXT "Repor contador de falhas após:", IDC_STATIC, 7, 72, 72, 18 + EDITTEXT IDC_RESET_TIME, 104, 73, 40, 13, WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP | ES_LEFT | ES_AUTOHSCROLL | ES_NUMBER + LTEXT "dias", IDC_STATIC, 150, 75, 95, 8 + LTEXT "Reiniciar serviço após:", IDC_RESTART_TEXT1, 7, 92, 92, 8 + EDITTEXT IDC_RESTART_TIME, 104, 90, 40, 13, WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP | ES_LEFT | ES_AUTOHSCROLL | ES_NUMBER + LTEXT "minutos", IDC_RESTART_TEXT2, 150, 92, 95, 8 + GROUPBOX "Executar programa", IDC_RUN_GROUPBOX, 7, 108, 238, 80 + LTEXT "&Programa:", IDC_RUN_TEXT1, 14, 121, 168, 8 + EDITTEXT IDC_PROGRAM, 14, 131, 165, 14 + PUSHBUTTON "&Procurar...", IDC_BROWSE_PROGRAM, 185, 131, 53, 14 + LTEXT "&Parâmetros da linha de comandos:", IDC_RUN_TEXT2, 14, 152, 108, 18 + EDITTEXT IDC_PARAMETERS, 128, 152, 110, 14 + AUTOCHECKBOX "Acrescentar contagem de falhas no fim da linha de comandos (/fail=%1%)", IDC_ADD_FAILCOUNT, 14, 171, 219, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_TOP | BS_MULTILINE + PUSHBUTTON "&Opções para reiniciar o computador...", IDC_RESTART_OPTIONS, 116, 197, 129, 14 +END + +IDD_DLG_DEPEND DIALOGEX 6, 6, 253, 225 +CAPTION "Dependências" +FONT 8, "MS Shell Dlg", 0, 0 +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_GROUP | WS_TABSTOP +BEGIN + CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" , WS_BORDER | WS_CHILDWINDOW | + WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | + TVS_LINESATROOT | TVS_DISABLEDRAGDROP, 8, 70, 236, 68 + CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", WS_BORDER | WS_CHILDWINDOW | + WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | + TVS_LINESATROOT | TVS_DISABLEDRAGDROP, 8, 151, 236, 68 + LTEXT "Alguns serviços dependem de outros serviços, controladores de sistema e grupos de ordenamento de carregamento. Se um componente do sistema for parado ou não estiver a ser executado correctamente, os serviços dependentes podem ser afectados.", IDC_STATIC, 8, 7, 238, 34 + LTEXT "Este serviço depende dos seguintes componentes do sistema:", IDC_STATIC, 8, 57, 236, 9 + LTEXT "Os seguintes componentes do sistema dependem deste serviço:", IDC_DEPEND_SERVICE, 8, 138, 236, 13 +END + +IDD_DLG_CREATE DIALOGEX 6, 6, 225, 209 +CAPTION "Criar um serviço" +FONT 8, "MS Shell Dlg", 0, 0 +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_GROUP | WS_TABSTOP +BEGIN + EDITTEXT IDC_CREATE_SERVNAME, 72, 12, 150, 11, WS_CHILD | WS_VISIBLE | WS_EX_CLIENTEDGE + EDITTEXT IDC_CREATE_DISPNAME, 72, 31, 150, 11, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_CREATE_PATH, 10, 62, 210, 13, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_CREATE_DESC, 10, 97, 210, 48, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_CREATE_OPTIONS, 10, 162, 210, 13, WS_CHILD | WS_VISIBLE + LTEXT "*Nome do serviço :", IDC_STATIC, 12, 12, 54, 9 + LTEXT "*Mostrar Nome :", IDC_STATIC, 12, 33, 54, 9 + LTEXT "*Caminho do executável :", IDC_STATIC, 10, 51, 68, 9 + LTEXT "Descrição :", IDC_STATIC, 12, 86, 44, 9 + PUSHBUTTON "OK", IDOK, 126, 192, 44, 13 + PUSHBUTTON "Cancelar", IDCANCEL, 176, 192, 46, 13 + LTEXT "Opções adicionais (Clique em Ajuda para detalhes)", IDC_STATIC, 10, 151, 134, 9 + PUSHBUTTON "&Ajuda", ID_CREATE_HELP, 10, 192, 44, 13 +END + +IDD_DLG_DELETE DIALOGEX 6, 6, 185, 148 +CAPTION "Apagar um serviço" +FONT 8, "MS Shell Dlg", 0, 0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | DS_MODALFRAME +BEGIN + ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 + LTEXT "Tem a certeza que deseja apagar o seguinte serviço? Uma vêz apagado não pode ser recuperado!", IDC_STATIC, 50, 6, 125, 25 + LTEXT "Nome do serviço:", IDC_STATIC, 6, 40, 80, 9 + LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 + EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | + WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY + PUSHBUTTON "Sim", IDOK, 26, 129, 54, 13 + DEFPUSHBUTTON "Não", IDCANCEL, 102, 129, 54, 13 +END + +IDD_DLG_DEPEND_STOP DIALOGEX 6, 6, 240, 148 +CAPTION "Parar outros serviços" +FONT 8, "MS Shell Dlg", 0, 0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | DS_MODALFRAME +BEGIN + ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 + LTEXT "", IDC_STOP_DEPENDS, 40, 8, 170, 25 + LISTBOX IDC_STOP_DEPENDS_LB, 15, 40, 210, 70, WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE | LBS_NOSEL + LTEXT "Quer parar estes serviços?", IDC_STATIC, 15, 110, 150, 10 + DEFPUSHBUTTON "Sim", IDOK, 60, 129, 54, 14 + PUSHBUTTON "Não", IDCANCEL, 120, 129, 54, 14 +END + +IDD_DLG_HELP_OPTIONS DIALOGEX 6, 6, 200, 150 +CAPTION "Opções" +FONT 8, "MS Shell Dlg", 0, 0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | DS_MODALFRAME +BEGIN + LTEXT "", IDC_CREATE_HELP, 6, 5, 200, 150 + PUSHBUTTON "Ok", IDOK, 75, 130, 44, 13 +END + +IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 +CAPTION " Control de Serviço" +FONT 8, "MS Shell Dlg", 0, 0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME +BEGIN + CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 + LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 + LTEXT "", IDC_SERVCON_NAME, 8, 25, 66, 11 + PUSHBUTTON "&Fechar", IDOK, 100, 70, 54, 13 +END + +STRINGTABLE +BEGIN + IDS_FIRSTCOLUMN "Nome" + IDS_SECONDCOLUMN "Descrição" + IDS_THIRDCOLUMN "Estado" + IDS_FOURTHCOLUMN "Tipo de arranque" + IDS_FITHCOLUMN "Iniciar sessão como" +END + +STRINGTABLE +BEGIN + IDS_SERVICES_STARTED "Iniciado" + IDS_SERVICES_STOPPED "Parado" + IDS_SERVICES_AUTO "Automático" + IDS_SERVICES_MAN "Manual" + IDS_SERVICES_DIS "Desactivado" +END + +STRINGTABLE +BEGIN + IDS_NUM_SERVICES "Num. de Serviços: %d" + IDS_STOP_DEPENDS "Quando %s terminar, estes outros serviços também terminarão" + IDS_NO_DEPENDS "<Sem Dependências>" +END + +STRINGTABLE +BEGIN + IDS_TOOLTIP_PROP "Propriedades" + IDS_TOOLTIP_REFRESH "Actualizar" + IDS_TOOLTIP_EXPORT "Exportar lista" + IDS_TOOLTIP_CREATE "Criar um novo serviço" + IDS_TOOLTIP_DELETE "Apagar um serviço existente" + IDS_TOOLTIP_START "Iniciar serviço" + IDS_TOOLTIP_STOP "Parar serviço" + IDS_TOOLTIP_PAUSE "Pausar serviço" + IDS_TOOLTIP_RESTART "Reiniciar serviço" +END + +STRINGTABLE +BEGIN + IDS_PROGRESS_INFO_START "ReactOS está a tentar iniciar os seguintes serviços" + IDS_PROGRESS_INFO_STOP "ReactOS está a tentar parar os seguintes serviços" + IDS_PROGRESS_INFO_PAUSE "ReactOS está a tentar pausar os seguintes serviços" + IDS_PROGRESS_INFO_RESUME "ReactOS está a tentar retomar os seguintes serviços" + IDS_CREATE_SUCCESS "Serviço criado com sucesso" + IDS_DELETE_SUCCESS "Serviço apagado com sucesso" + IDS_CREATE_REQ "Campos marcados com\nasterisco são obrigatórios" + IDS_DELETE_STOP "Tem de parar o serviço manualmente antes de apagar !" +END + +STRINGTABLE +BEGIN + IDS_HELP_OPTIONS "CREATE OPTIONS:\r\nNOTA: The option name includes the equal sign.\r\n type= <own|share|interact|kernel|filesys|rec>\r\n (default = own)\r\n start= <boot|system|auto|demand|disabled>\r\n (default = demand) \r\n error= <normal|severe|critical|ignore>\r\n (default = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(separated by / (forward slash))>\r\n obj= <AccountName|ObjectName>\r\n (default = LocalSystem)\r\n pas [...] +END + +/* Hints */ +STRINGTABLE +BEGIN + IDS_HINT_BLANK " " + IDS_HINT_EXPORT " Exporta a currente lista para ficheiro." + IDS_HINT_EXIT " Sai do programa." + IDS_HINT_CONNECT " Gere um computador diferente." + IDS_HINT_START " Inicia o serviço seleccionado." + IDS_HINT_STOP " Pára o serviço seleccionado." + IDS_HINT_PAUSE " Pausa o serviço seleccionado." + IDS_HINT_RESUME " Retoma o serviço seleccionado." + IDS_HINT_RESTART " Pára e inicia o serviço seleccionado." + IDS_HINT_REFRESH " Actualiza a lista de serviços." + IDS_HINT_EDIT " Edita as propriedades do serviço seleccionado." + IDS_HINT_CREATE " Cria um novo serviço." + IDS_HINT_DELETE " Apaga o serviço seleccionado." + IDS_HINT_PROP " Abre a folha de propriedades para a currente selecção." + IDS_HINT_LARGE " Mostra items com icones grandes." + IDS_HINT_SMALL " Mostra items com icones pequenos." + IDS_HINT_LIST " Mostra items em lista." + IDS_HINT_DETAILS " Mostra informações acerca de cada item numa janela." + IDS_HINT_CUST " Personalizar a vista." + IDS_HINT_HELP " Mostrar a janela de ajuda." + IDS_HINT_ABOUT " Acerca do Gestor de Serviços ReactOS." + IDS_HINT_SYS_RESTORE " Repor esta janela no tamanho normal." + IDS_HINT_SYS_MOVE " Move esta janela." + IDS_HINT_SYS_SIZE " Reajusta o tamanho desta janela." + IDS_HINT_SYS_MINIMIZE " Minimiza esta janela." + IDS_HINT_SYS_MAXIMIZE " Expande esta janela para o tamanho do ecrã." + IDS_HINT_SYS_CLOSE " Fecha esta janela." +END + +/* Application title */ +STRINGTABLE +BEGIN + IDS_APPNAME "Gestor de Serviços ReactOS" + IDS_APPAUTHORS "Copyright (C) 2005-2007 by Ged Murphy (gedmurphy(a)reactos.org)" +END + +STRINGTABLE +BEGIN + IDS_NO_ACTION "Sem acção" + IDS_RESTART_SERVICE "Reiniciar o serviço" + IDS_RUN_PROGRAM "Executar Programa" + IDS_RESTART_COMPUTER "Reiniciar o computador" +END + +STRINGTABLE +BEGIN + IDS_NOT_SAME_PASSWORD "The palavra-passe não é a mesma!" + IDS_INVALID_PASSWORD "Digite uma palavra-passe válida!" +END diff --git a/base/applications/mscutils/servman/servman.rc b/base/applications/mscutils/servman/servman.rc index 1050fb38953..f8504751e37 100644 --- a/base/applications/mscutils/servman/servman.rc +++ b/base/applications/mscutils/servman/servman.rc @@ -75,6 +75,9 @@ IDI_DRIVER ICON "res/driver.ico" #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif +#ifdef LANGUAGE_PT_PT + #include "lang/pt-PT.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif @@ -104,4 +107,4 @@ IDI_DRIVER ICON "res/driver.ico" #endif #ifdef LANGUAGE_ZH_TW #include "lang/zh-TW.rc" -#endif \ No newline at end of file +#endif [View Less]

3 years, 11 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2021