Ros-diffs August 2020

ros-diffs@reactos.org

27 participants
188 discussions

[reactos] 01/01: [SHELL32] Improve callbacking of CDefView (#3031)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ee231d00b955b2595ab4f… commit ee231d00b955b2595ab4fa3416e8d5bf440199a7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Aug 11 16:00:16 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Aug 11 16:00:16 2020 +0900 [SHELL32] Improve callbacking of CDefView (#3031) - Delete DefMessageSFVCB method. - Add some callbacking. --- dll/win32/shell32/CDefView.cpp | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 06d7c659f03..cb5dd140eb1 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -130,7 +130,6 @@ class CDefView : BOOL CreateList(); void UpdateListColors(); BOOL InitList(); - HRESULT DefMessageSFVCB(UINT uMsg, WPARAM wParam, LPARAM lParam); static INT CALLBACK ListViewCompareItems(LPARAM lParam1, LPARAM lParam2, LPARAM lpData); PCUITEMID_CHILD _PidlByItem(int i); @@ -397,6 +396,8 @@ CDefView::~CDefView() { TRACE(" destroying IShellView(%p)\n", this); + _DoFolderViewCB(SFVM_VIEWRELEASE, 0, 0); + if (m_viewinfo_data.hbmBack) { ::DeleteObject(m_viewinfo_data.hbmBack); @@ -537,7 +538,7 @@ BOOL CDefView::CreateList() dwStyle |= LVS_ALIGNTOP | LVS_SHOWSELALWAYS; ViewMode = m_FolderSettings.ViewMode; - hr = _DoFolderViewCB(SFVM_DEFVIEWMODE, NULL, (LPARAM)&ViewMode); + hr = _DoFolderViewCB(SFVM_DEFVIEWMODE, 0, (LPARAM)&ViewMode); if (SUCCEEDED(hr)) { if (ViewMode >= FVM_FIRST && ViewMode <= FVM_LAST) @@ -797,6 +798,9 @@ int CDefView::LV_AddItem(PCUITEMID_CHILD pidl) TRACE("(%p)(pidl=%p)\n", this, pidl); + if (_DoFolderViewCB(SFVM_ADDINGOBJECT, 0, (LPARAM)pidl) == S_FALSE) + return -1; + lvItem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM; /*set the mask*/ lvItem.iItem = m_ListView.GetItemCount(); /*add the item to the end of the list*/ lvItem.iSubItem = 0; @@ -1000,7 +1004,7 @@ HRESULT CDefView::FillList() m_ListView.InvalidateRect(NULL, TRUE); } - _DoFolderViewCB(SFVM_LISTREFRESHED, NULL, NULL); + _DoFolderViewCB(SFVM_LISTREFRESHED, 0, 0); return S_OK; } @@ -2416,6 +2420,8 @@ HRESULT WINAPI CDefView::Refresh() { TRACE("(%p)\n", this); + _DoFolderViewCB(SFVM_LISTREFRESHED, TRUE, 0); + m_ListView.DeleteAllItems(); FillList(); @@ -2466,6 +2472,7 @@ HRESULT WINAPI CDefView::DestroyViewWindow() if (m_hWnd) { + _DoFolderViewCB(SFVM_WINDOWCLOSING, (WPARAM)m_hWnd, 0); DestroyWindow(); } @@ -2888,7 +2895,7 @@ HRESULT STDMETHODCALLTYPE CDefView::CreateViewWindow3(IShellBrowser *psb, IShell if (!*hwnd) return E_FAIL; - _DoFolderViewCB(SFVM_WINDOWCREATED, (WPARAM)m_hWnd, NULL); + _DoFolderViewCB(SFVM_WINDOWCREATED, (WPARAM)m_hWnd, 0); SetWindowPos(HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW); UpdateWindow(); @@ -3541,14 +3548,6 @@ HRESULT CDefView::_MergeToolbar() return S_OK; } -// The default processing of IShellFolderView callbacks -HRESULT CDefView::DefMessageSFVCB(UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - // TODO: SFVM_GET_CUSTOMVIEWINFO, SFVM_WINDOWCREATED - TRACE("CDefView::DefMessageSFVCB uMsg=%u\n", uMsg); - return E_NOTIMPL; -} - HRESULT CDefView::_DoFolderViewCB(UINT uMsg, WPARAM wParam, LPARAM lParam) { HRESULT hr = E_NOTIMPL; @@ -3558,11 +3557,6 @@ HRESULT CDefView::_DoFolderViewCB(UINT uMsg, WPARAM wParam, LPARAM lParam) hr = m_pShellFolderViewCB->MessageSFVCB(uMsg, wParam, lParam); } - if (hr == E_NOTIMPL) - { - hr = DefMessageSFVCB(uMsg, wParam, lParam); - } - return hr; }

4 years, 2 months

[reactos] 01/01: [SHELL32] Optimize change notification (#3030)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f31905ecd4bbf2addf16… commit 1f31905ecd4bbf2addf1656331d3cf557ff54358 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 10 13:34:48 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Aug 10 13:34:48 2020 +0900 [SHELL32] Optimize change notification (#3030) - Keep the directory lists only. - Don't remember file sizes and normal file paths. CORE-13950 --- dll/win32/shell32/shelldesktop/CDirectoryList.cpp | 122 +++++++++++++ dll/win32/shell32/shelldesktop/CDirectoryList.h | 93 ++++++++++ .../shell32/shelldesktop/CDirectoryWatcher.cpp | 36 +--- dll/win32/shell32/shelldesktop/CDirectoryWatcher.h | 4 +- dll/win32/shell32/shelldesktop/CFilePathList.cpp | 192 --------------------- dll/win32/shell32/shelldesktop/CFilePathList.h | 108 ------------ dll/win32/shell32/shelldesktop/CMakeLists.txt | 2 +- 7 files changed, 227 insertions(+), 330 deletions(-) diff --git a/dll/win32/shell32/shelldesktop/CDirectoryList.cpp b/dll/win32/shell32/shelldesktop/CDirectoryList.cpp new file mode 100644 index 00000000000..eff446df467 --- /dev/null +++ b/dll/win32/shell32/shelldesktop/CDirectoryList.cpp @@ -0,0 +1,122 @@ +/* + * PROJECT: shell32 + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Shell change notification + * COPYRIGHT: Copyright 2020 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ +#include "shelldesktop.h" +#include "CDirectoryList.h" +#include <assert.h> // for assert + +WINE_DEFAULT_DEBUG_CHANNEL(shcn); + +BOOL CDirectoryList::ContainsPath(LPCWSTR pszPath) const +{ + assert(!PathIsRelativeW(pszPath)); + + for (INT i = 0; i < m_items.GetSize(); ++i) + { + if (m_items[i].IsEmpty()) + continue; + + if (m_items[i].EqualPath(pszPath)) + return TRUE; // matched + } + return FALSE; +} + +BOOL CDirectoryList::AddPath(LPCWSTR pszPath) +{ + assert(!PathIsRelativeW(pszPath)); + return m_items.Add(pszPath); +} + +BOOL CDirectoryList::RenamePath(LPCWSTR pszPath1, LPCWSTR pszPath2) +{ + assert(!PathIsRelativeW(pszPath1)); + assert(!PathIsRelativeW(pszPath2)); + + for (INT i = 0; i < m_items.GetSize(); ++i) + { + if (m_items[i].EqualPath(pszPath1)) + { + // matched + m_items[i].SetPath(pszPath2); + return TRUE; + } + } + return FALSE; +} + +BOOL CDirectoryList::DeletePath(LPCWSTR pszPath) +{ + assert(!PathIsRelativeW(pszPath)); + + for (INT i = 0; i < m_items.GetSize(); ++i) + { + if (m_items[i].EqualPath(pszPath)) + { + // matched + m_items[i].SetPath(NULL); + return TRUE; + } + } + return FALSE; +} + +BOOL CDirectoryList::AddPathsFromDirectory(LPCWSTR pszDirectoryPath) +{ + // get the full path + WCHAR szPath[MAX_PATH]; + lstrcpynW(szPath, pszDirectoryPath, _countof(szPath)); + assert(!PathIsRelativeW(szPath)); + + // is it a directory? + if (!PathIsDirectoryW(szPath)) + return FALSE; + + // add the path + if (!AddPath(szPath)) + return FALSE; + + // enumerate the file items to remember + PathAppendW(szPath, L"*"); + WIN32_FIND_DATAW find; + HANDLE hFind = FindFirstFileW(szPath, &find); + if (hFind == INVALID_HANDLE_VALUE) + { + ERR("FindFirstFileW failed\n"); + return FALSE; + } + + LPWSTR pch; + do + { + // ignore "." and ".." + pch = find.cFileName; + if (pch[0] == L'.' && (pch[1] == 0 || (pch[1] == L'.' && pch[2] == 0))) + continue; + + // build a path + PathRemoveFileSpecW(szPath); + if (lstrlenW(szPath) + lstrlenW(find.cFileName) + 1 > MAX_PATH) + { + ERR("szPath is too long\n"); + continue; + } + PathAppendW(szPath, find.cFileName); + + // add the path and do recurse + if (find.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + if (m_fRecursive) + AddPathsFromDirectory(szPath); + else + AddPath(szPath); + } + } while (FindNextFileW(hFind, &find)); + + FindClose(hFind); + + return TRUE; +} diff --git a/dll/win32/shell32/shelldesktop/CDirectoryList.h b/dll/win32/shell32/shelldesktop/CDirectoryList.h new file mode 100644 index 00000000000..1e9559c4b24 --- /dev/null +++ b/dll/win32/shell32/shelldesktop/CDirectoryList.h @@ -0,0 +1,93 @@ +#pragma once + +#include <atlsimpcoll.h> // for CSimpleArray + +////////////////////////////////////////////////////////////////////////////// + +// A pathname with info +class CDirectoryItem +{ +public: + CDirectoryItem() : m_pszPath(NULL) + { + } + + CDirectoryItem(LPCWSTR pszPath) + { + m_pszPath = _wcsdup(pszPath); + } + + CDirectoryItem(const CDirectoryItem& item) + : m_pszPath(_wcsdup(item.m_pszPath)) + { + } + + CDirectoryItem& operator=(const CDirectoryItem& item) + { + if (this != &item) + { + free(m_pszPath); + m_pszPath = _wcsdup(item.m_pszPath); + } + return *this; + } + + ~CDirectoryItem() + { + free(m_pszPath); + } + + BOOL IsEmpty() const + { + return m_pszPath == NULL; + } + + LPCWSTR GetPath() const + { + return m_pszPath; + } + + void SetPath(LPCWSTR pszPath) + { + free(m_pszPath); + m_pszPath = _wcsdup(pszPath); + } + + BOOL EqualPath(LPCWSTR pszPath) const + { + return m_pszPath != NULL && lstrcmpiW(m_pszPath, pszPath) == 0; + } + +protected: + LPWSTR m_pszPath; // A full path, malloc'ed +}; + +// the directory list +class CDirectoryList +{ +public: + CDirectoryList() : m_fRecursive(FALSE) + { + } + + CDirectoryList(LPCWSTR pszDirectoryPath, BOOL fRecursive) + : m_fRecursive(fRecursive) + { + AddPathsFromDirectory(pszDirectoryPath); + } + + BOOL ContainsPath(LPCWSTR pszPath) const; + BOOL AddPath(LPCWSTR pszPath); + BOOL AddPathsFromDirectory(LPCWSTR pszDirectoryPath); + BOOL RenamePath(LPCWSTR pszPath1, LPCWSTR pszPath2); + BOOL DeletePath(LPCWSTR pszPath); + + void RemoveAll() + { + m_items.RemoveAll(); + } + +protected: + BOOL m_fRecursive; + CSimpleArray<CDirectoryItem> m_items; +}; diff --git a/dll/win32/shell32/shelldesktop/CDirectoryWatcher.cpp b/dll/win32/shell32/shelldesktop/CDirectoryWatcher.cpp index d2ed1583558..9a206ac673a 100644 --- a/dll/win32/shell32/shelldesktop/CDirectoryWatcher.cpp +++ b/dll/win32/shell32/shelldesktop/CDirectoryWatcher.cpp @@ -71,7 +71,7 @@ static void NTAPI _RequestAllTerminationAPC(ULONG_PTR Parameter) CDirectoryWatcher::CDirectoryWatcher(LPCWSTR pszDirectoryPath, BOOL fSubTree) : m_fDead(FALSE) , m_fRecursive(fSubTree) - , m_file_list(pszDirectoryPath, fSubTree) + , m_dir_list(pszDirectoryPath, fSubTree) { TRACE("CDirectoryWatcher::CDirectoryWatcher: %p, '%S'\n", this, pszDirectoryPath); @@ -139,24 +139,6 @@ void CDirectoryWatcher::ProcessNotification() DWORD dwEvent, cbName; BOOL fDir; - // if the watch is recursive - if (m_fRecursive) - { - // get the first change - if (!m_file_list.GetFirstChange(szPath)) - return; - - // then, notify a SHCNE_UPDATEDIR - if (lstrcmpiW(m_szDirectoryPath, szPath) != 0) - PathRemoveFileSpecW(szPath); - NotifyFileSystemChange(SHCNE_UPDATEDIR, szPath, NULL); - - // refresh directory list - m_file_list.RemoveAll(); - m_file_list.AddPathsFromDirectory(m_szDirectoryPath, TRUE); - return; - } - // for each entry in s_buffer szPath[0] = szTempPath[0] = 0; for (;;) @@ -188,37 +170,37 @@ void CDirectoryWatcher::ProcessNotification() dwEvent = ConvertActionToEvent(pInfo->Action, fDir); // convert SHCNE_DELETE to SHCNE_RMDIR if the path is a directory - if (!fDir && (dwEvent == SHCNE_DELETE) && m_file_list.ContainsPath(szPath, TRUE)) + if (!fDir && (dwEvent == SHCNE_DELETE) && m_dir_list.ContainsPath(szPath)) { fDir = TRUE; dwEvent = SHCNE_RMDIR; } - // update m_file_list + // update m_dir_list switch (dwEvent) { case SHCNE_MKDIR: - if (!m_file_list.AddPath(szPath, 0, TRUE)) + if (!PathIsDirectoryW(szPath) || !m_dir_list.AddPath(szPath)) dwEvent = 0; break; case SHCNE_CREATE: - if (!m_file_list.AddPath(szPath, INVALID_FILE_SIZE, FALSE)) + if (!PathFileExistsW(szPath) || PathIsDirectoryW(szPath)) dwEvent = 0; break; case SHCNE_RENAMEFOLDER: - if (!m_file_list.RenamePath(szTempPath, szPath, TRUE)) + if (!PathIsDirectoryW(szPath) || !m_dir_list.RenamePath(szTempPath, szPath)) dwEvent = 0; break; case SHCNE_RENAMEITEM: - if (!m_file_list.RenamePath(szTempPath, szPath, FALSE)) + if (!PathFileExistsW(szPath) || PathIsDirectoryW(szPath)) dwEvent = 0; break; case SHCNE_RMDIR: - if (!m_file_list.DeletePath(szPath, TRUE)) + if (PathIsDirectoryW(szPath) || !m_dir_list.DeletePath(szPath)) dwEvent = 0; break; case SHCNE_DELETE: - if (!m_file_list.DeletePath(szPath, FALSE)) + if (PathFileExistsW(szPath)) dwEvent = 0; break; } diff --git a/dll/win32/shell32/shelldesktop/CDirectoryWatcher.h b/dll/win32/shell32/shelldesktop/CDirectoryWatcher.h index 667d5fac148..a8789b2fdf6 100644 --- a/dll/win32/shell32/shelldesktop/CDirectoryWatcher.h +++ b/dll/win32/shell32/shelldesktop/CDirectoryWatcher.h @@ -6,7 +6,7 @@ */ #pragma once -#include "CFilePathList.h" +#include "CDirectoryList.h" // NOTE: Regard to asynchronous procedure call (APC), please see: // https://docs.microsoft.com/en-us/windows/win32/api/synchapi/nf-synchapi-sle… @@ -31,7 +31,7 @@ public: protected: BOOL m_fDead; BOOL m_fRecursive; - CFilePathList m_file_list; + CDirectoryList m_dir_list; OVERLAPPED m_overlapped; BOOL CreateAPCThread(); diff --git a/dll/win32/shell32/shelldesktop/CFilePathList.cpp b/dll/win32/shell32/shelldesktop/CFilePathList.cpp deleted file mode 100644 index cb4d505a616..00000000000 --- a/dll/win32/shell32/shelldesktop/CFilePathList.cpp +++ /dev/null @@ -1,192 +0,0 @@ -/* - * PROJECT: shell32 - * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Shell change notification - * COPYRIGHT: Copyright 2020 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) - */ -#include "shelldesktop.h" -#include "CFilePathList.h" -#include <assert.h> // for assert - -WINE_DEFAULT_DEBUG_CHANNEL(shcn); - -BOOL CFilePathList::ContainsPath(LPCWSTR pszPath, BOOL fIsDirectory) const -{ - assert(!PathIsRelativeW(pszPath)); - - for (INT i = 0; i < m_items.GetSize(); ++i) - { - if (m_items[i].IsEmpty() || fIsDirectory != m_items[i].IsDirectory()) - continue; - - if (m_items[i].EqualPath(pszPath)) - return TRUE; // matched - } - return FALSE; -} - -static DWORD GetSizeOfFile(LPCWSTR pszPath) -{ - WIN32_FIND_DATAW find; - HANDLE hFind = FindFirstFileW(pszPath, &find); - if (hFind == INVALID_HANDLE_VALUE) - return FALSE; - FindClose(hFind); - return find.nFileSizeLow; -} - -BOOL CFilePathList::AddPath(LPCWSTR pszPath, DWORD dwFileSize, BOOL fIsDirectory) -{ - assert(!PathIsRelativeW(pszPath)); - - if (dwFileSize == INVALID_FILE_SIZE) - { - dwFileSize = GetSizeOfFile(pszPath); - } - - CFilePathItem item(pszPath, dwFileSize, fIsDirectory); - return m_items.Add(item); -} - -BOOL CFilePathList::RenamePath(LPCWSTR pszPath1, LPCWSTR pszPath2, BOOL fIsDirectory) -{ - assert(!PathIsRelativeW(pszPath1)); - assert(!PathIsRelativeW(pszPath2)); - - for (INT i = 0; i < m_items.GetSize(); ++i) - { - if (m_items[i].IsDirectory() == fIsDirectory && m_items[i].EqualPath(pszPath1)) - { - // matched - m_items[i].SetPath(pszPath2); - return TRUE; - } - } - return FALSE; -} - -BOOL CFilePathList::DeletePath(LPCWSTR pszPath, BOOL fIsDirectory) -{ - assert(!PathIsRelativeW(pszPath)); - - for (INT i = 0; i < m_items.GetSize(); ++i) - { - if (m_items[i].IsDirectory() == fIsDirectory && m_items[i].EqualPath(pszPath)) - { - // matched - m_items[i].SetPath(NULL); - return TRUE; - } - } - return FALSE; -} - -BOOL CFilePathList::AddPathsFromDirectory(LPCWSTR pszDirectoryPath, BOOL fRecursive) -{ - // get the full path - WCHAR szPath[MAX_PATH]; - lstrcpynW(szPath, pszDirectoryPath, _countof(szPath)); - assert(!PathIsRelativeW(szPath)); - - // is it a directory? - if (!PathIsDirectoryW(szPath)) - return FALSE; - - // add the path - if (!AddPath(szPath, 0, TRUE)) - return FALSE; - - // enumerate the file items to remember - PathAppendW(szPath, L"*"); - WIN32_FIND_DATAW find; - HANDLE hFind = FindFirstFileW(szPath, &find); - if (hFind == INVALID_HANDLE_VALUE) - { - ERR("FindFirstFileW failed\n"); - return FALSE; - } - - do - { - // ignore "." and ".." - if (lstrcmpW(find.cFileName, L".") == 0 || - lstrcmpW(find.cFileName, L"..") == 0) - { - continue; - } - - // build a path - PathRemoveFileSpecW(szPath); - if (lstrlenW(szPath) + lstrlenW(find.cFileName) + 1 > MAX_PATH) - { - ERR("szPath is too long\n"); - continue; - } - PathAppendW(szPath, find.cFileName); - - BOOL fIsDirectory = !!(find.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY); - - // add the path and do recurse - if (fRecursive && fIsDirectory) - AddPathsFromDirectory(szPath, fRecursive); - else - AddPath(szPath, find.nFileSizeLow, fIsDirectory); - } while (FindNextFileW(hFind, &find)); - - FindClose(hFind); - - return TRUE; -} - -BOOL CFilePathList::GetFirstChange(LPWSTR pszPath) const -{ - // validate paths - for (INT i = 0; i < m_items.GetSize(); ++i) - { - if (m_items[i].IsEmpty()) - continue; - - if (m_items[i].IsDirectory()) // item is a directory - { - if (!PathIsDirectoryW(m_items[i].GetPath())) - { - // mismatched - lstrcpynW(pszPath, m_items[i].GetPath(), MAX_PATH); - return TRUE; - } - } - else // item is a normal file - { - if (!PathFileExistsW(m_items[i].GetPath()) || - PathIsDirectoryW(m_items[i].GetPath())) - { - // mismatched - lstrcpynW(pszPath, m_items[i].GetPath(), MAX_PATH); - return TRUE; - } - } - } - - // check sizes - HANDLE hFind; - WIN32_FIND_DATAW find; - for (INT i = 0; i < m_items.GetSize(); ++i) - { - if (m_items[i].IsEmpty() || m_items[i].IsDirectory()) - continue; - - // get size - hFind = FindFirstFileW(m_items[i].GetPath(), &find); - FindClose(hFind); - - if (hFind == INVALID_HANDLE_VALUE || - find.nFileSizeLow != m_items[i].GetSize()) - { - // different size - lstrcpynW(pszPath, m_items[i].GetPath(), MAX_PATH); - return TRUE; - } - } - - return FALSE; -} diff --git a/dll/win32/shell32/shelldesktop/CFilePathList.h b/dll/win32/shell32/shelldesktop/CFilePathList.h deleted file mode 100644 index 815fdaba4a3..00000000000 --- a/dll/win32/shell32/shelldesktop/CFilePathList.h +++ /dev/null @@ -1,108 +0,0 @@ -#pragma once - -#include <atlsimpcoll.h> // for CSimpleArray - -////////////////////////////////////////////////////////////////////////////// - -// A pathname with info -class CFilePathItem -{ -public: - CFilePathItem() : m_pszPath(NULL) - { - } - - CFilePathItem(LPCWSTR pszPath, DWORD dwFileSize, BOOL IsDirectory) - { - m_pszPath = _wcsdup(pszPath); - m_dwFileSize = dwFileSize; - m_fIsDirectory = IsDirectory; - } - - CFilePathItem(const CFilePathItem& item) - : m_pszPath(_wcsdup(item.m_pszPath)) - , m_dwFileSize(item.m_dwFileSize) - , m_fIsDirectory(item.m_fIsDirectory) - { - } - - CFilePathItem& operator=(const CFilePathItem& item) - { - free(m_pszPath); - m_pszPath = _wcsdup(item.m_pszPath); - m_dwFileSize = item.m_dwFileSize; - m_fIsDirectory = item.m_fIsDirectory; - return *this; - } - - ~CFilePathItem() - { - free(m_pszPath); - } - - BOOL IsEmpty() const - { - return m_pszPath == NULL; - } - - BOOL IsDirectory() const - { - return m_fIsDirectory; - } - - LPCWSTR GetPath() const - { - return m_pszPath; - } - - void SetPath(LPCWSTR pszPath) - { - free(m_pszPath); - m_pszPath = _wcsdup(pszPath); - } - - BOOL EqualPath(LPCWSTR pszPath) const - { - return m_pszPath != NULL && lstrcmpiW(m_pszPath, pszPath) == 0; - } - - DWORD GetSize() const - { - return m_dwFileSize; - } - -protected: - LPWSTR m_pszPath; // A full path, malloc'ed - DWORD m_dwFileSize; // the size of a file - BOOL m_fIsDirectory; // is it a directory? -}; - -// the file list -class CFilePathList -{ -public: - CFilePathList() - { - } - - CFilePathList(LPCWSTR pszDirectoryPath, BOOL fRecursive) - { - AddPathsFromDirectory(pszDirectoryPath, fRecursive); - } - - BOOL ContainsPath(LPCWSTR pszPath, BOOL fIsDirectory) const; - BOOL GetFirstChange(LPWSTR pszPath) const; - - BOOL AddPath(LPCWSTR pszPath, DWORD dwFileSize, BOOL fIsDirectory); - BOOL AddPathsFromDirectory(LPCWSTR pszDirectoryPath, BOOL fRecursive); - BOOL RenamePath(LPCWSTR pszPath1, LPCWSTR pszPath2, BOOL fIsDirectory); - BOOL DeletePath(LPCWSTR pszPath, BOOL fIsDirectory); - - void RemoveAll() - { - m_items.RemoveAll(); - } - -protected: - CSimpleArray<CFilePathItem> m_items; -}; diff --git a/dll/win32/shell32/shelldesktop/CMakeLists.txt b/dll/win32/shell32/shelldesktop/CMakeLists.txt index 498eb70e024..2ea167b95f7 100644 --- a/dll/win32/shell32/shelldesktop/CMakeLists.txt +++ b/dll/win32/shell32/shelldesktop/CMakeLists.txt @@ -13,7 +13,7 @@ list(APPEND SOURCE CChangeNotifyServer.cpp CDesktopBrowser.cpp CDirectoryWatcher.cpp - CFilePathList.cpp + CDirectoryList.cpp dde.cpp) add_library(shelldesktop ${SOURCE})

4 years, 2 months

[reactos] 01/01: [EXPLORER] Improve CTrayWindow::OnCopyData (#3028)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1c400705618b64475afb7… commit 1c400705618b64475afb71fd70b1abce8a5effa4 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 10 07:15:21 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Aug 10 07:15:21 2020 +0900 [EXPLORER] Improve CTrayWindow::OnCopyData (#3028) Check pCopyData->dwData value. Don't send message needlessly. CORE-7237 --- base/shell/explorer/syspager.cpp | 7 ------- base/shell/explorer/traywnd.cpp | 15 +++++++++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp index 8d507c5be60..7e61b00a042 100644 --- a/base/shell/explorer/syspager.cpp +++ b/base/shell/explorer/syspager.cpp @@ -1531,8 +1531,6 @@ LRESULT CSysPagerWnd::OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHa return 0; } -LRESULT appbar_message( COPYDATASTRUCT* cds ); - LRESULT CSysPagerWnd::OnCopyData(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { PCOPYDATASTRUCT cpData = (PCOPYDATASTRUCT)lParam; @@ -1543,11 +1541,6 @@ LRESULT CSysPagerWnd::OnCopyData(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& if (pData->dwSignature == NI_NOTIFY_SIG) return NotifyIcon(pData->dwMessage, &pData->nid); } - else if (cpData->dwData == TABDMC_APPBAR) - { - FIXME("Taskbar Tray Application Bar\n"); - return appbar_message( cpData ); - } else if (cpData->dwData == TABDMC_LOADINPROC) { FIXME("Taskbar Load In Proc\n"); diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index b27a4689fee..2e081329d19 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -23,6 +23,7 @@ #include <commoncontrols.h> HRESULT TrayWindowCtxMenuCreator(ITrayWindow * TrayWnd, IN HWND hWndOwner, IContextMenu ** ppCtxMenu); +LRESULT appbar_message(COPYDATASTRUCT* cds); #define WM_APP_TRAYDESTROY (WM_APP + 0x100) @@ -2197,7 +2198,6 @@ ChangePos: return m_ContextMenu->GetCommandString(idCmd, uType, pwReserved, pszName, cchMax); } - /********************************************************** * ##### message handling ##### */ @@ -2341,9 +2341,16 @@ ChangePos: LRESULT OnCopyData(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - if (m_TrayNotify) - ::SendMessageW(m_TrayNotify, uMsg, wParam, lParam); - return TRUE; + COPYDATASTRUCT *pCopyData = reinterpret_cast<COPYDATASTRUCT *>(lParam); + switch (pCopyData->dwData) + { + case TABDMC_APPBAR: + return appbar_message(pCopyData); + case TABDMC_NOTIFY: + case TABDMC_LOADINPROC: + return ::SendMessageW(m_TrayNotify, uMsg, wParam, lParam); + } + return FALSE; } LRESULT OnNcPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)

4 years, 2 months

[reactos] 01/01: [IMM32] Stub ImmRegisterClient CORE-16479 (#3009)

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d682f9b05a0f590e4723… commit 8d682f9b05a0f590e4723d3eca1b7d4e57b7d1ee Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Sun Aug 9 16:49:00 2020 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 9 22:49:00 2020 +0900 [IMM32] Stub ImmRegisterClient CORE-16479 (#3009) Add a stub for ImmRegisterClient function in imm32.dll. CORE-16479 --- dll/win32/imm32/imm.c | 13 ++++++++++++- dll/win32/imm32/imm32.spec | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index afa504c4c91..a493202a6aa 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -3207,8 +3207,8 @@ BOOL WINAPI ImmDisableLegacyIME(void) FIXME("stub\n"); return TRUE; } -#ifdef __REACTOS__ +#ifdef __REACTOS__ /*********************************************************************** * ImmSetActiveContext(IMM32.@) */ @@ -3231,4 +3231,15 @@ BOOL WINAPI ImmSetActiveContextConsoleIME(HWND hwnd, BOOL fFlag) return ImmSetActiveContext(hwnd, hIMC, fFlag); return FALSE; } + +/*********************************************************************** +* ImmRegisterClient(IMM32.@) +* ( Undocumented, called from user32.dll ) +*/ +BOOL WINAPI ImmRegisterClient(PVOID ptr, /* FIXME: should point to SHAREDINFO structure */ + HINSTANCE hMod) +{ + FIXME("Stub\n"); + return TRUE; +} #endif diff --git a/dll/win32/imm32/imm32.spec b/dll/win32/imm32/imm32.spec index bfd54c3e579..1d6a8174ca3 100644 --- a/dll/win32/imm32/imm32.spec +++ b/dll/win32/imm32/imm32.spec @@ -77,7 +77,7 @@ @ stdcall ImmProcessKey(long long long long long) @ stub ImmPutImeMenuItemsIntoMappedFile @ stdcall ImmReSizeIMCC(long long) -@ stub ImmRegisterClient +@ stdcall ImmRegisterClient(ptr ptr) @ stdcall ImmRegisterWordA(long str long str) @ stdcall ImmRegisterWordW(long wstr long wstr) @ stdcall ImmReleaseContext(long long)

4 years, 2 months

[reactos] 01/01: [IMM32] Add ImmShowSoftKeyboard and ImmDestroySoftKeyboard (#3027)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2705abfb077a1826385be… commit 2705abfb077a1826385be5a2e080a84afa77c085 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 9 22:42:17 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 9 22:42:17 2020 +0900 [IMM32] Add ImmShowSoftKeyboard and ImmDestroySoftKeyboard (#3027) CORE-11700 --- dll/win32/imm32/imm.c | 18 ++++++++++++++++-- dll/win32/imm32/imm32.spec | 4 ++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 5b8468283dc..afa504c4c91 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -2676,9 +2676,14 @@ HWND WINAPI ImmCreateSoftKeyboard(UINT uType, UINT hOwner, int x, int y) */ BOOL WINAPI ImmDestroySoftKeyboard(HWND hSoftWnd) { +#ifdef __REACTOS__ + TRACE("(%p)\n", hSoftWnd); + return DestroyWindow(hSoftWnd); +#else FIXME("(%p): stub\n", hSoftWnd); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; +#endif } /*********************************************************************** @@ -2686,8 +2691,14 @@ BOOL WINAPI ImmDestroySoftKeyboard(HWND hSoftWnd) */ BOOL WINAPI ImmShowSoftKeyboard(HWND hSoftWnd, int nCmdShow) { +#ifdef __REACTOS__ + TRACE("(%p, %d)\n", hSoftWnd, nCmdShow); + if (hSoftWnd) + return ShowWindow(hSoftWnd, nCmdShow); +#else FIXME("(%p, %d): stub\n", hSoftWnd, nCmdShow); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); +#endif return FALSE; } @@ -3203,7 +3214,7 @@ BOOL WINAPI ImmDisableLegacyIME(void) */ BOOL WINAPI ImmSetActiveContext(HWND hwnd, HIMC hIMC, BOOL fFlag) { - FIXME("stub\n"); + FIXME("(%p, %p, %d): stub\n", hwnd, hIMC, fFlag); return FALSE; } @@ -3212,7 +3223,10 @@ BOOL WINAPI ImmSetActiveContext(HWND hwnd, HIMC hIMC, BOOL fFlag) */ BOOL WINAPI ImmSetActiveContextConsoleIME(HWND hwnd, BOOL fFlag) { - HIMC hIMC = ImmGetContext(hwnd); + HIMC hIMC; + TRACE("(%p, %d)\n", hwnd, fFlag); + + hIMC = ImmGetContext(hwnd); if (hIMC) return ImmSetActiveContext(hwnd, hIMC, fFlag); return FALSE; diff --git a/dll/win32/imm32/imm32.spec b/dll/win32/imm32/imm32.spec index 84ddfaca1f7..bfd54c3e579 100644 --- a/dll/win32/imm32/imm32.spec +++ b/dll/win32/imm32/imm32.spec @@ -8,7 +8,7 @@ @ stdcall ImmCreateSoftKeyboard(long long long long) @ stdcall ImmDestroyContext(long) @ stdcall ImmDestroyIMCC(long) -@ stdcall ImmDestroySoftKeyboard(long) +@ stdcall ImmDestroySoftKeyboard(ptr) @ stdcall ImmDisableIME(long) @ stdcall ImmDisableIme(long) ImmDisableIME @ stdcall ImmDisableLegacyIME() @@ -98,7 +98,7 @@ #@ stdcall ImmSetHotKey(long long long ptr) user32.CliImmSetHotKey @ stdcall ImmSetOpenStatus(long long) @ stdcall ImmSetStatusWindowPos(long ptr) -@ stdcall ImmShowSoftKeyboard(long long) +@ stdcall ImmShowSoftKeyboard(ptr long) @ stdcall ImmSimulateHotKey(long long) @ stub ImmSystemHandler @ stdcall ImmTranslateMessage(long long long long)

4 years, 2 months

[reactos] 01/01: [IMM32][NTUSER] Implement ImmGetHotKey (#3025)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ec9d277d59a2bb966de7e… commit ec9d277d59a2bb966de7ed7003502aecf0a3db3f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 9 22:41:11 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 9 22:41:11 2020 +0900 [IMM32][NTUSER] Implement ImmGetHotKey (#3025) CORE-11700 - Implement imm32!ImmGetHotKey function. - Modify NtUserGetImeHotKey function. - Add LPHKL typedef into <imm.h> header. --- dll/win32/imm32/CMakeLists.txt | 2 +- dll/win32/imm32/imm.c | 22 ++++++++++++++++++++++ sdk/include/psdk/imm.h | 3 +++ win32ss/include/ntuser.h | 12 +++++------- win32ss/user/ntuser/ime.c | 15 ++++++--------- 5 files changed, 37 insertions(+), 17 deletions(-) diff --git a/dll/win32/imm32/CMakeLists.txt b/dll/win32/imm32/CMakeLists.txt index 01eec2a490c..10c1a6e3708 100644 --- a/dll/win32/imm32/CMakeLists.txt +++ b/dll/win32/imm32/CMakeLists.txt @@ -14,6 +14,6 @@ list(APPEND SOURCE add_library(imm32 MODULE ${SOURCE} version.rc) set_module_type(imm32 win32dll) -target_link_libraries(imm32 wine) +target_link_libraries(imm32 wine win32ksys) add_importlibs(imm32 advapi32 user32 msvcrt kernel32 ntdll) add_cd_file(TARGET imm32 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index cfa7d6dea39..5b8468283dc 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -22,6 +22,9 @@ #include <stdarg.h> #include <stdio.h> +#ifdef __REACTOS__ +#define WIN32_NO_STATUS +#endif #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -33,6 +36,11 @@ #include "winnls.h" #include "winreg.h" #include "wine/list.h" +#ifdef __REACTOS__ +#include <ndk/umtypes.h> +#include <ndk/pstypes.h> +#include "../../../win32ss/include/ntuser.h" +#endif WINE_DEFAULT_DEBUG_CHANNEL(imm); @@ -3160,11 +3168,25 @@ BOOL WINAPI ImmEnumInputContext(DWORD idThread, IMCENUMPROC lpfn, LPARAM lParam) * ImmGetHotKey(IMM32.@) */ +#ifdef __REACTOS__ +BOOL WINAPI +ImmGetHotKey(IN DWORD dwHotKey, + OUT LPUINT lpuModifiers, + OUT LPUINT lpuVKey, + OUT LPHKL lphKL) +{ + TRACE("%lx, %p, %p, %p\n", dwHotKey, lpuModifiers, lpuVKey, lphKL); + if (lpuModifiers && lpuVKey) + return NtUserGetImeHotKey(dwHotKey, lpuModifiers, lpuVKey, lphKL); + return FALSE; +} +#else BOOL WINAPI ImmGetHotKey(DWORD hotkey, UINT *modifiers, UINT *key, HKL hkl) { FIXME("%x, %p, %p, %p: stub\n", hotkey, modifiers, key, hkl); return FALSE; } +#endif /*********************************************************************** * ImmDisableLegacyIME(IMM32.@) diff --git a/sdk/include/psdk/imm.h b/sdk/include/psdk/imm.h index 8b4cbb655ca..e856648c170 100644 --- a/sdk/include/psdk/imm.h +++ b/sdk/include/psdk/imm.h @@ -27,6 +27,9 @@ extern "C" { typedef HANDLE HIMC; typedef HANDLE HIMCC; +#ifdef __REACTOS__ +typedef HKL *LPHKL; +#endif typedef struct tagREGISTERWORDA { LPSTR lpReading; diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index 9485f574487..15e0e995922 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -2278,13 +2278,11 @@ NtUserGetIconSize( LONG *plcx, LONG *plcy); -DWORD -NTAPI -NtUserGetImeHotKey( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3); +BOOL NTAPI +NtUserGetImeHotKey(IN DWORD dwHotKey, + OUT LPUINT lpuModifiers, + OUT LPUINT lpuVKey, + OUT LPHKL lphKL); DWORD NTAPI diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index c2da55549d9..c910738e9f6 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -36,18 +36,15 @@ IntImmProcessKey(PUSER_MESSAGE_QUEUE MessageQueue, PWND pWnd, UINT Msg, WPARAM w return 0; } - -DWORD -APIENTRY -NtUserGetImeHotKey( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3) +BOOL WINAPI +NtUserGetImeHotKey(IN DWORD dwHotKey, + OUT LPUINT lpuModifiers, + OUT LPUINT lpuVKey, + OUT LPHKL lphKL) { STUB - return 0; + return FALSE; } DWORD

4 years, 2 months

[reactos] 01/01: [SHELL32_APITEST] Improve DoAction8 of SHChangeNotify testcase

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1d8c567996f75e226eee7… commit 1d8c567996f75e226eee78d0a31fdad5d0dc49ab Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 9 11:07:55 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Aug 9 11:07:55 2020 +0900 [SHELL32_APITEST] Improve DoAction8 of SHChangeNotify testcase CORE-13950 --- modules/rostests/apitests/shell32/SHChangeNotify.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/shell32/SHChangeNotify.cpp b/modules/rostests/apitests/shell32/SHChangeNotify.cpp index b800eaab328..229a221037e 100644 --- a/modules/rostests/apitests/shell32/SHChangeNotify.cpp +++ b/modules/rostests/apitests/shell32/SHChangeNotify.cpp @@ -85,7 +85,8 @@ DoAction7(void) static void DoAction8(void) { - ok_int(RemoveDirectoryW(s_dir1), TRUE); + BOOL ret = RemoveDirectoryW(s_dir1); + ok(ret, "RemoveDirectoryW failed. GetLastError() == %ld\n", GetLastError()); } static const TEST_ENTRY s_TestEntriesMode0[] =

4 years, 2 months

[reactos] 01/01: [SYSSETUP] Fix Russian translation (#3017)

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=357db6d191d59fd47fe33… commit 357db6d191d59fd47fe33785a13b3c222518f1a3 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Aug 8 14:32:10 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Aug 8 14:32:10 2020 +0300 [SYSSETUP] Fix Russian translation (#3017) Addendum to 75a0787. --- dll/win32/syssetup/lang/ru-RU.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/syssetup/lang/ru-RU.rc b/dll/win32/syssetup/lang/ru-RU.rc index 7f16f0684e8..96fc1a15171 100644 --- a/dll/win32/syssetup/lang/ru-RU.rc +++ b/dll/win32/syssetup/lang/ru-RU.rc @@ -250,6 +250,6 @@ BEGIN IDS_PRODUCTSERVERNAME "Сервер ReactOS" IDS_PRODUCTWORKSTATIONNAME "Рабочая станция ReactOS" IDS_PRODUCTSERVERINFO "Система будет распознаваться как сервер. Приватные папки ""Мои Изображения"", ""Мои видеозаписи"" и ""Моя музыка"" не будут зависеть от папки ""Мои документы""." - IDS_PRODUCTWORKSTATIONINFO "Система будет распознаваться как рабочая станция. Приватные папки ""Мои изображения"", ""Мои видеозаписи"" и ""Моя музыка"" будут находится в папке ""Мои документы""." + IDS_PRODUCTWORKSTATIONINFO "Система будет распознаваться как рабочая станция. Приватные папки ""Мои изображения"", ""Мои видеозаписи"" и ""Моя музыка"" будут находиться в папке ""Мои документы""." IDS_DEFAULT "(по умолчанию)" END

4 years, 2 months

[reactos] 01/01: [ZIPFLDR] Add some bitmap resources CORE-17092 (#2875)

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a1108f6155a73e22ee9aa… commit a1108f6155a73e22ee9aa74c2f0ae0eea3cfb6c6 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Sat Aug 8 08:13:54 2020 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 8 14:13:54 2020 +0900 [ZIPFLDR] Add some bitmap resources CORE-17092 (#2875) Add some bitmap images to our zipfldr shell extenson. MS version of this has them, but our one currently hasn't. And I think without bitmaps the wizard dialogs look a bit incompleted. I made them similar to MS bitmaps. They have exactly the same size (height x width), but looks differently, in ReactOS Tango style. CORE-17092 --- dll/shellext/zipfldr/CZipExtract.cpp | 2 ++ dll/shellext/zipfldr/lang/de-DE.rc | 26 ++++++++++++++------------ dll/shellext/zipfldr/lang/en-US.rc | 26 ++++++++++++++------------ dll/shellext/zipfldr/lang/et-EE.rc | 26 ++++++++++++++------------ dll/shellext/zipfldr/lang/fr-FR.rc | 26 ++++++++++++++------------ dll/shellext/zipfldr/lang/hi-IN.rc | 26 ++++++++++++++------------ dll/shellext/zipfldr/lang/it-IT.rc | 26 ++++++++++++++------------ dll/shellext/zipfldr/lang/ja-JP.rc | 26 ++++++++++++++------------ dll/shellext/zipfldr/lang/pl-PL.rc | 26 ++++++++++++++------------ dll/shellext/zipfldr/lang/ro-RO.rc | 26 ++++++++++++++------------ dll/shellext/zipfldr/lang/ru-RU.rc | 26 ++++++++++++++------------ dll/shellext/zipfldr/lang/sv-SE.rc | 26 ++++++++++++++------------ dll/shellext/zipfldr/lang/zh-CN.rc | 26 ++++++++++++++------------ dll/shellext/zipfldr/res/header.bmp | Bin 0 -> 7306 bytes dll/shellext/zipfldr/res/watermark.bmp | Bin 0 -> 309030 bytes dll/shellext/zipfldr/res/zipfldr.bmp | Bin 0 -> 79254 bytes dll/shellext/zipfldr/resource.h | 5 +++++ dll/shellext/zipfldr/zipfldr.rc | 3 +++ 18 files changed, 178 insertions(+), 144 deletions(-) diff --git a/dll/shellext/zipfldr/CZipExtract.cpp b/dll/shellext/zipfldr/CZipExtract.cpp index 883bce731aa..f9dd21d9b0e 100644 --- a/dll/shellext/zipfldr/CZipExtract.cpp +++ b/dll/shellext/zipfldr/CZipExtract.cpp @@ -338,6 +338,8 @@ public: psh.phpage = hpsp; psh.nPages = _countof(hpsp); + psh.pszbmWatermark = MAKEINTRESOURCE(IDB_WATERMARK); + psh.pszbmHeader = MAKEINTRESOURCE(IDB_HEADER); PropertySheetW(&psh); } diff --git a/dll/shellext/zipfldr/lang/de-DE.rc b/dll/shellext/zipfldr/lang/de-DE.rc index 7ea7f29fc27..b5b6f0be9bc 100644 --- a/dll/shellext/zipfldr/lang/de-DE.rc +++ b/dll/shellext/zipfldr/lang/de-DE.rc @@ -7,28 +7,30 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 260, 156 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ziel auswählen" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN - LTEXT "Wählen Sie ein Ziel zum Extahieren der Dateien.",IDC_STATIC,6,12,174,8 - EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL - PUSHBUTTON "Durchsuchen...",IDC_BROWSE,174,42,54,14 - PUSHBUTTON "Kennwort",IDC_PASSWORD,174,66,54,14 - LTEXT "Klicken Sie auf 'Weiter' um zu extrahieren",IDC_STATUSTEXT,6,114,150,8 - CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 + LTEXT "Wählen Sie ein Ziel zum Extahieren der Dateien.",IDC_STATIC,86,12,157,8 + EDITTEXT IDC_DIRECTORY,86,24,157,12,ES_AUTOHSCROLL + PUSHBUTTON "Durchsuchen...",IDC_BROWSE,189,42,54,14 + PUSHBUTTON "Kennwort",IDC_PASSWORD,189,66,54,14 + LTEXT "Klicken Sie auf 'Weiter' um zu extrahieren",IDC_STATUSTEXT,86,114,150,8 + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,86,126,157,6 + CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END -IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 260, 156 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Extrahieren abgeschlossen" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN - LTEXT "Die Dateien wurden in das folgende Verzeichnis extrahiert:",IDC_STATIC,6,12,222,18 - LTEXT "Zielverzeichnis",IDC_DESTDIR,6,36,222,8 - CONTROL "Extrahierte Dateien anzeigen",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,66,105,10 - LTEXT "Klicken Sie auf 'Fertig' um fortzufahren.",IDC_STATIC,6,84,174,8 + LTEXT "Die Dateien wurden in das folgende Verzeichnis extrahiert:",IDC_STATIC,86,12,157,18 + LTEXT "Zielverzeichnis",IDC_DESTDIR,86,36,157,8 + CONTROL "Extrahierte Dateien anzeigen",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,66,105,10 + LTEXT "Klicken Sie auf 'Fertig' um fortzufahren.",IDC_STATIC,86,84,134,8 + CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 273, 56 diff --git a/dll/shellext/zipfldr/lang/en-US.rc b/dll/shellext/zipfldr/lang/en-US.rc index 04f25b2659c..7de141c771f 100644 --- a/dll/shellext/zipfldr/lang/en-US.rc +++ b/dll/shellext/zipfldr/lang/en-US.rc @@ -7,28 +7,30 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 260, 156 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Select a Destination" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN - LTEXT "Select the destination directory",IDC_STATIC,6,12,174,8 - EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL - PUSHBUTTON "Browse...",IDC_BROWSE,174,42,54,14 - PUSHBUTTON "Password",IDC_PASSWORD,174,66,54,14 - LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,6,114,100,8 - CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 + LTEXT "Select the destination directory",IDC_STATIC,86,12,189,8 + EDITTEXT IDC_DIRECTORY,6,24,157,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_BROWSE,189,42,54,14 + PUSHBUTTON "Password",IDC_PASSWORD,189,66,54,14 + LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,86,114,80,8 + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,86,126,157,6 + CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END -IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 260, 156 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Extraction Complete" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN - LTEXT "The files have been extracted to the following directory:",IDC_STATIC,6,12,222,18 - LTEXT "Target dir",IDC_DESTDIR,6,36,222,8 - CONTROL "Show extracted files",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,66,81,10 - LTEXT "Press finish to continue.",IDC_STATIC,6,84,174,8 + LTEXT "The files have been extracted to the following directory:",IDC_STATIC,86,12,157,18 + LTEXT "Target dir",IDC_DESTDIR,86,36,157,8 + CONTROL "Show extracted files",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,66,81,10 + LTEXT "Press finish to continue.",IDC_STATIC,86,84,89,8 + CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 273, 56 diff --git a/dll/shellext/zipfldr/lang/et-EE.rc b/dll/shellext/zipfldr/lang/et-EE.rc index 7904bc15e3b..aad04a0f6e2 100644 --- a/dll/shellext/zipfldr/lang/et-EE.rc +++ b/dll/shellext/zipfldr/lang/et-EE.rc @@ -7,28 +7,30 @@ LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT -IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 260, 156 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Vali sihtkoht" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN - LTEXT "Vali sihtkoha kaust",IDC_STATIC,6,12,174,8 - EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL - PUSHBUTTON "Sirvi...",IDC_BROWSE,174,42,54,14 - PUSHBUTTON "Parool",IDC_PASSWORD,174,66,54,14 - LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,6,114,100,8 - CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 + LTEXT "Vali sihtkoha kaust",IDC_STATIC,86,12,154,8 + EDITTEXT IDC_DIRECTORY,86,24,157,12,ES_AUTOHSCROLL + PUSHBUTTON "Sirvi...",IDC_BROWSE,189,42,54,14 + PUSHBUTTON "Parool",IDC_PASSWORD,189,66,54,14 + LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,86,114,80,8 + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,86,126,157,6 + CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END -IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 260, 156 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ekstraktimine valmis" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN - LTEXT "Failid on ekstraktitud kausta:",IDC_STATIC,6,12,222,18 - LTEXT "Sihtkoha kataloog",IDC_DESTDIR,6,36,222,8 - CONTROL "Näita ekstraktitud faile",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,66,81,10 - LTEXT "Vajuta lõpeta jätkamiseks.",IDC_STATIC,6,84,174,8 + LTEXT "Failid on ekstraktitud kausta:",IDC_STATIC,86,12,157,18 + LTEXT "Sihtkoha kataloog",IDC_DESTDIR,86,36,157,8 + CONTROL "Näita ekstraktitud faile",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,66,81,10 + LTEXT "Vajuta lõpeta jätkamiseks.",IDC_STATIC,86,84,94,8 + CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 273, 56 diff --git a/dll/shellext/zipfldr/lang/fr-FR.rc b/dll/shellext/zipfldr/lang/fr-FR.rc index 777d6cbb788..a96579efa80 100644 --- a/dll/shellext/zipfldr/lang/fr-FR.rc +++ b/dll/shellext/zipfldr/lang/fr-FR.rc @@ -7,28 +7,30 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 260, 156 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Choisissez une destination" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN - LTEXT "Choisissez le répertoire de destination",IDC_STATIC,6,12,174,8 - EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL - PUSHBUTTON "Parcourir...",IDC_BROWSE,174,42,54,14 - PUSHBUTTON "Mot de passe",IDC_PASSWORD,174,66,54,14 - LTEXT "Appuyez sur 'Suivant' pour extraire",IDC_STATUSTEXT,6,114,150,8 - CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 + LTEXT "Choisissez le répertoire de destination",IDC_STATIC,86,12,154,8 + EDITTEXT IDC_DIRECTORY,86,24,157,12,ES_AUTOHSCROLL + PUSHBUTTON "Parcourir...",IDC_BROWSE,189,42,54,14 + PUSHBUTTON "Mot de passe",IDC_PASSWORD,189,66,54,14 + LTEXT "Appuyez sur 'Suivant' pour extraire",IDC_STATUSTEXT,86,114,120,8 + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,86,126,157,6 + CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END -IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 260, 156 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Extraction complète" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN - LTEXT "Les fichiers ont été extraits dans le répertoire :",IDC_STATIC,6,12,222,18 - LTEXT "Répertoire cible",IDC_DESTDIR,6,36,222,8 - CONTROL "Montrer les fichiers extraits",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,66,174,10 - LTEXT "Cliquer sur Terminer pour continuer.",IDC_STATIC,6,84,174,8 + LTEXT "Les fichiers ont été extraits dans le répertoire :",IDC_STATIC,86,12,157,18 + LTEXT "Répertoire cible",IDC_DESTDIR,86,36,157,8 + CONTROL "Montrer les fichiers extraits",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,66,154,10 + LTEXT "Cliquer sur Terminer pour continuer.",IDC_STATIC,86,84,154,8 + CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 273, 56 diff --git a/dll/shellext/zipfldr/lang/hi-IN.rc b/dll/shellext/zipfldr/lang/hi-IN.rc index cf2b6b8b19e..0abba87c418 100644 --- a/dll/shellext/zipfldr/lang/hi-IN.rc +++ b/dll/shellext/zipfldr/lang/hi-IN.rc @@ -7,28 +7,30 @@ LANGUAGE LANG_HINDI, SUBLANG_HINDI_INDIA -IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 260, 156 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "एक गंतव्य चुनें" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN - LTEXT "गंतव्य डाइरेक्टरी का चयन करें",IDC_STATIC,6,12,174,8 - EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL - PUSHBUTTON "ब्राउज...",IDC_BROWSE,174,42,54,14 - PUSHBUTTON "पासवर्ड",IDC_PASSWORD,174,66,54,14 - LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,6,114,100,8 - CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 + LTEXT "गंतव्य डाइरेक्टरी का चयन करें",IDC_STATIC,86,12,154,8 + EDITTEXT IDC_DIRECTORY,86,24,157,12,ES_AUTOHSCROLL + PUSHBUTTON "ब्राउज...",IDC_BROWSE,189,42,54,14 + PUSHBUTTON "पासवर्ड",IDC_PASSWORD,189,66,54,14 + LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,86,114,100,8 + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,86,126,157,6 + CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END -IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 260, 156 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Extraction Complete" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN - LTEXT "फाइलें निम्न निर्देशिका में निकाली गई हैं:",IDC_STATIC,6,12,222,18 - LTEXT "लक्ष्य दिर",IDC_DESTDIR,6,36,222,8 - CONTROL "निकाले गए फ़ाइल दिखाएं",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,66,81,10 - LTEXT "जारी रखने के लिए समाप्त दबाएं।",IDC_STATIC,6,84,174,8 + LTEXT "फाइलें निम्न निर्देशिका में निकाली गई हैं:",IDC_STATIC,86,12,157,23 + LTEXT "लक्ष्य दिर",IDC_DESTDIR,86,36,157,8 + CONTROL "निकाले गए फ़ाइल दिखाएं",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,66,81,10 + LTEXT "जारी रखने के लिए समाप्त दबाएं।",IDC_STATIC,86,84,169,8 + CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 273, 56 diff --git a/dll/shellext/zipfldr/lang/it-IT.rc b/dll/shellext/zipfldr/lang/it-IT.rc index 00b66381340..7c684273275 100644 --- a/dll/shellext/zipfldr/lang/it-IT.rc +++ b/dll/shellext/zipfldr/lang/it-IT.rc @@ -7,28 +7,30 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL -IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 260, 156 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Seleziona una Destinazione" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN - LTEXT "Seleziona la cartella di destinazione",IDC_STATIC,6,12,174,8 - EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL - PUSHBUTTON "Sfoglia...",IDC_BROWSE,174,42,54,14 - PUSHBUTTON "Password",IDC_PASSWORD,174,66,54,14 - LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,6,114,100,8 - CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 + LTEXT "Seleziona la cartella di destinazione",IDC_STATIC,86,12,154,8 + EDITTEXT IDC_DIRECTORY,86,24,157,12,ES_AUTOHSCROLL + PUSHBUTTON "Sfoglia...",IDC_BROWSE,154,42,54,14 + PUSHBUTTON "Password",IDC_PASSWORD,154,66,54,14 + LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,86,114,80,8 + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,86,126,157,6 + CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END -IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 260, 156 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Estrazione Completa" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN - LTEXT "I file sono stati estratti nella seguente cartella:",IDC_STATIC,6,12,222,18 - LTEXT "Cartella destinazione",IDC_DESTDIR,6,36,222,8 - CONTROL "Mostra i file estratti",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,66,81,10 - LTEXT "Premi Fine per continuare.",IDC_STATIC,6,84,174,8 + LTEXT "I file sono stati estratti nella seguente cartella:",IDC_STATIC,86,12,157,18 + LTEXT "Cartella destinazione",IDC_DESTDIR,86,36,157,8 + CONTROL "Mostra i file estratti",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,66,81,10 + LTEXT "Premi Fine per continuare.",IDC_STATIC,86,84,84,8 + CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 273, 56 diff --git a/dll/shellext/zipfldr/lang/ja-JP.rc b/dll/shellext/zipfldr/lang/ja-JP.rc index 843f294b160..9e6008f6f6f 100644 --- a/dll/shellext/zipfldr/lang/ja-JP.rc +++ b/dll/shellext/zipfldr/lang/ja-JP.rc @@ -7,28 +7,30 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 260, 156 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "展開先を選んで下さい" FONT 9, "MS UI Gothic", 400, 0, 0x0 BEGIN - LTEXT "展開先のディレクトリを選んで下さい",IDC_STATIC,6,12,174,8 - EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL - PUSHBUTTON "参照...",IDC_BROWSE,174,42,54,14 - PUSHBUTTON "パスワード",IDC_PASSWORD,174,66,54,14 - LTEXT "展開するには '次へ' をクリック",IDC_STATUSTEXT,6,114,100,8 - CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 + LTEXT "展開先のディレクトリを選んで下さい",IDC_STATIC,86,12,144,8 + EDITTEXT IDC_DIRECTORY,86,24,157,12,ES_AUTOHSCROLL + PUSHBUTTON "参照...",IDC_BROWSE,189,42,54,14 + PUSHBUTTON "パスワード",IDC_PASSWORD,189,66,54,14 + LTEXT "展開するには '次へ' をクリック",IDC_STATUSTEXT,86,114,80,8 + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,86,126,157,6 + CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END -IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 260, 156 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "展開完了" FONT 9, "MS UI Gothic", 400, 0, 0x0 BEGIN - LTEXT "ファイルは次のディレクトリに展開されました:",IDC_STATIC,6,12,222,18 - LTEXT "ターゲット",IDC_DESTDIR,6,36,222,8 - CONTROL "展開したファイルを表示",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,66,81,10 - LTEXT "完了をクリックして下さい。",IDC_STATIC,6,84,174,8 + LTEXT "ファイルは次のディレクトリに展開されました:",IDC_STATIC,86,12,157,18 + LTEXT "ターゲット",IDC_DESTDIR,86,36,157,8 + CONTROL "展開したファイルを表示",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,66,81,10 + LTEXT "完了をクリックして下さい。",IDC_STATIC,86,84,84,8 + CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 273, 56 diff --git a/dll/shellext/zipfldr/lang/pl-PL.rc b/dll/shellext/zipfldr/lang/pl-PL.rc index f89e018bdd5..c8278a18cb1 100644 --- a/dll/shellext/zipfldr/lang/pl-PL.rc +++ b/dll/shellext/zipfldr/lang/pl-PL.rc @@ -8,28 +8,30 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 260, 156 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Wybierz miejsce docelowe" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN - LTEXT "Wybierz katalog docelowy:",IDC_STATIC,6,12,174,8 - EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL - PUSHBUTTON "Przeglądaj...",IDC_BROWSE,174,42,54,14 - PUSHBUTTON "Hasło",IDC_PASSWORD,174,66,54,14 - LTEXT "Kliknij przycisk Dalej, aby wypakować.",IDC_STATUSTEXT,6,114,124,8 - CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 + LTEXT "Wybierz katalog docelowy:",IDC_STATIC,86,12,154,8 + EDITTEXT IDC_DIRECTORY,86,24,157,12,ES_AUTOHSCROLL + PUSHBUTTON "Przeglądaj...",IDC_BROWSE,189,42,54,14 + PUSHBUTTON "Hasło",IDC_PASSWORD,189,66,54,14 + LTEXT "Kliknij przycisk Dalej, aby wypakować.",IDC_STATUSTEXT,86,114,124,8 + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,86,126,157,6 + CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END -IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 260, 156 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Wyodrębnianie zakończone" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN - LTEXT "Pliki zostały pomyślnie wyodrębnione do następującego katalogu:",IDC_STATIC,6,12,222,18 - LTEXT "Ścieżka docelowa",IDC_DESTDIR,6,36,222,8 - CONTROL "Pokaż wyodrębnione pliki",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,66,121,10 - LTEXT "Aby kontynuować, kliknij przycisk Zakończ.",IDC_STATIC,6,84,174,8 + LTEXT "Pliki zostały pomyślnie wyodrębnione do następującego katalogu:",IDC_STATIC,86,12,157,18 + LTEXT "Ścieżka docelowa",IDC_DESTDIR,86,36,157,8 + CONTROL "Pokaż wyodrębnione pliki",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,66,101,10 + LTEXT "Aby kontynuować, kliknij przycisk Zakończ.",IDC_STATIC,86,84,154,8 + CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 273, 56 diff --git a/dll/shellext/zipfldr/lang/ro-RO.rc b/dll/shellext/zipfldr/lang/ro-RO.rc index 288544be28d..a363e2eadcf 100644 --- a/dll/shellext/zipfldr/lang/ro-RO.rc +++ b/dll/shellext/zipfldr/lang/ro-RO.rc @@ -7,28 +7,30 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL -IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 260, 156 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Selectați o Destinație" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN - LTEXT "Selectați folderul de destinație",IDC_STATIC,6,12,174,8 - EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL - PUSHBUTTON "Răsfoiți...",IDC_BROWSE,174,42,54,14 - PUSHBUTTON "Parolă",IDC_PASSWORD,174,66,54,14 - LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,6,114,100,8 - CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 + LTEXT "Selectați folderul de destinație",IDC_STATIC,86,12,154,8 + EDITTEXT IDC_DIRECTORY,86,24,157,12,ES_AUTOHSCROLL + PUSHBUTTON "Răsfoiți...",IDC_BROWSE,189,42,54,14 + PUSHBUTTON "Parolă",IDC_PASSWORD,189,66,54,14 + LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,86,84,100,8 + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,86,126,157,6 + CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END -IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 260, 156 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Extragere Completă" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN - LTEXT "Fișierele au fost extrase în folderul respectiv:",IDC_STATIC,6,12,222,18 - LTEXT "Ținta folder",IDC_DESTDIR,6,36,222,8 - CONTROL "Afișează fișierele extrase",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,66,81,10 - LTEXT "Apăsați Termină pentru a continua.",IDC_STATIC,6,84,174,8 + LTEXT "Fișierele au fost extrase în folderul respectiv:",IDC_STATIC,86,12,157,18 + LTEXT "Ținta folder",IDC_DESTDIR,86,36,157,8 + CONTROL "Afișează fișierele extrase",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,66,81,10 + LTEXT "Apăsați Termină pentru a continua.",IDC_STATIC,86,84,124,8 + CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 273, 56 diff --git a/dll/shellext/zipfldr/lang/ru-RU.rc b/dll/shellext/zipfldr/lang/ru-RU.rc index 6d79b44ac21..7dd47924b20 100644 --- a/dll/shellext/zipfldr/lang/ru-RU.rc +++ b/dll/shellext/zipfldr/lang/ru-RU.rc @@ -7,28 +7,30 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 260, 156 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Укажите путь" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN - LTEXT "Выберите путь для извлечения",IDC_STATIC,6,12,174,8 - EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL - PUSHBUTTON "Обзор...",IDC_BROWSE,174,42,54,14 - PUSHBUTTON "Пароль",IDC_PASSWORD,174,66,54,14 - LTEXT "Нажмите ""Далее"" для извлечения",IDC_STATUSTEXT,6,114,118,8 - CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 + LTEXT "Выберите путь для извлечения",IDC_STATIC,86,12,154,8 + EDITTEXT IDC_DIRECTORY,86,24,157,12,ES_AUTOHSCROLL + PUSHBUTTON "Обзор...",IDC_BROWSE,189,42,54,14 + PUSHBUTTON "Пароль",IDC_PASSWORD,189,66,54,14 + LTEXT "Нажмите ""Далее"" для извлечения",IDC_STATUSTEXT,86,114,118,8 + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,86,126,157,6 + CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END -IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 260, 156 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Извлечение завершено" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN - LTEXT "Все файлы были извлечены в следующую директорию:",IDC_STATIC,6,12,222,18 - LTEXT "Целевой путь",IDC_DESTDIR,6,36,222,8 - CONTROL "Показать извлечённые файлы",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,66,118,10 - LTEXT "Нажмите ""Готово"" чтобы продолжить.",IDC_STATIC,6,84,174,8 + LTEXT "Все файлы были извлечены в следующую директорию:",IDC_STATIC,86,12,157,18 + LTEXT "Целевой путь",IDC_DESTDIR,86,36,157,8 + CONTROL "Показать извлечённые файлы",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,66,118,10 + LTEXT "Нажмите ""Готово"" чтобы продолжить.",IDC_STATIC,86,84,144,8 + CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 273, 56 diff --git a/dll/shellext/zipfldr/lang/sv-SE.rc b/dll/shellext/zipfldr/lang/sv-SE.rc index 217cb66dbb9..ff7706da85a 100644 --- a/dll/shellext/zipfldr/lang/sv-SE.rc +++ b/dll/shellext/zipfldr/lang/sv-SE.rc @@ -7,28 +7,30 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL -IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 260, 156 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Välj ett mål" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN - LTEXT "Välj målkatalog",IDC_STATIC,6,12,174,8 - EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL - PUSHBUTTON "Bläddra...",IDC_BROWSE,174,42,54,14 - PUSHBUTTON "Lösenord",IDC_PASSWORD,174,66,54,14 - LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,6,114,100,8 - CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 + LTEXT "Välj målkatalog",IDC_STATIC,86,12,154,8 + EDITTEXT IDC_DIRECTORY,86,24,157,12,ES_AUTOHSCROLL + PUSHBUTTON "Bläddra...",IDC_BROWSE,189,42,54,14 + PUSHBUTTON "Lösenord",IDC_PASSWORD,189,66,54,14 + LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,86,114,80,8 + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,86,126,157,6 + CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END -IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 260, 156 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Extraheringen är slutförd" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN - LTEXT "Filerna har extraherats till följande katalog:",IDC_STATIC,6,12,222,18 - LTEXT "Målkatalog",IDC_DESTDIR,6,36,222,8 - CONTROL "Visa extraherade filer",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,66,81,10 - LTEXT "Tryck på slutför för att fortsätta.",IDC_STATIC,6,84,174,8 + LTEXT "Filerna har extraherats till följande katalog:",IDC_STATIC,86,12,157,18 + LTEXT "Målkatalog",IDC_DESTDIR,86,36,157,8 + CONTROL "Visa extraherade filer",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,66,81,10 + LTEXT "Tryck på slutför för att fortsätta.",IDC_STATIC,86,84,109,8 + CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 273, 56 diff --git a/dll/shellext/zipfldr/lang/zh-CN.rc b/dll/shellext/zipfldr/lang/zh-CN.rc index d4439bfa99f..710f3acef62 100644 --- a/dll/shellext/zipfldr/lang/zh-CN.rc +++ b/dll/shellext/zipfldr/lang/zh-CN.rc @@ -7,28 +7,30 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED -IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 260, 156 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "选择目标文件夹" FONT 9, "宋体", 400, 0, 0x0 BEGIN - LTEXT "选择目标文件夹",IDC_STATIC,6,12,174,8 - EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL - PUSHBUTTON "浏览...",IDC_BROWSE,174,42,54,14 - PUSHBUTTON "密码",IDC_PASSWORD,174,66,54,14 - LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,6,114,100,8 - CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 + LTEXT "选择目标文件夹",IDC_STATIC,86,12,154,8 + EDITTEXT IDC_DIRECTORY,86,24,157,12,ES_AUTOHSCROLL + PUSHBUTTON "浏览...",IDC_BROWSE,189,42,54,14 + PUSHBUTTON "密码",IDC_PASSWORD,189,66,54,14 + LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,86,114,80,8 + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,86,126,157,6 + CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END -IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 260, 156 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "解压完成" FONT 9, "宋体", 400, 0, 0x0 BEGIN - LTEXT "文件已经被解压至下列目录：",IDC_STATIC,6,12,222,18 - LTEXT "目标文件夹",IDC_DESTDIR,6,36,222,8 - CONTROL "显示被解压文件",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,66,81,10 - LTEXT "点击完成以继续。",IDC_STATIC,6,84,174,8 + LTEXT "文件已经被解压至下列目录：",IDC_STATIC,86,12,157,18 + LTEXT "目标文件夹",IDC_DESTDIR,86,36,157,8 + CONTROL "显示被解压文件",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,66,81,10 + LTEXT "点击完成以继续。",IDC_STATIC,86,84,84,8 + CONTROL IDB_ZIPFLDR,-1,"STATIC",SS_BITMAP | WS_CHILD | WS_VISIBLE,0,0,78,138 END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 273, 56 diff --git a/dll/shellext/zipfldr/res/header.bmp b/dll/shellext/zipfldr/res/header.bmp new file mode 100644 index 00000000000..4b7763a24e5 Binary files /dev/null and b/dll/shellext/zipfldr/res/header.bmp differ diff --git a/dll/shellext/zipfldr/res/watermark.bmp b/dll/shellext/zipfldr/res/watermark.bmp new file mode 100644 index 00000000000..fdae5e9ed5b Binary files /dev/null and b/dll/shellext/zipfldr/res/watermark.bmp differ diff --git a/dll/shellext/zipfldr/res/zipfldr.bmp b/dll/shellext/zipfldr/res/zipfldr.bmp new file mode 100644 index 00000000000..b2cbda5ff0d Binary files /dev/null and b/dll/shellext/zipfldr/res/zipfldr.bmp differ diff --git a/dll/shellext/zipfldr/resource.h b/dll/shellext/zipfldr/resource.h index 056c726e0f0..f2f453afdee 100644 --- a/dll/shellext/zipfldr/resource.h +++ b/dll/shellext/zipfldr/resource.h @@ -1,5 +1,10 @@ #pragma once +/* Bitmaps */ +#define IDB_ZIPFLDR 164 +#define IDB_HEADER 200 +#define IDB_WATERMARK 201 + /* registry stuff */ #define IDR_ZIPFLDR 8000 diff --git a/dll/shellext/zipfldr/zipfldr.rc b/dll/shellext/zipfldr/zipfldr.rc index 18e1440409f..5d58aa00993 100644 --- a/dll/shellext/zipfldr/zipfldr.rc +++ b/dll/shellext/zipfldr/zipfldr.rc @@ -3,6 +3,9 @@ #include "resource.h" +164 BITMAP "res/zipfldr.bmp" +200 BITMAP "res/header.bmp" +201 BITMAP "res/watermark.bmp" 1 ICON "res/zipfldr.ico" #define REACTOS_VERSION_DLL

4 years, 2 months

[reactos] 01/01: [NTUSER] Fix stack memory disclosure in NtUserBuildPropList (#3023)

by Nguyen Trung Khanh

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ff50b0db2e64d472353ed… commit ff50b0db2e64d472353edc3b924a1e1542998aa8 Author: Nguyen Trung Khanh <nguyentrungkhanh97(a)gmail.com> AuthorDate: Sat Aug 8 12:05:22 2020 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 8 14:05:22 2020 +0900 [NTUSER] Fix stack memory disclosure in NtUserBuildPropList (#3023) Fix structure alignment cause to stack memory disclosure in NtUserBuildPropList. --- win32ss/user/ntuser/prop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/prop.c b/win32ss/user/ntuser/prop.c index e325ed45cfa..038f909d80d 100644 --- a/win32ss/user/ntuser/prop.c +++ b/win32ss/user/ntuser/prop.c @@ -143,7 +143,7 @@ NtUserBuildPropList( PWND Window; PPROPERTY Property; PLIST_ENTRY ListEntry; - PROPLISTITEM listitem, *li; + PROPLISTITEM listitem = { 0 }, *li; NTSTATUS Status; DWORD Cnt = 0;

4 years, 2 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 August 2020