Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 02/03: [SHELL32] CMyDocsFolder: Ensure the object can be used without calling Initialize
by Mark Jansen 20 Apr '20

20 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d2b91deb33ecc6c71c436… commit d2b91deb33ecc6c71c43693d0d216e02a3936492 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Jan 29 21:48:16 2020 +0100 Commit: Ioannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Mon Apr 20 17:36:44 2020 +0300 [SHELL32] CMyDocsFolder: Ensure the object can be used without calling Initialize --- dll/win32/shell32/folders/CMyDocsFolder.cpp | 109 +++++++++++++++++++++++++++- dll/win32/shell32/folders/CMyDocsFolder.h | 5 ++ 2 files changed, 110 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/folders/CMyDocsFolder.cpp b/dll/win32/shell32/folders/CMyDocsFolder.cpp index ae7e4673b90..91b5640ef59 100644 --- a/dll/win32/shell32/folders/CMyDocsFolder.cpp +++ b/dll/win32/shell32/folders/CMyDocsFolder.cpp @@ -34,34 +34,87 @@ CMyDocsFolder::~CMyDocsFolder() SHFree(m_pidlInner); } +HRESULT WINAPI CMyDocsFolder::FinalConstruct() +{ + m_pidlInner = _ILCreateMyDocuments(); + + if (!m_pidlInner) + return E_OUTOFMEMORY; + + return S_OK; +} + +HRESULT CMyDocsFolder::EnsureFolder() +{ + ATLASSERT(m_pidlInner); + + if (m_pisfInner) + return S_OK; + + + HRESULT hr = SHELL32_CoCreateInitSF(m_pidlInner, + &CLSID_ShellFSFolder, + CSIDL_PERSONAL, + IID_PPV_ARG(IShellFolder2, &m_pisfInner)); + + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return S_OK; +} + HRESULT WINAPI CMyDocsFolder::ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, ULONG *pchEaten, PIDLIST_RELATIVE *ppidl, ULONG *pdwAttributes) { + HRESULT hr = EnsureFolder(); + if (FAILED(hr)) + return hr; + return m_pisfInner->ParseDisplayName(hwndOwner, pbc, lpszDisplayName, pchEaten, ppidl, pdwAttributes); } HRESULT WINAPI CMyDocsFolder::EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList) { + HRESULT hr = EnsureFolder(); + if (FAILED(hr)) + return hr; + return m_pisfInner->EnumObjects(hwndOwner, dwFlags, ppEnumIDList); } HRESULT WINAPI CMyDocsFolder::BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) { + HRESULT hr = EnsureFolder(); + if (FAILED(hr)) + return hr; + return m_pisfInner->BindToObject(pidl, pbcReserved, riid, ppvOut); } HRESULT WINAPI CMyDocsFolder::BindToStorage(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) { + HRESULT hr = EnsureFolder(); + if (FAILED(hr)) + return hr; + return m_pisfInner->BindToStorage(pidl, pbcReserved, riid, ppvOut); } HRESULT WINAPI CMyDocsFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2) { + HRESULT hr = EnsureFolder(); + if (FAILED(hr)) + return hr; + return m_pisfInner->CompareIDs(lParam, pidl1, pidl2); } HRESULT WINAPI CMyDocsFolder::CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID *ppvOut) { + HRESULT hr = EnsureFolder(); + if (FAILED(hr)) + return hr; + return m_pisfInner->CreateViewObject(hwndOwner, riid, ppvOut); } @@ -71,6 +124,10 @@ HRESULT WINAPI CMyDocsFolder::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY a SFGAO_STORAGE | SFGAO_HASPROPSHEET | SFGAO_STORAGEANCESTOR | SFGAO_CANCOPY | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER | SFGAO_CANRENAME | SFGAO_CANDELETE; + HRESULT hr = EnsureFolder(); + if (FAILED(hr)) + return hr; + if(cidl) return m_pisfInner->GetAttributesOf(cidl, apidl, rgfInOut); @@ -91,6 +148,10 @@ HRESULT WINAPI CMyDocsFolder::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY a HRESULT WINAPI CMyDocsFolder::GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut) { + HRESULT hr = EnsureFolder(); + if (FAILED(hr)) + return hr; + return m_pisfInner->GetUIObjectOf(hwndOwner, cidl, apidl, riid, prgfInOut, ppvOut); } @@ -99,6 +160,10 @@ HRESULT WINAPI CMyDocsFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFla if (!strRet || !pidl) return E_INVALIDARG; + HRESULT hr = EnsureFolder(); + if (FAILED(hr)) + return hr; + /* If we got an fs item just forward to the fs folder */ if (!_ILIsSpecialFolder(pidl)) return m_pisfInner->GetDisplayNameOf(pidl, dwFlags, strRet); @@ -120,41 +185,73 @@ HRESULT WINAPI CMyDocsFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFla HRESULT WINAPI CMyDocsFolder::SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl, /* simple pidl */ LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut) { + HRESULT hr = EnsureFolder(); + if (FAILED(hr)) + return hr; + return m_pisfInner->SetNameOf(hwndOwner, pidl, lpName, dwFlags, pPidlOut); } HRESULT WINAPI CMyDocsFolder::GetDefaultSearchGUID(GUID *pguid) { + HRESULT hr = EnsureFolder(); + if (FAILED(hr)) + return hr; + return m_pisfInner->GetDefaultSearchGUID(pguid); } HRESULT WINAPI CMyDocsFolder::EnumSearches(IEnumExtraSearch ** ppenum) { + HRESULT hr = EnsureFolder(); + if (FAILED(hr)) + return hr; + return m_pisfInner->EnumSearches(ppenum); } HRESULT WINAPI CMyDocsFolder::GetDefaultColumn(DWORD dwRes, ULONG *pSort, ULONG *pDisplay) { + HRESULT hr = EnsureFolder(); + if (FAILED(hr)) + return hr; + return m_pisfInner->GetDefaultColumn(dwRes, pSort, pDisplay); } HRESULT WINAPI CMyDocsFolder::GetDefaultColumnState(UINT iColumn, DWORD *pcsFlags) { + HRESULT hr = EnsureFolder(); + if (FAILED(hr)) + return hr; + return m_pisfInner->GetDefaultColumnState(iColumn, pcsFlags); } HRESULT WINAPI CMyDocsFolder::GetDetailsEx(PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv) { + HRESULT hr = EnsureFolder(); + if (FAILED(hr)) + return hr; + return m_pisfInner->GetDetailsEx(pidl, pscid, pv); } HRESULT WINAPI CMyDocsFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd) { + HRESULT hr = EnsureFolder(); + if (FAILED(hr)) + return hr; + return m_pisfInner->GetDetailsOf(pidl, iColumn, psd); } HRESULT WINAPI CMyDocsFolder::MapColumnToSCID(UINT column, SHCOLUMNID *pscid) { + HRESULT hr = EnsureFolder(); + if (FAILED(hr)) + return hr; + return m_pisfInner->MapColumnToSCID(column, pscid); } @@ -170,14 +267,18 @@ HRESULT WINAPI CMyDocsFolder::GetClassID(CLSID *lpClassId) HRESULT WINAPI CMyDocsFolder::Initialize(PCIDLIST_ABSOLUTE pidl) { + if (m_pisfInner) + return E_INVALIDARG; + + if (m_pidlInner) + SHFree(m_pidlInner); + m_pidlInner = ILClone(pidl); + if (!m_pidlInner) return E_OUTOFMEMORY; - return SHELL32_CoCreateInitSF(m_pidlInner, - &CLSID_ShellFSFolder, - CSIDL_PERSONAL, - IID_PPV_ARG(IShellFolder2, &m_pisfInner)); + return EnsureFolder(); } HRESULT WINAPI CMyDocsFolder::GetCurFolder(PIDLIST_ABSOLUTE *pidl) diff --git a/dll/win32/shell32/folders/CMyDocsFolder.h b/dll/win32/shell32/folders/CMyDocsFolder.h index 6bed840fcbc..c462ab9c200 100644 --- a/dll/win32/shell32/folders/CMyDocsFolder.h +++ b/dll/win32/shell32/folders/CMyDocsFolder.h @@ -32,10 +32,15 @@ class CMyDocsFolder : private: CComPtr<IShellFolder2> m_pisfInner; LPITEMIDLIST m_pidlInner; + + HRESULT EnsureFolder(); + public: CMyDocsFolder(); ~CMyDocsFolder(); + HRESULT WINAPI FinalConstruct(); + // IShellFolder virtual HRESULT WINAPI ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes); virtual HRESULT WINAPI EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList);

1 0

[reactos] 01/03: [SHELL32] Ensure CIDLDataObject::GetData always returns an STGMEDIUM that is safe for use with ReleaseStgMedium
by Mark Jansen 20 Apr '20

