Ros-diffs August 2020

ros-diffs@reactos.org

27 participants
188 discussions

[reactos] 01/01: [RTL] Allow RtlGetNextRange to be called on a finished iterator. CORE-6372

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2fb2f1e4c57b453a8a67b… commit 2fb2f1e4c57b453a8a67b4a54ad72533acf0a8b1 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Aug 16 16:18:25 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Aug 16 16:18:29 2020 +0200 [RTL] Allow RtlGetNextRange to be called on a finished iterator. CORE-6372 Fixes crash in kmtest:RtlRangeList. --- sdk/lib/rtl/rangelist.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sdk/lib/rtl/rangelist.c b/sdk/lib/rtl/rangelist.c index ab2de3e0369..e589d43812a 100644 --- a/sdk/lib/rtl/rangelist.c +++ b/sdk/lib/rtl/rangelist.c @@ -499,6 +499,12 @@ RtlGetNextRange(IN OUT PRTL_RANGE_LIST_ITERATOR Iterator, if (Iterator->Stamp != RangeList->Stamp) return STATUS_INVALID_PARAMETER; + if (Iterator->Current == NULL) + { + *Range = NULL; + return STATUS_NO_MORE_ENTRIES; + } + if (MoveForwards) { Next = ((PRTL_RANGE_ENTRY)Iterator->Current)->Entry.Flink; @@ -509,7 +515,11 @@ RtlGetNextRange(IN OUT PRTL_RANGE_LIST_ITERATOR Iterator, } if (Next == Iterator->RangeListHead) + { + Iterator->Current = NULL; + *Range = NULL; return STATUS_NO_MORE_ENTRIES; + } Iterator->Current = Next; *Range = &((PRTL_RANGE_ENTRY)Next)->Range;

4 years, 2 months

[reactos] 01/01: [SHELL32] Fix Russian translation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9900089fa67dc6d26aa5f… commit 9900089fa67dc6d26aa5fd93212deb1be579d8f3 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Aug 16 16:06:52 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Aug 16 16:06:52 2020 +0300 [SHELL32] Fix Russian translation Addendum to 5187ec8 and 824a52a. CORE-10972 CORE-12906 --- dll/win32/shell32/lang/ru-RU.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 997a4a63003..406a0937b34 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -999,8 +999,8 @@ BEGIN IDS_SPECIFY_ACTION "Необходимо задать действие." IDS_INVALID_PROGRAM "Указанная программа не найдена. Убедитесь, что имя и путь к файлу указаны правильно." IDS_REMOVE_ACTION "Вы действительно хотите удалить это действие?" - IDS_ACTION_EXISTS "Действие '%s' уже зарегистрирован для этого типа файла. Введите другое имя и повторите попытку." - IDS_EXE_FILTER "Programs\0*.exe\0All Files\0*.*\0" + IDS_ACTION_EXISTS "Действие '%s' уже зарегистрировано для этого типа файла. Введите другое имя и повторите попытку." + IDS_EXE_FILTER "Программы\0*.exe\0Все файлы\0*.*\0" IDS_EDITING_ACTION "Изменение действия для типа: " IDS_NO_ICONS "Файл '%s' не содержит значков.\n\nВыберите значок из списка или укажите другой файл." IDS_FILE_NOT_FOUND "Файл '%s' не найден."

4 years, 2 months

[reactos] 01/01: [README] Add a legal notice about WRK (#2953)

by Alexander Rechitskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cd433ffc39f2bd7c44ede… commit cd433ffc39f2bd7c44ede5a8611fcd5ea9eef384 Author: Alexander Rechitskiy <rechitskiy(a)reactos.org> AuthorDate: Sun Aug 16 15:52:57 2020 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 16 15:52:57 2020 +0300 [README] Add a legal notice about WRK (#2953) Mention the important legal limitation of contribution in the appropriate place of README. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index e6acf3d7bfc..8a8afba3214 100644 --- a/README.md +++ b/README.md @@ -91,6 +91,8 @@ __NOTE:__ The bug tracker is _not_ for discussions. Please use our [official cha We are always looking for developers! Check [how to contribute](CONTRIBUTING.md) if you are willing to participate. +__Legal notice__: If you have seen proprietary Microsoft Windows source code (including but not limited to the leaked Windows NT 3.5, NT 4, 2000 source code and the Windows Research Kernel), your contribution won't be accepted because of potential copyright violation. + Try out cloud-based ReactOS development using Gitpod and Docker: [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#ht…

4 years, 2 months

[reactos] 01/01: [SHELL32] Russian translation for Copy To Folder

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a95c7356ce81beff8bc30… commit a95c7356ce81beff8bc304475d694ed0fd4eae04 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Aug 16 15:32:26 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Aug 16 15:32:26 2020 +0300 [SHELL32] Russian translation for Copy To Folder Addendum to 85fdcdf. CORE-11132 --- dll/win32/shell32/lang/ru-RU.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index a12ecfe9d2b..997a4a63003 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -1005,8 +1005,8 @@ BEGIN IDS_NO_ICONS "Файл '%s' не содержит значков.\n\nВыберите значок из списка или укажите другой файл." IDS_FILE_NOT_FOUND "Файл '%s' не найден." IDS_LINK_INVALID "Элемент '%s', на который ссылается этот ярлык, был изменён или перемещён, поэтому ярлык не будет работать правильно." - IDS_COPYTOMENU "Copy to &folder..." - IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." - IDS_COPYITEMS "Copy Items" - IDS_COPYBUTTON "Copy" + IDS_COPYTOMENU "Копировать в &папку..." + IDS_COPYTOTITLE "Выберите расположение, куда вы хотите скопировать '%s', затем нажмите кнопку 'Копировать'." + IDS_COPYITEMS "Копирование элементов" + IDS_COPYBUTTON "Копировать" END

4 years, 2 months

[reactos] 01/01: [SHELL32] Fix regression #2703 CORE-17041 (trial) (#3046)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1d1bb5332135c19216678… commit 1d1bb5332135c192166783735cd35447ae699f0d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 16 11:16:44 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 16 11:16:44 2020 +0900 [SHELL32] Fix regression #2703 CORE-17041 (trial) (#3046) CORE-17041 --- dll/win32/shell32/folders/CDrivesFolder.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/folders/CDrivesFolder.cpp b/dll/win32/shell32/folders/CDrivesFolder.cpp index d7246a459bb..a2f90d35f57 100644 --- a/dll/win32/shell32/folders/CDrivesFolder.cpp +++ b/dll/win32/shell32/folders/CDrivesFolder.cpp @@ -582,7 +582,7 @@ HRESULT WINAPI CDrivesFolder::ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLEST HRESULT hr = E_INVALIDARG; LPCWSTR szNext = NULL; LPITEMIDLIST pidlTemp = NULL; - WCHAR volumePathName[MAX_PATH]; + INT nDriveNumber; TRACE("(%p)->(HWND=%p,%p,%p=%s,%p,pidl=%p,%p)\n", this, hwndOwner, pbc, lpszDisplayName, debugstr_w (lpszDisplayName), @@ -596,12 +596,12 @@ HRESULT WINAPI CDrivesFolder::ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLEST if (lpszDisplayName[0] == ':' && lpszDisplayName[1] == ':') return m_regFolder->ParseDisplayName(hwndOwner, pbc, lpszDisplayName, pchEaten, ppidl, pdwAttributes); - if (PathGetDriveNumberW(lpszDisplayName) < 0) + nDriveNumber = PathGetDriveNumberW(lpszDisplayName); + if (nDriveNumber < 0) return E_INVALIDARG; /* check if this drive actually exists */ - if (!GetVolumePathNameW(lpszDisplayName, volumePathName, _countof(volumePathName)) || - GetDriveTypeW(volumePathName) < DRIVE_REMOVABLE) + if ((::GetLogicalDrives() & (1 << nDriveNumber)) == 0) { return HRESULT_FROM_WIN32(ERROR_INVALID_DRIVE); }

4 years, 2 months

[reactos] 01/01: [SHELL32] de-DE translation for CORE-11132

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d4c27c96e2ce3c28d7e0… commit 2d4c27c96e2ce3c28d7e0290afcfa01b795b5f7d Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Aug 16 02:15:06 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Aug 16 02:15:06 2020 +0200 [SHELL32] de-DE translation for CORE-11132 Addendum to 0.4.15-dev-524-g 85fdcdf2ccd6b569eeaa8e771a98ab47a6de687c to keep the german localization up to date for the new Copy-To-Folder-Dlg. --- dll/win32/shell32/lang/de-DE.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index cc4b49246a7..42e29f229e3 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -999,8 +999,8 @@ BEGIN IDS_NO_ICONS "Die Datei '%s' enthält keine Symbole.\n\nWählen Sie ein Symbol aus der Liste oder wählen Sie eine andere Datei." IDS_FILE_NOT_FOUND "Die Datei '%s' wurde nicht gefunden." IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." - IDS_COPYTOMENU "Copy to &folder..." - IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." - IDS_COPYITEMS "Copy Items" - IDS_COPYBUTTON "Copy" + IDS_COPYTOMENU "In &Ordner kopieren..." + IDS_COPYTOTITLE "Wählen Sie den Ort, in den '%s' kopiert werden soll. Klicken Sie anschließend auf Kopieren." + IDS_COPYITEMS "Elemente kopieren" + IDS_COPYBUTTON "Kopieren" END

4 years, 2 months

[reactos] 01/01: [REGEDIT] Improve message box for importing registry files (#3006)

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=25f78cda99c6ad4d982e5… commit 25f78cda99c6ad4d982e53927bd17e8517cc6a4d Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Thu Jul 23 21:30:05 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Aug 16 02:25:44 2020 +0300 [REGEDIT] Improve message box for importing registry files (#3006) - Change the messagebox's icon type from warning icon to question icon, because this is done in Windows Regedit too. - Use two buttons (Yes and No) or three buttons (Yes, No, and Cancel) depending on the file count. CORE-15494 Co-authored-by: Stanislav Motylkov <x86corez(a)gmail.com> --- base/applications/regedit/regedit.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/base/applications/regedit/regedit.c b/base/applications/regedit/regedit.c index 5f553d8bdf2..e26b0e564f0 100644 --- a/base/applications/regedit/regedit.c +++ b/base/applications/regedit/regedit.c @@ -140,16 +140,31 @@ BOOL PerformRegAction(REGEDIT_ACTION action, LPWSTR s, BOOL silent) { WCHAR szText[512]; WCHAR filename[MAX_PATH]; + LPWSTR command_line = s; + UINT count = 0, mbType = MB_YESNO; FILE *fp; - get_file_name(&s, filename); - if (!filename[0]) + get_file_name(&command_line, filename); + while (filename[0]) + { + count++; + get_file_name(&command_line, filename); + } + + if (count == 0) { InfoMessageBox(NULL, MB_OK | MB_ICONINFORMATION, NULL, L"No file name is specified."); InfoMessageBox(NULL, MB_OK | MB_ICONINFORMATION, szTitle, usage); exit(4); } + if (count > 1) + { + /* Enable three buttons if we have more than one file */ + mbType = MB_YESNOCANCEL; + } + + get_file_name(&s, filename); while (filename[0]) { /* Request import confirmation */ @@ -159,7 +174,7 @@ BOOL PerformRegAction(REGEDIT_ACTION action, LPWSTR s, BOOL silent) LoadStringW(hInst, IDS_IMPORT_PROMPT, szText, COUNT_OF(szText)); - choice = InfoMessageBox(NULL, MB_YESNOCANCEL | MB_ICONWARNING, szTitle, szText, filename); + choice = InfoMessageBox(NULL, mbType | MB_ICONQUESTION, szTitle, szText, filename); switch (choice) {

4 years, 2 months

[reactos] 01/01: [SHELL32] Implement Copy To Folder (retrial) (#3044)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=85fdcdf2ccd6b569eeaa8… commit 85fdcdf2ccd6b569eeaa8e771a98ab47a6de687c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 16 08:04:07 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 16 08:04:07 2020 +0900 [SHELL32] Implement Copy To Folder (retrial) (#3044) - Add context menu item "Copy to &folder..." and implement the action. - Implement the "Copy to &folder..." menu item of "Edit" menu of Explorer. CORE-11132 --- dll/win32/shell32/CCopyToMenu.cpp | 374 ++++++++++++++++++++++++++++++ dll/win32/shell32/CCopyToMenu.h | 58 +++++ dll/win32/shell32/CDefView.cpp | 21 ++ dll/win32/shell32/CDefaultContextMenu.cpp | 35 ++- dll/win32/shell32/CMakeLists.txt | 1 + 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 | 4 + 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 | 4 + 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 + dll/win32/shell32/precomp.h | 1 + dll/win32/shell32/res/rgs/copytomenu.rgs | 26 +++ dll/win32/shell32/rgs_res.rc | 1 + dll/win32/shell32/shell32.cpp | 1 + dll/win32/shell32/shresdef.h | 6 + 44 files changed, 659 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/CCopyToMenu.cpp b/dll/win32/shell32/CCopyToMenu.cpp new file mode 100644 index 00000000000..bc1325bb86d --- /dev/null +++ b/dll/win32/shell32/CCopyToMenu.cpp @@ -0,0 +1,374 @@ +/* + * PROJECT: shell32 + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: CopyTo implementation + * COPYRIGHT: Copyright 2020 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#include "precomp.h" + +WINE_DEFAULT_DEBUG_CHANNEL(shell); + +static HRESULT +_GetCidlFromDataObject(IDataObject *pDataObject, CIDA** ppcida) +{ + static CLIPFORMAT s_cfHIDA = 0; + if (s_cfHIDA == 0) + { + s_cfHIDA = static_cast<CLIPFORMAT>(RegisterClipboardFormatW(CFSTR_SHELLIDLIST)); + } + + FORMATETC fmt = { s_cfHIDA, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; + STGMEDIUM medium; + + HRESULT hr = pDataObject->GetData(&fmt, &medium); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + LPVOID lpSrc = GlobalLock(medium.hGlobal); + SIZE_T cbSize = GlobalSize(medium.hGlobal); + + *ppcida = reinterpret_cast<CIDA *>(::CoTaskMemAlloc(cbSize)); + if (*ppcida) + { + memcpy(*ppcida, lpSrc, cbSize); + hr = S_OK; + } + else + { + ERR("Out of memory\n"); + hr = E_FAIL; + } + ReleaseStgMedium(&medium); + return hr; +} + +CCopyToMenu::CCopyToMenu() : + m_idCmdFirst(0), + m_idCmdLast(0), + m_idCmdCopyTo(-1) +{ +} + +CCopyToMenu::~CCopyToMenu() +{ +} + +#define WM_ENABLEOK (WM_USER + 0x2000) + +static LRESULT CALLBACK +WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + CCopyToMenu *this_ = + reinterpret_cast<CCopyToMenu *>(GetWindowLongPtr(hwnd, GWLP_USERDATA)); + + switch (uMsg) + { + case WM_ENABLEOK: + SendMessageW(hwnd, BFFM_ENABLEOK, 0, (BOOL)lParam); + return 0; + } + return CallWindowProcW(this_->m_fnOldWndProc, hwnd, uMsg, wParam, lParam); +} + +static int CALLBACK +BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData) +{ + CCopyToMenu *this_ = + reinterpret_cast<CCopyToMenu *>(GetWindowLongPtr(hwnd, GWLP_USERDATA)); + + switch (uMsg) + { + case BFFM_INITIALIZED: + { + SetWindowLongPtr(hwnd, GWLP_USERDATA, lpData); + this_ = reinterpret_cast<CCopyToMenu *>(lpData); + + // Select initial directory + SendMessageW(hwnd, BFFM_SETSELECTION, FALSE, + reinterpret_cast<LPARAM>(static_cast<LPCITEMIDLIST>(this_->m_pidlFolder))); + + // Set caption + CString strCaption(MAKEINTRESOURCEW(IDS_COPYITEMS)); + SetWindowTextW(hwnd, strCaption); + + // Set OK button text + CString strCopy(MAKEINTRESOURCEW(IDS_COPYBUTTON)); + SetDlgItemText(hwnd, IDOK, strCopy); + + // Subclassing + this_->m_fnOldWndProc = + reinterpret_cast<WNDPROC>( + SetWindowLongPtr(hwnd, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(WindowProc))); + + // Disable OK + PostMessageW(hwnd, WM_ENABLEOK, 0, FALSE); + break; + } + case BFFM_SELCHANGED: + { + WCHAR szPath[MAX_PATH]; + LPCITEMIDLIST pidl = reinterpret_cast<LPCITEMIDLIST>(lParam); + + szPath[0] = 0; + SHGetPathFromIDListW(pidl, szPath); + + if (ILIsEqual(pidl, this_->m_pidlFolder)) + PostMessageW(hwnd, WM_ENABLEOK, 0, FALSE); + else if (PathFileExistsW(szPath) || _ILIsDesktop(pidl)) + PostMessageW(hwnd, WM_ENABLEOK, 0, TRUE); + else + PostMessageW(hwnd, WM_ENABLEOK, 0, FALSE); + break; + } + } + + return FALSE; +} + +HRESULT CCopyToMenu::DoRealCopy(LPCMINVOKECOMMANDINFO lpici, LPCITEMIDLIST pidl) +{ + CComHeapPtr<CIDA> pCIDA; + HRESULT hr = _GetCidlFromDataObject(m_pDataObject, &pCIDA); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + PCUIDLIST_ABSOLUTE pidlParent = HIDA_GetPIDLFolder(pCIDA); + if (!pidlParent) + { + ERR("HIDA_GetPIDLFolder failed\n"); + return E_FAIL; + } + + CStringW strFiles; + WCHAR szPath[MAX_PATH]; + for (UINT n = 0; n < pCIDA->cidl; ++n) + { + PCUIDLIST_RELATIVE pidlRelative = HIDA_GetPIDLItem(pCIDA, n); + if (!pidlRelative) + continue; + + CComHeapPtr<ITEMIDLIST> pidlCombine(ILCombine(pidlParent, pidlRelative)); + if (!pidl) + return E_FAIL; + + SHGetPathFromIDListW(pidlCombine, szPath); + + if (n > 0) + strFiles += L'|'; + strFiles += szPath; + } + + strFiles += L'|'; // double null-terminated + strFiles.Replace(L'|', L'\0'); + + if (_ILIsDesktop(pidl)) + SHGetSpecialFolderPathW(NULL, szPath, CSIDL_DESKTOPDIRECTORY, FALSE); + else + SHGetPathFromIDListW(pidl, szPath); + INT cchPath = lstrlenW(szPath); + if (cchPath + 1 < MAX_PATH) + { + szPath[cchPath + 1] = 0; // double null-terminated + } + else + { + ERR("Too long path\n"); + return E_FAIL; + } + + SHFILEOPSTRUCTW op = { lpici->hwnd }; + op.wFunc = FO_COPY; + op.pFrom = strFiles; + op.pTo = szPath; + op.fFlags = FOF_ALLOWUNDO; + return ((SHFileOperation(&op) == 0) ? S_OK : E_FAIL); +} + +CStringW CCopyToMenu::DoGetFileTitle() +{ + CStringW ret = L"(file)"; + + CComHeapPtr<CIDA> pCIDA; + HRESULT hr = _GetCidlFromDataObject(m_pDataObject, &pCIDA); + if (FAILED_UNEXPECTEDLY(hr)) + return ret; + + PCUIDLIST_ABSOLUTE pidlParent = HIDA_GetPIDLFolder(pCIDA); + if (!pidlParent) + { + ERR("HIDA_GetPIDLFolder failed\n"); + return ret; + } + + WCHAR szPath[MAX_PATH]; + PCUIDLIST_RELATIVE pidlRelative = HIDA_GetPIDLItem(pCIDA, 0); + if (!pidlRelative) + { + ERR("HIDA_GetPIDLItem failed\n"); + return ret; + } + + CComHeapPtr<ITEMIDLIST> pidlCombine(ILCombine(pidlParent, pidlRelative)); + + if (SHGetPathFromIDListW(pidlCombine, szPath)) + ret = PathFindFileNameW(szPath); + else + ERR("Cannot get path\n"); + + if (pCIDA->cidl > 1) + ret += L" ..."; + + return ret; +} + +HRESULT CCopyToMenu::DoCopyToFolder(LPCMINVOKECOMMANDINFO lpici) +{ + WCHAR wszPath[MAX_PATH]; + HRESULT hr = E_FAIL; + + TRACE("DoCopyToFolder(%p)\n", lpici); + + if (!SHGetPathFromIDListW(m_pidlFolder, wszPath)) + { + ERR("SHGetPathFromIDListW failed\n"); + return hr; + } + + CStringW strFileTitle = DoGetFileTitle(); + CStringW strTitle; + strTitle.Format(IDS_COPYTOTITLE, static_cast<LPCWSTR>(strFileTitle)); + + BROWSEINFOW info = { lpici->hwnd }; + info.pidlRoot = NULL; + info.lpszTitle = strTitle; + info.ulFlags = BIF_RETURNONLYFSDIRS | BIF_USENEWUI; + info.lpfn = BrowseCallbackProc; + info.lParam = reinterpret_cast<LPARAM>(this); + CComHeapPtr<ITEMIDLIST> pidl(SHBrowseForFolder(&info)); + if (pidl) + { + hr = DoRealCopy(lpici, pidl); + } + + return hr; +} + +HRESULT WINAPI +CCopyToMenu::QueryContextMenu(HMENU hMenu, + UINT indexMenu, + UINT idCmdFirst, + UINT idCmdLast, + UINT uFlags) +{ + MENUITEMINFOW mii; + UINT Count = 0; + + TRACE("CCopyToMenu::QueryContextMenu(%p, %u, %u, %u, %u)\n", + hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); + + m_idCmdFirst = m_idCmdLast = idCmdFirst; + + // insert separator if necessary + ZeroMemory(&mii, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_TYPE; + if (GetMenuItemInfoW(hMenu, indexMenu - 1, TRUE, &mii) && + mii.fType != MFT_SEPARATOR) + { + ZeroMemory(&mii, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_TYPE; + mii.fType = MFT_SEPARATOR; + if (InsertMenuItemW(hMenu, indexMenu, TRUE, &mii)) + { + ++indexMenu; + ++Count; + } + } + + // insert "Copy to folder..." + CStringW strText(MAKEINTRESOURCEW(IDS_COPYTOMENU)); + ZeroMemory(&mii, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_ID | MIIM_TYPE; + mii.fType = MFT_STRING; + mii.dwTypeData = strText.GetBuffer(); + mii.cch = wcslen(mii.dwTypeData); + mii.wID = m_idCmdLast; + if (InsertMenuItemW(hMenu, indexMenu, TRUE, &mii)) + { + m_idCmdCopyTo = m_idCmdLast++; + ++indexMenu; + ++Count; + } + + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, Count); +} + +HRESULT WINAPI +CCopyToMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpici) +{ + HRESULT hr = E_FAIL; + TRACE("CCopyToMenu::InvokeCommand(%p)\n", lpici); + + if (HIWORD(lpici->lpVerb) == 0) + { + if (m_idCmdFirst + LOWORD(lpici->lpVerb) == m_idCmdCopyTo) + { + hr = DoCopyToFolder(lpici); + } + } + else + { + if (::lstrcmpiA(lpici->lpVerb, "copyto") == 0) + { + hr = DoCopyToFolder(lpici); + } + } + + return hr; +} + +HRESULT WINAPI +CCopyToMenu::GetCommandString(UINT_PTR idCmd, + UINT uType, + UINT *pwReserved, + LPSTR pszName, + UINT cchMax) +{ + FIXME("%p %lu %u %p %p %u\n", this, + idCmd, uType, pwReserved, pszName, cchMax); + + return E_NOTIMPL; +} + +HRESULT WINAPI +CCopyToMenu::HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + TRACE("This %p uMsg %x\n", this, uMsg); + return E_NOTIMPL; +} + +HRESULT WINAPI +CCopyToMenu::Initialize(PCIDLIST_ABSOLUTE pidlFolder, + IDataObject *pdtobj, HKEY hkeyProgID) +{ + m_pidlFolder.Attach(ILClone(pidlFolder)); + m_pDataObject = pdtobj; + return S_OK; +} + +HRESULT WINAPI CCopyToMenu::SetSite(IUnknown *pUnkSite) +{ + m_pSite = pUnkSite; + return S_OK; +} + +HRESULT WINAPI CCopyToMenu::GetSite(REFIID riid, void **ppvSite) +{ + if (!m_pSite) + return E_FAIL; + + return m_pSite->QueryInterface(riid, ppvSite); +} diff --git a/dll/win32/shell32/CCopyToMenu.h b/dll/win32/shell32/CCopyToMenu.h new file mode 100644 index 00000000000..a56cba111de --- /dev/null +++ b/dll/win32/shell32/CCopyToMenu.h @@ -0,0 +1,58 @@ +/* + * PROJECT: shell32 + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: CopyTo implementation + * COPYRIGHT: Copyright 2020 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ +#pragma once + +class CCopyToMenu : + public CComCoClass<CCopyToMenu, &CLSID_CopyToMenu>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IContextMenu2, + public IObjectWithSite, + public IShellExtInit +{ +protected: + UINT m_idCmdFirst, m_idCmdLast, m_idCmdCopyTo; + CComPtr<IDataObject> m_pDataObject; + CComPtr<IUnknown> m_pSite; + + HRESULT DoCopyToFolder(LPCMINVOKECOMMANDINFO lpici); + HRESULT DoRealCopy(LPCMINVOKECOMMANDINFO lpici, PCUIDLIST_ABSOLUTE pidl); + CStringW DoGetFileTitle(); + +public: + CComHeapPtr<ITEMIDLIST> m_pidlFolder; + WNDPROC m_fnOldWndProc; + + CCopyToMenu(); + ~CCopyToMenu(); + + // IContextMenu + virtual HRESULT WINAPI QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags); + virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi); + virtual HRESULT WINAPI GetCommandString(UINT_PTR idCommand, UINT uFlags, UINT *lpReserved, LPSTR lpszName, UINT uMaxNameLen); + + // IContextMenu2 + virtual HRESULT WINAPI HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam); + + // IShellExtInit + virtual HRESULT WINAPI Initialize(PCIDLIST_ABSOLUTE pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID); + + // IObjectWithSite + virtual HRESULT WINAPI SetSite(IUnknown *pUnkSite); + virtual HRESULT WINAPI GetSite(REFIID riid, void **ppvSite); + + DECLARE_REGISTRY_RESOURCEID(IDR_COPYTOMENU) + DECLARE_NOT_AGGREGATABLE(CCopyToMenu) + + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CCopyToMenu) + COM_INTERFACE_ENTRY_IID(IID_IContextMenu2, IContextMenu2) + COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) + COM_INTERFACE_ENTRY_IID(IID_IShellExtInit, IShellExtInit) + COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) + END_COM_MAP() +}; diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index cb5dd140eb1..a42d4d495cb 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -1822,6 +1822,7 @@ LRESULT CDefView::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHand case FCIDM_SHVIEW_COPY: case FCIDM_SHVIEW_RENAME: case FCIDM_SHVIEW_PROPERTIES: + case FCIDM_SHVIEW_COPYTO: return OnExplorerCommand(dwCmdID, TRUE); case FCIDM_SHVIEW_INSERT: @@ -2295,6 +2296,26 @@ LRESULT CDefView::OnInitMenuPopup(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL HMENU hViewMenu = GetSubmenuByID(m_hMenu, FCIDM_MENU_VIEW); + if (GetSelections() == 0) + { + ::EnableMenuItem(hmenu, FCIDM_SHVIEW_CUT, MF_GRAYED); + ::EnableMenuItem(hmenu, FCIDM_SHVIEW_COPY, MF_GRAYED); + ::EnableMenuItem(hmenu, FCIDM_SHVIEW_RENAME, MF_GRAYED); + ::EnableMenuItem(hmenu, FCIDM_SHVIEW_COPYTO, MF_GRAYED); + ::EnableMenuItem(hmenu, FCIDM_SHVIEW_MOVETO, MF_GRAYED); + ::EnableMenuItem(hmenu, FCIDM_SHVIEW_DELETE, MF_GRAYED); + } + else + { + // FIXME: Check copyable + ::EnableMenuItem(hmenu, FCIDM_SHVIEW_CUT, MF_ENABLED); + ::EnableMenuItem(hmenu, FCIDM_SHVIEW_COPY, MF_ENABLED); + ::EnableMenuItem(hmenu, FCIDM_SHVIEW_RENAME, MF_ENABLED); + ::EnableMenuItem(hmenu, FCIDM_SHVIEW_COPYTO, MF_ENABLED); + ::EnableMenuItem(hmenu, FCIDM_SHVIEW_MOVETO, MF_ENABLED); + ::EnableMenuItem(hmenu, FCIDM_SHVIEW_DELETE, MF_ENABLED); + } + /* Lets try to find out what the hell wParam is */ if (hmenu == GetSubMenu(m_hMenu, nPos)) menuItemId = ReallyGetMenuItemID(m_hMenu, nPos); diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp index d36d042c70c..a717078f70b 100644 --- a/dll/win32/shell32/CDefaultContextMenu.cpp +++ b/dll/win32/shell32/CDefaultContextMenu.cpp @@ -48,9 +48,9 @@ struct _StaticInvokeCommandMap_ { "delete", FCIDM_SHVIEW_DELETE}, { "properties", FCIDM_SHVIEW_PROPERTIES}, { "rename", FCIDM_SHVIEW_RENAME}, + { "copyto", FCIDM_SHVIEW_COPYTO }, }; - class CDefaultContextMenu : public CComObjectRootEx<CComMultiThreadModelNoCS>, public IContextMenu3, @@ -95,6 +95,7 @@ class CDefaultContextMenu : HRESULT DoRename(LPCMINVOKECOMMANDINFO lpcmi); HRESULT DoProperties(LPCMINVOKECOMMANDINFO lpcmi); HRESULT DoCreateNewFolder(LPCMINVOKECOMMANDINFO lpici); + HRESULT DoCopyToFolder(LPCMINVOKECOMMANDINFO lpici); HRESULT InvokeShellExt(LPCMINVOKECOMMANDINFO lpcmi); HRESULT InvokeRegVerb(LPCMINVOKECOMMANDINFO lpcmi); DWORD BrowserFlagsFromVerb(LPCMINVOKECOMMANDINFO lpcmi, PStaticShellEntry pEntry); @@ -893,6 +894,35 @@ CDefaultContextMenu::DoProperties( return S_OK; } +HRESULT +CDefaultContextMenu::DoCopyToFolder(LPCMINVOKECOMMANDINFO lpici) +{ + HRESULT hr = E_FAIL; + if (!m_pDataObj) + { + ERR("m_pDataObj is NULL\n"); + return hr; + } + + CComPtr<IContextMenu> pContextMenu; + hr = SHCoCreateInstance(NULL, &CLSID_CopyToMenu, NULL, IID_PPV_ARG(IContextMenu, &pContextMenu)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + CComPtr<IShellExtInit> pInit; + hr = pContextMenu->QueryInterface(IID_PPV_ARG(IShellExtInit, &pInit)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = pInit->Initialize(m_pidlFolder, m_pDataObj, NULL); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + lpici->lpVerb = "copyto"; + + return pContextMenu->InvokeCommand(lpici); +} + // This code is taken from CNewMenu and should be shared between the 2 classes HRESULT CDefaultContextMenu::DoCreateNewFolder( @@ -1248,6 +1278,9 @@ CDefaultContextMenu::InvokeCommand( case FCIDM_SHVIEW_NEWFOLDER: Result = DoCreateNewFolder(&LocalInvokeInfo); break; + case FCIDM_SHVIEW_COPYTO: + Result = DoCopyToFolder(&LocalInvokeInfo); + break; default: Result = E_INVALIDARG; ERR("Unhandled Verb %xl\n", LOWORD(LocalInvokeInfo.lpVerb)); diff --git a/dll/win32/shell32/CMakeLists.txt b/dll/win32/shell32/CMakeLists.txt index e0a84c9fe8e..aa51a47fe43 100644 --- a/dll/win32/shell32/CMakeLists.txt +++ b/dll/win32/shell32/CMakeLists.txt @@ -83,6 +83,7 @@ list(APPEND SOURCE COpenWithMenu.cpp CNewMenu.cpp CSendToMenu.cpp + CCopyToMenu.cpp CShellDispatch.cpp CFolder.cpp CFolderItems.cpp diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index 9c1a859495c..56ca1049511 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -999,4 +999,8 @@ BEGIN IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." IDS_FILE_NOT_FOUND "The file '%s' was not found." IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_COPYTOMENU "Copy to &folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 13595784d31..8e920649408 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -998,4 +998,8 @@ BEGIN IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." IDS_FILE_NOT_FOUND "The file '%s' was not found." IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_COPYTOMENU "Copy to &folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 5e41d728b22..4c86a7c5869 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -1004,4 +1004,8 @@ BEGIN IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." IDS_FILE_NOT_FOUND "The file '%s' was not found." IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_COPYTOMENU "Copy to &folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 48abdf760b3..6bf29e180b5 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -1004,4 +1004,8 @@ BEGIN IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." IDS_FILE_NOT_FOUND "The file '%s' was not found." IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_COPYTOMENU "Copy to &folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 0fdce04259d..cc4b49246a7 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -999,4 +999,8 @@ BEGIN IDS_NO_ICONS "Die Datei '%s' enthält keine Symbole.\n\nWählen Sie ein Symbol aus der Liste oder wählen Sie eine andere Datei." IDS_FILE_NOT_FOUND "Die Datei '%s' wurde nicht gefunden." IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_COPYTOMENU "Copy to &folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index cc9c8c15ba4..fd2bb3cfc42 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -998,4 +998,8 @@ BEGIN IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." IDS_FILE_NOT_FOUND "The file '%s' was not found." IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_COPYTOMENU "Copy to &folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 2fa65e383ed..4d1f9e55495 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -998,4 +998,8 @@ BEGIN IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." IDS_FILE_NOT_FOUND "The file '%s' was not found." IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_COPYTOMENU "Copy to &folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index 0af80340d2c..21f06a42d42 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -998,4 +998,8 @@ BEGIN IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." IDS_FILE_NOT_FOUND "The file '%s' was not found." IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_COPYTOMENU "Copy to &folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index 8b2afe4f73c..bdf04fd74a4 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -1007,4 +1007,8 @@ BEGIN IDS_NO_ICONS "El archivo '%s' no contiene íconos.\n\nEscoja un ícono de la lista o seleccione otro archivo." IDS_FILE_NOT_FOUND "El archivo '%s' no pudo ser encontrado." IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_COPYTOMENU "Copy to &folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 9f9703ca32a..8585ad68b08 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -1005,4 +1005,8 @@ BEGIN IDS_NO_ICONS "Fail '%s' ei sisalda ühtegi ikooni.\n\nVali ikoon nimekirjast või määra teine fail." IDS_FILE_NOT_FOUND "Faili '%s' ei leitud." IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_COPYTOMENU "Copy to &folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 9b112922152..80356afb3d5 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -998,4 +998,8 @@ BEGIN IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." IDS_FILE_NOT_FOUND "The file '%s' was not found." IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_COPYTOMENU "Copy to &folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index fc780633ed9..019fed4cc69 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -998,4 +998,8 @@ BEGIN IDS_NO_ICONS "Le fichier '%s' ne contient pas d'icônes.\n\nVeuillez choisir une icône dans la liste ou sélectionner un fichier différent." IDS_FILE_NOT_FOUND "Le fichier '%s' ne peut être trouvé." IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_COPYTOMENU "Copy to &folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 51e94334e7f..8d469bf407e 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -1000,4 +1000,8 @@ BEGIN IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." IDS_FILE_NOT_FOUND "לא ניתן למצוא את הקובץ '%s'." IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_COPYTOMENU "Copy to &folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 101d5b5c136..59be1fd3cbf 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -993,4 +993,8 @@ BEGIN IDS_NO_ICONS "फ़ाइल '%s' में कोई आइकन नहीं है।\n\nसूची से एक आइकन चुनें या एक अलग फ़ाइल निर्दिष्ट करें।" IDS_FILE_NOT_FOUND "फ़ाइल '%s' नहीं मिली।" IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_COPYTOMENU "Copy to &folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 1b3a743f11e..90f964dbd7c 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -997,4 +997,8 @@ BEGIN IDS_NO_ICONS "A fájl ('%s') nem tartalmaz ikonokat.\n\nVálasszon egy ikont a listából, vagy adjon meg egy másik fájlt." IDS_FILE_NOT_FOUND "A fájl ('%s') nem található." IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_COPYTOMENU "Copy to &folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index 90c22133c2b..09571a9f2a6 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -994,4 +994,8 @@ BEGIN IDS_NO_ICONS "Berkas '%s' tidak berisi ikon.\n\nPilih ikon dari daftar atau pilih berkas yang berbeda." IDS_FILE_NOT_FOUND "Berkas '%s' tidak ditemukan." IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_COPYTOMENU "Copy to &folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index b1bf68e20d7..ed3dac4bfc8 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -998,4 +998,8 @@ BEGIN IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." IDS_FILE_NOT_FOUND "The file '%s' was not found." IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_COPYTOMENU "Copy to &folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index d385640dfdd..3593c981ce7 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -995,4 +995,8 @@ BEGIN IDS_NO_ICONS "ファイル '%s' にはアイコンデータがありません。.\n\nリストからアイコンを選ぶか、別のファイルを指定して下さい。" IDS_FILE_NOT_FOUND "ファイル '%s' は見つかりませんでした。" IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_COPYTOMENU "Copy to &folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 6fed522e97d..3c46406aab7 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -998,4 +998,8 @@ BEGIN IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." IDS_FILE_NOT_FOUND "The file '%s' was not found." IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_COPYTOMENU "Copy to &folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 14181b2cc6a..26b311387a5 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -998,4 +998,8 @@ BEGIN IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." IDS_FILE_NOT_FOUND "The file '%s' was not found." IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_COPYTOMENU "Copy to &folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 502648fef4e..1831921be23 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -998,4 +998,8 @@ BEGIN IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." IDS_FILE_NOT_FOUND "The file '%s' was not found." IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_COPYTOMENU "Copy to &folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 1b5de4427d8..b125105cb29 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -1004,4 +1004,8 @@ BEGIN IDS_NO_ICONS "Plik '%s' nie zawiera ikon.\n\nWybierz ikonę z listy lub określ inny plik." IDS_FILE_NOT_FOUND "Nie odnaleziono pliku '%s'." IDS_LINK_INVALID "Element '%s', do którego odwołuje się ten skrót, został zmieniony lub przeniesiony i dlatego skrót ten nie będzie działał poprawnie." + IDS_COPYTOMENU "Copy To &Folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 0bca68bc3f4..9610e4e0fb6 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -998,4 +998,8 @@ BEGIN IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." IDS_FILE_NOT_FOUND "The file '%s' was not found." IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_COPYTOMENU "Copy to &folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 1325c971be2..f64de677bc9 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -998,4 +998,8 @@ BEGIN IDS_NO_ICONS "O arquivo '%s' não contém ícones.\n\nEscolha um ícone da lista ou especifique um arquivo diferente." IDS_FILE_NOT_FOUND "O arquivo '%s' não foi encontrado." IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_COPYTOMENU "Copy to &folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 1cbf12ba8aa..b4f0e6059aa 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -1000,4 +1000,8 @@ BEGIN IDS_NO_ICONS "Fișierul „%s” nu conține pictograme.\n\nAlegeți o pictogramă din listă sau specificați un alt fișier." IDS_FILE_NOT_FOUND "Fișierul „%s” nu a fost găsit." IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_COPYTOMENU "Copy to &folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 52e20a39d8e..a12ecfe9d2b 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -1005,4 +1005,8 @@ BEGIN IDS_NO_ICONS "Файл '%s' не содержит значков.\n\nВыберите значок из списка или укажите другой файл." IDS_FILE_NOT_FOUND "Файл '%s' не найден." IDS_LINK_INVALID "Элемент '%s', на который ссылается этот ярлык, был изменён или перемещён, поэтому ярлык не будет работать правильно." + IDS_COPYTOMENU "Copy to &folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index 5fb69feaf1e..93e87e85cad 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -998,4 +998,8 @@ BEGIN IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." IDS_FILE_NOT_FOUND "The file '%s' was not found." IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_COPYTOMENU "Copy to &folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index a8daae20a67..eca49866975 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -998,4 +998,8 @@ BEGIN IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." IDS_FILE_NOT_FOUND "The file '%s' was not found." IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_COPYTOMENU "Copy to &folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 36362694a9e..fa69346d878 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -1002,4 +1002,8 @@ BEGIN IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." IDS_FILE_NOT_FOUND "The file '%s' was not found." IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_COPYTOMENU "Copy to &folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index 0eaf3eae9c9..a81f73f5c6a 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -998,4 +998,8 @@ BEGIN IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." IDS_FILE_NOT_FOUND "The file '%s' was not found." IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_COPYTOMENU "Copy to &folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index c4fda54ac1e..519103301b3 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -1000,4 +1000,8 @@ BEGIN IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." IDS_FILE_NOT_FOUND "The file '%s' was not found." IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_COPYTOMENU "Copy to &folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index 85b0ea6ee96..62d8787ec23 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -998,4 +998,8 @@ BEGIN IDS_NO_ICONS "Файл '%s' не містить значків.\n\nВиберіть значок зі списку або відкрийте інший файл." IDS_FILE_NOT_FOUND "Файд '%s' не знайдено." IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_COPYTOMENU "Copy to &folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 70d68078cc4..a07f3cfdaf6 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -1008,4 +1008,8 @@ BEGIN IDS_NO_ICONS "文件 '%s' 不包含图标\n\n从列表中选择一个图标或指定其他文件。" IDS_FILE_NOT_FOUND "无法找到文件 '%s'。" IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_COPYTOMENU "Copy to &folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index 9f01928299a..c634e81d2f4 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -1009,4 +1009,8 @@ BEGIN IDS_NO_ICONS "The file '%s' contains no icons.\n\nChoose an icon from the list or specify a different file." IDS_FILE_NOT_FOUND "The file '%s' was not found." IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_COPYTOMENU "Copy to &folder..." + IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." + IDS_COPYITEMS "Copy Items" + IDS_COPYBUTTON "Copy" END diff --git a/dll/win32/shell32/precomp.h b/dll/win32/shell32/precomp.h index da9155f0bff..2703b42e817 100644 --- a/dll/win32/shell32/precomp.h +++ b/dll/win32/shell32/precomp.h @@ -81,6 +81,7 @@ #include "COpenWithMenu.h" #include "CNewMenu.h" #include "CSendToMenu.h" +#include "CCopyToMenu.h" #include "dialogs/filedefext.h" #include "dialogs/drvdefext.h" #include "CQueryAssociations.h" diff --git a/dll/win32/shell32/res/rgs/copytomenu.rgs b/dll/win32/shell32/res/rgs/copytomenu.rgs new file mode 100644 index 00000000000..8f2726c811c --- /dev/null +++ b/dll/win32/shell32/res/rgs/copytomenu.rgs @@ -0,0 +1,26 @@ +HKCR +{ + NoRemove CLSID + { + ForceRemove {C2FBB630-2971-11D1-A18C-00C04FD75D13} = s 'ReactOS CopyTo Object Service' + { + val flags = d '1' + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Apartment' + } + } + } + NoRemove AllFilesystemObjects + { + NoRemove shellex + { + NoRemove ContextMenuHandlers + { + ForceRemove CopyTo = s '{C2FBB630-2971-11D1-A18C-00C04FD75D13}' + { + } + } + } + } +} diff --git a/dll/win32/shell32/rgs_res.rc b/dll/win32/shell32/rgs_res.rc index d46053ddd99..9435241aaaa 100644 --- a/dll/win32/shell32/rgs_res.rc +++ b/dll/win32/shell32/rgs_res.rc @@ -30,3 +30,4 @@ IDR_USERNOTIFICATION REGISTRY "res/rgs/usernotification.rgs" IDR_SHELL REGISTRY "res/rgs/shell.rgs" IDR_ACTIVEDESKTOP REGISTRY "res/rgs/activedesktop.rgs" IDR_SENDTOMENU REGISTRY "res/rgs/sendtomenu.rgs" +IDR_COPYTOMENU REGISTRY "res/rgs/copytomenu.rgs" diff --git a/dll/win32/shell32/shell32.cpp b/dll/win32/shell32/shell32.cpp index c244477cf6b..527cbd29342 100644 --- a/dll/win32/shell32/shell32.cpp +++ b/dll/win32/shell32/shell32.cpp @@ -290,6 +290,7 @@ BEGIN_OBJECT_MAP(ObjectMap) OBJECT_ENTRY(CLSID_OpenWithMenu, COpenWithMenu) OBJECT_ENTRY(CLSID_NewMenu, CNewMenu) OBJECT_ENTRY(CLSID_SendToMenu, CSendToMenu) + OBJECT_ENTRY(CLSID_CopyToMenu, CCopyToMenu) OBJECT_ENTRY(CLSID_StartMenu, CStartMenuDummy) OBJECT_ENTRY(CLSID_MenuBandSite, CMenuSite) OBJECT_ENTRY(CLSID_MenuBand, CMenuBand) diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index 2152134eefc..81f22f97530 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -297,6 +297,10 @@ #define IDS_NO_ICONS 30529 #define IDS_FILE_NOT_FOUND 30530 #define IDS_LINK_INVALID 30531 +#define IDS_COPYTOMENU 30532 +#define IDS_COPYTOTITLE 30533 +#define IDS_COPYITEMS 30534 +#define IDS_COPYBUTTON 30535 /* Dialogs */ @@ -796,6 +800,7 @@ #define IDM_DELETE (FCIDM_SHVIEW_DELETE - 0x7000) #define IDM_RENAME (FCIDM_SHVIEW_RENAME - 0x7000) #define IDM_PROPERTIES (FCIDM_SHVIEW_PROPERTIES - 0x7000) +#define IDM_COPYTO (FCIDM_SHVIEW_COPYTO - 0x7000) #define IDM_DRAGFILE 0xce #define IDM_COPYHERE 0x7 @@ -836,3 +841,4 @@ #define IDR_SHELL 156 #define IDR_ACTIVEDESKTOP 157 #define IDR_SENDTOMENU 158 +#define IDR_COPYTOMENU 159

4 years, 2 months

[reactos] 01/01: [TASKMGR] Fix display of process command-line string (#3016)

by Aidan Case

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=535e262b78f4ea3ea9c0d… commit 535e262b78f4ea3ea9c0de6e1cd1b6f2991b067e Author: Aidan Case <aidanzcase(a)gmail.com> AuthorDate: Sun Aug 2 23:06:49 2020 -0500 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Aug 16 00:52:48 2020 +0300 [TASKMGR] Fix display of process command-line string (#3016) The CMD_LINE_CACHE index (idx) does not update when programs are closed. Compare it with the process id (pid) in the cache and determine the pid by the index in the same cache. CORE-17115 --- base/applications/taskmgr/perfdata.c | 43 ++++++++++++++++++++++++++++++++---- base/applications/taskmgr/perfdata.h | 3 +++ 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/base/applications/taskmgr/perfdata.c b/base/applications/taskmgr/perfdata.c index a19c0cb0d97..75c6c27fcd2 100644 --- a/base/applications/taskmgr/perfdata.c +++ b/base/applications/taskmgr/perfdata.c @@ -5,6 +5,7 @@ * * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> * Copyright (C) 2014 Ismael Ferreras Morezuelas <swyterzone+ros(a)gmail.com> + * Copyright (C) 2020 Aidan Case <aidanzcase(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,6 +23,8 @@ */ #include "precomp.h" +#include "perfdata.h" +#include "winbase.h" #define WIN32_LEAN_AND_MEAN #include <aclapi.h> @@ -564,19 +567,50 @@ BOOL PerfDataGetCommandLine(ULONG Index, LPWSTR lpCommandLine, ULONG nMaxCount) LPWSTR new_string; PCMD_LINE_CACHE cache = global_cache; + PCMD_LINE_CACHE old_cache = NULL; - /* [A] Search for a string already in cache? If so, use it */ + /* [A] Search for a string already in cache? If so, use it. If not, check if invalid and free it if so. */ while (cache && cache->pnext != NULL) { - if (cache->idx == Index && cache->str != NULL) + if (cache->idx == Index && cache->pid == PerfDataGetProcessId(cache->idx) && cache->str != NULL) { /* Found it. Use it, and add some ellipsis at the very end to make it cute */ wcsncpy(lpCommandLine, cache->str, CMD_LINE_MIN(nMaxCount, cache->len)); wcscpy(lpCommandLine + CMD_LINE_MIN(nMaxCount, cache->len) - wcslen(ellipsis), ellipsis); return TRUE; } - - cache = cache->pnext; + else if (cache->pid != PerfDataGetProcessId(cache->idx)) + { + /* There has been a shift, and this node is no longer valid. Free it and recache it later. */ + if (old_cache == NULL) + { + /* Unless, of course, its the global_cache. In that case, just shift global_cache to the next node and then free it. */ + old_cache = global_cache; + if (global_cache->pnext == NULL) + { + /* And we are out of cache. Whoops. */ + HeapFree(GetProcessHeap(), 0, old_cache); + global_cache = NULL; + break; + } + global_cache = global_cache->pnext; + cache = global_cache; + HeapFree(GetProcessHeap(), 0, old_cache); + } + else + { + /* We're in the middle of the cache, so we can safely shift nodes around. */ + old_cache->pnext = cache->pnext; + HeapFree(GetProcessHeap(), 0, cache); + cache = old_cache->pnext; + } + } + else + { + /* This is not the cache you're looking for. */ + old_cache = cache; + cache = cache->pnext; + } } /* [B] We don't; let's allocate and load a value from the process mem... and cache it */ @@ -642,6 +676,7 @@ BOOL PerfDataGetCommandLine(ULONG Index, LPWSTR lpCommandLine, ULONG nMaxCount) new_entry->idx = Index; new_entry->str = new_string; new_entry->len = CommandLineStr.Length; + new_entry->pid = ProcessId; if (!global_cache) global_cache = new_entry; diff --git a/base/applications/taskmgr/perfdata.h b/base/applications/taskmgr/perfdata.h index 51e11f47b2e..8bd3d33ad57 100644 --- a/base/applications/taskmgr/perfdata.h +++ b/base/applications/taskmgr/perfdata.h @@ -4,6 +4,7 @@ * perfdata.h * * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> + * Copyright (C) 2020 Aidan Case <aidanzcase(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,6 +23,7 @@ #pragma once +#include "windef.h" #ifdef __cplusplus extern "C" { #endif @@ -58,6 +60,7 @@ typedef struct _PERFDATA typedef struct _CMD_LINE_CACHE { DWORD idx; + ULONG pid; LPWSTR str; ULONG len; struct _CMD_LINE_CACHE* pnext;

4 years, 2 months

[reactos] 01/01: [TIMEDATE] Fix a broken function pointer cast.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=12186bec12fefa343263e… commit 12186bec12fefa343263e309eda609a08807848e Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Aug 15 21:36:42 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Aug 15 22:37:42 2020 +0200 [TIMEDATE] Fix a broken function pointer cast. --- dll/cpl/timedate/internettime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/cpl/timedate/internettime.c b/dll/cpl/timedate/internettime.c index 001c25d9949..68cd0b2da3c 100644 --- a/dll/cpl/timedate/internettime.c +++ b/dll/cpl/timedate/internettime.c @@ -342,7 +342,7 @@ OnAutoSync(BOOL Sync) RegCloseKey(hKey); } -static DWORD +static DWORD WINAPI UpdateThread( _In_ LPVOID lpParameter) { @@ -368,7 +368,7 @@ OnUpdate( { SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)TRUE); - if (CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)UpdateThread, (PVOID)hwndDlg, 0, NULL) == NULL) + if (CreateThread(NULL, 0, UpdateThread, (PVOID)hwndDlg, 0, NULL) == NULL) { UpdateNTPStatus(hwndDlg, GetLastError()); SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)FALSE);

4 years, 2 months

← Newer
1
...
12
13
14
15
16
17
18
19
Older →

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