Ros-diffs April 2018

ros-diffs@reactos.org

26 participants
247 discussions

01/01: [ZIPFLDR] Add Russian translation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ae9fb8a68d02fa7fe893b… commit ae9fb8a68d02fa7fe893bb4e04180eb56014335f Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Apr 22 17:31:21 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 22 17:12:47 2018 +0200 [ZIPFLDR] Add Russian translation --- dll/shellext/zipfldr/lang/ru-RU.rc | 71 ++++++++++++++++++++++++++++++++++++++ dll/shellext/zipfldr/zipfldr.rc | 3 ++ 2 files changed, 74 insertions(+) diff --git a/dll/shellext/zipfldr/lang/ru-RU.rc b/dll/shellext/zipfldr/lang/ru-RU.rc new file mode 100644 index 0000000000..2bd50f0149 --- /dev/null +++ b/dll/shellext/zipfldr/lang/ru-RU.rc @@ -0,0 +1,71 @@ +/* + * PROJECT: ReactOS Zip Shell Extension + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Russian (Russia) resource translation + * COPYRIGHT: Copyright 2018 Stas'M (x86corez(a)gmail.com) + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 235, 156 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Укажите путь" +FONT 8, "MS Shell Dlg", 400, 0, 0x0 +BEGIN + LTEXT "Выберите путь для извлечения",IDC_STATIC,6,12,174,8 + EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL + PUSHBUTTON "Обзор...",IDC_BROWSE,174,42,54,14 + PUSHBUTTON "Пароль",IDC_PASSWORD,174,66,54,14 + LTEXT "Извлечение...",IDC_STATIC,6,114,48,8 + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 +END + +IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 235, 156 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Извлечение завершено" +FONT 8, "MS Shell Dlg", 400, 0, 0x0 +BEGIN + LTEXT "Все файлы были извлечены в следующую директорию:",IDC_STATIC,6,12,222,18 + LTEXT "Целевой путь",IDC_DESTDIR,6,36,222,8 + CONTROL "Показать извлечённые файлы",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,66,118,10 + LTEXT "Нажмите \"Готово\" чтобы продолжить.",IDC_STATIC,6,84,174,8 +END + +IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 273, 56 +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Подтвердите замену файла" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "&Да",IDYES,6,36,62,14 + PUSHBUTTON "Отмена",IDCANCEL,204,36,62,14 + PUSHBUTTON "Заменить &все",IDYESALL,72,36,62,14 + PUSHBUTTON "&Нет",IDNO,138,36,62,14 + ICON "",IDC_EXCLAMATION_ICON,6,6,24,22 + LTEXT "",IDC_MESSAGE,36,6,228,24 +END + +STRINGTABLE +BEGIN + IDS_COL_NAME "Название" + IDS_COL_TYPE "Тип" + IDS_COL_COMPRSIZE "Сжатый размер" + IDS_COL_PASSWORD "Защищён паролем" + IDS_COL_SIZE "Размер" + IDS_COL_RATIO "Сжатие" + IDS_COL_DATE_MOD "Дата изменения" + IDS_YES "Да" + IDS_NO "Нет" + + IDS_WIZ_TITLE "Мастер извлечения архивов" + IDS_WIZ_DEST_TITLE "Укажите путь" + IDS_WIZ_DEST_SUBTITLE "Файлы из zip архива будут извлечены в указанную директорию." + IDS_WIZ_COMPL_TITLE "Извлечение завершено" + IDS_WIZ_COMPL_SUBTITLE "Файлы из zip архива были извлечены." + IDS_WIZ_BROWSE_TITLE "Выберите расположение для извлечения элементов." + + IDS_OVERWRITEFILE_TEXT "В данной папке уже есть файл '%1'.\nВы хотите заменить его?" + + IDS_MENUITEM "&Извлечь всё..." + IDS_HELPTEXT "Извлекает содержимое архива" + IDS_FRIENDLYNAME "Сжатая zip папка" +END diff --git a/dll/shellext/zipfldr/zipfldr.rc b/dll/shellext/zipfldr/zipfldr.rc index 9afe0f1596..593ad3efa5 100644 --- a/dll/shellext/zipfldr/zipfldr.rc +++ b/dll/shellext/zipfldr/zipfldr.rc @@ -33,6 +33,9 @@ IDR_ZIPFLDR REGISTRY "res/zipfldr.rgs" #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif

6 years, 8 months

05/05: [NTOSKRNL] Minor PnP enhancements.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e616a456c0ccce598e0a0… commit e616a456c0ccce598e0a065004988bea47079463 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 22 16:31:53 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 22 16:52:45 2018 +0200 [NTOSKRNL] Minor PnP enhancements. - For non-PnP devices reported to the PnP manager through the IoReportDetectedDevice() function, store the corresponding service/driver name and (non-)legacy information inside their HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Enum\Root\ entries. - Drivers flagged as "DRVO_BUILTIN_DRIVER" (basically, only those created via a IoCreateDriver() call) have their "Service" name that contain "\Driver\", which should be stripped before being used in building e.g. the corresponding "DETECTEDxxx" PnP compatible IDs. CORE-14247 - Use explicit REG_OPTION_NON_VOLATILE flag where needed in the IopCreateDeviceKeyPath() calls. - Save NULL-terminated REG-SZ string properties in the enumeration tree for each device enumerated inside \Enum\Root\. - Always use upcased key name for the "LEGACY_***" elements in \Enum\Root\. - Add a default "ConfigFlags" value for the legacy elements. - Simplify few parts of code. --- ntoskrnl/io/pnpmgr/pnpmgr.c | 44 +++++++++++++++---------------- ntoskrnl/io/pnpmgr/pnpreport.c | 60 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 79 insertions(+), 25 deletions(-) diff --git a/ntoskrnl/io/pnpmgr/pnpmgr.c b/ntoskrnl/io/pnpmgr/pnpmgr.c index 3337495ae0..62ad7a253f 100644 --- a/ntoskrnl/io/pnpmgr/pnpmgr.c +++ b/ntoskrnl/io/pnpmgr/pnpmgr.c @@ -98,7 +98,7 @@ IopInstallCriticalDevice(PDEVICE_NODE DeviceNode) PWCHAR IdBuffer, OriginalIdBuffer; /* Open the device instance key */ - Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, 0, &InstanceKey); + Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, REG_OPTION_NON_VOLATILE, &InstanceKey); if (Status != STATUS_SUCCESS) return; @@ -800,7 +800,7 @@ IopStartDevice( IopStartAndEnumerateDevice(DeviceNode); /* FIX: Should be done in new device instance code */ - Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, 0, &InstanceHandle); + Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, REG_OPTION_NON_VOLATILE, &InstanceHandle); if (!NT_SUCCESS(Status)) goto ByeBye; @@ -817,7 +817,7 @@ IopStartDevice( goto ByeBye; RtlInitUnicodeString(&KeyName, L"ActiveService"); - Status = ZwSetValueKey(ControlHandle, &KeyName, 0, REG_SZ, DeviceNode->ServiceName.Buffer, DeviceNode->ServiceName.Length); + Status = ZwSetValueKey(ControlHandle, &KeyName, 0, REG_SZ, DeviceNode->ServiceName.Buffer, DeviceNode->ServiceName.Length + sizeof(UNICODE_NULL)); // } ByeBye: @@ -873,7 +873,7 @@ IopQueryDeviceCapabilities(PDEVICE_NODE DeviceNode, else DeviceNode->UserFlags &= ~DNUF_DONT_SHOW_IN_UI; - Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, 0, &InstanceKey); + Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, REG_OPTION_NON_VOLATILE, &InstanceKey); if (NT_SUCCESS(Status)) { /* Set 'Capabilities' value */ @@ -1067,7 +1067,7 @@ IopCreateDeviceNode(PDEVICE_NODE ParentNode, if (!PhysicalDeviceObject) { - FullServiceName.MaximumLength = LegacyPrefix.Length + ServiceName1->Length; + FullServiceName.MaximumLength = LegacyPrefix.Length + ServiceName1->Length + sizeof(UNICODE_NULL); FullServiceName.Length = 0; FullServiceName.Buffer = ExAllocatePool(PagedPool, FullServiceName.MaximumLength); if (!FullServiceName.Buffer) @@ -1078,6 +1078,7 @@ IopCreateDeviceNode(PDEVICE_NODE ParentNode, RtlAppendUnicodeStringToString(&FullServiceName, &LegacyPrefix); RtlAppendUnicodeStringToString(&FullServiceName, ServiceName1); + RtlUpcaseUnicodeString(&FullServiceName, &FullServiceName, FALSE); Status = PnpRootCreateDevice(&FullServiceName, NULL, &PhysicalDeviceObject, &Node->InstancePath); if (!NT_SUCCESS(Status)) @@ -1097,7 +1098,9 @@ IopCreateDeviceNode(PDEVICE_NODE ParentNode, return Status; } - Node->ServiceName.Buffer = ExAllocatePool(PagedPool, ServiceName1->Length); + Node->ServiceName.MaximumLength = ServiceName1->Length + sizeof(UNICODE_NULL); + Node->ServiceName.Length = 0; + Node->ServiceName.Buffer = ExAllocatePool(PagedPool, Node->ServiceName.MaximumLength); if (!Node->ServiceName.Buffer) { ZwClose(InstanceHandle); @@ -1106,39 +1109,39 @@ IopCreateDeviceNode(PDEVICE_NODE ParentNode, return Status; } - Node->ServiceName.MaximumLength = ServiceName1->Length; - Node->ServiceName.Length = 0; - - RtlAppendUnicodeStringToString(&Node->ServiceName, ServiceName1); + RtlCopyUnicodeString(&Node->ServiceName, ServiceName1); if (ServiceName) { RtlInitUnicodeString(&KeyName, L"Service"); - Status = ZwSetValueKey(InstanceHandle, &KeyName, 0, REG_SZ, ServiceName->Buffer, ServiceName->Length); + Status = ZwSetValueKey(InstanceHandle, &KeyName, 0, REG_SZ, ServiceName->Buffer, ServiceName->Length + sizeof(UNICODE_NULL)); } if (NT_SUCCESS(Status)) { RtlInitUnicodeString(&KeyName, L"Legacy"); - LegacyValue = 1; Status = ZwSetValueKey(InstanceHandle, &KeyName, 0, REG_DWORD, &LegacyValue, sizeof(LegacyValue)); + + RtlInitUnicodeString(&KeyName, L"ConfigFlags"); + LegacyValue = 0; + ZwSetValueKey(InstanceHandle, &KeyName, 0, REG_DWORD, &LegacyValue, sizeof(LegacyValue)); + if (NT_SUCCESS(Status)) { RtlInitUnicodeString(&KeyName, L"Class"); - - RtlInitUnicodeString(&ClassName, L"LegacyDriver\0"); + RtlInitUnicodeString(&ClassName, L"LegacyDriver"); Status = ZwSetValueKey(InstanceHandle, &KeyName, 0, REG_SZ, ClassName.Buffer, ClassName.Length + sizeof(UNICODE_NULL)); if (NT_SUCCESS(Status)) { RtlInitUnicodeString(&KeyName, L"ClassGUID"); - - RtlInitUnicodeString(&ClassGUID, L"{8ECC055D-047F-11D1-A537-0000F8753ED1}\0"); + RtlInitUnicodeString(&ClassGUID, L"{8ECC055D-047F-11D1-A537-0000F8753ED1}"); Status = ZwSetValueKey(InstanceHandle, &KeyName, 0, REG_SZ, ClassGUID.Buffer, ClassGUID.Length + sizeof(UNICODE_NULL)); if (NT_SUCCESS(Status)) { + // FIXME: Retrieve the real "description" by looking at the "DisplayName" string + // of the corresponding CurrentControlSet\Services\xxx entry for this driver. RtlInitUnicodeString(&KeyName, L"DeviceDesc"); - Status = ZwSetValueKey(InstanceHandle, &KeyName, 0, REG_SZ, ServiceName1->Buffer, ServiceName1->Length + sizeof(UNICODE_NULL)); } } @@ -2244,7 +2247,7 @@ IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode, /* * Create registry key for the instance id, if it doesn't exist yet */ - Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, 0, &InstanceKey); + Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, REG_OPTION_NON_VOLATILE, &InstanceKey); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to create the instance key! (Status %lx)\n", Status); @@ -2719,10 +2722,7 @@ IopActionConfigureChildServices(PDEVICE_NODE DeviceNode, DeviceCaps.RawDeviceOK) { DPRINT("%wZ is using parent bus driver (%wZ)\n", &DeviceNode->InstancePath, &ParentDeviceNode->ServiceName); - - DeviceNode->ServiceName.Length = 0; - DeviceNode->ServiceName.MaximumLength = 0; - DeviceNode->ServiceName.Buffer = NULL; + RtlInitEmptyUnicodeString(&DeviceNode->ServiceName, NULL, 0); } else if (ClassGUID.Length != 0) { diff --git a/ntoskrnl/io/pnpmgr/pnpreport.c b/ntoskrnl/io/pnpmgr/pnpreport.c index 0d6943b927..00b3547cce 100644 --- a/ntoskrnl/io/pnpmgr/pnpreport.c +++ b/ntoskrnl/io/pnpmgr/pnpreport.c @@ -173,15 +173,17 @@ IoReportDetectedDevice(IN PDRIVER_OBJECT DriverObject, NTSTATUS Status; HANDLE InstanceKey; ULONG RequiredLength; - UNICODE_STRING ValueName, ServiceName; + UNICODE_STRING ValueName, ServiceLongName, ServiceName; WCHAR HardwareId[256]; PWCHAR IfString; ULONG IdLength; + ULONG LegacyValue; DPRINT("IoReportDetectedDevice (DeviceObject %p, *DeviceObject %p)\n", DeviceObject, DeviceObject ? *DeviceObject : NULL); - ServiceName = DriverObject->DriverExtension->ServiceKeyName; + ServiceLongName = DriverObject->DriverExtension->ServiceKeyName; + ServiceName = ServiceLongName; /* If the interface type is unknown, treat it as internal */ if (LegacyBusType == InterfaceTypeUndefined) @@ -194,6 +196,42 @@ IoReportDetectedDevice(IN PDRIVER_OBJECT DriverObject, if (!IfString) return STATUS_INVALID_PARAMETER; + /* + * Drivers that have been created via a direct IoCreateDriver() call + * have their ServiceKeyName set to \Driver\DriverName. We need to + * strip everything up to the last path separator and keep what remains. + */ + if (DriverObject->Flags & DRVO_BUILTIN_DRIVER) + { + /* + * Find the last path separator. + * NOTE: Since ServiceName is not necessarily NULL-terminated, + * we cannot use wcsrchr(). + */ + if (ServiceName.Buffer && ServiceName.Length >= sizeof(WCHAR)) + { + ValueName.Length = 1; + ValueName.Buffer = ServiceName.Buffer + (ServiceName.Length / sizeof(WCHAR)) - 1; + + while ((ValueName.Buffer > ServiceName.Buffer) && (*ValueName.Buffer != L'\\')) + { + --ValueName.Buffer; + ++ValueName.Length; + } + if (*ValueName.Buffer == L'\\') + { + ++ValueName.Buffer; + --ValueName.Length; + } + ValueName.Length *= sizeof(WCHAR); + + /* Shorten the string */ + ServiceName.MaximumLength -= (ServiceName.Length - ValueName.Length); + ServiceName.Length = ValueName.Length; + ServiceName.Buffer = ValueName.Buffer; + } + } + /* We use the caller's PDO if they supplied one */ if (DeviceObject && *DeviceObject) { @@ -218,7 +256,6 @@ IoReportDetectedDevice(IN PDRIVER_OBJECT DriverObject, Pdo, NULL, &DeviceNode); - if (!NT_SUCCESS(Status)) { DPRINT("IopCreateDeviceNode() failed (Status 0x%08lx)\n", Status); @@ -252,6 +289,23 @@ IoReportDetectedDevice(IN PDRIVER_OBJECT DriverObject, if (!NT_SUCCESS(Status)) return Status; + /* Save the driver name */ + RtlInitUnicodeString(&ValueName, L"Service"); + Status = ZwSetValueKey(InstanceKey, &ValueName, 0, REG_SZ, ServiceLongName.Buffer, ServiceLongName.Length + sizeof(UNICODE_NULL)); + if (!NT_SUCCESS(Status)) + { + DPRINT("Failed to write the Service name value: 0x%x\n", Status); + } + + /* Report as non-legacy driver */ + RtlInitUnicodeString(&ValueName, L"Legacy"); + LegacyValue = 0; + Status = ZwSetValueKey(InstanceKey, &ValueName, 0, REG_DWORD, &LegacyValue, sizeof(LegacyValue)); + if (!NT_SUCCESS(Status)) + { + DPRINT("Failed to write the Legacy value: 0x%x\n", Status); + } + /* Add DETECTEDInterfaceType\DriverName */ IdLength = 0; IdLength += swprintf(&HardwareId[IdLength],

6 years, 8 months

04/05: [ACPI] Fix the format of the (default hardcoded) "unique" instance ID.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2183e65c17fd4a8b0fe95… commit 2183e65c17fd4a8b0fe950c1600146c206c1f035 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Apr 4 02:25:49 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 22 16:52:42 2018 +0200 [ACPI] Fix the format of the (default hardcoded) "unique" instance ID. --- drivers/bus/acpi/buspdo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/bus/acpi/buspdo.c b/drivers/bus/acpi/buspdo.c index ea6b7dd8e4..59a437e671 100644 --- a/drivers/bus/acpi/buspdo.c +++ b/drivers/bus/acpi/buspdo.c @@ -507,12 +507,12 @@ Bus_PDO_QueryDeviceId( Device->pnp.unique_id); else /* FIXME: Generate unique id! */ - length = swprintf(temp, L"%ls", L"0000"); + length = swprintf(temp, L"%ls", L"0"); } else { /* FIXME: Generate unique id! */ - length = swprintf(temp, L"%ls", L"0000"); + length = swprintf(temp, L"%ls", L"0"); } temp[length++] = UNICODE_NULL;

