Ros-diffs January 2020

ros-diffs@reactos.org

21 participants
133 discussions

[reactos] 01/01: [FONTEXT] Add detail view columns to font folder CORE-16476

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c09636f9469465940b74b… commit c09636f9469465940b74b2597a4464412f35a28a Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Jan 20 21:43:19 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Jan 29 22:55:50 2020 +0100 [FONTEXT] Add detail view columns to font folder CORE-16476 --- dll/shellext/fontext/CDataObject.cpp | 15 +----- dll/shellext/fontext/CFontCache.cpp | 29 +++++++--- dll/shellext/fontext/CFontCache.hpp | 8 ++- dll/shellext/fontext/CFontExt.cpp | 102 ++++++++++++++++++++++++++++++----- dll/shellext/fontext/CFontExt.hpp | 4 +- dll/shellext/fontext/CFontMenu.cpp | 15 +----- dll/shellext/fontext/CMakeLists.txt | 3 +- dll/shellext/fontext/fontext.cpp | 6 +-- dll/shellext/fontext/fontpidl.cpp | 8 +-- dll/shellext/fontext/lang/en-US.rc | 9 ++++ dll/shellext/fontext/lang/it-IT.rc | 20 +++++++ dll/shellext/fontext/lang/pl-PL.rc | 20 +++++++ dll/shellext/fontext/lang/ro-RO.rc | 20 +++++++ dll/shellext/fontext/lang/tr-TR.rc | 20 +++++++ dll/shellext/fontext/resource.h | 6 +++ 15 files changed, 228 insertions(+), 57 deletions(-) diff --git a/dll/shellext/fontext/CDataObject.cpp b/dll/shellext/fontext/CDataObject.cpp index 252b125fc92..f6851f19985 100644 --- a/dll/shellext/fontext/CDataObject.cpp +++ b/dll/shellext/fontext/CDataObject.cpp @@ -2,7 +2,7 @@ * PROJECT: ReactOS Font Shell Extension * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: CFontMenu implementation - * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2019,2020 Mark Jansen (mark.jansen(a)reactos.org) */ #include "precomp.h" @@ -45,11 +45,6 @@ HRESULT _CDataObject_CreateInstance(PCIDLIST_ABSOLUTE folder, UINT cidl, PCUITEM // Now that we have an IDataObject with the shell itemid list (CFSTR_SHELLIDLIST, aka HIDA) format // we will augment this IDataObject with the CF_HDROP format. (Full filepaths) // This enabled the objects for the 'copy' and drag to copy actions - WCHAR FontsDir[MAX_PATH]; - hr = SHGetFolderPathW(NULL, CSIDL_FONTS, NULL, 0, FontsDir); - if (FAILED_UNEXPECTEDLY(hr)) - return S_OK; - StringCchCatW(FontsDir, _countof(FontsDir), L"\\"); CComHeapPtr<BYTE> data; @@ -63,15 +58,9 @@ HRESULT _CDataObject_CreateInstance(PCIDLIST_ABSOLUTE folder, UINT cidl, PCUITEM const FontPidlEntry* fontEntry = _FontFromIL(apidl[n]); if (fontEntry) { - CStringW File = g_FontCache->Filename(fontEntry); + CStringW File = g_FontCache->Filename(fontEntry, true); if (!File.IsEmpty()) { - // Ensure this is a full path - if (PathIsRelativeW(File)) - { - File = FontsDir + File; - } - // Now append the path (+ nullterminator) to the buffer UINT len = offset + (File.GetLength() + 1) * sizeof(WCHAR); data.ReallocateBytes(len); diff --git a/dll/shellext/fontext/CFontCache.cpp b/dll/shellext/fontext/CFontCache.cpp index 8bccf346582..218be7bb638 100644 --- a/dll/shellext/fontext/CFontCache.cpp +++ b/dll/shellext/fontext/CFontCache.cpp @@ -2,7 +2,7 @@ * PROJECT: ReactOS Font Shell Extension * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: font list cache handling - * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2019,2020 Mark Jansen (mark.jansen(a)reactos.org) */ #include "precomp.h" @@ -68,6 +68,12 @@ CFontCache::CFontCache() { } +void CFontCache::SetFontDir(const LPCWSTR Path) +{ + if (m_FontFolderPath.IsEmpty()) + m_FontFolderPath = Path; +} + size_t CFontCache::Size() { if (m_Fonts.GetCount() == 0u) @@ -87,23 +93,34 @@ CStringW CFontCache::Name(size_t Index) return m_Fonts[Index].Name(); } -CStringW CFontCache::Filename(const FontPidlEntry* fontEntry) +CStringW CFontCache::Filename(const FontPidlEntry* fontEntry, bool alwaysFullPath) { + CStringW File; + if (fontEntry->Index < m_Fonts.GetCount()) { CFontInfo& info = m_Fonts[fontEntry->Index]; if (info.Name().CompareNoCase(fontEntry->Name) == 0) - return info.File(); + File = info.File(); } - for (UINT n = 0; n < Size(); ++n) + for (UINT n = 0; File.IsEmpty() && n < Size(); ++n) { if (m_Fonts[n].Name().CompareNoCase(fontEntry->Name) == 0) - return m_Fonts[n].File(); + File = m_Fonts[n].File(); + } + + if (!File.IsEmpty() && alwaysFullPath) + { + // Ensure this is a full path + if (PathIsRelativeW(File)) + { + File = m_FontFolderPath + File; + } } - return CStringW(); + return File; } void CFontCache::Insert(CAtlList<CFontInfo>& fonts, const CStringW& KeyName) diff --git a/dll/shellext/fontext/CFontCache.hpp b/dll/shellext/fontext/CFontCache.hpp index 226c061f685..9454660a653 100644 --- a/dll/shellext/fontext/CFontCache.hpp +++ b/dll/shellext/fontext/CFontCache.hpp @@ -2,7 +2,7 @@ * PROJECT: ReactOS Font Shell Extension * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: font list cache handling - * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2019,2020 Mark Jansen (mark.jansen(a)reactos.org) */ #pragma once @@ -27,6 +27,7 @@ class CFontCache { private: CAtlArray<CFontInfo> m_Fonts; + CStringW m_FontFolderPath; protected: CFontCache(); @@ -35,9 +36,12 @@ protected: void Read(); public: + void SetFontDir(const LPCWSTR Path); + const CStringW& FontPath() const { return m_FontFolderPath; } + size_t Size(); CStringW Name(size_t Index); - CStringW Filename(const FontPidlEntry* fontEntry); + CStringW Filename(const FontPidlEntry* fontEntry, bool alwaysFullPath = false); friend class CFontExtModule; }; diff --git a/dll/shellext/fontext/CFontExt.cpp b/dll/shellext/fontext/CFontExt.cpp index 1ce5325500a..c157104c7e9 100644 --- a/dll/shellext/fontext/CFontExt.cpp +++ b/dll/shellext/fontext/CFontExt.cpp @@ -2,7 +2,7 @@ * PROJECT: ReactOS Font Shell Extension * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: CFontExt implementation - * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2019,2020 Mark Jansen (mark.jansen(a)reactos.org) * Copyright 2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ @@ -22,6 +22,10 @@ struct FolderViewColumns static FolderViewColumns g_ColumnDefs[] = { { IDS_COL_NAME, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, 25, LVCFMT_LEFT }, + { IDS_COL_FILENAME, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, 20, LVCFMT_LEFT }, + { IDS_COL_SIZE, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, 10, LVCFMT_RIGHT }, + { IDS_COL_MODIFIED, SHCOLSTATE_TYPE_DATE | SHCOLSTATE_ONBYDEFAULT, 15, LVCFMT_LEFT }, + { IDS_COL_ATTR, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, 12, LVCFMT_RIGHT }, }; @@ -134,10 +138,83 @@ STDMETHODIMP CFontExt::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDET return E_FAIL; } + // Name, ReactOS specific? + if (iColumn == 0) + return GetDisplayNameOf(pidl, 0, &psd->str); + + const FontPidlEntry* fontEntry = _FontFromIL(pidl); + if (!fontEntry) + { + ERR("ERROR, not a font PIDL!\n"); + return E_FAIL; + } + + // If we got here, we are in details view! + // Let's see if we got info about this file that we can re-use + if (m_LastDetailsFontName != fontEntry->Name) + { + CStringW File = g_FontCache->Filename(fontEntry, true); + HANDLE hFile = FindFirstFileW(File, &m_LastDetailsFileData); + if (hFile == INVALID_HANDLE_VALUE) + { + m_LastDetailsFontName.Empty(); + ERR("Unable to query info about %S\n", File.GetString()); + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + } + FindClose(hFile); + m_LastDetailsFontName = fontEntry->Name; + } + + // Most code borrowed from CFSFolder::GetDetailsOf + FILETIME lft; + SYSTEMTIME time; + int ret; + LARGE_INTEGER FileSize; + CStringA AttrLetters; switch (iColumn) { - case 0: /* Name, ReactOS specific? */ - return GetDisplayNameOf(pidl, 0, &psd->str); + case 1: // Filename + return SHSetStrRet(&psd->str, m_LastDetailsFileData.cFileName); + case 2: // Size + psd->str.uType = STRRET_CSTR; + FileSize.HighPart = m_LastDetailsFileData.nFileSizeHigh; + FileSize.LowPart = m_LastDetailsFileData.nFileSizeLow; + StrFormatKBSizeA(FileSize.QuadPart, psd->str.cStr, MAX_PATH); + return S_OK; + case 3: // Modified + FileTimeToLocalFileTime(&m_LastDetailsFileData.ftLastWriteTime, &lft); + FileTimeToSystemTime (&lft, &time); + psd->str.uType = STRRET_CSTR; + ret = GetDateFormatA(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &time, NULL, psd->str.cStr, MAX_PATH); + if (ret < 1) + { + ERR("GetDateFormatA failed\n"); + return E_FAIL; + } + psd->str.cStr[ret-1] = ' '; + GetTimeFormatA(LOCALE_USER_DEFAULT, TIME_NOSECONDS, &time, NULL, &psd->str.cStr[ret], MAX_PATH - ret); + return S_OK; + case 4: // Attributes + AttrLetters.LoadString(IDS_COL_ATTR_LETTERS); + if (AttrLetters.GetLength() != 5) + { + ERR("IDS_COL_ATTR_LETTERS does not contain 5 letters!\n"); + return E_FAIL; + } + psd->str.uType = STRRET_CSTR; + ret = 0; + if (m_LastDetailsFileData.dwFileAttributes & FILE_ATTRIBUTE_READONLY) + psd->str.cStr[ret++] = AttrLetters[0]; + if (m_LastDetailsFileData.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) + psd->str.cStr[ret++] = AttrLetters[1]; + if (m_LastDetailsFileData.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM) + psd->str.cStr[ret++] = AttrLetters[2]; + if (m_LastDetailsFileData.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE) + psd->str.cStr[ret++] = AttrLetters[3]; + if (m_LastDetailsFileData.dwFileAttributes & FILE_ATTRIBUTE_COMPRESSED) + psd->str.cStr[ret++] = AttrLetters[4]; + psd->str.cStr[ret] = '\0'; + return S_OK; default: break; } @@ -332,27 +409,29 @@ STDMETHODIMP CFontExt::GetCurFolder(LPITEMIDLIST *ppidl) // *** IPersistFolder methods *** STDMETHODIMP CFontExt::Initialize(LPCITEMIDLIST pidl) { - WCHAR PidlPath[MAX_PATH + 1] = {0}, Expected[MAX_PATH + 1]; + WCHAR PidlPath[MAX_PATH + 1] = {0}, FontsDir[MAX_PATH + 1]; if (!SHGetPathFromIDListW(pidl, PidlPath)) { ERR("Unable to extract path from pidl\n"); return E_FAIL; } - HRESULT hr = SHGetFolderPathW(NULL, CSIDL_FONTS, NULL, 0, Expected); - if (!SUCCEEDED(hr)) + HRESULT hr = SHGetFolderPathW(NULL, CSIDL_FONTS, NULL, 0, FontsDir); + if (FAILED_UNEXPECTEDLY(hr)) { ERR("Unable to get fonts path (0x%x)\n", hr); return hr; } - if (_wcsicmp(PidlPath, Expected)) + if (_wcsicmp(PidlPath, FontsDir)) { ERR("CFontExt View initializing on unexpected folder: '%S'\n", PidlPath); return E_FAIL; } m_Folder.Attach(ILClone(pidl)); + StringCchCatW(FontsDir, _countof(FontsDir), L"\\"); + g_FontCache->SetFontDir(FontsDir); return S_OK; } @@ -397,13 +476,8 @@ STDMETHODIMP CFontExt::Drop(IDataObject* pDataObj, DWORD grfKeyState, POINTL pt, { *pdwEffect = DROPEFFECT_NONE; - WCHAR szFontsDir[MAX_PATH]; - HRESULT hr = SHGetFolderPathW(NULL, CSIDL_FONTS, NULL, 0, szFontsDir); - if (FAILED_UNEXPECTEDLY(hr)) - return E_FAIL; - CComHeapPtr<CIDA> cida; - hr = _GetCidlFromDataObject(pDataObj, &cida); + HRESULT hr = _GetCidlFromDataObject(pDataObj, &cida); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -471,7 +545,7 @@ STDMETHODIMP CFontExt::Drop(IDataObject* pDataObj, DWORD grfKeyState, POINTL pt, for (size_t iItem = 0; iItem < FontPaths.GetCount(); ++iItem) { - HRESULT hr = DoInstallFontFile(FontPaths[iItem], szFontsDir, keyFonts.m_hKey); + HRESULT hr = DoInstallFontFile(FontPaths[iItem], g_FontCache->FontPath(), keyFonts.m_hKey); if (FAILED_UNEXPECTEDLY(hr)) { bOK = FALSE; diff --git a/dll/shellext/fontext/CFontExt.hpp b/dll/shellext/fontext/CFontExt.hpp index 19d94f6fa1c..6e3a178042d 100644 --- a/dll/shellext/fontext/CFontExt.hpp +++ b/dll/shellext/fontext/CFontExt.hpp @@ -2,7 +2,7 @@ * PROJECT: ReactOS Font Shell Extension * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: CFontExt definition - * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2019,2020 Mark Jansen (mark.jansen(a)reactos.org) * Copyright 2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ @@ -16,6 +16,8 @@ class CFontExt : public IDropTarget { CComHeapPtr<ITEMIDLIST> m_Folder; + CStringW m_LastDetailsFontName; + WIN32_FIND_DATAW m_LastDetailsFileData; public: diff --git a/dll/shellext/fontext/CFontMenu.cpp b/dll/shellext/fontext/CFontMenu.cpp index 0a2f0e55856..05b968e27d3 100644 --- a/dll/shellext/fontext/CFontMenu.cpp +++ b/dll/shellext/fontext/CFontMenu.cpp @@ -2,7 +2,7 @@ * PROJECT: ReactOS Font Shell Extension * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: CFontMenu implementation - * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2019,2020 Mark Jansen (mark.jansen(a)reactos.org) */ #include "precomp.h" @@ -69,20 +69,9 @@ static void RunFontViewer(HWND hwnd, const FontPidlEntry* fontEntry) WCHAR FontViewerPath[MAX_PATH] = L"%SystemRoot%\\System32\\fontview.exe"; WCHAR FontPathArg[MAX_PATH + 3]; - CStringW Path = g_FontCache->Filename(fontEntry); + CStringW Path = g_FontCache->Filename(fontEntry, true); if (!Path.IsEmpty()) { - if (PathIsRelativeW(Path)) - { - WCHAR FontsDir[MAX_PATH]; - HRESULT hr = SHGetFolderPathW(NULL, CSIDL_FONTS, NULL, 0, FontsDir); - if (!FAILED_UNEXPECTEDLY(hr)) - { - StringCchCatW(FontsDir, _countof(FontsDir), L"\\"); - Path = FontsDir + Path; - } - } - // '/d' disables the install button StringCchPrintfW(FontPathArg, _countof(FontPathArg), L"/d %s", Path.GetString()); PathQuoteSpacesW(FontPathArg + 3); diff --git a/dll/shellext/fontext/CMakeLists.txt b/dll/shellext/fontext/CMakeLists.txt index 2f2586b2517..e50eebfa95b 100644 --- a/dll/shellext/fontext/CMakeLists.txt +++ b/dll/shellext/fontext/CMakeLists.txt @@ -22,7 +22,8 @@ list(APPEND SOURCE fontext.cpp fontpidl.cpp fontpidl.hpp - precomp.h) + precomp.h + resource.h) add_library(fontext MODULE ${SOURCE} diff --git a/dll/shellext/fontext/fontext.cpp b/dll/shellext/fontext/fontext.cpp index ab1ed51bbc7..d3659199e2d 100644 --- a/dll/shellext/fontext/fontext.cpp +++ b/dll/shellext/fontext/fontext.cpp @@ -2,7 +2,7 @@ * PROJECT: ReactOS Font Shell Extension * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Shell extension entry point - * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2019,2020 Mark Jansen (mark.jansen(a)reactos.org) */ #include "precomp.h" @@ -59,11 +59,11 @@ STDAPI DllRegisterServer() HRESULT hr; hr = gModule.DllRegisterServer(FALSE); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = SHGetFolderPathW(NULL, CSIDL_FONTS, NULL, 0, Path); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; // Make this a system folder: diff --git a/dll/shellext/fontext/fontpidl.cpp b/dll/shellext/fontext/fontpidl.cpp index 021afe128a4..38bb7814c84 100644 --- a/dll/shellext/fontext/fontpidl.cpp +++ b/dll/shellext/fontext/fontpidl.cpp @@ -2,7 +2,7 @@ * PROJECT: ReactOS Font Shell Extension * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: pidl handling - * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2019,2020 Mark Jansen (mark.jansen(a)reactos.org) */ #include "precomp.h" @@ -31,8 +31,8 @@ LPITEMIDLIST _ILCreate(LPCWSTR lpString, ULONG Index) const FontPidlEntry* _FontFromIL(LPCITEMIDLIST pidl) { - const FontPidlEntry* zipPidl = (const FontPidlEntry*)pidl; - if (zipPidl->Magic == 'fp') - return zipPidl; + const FontPidlEntry* fontEntry = (const FontPidlEntry*)pidl; + if (fontEntry->Magic == 'fp') + return fontEntry; return NULL; } diff --git a/dll/shellext/fontext/lang/en-US.rc b/dll/shellext/fontext/lang/en-US.rc index d7fcae09bef..cdc94dbe07a 100644 --- a/dll/shellext/fontext/lang/en-US.rc +++ b/dll/shellext/fontext/lang/en-US.rc @@ -13,6 +13,15 @@ BEGIN IDS_COL_NAME "Name" END +STRINGTABLE +BEGIN + IDS_COL_FILENAME "Filename" + IDS_COL_SIZE "Size" + IDS_COL_MODIFIED "Modified" + IDS_COL_ATTR "Attributes" + IDS_COL_ATTR_LETTERS "RHSAC" +END + STRINGTABLE BEGIN diff --git a/dll/shellext/fontext/lang/it-IT.rc b/dll/shellext/fontext/lang/it-IT.rc index 5c067cdc5f2..8fb1566f13f 100644 --- a/dll/shellext/fontext/lang/it-IT.rc +++ b/dll/shellext/fontext/lang/it-IT.rc @@ -11,3 +11,23 @@ STRINGTABLE BEGIN IDS_REACTOS_FONTS_FOLDER "Cartella dei font di ReactOS" END + +STRINGTABLE +BEGIN + IDS_COL_NAME "Name" +END + +STRINGTABLE +BEGIN + IDS_COL_FILENAME "Filename" + IDS_COL_SIZE "Size" + IDS_COL_MODIFIED "Modified" + IDS_COL_ATTR "Attributes" + IDS_COL_ATTR_LETTERS "RHSAC" +END + + +STRINGTABLE +BEGIN + IDS_FONT_PREVIEW "Preview" +END diff --git a/dll/shellext/fontext/lang/pl-PL.rc b/dll/shellext/fontext/lang/pl-PL.rc index 8a4c6cd170a..73fe7c170fc 100644 --- a/dll/shellext/fontext/lang/pl-PL.rc +++ b/dll/shellext/fontext/lang/pl-PL.rc @@ -6,3 +6,23 @@ STRINGTABLE BEGIN IDS_REACTOS_FONTS_FOLDER "Folder czcionek ReactOS" END + +STRINGTABLE +BEGIN + IDS_COL_NAME "Name" +END + +STRINGTABLE +BEGIN + IDS_COL_FILENAME "Filename" + IDS_COL_SIZE "Size" + IDS_COL_MODIFIED "Modified" + IDS_COL_ATTR "Attributes" + IDS_COL_ATTR_LETTERS "RHSAC" +END + + +STRINGTABLE +BEGIN + IDS_FONT_PREVIEW "Preview" +END diff --git a/dll/shellext/fontext/lang/ro-RO.rc b/dll/shellext/fontext/lang/ro-RO.rc index af1d14c65c6..a6f2e6219cf 100644 --- a/dll/shellext/fontext/lang/ro-RO.rc +++ b/dll/shellext/fontext/lang/ro-RO.rc @@ -11,3 +11,23 @@ STRINGTABLE BEGIN IDS_REACTOS_FONTS_FOLDER "Folder-ul de fonturi de ReactOS" END + +STRINGTABLE +BEGIN + IDS_COL_NAME "Name" +END + +STRINGTABLE +BEGIN + IDS_COL_FILENAME "Filename" + IDS_COL_SIZE "Size" + IDS_COL_MODIFIED "Modified" + IDS_COL_ATTR "Attributes" + IDS_COL_ATTR_LETTERS "RHSAC" +END + + +STRINGTABLE +BEGIN + IDS_FONT_PREVIEW "Preview" +END diff --git a/dll/shellext/fontext/lang/tr-TR.rc b/dll/shellext/fontext/lang/tr-TR.rc index 7f6ec6550d5..1c44a655a2e 100644 --- a/dll/shellext/fontext/lang/tr-TR.rc +++ b/dll/shellext/fontext/lang/tr-TR.rc @@ -6,3 +6,23 @@ STRINGTABLE BEGIN IDS_REACTOS_FONTS_FOLDER "ReactOS Yazı Tipi Klasörü" END + +STRINGTABLE +BEGIN + IDS_COL_NAME "Name" +END + +STRINGTABLE +BEGIN + IDS_COL_FILENAME "Filename" + IDS_COL_SIZE "Size" + IDS_COL_MODIFIED "Modified" + IDS_COL_ATTR "Attributes" + IDS_COL_ATTR_LETTERS "RHSAC" +END + + +STRINGTABLE +BEGIN + IDS_FONT_PREVIEW "Preview" +END diff --git a/dll/shellext/fontext/resource.h b/dll/shellext/fontext/resource.h index 49246c33524..8ff4867ee4e 100644 --- a/dll/shellext/fontext/resource.h +++ b/dll/shellext/fontext/resource.h @@ -4,6 +4,12 @@ #define IDS_REACTOS_FONTS_FOLDER 151 #define IDS_COL_NAME 301 +#define IDS_COL_FILENAME 304 +#define IDS_COL_SIZE 305 +#define IDS_COL_MODIFIED 306 +#define IDS_COL_ATTR 307 +#define IDS_COL_ATTR_LETTERS 308 + #define IDS_FONT_PREVIEW 401 #define IDR_FONTEXT 8000

