Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [BOOTDATA] Add "Application Popup" as a known source of events for the System event log.
by Hermès Bélusca-Maïto 18 Feb '18

18 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e93e0dd46e5fab1de7ab… commit 0e93e0dd46e5fab1de7ab69569b56d56fbfdf193 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 18 01:16:24 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 18 01:16:24 2018 +0100 [BOOTDATA] Add "Application Popup" as a known source of events for the System event log. --- boot/bootdata/hivesys.inf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index bb0b3b8257..59f88fc10d 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -1546,6 +1546,8 @@ HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System","MaxSize",0x00010003,52 HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System","Retention",0x00010003,604800 HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System\EventLog","EventMessageFile",0x00020000,"%SystemRoot%\system32\netevent.dll" HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System\EventLog","TypesSupported",0x00010001,0x00000007 +HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System\Application Popup","EventMessageFile",0x00020000,"%SystemRoot%\system32\ntdll.dll" +HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System\Application Popup","TypesSupported",0x00010001,0x00000007 HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System\Service Control Manager","EventMessageFile",0x00020000,"%SystemRoot%\system32\netevent.dll" HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System\Service Control Manager","TypesSupported",0x00010001,0x00000007

1 0

01/01: [CMAKE] Increase KERNEL_VERSION_PATCH_LEVEL to 9 CORE-14345
by Joachim Henze 17 Feb '18

17 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f525c2b178631ef029ea… commit 6f525c2b178631ef029ea7e7c7ee9635866418b1 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sat Feb 17 23:48:16 2018 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sat Feb 17 23:48:16 2018 +0100 [CMAKE] Increase KERNEL_VERSION_PATCH_LEVEL to 9 CORE-14345 To make 1st stage setup properly report "0.4.9" --- sdk/include/reactos/version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/reactos/version.cmake b/sdk/include/reactos/version.cmake index a585154556..70fb1bbe99 100644 --- a/sdk/include/reactos/version.cmake +++ b/sdk/include/reactos/version.cmake @@ -2,7 +2,7 @@ string(TIMESTAMP KERNEL_VERSION_BUILD %Y%m%d UTC) set(KERNEL_VERSION_MAJOR "0") set(KERNEL_VERSION_MINOR "4") -set(KERNEL_VERSION_PATCH_LEVEL "8") +set(KERNEL_VERSION_PATCH_LEVEL "9") set(COPYRIGHT_YEAR "2018") # KERNEL_VERSION_BUILD_TYPE is "dev" for Git builds

1 0

01/01: [SC] Fix MSVC build.
by Hermès Bélusca-Maïto 17 Feb '18

17 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f59f0380ddcd4a02a322… commit 5f59f0380ddcd4a02a322e4721f8b86db391bfb4 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Feb 17 21:03:58 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Feb 17 21:08:28 2018 +0100 [SC] Fix MSVC build. --- base/applications/sc/usage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/sc/usage.c b/base/applications/sc/usage.c index d04907d212..b1b4a04925 100644 --- a/base/applications/sc/usage.c +++ b/base/applications/sc/usage.c @@ -83,7 +83,7 @@ VOID MainUsage(VOID) _T("sc query state= all - Enumerates all services & drivers\n") _T("sc query bufsize= 50 - Enumerates with a 50 byte buffer.\n") _T("sc query ri= 14 - Enumerates with resume index = 14\n") - _T("sc queryex group= "" - Enumerates active services not in a group\n") + _T("sc queryex group= \"\" - Enumerates active services not in a group\n") _T("sc query type= service type= interact - Enumerates all interactive services\n") _T("sc query type= driver group= NDIS - Enumerates all NDIS drivers\n")); }

1 0

01/01: [SHELL32] CFSDropTarget: style fixes
by Giannis Adamopoulos 17 Feb '18