6 years, 8 months

03/05: [NTOSKRNL] Whitespace fixes only.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fa103197ad05ea0fc89a6… commit fa103197ad05ea0fc89a6a6a3bd161c68e1c7ea1 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Apr 3 02:17:52 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 22 16:52:40 2018 +0200 [NTOSKRNL] Whitespace fixes only. --- ntoskrnl/io/pnpmgr/pnpreport.c | 66 +++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/ntoskrnl/io/pnpmgr/pnpreport.c b/ntoskrnl/io/pnpmgr/pnpreport.c index 92523207c5..0d6943b927 100644 --- a/ntoskrnl/io/pnpmgr/pnpreport.c +++ b/ntoskrnl/io/pnpmgr/pnpreport.c @@ -179,7 +179,7 @@ IoReportDetectedDevice(IN PDRIVER_OBJECT DriverObject, ULONG IdLength; DPRINT("IoReportDetectedDevice (DeviceObject %p, *DeviceObject %p)\n", - DeviceObject, DeviceObject ? *DeviceObject : NULL); + DeviceObject, DeviceObject ? *DeviceObject : NULL); ServiceName = DriverObject->DriverExtension->ServiceKeyName; @@ -274,33 +274,33 @@ IoReportDetectedDevice(IN PDRIVER_OBJECT DriverObject, Status = ZwSetValueKey(InstanceKey, &ValueName, 0, REG_MULTI_SZ, HardwareId, IdLength * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) { - DPRINT("Failed to write the compatible IDs: 0x%x\n", Status); - ZwClose(InstanceKey); - return Status; + DPRINT("Failed to write the compatible IDs: 0x%x\n", Status); + ZwClose(InstanceKey); + return Status; } /* Add a hardware ID if the driver didn't report one */ RtlInitUnicodeString(&ValueName, L"HardwareID"); if (ZwQueryValueKey(InstanceKey, &ValueName, KeyValueBasicInformation, NULL, 0, &RequiredLength) == STATUS_OBJECT_NAME_NOT_FOUND) { - /* Just use our most specific compatible ID */ - IdLength = 0; - IdLength += swprintf(&HardwareId[IdLength], - L"DETECTED%ls\\%wZ", - IfString, - &ServiceName); - IdLength++; - - HardwareId[IdLength++] = UNICODE_NULL; - - /* Write the value to the registry */ - Status = ZwSetValueKey(InstanceKey, &ValueName, 0, REG_MULTI_SZ, HardwareId, IdLength * sizeof(WCHAR)); - if (!NT_SUCCESS(Status)) - { - DPRINT("Failed to write the hardware ID: 0x%x\n", Status); - ZwClose(InstanceKey); - return Status; - } + /* Just use our most specific compatible ID */ + IdLength = 0; + IdLength += swprintf(&HardwareId[IdLength], + L"DETECTED%ls\\%wZ", + IfString, + &ServiceName); + IdLength++; + + HardwareId[IdLength++] = UNICODE_NULL; + + /* Write the value to the registry */ + Status = ZwSetValueKey(InstanceKey, &ValueName, 0, REG_MULTI_SZ, HardwareId, IdLength * sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + { + DPRINT("Failed to write the hardware ID: 0x%x\n", Status); + ZwClose(InstanceKey); + return Status; + } } /* Assign the resources to the device node */ @@ -309,10 +309,10 @@ IoReportDetectedDevice(IN PDRIVER_OBJECT DriverObject, /* Set appropriate flags */ if (DeviceNode->BootResources) - IopDeviceNodeSetFlag(DeviceNode, DNF_HAS_BOOT_CONFIG); + IopDeviceNodeSetFlag(DeviceNode, DNF_HAS_BOOT_CONFIG); if (!DeviceNode->ResourceRequirements && !DeviceNode->BootResources) - IopDeviceNodeSetFlag(DeviceNode, DNF_NO_RESOURCE_REQUIRED); + IopDeviceNodeSetFlag(DeviceNode, DNF_NO_RESOURCE_REQUIRED); /* Write the resource information to the registry */ IopSetDeviceInstanceData(InstanceKey, DeviceNode); @@ -320,15 +320,15 @@ IoReportDetectedDevice(IN PDRIVER_OBJECT DriverObject, /* If the caller didn't get the resources assigned for us, do it now */ if (!ResourceAssigned) { - Status = IopAssignDeviceResources(DeviceNode); - - /* See if we failed */ - if (!NT_SUCCESS(Status)) - { - DPRINT("Assigning resources failed: 0x%x\n", Status); - ZwClose(InstanceKey); - return Status; - } + Status = IopAssignDeviceResources(DeviceNode); + + /* See if we failed */ + if (!NT_SUCCESS(Status)) + { + DPRINT("Assigning resources failed: 0x%x\n", Status); + ZwClose(InstanceKey); + return Status; + } } /* Close the instance key handle */

6 years, 8 months

02/05: [NTOSKRNL] Set the DRVO_BUILTIN_DRIVER DriverObject flag when a built-in driver is created using IoCreateDriver().

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=45012aa48632815ca5010… commit 45012aa48632815ca5010825ab6e386eb438cc03 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Apr 3 02:14:48 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 22 16:52:38 2018 +0200 [NTOSKRNL] Set the DRVO_BUILTIN_DRIVER DriverObject flag when a built-in driver is created using IoCreateDriver(). --- ntoskrnl/include/internal/io.h | 4 ++-- ntoskrnl/io/iomgr/driver.c | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/include/internal/io.h b/ntoskrnl/include/internal/io.h index f536fef5b2..f47768d4a1 100644 --- a/ntoskrnl/include/internal/io.h +++ b/ntoskrnl/include/internal/io.h @@ -1091,9 +1091,9 @@ NTSTATUS NTAPI IopCreateDriver(IN PUNICODE_STRING DriverName OPTIONAL, IN PDRIVER_INITIALIZE InitializationFunction, - IN PUNICODE_STRING RegistryPath, + IN PUNICODE_STRING RegistryPath OPTIONAL, IN PCUNICODE_STRING ServiceName, - PLDR_DATA_TABLE_ENTRY ModuleObject, + IN PLDR_DATA_TABLE_ENTRY ModuleObject OPTIONAL, OUT PDRIVER_OBJECT *pDriverObject); VOID diff --git a/ntoskrnl/io/iomgr/driver.c b/ntoskrnl/io/iomgr/driver.c index 4f4df52979..f9de2e5065 100644 --- a/ntoskrnl/io/iomgr/driver.c +++ b/ntoskrnl/io/iomgr/driver.c @@ -1419,9 +1419,9 @@ NTSTATUS NTAPI IopCreateDriver(IN PUNICODE_STRING DriverName OPTIONAL, IN PDRIVER_INITIALIZE InitializationFunction, - IN PUNICODE_STRING RegistryPath, + IN PUNICODE_STRING RegistryPath OPTIONAL, IN PCUNICODE_STRING ServiceName, - PLDR_DATA_TABLE_ENTRY ModuleObject, + IN PLDR_DATA_TABLE_ENTRY ModuleObject OPTIONAL, OUT PDRIVER_OBJECT *pDriverObject) { WCHAR NameBuffer[100]; @@ -1479,7 +1479,16 @@ try_again: RtlZeroMemory(DriverObject, ObjectSize); DriverObject->Type = IO_TYPE_DRIVER; DriverObject->Size = sizeof(DRIVER_OBJECT); - DriverObject->Flags = DRVO_LEGACY_DRIVER; + + /* + * Check whether RegistryPath and ModuleObject are both NULL because + * IoCreateDriver() was called to initialize a built-in driver. + */ + if ((RegistryPath != NULL) || (ModuleObject != NULL)) + DriverObject->Flags = DRVO_LEGACY_DRIVER; + else + DriverObject->Flags = DRVO_BUILTIN_DRIVER; + DriverObject->DriverExtension = (PDRIVER_EXTENSION)(DriverObject + 1); DriverObject->DriverExtension->DriverObject = DriverObject; DriverObject->DriverInit = InitializationFunction;

6 years, 8 months

01/05: [NTOSKRNL] Set flags the standard way.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=635775d2496fe3d4032ff… commit 635775d2496fe3d4032ffc9d854a8ea430a8b63c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Apr 3 02:10:08 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 22 16:52:36 2018 +0200 [NTOSKRNL] Set flags the standard way. --- ntoskrnl/io/pnpmgr/pnpmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/io/pnpmgr/pnpmgr.c b/ntoskrnl/io/pnpmgr/pnpmgr.c index 83ff6774b6..3337495ae0 100644 --- a/ntoskrnl/io/pnpmgr/pnpmgr.c +++ b/ntoskrnl/io/pnpmgr/pnpmgr.c @@ -452,7 +452,7 @@ IopInitializeDevice(PDEVICE_NODE DeviceNode, if (DeviceNode->Flags & DNF_LEGACY_DRIVER) { - DeviceNode->Flags |= DNF_ADDED + DNF_STARTED; + DeviceNode->Flags |= (DNF_ADDED | DNF_STARTED); return STATUS_SUCCESS; }

6 years, 8 months

01/01: [BROWSEUI] Apply a hack to prevent truncating the address bar text. CORE-13003

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea0cc1c7831dbe7dec31f… commit ea0cc1c7831dbe7dec31f4f495befb5dfa90ab5c Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sun Apr 22 15:42:10 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Apr 22 15:42:29 2018 +0200 [BROWSEUI] Apply a hack to prevent truncating the address bar text. CORE-13003 --- dll/win32/browseui/addressband.cpp | 31 +++++++++++++++++++++++++++++-- dll/win32/browseui/addressband.h | 1 + 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dll/win32/browseui/addressband.cpp b/dll/win32/browseui/addressband.cpp index c319dbd628..0bc3e971e2 100644 --- a/dll/win32/browseui/addressband.cpp +++ b/dll/win32/browseui/addressband.cpp @@ -43,6 +43,7 @@ CAddressBand::CAddressBand() fGoButton = NULL; fComboBox = NULL; fGoButtonShown = false; + fAdjustNeeded = 0; } CAddressBand::~CAddressBand() @@ -66,7 +67,10 @@ HRESULT STDMETHODCALLTYPE CAddressBand::GetBandInfo(DWORD dwBandID, DWORD dwView { if (pdbi->dwMask & DBIM_MINSIZE) { - pdbi->ptMinSize.x = 100; + if (fGoButtonShown) + pdbi->ptMinSize.x = 100; + else + pdbi->ptMinSize.x = 150; pdbi->ptMinSize.y = 22; } if (pdbi->dwMask & DBIM_MAXSIZE) @@ -81,7 +85,10 @@ HRESULT STDMETHODCALLTYPE CAddressBand::GetBandInfo(DWORD dwBandID, DWORD dwView } if (pdbi->dwMask & DBIM_ACTUAL) { - pdbi->ptActual.x = 100; + if (fGoButtonShown) + pdbi->ptActual.x = 100; + else + pdbi->ptActual.x = 150; pdbi->ptActual.y = 22; } if (pdbi->dwMask & DBIM_TITLE) @@ -451,6 +458,8 @@ LRESULT CAddressBand::OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHan long newHeight; long newWidth; + fAdjustNeeded = 1; + if (fGoButtonShown == false) { bHandled = FALSE; @@ -505,6 +514,24 @@ LRESULT CAddressBand::OnWindowPosChanging(UINT uMsg, WPARAM wParam, LPARAM lPara positionInfoCopy = *reinterpret_cast<WINDOWPOS *>(lParam); newHeight = positionInfoCopy.cy; newWidth = positionInfoCopy.cx; + +/* + Sometimes when we get here newWidth = 100 which comes from GetBandInfo and is less than the 200 that we need. + We need room for the "Address" text (50 pixels), the "GoButton" (50 pixels), the left and right borders (30 pixels) + the icon (20 pixels) and the ComboBox (50 pixels) for handling the text of the current directory. This is 200 pixels. + When newWidth = 100 the Addressband ComboBox will only have a single character because it becomes 2 pixels wide. + The hack below readjusts the width to the minimum required to allow seeing the whole text and prints out a debug message. +*/ + + if ((newWidth < 200) && (newWidth != 0)) + { + if (fAdjustNeeded == 1) + { + ERR("CORE-13003 HACK: Addressband ComboBox width readjusted from %ld to 200.\n", newWidth); + newWidth = 200; + fAdjustNeeded = 0; + } + } SendMessage(fGoButton, TB_GETITEMRECT, 0, reinterpret_cast<LPARAM>(&buttonBounds)); buttonWidth = buttonBounds.right - buttonBounds.left; diff --git a/dll/win32/browseui/addressband.h b/dll/win32/browseui/addressband.h index 5d345bcb14..eaba14282a 100644 --- a/dll/win32/browseui/addressband.h +++ b/dll/win32/browseui/addressband.h @@ -43,6 +43,7 @@ private: bool fGoButtonShown; HIMAGELIST m_himlNormal; HIMAGELIST m_himlHot; + INT fAdjustNeeded; public: CAddressBand();

6 years, 8 months

01/01: [NTOS:MM] Fix ViewSize parameter passed to MiInsertVadEx() from MiCreatePebOrTeb() The size is in bytes, not in pages! On x86 we got away with it, since PEB and TEB require only a single page and the 1 passed to MiInsertVadEx() was aligned up to PAGE_SIZE. On x64 this doesn't work, since the size is 2 pages.

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e49ef251b7a14d5a0261d… commit e49ef251b7a14d5a0261d0b5c3890c8abe03569d Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jan 29 12:37:26 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Apr 22 15:06:19 2018 +0200 [NTOS:MM] Fix ViewSize parameter passed to MiInsertVadEx() from MiCreatePebOrTeb() The size is in bytes, not in pages! On x86 we got away with it, since PEB and TEB require only a single page and the 1 passed to MiInsertVadEx() was aligned up to PAGE_SIZE. On x64 this doesn't work, since the size is 2 pages. --- ntoskrnl/mm/ARM3/procsup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/mm/ARM3/procsup.c b/ntoskrnl/mm/ARM3/procsup.c index 95e760a2ec..009168eba9 100644 --- a/ntoskrnl/mm/ARM3/procsup.c +++ b/ntoskrnl/mm/ARM3/procsup.c @@ -88,7 +88,7 @@ MiCreatePebOrTeb(IN PEPROCESS Process, *BaseAddress = 0; Status = MiInsertVadEx((PMMVAD)Vad, BaseAddress, - BYTES_TO_PAGES(Size), + Size, HighestAddress, PAGE_SIZE, MEM_TOP_DOWN);

6 years, 8 months

01/01: [SYSSETUP] Add the property sheet page and initialize it

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e8f8536f9be1d8c1dcefe… commit e8f8536f9be1d8c1dcefe8bdf51188d407c8251b Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Apr 22 14:26:11 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Apr 22 14:26:11 2018 +0200 [SYSSETUP] Add the property sheet page and initialize it - Add the wheel detection option strings. - Add the property sheet page and initialize the dialog. --- dll/win32/syssetup/lang/bg-BG.rc | 7 +++ dll/win32/syssetup/lang/cs-CZ.rc | 7 +++ dll/win32/syssetup/lang/da-DK.rc | 7 +++ dll/win32/syssetup/lang/de-DE.rc | 7 +++ dll/win32/syssetup/lang/el-GR.rc | 7 +++ dll/win32/syssetup/lang/en-US.rc | 7 +++ dll/win32/syssetup/lang/es-ES.rc | 7 +++ dll/win32/syssetup/lang/et-EE.rc | 7 +++ dll/win32/syssetup/lang/fi-FI.rc | 7 +++ dll/win32/syssetup/lang/fr-FR.rc | 7 +++ dll/win32/syssetup/lang/he-IL.rc | 7 +++ dll/win32/syssetup/lang/hu-HU.rc | 7 +++ dll/win32/syssetup/lang/id-ID.rc | 7 +++ dll/win32/syssetup/lang/it-IT.rc | 7 +++ dll/win32/syssetup/lang/ja-JP.rc | 7 +++ dll/win32/syssetup/lang/lt-LT.rc | 7 +++ dll/win32/syssetup/lang/nl-NL.rc | 7 +++ dll/win32/syssetup/lang/no-NO.rc | 7 +++ dll/win32/syssetup/lang/pl-PL.rc | 7 +++ dll/win32/syssetup/lang/pt-BR.rc | 7 +++ dll/win32/syssetup/lang/ro-RO.rc | 7 +++ dll/win32/syssetup/lang/ru-RU.rc | 7 +++ dll/win32/syssetup/lang/sk-SK.rc | 7 +++ dll/win32/syssetup/lang/sq-AL.rc | 7 +++ dll/win32/syssetup/lang/sv-SE.rc | 7 +++ dll/win32/syssetup/lang/th-TH.rc | 7 +++ dll/win32/syssetup/lang/tr-TR.rc | 7 +++ dll/win32/syssetup/lang/uk-UA.rc | 7 +++ dll/win32/syssetup/lang/zh-CN.rc | 7 +++ dll/win32/syssetup/lang/zh-TW.rc | 7 +++ dll/win32/syssetup/proppage.c | 95 ++++++++++++++++++++++++++++++++++++++-- dll/win32/syssetup/resource.h | 4 ++ 32 files changed, 305 insertions(+), 4 deletions(-) diff --git a/dll/win32/syssetup/lang/bg-BG.rc b/dll/win32/syssetup/lang/bg-BG.rc index 8182f53a85..247332e9a3 100644 --- a/dll/win32/syssetup/lang/bg-BG.rc +++ b/dll/win32/syssetup/lang/bg-BG.rc @@ -210,3 +210,10 @@ BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" IDS_COMMONFILES "Общи файлове" END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "Detection disabled" + IDS_LOOKFORWHEEL "Look for wheel" + IDS_ASSUMEPRESENT "Assume wheel is present" +END diff --git a/dll/win32/syssetup/lang/cs-CZ.rc b/dll/win32/syssetup/lang/cs-CZ.rc index 120defd98b..d5f230d3ae 100644 --- a/dll/win32/syssetup/lang/cs-CZ.rc +++ b/dll/win32/syssetup/lang/cs-CZ.rc @@ -216,3 +216,10 @@ BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" IDS_COMMONFILES "Common Files" END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "Detection disabled" + IDS_LOOKFORWHEEL "Look for wheel" + IDS_ASSUMEPRESENT "Assume wheel is present" +END diff --git a/dll/win32/syssetup/lang/da-DK.rc b/dll/win32/syssetup/lang/da-DK.rc index 949fbaf3b4..f6c10a6898 100644 --- a/dll/win32/syssetup/lang/da-DK.rc +++ b/dll/win32/syssetup/lang/da-DK.rc @@ -229,3 +229,10 @@ BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Programmer" IDS_COMMONFILES "Common Files" END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "Detection disabled" + IDS_LOOKFORWHEEL "Look for wheel" + IDS_ASSUMEPRESENT "Assume wheel is present" +END diff --git a/dll/win32/syssetup/lang/de-DE.rc b/dll/win32/syssetup/lang/de-DE.rc index 944517504c..b9c32deca3 100644 --- a/dll/win32/syssetup/lang/de-DE.rc +++ b/dll/win32/syssetup/lang/de-DE.rc @@ -210,3 +210,10 @@ BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Programme" IDS_COMMONFILES "Gemeinsame Dateien" END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "Erkennung deaktiviert" + IDS_LOOKFORWHEEL "Rad suchen" + IDS_ASSUMEPRESENT "Annehmen, dass Rad vorhanden ist" +END diff --git a/dll/win32/syssetup/lang/el-GR.rc b/dll/win32/syssetup/lang/el-GR.rc index 7b2eddaf1b..03f53ca214 100644 --- a/dll/win32/syssetup/lang/el-GR.rc +++ b/dll/win32/syssetup/lang/el-GR.rc @@ -210,3 +210,10 @@ BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" IDS_COMMONFILES "Common Files" END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "Detection disabled" + IDS_LOOKFORWHEEL "Look for wheel" + IDS_ASSUMEPRESENT "Assume wheel is present" +END diff --git a/dll/win32/syssetup/lang/en-US.rc b/dll/win32/syssetup/lang/en-US.rc index 8142e80013..f131e0a6a4 100644 --- a/dll/win32/syssetup/lang/en-US.rc +++ b/dll/win32/syssetup/lang/en-US.rc @@ -230,3 +230,10 @@ BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" IDS_COMMONFILES "Common Files" END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "Detection disabled" + IDS_LOOKFORWHEEL "Look for wheel" + IDS_ASSUMEPRESENT "Assume wheel is present" +END diff --git a/dll/win32/syssetup/lang/es-ES.rc b/dll/win32/syssetup/lang/es-ES.rc index 8112307dc1..25081b012c 100644 --- a/dll/win32/syssetup/lang/es-ES.rc +++ b/dll/win32/syssetup/lang/es-ES.rc @@ -211,3 +211,10 @@ BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Archivos de programa" IDS_COMMONFILES "Archivos comunes" END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "Detection disabled" + IDS_LOOKFORWHEEL "Look for wheel" + IDS_ASSUMEPRESENT "Assume wheel is present" +END diff --git a/dll/win32/syssetup/lang/et-EE.rc b/dll/win32/syssetup/lang/et-EE.rc index 91bb306305..5f1778f477 100644 --- a/dll/win32/syssetup/lang/et-EE.rc +++ b/dll/win32/syssetup/lang/et-EE.rc @@ -210,3 +210,10 @@ BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" IDS_COMMONFILES "Common Files" END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "Detection disabled" + IDS_LOOKFORWHEEL "Look for wheel" + IDS_ASSUMEPRESENT "Assume wheel is present" +END diff --git a/dll/win32/syssetup/lang/fi-FI.rc b/dll/win32/syssetup/lang/fi-FI.rc index f780fcd634..76ded8ab02 100644 --- a/dll/win32/syssetup/lang/fi-FI.rc +++ b/dll/win32/syssetup/lang/fi-FI.rc @@ -229,3 +229,10 @@ BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" IDS_COMMONFILES "Common Files" END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "Detection disabled" + IDS_LOOKFORWHEEL "Look for wheel" + IDS_ASSUMEPRESENT "Assume wheel is present" +END diff --git a/dll/win32/syssetup/lang/fr-FR.rc b/dll/win32/syssetup/lang/fr-FR.rc index 33160812ac..124a71fa5d 100644 --- a/dll/win32/syssetup/lang/fr-FR.rc +++ b/dll/win32/syssetup/lang/fr-FR.rc @@ -210,3 +210,10 @@ BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" IDS_COMMONFILES "Fichiers communs" END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "Detection disabled" + IDS_LOOKFORWHEEL "Look for wheel" + IDS_ASSUMEPRESENT "Assume wheel is present" +END diff --git a/dll/win32/syssetup/lang/he-IL.rc b/dll/win32/syssetup/lang/he-IL.rc index ac46750e95..015396d16c 100644 --- a/dll/win32/syssetup/lang/he-IL.rc +++ b/dll/win32/syssetup/lang/he-IL.rc @@ -210,3 +210,10 @@ BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" IDS_COMMONFILES "Common Files" END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "Detection disabled" + IDS_LOOKFORWHEEL "Look for wheel" + IDS_ASSUMEPRESENT "Assume wheel is present" +END diff --git a/dll/win32/syssetup/lang/hu-HU.rc b/dll/win32/syssetup/lang/hu-HU.rc index b2c67f53bf..6a22058823 100644 --- a/dll/win32/syssetup/lang/hu-HU.rc +++ b/dll/win32/syssetup/lang/hu-HU.rc @@ -210,3 +210,10 @@ BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" IDS_COMMONFILES "Common Files" END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "Detection disabled" + IDS_LOOKFORWHEEL "Look for wheel" + IDS_ASSUMEPRESENT "Assume wheel is present" +END diff --git a/dll/win32/syssetup/lang/id-ID.rc b/dll/win32/syssetup/lang/id-ID.rc index 41c7efebad..41c8732398 100644 --- a/dll/win32/syssetup/lang/id-ID.rc +++ b/dll/win32/syssetup/lang/id-ID.rc @@ -210,3 +210,10 @@ BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" IDS_COMMONFILES "Common Files" END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "Detection disabled" + IDS_LOOKFORWHEEL "Look for wheel" + IDS_ASSUMEPRESENT "Assume wheel is present" +END diff --git a/dll/win32/syssetup/lang/it-IT.rc b/dll/win32/syssetup/lang/it-IT.rc index d3a900e07c..e5d5a758ce 100644 --- a/dll/win32/syssetup/lang/it-IT.rc +++ b/dll/win32/syssetup/lang/it-IT.rc @@ -210,3 +210,10 @@ BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Programmi" IDS_COMMONFILES "File comuni" END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "Detection disabled" + IDS_LOOKFORWHEEL "Look for wheel" + IDS_ASSUMEPRESENT "Assume wheel is present" +END diff --git a/dll/win32/syssetup/lang/ja-JP.rc b/dll/win32/syssetup/lang/ja-JP.rc index a2b4dff673..e38b38f634 100644 --- a/dll/win32/syssetup/lang/ja-JP.rc +++ b/dll/win32/syssetup/lang/ja-JP.rc @@ -210,3 +210,10 @@ BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" IDS_COMMONFILES "Common Files" END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "Detection disabled" + IDS_LOOKFORWHEEL "Look for wheel" + IDS_ASSUMEPRESENT "Assume wheel is present" +END diff --git a/dll/win32/syssetup/lang/lt-LT.rc b/dll/win32/syssetup/lang/lt-LT.rc index 1132687ebb..458ce0e8eb 100644 --- a/dll/win32/syssetup/lang/lt-LT.rc +++ b/dll/win32/syssetup/lang/lt-LT.rc @@ -229,3 +229,10 @@ BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" IDS_COMMONFILES "Common Files" END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "Detection disabled" + IDS_LOOKFORWHEEL "Look for wheel" + IDS_ASSUMEPRESENT "Assume wheel is present" +END diff --git a/dll/win32/syssetup/lang/nl-NL.rc b/dll/win32/syssetup/lang/nl-NL.rc index c7e2529dce..5b50e730d0 100644 --- a/dll/win32/syssetup/lang/nl-NL.rc +++ b/dll/win32/syssetup/lang/nl-NL.rc @@ -210,3 +210,10 @@ BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" IDS_COMMONFILES "Common Files" END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "Detection disabled" + IDS_LOOKFORWHEEL "Look for wheel" + IDS_ASSUMEPRESENT "Assume wheel is present" +END diff --git a/dll/win32/syssetup/lang/no-NO.rc b/dll/win32/syssetup/lang/no-NO.rc index 9730718c30..3c08e54fe3 100644 --- a/dll/win32/syssetup/lang/no-NO.rc +++ b/dll/win32/syssetup/lang/no-NO.rc @@ -210,3 +210,10 @@ BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Programfiler" IDS_COMMONFILES "Common Files" END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "Detection disabled" + IDS_LOOKFORWHEEL "Look for wheel" + IDS_ASSUMEPRESENT "Assume wheel is present" +END diff --git a/dll/win32/syssetup/lang/pl-PL.rc b/dll/win32/syssetup/lang/pl-PL.rc index a28d1fa440..36ae269013 100644 --- a/dll/win32/syssetup/lang/pl-PL.rc +++ b/dll/win32/syssetup/lang/pl-PL.rc @@ -210,3 +210,10 @@ BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" IDS_COMMONFILES "Common Files" END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "Detection disabled" + IDS_LOOKFORWHEEL "Look for wheel" + IDS_ASSUMEPRESENT "Assume wheel is present" +END diff --git a/dll/win32/syssetup/lang/pt-BR.rc b/dll/win32/syssetup/lang/pt-BR.rc index 58b35ba463..00a295385b 100644 --- a/dll/win32/syssetup/lang/pt-BR.rc +++ b/dll/win32/syssetup/lang/pt-BR.rc @@ -210,3 +210,10 @@ BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Arquivos de programas" IDS_COMMONFILES "Arquivos comuns" END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "Detection disabled" + IDS_LOOKFORWHEEL "Look for wheel" + IDS_ASSUMEPRESENT "Assume wheel is present" +END diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc index 7235f81c10..68ce3f96b1 100644 --- a/dll/win32/syssetup/lang/ro-RO.rc +++ b/dll/win32/syssetup/lang/ro-RO.rc @@ -219,3 +219,10 @@ BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Fișiere de program" IDS_COMMONFILES "Fișiere comune" END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "Detection disabled" + IDS_LOOKFORWHEEL "Look for wheel" + IDS_ASSUMEPRESENT "Assume wheel is present" +END diff --git a/dll/win32/syssetup/lang/ru-RU.rc b/dll/win32/syssetup/lang/ru-RU.rc index a57a28a188..e4a42080cc 100644 --- a/dll/win32/syssetup/lang/ru-RU.rc +++ b/dll/win32/syssetup/lang/ru-RU.rc @@ -212,3 +212,10 @@ BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" IDS_COMMONFILES "Common Files" END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "Detection disabled" + IDS_LOOKFORWHEEL "Look for wheel" + IDS_ASSUMEPRESENT "Assume wheel is present" +END diff --git a/dll/win32/syssetup/lang/sk-SK.rc b/dll/win32/syssetup/lang/sk-SK.rc index 152e1388be..3f550d3252 100644 --- a/dll/win32/syssetup/lang/sk-SK.rc +++ b/dll/win32/syssetup/lang/sk-SK.rc @@ -216,3 +216,10 @@ BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" IDS_COMMONFILES "Common Files" END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "Detection disabled" + IDS_LOOKFORWHEEL "Look for wheel" + IDS_ASSUMEPRESENT "Assume wheel is present" +END diff --git a/dll/win32/syssetup/lang/sq-AL.rc b/dll/win32/syssetup/lang/sq-AL.rc index 48b453a33d..37344c3d35 100644 --- a/dll/win32/syssetup/lang/sq-AL.rc +++ b/dll/win32/syssetup/lang/sq-AL.rc @@ -229,3 +229,10 @@ BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Dokumente Programi" IDS_COMMONFILES "Dokumente Zakonshëm" END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "Detection disabled" + IDS_LOOKFORWHEEL "Look for wheel" + IDS_ASSUMEPRESENT "Assume wheel is present" +END diff --git a/dll/win32/syssetup/lang/sv-SE.rc b/dll/win32/syssetup/lang/sv-SE.rc index 2d692e34e2..bece96b2cf 100644 --- a/dll/win32/syssetup/lang/sv-SE.rc +++ b/dll/win32/syssetup/lang/sv-SE.rc @@ -229,3 +229,10 @@ BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program" IDS_COMMONFILES "Delade filer" END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "Detection disabled" + IDS_LOOKFORWHEEL "Look for wheel" + IDS_ASSUMEPRESENT "Assume wheel is present" +END diff --git a/dll/win32/syssetup/lang/th-TH.rc b/dll/win32/syssetup/lang/th-TH.rc index 3fb5b3c4b9..de776455ed 100644 --- a/dll/win32/syssetup/lang/th-TH.rc +++ b/dll/win32/syssetup/lang/th-TH.rc @@ -229,3 +229,10 @@ BEGIN IDS_PROGRAMFILES "%SystemDrive%\\โปรแกรมไฟล์" IDS_COMMONFILES "Common Files" END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "Detection disabled" + IDS_LOOKFORWHEEL "Look for wheel" + IDS_ASSUMEPRESENT "Assume wheel is present" +END diff --git a/dll/win32/syssetup/lang/tr-TR.rc b/dll/win32/syssetup/lang/tr-TR.rc index 41c633c1a5..5f67923ef7 100644 --- a/dll/win32/syssetup/lang/tr-TR.rc +++ b/dll/win32/syssetup/lang/tr-TR.rc @@ -212,3 +212,10 @@ BEGIN IDS_PROGRAMFILES "%SystemDrive%\\İzlence Kütükleri" IDS_COMMONFILES "Ortak Kütükler" END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "Detection disabled" + IDS_LOOKFORWHEEL "Look for wheel" + IDS_ASSUMEPRESENT "Assume wheel is present" +END diff --git a/dll/win32/syssetup/lang/uk-UA.rc b/dll/win32/syssetup/lang/uk-UA.rc index f2c9f19941..06508a5bb9 100644 --- a/dll/win32/syssetup/lang/uk-UA.rc +++ b/dll/win32/syssetup/lang/uk-UA.rc @@ -218,3 +218,10 @@ BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" IDS_COMMONFILES "Common Files" END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "Detection disabled" + IDS_LOOKFORWHEEL "Look for wheel" + IDS_ASSUMEPRESENT "Assume wheel is present" +END diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc index 3617aba326..15133dcd89 100644 --- a/dll/win32/syssetup/lang/zh-CN.rc +++ b/dll/win32/syssetup/lang/zh-CN.rc @@ -215,3 +215,10 @@ BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" IDS_COMMONFILES "Common Files" END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "Detection disabled" + IDS_LOOKFORWHEEL "Look for wheel" + IDS_ASSUMEPRESENT "Assume wheel is present" +END diff --git a/dll/win32/syssetup/lang/zh-TW.rc b/dll/win32/syssetup/lang/zh-TW.rc index 9b9dbafceb..c4ca3f4d11 100644 --- a/dll/win32/syssetup/lang/zh-TW.rc +++ b/dll/win32/syssetup/lang/zh-TW.rc @@ -211,3 +211,10 @@ BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" IDS_COMMONFILES "Common Files" END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "Detection disabled" + IDS_LOOKFORWHEEL "Look for wheel" + IDS_ASSUMEPRESENT "Assume wheel is present" +END diff --git a/dll/win32/syssetup/proppage.c b/dll/win32/syssetup/proppage.c index fa2ee4a9b7..6cab3faab1 100644 --- a/dll/win32/syssetup/proppage.c +++ b/dll/win32/syssetup/proppage.c @@ -11,6 +11,8 @@ #define NDEBUG #include <debug.h> +DWORD MouseSampleRates[] = {20, 40, 60, 80, 100, 200}; + /* * @implemented @@ -77,8 +79,65 @@ LegacyDriverPropPageProvider( } +static +VOID +MouseOnDialogInit( + HWND hwndDlg, + LPARAM lParam) +{ + WCHAR szBuffer[64]; + UINT i; + + /* Add the sample rates */ + for (i = 0; i < ARRAYSIZE(MouseSampleRates); i++) + { + wsprintf(szBuffer, L"%lu", MouseSampleRates[i]); + SendDlgItemMessageW(hwndDlg, + IDC_PS2MOUSESAMPLERATE, + CB_ADDSTRING, + 0, + (LPARAM)szBuffer); + } + + /* Add the detection options */ + for (i = IDS_DETECTIONDISABLED; i <= IDS_ASSUMEPRESENT; i++) + { + LoadStringW(hDllInstance, i, szBuffer, ARRAYSIZE(szBuffer)); + SendDlgItemMessageW(hwndDlg, + IDC_PS2MOUSEWHEEL, + CB_ADDSTRING, + 0, + (LPARAM)szBuffer); + } + +} + + +static +INT_PTR +CALLBACK +MouseDlgProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + DPRINT("MouseDlgProc\n"); + + switch (uMsg) + { + case WM_INITDIALOG: + MouseOnDialogInit(hwndDlg, lParam); + return TRUE; + } + + return FALSE; +} + + + /* - * @unimplemented + * @implemented */ BOOL WINAPI @@ -87,10 +146,38 @@ PS2MousePropPageProvider( _In_ LPFNADDPROPSHEETPAGE lpfnAddPropSheetPageProc, _In_ LPARAM lParam) { - DPRINT1("PS2MousePropPageProvider(%p %p %lx)\n", + PROPSHEETPAGEW PropSheetPage; + HPROPSHEETPAGE hPropSheetPage; + + DPRINT("PS2MousePropPageProvider(%p %p %lx)\n", lpPropSheetPageRequest, lpfnAddPropSheetPageProc, lParam); - UNIMPLEMENTED; - return FALSE; + + if (lpPropSheetPageRequest->PageRequested != SPPSR_ENUM_ADV_DEVICE_PROPERTIES) + return FALSE; + + PropSheetPage.dwSize = sizeof(PROPSHEETPAGEW); + PropSheetPage.dwFlags = 0; + PropSheetPage.hInstance = hDllInstance; + PropSheetPage.pszTemplate = MAKEINTRESOURCE(IDD_PS2MOUSEPROPERTIES); + PropSheetPage.pfnDlgProc = MouseDlgProc; + PropSheetPage.lParam = 0; + PropSheetPage.pfnCallback = NULL; + + hPropSheetPage = CreatePropertySheetPageW(&PropSheetPage); + if (hPropSheetPage == NULL) + { + DPRINT1("CreatePropertySheetPageW() failed!\n"); + return FALSE; + } + + if (!(*lpfnAddPropSheetPageProc)(hPropSheetPage, lParam)) + { + DPRINT1("lpfnAddPropSheetPageProc() failed!\n"); + DestroyPropertySheetPage(hPropSheetPage); + return FALSE; + } + + return TRUE; } diff --git a/dll/win32/syssetup/resource.h b/dll/win32/syssetup/resource.h index 8776eea5e5..c9dcb3a0aa 100644 --- a/dll/win32/syssetup/resource.h +++ b/dll/win32/syssetup/resource.h @@ -136,4 +136,8 @@ #define IDS_PROGRAMFILES 3600 #define IDS_COMMONFILES 3601 +#define IDS_DETECTIONDISABLED 3700 +#define IDS_LOOKFORWHEEL 3701 +#define IDS_ASSUMEPRESENT 3702 + #define IDR_GPL 4000

6 years, 8 months

01/01: [SYSSETUP] Add the PS/2-Mouse property page dialog

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=183a4bfd9cdeacc9caea8… commit 183a4bfd9cdeacc9caea80f0863dbb0bede42188 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Apr 22 11:59:47 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Apr 22 11:59:47 2018 +0200 [SYSSETUP] Add the PS/2-Mouse property page dialog --- dll/win32/syssetup/lang/bg-BG.rc | 18 ++++++++++++++++++ dll/win32/syssetup/lang/cs-CZ.rc | 18 ++++++++++++++++++ dll/win32/syssetup/lang/da-DK.rc | 18 ++++++++++++++++++ dll/win32/syssetup/lang/de-DE.rc | 18 ++++++++++++++++++ dll/win32/syssetup/lang/el-GR.rc | 18 ++++++++++++++++++ dll/win32/syssetup/lang/en-US.rc | 18 ++++++++++++++++++ dll/win32/syssetup/lang/es-ES.rc | 18 ++++++++++++++++++ dll/win32/syssetup/lang/et-EE.rc | 18 ++++++++++++++++++ dll/win32/syssetup/lang/fi-FI.rc | 18 ++++++++++++++++++ dll/win32/syssetup/lang/fr-FR.rc | 18 ++++++++++++++++++ dll/win32/syssetup/lang/he-IL.rc | 18 ++++++++++++++++++ dll/win32/syssetup/lang/hu-HU.rc | 18 ++++++++++++++++++ dll/win32/syssetup/lang/id-ID.rc | 18 ++++++++++++++++++ dll/win32/syssetup/lang/it-IT.rc | 18 ++++++++++++++++++ dll/win32/syssetup/lang/ja-JP.rc | 18 ++++++++++++++++++ dll/win32/syssetup/lang/lt-LT.rc | 18 ++++++++++++++++++ dll/win32/syssetup/lang/nl-NL.rc | 18 ++++++++++++++++++ dll/win32/syssetup/lang/no-NO.rc | 18 ++++++++++++++++++ dll/win32/syssetup/lang/pl-PL.rc | 18 ++++++++++++++++++ dll/win32/syssetup/lang/pt-BR.rc | 18 ++++++++++++++++++ dll/win32/syssetup/lang/ro-RO.rc | 18 ++++++++++++++++++ dll/win32/syssetup/lang/ru-RU.rc | 18 ++++++++++++++++++ dll/win32/syssetup/lang/sk-SK.rc | 18 ++++++++++++++++++ dll/win32/syssetup/lang/sq-AL.rc | 18 ++++++++++++++++++ dll/win32/syssetup/lang/sv-SE.rc | 18 ++++++++++++++++++ dll/win32/syssetup/lang/th-TH.rc | 18 ++++++++++++++++++ dll/win32/syssetup/lang/tr-TR.rc | 18 ++++++++++++++++++ dll/win32/syssetup/lang/uk-UA.rc | 18 ++++++++++++++++++ dll/win32/syssetup/lang/zh-CN.rc | 18 ++++++++++++++++++ dll/win32/syssetup/lang/zh-TW.rc | 18 ++++++++++++++++++ dll/win32/syssetup/resource.h | 8 ++++++++ 31 files changed, 548 insertions(+) diff --git a/dll/win32/syssetup/lang/bg-BG.rc b/dll/win32/syssetup/lang/bg-BG.rc index 665bf8e6ad..8182f53a85 100644 --- a/dll/win32/syssetup/lang/bg-BG.rc +++ b/dll/win32/syssetup/lang/bg-BG.rc @@ -131,6 +131,24 @@ BEGIN CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END +IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 + LTEXT "reports per second", -1, 169, 35, 76, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 + LTEXT "packets", -1, 169, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 + AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 +END + STRINGTABLE BEGIN IDS_ACKTITLE "Благодарности" diff --git a/dll/win32/syssetup/lang/cs-CZ.rc b/dll/win32/syssetup/lang/cs-CZ.rc index e144877ce9..120defd98b 100644 --- a/dll/win32/syssetup/lang/cs-CZ.rc +++ b/dll/win32/syssetup/lang/cs-CZ.rc @@ -137,6 +137,24 @@ BEGIN CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END +IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 + LTEXT "reports per second", -1, 169, 35, 76, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 + LTEXT "packets", -1, 169, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 + AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 +END + STRINGTABLE BEGIN IDS_ACKTITLE "Poděkování" diff --git a/dll/win32/syssetup/lang/da-DK.rc b/dll/win32/syssetup/lang/da-DK.rc index b31e5e0f03..949fbaf3b4 100644 --- a/dll/win32/syssetup/lang/da-DK.rc +++ b/dll/win32/syssetup/lang/da-DK.rc @@ -150,6 +150,24 @@ BEGIN CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END +IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 + LTEXT "reports per second", -1, 169, 35, 76, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 + LTEXT "packets", -1, 169, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 + AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 +END + STRINGTABLE BEGIN IDS_ACKTITLE "Acknowledgements" diff --git a/dll/win32/syssetup/lang/de-DE.rc b/dll/win32/syssetup/lang/de-DE.rc index 5102afa80c..944517504c 100644 --- a/dll/win32/syssetup/lang/de-DE.rc +++ b/dll/win32/syssetup/lang/de-DE.rc @@ -131,6 +131,24 @@ BEGIN CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END +IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Erweiterte Einstellungen" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "&Abtastrate:", -1, 27, 35, 90, 8 + LTEXT "-mal pro Sekunde", -1, 169, 35, 76, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Raderkennung:", -1, 27, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Eingabepufferlänge:", -1, 27, 75, 90, 8 + LTEXT "Pakete", -1, 169, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 + AUTOCHECKBOX "&Schnelle Initialisierung", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "S&tandardwerte", IDC_PS2MOUSEDEFAULTS, 188, 188, 57, 14 +END + STRINGTABLE BEGIN IDS_ACKTITLE "Danksagungen" diff --git a/dll/win32/syssetup/lang/el-GR.rc b/dll/win32/syssetup/lang/el-GR.rc index 25c89a7bcc..7b2eddaf1b 100644 --- a/dll/win32/syssetup/lang/el-GR.rc +++ b/dll/win32/syssetup/lang/el-GR.rc @@ -131,6 +131,24 @@ BEGIN CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END +IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 + LTEXT "reports per second", -1, 169, 35, 76, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 + LTEXT "packets", -1, 169, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 + AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 +END + STRINGTABLE BEGIN IDS_ACKTITLE "Αναγνωρίσεις" diff --git a/dll/win32/syssetup/lang/en-US.rc b/dll/win32/syssetup/lang/en-US.rc index a2459de107..8142e80013 100644 --- a/dll/win32/syssetup/lang/en-US.rc +++ b/dll/win32/syssetup/lang/en-US.rc @@ -150,6 +150,24 @@ BEGIN CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END +IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 + LTEXT "reports per second", -1, 169, 35, 76, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 + LTEXT "packets", -1, 169, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 + AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 +END + STRINGTABLE BEGIN IDS_ACKTITLE "Acknowledgements" diff --git a/dll/win32/syssetup/lang/es-ES.rc b/dll/win32/syssetup/lang/es-ES.rc index 1820b59d2b..8112307dc1 100644 --- a/dll/win32/syssetup/lang/es-ES.rc +++ b/dll/win32/syssetup/lang/es-ES.rc @@ -132,6 +132,24 @@ BEGIN CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END +IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 + LTEXT "reports per second", -1, 169, 35, 76, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 + LTEXT "packets", -1, 169, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 + AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 +END + STRINGTABLE BEGIN IDS_ACKTITLE "Agradecimientos" diff --git a/dll/win32/syssetup/lang/et-EE.rc b/dll/win32/syssetup/lang/et-EE.rc index 8782113c6a..91bb306305 100644 --- a/dll/win32/syssetup/lang/et-EE.rc +++ b/dll/win32/syssetup/lang/et-EE.rc @@ -131,6 +131,24 @@ BEGIN CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END +IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 + LTEXT "reports per second", -1, 169, 35, 76, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 + LTEXT "packets", -1, 169, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 + AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 +END + STRINGTABLE BEGIN IDS_ACKTITLE "Tänud" diff --git a/dll/win32/syssetup/lang/fi-FI.rc b/dll/win32/syssetup/lang/fi-FI.rc index 5fc3c8af13..f780fcd634 100644 --- a/dll/win32/syssetup/lang/fi-FI.rc +++ b/dll/win32/syssetup/lang/fi-FI.rc @@ -150,6 +150,24 @@ BEGIN CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END +IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 + LTEXT "reports per second", -1, 169, 35, 76, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 + LTEXT "packets", -1, 169, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 + AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 +END + STRINGTABLE BEGIN IDS_ACKTITLE "Acknowledgements" diff --git a/dll/win32/syssetup/lang/fr-FR.rc b/dll/win32/syssetup/lang/fr-FR.rc index fbd3f76383..33160812ac 100644 --- a/dll/win32/syssetup/lang/fr-FR.rc +++ b/dll/win32/syssetup/lang/fr-FR.rc @@ -131,6 +131,24 @@ BEGIN CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END +IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 + LTEXT "reports per second", -1, 169, 35, 76, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 + LTEXT "packets", -1, 169, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 + AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 +END + STRINGTABLE BEGIN IDS_ACKTITLE "Remerciements" diff --git a/dll/win32/syssetup/lang/he-IL.rc b/dll/win32/syssetup/lang/he-IL.rc index ec7b1b5ea4..ac46750e95 100644 --- a/dll/win32/syssetup/lang/he-IL.rc +++ b/dll/win32/syssetup/lang/he-IL.rc @@ -131,6 +131,24 @@ BEGIN CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END +IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 + LTEXT "reports per second", -1, 169, 35, 76, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 + LTEXT "packets", -1, 169, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 + AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 +END + STRINGTABLE BEGIN IDS_ACKTITLE "תודות" diff --git a/dll/win32/syssetup/lang/hu-HU.rc b/dll/win32/syssetup/lang/hu-HU.rc index 4e7d7b12f3..b2c67f53bf 100644 --- a/dll/win32/syssetup/lang/hu-HU.rc +++ b/dll/win32/syssetup/lang/hu-HU.rc @@ -131,6 +131,24 @@ BEGIN CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END +IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 + LTEXT "reports per second", -1, 169, 35, 76, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 + LTEXT "packets", -1, 169, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 + AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 +END + STRINGTABLE BEGIN IDS_ACKTITLE "Köszönetnyílvánítás" diff --git a/dll/win32/syssetup/lang/id-ID.rc b/dll/win32/syssetup/lang/id-ID.rc index 02cda34d17..41c7efebad 100644 --- a/dll/win32/syssetup/lang/id-ID.rc +++ b/dll/win32/syssetup/lang/id-ID.rc @@ -131,6 +131,24 @@ BEGIN CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END +IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 + LTEXT "reports per second", -1, 169, 35, 76, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 + LTEXT "packets", -1, 169, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 + AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 +END + STRINGTABLE BEGIN IDS_ACKTITLE "Pengakuan" diff --git a/dll/win32/syssetup/lang/it-IT.rc b/dll/win32/syssetup/lang/it-IT.rc index 5fb089f248..d3a900e07c 100644 --- a/dll/win32/syssetup/lang/it-IT.rc +++ b/dll/win32/syssetup/lang/it-IT.rc @@ -131,6 +131,24 @@ BEGIN CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END +IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 + LTEXT "reports per second", -1, 169, 35, 76, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 + LTEXT "packets", -1, 169, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 + AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 +END + STRINGTABLE BEGIN IDS_ACKTITLE "Riconoscimenti" diff --git a/dll/win32/syssetup/lang/ja-JP.rc b/dll/win32/syssetup/lang/ja-JP.rc index 33c5a1187e..a2b4dff673 100644 --- a/dll/win32/syssetup/lang/ja-JP.rc +++ b/dll/win32/syssetup/lang/ja-JP.rc @@ -131,6 +131,24 @@ BEGIN CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END +IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 + LTEXT "reports per second", -1, 169, 35, 76, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 + LTEXT "packets", -1, 169, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 + AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 +END + STRINGTABLE BEGIN IDS_ACKTITLE "承認" diff --git a/dll/win32/syssetup/lang/lt-LT.rc b/dll/win32/syssetup/lang/lt-LT.rc index dc5b9cf893..1132687ebb 100644 --- a/dll/win32/syssetup/lang/lt-LT.rc +++ b/dll/win32/syssetup/lang/lt-LT.rc @@ -150,6 +150,24 @@ BEGIN CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END +IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 + LTEXT "reports per second", -1, 169, 35, 76, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 + LTEXT "packets", -1, 169, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 + AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 +END + STRINGTABLE BEGIN IDS_ACKTITLE "Acknowledgements" diff --git a/dll/win32/syssetup/lang/nl-NL.rc b/dll/win32/syssetup/lang/nl-NL.rc index a5f15c97c7..c7e2529dce 100644 --- a/dll/win32/syssetup/lang/nl-NL.rc +++ b/dll/win32/syssetup/lang/nl-NL.rc @@ -131,6 +131,24 @@ BEGIN CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END +IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 + LTEXT "reports per second", -1, 169, 35, 76, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 + LTEXT "packets", -1, 169, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 + AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 +END + STRINGTABLE BEGIN IDS_ACKTITLE "Acknowledgements" diff --git a/dll/win32/syssetup/lang/no-NO.rc b/dll/win32/syssetup/lang/no-NO.rc index 2e83eb0ca9..9730718c30 100644 --- a/dll/win32/syssetup/lang/no-NO.rc +++ b/dll/win32/syssetup/lang/no-NO.rc @@ -131,6 +131,24 @@ BEGIN CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END +IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 + LTEXT "reports per second", -1, 169, 35, 76, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 + LTEXT "packets", -1, 169, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 + AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 +END + STRINGTABLE BEGIN IDS_ACKTITLE "Annerkjennelser" diff --git a/dll/win32/syssetup/lang/pl-PL.rc b/dll/win32/syssetup/lang/pl-PL.rc index 3c461c668e..a28d1fa440 100644 --- a/dll/win32/syssetup/lang/pl-PL.rc +++ b/dll/win32/syssetup/lang/pl-PL.rc @@ -131,6 +131,24 @@ BEGIN CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END +IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 + LTEXT "reports per second", -1, 169, 35, 76, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 + LTEXT "packets", -1, 169, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 + AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 +END + STRINGTABLE BEGIN IDS_ACKTITLE "Podziękowania" diff --git a/dll/win32/syssetup/lang/pt-BR.rc b/dll/win32/syssetup/lang/pt-BR.rc index 7749c2f928..58b35ba463 100644 --- a/dll/win32/syssetup/lang/pt-BR.rc +++ b/dll/win32/syssetup/lang/pt-BR.rc @@ -131,6 +131,24 @@ BEGIN CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END +IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 + LTEXT "reports per second", -1, 169, 35, 76, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 + LTEXT "packets", -1, 169, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 + AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 +END + STRINGTABLE BEGIN IDS_ACKTITLE "Agradecimentos" diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc index ffe2b013db..7235f81c10 100644 --- a/dll/win32/syssetup/lang/ro-RO.rc +++ b/dll/win32/syssetup/lang/ro-RO.rc @@ -140,6 +140,24 @@ BEGIN CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END +IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 + LTEXT "reports per second", -1, 169, 35, 76, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 + LTEXT "packets", -1, 169, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 + AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 +END + STRINGTABLE BEGIN IDS_ACKTITLE "Conștientizări" diff --git a/dll/win32/syssetup/lang/ru-RU.rc b/dll/win32/syssetup/lang/ru-RU.rc index 2de6f3d147..a57a28a188 100644 --- a/dll/win32/syssetup/lang/ru-RU.rc +++ b/dll/win32/syssetup/lang/ru-RU.rc @@ -133,6 +133,24 @@ BEGIN CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END +IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 + LTEXT "reports per second", -1, 169, 35, 76, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 + LTEXT "packets", -1, 169, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 + AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 +END + STRINGTABLE BEGIN IDS_ACKTITLE "Подтверждение лицензии" diff --git a/dll/win32/syssetup/lang/sk-SK.rc b/dll/win32/syssetup/lang/sk-SK.rc index f5563c56f8..152e1388be 100644 --- a/dll/win32/syssetup/lang/sk-SK.rc +++ b/dll/win32/syssetup/lang/sk-SK.rc @@ -137,6 +137,24 @@ BEGIN CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END +IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 + LTEXT "reports per second", -1, 169, 35, 76, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 + LTEXT "packets", -1, 169, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 + AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 +END + STRINGTABLE BEGIN IDS_ACKTITLE "Poďakovanie" diff --git a/dll/win32/syssetup/lang/sq-AL.rc b/dll/win32/syssetup/lang/sq-AL.rc index e5e20ec84d..48b453a33d 100644 --- a/dll/win32/syssetup/lang/sq-AL.rc +++ b/dll/win32/syssetup/lang/sq-AL.rc @@ -150,6 +150,24 @@ BEGIN CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END +IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 + LTEXT "reports per second", -1, 169, 35, 76, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 + LTEXT "packets", -1, 169, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 + AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 +END + STRINGTABLE BEGIN IDS_ACKTITLE "Falenderime" diff --git a/dll/win32/syssetup/lang/sv-SE.rc b/dll/win32/syssetup/lang/sv-SE.rc index e583d35a33..2d692e34e2 100644 --- a/dll/win32/syssetup/lang/sv-SE.rc +++ b/dll/win32/syssetup/lang/sv-SE.rc @@ -150,6 +150,24 @@ BEGIN CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END +IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 + LTEXT "reports per second", -1, 169, 35, 76, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 + LTEXT "packets", -1, 169, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 + AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 +END + STRINGTABLE BEGIN IDS_ACKTITLE "Acknowledgements" diff --git a/dll/win32/syssetup/lang/th-TH.rc b/dll/win32/syssetup/lang/th-TH.rc index de15cf770f..3fb5b3c4b9 100644 --- a/dll/win32/syssetup/lang/th-TH.rc +++ b/dll/win32/syssetup/lang/th-TH.rc @@ -150,6 +150,24 @@ BEGIN CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END +IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 + LTEXT "reports per second", -1, 169, 35, 76, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 + LTEXT "packets", -1, 169, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 + AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 +END + STRINGTABLE BEGIN IDS_ACKTITLE "Acknowledgements" diff --git a/dll/win32/syssetup/lang/tr-TR.rc b/dll/win32/syssetup/lang/tr-TR.rc index 09d30ee522..41c633c1a5 100644 --- a/dll/win32/syssetup/lang/tr-TR.rc +++ b/dll/win32/syssetup/lang/tr-TR.rc @@ -133,6 +133,24 @@ BEGIN CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END +IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 + LTEXT "reports per second", -1, 169, 35, 76, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 + LTEXT "packets", -1, 169, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 + AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 +END + STRINGTABLE BEGIN IDS_ACKTITLE "Teşekkürler" diff --git a/dll/win32/syssetup/lang/uk-UA.rc b/dll/win32/syssetup/lang/uk-UA.rc index 558b1ef63b..f2c9f19941 100644 --- a/dll/win32/syssetup/lang/uk-UA.rc +++ b/dll/win32/syssetup/lang/uk-UA.rc @@ -139,6 +139,24 @@ BEGIN CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END +IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 + LTEXT "reports per second", -1, 169, 35, 76, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 + LTEXT "packets", -1, 169, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 + AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 +END + STRINGTABLE BEGIN IDS_ACKTITLE "Подяки" diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc index 21d81da21c..3617aba326 100644 --- a/dll/win32/syssetup/lang/zh-CN.rc +++ b/dll/win32/syssetup/lang/zh-CN.rc @@ -133,6 +133,24 @@ BEGIN CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END +IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 + LTEXT "reports per second", -1, 169, 35, 54, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 + LTEXT "packets", -1, 169, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 + AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 72, 10 + PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 +END + STRINGTABLE BEGIN IDS_ACKTITLE "致谢" diff --git a/dll/win32/syssetup/lang/zh-TW.rc b/dll/win32/syssetup/lang/zh-TW.rc index bfa21a5d7a..9b9dbafceb 100644 --- a/dll/win32/syssetup/lang/zh-TW.rc +++ b/dll/win32/syssetup/lang/zh-TW.rc @@ -133,6 +133,24 @@ BEGIN CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 END +IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Advanced Settings" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 + LTEXT "reports per second", -1, 169, 35, 76, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 + LTEXT "packets", -1, 169, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 + AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 72, 10 + PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 +END + STRINGTABLE BEGIN IDS_ACKTITLE "致謝" diff --git a/dll/win32/syssetup/resource.h b/dll/win32/syssetup/resource.h index 90d931330e..8776eea5e5 100644 --- a/dll/win32/syssetup/resource.h +++ b/dll/win32/syssetup/resource.h @@ -79,6 +79,14 @@ #define IDC_STATUSLABEL 2201 #define IDC_STATUSPROGRESS 2202 +#define IDD_PS2MOUSEPROPERTIES 2300 +#define IDC_PS2MOUSESAMPLERATE 2301 +#define IDC_PS2MOUSEWHEEL 2302 +#define IDC_PS2MOUSEINPUTLEN 2303 +#define IDC_PS2MOUSEINPUTUPDN 2304 +#define IDC_PS2MOUSEFASTINIT 2305 +#define IDC_PS2MOUSEDEFAULTS 2306 + #define IDS_ACKTITLE 3010 #define IDS_ACKSUBTITLE 3011

6 years, 8 months

← Newer
1
2
3
4
5
6
7
8
9
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2018