Ros-diffs January 2021

ros-diffs@reactos.org

15 participants
146 discussions

[reactos] 03/10: [NTOS:PNP][NTOS:IO] Do not create a device object + node on every driver load
by Victor Perevertkin 04 Jan '21

04 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f0e37b042414a5b4530b… commit 6f0e37b042414a5b4530b89f1bf2b719a6e9147f Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sun Nov 15 17:33:42 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Mon Jan 4 16:50:32 2021 +0300 [NTOS:PNP][NTOS:IO] Do not create a device object + node on every driver load - Remove the usage of IopCreateDeviceNode and change it to PipAllocateDeviceNode where required --- ntoskrnl/include/internal/io.h | 13 ++----- ntoskrnl/io/iomgr/driver.c | 85 +++++------------------------------------- ntoskrnl/io/pnpmgr/devaction.c | 16 ++++---- ntoskrnl/io/pnpmgr/devnode.c | 40 +++++++++++++++++--- ntoskrnl/io/pnpmgr/pnpreport.c | 13 +++---- 5 files changed, 61 insertions(+), 106 deletions(-) diff --git a/ntoskrnl/include/internal/io.h b/ntoskrnl/include/internal/io.h index 628929f1cff..4e81a6f1c83 100644 --- a/ntoskrnl/include/internal/io.h +++ b/ntoskrnl/include/internal/io.h @@ -615,18 +615,14 @@ IopGetSystemPowerDeviceObject( ); PDEVICE_NODE -NTAPI PipAllocateDeviceNode( IN PDEVICE_OBJECT PhysicalDeviceObject ); -NTSTATUS -IopCreateDeviceNode( - IN PDEVICE_NODE ParentNode, - IN PDEVICE_OBJECT PhysicalDeviceObject, - IN PUNICODE_STRING ServiceName, - OUT PDEVICE_NODE *DeviceNode -); +VOID +PiInsertDevNode( + _In_ PDEVICE_NODE DeviceNode, + _In_ PDEVICE_NODE ParentNode); NTSTATUS IopFreeDeviceNode( @@ -1160,7 +1156,6 @@ IopLoadUnloadDriver( NTSTATUS FASTCALL IopInitializeDriverModule( - IN PDEVICE_NODE DeviceNode, IN PLDR_DATA_TABLE_ENTRY ModuleObject, IN PUNICODE_STRING ServiceName, IN BOOLEAN FileSystemDriver, diff --git a/ntoskrnl/io/iomgr/driver.c b/ntoskrnl/io/iomgr/driver.c index 3b033f9ab32..f3f4c5a79a8 100644 --- a/ntoskrnl/io/iomgr/driver.c +++ b/ntoskrnl/io/iomgr/driver.c @@ -464,10 +464,6 @@ MmFreeDriverInitialization(IN PLDR_DATA_TABLE_ENTRY LdrEntry); * * Initialize a loaded driver. * - * Parameters - * DeviceNode - * Pointer to device node. - * * ModuleObject * Module object representing the driver. It can be retrieve by * IopLoadServiceModule. @@ -485,7 +481,6 @@ MmFreeDriverInitialization(IN PLDR_DATA_TABLE_ENTRY LdrEntry); NTSTATUS FASTCALL IopInitializeDriverModule( - IN PDEVICE_NODE DeviceNode, IN PLDR_DATA_TABLE_ENTRY ModuleObject, IN PUNICODE_STRING ServiceName, IN BOOLEAN FileSystemDriver, @@ -626,8 +621,7 @@ IopAttachFilterDriversCallback( return Status; } - Status = IopInitializeDriverModule(DeviceNode, - ModuleObject, + Status = IopInitializeDriverModule(ModuleObject, &ServiceName, FALSE, &DriverObject); @@ -827,7 +821,6 @@ NTSTATUS NTAPI IopInitializeBuiltinDriver(IN PLDR_DATA_TABLE_ENTRY BootLdrEntry) { - PDEVICE_NODE DeviceNode; PDRIVER_OBJECT DriverObject; NTSTATUS Status; PWCHAR Buffer, FileNameWithoutPath; @@ -885,21 +878,6 @@ IopInitializeBuiltinDriver(IN PLDR_DATA_TABLE_ENTRY BootLdrEntry) FileExtension[0] = UNICODE_NULL; } - /* - * Determine the right device object - */ - /* Use IopRootDeviceNode for now */ - Status = IopCreateDeviceNode(IopRootDeviceNode, - NULL, - &ServiceName, - &DeviceNode); - RtlFreeUnicodeString(&ServiceName); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Driver '%wZ' load failed, status (%x)\n", ModuleName, Status); - return Status; - } - /* Lookup the new Ldr entry in PsLoadedModuleList */ NextEntry = PsLoadedModuleList.Flink; while (NextEntry != &PsLoadedModuleList) @@ -919,23 +897,18 @@ IopInitializeBuiltinDriver(IN PLDR_DATA_TABLE_ENTRY BootLdrEntry) /* * Initialize the driver */ - Status = IopInitializeDriverModule(DeviceNode, - LdrEntry, - &DeviceNode->ServiceName, + Status = IopInitializeDriverModule(LdrEntry, + &ServiceName, FALSE, &DriverObject); + RtlFreeUnicodeString(&ServiceName); if (!NT_SUCCESS(Status)) { + DPRINT1("Driver '%wZ' load failed, status (%x)\n", ModuleName, Status); return Status; } - Status = IopInitializeDevice(DeviceNode, DriverObject); - if (NT_SUCCESS(Status)) - { - Status = IopStartDevice(DeviceNode); - } - /* Remove extra reference from IopInitializeDriverModule */ ObDereferenceObject(DriverObject); @@ -960,7 +933,6 @@ IopInitializeBootDrivers(VOID) { PLIST_ENTRY ListHead, NextEntry, NextEntry2; PLDR_DATA_TABLE_ENTRY LdrEntry; - PDEVICE_NODE DeviceNode; PDRIVER_OBJECT DriverObject; LDR_DATA_TABLE_ENTRY ModuleObject; NTSTATUS Status; @@ -971,10 +943,6 @@ IopInitializeBootDrivers(VOID) PBOOT_DRIVER_LIST_ENTRY BootEntry; DPRINT("IopInitializeBootDrivers()\n"); - /* Use IopRootDeviceNode for now */ - Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, NULL, &DeviceNode); - if (!NT_SUCCESS(Status)) return; - /* Setup the module object for the RAW FS Driver */ ModuleObject.DllBase = NULL; ModuleObject.SizeOfImage = 0; @@ -982,8 +950,7 @@ IopInitializeBootDrivers(VOID) RtlInitUnicodeString(&DriverName, L"RAW"); /* Initialize it */ - Status = IopInitializeDriverModule(DeviceNode, - &ModuleObject, + Status = IopInitializeDriverModule(&ModuleObject, &DriverName, TRUE, &DriverObject); @@ -993,24 +960,6 @@ IopInitializeBootDrivers(VOID) return; } - /* Now initialize the associated device */ - Status = IopInitializeDevice(DeviceNode, DriverObject); - if (!NT_SUCCESS(Status)) - { - /* Fail */ - ObDereferenceObject(DriverObject); - return; - } - - /* Start it up */ - Status = IopStartDevice(DeviceNode); - if (!NT_SUCCESS(Status)) - { - /* Fail */ - ObDereferenceObject(DriverObject); - return; - } - /* Get highest group order index */ IopGroupIndex = PpInitGetGroupOrderIndex(NULL); if (IopGroupIndex == 0xFFFF) ASSERT(FALSE); @@ -1943,7 +1892,6 @@ IopLoadUnloadDriver( UNICODE_STRING ServiceName; NTSTATUS Status; ULONG Type; - PDEVICE_NODE DeviceNode; PLDR_DATA_TABLE_ENTRY ModuleObject; PVOID BaseAddress; WCHAR *cur; @@ -2069,21 +2017,10 @@ IopLoadUnloadDriver( /* * Initialize the driver module if it's loaded for the first time */ - Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, &ServiceName, &DeviceNode); - if (!NT_SUCCESS(Status)) - { - DPRINT1("IopCreateDeviceNode() failed (Status %lx)\n", Status); - ExReleaseResourceLite(&IopDriverLoadResource); - KeLeaveCriticalRegion(); - MmUnloadSystemImage(ModuleObject); - return Status; - } + IopDisplayLoadingMessage(&ServiceName); - IopDisplayLoadingMessage(&DeviceNode->ServiceName); - - Status = IopInitializeDriverModule(DeviceNode, - ModuleObject, - &DeviceNode->ServiceName, + Status = IopInitializeDriverModule(ModuleObject, + &ServiceName, (Type == SERVICE_FILE_SYSTEM_DRIVER || Type == SERVICE_RECOGNIZER_DRIVER), DriverObject); @@ -2098,10 +2035,6 @@ IopLoadUnloadDriver( ExReleaseResourceLite(&IopDriverLoadResource); KeLeaveCriticalRegion(); - - /* Initialize and start device */ - IopInitializeDevice(DeviceNode, *DriverObject); - Status = IopStartDevice(DeviceNode); } else { diff --git a/ntoskrnl/io/pnpmgr/devaction.c b/ntoskrnl/io/pnpmgr/devaction.c index 34d71e18a2e..99e4e2b944d 100644 --- a/ntoskrnl/io/pnpmgr/devaction.c +++ b/ntoskrnl/io/pnpmgr/devaction.c @@ -1079,8 +1079,10 @@ IopActionInitChildServices(PDEVICE_NODE DeviceNode, if (NT_SUCCESS(Status) || Status == STATUS_IMAGE_ALREADY_LOADED) { /* Initialize the driver */ - Status = IopInitializeDriverModule(DeviceNode, ModuleObject, - &DeviceNode->ServiceName, FALSE, &DriverObject); + Status = IopInitializeDriverModule(ModuleObject, + &DeviceNode->ServiceName, + FALSE, + &DriverObject); if (!NT_SUCCESS(Status)) DeviceNode->Problem = CM_PROB_FAILED_DRIVER_ENTRY; } @@ -2183,13 +2185,11 @@ PipEnumerateDevice( if (!ChildDeviceNode) { /* One doesn't exist, create it */ - Status = IopCreateDeviceNode( - DeviceNode, - ChildDeviceObject, - NULL, - &ChildDeviceNode); - if (NT_SUCCESS(Status)) + ChildDeviceNode = PipAllocateDeviceNode(ChildDeviceObject); + if (ChildDeviceNode) { + PiInsertDevNode(ChildDeviceNode, DeviceNode); + /* Mark the node as enumerated */ ChildDeviceNode->Flags |= DNF_ENUMERATED; diff --git a/ntoskrnl/io/pnpmgr/devnode.c b/ntoskrnl/io/pnpmgr/devnode.c index 230fcce100b..0442e1765c2 100644 --- a/ntoskrnl/io/pnpmgr/devnode.c +++ b/ntoskrnl/io/pnpmgr/devnode.c @@ -31,7 +31,6 @@ IopGetDeviceNode( } PDEVICE_NODE -NTAPI PipAllocateDeviceNode( _In_opt_ PDEVICE_OBJECT PhysicalDeviceObject) { @@ -39,19 +38,22 @@ PipAllocateDeviceNode( PAGED_CODE(); /* Allocate it */ - DeviceNode = ExAllocatePoolWithTag(NonPagedPool, sizeof(DEVICE_NODE), TAG_IO_DEVNODE); - if (!DeviceNode) return DeviceNode; + DeviceNode = ExAllocatePoolZero(NonPagedPool, sizeof(DEVICE_NODE), TAG_IO_DEVNODE); + if (!DeviceNode) + { + return NULL; + } /* Statistics */ InterlockedIncrement(&IopNumberDeviceNodes); /* Set it up */ - RtlZeroMemory(DeviceNode, sizeof(DEVICE_NODE)); DeviceNode->InterfaceType = InterfaceTypeUndefined; DeviceNode->BusNumber = -1; DeviceNode->ChildInterfaceType = InterfaceTypeUndefined; DeviceNode->ChildBusNumber = -1; DeviceNode->ChildBusTypeIndex = -1; + DeviceNode->State = DeviceNodeUninitialized; // KeInitializeEvent(&DeviceNode->EnumerationMutex, SynchronizationEvent, TRUE); InitializeListHead(&DeviceNode->DeviceArbiterList); InitializeListHead(&DeviceNode->DeviceTranslatorList); @@ -72,6 +74,32 @@ PipAllocateDeviceNode( return DeviceNode; } +VOID +PiInsertDevNode( + _In_ PDEVICE_NODE DeviceNode, + _In_ PDEVICE_NODE ParentNode) +{ + KIRQL oldIrql; + + ASSERT(DeviceNode->Parent == NULL); + + KeAcquireSpinLock(&IopDeviceTreeLock, &oldIrql); + DeviceNode->Parent = ParentNode; + DeviceNode->Sibling = NULL; + if (ParentNode->LastChild == NULL) + { + ParentNode->Child = DeviceNode; + ParentNode->LastChild = DeviceNode; + } + else + { + ParentNode->LastChild->Sibling = DeviceNode; + ParentNode->LastChild = DeviceNode; + } + KeReleaseSpinLock(&IopDeviceTreeLock, oldIrql); + DeviceNode->Level = ParentNode->Level + 1; +} + /** * @brief Creates a device node * @@ -84,7 +112,7 @@ PipAllocateDeviceNode( * * @return Status, indicating the result of an operation */ - +#if 0 NTSTATUS IopCreateDeviceNode( _In_ PDEVICE_NODE ParentNode, @@ -94,7 +122,6 @@ IopCreateDeviceNode( { PDEVICE_NODE Node; NTSTATUS Status; - KIRQL OldIrql; UNICODE_STRING FullServiceName; UNICODE_STRING LegacyPrefix = RTL_CONSTANT_STRING(L"LEGACY_"); UNICODE_STRING UnknownDeviceName = RTL_CONSTANT_STRING(L"UNKNOWN"); @@ -249,6 +276,7 @@ IopCreateDeviceNode( return STATUS_SUCCESS; } +#endif NTSTATUS IopFreeDeviceNode( diff --git a/ntoskrnl/io/pnpmgr/pnpreport.c b/ntoskrnl/io/pnpmgr/pnpreport.c index ae0ac9566d3..4c5e36cb147 100644 --- a/ntoskrnl/io/pnpmgr/pnpreport.c +++ b/ntoskrnl/io/pnpmgr/pnpreport.c @@ -242,16 +242,15 @@ IoReportDetectedDevice(IN PDRIVER_OBJECT DriverObject, } /* Create the device node for the new PDO */ - Status = IopCreateDeviceNode(IopRootDeviceNode, - Pdo, - NULL, - &DeviceNode); - if (!NT_SUCCESS(Status)) + DeviceNode = PipAllocateDeviceNode(Pdo); + if (!DeviceNode) { - DPRINT("IopCreateDeviceNode() failed (Status 0x%08lx)\n", Status); - return Status; + DPRINT("PipAllocateDeviceNode() failed\n"); + return STATUS_INSUFFICIENT_RESOURCES; } + PiInsertDevNode(DeviceNode, IopRootDeviceNode); + /* We're enumerated already */ IopDeviceNodeSetFlag(DeviceNode, DNF_ENUMERATED);

1 0

[reactos] 02/10: [HIVESYS] Add CDROM device class
by Victor Perevertkin 04 Jan '21

04 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4f91354092408ac30d1cf… commit 4f91354092408ac30d1cfe93cfd93cffe93847f5 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue Dec 22 21:00:00 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Mon Jan 4 16:50:31 2021 +0300 [HIVESYS] Add CDROM device class --- boot/bootdata/hivesys.inf | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index bbb94bc2ffd..1f9baa44404 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -349,6 +349,13 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Class\{36FC9E60-C465-11CF-8056-4445535400 HKLM,"SYSTEM\CurrentControlSet\Control\Class\{36FC9E60-C465-11CF-8056-444553540000}","Icon",0x00000000,"-20" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{36FC9E60-C465-11CF-8056-444553540000}","NoInstallClass",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E965-E325-11CE-BFC1-08002BE10318}",,0x00000000,"DVD/CD-ROM drives" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E965-E325-11CE-BFC1-08002BE10318}","Class",0x00000000,"CDROM" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E965-E325-11CE-BFC1-08002BE10318}","Icon",0x00000000,"-51" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E965-E325-11CE-BFC1-08002BE10318}","Installer32",0x00000000,"storprop.dll,DvdClassInstaller" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E965-E325-11CE-BFC1-08002BE10318}","NoInstallClass",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E965-E325-11CE-BFC1-08002BE10318}","SilentInstall",0x00000000,"1" + HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E967-E325-11CE-BFC1-08002BE10318}",,0x00000000,"Disk drives" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E967-E325-11CE-BFC1-08002BE10318}","Class",0x00000000,"DiskDrive" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E967-E325-11CE-BFC1-08002BE10318}","Icon",0x00000000,"-53"

1 0

[reactos] 01/10: [I8042PRT] Add service registry entry for the driver
by Victor Perevertkin 04 Jan '21

04 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b1c460d34e2f04257d69d… commit b1c460d34e2f04257d69d62ea32458b11ce6ba11 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue Dec 22 20:55:26 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Mon Jan 4 16:50:31 2021 +0300 [I8042PRT] Add service registry entry for the driver --- drivers/input/i8042prt/CMakeLists.txt | 1 + drivers/input/i8042prt/i8042prt_reg.inf | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/drivers/input/i8042prt/CMakeLists.txt b/drivers/input/i8042prt/CMakeLists.txt index b16547b72a6..fc22dc6513c 100644 --- a/drivers/input/i8042prt/CMakeLists.txt +++ b/drivers/input/i8042prt/CMakeLists.txt @@ -25,3 +25,4 @@ target_link_libraries(i8042prt dmilib) add_importlibs(i8042prt ntoskrnl hal) add_pch(i8042prt i8042prt.h SOURCE) add_cd_file(TARGET i8042prt DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_registry_inf(i8042prt_reg.inf) diff --git a/drivers/input/i8042prt/i8042prt_reg.inf b/drivers/input/i8042prt/i8042prt_reg.inf new file mode 100644 index 00000000000..584595c2297 --- /dev/null +++ b/drivers/input/i8042prt/i8042prt_reg.inf @@ -0,0 +1,8 @@ +; Intel i8042 controller driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Group",0x00000000,"Keyboard Port" +HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","ImagePath",0x00020000,"system32\drivers\i8042prt.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Tag",0x00010001,0x00000004 +HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Type",0x00010001,0x00000001

1 0

[reactos] 01/01: [UNIATA] Reduce the stack usage in AtapiDmaInit
by Victor Perevertkin 04 Jan '21

04 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9029f51d8ca9022c83a27… commit 9029f51d8ca9022c83a27a8220e7547cf5f90b3b Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Mon Jan 4 16:43:23 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Mon Jan 4 16:43:23 2021 +0300 [UNIATA] Reduce the stack usage in AtapiDmaInit --- drivers/storage/ide/uniata/id_dma.cpp | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/drivers/storage/ide/uniata/id_dma.cpp b/drivers/storage/ide/uniata/id_dma.cpp index 309e9040fa3..db6689088df 100644 --- a/drivers/storage/ide/uniata/id_dma.cpp +++ b/drivers/storage/ide/uniata/id_dma.cpp @@ -1328,10 +1328,17 @@ dma_cs55xx: apiomode = 4; if(ChipType == CYRIX_3x) { +#ifdef __REACTOS__ + static const ULONG cyr_piotiming[] = + { 0x00009172, 0x00012171, 0x00020080, 0x00032010, 0x00040010 }; + static const ULONG cyr_wdmatiming[] = { 0x00077771, 0x00012121, 0x00002020 }; + static const ULONG cyr_udmatiming[] = { 0x00921250, 0x00911140, 0x00911030 }; +#else ULONG cyr_piotiming[] = { 0x00009172, 0x00012171, 0x00020080, 0x00032010, 0x00040010 }; ULONG cyr_wdmatiming[] = { 0x00077771, 0x00012121, 0x00002020 }; ULONG cyr_udmatiming[] = { 0x00921250, 0x00911140, 0x00911030 }; +#endif ULONG mode_reg = 0x24+(dev << 3); for(i=udmamode; i>=0; i--) { @@ -1352,8 +1359,12 @@ dma_cs55xx: } } else if(ChipType == CYRIX_OLD) { +#ifdef __REACTOS__ + static const UCHAR cyr_piotiming_old[] = { 11, 6, 3, 2, 1 }; +#else UCHAR cyr_piotiming_old[] = { 11, 6, 3, 2, 1 }; +#endif UCHAR timing; for(i=wdmamode; i>=0; i--) { @@ -1411,12 +1422,20 @@ dma_cs55xx: /* National */ /************/ if(!ChipType) { +#ifdef __REACTOS__ + static const ULONG nat_piotiming[] = + { 0x9172d132, 0x21717121, 0x00803020, 0x20102010, 0x00100010, 0x00803020, + 0x20102010, 0x00100010, 0x00100010, 0x00100010, 0x00100010 }; + static const ULONG nat_dmatiming[] = { 0x80077771, 0x80012121, 0x80002020 }; + static const ULONG nat_udmatiming[] = { 0x80921250, 0x80911140, 0x80911030 }; +#else ULONG nat_piotiming[] = { 0x9172d132, 0x21717121, 0x00803020, 0x20102010, 0x00100010, 0x00803020, 0x20102010, 0x00100010, 0x00100010, 0x00100010, 0x00100010 }; ULONG nat_dmatiming[] = { 0x80077771, 0x80012121, 0x80002020 }; ULONG nat_udmatiming[] = { 0x80921250, 0x80911140, 0x80911030 }; +#endif if(apiomode >= 4) apiomode = 4; @@ -1534,9 +1553,15 @@ dma_cs55xx: ULONG new40 = 0; UCHAR mask44 = 0; UCHAR new44 = 0; +#ifdef __REACTOS__ + static const UCHAR intel_timings[] = + { 0x00, 0x00, 0x10, 0x21, 0x23, 0x10, 0x21, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23 }; + static const UCHAR intel_utimings[] = { 0x00, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02 }; +#else UCHAR intel_timings[] = { 0x00, 0x00, 0x10, 0x21, 0x23, 0x10, 0x21, 0x23, - 0x23, 0x23, 0x23, 0x23, 0x23, 0x23 }; + 0x23, 0x23, 0x23, 0x23, 0x23, 0x23 }; UCHAR intel_utimings[] = { 0x00, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02 }; +#endif const UCHAR needed_pio[3] = { ATA_PIO0, ATA_PIO3, ATA_PIO4 };

1 0

[reactos] 01/01: [SHELL32] Improve Polish (pl-PL) translation (#3410)
by Piotr Hetnarowicz 03 Jan '21

03 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eb5972010aa8977575bae… commit eb5972010aa8977575bae1db4f595474469d2071 Author: Piotr Hetnarowicz <40692062+pithwz(a)users.noreply.github.com> AuthorDate: Sun Jan 3 16:24:18 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 3 18:24:18 2021 +0300 [SHELL32] Improve Polish (pl-PL) translation (#3410) --- dll/win32/shell32/lang/pl-PL.rc | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index f2421fd7a1b..c2c9d303f92 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -733,12 +733,12 @@ STRINGTABLE BEGIN /* columns in the shellview */ IDS_SHV_COLUMN_NAME "Nazwa" - IDS_SHV_COLUMN_SIZE "Wielkość" + IDS_SHV_COLUMN_SIZE "Rozmiar" IDS_SHV_COLUMN_TYPE "Typ" - IDS_SHV_COLUMN_MODIFIED "Modyfikacja" + IDS_SHV_COLUMN_MODIFIED "Data modyfikacji" IDS_SHV_COLUMN_ATTRIBUTES "Atrybuty" - IDS_SHV_COLUMN_DISK_CAPACITY "Wielkość" - IDS_SHV_COLUMN_DISK_AVAILABLE "Dostępna wielkość" + IDS_SHV_COLUMN_DISK_CAPACITY "Całkowity rozmiar" + IDS_SHV_COLUMN_DISK_AVAILABLE "Wolne miejsce" IDS_SHV_COLUMN_OWNER "Właściciel" IDS_SHV_COLUMN_GROUP "Grupa" IDS_SHV_COLUMN_FILENAME "Nazwa pliku" @@ -765,7 +765,7 @@ BEGIN IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Konfiguruje ustawienia administracyjne dla tego komputeratera." IDS_FOLDER_OPTIONS_DESCRIPTION "Dostosowuje wygląd plików i folderów, zmienia skojarzenia plików." IDS_FONTS_DESCRIPTION "Dodaj lub zmień czcionki zainstalowane na tym komputerze oraz zarządzaj nimi." - IDS_PRINTERS_DESCRIPTION "Pokazuje zainstalowane drukarki i faks-drukarki oraz pomaga w dodawaniu nowych." + IDS_PRINTERS_DESCRIPTION "Dodawaj lub usuwaj drukarki, wyświetlaj kolejki wydruku lub zarządzaj nimi, zmieniaj ustawienia drukarek i preferencje drukowania." /* About shell dialog version string */ IDS_ABOUT_VERSION_STRING "Wersja %S (%S)" @@ -814,35 +814,35 @@ BEGIN IDS_OVERWRITEFILE_CAPTION "Potwierdź zastąpienie pliku" IDS_OVERWRITEFOLDER_TEXT "Ten folder zawiera już katalog o nazwie '%1'.\n\nJeżeli w docelowym folderze wystąpią pliki o takich samych nazwach jak\nw wybranym folderze, to zostaną one zastąpione. Czy chcesz mimo to przenieść\nlub skopiować folder?" - IDS_FILEOOP_COPYING "Kopiowanie..." - IDS_FILEOOP_MOVING "Przenoszenie..." - IDS_FILEOOP_DELETING "Usuwanie..." + IDS_FILEOOP_COPYING "Trwa kopiowanie..." + IDS_FILEOOP_MOVING "Trwa przenoszenie..." + IDS_FILEOOP_DELETING "Trwa usuwanie..." IDS_FILEOOP_FROM_TO "Z %1 do %2" IDS_FILEOOP_FROM "Z %1" - IDS_FILEOOP_PREFLIGHT "Przygotowywanie" + IDS_FILEOOP_PREFLIGHT "Przygotowywanie operacji" /* message box strings */ IDS_RESTART_TITLE "Uruchom ponownie" IDS_RESTART_PROMPT "Czy chcesz ponownie uruchomić system?" - IDS_SHUTDOWN_TITLE "Zamknij" + IDS_SHUTDOWN_TITLE "Zamknij system" IDS_SHUTDOWN_PROMPT "Czy chcesz zamknąć system?" /* Format Dialog Strings */ IDS_FORMAT_TITLE "Formatuj dysk lokalny" - IDS_FORMAT_WARNING "OSTRZEŻENIE: Formatowanie wymaże WSZYSTKIE dane na tym dysku.\nNaciśnij przycisk OK, aby sformatować dysk lub przycisk ANULUJ, aby pozostawić dysk bez zmian." + IDS_FORMAT_WARNING "OSTRZEŻENIE: Formatowanie wymaże WSZYSTKIE dane na tym dysku.\nWybierz przycisk OK, aby sformatować dysk lub przycisk ANULUJ, aby zamknąć." IDS_FORMAT_COMPLETE "Formatowanie zakończone." /* Run File dialog */ IDS_RUNDLG_ERROR "Nie można wyświetlić okna Uruchom (błąd wewnętrzny)" IDS_RUNDLG_BROWSE_ERROR "Nie można wyświetlić okna Przeglądaj (błąd wewnętrzny)" - IDS_RUNDLG_BROWSE_CAPTION "Przeglądaj" + IDS_RUNDLG_BROWSE_CAPTION "Przeglądanie" IDS_RUNDLG_BROWSE_FILTER "Programy (*.exe)\0*.exe\0Wszystkie pliki (*.*)\0*.*\0" /* Shell folder path default values. See also: dll/win32/userenv/lang */ IDS_PROGRAMS "Menu Start\\Programy" IDS_PERSONAL "Moje dokumenty" IDS_FAVORITES "Ulubione" - IDS_STARTUP "Menu Start\\Programy\\AutoStart" + IDS_STARTUP "Menu Start\\Programy\\Autostart" IDS_RECENT "Ostatnie" IDS_SENDTO "Wyślij do" IDS_STARTMENU "Menu Start" @@ -868,7 +868,7 @@ BEGIN IDS_CDBURN_AREA "Ustawienia lokalne\\Dane aplikacji\\Microsoft\\Nagrywanie dysków CD" IDS_NETWORKPLACE "Moje miejsca sieciowe" - IDS_NEWFOLDER "Nowy katalog" + IDS_NEWFOLDER "Nowy folder" IDS_DRIVE_FIXED "Dysk lokalny" IDS_DRIVE_CDROM "Stacja dysków CD" @@ -904,7 +904,7 @@ BEGIN IDS_NONE "(brak)" /* Friendly File Type Names */ - IDS_DIRECTORY "Katalog" + IDS_DIRECTORY "Folder" IDS_BAT_FILE "Plik wsadowy ReactOS" IDS_CMD_FILE "Skrypt konsoli ReactOS" IDS_COM_FILE "Aplikacja DOS" @@ -923,7 +923,7 @@ BEGIN IDS_OTF_FILE "Plik czcionki OpenType" IDS_HLP_FILE "Plik pomocy" IDS_ICO_FILE "Ikona" - IDS_INI_FILE "Ustawienia konfiguracji" + IDS_INI_FILE "Ustawienia konfiguracyjne" IDS_LNK_FILE "Skrót" IDS_NT__FILE "Plik konfiguracji NT DOS32" IDS_PIF_FILE "Plik informacyjny o programie NT VDM" @@ -964,8 +964,8 @@ BEGIN IDS_EXE_DESCRIPTION "Opis:" IDS_MENU_EMPTY "(Puste)" - IDS_OBJECTS "%d Obiekty" - IDS_OBJECTS_SELECTED "%d Wybrane obiekty" + IDS_OBJECTS "%d Obiektów" + IDS_OBJECTS_SELECTED "%d Zaznaczonych obiektów" IDS_ADVANCED_FOLDER "Pliki i Foldery" IDS_ADVANCED_NET_CRAWLER "Automatycznie wyszukuj foldery sieciowe i drukarki"

1 0

[reactos] 01/01: [COMDLG32] Improve Polish (pl-PL) translation (#3411)
by Piotr Hetnarowicz 03 Jan '21

03 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=df7b892d97f2115860408… commit df7b892d97f2115860408f362b40814e31c8b5ff Author: Piotr Hetnarowicz <40692062+pithwz(a)users.noreply.github.com> AuthorDate: Sun Jan 3 13:54:10 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 3 15:54:10 2021 +0300 [COMDLG32] Improve Polish (pl-PL) translation (#3411) --- dll/win32/comdlg32/lang/cdlg_Pl.rc | 176 ++++++++++++++++++------------------- 1 file changed, 88 insertions(+), 88 deletions(-) diff --git a/dll/win32/comdlg32/lang/cdlg_Pl.rc b/dll/win32/comdlg32/lang/cdlg_Pl.rc index b92250b429e..623f40d5bd4 100644 --- a/dll/win32/comdlg32/lang/cdlg_Pl.rc +++ b/dll/win32/comdlg32/lang/cdlg_Pl.rc @@ -104,8 +104,8 @@ Proszę podać wartość pomiędzy 1 a %d." STRINGTABLE /* Font styles */ { - IDS_FONT_REGULAR "Regularny" - IDS_FONT_BOLD "Pogrubiony" + IDS_FONT_REGULAR "Regularne" + IDS_FONT_BOLD "Pogrubienie" IDS_FONT_ITALIC "Kursywa" IDS_FONT_BOLD_ITALIC "Pogrubiona kursywa" } @@ -146,25 +146,25 @@ STRINGTABLE * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES. */ -OPEN_FILE DIALOG 36, 24, 275, 134 +OPEN_FILE DIALOG 36, 24, 285, 135 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Otwórz" +CAPTION "Otwieranie" FONT 8, "MS Shell Dlg" { LTEXT "&Nazwa pliku:", stc3, 6, 6, 76, 9 EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP LISTBOX lst1, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "&Katalogi:", -1, 110, 6, 92, 9 - LTEXT "", stc1, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP - LISTBOX lst2, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP + LTEXT "&Foldery:", -1, 110, 6, 96, 9 + LTEXT "", stc1, 110, 18, 96, 9, SS_NOPREFIX | WS_GROUP + LISTBOX lst2, 110, 32, 96, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "Wyświetl pliki &typu:", stc2, 6, 104, 90, 9 COMBOBOX cmb1, 6, 114, 90, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "&Dyski:", stc4, 110, 104, 92, 9 - COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "Otwórz", IDOK, 208, 6, 60, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Anuluj", IDCANCEL, 208, 24, 60, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Pomo&c", pshHelp, 208, 46, 60, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "Tylko do &odczytu", chx1, 208, 68, 70, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + LTEXT "&Dyski:", stc4, 110, 104, 96, 9 + COMBOBOX cmb2, 110, 114, 96, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "Otwórz", IDOK, 212, 6, 64, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Anuluj", IDCANCEL, 212, 24, 64, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Pomo&c", pshHelp, 212, 46, 64, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "Tylko do &odczytu", chx1, 212, 68, 70, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -213,7 +213,7 @@ FONT 8, "MS Shell Dlg" } -PRINT_SETUP DIALOG 36, 24, 264, 134 +PRINT_SETUP DIALOG 36, 24, 264, 148 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ustawienia wydruku" FONT 8, "MS Shell Dlg" @@ -223,50 +223,50 @@ FONT 8, "MS Shell Dlg" LTEXT "[brak]", stc1, 35, 30, 120, 9 RADIOBUTTON "&Inna drukarka", rad2, 16, 44, 150, 12 COMBOBOX cmb1, 35, 58, 145, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Anuluj", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Ustawienia", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - GROUPBOX "Orientacja", grp2, 6, 82, 100, 50, BS_GROUPBOX - RADIOBUTTON "W p&ionie", rad3, 50, 95, 50, 12 - RADIOBUTTON "Po&ziomo", rad4, 50, 110, 50, 12 + DEFPUSHBUTTON "OK", IDOK, 200, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Anuluj", IDCANCEL, 200, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Ustawienia", psh1, 200, 46, 56, 14, WS_GROUP | WS_TABSTOP + GROUPBOX "Orientacja", grp2, 6, 82, 95, 56, BS_GROUPBOX + RADIOBUTTON "P&ionowa", rad3, 45, 100, 50, 12 + RADIOBUTTON "Po&zioma", rad4, 45, 115, 50, 12 ICON "LANDSCAP", stc10, 10, 95, 32, 32 - ICON "PORTRAIT", stc11, 10, 95, 32, 32 - GROUPBOX "Papier", grp3, 116, 82, 178, 50, BS_GROUPBOX - LTEXT "&Wielkość", stc2, 126, 95, 35, 9 - LTEXT "&Źródło", stc3, 126, 110, 35, 9 + ICON "PORTRAIT", stc11, 15, 100, 32, 32 + GROUPBOX "Papier", grp3, 110, 82, 145, 56, BS_GROUPBOX + LTEXT "&Wielkość", stc2, 120, 98, 30, 9 + LTEXT "&Źródło", stc3, 120, 118, 30, 9 COMBOBOX cmb2, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - COMBOBOX cmb3, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + COMBOBOX cmb3, 155, 115, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP } -CHOOSE_FONT DIALOG 13, 54, 274, 169 +CHOOSE_FONT DIALOG 13, 54, 314, 196 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Czcionka" FONT 8, "MS Shell Dlg" { - LTEXT "&Czcionka:",stc1 ,6,3,90,9 - COMBOBOX cmb1, 6,13,94,76, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + LTEXT "&Czcionka:",stc1 ,7,7,40,9 + COMBOBOX cmb1, 7,16,98,76, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "&Styl:",stc2 ,108,3,60,9 - COMBOBOX cmb2,108,13,64,76, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + LTEXT "&Styl:",stc2 ,110,7,44,9 + COMBOBOX cmb2,110,16,101,76, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "Wielkość:",stc3,179,3,32,9 - COMBOBOX cmb3,179,13,32,76, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + LTEXT "Rozmiar:",stc3,216,7,30,9 + COMBOBOX cmb3,217,16,36,76, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT - DEFPUSHBUTTON "OK",IDOK,218,6,50,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Anuluj",IDCANCEL,218,23,50,14,WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Zastosuj", psh3,218,40,50,14,WS_GROUP | WS_TABSTOP - PUSHBUTTON "Pomo&c" , pshHelp,218,57,50,14,WS_GROUP | WS_TABSTOP - GROUPBOX "Efekty specialne",grp1,6,92,84,36,WS_GROUP - CHECKBOX "Prz&ekreślona", chx1, 10,102,78,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "P&odkreślona", chx2, 10,114,78,10, BS_AUTOCHECKBOX - LTEXT "Kolor:", stc4 ,6,134,80,9 - COMBOBOX cmb4,6,144,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + DEFPUSHBUTTON "OK",IDOK,258,16,45,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Anuluj",IDCANCEL,258,23,45,14,WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Zastosuj", psh3,258,48,45,14,WS_GROUP | WS_TABSTOP + PUSHBUTTON "Pomo&c" , pshHelp,258,64,45,14,WS_GROUP | WS_TABSTOP + GROUPBOX "Efekty specialne",grp1,7,97,98,72,WS_GROUP + CHECKBOX "Prz&ekreślenie", chx1, 13,110,58,10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "P&odkreślenie", chx2, 13,123,58,10, BS_AUTOCHECKBOX + LTEXT "Kolor:", stc4 ,13,136,30,9 + COMBOBOX cmb4,13,146,82,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Przykład",grp2,98,92,120,36,WS_GROUP - CTEXT "",stc5,103,101,109,24,SS_NOPREFIX | NOT WS_VISIBLE - LTEXT "Skr&ypt:",stc7 ,98,134,40,9 - COMBOBOX cmb5,98,144,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | + GROUPBOX "Przykład",grp2,110,97,143,43,WS_GROUP + CTEXT "",stc5,118,111,127,23,SS_NOPREFIX | NOT WS_VISIBLE + LTEXT "Skr&ypt:",stc7 ,110,147,30,9 + COMBOBOX cmb5,110,157,143,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } @@ -305,78 +305,78 @@ FONT 8, "MS Shell Dlg" } -FINDDLGORD DIALOG 36, 24, 276, 62 +FINDDLGORD DIALOG 36, 24, 285, 63 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Wyszukaj w rejestrze" +CAPTION "Znajdowanie" FONT 8, "MS Shell Dlg" { - LTEXT "&Znajdź:", -1, 4, 8, 52, 8 - EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Uwzględniaj tylko całe wyrazy", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Uwzględniaj wielkość liter", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Kierunek", grp1, 147, 21, 58, 38 - CONTROL "W &górę", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 - CONTROL "W &dół", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 - DEFPUSHBUTTON "&Znajdź następny", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Anuluj", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Pomo&c", pshHelp , 212, 42, 60, 14, WS_GROUP | WS_TABSTOP + LTEXT "&Znajdź:", -1, 4, 8, 24, 8 + EDITTEXT edt1, 32, 7, 172, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + CHECKBOX "Uwzględnij tylko całe wyrazy", chx1, 4, 26, 107, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Uwzględnij wielkość liter", chx2, 4, 42, 92, 10, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Kierunek", grp1, 118, 26, 87, 28 + CONTROL "W &górę", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 122, 38, 39, 10 + CONTROL "W &dół", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 166, 38, 36, 10 + DEFPUSHBUTTON "&Znajdź następny", IDOK, 211, 5, 70, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Anuluj", IDCANCEL , 211, 23, 70, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Pomo&c", pshHelp , 211, 45, 70, 14, WS_GROUP | WS_TABSTOP } -REPLACEDLGORD DIALOG 36, 24, 276, 94 +REPLACEDLGORD DIALOG 36, 24, 252, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Zamień" +CAPTION "Zamienianie" FONT 8, "MS Shell Dlg" { - LTEXT "&Znajdź:", -1, 4, 8, 24, 8 + LTEXT "&Znajdź:", -1, 4, 9, 24, 8 EDITTEXT edt1, 43, 7, 125, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP LTEXT "Zamień &na:", -1, 4, 26, 36, 8 EDITTEXT edt2, 43, 24, 125, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Uwzględniaj tylko całe wyrazy", chx1, 5, 46, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Uwzględniaj wielkość liter", chx2, 5, 62, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - DEFPUSHBUTTON "&Znajdź następny", IDOK, 186, 6, 74, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "&Zamień", psh1 , 186, 24, 74, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Zamień &wszystkie", psh2 , 186, 42, 74, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Anuluj", IDCANCEL , 186, 60, 74, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Pomo&c", pshHelp , 186, 78, 74, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "Uwzględnij tylko całe wyrazy", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Uwzględnij wielkość liter", chx2, 5, 62, 104, 12, BS_AUTOCHECKBOX | WS_TABSTOP + DEFPUSHBUTTON "&Znajdź następny", IDOK, 174, 4, 74, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "&Zamień", psh1 , 174, 21, 74, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Zamień &wszystko", psh2 , 174, 38, 74, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Anuluj", IDCANCEL , 174, 55, 74, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Pomo&c", pshHelp , 174, 75, 74, 14, WS_GROUP | WS_TABSTOP } PRINT32 DIALOG 32, 32, 288, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP -CAPTION "Drukuj" +CAPTION "Drukowanie" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 176,164, 50,14, WS_GROUP | BS_DEFPUSHBUTTON - PUSHBUTTON "Anuluj", IDCANCEL, 230,164, 50,14, WS_GROUP - PUSHBUTTON "Pomo&c", pshHelp, 50, 161, 50,14, WS_GROUP + DEFPUSHBUTTON "OK", IDOK, 180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON + PUSHBUTTON "Anuluj", IDCANCEL, 232,164, 48,14, WS_GROUP + PUSHBUTTON "Pomo&c", pshHelp, 8, 164, 48,14, WS_GROUP GROUPBOX "Drukarka", grp4, 8, 4, 272,84, WS_GROUP - CONTROL "Drukuj do pli&ku", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 + CONTROL "Drukuj do pli&ku", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,72,64,12 PUSHBUTTON "Właś&ciwości", psh2, 212, 17, 60,14, WS_GROUP LTEXT "&Nazwa:", stc6, 16, 20, 36,8 COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "Stan:", stc8, 16, 36, 47,10, SS_NOPREFIX - LTEXT "", stc12, 65, 36, 120,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Typ:", stc7, 16, 48, 47,10, SS_NOPREFIX - LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Gdzie:", stc10, 16, 60, 47,10, SS_NOPREFIX - LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Komentarz:", stc9, 16, 72, 47,10, SS_NOPREFIX - LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Stan:", stc8, 16, 36, 36,10, SS_NOPREFIX + LTEXT "", stc12, 55, 36, 219,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Typ:", stc7, 16, 48, 36,10, SS_NOPREFIX + LTEXT "", stc11, 55, 48, 219,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Gdzie:", stc10, 16, 60, 36,10, SS_NOPREFIX + LTEXT "", stc14, 55, 60, 219,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Komentarz:", stc9, 16, 72, 36,10, SS_NOPREFIX + LTEXT "", stc13, 55, 72, 153,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Kopie", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Lczba &kopii:",stc5,168,105,68,8 ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE CONTROL "&Sortuj", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER GROUPBOX "Zakres wydruku", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&Cały rejestr", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 + CONTROL "&Wszystko", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 CONTROL "&Strony", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 CONTROL "&Zaznaczenie", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 - EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER + EDITTEXT edt1, 74,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER - RTEXT "&od:", stc2, 52,124, 20,8 - RTEXT "&do:", stc3, 99,124, 20,8 + RTEXT "&od:", stc2, 52,124, 16,8 + RTEXT "&do:", stc3, 102,124, 16,8 } PRINT32_SETUP DIALOG 32, 32, 288, 178 @@ -424,8 +424,8 @@ BEGIN LTEXT "Źródł&o:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "Orientacja", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "P&ionowo", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "Po&ziomo", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "P&ionowa", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "Po&zioma", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Lewy:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER @@ -465,9 +465,9 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPC CAPTION "Otwieranie" FONT 8, "MS Shell Dlg" { - LTEXT "&Szukaj w:", IDC_LOOKINSTATIC, 28, 6, 43, 8, SS_NOTIFY + LTEXT "&Szukaj w:", IDC_LOOKINSTATIC, 4, 6, 57, 8, SS_NOTIFY COMBOBOX IDC_LOOKIN, 66, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - LTEXT "" , IDC_TOOLBARSTATIC, 211, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE + LTEXT "" , IDC_TOOLBARSTATIC, 248, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 22, 58, 208 LISTBOX IDC_SHELLSTATIC, 66, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "&Nazwa pliku:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY

1 0

[reactos] 01/01: [SAMSRV] Add 'Print Operators', 'Performance Monitor Users' and 'Performance Log Users' aliases to servers
by Eric Kohl 03 Jan '21

03 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=54d6fab0e165b1d6c60a0… commit 54d6fab0e165b1d6c60a0859362a3f024fe4d22f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jan 3 06:17:48 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 3 06:17:48 2021 +0100 [SAMSRV] Add 'Print Operators', 'Performance Monitor Users' and 'Performance Log Users' aliases to servers --- dll/win32/samsrv/lang/de-DE.rc | 8 +++++++- dll/win32/samsrv/lang/en-US.rc | 6 ++++++ dll/win32/samsrv/lang/es-ES.rc | 6 ++++++ dll/win32/samsrv/lang/hi-IN.rc | 6 ++++++ dll/win32/samsrv/lang/hu-HU.rc | 6 ++++++ dll/win32/samsrv/lang/it-IT.rc | 6 ++++++ dll/win32/samsrv/lang/ja-JP.rc | 6 ++++++ dll/win32/samsrv/lang/pl-PL.rc | 6 ++++++ dll/win32/samsrv/lang/pt-PT.rc | 6 ++++++ dll/win32/samsrv/lang/ro-RO.rc | 6 ++++++ dll/win32/samsrv/lang/ru-RU.rc | 6 ++++++ dll/win32/samsrv/lang/sq-AL.rc | 6 ++++++ dll/win32/samsrv/lang/tr-TR.rc | 6 ++++++ dll/win32/samsrv/lang/zh-CN.rc | 6 ++++++ dll/win32/samsrv/lang/zh-TW.rc | 6 ++++++ dll/win32/samsrv/resources.h | 23 ++++++++++++++--------- dll/win32/samsrv/samsrv.c | 5 +++++ dll/win32/samsrv/samsrv.h | 3 ++- dll/win32/samsrv/setup.c | 33 +++++++++++++++++++++++++++++++++ 19 files changed, 145 insertions(+), 11 deletions(-) diff --git a/dll/win32/samsrv/lang/de-DE.rc b/dll/win32/samsrv/lang/de-DE.rc index a3ace8da4d2..8b4f33721e1 100644 --- a/dll/win32/samsrv/lang/de-DE.rc +++ b/dll/win32/samsrv/lang/de-DE.rc @@ -13,7 +13,9 @@ BEGIN IDS_ALIAS_POWER_USERS_COMMENT "Hauptbenutzer besitzen die meisten Rechte mit einigen Einschränkungen." IDS_ALIAS_USERS_NAME "Benutzer" IDS_ALIAS_USERS_COMMENT "Benutzer können keine Änderungen am System vornehmen." - IDS_ALIAS_BACKUP_OPS_NAME "Sicherungs-Operator" + IDS_ALIAS_PRINT_OPS_NAME "Druck-Operatoren" + IDS_ALIAS_PRINT_OPS_COMMENT "Mitglieder können Drucker in der Domäne verwalten." + IDS_ALIAS_BACKUP_OPS_NAME "Sicherungs-Operatoren" IDS_ALIAS_BACKUP_OPS_COMMENT "Sicherungs-Operatoren können Sicherheitseinschränkungen nur zum Sichern und Wiederherstellen von Dateien außer Kraft setzen." IDS_ALIAS_REPLICATOR_NAME "Replikations-Operator" IDS_ALIAS_REPLICATOR_COMMENT "Unterstützt Dateireplikation in Domänen." @@ -21,6 +23,10 @@ BEGIN IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Mitglieder dieser Gruppe haben die Berechtigung, sich remote anzumelden." IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Netzwerkkonfigurations-Operator" IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Mitglieder dieser Gruppe verfügen über einige Administratorrechte zum Verwalten der Konfiguration von Netzwerkfunktionen." + IDS_ALIAS_MONITORING_USERS_NAME "Performance-Monitor Benutzer" + IDS_ALIAS_MONITORING_USERS_COMMENT "Mitglieder dieser Gruppe vefügen über Remotezugriff zum Überwachen dieses Computers." + IDS_ALIAS_LOGGING_USERS_NAME "Performance-Protokoll Benutzer" + IDS_ALIAS_LOGGING_USERS_COMMENT "Mitglieder dieser Gruppe verfügen über Remotezugriff um die Protokollierung von Leistungsindikatoren auf diesem Computer zu planen." /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and diff --git a/dll/win32/samsrv/lang/en-US.rc b/dll/win32/samsrv/lang/en-US.rc index c810e11229f..0d41b80d032 100644 --- a/dll/win32/samsrv/lang/en-US.rc +++ b/dll/win32/samsrv/lang/en-US.rc @@ -13,6 +13,8 @@ BEGIN IDS_ALIAS_POWER_USERS_COMMENT "Power Users have most administrative rights with some restrictions." IDS_ALIAS_USERS_NAME "Users" IDS_ALIAS_USERS_COMMENT "Users are prevented from making system-wide changes." + IDS_ALIAS_PRINT_OPS_NAME "Print Operators" + IDS_ALIAS_PRINT_OPS_COMMENT "Members of this group can administer domain printers" IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" IDS_ALIAS_REPLICATOR_NAME "Replicator" @@ -21,6 +23,10 @@ BEGIN IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Members in this group are granted the right to logon remotely" IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Network Configuration Operators" IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Members in this group can have some administrative privileges to manage configuration of networking features" + IDS_ALIAS_MONITORING_USERS_NAME "Performance Monitor Users" + IDS_ALIAS_MONITORING_USERS_COMMENT "Members of this group have remote access to monitor this computer" + IDS_ALIAS_LOGGING_USERS_NAME "Performance Log Users" + IDS_ALIAS_LOGGING_USERS_COMMENT "Members of this group have remote access to schedule logging of performance counters on this computer" /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and diff --git a/dll/win32/samsrv/lang/es-ES.rc b/dll/win32/samsrv/lang/es-ES.rc index 3a30a78eaec..7fbea54d956 100644 --- a/dll/win32/samsrv/lang/es-ES.rc +++ b/dll/win32/samsrv/lang/es-ES.rc @@ -14,6 +14,8 @@ BEGIN IDS_ALIAS_POWER_USERS_COMMENT "Los usuarios avanzados obtienen la mayor parte de los derechos administrativos con algunas restricciones." IDS_ALIAS_USERS_NAME "Usuarios" IDS_ALIAS_USERS_COMMENT "Los usuarios no pueden hacer cambios que afecten al sistema." + IDS_ALIAS_PRINT_OPS_NAME "Print Operators" + IDS_ALIAS_PRINT_OPS_COMMENT "Members can administer domain printers" IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" IDS_ALIAS_REPLICATOR_NAME "Replicator" @@ -22,6 +24,10 @@ BEGIN IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Members in this group are granted the right to logon remotely" IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Network Configuration Operators" IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Members in this group can have some administrative privileges to manage configuration of networking features" + IDS_ALIAS_MONITORING_USERS_NAME "Performance Monitor Users" + IDS_ALIAS_MONITORING_USERS_COMMENT "Members of this group have remote access to monitor this computer" + IDS_ALIAS_LOGGING_USERS_NAME "Performance Log Users" + IDS_ALIAS_LOGGING_USERS_COMMENT "Members of this group have remote access to schedule logging of performance counters on this computer" /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and diff --git a/dll/win32/samsrv/lang/hi-IN.rc b/dll/win32/samsrv/lang/hi-IN.rc index 0dd5934f3a0..e32da0140f1 100644 --- a/dll/win32/samsrv/lang/hi-IN.rc +++ b/dll/win32/samsrv/lang/hi-IN.rc @@ -20,6 +20,8 @@ BEGIN IDS_ALIAS_POWER_USERS_COMMENT "पावर उपयोगकर्ताओं के पास कुछ प्रतिबंधों के साथ अधिकांश प्रशासनिक अधिकार हैं।" IDS_ALIAS_USERS_NAME "उपयोगकर्ता" IDS_ALIAS_USERS_COMMENT "उपयोगकर्ताओं को सिस्टम-व्यापी परिवर्तन करने से रोका जाता है।" + IDS_ALIAS_PRINT_OPS_NAME "Print Operators" + IDS_ALIAS_PRINT_OPS_COMMENT "Members can administer domain printers" IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" IDS_ALIAS_REPLICATOR_NAME "Replicator" @@ -28,6 +30,10 @@ BEGIN IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Members in this group are granted the right to logon remotely" IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Network Configuration Operators" IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Members in this group can have some administrative privileges to manage configuration of networking features" + IDS_ALIAS_MONITORING_USERS_NAME "Performance Monitor Users" + IDS_ALIAS_MONITORING_USERS_COMMENT "Members of this group have remote access to monitor this computer" + IDS_ALIAS_LOGGING_USERS_NAME "Performance Log Users" + IDS_ALIAS_LOGGING_USERS_COMMENT "Members of this group have remote access to schedule logging of performance counters on this computer" /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and diff --git a/dll/win32/samsrv/lang/hu-HU.rc b/dll/win32/samsrv/lang/hu-HU.rc index f478b4bcbd6..dbf378bb059 100644 --- a/dll/win32/samsrv/lang/hu-HU.rc +++ b/dll/win32/samsrv/lang/hu-HU.rc @@ -13,6 +13,8 @@ BEGIN IDS_ALIAS_POWER_USERS_COMMENT "A haladó felhasználók a legtöbb adminisztrációs joggal rendelkeznek, bizonyos korlátozásokkal." IDS_ALIAS_USERS_NAME "Felhasználók" IDS_ALIAS_USERS_COMMENT "A felhasználók nem tudnak rendszerszintű változtatásokat végrehajtani." + IDS_ALIAS_PRINT_OPS_NAME "Print Operators" + IDS_ALIAS_PRINT_OPS_COMMENT "Members can administer domain printers" IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" IDS_ALIAS_REPLICATOR_NAME "Replicator" @@ -21,6 +23,10 @@ BEGIN IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Members in this group are granted the right to logon remotely" IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Network Configuration Operators" IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Members in this group can have some administrative privileges to manage configuration of networking features" + IDS_ALIAS_MONITORING_USERS_NAME "Performance Monitor Users" + IDS_ALIAS_MONITORING_USERS_COMMENT "Members of this group have remote access to monitor this computer" + IDS_ALIAS_LOGGING_USERS_NAME "Performance Log Users" + IDS_ALIAS_LOGGING_USERS_COMMENT "Members of this group have remote access to schedule logging of performance counters on this computer" /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and diff --git a/dll/win32/samsrv/lang/it-IT.rc b/dll/win32/samsrv/lang/it-IT.rc index f31a8c6eba2..bfd5af15c31 100644 --- a/dll/win32/samsrv/lang/it-IT.rc +++ b/dll/win32/samsrv/lang/it-IT.rc @@ -13,6 +13,8 @@ BEGIN IDS_ALIAS_POWER_USERS_COMMENT "Gli utenti avanzati hanno la maggior parte dei diritti amministrativi con alcune restrizioni." IDS_ALIAS_USERS_NAME "Utente" IDS_ALIAS_USERS_COMMENT "Gli utenti non possono apportare modifiche a livello di sistema." + IDS_ALIAS_PRINT_OPS_NAME "Print Operators" + IDS_ALIAS_PRINT_OPS_COMMENT "Members can administer domain printers" IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" IDS_ALIAS_REPLICATOR_NAME "Replicator" @@ -21,6 +23,10 @@ BEGIN IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Members in this group are granted the right to logon remotely" IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Network Configuration Operators" IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Members in this group can have some administrative privileges to manage configuration of networking features" + IDS_ALIAS_MONITORING_USERS_NAME "Performance Monitor Users" + IDS_ALIAS_MONITORING_USERS_COMMENT "Members of this group have remote access to monitor this computer" + IDS_ALIAS_LOGGING_USERS_NAME "Performance Log Users" + IDS_ALIAS_LOGGING_USERS_COMMENT "Members of this group have remote access to schedule logging of performance counters on this computer" /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and diff --git a/dll/win32/samsrv/lang/ja-JP.rc b/dll/win32/samsrv/lang/ja-JP.rc index a9ac1c943d8..5fe3d7a3a45 100644 --- a/dll/win32/samsrv/lang/ja-JP.rc +++ b/dll/win32/samsrv/lang/ja-JP.rc @@ -13,6 +13,8 @@ BEGIN IDS_ALIAS_POWER_USERS_COMMENT "パワーユーザーは、いくつかの制限付きでほとんどの管理権限を持ちます。" IDS_ALIAS_USERS_NAME "ユーザー" IDS_ALIAS_USERS_COMMENT "ユーザーは、システム規模の変更をすることができません。" + IDS_ALIAS_PRINT_OPS_NAME "Print Operators" + IDS_ALIAS_PRINT_OPS_COMMENT "Members can administer domain printers" IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" IDS_ALIAS_REPLICATOR_NAME "Replicator" @@ -21,6 +23,10 @@ BEGIN IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Members in this group are granted the right to logon remotely" IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Network Configuration Operators" IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Members in this group can have some administrative privileges to manage configuration of networking features" + IDS_ALIAS_MONITORING_USERS_NAME "Performance Monitor Users" + IDS_ALIAS_MONITORING_USERS_COMMENT "Members of this group have remote access to monitor this computer" + IDS_ALIAS_LOGGING_USERS_NAME "Performance Log Users" + IDS_ALIAS_LOGGING_USERS_COMMENT "Members of this group have remote access to schedule logging of performance counters on this computer" /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and diff --git a/dll/win32/samsrv/lang/pl-PL.rc b/dll/win32/samsrv/lang/pl-PL.rc index 5ba9f28f774..0a27b160ee3 100644 --- a/dll/win32/samsrv/lang/pl-PL.rc +++ b/dll/win32/samsrv/lang/pl-PL.rc @@ -13,6 +13,8 @@ BEGIN IDS_ALIAS_POWER_USERS_COMMENT "Użytkownicy zaawansowani maja większość uprawnień administracyjnych, z kilkoma wyjątkami." IDS_ALIAS_USERS_NAME "Użytkownicy" IDS_ALIAS_USERS_COMMENT "Użytkownicy nie mogą dokonywać istotnych zmian w systemie." + IDS_ALIAS_PRINT_OPS_NAME "Print Operators" + IDS_ALIAS_PRINT_OPS_COMMENT "Members can administer domain printers" IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" IDS_ALIAS_REPLICATOR_NAME "Replicator" @@ -21,6 +23,10 @@ BEGIN IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Members in this group are granted the right to logon remotely" IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Network Configuration Operators" IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Members in this group can have some administrative privileges to manage configuration of networking features" + IDS_ALIAS_MONITORING_USERS_NAME "Performance Monitor Users" + IDS_ALIAS_MONITORING_USERS_COMMENT "Members of this group have remote access to monitor this computer" + IDS_ALIAS_LOGGING_USERS_NAME "Performance Log Users" + IDS_ALIAS_LOGGING_USERS_COMMENT "Members of this group have remote access to schedule logging of performance counters on this computer" /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and diff --git a/dll/win32/samsrv/lang/pt-PT.rc b/dll/win32/samsrv/lang/pt-PT.rc index dff259f5dc9..43450ec4171 100644 --- a/dll/win32/samsrv/lang/pt-PT.rc +++ b/dll/win32/samsrv/lang/pt-PT.rc @@ -13,6 +13,8 @@ BEGIN IDS_ALIAS_POWER_USERS_COMMENT "Utilizadores avançados têm a maioria dos direitos administrativos com algumas restrições." IDS_ALIAS_USERS_NAME "Utilizadores" IDS_ALIAS_USERS_COMMENT "Os utilizadores são impedidos de fazer alterações em todo o sistema." + IDS_ALIAS_PRINT_OPS_NAME "Print Operators" + IDS_ALIAS_PRINT_OPS_COMMENT "Members can administer domain printers" IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" IDS_ALIAS_REPLICATOR_NAME "Replicator" @@ -21,6 +23,10 @@ BEGIN IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Members in this group are granted the right to logon remotely" IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Network Configuration Operators" IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Members in this group can have some administrative privileges to manage configuration of networking features" + IDS_ALIAS_MONITORING_USERS_NAME "Performance Monitor Users" + IDS_ALIAS_MONITORING_USERS_COMMENT "Members of this group have remote access to monitor this computer" + IDS_ALIAS_LOGGING_USERS_NAME "Performance Log Users" + IDS_ALIAS_LOGGING_USERS_COMMENT "Members of this group have remote access to schedule logging of performance counters on this computer" /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and diff --git a/dll/win32/samsrv/lang/ro-RO.rc b/dll/win32/samsrv/lang/ro-RO.rc index 4282b8619f7..409884ed2e0 100644 --- a/dll/win32/samsrv/lang/ro-RO.rc +++ b/dll/win32/samsrv/lang/ro-RO.rc @@ -15,6 +15,8 @@ BEGIN IDS_ALIAS_POWER_USERS_COMMENT "Utilizatorii avansați posedă majoritatea drepturilor administrative cu unele restricții." IDS_ALIAS_USERS_NAME "Utilizatori" IDS_ALIAS_USERS_COMMENT "Utilizatorilor le este limitată capacitatea de a aduce modificări în sistem." + IDS_ALIAS_PRINT_OPS_NAME "Print Operators" + IDS_ALIAS_PRINT_OPS_COMMENT "Members can administer domain printers" IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" IDS_ALIAS_REPLICATOR_NAME "Replicator" @@ -23,6 +25,10 @@ BEGIN IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Members in this group are granted the right to logon remotely" IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Network Configuration Operators" IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Members in this group can have some administrative privileges to manage configuration of networking features" + IDS_ALIAS_MONITORING_USERS_NAME "Performance Monitor Users" + IDS_ALIAS_MONITORING_USERS_COMMENT "Members of this group have remote access to monitor this computer" + IDS_ALIAS_LOGGING_USERS_NAME "Performance Log Users" + IDS_ALIAS_LOGGING_USERS_COMMENT "Members of this group have remote access to schedule logging of performance counters on this computer" /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and diff --git a/dll/win32/samsrv/lang/ru-RU.rc b/dll/win32/samsrv/lang/ru-RU.rc index f63ce09b2c5..5798dd9406a 100644 --- a/dll/win32/samsrv/lang/ru-RU.rc +++ b/dll/win32/samsrv/lang/ru-RU.rc @@ -15,6 +15,8 @@ BEGIN IDS_ALIAS_POWER_USERS_COMMENT "Категория опытных пользователей обладает ограниченными административными правами." IDS_ALIAS_USERS_NAME "Пользователи" IDS_ALIAS_USERS_COMMENT "Пользователи не имеют прав на изменение параметров системы и могут запускать большинство приложений." + IDS_ALIAS_PRINT_OPS_NAME "Print Operators" + IDS_ALIAS_PRINT_OPS_COMMENT "Members can administer domain printers" IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" IDS_ALIAS_REPLICATOR_NAME "Replicator" @@ -23,6 +25,10 @@ BEGIN IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Members in this group are granted the right to logon remotely" IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Network Configuration Operators" IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Members in this group can have some administrative privileges to manage configuration of networking features" + IDS_ALIAS_MONITORING_USERS_NAME "Performance Monitor Users" + IDS_ALIAS_MONITORING_USERS_COMMENT "Members of this group have remote access to monitor this computer" + IDS_ALIAS_LOGGING_USERS_NAME "Performance Log Users" + IDS_ALIAS_LOGGING_USERS_COMMENT "Members of this group have remote access to schedule logging of performance counters on this computer" /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and diff --git a/dll/win32/samsrv/lang/sq-AL.rc b/dll/win32/samsrv/lang/sq-AL.rc index 4dd2d2465cc..b839fef8040 100644 --- a/dll/win32/samsrv/lang/sq-AL.rc +++ b/dll/win32/samsrv/lang/sq-AL.rc @@ -17,6 +17,8 @@ BEGIN IDS_ALIAS_POWER_USERS_COMMENT "Përdorues të Fuqishëm katë të drejta administrative me disa kufizime." IDS_ALIAS_USERS_NAME "Përdoruesit" IDS_ALIAS_USERS_COMMENT "Përdoruesit janë të penguar për ndryshim bërje të gjërave të sistemit." + IDS_ALIAS_PRINT_OPS_NAME "Print Operators" + IDS_ALIAS_PRINT_OPS_COMMENT "Members can administer domain printers" IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" IDS_ALIAS_REPLICATOR_NAME "Replicator" @@ -25,6 +27,10 @@ BEGIN IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Members in this group are granted the right to logon remotely" IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Network Configuration Operators" IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Members in this group can have some administrative privileges to manage configuration of networking features" + IDS_ALIAS_MONITORING_USERS_NAME "Performance Monitor Users" + IDS_ALIAS_MONITORING_USERS_COMMENT "Members of this group have remote access to monitor this computer" + IDS_ALIAS_LOGGING_USERS_NAME "Performance Log Users" + IDS_ALIAS_LOGGING_USERS_COMMENT "Members of this group have remote access to schedule logging of performance counters on this computer" /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and diff --git a/dll/win32/samsrv/lang/tr-TR.rc b/dll/win32/samsrv/lang/tr-TR.rc index d18c6d75472..dd475f8b1e1 100644 --- a/dll/win32/samsrv/lang/tr-TR.rc +++ b/dll/win32/samsrv/lang/tr-TR.rc @@ -15,6 +15,8 @@ BEGIN IDS_ALIAS_POWER_USERS_COMMENT "Güçlü Kullanıcılar, birtakım kısıtlamalarla çoğu yönetim yetkilerine iyedir." IDS_ALIAS_USERS_NAME "Kullanıcılar" IDS_ALIAS_USERS_COMMENT "Kullanıcılar, dizge değişiklikleri yapmaktan alıkonulmuştur." + IDS_ALIAS_PRINT_OPS_NAME "Print Operators" + IDS_ALIAS_PRINT_OPS_COMMENT "Members can administer domain printers" IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" IDS_ALIAS_REPLICATOR_NAME "Replicator" @@ -23,6 +25,10 @@ BEGIN IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Members in this group are granted the right to logon remotely" IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Network Configuration Operators" IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Members in this group can have some administrative privileges to manage configuration of networking features" + IDS_ALIAS_MONITORING_USERS_NAME "Performance Monitor Users" + IDS_ALIAS_MONITORING_USERS_COMMENT "Members of this group have remote access to monitor this computer" + IDS_ALIAS_LOGGING_USERS_NAME "Performance Log Users" + IDS_ALIAS_LOGGING_USERS_COMMENT "Members of this group have remote access to schedule logging of performance counters on this computer" /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and diff --git a/dll/win32/samsrv/lang/zh-CN.rc b/dll/win32/samsrv/lang/zh-CN.rc index 5e65630bdd9..e45a94e183c 100644 --- a/dll/win32/samsrv/lang/zh-CN.rc +++ b/dll/win32/samsrv/lang/zh-CN.rc @@ -16,6 +16,8 @@ BEGIN IDS_ALIAS_POWER_USERS_COMMENT "高级用户拥有大多数管理权限，但存在一些限制。" IDS_ALIAS_USERS_NAME "用户" IDS_ALIAS_USERS_COMMENT "防止用户进行对系统进行全面更改。" + IDS_ALIAS_PRINT_OPS_NAME "Print Operators" + IDS_ALIAS_PRINT_OPS_COMMENT "Members can administer domain printers" IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" IDS_ALIAS_REPLICATOR_NAME "Replicator" @@ -24,6 +26,10 @@ BEGIN IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Members in this group are granted the right to logon remotely" IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Network Configuration Operators" IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Members in this group can have some administrative privileges to manage configuration of networking features" + IDS_ALIAS_MONITORING_USERS_NAME "Performance Monitor Users" + IDS_ALIAS_MONITORING_USERS_COMMENT "Members of this group have remote access to monitor this computer" + IDS_ALIAS_LOGGING_USERS_NAME "Performance Log Users" + IDS_ALIAS_LOGGING_USERS_COMMENT "Members of this group have remote access to schedule logging of performance counters on this computer" /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and diff --git a/dll/win32/samsrv/lang/zh-TW.rc b/dll/win32/samsrv/lang/zh-TW.rc index 17a122af24f..9038404f8cf 100644 --- a/dll/win32/samsrv/lang/zh-TW.rc +++ b/dll/win32/samsrv/lang/zh-TW.rc @@ -16,6 +16,8 @@ BEGIN IDS_ALIAS_POWER_USERS_COMMENT "進階使用者擁有大多數管理權限，但存在一些限制。" IDS_ALIAS_USERS_NAME "使用者" IDS_ALIAS_USERS_COMMENT "防止使用者對系統進行全面變更。" + IDS_ALIAS_PRINT_OPS_NAME "Print Operators" + IDS_ALIAS_PRINT_OPS_COMMENT "Members can administer domain printers" IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" IDS_ALIAS_REPLICATOR_NAME "Replicator" @@ -24,6 +26,10 @@ BEGIN IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Members in this group are granted the right to logon remotely" IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Network Configuration Operators" IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Members in this group can have some administrative privileges to manage configuration of networking features" + IDS_ALIAS_MONITORING_USERS_NAME "Performance Monitor Users" + IDS_ALIAS_MONITORING_USERS_COMMENT "Members of this group have remote access to monitor this computer" + IDS_ALIAS_LOGGING_USERS_NAME "Performance Log Users" + IDS_ALIAS_LOGGING_USERS_COMMENT "Members of this group have remote access to schedule logging of performance counters on this computer" /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and diff --git a/dll/win32/samsrv/resources.h b/dll/win32/samsrv/resources.h index d67d496bca5..a2f881cf4f7 100644 --- a/dll/win32/samsrv/resources.h +++ b/dll/win32/samsrv/resources.h @@ -21,15 +21,20 @@ #define IDS_ALIAS_POWER_USERS_COMMENT 125 #define IDS_ALIAS_USERS_NAME 126 #define IDS_ALIAS_USERS_COMMENT 127 -#define IDS_ALIAS_BACKUP_OPS_NAME 128 -#define IDS_ALIAS_BACKUP_OPS_COMMENT 129 -#define IDS_ALIAS_REPLICATOR_NAME 130 -#define IDS_ALIAS_REPLICATOR_COMMENT 131 -#define IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME 132 -#define IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT 133 -#define IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME 134 -#define IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT 135 - +#define IDS_ALIAS_PRINT_OPS_NAME 128 +#define IDS_ALIAS_PRINT_OPS_COMMENT 129 +#define IDS_ALIAS_BACKUP_OPS_NAME 130 +#define IDS_ALIAS_BACKUP_OPS_COMMENT 131 +#define IDS_ALIAS_REPLICATOR_NAME 132 +#define IDS_ALIAS_REPLICATOR_COMMENT 133 +#define IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME 134 +#define IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT 135 +#define IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME 136 +#define IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT 137 +#define IDS_ALIAS_MONITORING_USERS_NAME 138 +#define IDS_ALIAS_MONITORING_USERS_COMMENT 139 +#define IDS_ALIAS_LOGGING_USERS_NAME 140 +#define IDS_ALIAS_LOGGING_USERS_COMMENT 141 #define IDS_USER_ADMINISTRATOR_NAME 160 #define IDS_USER_ADMINISTRATOR_COMMENT 161 diff --git a/dll/win32/samsrv/samsrv.c b/dll/win32/samsrv/samsrv.c index 7efaabe6e7f..5e4fd9d96f3 100644 --- a/dll/win32/samsrv/samsrv.c +++ b/dll/win32/samsrv/samsrv.c @@ -26,6 +26,7 @@ ENCRYPTED_NT_OWF_PASSWORD EmptyNtHash; ENCRYPTED_LM_OWF_PASSWORD EmptyLmHash; RTL_RESOURCE SampResource; +NT_PRODUCT_TYPE SampProductType; /* FUNCTIONS *****************************************************************/ @@ -104,6 +105,10 @@ SamIInitialize(VOID) TRACE("SamIInitialize() called\n"); + Status = RtlGetNtProductType(&SampProductType); + if (!NT_SUCCESS(Status)) + SampProductType = NtProductWinNt; + Status = SampInitHashes(); if (!NT_SUCCESS(Status)) return Status; diff --git a/dll/win32/samsrv/samsrv.h b/dll/win32/samsrv/samsrv.h index 842ac51e2d0..e16308c9338 100644 --- a/dll/win32/samsrv/samsrv.h +++ b/dll/win32/samsrv/samsrv.h @@ -21,6 +21,7 @@ #include <winbase.h> #include <winreg.h> #define NTOS_MODE_USER +#include <ndk/ketypes.h> #include <ndk/kefuncs.h> #include <ndk/obfuncs.h> #include <ndk/rtlfuncs.h> @@ -119,7 +120,7 @@ extern PGENERIC_MAPPING pServerMapping; extern ENCRYPTED_NT_OWF_PASSWORD EmptyNtHash; extern ENCRYPTED_LM_OWF_PASSWORD EmptyLmHash; extern RTL_RESOURCE SampResource; - +extern NT_PRODUCT_TYPE SampProductType; /* alias.c */ diff --git a/dll/win32/samsrv/setup.c b/dll/win32/samsrv/setup.c index 210039f938a..30e11a96019 100644 --- a/dll/win32/samsrv/setup.c +++ b/dll/win32/samsrv/setup.c @@ -1022,6 +1022,18 @@ SampInitializeSAM(VOID) szComment, DOMAIN_ALIAS_RID_POWER_USERS); + if (SampProductType != NtProductWinNt) + { + /* Create the Print Operators alias (Server only) */ + SampLoadString(hInstance, IDS_ALIAS_PRINT_OPS_NAME, szName, 80); + SampLoadString(hInstance, IDS_ALIAS_PRINT_OPS_COMMENT, szComment, 256); + + SampSetupCreateAliasAccount(hBuiltinDomainKey, + szName, + szComment, + DOMAIN_ALIAS_RID_PRINT_OPS); + } + /* Create the Backup Operators alias */ SampLoadString(hInstance, IDS_ALIAS_BACKUP_OPS_NAME, szName, 80); SampLoadString(hInstance, IDS_ALIAS_BACKUP_OPS_COMMENT, szComment, 256); @@ -1058,6 +1070,27 @@ SampInitializeSAM(VOID) szComment, DOMAIN_ALIAS_RID_NETWORK_CONFIGURATION_OPS); + if (SampProductType != NtProductWinNt) + { + /* Create the Performance Monitor Users alias (Server only) */ + SampLoadString(hInstance, IDS_ALIAS_MONITORING_USERS_NAME, szName, 80); + SampLoadString(hInstance, IDS_ALIAS_MONITORING_USERS_COMMENT, szComment, 256); + + SampSetupCreateAliasAccount(hBuiltinDomainKey, + szName, + szComment, + DOMAIN_ALIAS_RID_MONITORING_USERS); + + /* Create the Performance Log Users alias (Server only) */ + SampLoadString(hInstance, IDS_ALIAS_LOGGING_USERS_NAME, szName, 80); + SampLoadString(hInstance, IDS_ALIAS_LOGGING_USERS_COMMENT, szComment, 256); + + SampSetupCreateAliasAccount(hBuiltinDomainKey, + szName, + szComment, + DOMAIN_ALIAS_RID_LOGGING_USERS); + } + /* Add the Administrator user to the Administrators alias */ pSid = AppendRidToSid(AccountDomainInfo->DomainSid, DOMAIN_USER_RID_ADMIN);

1 0

[reactos] 01/01: [CMAKE] Replace CMAKE_AR with CMAKE_LINKER /LIB for msvc
by Victor Perevertkin 03 Jan '21

03 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e394a1312a94b0e524e7c… commit e394a1312a94b0e524e7ce92e42f0e2c75213d04 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sun Jan 3 04:06:51 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sun Jan 3 04:06:51 2021 +0300 [CMAKE] Replace CMAKE_AR with CMAKE_LINKER /LIB for msvc Render the command to a variable for dealing with quotes properly Addendum to ca1b2ada343a7ca2edd556f013ed55622318039d and b96e88894a4d55f5e8b94430deeb0f086151b24f --- sdk/cmake/msvc.cmake | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index ee6c343451d..3b70fd92744 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -317,12 +317,13 @@ function(generate_import_lib _libname _dllname _spec_file) set(_libfile_tmp ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_tmp.lib) set(_static_lib_options ) + set(_implib_command ${CMAKE_LINKER} /LIB /NOLOGO /MACHINE:${WINARCH} + $<TARGET_PROPERTY:${_libname},STATIC_LIBRARY_FLAGS> $<TARGET_PROPERTY:${_libname},STATIC_LIBRARY_OPTIONS> + /DEF:${_def_file} /OUT:${_libfile_tmp} ${_asm_stubs_file}.obj) + add_custom_command( OUTPUT ${_libfile_tmp} - COMMAND - ${CMAKE_AR} /NOLOGO /MACHINE:${WINARCH} - $<TARGET_PROPERTY:${_libname},STATIC_LIBRARY_FLAGS> $<TARGET_PROPERTY:${_libname},STATIC_LIBRARY_OPTIONS> - /DEF:${_def_file} /OUT:${_libfile_tmp} ${_asm_stubs_file}.obj + COMMAND ${_implib_command} DEPENDS ${_asm_stubs_file}.obj ${_def_file}) # By giving the import lib as an object input, LIB extracts the relevant object files and make a new library.

1 0

[reactos] 01/01: [CMAKE] Replace DIVISION_SLASH unicode character with SOLIDUS
by Victor Perevertkin 03 Jan '21

03 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ca1b2ada343a7ca2edd55… commit ca1b2ada343a7ca2edd556f013ed55622318039d Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sun Jan 3 03:46:12 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sun Jan 3 03:46:12 2021 +0300 [CMAKE] Replace DIVISION_SLASH unicode character with SOLIDUS This fixes the build on some machines. In addition, replace the hardcoded "LINK /LIB" with ${CMAKE_AR} Addendum to b96e88894a4d55f5e8b94430deeb0f086151b24f --- sdk/cmake/msvc.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 1601805404a..ee6c343451d 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -320,9 +320,9 @@ function(generate_import_lib _libname _dllname _spec_file) add_custom_command( OUTPUT ${_libfile_tmp} COMMAND - LINK /LIB ∕NOLOGO /MACHINE:${WINARCH} + ${CMAKE_AR} /NOLOGO /MACHINE:${WINARCH} $<TARGET_PROPERTY:${_libname},STATIC_LIBRARY_FLAGS> $<TARGET_PROPERTY:${_libname},STATIC_LIBRARY_OPTIONS> - ∕DEF:${_def_file} /OUT:${_libfile_tmp} ${_asm_stubs_file}.obj + /DEF:${_def_file} /OUT:${_libfile_tmp} ${_asm_stubs_file}.obj DEPENDS ${_asm_stubs_file}.obj ${_def_file}) # By giving the import lib as an object input, LIB extracts the relevant object files and make a new library.

1 0

[reactos] 02/02: [USETUP] Minor improvements when initializing the console.
by Hermès Bélusca-Maïto 02 Jan '21

02 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0abff65a5520d6e926d36… commit 0abff65a5520d6e926d364edc6df6e10f2b46155 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 3 00:10:03 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 3 00:27:54 2021 +0100 [USETUP] Minor improvements when initializing the console. - Use NT values for uninitialized handle values. - Cache the STD_INPUT_HANDLE. - Free the console if GetConsoleScreenBufferInfo() fails in CONSOLE_Init(). --- base/setup/usetup/consup.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/base/setup/usetup/consup.c b/base/setup/usetup/consup.c index 2a5336cb5e5..e72c43106e6 100644 --- a/base/setup/usetup/consup.c +++ b/base/setup/usetup/consup.c @@ -33,8 +33,8 @@ /* GLOBALS ******************************************************************/ -HANDLE StdInput = INVALID_HANDLE_VALUE; -HANDLE StdOutput = INVALID_HANDLE_VALUE; +HANDLE StdInput = NULL; +HANDLE StdOutput = NULL; SHORT xScreen = 0; SHORT yScreen = 0; @@ -45,15 +45,24 @@ BOOLEAN CONSOLE_Init(VOID) { CONSOLE_SCREEN_BUFFER_INFO csbi; + + /* Allocate a new console */ if (!AllocConsole()) return FALSE; - StdInput = GetStdHandle(STD_INPUT_HANDLE); + /* Get the standard handles */ + StdInput = GetStdHandle(STD_INPUT_HANDLE); StdOutput = GetStdHandle(STD_OUTPUT_HANDLE); + + /* Retrieve the size of the console */ if (!GetConsoleScreenBufferInfo(StdOutput, &csbi)) + { + FreeConsole(); return FALSE; + } xScreen = csbi.dwSize.X; yScreen = csbi.dwSize.Y; + return TRUE; } @@ -175,7 +184,7 @@ CONSOLE_GetCursorXY( { CONSOLE_SCREEN_BUFFER_INFO csbi; - GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi); + GetConsoleScreenBufferInfo(StdOutput, &csbi); *x = csbi.dwCursorPosition.X; *y = csbi.dwCursorPosition.Y;

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 January 2021