20 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a6a28b6349bbdb42bca3… commit 6a6a28b6349bbdb42bca39a3295b4a2013e9f100 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Jan 29 21:36:08 2020 +0100 Commit: Ioannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Mon Apr 20 17:36:43 2020 +0300 [SHELL32] Ensure CIDLDataObject::GetData always returns an STGMEDIUM that is safe for use with ReleaseStgMedium --- dll/win32/shell32/CIDLDataObj.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dll/win32/shell32/CIDLDataObj.cpp b/dll/win32/shell32/CIDLDataObj.cpp index 8e1993e2a66..f3366d89a1d 100644 --- a/dll/win32/shell32/CIDLDataObj.cpp +++ b/dll/win32/shell32/CIDLDataObj.cpp @@ -236,6 +236,8 @@ HRESULT WINAPI CIDLDataObj::GetData(LPFORMATETC pformatetcIn, STGMEDIUM *pmedium GetClipboardFormatNameA (pformatetcIn->cfFormat, szTemp, 256); TRACE("(%p)->(%p %p format=%s)\n", this, pformatetcIn, pmedium, szTemp); } + pmedium->hGlobal = NULL; + pmedium->pUnkForRelease = NULL; for (int n = 0; n < m_Formats.GetSize(); ++n) { const FORMATETC& fmt = m_Formats[n];

1 0

[reactos] 01/01: Add Search Hidden Files and Folders Registry Entry for HKCU
by Doug Lyons 20 Apr '20

20 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ff61611aecadd003e67b3… commit ff61611aecadd003e67b322d16fccd33b0ec4a0b Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sat Apr 18 21:17:46 2020 -0500 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Mon Apr 20 15:39:40 2020 +0300 Add Search Hidden Files and Folders Registry Entry for HKCU --- boot/bootdata/hivedef.inf | 1 + 1 file changed, 1 insertion(+) diff --git a/boot/bootdata/hivedef.inf b/boot/bootdata/hivedef.inf index 45e5d8e64c5..d2a5821a259 100644 --- a/boot/bootdata/hivedef.inf +++ b/boot/bootdata/hivedef.inf @@ -1883,6 +1883,7 @@ HKCU,"SOFTWARE\Classes\Applications",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer",,0x00000012 +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer","SearchHidden",0x00010001,0x00000000 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer","SelectExtOnRename",0x00010001,0x00000000 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders",,0x00000012

1 0

[reactos] 01/01: [EXPLORER] Keep processing messages while waiting for a startup task CORE-16909
by Mark Jansen 20 Apr '20

20 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5cee1b95c039d262c680c… commit 5cee1b95c039d262c680cbf44956f96df70bdcae Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Apr 19 18:44:26 2020 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Mon Apr 20 15:37:19 2020 +0300 [EXPLORER] Keep processing messages while waiting for a startup task CORE-16909 --- base/shell/explorer/startup.cpp | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/base/shell/explorer/startup.cpp b/base/shell/explorer/startup.cpp index b8e048df413..f4f064e266a 100644 --- a/base/shell/explorer/startup.cpp +++ b/base/shell/explorer/startup.cpp @@ -85,8 +85,37 @@ static int runCmd(LPWSTR cmdline, LPCWSTR dir, BOOL wait, BOOL minimized) TRACE("Successfully ran command\n"); if (wait) - { /* wait for the process to exit */ - WaitForSingleObject(info.hProcess, INFINITE); + { + HANDLE Handles[] = { info.hProcess }; + DWORD nCount = _countof(Handles); + DWORD dwWait; + MSG msg; + + /* wait for the process to exit */ + for (;;) + { + /* We need to keep processing messages, + otherwise we will hang anything that is trying to send a message to us */ + dwWait = MsgWaitForMultipleObjects(nCount, Handles, FALSE, INFINITE, QS_ALLINPUT); + + /* WAIT_OBJECT_0 + nCount signals an event in the message queue, + so anything other than that means we are done. */ + if (dwWait != WAIT_OBJECT_0 + nCount) + { + if (dwWait >= WAIT_OBJECT_0 && dwWait < WAIT_OBJECT_0 + nCount) + TRACE("Event %u signaled\n", dwWait - WAIT_OBJECT_0); + else + WARN("Return code: %u\n", dwWait); + break; + } + + while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + } + GetExitCodeProcess(info.hProcess, &exit_code); }

1 0

[reactos] 01/01: [SHIMGVW] Consider failure case of loading file (#2606)
by Katayama Hirofumi MZ 20 Apr '20

20 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3926e9b3c884e00328ca3… commit 3926e9b3c884e00328ca38285d5047be5dc4b343 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Apr 20 21:05:14 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Apr 20 21:05:14 2020 +0900 [SHIMGVW] Consider failure case of loading file (#2606) If loading an image file failed, then properly handle it. The command line is rundll32 shimgvw.dll,ImageView_Fullscreen . CORE-16911 --- dll/win32/shimgvw/lang/bg-BG.rc | 1 + dll/win32/shimgvw/lang/cs-CZ.rc | 1 + dll/win32/shimgvw/lang/de-DE.rc | 1 + dll/win32/shimgvw/lang/en-US.rc | 1 + dll/win32/shimgvw/lang/es-ES.rc | 1 + dll/win32/shimgvw/lang/fr-FR.rc | 1 + dll/win32/shimgvw/lang/he-IL.rc | 1 + dll/win32/shimgvw/lang/it-IT.rc | 1 + dll/win32/shimgvw/lang/ja-JP.rc | 1 + dll/win32/shimgvw/lang/lt-LT.rc | 1 + dll/win32/shimgvw/lang/no-NO.rc | 1 + dll/win32/shimgvw/lang/pl-PL.rc | 1 + dll/win32/shimgvw/lang/pt-PT.rc | 1 + dll/win32/shimgvw/lang/ro-RO.rc | 1 + dll/win32/shimgvw/lang/ru-RU.rc | 1 + dll/win32/shimgvw/lang/sk-SK.rc | 1 + dll/win32/shimgvw/lang/sq-AL.rc | 1 + dll/win32/shimgvw/lang/tr-TR.rc | 1 + dll/win32/shimgvw/lang/uk-UA.rc | 1 + dll/win32/shimgvw/lang/zh-CN.rc | 1 + dll/win32/shimgvw/lang/zh-TW.rc | 1 + dll/win32/shimgvw/resource.h | 1 + dll/win32/shimgvw/shimgvw.c | 130 ++++++++++++++++++++++++++++------------ 23 files changed, 115 insertions(+), 37 deletions(-) diff --git a/dll/win32/shimgvw/lang/bg-BG.rc b/dll/win32/shimgvw/lang/bg-BG.rc index f0e819325bb..91e1f3c8c84 100644 --- a/dll/win32/shimgvw/lang/bg-BG.rc +++ b/dll/win32/shimgvw/lang/bg-BG.rc @@ -4,6 +4,7 @@ STRINGTABLE BEGIN IDS_APPTITLE "Прегледът за снимки и факсове на РеактОС" IDS_SETASDESKBG "Слагане като подкраска" + IDS_NOPREVIEW "No preview available." IDS_PREVIEW "Преглед" /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "Следващо изображение" diff --git a/dll/win32/shimgvw/lang/cs-CZ.rc b/dll/win32/shimgvw/lang/cs-CZ.rc index 4163698a7b6..f9355e39ba9 100644 --- a/dll/win32/shimgvw/lang/cs-CZ.rc +++ b/dll/win32/shimgvw/lang/cs-CZ.rc @@ -9,6 +9,7 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS prohlížeč obrázků a faxů" IDS_SETASDESKBG "Nastavit jako pozadí plochy" + IDS_NOPREVIEW "No preview available." IDS_PREVIEW "Náhled" /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "Další obrázek" diff --git a/dll/win32/shimgvw/lang/de-DE.rc b/dll/win32/shimgvw/lang/de-DE.rc index e199106ac47..ed9b19c6701 100644 --- a/dll/win32/shimgvw/lang/de-DE.rc +++ b/dll/win32/shimgvw/lang/de-DE.rc @@ -4,6 +4,7 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS-Bild- und Faxansicht" IDS_SETASDESKBG "Als Desktophintergrund setzen" + IDS_NOPREVIEW "No preview available." IDS_PREVIEW "Vorschau" /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "Nächstes Bild" diff --git a/dll/win32/shimgvw/lang/en-US.rc b/dll/win32/shimgvw/lang/en-US.rc index 6b7342bad1f..c212b2e7d00 100644 --- a/dll/win32/shimgvw/lang/en-US.rc +++ b/dll/win32/shimgvw/lang/en-US.rc @@ -4,6 +4,7 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS Picture and Fax Viewer" IDS_SETASDESKBG "Set as Desktop Background" + IDS_NOPREVIEW "No preview available." IDS_PREVIEW "Preview" /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "Next Picture" diff --git a/dll/win32/shimgvw/lang/es-ES.rc b/dll/win32/shimgvw/lang/es-ES.rc index 54cc7ed890d..4fd16a4a595 100644 --- a/dll/win32/shimgvw/lang/es-ES.rc +++ b/dll/win32/shimgvw/lang/es-ES.rc @@ -6,6 +6,7 @@ STRINGTABLE BEGIN IDS_APPTITLE "Visor de imágenes y fax de ReactOS" IDS_SETASDESKBG "Establecer como fondo de escritorio" + IDS_NOPREVIEW "No preview available." IDS_PREVIEW "Vista previa" /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "Siguiente imagen" diff --git a/dll/win32/shimgvw/lang/fr-FR.rc b/dll/win32/shimgvw/lang/fr-FR.rc index e020c1ea319..6c7862600b1 100644 --- a/dll/win32/shimgvw/lang/fr-FR.rc +++ b/dll/win32/shimgvw/lang/fr-FR.rc @@ -4,6 +4,7 @@ STRINGTABLE BEGIN IDS_APPTITLE "Visionneuse d'Images et Fax de ReactOS" IDS_SETASDESKBG "Définir comme Arrière-plan du Bureau" + IDS_NOPREVIEW "No preview available." IDS_PREVIEW "Aperçu" /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "Image Suivante" diff --git a/dll/win32/shimgvw/lang/he-IL.rc b/dll/win32/shimgvw/lang/he-IL.rc index dbec4c39c2a..c90d0e79dd1 100644 --- a/dll/win32/shimgvw/lang/he-IL.rc +++ b/dll/win32/shimgvw/lang/he-IL.rc @@ -4,6 +4,7 @@ STRINGTABLE BEGIN IDS_APPTITLE "מציג התמונות והפקסים של ReactOS" IDS_SETASDESKBG "קבע כרקע שולחן עבודה" + IDS_NOPREVIEW "No preview available." IDS_PREVIEW "תצוגה מקדימה" /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "התמונה הבאה" diff --git a/dll/win32/shimgvw/lang/it-IT.rc b/dll/win32/shimgvw/lang/it-IT.rc index 82655f83807..f629ad69acc 100644 --- a/dll/win32/shimgvw/lang/it-IT.rc +++ b/dll/win32/shimgvw/lang/it-IT.rc @@ -4,6 +4,7 @@ STRINGTABLE BEGIN IDS_APPTITLE "Visualizzatore immagini e fax di ReactOS" IDS_SETASDESKBG "Imposta come sfondo del desktop" + IDS_NOPREVIEW "No preview available." IDS_PREVIEW "Anteprima" /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "Immagine successiva" diff --git a/dll/win32/shimgvw/lang/ja-JP.rc b/dll/win32/shimgvw/lang/ja-JP.rc index 28a75e0f099..2a7e13fe837 100644 --- a/dll/win32/shimgvw/lang/ja-JP.rc +++ b/dll/win32/shimgvw/lang/ja-JP.rc @@ -4,6 +4,7 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS画像とFAXビュアー" IDS_SETASDESKBG "デスクトップの背景に設定する" + IDS_NOPREVIEW "No preview available." IDS_PREVIEW "プレビュー" /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "次の画像" diff --git a/dll/win32/shimgvw/lang/lt-LT.rc b/dll/win32/shimgvw/lang/lt-LT.rc index 1ed29815677..631f493ae39 100644 --- a/dll/win32/shimgvw/lang/lt-LT.rc +++ b/dll/win32/shimgvw/lang/lt-LT.rc @@ -6,6 +6,7 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS paveikslėlių ir faksogramų peržiūros programa" IDS_SETASDESKBG "Nustatyti kaip darbalaukio foną" + IDS_NOPREVIEW "No preview available." IDS_PREVIEW "Preview" /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "Tolesnis paveikslėlis" diff --git a/dll/win32/shimgvw/lang/no-NO.rc b/dll/win32/shimgvw/lang/no-NO.rc index 4012786682c..f25300df06a 100644 --- a/dll/win32/shimgvw/lang/no-NO.rc +++ b/dll/win32/shimgvw/lang/no-NO.rc @@ -4,6 +4,7 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS bilde og Faks Viser" IDS_SETASDESKBG "Sett som skrivebord bakgrunn" + IDS_NOPREVIEW "No preview available." IDS_PREVIEW "Skriv ut" /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "Neste bilde" diff --git a/dll/win32/shimgvw/lang/pl-PL.rc b/dll/win32/shimgvw/lang/pl-PL.rc index 8fdfaea4581..2bb921f4fae 100644 --- a/dll/win32/shimgvw/lang/pl-PL.rc +++ b/dll/win32/shimgvw/lang/pl-PL.rc @@ -9,6 +9,7 @@ STRINGTABLE BEGIN IDS_APPTITLE "Przeglądarka obrazów i faksów ReactOS" IDS_SETASDESKBG "Ustaw jako tło pulpitu" + IDS_NOPREVIEW "No preview available." IDS_PREVIEW "Podgląd" /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "Następny obraz" diff --git a/dll/win32/shimgvw/lang/pt-PT.rc b/dll/win32/shimgvw/lang/pt-PT.rc index c6fa85a3ff6..ba02254631f 100644 --- a/dll/win32/shimgvw/lang/pt-PT.rc +++ b/dll/win32/shimgvw/lang/pt-PT.rc @@ -9,6 +9,7 @@ STRINGTABLE BEGIN IDS_APPTITLE "Visualizador de imagens e faxes do ReactOS" IDS_SETASDESKBG "Definir como plano de fundo da área de trabalho" + IDS_NOPREVIEW "No preview available." IDS_PREVIEW "Pre-visualizar" /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "Próxima imagem" diff --git a/dll/win32/shimgvw/lang/ro-RO.rc b/dll/win32/shimgvw/lang/ro-RO.rc index 81ff1466829..1dee13cca8c 100644 --- a/dll/win32/shimgvw/lang/ro-RO.rc +++ b/dll/win32/shimgvw/lang/ro-RO.rc @@ -11,6 +11,7 @@ STRINGTABLE BEGIN IDS_APPTITLE "Vizualizare fax și imagini" IDS_SETASDESKBG "Plasează ca decor de fundal" + IDS_NOPREVIEW "No preview available." IDS_PREVIEW "Previzionare" /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "Imaginea următare" diff --git a/dll/win32/shimgvw/lang/ru-RU.rc b/dll/win32/shimgvw/lang/ru-RU.rc index beab59399f8..2ae247055f5 100644 --- a/dll/win32/shimgvw/lang/ru-RU.rc +++ b/dll/win32/shimgvw/lang/ru-RU.rc @@ -4,6 +4,7 @@ STRINGTABLE BEGIN IDS_APPTITLE "Программа просмотра изображений и факсов" IDS_SETASDESKBG "Установить как фон рабочего стола" + IDS_NOPREVIEW "No preview available." IDS_PREVIEW "Предпросмотр" /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "Следующее изображение" diff --git a/dll/win32/shimgvw/lang/sk-SK.rc b/dll/win32/shimgvw/lang/sk-SK.rc index d5ae689c2b7..3216f9142ca 100644 --- a/dll/win32/shimgvw/lang/sk-SK.rc +++ b/dll/win32/shimgvw/lang/sk-SK.rc @@ -8,6 +8,7 @@ STRINGTABLE BEGIN IDS_APPTITLE "Zobrazovač obrázkov a faxov systému ReactOS" IDS_SETASDESKBG "Nastaviť ako pozadie pracovnej plochy" + IDS_NOPREVIEW "No preview available." IDS_PREVIEW "Preview" // Náhľad, Ukážka, Prezrieť ??? /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "Nasledujúci obrázok" diff --git a/dll/win32/shimgvw/lang/sq-AL.rc b/dll/win32/shimgvw/lang/sq-AL.rc index 6df55634315..79854867665 100644 --- a/dll/win32/shimgvw/lang/sq-AL.rc +++ b/dll/win32/shimgvw/lang/sq-AL.rc @@ -8,6 +8,7 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS Vëzhguesi i Fotove dhe Faxit" IDS_SETASDESKBG "Vendos si Sfond Desktopi" + IDS_NOPREVIEW "No preview available." IDS_PREVIEW "Shikim Paraprak" /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "Fotoja Tjetër" diff --git a/dll/win32/shimgvw/lang/tr-TR.rc b/dll/win32/shimgvw/lang/tr-TR.rc index 40dbcb53fc0..13f5db98659 100644 --- a/dll/win32/shimgvw/lang/tr-TR.rc +++ b/dll/win32/shimgvw/lang/tr-TR.rc @@ -6,6 +6,7 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS Resim ve Belgegeçer Görüntüleyicisi" IDS_SETASDESKBG "Masaüstü Arka Planı Olarak Ayarla" + IDS_NOPREVIEW "No preview available." IDS_PREVIEW "Ön İzleme" /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "Sonraki Resim" diff --git a/dll/win32/shimgvw/lang/uk-UA.rc b/dll/win32/shimgvw/lang/uk-UA.rc index ee64a5fddfe..9202a26843f 100644 --- a/dll/win32/shimgvw/lang/uk-UA.rc +++ b/dll/win32/shimgvw/lang/uk-UA.rc @@ -12,6 +12,7 @@ STRINGTABLE BEGIN IDS_APPTITLE "Програма перегляду зображень і факсів ReactOS" IDS_SETASDESKBG "Встановити як фон робочого столу" + IDS_NOPREVIEW "No preview available." IDS_PREVIEW "Перегляд" /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "Наступне зображення" diff --git a/dll/win32/shimgvw/lang/zh-CN.rc b/dll/win32/shimgvw/lang/zh-CN.rc index 0ba55768aa5..40cc06efc68 100644 --- a/dll/win32/shimgvw/lang/zh-CN.rc +++ b/dll/win32/shimgvw/lang/zh-CN.rc @@ -7,6 +7,7 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS 图片和传真查看器" IDS_SETASDESKBG "设置为桌面背景" + IDS_NOPREVIEW "No preview available." IDS_PREVIEW "预览" /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "下一张图片" diff --git a/dll/win32/shimgvw/lang/zh-TW.rc b/dll/win32/shimgvw/lang/zh-TW.rc index 44345ea6fce..1aee3fdc2fb 100644 --- a/dll/win32/shimgvw/lang/zh-TW.rc +++ b/dll/win32/shimgvw/lang/zh-TW.rc @@ -6,6 +6,7 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS 圖片和傳真檢視器" IDS_SETASDESKBG "設定為桌面背景" + IDS_NOPREVIEW "No preview available." IDS_PREVIEW "預覽" /* Tooltips */ IDS_TOOLTIP_NEXT_PIC "下一張圖片" diff --git a/dll/win32/shimgvw/resource.h b/dll/win32/shimgvw/resource.h index 8026b10e203..b54f96e98f8 100644 --- a/dll/win32/shimgvw/resource.h +++ b/dll/win32/shimgvw/resource.h @@ -38,6 +38,7 @@ /* Strings */ #define IDS_APPTITLE 100 #define IDS_SETASDESKBG 101 +#define IDS_NOPREVIEW 102 #define IDS_PREVIEW 550 /* Friendly File Type Names */ diff --git a/dll/win32/shimgvw/shimgvw.c b/dll/win32/shimgvw/shimgvw.c index de8dc0e0238..9215eae87bb 100644 --- a/dll/win32/shimgvw/shimgvw.c +++ b/dll/win32/shimgvw/shimgvw.c @@ -37,7 +37,7 @@ HINSTANCE hInstance; SHIMGVW_SETTINGS shiSettings; SHIMGVW_FILENODE *currentFile; -GpImage *image; +GpImage *image = NULL; WNDPROC PrevProc = NULL; HWND hDispWnd, hToolBar; @@ -186,6 +186,9 @@ static void ZoomInOrOut(BOOL bZoomIn) { INT i; + if (image == NULL) + return; + if (bZoomIn) /* zoom in */ { /* find next step */ @@ -237,6 +240,9 @@ static void ResetZoom(void) RECT Rect; UINT ImageWidth, ImageHeight; + if (image == NULL) + return; + /* get disp window size and image size */ GetClientRect(hDispWnd, &Rect); GdipGetImageWidth(image, &ImageWidth); @@ -329,6 +335,9 @@ static void pSaveImageAs(HWND hwnd) UINT j; WCHAR *c; + if (image == NULL) + return; + GdipGetImageEncodersSize(&num, &size); codecInfo = malloc(size); if (!codecInfo) @@ -421,32 +430,54 @@ static void pSaveImageAs(HWND hwnd) free(codecInfo); } +static VOID +pPrintImage(HWND hwnd) +{ + /* FIXME */ +} + +static VOID +EnableToolBarButtons(BOOL bEnable) +{ + SendMessage(hToolBar, TB_ENABLEBUTTON, IDC_SAVE, bEnable); + SendMessage(hToolBar, TB_ENABLEBUTTON, IDC_PRINT, bEnable); +} + static VOID pLoadImageFromNode(SHIMGVW_FILENODE *node, HWND hwnd) { WCHAR szTitleBuf[800]; WCHAR szResStr[512]; - WCHAR *c; + LPWSTR pchFileTitle; - if (node) + if (image) { - c = wcsrchr(node->FileName, '\\'); - if (c) - { - c++; - } + GdipDisposeImage(image); + image = NULL; + } - LoadStringW(hInstance, IDS_APPTITLE, szResStr, ARRAYSIZE(szResStr)); - StringCbPrintfW(szTitleBuf, sizeof(szTitleBuf), L"%ls%ls%ls", szResStr, L" - ", c); - SetWindowTextW(hwnd, szTitleBuf); + if (node == NULL) + { + EnableToolBarButtons(FALSE); + return; + } - if (image) - { - GdipDisposeImage(image); - } + pLoadImage(node->FileName); - pLoadImage(node->FileName); + LoadStringW(hInstance, IDS_APPTITLE, szResStr, ARRAYSIZE(szResStr)); + if (image != NULL) + { + pchFileTitle = PathFindFileNameW(node->FileName); + StringCbPrintfW(szTitleBuf, sizeof(szTitleBuf), + L"%ls%ls%ls", szResStr, L" - ", pchFileTitle); + SetWindowTextW(hwnd, szTitleBuf); + } + else + { + SetWindowTextW(hwnd, szResStr); } + + EnableToolBarButtons(image != NULL); } static SHIMGVW_FILENODE* @@ -617,6 +648,8 @@ ImageView_DrawImage(HWND hwnd) HBRUSH white; HGDIOBJ hbrOld; UINT uFlags; + WCHAR szText[128]; + HGDIOBJ hFontOld; hdc = BeginPaint(hwnd, &ps); if (!hdc) @@ -632,18 +665,34 @@ ImageView_DrawImage(HWND hwnd) return; } - GdipGetImageWidth(image, &ImageWidth); - GdipGetImageHeight(image, &ImageHeight); + GetClientRect(hwnd, &rect); + white = GetStockObject(WHITE_BRUSH); + + if (image == NULL) + { + FillRect(hdc, &rect, white); + + LoadStringW(hInstance, IDS_NOPREVIEW, szText, ARRAYSIZE(szText)); + + SetTextColor(hdc, RGB(0, 0, 0)); + SetBkMode(hdc, TRANSPARENT); - if (GetClientRect(hwnd, &rect)) + hFontOld = SelectObject(hdc, GetStockObject(DEFAULT_GUI_FONT)); + DrawTextW(hdc, szText, -1, &rect, DT_SINGLELINE | DT_CENTER | DT_VCENTER | + DT_NOPREFIX); + SelectObject(hdc, hFontOld); + } + else { + GdipGetImageWidth(image, &ImageWidth); + GdipGetImageHeight(image, &ImageHeight); + ZoomedWidth = (ImageWidth * ZoomPercents) / 100; ZoomedHeight = (ImageHeight * ZoomPercents) / 100; x = (rect.right - ZoomedWidth) / 2; y = (rect.bottom - ZoomedHeight) / 2; - white = GetStockObject(WHITE_BRUSH); // Fill top part margin = rect; margin.bottom = y - 1; @@ -903,46 +952,50 @@ ImageView_WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) currentFile = currentFile->Prev; pLoadImageFromNode(currentFile, hwnd); } - break; + case IDC_NEXT: { currentFile = currentFile->Next; pLoadImageFromNode(currentFile, hwnd); } - break; + case IDC_ZOOMP: - { ZoomInOrOut(TRUE); - } - break; + break; + case IDC_ZOOMM: - { ZoomInOrOut(FALSE); - } - break; + break; + case IDC_SAVE: pSaveImageAs(hwnd); + break; - break; case IDC_PRINT: + pPrintImage(hwnd); + break; - break; case IDC_ROT1: { - GdipImageRotateFlip(image, Rotate270FlipNone); - ImageView_UpdateWindow(hwnd); + if (image) + { + GdipImageRotateFlip(image, Rotate270FlipNone); + ImageView_UpdateWindow(hwnd); + } + break; } - break; case IDC_ROT2: { - GdipImageRotateFlip(image, Rotate90FlipNone); - ImageView_UpdateWindow(hwnd); + if (image) + { + GdipImageRotateFlip(image, Rotate90FlipNone); + ImageView_UpdateWindow(hwnd); + } + break; } - - break; } } break; @@ -1106,7 +1159,10 @@ ImageView_CreateWindow(HWND hwnd, LPWSTR szFileName) pFreeFileList(currentFile); if (image) + { GdipDisposeImage(image); + image = NULL; + } Anime_FreeInfo();

1 0

[reactos] 01/01: [BROWSEUI] Display an error message if the path or drive don't exist (CORE-10989)
by Charles Ambrye 20 Apr '20

20 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d8e47d61d472519c0ee34… commit d8e47d61d472519c0ee34dcdc1f22a49f0d7a050 Author: Charles Ambrye <giawa(a)hotmail.com> AuthorDate: Sun Apr 19 12:48:14 2020 -0700 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Mon Apr 20 14:21:37 2020 +0300 [BROWSEUI] Display an error message if the path or drive don't exist (CORE-10989) The return result of ParseNow was never checked, but contained useful information on what type of error may have occurred. If the error is an issue with the path not existing the explorer will now show an error message notifying the user of the problem instead of silently failing. Note: Shell32 does not properly return ERROR_INVALID_DRIVE when the drive path does not exist. For that reason, it is still possible to browse to a non-existent drive. However, once shell32 is patched this code will work properly, as it checks for both ERROR_INVALID_DRIVE and ERROR_FILE_NOT_FOUND. --- dll/win32/browseui/addresseditbox.cpp | 21 ++++++++++++++++++++- dll/win32/browseui/addresseditbox.h | 1 + dll/win32/browseui/lang/bg-BG.rc | 6 ++++++ dll/win32/browseui/lang/de-DE.rc | 6 ++++++ dll/win32/browseui/lang/en-US.rc | 6 ++++++ dll/win32/browseui/lang/es-ES.rc | 6 ++++++ dll/win32/browseui/lang/et-EE.rc | 6 ++++++ dll/win32/browseui/lang/fr-FR.rc | 6 ++++++ dll/win32/browseui/lang/he-IL.rc | 6 ++++++ dll/win32/browseui/lang/hi-IN.rc | 6 ++++++ dll/win32/browseui/lang/hu-HU.rc | 6 ++++++ dll/win32/browseui/lang/id-ID.rc | 6 ++++++ dll/win32/browseui/lang/it-IT.rc | 6 ++++++ dll/win32/browseui/lang/ja-JP.rc | 6 ++++++ dll/win32/browseui/lang/pl-PL.rc | 6 ++++++ dll/win32/browseui/lang/pt-BR.rc | 6 ++++++ dll/win32/browseui/lang/pt-PT.rc | 6 ++++++ dll/win32/browseui/lang/ro-RO.rc | 6 ++++++ dll/win32/browseui/lang/ru-RU.rc | 6 ++++++ dll/win32/browseui/lang/sq-AL.rc | 6 ++++++ dll/win32/browseui/lang/tr-TR.rc | 6 ++++++ dll/win32/browseui/lang/uk-UA.rc | 6 ++++++ dll/win32/browseui/lang/zh-CN.rc | 6 ++++++ dll/win32/browseui/lang/zh-TW.rc | 6 ++++++ dll/win32/browseui/resource.h | 3 +++ 25 files changed, 156 insertions(+), 1 deletion(-) diff --git a/dll/win32/browseui/addresseditbox.cpp b/dll/win32/browseui/addresseditbox.cpp index 5d96b896171..f3d7bc20008 100644 --- a/dll/win32/browseui/addresseditbox.cpp +++ b/dll/win32/browseui/addresseditbox.cpp @@ -174,6 +174,19 @@ cleanup: return hr; } +HRESULT STDMETHODCALLTYPE CAddressEditBox::ShowFileNotFoundError(HRESULT hRet) +{ + CComHeapPtr<WCHAR> input; + int inputLength = fCombobox.GetWindowTextLength() + 2; + + input.Allocate(inputLength); + fCombobox.GetWindowText(input, inputLength); + + ShellMessageBoxW(_AtlBaseModule.GetResourceInstance(), fCombobox.m_hWnd, MAKEINTRESOURCEW(IDS_PARSE_ADDR_ERR_TEXT), MAKEINTRESOURCEW(IDS_PARSE_ADDR_ERR_TITLE), MB_OK | MB_ICONERROR, input.m_pData); + + return hRet; +} + HRESULT STDMETHODCALLTYPE CAddressEditBox::Execute(long paramC) { HRESULT hr; @@ -182,7 +195,13 @@ HRESULT STDMETHODCALLTYPE CAddressEditBox::Execute(long paramC) * Parse the path is it wasn't parsed */ if (!pidlLastParsed) - ParseNow(0); + hr = ParseNow(0); + + /* + * If the destination path doesn't exist then display an error message + */ + if (hr == HRESULT_FROM_WIN32(ERROR_INVALID_DRIVE) || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) + return ShowFileNotFoundError(hr); if (!pidlLastParsed) return E_FAIL; diff --git a/dll/win32/browseui/addresseditbox.h b/dll/win32/browseui/addresseditbox.h index ba03aa821fa..4b56a0f997b 100644 --- a/dll/win32/browseui/addresseditbox.h +++ b/dll/win32/browseui/addresseditbox.h @@ -47,6 +47,7 @@ private: void AddComboBoxItem(LPITEMIDLIST pidl, int index, int indent); void FillOneLevel(int index, int levelIndent, int indent); LPITEMIDLIST GetItemData(int index); + HRESULT STDMETHODCALLTYPE ShowFileNotFoundError(HRESULT hRet); public: // *** IShellService methods *** virtual HRESULT STDMETHODCALLTYPE SetOwner(IUnknown *); diff --git a/dll/win32/browseui/lang/bg-BG.rc b/dll/win32/browseui/lang/bg-BG.rc index 2df9859f64e..3499dec9de2 100644 --- a/dll/win32/browseui/lang/bg-BG.rc +++ b/dll/win32/browseui/lang/bg-BG.rc @@ -336,3 +336,9 @@ BEGIN IDS_COL_LOCATION "In Folder" IDS_COL_RELEVANCE "Relevance" END + +STRINGTABLE +BEGIN + IDS_PARSE_ADDR_ERR_TITLE "ReactOS Explorer" + IDS_PARSE_ADDR_ERR_TEXT "ReactOS Explorer cannot find '%1'. Check the spelling and try again." +END diff --git a/dll/win32/browseui/lang/de-DE.rc b/dll/win32/browseui/lang/de-DE.rc index 99026200bed..9b24f0ad907 100644 --- a/dll/win32/browseui/lang/de-DE.rc +++ b/dll/win32/browseui/lang/de-DE.rc @@ -355,3 +355,9 @@ BEGIN IDS_COL_LOCATION "In Ordner" IDS_COL_RELEVANCE "Relevanz" END + +STRINGTABLE +BEGIN + IDS_PARSE_ADDR_ERR_TITLE "ReactOS Explorer" + IDS_PARSE_ADDR_ERR_TEXT "ReactOS Explorer cannot find '%1'. Check the spelling and try again." +END diff --git a/dll/win32/browseui/lang/en-US.rc b/dll/win32/browseui/lang/en-US.rc index 9ad03fcd9c5..f0ce4179081 100644 --- a/dll/win32/browseui/lang/en-US.rc +++ b/dll/win32/browseui/lang/en-US.rc @@ -354,3 +354,9 @@ BEGIN IDS_COL_LOCATION "In Folder" IDS_COL_RELEVANCE "Relevance" END + +STRINGTABLE +BEGIN + IDS_PARSE_ADDR_ERR_TITLE "ReactOS Explorer" + IDS_PARSE_ADDR_ERR_TEXT "ReactOS Explorer cannot find '%1'. Check the spelling and try again." +END diff --git a/dll/win32/browseui/lang/es-ES.rc b/dll/win32/browseui/lang/es-ES.rc index cf9f4b20f37..e757c95ffd8 100644 --- a/dll/win32/browseui/lang/es-ES.rc +++ b/dll/win32/browseui/lang/es-ES.rc @@ -345,3 +345,9 @@ BEGIN IDS_COL_LOCATION "En la carpeta" IDS_COL_RELEVANCE "Relevancia" END + +STRINGTABLE +BEGIN + IDS_PARSE_ADDR_ERR_TITLE "ReactOS Explorer" + IDS_PARSE_ADDR_ERR_TEXT "ReactOS Explorer cannot find '%1'. Check the spelling and try again." +END diff --git a/dll/win32/browseui/lang/et-EE.rc b/dll/win32/browseui/lang/et-EE.rc index 9de2b95a55f..4a27091eb6b 100644 --- a/dll/win32/browseui/lang/et-EE.rc +++ b/dll/win32/browseui/lang/et-EE.rc @@ -343,3 +343,9 @@ BEGIN IDS_COL_LOCATION "In Folder" IDS_COL_RELEVANCE "Relevance" END + +STRINGTABLE +BEGIN + IDS_PARSE_ADDR_ERR_TITLE "ReactOS Explorer" + IDS_PARSE_ADDR_ERR_TEXT "ReactOS Explorer cannot find '%1'. Check the spelling and try again." +END diff --git a/dll/win32/browseui/lang/fr-FR.rc b/dll/win32/browseui/lang/fr-FR.rc index 2185583ad6d..5f3d9b568ea 100644 --- a/dll/win32/browseui/lang/fr-FR.rc +++ b/dll/win32/browseui/lang/fr-FR.rc @@ -354,3 +354,9 @@ BEGIN IDS_COL_LOCATION "Dans le dossier" IDS_COL_RELEVANCE "Pertinence" END + +STRINGTABLE +BEGIN + IDS_PARSE_ADDR_ERR_TITLE "Explorateur ReactOS" + IDS_PARSE_ADDR_ERR_TEXT "L'explorateur ReactOS ne peut trouver '%1'. Veuillez vérifier l'orthographe et réessayer." +END diff --git a/dll/win32/browseui/lang/he-IL.rc b/dll/win32/browseui/lang/he-IL.rc index 03d5366197b..f235d3420a1 100644 --- a/dll/win32/browseui/lang/he-IL.rc +++ b/dll/win32/browseui/lang/he-IL.rc @@ -338,3 +338,9 @@ BEGIN IDS_COL_LOCATION "בתיקיה" IDS_COL_RELEVANCE "רלוונטיות" END + +STRINGTABLE +BEGIN + IDS_PARSE_ADDR_ERR_TITLE "ReactOS Explorer" + IDS_PARSE_ADDR_ERR_TEXT "ReactOS Explorer cannot find '%1'. Check the spelling and try again." +END diff --git a/dll/win32/browseui/lang/hi-IN.rc b/dll/win32/browseui/lang/hi-IN.rc index 75a2008e5f3..2016cfa623a 100644 --- a/dll/win32/browseui/lang/hi-IN.rc +++ b/dll/win32/browseui/lang/hi-IN.rc @@ -336,3 +336,9 @@ BEGIN IDS_COL_LOCATION "In Folder" IDS_COL_RELEVANCE "Relevance" END + +STRINGTABLE +BEGIN + IDS_PARSE_ADDR_ERR_TITLE "ReactOS Explorer" + IDS_PARSE_ADDR_ERR_TEXT "ReactOS Explorer cannot find '%1'. Check the spelling and try again." +END diff --git a/dll/win32/browseui/lang/hu-HU.rc b/dll/win32/browseui/lang/hu-HU.rc index 812cc58a33f..226102189a6 100644 --- a/dll/win32/browseui/lang/hu-HU.rc +++ b/dll/win32/browseui/lang/hu-HU.rc @@ -354,3 +354,9 @@ BEGIN IDS_COL_LOCATION "In Folder" IDS_COL_RELEVANCE "Relevance" END + +STRINGTABLE +BEGIN + IDS_PARSE_ADDR_ERR_TITLE "ReactOS Explorer" + IDS_PARSE_ADDR_ERR_TEXT "ReactOS Explorer cannot find '%1'. Check the spelling and try again." +END diff --git a/dll/win32/browseui/lang/id-ID.rc b/dll/win32/browseui/lang/id-ID.rc index cf1729e3716..2ef4668ac1f 100644 --- a/dll/win32/browseui/lang/id-ID.rc +++ b/dll/win32/browseui/lang/id-ID.rc @@ -354,3 +354,9 @@ BEGIN IDS_COL_LOCATION "Dalam Folder" IDS_COL_RELEVANCE "Relevansi" END + +STRINGTABLE +BEGIN + IDS_PARSE_ADDR_ERR_TITLE "ReactOS Explorer" + IDS_PARSE_ADDR_ERR_TEXT "ReactOS Explorer cannot find '%1'. Check the spelling and try again." +END diff --git a/dll/win32/browseui/lang/it-IT.rc b/dll/win32/browseui/lang/it-IT.rc index 1fc6d3f8451..b50dca4a41b 100644 --- a/dll/win32/browseui/lang/it-IT.rc +++ b/dll/win32/browseui/lang/it-IT.rc @@ -336,3 +336,9 @@ BEGIN IDS_COL_LOCATION "In Folder" IDS_COL_RELEVANCE "Relevance" END + +STRINGTABLE +BEGIN + IDS_PARSE_ADDR_ERR_TITLE "ReactOS Explorer" + IDS_PARSE_ADDR_ERR_TEXT "ReactOS Explorer cannot find '%1'. Check the spelling and try again." +END diff --git a/dll/win32/browseui/lang/ja-JP.rc b/dll/win32/browseui/lang/ja-JP.rc index 46e37f04d22..aac4a1e3105 100644 --- a/dll/win32/browseui/lang/ja-JP.rc +++ b/dll/win32/browseui/lang/ja-JP.rc @@ -354,3 +354,9 @@ BEGIN IDS_COL_LOCATION "場所" IDS_COL_RELEVANCE "関連" END + +STRINGTABLE +BEGIN + IDS_PARSE_ADDR_ERR_TITLE "ReactOS Explorer" + IDS_PARSE_ADDR_ERR_TEXT "ReactOS Explorer cannot find '%1'. Check the spelling and try again." +END diff --git a/dll/win32/browseui/lang/pl-PL.rc b/dll/win32/browseui/lang/pl-PL.rc index 7333f5e58f7..22f3ac24444 100644 --- a/dll/win32/browseui/lang/pl-PL.rc +++ b/dll/win32/browseui/lang/pl-PL.rc @@ -344,3 +344,9 @@ BEGIN IDS_COL_LOCATION "W folderze" IDS_COL_RELEVANCE "Istotność" END + +STRINGTABLE +BEGIN + IDS_PARSE_ADDR_ERR_TITLE "ReactOS Explorer" + IDS_PARSE_ADDR_ERR_TEXT "ReactOS Explorer cannot find '%1'. Check the spelling and try again." +END diff --git a/dll/win32/browseui/lang/pt-BR.rc b/dll/win32/browseui/lang/pt-BR.rc index 819760b7ee3..569e93dfa07 100644 --- a/dll/win32/browseui/lang/pt-BR.rc +++ b/dll/win32/browseui/lang/pt-BR.rc @@ -338,3 +338,9 @@ BEGIN IDS_COL_LOCATION "In Folder" IDS_COL_RELEVANCE "Relevance" END + +STRINGTABLE +BEGIN + IDS_PARSE_ADDR_ERR_TITLE "ReactOS Explorer" + IDS_PARSE_ADDR_ERR_TEXT "ReactOS Explorer cannot find '%1'. Check the spelling and try again." +END diff --git a/dll/win32/browseui/lang/pt-PT.rc b/dll/win32/browseui/lang/pt-PT.rc index 2c4cdfe0c28..6c1cf775698 100644 --- a/dll/win32/browseui/lang/pt-PT.rc +++ b/dll/win32/browseui/lang/pt-PT.rc @@ -338,3 +338,9 @@ BEGIN IDS_COL_LOCATION "In Folder" IDS_COL_RELEVANCE "Relevance" END + +STRINGTABLE +BEGIN + IDS_PARSE_ADDR_ERR_TITLE "ReactOS Explorer" + IDS_PARSE_ADDR_ERR_TEXT "ReactOS Explorer cannot find '%1'. Check the spelling and try again." +END diff --git a/dll/win32/browseui/lang/ro-RO.rc b/dll/win32/browseui/lang/ro-RO.rc index 3be6b38605d..89dcae38e1f 100644 --- a/dll/win32/browseui/lang/ro-RO.rc +++ b/dll/win32/browseui/lang/ro-RO.rc @@ -338,3 +338,9 @@ BEGIN IDS_COL_LOCATION "In Folder" IDS_COL_RELEVANCE "Relevance" END + +STRINGTABLE +BEGIN + IDS_PARSE_ADDR_ERR_TITLE "ReactOS Explorer" + IDS_PARSE_ADDR_ERR_TEXT "ReactOS Explorer cannot find '%1'. Check the spelling and try again." +END diff --git a/dll/win32/browseui/lang/ru-RU.rc b/dll/win32/browseui/lang/ru-RU.rc index fd74f6d4ca3..43a3bba5d95 100644 --- a/dll/win32/browseui/lang/ru-RU.rc +++ b/dll/win32/browseui/lang/ru-RU.rc @@ -345,3 +345,9 @@ BEGIN IDS_COL_LOCATION "В папке" IDS_COL_RELEVANCE "Релевантность" END + +STRINGTABLE +BEGIN + IDS_PARSE_ADDR_ERR_TITLE "ReactOS Explorer" + IDS_PARSE_ADDR_ERR_TEXT "ReactOS Explorer cannot find '%1'. Check the spelling and try again." +END diff --git a/dll/win32/browseui/lang/sq-AL.rc b/dll/win32/browseui/lang/sq-AL.rc index 2632c14206f..72e95e50d63 100644 --- a/dll/win32/browseui/lang/sq-AL.rc +++ b/dll/win32/browseui/lang/sq-AL.rc @@ -355,3 +355,9 @@ BEGIN IDS_COL_LOCATION "In Folder" IDS_COL_RELEVANCE "Relevance" END + +STRINGTABLE +BEGIN + IDS_PARSE_ADDR_ERR_TITLE "ReactOS Explorer" + IDS_PARSE_ADDR_ERR_TEXT "ReactOS Explorer cannot find '%1'. Check the spelling and try again." +END diff --git a/dll/win32/browseui/lang/tr-TR.rc b/dll/win32/browseui/lang/tr-TR.rc index 8f127e2e7cf..fa0a5958e11 100644 --- a/dll/win32/browseui/lang/tr-TR.rc +++ b/dll/win32/browseui/lang/tr-TR.rc @@ -338,3 +338,9 @@ BEGIN IDS_COL_LOCATION "In Folder" IDS_COL_RELEVANCE "Relevance" END + +STRINGTABLE +BEGIN + IDS_PARSE_ADDR_ERR_TITLE "ReactOS Explorer" + IDS_PARSE_ADDR_ERR_TEXT "ReactOS Explorer cannot find '%1'. Check the spelling and try again." +END diff --git a/dll/win32/browseui/lang/uk-UA.rc b/dll/win32/browseui/lang/uk-UA.rc index 8ef156403e1..c59893b9ab6 100644 --- a/dll/win32/browseui/lang/uk-UA.rc +++ b/dll/win32/browseui/lang/uk-UA.rc @@ -344,3 +344,9 @@ BEGIN IDS_COL_LOCATION "In Folder" IDS_COL_RELEVANCE "Relevance" END + +STRINGTABLE +BEGIN + IDS_PARSE_ADDR_ERR_TITLE "ReactOS Explorer" + IDS_PARSE_ADDR_ERR_TEXT "ReactOS Explorer cannot find '%1'. Check the spelling and try again." +END diff --git a/dll/win32/browseui/lang/zh-CN.rc b/dll/win32/browseui/lang/zh-CN.rc index 732ffa3acee..bce7c45022a 100644 --- a/dll/win32/browseui/lang/zh-CN.rc +++ b/dll/win32/browseui/lang/zh-CN.rc @@ -357,3 +357,9 @@ BEGIN IDS_COL_LOCATION "In Folder" IDS_COL_RELEVANCE "Relevance" END + +STRINGTABLE +BEGIN + IDS_PARSE_ADDR_ERR_TITLE "ReactOS Explorer" + IDS_PARSE_ADDR_ERR_TEXT "ReactOS Explorer cannot find '%1'. Check the spelling and try again." +END diff --git a/dll/win32/browseui/lang/zh-TW.rc b/dll/win32/browseui/lang/zh-TW.rc index 00bbfec1fa1..20539a6d6fc 100644 --- a/dll/win32/browseui/lang/zh-TW.rc +++ b/dll/win32/browseui/lang/zh-TW.rc @@ -357,3 +357,9 @@ BEGIN IDS_COL_LOCATION "In Folder" IDS_COL_RELEVANCE "Relevance" END + +STRINGTABLE +BEGIN + IDS_PARSE_ADDR_ERR_TITLE "ReactOS Explorer" + IDS_PARSE_ADDR_ERR_TEXT "ReactOS Explorer cannot find '%1'. Check the spelling and try again." +END diff --git a/dll/win32/browseui/resource.h b/dll/win32/browseui/resource.h index aba9e2fb8b0..84269b677db 100644 --- a/dll/win32/browseui/resource.h +++ b/dll/win32/browseui/resource.h @@ -173,3 +173,6 @@ #define IDS_SEARCH_FOLDER 9234 #define IDS_SEARCH_RESULTS 30520 #define IDS_SEARCH_OPEN_FOLDER 40960 + +#define IDS_PARSE_ADDR_ERR_TITLE 9600 +#define IDS_PARSE_ADDR_ERR_TEXT 9601

1 0

[reactos] 01/01: [BROWSEUI] Attempt to parse absolute path even if relative path gets an unexpected failure
by Charles Ambrye 20 Apr '20

20 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b8f4f22ba207aa3491044… commit b8f4f22ba207aa34910442c679b2196e8d23f417 Author: Charles Ambrye <giawa(a)hotmail.com> AuthorDate: Sat Apr 18 22:34:08 2020 -0700 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Mon Apr 20 14:12:47 2020 +0300 [BROWSEUI] Attempt to parse absolute path even if relative path gets an unexpected failure Some 'BindToObject' methods are incomplete, and in some cases relative paths are simply not possible (especially in special folders such as the desktop) --- dll/win32/browseui/addresseditbox.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dll/win32/browseui/addresseditbox.cpp b/dll/win32/browseui/addresseditbox.cpp index f5748ec6c80..5d96b896171 100644 --- a/dll/win32/browseui/addresseditbox.cpp +++ b/dll/win32/browseui/addresseditbox.cpp @@ -146,11 +146,11 @@ HRESULT STDMETHODCALLTYPE CAddressEditBox::ParseNow(long paramC) hr = pbs->GetPidl(&pidlCurrent); if (FAILED_UNEXPECTEDLY(hr)) - goto cleanup; + goto parseabsolute; hr = psfDesktop->BindToObject(pidlCurrent, NULL, IID_PPV_ARG(IShellFolder, &psfCurrent)); if (FAILED_UNEXPECTEDLY(hr)) - goto cleanup; + goto parseabsolute; hr = psfCurrent->ParseDisplayName(topLevelWindow, NULL, address, &eaten, &pidlRelative, &attributes); if (SUCCEEDED(hr)) @@ -160,6 +160,7 @@ HRESULT STDMETHODCALLTYPE CAddressEditBox::ParseNow(long paramC) goto cleanup; } +parseabsolute: /* We couldn't parse a relative path, attempt to parse an absolute path */ hr = psfDesktop->ParseDisplayName(topLevelWindow, NULL, address, &eaten, &pidlLastParsed, &attributes);

1 0

[reactos] 01/01: [SHELL32] CORE-16895 RC IDD_OPEN_WITH All langs
by Joachim Henze 20 Apr '20

20 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4af7888b29d072157fed4… commit 4af7888b29d072157fed46e0d221da238d5c5542 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Mon Apr 20 02:07:52 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Mon Apr 20 02:08:45 2020 +0200 [SHELL32] CORE-16895 RC IDD_OPEN_WITH All langs -Avoid text truncations regarding the checkbox in a uniform way -Reduce chance of text truncations for a button in a uniform way -Fix es-ES dlg layout and harmonize its dlg Size with other languages -de-DE fix double accelerator --- dll/win32/shell32/lang/bg-BG.rc | 4 ++-- dll/win32/shell32/lang/ca-ES.rc | 4 ++-- dll/win32/shell32/lang/cs-CZ.rc | 4 ++-- dll/win32/shell32/lang/da-DK.rc | 4 ++-- dll/win32/shell32/lang/de-DE.rc | 2 +- dll/win32/shell32/lang/el-GR.rc | 4 ++-- dll/win32/shell32/lang/en-GB.rc | 4 ++-- dll/win32/shell32/lang/en-US.rc | 4 ++-- dll/win32/shell32/lang/es-ES.rc | 16 ++++++++-------- dll/win32/shell32/lang/et-EE.rc | 4 ++-- dll/win32/shell32/lang/fi-FI.rc | 4 ++-- dll/win32/shell32/lang/fr-FR.rc | 4 ++-- dll/win32/shell32/lang/he-IL.rc | 4 ++-- dll/win32/shell32/lang/hi-IN.rc | 4 ++-- dll/win32/shell32/lang/hu-HU.rc | 4 ++-- dll/win32/shell32/lang/id-ID.rc | 4 ++-- dll/win32/shell32/lang/it-IT.rc | 4 ++-- dll/win32/shell32/lang/ja-JP.rc | 4 ++-- dll/win32/shell32/lang/ko-KR.rc | 4 ++-- dll/win32/shell32/lang/nl-NL.rc | 4 ++-- dll/win32/shell32/lang/no-NO.rc | 4 ++-- dll/win32/shell32/lang/pl-PL.rc | 4 ++-- dll/win32/shell32/lang/pt-BR.rc | 4 ++-- dll/win32/shell32/lang/pt-PT.rc | 4 ++-- dll/win32/shell32/lang/ro-RO.rc | 4 ++-- dll/win32/shell32/lang/ru-RU.rc | 4 ++-- dll/win32/shell32/lang/sk-SK.rc | 4 ++-- dll/win32/shell32/lang/sl-SI.rc | 4 ++-- dll/win32/shell32/lang/sq-AL.rc | 4 ++-- dll/win32/shell32/lang/sv-SE.rc | 4 ++-- dll/win32/shell32/lang/tr-TR.rc | 4 ++-- dll/win32/shell32/lang/uk-UA.rc | 4 ++-- dll/win32/shell32/lang/zh-CN.rc | 4 ++-- dll/win32/shell32/lang/zh-TW.rc | 4 ++-- 34 files changed, 73 insertions(+), 73 deletions(-) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index 7bc33d5fc78..7b9498ca7a3 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -401,8 +401,8 @@ BEGIN LTEXT "Файл: ", 14001, 44, 25, 188, 20 GROUPBOX "&Приложения", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "&Винаги избраното приложение да отваря този вид файлове.", 14003, 20, 193, 225, 10 - PUSHBUTTON "&Обзор...", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "&Винаги избраното приложение да отваря този вид файлове.", 14003, 16, 193, 232, 10 + PUSHBUTTON "&Обзор...", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "Добре", IDOK, 150, 236, 50, 14 PUSHBUTTON "Отказ", IDCANCEL, 206, 236, 50, 14 END diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 4167d8a8f6d..65209c7caca 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -400,8 +400,8 @@ BEGIN LTEXT "File: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programs", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 - PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 16, 193, 232, 10 + PUSHBUTTON "&Browse...", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 09cf6344baa..a07a6426de6 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -406,8 +406,8 @@ BEGIN LTEXT "Soubor: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programy", -1, 7, 42, 249, 187 CONTROL "Programy", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "&Vždy použít vybraný program k otevření tohoto typu souboru", 14003, 20, 193, 225, 10 - PUSHBUTTON "P&rocházet...", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "&Vždy použít vybraný program k otevření tohoto typu souboru", 14003, 16, 193, 232, 10 + PUSHBUTTON "P&rocházet...", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 PUSHBUTTON "Storno", IDCANCEL, 206, 236, 50, 14 END diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 9befbd14d7e..9b8f2e20cc5 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -406,8 +406,8 @@ BEGIN LTEXT "File: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programs", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 - PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 16, 193, 232, 10 + PUSHBUTTON "&Browse...", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 5221918721a..8c66c1a58d9 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -400,7 +400,7 @@ BEGIN LTEXT "Datei: ", 14001, 44, 30, 188, 10 GROUPBOX "&Programme", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "&Dateityp &immer mit dem ausgewählten Programm öffnen", 14003, 20, 193, 225, 10 + AUTOCHECKBOX "Dateityp &immer mit diesem Programm öffnen", 14003, 16, 193, 232, 10 PUSHBUTTON "&Durchsuchen...", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 PUSHBUTTON "Abbrechen", IDCANCEL, 206, 236, 50, 14 diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index 3301363aaa1..2fa2128c82c 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -400,8 +400,8 @@ BEGIN LTEXT "Αρχείο: %s", 14001, 44, 25, 188, 20 GROUPBOX "Προγράμματα", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - CHECKBOX "&Άνοιγμα αυτού του είδους αρχείου, πάντα με το επιλεγμένο πρόγραμμα", 14003, 20, 193, 225, 10 - PUSHBUTTON "&Αναζήτηση...", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "&Άνοιγμα αυτού του είδους αρχείου, πάντα με το επιλεγμένο πρόγραμμα", 14003, 16, 193, 232, 10 + PUSHBUTTON "&Αναζήτηση...", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 PUSHBUTTON "Άκυρο", IDCANCEL, 206, 236, 50, 14 END diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 2167c84a62c..973293b3417 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -400,8 +400,8 @@ BEGIN LTEXT "File: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programs", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 - PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 16, 193, 232, 10 + PUSHBUTTON "&Browse...", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index 78ff5669fc2..d1e460f00da 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -400,8 +400,8 @@ BEGIN LTEXT "File: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programs", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 - PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 16, 193, 232, 10 + PUSHBUTTON "&Browse...", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index 970db28466c..a8e68424439 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -399,20 +399,20 @@ BEGIN AUTOCHECKBOX "&Mostrar un cuadro de diálogo para confirmar la eliminación", 14004, 20, 155, 200, 10, WS_TABSTOP END -IDD_OPEN_WITH DIALOGEX 0, 0, 284, 256 +IDD_OPEN_WITH DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Abrir con" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 - LTEXT "Elija el programa que desea usar para abrir el siguiente archivo:", -1, 44, 12, 211, 10 - LTEXT "Archivo: ", 14001, 44, 25, 188, 20 - GROUPBOX "&Programas ", -1, 7, 42, 269, 187 + LTEXT "Elija el programa que desea usar para abrir el siguiente archivo:", -1, 44, 12, 211, 18 + LTEXT "Archivo: ", 14001, 44, 30, 188, 10 + GROUPBOX "&Programas ", -1, 7, 42, 249, 187 CONTROL "Programas", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "Utilizar &siempre el programa seleccionado para abrir este tipo de archivos", 14003, 15, 193, 250, 10 - PUSHBUTTON "&Examinar...", 14004, 218, 207, 50, 14 - DEFPUSHBUTTON "Aceptar", IDOK, 170, 236, 50, 14 - PUSHBUTTON "Cancelar", IDCANCEL, 226, 236, 50, 14 + AUTOCHECKBOX "&Siempre use el programa para abrir este tipo de archivos", 14003, 16, 193, 232, 10 + PUSHBUTTON "&Examinar...", 14004, 188, 207, 60, 14 + DEFPUSHBUTTON "Aceptar", IDOK, 150, 236, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 206, 236, 50, 14 END IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 294, 240 diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 48f9a1473fe..7444ec2800a 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -407,8 +407,8 @@ BEGIN LTEXT "Fail: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programmid", -1, 7, 42, 249, 187 CONTROL "Programmid", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "&Ava seda tüüpi fail alati valitud programmiga", 14003, 20, 193, 225, 10 - PUSHBUTTON "&Sirvi...", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "&Ava seda tüüpi fail alati valitud programmiga", 14003, 16, 193, 232, 10 + PUSHBUTTON "&Sirvi...", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 PUSHBUTTON "Loobu", IDCANCEL, 206, 236, 50, 14 END diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index b9cc306f45b..79fe458b524 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -400,8 +400,8 @@ BEGIN LTEXT "File: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programs", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 - PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 16, 193, 232, 10 + PUSHBUTTON "&Browse...", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 60b56f6034d..4c2c33ef4f9 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -400,8 +400,8 @@ BEGIN LTEXT "Fichier : ", 14001, 44, 25, 213, 20 GROUPBOX "&Programmes", -1, 7, 42, 249, 187 CONTROL "Programmes", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "Toujours utiliser le progr&amme sélectionné pour ouvrir ce type de fichier", 14003, 20, 193, 225, 10 - PUSHBUTTON "Parcourir...", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "Toujours utiliser ce progr&amme pour ouvrir ce type de fichier", 14003, 16, 193, 232, 10 + PUSHBUTTON "Parcourir...", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 PUSHBUTTON "Annuler", IDCANCEL, 206, 236, 50, 14 END diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 5f7744e7a71..cbdc37dee78 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -402,8 +402,8 @@ BEGIN LTEXT "קובץ: ", 14001, 44, 25, 188, 20 GROUPBOX "תוכניות:", -1, 7, 42, 249, 187 CONTROL "תוכניות", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 - PUSHBUTTON "&עיון...", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 16, 193, 232, 10 + PUSHBUTTON "&עיון...", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "אישור", IDOK, 150, 236, 50, 14 PUSHBUTTON "ביטול", IDCANCEL, 206, 236, 50, 14 END diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 917b1ede7bd..597e829bc65 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -400,8 +400,8 @@ BEGIN LTEXT "फ़ाइल: ", 14001, 44, 25, 188, 20 GROUPBOX "&प्रोग्राम", -1, 7, 42, 249, 187 CONTROL "प्रोग्राम", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "&इस तरह की फाइल खोलने के लिए हमेशा चयनित प्रोग्राम का उपयोग करें", 14003, 20, 193, 225, 10 - PUSHBUTTON "&ब्राउज...", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "&इस तरह की फाइल खोलने के लिए हमेशा चयनित प्रोग्राम का उपयोग करें", 14003, 16, 193, 232, 10 + PUSHBUTTON "&ब्राउज...", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "ठीक", IDOK, 150, 236, 50, 14 PUSHBUTTON "रद्द करें", IDCANCEL, 206, 236, 50, 14 END diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index da173cf231b..9d12d48f379 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -400,8 +400,8 @@ BEGIN LTEXT "Fájl: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programs", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 - PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 16, 193, 232, 10 + PUSHBUTTON "&Browse...", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 PUSHBUTTON "Mégse", IDCANCEL, 206, 236, 50, 14 END diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index 0ecee2741a0..b38d8e01c3c 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -400,8 +400,8 @@ BEGIN LTEXT "Berkas: ", 14001, 44, 25, 188, 20 GROUPBOX "&Program", -1, 7, 42, 249, 187 CONTROL "Program", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "&Selalu gunakan program terpilih untuk membuka berkas jenis ini", 14003, 20, 193, 225, 10 - PUSHBUTTON "&Jelajah...", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "&Selalu gunakan program terpilih untuk membuka berkas jenis ini", 14003, 16, 193, 232, 10 + PUSHBUTTON "&Jelajah...", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 PUSHBUTTON "Batal", IDCANCEL, 206, 236, 50, 14 END diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index a7c1f599af8..f0125ec857b 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -400,8 +400,8 @@ BEGIN LTEXT "File: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programmi", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "&Usare sempre il programma selezionato per aprire questo tipo di file", 14003, 20, 193, 225, 10 - PUSHBUTTON "&Sfoglia...", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "&Usare sempre questo programma per aprire questo tipo di file", 14003, 16, 193, 232, 10 + PUSHBUTTON "&Sfoglia...", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 PUSHBUTTON "Annulla", IDCANCEL, 206, 236, 50, 14 END diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index dd83042f0ac..93ed74f11f2 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -400,8 +400,8 @@ BEGIN LTEXT "ファイル: ", 14001, 44, 25, 188, 20 GROUPBOX "プログラムの一覧(&P)", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "この種類のファイルを開くときは、常に選択したプログラムを使用する(&A)", 14003, 20, 193, 225, 10 - PUSHBUTTON "参照(&B)...", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "この種類のファイルを開くときは、常に選択したプログラムを使用する(&A)", 14003, 16, 193, 232, 10 + PUSHBUTTON "参照(&B)...", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 PUSHBUTTON "キャンセル", IDCANCEL, 206, 236, 50, 14 END diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 9ca9f2036a1..d117d9f9af3 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -400,8 +400,8 @@ BEGIN LTEXT "File: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programs", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 - PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 16, 193, 232, 10 + PUSHBUTTON "&Browse...", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 6026a27262e..99406fe5461 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -400,8 +400,8 @@ BEGIN LTEXT "File: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programs", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 - PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 16, 193, 232, 10 + PUSHBUTTON "&Browse...", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index fe8f590c295..df3fd718dcb 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -400,8 +400,8 @@ BEGIN LTEXT "Fil: ", 14001, 44, 25, 188, 20 GROUPBOX "&Program", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "&Alltid bruk valgte program for å åpne denne filtypen", 14003, 20, 193, 225, 10 - PUSHBUTTON "&Utforsk...", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "&Alltid bruk valgte program for å åpne denne filtypen", 14003, 16, 193, 232, 10 + PUSHBUTTON "&Utforsk...", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 PUSHBUTTON "Avbryt", IDCANCEL, 206, 236, 50, 14 END diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 49a312bd851..893a071d465 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -406,8 +406,8 @@ BEGIN LTEXT "Plik: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programy", -1, 7, 42, 249, 187 CONTROL "Programy", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "&Zawsze używaj wybranego programu do otwierania tego typu plików", 14003, 20, 193, 175, 24, BS_MULTILINE - PUSHBUTTON "&Przeglądaj...", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "&Zawsze używaj wybranego programu do otwierania tego typu plików", 14003, 16, 193, 232, 10 + PUSHBUTTON "&Przeglądaj...", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 PUSHBUTTON "Anuluj", IDCANCEL, 206, 236, 50, 14 END diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 28adacfe02c..1a21f30d95c 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -400,8 +400,8 @@ BEGIN LTEXT "Arquivo: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programas", -1, 7, 42, 249, 187 CONTROL "Programas", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "&Sempre usar o programa selecionado para abrir este tipo de arquivo", 14003, 20, 193, 225, 10 - PUSHBUTTON "&Procurar...", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "&Sempre usar o programa selecionado para abrir este tipo de arquivo", 14003, 16, 193, 232, 10 + PUSHBUTTON "&Procurar...", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 PUSHBUTTON "Cancelar", IDCANCEL, 206, 236, 50, 14 END diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 1331e327ced..21de5d99294 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -400,8 +400,8 @@ BEGIN LTEXT "Ficheiro: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programas", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "&Utilizar sempre o programa seleccionado para abrir este tipo de ficheiros", 14003, 20, 193, 225, 10 - PUSHBUTTON "&Seleccionar...", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "Sempre &use este programa para abrir esse tipo de ficheiros", 14003, 16, 193, 232, 10 + PUSHBUTTON "&Seleccionar...", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 PUSHBUTTON "Cancelar", IDCANCEL, 206, 236, 50, 14 END diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 24410665742..731a2a061cd 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -402,8 +402,8 @@ BEGIN LTEXT "Fișier: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programe", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "&Utilizează întotdeauna această aplicație", 14003, 20, 198, 225, 10 - PUSHBUTTON "Spe&cificare…", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "&Utilizează întotdeauna această aplicație", 14003, 16, 193, 232, 10 + PUSHBUTTON "Spe&cificare…", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "Con&firmă", IDOK, 150, 236, 50, 14 PUSHBUTTON "A&nulează", IDCANCEL, 206, 236, 50, 14 END diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index f7faf465577..6a7bfdc1340 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -407,8 +407,8 @@ BEGIN LTEXT "Файл: ", 14001, 44, 25, 188, 20 GROUPBOX "Программы", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "&Использовать ее для всех файлов такого типа", 14003, 20, 193, 225, 10 - PUSHBUTTON "&Обзор...", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "&Использовать ее для всех файлов такого типа", 14003, 16, 193, 232, 10 + PUSHBUTTON "&Обзор...", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 PUSHBUTTON "Отмена", IDCANCEL, 206, 236, 50, 14 END diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index aff9d158905..1dbc9eba295 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -400,8 +400,8 @@ BEGIN LTEXT "Súbor: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programy", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "N&a otvorenie týchto súborov vždy použiť vybratý program", 14003, 20, 193, 225, 10 - PUSHBUTTON "&Prehľadávať...", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "N&a otvorenie týchto súborov vždy použiť vybratý program", 14003, 16, 193, 232, 10 + PUSHBUTTON "&Prehľadávať...", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 PUSHBUTTON "Zrušiť", IDCANCEL, 206, 236, 50, 14 END diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index d6885e37d45..7beee80d600 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -400,8 +400,8 @@ BEGIN LTEXT "File: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programs", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 - PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 16, 193, 232, 10 + PUSHBUTTON "&Browse...", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 END diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 478583fb52b..3739bcd0980 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -404,8 +404,8 @@ BEGIN LTEXT "Dokument: ", 14001, 44, 25, 188, 20 GROUPBOX "&Programe", -1, 7, 42, 249, 187 CONTROL "Programe", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "&Gjithmonë përdorni programin e përzgjedhur për të hapur këtë lloj dokumenti", 14003, 20, 193, 225, 10 - PUSHBUTTON "&Shfleto...", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "&Gjithmonë përdorni këtë program për të hapur këtë lloj dokumenti", 14003, 16, 193, 232, 10 + PUSHBUTTON "&Shfleto...", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 PUSHBUTTON "Anulo", IDCANCEL, 206, 236, 50, 14 END diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index 2b7c504f01c..c941da1710d 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -400,8 +400,8 @@ BEGIN LTEXT "Fil: ", 14001, 44, 25, 188, 20 GROUPBOX "&Program", -1, 7, 42, 249, 187 CONTROL "Program", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "&Använd alltid the valda programmet för att öppna den här filtypen", 14003, 20, 193, 225, 10 - PUSHBUTTON "&Bläddra...", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "&Använd alltid the valda programmet för att öppna den här filtypen", 14003, 16, 193, 232, 10 + PUSHBUTTON "&Bläddra...", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 PUSHBUTTON "Avbryt", IDCANCEL, 206, 236, 50, 14 END diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index c0f9667cab8..17e69da786f 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -402,8 +402,8 @@ BEGIN LTEXT "Kütük: ", 14001, 44, 25, 188, 20 GROUPBOX "&İzlenceler", -1, 7, 42, 249, 187 CONTROL "İzlenceler", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "&Kütüğün Bu Türünü Açmak İçin Tüm Zamanlarda Seçili İzlenceyi Kullan", 14003, 20, 193, 225, 10 - PUSHBUTTON "&Göz At...", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "&Kütüğün Bu Türünü Açmak İçin Tüm Zamanlarda Seçili İzlenceyi Kullan", 14003, 16, 193, 232, 10 + PUSHBUTTON "&Göz At...", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "Tamam", IDOK, 150, 236, 50, 14 PUSHBUTTON "İptal", IDCANCEL, 206, 236, 50, 14 END diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index aab6acea4b3..41ef406152b 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -400,8 +400,8 @@ BEGIN LTEXT "Файл: ", 14001, 44, 25, 188, 20 GROUPBOX "&Програми", -1, 7, 42, 249, 187 CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "Завжд&и використовувати цю програму для файлів цього типу", 14003, 20, 193, 225, 10 - PUSHBUTTON "О&гляд...", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "Завжд&и використовувати цю програму для файлів цього типу", 14003, 16, 193, 232, 10 + PUSHBUTTON "О&гляд...", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 PUSHBUTTON "Скасувати", IDCANCEL, 206, 236, 50, 14 END diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 17aa5ed74ac..8ff7eefa01a 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -410,8 +410,8 @@ BEGIN LTEXT "文件: ", 14001, 44, 25, 188, 20 GROUPBOX "程序(&P)", -1, 7, 42, 249, 187 CONTROL "程序", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "始终使用选择的程序打开这种文件(&A)", 14003, 20, 193, 225, 10 - PUSHBUTTON "浏览...(&B)", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "始终使用选择的程序打开这种文件(&A)", 14003, 16, 193, 232, 10 + PUSHBUTTON "浏览...(&B)", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "确定", IDOK, 150, 236, 50, 14 PUSHBUTTON "取消", IDCANCEL, 206, 236, 50, 14 END diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index 353756e8c96..35d8a2ce9f3 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -409,8 +409,8 @@ BEGIN LTEXT "檔案: ", 14001, 44, 25, 188, 20 GROUPBOX "程式(&P)", -1, 7, 42, 249, 187 CONTROL "程式", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "總是使用選定的城市開啟所選類型的檔案(&A)", 14003, 20, 193, 225, 10 - PUSHBUTTON "瀏覽(&B)...", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "總是使用選定的城市開啟所選類型的檔案(&A)", 14003, 16, 193, 232, 10 + PUSHBUTTON "瀏覽(&B)...", 14004, 188, 207, 60, 14 DEFPUSHBUTTON "確定", IDOK, 150, 236, 50, 14 PUSHBUTTON "取消", IDCANCEL, 206, 236, 50, 14 END

1 0

[reactos] 01/01: [Win32SS] Fix build
by James Tabor 19 Apr '20

19 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c6fbb8a5ed598306b4e0c… commit c6fbb8a5ed598306b4e0cf5340dd1d881b66445b Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Sun Apr 19 18:49:46 2020 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Sun Apr 19 18:49:46 2020 -0500 [Win32SS] Fix build --- win32ss/pch.h | 1 + 1 file changed, 1 insertion(+) diff --git a/win32ss/pch.h b/win32ss/pch.h index 48ffb8ca322..efc390df220 100644 --- a/win32ss/pch.h +++ b/win32ss/pch.h @@ -67,6 +67,7 @@ typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES; #define _NOCSECT_TYPE #include <ddrawi.h> #include <imm.h> +#include <dbt.h> /* SEH support with PSEH */ #include <pseh/pseh2.h>

1 0

[reactos] 01/01: [Win32SS] Fix Send and Post Parameters for WM_DEVICECHANGE
by James Tabor 19 Apr '20

19 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b9d6c5869d3a0cf4f0db3… commit b9d6c5869d3a0cf4f0db3c0e0c1928cee6c5fdaf Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Sun Apr 19 18:40:59 2020 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Sun Apr 19 18:40:59 2020 -0500 [Win32SS] Fix Send and Post Parameters for WM_DEVICECHANGE For CORE-16492. See CORE-7447. See https://source.winehq.org/git/wine.git/commitdiff/43197e6641591c4b2955f086d… --- win32ss/user/ntuser/message.c | 31 +++++++++++++++++++++++-------- win32ss/user/user32/windows/message.c | 17 +++++++++-------- 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/win32ss/user/ntuser/message.c b/win32ss/user/ntuser/message.c index 5c6a3fc66a4..79d68a184ea 100644 --- a/win32ss/user/ntuser/message.c +++ b/win32ss/user/ntuser/message.c @@ -96,10 +96,11 @@ static const unsigned int message_pointer_flags[] = }; /* check whether a given message type includes pointers */ -static inline int is_pointer_message( UINT message ) +static inline int is_pointer_message( UINT message, WPARAM wparam ) { if (message >= 8*sizeof(message_pointer_flags)) return FALSE; - return (message_pointer_flags[message / 32] & SET(message)) != 0; + if (message == WM_DEVICECHANGE && !(wparam & 0x8000)) return FALSE; + return (message_pointer_flags[message / 32] & SET(message)) != 0; } #undef SET @@ -139,6 +140,7 @@ static MSGMEMORY g_MsgMemory[] = { WM_DRAWITEM, sizeof(DRAWITEMSTRUCT), MMS_FLAG_READWRITE }, { WM_HELP, sizeof(HELPINFO), MMS_FLAG_READWRITE }, { WM_NEXTMENU, sizeof(MDINEXTMENU), MMS_FLAG_READWRITE }, + { WM_DEVICECHANGE, MMS_SIZE_SPECIAL, MMS_FLAG_READ }, }; static PMSGMEMORY FASTCALL @@ -220,6 +222,16 @@ MsgMemorySize(PMSGMEMORY MsgMemoryEntry, WPARAM wParam, LPARAM lParam) } break; + case WM_DEVICECHANGE: + { + if ( lParam && (wParam & 0x8000) ) + { + DEV_BROADCAST_HDR *header = (DEV_BROADCAST_HDR *)lParam; + Size = header->dbch_size; + } + } + break; + default: ASSERT(FALSE); Size = 0; @@ -1219,8 +1231,11 @@ co_IntGetPeekMessage( PMSG pMsg, bGMSG ); if (Present) { - /* GetMessage or PostMessage must never get messages that contain pointers */ - ASSERT(FindMsgMemory(pMsg->message) == NULL); + if ( pMsg->message != WM_DEVICECHANGE || (pMsg->wParam & 0x8000) ) + { + /* GetMessage or PostMessage must never get messages that contain pointers */ + ASSERT(FindMsgMemory(pMsg->message) == NULL); + } if ( pMsg->message >= WM_DDE_FIRST && pMsg->message <= WM_DDE_LAST ) { @@ -1298,7 +1313,7 @@ UserPostThreadMessage( PTHREADINFO pti, { MSG Message; - if (is_pointer_message(Msg)) + if (is_pointer_message(Msg, wParam)) { EngSetLastError(ERROR_MESSAGE_SYNC_ONLY ); return FALSE; @@ -1344,7 +1359,7 @@ UserPostMessage( HWND Wnd, Message.pt = gpsi->ptCursor; Message.time = EngGetTickCount32(); - if (is_pointer_message(Message.message)) + if (is_pointer_message(Message.message, Message.wParam)) { EngSetLastError(ERROR_MESSAGE_SYNC_ONLY ); return FALSE; @@ -2026,7 +2041,7 @@ UserSendNotifyMessage( HWND hWnd, { BOOL Ret = TRUE; - if (is_pointer_message(Msg)) + if (is_pointer_message(Msg, wParam)) { EngSetLastError(ERROR_MESSAGE_SYNC_ONLY ); return FALSE; @@ -2860,7 +2875,7 @@ NtUserMessageCall( HWND hWnd, } _SEH2_END; - if (is_pointer_message(Msg)) + if (is_pointer_message(Msg, wParam)) { EngSetLastError(ERROR_MESSAGE_SYNC_ONLY ); break; diff --git a/win32ss/user/user32/windows/message.c b/win32ss/user/user32/windows/message.c index 2f94caa5f2c..607ae7dda9b 100644 --- a/win32ss/user/user32/windows/message.c +++ b/win32ss/user/user32/windows/message.c @@ -95,10 +95,11 @@ static const unsigned int message_pointer_flags[] = }; /* check whether a given message type includes pointers */ -static inline int is_pointer_message( UINT message ) +static inline int is_pointer_message( UINT message, WPARAM wparam ) { if (message >= 8*sizeof(message_pointer_flags)) return FALSE; - return (message_pointer_flags[message / 32] & SET(message)) != 0; + if (message == WM_DEVICECHANGE && !(wparam & 0x8000)) return FALSE; + return (message_pointer_flags[message / 32] & SET(message)) != 0; } #undef SET @@ -1917,7 +1918,7 @@ DispatchMessageA(CONST MSG *lpmsg) else Wnd = NULL; - if (is_pointer_message(lpmsg->message)) + if (is_pointer_message(lpmsg->message, lpmsg->wParam)) { SetLastError( ERROR_MESSAGE_SYNC_ONLY ); return 0; @@ -2006,7 +2007,7 @@ DispatchMessageW(CONST MSG *lpmsg) else Wnd = NULL; - if (is_pointer_message(lpmsg->message)) + if (is_pointer_message(lpmsg->message, lpmsg->wParam)) { SetLastError( ERROR_MESSAGE_SYNC_ONLY ); return 0; @@ -2529,7 +2530,7 @@ SendMessageCallbackA( MSG AnsiMsg, UcMsg; CALL_BACK_INFO CallBackInfo; - if (is_pointer_message(Msg)) + if (is_pointer_message(Msg, wParam)) { SetLastError( ERROR_MESSAGE_SYNC_ONLY ); return FALSE; @@ -2579,7 +2580,7 @@ SendMessageCallbackW( { CALL_BACK_INFO CallBackInfo; - if (is_pointer_message(Msg)) + if (is_pointer_message(Msg, wParam)) { SetLastError( ERROR_MESSAGE_SYNC_ONLY ); return FALSE; @@ -2742,7 +2743,7 @@ SendNotifyMessageA( BOOL Ret; MSG AnsiMsg, UcMsg; - if (is_pointer_message(Msg)) + if (is_pointer_message(Msg, wParam)) { SetLastError( ERROR_MESSAGE_SYNC_ONLY ); return FALSE; @@ -2779,7 +2780,7 @@ SendNotifyMessageW( { LRESULT Result; - if (is_pointer_message(Msg)) + if (is_pointer_message(Msg, wParam)) { SetLastError( ERROR_MESSAGE_SYNC_ONLY ); 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