Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [WINLOGON] Protect function calls to '3rd-party' DLLs by SEH. (#4743)
by Hermès Bélusca-Maïto 04 Oct '22

04 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=967f5b98983928e1884e8… commit 967f5b98983928e1884e824371e7002dbd417308 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Sep 30 20:40:43 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Oct 4 23:14:35 2022 +0200 [WINLOGON] Protect function calls to '3rd-party' DLLs by SEH. (#4743) This includes: - Notification dll calling in CallNotificationDll(). - winmm.dll API calling (e.g. PlaySound) in PlaySoundRoutine(). Also: - Fix dwKeyName usage in RegEnumKeyExW() specifying a number of *characters*. --- base/system/winlogon/CMakeLists.txt | 2 +- base/system/winlogon/notify.c | 44 +++++++++++++++++++++++-------------- base/system/winlogon/sas.c | 26 +++++++++++++--------- base/system/winlogon/winlogon.h | 9 ++++++-- 4 files changed, 51 insertions(+), 30 deletions(-) diff --git a/base/system/winlogon/CMakeLists.txt b/base/system/winlogon/CMakeLists.txt index 06ff9241c91..18f9f79a328 100644 --- a/base/system/winlogon/CMakeLists.txt +++ b/base/system/winlogon/CMakeLists.txt @@ -21,7 +21,7 @@ list(APPEND SOURCE add_rc_deps(winlogon.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/winlogon.ico) add_executable(winlogon ${SOURCE} winlogon.rc) -target_link_libraries(winlogon wine) +target_link_libraries(winlogon wine ${PSEH_LIB}) set_module_type(winlogon win32gui) add_importlibs(winlogon user32 advapi32 userenv secur32 rpcrt4 mpr msvcrt kernel32 ntdll) add_pch(winlogon winlogon.h SOURCE) diff --git a/base/system/winlogon/notify.c b/base/system/winlogon/notify.c index d84e06af47f..3aa3e0d98ec 100644 --- a/base/system/winlogon/notify.c +++ b/base/system/winlogon/notify.c @@ -278,7 +278,7 @@ InitNotifications(VOID) dwIndex = 0; for(;;) { - dwKeyName = 80 * sizeof(WCHAR); + dwKeyName = ARRAYSIZE(szKeyName); lError = RegEnumKeyExW(hNotifyKey, dwIndex, szKeyName, @@ -312,11 +312,8 @@ CallNotificationDll( NOTIFICATION_TYPE Type, PWLX_NOTIFICATION_INFO pInfo) { - HKEY hDllKey = NULL; - HMODULE hModule = NULL; + HMODULE hModule; CHAR szFuncBuffer[128]; - DWORD dwSize; - DWORD dwType; DWORD dwError = ERROR_SUCCESS; PWLX_NOTIFY_HANDLER pNotifyHandler; @@ -338,6 +335,10 @@ CallNotificationDll( } else { + HKEY hDllKey; + DWORD dwSize; + DWORD dwType; + dwError = RegOpenKeyExW(hNotifyKey, NotificationDll->pszKeyName, 0, @@ -356,23 +357,32 @@ CallNotificationDll( &dwType, (PBYTE)szFuncBuffer, &dwSize); + + RegCloseKey(hDllKey); } - if (dwError == ERROR_SUCCESS) - { - hModule = LoadLibraryW(NotificationDll->pszDllName); - if (hModule != NULL) - { - pNotifyHandler = (PWLX_NOTIFY_HANDLER)GetProcAddress(hModule, szFuncBuffer); - if (pNotifyHandler != NULL) - pNotifyHandler(pInfo); + if (dwError != ERROR_SUCCESS) + return; - FreeLibrary(hModule); - } + hModule = LoadLibraryW(NotificationDll->pszDllName); + if (!hModule) + return; + + pNotifyHandler = (PWLX_NOTIFY_HANDLER)GetProcAddress(hModule, szFuncBuffer); + + _SEH2_TRY + { + if (pNotifyHandler) + pNotifyHandler(pInfo); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ERR("WL: Exception while running notification %S!%s, Status 0x%08lx\n", + NotificationDll->pszDllName, szFuncBuffer, _SEH2_GetExceptionCode()); } + _SEH2_END; - if (hDllKey != NULL) - RegCloseKey(hDllKey); + FreeLibrary(hModule); } diff --git a/base/system/winlogon/sas.c b/base/system/winlogon/sas.c index a78733b7771..bc37d5db49d 100644 --- a/base/system/winlogon/sas.c +++ b/base/system/winlogon/sas.c @@ -251,30 +251,36 @@ PlaySoundRoutine( BOOL Ret = FALSE; hLibrary = LoadLibraryW(L"winmm.dll"); - if (hLibrary) + if (!hLibrary) + return FALSE; + + waveOutGetNumDevs = (WAVEOUTGETNUMDEVS)GetProcAddress(hLibrary, "waveOutGetNumDevs"); + Play = (PLAYSOUNDW)GetProcAddress(hLibrary, "PlaySoundW"); + + _SEH2_TRY { - waveOutGetNumDevs = (WAVEOUTGETNUMDEVS)GetProcAddress(hLibrary, "waveOutGetNumDevs"); if (waveOutGetNumDevs) { NumDevs = waveOutGetNumDevs(); if (!NumDevs) { if (!bLogon) - { Beep(440, 125); - } - FreeLibrary(hLibrary); - return FALSE; + _SEH2_LEAVE; } } - Play = (PLAYSOUNDW)GetProcAddress(hLibrary, "PlaySoundW"); if (Play) - { Ret = Play(FileName, NULL, Flags); - } - FreeLibrary(hLibrary); } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ERR("WL: Exception while playing sound '%S', Status 0x%08lx\n", + FileName ? FileName : L"(n/a)", _SEH2_GetExceptionCode()); + } + _SEH2_END; + + FreeLibrary(hLibrary); return Ret; } diff --git a/base/system/winlogon/winlogon.h b/base/system/winlogon/winlogon.h index 668fd3e0ad2..3dcf6fda0c3 100644 --- a/base/system/winlogon/winlogon.h +++ b/base/system/winlogon/winlogon.h @@ -26,10 +26,12 @@ #ifndef __WINLOGON_MAIN_H__ #define __WINLOGON_MAIN_H__ -#include <stdarg.h> - #define USE_GETLASTINPUTINFO + +#include <stdarg.h> + +/* PSDK/NDK Headers */ #define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> @@ -41,6 +43,9 @@ #include <ndk/exfuncs.h> #include <strsafe.h> +/* PSEH for SEH Support */ +#include <pseh/pseh2.h> + #include <reactos/undocuser.h> #include <reactos/undocmpr.h>

1 0

[reactos] 02/02: [DESK] Fix screensaver preview drawing
by Stanislav Motylkov 04 Oct '22

04 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab3e0002a6197cd096bee… commit ab3e0002a6197cd096bee57ffe24489d94cae440 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Oct 3 17:34:10 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue Oct 4 21:16:08 2022 +0300 [DESK] Fix screensaver preview drawing Use window subclassing to override WM_PAINT message handling and use RedrawWindow function along with WS_CLIPCHILDREN style for the parent window in order to preserve screensaver drawing. CORE-15929 --- dll/cpl/desk/screensaver.c | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/dll/cpl/desk/screensaver.c b/dll/cpl/desk/screensaver.c index f4b81612ca3..6041c533b60 100644 --- a/dll/cpl/desk/screensaver.c +++ b/dll/cpl/desk/screensaver.c @@ -27,6 +27,7 @@ typedef struct _DATA ScreenSaverItem ScreenSaverItems[MAX_SCREENSAVERS]; PROCESS_INFORMATION PrevWindowPi; int Selection; + WNDPROC OldPreviewProc; UINT ScreenSaverCount; HWND ScreenSaverPreviewParent; } DATA, *PDATA; @@ -107,6 +108,33 @@ SelectionChanged(HWND hwndDlg, PDATA pData) } +LRESULT CALLBACK +RedrawSubclassProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + HWND hwnd; + PDATA pData; + LRESULT Ret = FALSE; + + pData = (PDATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); + if (!pData) + return Ret; + + Ret = CallWindowProc(pData->OldPreviewProc, hwndDlg, uMsg, wParam, lParam); + + if (uMsg == WM_PAINT) + { + hwnd = pData->ScreenSaverPreviewParent; + if (hwnd) + RedrawWindow(hwnd, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_ALLCHILDREN); + } + + return Ret; +} + + static VOID ShowScreenSaverPreview(IN LPDRAWITEMSTRUCT draw, IN PDATA pData) { @@ -650,8 +678,16 @@ OnInitDialog(HWND hwndDlg, PDATA pData) HWND hParent = GetDlgItem(hwndDlg, IDC_SCREENS_PREVIEW); HWND hChild; + if (hParent != NULL) + { + pData->OldPreviewProc = (WNDPROC)GetWindowLongPtr(hParent, GWLP_WNDPROC); + SetWindowLongPtr(hParent, GWLP_WNDPROC, (LONG_PTR)RedrawSubclassProc); + SetWindowLongPtr(hParent, GWLP_USERDATA, (LONG_PTR)pData); + } + hChild = CreateWindowEx(0, szPreviewWndClass, NULL, - WS_CHILD, 0, 0, 0, 0, hParent, + WS_CHILD | WS_CLIPCHILDREN, + 0, 0, 0, 0, hParent, NULL, hApplet, NULL); if (hChild != NULL) { @@ -781,6 +817,9 @@ ScreenSaverPageProc(HWND hwndDlg, { if (pData->ScreenSaverPreviewParent) { + SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_SCREENS_PREVIEW), + GWLP_WNDPROC, + (LONG_PTR)pData->OldPreviewProc); DestroyWindow(pData->ScreenSaverPreviewParent); pData->ScreenSaverPreviewParent = NULL; }

1 0

[reactos] 01/02: [DESK] Show screensaver preview in a monitor
by Stanislav Motylkov 04 Oct '22

04 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=092fc8edd0c8895e361a3… commit 092fc8edd0c8895e361a3dda5d90f185a1145ac8 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Oct 3 17:32:42 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue Oct 4 21:16:07 2022 +0300 [DESK] Show screensaver preview in a monitor Reuse the same monitor bitmap for the top preview control. Also use Windows-compatible class name for it. CORE-10606 --- dll/cpl/desk/lang/bg-BG.rc | 2 +- dll/cpl/desk/lang/cs-CZ.rc | 2 +- dll/cpl/desk/lang/de-DE.rc | 2 +- dll/cpl/desk/lang/el-GR.rc | 2 +- dll/cpl/desk/lang/en-GB.rc | 2 +- dll/cpl/desk/lang/en-US.rc | 2 +- dll/cpl/desk/lang/es-ES.rc | 2 +- dll/cpl/desk/lang/et-EE.rc | 2 +- dll/cpl/desk/lang/fr-FR.rc | 2 +- dll/cpl/desk/lang/he-IL.rc | 2 +- dll/cpl/desk/lang/hu-HU.rc | 2 +- dll/cpl/desk/lang/id-ID.rc | 2 +- dll/cpl/desk/lang/it-IT.rc | 2 +- dll/cpl/desk/lang/ja-JP.rc | 2 +- dll/cpl/desk/lang/nl-NL.rc | 2 +- dll/cpl/desk/lang/no-NO.rc | 2 +- dll/cpl/desk/lang/pl-PL.rc | 2 +- dll/cpl/desk/lang/pt-BR.rc | 2 +- dll/cpl/desk/lang/pt-PT.rc | 2 +- dll/cpl/desk/lang/ro-RO.rc | 2 +- dll/cpl/desk/lang/ru-RU.rc | 2 +- dll/cpl/desk/lang/sk-SK.rc | 2 +- dll/cpl/desk/lang/sq-AL.rc | 2 +- dll/cpl/desk/lang/sv-SE.rc | 2 +- dll/cpl/desk/lang/tr-TR.rc | 2 +- dll/cpl/desk/lang/uk-UA.rc | 2 +- dll/cpl/desk/lang/zh-CN.rc | 2 +- dll/cpl/desk/lang/zh-HK.rc | 2 +- dll/cpl/desk/lang/zh-TW.rc | 2 +- dll/cpl/desk/screensaver.c | 89 +++++++++++++++++++++++++++++++++++++++++++++- 30 files changed, 117 insertions(+), 30 deletions(-) diff --git a/dll/cpl/desk/lang/bg-BG.rc b/dll/cpl/desk/lang/bg-BG.rc index b742bfd45b1..4dae3f7b9ae 100644 --- a/dll/cpl/desk/lang/bg-BG.rc +++ b/dll/cpl/desk/lang/bg-BG.rc @@ -33,7 +33,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Екранен предпазител" FONT 8, "MS Shell Dlg", 0, 0 BEGIN - CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 GROUPBOX "&Екранен предпазител", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "На&стройки", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP diff --git a/dll/cpl/desk/lang/cs-CZ.rc b/dll/cpl/desk/lang/cs-CZ.rc index 386411e122d..9d083f1936e 100644 --- a/dll/cpl/desk/lang/cs-CZ.rc +++ b/dll/cpl/desk/lang/cs-CZ.rc @@ -39,7 +39,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Spořič obrazovky" FONT 8, "MS Shell Dlg", 0, 0 BEGIN - CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 GROUPBOX "&Spořič obrazovky", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Nastavení", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP diff --git a/dll/cpl/desk/lang/de-DE.rc b/dll/cpl/desk/lang/de-DE.rc index d83f0b84916..ddf5cb6ed79 100644 --- a/dll/cpl/desk/lang/de-DE.rc +++ b/dll/cpl/desk/lang/de-DE.rc @@ -33,7 +33,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Bildschirmschoner" FONT 8, "MS Shell Dlg", 0, 0 BEGIN - CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 GROUPBOX "Bild&schirmschoner", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Eins&tellungen", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP diff --git a/dll/cpl/desk/lang/el-GR.rc b/dll/cpl/desk/lang/el-GR.rc index c3a5444845e..6678325805b 100644 --- a/dll/cpl/desk/lang/el-GR.rc +++ b/dll/cpl/desk/lang/el-GR.rc @@ -33,7 +33,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Προφύλαξη οθόνης" FONT 8, "MS Shell Dlg", 0, 0 BEGIN - CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 GROUPBOX "Προφύλαξη οθόνης", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Ρυθμίσεις", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP diff --git a/dll/cpl/desk/lang/en-GB.rc b/dll/cpl/desk/lang/en-GB.rc index d0fc9282a17..11609378370 100644 --- a/dll/cpl/desk/lang/en-GB.rc +++ b/dll/cpl/desk/lang/en-GB.rc @@ -33,7 +33,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Screensaver" FONT 8, "MS Shell Dlg", 0, 0 BEGIN - CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 GROUPBOX "&Screensaver", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Se&ttings", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP diff --git a/dll/cpl/desk/lang/en-US.rc b/dll/cpl/desk/lang/en-US.rc index 12cc26ce914..2de5355fc14 100644 --- a/dll/cpl/desk/lang/en-US.rc +++ b/dll/cpl/desk/lang/en-US.rc @@ -33,7 +33,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Screensaver" FONT 8, "MS Shell Dlg", 0, 0 BEGIN - CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 GROUPBOX "&Screensaver", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Se&ttings", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP diff --git a/dll/cpl/desk/lang/es-ES.rc b/dll/cpl/desk/lang/es-ES.rc index 21ce9e4fe2c..244ec1931f4 100644 --- a/dll/cpl/desk/lang/es-ES.rc +++ b/dll/cpl/desk/lang/es-ES.rc @@ -43,7 +43,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Protector de pantalla" FONT 8, "MS Shell Dlg", 0, 0 BEGIN - CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 GROUPBOX "&Protector de pantalla ", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "C&onfiguración", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP diff --git a/dll/cpl/desk/lang/et-EE.rc b/dll/cpl/desk/lang/et-EE.rc index 4436b9c0b73..74b1198e85b 100644 --- a/dll/cpl/desk/lang/et-EE.rc +++ b/dll/cpl/desk/lang/et-EE.rc @@ -40,7 +40,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ekraanisäästja" FONT 8, "MS Shell Dlg", 0, 0 BEGIN - CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 GROUPBOX "&Erkaanisäästja", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "S&ätted", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP diff --git a/dll/cpl/desk/lang/fr-FR.rc b/dll/cpl/desk/lang/fr-FR.rc index 9f8a90e1e0b..1cf8f9868c1 100644 --- a/dll/cpl/desk/lang/fr-FR.rc +++ b/dll/cpl/desk/lang/fr-FR.rc @@ -35,7 +35,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Écran de veille" FONT 8, "MS Shell Dlg", 0, 0 BEGIN - CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 GROUPBOX "É&cran de veille", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Paramè&tres", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP diff --git a/dll/cpl/desk/lang/he-IL.rc b/dll/cpl/desk/lang/he-IL.rc index e5b4c511655..60e1156616d 100644 --- a/dll/cpl/desk/lang/he-IL.rc +++ b/dll/cpl/desk/lang/he-IL.rc @@ -33,7 +33,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "שומר מסך" FONT 8, "MS Shell Dlg", 0, 0 BEGIN - CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 GROUPBOX "שומר מסך", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "הגדרות", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP diff --git a/dll/cpl/desk/lang/hu-HU.rc b/dll/cpl/desk/lang/hu-HU.rc index f96f7c872c6..1f3d1b70309 100644 --- a/dll/cpl/desk/lang/hu-HU.rc +++ b/dll/cpl/desk/lang/hu-HU.rc @@ -35,7 +35,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Képernyőkímélő" FONT 8, "MS Shell Dlg", 0, 0 BEGIN - CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 GROUPBOX "&Képernyőkímélő", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Beállítások", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP diff --git a/dll/cpl/desk/lang/id-ID.rc b/dll/cpl/desk/lang/id-ID.rc index a2f0a2fe2dc..5e85b95bbca 100644 --- a/dll/cpl/desk/lang/id-ID.rc +++ b/dll/cpl/desk/lang/id-ID.rc @@ -33,7 +33,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Screensaver" FONT 8, "MS Shell Dlg", 0, 0 BEGIN - CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 GROUPBOX "&Screensaver", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Se&telan", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP diff --git a/dll/cpl/desk/lang/it-IT.rc b/dll/cpl/desk/lang/it-IT.rc index d66cf49191d..e96ec2d79d6 100644 --- a/dll/cpl/desk/lang/it-IT.rc +++ b/dll/cpl/desk/lang/it-IT.rc @@ -33,7 +33,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Salva schermo" FONT 8, "MS Shell Dlg", 0, 0 BEGIN - CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 GROUPBOX "&Salva schermo", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Impostazioni", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP diff --git a/dll/cpl/desk/lang/ja-JP.rc b/dll/cpl/desk/lang/ja-JP.rc index 432b61a7fef..e98ce8bca89 100644 --- a/dll/cpl/desk/lang/ja-JP.rc +++ b/dll/cpl/desk/lang/ja-JP.rc @@ -33,7 +33,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "スクリーンセーバー" FONT 9, "MS UI Gothic", 0, 0 BEGIN - CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 GROUPBOX "スクリーンセーバー(&S)", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "設定(&T)", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP diff --git a/dll/cpl/desk/lang/nl-NL.rc b/dll/cpl/desk/lang/nl-NL.rc index fca749f8c8f..6487d1ee77e 100644 --- a/dll/cpl/desk/lang/nl-NL.rc +++ b/dll/cpl/desk/lang/nl-NL.rc @@ -33,7 +33,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Schermbeveiliging" FONT 8, "MS Shell Dlg", 0, 0 BEGIN - CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 GROUPBOX "&Schermbeveiliging", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Instellingen", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP diff --git a/dll/cpl/desk/lang/no-NO.rc b/dll/cpl/desk/lang/no-NO.rc index d6520cb9f0c..9fa117f234e 100644 --- a/dll/cpl/desk/lang/no-NO.rc +++ b/dll/cpl/desk/lang/no-NO.rc @@ -33,7 +33,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Skjermsparer" FONT 8, "MS Shell Dlg", 0, 0 BEGIN - CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 GROUPBOX "&Skjermsparer", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Inn&stillinger", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP diff --git a/dll/cpl/desk/lang/pl-PL.rc b/dll/cpl/desk/lang/pl-PL.rc index e88a01a9988..8409da7729a 100644 --- a/dll/cpl/desk/lang/pl-PL.rc +++ b/dll/cpl/desk/lang/pl-PL.rc @@ -43,7 +43,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Wygaszacz ekranu" FONT 8, "MS Shell Dlg", 0, 0 BEGIN - CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 GROUPBOX "&Wygaszacz ekranu", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Ustawienia", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP diff --git a/dll/cpl/desk/lang/pt-BR.rc b/dll/cpl/desk/lang/pt-BR.rc index 2a524c8c992..ea7bbfcc074 100644 --- a/dll/cpl/desk/lang/pt-BR.rc +++ b/dll/cpl/desk/lang/pt-BR.rc @@ -33,7 +33,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Proteção de tela" FONT 8, "MS Shell Dlg", 0, 0 BEGIN - CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 GROUPBOX "Proteção de &tela", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Configurações", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP diff --git a/dll/cpl/desk/lang/pt-PT.rc b/dll/cpl/desk/lang/pt-PT.rc index 2c93d48cbbf..5275419926f 100644 --- a/dll/cpl/desk/lang/pt-PT.rc +++ b/dll/cpl/desk/lang/pt-PT.rc @@ -38,7 +38,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Protecção de ecrã" FONT 8, "MS Shell Dlg", 0, 0 BEGIN - CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 GROUPBOX "Protecção de &ecrã", IDC_SCREENS_DUMMY, 8, 92, 230, 64 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Definições", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP diff --git a/dll/cpl/desk/lang/ro-RO.rc b/dll/cpl/desk/lang/ro-RO.rc index bf87ce2334d..a6655c12562 100644 --- a/dll/cpl/desk/lang/ro-RO.rc +++ b/dll/cpl/desk/lang/ro-RO.rc @@ -38,7 +38,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Regim de inactivitate" FONT 8, "MS Shell Dlg", 0, 0 BEGIN - CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 GROUPBOX "Ani&mație de ecran inactiv", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Opțiuni", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP diff --git a/dll/cpl/desk/lang/ru-RU.rc b/dll/cpl/desk/lang/ru-RU.rc index c48b93a8c78..afe0555ac7f 100644 --- a/dll/cpl/desk/lang/ru-RU.rc +++ b/dll/cpl/desk/lang/ru-RU.rc @@ -33,7 +33,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Заставка" FONT 8, "MS Shell Dlg", 0, 0 BEGIN - CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 GROUPBOX "&Заставка", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Параметры", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP diff --git a/dll/cpl/desk/lang/sk-SK.rc b/dll/cpl/desk/lang/sk-SK.rc index fd458e45db3..ce7e673f425 100644 --- a/dll/cpl/desk/lang/sk-SK.rc +++ b/dll/cpl/desk/lang/sk-SK.rc @@ -35,7 +35,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Šetrič obrazovky" FONT 8, "MS Shell Dlg", 0, 0 BEGIN - CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 GROUPBOX "Šetrič o&brazovky", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Nastavenie", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP diff --git a/dll/cpl/desk/lang/sq-AL.rc b/dll/cpl/desk/lang/sq-AL.rc index b6b504e1e49..5722554caab 100644 --- a/dll/cpl/desk/lang/sq-AL.rc +++ b/dll/cpl/desk/lang/sq-AL.rc @@ -37,7 +37,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Screensaver" FONT 8, "MS Shell Dlg", 0, 0 BEGIN - CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 GROUPBOX "&Screensaver", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Cilësime&t", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP diff --git a/dll/cpl/desk/lang/sv-SE.rc b/dll/cpl/desk/lang/sv-SE.rc index 409fc3f491b..2533296827e 100644 --- a/dll/cpl/desk/lang/sv-SE.rc +++ b/dll/cpl/desk/lang/sv-SE.rc @@ -35,7 +35,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Screensaver" FONT 8, "MS Shell Dlg", 0, 0 BEGIN - CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 GROUPBOX "&Screensaver", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Se&ttings", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP diff --git a/dll/cpl/desk/lang/tr-TR.rc b/dll/cpl/desk/lang/tr-TR.rc index c828f0b5cb9..759472c8f13 100644 --- a/dll/cpl/desk/lang/tr-TR.rc +++ b/dll/cpl/desk/lang/tr-TR.rc @@ -35,7 +35,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ekran Koruyucu" FONT 8, "MS Shell Dlg", 0, 0 BEGIN - CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 GROUPBOX "Ekran Koruyucu", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Ayarlar", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP diff --git a/dll/cpl/desk/lang/uk-UA.rc b/dll/cpl/desk/lang/uk-UA.rc index 5e9d3a285e2..4343a9ad45d 100644 --- a/dll/cpl/desk/lang/uk-UA.rc +++ b/dll/cpl/desk/lang/uk-UA.rc @@ -41,7 +41,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Заставка" FONT 8, "MS Shell Dlg", 0, 0 BEGIN - CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 GROUPBOX "&Заставка", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "П&араметри", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP diff --git a/dll/cpl/desk/lang/zh-CN.rc b/dll/cpl/desk/lang/zh-CN.rc index a9a51d7d598..df8d1e8ab74 100644 --- a/dll/cpl/desk/lang/zh-CN.rc +++ b/dll/cpl/desk/lang/zh-CN.rc @@ -43,7 +43,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "屏幕保护程序" FONT 9, "宋体", 0, 0 BEGIN - CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 GROUPBOX "屏幕保护程序(&S)", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "设置(&T)...", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP diff --git a/dll/cpl/desk/lang/zh-HK.rc b/dll/cpl/desk/lang/zh-HK.rc index 2e42c33b408..62fa240f8c1 100644 --- a/dll/cpl/desk/lang/zh-HK.rc +++ b/dll/cpl/desk/lang/zh-HK.rc @@ -41,7 +41,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "螢幕保護裝置" FONT 9, "新細明體", 0, 0 BEGIN - CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 GROUPBOX "螢幕保護裝置(&S)", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "設定(&T)...", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP diff --git a/dll/cpl/desk/lang/zh-TW.rc b/dll/cpl/desk/lang/zh-TW.rc index 2f8a659304c..8f08fefd871 100644 --- a/dll/cpl/desk/lang/zh-TW.rc +++ b/dll/cpl/desk/lang/zh-TW.rc @@ -42,7 +42,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "螢幕保護裝置" FONT 9, "新細明體", 0, 0 BEGIN - CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 GROUPBOX "螢幕保護裝置(&S)", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "設定(&T)...", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP diff --git a/dll/cpl/desk/screensaver.c b/dll/cpl/desk/screensaver.c index 02c05c9b650..f4b81612ca3 100644 --- a/dll/cpl/desk/screensaver.c +++ b/dll/cpl/desk/screensaver.c @@ -12,6 +12,8 @@ #define MAX_SCREENSAVERS 100 +static const TCHAR szPreviewWndClass[] = TEXT("SSDemoParent"); + typedef struct { BOOL bIsScreenSaver; /* Is this background a wallpaper */ @@ -26,6 +28,7 @@ typedef struct _DATA PROCESS_INFORMATION PrevWindowPi; int Selection; UINT ScreenSaverCount; + HWND ScreenSaverPreviewParent; } DATA, *PDATA; @@ -104,10 +107,48 @@ SelectionChanged(HWND hwndDlg, PDATA pData) } +static VOID +ShowScreenSaverPreview(IN LPDRAWITEMSTRUCT draw, IN PDATA pData) +{ + HBRUSH hBrush; + HDC hDC; + HGDIOBJ hOldObj; + RECT rcItem = { + MONITOR_LEFT, + MONITOR_TOP, + MONITOR_RIGHT, + MONITOR_BOTTOM + }; + + hDC = CreateCompatibleDC(draw->hDC); + hOldObj = SelectObject(hDC, g_GlobalData.hMonitorBitmap); + + if (!IsWindowVisible(pData->ScreenSaverPreviewParent)) + { + /* FIXME: Draw static bitmap inside monitor. */ + hBrush = CreateSolidBrush(g_GlobalData.desktop_color); + FillRect(hDC, &rcItem, hBrush); + DeleteObject(hBrush); + } + + GdiTransparentBlt(draw->hDC, + draw->rcItem.left, draw->rcItem.top, + draw->rcItem.right - draw->rcItem.left + 1, + draw->rcItem.bottom - draw->rcItem.top + 1, + hDC, + 0, 0, + g_GlobalData.bmMonWidth, g_GlobalData.bmMonHeight, + MONITOR_ALPHA); + + SelectObject(hDC, hOldObj); + DeleteDC(hDC); +} + + static VOID SetScreenSaverPreviewBox(HWND hwndDlg, PDATA pData) { - HWND hPreview = GetDlgItem(hwndDlg, IDC_SCREENS_PREVIEW); + HWND hPreview = pData->ScreenSaverPreviewParent; STARTUPINFO si; TCHAR szCmdline[2048]; @@ -119,6 +160,7 @@ SetScreenSaverPreviewBox(HWND hwndDlg, PDATA pData) CloseHandle(pData->PrevWindowPi.hThread); pData->PrevWindowPi.hThread = pData->PrevWindowPi.hProcess = NULL; } + ShowWindow(pData->ScreenSaverPreviewParent, SW_HIDE); if (pData->Selection > 0) { @@ -131,6 +173,8 @@ SetScreenSaverPreviewBox(HWND hwndDlg, PDATA pData) si.cb = sizeof(si); ZeroMemory(&pData->PrevWindowPi, sizeof(pData->PrevWindowPi)); + ShowWindow(pData->ScreenSaverPreviewParent, SW_SHOW); + if (!CreateProcess(NULL, szCmdline, NULL, @@ -584,6 +628,7 @@ OnInitDialog(HWND hwndDlg, PDATA pData) LPTSTR lpCurSs; HWND hwndSSCombo = GetDlgItem(hwndDlg, IDC_SCREENS_LIST); INT Num; + WNDCLASS wc = {0}; pData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -594,6 +639,32 @@ OnInitDialog(HWND hwndDlg, PDATA pData) return FALSE; } + wc.lpfnWndProc = DefWindowProc; + wc.hInstance = hApplet; + wc.hCursor = NULL; + wc.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH); + wc.lpszClassName = szPreviewWndClass; + + if (RegisterClass(&wc)) + { + HWND hParent = GetDlgItem(hwndDlg, IDC_SCREENS_PREVIEW); + HWND hChild; + + hChild = CreateWindowEx(0, szPreviewWndClass, NULL, + WS_CHILD, 0, 0, 0, 0, hParent, + NULL, hApplet, NULL); + if (hChild != NULL) + { + RECT rc; + GetClientRect(hParent, &rc); + rc.left += MONITOR_LEFT; + rc.top += MONITOR_TOP; + MoveWindow(hChild, rc.left, rc.top, MONITOR_WIDTH, MONITOR_HEIGHT, FALSE); + } + + pData->ScreenSaverPreviewParent = hChild; + } + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pData); @@ -708,6 +779,12 @@ ScreenSaverPageProc(HWND hwndDlg, case WM_DESTROY: { + if (pData->ScreenSaverPreviewParent) + { + DestroyWindow(pData->ScreenSaverPreviewParent); + pData->ScreenSaverPreviewParent = NULL; + } + UnregisterClass(szPreviewWndClass, hApplet); if (pData->PrevWindowPi.hProcess) { TerminateProcess(pData->PrevWindowPi.hProcess, 0); @@ -727,6 +804,16 @@ ScreenSaverPageProc(HWND hwndDlg, break; } + case WM_DRAWITEM: + { + LPDRAWITEMSTRUCT lpDrawItem; + lpDrawItem = (LPDRAWITEMSTRUCT)lParam; + + if (lpDrawItem->CtlID == IDC_SCREENS_PREVIEW) + ShowScreenSaverPreview(lpDrawItem, pData); + break; + } + case WM_COMMAND: { DWORD controlId = LOWORD(wParam);

1 0

[reactos] 01/01: [REACTOS][CPL] Coding style fixes only
by Stanislav Motylkov 04 Oct '22

04 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d5bd08fca429624869001… commit d5bd08fca429624869001b926d2cf134865c8618 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Oct 4 21:14:31 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue Oct 4 21:14:31 2022 +0300 [REACTOS][CPL] Coding style fixes only --- base/applications/mstsc/connectdialog.c | 2 +- dll/cpl/desk/settings.c | 2 +- dll/cpl/sysdm/general.c | 2 +- dll/cpl/timedate/timezone.c | 2 +- modules/rostests/tests/statst2/statst2.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/base/applications/mstsc/connectdialog.c b/base/applications/mstsc/connectdialog.c index 5e3d2720f69..3795a7f0640 100644 --- a/base/applications/mstsc/connectdialog.c +++ b/base/applications/mstsc/connectdialog.c @@ -944,7 +944,7 @@ DisplayDlgProc(HWND hDlg, case WM_DRAWITEM: { LPDRAWITEMSTRUCT lpDrawItem; - lpDrawItem = (LPDRAWITEMSTRUCT) lParam; + lpDrawItem = (LPDRAWITEMSTRUCT)lParam; if(lpDrawItem->CtlID == IDC_COLORIMAGE) { HDC hdcMem; diff --git a/dll/cpl/desk/settings.c b/dll/cpl/desk/settings.c index 8784f4a9743..602df32800b 100644 --- a/dll/cpl/desk/settings.c +++ b/dll/cpl/desk/settings.c @@ -892,7 +892,7 @@ SettingsPageProc(IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lPar case WM_DRAWITEM: { LPDRAWITEMSTRUCT lpDrawItem; - lpDrawItem = (LPDRAWITEMSTRUCT) lParam; + lpDrawItem = (LPDRAWITEMSTRUCT)lParam; switch (lpDrawItem->CtlID) { diff --git a/dll/cpl/sysdm/general.c b/dll/cpl/sysdm/general.c index e09b4a44b6d..d6d1288786a 100644 --- a/dll/cpl/sysdm/general.c +++ b/dll/cpl/sysdm/general.c @@ -747,7 +747,7 @@ INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM case WM_DRAWITEM: { - LPDRAWITEMSTRUCT lpDrawItem = (LPDRAWITEMSTRUCT) lParam; + LPDRAWITEMSTRUCT lpDrawItem = (LPDRAWITEMSTRUCT)lParam; if (lpDrawItem->CtlID == IDC_ROSIMG) { diff --git a/dll/cpl/timedate/timezone.c b/dll/cpl/timedate/timezone.c index cd7361136a9..dcc8fab661a 100644 --- a/dll/cpl/timedate/timezone.c +++ b/dll/cpl/timedate/timezone.c @@ -285,7 +285,7 @@ TimeZonePageProc(HWND hwndDlg, case WM_DRAWITEM: { LPDRAWITEMSTRUCT lpDrawItem; - lpDrawItem = (LPDRAWITEMSTRUCT) lParam; + lpDrawItem = (LPDRAWITEMSTRUCT)lParam; if(lpDrawItem->CtlID == IDC_WORLD_BACKGROUND) { HDC hdcMem; diff --git a/modules/rostests/tests/statst2/statst2.c b/modules/rostests/tests/statst2/statst2.c index 6ac769ed38b..2cd856ce06b 100644 --- a/modules/rostests/tests/statst2/statst2.c +++ b/modules/rostests/tests/statst2/statst2.c @@ -100,7 +100,7 @@ LRESULT CALLBACK WndProc ( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) case WM_DRAWITEM: { - LPDRAWITEMSTRUCT lpDrawItem = (LPDRAWITEMSTRUCT) lParam; + LPDRAWITEMSTRUCT lpDrawItem = (LPDRAWITEMSTRUCT)lParam; DrawText ( lpDrawItem->hDC, "SS_DRAWITEM test successful!", 28, &(lpDrawItem->rcItem), 0 ); } break;

1 0

[reactos] 01/01: [EVENTVWR] Improve behaviour on event item selection. (#4746)
by Hermès Bélusca-Maïto 04 Oct '22

04 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ff3d1b7bb1644aa629dfb… commit ff3d1b7bb1644aa629dfb9a149956825f8e6502c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Oct 3 02:29:49 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Oct 4 17:29:10 2022 +0200 [EVENTVWR] Improve behaviour on event item selection. (#4746) CORE-18438 - Each event detail control stores its own "current" item index, so that there can be different event detail dialogs showing different events concurrently (half-plemented; this is a Win7-like feature). As such, give the index of the selected event item when sending the EVT_DISPLAY message, instead of having the details dialog retrieve everytime by itself the current selected item (that may change in-between calls, and can trigger the "No Items in ListView" error). - When pressing "Prev"/"Next" buttons, detect whether we already are at the top/bottom of the event log, and if so, prompt the user to continue around. Clear up any selected event in the list, before selecting the new one. (Note: the event list supports multiple selection, for future functionality.) --- base/applications/mscutils/eventvwr/eventvwr.c | 67 +++++++++-- base/applications/mscutils/eventvwr/evtdetctl.c | 152 ++++++++++++++---------- base/applications/mscutils/eventvwr/evtdetctl.h | 8 ++ 3 files changed, 153 insertions(+), 74 deletions(-) diff --git a/base/applications/mscutils/eventvwr/eventvwr.c b/base/applications/mscutils/eventvwr/eventvwr.c index a35daffab26..1dba37bf776 100644 --- a/base/applications/mscutils/eventvwr/eventvwr.c +++ b/base/applications/mscutils/eventvwr/eventvwr.c @@ -3362,16 +3362,44 @@ WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) if ( (pnmv->uChanged & LVIF_STATE) && /* The state has changed */ (pnmv->uNewState & LVIS_SELECTED) /* The item has been (de)selected */ ) { - if (hwndEventDetails) - SendMessageW(hwndEventDetails, EVT_DISPLAY, 0, 0); + if (!hwndEventDetails) + break; + + /* Verify the index of selected item */ + if (pnmv->iItem == -1) + { + MessageBoxW(hWnd, + L"No selected items!", + szTitle, + MB_OK | MB_ICONERROR); + break; + } + SendMessageW(hwndEventDetails, EVT_DISPLAY, 0, (LPARAM)pnmv->iItem); } break; } +#ifdef LVN_ITEMACTIVATE + case LVN_ITEMACTIVATE: + { + /* Get the index of the single focused selected item */ + LPNMITEMACTIVATE lpnmitem = (LPNMITEMACTIVATE)lParam; + INT iItem = lpnmitem->iItem; + if (iItem != -1) + SendMessageW(hWnd, WM_COMMAND, IDM_EVENT_DETAILS, (LPARAM)iItem); + break; + } +#else // LVN_ITEMACTIVATE case NM_DBLCLK: case NM_RETURN: - SendMessageW(hWnd, WM_COMMAND, IDM_EVENT_DETAILS, 0); + { + /* Get the index of the single focused selected item */ + INT iItem = ListView_GetNextItem(hwndListView, -1, LVNI_FOCUSED | LVNI_SELECTED); + if (iItem != -1) + SendMessageW(hWnd, WM_COMMAND, IDM_EVENT_DETAILS, (LPARAM)iItem); break; + } +#endif // LVN_ITEMACTIVATE } } else if (hdr->hwndFrom == hwndTreeView) @@ -3529,16 +3557,35 @@ WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case IDM_EVENT_DETAILS: { - // LPNMITEMACTIVATE lpnmitem = (LPNMITEMACTIVATE)lParam; - PEVENTLOGFILTER EventLogFilter = GetSelectedFilter(NULL); - if (/*lpnmitem->iItem != -1 &&*/ EventLogFilter) + INT iItem; + PEVENTLOGFILTER EventLogFilter; + + /* Get the index of the single focused selected item */ + iItem = ListView_GetNextItem(hwndListView, -1, LVNI_FOCUSED | LVNI_SELECTED); + if (iItem == -1) { + /** + // FIXME: Reenable this check once menu items are + // correctly disabled when no event is selected, etc. + MessageBoxW(hWnd, + L"No selected items!", + szTitle, + MB_OK | MB_ICONERROR); + **/ + break; + } + + EventLogFilter = GetSelectedFilter(NULL); + if (EventLogFilter) + { + EVENTDETAIL_INFO DetailInfo = {EventLogFilter, iItem}; + EventLogFilter_AddRef(EventLogFilter); DialogBoxParamW(hInst, MAKEINTRESOURCEW(IDD_EVENTDETAILS_DLG), hWnd, EventDetails, - (LPARAM)EventLogFilter); + (LPARAM)&DetailInfo); EventLogFilter_Release(EventLogFilter); } break; @@ -4272,6 +4319,7 @@ EventDetails(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { LONG_PTR dwStyle; RECT rcWnd, rect; + INT iEventItem; hWndDetailsCtrl = CreateEventDetailsCtrl(hInst, hDlg, lParam); if (!hWndDetailsCtrl) @@ -4333,8 +4381,9 @@ EventDetails(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) cxOld = rcWnd.right - rcWnd.left; cyOld = rcWnd.bottom - rcWnd.top; - /* Show event info on dialog control */ - SendMessageW(hWndDetailsCtrl, EVT_DISPLAY, 0, 0); + /* Show event info in dialog control */ + iEventItem = (lParam != 0 ? ((PEVENTDETAIL_INFO)lParam)->iEventItem : 0); + SendMessageW(hWndDetailsCtrl, EVT_DISPLAY, 0, (LPARAM)iEventItem); // SetWindowPos(hWndDetailsCtrl, NULL, // 0, 0, diff --git a/base/applications/mscutils/eventvwr/evtdetctl.c b/base/applications/mscutils/eventvwr/evtdetctl.c index 4cc6f9752cf..b476e4db847 100644 --- a/base/applications/mscutils/eventvwr/evtdetctl.c +++ b/base/applications/mscutils/eventvwr/evtdetctl.c @@ -14,6 +14,7 @@ // FIXME: #define EVENT_MESSAGE_EVENTTEXT_BUFFER (1024*10) +extern WCHAR szTitle[]; extern HWND hwndListView; extern BOOL GetEventMessage(IN LPCWSTR KeyName, @@ -24,7 +25,9 @@ GetEventMessage(IN LPCWSTR KeyName, typedef struct _DETAILDATA { + /* Data initialized from EVENTDETAIL_INFO */ PEVENTLOGFILTER EventLogFilter; + INT iEventItem; BOOL bDisplayWords; HFONT hMonospaceFont; @@ -37,8 +40,16 @@ typedef struct _DETAILDATA static VOID -DisplayEvent(HWND hDlg, PEVENTLOGFILTER EventLogFilter) +DisplayEvent( + _In_ HWND hDlg, + _In_ PDETAILDATA pDetailData) { + PEVENTLOGFILTER EventLogFilter = pDetailData->EventLogFilter; + INT iItem = pDetailData->iEventItem; + LVITEMW li; + PEVENTLOGRECORD pevlr; + BOOL bEventData; + WCHAR szEventType[MAX_PATH]; WCHAR szTime[MAX_PATH]; WCHAR szDate[MAX_PATH]; @@ -48,38 +59,22 @@ DisplayEvent(HWND hDlg, PEVENTLOGFILTER EventLogFilter) WCHAR szCategory[MAX_PATH]; WCHAR szEventID[MAX_PATH]; WCHAR szEventText[EVENT_MESSAGE_EVENTTEXT_BUFFER]; - BOOL bEventData = FALSE; - LVITEMW li; - PEVENTLOGRECORD pevlr; - int iIndex; - - /* Get index of selected item */ - iIndex = ListView_GetNextItem(hwndListView, -1, LVNI_SELECTED | LVNI_FOCUSED); - if (iIndex == -1) - { - MessageBoxW(hDlg, - L"No Items in ListView", - L"Error", - MB_OK | MB_ICONINFORMATION); - return; - } li.mask = LVIF_PARAM; - li.iItem = iIndex; + li.iItem = iItem; li.iSubItem = 0; - ListView_GetItem(hwndListView, &li); pevlr = (PEVENTLOGRECORD)li.lParam; - ListView_GetItemText(hwndListView, iIndex, 0, szEventType, ARRAYSIZE(szEventType)); - ListView_GetItemText(hwndListView, iIndex, 1, szDate, ARRAYSIZE(szDate)); - ListView_GetItemText(hwndListView, iIndex, 2, szTime, ARRAYSIZE(szTime)); - ListView_GetItemText(hwndListView, iIndex, 3, szSource, ARRAYSIZE(szSource)); - ListView_GetItemText(hwndListView, iIndex, 4, szCategory, ARRAYSIZE(szCategory)); - ListView_GetItemText(hwndListView, iIndex, 5, szEventID, ARRAYSIZE(szEventID)); - ListView_GetItemText(hwndListView, iIndex, 6, szUser, ARRAYSIZE(szUser)); - ListView_GetItemText(hwndListView, iIndex, 7, szComputer, ARRAYSIZE(szComputer)); + ListView_GetItemText(hwndListView, iItem, 0, szEventType, ARRAYSIZE(szEventType)); + ListView_GetItemText(hwndListView, iItem, 1, szDate, ARRAYSIZE(szDate)); + ListView_GetItemText(hwndListView, iItem, 2, szTime, ARRAYSIZE(szTime)); + ListView_GetItemText(hwndListView, iItem, 3, szSource, ARRAYSIZE(szSource)); + ListView_GetItemText(hwndListView, iItem, 4, szCategory, ARRAYSIZE(szCategory)); + ListView_GetItemText(hwndListView, iItem, 5, szEventID, ARRAYSIZE(szEventID)); + ListView_GetItemText(hwndListView, iItem, 6, szUser, ARRAYSIZE(szUser)); + ListView_GetItemText(hwndListView, iItem, 7, szComputer, ARRAYSIZE(szComputer)); SetDlgItemTextW(hDlg, IDC_EVENTDATESTATIC, szDate); SetDlgItemTextW(hDlg, IDC_EVENTTIMESTATIC, szTime); @@ -180,32 +175,23 @@ PrintWordDataLine(PWCHAR pBuffer, UINT uOffset, PULONG pData, UINT uLength) static VOID -DisplayEventData(HWND hDlg, BOOL bDisplayWords) +DisplayEventData( + _In_ HWND hDlg, + _In_ PDETAILDATA pDetailData) { + BOOL bDisplayWords = pDetailData->bDisplayWords; + INT iItem = pDetailData->iEventItem; LVITEMW li; PEVENTLOGRECORD pevlr; - int iIndex; LPBYTE pData; UINT i, uOffset; UINT uBufferSize, uLineLength; PWCHAR pTextBuffer, pLine; - /* Get index of selected item */ - iIndex = ListView_GetNextItem(hwndListView, -1, LVNI_SELECTED | LVNI_FOCUSED); - if (iIndex == -1) - { - MessageBoxW(hDlg, - L"No Items in ListView", - L"Error", - MB_OK | MB_ICONINFORMATION); - return; - } - li.mask = LVIF_PARAM; - li.iItem = iIndex; + li.iItem = iItem; li.iSubItem = 0; - ListView_GetItem(hwndListView, &li); pevlr = (PEVENTLOGRECORD)li.lParam; @@ -800,7 +786,12 @@ EventDetailsCtrl(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) } SetWindowLongPtrW(hDlg, DWLP_USER, (LONG_PTR)pData); - pData->EventLogFilter = (PEVENTLOGFILTER)lParam; + if (lParam != 0) + { + PEVENTDETAIL_INFO DetailInfo = (PEVENTDETAIL_INFO)lParam; + pData->EventLogFilter = DetailInfo->EventLogFilter; + pData->iEventItem = DetailInfo->iEventItem; + } pData->bDisplayWords = FALSE; pData->hMonospaceFont = CreateMonospaceFont(); @@ -811,12 +802,6 @@ EventDetailsCtrl(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) InitDetailsDlgCtrl(hDlg, pData); -#if 0 - /* Show event info on dialog box */ - DisplayEvent(hDlg, pData->EventLogFilter); - DisplayEventData(hDlg, pData->bDisplayWords); -#endif - // OnSize(hDlg, pData, pData->cxOld, pData->cyOld); return (INT_PTR)TRUE; } @@ -835,39 +820,76 @@ EventDetailsCtrl(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) return (INT_PTR)TRUE; case EVT_DISPLAY: + { + pData->iEventItem = (INT)lParam; if (pData->EventLogFilter) { - /* Show event info on dialog box */ - DisplayEvent(hDlg, pData->EventLogFilter); - DisplayEventData(hDlg, pData->bDisplayWords); + /* Show event info in control */ + DisplayEvent(hDlg, pData); + DisplayEventData(hDlg, pData); } return (INT_PTR)TRUE; + } case WM_COMMAND: switch (LOWORD(wParam)) { case IDC_PREVIOUS: + case IDC_NEXT: { - SendMessageW(hwndListView, WM_KEYDOWN, VK_UP, 0); + BOOL bPrev = (LOWORD(wParam) == IDC_PREVIOUS); + INT iItem, iSel; + + /* Select the previous/next item from our current one */ + iItem = ListView_GetNextItem(hwndListView, + pData->iEventItem, + bPrev ? LVNI_ABOVE : LVNI_BELOW); + if (iItem == -1) + { + // TODO: Localization. + if (MessageBoxW(hDlg, + bPrev + ? L"You have reached the beginning of the event log. Do you want to continue from the end?" + : L"You have reached the end of the event log. Do you want to continue from the beginning?", + szTitle, + MB_YESNO | MB_ICONQUESTION) + == IDNO) + { + break; + } + + /* Determine from where to restart */ + if (bPrev) + iItem = ListView_GetItemCount(hwndListView) - 1; + else + iItem = 0; + } - /* Show event info on dialog box */ - if (pData->EventLogFilter) + /* + * Deselect the currently selected items in the list view. + * (They may be different from our current one, if multiple + * event details are being displayed concurrently!) + */ + iSel = -1; + while ((iSel = ListView_GetNextItem(hwndListView, iSel, LVNI_SELECTED)) != -1) { - DisplayEvent(hDlg, pData->EventLogFilter); - DisplayEventData(hDlg, pData->bDisplayWords); + ListView_SetItemState(hwndListView, iSel, + 0, LVIS_FOCUSED | LVIS_SELECTED); } - return (INT_PTR)TRUE; - } - case IDC_NEXT: - { - SendMessageW(hwndListView, WM_KEYDOWN, VK_DOWN, 0); + /* Select the new item */ + ListView_SetItemState(hwndListView, iItem, + LVIS_FOCUSED | LVIS_SELECTED, + LVIS_FOCUSED | LVIS_SELECTED); + ListView_EnsureVisible(hwndListView, iItem, FALSE); + + pData->iEventItem = iItem; - /* Show event info on dialog box */ + /* Show event info in control */ if (pData->EventLogFilter) { - DisplayEvent(hDlg, pData->EventLogFilter); - DisplayEventData(hDlg, pData->bDisplayWords); + DisplayEvent(hDlg, pData); + DisplayEventData(hDlg, pData); } return (INT_PTR)TRUE; } @@ -883,7 +905,7 @@ EventDetailsCtrl(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) if (pData->EventLogFilter) { pData->bDisplayWords = (LOWORD(wParam) == IDC_WORDRADIO); - DisplayEventData(hDlg, pData->bDisplayWords); + DisplayEventData(hDlg, pData); } return (INT_PTR)TRUE; } diff --git a/base/applications/mscutils/eventvwr/evtdetctl.h b/base/applications/mscutils/eventvwr/evtdetctl.h index 5d6464ee8a9..a123232bf86 100644 --- a/base/applications/mscutils/eventvwr/evtdetctl.h +++ b/base/applications/mscutils/eventvwr/evtdetctl.h @@ -10,6 +10,14 @@ #ifndef _EVTDETCTL_H_ #define _EVTDETCTL_H_ +/* Optional structure passed by pointer + * as LPARAM to CreateEventDetailsCtrl() */ +typedef struct _EVENTDETAIL_INFO +{ + PEVENTLOGFILTER EventLogFilter; + INT iEventItem; +} EVENTDETAIL_INFO, *PEVENTDETAIL_INFO; + #define EVT_SETFILTER (WM_APP + 2) #define EVT_DISPLAY (WM_APP + 3)

1 0

[reactos] 01/01: [NTUSER][USER32] Initial support of WS_EX_NOACTIVATE flag (#4731)
by Katayama Hirofumi MZ 04 Oct '22

04 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=826bd41d88df8b83494ce… commit 826bd41d88df8b83494ce921f7f4a3ec55544c7f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Oct 4 09:40:43 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Oct 4 09:40:43 2022 +0900 [NTUSER][USER32] Initial support of WS_EX_NOACTIVATE flag (#4731) WS_EX_NOACTIVATE flag forbids the window to be activated. CORE-18417 --- win32ss/user/ntuser/focus.c | 23 ++++++++++++++++------- win32ss/user/ntuser/nonclient.c | 22 ++++++++++++---------- win32ss/user/ntuser/window.c | 6 +++++- win32ss/user/ntuser/winpos.c | 1 + win32ss/user/user32/controls/appswitch.c | 4 ++-- 5 files changed, 36 insertions(+), 20 deletions(-) diff --git a/win32ss/user/ntuser/focus.c b/win32ss/user/ntuser/focus.c index f40a2bf686b..a72070c3542 100644 --- a/win32ss/user/ntuser/focus.c +++ b/win32ss/user/ntuser/focus.c @@ -734,7 +734,7 @@ IsAllowedFGActive(PTHREADINFO pti, PWND Wnd) pti->rpdesk != gpdeskInputDesktop || // not current Desktop, pti->MessageQueue == gpqForeground || // if already the queue foreground, IsFGLocked() || // foreground is locked, - Wnd->ExStyle & WS_EX_NOACTIVATE ) // or,,, does not become the foreground window when the user clicks it. + (Wnd->ExStyle & WS_EX_NOACTIVATE)) // or, does not become the foreground window when the user clicks it. { return FALSE; } @@ -1041,9 +1041,8 @@ co_IntSetActiveWindow( ThreadQueue = pti->MessageQueue; ASSERT(ThreadQueue != 0); - hWndPrev = ThreadQueue->spwndActive ? UserHMGetHandle(ThreadQueue->spwndActive) : NULL; - pWndChg = ThreadQueue->spwndActive; // Keep to notify of a preemptive switch. + hWndPrev = (pWndChg ? UserHMGetHandle(pWndChg) : NULL); if ( !Wnd || Wnd == UserGetDesktopWindow() ) { @@ -1055,6 +1054,9 @@ co_IntSetActiveWindow( hWnd = UserHMGetHandle(Wnd); //ERR("co_IntSetActiveWindow 2 hWnd 0x%p\n",hWnd); + if (Wnd->ExStyle & WS_EX_NOACTIVATE) + return TRUE; + /* check if the specified window can be set in the input data of a given queue */ if ( ThreadQueue != Wnd->head.pti->MessageQueue ) { @@ -1248,9 +1250,12 @@ BOOL FASTCALL co_IntMouseActivateWindow(PWND Wnd) { TRACE("Mouse Active\n"); + if (Wnd && (Wnd->ExStyle & WS_EX_NOACTIVATE)) + return TRUE; return co_IntSetForegroundAndFocusWindow(Wnd, TRUE, TRUE); } +/* Win: PWND xxxSetActiveWindow(Wnd) */ BOOL FASTCALL UserSetActiveWindow( _In_opt_ PWND Wnd ) { @@ -1660,8 +1665,9 @@ NtUserSetActiveWindow(HWND hWnd) { USER_REFERENCE_ENTRY Ref; HWND hWndPrev; - PWND Window; + PWND Window, pwndPrev; DECLARE_RETURN(HWND); + BOOL bActivated; TRACE("Enter NtUserSetActiveWindow(%p)\n", hWnd); UserEnterExclusive(); @@ -1679,11 +1685,14 @@ NtUserSetActiveWindow(HWND hWnd) if (!Window || Window->head.pti->MessageQueue == gptiCurrent->MessageQueue) { - hWndPrev = gptiCurrent->MessageQueue->spwndActive ? UserHMGetHandle(gptiCurrent->MessageQueue->spwndActive) : NULL; + pwndPrev = gptiCurrent->MessageQueue->spwndActive; + hWndPrev = (pwndPrev ? UserHMGetHandle(pwndPrev) : NULL); if (Window) UserRefObjectCo(Window, &Ref); - UserSetActiveWindow(Window); + bActivated = UserSetActiveWindow(Window); if (Window) UserDerefObjectCo(Window); - RETURN( hWndPrev ? (IntIsWindow(hWndPrev) ? hWndPrev : 0) : 0 ); + if (!bActivated) + RETURN(NULL); + RETURN(hWndPrev ? hWndPrev : hWnd); } RETURN( NULL); diff --git a/win32ss/user/ntuser/nonclient.c b/win32ss/user/ntuser/nonclient.c index 59bd57e2f3d..0cace3c0ba3 100644 --- a/win32ss/user/ntuser/nonclient.c +++ b/win32ss/user/ntuser/nonclient.c @@ -438,12 +438,12 @@ DefWndDoSizeMove(PWND pwnd, WORD wParam) if (doSideSnap) { co_WinPosSetWindowPos(pwnd, - 0, + NULL, snapRect.left, snapRect.top, snapRect.right - snapRect.left, snapRect.bottom - snapRect.top, - 0); + SWP_NOACTIVATE); pwnd->InternalPos.NormalRect = origRect; } else @@ -551,13 +551,13 @@ DefWndDoSizeMove(PWND pwnd, WORD wParam) //// This causes the mdi child window to jump up when it is moved. //IntMapWindowPoints( 0, pWndParent, (POINT *)&rect, 2 ); - co_WinPosSetWindowPos( pwnd, - 0, - newRect.left, - newRect.top, - newRect.right - newRect.left, - newRect.bottom - newRect.top, - ( hittest == HTCAPTION ) ? SWP_NOSIZE : 0 ); + co_WinPosSetWindowPos(pwnd, + NULL, + newRect.left, + newRect.top, + newRect.right - newRect.left, + newRect.bottom - newRect.top, + SWP_NOACTIVATE | ((hittest == HTCAPTION) ? SWP_NOSIZE : 0)); hrgnNew = GreCreateRectRgnIndirect(&pwnd->rcWindow); if (pwnd->hrgnClip != NULL) @@ -1532,7 +1532,8 @@ NC_HandleNCLButtonDown(PWND pWnd, WPARAM wParam, LPARAM lParam) TopWnd = parent; } - if ( co_IntSetForegroundWindowMouse(TopWnd) || + if ( (pWnd && (pWnd->ExStyle & WS_EX_NOACTIVATE)) || + co_IntSetForegroundWindowMouse(TopWnd) || //NtUserCallHwndLock(hTopWnd, HWNDLOCK_ROUTINE_SETFOREGROUNDWINDOWMOUSE) || UserGetActiveWindow() == UserHMGetHandle(TopWnd)) { @@ -1689,6 +1690,7 @@ LRESULT NC_HandleNCRButtonDown( PWND pwnd, WPARAM wParam, LPARAM lParam ) if (UserHMGetHandle(pwnd) != IntGetCapture()) return 0; } IntReleaseCapture(); + if (hittest == HTCAPTION || hittest == HTSYSMENU || hittest == HTHSCROLL || hittest == HTVSCROLL) { TRACE("Msg pt %x and Msg.lParam %x and lParam %x\n",MAKELONG(msg.pt.x,msg.pt.y),msg.lParam,lParam); diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index c880ddcc173..e9026864d57 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -2494,7 +2494,11 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, SwFlag = co_WinPosMinMaximize(Window, SwFlag, &NewPos); SwFlag |= SWP_NOZORDER|SWP_FRAMECHANGED; /* Frame always gets changed */ - if (!(style & WS_VISIBLE) || (style & WS_CHILD) || UserGetActiveWindow()) SwFlag |= SWP_NOACTIVATE; + if (!(style & WS_VISIBLE) || (style & WS_CHILD) || UserGetActiveWindow() || + (Window->ExStyle & WS_EX_NOACTIVATE)) + { + SwFlag |= SWP_NOACTIVATE; + } co_WinPosSetWindowPos(Window, 0, NewPos.left, NewPos.top, NewPos.right, NewPos.bottom, SwFlag); } diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index 25c13b48102..3dc4491fa09 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -379,6 +379,7 @@ BOOL FASTCALL can_activate_window( PWND Wnd OPTIONAL) if (!(style & WS_VISIBLE)) return FALSE; if (style & WS_MINIMIZE) return FALSE; if ((style & (WS_POPUP|WS_CHILD)) == WS_CHILD) return FALSE; + if (Wnd->ExStyle & WS_EX_NOACTIVATE) return FALSE; return TRUE; /* FIXME: This window could be disable because the child that closed was a popup. */ diff --git a/win32ss/user/user32/controls/appswitch.c b/win32ss/user/user32/controls/appswitch.c index fa522be1c01..6cff11c465f 100644 --- a/win32ss/user/user32/controls/appswitch.c +++ b/win32ss/user/user32/controls/appswitch.c @@ -225,9 +225,9 @@ BOOL IsAltTabWindow(HWND hwnd) if (!IsWindowVisible(hwnd)) return FALSE; - // must not be WS_EX_TOOLWINDOW + // must not be WS_EX_TOOLWINDOW nor WS_EX_NOACTIVATE ExStyle = GetWindowLong(hwnd, GWL_EXSTYLE); - if (ExStyle & WS_EX_TOOLWINDOW) + if (ExStyle & (WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE)) return FALSE; // must be not empty rect

1 0

[reactos] 01/01: [NTUSER] Fix 'Trying to link windows to itself' (#4478) CORE-18132
by Doug Lyons 03 Oct '22

03 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd027c9de4dca4ef53f9d… commit bd027c9de4dca4ef53f9d8f3233749de3d25a4f2 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Mon Oct 3 17:26:02 2022 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Oct 4 00:26:02 2022 +0200 [NTUSER] Fix 'Trying to link windows to itself' (#4478) CORE-18132 Fix 'Trying to link windows to itself' on DestroyWindow. Patch by I_Kill_Bugs. This fixes a potential BSOD 0x50 observable in the app Localizer Editor" --- win32ss/user/ntuser/winpos.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index 7795f0293b6..25c13b48102 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -1393,8 +1393,34 @@ WinPosDoOwnedPopups(PWND Window, HWND hWndInsertAfter) if (List[i] == Owner) { - if (i > 0) hWndInsertAfter = List[i-1]; - else hWndInsertAfter = topmost ? HWND_TOPMOST : HWND_TOP; + /* We found its Owner, so we must handle it here. */ + if (i > 0) + { + if (List[i - 1] != UserHMGetHandle(Window)) + { + /* + * If the popup to be inserted is not already just + * before the Owner, insert it there. The modified + * hWndInsertAfter will be handled below. + * + * (NOTE: Do not allow hWndInsertAfter to become equal + * to the popup's window handle, as this would cause + * the popup to link to itself). + */ + hWndInsertAfter = List[i - 1]; + } + else + { + /* If the popup to be inserted is already + * before the Owner, we are done. */ + ExFreePoolWithTag(List, USERTAG_WINDOWLIST); + return hWndInsertAfter; + } + } + else + { + hWndInsertAfter = topmost ? HWND_TOPMOST : HWND_TOP; + } break; }

1 0

[reactos] 02/02: [EVENTVWR] Simplify some duplicated code. (#4745)
by Hermès Bélusca-Maïto 03 Oct '22

03 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=efd11b7f5672319d45492… commit efd11b7f5672319d45492aee04cbd133c1d09a85 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Oct 3 02:26:20 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 3 23:17:02 2022 +0200 [EVENTVWR] Simplify some duplicated code. (#4745) --- base/applications/mscutils/eventvwr/eventvwr.c | 42 ++++++++++--------------- base/applications/mscutils/eventvwr/evtdetctl.c | 26 +++++++-------- 2 files changed, 28 insertions(+), 40 deletions(-) diff --git a/base/applications/mscutils/eventvwr/eventvwr.c b/base/applications/mscutils/eventvwr/eventvwr.c index 1d5328fc222..a35daffab26 100644 --- a/base/applications/mscutils/eventvwr/eventvwr.c +++ b/base/applications/mscutils/eventvwr/eventvwr.c @@ -33,8 +33,8 @@ static const LPCWSTR SystemLogs[] = }; /* MessageFile message buffer size */ -#define EVENT_MESSAGE_EVENTTEXT_BUFFER 1024*10 // NOTE: Used by evtdetctl.c -#define EVENT_MESSAGE_FILE_BUFFER 1024*10 +#define EVENT_MESSAGE_EVENTTEXT_BUFFER (1024*10) // NOTE: Used by evtdetctl.c +#define EVENT_MESSAGE_FILE_BUFFER (1024*10) #define EVENT_DLL_SEPARATOR L";" #define EVENT_CATEGORY_MESSAGE_FILE L"CategoryMessageFile" #define EVENT_MESSAGE_FILE L"EventMessageFile" @@ -2034,7 +2034,7 @@ EnumEventsThread(IN LPVOID lpParameter) // (EventLogFilter->NumOfEventLogs > 1) MessageBoxW(hwndMainWindow, L"Many-logs filtering is not implemented yet!!", - L"Event Log", + szTitle, MB_OK | MB_ICONINFORMATION); } @@ -3514,22 +3514,14 @@ WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) } case IDM_LIST_NEWEST: - { - CheckMenuRadioItem(hMainMenu, IDM_LIST_NEWEST, IDM_LIST_OLDEST, IDM_LIST_NEWEST, MF_BYCOMMAND); - if (!Settings.bNewestEventsFirst) - { - Settings.bNewestEventsFirst = TRUE; - Refresh(GetSelectedFilter(NULL)); - } - break; - } - case IDM_LIST_OLDEST: { - CheckMenuRadioItem(hMainMenu, IDM_LIST_NEWEST, IDM_LIST_OLDEST, IDM_LIST_OLDEST, MF_BYCOMMAND); - if (Settings.bNewestEventsFirst) + BOOL bNewest = (LOWORD(wParam) == IDM_LIST_NEWEST); + CheckMenuRadioItem(hMainMenu, IDM_LIST_NEWEST, IDM_LIST_OLDEST, LOWORD(wParam), MF_BYCOMMAND); + + if (bNewest != Settings.bNewestEventsFirst) { - Settings.bNewestEventsFirst = FALSE; + Settings.bNewestEventsFirst = bNewest; Refresh(GetSelectedFilter(NULL)); } break; @@ -3608,11 +3600,11 @@ WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) } case IDM_HELP: - MessageBoxW(hwndMainWindow, + MessageBoxW(hWnd, L"Help not implemented yet!", - L"Event Log", + szTitle, MB_OK | MB_ICONINFORMATION); - break; + break; case IDM_EXIT: DestroyWindow(hWnd); @@ -4192,7 +4184,7 @@ EventLogPropProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) case IDHELP: MessageBoxW(hDlg, L"Help not implemented yet!", - L"Event Log", + szTitle, MB_OK | MB_ICONINFORMATION); return (INT_PTR)TRUE; @@ -4279,7 +4271,6 @@ EventDetails(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_INITDIALOG: { LONG_PTR dwStyle; - INT sbVXSize, sbHYSize; RECT rcWnd, rect; hWndDetailsCtrl = CreateEventDetailsCtrl(hInst, hDlg, lParam); @@ -4291,11 +4282,12 @@ EventDetails(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) /* Create a size grip if the dialog has a sizing border */ GetClientRect(hDlg, &rcWnd); - dwStyle = GetWindowLongPtrW(hDlg, GWL_STYLE); - sbVXSize = GetSystemMetrics(SM_CXVSCROLL); - sbHYSize = GetSystemMetrics(SM_CYHSCROLL); + dwStyle = GetWindowLongPtrW(hDlg, GWL_STYLE); if (dwStyle & WS_THICKFRAME /* == WS_SIZEBOX */) { + INT sbVXSize = GetSystemMetrics(SM_CXVSCROLL); + INT sbHYSize = GetSystemMetrics(SM_CYHSCROLL); + hWndGrip = CreateWindowW(WC_SCROLLBARW, NULL, WS_CHILD | WS_VISIBLE | /**/ WS_CLIPSIBLINGS | /**/ SBS_SIZEGRIP | SBS_SIZEBOXBOTTOMRIGHTALIGN, @@ -4380,7 +4372,7 @@ EventDetails(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) case IDHELP: MessageBoxW(hDlg, L"Help not implemented yet!", - L"Event Log", + szTitle, MB_OK | MB_ICONINFORMATION); return (INT_PTR)TRUE; diff --git a/base/applications/mscutils/eventvwr/evtdetctl.c b/base/applications/mscutils/eventvwr/evtdetctl.c index ef11ce4bf33..4cc6f9752cf 100644 --- a/base/applications/mscutils/eventvwr/evtdetctl.c +++ b/base/applications/mscutils/eventvwr/evtdetctl.c @@ -13,7 +13,7 @@ #include <shellapi.h> // FIXME: -#define EVENT_MESSAGE_EVENTTEXT_BUFFER 1024*10 +#define EVENT_MESSAGE_EVENTTEXT_BUFFER (1024*10) extern HWND hwndListView; extern BOOL GetEventMessage(IN LPCWSTR KeyName, @@ -479,7 +479,8 @@ OnScroll(HWND hDlg, PDETAILDATA pData, INT nBar, WORD sbCode) } } -static VOID +static +VOID OnSize(HWND hDlg, PDETAILDATA pData, INT cx, INT cy) { LONG_PTR dwStyle; @@ -877,20 +878,15 @@ EventDetailsCtrl(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) return (INT_PTR)TRUE; case IDC_BYTESRADIO: - if (pData->EventLogFilter) - { - pData->bDisplayWords = FALSE; - DisplayEventData(hDlg, pData->bDisplayWords); - } - return (INT_PTR)TRUE; - case IDC_WORDRADIO: + { if (pData->EventLogFilter) { - pData->bDisplayWords = TRUE; + pData->bDisplayWords = (LOWORD(wParam) == IDC_WORDRADIO); DisplayEventData(hDlg, pData->bDisplayWords); } return (INT_PTR)TRUE; + } default: break; @@ -914,14 +910,14 @@ EventDetailsCtrl(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) } case WM_HSCROLL: - OnScroll(hDlg, pData, SB_HORZ, LOWORD(wParam)); - SetWindowLongPtrW(hDlg, DWLP_MSGRESULT, 0); - return (INT_PTR)TRUE; - case WM_VSCROLL: - OnScroll(hDlg, pData, SB_VERT, LOWORD(wParam)); + { + OnScroll(hDlg, pData, + (uMsg == WM_HSCROLL) ? SB_HORZ : SB_VERT, + LOWORD(wParam)); SetWindowLongPtrW(hDlg, DWLP_MSGRESULT, 0); return (INT_PTR)TRUE; + } case WM_SIZE: OnSize(hDlg, pData, LOWORD(lParam), HIWORD(lParam));

1 0

[reactos] 01/02: [EVENTVWR] Update file headers.
by Hermès Bélusca-Maïto 03 Oct '22

03 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89bdca6177471d2096a1c… commit 89bdca6177471d2096a1cdca3fb8beb16a8fe1eb Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Oct 2 18:22:43 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 3 23:16:57 2022 +0200 [EVENTVWR] Update file headers. --- base/applications/mscutils/eventvwr/eventvwr.c | 31 +++++------------------ base/applications/mscutils/eventvwr/eventvwr.h | 13 +++++----- base/applications/mscutils/eventvwr/eventvwr.rc | 9 +++++++ base/applications/mscutils/eventvwr/evtdetctl.c | 13 +++++----- base/applications/mscutils/eventvwr/evtdetctl.h | 13 +++++----- base/applications/mscutils/eventvwr/lang/bg-BG.rc | 7 +++++ base/applications/mscutils/eventvwr/lang/cs-CZ.rc | 7 +++++ base/applications/mscutils/eventvwr/lang/de-DE.rc | 8 +++++- base/applications/mscutils/eventvwr/lang/el-GR.rc | 7 ++++- base/applications/mscutils/eventvwr/lang/en-US.rc | 11 ++++---- base/applications/mscutils/eventvwr/lang/es-ES.rc | 10 +++++++- base/applications/mscutils/eventvwr/lang/fr-FR.rc | 8 +++++- base/applications/mscutils/eventvwr/lang/he-IL.rc | 7 ++++- base/applications/mscutils/eventvwr/lang/it-IT.rc | 8 +++++- base/applications/mscutils/eventvwr/lang/ja-JP.rc | 7 ++++- base/applications/mscutils/eventvwr/lang/ko-KR.rc | 7 ++++- base/applications/mscutils/eventvwr/lang/no-NO.rc | 7 +++++ base/applications/mscutils/eventvwr/lang/pl-PL.rc | 10 ++++++-- base/applications/mscutils/eventvwr/lang/pt-BR.rc | 7 ++++- base/applications/mscutils/eventvwr/lang/pt-PT.rc | 7 ++++- base/applications/mscutils/eventvwr/lang/ro-RO.rc | 7 +++-- base/applications/mscutils/eventvwr/lang/ru-RU.rc | 11 +++++++- base/applications/mscutils/eventvwr/lang/sk-SK.rc | 8 +++--- base/applications/mscutils/eventvwr/lang/sq-AL.rc | 9 +++---- base/applications/mscutils/eventvwr/lang/sv-SE.rc | 7 ++++- base/applications/mscutils/eventvwr/lang/tr-TR.rc | 10 ++++---- base/applications/mscutils/eventvwr/lang/uk-UA.rc | 9 ++++++- base/applications/mscutils/eventvwr/lang/zh-CN.rc | 2 +- base/applications/mscutils/eventvwr/resource.h | 9 +++++++ 29 files changed, 187 insertions(+), 82 deletions(-) diff --git a/base/applications/mscutils/eventvwr/eventvwr.c b/base/applications/mscutils/eventvwr/eventvwr.c index fad78d4e3bc..1d5328fc222 100644 --- a/base/applications/mscutils/eventvwr/eventvwr.c +++ b/base/applications/mscutils/eventvwr/eventvwr.c @@ -1,29 +1,10 @@ /* - * ReactOS Win32 Applications - * Copyright (C) 2007 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * PROJECT: ReactOS Event Log Viewer - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/mscutils/eventvwr/eventvwr.c - * PURPOSE: Event Log Viewer main file - * PROGRAMMERS: Marc Piulachs (marc.piulachs at codexchange [dot] net) - * Eric Kohl - * Hermes Belusca-Maito + * PROJECT: ReactOS Event Log Viewer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Event Log Viewer main file. + * COPYRIGHT: Copyright 2007 Marc Piulachs <marc.piulachs(a)codexchange.net> + * Copyright 2008-2016 Eric Kohl <eric.kohl(a)reactos.org> + * Copyright 2016-2022 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> */ #include "eventvwr.h" diff --git a/base/applications/mscutils/eventvwr/eventvwr.h b/base/applications/mscutils/eventvwr/eventvwr.h index 7ae99ef82dc..86d6d611674 100644 --- a/base/applications/mscutils/eventvwr/eventvwr.h +++ b/base/applications/mscutils/eventvwr/eventvwr.h @@ -1,11 +1,10 @@ /* - * PROJECT: ReactOS Event Log Viewer - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/mscutils/eventvwr/eventvwr.h - * PURPOSE: Event Log Viewer header - * PROGRAMMERS: Marc Piulachs (marc.piulachs at codexchange [dot] net) - * Eric Kohl - * Hermes Belusca-Maito + * PROJECT: ReactOS Event Log Viewer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Event Log Viewer header. + * COPYRIGHT: Copyright 2007 Marc Piulachs <marc.piulachs(a)codexchange.net> + * Copyright 2008-2016 Eric Kohl <eric.kohl(a)reactos.org> + * Copyright 2016-2022 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> */ #ifndef _EVENTVWR_PCH_ diff --git a/base/applications/mscutils/eventvwr/eventvwr.rc b/base/applications/mscutils/eventvwr/eventvwr.rc index 29219c071f7..e321b3ed1b9 100644 --- a/base/applications/mscutils/eventvwr/eventvwr.rc +++ b/base/applications/mscutils/eventvwr/eventvwr.rc @@ -1,3 +1,12 @@ +/* + * PROJECT: ReactOS Event Log Viewer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Resources file. + * COPYRIGHT: Copyright 2007 Marc Piulachs <marc.piulachs(a)codexchange.net> + * Copyright 2008-2016 Eric Kohl <eric.kohl(a)reactos.org> + * Copyright 2016-2022 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> + */ + #include <windef.h> #include <winuser.h> #include <commctrl.h> diff --git a/base/applications/mscutils/eventvwr/evtdetctl.c b/base/applications/mscutils/eventvwr/evtdetctl.c index d767fe721f8..ef11ce4bf33 100644 --- a/base/applications/mscutils/eventvwr/evtdetctl.c +++ b/base/applications/mscutils/eventvwr/evtdetctl.c @@ -1,11 +1,10 @@ /* - * PROJECT: ReactOS Event Log Viewer - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/mscutils/eventvwr/evtdetctl.c - * PURPOSE: Event Details Control - * PROGRAMMERS: Marc Piulachs (marc.piulachs at codexchange [dot] net) - * Eric Kohl - * Hermes Belusca-Maito + * PROJECT: ReactOS Event Log Viewer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Event Details Control. + * COPYRIGHT: Copyright 2007 Marc Piulachs <marc.piulachs(a)codexchange.net> + * Copyright 2008-2016 Eric Kohl <eric.kohl(a)reactos.org> + * Copyright 2016-2022 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> */ #include "eventvwr.h" diff --git a/base/applications/mscutils/eventvwr/evtdetctl.h b/base/applications/mscutils/eventvwr/evtdetctl.h index e2fc8dd6cc5..5d6464ee8a9 100644 --- a/base/applications/mscutils/eventvwr/evtdetctl.h +++ b/base/applications/mscutils/eventvwr/evtdetctl.h @@ -1,11 +1,10 @@ /* - * PROJECT: ReactOS Event Log Viewer - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/mscutils/eventvwr/evtdetctl.h - * PURPOSE: Event Details Control - * PROGRAMMERS: Marc Piulachs (marc.piulachs at codexchange [dot] net) - * Eric Kohl - * Hermes Belusca-Maito + * PROJECT: ReactOS Event Log Viewer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Event Details Control. + * COPYRIGHT: Copyright 2007 Marc Piulachs <marc.piulachs(a)codexchange.net> + * Copyright 2008-2016 Eric Kohl <eric.kohl(a)reactos.org> + * Copyright 2016-2022 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> */ #ifndef _EVTDETCTL_H_ diff --git a/base/applications/mscutils/eventvwr/lang/bg-BG.rc b/base/applications/mscutils/eventvwr/lang/bg-BG.rc index 49f505a37f9..bf718387cb6 100644 --- a/base/applications/mscutils/eventvwr/lang/bg-BG.rc +++ b/base/applications/mscutils/eventvwr/lang/bg-BG.rc @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS Event Log Viewer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Bulgarian resource file + * TRANSLATORS: Copyright 2007 Станев <sstpr(a)narod.ru> + */ + LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT IDM_EVENTVWR MENU diff --git a/base/applications/mscutils/eventvwr/lang/cs-CZ.rc b/base/applications/mscutils/eventvwr/lang/cs-CZ.rc index c1cf32d9c0e..2c63b73d320 100644 --- a/base/applications/mscutils/eventvwr/lang/cs-CZ.rc +++ b/base/applications/mscutils/eventvwr/lang/cs-CZ.rc @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS Event Log Viewer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Czech resource file + * TRANSLATORS: Copyright 2014-2017 Kamil Hornicek <kamil.hornicek(a)reactos.org> + */ + LANGUAGE LANG_CZECH, SUBLANG_DEFAULT IDM_EVENTVWR MENU diff --git a/base/applications/mscutils/eventvwr/lang/de-DE.rc b/base/applications/mscutils/eventvwr/lang/de-DE.rc index 6ed1d1dcadc..3838fdb1da8 100644 --- a/base/applications/mscutils/eventvwr/lang/de-DE.rc +++ b/base/applications/mscutils/eventvwr/lang/de-DE.rc @@ -1,4 +1,10 @@ -/* German translation by Daniel Reimer and Joachim Henze */ +/* + * PROJECT: ReactOS Event Log Viewer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: German resource file + * TRANSLATORS: Copyright 2007-2008 Daniel Reimer <reimer.daniel(a)freenet.de> + * Copyright 2021 Joachim Henze <joachim.henze(a)reactos.org> + */ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL diff --git a/base/applications/mscutils/eventvwr/lang/el-GR.rc b/base/applications/mscutils/eventvwr/lang/el-GR.rc index 98c06eaf73f..3f018b0fbd0 100644 --- a/base/applications/mscutils/eventvwr/lang/el-GR.rc +++ b/base/applications/mscutils/eventvwr/lang/el-GR.rc @@ -1,4 +1,9 @@ -/* Greek translation by Apostolos Alexiadis */ +/* + * PROJECT: ReactOS Event Log Viewer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Greek resource file + * TRANSLATORS: Copyright 2007 Apostolos Alexiadis + */ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT diff --git a/base/applications/mscutils/eventvwr/lang/en-US.rc b/base/applications/mscutils/eventvwr/lang/en-US.rc index f665eb9f00d..a2a4cf6d5f2 100644 --- a/base/applications/mscutils/eventvwr/lang/en-US.rc +++ b/base/applications/mscutils/eventvwr/lang/en-US.rc @@ -1,9 +1,10 @@ /* - * PROJECT: ReactOS Event Viewer - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/mscutils/eventvwr/lang/en-US.rc - * PURPOSE: English Language File for ReactOS Event Viewer - * TRANSLATOR: Marc Piulachs + * PROJECT: ReactOS Event Log Viewer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: English resource file + * TRANSLATORS: Copyright 2007 Marc Piulachs <marc.piulachs(a)codexchange.net> + * Copyright 2008-2016 Eric Kohl <eric.kohl(a)reactos.org> + * Copyright 2016-2022 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> */ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US diff --git a/base/applications/mscutils/eventvwr/lang/es-ES.rc b/base/applications/mscutils/eventvwr/lang/es-ES.rc index 4efb08fed21..df8493addad 100644 --- a/base/applications/mscutils/eventvwr/lang/es-ES.rc +++ b/base/applications/mscutils/eventvwr/lang/es-ES.rc @@ -1,4 +1,12 @@ -/* Spanish translation by Marc Piulachs, proofread by Ismael Ferreras Morezuelas, revised in 2020 by Julen Urizar Compains */ +/* + * PROJECT: ReactOS Event Log Viewer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Spanish resource file + * TRANSLATORS: Copyright 2007 Remialdo <remialdo(a)gmail.com> + * Copyright 2009 Javier Remacha + * Copyright 2014 Ismael Ferreras Morezuelas <swyterzone+ros(a)gmail.com> + * Copyright 2020 Julen Urizar Compains <julenuri(a)hotmail.com> + */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL diff --git a/base/applications/mscutils/eventvwr/lang/fr-FR.rc b/base/applications/mscutils/eventvwr/lang/fr-FR.rc index b11cf16b5af..6742e43bc69 100644 --- a/base/applications/mscutils/eventvwr/lang/fr-FR.rc +++ b/base/applications/mscutils/eventvwr/lang/fr-FR.rc @@ -1,4 +1,10 @@ -/* French translation by Pierre Schweitzer */ +/* + * PROJECT: ReactOS Event Log Viewer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: French resource file + * TRANSLATORS: Copyright 2007-2009 Pierre Schweitzer <pierre(a)reactos.org> + * Copyright 2016-2022 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> + */ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL diff --git a/base/applications/mscutils/eventvwr/lang/he-IL.rc b/base/applications/mscutils/eventvwr/lang/he-IL.rc index 557b3a77c79..a2ab5a4ef1a 100644 --- a/base/applications/mscutils/eventvwr/lang/he-IL.rc +++ b/base/applications/mscutils/eventvwr/lang/he-IL.rc @@ -1,4 +1,9 @@ -/* Hebrew translation by Baruch Rutman */ +/* + * PROJECT: ReactOS Event Log Viewer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Hebrew resource file + * TRANSLATORS: Copyright 2013 Baruch Rutman <peterooch(a)gmail.com> + */ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT diff --git a/base/applications/mscutils/eventvwr/lang/it-IT.rc b/base/applications/mscutils/eventvwr/lang/it-IT.rc index 3d49badbcff..f4210df8938 100644 --- a/base/applications/mscutils/eventvwr/lang/it-IT.rc +++ b/base/applications/mscutils/eventvwr/lang/it-IT.rc @@ -1,4 +1,10 @@ -/* Italian translation by Paolo Devoti */ +/* + * PROJECT: ReactOS Event Log Viewer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Italian resource file + * TRANSLATORS: Copyright 2007 Paolo Devoti <devotip(a)tiscali.it> + * Copyright 2010-2011 Gabriel Ilardi <gabrielilardi(a)hotmail.it> + */ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL diff --git a/base/applications/mscutils/eventvwr/lang/ja-JP.rc b/base/applications/mscutils/eventvwr/lang/ja-JP.rc index e48481ba65b..ade749976dc 100644 --- a/base/applications/mscutils/eventvwr/lang/ja-JP.rc +++ b/base/applications/mscutils/eventvwr/lang/ja-JP.rc @@ -1,4 +1,9 @@ -/* Japanese translation by Tomoya Kitagawa */ +/* + * PROJECT: ReactOS Event Log Viewer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Japanese resource file + * TRANSLATORS: Copyright 2009 Tomoya Kitagawa <jptomoya(a)yahoo.co.jp> + */ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT diff --git a/base/applications/mscutils/eventvwr/lang/ko-KR.rc b/base/applications/mscutils/eventvwr/lang/ko-KR.rc index 583a450872c..472557f534b 100644 --- a/base/applications/mscutils/eventvwr/lang/ko-KR.rc +++ b/base/applications/mscutils/eventvwr/lang/ko-KR.rc @@ -1,4 +1,9 @@ -/* Korean translation by manatails007 */ +/* + * PROJECT: ReactOS Event Log Viewer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Korean resource file + * TRANSLATORS: Copyright 2008 Seungju Kim aka manatails007 <admin(a)manateeshome.com> + */ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT diff --git a/base/applications/mscutils/eventvwr/lang/no-NO.rc b/base/applications/mscutils/eventvwr/lang/no-NO.rc index 38e370bf3fb..1f61d570477 100644 --- a/base/applications/mscutils/eventvwr/lang/no-NO.rc +++ b/base/applications/mscutils/eventvwr/lang/no-NO.rc @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS Event Log Viewer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Norwegian resource file + * TRANSLATORS: Copyright 2008 Lars Martin Hambro (lars_martin4(a)hotmail.com) + */ + LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL IDM_EVENTVWR MENU diff --git a/base/applications/mscutils/eventvwr/lang/pl-PL.rc b/base/applications/mscutils/eventvwr/lang/pl-PL.rc index b442a3a7260..4ae59868563 100644 --- a/base/applications/mscutils/eventvwr/lang/pl-PL.rc +++ b/base/applications/mscutils/eventvwr/lang/pl-PL.rc @@ -1,5 +1,11 @@ -/* Polish translation by Caemyr - Olaf Siejka - * PL update by wojo664 (June 2014) +/* + * PROJECT: ReactOS Event Log Viewer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Polish resource file + * TRANSLATORS: Copyright 2007-2011 Olaf Siejka <caemyr(a)gmail.com> + * Copyright 2014 Wojtek Kozłowski <wojo664(a)gmail.com> + * Copyright 2017-2018 Adam Słaboń <asaillen456esx(a)gmail.com> + * Copyright 2011-2020 Adam Stachowicz <saibamenppl(a)gmail.com> */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT diff --git a/base/applications/mscutils/eventvwr/lang/pt-BR.rc b/base/applications/mscutils/eventvwr/lang/pt-BR.rc index 9519a59a710..2af3235bce4 100644 --- a/base/applications/mscutils/eventvwr/lang/pt-BR.rc +++ b/base/applications/mscutils/eventvwr/lang/pt-BR.rc @@ -1,4 +1,9 @@ -/* Portuguese Brazilian translation by Matheus Macabu */ +/* + * PROJECT: ReactOS Event Log Viewer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Portuguese Brazilian resource file + * TRANSLATORS: Copyright 2012 Matheus Macabu + */ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN diff --git a/base/applications/mscutils/eventvwr/lang/pt-PT.rc b/base/applications/mscutils/eventvwr/lang/pt-PT.rc index 5b04e08b2cd..cdbadb16b17 100644 --- a/base/applications/mscutils/eventvwr/lang/pt-PT.rc +++ b/base/applications/mscutils/eventvwr/lang/pt-PT.rc @@ -1,4 +1,9 @@ -/* Portuguese Portugal translation by Jose Jesus */ +/* + * PROJECT: ReactOS Event Log Viewer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Portuguese Portugal resource file + * TRANSLATORS: Copyright 2021 Jose Carlos Jesus <zecarlos1957(a)hotmail.com> + */ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL diff --git a/base/applications/mscutils/eventvwr/lang/ro-RO.rc b/base/applications/mscutils/eventvwr/lang/ro-RO.rc index 249c2223fec..d0c80923b9a 100644 --- a/base/applications/mscutils/eventvwr/lang/ro-RO.rc +++ b/base/applications/mscutils/eventvwr/lang/ro-RO.rc @@ -1,6 +1,9 @@ /* - * Translators: Petru Dimitriu (petrimetri at gmail dot com) - * Ștefan Fulea (stefan dot fulea at mail dot com) + * PROJECT: ReactOS Event Log Viewer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Romanian resource file + * TRANSLATORS: Copyright 2009 Petru Dimitriu <petrimetri(a)gmail.com> + * Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL diff --git a/base/applications/mscutils/eventvwr/lang/ru-RU.rc b/base/applications/mscutils/eventvwr/lang/ru-RU.rc index bb730cb644c..efd2f52d1e0 100644 --- a/base/applications/mscutils/eventvwr/lang/ru-RU.rc +++ b/base/applications/mscutils/eventvwr/lang/ru-RU.rc @@ -1,4 +1,13 @@ -/* Russian translation by Dmitry Chapyshev, Artem Reznikov, Kudratov Olimjon (olim98(a)bk.ru) */ +/* + * PROJECT: ReactOS Event Log Viewer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Russian resource file + * TRANSLATORS: Copyright 2007-2016 Dmitry Chapyshev <dmitry(a)reactos.org> + * Copyright 2008 Artem Reznikov + * Copyright 2011 Igor Paliychuk <mansonigor(a)gmail.com> + * Copyright 2014 Kudratov Olimjon <olim98(a)bk.ru> + * Copyright 2016 Sergey Stopkin <stopkin.sergey(a)gmail.com> + */ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT diff --git a/base/applications/mscutils/eventvwr/lang/sk-SK.rc b/base/applications/mscutils/eventvwr/lang/sk-SK.rc index 5964bcc74ee..cd6acfbeeca 100644 --- a/base/applications/mscutils/eventvwr/lang/sk-SK.rc +++ b/base/applications/mscutils/eventvwr/lang/sk-SK.rc @@ -1,6 +1,8 @@ -/* TRANSLATOR : Mário Kačmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) - * DATE OF TR.: 21-06-2008 - * LAST CHANGE: 28-07-2008 +/* + * PROJECT: ReactOS Event Log Viewer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Slovak resource file + * TRANSLATORS: Copyright 2008-2011 Mário Kačmár <kario(a)szm.sk> */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT diff --git a/base/applications/mscutils/eventvwr/lang/sq-AL.rc b/base/applications/mscutils/eventvwr/lang/sq-AL.rc index 35248447b83..cb8e23da409 100644 --- a/base/applications/mscutils/eventvwr/lang/sq-AL.rc +++ b/base/applications/mscutils/eventvwr/lang/sq-AL.rc @@ -1,9 +1,8 @@ /* - * PROJECT: ReactOS Event Viewer - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/mscutils/eventvwr/lang/sq-AL.rc - * PURPOSE: Albanian Language File for ReactOS Event Viewer - * TRANSLATOR: Ardit Dani + * PROJECT: ReactOS Event Log Viewer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Albanian resource file + * TRANSLATORS: Copyright 2013 Ardit Dani <ardit.dani(a)gmail.com> */ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL diff --git a/base/applications/mscutils/eventvwr/lang/sv-SE.rc b/base/applications/mscutils/eventvwr/lang/sv-SE.rc index 18b2e2f9b5a..98ecb982810 100644 --- a/base/applications/mscutils/eventvwr/lang/sv-SE.rc +++ b/base/applications/mscutils/eventvwr/lang/sv-SE.rc @@ -1,4 +1,9 @@ -/* Swedish translation by Jaix Bly */ +/* + * PROJECT: ReactOS Event Log Viewer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Swedish resource file + * TRANSLATORS: Copyright 2011 Jan Blomqvist Kinander aka Jaix Bly <JaixBly(a)spray.se> + */ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL diff --git a/base/applications/mscutils/eventvwr/lang/tr-TR.rc b/base/applications/mscutils/eventvwr/lang/tr-TR.rc index 1fcdea221c9..b7dad5217c6 100644 --- a/base/applications/mscutils/eventvwr/lang/tr-TR.rc +++ b/base/applications/mscutils/eventvwr/lang/tr-TR.rc @@ -1,9 +1,9 @@ /* - * PROJECT: ReactOS Event Viewer - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/mscutils/eventvwr/lang/tr-TR.rc - * PURPOSE: Turkish Language File for ReactOS Event Viewer - * TRANSLATOR: 2013-2016 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) + * PROJECT: ReactOS Event Log Viewer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Türkish resource file + * TRANSLATORS: Copyright 2013-2017 Erdem Ersoy (eersoy93) <erdemersoy(a)erdemersoy.net> + * Copyright 2021 Süleyman Poyraz <zaryob.dev(a)gmail.com> */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT diff --git a/base/applications/mscutils/eventvwr/lang/uk-UA.rc b/base/applications/mscutils/eventvwr/lang/uk-UA.rc index 4dea849badd..f76a78c3629 100644 --- a/base/applications/mscutils/eventvwr/lang/uk-UA.rc +++ b/base/applications/mscutils/eventvwr/lang/uk-UA.rc @@ -1,4 +1,11 @@ -/* Ukraianian translation by Rostislav Zabolotny, Artem Reznikov, Igor Paliychuk */ +/* + * PROJECT: ReactOS Event Log Viewer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Ukrainian resource file + * TRANSLATORS: Copyright 2007 Rostislav Zabolotny + * Copyright 2008 Artem Reznikov + * Copyright 2010-2011 Igor Paliychuk <mansonigor(a)gmail.com> + */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT diff --git a/base/applications/mscutils/eventvwr/lang/zh-CN.rc b/base/applications/mscutils/eventvwr/lang/zh-CN.rc index 4284bba4ead..35ea38b2949 100644 --- a/base/applications/mscutils/eventvwr/lang/zh-CN.rc +++ b/base/applications/mscutils/eventvwr/lang/zh-CN.rc @@ -3,7 +3,7 @@ * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Chinese (Simplified) resource file * TRANSLATORS: Copyright 2011 Song Fuchang (0xfc) <sfc_0(a)yahoo.com.cn> - * TRANSLATORS: Copyright 2017 Li Keqing <forucial(a)icloud.com> + * Copyright 2017 Li Keqing <forucial(a)icloud.com> * Copyright 2021 Wu Haotian <rigoligo03(a)gmail.com> */ diff --git a/base/applications/mscutils/eventvwr/resource.h b/base/applications/mscutils/eventvwr/resource.h index db8f341b9a1..27c61bc2cb0 100644 --- a/base/applications/mscutils/eventvwr/resource.h +++ b/base/applications/mscutils/eventvwr/resource.h @@ -1,3 +1,12 @@ +/* + * PROJECT: ReactOS Event Log Viewer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Resources header. + * COPYRIGHT: Copyright 2007 Marc Piulachs <marc.piulachs(a)codexchange.net> + * Copyright 2008-2016 Eric Kohl <eric.kohl(a)reactos.org> + * Copyright 2016-2022 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> + */ + #pragma once /* Icon IDs */

1 0

[reactos] 01/01: [DESK] Fix screensaver layouts for all translations
by Stanislav Motylkov 03 Oct '22

03 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=12526424d5e44865e5547… commit 12526424d5e44865e55478436763bfbfc4b36fc7 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Oct 3 21:00:58 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Oct 3 21:04:33 2022 +0300 [DESK] Fix screensaver layouts for all translations Also remove trailing "0" for the preview static control styles. --- dll/cpl/desk/lang/bg-BG.rc | 14 +++++++------- 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 | 10 +++++----- dll/cpl/desk/lang/et-EE.rc | 4 ++-- dll/cpl/desk/lang/fr-FR.rc | 6 +++--- dll/cpl/desk/lang/he-IL.rc | 4 ++-- dll/cpl/desk/lang/hu-HU.rc | 4 ++-- dll/cpl/desk/lang/id-ID.rc | 12 ++++++------ dll/cpl/desk/lang/it-IT.rc | 12 ++++++------ dll/cpl/desk/lang/ja-JP.rc | 4 ++-- dll/cpl/desk/lang/nl-NL.rc | 12 ++++++------ dll/cpl/desk/lang/no-NO.rc | 4 ++-- dll/cpl/desk/lang/pl-PL.rc | 12 ++++++------ dll/cpl/desk/lang/pt-BR.rc | 6 +++--- dll/cpl/desk/lang/pt-PT.rc | 16 ++++++++-------- dll/cpl/desk/lang/ro-RO.rc | 14 +++++++------- dll/cpl/desk/lang/ru-RU.rc | 14 +++++++------- dll/cpl/desk/lang/sk-SK.rc | 12 ++++++------ dll/cpl/desk/lang/sq-AL.rc | 6 +++--- dll/cpl/desk/lang/sv-SE.rc | 4 ++-- dll/cpl/desk/lang/tr-TR.rc | 12 ++++++------ dll/cpl/desk/lang/uk-UA.rc | 12 ++++++------ dll/cpl/desk/lang/zh-CN.rc | 4 ++-- dll/cpl/desk/lang/zh-HK.rc | 4 ++-- dll/cpl/desk/lang/zh-TW.rc | 4 ++-- 29 files changed, 113 insertions(+), 113 deletions(-) diff --git a/dll/cpl/desk/lang/bg-BG.rc b/dll/cpl/desk/lang/bg-BG.rc index 8018fa5c00f..b742bfd45b1 100644 --- a/dll/cpl/desk/lang/bg-BG.rc +++ b/dll/cpl/desk/lang/bg-BG.rc @@ -18,7 +18,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Работна площ" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Изберете изображение за украса на работната си площ", IDC_STATIC, 8, 93, 230, 9 @@ -38,13 +38,13 @@ BEGIN COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "На&стройки", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP PUSHBUTTON "Пре&глед", IDC_SCREENS_TESTSC, 175, 102, 50, 15 - LTEXT "&Изчакване", IDC_WAITTEXT, 14, 125, 20, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY, 36, 123, 32, 13, ES_RIGHT | WS_GROUP + LTEXT "&Изчакване", IDC_WAITTEXT, 14, 125, 38, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY, 52, 123, 32, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | - UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13 - LTEXT "минути", IDC_MINTEXT, 70, 125, 26, 9 + UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 72, 123, 12, 13 + LTEXT "минути", IDC_MINTEXT, 86, 125, 26, 9 CONTROL "Искане на парола при изход", IDC_SCREENS_USEPASSCHK, "button", - BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19 + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 120, 109, 19 GROUPBOX "&Енергоспестяващи възможности на монитора", IDC_SCREENS_DUMMY2, 8, 150, 230, 41 LTEXT "За настройка захранването на монитора, натиснете „Захранване...“.", IDC_STATIC, 16, 161, 146, 27 PUSHBUTTON "Захранване...", IDC_SCREENS_POWER_BUTTON, 167, 165, 61, 15 @@ -134,7 +134,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Настройки" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 LTEXT "Завлачете значетата на мониторите така, че да отговарят на действителното разположение на мониторите ви.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE diff --git a/dll/cpl/desk/lang/cs-CZ.rc b/dll/cpl/desk/lang/cs-CZ.rc index 73c515cc645..386411e122d 100644 --- a/dll/cpl/desk/lang/cs-CZ.rc +++ b/dll/cpl/desk/lang/cs-CZ.rc @@ -24,7 +24,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Pozadí" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Vyberte obrázek, který chcete použít jako pozadí", IDC_STATIC, 8, 93, 230, 9 @@ -140,7 +140,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Nastavení" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 LTEXT "Tažením nastavte ikony monitorů, aby odpovídaly fyzickému uspořádání vašich monitorů.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE diff --git a/dll/cpl/desk/lang/de-DE.rc b/dll/cpl/desk/lang/de-DE.rc index b6eea5450c1..d83f0b84916 100644 --- a/dll/cpl/desk/lang/de-DE.rc +++ b/dll/cpl/desk/lang/de-DE.rc @@ -18,7 +18,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Desktop" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Hintergrundbild", IDC_STATIC, 8, 93, 230, 9 @@ -134,7 +134,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Einstellungen" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 LTEXT "Verschieben Sie die Monitor-Symbole, sodass sie der physischen Anordnung Ihrer Monitore entsprechen.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE diff --git a/dll/cpl/desk/lang/el-GR.rc b/dll/cpl/desk/lang/el-GR.rc index d098a341703..c3a5444845e 100644 --- a/dll/cpl/desk/lang/el-GR.rc +++ b/dll/cpl/desk/lang/el-GR.rc @@ -18,7 +18,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Φόντο" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Επιλέξτε Φόντο", IDC_STATIC, 8, 93, 230, 9 @@ -134,7 +134,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ρυθμίσεις" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 LTEXT "Σύρετε τα εικονίδια της οθόνης, ώστε να ταιριάξουν με τη φυσική διάταξη των οθονών σας.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE diff --git a/dll/cpl/desk/lang/en-GB.rc b/dll/cpl/desk/lang/en-GB.rc index b7ebc3e5c0b..d0fc9282a17 100644 --- a/dll/cpl/desk/lang/en-GB.rc +++ b/dll/cpl/desk/lang/en-GB.rc @@ -18,7 +18,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Background" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Select an image to use as your des&ktop wallpaper", IDC_STATIC, 8, 93, 230, 9 @@ -134,7 +134,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Settings" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE diff --git a/dll/cpl/desk/lang/en-US.rc b/dll/cpl/desk/lang/en-US.rc index 6173558b086..12cc26ce914 100644 --- a/dll/cpl/desk/lang/en-US.rc +++ b/dll/cpl/desk/lang/en-US.rc @@ -18,7 +18,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Background" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Select an image to use as your des&ktop wallpaper", IDC_STATIC, 8, 93, 230, 9 @@ -134,7 +134,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Settings" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE diff --git a/dll/cpl/desk/lang/es-ES.rc b/dll/cpl/desk/lang/es-ES.rc index 8f5c272af84..21ce9e4fe2c 100644 --- a/dll/cpl/desk/lang/es-ES.rc +++ b/dll/cpl/desk/lang/es-ES.rc @@ -28,7 +28,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Escritorio" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "&Fondo de escritorio", IDC_STATIC, 8, 93, 230, 9 @@ -49,10 +49,10 @@ BEGIN PUSHBUTTON "C&onfiguración", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP PUSHBUTTON "&Vista previa", IDC_SCREENS_TESTSC, 175, 102, 50, 15 LTEXT "&Esperar", IDC_WAITTEXT, 14, 125, 25, 9, SS_RIGHT - EDITTEXT IDC_SCREENS_TIMEDELAY, 40, 123, 30, 13, ES_RIGHT | WS_GROUP + EDITTEXT IDC_SCREENS_TIMEDELAY, 42, 123, 30, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | - UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13 - LTEXT "minutos", IDC_MINTEXT, 72, 125, 26, 9 + UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 58, 123, 12, 13 + LTEXT "minutos", IDC_MINTEXT, 74, 125, 26, 9 CONTROL "Pr&oteger sesión con contraseña", IDC_SCREENS_USEPASSCHK, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19 GROUPBOX "Energía del monitor ", IDC_SCREENS_DUMMY2, 8, 150, 230, 41 @@ -144,7 +144,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Configuración" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 LTEXT "Arrastre los iconos para ajustar el orden físico de sus monitores.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE diff --git a/dll/cpl/desk/lang/et-EE.rc b/dll/cpl/desk/lang/et-EE.rc index 978ccdf0ee8..4436b9c0b73 100644 --- a/dll/cpl/desk/lang/et-EE.rc +++ b/dll/cpl/desk/lang/et-EE.rc @@ -25,7 +25,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Taust" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Taust:", IDC_STATIC, 8, 93, 230, 9 @@ -141,7 +141,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Sätted" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 LTEXT "Lohista monitori ikoone kuni see kattub teie füüsilise monitoride järjekorraga.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE diff --git a/dll/cpl/desk/lang/fr-FR.rc b/dll/cpl/desk/lang/fr-FR.rc index 45870b271a5..9f8a90e1e0b 100644 --- a/dll/cpl/desk/lang/fr-FR.rc +++ b/dll/cpl/desk/lang/fr-FR.rc @@ -20,7 +20,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Bureau" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Arrière-plan :", IDC_STATIC, 8, 93, 230, 9 @@ -40,7 +40,7 @@ BEGIN COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Paramè&tres", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP PUSHBUTTON "&Aperçu", IDC_SCREENS_TESTSC, 175, 102, 50, 15 - LTEXT "Dé&lai ", IDC_WAITTEXT, 14, 125, 20, 9 + LTEXT "Dé&lai", IDC_WAITTEXT, 14, 125, 20, 9 EDITTEXT IDC_SCREENS_TIMEDELAY, 31, 123, 32, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13 @@ -136,7 +136,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Paramètres" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 LTEXT "Déplacez les icônes de moniteur pour qu'elles correspondent à l'arrangement physique de vos moniteurs.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE diff --git a/dll/cpl/desk/lang/he-IL.rc b/dll/cpl/desk/lang/he-IL.rc index 8fecbd9005b..e5b4c511655 100644 --- a/dll/cpl/desk/lang/he-IL.rc +++ b/dll/cpl/desk/lang/he-IL.rc @@ -18,7 +18,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "רקע" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "בחר תמונה שתשמש כרקע שולחן העבודה שלך:", IDC_STATIC, 8, 93, 230, 9 @@ -134,7 +134,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "הגדרות" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE diff --git a/dll/cpl/desk/lang/hu-HU.rc b/dll/cpl/desk/lang/hu-HU.rc index 8f8f6ad8f26..f96f7c872c6 100644 --- a/dll/cpl/desk/lang/hu-HU.rc +++ b/dll/cpl/desk/lang/hu-HU.rc @@ -20,7 +20,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Háttér" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Válasszon ki egy képet az asztala hátterének", IDC_STATIC, 8, 93, 230, 9 @@ -136,7 +136,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Beállítások" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 LTEXT "Mozgassa a monitor ikonokat úgy, hogy megegyezzen a monitorjai fizikai elrendezésével.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE diff --git a/dll/cpl/desk/lang/id-ID.rc b/dll/cpl/desk/lang/id-ID.rc index f0f339b1d31..a2f0a2fe2dc 100644 --- a/dll/cpl/desk/lang/id-ID.rc +++ b/dll/cpl/desk/lang/id-ID.rc @@ -18,7 +18,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Latar Belakang" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Pilih gambar untuk dipakai sebagai desktop wallpaper anda", IDC_STATIC, 8, 93, 230, 9 @@ -38,11 +38,11 @@ BEGIN COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Se&telan", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP PUSHBUTTON "P&ratinjau", IDC_SCREENS_TESTSC, 175, 102, 50, 15 - LTEXT "Tun&ggu", IDC_WAITTEXT, 14, 125, 20, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY, 36, 123, 32, 13, ES_RIGHT | WS_GROUP + LTEXT "Tun&ggu", IDC_WAITTEXT, 14, 125, 26, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY, 40, 123, 32, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | - UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13 - LTEXT "menit", IDC_MINTEXT, 70, 125, 26, 9 + UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 60, 123, 12, 13 + LTEXT "menit", IDC_MINTEXT, 74, 125, 26, 9 CONTROL "Pintai &kata sandi saat melanjutkan", IDC_SCREENS_USEPASSCHK, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 106, 120, 119, 19 GROUPBOX "Fitur pen&yimpan Daya monitor", IDC_SCREENS_DUMMY2, 8, 150, 230, 41 @@ -134,7 +134,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Setelan" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 LTEXT "Geser ikon monitor untuk mencocokkan penyesuaian fisik monitor.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE diff --git a/dll/cpl/desk/lang/it-IT.rc b/dll/cpl/desk/lang/it-IT.rc index c648e8906be..d66cf49191d 100644 --- a/dll/cpl/desk/lang/it-IT.rc +++ b/dll/cpl/desk/lang/it-IT.rc @@ -18,7 +18,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Sfondo" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Selezionare un'immagine da usare come sfondo per il desktop", IDC_STATIC, 8, 93, 230, 9 @@ -38,11 +38,11 @@ BEGIN COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Impostazioni", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP PUSHBUTTON "&Anteprima", IDC_SCREENS_TESTSC, 175, 102, 50, 15 - LTEXT "&Attesa", IDC_WAITTEXT, 14, 125, 20, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY, 36, 123, 32, 13, ES_RIGHT | WS_GROUP + LTEXT "&Attesa", IDC_WAITTEXT, 14, 125, 22, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY, 38, 123, 32, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | - UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13 - LTEXT "minuti", IDC_MINTEXT, 70, 125, 26, 9 + UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 58, 123, 12, 13 + LTEXT "minuti", IDC_MINTEXT, 72, 125, 26, 9 CONTROL "Chiedere la &password al ripristino", IDC_SCREENS_USEPASSCHK, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19 GROUPBOX "&Funzioni di risparmio energetico del monitor", IDC_SCREENS_DUMMY2, 8, 150, 230, 41 @@ -134,7 +134,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Impostazioni" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 LTEXT "Trascinare le icone dei monitor in modo corrispondente alla disposizione fisica dei vostri monitor.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE diff --git a/dll/cpl/desk/lang/ja-JP.rc b/dll/cpl/desk/lang/ja-JP.rc index ae09152b14a..432b61a7fef 100644 --- a/dll/cpl/desk/lang/ja-JP.rc +++ b/dll/cpl/desk/lang/ja-JP.rc @@ -18,7 +18,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "背景" FONT 9, "MS UI Gothic" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "デスクトップの壁紙として使う画像を選択してください:", IDC_STATIC, 8, 93, 230, 9 @@ -134,7 +134,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "設定" FONT 9, "MS UI Gothic" BEGIN - CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 LTEXT "モニタのアイコンを実際のモニタの配列と一致するように移動してください。", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE diff --git a/dll/cpl/desk/lang/nl-NL.rc b/dll/cpl/desk/lang/nl-NL.rc index 5021cf5f9bf..fca749f8c8f 100644 --- a/dll/cpl/desk/lang/nl-NL.rc +++ b/dll/cpl/desk/lang/nl-NL.rc @@ -18,7 +18,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Achtergrond" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Kies een afbeelding als bureaublad achtergrond", IDC_STATIC, 8, 93, 230, 9 @@ -38,11 +38,11 @@ BEGIN COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Instellingen", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP PUSHBUTTON "&Voorbeeld", IDC_SCREENS_TESTSC, 175, 102, 50, 15 - LTEXT "&Wacht", IDC_WAITTEXT, 14, 125, 20, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY, 36, 123, 32, 13, ES_RIGHT | WS_GROUP + LTEXT "&Wacht", IDC_WAITTEXT, 14, 125, 22, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY, 38, 123, 32, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | - UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13 - LTEXT "minuten", IDC_MINTEXT, 70, 125, 26, 9 + UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 58, 123, 12, 13 + LTEXT "minuten", IDC_MINTEXT, 72, 125, 26, 9 CONTROL "Ask for &password on resume", IDC_SCREENS_USEPASSCHK, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19 GROUPBOX "&Energie van het beeldscherm", IDC_SCREENS_DUMMY2, 8, 150, 230, 41 @@ -134,7 +134,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Instellingen" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE diff --git a/dll/cpl/desk/lang/no-NO.rc b/dll/cpl/desk/lang/no-NO.rc index f3d70cd2e29..d6520cb9f0c 100644 --- a/dll/cpl/desk/lang/no-NO.rc +++ b/dll/cpl/desk/lang/no-NO.rc @@ -18,7 +18,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Bakgrunn" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Velg et bilde som du vil bruke som skrivebordbakgrunn", IDC_STATIC, 8, 93, 230, 9 @@ -134,7 +134,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Innstillinger" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 LTEXT "Dra skjermikonene for å tilpasse fysisk til din skjerm.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE diff --git a/dll/cpl/desk/lang/pl-PL.rc b/dll/cpl/desk/lang/pl-PL.rc index be19ad7fe59..e88a01a9988 100644 --- a/dll/cpl/desk/lang/pl-PL.rc +++ b/dll/cpl/desk/lang/pl-PL.rc @@ -28,7 +28,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Pulpit" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Wybierz obraz do użycia jako tapeta pulpitu", IDC_STATIC, 8, 93, 230, 9 @@ -48,11 +48,11 @@ BEGIN COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Ustawienia", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP PUSHBUTTON "&Podgląd", IDC_SCREENS_TESTSC, 175, 102, 50, 15 - LTEXT "&Czekaj", IDC_WAITTEXT, 14, 125, 20, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY, 36, 123, 32, 13, ES_RIGHT | WS_GROUP + LTEXT "&Czekaj", IDC_WAITTEXT, 14, 125, 24, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY, 38, 123, 32, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | - UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13 - LTEXT "minut", IDC_MINTEXT, 70, 125, 26, 9 + UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 58, 123, 12, 13 + LTEXT "minut", IDC_MINTEXT, 72, 125, 26, 9 CONTROL "Po wznowieniu chroń &hasłem", IDC_SCREENS_USEPASSCHK, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19 GROUPBOX "&Zasilanie monitora", IDC_SCREENS_DUMMY2, 8, 150, 230, 41 @@ -144,7 +144,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ustawienia" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 LTEXT "Przeciągnij ikony monitorów tak, by przedstawiały fizyczne rozmieszczenie twoich monitorów.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE diff --git a/dll/cpl/desk/lang/pt-BR.rc b/dll/cpl/desk/lang/pt-BR.rc index 6d10ed9df59..2a524c8c992 100644 --- a/dll/cpl/desk/lang/pt-BR.rc +++ b/dll/cpl/desk/lang/pt-BR.rc @@ -18,7 +18,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Área de trabalho" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "&Plano de fundo:", IDC_STATIC, 8, 93, 230, 9 @@ -38,7 +38,7 @@ BEGIN COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Configurações", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP PUSHBUTTON "&Visualizar", IDC_SCREENS_TESTSC, 175, 102, 50, 15 - LTEXT "Ag&uardar:", IDC_WAITTEXT, 14, 125, 30, 9 + LTEXT "Ag&uardar", IDC_WAITTEXT, 14, 125, 30, 9 EDITTEXT IDC_SCREENS_TIMEDELAY, 46, 123, 32, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13 @@ -134,7 +134,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Configurações" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 LTEXT "Arraste os ícones de monitor para que corresponda à disposição física de seus monitores.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE diff --git a/dll/cpl/desk/lang/pt-PT.rc b/dll/cpl/desk/lang/pt-PT.rc index 7674e647081..2c93d48cbbf 100644 --- a/dll/cpl/desk/lang/pt-PT.rc +++ b/dll/cpl/desk/lang/pt-PT.rc @@ -23,7 +23,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ambiente de trabalho" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "&Plano de fundo:", IDC_STATIC, 8, 93, 230, 9 @@ -33,13 +33,13 @@ BEGIN COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END -IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 +IDD_SCREENSAVER DIALOGEX 0, 0, 246, 216 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Protecção de ecrã" FONT 8, "MS Shell Dlg", 0, 0 BEGIN CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE - GROUPBOX "Protecção de &ecrã", IDC_SCREENS_DUMMY, 8, 92, 230, 75 + GROUPBOX "Protecção de &ecrã", IDC_SCREENS_DUMMY, 8, 92, 230, 64 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Definições", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP PUSHBUTTON "&Pré-visualizar", IDC_SCREENS_TESTSC, 175, 102, 50, 15 @@ -49,10 +49,10 @@ BEGIN UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13 LTEXT "minutos", IDC_MINTEXT, 80, 125, 26, 9 CONTROL "Ao reiniciar, &proteger por palavra-passe", IDC_SCREENS_USEPASSCHK, "button", - BS_AUTOCHECKBOX | WS_TABSTOP, 30, 145, 200, 19 - GROUPBOX "Energia do monitor", IDC_SCREENS_DUMMY2, 8, 175, 230, 41 - LTEXT "Para ajustar as definições de energia do monitor e poupar energia, clique em 'Energia'.", IDC_STATIC, 16, 185, 146, 27 - PUSHBUTTON "&Energia...", IDC_SCREENS_POWER_BUTTON, 167, 190, 61, 15 + BS_AUTOCHECKBOX | WS_TABSTOP, 30, 140, 200, 11 + GROUPBOX "Energia do monitor", IDC_SCREENS_DUMMY2, 8, 164, 230, 41 + LTEXT "Para ajustar as definições de energia do monitor e poupar energia, clique em 'Energia'.", IDC_STATIC, 16, 174, 146, 27 + PUSHBUTTON "&Energia...", IDC_SCREENS_POWER_BUTTON, 167, 179, 61, 15 END IDD_APPEARANCE DIALOGEX 0, 0, 246, 212 @@ -139,7 +139,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Definições" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 LTEXT "Arraste os ícones dos monitores, para que correspondam à disposição física dos seus monitores.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 250, 82, WS_EX_CLIENTEDGE diff --git a/dll/cpl/desk/lang/ro-RO.rc b/dll/cpl/desk/lang/ro-RO.rc index 511e4211091..bf87ce2334d 100644 --- a/dll/cpl/desk/lang/ro-RO.rc +++ b/dll/cpl/desk/lang/ro-RO.rc @@ -23,7 +23,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Fundal" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Alegeți o imagine pentru a o folosi ca decor de birou.", IDC_STATIC, 8, 93, 230, 9 @@ -43,13 +43,13 @@ BEGIN COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Opțiuni", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP PUSHBUTTON "Pre&vizionare", IDC_SCREENS_TESTSC, 175, 102, 50, 15 - LTEXT "În vigoare &după:", IDC_WAITTEXT, 14, 125, 20, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY, 36, 123, 32, 13, ES_RIGHT | WS_GROUP + LTEXT "În vigoare &după", IDC_WAITTEXT, 14, 125, 54, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY, 68, 123, 32, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | - UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13 - LTEXT "minute", IDC_MINTEXT, 70, 125, 26, 9 + UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 88, 123, 12, 13 + LTEXT "minute", IDC_MINTEXT, 102, 125, 23, 9 CONTROL "Solicită pa&rolă la revenire", IDC_SCREENS_USEPASSCHK, "button", - BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19 + BS_AUTOCHECKBOX | WS_TABSTOP, 129, 120, 96, 19 GROUPBOX "Me&canisme de gestiune a consumului", IDC_SCREENS_DUMMY2, 8, 150, 230, 41 LTEXT "Aici veți putea ajusta parametrii actuali pentru gestiunea consumului de energie.", IDC_STATIC, 16, 161, 146, 27 PUSHBUTTON "&Energie…", IDC_SCREENS_POWER_BUTTON, 167, 165, 61, 15 @@ -139,7 +139,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Configurare" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 LTEXT "Mișcați miniaturile ecranelor până vor corespunde cu amplasamentul fizic al ecranelor (opțiune pentru ecrane multiple).", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE diff --git a/dll/cpl/desk/lang/ru-RU.rc b/dll/cpl/desk/lang/ru-RU.rc index 3cb754dc6ec..c48b93a8c78 100644 --- a/dll/cpl/desk/lang/ru-RU.rc +++ b/dll/cpl/desk/lang/ru-RU.rc @@ -18,7 +18,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Рабочий стол" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Выберите изображение для рабочего стола", IDC_STATIC, 8, 93, 230, 9 @@ -38,13 +38,13 @@ BEGIN COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Параметры", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP PUSHBUTTON "П&росмотр", IDC_SCREENS_TESTSC, 175, 102, 50, 15 - LTEXT "И&нтервал", IDC_WAITTEXT, 14, 125, 20, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY, 36, 123, 32, 13, ES_RIGHT | WS_GROUP + LTEXT "И&нтервал", IDC_WAITTEXT, 14, 125, 35, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY, 50, 123, 32, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | - UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13 - LTEXT "мин.", IDC_MINTEXT, 70, 125, 26, 9 + UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 70, 123, 12, 13 + LTEXT "мин.", IDC_MINTEXT, 84, 125, 18, 9 CONTROL "На&чинать с экрана приветствия", IDC_SCREENS_USEPASSCHK, "button", - BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19 + BS_AUTOCHECKBOX | WS_TABSTOP, 106, 120, 121, 19 GROUPBOX "&Энергосбережение", IDC_SCREENS_DUMMY2, 8, 150, 230, 41 LTEXT "Для изменения параметров питания монитора нажмите кнопку ""Питание"".", IDC_STATIC, 16, 161, 146, 27 PUSHBUTTON "П&итание...", IDC_SCREENS_POWER_BUTTON, 167, 165, 61, 15 @@ -134,7 +134,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Параметры" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 LTEXT "Разместите значки мониторов в соответствии с их расположением.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE diff --git a/dll/cpl/desk/lang/sk-SK.rc b/dll/cpl/desk/lang/sk-SK.rc index b89182d311e..fd458e45db3 100644 --- a/dll/cpl/desk/lang/sk-SK.rc +++ b/dll/cpl/desk/lang/sk-SK.rc @@ -20,7 +20,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Pozadie" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Vyberte obrázok, ktorý chcete použiť ako pozadie pracovnej plochy", IDC_STATIC, 8, 93, 230, 9 @@ -40,11 +40,11 @@ BEGIN COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Nastavenie", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP PUSHBUTTON "&Ukážka", IDC_SCREENS_TESTSC, 175, 102, 50, 15 - LTEXT "&Počkať", IDC_WAITTEXT, 14, 125, 20, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY, 36, 123, 32, 13, ES_RIGHT | WS_GROUP + LTEXT "&Počkať", IDC_WAITTEXT, 14, 125, 23, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY, 38, 123, 32, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | - UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13 - LTEXT "minút", IDC_MINTEXT, 70, 125, 26, 9 + UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 58, 123, 12, 13 + LTEXT "minút", IDC_MINTEXT, 72, 125, 26, 9 CONTROL "Pri obnovení chrániť &heslom", IDC_SCREENS_USEPASSCHK, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19 GROUPBOX "Napájani&e monitora", IDC_SCREENS_DUMMY2, 8, 150, 230, 41 @@ -136,7 +136,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Nastavenie" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 LTEXT "Ťahaním zoraďte ikony podľa fyzického rozmiestnenia monitorov.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE diff --git a/dll/cpl/desk/lang/sq-AL.rc b/dll/cpl/desk/lang/sq-AL.rc index 85fe079cc00..b6b504e1e49 100644 --- a/dll/cpl/desk/lang/sq-AL.rc +++ b/dll/cpl/desk/lang/sq-AL.rc @@ -22,7 +22,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Sfond" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Zgjidhni një imazh për t'u përdorur si sfond tuaj desktop", IDC_STATIC, 8, 93, 230, 9 @@ -40,7 +40,7 @@ BEGIN CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE GROUPBOX "&Screensaver", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Cilësime%t", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP + PUSHBUTTON "Cilësime&t", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP PUSHBUTTON "Pre&view", IDC_SCREENS_TESTSC, 175, 102, 50, 15 LTEXT "Prit", IDC_WAITTEXT, 14, 125, 20, 9 EDITTEXT IDC_SCREENS_TIMEDELAY, 36, 123, 32, 13, ES_RIGHT | WS_GROUP @@ -138,7 +138,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Cilësimet" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 LTEXT "Terheq monitorimin e ikonave të përputhet me marrëveshje fizike të vëzhguesit tuaj.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE diff --git a/dll/cpl/desk/lang/sv-SE.rc b/dll/cpl/desk/lang/sv-SE.rc index a61fc851d18..409fc3f491b 100644 --- a/dll/cpl/desk/lang/sv-SE.rc +++ b/dll/cpl/desk/lang/sv-SE.rc @@ -20,7 +20,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Bakgrund" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Välj en bild du vill ha som skrivbordsunderlägg", IDC_STATIC, 8, 93, 230, 9 @@ -136,7 +136,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Inställningar" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE diff --git a/dll/cpl/desk/lang/tr-TR.rc b/dll/cpl/desk/lang/tr-TR.rc index 8ea90892be8..c828f0b5cb9 100644 --- a/dll/cpl/desk/lang/tr-TR.rc +++ b/dll/cpl/desk/lang/tr-TR.rc @@ -20,7 +20,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Arka Plan" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Duvar kağıdınız olarak kullanmak için bir resim seçiniz.", IDC_STATIC, 8, 93, 230, 9 @@ -40,11 +40,11 @@ BEGIN COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Ayarlar", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP PUSHBUTTON "&Ön İzleme", IDC_SCREENS_TESTSC, 175, 102, 50, 15 - LTEXT "&Bekleme:", IDC_WAITTEXT, 14, 125, 20, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY, 36, 123, 32, 13, ES_RIGHT | WS_GROUP + LTEXT "&Bekleme", IDC_WAITTEXT, 14, 125, 27, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY, 42, 123, 32, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | - UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13 - LTEXT "dakika", IDC_MINTEXT, 70, 125, 26, 9 + UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 62, 123, 12, 13 + LTEXT "dakika", IDC_MINTEXT, 76, 125, 26, 9 CONTROL "&Çıkışta Parola Sor", IDC_SCREENS_USEPASSCHK, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19 GROUPBOX "Monitörün Güç Tasarrufu Özellikleri", IDC_SCREENS_DUMMY2, 8, 150, 230, 41 @@ -136,7 +136,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ayarlar" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 LTEXT "Monitörlerinizin fiziksel düzenlenmesini karşılaştırmak için monitör simgelerini sürükleyiniz.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE diff --git a/dll/cpl/desk/lang/uk-UA.rc b/dll/cpl/desk/lang/uk-UA.rc index 5d8cbb06e11..5e9d3a285e2 100644 --- a/dll/cpl/desk/lang/uk-UA.rc +++ b/dll/cpl/desk/lang/uk-UA.rc @@ -26,7 +26,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Робочий стіл" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Виберіть зображення для шпалер робочого столу", IDC_STATIC, 8, 93, 238, 9 @@ -46,11 +46,11 @@ BEGIN COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "П&араметри", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP PUSHBUTTON "&Перегляд", IDC_SCREENS_TESTSC, 175, 102, 50, 15 - LTEXT "&Інтервал", IDC_WAITTEXT, 14, 125, 20, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY, 36, 123, 32, 13, ES_RIGHT | WS_GROUP + LTEXT "&Інтервал", IDC_WAITTEXT, 14, 125, 32, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY, 48, 123, 32, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | - UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13 - LTEXT "хв", IDC_MINTEXT, 70, 125, 26, 9 + UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 68, 123, 12, 13 + LTEXT "хв", IDC_MINTEXT, 82, 125, 16, 9 CONTROL "За&хист паролем", IDC_SCREENS_USEPASSCHK,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19 GROUPBOX "&Енергозбереження", IDC_SCREENS_DUMMY2, 8, 150, 230, 41 @@ -142,7 +142,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Параметри" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 LTEXT "Розташуйте значки моніторів відповідно до фактичного розташування моніторів.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE diff --git a/dll/cpl/desk/lang/zh-CN.rc b/dll/cpl/desk/lang/zh-CN.rc index 76cd85d2a65..a9a51d7d598 100644 --- a/dll/cpl/desk/lang/zh-CN.rc +++ b/dll/cpl/desk/lang/zh-CN.rc @@ -28,7 +28,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "背景" FONT 9, "宋体" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "壁纸：", IDC_STATIC, 8, 93, 230, 9 @@ -144,7 +144,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "设置" FONT 9, "宋体" BEGIN - CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 LTEXT "拖动监视器图标以匹配监视器的物理排列。", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE diff --git a/dll/cpl/desk/lang/zh-HK.rc b/dll/cpl/desk/lang/zh-HK.rc index e6d8ee0bbea..2e42c33b408 100644 --- a/dll/cpl/desk/lang/zh-HK.rc +++ b/dll/cpl/desk/lang/zh-HK.rc @@ -26,7 +26,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "背景" FONT 9, "新細明體" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "牆紙：", IDC_STATIC, 8, 93, 230, 9 @@ -142,7 +142,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "設定" FONT 9, "新細明體" BEGIN - CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 LTEXT "拖動顯示器圖示以便符合顯示器的實際設定。", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE diff --git a/dll/cpl/desk/lang/zh-TW.rc b/dll/cpl/desk/lang/zh-TW.rc index 81a5f965abc..2f8a659304c 100644 --- a/dll/cpl/desk/lang/zh-TW.rc +++ b/dll/cpl/desk/lang/zh-TW.rc @@ -27,7 +27,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "背景" FONT 9, "新細明體" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "牆紙：", IDC_STATIC, 8, 93, 230, 9 @@ -143,7 +143,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "設定" FONT 9, "新細明體" BEGIN - CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 + CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74 LTEXT "拖動顯示器圖示以便符合顯示器的實際設定。", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs