Ros-diffs May 2022

ros-diffs@reactos.org

31 participants
165 discussions

[reactos] 02/07: [NTOS:SE] SepCaptureAcl(): Add missing validation of the captured ACL (#4523)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=389a2da7ff94cfcefff32… commit 389a2da7ff94cfcefff3220797f61311519d6fa0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu May 19 23:43:18 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon May 23 19:30:34 2022 +0200 [NTOS:SE] SepCaptureAcl(): Add missing validation of the captured ACL (#4523) - The ACL is however not validated when the function is called within kernel mode and no capture is actually being done. - Simplify aspects of the function (returning early when possible). --- ntoskrnl/se/acl.c | 85 ++++++++++++++++++++++++++++------------------------- ntoskrnl/se/token.c | 2 +- 2 files changed, 46 insertions(+), 41 deletions(-) diff --git a/ntoskrnl/se/acl.c b/ntoskrnl/se/acl.c index e160b34c429..d7c53d4ac17 100644 --- a/ntoskrnl/se/acl.c +++ b/ntoskrnl/se/acl.c @@ -329,15 +329,15 @@ SepCreateImpersonationTokenDacl( * * @param[in] AccessMode * Processor level access mode. The processor mode determines how - * are the input arguments probed. + * the input arguments are probed. * * @param[in] PoolType * Pool type for new captured ACL for creation. The pool type determines - * how the ACL data should reside in the pool memory. + * in which memory pool the ACL data should reside. * * @param[in] CaptureIfKernel - * If set to TRUE and the processor access mode being KernelMode, we're - * capturing an ACL directly in the kernel. Otherwise we're capturing + * If set to TRUE and the processor access mode being KernelMode, we are + * capturing an ACL directly in the kernel. Otherwise we are capturing * within a kernel mode driver. * * @param[out] CapturedAcl @@ -357,11 +357,19 @@ SepCaptureAcl( _Out_ PACL *CapturedAcl) { PACL NewAcl; - ULONG AclSize = 0; - NTSTATUS Status = STATUS_SUCCESS; + ULONG AclSize; PAGED_CODE(); + /* If in kernel mode and we do not capture, just + * return the given ACL and don't validate it. */ + if ((AccessMode == KernelMode) && !CaptureIfKernel) + { + *CapturedAcl = InputAcl; + return STATUS_SUCCESS; + } + + /* Otherwise, capture and validate the ACL, depending on the access mode */ if (AccessMode != KernelMode) { _SEH2_TRY @@ -381,59 +389,56 @@ SepCaptureAcl( } _SEH2_END; + /* Validate the minimal size an ACL can have */ + if (AclSize < sizeof(ACL)) + return STATUS_INVALID_ACL; + NewAcl = ExAllocatePoolWithTag(PoolType, AclSize, TAG_ACL); - if (NewAcl != NULL) - { - _SEH2_TRY - { - RtlCopyMemory(NewAcl, - InputAcl, - AclSize); + if (!NewAcl) + return STATUS_INSUFFICIENT_RESOURCES; - *CapturedAcl = NewAcl; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Free the ACL and return the exception code */ - ExFreePoolWithTag(NewAcl, TAG_ACL); - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - _SEH2_END; + _SEH2_TRY + { + RtlCopyMemory(NewAcl, InputAcl, AclSize); } - else + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = STATUS_INSUFFICIENT_RESOURCES; + /* Free the ACL and return the exception code */ + ExFreePoolWithTag(NewAcl, TAG_ACL); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } - } - else if (!CaptureIfKernel) - { - *CapturedAcl = InputAcl; + _SEH2_END; } else { AclSize = InputAcl->AclSize; + /* Validate the minimal size an ACL can have */ + if (AclSize < sizeof(ACL)) + return STATUS_INVALID_ACL; + NewAcl = ExAllocatePoolWithTag(PoolType, AclSize, TAG_ACL); + if (!NewAcl) + return STATUS_INSUFFICIENT_RESOURCES; - if (NewAcl != NULL) - { - RtlCopyMemory(NewAcl, - InputAcl, - AclSize); + RtlCopyMemory(NewAcl, InputAcl, AclSize); + } - *CapturedAcl = NewAcl; - } - else - { - Status = STATUS_INSUFFICIENT_RESOURCES; - } + /* Validate the captured ACL */ + if (!RtlValidAcl(NewAcl)) + { + /* Free the ACL and fail */ + ExFreePoolWithTag(NewAcl, TAG_ACL); + return STATUS_INVALID_ACL; } - return Status; + /* It's valid, return it */ + *CapturedAcl = NewAcl; + return STATUS_SUCCESS; } /** diff --git a/ntoskrnl/se/token.c b/ntoskrnl/se/token.c index 1415e36009d..f215f4c1fe2 100644 --- a/ntoskrnl/se/token.c +++ b/ntoskrnl/se/token.c @@ -4518,7 +4518,7 @@ NtSetInformationToken( { PACL CapturedAcl; - /* Capture and copy the dacl */ + /* Capture, validate, and copy the DACL */ Status = SepCaptureAcl(InputAcl, PreviousMode, PagedPool,

2 years, 7 months

[reactos] 01/07: [NTOS:SE] SeValidSecurityDescriptor(): Add missing validation aspects (#4523)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a0bcf90f35401d1b9902d… commit a0bcf90f35401d1b9902d1d06ac2c1cf40c0a442 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu May 19 23:19:04 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon May 23 19:30:33 2022 +0200 [NTOS:SE] SeValidSecurityDescriptor(): Add missing validation aspects (#4523) - Add extra bounds checks. - Add missing RtlValidAcl() calls for verifying the DACL and SACL. --- ntoskrnl/se/sd.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 46 insertions(+), 8 deletions(-) diff --git a/ntoskrnl/se/sd.c b/ntoskrnl/se/sd.c index 56f013bf446..db3f5a5c440 100644 --- a/ntoskrnl/se/sd.c +++ b/ntoskrnl/se/sd.c @@ -1066,6 +1066,15 @@ SeValidSecurityDescriptor( return FALSE; } + /* Ensure the Owner SID is within the bounds of the security descriptor */ + if ((SecurityDescriptor->Owner > Length) || + (Length - SecurityDescriptor->Owner < sizeof(SID))) + { + DPRINT1("Owner SID not within bounds\n"); + return FALSE; + } + + /* Reference it */ Sid = (PISID)((ULONG_PTR)SecurityDescriptor + SecurityDescriptor->Owner); if (Sid->Revision != SID_REVISION) { @@ -1073,6 +1082,7 @@ SeValidSecurityDescriptor( return FALSE; } + // NOTE: Same as SeLengthSid(Sid); but doesn't use hardcoded values. SdLength += (sizeof(SID) + (Sid->SubAuthorityCount - 1) * sizeof(ULONG)); if (Length < SdLength) { @@ -1089,6 +1099,15 @@ SeValidSecurityDescriptor( return FALSE; } + /* Ensure the Group SID is within the bounds of the security descriptor */ + if ((SecurityDescriptor->Group > Length) || + (Length - SecurityDescriptor->Group < sizeof(SID))) + { + DPRINT1("Group SID not within bounds\n"); + return FALSE; + } + + /* Reference it */ Sid = (PSID)((ULONG_PTR)SecurityDescriptor + SecurityDescriptor->Group); if (Sid->Revision != SID_REVISION) { @@ -1096,6 +1115,7 @@ SeValidSecurityDescriptor( return FALSE; } + // NOTE: Same as SeLengthSid(Sid); but doesn't use hardcoded values. SdLength += (sizeof(SID) + (Sid->SubAuthorityCount - 1) * sizeof(ULONG)); if (Length < SdLength) { @@ -1113,20 +1133,29 @@ SeValidSecurityDescriptor( return FALSE; } - Acl = (PACL)((ULONG_PTR)SecurityDescriptor + SecurityDescriptor->Dacl); - if ((Acl->AclRevision < MIN_ACL_REVISION) || - (Acl->AclRevision > MAX_ACL_REVISION)) + /* Ensure the DACL is within the bounds of the security descriptor */ + if ((SecurityDescriptor->Dacl > Length) || + (Length - SecurityDescriptor->Dacl < sizeof(ACL))) { - DPRINT1("Invalid DACL revision\n"); + DPRINT1("DACL not within bounds\n"); return FALSE; } + /* Reference it */ + Acl = (PACL)((ULONG_PTR)SecurityDescriptor + SecurityDescriptor->Dacl); + SdLength += Acl->AclSize; if (Length < SdLength) { DPRINT1("Invalid DACL size\n"); return FALSE; } + + if (!RtlValidAcl(Acl)) + { + DPRINT1("Invalid DACL\n"); + return FALSE; + } } /* Check SACL */ @@ -1138,20 +1167,29 @@ SeValidSecurityDescriptor( return FALSE; } - Acl = (PACL)((ULONG_PTR)SecurityDescriptor + SecurityDescriptor->Sacl); - if ((Acl->AclRevision < MIN_ACL_REVISION) || - (Acl->AclRevision > MAX_ACL_REVISION)) + /* Ensure the SACL is within the bounds of the security descriptor */ + if ((SecurityDescriptor->Sacl > Length) || + (Length - SecurityDescriptor->Sacl < sizeof(ACL))) { - DPRINT1("Invalid SACL revision\n"); + DPRINT1("SACL not within bounds\n"); return FALSE; } + /* Reference it */ + Acl = (PACL)((ULONG_PTR)SecurityDescriptor + SecurityDescriptor->Sacl); + SdLength += Acl->AclSize; if (Length < SdLength) { DPRINT1("Invalid SACL size\n"); return FALSE; } + + if (!RtlValidAcl(Acl)) + { + DPRINT1("Invalid SACL\n"); + return FALSE; + } } return TRUE;

2 years, 7 months

[reactos] 01/01: [WIN32K:NTUSER] Only call IntFreeSecurityBuffer() when needed, don't free NULL buffers.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d21895e6ef982c2927857… commit d21895e6ef982c2927857cb18d6fb30370b5db04 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri May 6 20:34:52 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon May 23 19:30:13 2022 +0200 [WIN32K:NTUSER] Only call IntFreeSecurityBuffer() when needed, don't free NULL buffers. Addendum to 878c2f44. --- win32ss/user/ntuser/desktop.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/win32ss/user/ntuser/desktop.c b/win32ss/user/ntuser/desktop.c index fcb3a8aa009..2344fea0c01 100644 --- a/win32ss/user/ntuser/desktop.c +++ b/win32ss/user/ntuser/desktop.c @@ -563,7 +563,7 @@ IntResolveDesktop( LUID ProcessLuid; USHORT StrSize; SIZE_T MemSize; - PSECURITY_DESCRIPTOR ServiceSD = NULL; + PSECURITY_DESCRIPTOR ServiceSD; POBJECT_ATTRIBUTES ObjectAttributes = NULL; PUNICODE_STRING ObjectName; UNICODE_STRING WinStaName, DesktopName; @@ -1022,16 +1022,15 @@ IntResolveDesktop( ObjectName->Length = (USHORT)(wcslen(ObjectName->Buffer) * sizeof(WCHAR)); /* - * Set up a security descriptor for the service. - * A service is generally based upon a desktop - * and a window station. The newly created window - * station and desktop will get this security descriptor + * Set up a security descriptor for the new service's window station. + * A service has an associated window station and desktop. The newly + * created window station and desktop will get this security descriptor * if such objects weren't created before. */ Status = IntCreateServiceSecurity(&ServiceSD); if (!NT_SUCCESS(Status)) { - ERR("Failed to create a security descriptor for default window station, Status 0x%08lx\n", Status); + ERR("Failed to create a security descriptor for service window station, Status 0x%08lx\n", Status); goto Quit; } @@ -1051,6 +1050,9 @@ IntResolveDesktop( KernelMode, MAXIMUM_ALLOWED, 0, 0, 0, 0, 0); + + IntFreeSecurityBuffer(ServiceSD); + if (!NT_SUCCESS(Status)) { ASSERT(hWinSta == NULL); @@ -1200,8 +1202,6 @@ Quit: { *phWinSta = hWinSta; *phDesktop = hDesktop; - - IntFreeSecurityBuffer(ServiceSD); return STATUS_SUCCESS; } else @@ -1218,9 +1218,6 @@ Quit: if (hWinSta) ObCloseHandle(hWinSta, UserMode); - if (ServiceSD) - IntFreeSecurityBuffer(ServiceSD); - SetLastNtError(Status); return Status; }

2 years, 7 months

[reactos] 01/01: [DESK] Implement pCDevSettings_GetDeviceInstanceId properly

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3900cf88b3ad8fa1b5378… commit 3900cf88b3ad8fa1b53785bc2f69a5f07b9bdd22 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon May 23 19:04:47 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon May 23 19:04:47 2022 +0300 [DESK] Implement pCDevSettings_GetDeviceInstanceId properly - CM_Locate_DevNodeW expects a Device Instance ID as second argument, so it cannot be used for converting a Hardware ID. - Use SetupAPI functions here instead, as documented in: https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-enumd… - Now our desk.cpl passes correct identifier to CPL extensions, such as deskadp and deskmon, so clicking on "Properties" in the advanced display properties now works in Windows XP. - Also fix copypasta in DisplayAdvancedSettings that affected applet built with MSVC - deskadp extension was loaded twice. - Also fix magic flag value for EDD_GET_DEVICE_INTERFACE_NAME. --- dll/cpl/desk/advmon.c | 2 +- dll/cpl/desk/devsett.c | 81 ++++++++++++++++++++++++++++++------------------- dll/cpl/desk/settings.c | 2 +- 3 files changed, 51 insertions(+), 34 deletions(-) diff --git a/dll/cpl/desk/advmon.c b/dll/cpl/desk/advmon.c index 141f6ffe479..e933072316e 100644 --- a/dll/cpl/desk/advmon.c +++ b/dll/cpl/desk/advmon.c @@ -122,7 +122,7 @@ DisplayAdvancedSettings(HWND hWndParent, PDISPLAY_DEVICE_ENTRY DisplayDevice) SHAddFromPropSheetExtArray(hpsxaDev, PropSheetAddPage, (LPARAM)&psh); #ifdef _MSC_VER - hpsxaDisp = msvc_SHCreatePropSheetExtArrayEx(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Device"), MAX_ADVANCED_PAGES - psh.nPages, pdo); + hpsxaDisp = msvc_SHCreatePropSheetExtArrayEx(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Display"), MAX_ADVANCED_PAGES - psh.nPages, pdo); #else hpsxaDisp = SHCreatePropSheetExtArrayEx(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Display"), MAX_ADVANCED_PAGES - psh.nPages, pdo); #endif diff --git a/dll/cpl/desk/devsett.c b/dll/cpl/desk/devsett.c index 73dbb78a62f..27e75d6d349 100644 --- a/dll/cpl/desk/devsett.c +++ b/dll/cpl/desk/devsett.c @@ -168,47 +168,64 @@ pCDevSettings_GetMonitorDevice(const WCHAR *pszDisplayDevice) return str; } +/** + * @brief + * Converts a Hardware ID (DeviceID from EnumDisplayDevices) + * to an unique Device Instance ID. + * + * @param[in] pszDevice + * A pointer to a null-terminated Unicode string + * containing a Hardware ID. + * e.g. "PCI\VEN_80EE&DEV_BEEF&SUBSYS_00000000&REV_00" + * + * @return + * A pointer to a null-terminated Unicode string + * containing an unique Device Instance ID + * or NULL in case of error. + * e.g. "PCI\VEN_80EE&DEV_BEEF&SUBSYS_00000000&REV_00\3&267A616A&0&10" + * + * @remarks + * The caller must free the returned string with LocalFree. + */ static PWSTR pCDevSettings_GetDeviceInstanceId(const WCHAR *pszDevice) { - DEVINST DevInst; - CONFIGRET cr; + HDEVINFO DevInfo; + SP_DEVINFO_DATA InfoData; ULONG BufLen; LPWSTR lpDevInstId = NULL; - DPRINT1("CDevSettings::GetDeviceInstanceId(%ws) UNIMPLEMENTED!\n", pszDevice); + DPRINT("CDevSettings::GetDeviceInstanceId(%ws)!\n", pszDevice); - cr = CM_Locate_DevNodeW(&DevInst, - (DEVINSTID_W)pszDevice, - CM_LOCATE_DEVNODE_NORMAL); - if (cr == CR_SUCCESS) - { - DPRINT1("Success1\n"); - cr = CM_Get_Device_ID_Size(&BufLen, - DevInst, - 0); - if (cr == CR_SUCCESS) - { - DPRINT1("Success2\n"); - lpDevInstId = LocalAlloc(LMEM_FIXED, - (BufLen + 1) * sizeof(WCHAR)); + DevInfo = SetupDiGetClassDevsW(NULL, pszDevice, NULL, DIGCF_ALLCLASSES | DIGCF_PRESENT); + if (DevInfo == INVALID_HANDLE_VALUE) + return NULL; - if (lpDevInstId != NULL) - { - DPRINT1("Success3\n"); - cr = CM_Get_Device_IDW(DevInst, - lpDevInstId, - BufLen, - 0); + ZeroMemory(&InfoData, sizeof(InfoData)); + InfoData.cbSize = sizeof(InfoData); - if (cr != CR_SUCCESS) - { - LocalFree((HLOCAL)lpDevInstId); - lpDevInstId = NULL; - } - DPRINT1("instance id: %ws\n", lpDevInstId); - } - } + /* Try to enumerate the first matching device */ + if (!SetupDiEnumDeviceInfo(DevInfo, 0, &InfoData)) + return NULL; + + if (SetupDiGetDeviceInstanceId(DevInfo, &InfoData, NULL, 0, &BufLen) || + GetLastError() != ERROR_INSUFFICIENT_BUFFER) + return NULL; + + lpDevInstId = LocalAlloc(LMEM_FIXED, + (BufLen + 1) * sizeof(WCHAR)); + + if (lpDevInstId == NULL) + return NULL; + + if (!SetupDiGetDeviceInstanceId(DevInfo, &InfoData, lpDevInstId, BufLen, NULL)) + { + LocalFree((HLOCAL)lpDevInstId); + lpDevInstId = NULL; + } + else + { + DPRINT("instance id: %ws\n", lpDevInstId); } return lpDevInstId; diff --git a/dll/cpl/desk/settings.c b/dll/cpl/desk/settings.c index 93d8b9a246f..d0b8d12a06b 100644 --- a/dll/cpl/desk/settings.c +++ b/dll/cpl/desk/settings.c @@ -330,7 +330,7 @@ SettingsOnInitDialog(IN HWND hwndDlg) /* Get video cards list */ pData->DisplayDeviceList = NULL; displayDevice.cb = sizeof(displayDevice); - while (EnumDisplayDevices(NULL, iDevNum, &displayDevice, 0x1)) + while (EnumDisplayDevices(NULL, iDevNum, &displayDevice, EDD_GET_DEVICE_INTERFACE_NAME)) { if ((displayDevice.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) != 0) {

2 years, 7 months

[reactos] 01/01: [DESK] Synchronize translations

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6dc17389cb9f706fc3ef8… commit 6dc17389cb9f706fc3ef8cf9b2537de7f49866b0 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon May 23 02:44:03 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon May 23 02:44:03 2022 +0300 [DESK] Synchronize translations - Fix differences in punctuation - pt-PT had something out of place that other translations didn't had at all --- dll/cpl/desk/lang/bg-BG.rc | 4 ++-- dll/cpl/desk/lang/cs-CZ.rc | 4 ++-- dll/cpl/desk/lang/de-DE.rc | 4 ++-- dll/cpl/desk/lang/el-GR.rc | 4 ++-- dll/cpl/desk/lang/en-GB.rc | 4 ++-- dll/cpl/desk/lang/en-US.rc | 4 ++-- dll/cpl/desk/lang/es-ES.rc | 4 ++-- dll/cpl/desk/lang/et-EE.rc | 4 ++-- dll/cpl/desk/lang/fr-FR.rc | 4 ++-- dll/cpl/desk/lang/he-IL.rc | 4 ++-- dll/cpl/desk/lang/hu-HU.rc | 4 ++-- dll/cpl/desk/lang/id-ID.rc | 4 ++-- dll/cpl/desk/lang/it-IT.rc | 4 ++-- dll/cpl/desk/lang/nl-NL.rc | 4 ++-- dll/cpl/desk/lang/no-NO.rc | 4 ++-- dll/cpl/desk/lang/pl-PL.rc | 4 ++-- dll/cpl/desk/lang/pt-PT.rc | 20 ++++++++++---------- dll/cpl/desk/lang/ro-RO.rc | 4 ++-- dll/cpl/desk/lang/ru-RU.rc | 4 ++-- dll/cpl/desk/lang/sk-SK.rc | 4 ++-- dll/cpl/desk/lang/sq-AL.rc | 4 ++-- dll/cpl/desk/lang/sv-SE.rc | 4 ++-- dll/cpl/desk/lang/tr-TR.rc | 2 +- dll/cpl/desk/lang/uk-UA.rc | 4 ++-- 24 files changed, 55 insertions(+), 55 deletions(-) diff --git a/dll/cpl/desk/lang/bg-BG.rc b/dll/cpl/desk/lang/bg-BG.rc index 4ecf6464ad3..d14d3904c3c 100644 --- a/dll/cpl/desk/lang/bg-BG.rc +++ b/dll/cpl/desk/lang/bg-BG.rc @@ -137,7 +137,7 @@ BEGIN LTEXT "Завлачете значетата на мониторите така, че да отговарят на действителното разположение на мониторите ви.", -1, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE - LTEXT "&Екран", 1820, 3, 107, 70, 9 + LTEXT "&Екран:", 1820, 3, 107, 70, 9 LTEXT "<няма>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "&Разделителна способност", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 @@ -156,7 +156,7 @@ CAPTION "Общи" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Екран", -1, 7, 6, 237, 56, WS_GROUP - LTEXT "Размер на шрифта", -1, 14, 20, 222, 9 + LTEXT "Размер на шрифта:", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Съвместимост", -1, 7, 67, 237, 97 diff --git a/dll/cpl/desk/lang/cs-CZ.rc b/dll/cpl/desk/lang/cs-CZ.rc index bf2f9e9945d..46217e5568f 100644 --- a/dll/cpl/desk/lang/cs-CZ.rc +++ b/dll/cpl/desk/lang/cs-CZ.rc @@ -143,7 +143,7 @@ BEGIN LTEXT "Tažením nastavte ikony monitorů, aby odpovídaly fyzickému uspořádání vašich monitorů.", -1, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE - LTEXT "&Obrazovka", 1820, 3, 107, 70, 9 + LTEXT "&Obrazovka:", 1820, 3, 107, 70, 9 LTEXT "<není>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "&Velikost obrazovky", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 @@ -162,7 +162,7 @@ CAPTION "Obecné" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Obrazovka", -1, 7, 6, 237, 56, WS_GROUP - LTEXT "Velikost písma", -1, 14, 20, 222, 9 + LTEXT "Velikost písma:", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Kompatibilita", -1, 7, 67, 237, 97 diff --git a/dll/cpl/desk/lang/de-DE.rc b/dll/cpl/desk/lang/de-DE.rc index a1aa602bb8b..a1d0ea3baca 100644 --- a/dll/cpl/desk/lang/de-DE.rc +++ b/dll/cpl/desk/lang/de-DE.rc @@ -137,7 +137,7 @@ BEGIN LTEXT "Verschieben Sie die Monitor-Symbole, sodass sie der physischen Anordnung Ihrer Monitore entsprechen.", -1, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE - LTEXT "&Anzeige", 1820, 3, 107, 70, 9 + LTEXT "&Anzeige:", 1820, 3, 107, 70, 9 LTEXT "<kein>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "Bi&ldschirmauflösung", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 @@ -156,7 +156,7 @@ CAPTION "Allgemein" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Anzeige", -1, 7, 6, 237, 56, WS_GROUP - LTEXT "Schriftgröße", -1, 14, 20, 222, 9 + LTEXT "Schriftgröße:", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Kompatibilität", -1, 7, 67, 237, 97 diff --git a/dll/cpl/desk/lang/el-GR.rc b/dll/cpl/desk/lang/el-GR.rc index faef0bf8fc9..9e6e738a8e0 100644 --- a/dll/cpl/desk/lang/el-GR.rc +++ b/dll/cpl/desk/lang/el-GR.rc @@ -137,7 +137,7 @@ BEGIN LTEXT "Σύρετε τα εικονίδια της οθόνης, ώστε να ταιριάξουν με τη φυσική διάταξη των οθονών σας.", -1, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE - LTEXT "&Εμφάνιση", 1820, 3, 107, 70, 9 + LTEXT "&Εμφάνιση:", 1820, 3, 107, 70, 9 LTEXT "<κανένα>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "&Ανάλυση οθόνης", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 @@ -156,7 +156,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP - LTEXT "Font Size", -1, 14, 20, 222, 9 + LTEXT "Font Size:", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Compatibility", -1, 7, 67, 237, 97 diff --git a/dll/cpl/desk/lang/en-GB.rc b/dll/cpl/desk/lang/en-GB.rc index 7c373470442..ff719d1e600 100644 --- a/dll/cpl/desk/lang/en-GB.rc +++ b/dll/cpl/desk/lang/en-GB.rc @@ -155,8 +155,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Display:", -1, 7, 6, 237, 56, WS_GROUP - LTEXT "Font Size", -1, 14, 20, 222, 9 + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Compatibility", -1, 7, 67, 237, 97 diff --git a/dll/cpl/desk/lang/en-US.rc b/dll/cpl/desk/lang/en-US.rc index 0d7fbf1dfa0..36da4545952 100644 --- a/dll/cpl/desk/lang/en-US.rc +++ b/dll/cpl/desk/lang/en-US.rc @@ -155,8 +155,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Display:", -1, 7, 6, 237, 56, WS_GROUP - LTEXT "Font Size", -1, 14, 20, 222, 9 + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Compatibility", -1, 7, 67, 237, 97 diff --git a/dll/cpl/desk/lang/es-ES.rc b/dll/cpl/desk/lang/es-ES.rc index 590b19d09c1..4f5bf52ebd7 100644 --- a/dll/cpl/desk/lang/es-ES.rc +++ b/dll/cpl/desk/lang/es-ES.rc @@ -147,7 +147,7 @@ BEGIN LTEXT "Arrastre los iconos para ajustar el orden físico de sus monitores.", -1, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE - LTEXT "Mostrar", 1820, 3, 107, 70, 9 + LTEXT "Mostrar:", 1820, 3, 107, 70, 9 LTEXT "<ninguno>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "&Resolución de pantalla ", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 @@ -166,7 +166,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Pantalla ", -1, 7, 6, 237, 56, WS_GROUP - LTEXT "Tamaño de la fuente", -1, 14, 20, 222, 9 + LTEXT "Tamaño de la fuente:", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Compatibilidad ", -1, 7, 67, 237, 97 diff --git a/dll/cpl/desk/lang/et-EE.rc b/dll/cpl/desk/lang/et-EE.rc index ef85fcab0f2..a4b5d637dc8 100644 --- a/dll/cpl/desk/lang/et-EE.rc +++ b/dll/cpl/desk/lang/et-EE.rc @@ -162,8 +162,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Üldist" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Kuva:", -1, 7, 6, 237, 56, WS_GROUP - LTEXT "Fondi suurus", -1, 14, 20, 222, 9 + GROUPBOX "Kuva", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Fondi suurus:", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Ühilduvus", -1, 7, 67, 237, 97 diff --git a/dll/cpl/desk/lang/fr-FR.rc b/dll/cpl/desk/lang/fr-FR.rc index 68b05a2dd75..c0a1a0f0e24 100644 --- a/dll/cpl/desk/lang/fr-FR.rc +++ b/dll/cpl/desk/lang/fr-FR.rc @@ -139,7 +139,7 @@ BEGIN LTEXT "Déplacez les icônes de moniteur pour qu'elles correspondent à l'arrangement physique de vos moniteurs.", -1, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE - LTEXT "&Affichage", 1820, 3, 107, 70, 9 + LTEXT "&Affichage :", 1820, 3, 107, 70, 9 LTEXT "<aucun>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "&Résolution de l'affichage", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 @@ -158,7 +158,7 @@ CAPTION "Général" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Affichage", -1, 7, 6, 285, 56, WS_GROUP - LTEXT "Taille de la police", -1, 14, 20, 222, 9 + LTEXT "Taille de la police :", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Compatibilité", -1, 7, 67, 285, 97 diff --git a/dll/cpl/desk/lang/he-IL.rc b/dll/cpl/desk/lang/he-IL.rc index 5d68fa765ec..6c91a9925b9 100644 --- a/dll/cpl/desk/lang/he-IL.rc +++ b/dll/cpl/desk/lang/he-IL.rc @@ -139,7 +139,7 @@ BEGIN WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE LTEXT "תצוגה:", 1820, 3, 107, 70, 9 LTEXT "<none>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 - GROUPBOX "גודל תצוגה:", 1818, 3, 127, 115, 43 + GROUPBOX "גודל תצוגה", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 LTEXT "פחות", 1815, 9, 137, 25, 9, NOT WS_GROUP LTEXT "יותר", 1816, 93, 137, 20, 9, NOT WS_GROUP @@ -156,7 +156,7 @@ CAPTION "כללי" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "תצוגה", -1, 7, 6, 237, 56, WS_GROUP - LTEXT "גודל גופן", -1, 14, 20, 222, 9 + LTEXT "גודל גופן:", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "תאימות", -1, 7, 67, 237, 97 diff --git a/dll/cpl/desk/lang/hu-HU.rc b/dll/cpl/desk/lang/hu-HU.rc index 48dac0caa2b..73287ac3c7c 100644 --- a/dll/cpl/desk/lang/hu-HU.rc +++ b/dll/cpl/desk/lang/hu-HU.rc @@ -139,7 +139,7 @@ BEGIN LTEXT "Mozgassa a monitor ikonokat úgy, hogy megegyezzen a monitorjai fizikai elrendezésével.", -1, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE - LTEXT "&Képernyő", 1820, 3, 107, 70, 9 + LTEXT "&Képernyő:", 1820, 3, 107, 70, 9 LTEXT "<nincs>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "Ké&pméret", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 53, 17 @@ -158,7 +158,7 @@ CAPTION "Általános" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Képernyő", -1, 7, 6, 237, 56, WS_GROUP - LTEXT "Betűméret", -1, 14, 20, 222, 9 + LTEXT "Betűméret:", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Kompatibilitás", -1, 7, 67, 237, 97 diff --git a/dll/cpl/desk/lang/id-ID.rc b/dll/cpl/desk/lang/id-ID.rc index 34d02af8965..f22885323d5 100644 --- a/dll/cpl/desk/lang/id-ID.rc +++ b/dll/cpl/desk/lang/id-ID.rc @@ -137,7 +137,7 @@ BEGIN LTEXT "Geser ikon monitor untuk mencocokkan penyesuaian fisik monitor.", -1, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE - LTEXT "&Tampilan", 1820, 3, 107, 70, 9 + LTEXT "&Tampilan:", 1820, 3, 107, 70, 9 LTEXT "<tidak ada>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "Area &Layar", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 @@ -156,7 +156,7 @@ CAPTION "Umum" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Tampilan", -1, 7, 6, 237, 56, WS_GROUP - LTEXT "Ukuran Fon", -1, 14, 20, 222, 9 + LTEXT "Ukuran Fon:", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Kompatibilitas", -1, 7, 67, 237, 97 diff --git a/dll/cpl/desk/lang/it-IT.rc b/dll/cpl/desk/lang/it-IT.rc index 8d782a9c8a5..bc4cbf7884d 100644 --- a/dll/cpl/desk/lang/it-IT.rc +++ b/dll/cpl/desk/lang/it-IT.rc @@ -137,7 +137,7 @@ BEGIN LTEXT "Trascinare le icone dei monitor in modo corrispondente alla disposizione fisica dei vostri monitor.", -1, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE - LTEXT "&Schermo", 1820, 3, 107, 70, 9 + LTEXT "&Schermo:", 1820, 3, 107, 70, 9 LTEXT "<none>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "&Risoluzione dello schermo", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 @@ -156,7 +156,7 @@ CAPTION "Generale" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Monitor", -1, 7, 6, 237, 56, WS_GROUP - LTEXT "Dimensione font", -1, 14, 20, 222, 9 + LTEXT "Dimensione font:", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Compatibilità", -1, 7, 67, 237, 97 diff --git a/dll/cpl/desk/lang/nl-NL.rc b/dll/cpl/desk/lang/nl-NL.rc index 37ce5c267d9..866e2667744 100644 --- a/dll/cpl/desk/lang/nl-NL.rc +++ b/dll/cpl/desk/lang/nl-NL.rc @@ -137,7 +137,7 @@ BEGIN LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.", -1, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE - LTEXT "&Scherm", 1820, 3, 107, 70, 9 + LTEXT "&Scherm:", 1820, 3, 107, 70, 9 LTEXT "<none>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "&Schermresolutie", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 @@ -156,7 +156,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP - LTEXT "Font Size", -1, 14, 20, 222, 9 + LTEXT "Font Size:", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Compatibility", -1, 7, 67, 237, 97 diff --git a/dll/cpl/desk/lang/no-NO.rc b/dll/cpl/desk/lang/no-NO.rc index 78ad0895213..70985a7e200 100644 --- a/dll/cpl/desk/lang/no-NO.rc +++ b/dll/cpl/desk/lang/no-NO.rc @@ -137,7 +137,7 @@ BEGIN LTEXT "Dra skjermikonene for å tilpasse fysisk til din skjerm.", -1, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE - LTEXT "&Skjerm", 1820, 3, 107, 70, 9 + LTEXT "&Skjerm:", 1820, 3, 107, 70, 9 LTEXT "<ingen>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "&Skjermområde", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 @@ -156,7 +156,7 @@ CAPTION "Generielt" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Vis", -1, 7, 6, 237, 56, WS_GROUP - LTEXT "Skriftstørrelse", -1, 14, 20, 222, 9 + LTEXT "Skriftstørrelse:", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Kompatibilitet", -1, 7, 67, 237, 97 diff --git a/dll/cpl/desk/lang/pl-PL.rc b/dll/cpl/desk/lang/pl-PL.rc index 70636a7f366..e244a797dc2 100644 --- a/dll/cpl/desk/lang/pl-PL.rc +++ b/dll/cpl/desk/lang/pl-PL.rc @@ -147,7 +147,7 @@ BEGIN LTEXT "Przeciągnij ikony monitorów tak, by przedstawiały fizyczne rozmieszczenie twoich monitorów.", -1, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE - LTEXT "&Ekran", 1820, 3, 107, 70, 9 + LTEXT "&Ekran:", 1820, 3, 107, 70, 9 LTEXT "<brak>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "&Rozdzielczość ekranu", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 @@ -166,7 +166,7 @@ CAPTION "Ogólne" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Ekran", -1, 7, 6, 237, 56, WS_GROUP - LTEXT "Rozmiar czcionek", -1, 14, 20, 222, 9 + LTEXT "Rozmiar czcionek:", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Tryb zgodności", -1, 7, 67, 237, 97 diff --git a/dll/cpl/desk/lang/pt-PT.rc b/dll/cpl/desk/lang/pt-PT.rc index 1f37033814a..bcaccf7a445 100644 --- a/dll/cpl/desk/lang/pt-PT.rc +++ b/dll/cpl/desk/lang/pt-PT.rc @@ -160,16 +160,16 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Geral" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Visualização", -1, 7, 6, 237, 105, WS_GROUP - LTEXT "Se a resolução do ecrã tornar os items demasiado pequenos para ver confortavelmente, pode aumentar o valor ppp para compensar. Para alterar apenas o tamanho do tipo de letra, clique em ""Cancelar"" e vá até ao separador ""Aspecto"".", -1, 14, 20, 220, 45 - LTEXT "Definição do valor ppp:", -1, 14, 65, 222, 9 - COMBOBOX IDC_FONTSIZE_COMBO, 14, 75, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 91, 223, 12 - GROUPBOX "Compatibilidade", -1, 7, 115, 237, 100 - LTEXT "Alguns programas podem não funcionar correctamente se não reiniciar o computador após alterar as definições de visualização.\n\nApós alterar as definições de visualização:", -1, 12, 130, 228, 34 - AUTORADIOBUTTON "&Reiniciar o computador antes de aplicar as novas definições", IDC_RESTART_RB, 14, 165, 228, 10 - AUTORADIOBUTTON "&Aplicar as novas definições sem reiniciar", IDC_WITHOUTREBOOT_RB, 14, 180, 228, 10 - AUTORADIOBUTTON "&Perguntar antes de aplicar as novas definições de visualização", IDC_ASKME_RB, 14, 195, 228, 10 + GROUPBOX "Visualização", -1, 7, 6, 237, 56, WS_GROUP + //LTEXT "Se a resolução do ecrã tornar os items demasiado pequenos para ver confortavelmente, pode aumentar o valor ppp para compensar. Para alterar apenas o tamanho do tipo de letra, clique em ""Cancelar"" e vá até ao separador ""Aspecto"".", -1, 14, 20, 220, 45 + LTEXT "Definição do valor ppp:", -1, 14, 20, 222, 9 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibilidade", -1, 7, 67, 237, 100 + LTEXT "Alguns programas podem não funcionar correctamente se não reiniciar o computador após alterar as definições de visualização.\n\nApós alterar as definições de visualização:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Reiniciar o computador antes de aplicar as novas definições", IDC_RESTART_RB, 14, 116, 228, 10 + AUTORADIOBUTTON "&Aplicar as novas definições sem reiniciar", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 + AUTORADIOBUTTON "&Perguntar antes de aplicar as novas definições de visualização", IDC_ASKME_RB, 14, 146, 228, 10 END IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 diff --git a/dll/cpl/desk/lang/ro-RO.rc b/dll/cpl/desk/lang/ro-RO.rc index 79122a1c871..33b17bce241 100644 --- a/dll/cpl/desk/lang/ro-RO.rc +++ b/dll/cpl/desk/lang/ro-RO.rc @@ -142,7 +142,7 @@ BEGIN LTEXT "Mișcați miniaturile ecranelor până vor corespunde cu amplasamentul fizic al ecranelor (opțiune pentru ecrane multiple).", -1, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE - LTEXT "&Dispozitive de afișare", 1820, 3, 107, 70, 9 + LTEXT "&Dispozitive de afișare:", 1820, 3, 107, 75, 9 LTEXT "<nespecificat>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "Re&zoluție ecran", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 @@ -161,7 +161,7 @@ CAPTION "Generale" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Afișare", -1, 7, 6, 237, 56, WS_GROUP - LTEXT "Mărime font", -1, 14, 20, 222, 9 + LTEXT "Mărime font:", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Compatibilitate", -1, 7, 67, 237, 97 diff --git a/dll/cpl/desk/lang/ru-RU.rc b/dll/cpl/desk/lang/ru-RU.rc index b0751ad92e1..9115919059d 100644 --- a/dll/cpl/desk/lang/ru-RU.rc +++ b/dll/cpl/desk/lang/ru-RU.rc @@ -137,7 +137,7 @@ BEGIN LTEXT "Разместите значки мониторов в соответствии с их расположением.", -1, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE - LTEXT "&Дисплей", 1820, 3, 107, 70, 9 + LTEXT "&Дисплей:", 1820, 3, 107, 70, 9 LTEXT "<нет>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "&Разрешение экрана", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 @@ -156,7 +156,7 @@ CAPTION "Общие" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Экран", -1, 7, 6, 237, 56, WS_GROUP - LTEXT "Размер шрифта", -1, 14, 20, 222, 9 + LTEXT "Размер шрифта:", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Совместимость", -1, 7, 67, 237, 97 diff --git a/dll/cpl/desk/lang/sk-SK.rc b/dll/cpl/desk/lang/sk-SK.rc index 34f73d5d7e0..82e4a3f4deb 100644 --- a/dll/cpl/desk/lang/sk-SK.rc +++ b/dll/cpl/desk/lang/sk-SK.rc @@ -139,7 +139,7 @@ BEGIN LTEXT "Ťahaním zoraďte ikony podľa fyzického rozmiestnenia monitorov.", -1, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE - LTEXT "&Monitor", 1820, 3, 107, 70, 9 + LTEXT "&Monitor:", 1820, 3, 107, 70, 9 LTEXT "<Nie je>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "&Rozlíšenie obrazovky", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 @@ -158,7 +158,7 @@ CAPTION "Všeobecné" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP - LTEXT "Veľkosť písma", -1, 14, 20, 222, 9 + LTEXT "Veľkosť písma:", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Kompatibilita", -1, 7, 67, 237, 97 diff --git a/dll/cpl/desk/lang/sq-AL.rc b/dll/cpl/desk/lang/sq-AL.rc index ae419b83766..b7ea4d62cb1 100644 --- a/dll/cpl/desk/lang/sq-AL.rc +++ b/dll/cpl/desk/lang/sq-AL.rc @@ -141,7 +141,7 @@ BEGIN LTEXT "Terheq monitorimin e ikonave të përputhet me marrëveshje fizike të vëzhguesit tuaj.", -1, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE - LTEXT "&Ekran", 1820, 3, 107, 70, 9 + LTEXT "&Ekran:", 1820, 3, 107, 70, 9 LTEXT "<none>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "&Zona ekranit", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 @@ -160,7 +160,7 @@ CAPTION "Përgjithshëm" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Ekran", -1, 7, 6, 237, 56, WS_GROUP - LTEXT "Font Masa", -1, 14, 20, 222, 9 + LTEXT "Font Masa:", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Pajtueshmëri", -1, 7, 67, 237, 97 diff --git a/dll/cpl/desk/lang/sv-SE.rc b/dll/cpl/desk/lang/sv-SE.rc index 7cd1380ae32..eaf612f82df 100644 --- a/dll/cpl/desk/lang/sv-SE.rc +++ b/dll/cpl/desk/lang/sv-SE.rc @@ -139,7 +139,7 @@ BEGIN LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.", -1, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE - LTEXT "&Bild", 1820, 3, 107, 70, 9 + LTEXT "&Bild:", 1820, 3, 107, 70, 9 LTEXT "<ingen>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "&Bildyta", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 @@ -158,7 +158,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP - LTEXT "Font Size", -1, 14, 20, 222, 9 + LTEXT "Font Size:", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Compatibility", -1, 7, 67, 237, 97 diff --git a/dll/cpl/desk/lang/tr-TR.rc b/dll/cpl/desk/lang/tr-TR.rc index 33a8b7c5f23..b24b1233853 100644 --- a/dll/cpl/desk/lang/tr-TR.rc +++ b/dll/cpl/desk/lang/tr-TR.rc @@ -158,7 +158,7 @@ CAPTION "Genel" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Görüntü", -1, 7, 6, 237, 56, WS_GROUP - LTEXT "Yazı Tipi Boyutu", -1, 14, 20, 222, 9 + LTEXT "Yazı Tipi Boyutu:", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Uyumluluk", -1, 7, 67, 237, 97 diff --git a/dll/cpl/desk/lang/uk-UA.rc b/dll/cpl/desk/lang/uk-UA.rc index b773d9754fa..2d6ace664b2 100644 --- a/dll/cpl/desk/lang/uk-UA.rc +++ b/dll/cpl/desk/lang/uk-UA.rc @@ -145,7 +145,7 @@ BEGIN LTEXT "Розташуйте значки моніторів відповідно до фактичного розташування моніторів.", -1, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE - LTEXT "&Дисплей", 1820, 3, 107, 70, 9 + LTEXT "&Дисплей:", 1820, 3, 107, 70, 9 LTEXT "<немає>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "&Область екрану", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 @@ -164,7 +164,7 @@ CAPTION "Загальні" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Екран", -1, 7, 6, 237, 56, WS_GROUP - LTEXT "Розмір шрифту", -1, 14, 20, 222, 9 + LTEXT "Розмір шрифту:", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Сумісність", -1, 7, 67, 237, 97

2 years, 7 months

[reactos] 02/02: [WIN32K] Improve finding the best matching display mode

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d2a87f1b7fc3cce462ff4… commit d2a87f1b7fc3cce462ff42c0932aa1b81b533a06 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun May 22 22:47:20 2022 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sun May 22 23:42:03 2022 +0200 [WIN32K] Improve finding the best matching display mode Search the display mode having the smallest difference with the requested one. We can then remove the hardcoded values of 60 Hz and 32 bpp by default. CORE-18189 --- win32ss/gdi/eng/ldevobj.c | 64 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 46 insertions(+), 18 deletions(-) diff --git a/win32ss/gdi/eng/ldevobj.c b/win32ss/gdi/eng/ldevobj.c index bd6d282c23c..b7626f92886 100644 --- a/win32ss/gdi/eng/ldevobj.c +++ b/win32ss/gdi/eng/ldevobj.c @@ -669,6 +669,8 @@ LDEVOBJ_bBuildDevmodeList( return TRUE; } +/* Search the closest display mode according to some settings. + * Note that we don't care about the DM_* flags in dmFields, but check if value != 0 instead */ static BOOL LDEVOBJ_bGetClosestMode( @@ -676,31 +678,57 @@ LDEVOBJ_bGetClosestMode( _In_ PDEVMODEW RequestedMode, _Out_ PDEVMODEW *pSelectedMode) { - if (pGraphicsDevice->cDevModes == 0) - return FALSE; + DEVMODEW dmDiff; + PDEVMODEW pdmCurrent, pdmBest = NULL; + ULONG i; - /* Search a 32bit mode (if not already specified) */ - if (!(RequestedMode->dmFields & DM_BITSPERPEL)) + /* Use a DEVMODE to keep the differences between best mode found and expected mode. + * Initialize fields to max value so we can find better modes. */ + dmDiff.dmPelsWidth = 0xffffffff; + dmDiff.dmPelsHeight = 0xffffffff; + dmDiff.dmBitsPerPel = 0xffffffff; + dmDiff.dmDisplayFrequency = 0xffffffff; + + /* Search the closest mode */ +#define DM_DIFF(field) (RequestedMode->field > pdmCurrent->field ? (RequestedMode->field - pdmCurrent->field) : (pdmCurrent->field - RequestedMode->field)) + for (i = 0; i < pGraphicsDevice->cDevModes; i++) { - RequestedMode->dmBitsPerPel = 32; - RequestedMode->dmFields |= DM_BITSPERPEL; + pdmCurrent = pGraphicsDevice->pDevModeList[i].pdm; + + /* Skip current mode if it is worse than best mode found */ + if (RequestedMode->dmPelsWidth != 0 && DM_DIFF(dmPelsWidth) > dmDiff.dmPelsWidth) + continue; + if (RequestedMode->dmPelsHeight != 0 && DM_DIFF(dmPelsHeight) > dmDiff.dmPelsHeight) + continue; + if (RequestedMode->dmBitsPerPel != 0 && DM_DIFF(dmBitsPerPel) > dmDiff.dmBitsPerPel) + continue; + if (RequestedMode->dmDisplayFrequency != 0 && DM_DIFF(dmDisplayFrequency) > dmDiff.dmDisplayFrequency) + continue; + + /* Better (or equivalent) mode found. Update differences */ + dmDiff.dmPelsWidth = DM_DIFF(dmPelsWidth); + dmDiff.dmPelsHeight = DM_DIFF(dmPelsHeight); + dmDiff.dmBitsPerPel = DM_DIFF(dmBitsPerPel); + dmDiff.dmDisplayFrequency = DM_DIFF(dmDisplayFrequency); + pdmBest = pdmCurrent; } - if (LDEVOBJ_bProbeAndCaptureDevmode(pGraphicsDevice, RequestedMode, pSelectedMode, FALSE)) - return TRUE; +#undef DM_DIFF - /* Search 60 Hz (if not already specified) */ - if (!(RequestedMode->dmFields & DM_DISPLAYFREQUENCY)) + if (pdmBest) { - RequestedMode->dmDisplayFrequency = 60; - RequestedMode->dmFields |= DM_DISPLAYFREQUENCY; - if (LDEVOBJ_bProbeAndCaptureDevmode(pGraphicsDevice, RequestedMode, pSelectedMode, FALSE)) - return TRUE; + TRACE("Closest display mode to '%dx%dx%d %d Hz' is '%dx%dx%d %d Hz'\n", + RequestedMode->dmPelsWidth, + RequestedMode->dmPelsHeight, + RequestedMode->dmBitsPerPel, + RequestedMode->dmDisplayFrequency, + pdmBest->dmPelsWidth, + pdmBest->dmPelsHeight, + pdmBest->dmBitsPerPel, + pdmBest->dmDisplayFrequency); } - /* Fall back to first mode */ - WARN("Fall back to first available mode\n"); - *pSelectedMode = pGraphicsDevice->pDevModeList[0].pdm; - return TRUE; + *pSelectedMode = pdmBest; + return pdmBest != NULL; } BOOL

2 years, 7 months

[reactos] 01/02: Revert "[WIN32SS] Only refresh graphics mode list when iModeNum = 0"

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=63e59e10f30c7f0214599… commit 63e59e10f30c7f0214599736032deb14eadb23d3 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun May 22 22:43:12 2022 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sun May 22 23:42:00 2022 +0200 Revert "[WIN32SS] Only refresh graphics mode list when iModeNum = 0" This reverts commit c243133b2c598bd004229242f36d9159a8e45b99. Without the revert, VirtualBox auto-resize doesn't work on first attempt, but only on next ones. However, according to documentation, we must only initialize device and cache information when iModeNum = 0. CORE-18189 --- win32ss/user/ntuser/display.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/win32ss/user/ntuser/display.c b/win32ss/user/ntuser/display.c index c3751517527..8f15a68e1bf 100644 --- a/win32ss/user/ntuser/display.c +++ b/win32ss/user/ntuser/display.c @@ -412,36 +412,27 @@ UserEnumDisplaySettings( PGRAPHICS_DEVICE pGraphicsDevice; PDEVMODEENTRY pdmentry; ULONG i, iFoundMode; + PPDEVOBJ ppdev; TRACE("Enter UserEnumDisplaySettings('%wZ', %lu)\n", pustrDevice, iModeNum); /* Ask GDI for the GRAPHICS_DEVICE */ pGraphicsDevice = EngpFindGraphicsDevice(pustrDevice, 0); - if (!pGraphicsDevice) + ppdev = EngpGetPDEV(pustrDevice); + + if (!pGraphicsDevice || !ppdev) { /* No device found */ ERR("No device found!\n"); return STATUS_INVALID_PARAMETER_1; } - if (iModeNum == 0) - { - PPDEVOBJ ppdev; - ppdev = EngpGetPDEV(pustrDevice); - if (!ppdev) - { - /* No device found */ - ERR("No device found!\n"); - return STATUS_INVALID_PARAMETER_1; - } - - /* Let's politely ask the driver for an updated mode list, - * just in case there's something new in there (vbox) */ + /* let's politely ask the driver for an updated mode list, + just in case there's something new in there (vbox) */ - PDEVOBJ_vRefreshModeList(ppdev); - PDEVOBJ_vRelease(ppdev); - } + PDEVOBJ_vRefreshModeList(ppdev); + PDEVOBJ_vRelease(ppdev); iFoundMode = 0; for (i = 0; i < pGraphicsDevice->cDevModes; i++)

2 years, 7 months

[reactos] 05/05: [WIN32SS] Change LDEVOBJ_bProbeAndCaptureDevmode to load missing settings from registry

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=588285881ea5490946763… commit 588285881ea5490946763515501dd89ee6a88ac2 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun May 22 14:23:26 2022 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sun May 22 17:32:44 2022 +0200 [WIN32SS] Change LDEVOBJ_bProbeAndCaptureDevmode to load missing settings from registry - use EngpGetDisplayDriverParameters to get display settings from registry - update searched display settings with the provided ones (+ add missing SEH2) - then, search exact mode User can now change only one display setting, without specifying other ones. --- win32ss/gdi/eng/ldevobj.c | 137 ++++++++++++++++++++++++++++++++++------------ win32ss/gdi/eng/mdevobj.c | 56 +------------------ 2 files changed, 105 insertions(+), 88 deletions(-) diff --git a/win32ss/gdi/eng/ldevobj.c b/win32ss/gdi/eng/ldevobj.c index 4a929ec4d24..bd6d282c23c 100644 --- a/win32ss/gdi/eng/ldevobj.c +++ b/win32ss/gdi/eng/ldevobj.c @@ -710,56 +710,113 @@ LDEVOBJ_bProbeAndCaptureDevmode( _Out_ PDEVMODEW *pSelectedMode, _In_ BOOL bSearchClosestMode) { + DEVMODEW dmSearch; PDEVMODEW pdmCurrent, pdm, pdmSelected = NULL; ULONG i; - DWORD dwFields; + ULONG ulVirtualWidth = 0, ulVirtualHeight = 0; + BOOL bResult = TRUE; + NTSTATUS Status; if (!LDEVOBJ_bBuildDevmodeList(pGraphicsDevice)) return FALSE; - if (bSearchClosestMode) + /* At first, load information from registry */ + RtlZeroMemory(&dmSearch, sizeof(dmSearch)); + Status = EngpGetDisplayDriverParameters(pGraphicsDevice, &dmSearch, NULL); + if (!NT_SUCCESS(Status)) { - /* Search the closest mode */ - if (!LDEVOBJ_bGetClosestMode(pGraphicsDevice, RequestedMode, &pdmSelected)) - return FALSE; - ASSERT(pdmSelected); + ERR("EngpGetDisplayDriverParameters() failed with status 0x%08x\n", Status); + return FALSE; } - else + + /* Override values with the new ones provided */ + + _SEH2_TRY { - /* Search if requested mode exists */ - for (i = 0; i < pGraphicsDevice->cDevModes; i++) + bSearchClosestMode |= RequestedMode->dmFields == 0; + + /* Copy standard fields (if provided) */ + if (RequestedMode->dmFields & DM_BITSPERPEL && RequestedMode->dmBitsPerPel != 0) + dmSearch.dmBitsPerPel = RequestedMode->dmBitsPerPel; + if (RequestedMode->dmFields & DM_PELSWIDTH && RequestedMode->dmPelsWidth != 0) + dmSearch.dmPelsWidth = RequestedMode->dmPelsWidth; + if (RequestedMode->dmFields & DM_PELSHEIGHT && RequestedMode->dmPelsHeight != 0) + dmSearch.dmPelsHeight = RequestedMode->dmPelsHeight; + if (RequestedMode->dmFields & DM_DISPLAYFREQUENCY && RequestedMode->dmDisplayFrequency != 0) + dmSearch.dmDisplayFrequency = RequestedMode->dmDisplayFrequency; + + if ((RequestedMode->dmFields & (DM_PANNINGWIDTH | DM_PANNINGHEIGHT)) == (DM_PANNINGWIDTH | DM_PANNINGHEIGHT) && + RequestedMode->dmPanningWidth != 0 && RequestedMode->dmPanningHeight != 0 && + RequestedMode->dmPanningWidth < dmSearch.dmPelsWidth && + RequestedMode->dmPanningHeight < dmSearch.dmPelsHeight) { - pdmCurrent = pGraphicsDevice->pDevModeList[i].pdm; - - /* Compare asked DEVMODE fields - * Only compare those that are valid in both DEVMODE structs */ - dwFields = pdmCurrent->dmFields & RequestedMode->dmFields; - - /* For now, we only need those */ - if ((dwFields & DM_BITSPERPEL) && - (pdmCurrent->dmBitsPerPel != RequestedMode->dmBitsPerPel)) continue; - if ((dwFields & DM_PELSWIDTH) && - (pdmCurrent->dmPelsWidth != RequestedMode->dmPelsWidth)) continue; - if ((dwFields & DM_PELSHEIGHT) && - (pdmCurrent->dmPelsHeight != RequestedMode->dmPelsHeight)) continue; - if ((dwFields & DM_DISPLAYFREQUENCY) && - (pdmCurrent->dmDisplayFrequency != RequestedMode->dmDisplayFrequency)) continue; - - pdmSelected = pdmCurrent; - break; + /* Get new panning values */ + ulVirtualWidth = RequestedMode->dmPelsWidth; + ulVirtualHeight = RequestedMode->dmPelsHeight; + dmSearch.dmPelsWidth = RequestedMode->dmPanningWidth; + dmSearch.dmPelsHeight = RequestedMode->dmPanningHeight; + } + else if (dmSearch.dmPanningWidth != 0 && dmSearch.dmPanningHeight != 0 && + dmSearch.dmPanningWidth < dmSearch.dmPelsWidth && + dmSearch.dmPanningHeight < dmSearch.dmPelsHeight) + { + /* Keep existing panning values */ + ulVirtualWidth = dmSearch.dmPelsWidth; + ulVirtualHeight = dmSearch.dmPelsHeight; + dmSearch.dmPelsWidth = dmSearch.dmPanningWidth; + dmSearch.dmPelsHeight = dmSearch.dmPanningHeight; } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + bResult = FALSE; + } + _SEH2_END; + + if (!bResult) + return FALSE; - if (!pdmSelected) + if (bSearchClosestMode) + { + if (LDEVOBJ_bGetClosestMode(pGraphicsDevice, &dmSearch, &pdmSelected)) { - WARN("Requested mode not found (%dx%dx%d %d Hz)\n", - RequestedMode->dmFields & DM_PELSWIDTH ? RequestedMode->dmPelsWidth : 0, - RequestedMode->dmFields & DM_PELSHEIGHT ? RequestedMode->dmPelsHeight : 0, - RequestedMode->dmFields & DM_BITSPERPEL ? RequestedMode->dmBitsPerPel : 0, - RequestedMode->dmFields & DM_DISPLAYFREQUENCY ? RequestedMode->dmDisplayFrequency : 0); - return FALSE; + /* Ok, found a closest mode. Update search */ + dmSearch.dmBitsPerPel = pdmSelected->dmBitsPerPel; + dmSearch.dmPelsWidth = pdmSelected->dmPelsWidth; + dmSearch.dmPelsHeight = pdmSelected->dmPelsHeight; + dmSearch.dmDisplayFrequency = pdmSelected->dmDisplayFrequency; } } + /* Now, search the exact mode to return to caller */ + for (i = 0; i < pGraphicsDevice->cDevModes; i++) + { + pdmCurrent = pGraphicsDevice->pDevModeList[i].pdm; + + /* For now, we only need those */ + if (pdmCurrent->dmBitsPerPel != dmSearch.dmBitsPerPel) + continue; + if (pdmCurrent->dmPelsWidth != dmSearch.dmPelsWidth) + continue; + if (pdmCurrent->dmPelsHeight != dmSearch.dmPelsHeight) + continue; + if (pdmCurrent->dmDisplayFrequency != dmSearch.dmDisplayFrequency) + continue; + + pdmSelected = pdmCurrent; + break; + } + + if (!pdmSelected) + { + ERR("Requested mode not found (%dx%dx%d %d Hz)\n", + dmSearch.dmPelsWidth, + dmSearch.dmPelsHeight, + dmSearch.dmBitsPerPel, + dmSearch.dmDisplayFrequency); + return FALSE; + } + /* Allocate memory for output */ pdm = ExAllocatePoolZero(PagedPool, pdmSelected->dmSize + pdmSelected->dmDriverExtra, GDITAG_DEVMODE); if (!pdm) @@ -771,6 +828,18 @@ LDEVOBJ_bProbeAndCaptureDevmode( (PVOID)((ULONG_PTR)pdmSelected + pdmSelected->dmSize), pdmSelected->dmDriverExtra); + /* Add back panning */ + if (ulVirtualWidth != 0 && ulVirtualHeight != 0 && + pdm->dmPelsWidth < ulVirtualWidth && + pdm->dmPelsHeight < ulVirtualHeight) + { + pdm->dmFields |= DM_PANNINGWIDTH | DM_PANNINGHEIGHT; + pdm->dmPanningWidth = pdm->dmPelsWidth; + pdm->dmPanningHeight = pdm->dmPelsHeight; + pdm->dmPelsWidth = ulVirtualWidth; + pdm->dmPelsHeight = ulVirtualHeight; + } + *pSelectedMode = pdm; return TRUE; } diff --git a/win32ss/gdi/eng/mdevobj.c b/win32ss/gdi/eng/mdevobj.c index 2b6ce26b0ca..620e5451f8c 100644 --- a/win32ss/gdi/eng/mdevobj.c +++ b/win32ss/gdi/eng/mdevobj.c @@ -99,62 +99,10 @@ MDEVOBJ_Create( if (!pdm) { - /* No settings requested. Read default settings from registry to dmDefault */ - HKEY hKey; - WCHAR DeviceKey[128]; - ULONG cbSize; - NTSTATUS Status; - DWORD dwValue; - + /* No settings requested. Provide nothing and LDEVOBJ_bProbeAndCaptureDevmode + * will read default settings from registry */ RtlZeroMemory(&dmDefault, sizeof(dmDefault)); dmDefault.dmSize = sizeof(dmDefault); - - Status = RegOpenKey(L"\\Registry\\Machine\\HARDWARE\\DEVICEMAP\\VIDEO", &hKey); - if (!NT_SUCCESS(Status)) - { - /* Ignore this device and continue */ - ERR("Failed to open VIDEO key: status 0x%08x\n", Status); - continue; - } - cbSize = sizeof(DeviceKey); - Status = RegQueryValue(hKey, - pGraphicsDevice->szNtDeviceName, - REG_SZ, - DeviceKey, - &cbSize); - ZwClose(hKey); - if (!NT_SUCCESS(Status)) - { - /* Ignore this device and continue */ - ERR("Failed to open get device key for '%S': status 0x%08x\n", pGraphicsDevice->szNtDeviceName, Status); - continue; - } - Status = RegOpenKey(DeviceKey, &hKey); - if (!NT_SUCCESS(Status)) - { - /* Ignore this device and continue */ - ERR("Failed to open open device key '%S' for '%S': status 0x%08x\n", DeviceKey, pGraphicsDevice->szNtDeviceName, Status); - continue; - } -#define READ(field, str, flag) \ - if (RegReadDWORD(hKey, L##str, &dwValue)) \ - { \ - dmDefault.field = dwValue; \ - dmDefault.dmFields |= flag; \ - } - READ(dmBitsPerPel, "DefaultSettings.BitsPerPel", DM_BITSPERPEL); - READ(dmPelsWidth, "DefaultSettings.XResolution", DM_PELSWIDTH); - READ(dmPelsHeight, "DefaultSettings.YResolution", DM_PELSHEIGHT); - READ(dmDisplayFlags, "DefaultSettings.Flags", DM_DISPLAYFLAGS); - READ(dmDisplayFrequency, "DefaultSettings.VRefresh", DM_DISPLAYFREQUENCY); - READ(dmPanningWidth, "DefaultSettings.XPanning", DM_PANNINGWIDTH); - READ(dmPanningHeight, "DefaultSettings.YPanning", DM_PANNINGHEIGHT); - READ(dmDisplayOrientation, "DefaultSettings.Orientation", DM_DISPLAYORIENTATION); - READ(dmDisplayFixedOutput, "DefaultSettings.FixedOutput", DM_DISPLAYFIXEDOUTPUT); - READ(dmPosition.x, "Attach.RelativeX", DM_POSITION); - READ(dmPosition.y, "Attach.RelativeY", DM_POSITION); - RegReadDWORD(hKey, L"Acceleration.Level", &dwAccelerationLevel); - ZwClose(hKey); } /* Get or create a PDEV for these settings */

2 years, 7 months

[reactos] 04/05: [WIN32SS] Copy loading of registry settings from mdevobj.c to new function

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9acd895f1849350d7bc65… commit 9acd895f1849350d7bc652ee55be2515ef80f98a Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun May 22 14:21:34 2022 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sun May 22 17:32:40 2022 +0200 [WIN32SS] Copy loading of registry settings from mdevobj.c to new function This function will be used in next commit, and duplicated implementation in mdevobj.c will be dropped. --- win32ss/gdi/eng/device.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++ win32ss/gdi/eng/device.h | 13 +++++++ 2 files changed, 108 insertions(+) diff --git a/win32ss/gdi/eng/device.c b/win32ss/gdi/eng/device.c index 037b0261a47..2b96ca409c9 100644 --- a/win32ss/gdi/eng/device.c +++ b/win32ss/gdi/eng/device.c @@ -124,6 +124,101 @@ EngpUpdateGraphicsDeviceList(VOID) return STATUS_SUCCESS; } +/* Open display settings registry key + * Returns NULL in case of error. */ +static HKEY +EngpGetRegistryHandleFromDeviceMap( + _In_ PGRAPHICS_DEVICE pGraphicsDevice) +{ + static const PWCHAR KEY_VIDEO = L"\\Registry\\Machine\\HARDWARE\\DEVICEMAP\\VIDEO"; + HKEY hKey; + WCHAR szDeviceKey[256]; + ULONG cbSize; + NTSTATUS Status; + + /* Open the device map registry key */ + Status = RegOpenKey(KEY_VIDEO, &hKey); + if (!NT_SUCCESS(Status)) + { + ERR("Could not open HARDWARE\\DEVICEMAP\\VIDEO registry key: status 0x%08x\n", Status); + return NULL; + } + + /* Query the registry path */ + cbSize = sizeof(szDeviceKey); + RegQueryValue(hKey, + pGraphicsDevice->szNtDeviceName, + REG_SZ, + szDeviceKey, + &cbSize); + ZwClose(hKey); + + /* Open the registry key */ + Status = RegOpenKey(szDeviceKey, &hKey); + if (!NT_SUCCESS(Status)) + { + ERR("Could not open registry key '%S': status 0x%08x\n", szDeviceKey, Status); + return NULL; + } + + return hKey; +} + +NTSTATUS +EngpGetDisplayDriverParameters( + _In_ PGRAPHICS_DEVICE pGraphicsDevice, + _Out_ PDEVMODEW pdm, + _Out_opt_ PDWORD pdwAccelerationLevel) +{ + HKEY hKey; + DWORD dwDummy; + NTSTATUS Status; + RTL_QUERY_REGISTRY_TABLE DisplaySettingsTable[] = + { + { + NULL, + RTL_QUERY_REGISTRY_DIRECT, + L"Acceleration.Level", + pdwAccelerationLevel ? pdwAccelerationLevel : &dwDummy, + REG_NONE, NULL, 0 + }, +#define READ(field, str) \ + { \ + NULL, \ + RTL_QUERY_REGISTRY_DIRECT, \ + L ##str, \ + &pdm->field, \ + REG_NONE, NULL, 0 \ + }, + READ(dmBitsPerPel, "DefaultSettings.BitsPerPel") + READ(dmPelsWidth, "DefaultSettings.XResolution") + READ(dmPelsHeight, "DefaultSettings.YResolution") + READ(dmDisplayFlags, "DefaultSettings.Flags") + READ(dmDisplayFrequency, "DefaultSettings.VRefresh") + READ(dmPanningWidth, "DefaultSettings.XPanning") + READ(dmPanningHeight, "DefaultSettings.YPanning") + READ(dmDisplayOrientation, "DefaultSettings.Orientation") + READ(dmDisplayFixedOutput, "DefaultSettings.FixedOutput") + READ(dmPosition.x, "Attach.RelativeX") + READ(dmPosition.y, "Attach.RelativeY") +#undef READ + {0} + }; + + hKey = EngpGetRegistryHandleFromDeviceMap(pGraphicsDevice); + if (!hKey) + return STATUS_UNSUCCESSFUL; + + Status = RtlQueryRegistryValues(RTL_REGISTRY_HANDLE, + (PWSTR)hKey, + DisplaySettingsTable, + NULL, + NULL); + + ZwClose(hKey); + return Status; +} + extern VOID UserRefreshDisplay(IN PPDEVOBJ ppdev); diff --git a/win32ss/gdi/eng/device.h b/win32ss/gdi/eng/device.h index cb211d4c055..5791e5a5591 100644 --- a/win32ss/gdi/eng/device.h +++ b/win32ss/gdi/eng/device.h @@ -35,6 +35,19 @@ EngpRegisterGraphicsDevice( NTSTATUS EngpUpdateGraphicsDeviceList(VOID); +/* Read configuration of a graphics card from registry: + * - pGraphicsDevice: instance of the graphics card + * - pdm: on output, contains the values read in registry + * - pdwAccelerationLevel: acceleration level stored in registry + * Return value: a STATUS_* value + * Assume that pdm has already been zero-filled. + * Note that dmFields is not updated. */ +NTSTATUS +EngpGetDisplayDriverParameters( + _In_ PGRAPHICS_DEVICE pGraphicsDevice, + _Out_ PDEVMODEW pdm, + _Out_opt_ PDWORD pdwAccelerationLevel); + CODE_SEG("INIT") NTSTATUS NTAPI

2 years, 7 months

[reactos] 03/05: [WIN32SS] In LDEVOBJ_bGetClosestMode, search 60 Hz if everything failed

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=900beca021a677b2a3709… commit 900beca021a677b2a3709f1a4621714db51aa779 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun May 22 14:13:48 2022 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sun May 22 17:32:08 2022 +0200 [WIN32SS] In LDEVOBJ_bGetClosestMode, search 60 Hz if everything failed This function needs probably to be rewritten. --- win32ss/gdi/eng/ldevobj.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/win32ss/gdi/eng/ldevobj.c b/win32ss/gdi/eng/ldevobj.c index cb6a8bbbe32..4a929ec4d24 100644 --- a/win32ss/gdi/eng/ldevobj.c +++ b/win32ss/gdi/eng/ldevobj.c @@ -688,6 +688,15 @@ LDEVOBJ_bGetClosestMode( if (LDEVOBJ_bProbeAndCaptureDevmode(pGraphicsDevice, RequestedMode, pSelectedMode, FALSE)) return TRUE; + /* Search 60 Hz (if not already specified) */ + if (!(RequestedMode->dmFields & DM_DISPLAYFREQUENCY)) + { + RequestedMode->dmDisplayFrequency = 60; + RequestedMode->dmFields |= DM_DISPLAYFREQUENCY; + if (LDEVOBJ_bProbeAndCaptureDevmode(pGraphicsDevice, RequestedMode, pSelectedMode, FALSE)) + return TRUE; + } + /* Fall back to first mode */ WARN("Fall back to first available mode\n"); *pSelectedMode = pGraphicsDevice->pDevModeList[0].pdm;

2 years, 7 months

← Newer
1
2
3
4
5
6
7
8
9
...
17
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 May 2022