Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [FREELDR] Properly set keyboard flags in hardware detection (#2288)
by Dmitry Borisov 29 Jan '20

29 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e00ea7daddfa21ba692d6… commit e00ea7daddfa21ba692d6d9a22d460d79920c6fc Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Wed Jan 29 21:49:31 2020 +0600 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 29 16:49:31 2020 +0100 [FREELDR] Properly set keyboard flags in hardware detection (#2288) See https://docs.microsoft.com/en-us/windows-hardware/drivers/ddi/wdm/ns-wdm-_c… --- boot/freeldr/freeldr/arch/i386/machpc.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/boot/freeldr/freeldr/arch/i386/machpc.c b/boot/freeldr/freeldr/arch/i386/machpc.c index 95253971c02..3ca5578aa4b 100644 --- a/boot/freeldr/freeldr/arch/i386/machpc.c +++ b/boot/freeldr/freeldr/arch/i386/machpc.c @@ -919,6 +919,7 @@ DetectKeyboardPeripheral(PCONFIGURATION_COMPONENT_DATA ControllerKey) PCM_KEYBOARD_DEVICE_DATA KeyboardData; PCONFIGURATION_COMPONENT_DATA PeripheralKey; ULONG Size; + REGS Regs; /* HACK: don't call DetectKeyboardDevice() as it fails in Qemu 0.8.2 if (DetectKeyboardDevice()) */ @@ -944,12 +945,21 @@ DetectKeyboardPeripheral(PCONFIGURATION_COMPONENT_DATA ControllerKey) PartialDescriptor->ShareDisposition = CmResourceShareUndetermined; PartialDescriptor->u.DeviceSpecificData.DataSize = sizeof(CM_KEYBOARD_DEVICE_DATA); + /* Int 16h AH=02h + * KEYBOARD - GET SHIFT FLAGS + * + * Return: + * AL - shift flags + */ + Regs.b.ah = 0x02; + Int386(0x16, &Regs, &Regs); + KeyboardData = (PCM_KEYBOARD_DEVICE_DATA)(PartialDescriptor + 1); KeyboardData->Version = 1; KeyboardData->Revision = 1; KeyboardData->Type = 4; KeyboardData->Subtype = 0; - KeyboardData->KeyboardFlags = 0x20; + KeyboardData->KeyboardFlags = Regs.b.al; /* Create controller key */ FldrCreateComponentKey(ControllerKey,

1 0

[reactos] 01/01: [SDK][ATL] Make ThrowMemoryException protected
by Katayama Hirofumi MZ 29 Jan '20

29 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4c0426ec442fd52f6f061… commit 4c0426ec442fd52f6f06122795b02fd5fd7fdd94 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 29 22:29:11 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Jan 29 22:29:11 2020 +0900 [SDK][ATL] Make ThrowMemoryException protected --- sdk/lib/atl/atlsimpstr.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sdk/lib/atl/atlsimpstr.h b/sdk/lib/atl/atlsimpstr.h index 05e582fc6f8..c06a8e46cc5 100644 --- a/sdk/lib/atl/atlsimpstr.h +++ b/sdk/lib/atl/atlsimpstr.h @@ -608,7 +608,7 @@ private: return pNewData; } - +protected: static void ThrowMemoryException() { AtlThrow(E_OUTOFMEMORY); @@ -618,7 +618,6 @@ private: { AtlThrow(E_INVALIDARG); } - }; #ifdef UNICODE

1 0

[reactos] 01/01: [SDK][ATL] Implement CStringT::FormatMessage (#2286)
by Katayama Hirofumi MZ 29 Jan '20

29 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eaa3692f7d1743f588e38… commit eaa3692f7d1743f588e38c9d9b35978ac0cb32e5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 29 22:16:58 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 29 22:16:58 2020 +0900 [SDK][ATL] Implement CStringT::FormatMessage (#2286) CStringT::FormatMessage in ATL is a method to build a formatted string. CORE-16666 --- sdk/lib/atl/cstringt.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/sdk/lib/atl/cstringt.h b/sdk/lib/atl/cstringt.h index 87ac52aac6f..ad89dc6270a 100644 --- a/sdk/lib/atl/cstringt.h +++ b/sdk/lib/atl/cstringt.h @@ -150,6 +150,16 @@ public: return ::vswprintf(pszDest, pszFormat, args); } + static LPWSTR + FormatMessageV(_In_z_ LPCWSTR pszFormat, _In_opt_ va_list *pArgList) + { + LPWSTR psz; + ::FormatMessageW( + FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, pszFormat, 0, 0, + reinterpret_cast<LPWSTR>(&psz), 0, pArgList); + return psz; + } + static BSTR __cdecl AllocSysString( _In_z_ LPCWSTR pszSource, _In_ int nLength) @@ -289,6 +299,16 @@ public: return ::vsprintf(pszDest, pszFormat, args); } + static LPSTR + FormatMessageV(_In_z_ LPCSTR pszFormat, _In_opt_ va_list *pArgList) + { + LPSTR psz; + ::FormatMessageA( + FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, pszFormat, 0, 0, reinterpret_cast<LPSTR>(&psz), + 0, pArgList); + return psz; + } + static BSTR __cdecl AllocSysString( _In_z_ LPCSTR pszSource, _In_ int nLength) @@ -692,6 +712,36 @@ public: CThisSimpleString::ReleaseBufferSetLength(nLength); } + void __cdecl FormatMessage(UINT nFormatID, ...) + { + va_list va; + va_start(va, nFormatID); + + CStringT str; + if (str.LoadString(nFormatID)) + FormatMessageV(str, &va); + + va_end(va); + } + + void __cdecl FormatMessage(PCXSTR pszFormat, ...) + { + va_list va; + va_start(va, pszFormat); + FormatMessageV(pszFormat, &va); + va_end(va); + } + + void + FormatMessageV(PCXSTR pszFormat, va_list *pArgList) + { + PXSTR psz = StringTraits::FormatMessageV(pszFormat, pArgList); + if (!psz) + CThisSimpleString::ThrowMemoryException(); + + *this = psz; + ::LocalFree(psz); + } int Replace(PCXSTR pszOld, PCXSTR pszNew) {

1 0

[reactos] 01/01: [BROWSEUI] Fix infinite recursion in autocomplete control import wine commits 9c2217 and 644358, slightly tweaked to fit our code
by Mark Jansen 28 Jan '20

28 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5b3e84f2ef2c8e8806a98… commit 5b3e84f2ef2c8e8806a984e315b4f272b6677a90 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Jan 26 23:40:04 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Jan 28 19:25:11 2020 +0100 [BROWSEUI] Fix infinite recursion in autocomplete control import wine commits 9c2217 and 644358, slightly tweaked to fit our code --- dll/win32/browseui/CAutoComplete.cpp | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/dll/win32/browseui/CAutoComplete.cpp b/dll/win32/browseui/CAutoComplete.cpp index e1ed083dae3..8bf5b152e84 100644 --- a/dll/win32/browseui/CAutoComplete.cpp +++ b/dll/win32/browseui/CAutoComplete.cpp @@ -65,8 +65,11 @@ CAutoComplete::~CAutoComplete() TRACE(" destroying IAutoComplete(%p)\n", this); HeapFree(GetProcessHeap(), 0, quickComplete); HeapFree(GetProcessHeap(), 0, txtbackup); - RemovePropW(hwndEdit, autocomplete_propertyW); - SetWindowLongPtrW(hwndEdit, GWLP_WNDPROC, (LONG_PTR)wpOrigEditProc); + if (wpOrigEditProc) + { + SetWindowLongPtrW(hwndEdit, GWLP_WNDPROC, (LONG_PTR)wpOrigEditProc); + RemovePropW(hwndEdit, autocomplete_propertyW); + } if (hwndListBox) DestroyWindow(hwndListBox); } @@ -148,10 +151,27 @@ HRESULT WINAPI CAutoComplete::Init(HWND hwndEdit, IUnknown *punkACL, LPCOLESTR p this->hwndEdit = hwndEdit; this->initialized = TRUE; - this->wpOrigEditProc = (WNDPROC)SetWindowLongPtrW(hwndEdit, GWLP_WNDPROC, (LONG_PTR) ACEditSubclassProc); + /* Keep at least one reference to the object until the edit window is destroyed. */ this->AddRef(); - SetPropW( this->hwndEdit, autocomplete_propertyW, (HANDLE)this ); + + /* If another AutoComplete object was previously assigned to this edit control, + release it but keep the same callback on the control, to avoid an infinite + recursive loop in ACEditSubclassProc while the property is set to this object */ + CAutoComplete *prev = static_cast<CAutoComplete *>(GetPropW(hwndEdit, autocomplete_propertyW)); + + if (prev && prev->initialized) + { + this->wpOrigEditProc = prev->wpOrigEditProc; + SetPropW(hwndEdit, autocomplete_propertyW, this); + prev->wpOrigEditProc = NULL; + prev->Release(); + } + else + { + SetPropW( this->hwndEdit, autocomplete_propertyW, (HANDLE)this ); + this->wpOrigEditProc = (WNDPROC)SetWindowLongPtrW(hwndEdit, GWLP_WNDPROC, (LONG_PTR)ACEditSubclassProc); + } if (options & ACO_AUTOSUGGEST) {

1 0

[reactos] 01/01: [CPL][APPWIZ] Consider PSN_SETACTIVE
by Katayama Hirofumi MZ 28 Jan '20

28 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=43556bfff2b7a56b08293… commit 43556bfff2b7a56b0829356bfd87303343acf5a0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 29 02:29:16 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Jan 29 02:29:16 2020 +0900 [CPL][APPWIZ] Consider PSN_SETACTIVE - Correctly respond even if the user clicked "Back" button. - Accept environment variables. CORE-16534 --- dll/cpl/appwiz/createlink.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/dll/cpl/appwiz/createlink.c b/dll/cpl/appwiz/createlink.c index 27ac650e96e..46cf6f9b84c 100644 --- a/dll/cpl/appwiz/createlink.c +++ b/dll/cpl/appwiz/createlink.c @@ -231,7 +231,7 @@ WelcomeDlgProc(HWND hwndDlg, LPPROPSHEETPAGEW ppsp; PCREATE_LINK_CONTEXT pContext; LPPSHNOTIFY lppsn; - WCHAR szPath[MAX_PATH]; + WCHAR szPath[MAX_PATH * 2]; WCHAR szDesc[100]; BROWSEINFOW brws; LPITEMIDLIST pidllist; @@ -284,11 +284,18 @@ WelcomeDlgProc(HWND hwndDlg, case WM_NOTIFY: lppsn = (LPPSHNOTIFY) lParam; pContext = (PCREATE_LINK_CONTEXT)GetWindowLongPtr(hwndDlg, DWLP_USER); - if (lppsn->hdr.code == PSN_WIZNEXT) + if (lppsn->hdr.code == PSN_SETACTIVE) + { + SetDlgItemTextW(hwndDlg, IDC_SHORTCUT_LOCATION, pContext->szTarget); + } + else if (lppsn->hdr.code == PSN_WIZNEXT) { GetDlgItemTextW(hwndDlg, IDC_SHORTCUT_LOCATION, pContext->szTarget, _countof(pContext->szTarget)); StrTrimW(pContext->szTarget, L" \t"); + ExpandEnvironmentStringsW(pContext->szTarget, szPath, _countof(szPath)); + StringCchCopyW(pContext->szTarget, _countof(pContext->szTarget), szPath); + if (IsInternetLocation(pContext->szTarget)) { /* internet */ @@ -336,7 +343,7 @@ WelcomeDlgProc(HWND hwndDlg, return TRUE; } } - else if (lppsn->hdr.code == PSN_RESET) + else if (lppsn->hdr.code == PSN_RESET && !lppsn->lParam) { /* The user has clicked [Cancel] */ DeleteFileW(pContext->szOldFile); @@ -367,11 +374,6 @@ FinishDlgProc(HWND hwndDlg, ppsp = (LPPROPSHEETPAGEW)lParam; pContext = (PCREATE_LINK_CONTEXT) ppsp->lParam; SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pContext); - - /* TODO: Use shell32!PathCleanupSpec instead of DoConvertNameForFileSystem */ - DoConvertNameForFileSystem(pContext->szDescription); - SetDlgItemTextW(hwndDlg, IDC_SHORTCUT_NAME, pContext->szDescription); - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_FINISH); break; case WM_COMMAND: @@ -397,7 +399,13 @@ FinishDlgProc(HWND hwndDlg, case WM_NOTIFY: lppsn = (LPPSHNOTIFY) lParam; pContext = (PCREATE_LINK_CONTEXT) GetWindowLongPtr(hwndDlg, DWLP_USER); - if (lppsn->hdr.code == PSN_WIZFINISH) + if (lppsn->hdr.code == PSN_SETACTIVE) + { + /* TODO: Use shell32!PathCleanupSpec instead of DoConvertNameForFileSystem */ + DoConvertNameForFileSystem(pContext->szDescription); + SetDlgItemTextW(hwndDlg, IDC_SHORTCUT_NAME, pContext->szDescription); + } + else if (lppsn->hdr.code == PSN_WIZFINISH) { GetDlgItemTextW(hwndDlg, IDC_SHORTCUT_NAME, pContext->szDescription, _countof(pContext->szDescription)); StrTrimW(pContext->szDescription, L" \t"); @@ -458,7 +466,7 @@ FinishDlgProc(HWND hwndDlg, } } } - else if (lppsn->hdr.code == PSN_RESET) + else if (lppsn->hdr.code == PSN_RESET && !lppsn->lParam) { /* The user has clicked [Cancel] */ DeleteFileW(pContext->szOldFile);

1 0

[reactos] 01/01: [CPL][APPWIZ] Use display name for shortcut label (#2284)
by Katayama Hirofumi MZ 28 Jan '20

28 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7249b8b74f4eb70f85dc3… commit 7249b8b74f4eb70f85dc31db6be3c6161a9c0826 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jan 28 23:31:09 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jan 28 23:31:09 2020 +0900 [CPL][APPWIZ] Use display name for shortcut label (#2284) CORE-16534 --- dll/cpl/appwiz/createlink.c | 88 ++++++++++++++++++++++++++++++++++++++++++-- dll/cpl/appwiz/lang/bg-BG.rc | 1 + dll/cpl/appwiz/lang/cs-CZ.rc | 1 + dll/cpl/appwiz/lang/de-DE.rc | 1 + dll/cpl/appwiz/lang/el-GR.rc | 1 + dll/cpl/appwiz/lang/en-US.rc | 1 + dll/cpl/appwiz/lang/es-ES.rc | 1 + dll/cpl/appwiz/lang/et-EE.rc | 1 + dll/cpl/appwiz/lang/fr-FR.rc | 1 + dll/cpl/appwiz/lang/he-IL.rc | 1 + dll/cpl/appwiz/lang/id-ID.rc | 1 + dll/cpl/appwiz/lang/it-IT.rc | 1 + dll/cpl/appwiz/lang/ja-JP.rc | 1 + dll/cpl/appwiz/lang/no-NO.rc | 1 + dll/cpl/appwiz/lang/pl-PL.rc | 1 + dll/cpl/appwiz/lang/pt-BR.rc | 1 + dll/cpl/appwiz/lang/pt-PT.rc | 1 + dll/cpl/appwiz/lang/ro-RO.rc | 1 + dll/cpl/appwiz/lang/ru-RU.rc | 1 + dll/cpl/appwiz/lang/sk-SK.rc | 1 + dll/cpl/appwiz/lang/sq-AL.rc | 1 + dll/cpl/appwiz/lang/tr-TR.rc | 1 + dll/cpl/appwiz/lang/uk-UA.rc | 1 + dll/cpl/appwiz/lang/zh-CN.rc | 1 + dll/cpl/appwiz/lang/zh-TW.rc | 1 + dll/cpl/appwiz/resource.h | 1 + 26 files changed, 109 insertions(+), 4 deletions(-) diff --git a/dll/cpl/appwiz/createlink.c b/dll/cpl/appwiz/createlink.c index 7925f0b2ea3..27ac650e96e 100644 --- a/dll/cpl/appwiz/createlink.c +++ b/dll/cpl/appwiz/createlink.c @@ -11,6 +11,7 @@ */ #include "appwiz.h" +#include <shellapi.h> #include <strsafe.h> BOOL @@ -176,6 +177,50 @@ BOOL IsInternetLocation(LPCWSTR pszLocation) return (PathIsURLW(pszLocation) || wcsstr(pszLocation, L"www.") == pszLocation); } +/* Remove all invalid characters from the name */ +void +DoConvertNameForFileSystem(LPWSTR szName) +{ + LPWSTR pch1, pch2; + for (pch1 = pch2 = szName; *pch1; ++pch1) + { + if (wcschr(L"\\/:*?\"<>|", *pch1) != NULL) + { + /* *pch1 is an invalid character */ + continue; + } + *pch2 = *pch1; + ++pch2; + } + *pch2 = 0; +} + +BOOL +DoValidateShortcutName(PCREATE_LINK_CONTEXT pContext) +{ + SIZE_T cch; + LPCWSTR pch, pszName = pContext->szDescription; + + if (!pszName || !pszName[0]) + return FALSE; + + cch = wcslen(pContext->szOrigin) + wcslen(pszName) + 1; + if (cch >= MAX_PATH) + return FALSE; + + pch = pszName; + for (pch = pszName; *pch; ++pch) + { + if (wcschr(L"\\/:*?\"<>|", *pch) != NULL) + { + /* *pch is an invalid character */ + return FALSE; + } + } + + return TRUE; +} + INT_PTR CALLBACK WelcomeDlgProc(HWND hwndDlg, @@ -191,6 +236,7 @@ WelcomeDlgProc(HWND hwndDlg, BROWSEINFOW brws; LPITEMIDLIST pidllist; LPWSTR pch; + SHFILEINFOW FileInfo; switch(uMsg) { @@ -259,6 +305,11 @@ WelcomeDlgProc(HWND hwndDlg, SetFocus(GetDlgItem(hwndDlg, IDC_SHORTCUT_LOCATION)); SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE); + /* get display name */ + FileInfo.szDisplayName[0] = 0; + if (SHGetFileInfoW(pContext->szTarget, 0, &FileInfo, sizeof(FileInfo), SHGFI_DISPLAYNAME)) + StringCchCopyW(pContext->szDescription, _countof(pContext->szDescription), FileInfo.szDisplayName); + /* set working directory */ StringCchCopyW(pContext->szWorkingDirectory, _countof(pContext->szWorkingDirectory), pContext->szTarget); @@ -272,10 +323,17 @@ WelcomeDlgProc(HWND hwndDlg, { /* not found */ WCHAR szError[MAX_PATH + 100]; + + SendDlgItemMessageW(hwndDlg, IDC_SHORTCUT_LOCATION, EM_SETSEL, 0, -1); + LoadStringW(hApplet, IDS_CREATE_SHORTCUT, szDesc, _countof(szDesc)); LoadStringW(hApplet, IDS_ERROR_NOT_FOUND, szPath, _countof(szPath)); StringCchPrintfW(szError, _countof(szError), szPath, pContext->szTarget); MessageBoxW(hwndDlg, szError, szDesc, MB_ICONERROR); + + /* prevent the wizard to go next */ + SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, -1); + return TRUE; } } else if (lppsn->hdr.code == PSN_RESET) @@ -300,6 +358,8 @@ FinishDlgProc(HWND hwndDlg, PCREATE_LINK_CONTEXT pContext; LPPSHNOTIFY lppsn; LPWSTR pch; + WCHAR szText[MAX_PATH]; + WCHAR szMessage[128]; switch(uMsg) { @@ -307,7 +367,11 @@ FinishDlgProc(HWND hwndDlg, ppsp = (LPPROPSHEETPAGEW)lParam; pContext = (PCREATE_LINK_CONTEXT) ppsp->lParam; SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pContext); + + /* TODO: Use shell32!PathCleanupSpec instead of DoConvertNameForFileSystem */ + DoConvertNameForFileSystem(pContext->szDescription); SetDlgItemTextW(hwndDlg, IDC_SHORTCUT_NAME, pContext->szDescription); + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_FINISH); break; case WM_COMMAND: @@ -316,7 +380,12 @@ FinishDlgProc(HWND hwndDlg, case EN_CHANGE: if (SendDlgItemMessage(hwndDlg, IDC_SHORTCUT_NAME, WM_GETTEXTLENGTH, 0, 0)) { - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_FINISH); + GetDlgItemTextW(hwndDlg, IDC_SHORTCUT_NAME, szText, _countof(szText)); + StrTrimW(szText, L" \t"); + if (szText[0]) + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_FINISH); + else + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK); } else { @@ -330,9 +399,21 @@ FinishDlgProc(HWND hwndDlg, pContext = (PCREATE_LINK_CONTEXT) GetWindowLongPtr(hwndDlg, DWLP_USER); if (lppsn->hdr.code == PSN_WIZFINISH) { - GetDlgItemTextW(hwndDlg, IDC_SHORTCUT_NAME, pContext->szDescription, MAX_PATH); + GetDlgItemTextW(hwndDlg, IDC_SHORTCUT_NAME, pContext->szDescription, _countof(pContext->szDescription)); StrTrimW(pContext->szDescription, L" \t"); + if (!DoValidateShortcutName(pContext)) + { + SendDlgItemMessageW(hwndDlg, IDC_SHORTCUT_NAME, EM_SETSEL, 0, -1); + + LoadStringW(hApplet, IDS_INVALID_NAME, szMessage, _countof(szMessage)); + MessageBoxW(hwndDlg, szMessage, NULL, MB_ICONERROR); + + /* prevent the wizard to go next */ + SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, -1); + return TRUE; + } + /* if old shortcut file exists, then delete it now */ DeleteFileW(pContext->szOldFile); SHChangeNotify(SHCNE_DELETE, SHCNF_PATHW, pContext->szOldFile, NULL); @@ -352,7 +433,6 @@ FinishDlgProc(HWND hwndDlg, if (!CreateInternetShortcut(pContext)) { - WCHAR szMessage[128]; LoadStringW(hApplet, IDS_CANTMAKEINETSHORTCUT, szMessage, _countof(szMessage)); MessageBoxW(hwndDlg, szMessage, NULL, MB_ICONERROR); } @@ -522,7 +602,7 @@ NewLinkHereA(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) { WCHAR szFile[MAX_PATH]; - if (MultiByteToWideChar(CP_ACP, 0, (LPSTR) lParam1, -1, szFile, MAX_PATH)) + if (MultiByteToWideChar(CP_ACP, 0, (LPSTR)lParam1, -1, szFile, _countof(szFile))) { return ShowCreateShortcutWizard(hwndCPl, szFile); } diff --git a/dll/cpl/appwiz/lang/bg-BG.rc b/dll/cpl/appwiz/lang/bg-BG.rc index 4198ecd3879..1771b697598 100644 --- a/dll/cpl/appwiz/lang/bg-BG.rc +++ b/dll/cpl/appwiz/lang/bg-BG.rc @@ -85,4 +85,5 @@ BEGIN IDS_NO_MEMORY "No memory could be allocated!" IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" + IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." END diff --git a/dll/cpl/appwiz/lang/cs-CZ.rc b/dll/cpl/appwiz/lang/cs-CZ.rc index 4d0157bc21d..a03f07ba4b9 100644 --- a/dll/cpl/appwiz/lang/cs-CZ.rc +++ b/dll/cpl/appwiz/lang/cs-CZ.rc @@ -90,4 +90,5 @@ BEGIN IDS_NO_MEMORY "No memory could be allocated!" IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" + IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." END diff --git a/dll/cpl/appwiz/lang/de-DE.rc b/dll/cpl/appwiz/lang/de-DE.rc index 29f55f9f696..f44b8e79fee 100644 --- a/dll/cpl/appwiz/lang/de-DE.rc +++ b/dll/cpl/appwiz/lang/de-DE.rc @@ -85,4 +85,5 @@ BEGIN IDS_NO_MEMORY "No memory could be allocated!" IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" + IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." END diff --git a/dll/cpl/appwiz/lang/el-GR.rc b/dll/cpl/appwiz/lang/el-GR.rc index 4f996bd341e..53c815a9f37 100644 --- a/dll/cpl/appwiz/lang/el-GR.rc +++ b/dll/cpl/appwiz/lang/el-GR.rc @@ -85,4 +85,5 @@ BEGIN IDS_NO_MEMORY "No memory could be allocated!" IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" + IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." END diff --git a/dll/cpl/appwiz/lang/en-US.rc b/dll/cpl/appwiz/lang/en-US.rc index b84f58d92e1..7f25e1b4a74 100644 --- a/dll/cpl/appwiz/lang/en-US.rc +++ b/dll/cpl/appwiz/lang/en-US.rc @@ -85,4 +85,5 @@ BEGIN IDS_NO_MEMORY "No memory could be allocated!" IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" + IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." END diff --git a/dll/cpl/appwiz/lang/es-ES.rc b/dll/cpl/appwiz/lang/es-ES.rc index 52f809c83b7..9758843998e 100644 --- a/dll/cpl/appwiz/lang/es-ES.rc +++ b/dll/cpl/appwiz/lang/es-ES.rc @@ -94,4 +94,5 @@ BEGIN IDS_NO_MEMORY "No se pudo asignar memoria" IDS_NO_DIRECTORY "No se ha especificado directorio alguno" IDS_INVALID_PATH "La ruta proporcionada es inválida" + IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." END diff --git a/dll/cpl/appwiz/lang/et-EE.rc b/dll/cpl/appwiz/lang/et-EE.rc index 9a28610184e..1536a64b7ef 100644 --- a/dll/cpl/appwiz/lang/et-EE.rc +++ b/dll/cpl/appwiz/lang/et-EE.rc @@ -92,4 +92,5 @@ BEGIN IDS_NO_MEMORY "No memory could be allocated!" IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" + IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." END diff --git a/dll/cpl/appwiz/lang/fr-FR.rc b/dll/cpl/appwiz/lang/fr-FR.rc index 3a3b8419808..e03f2ef5d7c 100644 --- a/dll/cpl/appwiz/lang/fr-FR.rc +++ b/dll/cpl/appwiz/lang/fr-FR.rc @@ -85,4 +85,5 @@ BEGIN IDS_NO_MEMORY "No memory could be allocated!" IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" + IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." END diff --git a/dll/cpl/appwiz/lang/he-IL.rc b/dll/cpl/appwiz/lang/he-IL.rc index e4ab1dd5d2f..ade66f0999d 100644 --- a/dll/cpl/appwiz/lang/he-IL.rc +++ b/dll/cpl/appwiz/lang/he-IL.rc @@ -86,4 +86,5 @@ BEGIN IDS_NO_MEMORY "No memory could be allocated!" IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" + IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." END diff --git a/dll/cpl/appwiz/lang/id-ID.rc b/dll/cpl/appwiz/lang/id-ID.rc index 08924fa71a4..32e0a8ea171 100644 --- a/dll/cpl/appwiz/lang/id-ID.rc +++ b/dll/cpl/appwiz/lang/id-ID.rc @@ -85,4 +85,5 @@ BEGIN IDS_NO_MEMORY "Tidak ada memori yang bisa dialokasikan!" IDS_NO_DIRECTORY "Direktori belum diberi!" IDS_INVALID_PATH "Jalur yang diberikan tidak sah!" + IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." END diff --git a/dll/cpl/appwiz/lang/it-IT.rc b/dll/cpl/appwiz/lang/it-IT.rc index 248a279785d..7cde7d4e4e2 100644 --- a/dll/cpl/appwiz/lang/it-IT.rc +++ b/dll/cpl/appwiz/lang/it-IT.rc @@ -85,4 +85,5 @@ BEGIN IDS_NO_MEMORY "No memory could be allocated!" IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" + IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." END diff --git a/dll/cpl/appwiz/lang/ja-JP.rc b/dll/cpl/appwiz/lang/ja-JP.rc index 01ad4976552..045e9ac89de 100644 --- a/dll/cpl/appwiz/lang/ja-JP.rc +++ b/dll/cpl/appwiz/lang/ja-JP.rc @@ -85,4 +85,5 @@ BEGIN IDS_NO_MEMORY "No memory could be allocated!" IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" + IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." END diff --git a/dll/cpl/appwiz/lang/no-NO.rc b/dll/cpl/appwiz/lang/no-NO.rc index 77ac73142bb..f1a85e72e07 100644 --- a/dll/cpl/appwiz/lang/no-NO.rc +++ b/dll/cpl/appwiz/lang/no-NO.rc @@ -85,4 +85,5 @@ BEGIN IDS_NO_MEMORY "No memory could be allocated!" IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" + IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." END diff --git a/dll/cpl/appwiz/lang/pl-PL.rc b/dll/cpl/appwiz/lang/pl-PL.rc index 5af34f868d2..caf66710be7 100644 --- a/dll/cpl/appwiz/lang/pl-PL.rc +++ b/dll/cpl/appwiz/lang/pl-PL.rc @@ -95,4 +95,5 @@ BEGIN IDS_NO_MEMORY "Nie można przydzielić pamięci!" IDS_NO_DIRECTORY "Nie podano ścieżki!" IDS_INVALID_PATH "Podana ścieżka jest niepoprawna!" + IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." END diff --git a/dll/cpl/appwiz/lang/pt-BR.rc b/dll/cpl/appwiz/lang/pt-BR.rc index a76c1bcd118..35404e74dc2 100644 --- a/dll/cpl/appwiz/lang/pt-BR.rc +++ b/dll/cpl/appwiz/lang/pt-BR.rc @@ -87,4 +87,5 @@ BEGIN IDS_NO_MEMORY "A memória não pode ser alocada!" IDS_NO_DIRECTORY "Sem diretoria!" IDS_INVALID_PATH "O caminho é invalido!" + IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." END diff --git a/dll/cpl/appwiz/lang/pt-PT.rc b/dll/cpl/appwiz/lang/pt-PT.rc index 0c6e6801ee3..715daa40991 100644 --- a/dll/cpl/appwiz/lang/pt-PT.rc +++ b/dll/cpl/appwiz/lang/pt-PT.rc @@ -87,4 +87,5 @@ BEGIN IDS_NO_MEMORY "A memória não pode ser alocada!" IDS_NO_DIRECTORY "Sem directoria!" IDS_INVALID_PATH "O caminho é invalido!" + IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." END diff --git a/dll/cpl/appwiz/lang/ro-RO.rc b/dll/cpl/appwiz/lang/ro-RO.rc index 185243b789b..45eb1112d49 100644 --- a/dll/cpl/appwiz/lang/ro-RO.rc +++ b/dll/cpl/appwiz/lang/ro-RO.rc @@ -91,4 +91,5 @@ BEGIN IDS_NO_MEMORY "No memory could be allocated!" IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" + IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." END diff --git a/dll/cpl/appwiz/lang/ru-RU.rc b/dll/cpl/appwiz/lang/ru-RU.rc index 94a9bc76c30..42d1c80017e 100644 --- a/dll/cpl/appwiz/lang/ru-RU.rc +++ b/dll/cpl/appwiz/lang/ru-RU.rc @@ -85,4 +85,5 @@ BEGIN IDS_NO_MEMORY "Невозможно выделить память." IDS_NO_DIRECTORY "Не указано ни одного каталога!" IDS_INVALID_PATH "Указанный путь неверен!" + IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." END diff --git a/dll/cpl/appwiz/lang/sk-SK.rc b/dll/cpl/appwiz/lang/sk-SK.rc index ab136de8f32..5a52da02bdc 100644 --- a/dll/cpl/appwiz/lang/sk-SK.rc +++ b/dll/cpl/appwiz/lang/sk-SK.rc @@ -89,4 +89,5 @@ BEGIN IDS_NO_MEMORY "No memory could be allocated!" IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" + IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." END diff --git a/dll/cpl/appwiz/lang/sq-AL.rc b/dll/cpl/appwiz/lang/sq-AL.rc index 161f72f7e75..bf247b9a099 100644 --- a/dll/cpl/appwiz/lang/sq-AL.rc +++ b/dll/cpl/appwiz/lang/sq-AL.rc @@ -89,4 +89,5 @@ BEGIN IDS_NO_MEMORY "No memory could be allocated!" IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" + IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." END diff --git a/dll/cpl/appwiz/lang/tr-TR.rc b/dll/cpl/appwiz/lang/tr-TR.rc index 34f4f76f9ed..a45bf5a6d7e 100644 --- a/dll/cpl/appwiz/lang/tr-TR.rc +++ b/dll/cpl/appwiz/lang/tr-TR.rc @@ -87,4 +87,5 @@ BEGIN IDS_NO_MEMORY "No memory could be allocated!" IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" + IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." END diff --git a/dll/cpl/appwiz/lang/uk-UA.rc b/dll/cpl/appwiz/lang/uk-UA.rc index c3ec10ceea9..965dc6233f2 100644 --- a/dll/cpl/appwiz/lang/uk-UA.rc +++ b/dll/cpl/appwiz/lang/uk-UA.rc @@ -93,4 +93,5 @@ BEGIN IDS_NO_MEMORY "Неможливо виділити пам'ять." IDS_NO_DIRECTORY "Не вказано жодного каталогу!" IDS_INVALID_PATH "Вказаний шлях недійсний!" + IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." END diff --git a/dll/cpl/appwiz/lang/zh-CN.rc b/dll/cpl/appwiz/lang/zh-CN.rc index cd43aaeaf0e..42d017c2dd1 100644 --- a/dll/cpl/appwiz/lang/zh-CN.rc +++ b/dll/cpl/appwiz/lang/zh-CN.rc @@ -94,4 +94,5 @@ BEGIN IDS_NO_MEMORY "没有可以分配的内存空间。" IDS_NO_DIRECTORY "没有指定路径。" IDS_INVALID_PATH "指定的路径无效。" + IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." END diff --git a/dll/cpl/appwiz/lang/zh-TW.rc b/dll/cpl/appwiz/lang/zh-TW.rc index 7f499e1c37f..f2de51b4e78 100644 --- a/dll/cpl/appwiz/lang/zh-TW.rc +++ b/dll/cpl/appwiz/lang/zh-TW.rc @@ -94,4 +94,5 @@ BEGIN IDS_NO_MEMORY "沒有可以分配的記憶體空間。" IDS_NO_DIRECTORY "沒有指定路徑。" IDS_INVALID_PATH "指定的路徑無效。" + IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." END diff --git a/dll/cpl/appwiz/resource.h b/dll/cpl/appwiz/resource.h index d91a360e172..28ddc864cf7 100644 --- a/dll/cpl/appwiz/resource.h +++ b/dll/cpl/appwiz/resource.h @@ -28,6 +28,7 @@ #define IDS_NO_MEMORY 2026 #define IDS_NO_DIRECTORY 2027 #define IDS_INVALID_PATH 2028 +#define IDS_INVALID_NAME 2029 #define IDS_DOWNLOADING 14 #define IDS_INSTALLING 15

1 0

[reactos] 01/01: [CPL][DESK] Use GetModuleHandleW(L"shell32.dll")
by Katayama Hirofumi MZ 28 Jan '20

28 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f7972f0e6a08a4d1f2e23… commit f7972f0e6a08a4d1f2e23a81223ba588056c0a60 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jan 28 22:24:30 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Jan 28 22:24:30 2020 +0900 [CPL][DESK] Use GetModuleHandleW(L"shell32.dll") CORE-16665 --- dll/cpl/desk/background.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dll/cpl/desk/background.c b/dll/cpl/desk/background.c index babc006c3f5..878b2f64bc1 100644 --- a/dll/cpl/desk/background.c +++ b/dll/cpl/desk/background.c @@ -321,9 +321,8 @@ AddListViewItems(HWND hwndDlg, PBACKGROUND_DATA pData) /* Load (None) icon */ #define IDI_SHELL_NO 200 - hShell32 = LoadLibraryEx(L"shell32", NULL, LOAD_LIBRARY_AS_DATAFILE); + hShell32 = GetModuleHandleW(L"shell32.dll"); hIcon = (HICON)LoadImageW(hShell32, MAKEINTRESOURCEW(IDI_SHELL_NO), IMAGE_ICON, cx, cy, 0); - FreeLibrary(hShell32); #undef IDI_SHELL_NO ListView_SetImageList(hwndBackgroundList, himl, LVSIL_SMALL);

1 0

[reactos] 01/01: [CPL][DESK] Improve Japanese translation for IDD_THEMES
by Katayama Hirofumi MZ 28 Jan '20

28 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b404824776d5b3debbda3… commit b404824776d5b3debbda3b0273028357bfbb6d63 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jan 28 17:18:15 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Jan 28 17:18:15 2020 +0900 [CPL][DESK] Improve Japanese translation for IDD_THEMES --- dll/cpl/desk/lang/ja-JP.rc | 12 ++++++------ dll/cpl/desk/lang/pl-PL.rc | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dll/cpl/desk/lang/ja-JP.rc b/dll/cpl/desk/lang/ja-JP.rc index 8ac06b066ff..f1615452c8f 100644 --- a/dll/cpl/desk/lang/ja-JP.rc +++ b/dll/cpl/desk/lang/ja-JP.rc @@ -1,15 +1,15 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDD_THEMES DIALOGEX 0, 0, 246, 210 -CAPTION "Themes" +CAPTION "テーマ" STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -FONT 8, "MS Shell Dlg" +FONT 9, "MS UI Gothic" BEGIN - LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30 - LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10 + LTEXT "テーマは、クリック一つで壁紙や音声、アイコン、その他の要素を一度に変更できる個人設定です。", IDC_STATIC, 5, 5, 235, 30 + LTEXT "テーマ:", IDC_STATIC, 5, 42, 55, 10 COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 - PUSHBUTTON "&Delete", IDC_THEMES_DELETE, 170, 70, 70, 14 + PUSHBUTTON "保存(&A)...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 + PUSHBUTTON "削除(&D)", IDC_THEMES_DELETE, 170, 70, 70, 14 CONTROL "", IDC_THEMES_PREVIEW, "STATIC", SS_BITMAP, 5, 90, 235, 115, WS_EX_CLIENTEDGE END diff --git a/dll/cpl/desk/lang/pl-PL.rc b/dll/cpl/desk/lang/pl-PL.rc index f470ab4a3ae..0b895a709c2 100644 --- a/dll/cpl/desk/lang/pl-PL.rc +++ b/dll/cpl/desk/lang/pl-PL.rc @@ -10,7 +10,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT IDD_THEMES DIALOGEX 0, 0, 246, 210 -CAPTION "Themes" +CAPTION "Kompozycje" STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN

1 0

[reactos] 01/01: [CPL][DESK] Improve Polish translation for IDD_THEMES
by Katayama Hirofumi MZ 28 Jan '20

28 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=724dcba818a623e17d269… commit 724dcba818a623e17d2696168ade63cc29323104 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jan 28 17:13:11 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Jan 28 17:13:11 2020 +0900 [CPL][DESK] Improve Polish translation for IDD_THEMES --- dll/cpl/desk/lang/pl-PL.rc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dll/cpl/desk/lang/pl-PL.rc b/dll/cpl/desk/lang/pl-PL.rc index b1b7bb8326e..f470ab4a3ae 100644 --- a/dll/cpl/desk/lang/pl-PL.rc +++ b/dll/cpl/desk/lang/pl-PL.rc @@ -1,5 +1,5 @@ /* - * Translated by Sebastian Gasiorek, (2005-07-07) + * Translated by Sebastian Gasiorek (2005-07-07) and Piotr_hh * Updated by xrogers (13.04.2007) * https://sourceforge.net/projects/reactospl * Updated by Caemyr - Olaf Siejka (Jan-Feb, 2008) @@ -14,11 +14,11 @@ CAPTION "Themes" STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30 - LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10 + LTEXT "Kompozycja to Tapeta, zestaw dźwięków, ikon i innych elementów, które pomogą Ci spersonalizować komputer za pomocą jednego kliknięcia.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Kompozycja:", IDC_STATIC, 5, 42, 55, 10 COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 - PUSHBUTTON "&Delete", IDC_THEMES_DELETE, 170, 70, 70, 14 + PUSHBUTTON "Z&apisz jako...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 + PUSHBUTTON "&Usuń", IDC_THEMES_DELETE, 170, 70, 70, 14 CONTROL "", IDC_THEMES_PREVIEW, "STATIC", SS_BITMAP, 5, 90, 235, 115, WS_EX_CLIENTEDGE END

1 0

[reactos] 01/01: [CPL][DESK] Add "Themes" Tab resource data (#2280)
by Katayama Hirofumi MZ 28 Jan '20

28 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d05f621fedef88988cb58… commit d05f621fedef88988cb58b0879153d6dcf945e1e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jan 28 14:32:02 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jan 28 14:32:02 2020 +0900 [CPL][DESK] Add "Themes" Tab resource data (#2280) CORE-14537 --- dll/cpl/desk/desk.c | 2 ++ dll/cpl/desk/lang/bg-BG.rc | 13 +++++++++++++ dll/cpl/desk/lang/cs-CZ.rc | 13 +++++++++++++ dll/cpl/desk/lang/de-DE.rc | 13 +++++++++++++ dll/cpl/desk/lang/el-GR.rc | 13 +++++++++++++ dll/cpl/desk/lang/en-GB.rc | 13 +++++++++++++ dll/cpl/desk/lang/en-US.rc | 13 +++++++++++++ dll/cpl/desk/lang/es-ES.rc | 13 +++++++++++++ dll/cpl/desk/lang/et-EE.rc | 13 +++++++++++++ dll/cpl/desk/lang/fr-FR.rc | 13 +++++++++++++ dll/cpl/desk/lang/he-IL.rc | 13 +++++++++++++ dll/cpl/desk/lang/hu-HU.rc | 13 +++++++++++++ dll/cpl/desk/lang/id-ID.rc | 13 +++++++++++++ dll/cpl/desk/lang/it-IT.rc | 13 +++++++++++++ dll/cpl/desk/lang/ja-JP.rc | 13 +++++++++++++ dll/cpl/desk/lang/nl-NL.rc | 13 +++++++++++++ dll/cpl/desk/lang/no-NO.rc | 13 +++++++++++++ dll/cpl/desk/lang/pl-PL.rc | 13 +++++++++++++ dll/cpl/desk/lang/pt-BR.rc | 13 +++++++++++++ dll/cpl/desk/lang/pt-PT.rc | 13 +++++++++++++ dll/cpl/desk/lang/ro-RO.rc | 13 +++++++++++++ dll/cpl/desk/lang/ru-RU.rc | 13 +++++++++++++ dll/cpl/desk/lang/sk-SK.rc | 13 +++++++++++++ dll/cpl/desk/lang/sq-AL.rc | 13 +++++++++++++ dll/cpl/desk/lang/sv-SE.rc | 13 +++++++++++++ dll/cpl/desk/lang/tr-TR.rc | 13 +++++++++++++ dll/cpl/desk/lang/uk-UA.rc | 13 +++++++++++++ dll/cpl/desk/lang/zh-CN.rc | 13 +++++++++++++ dll/cpl/desk/lang/zh-TW.rc | 13 +++++++++++++ dll/cpl/desk/resource.h | 7 +++++++ dll/cpl/desk/theme.c | 31 +++++++++++++++++++++++++++++++ 31 files changed, 404 insertions(+) diff --git a/dll/cpl/desk/desk.c b/dll/cpl/desk/desk.c index 0277e7f264b..28a296c1423 100644 --- a/dll/cpl/desk/desk.c +++ b/dll/cpl/desk/desk.c @@ -16,6 +16,7 @@ static LONG APIENTRY DisplayApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK ThemesPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK BackgroundPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK ScreenSaverPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK AppearancePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); @@ -112,6 +113,7 @@ static const struct LPWSTR Name; } PropPages[] = { + /* { IDD_THEMES, ThemesPageProc, NULL, L"Themes" }, */ /* TODO: */ { IDD_BACKGROUND, BackgroundPageProc, NULL, L"Desktop" }, { IDD_SCREENSAVER, ScreenSaverPageProc, NULL, L"Screen Saver" }, { IDD_APPEARANCE, AppearancePageProc, NULL, L"Appearance" }, diff --git a/dll/cpl/desk/lang/bg-BG.rc b/dll/cpl/desk/lang/bg-BG.rc index dfaac01067a..0b01e181d4b 100644 --- a/dll/cpl/desk/lang/bg-BG.rc +++ b/dll/cpl/desk/lang/bg-BG.rc @@ -1,5 +1,18 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT +IDD_THEMES DIALOGEX 0, 0, 246, 210 +CAPTION "Themes" +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10 + COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 + PUSHBUTTON "&Delete", IDC_THEMES_DELETE, 170, 70, 70, 14 + CONTROL "", IDC_THEMES_PREVIEW, "STATIC", SS_BITMAP, 5, 90, 235, 115, WS_EX_CLIENTEDGE +END + IDD_BACKGROUND DIALOGEX 0, 0, 246, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Работна площ" diff --git a/dll/cpl/desk/lang/cs-CZ.rc b/dll/cpl/desk/lang/cs-CZ.rc index a0c786486bf..134efa238e5 100644 --- a/dll/cpl/desk/lang/cs-CZ.rc +++ b/dll/cpl/desk/lang/cs-CZ.rc @@ -6,6 +6,19 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +IDD_THEMES DIALOGEX 0, 0, 246, 210 +CAPTION "Themes" +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10 + COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 + PUSHBUTTON "&Delete", IDC_THEMES_DELETE, 170, 70, 70, 14 + CONTROL "", IDC_THEMES_PREVIEW, "STATIC", SS_BITMAP, 5, 90, 235, 115, WS_EX_CLIENTEDGE +END + IDD_BACKGROUND DIALOGEX 0, 0, 246, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Pozadí" diff --git a/dll/cpl/desk/lang/de-DE.rc b/dll/cpl/desk/lang/de-DE.rc index f56f5e0d408..61b618a2b69 100644 --- a/dll/cpl/desk/lang/de-DE.rc +++ b/dll/cpl/desk/lang/de-DE.rc @@ -1,5 +1,18 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +IDD_THEMES DIALOGEX 0, 0, 246, 210 +CAPTION "Themes" +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10 + COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 + PUSHBUTTON "&Delete", IDC_THEMES_DELETE, 170, 70, 70, 14 + CONTROL "", IDC_THEMES_PREVIEW, "STATIC", SS_BITMAP, 5, 90, 235, 115, WS_EX_CLIENTEDGE +END + IDD_BACKGROUND DIALOGEX 0, 0, 246, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Desktop" diff --git a/dll/cpl/desk/lang/el-GR.rc b/dll/cpl/desk/lang/el-GR.rc index c8a957361b8..e758ac99377 100644 --- a/dll/cpl/desk/lang/el-GR.rc +++ b/dll/cpl/desk/lang/el-GR.rc @@ -1,5 +1,18 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT +IDD_THEMES DIALOGEX 0, 0, 246, 210 +CAPTION "Themes" +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10 + COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 + PUSHBUTTON "&Delete", IDC_THEMES_DELETE, 170, 70, 70, 14 + CONTROL "", IDC_THEMES_PREVIEW, "STATIC", SS_BITMAP, 5, 90, 235, 115, WS_EX_CLIENTEDGE +END + IDD_BACKGROUND DIALOGEX 0, 0, 246, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Φόντο" diff --git a/dll/cpl/desk/lang/en-GB.rc b/dll/cpl/desk/lang/en-GB.rc index c31b934efef..02c71f9edd5 100644 --- a/dll/cpl/desk/lang/en-GB.rc +++ b/dll/cpl/desk/lang/en-GB.rc @@ -1,5 +1,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK +IDD_THEMES DIALOGEX 0, 0, 246, 210 +CAPTION "Themes" +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10 + COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 + PUSHBUTTON "&Delete", IDC_THEMES_DELETE, 170, 70, 70, 14 + CONTROL "", IDC_THEMES_PREVIEW, "STATIC", SS_BITMAP, 5, 90, 235, 115, WS_EX_CLIENTEDGE +END + IDD_BACKGROUND DIALOGEX 0, 0, 246, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Background" diff --git a/dll/cpl/desk/lang/en-US.rc b/dll/cpl/desk/lang/en-US.rc index 40ea2f261a4..a0fa23477f9 100644 --- a/dll/cpl/desk/lang/en-US.rc +++ b/dll/cpl/desk/lang/en-US.rc @@ -1,5 +1,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +IDD_THEMES DIALOGEX 0, 0, 246, 210 +CAPTION "Themes" +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10 + COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 + PUSHBUTTON "&Delete", IDC_THEMES_DELETE, 170, 70, 70, 14 + CONTROL "", IDC_THEMES_PREVIEW, "STATIC", SS_BITMAP, 5, 90, 235, 115, WS_EX_CLIENTEDGE +END + IDD_BACKGROUND DIALOGEX 0, 0, 246, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Background" diff --git a/dll/cpl/desk/lang/es-ES.rc b/dll/cpl/desk/lang/es-ES.rc index e77eb64e7bf..b0b179bec21 100644 --- a/dll/cpl/desk/lang/es-ES.rc +++ b/dll/cpl/desk/lang/es-ES.rc @@ -9,6 +9,19 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL +IDD_THEMES DIALOGEX 0, 0, 246, 210 +CAPTION "Themes" +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10 + COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 + PUSHBUTTON "&Delete", IDC_THEMES_DELETE, 170, 70, 70, 14 + CONTROL "", IDC_THEMES_PREVIEW, "STATIC", SS_BITMAP, 5, 90, 235, 115, WS_EX_CLIENTEDGE +END + IDD_BACKGROUND DIALOGEX 0, 0, 246, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Escritorio" diff --git a/dll/cpl/desk/lang/et-EE.rc b/dll/cpl/desk/lang/et-EE.rc index 73f08d3a77d..b17803a396c 100644 --- a/dll/cpl/desk/lang/et-EE.rc +++ b/dll/cpl/desk/lang/et-EE.rc @@ -7,6 +7,19 @@ LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT +IDD_THEMES DIALOGEX 0, 0, 246, 210 +CAPTION "Themes" +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10 + COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 + PUSHBUTTON "&Delete", IDC_THEMES_DELETE, 170, 70, 70, 14 + CONTROL "", IDC_THEMES_PREVIEW, "STATIC", SS_BITMAP, 5, 90, 235, 115, WS_EX_CLIENTEDGE +END + IDD_BACKGROUND DIALOGEX 0, 0, 246, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Taust" diff --git a/dll/cpl/desk/lang/fr-FR.rc b/dll/cpl/desk/lang/fr-FR.rc index cd0aa31be6e..f58397ca572 100644 --- a/dll/cpl/desk/lang/fr-FR.rc +++ b/dll/cpl/desk/lang/fr-FR.rc @@ -2,6 +2,19 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL +IDD_THEMES DIALOGEX 0, 0, 246, 210 +CAPTION "Themes" +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10 + COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 + PUSHBUTTON "&Delete", IDC_THEMES_DELETE, 170, 70, 70, 14 + CONTROL "", IDC_THEMES_PREVIEW, "STATIC", SS_BITMAP, 5, 90, 235, 115, WS_EX_CLIENTEDGE +END + IDD_BACKGROUND DIALOGEX 0, 0, 246, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Fond d'écran" diff --git a/dll/cpl/desk/lang/he-IL.rc b/dll/cpl/desk/lang/he-IL.rc index edfc0e4df2c..24669317823 100644 --- a/dll/cpl/desk/lang/he-IL.rc +++ b/dll/cpl/desk/lang/he-IL.rc @@ -1,5 +1,18 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT +IDD_THEMES DIALOGEX 0, 0, 246, 210 +CAPTION "Themes" +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10 + COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 + PUSHBUTTON "&Delete", IDC_THEMES_DELETE, 170, 70, 70, 14 + CONTROL "", IDC_THEMES_PREVIEW, "STATIC", SS_BITMAP, 5, 90, 235, 115, WS_EX_CLIENTEDGE +END + IDD_BACKGROUND DIALOGEX 0, 0, 246, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "רקע" diff --git a/dll/cpl/desk/lang/hu-HU.rc b/dll/cpl/desk/lang/hu-HU.rc index 4834eb711bb..981997c08fe 100644 --- a/dll/cpl/desk/lang/hu-HU.rc +++ b/dll/cpl/desk/lang/hu-HU.rc @@ -2,6 +2,19 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT +IDD_THEMES DIALOGEX 0, 0, 246, 210 +CAPTION "Themes" +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10 + COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 + PUSHBUTTON "&Delete", IDC_THEMES_DELETE, 170, 70, 70, 14 + CONTROL "", IDC_THEMES_PREVIEW, "STATIC", SS_BITMAP, 5, 90, 235, 115, WS_EX_CLIENTEDGE +END + IDD_BACKGROUND DIALOGEX 0, 0, 246, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Háttér" diff --git a/dll/cpl/desk/lang/id-ID.rc b/dll/cpl/desk/lang/id-ID.rc index ac9d7952130..f17030ec8be 100644 --- a/dll/cpl/desk/lang/id-ID.rc +++ b/dll/cpl/desk/lang/id-ID.rc @@ -1,5 +1,18 @@ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT +IDD_THEMES DIALOGEX 0, 0, 246, 210 +CAPTION "Themes" +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10 + COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 + PUSHBUTTON "&Delete", IDC_THEMES_DELETE, 170, 70, 70, 14 + CONTROL "", IDC_THEMES_PREVIEW, "STATIC", SS_BITMAP, 5, 90, 235, 115, WS_EX_CLIENTEDGE +END + IDD_BACKGROUND DIALOGEX 0, 0, 246, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Latar Belakang" diff --git a/dll/cpl/desk/lang/it-IT.rc b/dll/cpl/desk/lang/it-IT.rc index 4ea905a1488..0b69f3621f3 100644 --- a/dll/cpl/desk/lang/it-IT.rc +++ b/dll/cpl/desk/lang/it-IT.rc @@ -1,5 +1,18 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL +IDD_THEMES DIALOGEX 0, 0, 246, 210 +CAPTION "Themes" +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10 + COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 + PUSHBUTTON "&Delete", IDC_THEMES_DELETE, 170, 70, 70, 14 + CONTROL "", IDC_THEMES_PREVIEW, "STATIC", SS_BITMAP, 5, 90, 235, 115, WS_EX_CLIENTEDGE +END + IDD_BACKGROUND DIALOGEX 0, 0, 246, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Sfondo" diff --git a/dll/cpl/desk/lang/ja-JP.rc b/dll/cpl/desk/lang/ja-JP.rc index 3efd016baa8..8ac06b066ff 100644 --- a/dll/cpl/desk/lang/ja-JP.rc +++ b/dll/cpl/desk/lang/ja-JP.rc @@ -1,5 +1,18 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +IDD_THEMES DIALOGEX 0, 0, 246, 210 +CAPTION "Themes" +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10 + COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 + PUSHBUTTON "&Delete", IDC_THEMES_DELETE, 170, 70, 70, 14 + CONTROL "", IDC_THEMES_PREVIEW, "STATIC", SS_BITMAP, 5, 90, 235, 115, WS_EX_CLIENTEDGE +END + IDD_BACKGROUND DIALOGEX 0, 0, 246, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "背景" diff --git a/dll/cpl/desk/lang/nl-NL.rc b/dll/cpl/desk/lang/nl-NL.rc index 9b696bfb73f..7643fad12ec 100644 --- a/dll/cpl/desk/lang/nl-NL.rc +++ b/dll/cpl/desk/lang/nl-NL.rc @@ -1,5 +1,18 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +IDD_THEMES DIALOGEX 0, 0, 246, 210 +CAPTION "Themes" +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10 + COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 + PUSHBUTTON "&Delete", IDC_THEMES_DELETE, 170, 70, 70, 14 + CONTROL "", IDC_THEMES_PREVIEW, "STATIC", SS_BITMAP, 5, 90, 235, 115, WS_EX_CLIENTEDGE +END + IDD_BACKGROUND DIALOGEX 0, 0, 246, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Achtergrond" diff --git a/dll/cpl/desk/lang/no-NO.rc b/dll/cpl/desk/lang/no-NO.rc index 7617c7dcd96..6b94d4eaa58 100644 --- a/dll/cpl/desk/lang/no-NO.rc +++ b/dll/cpl/desk/lang/no-NO.rc @@ -1,5 +1,18 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL +IDD_THEMES DIALOGEX 0, 0, 246, 210 +CAPTION "Themes" +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10 + COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 + PUSHBUTTON "&Delete", IDC_THEMES_DELETE, 170, 70, 70, 14 + CONTROL "", IDC_THEMES_PREVIEW, "STATIC", SS_BITMAP, 5, 90, 235, 115, WS_EX_CLIENTEDGE +END + IDD_BACKGROUND DIALOGEX 0, 0, 246, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Bakgrunn" diff --git a/dll/cpl/desk/lang/pl-PL.rc b/dll/cpl/desk/lang/pl-PL.rc index a4527d54b63..b1b7bb8326e 100644 --- a/dll/cpl/desk/lang/pl-PL.rc +++ b/dll/cpl/desk/lang/pl-PL.rc @@ -9,6 +9,19 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +IDD_THEMES DIALOGEX 0, 0, 246, 210 +CAPTION "Themes" +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10 + COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 + PUSHBUTTON "&Delete", IDC_THEMES_DELETE, 170, 70, 70, 14 + CONTROL "", IDC_THEMES_PREVIEW, "STATIC", SS_BITMAP, 5, 90, 235, 115, WS_EX_CLIENTEDGE +END + IDD_BACKGROUND DIALOGEX 0, 0, 246, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Pulpit" diff --git a/dll/cpl/desk/lang/pt-BR.rc b/dll/cpl/desk/lang/pt-BR.rc index c8f72aa8653..713244ef103 100644 --- a/dll/cpl/desk/lang/pt-BR.rc +++ b/dll/cpl/desk/lang/pt-BR.rc @@ -1,5 +1,18 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN +IDD_THEMES DIALOGEX 0, 0, 246, 210 +CAPTION "Themes" +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10 + COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 + PUSHBUTTON "&Delete", IDC_THEMES_DELETE, 170, 70, 70, 14 + CONTROL "", IDC_THEMES_PREVIEW, "STATIC", SS_BITMAP, 5, 90, 235, 115, WS_EX_CLIENTEDGE +END + IDD_BACKGROUND DIALOGEX 0, 0, 246, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Área de trabalho" diff --git a/dll/cpl/desk/lang/pt-PT.rc b/dll/cpl/desk/lang/pt-PT.rc index 954e306fe68..34dd73e3097 100644 --- a/dll/cpl/desk/lang/pt-PT.rc +++ b/dll/cpl/desk/lang/pt-PT.rc @@ -5,6 +5,19 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +IDD_THEMES DIALOGEX 0, 0, 246, 210 +CAPTION "Themes" +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10 + COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 + PUSHBUTTON "&Delete", IDC_THEMES_DELETE, 170, 70, 70, 14 + CONTROL "", IDC_THEMES_PREVIEW, "STATIC", SS_BITMAP, 5, 90, 235, 115, WS_EX_CLIENTEDGE +END + IDD_BACKGROUND DIALOGEX 0, 0, 246, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ambiente de trabalho" diff --git a/dll/cpl/desk/lang/ro-RO.rc b/dll/cpl/desk/lang/ro-RO.rc index dc61281be41..ac1ba9a0504 100644 --- a/dll/cpl/desk/lang/ro-RO.rc +++ b/dll/cpl/desk/lang/ro-RO.rc @@ -5,6 +5,19 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL +IDD_THEMES DIALOGEX 0, 0, 246, 210 +CAPTION "Themes" +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10 + COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 + PUSHBUTTON "&Delete", IDC_THEMES_DELETE, 170, 70, 70, 14 + CONTROL "", IDC_THEMES_PREVIEW, "STATIC", SS_BITMAP, 5, 90, 235, 115, WS_EX_CLIENTEDGE +END + IDD_BACKGROUND DIALOGEX 0, 0, 246, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Fundal" diff --git a/dll/cpl/desk/lang/ru-RU.rc b/dll/cpl/desk/lang/ru-RU.rc index 022e6ed729d..ba2182d5a1f 100644 --- a/dll/cpl/desk/lang/ru-RU.rc +++ b/dll/cpl/desk/lang/ru-RU.rc @@ -1,5 +1,18 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +IDD_THEMES DIALOGEX 0, 0, 246, 210 +CAPTION "Themes" +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10 + COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 + PUSHBUTTON "&Delete", IDC_THEMES_DELETE, 170, 70, 70, 14 + CONTROL "", IDC_THEMES_PREVIEW, "STATIC", SS_BITMAP, 5, 90, 235, 115, WS_EX_CLIENTEDGE +END + IDD_BACKGROUND DIALOGEX 0, 0, 246, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Рабочий стол" diff --git a/dll/cpl/desk/lang/sk-SK.rc b/dll/cpl/desk/lang/sk-SK.rc index 9046b95dd9c..ce05f458549 100644 --- a/dll/cpl/desk/lang/sk-SK.rc +++ b/dll/cpl/desk/lang/sk-SK.rc @@ -2,6 +2,19 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT +IDD_THEMES DIALOGEX 0, 0, 246, 210 +CAPTION "Themes" +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10 + COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 + PUSHBUTTON "&Delete", IDC_THEMES_DELETE, 170, 70, 70, 14 + CONTROL "", IDC_THEMES_PREVIEW, "STATIC", SS_BITMAP, 5, 90, 235, 115, WS_EX_CLIENTEDGE +END + IDD_BACKGROUND DIALOGEX 0, 0, 246, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Pozadie" diff --git a/dll/cpl/desk/lang/sq-AL.rc b/dll/cpl/desk/lang/sq-AL.rc index fe7188b5224..c8828797235 100644 --- a/dll/cpl/desk/lang/sq-AL.rc +++ b/dll/cpl/desk/lang/sq-AL.rc @@ -4,6 +4,19 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL +IDD_THEMES DIALOGEX 0, 0, 246, 210 +CAPTION "Themes" +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10 + COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 + PUSHBUTTON "&Delete", IDC_THEMES_DELETE, 170, 70, 70, 14 + CONTROL "", IDC_THEMES_PREVIEW, "STATIC", SS_BITMAP, 5, 90, 235, 115, WS_EX_CLIENTEDGE +END + IDD_BACKGROUND DIALOGEX 0, 0, 246, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Sfond" diff --git a/dll/cpl/desk/lang/sv-SE.rc b/dll/cpl/desk/lang/sv-SE.rc index 1ea71fc3b4a..ddadce8161d 100644 --- a/dll/cpl/desk/lang/sv-SE.rc +++ b/dll/cpl/desk/lang/sv-SE.rc @@ -2,6 +2,19 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL +IDD_THEMES DIALOGEX 0, 0, 246, 210 +CAPTION "Themes" +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10 + COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 + PUSHBUTTON "&Delete", IDC_THEMES_DELETE, 170, 70, 70, 14 + CONTROL "", IDC_THEMES_PREVIEW, "STATIC", SS_BITMAP, 5, 90, 235, 115, WS_EX_CLIENTEDGE +END + IDD_BACKGROUND DIALOGEX 0, 0, 246, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Bakgrund" diff --git a/dll/cpl/desk/lang/tr-TR.rc b/dll/cpl/desk/lang/tr-TR.rc index 129deb7bb23..261272b52da 100644 --- a/dll/cpl/desk/lang/tr-TR.rc +++ b/dll/cpl/desk/lang/tr-TR.rc @@ -2,6 +2,19 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT +IDD_THEMES DIALOGEX 0, 0, 246, 210 +CAPTION "Themes" +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10 + COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 + PUSHBUTTON "&Delete", IDC_THEMES_DELETE, 170, 70, 70, 14 + CONTROL "", IDC_THEMES_PREVIEW, "STATIC", SS_BITMAP, 5, 90, 235, 115, WS_EX_CLIENTEDGE +END + IDD_BACKGROUND DIALOGEX 0, 0, 246, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Arka Plan" diff --git a/dll/cpl/desk/lang/uk-UA.rc b/dll/cpl/desk/lang/uk-UA.rc index 1937ae90228..b7363988db0 100644 --- a/dll/cpl/desk/lang/uk-UA.rc +++ b/dll/cpl/desk/lang/uk-UA.rc @@ -8,6 +8,19 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +IDD_THEMES DIALOGEX 0, 0, 246, 210 +CAPTION "Themes" +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10 + COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 + PUSHBUTTON "&Delete", IDC_THEMES_DELETE, 170, 70, 70, 14 + CONTROL "", IDC_THEMES_PREVIEW, "STATIC", SS_BITMAP, 5, 90, 235, 115, WS_EX_CLIENTEDGE +END + IDD_BACKGROUND DIALOGEX 0, 0, 246, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Робочий стіл" diff --git a/dll/cpl/desk/lang/zh-CN.rc b/dll/cpl/desk/lang/zh-CN.rc index 4cacec50018..25be422366b 100644 --- a/dll/cpl/desk/lang/zh-CN.rc +++ b/dll/cpl/desk/lang/zh-CN.rc @@ -8,6 +8,19 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED +IDD_THEMES DIALOGEX 0, 0, 246, 210 +CAPTION "Themes" +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10 + COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 + PUSHBUTTON "&Delete", IDC_THEMES_DELETE, 170, 70, 70, 14 + CONTROL "", IDC_THEMES_PREVIEW, "STATIC", SS_BITMAP, 5, 90, 235, 115, WS_EX_CLIENTEDGE +END + IDD_BACKGROUND DIALOGEX 0, 0, 246, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "背景" diff --git a/dll/cpl/desk/lang/zh-TW.rc b/dll/cpl/desk/lang/zh-TW.rc index e5e2a4022f2..bcd863afce2 100644 --- a/dll/cpl/desk/lang/zh-TW.rc +++ b/dll/cpl/desk/lang/zh-TW.rc @@ -3,6 +3,19 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL +IDD_THEMES DIALOGEX 0, 0, 246, 210 +CAPTION "Themes" +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10 + COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 + PUSHBUTTON "&Delete", IDC_THEMES_DELETE, 170, 70, 70, 14 + CONTROL "", IDC_THEMES_PREVIEW, "STATIC", SS_BITMAP, 5, 90, 235, 115, WS_EX_CLIENTEDGE +END + IDD_BACKGROUND DIALOGEX 0, 0, 246, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "背景" diff --git a/dll/cpl/desk/resource.h b/dll/cpl/desk/resource.h index 816ab45311f..fb00e1228dc 100644 --- a/dll/cpl/desk/resource.h +++ b/dll/cpl/desk/resource.h @@ -13,9 +13,16 @@ #define IDD_SETTINGS 103 #define IDD_ADVAPPEARANCE 104 #define IDD_EFFAPPEARANCE 105 +#define IDD_THEMES 106 #define IDD_ADVANCED_GENERAL 200 #define IDD_CONFIRMSETTINGS 201 +/* Themes Page */ +#define IDC_THEMES_COMBOBOX 1000 +#define IDC_THEMES_SAVE_AS 1001 +#define IDC_THEMES_DELETE 1002 +#define IDC_THEMES_PREVIEW 1003 + /* Background Page */ #define IDC_BACKGROUND_LIST 1000 #define IDC_MONITOR 1001 diff --git a/dll/cpl/desk/theme.c b/dll/cpl/desk/theme.c index 858033c42ac..6e1cf4ad636 100644 --- a/dll/cpl/desk/theme.c +++ b/dll/cpl/desk/theme.c @@ -1058,3 +1058,34 @@ cleanup: return ret; } + +/* TODO: */ +INT_PTR CALLBACK +ThemesPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + LPNMHDR lpnm; + + switch (uMsg) + { + case WM_INITDIALOG: + break; + + case WM_COMMAND: + break; + + case WM_NOTIFY: + lpnm = (LPNMHDR)lParam; + switch (lpnm->code) + { + case PSN_APPLY: + SendMessage(HWND_BROADCAST, WM_SETTINGCHANGE, 0, (LPARAM)TEXT("")); + return TRUE; + } + break; + + case WM_DESTROY: + break; + } + + return FALSE; +}

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