4 years, 7 months

[reactos] 01/01: [FREELDR] Properly set keyboard flags in hardware detection (#2288)

by Dmitry Borisov

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,

4 years, 7 months

[reactos] 01/01: [SDK][ATL] Make ThrowMemoryException protected

by Katayama Hirofumi MZ

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

4 years, 7 months

[reactos] 01/01: [SDK][ATL] Implement CStringT::FormatMessage (#2286)

by Katayama Hirofumi MZ

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) {

4 years, 7 months

[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

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) {

4 years, 7 months

[reactos] 01/01: [CPL][APPWIZ] Consider PSN_SETACTIVE

by Katayama Hirofumi MZ

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);

4 years, 7 months

[reactos] 01/01: [CPL][APPWIZ] Use display name for shortcut label (#2284)

by Katayama Hirofumi MZ

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

4 years, 7 months

[reactos] 01/01: [CPL][DESK] Use GetModuleHandleW(L"shell32.dll")

by Katayama Hirofumi MZ

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);

4 years, 7 months

[reactos] 01/01: [CPL][DESK] Improve Japanese translation for IDD_THEMES

by Katayama Hirofumi MZ

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

4 years, 7 months

[reactos] 01/01: [CPL][DESK] Improve Polish translation for IDD_THEMES

by Katayama Hirofumi MZ

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

4 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2020