17 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fd209faa66b06f6ed8a1a… commit fd209faa66b06f6ed8a1aeb94ec2f3f20ec0cf55 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sat Feb 17 22:01:04 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sat Feb 17 22:01:04 2018 +0200 [SHELL32] CFSDropTarget: style fixes --- dll/win32/shell32/droptargets/CFSDropTarget.cpp | 72 ++++++++++++------------- dll/win32/shell32/droptargets/CFSDropTarget.h | 16 +++--- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/dll/win32/shell32/droptargets/CFSDropTarget.cpp b/dll/win32/shell32/droptargets/CFSDropTarget.cpp index deca859934..41d4bab1c1 100644 --- a/dll/win32/shell32/droptargets/CFSDropTarget.cpp +++ b/dll/win32/shell32/droptargets/CFSDropTarget.cpp @@ -52,18 +52,18 @@ static WCHAR* BuildPathsList(LPCWSTR wszBasePath, int cidl, LPCITEMIDLIST *pidls } /**************************************************************************** - * CFSDropTarget::CopyItems + * CFSDropTarget::_CopyItems * * copies items to this folder */ -HRESULT WINAPI CFSDropTarget::CopyItems(IShellFolder * pSFFrom, UINT cidl, - LPCITEMIDLIST * apidl, BOOL bCopy) +HRESULT CFSDropTarget::_CopyItems(IShellFolder * pSFFrom, UINT cidl, + LPCITEMIDLIST * apidl, BOOL bCopy) { LPWSTR pszSrcList; HRESULT hr; WCHAR wszTargetPath[MAX_PATH + 1]; - wcscpy(wszTargetPath, sPathTarget); + wcscpy(wszTargetPath, m_sPathTarget); //Double NULL terminate. wszTargetPath[wcslen(wszTargetPath) + 1] = '\0'; @@ -75,7 +75,7 @@ HRESULT WINAPI CFSDropTarget::CopyItems(IShellFolder * pSFFrom, UINT cidl, return hr; pszSrcList = BuildPathsList(strretFrom.pOleStr, cidl, apidl); - ERR("Source file (just the first) = %s, target path = %s, bCopy: %d\n", debugstr_w(pszSrcList), debugstr_w(sPathTarget), bCopy); + ERR("Source file (just the first) = %s, target path = %s, bCopy: %d\n", debugstr_w(pszSrcList), debugstr_w(m_sPathTarget), bCopy); CoTaskMemFree(strretFrom.pOleStr); if (!pszSrcList) return E_OUTOFMEMORY; @@ -98,39 +98,39 @@ HRESULT WINAPI CFSDropTarget::CopyItems(IShellFolder * pSFFrom, UINT cidl, } CFSDropTarget::CFSDropTarget(): - cfShellIDList(0), - fAcceptFmt(FALSE), - sPathTarget(NULL), + m_cfShellIDList(0), + m_fAcceptFmt(FALSE), + m_sPathTarget(NULL), m_hwndSite(NULL), m_grfKeyState(0) { } -HRESULT WINAPI CFSDropTarget::Initialize(LPWSTR PathTarget) +HRESULT CFSDropTarget::Initialize(LPWSTR PathTarget) { if (!PathTarget) return E_UNEXPECTED; - cfShellIDList = RegisterClipboardFormatW(CFSTR_SHELLIDLIST); - if (!cfShellIDList) + m_cfShellIDList = RegisterClipboardFormatW(CFSTR_SHELLIDLIST); + if (!m_cfShellIDList) return E_FAIL; - sPathTarget = (WCHAR *)SHAlloc((wcslen(PathTarget) + 1) * sizeof(WCHAR)); - if (!sPathTarget) + m_sPathTarget = (WCHAR *)SHAlloc((wcslen(PathTarget) + 1) * sizeof(WCHAR)); + if (!m_sPathTarget) return E_OUTOFMEMORY; - wcscpy(sPathTarget, PathTarget); + wcscpy(m_sPathTarget, PathTarget); return S_OK; } CFSDropTarget::~CFSDropTarget() { - SHFree(sPathTarget); + SHFree(m_sPathTarget); } BOOL -CFSDropTarget::GetUniqueFileName(LPWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pwszTarget, BOOL bShortcut) +CFSDropTarget::_GetUniqueFileName(LPWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pwszTarget, BOOL bShortcut) { WCHAR wszLink[40]; @@ -159,7 +159,7 @@ CFSDropTarget::GetUniqueFileName(LPWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pw /**************************************************************************** * IDropTarget implementation */ -BOOL CFSDropTarget::QueryDrop(DWORD dwKeyState, LPDWORD pdwEffect) +BOOL CFSDropTarget::_QueryDrop(DWORD dwKeyState, LPDWORD pdwEffect) { /* TODO Windows does different drop effects if dragging across drives. i.e., it will copy instead of move if the directories are on different disks. */ @@ -168,7 +168,7 @@ BOOL CFSDropTarget::QueryDrop(DWORD dwKeyState, LPDWORD pdwEffect) *pdwEffect = DROPEFFECT_NONE; - if (fAcceptFmt) { /* Does our interpretation of the keystate ... */ + if (m_fAcceptFmt) { /* Does our interpretation of the keystate ... */ *pdwEffect = KeyStateToDropEffect (dwKeyState); if (*pdwEffect == DROPEFFECT_NONE) @@ -268,15 +268,15 @@ HRESULT WINAPI CFSDropTarget::DragEnter(IDataObject *pDataObject, TRACE("(%p)->(DataObject=%p)\n", this, pDataObject); FORMATETC fmt; FORMATETC fmt2; - fAcceptFmt = FALSE; + m_fAcceptFmt = FALSE; - InitFormatEtc (fmt, cfShellIDList, TYMED_HGLOBAL); + InitFormatEtc (fmt, m_cfShellIDList, TYMED_HGLOBAL); InitFormatEtc (fmt2, CF_HDROP, TYMED_HGLOBAL); if (SUCCEEDED(pDataObject->QueryGetData(&fmt))) - fAcceptFmt = TRUE; + m_fAcceptFmt = TRUE; else if (SUCCEEDED(pDataObject->QueryGetData(&fmt2))) - fAcceptFmt = TRUE; + m_fAcceptFmt = TRUE; m_grfKeyState = dwKeyState; m_dwDefaultEffect = DROPEFFECT_MOVE; @@ -288,7 +288,7 @@ HRESULT WINAPI CFSDropTarget::DragEnter(IDataObject *pDataObject, if (DragQueryFileW((HDROP)medium.hGlobal, 0, wstrFirstFile, _countof(wstrFirstFile))) { /* Check if the drive letter is different */ - if (wstrFirstFile[0] != sPathTarget[0]) + if (wstrFirstFile[0] != m_sPathTarget[0]) { m_dwDefaultEffect = DROPEFFECT_COPY; } @@ -296,7 +296,7 @@ HRESULT WINAPI CFSDropTarget::DragEnter(IDataObject *pDataObject, ReleaseStgMedium(&medium); } - QueryDrop(dwKeyState, pdwEffect); + _QueryDrop(dwKeyState, pdwEffect); return S_OK; } @@ -310,7 +310,7 @@ HRESULT WINAPI CFSDropTarget::DragOver(DWORD dwKeyState, POINTL pt, m_grfKeyState = dwKeyState; - QueryDrop(dwKeyState, pdwEffect); + _QueryDrop(dwKeyState, pdwEffect); return S_OK; } @@ -319,7 +319,7 @@ HRESULT WINAPI CFSDropTarget::DragLeave() { TRACE("(%p)\n", this); - fAcceptFmt = FALSE; + m_fAcceptFmt = FALSE; return S_OK; } @@ -336,7 +336,7 @@ HRESULT WINAPI CFSDropTarget::Drop(IDataObject *pDataObject, DWORD dwAvailableEffects = *pdwEffect; - QueryDrop(dwKeyState, pdwEffect); + _QueryDrop(dwKeyState, pdwEffect); TRACE("pdwEffect: 0x%x, m_dwDefaultEffect: 0x%x, dwAvailableEffects: 0x%x\n", *pdwEffect, m_dwDefaultEffect, dwAvailableEffects); @@ -401,15 +401,15 @@ CFSDropTarget::GetSite(REFIID riid, void **ppvSite) return m_site->QueryInterface(riid, ppvSite); } -HRESULT WINAPI CFSDropTarget::_DoDrop(IDataObject *pDataObject, - DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) +HRESULT CFSDropTarget::_DoDrop(IDataObject *pDataObject, + DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) { TRACE("(%p) performing drop, effect %u\n", this, *pdwEffect); FORMATETC fmt; FORMATETC fmt2; STGMEDIUM medium; - InitFormatEtc (fmt, cfShellIDList, TYMED_HGLOBAL); + InitFormatEtc (fmt, m_cfShellIDList, TYMED_HGLOBAL); InitFormatEtc (fmt2, CF_HDROP, TYMED_HGLOBAL); HRESULT hr; @@ -487,7 +487,7 @@ HRESULT WINAPI CFSDropTarget::_DoDrop(IDataObject *pDataObject, WCHAR wszPath[MAX_PATH]; WCHAR wszTarget[MAX_PATH]; - wcscpy(wszTargetPath, sPathTarget); + wcscpy(wszTargetPath, m_sPathTarget); TRACE("target path = %s", debugstr_w(wszTargetPath)); @@ -518,14 +518,14 @@ HRESULT WINAPI CFSDropTarget::_DoDrop(IDataObject *pDataObject, LPWSTR pwszFileName = PathFindFileNameW(wszPath); LPWSTR pwszExt = PathFindExtensionW(wszPath); - LPWSTR placementPath = PathCombineW(lpStr1, sPathTarget, pwszFileName); + LPWSTR placementPath = PathCombineW(lpStr1, m_sPathTarget, pwszFileName); CComPtr<IPersistFile> ppf; //Check to see if it's already a link. if (!wcsicmp(pwszExt, L".lnk")) { //It's a link so, we create a new one which copies the old. - if(!GetUniqueFileName(placementPath, pwszExt, wszTarget, TRUE)) + if(!_GetUniqueFileName(placementPath, pwszExt, wszTarget, TRUE)) { ERR("Error getting unique file name"); hr = E_FAIL; @@ -546,7 +546,7 @@ HRESULT WINAPI CFSDropTarget::_DoDrop(IDataObject *pDataObject, { //It's not a link, so build a new link using the creator class and fill it in. //Create a file name for the link - if (!GetUniqueFileName(placementPath, L".lnk", wszTarget, TRUE)) + if (!_GetUniqueFileName(placementPath, L".lnk", wszTarget, TRUE)) { ERR("Error creating unique file name"); hr = E_FAIL; @@ -585,7 +585,7 @@ HRESULT WINAPI CFSDropTarget::_DoDrop(IDataObject *pDataObject, } else { - hr = this->CopyItems(psfFrom, lpcida->cidl, (LPCITEMIDLIST*)apidl, bCopy); + hr = _CopyItems(psfFrom, lpcida->cidl, (LPCITEMIDLIST*)apidl, bCopy); } SHFree(pidl); @@ -601,7 +601,7 @@ HRESULT WINAPI CFSDropTarget::_DoDrop(IDataObject *pDataObject, WCHAR wszTargetPath[MAX_PATH + 1]; LPWSTR pszSrcList; - wcscpy(wszTargetPath, sPathTarget); + wcscpy(wszTargetPath, m_sPathTarget); //Double NULL terminate. wszTargetPath[wcslen(wszTargetPath) + 1] = '\0'; diff --git a/dll/win32/shell32/droptargets/CFSDropTarget.h b/dll/win32/shell32/droptargets/CFSDropTarget.h index e0740d2ee7..c808c6f59d 100644 --- a/dll/win32/shell32/droptargets/CFSDropTarget.h +++ b/dll/win32/shell32/droptargets/CFSDropTarget.h @@ -29,18 +29,18 @@ class CFSDropTarget : public IObjectWithSite { private: - UINT cfShellIDList; /* clipboardformat for IDropTarget */ - BOOL fAcceptFmt; /* flag for pending Drop */ - LPWSTR sPathTarget; + UINT m_cfShellIDList; /* clipboardformat for IDropTarget */ + BOOL m_fAcceptFmt; /* flag for pending Drop */ + LPWSTR m_sPathTarget; HWND m_hwndSite; DWORD m_grfKeyState; DWORD m_dwDefaultEffect; CComPtr<IUnknown> m_site; - BOOL QueryDrop (DWORD dwKeyState, LPDWORD pdwEffect); - virtual HRESULT WINAPI _DoDrop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); - virtual HRESULT WINAPI CopyItems(IShellFolder *pSFFrom, UINT cidl, LPCITEMIDLIST *apidl, BOOL bCopy); - BOOL GetUniqueFileName(LPWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pwszTarget, BOOL bShortcut); + BOOL _QueryDrop (DWORD dwKeyState, LPDWORD pdwEffect); + HRESULT _DoDrop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); + HRESULT _CopyItems(IShellFolder *pSFFrom, UINT cidl, LPCITEMIDLIST *apidl, BOOL bCopy); + BOOL _GetUniqueFileName(LPWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pwszTarget, BOOL bShortcut); static DWORD WINAPI _DoDropThreadProc(LPVOID lpParameter); HRESULT _GetEffectFromMenu(IDataObject *pDataObject, POINTL pt, DWORD *pdwEffect, DWORD dwAvailableEffects); HRESULT _RepositionItems(IShellFolderView *psfv, IDataObject *pDataObject, POINTL pt); @@ -48,7 +48,7 @@ class CFSDropTarget : public: CFSDropTarget(); ~CFSDropTarget(); - HRESULT WINAPI Initialize(LPWSTR PathTarget); + HRESULT Initialize(LPWSTR PathTarget); // IDropTarget virtual HRESULT WINAPI DragEnter(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect);

1 0

01/01: [SHELL32] CDefView: remove a useless print
by Giannis Adamopoulos 17 Feb '18

17 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4b19b1e49d467bf4cbb9b… commit 4b19b1e49d467bf4cbb9b4018ea40f0a7d225b97 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sat Feb 17 21:36:31 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sat Feb 17 21:40:16 2018 +0200 [SHELL32] CDefView: remove a useless print --- dll/win32/shell32/CDefView.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 280be9606a..336b3fc534 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -3066,8 +3066,6 @@ HRESULT WINAPI CDefView::DragLeave() HRESULT WINAPI CDefView::Drop(IDataObject* pDataObject, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect) { - ERR("GetKeyState(VK_LBUTTON): %d\n", GetKeyState(VK_LBUTTON)); - ImageList_DragLeave(m_hWnd); ImageList_EndDrag();

1 0

04/04: [SHELL32] CFSDropTarget: Use copy depending on the source drive Show the default action as the default menu item in the right click menu.
by Giannis Adamopoulos 17 Feb '18

17 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f25b42a3142868c232dc… commit 6f25b42a3142868c232dcb718b188be9e2a6fc9d Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sat Feb 17 13:59:51 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sat Feb 17 20:30:37 2018 +0200 [SHELL32] CFSDropTarget: Use copy depending on the source drive Show the default action as the default menu item in the right click menu. --- dll/win32/shell32/droptargets/CFSDropTarget.cpp | 46 ++++++++++++++++++++++--- dll/win32/shell32/droptargets/CFSDropTarget.h | 3 +- 2 files changed, 43 insertions(+), 6 deletions(-) diff --git a/dll/win32/shell32/droptargets/CFSDropTarget.cpp b/dll/win32/shell32/droptargets/CFSDropTarget.cpp index 3337b455a0..deca859934 100644 --- a/dll/win32/shell32/droptargets/CFSDropTarget.cpp +++ b/dll/win32/shell32/droptargets/CFSDropTarget.cpp @@ -164,7 +164,7 @@ BOOL CFSDropTarget::QueryDrop(DWORD dwKeyState, LPDWORD pdwEffect) /* TODO Windows does different drop effects if dragging across drives. i.e., it will copy instead of move if the directories are on different disks. */ - DWORD dwEffect = DROPEFFECT_MOVE; + DWORD dwEffect = m_dwDefaultEffect; *pdwEffect = DROPEFFECT_NONE; @@ -182,16 +182,32 @@ BOOL CFSDropTarget::QueryDrop(DWORD dwKeyState, LPDWORD pdwEffect) return FALSE; } -HRESULT CFSDropTarget::_GetEffectFromMenu(IDataObject *pDataObject, POINTL pt, DWORD *pdwEffect) +HRESULT CFSDropTarget::_GetEffectFromMenu(IDataObject *pDataObject, POINTL pt, DWORD *pdwEffect, DWORD dwAvailableEffects) { HMENU hmenu = LoadMenuW(shell32_hInstance, MAKEINTRESOURCEW(IDM_DRAGFILE)); if (!hmenu) return E_OUTOFMEMORY; + HMENU hpopupmenu = GetSubMenu(hmenu, 0); + + if ((dwAvailableEffects & DROPEFFECT_COPY) == 0) + DeleteMenu(hpopupmenu, IDM_COPYHERE, MF_BYCOMMAND); + else if ((dwAvailableEffects & DROPEFFECT_MOVE) == 0) + DeleteMenu(hpopupmenu, IDM_MOVEHERE, MF_BYCOMMAND); + else if ((dwAvailableEffects & DROPEFFECT_LINK) == 0) + DeleteMenu(hpopupmenu, IDM_LINKHERE, MF_BYCOMMAND); + + if ((*pdwEffect & DROPEFFECT_COPY)) + SetMenuDefaultItem(hpopupmenu, IDM_COPYHERE, FALSE); + else if ((*pdwEffect & DROPEFFECT_MOVE)) + SetMenuDefaultItem(hpopupmenu, IDM_MOVEHERE, FALSE); + else if ((*pdwEffect & DROPEFFECT_LINK)) + SetMenuDefaultItem(hpopupmenu, IDM_LINKHERE, FALSE); + /* FIXME: We need to support shell extensions here */ - UINT uCommand = TrackPopupMenu(GetSubMenu(hmenu, 0), - TPM_LEFTALIGN | TPM_RETURNCMD | TPM_LEFTBUTTON | TPM_RIGHTBUTTON, + UINT uCommand = TrackPopupMenu(hpopupmenu, + TPM_LEFTALIGN | TPM_RETURNCMD | TPM_LEFTBUTTON | TPM_RIGHTBUTTON | TPM_NONOTIFY, pt.x, pt.y, 0, m_hwndSite, NULL); if (uCommand == 0) return S_FALSE; @@ -263,6 +279,22 @@ HRESULT WINAPI CFSDropTarget::DragEnter(IDataObject *pDataObject, fAcceptFmt = TRUE; m_grfKeyState = dwKeyState; + m_dwDefaultEffect = DROPEFFECT_MOVE; + + STGMEDIUM medium; + if (SUCCEEDED(pDataObject->GetData(&fmt2, &medium))) + { + WCHAR wstrFirstFile[MAX_PATH]; + if (DragQueryFileW((HDROP)medium.hGlobal, 0, wstrFirstFile, _countof(wstrFirstFile))) + { + /* Check if the drive letter is different */ + if (wstrFirstFile[0] != sPathTarget[0]) + { + m_dwDefaultEffect = DROPEFFECT_COPY; + } + } + ReleaseStgMedium(&medium); + } QueryDrop(dwKeyState, pdwEffect); return S_OK; @@ -302,11 +334,15 @@ HRESULT WINAPI CFSDropTarget::Drop(IDataObject *pDataObject, IUnknown_GetWindow(m_site, &m_hwndSite); + DWORD dwAvailableEffects = *pdwEffect; + QueryDrop(dwKeyState, pdwEffect); + TRACE("pdwEffect: 0x%x, m_dwDefaultEffect: 0x%x, dwAvailableEffects: 0x%x\n", *pdwEffect, m_dwDefaultEffect, dwAvailableEffects); + if (m_grfKeyState & MK_RBUTTON) { - HRESULT hr = _GetEffectFromMenu(pDataObject, pt, pdwEffect); + HRESULT hr = _GetEffectFromMenu(pDataObject, pt, pdwEffect, dwAvailableEffects); if (FAILED_UNEXPECTEDLY(hr) || hr == S_FALSE) return hr; } diff --git a/dll/win32/shell32/droptargets/CFSDropTarget.h b/dll/win32/shell32/droptargets/CFSDropTarget.h index 091e60ee33..e0740d2ee7 100644 --- a/dll/win32/shell32/droptargets/CFSDropTarget.h +++ b/dll/win32/shell32/droptargets/CFSDropTarget.h @@ -34,6 +34,7 @@ class CFSDropTarget : LPWSTR sPathTarget; HWND m_hwndSite; DWORD m_grfKeyState; + DWORD m_dwDefaultEffect; CComPtr<IUnknown> m_site; BOOL QueryDrop (DWORD dwKeyState, LPDWORD pdwEffect); @@ -41,7 +42,7 @@ class CFSDropTarget : virtual HRESULT WINAPI CopyItems(IShellFolder *pSFFrom, UINT cidl, LPCITEMIDLIST *apidl, BOOL bCopy); BOOL GetUniqueFileName(LPWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pwszTarget, BOOL bShortcut); static DWORD WINAPI _DoDropThreadProc(LPVOID lpParameter); - HRESULT _GetEffectFromMenu(IDataObject *pDataObject, POINTL pt, DWORD *pdwEffect); + HRESULT _GetEffectFromMenu(IDataObject *pDataObject, POINTL pt, DWORD *pdwEffect, DWORD dwAvailableEffects); HRESULT _RepositionItems(IShellFolderView *psfv, IDataObject *pDataObject, POINTL pt); public:

1 0

03/04: [SHELL32] CFSDropTarget: Initial implementation of right click drag menu
by Giannis Adamopoulos 17 Feb '18

17 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d91269edaf26cbea0195… commit 6d91269edaf26cbea019577b9b14faf7d04a8d33 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Fri Feb 16 20:33:44 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sat Feb 17 20:30:37 2018 +0200 [SHELL32] CFSDropTarget: Initial implementation of right click drag menu --- dll/win32/shell32/droptargets/CFSDropTarget.cpp | 114 +++++++++++++++++++++++- dll/win32/shell32/droptargets/CFSDropTarget.h | 13 ++- 2 files changed, 123 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/droptargets/CFSDropTarget.cpp b/dll/win32/shell32/droptargets/CFSDropTarget.cpp index 468f6c1703..3337b455a0 100644 --- a/dll/win32/shell32/droptargets/CFSDropTarget.cpp +++ b/dll/win32/shell32/droptargets/CFSDropTarget.cpp @@ -83,7 +83,7 @@ HRESULT WINAPI CFSDropTarget::CopyItems(IShellFolder * pSFFrom, UINT cidl, SHFILEOPSTRUCTW op = {0}; op.pFrom = pszSrcList; op.pTo = wszTargetPath; - op.hwnd = GetActiveWindow(); + op.hwnd = m_hwndSite; op.wFunc = bCopy ? FO_COPY : FO_MOVE; op.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR; @@ -100,7 +100,9 @@ HRESULT WINAPI CFSDropTarget::CopyItems(IShellFolder * pSFFrom, UINT cidl, CFSDropTarget::CFSDropTarget(): cfShellIDList(0), fAcceptFmt(FALSE), - sPathTarget(NULL) + sPathTarget(NULL), + m_hwndSite(NULL), + m_grfKeyState(0) { } @@ -180,6 +182,70 @@ BOOL CFSDropTarget::QueryDrop(DWORD dwKeyState, LPDWORD pdwEffect) return FALSE; } +HRESULT CFSDropTarget::_GetEffectFromMenu(IDataObject *pDataObject, POINTL pt, DWORD *pdwEffect) +{ + HMENU hmenu = LoadMenuW(shell32_hInstance, MAKEINTRESOURCEW(IDM_DRAGFILE)); + if (!hmenu) + return E_OUTOFMEMORY; + + /* FIXME: We need to support shell extensions here */ + + UINT uCommand = TrackPopupMenu(GetSubMenu(hmenu, 0), + TPM_LEFTALIGN | TPM_RETURNCMD | TPM_LEFTBUTTON | TPM_RIGHTBUTTON, + pt.x, pt.y, 0, m_hwndSite, NULL); + if (uCommand == 0) + return S_FALSE; + else if (uCommand == IDM_COPYHERE) + *pdwEffect = DROPEFFECT_COPY; + else if (uCommand == IDM_MOVEHERE) + *pdwEffect = DROPEFFECT_MOVE; + else if (uCommand == IDM_LINKHERE) + *pdwEffect = DROPEFFECT_LINK; + + return S_OK; +} + +HRESULT CFSDropTarget::_RepositionItems(IShellFolderView *psfv, IDataObject *pdtobj, POINTL pt) +{ + CComPtr<IFolderView> pfv; + POINT ptDrag; + HRESULT hr = psfv->QueryInterface(IID_PPV_ARG(IFolderView, &pfv)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = psfv->GetDragPoint(&ptDrag); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + PIDLIST_ABSOLUTE pidlFolder; + PUITEMID_CHILD *apidl; + UINT cidl; + hr = SH_GetApidlFromDataObject(pdtobj, &pidlFolder, &apidl, &cidl); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + CComHeapPtr<POINT> apt; + if (!apt.Allocate(cidl)) + { + SHFree(pidlFolder); + _ILFreeaPidl(apidl, cidl); + return E_OUTOFMEMORY; + } + + for (UINT i = 0; i<cidl; i++) + { + pfv->GetItemPosition(apidl[i], &apt[i]); + apt[i].x += pt.x - ptDrag.x; + apt[i].y += pt.y - ptDrag.y; + } + + pfv->SelectAndPositionItems(cidl, apidl, apt, SVSI_SELECT); + + SHFree(pidlFolder); + _ILFreeaPidl(apidl, cidl); + return S_OK; +} + HRESULT WINAPI CFSDropTarget::DragEnter(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) { @@ -196,6 +262,8 @@ HRESULT WINAPI CFSDropTarget::DragEnter(IDataObject *pDataObject, else if (SUCCEEDED(pDataObject->QueryGetData(&fmt2))) fAcceptFmt = TRUE; + m_grfKeyState = dwKeyState; + QueryDrop(dwKeyState, pdwEffect); return S_OK; } @@ -208,6 +276,8 @@ HRESULT WINAPI CFSDropTarget::DragOver(DWORD dwKeyState, POINTL pt, if (!pdwEffect) return E_INVALIDARG; + m_grfKeyState = dwKeyState; + QueryDrop(dwKeyState, pdwEffect); return S_OK; @@ -230,8 +300,28 @@ HRESULT WINAPI CFSDropTarget::Drop(IDataObject *pDataObject, if (!pdwEffect) return E_INVALIDARG; + IUnknown_GetWindow(m_site, &m_hwndSite); + QueryDrop(dwKeyState, pdwEffect); + if (m_grfKeyState & MK_RBUTTON) + { + HRESULT hr = _GetEffectFromMenu(pDataObject, pt, pdwEffect); + if (FAILED_UNEXPECTEDLY(hr) || hr == S_FALSE) + return hr; + } + + if (*pdwEffect == DROPEFFECT_MOVE && m_site) + { + CComPtr<IShellFolderView> psfv; + HRESULT hr = IUnknown_QueryService(m_site, SID_IFolderView, IID_PPV_ARG(IShellFolderView, &psfv)); + if (SUCCEEDED(hr) && psfv->IsDropOnSource(this) == S_OK) + { + _RepositionItems(psfv, pDataObject, pt); + return S_OK; + } + } + BOOL fIsOpAsync = FALSE; CComPtr<IAsyncOperation> pAsyncOperation; @@ -257,6 +347,24 @@ HRESULT WINAPI CFSDropTarget::Drop(IDataObject *pDataObject, return this->_DoDrop(pDataObject, dwKeyState, pt, pdwEffect); } +HRESULT +WINAPI +CFSDropTarget::SetSite(IUnknown *pUnkSite) +{ + m_site = pUnkSite; + return S_OK; +} + +HRESULT +WINAPI +CFSDropTarget::GetSite(REFIID riid, void **ppvSite) +{ + if (!m_site) + return E_FAIL; + + return m_site->QueryInterface(riid, ppvSite); +} + HRESULT WINAPI CFSDropTarget::_DoDrop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) { @@ -474,7 +582,7 @@ HRESULT WINAPI CFSDropTarget::_DoDrop(IDataObject *pDataObject, ZeroMemory(&op, sizeof(op)); op.pFrom = pszSrcList; op.pTo = wszTargetPath; - op.hwnd = GetActiveWindow(); + op.hwnd = m_hwndSite; op.wFunc = bCopy ? FO_COPY : FO_MOVE; op.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR; hr = SHFileOperationW(&op); diff --git a/dll/win32/shell32/droptargets/CFSDropTarget.h b/dll/win32/shell32/droptargets/CFSDropTarget.h index e6c063d02c..091e60ee33 100644 --- a/dll/win32/shell32/droptargets/CFSDropTarget.h +++ b/dll/win32/shell32/droptargets/CFSDropTarget.h @@ -25,18 +25,24 @@ class CFSDropTarget : public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IDropTarget + public IDropTarget, + public IObjectWithSite { private: UINT cfShellIDList; /* clipboardformat for IDropTarget */ BOOL fAcceptFmt; /* flag for pending Drop */ LPWSTR sPathTarget; + HWND m_hwndSite; + DWORD m_grfKeyState; + CComPtr<IUnknown> m_site; BOOL QueryDrop (DWORD dwKeyState, LPDWORD pdwEffect); virtual HRESULT WINAPI _DoDrop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); virtual HRESULT WINAPI CopyItems(IShellFolder *pSFFrom, UINT cidl, LPCITEMIDLIST *apidl, BOOL bCopy); BOOL GetUniqueFileName(LPWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pwszTarget, BOOL bShortcut); static DWORD WINAPI _DoDropThreadProc(LPVOID lpParameter); + HRESULT _GetEffectFromMenu(IDataObject *pDataObject, POINTL pt, DWORD *pdwEffect); + HRESULT _RepositionItems(IShellFolderView *psfv, IDataObject *pDataObject, POINTL pt); public: CFSDropTarget(); @@ -49,12 +55,17 @@ class CFSDropTarget : virtual HRESULT WINAPI DragLeave(); virtual HRESULT WINAPI Drop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); + // IObjectWithSite + virtual HRESULT STDMETHODCALLTYPE SetSite(IUnknown *pUnkSite); + virtual HRESULT STDMETHODCALLTYPE GetSite(REFIID riid, void **ppvSite); + DECLARE_NOT_AGGREGATABLE(CFSDropTarget) DECLARE_PROTECT_FINAL_CONSTRUCT() BEGIN_COM_MAP(CFSDropTarget) COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget) + COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) END_COM_MAP() };

1 0

02/04: [SHELL32] CDefView: Implement several methods needed for drop targets Set the view object as the site of the drop target. Implement GetItemPosition, SelectAndPositionItems, IsDropOnSource, GetDragPoint. Use DROPEFFECT_COPY only when the item supports it.
by Giannis Adamopoulos 17 Feb '18

17 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f8ab050db7fde50f0999… commit 8f8ab050db7fde50f09995f63d580f70645bece8 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sat Feb 17 19:29:20 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sat Feb 17 20:30:37 2018 +0200 [SHELL32] CDefView: Implement several methods needed for drop targets Set the view object as the site of the drop target. Implement GetItemPosition, SelectAndPositionItems, IsDropOnSource, GetDragPoint. Use DROPEFFECT_COPY only when the item supports it. --- dll/win32/shell32/CDefView.cpp | 62 +++++++++++++++++++++++++++++++----------- 1 file changed, 46 insertions(+), 16 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index c3d37e5c0e..280be9606a 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -101,6 +101,7 @@ class CDefView : UINT m_cScrollDelay; /* Send a WM_*SCROLL msg every 250 ms during drag-scroll */ POINT m_ptLastMousePos; /* Mouse position at last DragOver call */ POINT m_ptFirstMousePos; /* Mouse position when the drag operation started */ + DWORD m_grfKeyState; // CComPtr<IContextMenu> m_pCM; @@ -1765,8 +1766,8 @@ LRESULT CDefView::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl if (GetSelections()) { CComPtr<IDataObject> pda; - DWORD dwAttributes = SFGAO_CANLINK; - DWORD dwEffect = DROPEFFECT_COPY | DROPEFFECT_MOVE; + DWORD dwAttributes = SFGAO_CANCOPY | SFGAO_CANLINK; + DWORD dwEffect = DROPEFFECT_MOVE; if (SUCCEEDED(m_pSFParent->GetUIObjectOf(m_hWnd, m_cidl, m_apidl, IID_NULL_PPV_ARG(IDataObject, &pda)))) { @@ -1774,10 +1775,7 @@ LRESULT CDefView::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl if (SUCCEEDED(m_pSFParent->GetAttributesOf(m_cidl, m_apidl, &dwAttributes))) { - if (dwAttributes & SFGAO_CANLINK) - { - dwEffect |= DROPEFFECT_LINK; - } + dwEffect |= dwAttributes & (SFGAO_CANCOPY | SFGAO_CANLINK); } CComPtr<IAsyncOperation> piaso; @@ -2423,7 +2421,12 @@ HRESULT STDMETHODCALLTYPE CDefView::GetFocusedItem(int *piItem) HRESULT STDMETHODCALLTYPE CDefView::GetItemPosition(PCUITEMID_CHILD pidl, POINT *ppt) { - return E_NOTIMPL; + int lvIndex = LV_FindItemByPidl(pidl); + if (lvIndex == -1 || ppt == NULL) + return E_INVALIDARG; + + m_ListView.GetItemPosition(lvIndex, ppt); + return S_OK; } HRESULT STDMETHODCALLTYPE CDefView::GetSpacing(POINT *ppt) @@ -2488,7 +2491,21 @@ HRESULT STDMETHODCALLTYPE CDefView::SelectItem(int iItem, DWORD dwFlags) HRESULT STDMETHODCALLTYPE CDefView::SelectAndPositionItems(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, POINT *apt, DWORD dwFlags) { - return E_NOTIMPL; + /* Reset the selection */ + m_ListView.SetItemState(-1, 0, LVIS_SELECTED); + + int lvIndex; + for (UINT i = 0 ; i < m_cidl; i++) + { + lvIndex = LV_FindItemByPidl(apidl[i]); + if (lvIndex != -1) + { + SelectItem(lvIndex, dwFlags); + m_ListView.SetItemPosition(lvIndex, &apt[i]); + } + } + + return S_OK; } /********************************************************** @@ -2717,14 +2734,22 @@ HRESULT STDMETHODCALLTYPE CDefView::GetSelectedObjects(PCUITEMID_CHILD **pidl, U HRESULT STDMETHODCALLTYPE CDefView::IsDropOnSource(IDropTarget *drop_target) { - FIXME("(%p)->(%p) stub\n", this, drop_target); - return E_NOTIMPL; + if ((m_iDragOverItem == -1 || m_pCurDropTarget == NULL) && + (m_pSourceDataObject.p)) + { + return S_OK; + } + + return S_FALSE; } HRESULT STDMETHODCALLTYPE CDefView::GetDragPoint(POINT *pt) { - FIXME("(%p)->(%p) stub\n", this, pt); - return E_NOTIMPL; + if (!pt) + return E_INVALIDARG; + + *pt = m_ptFirstMousePos; + return S_OK; } HRESULT STDMETHODCALLTYPE CDefView::GetDropPoint(POINT *pt) @@ -2887,6 +2912,11 @@ HRESULT CDefView::drag_notify_subitem(DWORD grfKeyState, POINTL pt, DWORD *pdwEf HRESULT hr; RECT clientRect; + /* The key state on drop doesn't have MK_LBUTTON or MK_RBUTTON because it + reflects the key state after the user released the button, so we need + to remember the last key state when the button was pressed */ + m_grfKeyState = grfKeyState; + /* Map from global to client coordinates and query the index of the listview-item, which is * currently under the mouse cursor. */ LVHITTESTINFO htinfo = {{pt.x, pt.y}, LVHT_ONITEM}; @@ -2972,6 +3002,8 @@ HRESULT CDefView::drag_notify_subitem(DWORD grfKeyState, POINTL pt, DWORD *pdwEf hr = m_pSFParent->GetUIObjectOf(m_ListView, 1, &pidl, IID_NULL_PPV_ARG(IDropTarget, &m_pCurDropTarget)); } + IUnknown_SetSite(m_pCurDropTarget, (IShellView *)this); + /* If anything failed, m_pCurDropTarget should be NULL now, which ought to be a save state. */ if (FAILED(hr)) { @@ -3039,11 +3071,9 @@ HRESULT WINAPI CDefView::Drop(IDataObject* pDataObject, DWORD grfKeyState, POINT ImageList_DragLeave(m_hWnd); ImageList_EndDrag(); - if ((m_iDragOverItem == -1 || m_pCurDropTarget == NULL) && + if ((IsDropOnSource(NULL) == S_OK) && (*pdwEffect & DROPEFFECT_MOVE) && - /*(GetKeyState(VK_LBUTTON) != 0) &&*/ - (m_pSourceDataObject.p) && - (SHIsSameObject(pDataObject, m_pSourceDataObject))) + (m_grfKeyState & MK_LBUTTON)) { if (m_pCurDropTarget) {

1 0

01/04: [SHELL32] Add menu resource which is used when dragging files with right click
by Giannis Adamopoulos 17 Feb '18

17 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5bef945cc9ef223f9c85e… commit 5bef945cc9ef223f9c85ededcbfa8f5f9410dcb9 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sat Feb 17 19:18:43 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sat Feb 17 20:30:37 2018 +0200 [SHELL32] Add menu resource which is used when dragging files with right click --- dll/win32/shell32/lang/bg-BG.rc | 12 ++++++++++++ dll/win32/shell32/lang/ca-ES.rc | 12 ++++++++++++ dll/win32/shell32/lang/cs-CZ.rc | 12 ++++++++++++ dll/win32/shell32/lang/da-DK.rc | 12 ++++++++++++ dll/win32/shell32/lang/de-DE.rc | 12 ++++++++++++ dll/win32/shell32/lang/el-GR.rc | 12 ++++++++++++ dll/win32/shell32/lang/en-GB.rc | 12 ++++++++++++ dll/win32/shell32/lang/en-US.rc | 12 ++++++++++++ dll/win32/shell32/lang/es-ES.rc | 12 ++++++++++++ dll/win32/shell32/lang/et-EE.rc | 12 ++++++++++++ dll/win32/shell32/lang/fi-FI.rc | 12 ++++++++++++ dll/win32/shell32/lang/fr-FR.rc | 12 ++++++++++++ dll/win32/shell32/lang/he-IL.rc | 12 ++++++++++++ dll/win32/shell32/lang/hu-HU.rc | 12 ++++++++++++ dll/win32/shell32/lang/it-IT.rc | 12 ++++++++++++ dll/win32/shell32/lang/ja-JP.rc | 12 ++++++++++++ dll/win32/shell32/lang/ko-KR.rc | 12 ++++++++++++ dll/win32/shell32/lang/nl-NL.rc | 12 ++++++++++++ dll/win32/shell32/lang/no-NO.rc | 12 ++++++++++++ dll/win32/shell32/lang/pl-PL.rc | 12 ++++++++++++ dll/win32/shell32/lang/pt-BR.rc | 12 ++++++++++++ dll/win32/shell32/lang/pt-PT.rc | 12 ++++++++++++ dll/win32/shell32/lang/ro-RO.rc | 12 ++++++++++++ dll/win32/shell32/lang/ru-RU.rc | 12 ++++++++++++ dll/win32/shell32/lang/sk-SK.rc | 12 ++++++++++++ dll/win32/shell32/lang/sl-SI.rc | 12 ++++++++++++ dll/win32/shell32/lang/sq-AL.rc | 12 ++++++++++++ dll/win32/shell32/lang/sv-SE.rc | 12 ++++++++++++ dll/win32/shell32/lang/tr-TR.rc | 12 ++++++++++++ dll/win32/shell32/lang/uk-UA.rc | 12 ++++++++++++ dll/win32/shell32/lang/zh-CN.rc | 12 ++++++++++++ dll/win32/shell32/lang/zh-TW.rc | 12 ++++++++++++ dll/win32/shell32/shresdef.h | 7 +++++++ 33 files changed, 391 insertions(+) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index f970f1691c..e4875ae6dd 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -75,6 +75,18 @@ BEGIN END END +IDM_DRAGFILE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Copy here", IDM_COPYHERE + MENUITEM "&Move here", IDM_MOVEHERE + MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM SEPARATOR + MENUITEM "Cancel", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Търсене на папка" diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 2041c2754d..78946e4cc1 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -75,6 +75,18 @@ BEGIN END END +IDM_DRAGFILE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Copy here", IDM_COPYHERE + MENUITEM "&Move here", IDM_MOVEHERE + MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM SEPARATOR + MENUITEM "Cancel", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 7f66bab239..22721fe890 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -81,6 +81,18 @@ BEGIN END END +IDM_DRAGFILE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Copy here", IDM_COPYHERE + MENUITEM "&Move here", IDM_MOVEHERE + MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM SEPARATOR + MENUITEM "Cancel", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Procházet..." diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 81f8cb4d2d..dcafd7f168 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -81,6 +81,18 @@ BEGIN END END +IDM_DRAGFILE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Copy here", IDM_COPYHERE + MENUITEM "&Move here", IDM_MOVEHERE + MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM SEPARATOR + MENUITEM "Cancel", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Søg efter Mappe" diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index ef31156bc1..30031c9195 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -75,6 +75,18 @@ BEGIN END END +IDM_DRAGFILE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Copy here", IDM_COPYHERE + MENUITEM "&Move here", IDM_MOVEHERE + MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM SEPARATOR + MENUITEM "Cancel", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Verzeichnis auswählen" diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index cb26eadf5e..8f18322098 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -75,6 +75,18 @@ BEGIN END END +IDM_DRAGFILE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Copy here", IDM_COPYHERE + MENUITEM "&Move here", IDM_MOVEHERE + MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM SEPARATOR + MENUITEM "Cancel", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Αναζήτηση φακέλου" diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index ef0d77d766..95ea0554d4 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -75,6 +75,18 @@ BEGIN END END +IDM_DRAGFILE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Copy here", IDM_COPYHERE + MENUITEM "&Move here", IDM_MOVEHERE + MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM SEPARATOR + MENUITEM "Cancel", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index 8678ac9da2..03b5eb1aa5 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -76,6 +76,18 @@ BEGIN END END +IDM_DRAGFILE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Copy here", IDM_COPYHERE + MENUITEM "&Move here", IDM_MOVEHERE + MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM SEPARATOR + MENUITEM "Cancel", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index 223315d81a..c43a4c98e4 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -77,6 +77,18 @@ BEGIN END END +IDM_DRAGFILE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Copy here", IDM_COPYHERE + MENUITEM "&Move here", IDM_MOVEHERE + MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM SEPARATOR + MENUITEM "Cancel", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Explorar carpeta" diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 0439394598..4acbe06a3b 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -83,6 +83,18 @@ BEGIN END END +IDM_DRAGFILE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Copy here", IDM_COPYHERE + MENUITEM "&Move here", IDM_MOVEHERE + MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM SEPARATOR + MENUITEM "Cancel", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index d3f8e5006b..f20f3c046a 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -75,6 +75,18 @@ BEGIN END END +IDM_DRAGFILE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Copy here", IDM_COPYHERE + MENUITEM "&Move here", IDM_MOVEHERE + MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM SEPARATOR + MENUITEM "Cancel", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Valitse Kansio" diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 7d636bf2e3..20beb111ba 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -75,6 +75,18 @@ BEGIN END END +IDM_DRAGFILE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Copy here", IDM_COPYHERE + MENUITEM "&Move here", IDM_MOVEHERE + MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM SEPARATOR + MENUITEM "Cancel", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Parcourir" diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index a430a45de1..2ff9d0c04b 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -75,6 +75,18 @@ BEGIN END END +IDM_DRAGFILE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Copy here", IDM_COPYHERE + MENUITEM "&Move here", IDM_MOVEHERE + MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM SEPARATOR + MENUITEM "Cancel", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "בחירת תיקיה" diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index ede65d3df2..defd1cb52e 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -75,6 +75,18 @@ BEGIN END END +IDM_DRAGFILE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Copy here", IDM_COPYHERE + MENUITEM "&Move here", IDM_MOVEHERE + MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM SEPARATOR + MENUITEM "Cancel", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Mappák böngészése" diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index ad5af13266..7ea9d55d4f 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -75,6 +75,18 @@ BEGIN END END +IDM_DRAGFILE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Copy here", IDM_COPYHERE + MENUITEM "&Move here", IDM_MOVEHERE + MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM SEPARATOR + MENUITEM "Cancel", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Sfoglia Cartella" diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 90788a57b7..b4045fb2c3 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -75,6 +75,18 @@ BEGIN END END +IDM_DRAGFILE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Copy here", IDM_COPYHERE + MENUITEM "&Move here", IDM_MOVEHERE + MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM SEPARATOR + MENUITEM "Cancel", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "フォルダの参照" diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 62919b77c0..15174d4bca 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -75,6 +75,18 @@ BEGIN END END +IDM_DRAGFILE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Copy here", IDM_COPYHERE + MENUITEM "&Move here", IDM_MOVEHERE + MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM SEPARATOR + MENUITEM "Cancel", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index a84107d622..70cfae49da 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -75,6 +75,18 @@ BEGIN END END +IDM_DRAGFILE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Copy here", IDM_COPYHERE + MENUITEM "&Move here", IDM_MOVEHERE + MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM SEPARATOR + MENUITEM "Cancel", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 234da19a2f..aca7f9fd68 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -75,6 +75,18 @@ BEGIN END END +IDM_DRAGFILE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Copy here", IDM_COPYHERE + MENUITEM "&Move here", IDM_MOVEHERE + MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM SEPARATOR + MENUITEM "Cancel", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Bla etter mappe" diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 120bd0300f..a91fb1d82c 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -80,6 +80,18 @@ BEGIN END END +IDM_DRAGFILE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Copy here", IDM_COPYHERE + MENUITEM "&Move here", IDM_MOVEHERE + MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM SEPARATOR + MENUITEM "Cancel", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Wybierz folder" diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index f28f300c32..c63193da8d 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -75,6 +75,18 @@ BEGIN END END +IDM_DRAGFILE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Copy here", IDM_COPYHERE + MENUITEM "&Move here", IDM_MOVEHERE + MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM SEPARATOR + MENUITEM "Cancel", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Procurar pasta" diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 2b9c35cc56..75a34adea6 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -75,6 +75,18 @@ BEGIN END END +IDM_DRAGFILE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Copy here", IDM_COPYHERE + MENUITEM "&Move here", IDM_MOVEHERE + MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM SEPARATOR + MENUITEM "Cancel", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Procurar Pastas" diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index b390cd0ed0..39413f1ec9 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -77,6 +77,18 @@ BEGIN END END +IDM_DRAGFILE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Copy here", IDM_COPYHERE + MENUITEM "&Move here", IDM_MOVEHERE + MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM SEPARATOR + MENUITEM "Cancel", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Specificare dosar" diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index d544087334..7af9e803ab 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -77,6 +77,18 @@ BEGIN END END +IDM_DRAGFILE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Copy here", IDM_COPYHERE + MENUITEM "&Move here", IDM_MOVEHERE + MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM SEPARATOR + MENUITEM "Cancel", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Обзор" diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index ea3db6ad3e..ca6165eb8c 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -75,6 +75,18 @@ BEGIN END END +IDM_DRAGFILE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Copy here", IDM_COPYHERE + MENUITEM "&Move here", IDM_MOVEHERE + MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM SEPARATOR + MENUITEM "Cancel", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index 6a5eacd992..c01dd18118 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -75,6 +75,18 @@ BEGIN END END +IDM_DRAGFILE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Copy here", IDM_COPYHERE + MENUITEM "&Move here", IDM_MOVEHERE + MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM SEPARATOR + MENUITEM "Cancel", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 4edc13300f..bf831bf7e3 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -79,6 +79,18 @@ BEGIN END END +IDM_DRAGFILE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Copy here", IDM_COPYHERE + MENUITEM "&Move here", IDM_MOVEHERE + MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM SEPARATOR + MENUITEM "Cancel", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Shfleto për Dosje" diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index fc440135fe..257ccc9e25 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -75,6 +75,18 @@ BEGIN END END +IDM_DRAGFILE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Copy here", IDM_COPYHERE + MENUITEM "&Move here", IDM_MOVEHERE + MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM SEPARATOR + MENUITEM "Cancel", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Bläddra efter mapp" diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index d1d53dd908..f91d2e37b1 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -77,6 +77,18 @@ BEGIN END END +IDM_DRAGFILE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Copy here", IDM_COPYHERE + MENUITEM "&Move here", IDM_MOVEHERE + MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM SEPARATOR + MENUITEM "Cancel", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Dizin İçin Göz At" diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index 50d33254d0..4230b0eb0b 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -75,6 +75,18 @@ BEGIN END END +IDM_DRAGFILE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Copy here", IDM_COPYHERE + MENUITEM "&Move here", IDM_MOVEHERE + MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM SEPARATOR + MENUITEM "Cancel", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Огляд тек" diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 0a0a401453..b0aed09fcb 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -85,6 +85,18 @@ BEGIN END END +IDM_DRAGFILE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Copy here", IDM_COPYHERE + MENUITEM "&Move here", IDM_MOVEHERE + MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM SEPARATOR + MENUITEM "Cancel", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "浏览文件夹" diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index 515c41c7de..4c348c180b 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -83,6 +83,18 @@ BEGIN END END +IDM_DRAGFILE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Copy here", IDM_COPYHERE + MENUITEM "&Move here", IDM_MOVEHERE + MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM SEPARATOR + MENUITEM "Cancel", 0 + END +END + IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index 53e4896713..5508e3f1d9 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -662,6 +662,13 @@ #define IDM_RENAME (FCIDM_SHVIEW_RENAME - 0x7000) #define IDM_PROPERTIES (FCIDM_SHVIEW_PROPERTIES - 0x7000) +#define IDM_DRAGFILE 0xce +#define IDM_COPYHERE 0x7 +#define IDM_MOVEHERE 0x8 +#define IDM_LINKHERE 0xB + + + /* Registrar scripts (RGS) */ #define IDR_ADMINFOLDERSHORTCUT 128 #define IDR_CONTROLPANEL 130

1 0

01/01: [SC] Implement missing query/queryex options - PrintService: Print optional display name. - MainUsage: Print missing query options. - Parse query options and use them to enumerate services.
by Eric Kohl 17 Feb '18

17 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=47281571546797043d7f5… commit 47281571546797043d7f5dad0bf5da5372055274 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Feb 17 19:26:06 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Feb 17 19:28:16 2018 +0100 [SC] Implement missing query/queryex options - PrintService: Print optional display name. - MainUsage: Print missing query options. - Parse query options and use them to enumerate services. --- base/applications/sc/control.c | 1 + base/applications/sc/print.c | 4 + base/applications/sc/query.c | 361 ++++++++++++++++++++++++++++------------- base/applications/sc/sc.h | 2 +- base/applications/sc/start.c | 1 + base/applications/sc/usage.c | 8 +- 6 files changed, 261 insertions(+), 116 deletions(-) diff --git a/base/applications/sc/control.c b/base/applications/sc/control.c index de212dd230..5e5a4e84ac 100644 --- a/base/applications/sc/control.c +++ b/base/applications/sc/control.c @@ -96,6 +96,7 @@ Control(DWORD Control, StatusEx.dwServiceFlags = 0; PrintService(ServiceName, + NULL, &StatusEx, FALSE); diff --git a/base/applications/sc/print.c b/base/applications/sc/print.c index caf82a4ae6..f08402207f 100644 --- a/base/applications/sc/print.c +++ b/base/applications/sc/print.c @@ -11,11 +11,15 @@ VOID PrintService(LPCTSTR lpServiceName, + LPCTSTR lpDisplayName, LPSERVICE_STATUS_PROCESS pStatus, BOOL bExtended) { _tprintf(_T("SERVICE_NAME: %s\n"), lpServiceName); + if (lpDisplayName) + _tprintf(_T("DISPLAY_NAME: %s\n"), lpDisplayName); + // Re-use PrintServiceStatus(), as SERVICE_STATUS_PROCESS is in fact an extension of SERVICE_STATUS. PrintServiceStatus((LPSERVICE_STATUS)pStatus); diff --git a/base/applications/sc/query.c b/base/applications/sc/query.c index d9d925f3ec..54e04277b2 100644 --- a/base/applications/sc/query.c +++ b/base/applications/sc/query.c @@ -4,25 +4,11 @@ * FILE: base/applications/sc/query.c * PURPOSE: queries service info * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> - * - */ -/* - * TODO: - * Allow calling of 2 options e.g.: - * type= driver state= inactive + * Copyright 2018 Eric Kohl <eric.kohl(a)reactos.org> */ #include "sc.h" -LPTSTR QueryOpts[] = { - _T("type="), - _T("state="), - _T("bufsize="), - _T("ri="), - _T("group="), -}; - - LPSERVICE_STATUS_PROCESS QueryService(LPCTSTR ServiceName) { @@ -84,17 +70,20 @@ fail: } -static BOOL +static +DWORD EnumServices(ENUM_SERVICE_STATUS_PROCESS **pServiceStatus, - DWORD ServiceType, - DWORD ServiceState) + DWORD dwServiceType, + DWORD dwServiceState, + DWORD dwBufferSize, + DWORD dwResumeIndex, + LPCTSTR pszGroupName) { SC_HANDLE hSCManager; - DWORD BufSize = 0; DWORD BytesNeeded = 0; - DWORD ResumeHandle = 0; + DWORD ResumeHandle = dwResumeIndex; DWORD NumServices = 0; - DWORD Ret; + BOOL Ret; hSCManager = OpenSCManager(NULL, NULL, @@ -102,42 +91,49 @@ EnumServices(ENUM_SERVICE_STATUS_PROCESS **pServiceStatus, if (hSCManager == NULL) { ReportLastError(); - return FALSE; + return 0; } - Ret = EnumServicesStatusEx(hSCManager, - SC_ENUM_PROCESS_INFO, - ServiceType, - ServiceState, - (LPBYTE)*pServiceStatus, - BufSize, - &BytesNeeded, - &NumServices, - &ResumeHandle, - 0); - - if ((Ret == 0) && (GetLastError() == ERROR_MORE_DATA)) + if (dwBufferSize == 0) { - *pServiceStatus = (ENUM_SERVICE_STATUS_PROCESS *) - HeapAlloc(GetProcessHeap(), - 0, - BytesNeeded); - if (*pServiceStatus != NULL) + Ret = EnumServicesStatusEx(hSCManager, + SC_ENUM_PROCESS_INFO, + dwServiceType, + dwServiceState, + (LPBYTE)*pServiceStatus, + dwBufferSize, + &BytesNeeded, + &NumServices, + &ResumeHandle, + pszGroupName); + if ((Ret == 0) && (GetLastError() != ERROR_MORE_DATA)) { - if (EnumServicesStatusEx(hSCManager, - SC_ENUM_PROCESS_INFO, - ServiceType, - ServiceState, - (LPBYTE)*pServiceStatus, - BytesNeeded, - &BytesNeeded, - &NumServices, - &ResumeHandle, - 0)) - { - CloseServiceHandle(hSCManager); - return NumServices; - } + ReportLastError(); + return 0; + } + + dwBufferSize = BytesNeeded; + } + + *pServiceStatus = (ENUM_SERVICE_STATUS_PROCESS *) + HeapAlloc(GetProcessHeap(), + 0, + dwBufferSize); + if (*pServiceStatus != NULL) + { + if (EnumServicesStatusEx(hSCManager, + SC_ENUM_PROCESS_INFO, + dwServiceType, + dwServiceState, + (LPBYTE)*pServiceStatus, + dwBufferSize, + &BytesNeeded, + &NumServices, + &ResumeHandle, + pszGroupName)) + { + CloseServiceHandle(hSCManager); + return NumServices; } } @@ -151,6 +147,147 @@ EnumServices(ENUM_SERVICE_STATUS_PROCESS **pServiceStatus, } +static +BOOL +ParseQueryArguments( + IN LPCTSTR *ServiceArgs, + IN INT ArgCount, + OUT PDWORD pdwServiceType, + OUT PDWORD pdwServiceState, + OUT PDWORD pdwBufferSize, + OUT PDWORD pdwResumeIndex, + OUT LPCTSTR *ppszGroupName, + OUT LPCTSTR *ppszServiceName) +{ + INT TmpCount, TmpIndex; + DWORD dwValue; + + TmpCount = ArgCount; + TmpIndex = 0; + while (TmpCount > 0) + { + if (!lstrcmpi(ServiceArgs[TmpIndex], _T("type="))) + { + TmpIndex++; + TmpCount--; + + if (TmpCount > 0) + { + if (!lstrcmpi(ServiceArgs[TmpIndex], _T("service"))) + { + *pdwServiceType = SERVICE_WIN32; + } + else if (!lstrcmpi(ServiceArgs[TmpIndex], _T("driver"))) + { + *pdwServiceType = SERVICE_DRIVER; + } + else if (!lstrcmpi(ServiceArgs[TmpIndex], _T("all"))) + { + *pdwServiceType = SERVICE_TYPE_ALL; + } + else if (!lstrcmpi(ServiceArgs[TmpIndex], _T("interact"))) + { + *pdwServiceType |= SERVICE_INTERACTIVE_PROCESS; + } + else + { + _tprintf(_T("ERROR following \"type=\"!\nMust be \"driver\" or \"service\"\n")); + return FALSE; + } + + TmpIndex++; + TmpCount--; + } + } + else if (!lstrcmpi(ServiceArgs[TmpIndex], _T("state="))) + { + TmpIndex++; + TmpCount--; + + if (TmpCount > 0) + { + if (!lstrcmpi(ServiceArgs[TmpIndex], _T("active"))) + { + *pdwServiceState = SERVICE_ACTIVE; + } + else if (!lstrcmpi(ServiceArgs[TmpIndex], _T("inactive"))) + { + *pdwServiceState = SERVICE_INACTIVE; + } + else if (!lstrcmpi(ServiceArgs[TmpIndex], _T("all"))) + { + *pdwServiceState = SERVICE_STATE_ALL; + } + else + { + _tprintf(_T("ERROR following \"state=\"!\nMust be \"inactive\" or \"all\"\n")); + return FALSE; + } + + TmpIndex++; + TmpCount--; + } + } + else if (!lstrcmpi(ServiceArgs[TmpIndex], _T("bufsize="))) + { + TmpIndex++; + TmpCount--; + + if (TmpCount > 0) + { + dwValue = _tcstoul(ServiceArgs[TmpIndex], NULL, 10); + if (dwValue > 0) + { + *pdwBufferSize = dwValue; + } + + TmpIndex++; + TmpCount--; + } + } + else if (!lstrcmpi(ServiceArgs[TmpIndex], _T("ri="))) + { + TmpIndex++; + TmpCount--; + + if (TmpCount >= 0) + { + dwValue = _tcstoul(ServiceArgs[TmpIndex], NULL, 10); + if (dwValue > 0) + { + *pdwResumeIndex = dwValue; + } + + TmpIndex++; + TmpCount--; + } + } + else if (!lstrcmpi(ServiceArgs[TmpIndex], _T("group="))) + { + TmpIndex++; + TmpCount--; + + if (TmpCount > 0) + { + *ppszGroupName = ServiceArgs[TmpIndex]; + + TmpIndex++; + TmpCount--; + } + } + else + { + *ppszServiceName = ServiceArgs[TmpIndex]; + + TmpIndex++; + TmpCount--; + } + } + + return TRUE; +} + + BOOL Query(LPCTSTR *ServiceArgs, DWORD ArgCount, @@ -158,17 +295,18 @@ Query(LPCTSTR *ServiceArgs, { LPENUM_SERVICE_STATUS_PROCESS pServiceStatus = NULL; DWORD NumServices = 0; - //DWORD ServiceType; - //DWORD ServiceState; - BOOL bServiceName = TRUE; - DWORD OptSize, i; - - LPCTSTR *TmpArgs; - INT TmpCnt; + DWORD dwServiceType = SERVICE_WIN32; + DWORD dwServiceState = SERVICE_ACTIVE; + DWORD dwBufferSize = 0; + DWORD dwResumeIndex = 0; + LPCTSTR pszGroupName = NULL; + LPCTSTR pszServiceName = NULL; + DWORD i; #ifdef SCDBG - TmpArgs = ServiceArgs; - TmpCnt = ArgCount; + LPCTSTR *TmpArgs = ServiceArgs; + INT TmpCnt = ArgCount; + _tprintf(_T("Arguments:\n")); while (TmpCnt) { @@ -179,66 +317,69 @@ Query(LPCTSTR *ServiceArgs, _tprintf(_T("\n")); #endif /* SCDBG */ - /* display all running services and drivers */ - if (ArgCount == 0) - { - NumServices = EnumServices(&pServiceStatus, - SERVICE_WIN32, - SERVICE_ACTIVE); - - if (NumServices != 0) - { - for (i=0; i < NumServices; i++) - { - PrintService(pServiceStatus[i].lpServiceName, - &pServiceStatus[i].ServiceStatusProcess, - bExtended); - } - - _tprintf(_T("number : %lu\n"), NumServices); - - if (pServiceStatus) - HeapFree(GetProcessHeap(), 0, pServiceStatus); - - return TRUE; - } - + /* Parse arguments */ + if (!ParseQueryArguments(ServiceArgs, + ArgCount, + &dwServiceType, + &dwServiceState, + &dwBufferSize, + &dwResumeIndex, + &pszGroupName, + &pszServiceName)) return FALSE; - } - TmpArgs = ServiceArgs; - TmpCnt = ArgCount; - OptSize = sizeof(QueryOpts) / sizeof(QueryOpts[0]); - while (TmpCnt--) +#ifdef SCDBG + _tprintf(_T("Service type: %lx\n"), dwServiceType); + _tprintf(_T("Service state: %lx\n"), dwServiceState); + _tprintf(_T("Buffer size: %lu\n"), dwBufferSize); + _tprintf(_T("Resume index: %lu\n"), dwResumeIndex); + _tprintf(_T("Group name: %s\n"), pszGroupName); + _tprintf(_T("Service name: %s\n"), pszServiceName); +#endif + + if (pszServiceName) { - for (i=0; i < OptSize; i++) - { - if (!lstrcmpi(*TmpArgs, QueryOpts[i])) - { - bServiceName = FALSE; - } - } - TmpArgs++; - } - - - /* FIXME: parse options */ - + /* Print only the requested service */ - /* print only the service requested */ - if (bServiceName) - { LPSERVICE_STATUS_PROCESS pStatus; - LPCTSTR ServiceName = *ServiceArgs; - pStatus = QueryService(ServiceName); + pStatus = QueryService(pszServiceName); if (pStatus) { - PrintService(ServiceName, + PrintService(pszServiceName, + NULL, pStatus, bExtended); } } + else + { + /* Print all matching services */ + + NumServices = EnumServices(&pServiceStatus, + dwServiceType, + dwServiceState, + dwBufferSize, + dwResumeIndex, + pszGroupName); + if (NumServices == 0) + return FALSE; + + for (i = 0; i < NumServices; i++) + { + PrintService(pServiceStatus[i].lpServiceName, + pServiceStatus[i].lpDisplayName, + &pServiceStatus[i].ServiceStatusProcess, + bExtended); + } + +#ifdef SCDBG + _tprintf(_T("number : %lu\n"), NumServices); +#endif + + if (pServiceStatus) + HeapFree(GetProcessHeap(), 0, pServiceStatus); + } return TRUE; } diff --git a/base/applications/sc/sc.h b/base/applications/sc/sc.h index 3dbacee0c8..a896da6855 100644 --- a/base/applications/sc/sc.h +++ b/base/applications/sc/sc.h @@ -56,7 +56,7 @@ BOOL GetKeyName(LPCTSTR ServiceName); BOOL EnumDepend(LPCTSTR ServiceName); /* print and error functions */ -VOID PrintService(LPCTSTR ServiceName, LPSERVICE_STATUS_PROCESS pStatus, BOOL bExtended); +VOID PrintService(LPCTSTR ServiceName, LPCTSTR DisplayName, LPSERVICE_STATUS_PROCESS pStatus, BOOL bExtended); VOID PrintServiceStatus(LPSERVICE_STATUS pStatus); VOID ReportLastError(VOID); diff --git a/base/applications/sc/start.c b/base/applications/sc/start.c index 676355ce2f..598a6355c7 100644 --- a/base/applications/sc/start.c +++ b/base/applications/sc/start.c @@ -68,6 +68,7 @@ BOOL Start(LPCTSTR ServiceName, LPCTSTR *ServiceArgs, INT ArgCount) if (pServiceInfo != NULL) { PrintService(ServiceName, + NULL, pServiceInfo, TRUE); diff --git a/base/applications/sc/usage.c b/base/applications/sc/usage.c index 4bcf049f9d..d04907d212 100644 --- a/base/applications/sc/usage.c +++ b/base/applications/sc/usage.c @@ -68,14 +68,12 @@ VOID MainUsage(VOID) _T(" (default = service)\n") _T(" state= State of services to enumerate (inactive, all)\n") _T(" (default = active)\n") -/* _T(" bufsize= The size (in bytes) of the enumeration buffer\n") _T(" (default = 4096)\n") _T(" ri= The resume index number at which to begin the enumeration\n") _T(" (default = 0)\n") _T(" group= Service group to enumerate\n") _T(" (default = all groups)\n") -*/ _T("SYNTAX EXAMPLES\n") _T("sc query - Enumerates status for active services & drivers\n") _T("sc query messenger - Displays status for the messenger service\n") @@ -83,9 +81,9 @@ VOID MainUsage(VOID) _T("sc query type= driver - Enumerates only active drivers\n") _T("sc query type= service - Enumerates only Win32 services\n") _T("sc query state= all - Enumerates all services & drivers\n") -// _T("sc query bufsize= 50 - Enumerates with a 50 byte buffer.\n") -// _T("sc query ri= 14 - Enumerates with resume index = 14\n") -// _T("sc queryex group= "" - Enumerates active services not in a group\n") + _T("sc query bufsize= 50 - Enumerates with a 50 byte buffer.\n") + _T("sc query ri= 14 - Enumerates with resume index = 14\n") + _T("sc queryex group= "" - Enumerates active services not in a group\n") _T("sc query type= service type= interact - Enumerates all interactive services\n") _T("sc query type= driver group= NDIS - Enumerates all NDIS drivers\n")); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs