[gadamopoulos] 68915: [SHELL32] - CNewMenu: Get the folder path from the pidl passed in the Initialize method. No need to query the defview for that. - Dont use a reactos only interface to create a...
Author: gadamopoulos Date: Wed Sep 2 13:14:46 2015 New Revision: 68915
URL: http://svn.reactos.org/svn/reactos?rev=68915&view=rev Log: [SHELL32] - CNewMenu: Get the folder path from the pidl passed in the Initialize method. No need to query the defview for that. - Dont use a reactos only interface to create a new directory. Prefer to do it with less code using exported functions. - Add a new SelectNewItem method that is used when creating a new file or directory. - Apply same fix for browse for folder dialog.
Modified: trunk/reactos/dll/win32/shell32/CNewMenu.cpp trunk/reactos/dll/win32/shell32/CNewMenu.h trunk/reactos/dll/win32/shell32/wine/brsfolder.c
Modified: trunk/reactos/dll/win32/shell32/CNewMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CNewMenu.... ============================================================================== --- trunk/reactos/dll/win32/shell32/CNewMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CNewMenu.cpp [iso-8859-1] Wed Sep 2 13:14:46 2015 @@ -38,6 +38,9 @@ CNewMenu::~CNewMenu() { UnloadAllItems(); + + if (m_pidlFolder) + ILFree(m_pidlFolder); }
void CNewMenu::UnloadItem(SHELLNEW_ITEM *pItem) @@ -296,93 +299,82 @@ return pItem; }
-HRESULT CNewMenu::CreateNewFolder(IShellView *psv) -{ - WCHAR wszName[MAX_PATH]; - CComPtr<ISFHelper> psfhlp; - CComPtr<IFolderView> pFolderView; - CComPtr<IShellFolder> pParentFolder; - HRESULT hr; - - //if (m_pSite == NULL) - // return E_FAIL; - - /* Get current folder */ - hr = IUnknown_QueryService(psv, SID_IFolderView, IID_PPV_ARG(IFolderView, &pFolderView)); +HRESULT CNewMenu::SelectNewItem(LPCMINVOKECOMMANDINFO lpici, LONG wEventId, UINT uFlags, LPWSTR pszName) +{ + CComPtr<IShellBrowser> lpSB; + CComPtr<IShellView> lpSV; + HRESULT hr = E_FAIL; + LPITEMIDLIST pidl; + PITEMID_CHILD pidlNewItem; + + /* Notify the view object about the new item */ + SHChangeNotify(wEventId, uFlags, (LPCVOID) pszName, NULL); + + /* FIXME: I think that this can be implemented using callbacks to the shell folder */ + + /* Note: CWM_GETISHELLBROWSER returns shell browser without adding reference */ + lpSB = (LPSHELLBROWSER)SendMessageA(lpici->hwnd, CWM_GETISHELLBROWSER, 0, 0); + if (!lpSB) + return E_FAIL; + + hr = lpSB->QueryActiveShellView(&lpSV); if (FAILED(hr)) return hr;
- hr = pFolderView->GetFolder(IID_PPV_ARG(IShellFolder, &pParentFolder)); - if (FAILED(hr)) + /* Attempt to get the pidl of the new item */ + hr = SHILCreateFromPathW(pszName, &pidl, NULL); + if (FAILED_UNEXPECTEDLY(hr)) return hr;
- hr = pParentFolder->QueryInterface(IID_PPV_ARG(ISFHelper, &psfhlp)); - if (FAILED(hr)) + pidlNewItem = ILFindLastID(pidl); + + hr = lpSV->SelectItem(pidlNewItem, SVSI_DESELECTOTHERS | SVSI_EDIT | SVSI_ENSUREVISIBLE | + SVSI_FOCUSED | SVSI_SELECT); + + SHFree(pidl); + + return hr; +} + +HRESULT CNewMenu::CreateNewFolder(LPCMINVOKECOMMANDINFO lpici) +{ + WCHAR wszPath[MAX_PATH]; + WCHAR wszName[MAX_PATH]; + WCHAR wszNewFolder[25]; + HRESULT hr; + + /* Get folder path */ + hr = SHGetPathFromIDListW(m_pidlFolder, wszPath); + if (FAILED_UNEXPECTEDLY(hr)) return hr;
- LPITEMIDLIST pidl; - - /* Get unique name and create a folder */ - hr = psfhlp->GetUniqueName(wszName, _countof(wszName)); - if (hr != S_OK) - return hr; - hr = psfhlp->AddFolder(0, wszName, &pidl); - if (hr != S_OK) - { - WCHAR wszBuf[256]; - StringCbPrintfW(wszBuf, sizeof(wszBuf), L"Cannot create folder: %s", wszName); - MessageBoxW(NULL, wszBuf, L"Cannot create folder", MB_OK|MB_ICONERROR); - return hr; - } - - /* Do a labeledit */ - psv->Refresh(); - psv->SelectItem(pidl, SVSI_DESELECTOTHERS | SVSI_EDIT | SVSI_ENSUREVISIBLE | - SVSI_FOCUSED | SVSI_SELECT); - - SHFree(pidl); + if (!LoadStringW(shell32_hInstance, IDS_NEWFOLDER, wszNewFolder, _countof(wszNewFolder))) + return E_FAIL; + + /* Create the name of the new directory */ + if (!PathYetAnotherMakeUniqueName(wszName, wszPath, NULL, wszNewFolder)) + return E_FAIL; + + /* Create the new directory and show the appropriate dialog in case of error */ + if (SHCreateDirectory (lpici->hwnd, wszName) != ERROR_SUCCESS) + return E_FAIL; + + /* Show and select the new item in the def view */ + SelectNewItem(lpici, SHCNE_MKDIR, SHCNF_PATHW, wszName); + return S_OK; }
-HRESULT CNewMenu::CreateNewItem(SHELLNEW_ITEM *pItem, LPCMINVOKECOMMANDINFO lpcmi, IShellView *psv) -{ - LPITEMIDLIST pidl; - STRRET strTemp; +HRESULT CNewMenu::CreateNewItem(SHELLNEW_ITEM *pItem, LPCMINVOKECOMMANDINFO lpcmi) +{ WCHAR wszBuf[MAX_PATH]; WCHAR wszPath[MAX_PATH]; - CComPtr<IFolderView> pFolderView; - CComPtr<IShellFolder> pParentFolder; - CComPtr<IPersistFolder2> psf; HRESULT hr;
- /* Get current folder */ - hr = IUnknown_QueryService(psv, SID_IFolderView, IID_PPV_ARG(IFolderView, &pFolderView)); - if (FAILED(hr)) + /* Get folder path */ + hr = SHGetPathFromIDListW(m_pidlFolder, wszPath); + if (FAILED_UNEXPECTEDLY(hr)) return hr; - - hr = pFolderView->GetFolder(IID_PPV_ARG(IShellFolder, &pParentFolder)); - if (FAILED(hr)) - return hr; - - if (pParentFolder->QueryInterface(IID_PPV_ARG(IPersistFolder2, &psf)) != S_OK) - { - ERR("Failed to get interface IID_IPersistFolder2\n"); - return E_FAIL; - } - - if (psf->GetCurFolder(&pidl) != S_OK) - { - ERR("IPersistFolder2_GetCurFolder failed\n"); - return E_FAIL; - } - - /* Get folder path */ - if (pParentFolder == NULL || pParentFolder->GetDisplayNameOf(pidl, SHGDN_FORPARSING, &strTemp) != S_OK) - { - ERR("IShellFolder_GetDisplayNameOf failed\n"); - return E_FAIL; - } - StrRetToBufW(&strTemp, pidl, wszPath, _countof(wszPath));
switch (pItem->Type) { @@ -468,16 +460,7 @@ if (bSuccess) { TRACE("Notifying fs %s\n", debugstr_w(wszPath)); - SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, (LPCVOID)wszPath, NULL); - psv->Refresh(); - - LPITEMIDLIST pidl; - hr = _ILCreateFromPathW(wszPath, &pidl); - if (SUCCEEDED(hr)) - { - psv->SelectItem(pidl, SVSI_DESELECTOTHERS|SVSI_EDIT|SVSI_ENSUREVISIBLE|SVSI_FOCUSED|SVSI_SELECT); - ILFree(pidl); - } + SelectNewItem(lpcmi, SHCNE_CREATE, SHCNF_PATHW, wszPath); } else { @@ -551,22 +534,15 @@ WINAPI CNewMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpici) { - CComPtr<IShellBrowser> lpSB; - CComPtr<IShellView> lpSV; HRESULT hr = E_FAIL;
- /* Note: CWM_GETISHELLBROWSER returns shell browser without adding reference */ - lpSB = (LPSHELLBROWSER)SendMessageA(lpici->hwnd, CWM_GETISHELLBROWSER, 0, 0); - if (lpSB) - lpSB->QueryActiveShellView(&lpSV); - if (LOWORD(lpici->lpVerb) == 0) - hr = CreateNewFolder(lpSV); + hr = CreateNewFolder(lpici); else { SHELLNEW_ITEM *pItem = FindItemFromIdOffset(LOWORD(lpici->lpVerb)); if (pItem) - hr = CreateNewItem(pItem, lpici, lpSV); + hr = CreateNewItem(pItem, lpici); }
TRACE("CNewMenu::InvokeCommand %x\n", hr); @@ -657,6 +633,8 @@ CNewMenu::Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID) { + m_pidlFolder = ILClone(pidlFolder); + /* Load folder and shortcut icons */ m_hiconFolder = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDI_SHELL_FOLDER), IMAGE_ICON, 16, 16, LR_SHARED); m_hiconLink = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDI_SHELL_SHORTCUT), IMAGE_ICON, 16, 16, LR_SHARED);
Modified: trunk/reactos/dll/win32/shell32/CNewMenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CNewMenu.... ============================================================================== --- trunk/reactos/dll/win32/shell32/CNewMenu.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CNewMenu.h [iso-8859-1] Wed Sep 2 13:14:46 2015 @@ -51,6 +51,7 @@ SHELLNEW_ITEM *pNext; };
+ LPITEMIDLIST m_pidlFolder; LPWSTR m_wszPath; SHELLNEW_ITEM *m_pItems; SHELLNEW_ITEM *m_pLinkItem; @@ -65,8 +66,9 @@ BOOL LoadAllItems(); UINT InsertShellNewItems(HMENU hMenu, UINT idFirst, UINT idMenu); SHELLNEW_ITEM *FindItemFromIdOffset(UINT IdOffset); - HRESULT CreateNewFolder(IShellView *psv); - HRESULT CreateNewItem(SHELLNEW_ITEM *pItem, LPCMINVOKECOMMANDINFO lpcmi, IShellView *psv); + HRESULT CreateNewFolder(LPCMINVOKECOMMANDINFO lpici); + HRESULT CreateNewItem(SHELLNEW_ITEM *pItem, LPCMINVOKECOMMANDINFO lpcmi); + HRESULT SelectNewItem(LPCMINVOKECOMMANDINFO lpici, LONG wEventId, UINT uFlags, LPWSTR pszName);
public: CNewMenu();
Modified: trunk/reactos/dll/win32/shell32/wine/brsfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/brsf... ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/brsfolder.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/brsfolder.c [iso-8859-1] Wed Sep 2 13:14:46 2015 @@ -735,7 +735,12 @@ { DWORD flags = BrowseFlagsToSHCONTF(info->lpBrowseInfo->ulFlags); IShellFolder *desktop, *cur; +#ifdef __REACTOS__ + WCHAR wszNewFolder[25]; + WCHAR path[25]; +#else ISFHelper *sfhelper; +#endif WCHAR name[MAX_PATH]; HTREEITEM parent, added; LPTV_ITEMDATA item_data; @@ -758,6 +763,22 @@ if(FAILED(hr)) return hr;
+#ifdef __REACTOS__ + hr = SHGetPathFromIDListW(info->pidlRet, path); + if(FAILED(hr)) + return hr; + + len = strlenW(name); + if(len<MAX_PATH) + len++; + + if (!LoadStringW(shell32_hInstance, IDS_NEWFOLDER, wszNewFolder, _countof(wszNewFolder))) + return E_FAIL; + + if (!PathYetAnotherMakeUniqueName(name, path, NULL, wszNewFolder)) + return E_FAIL; +#else + hr = IShellFolder_QueryInterface(cur, &IID_ISFHelper, (void**)&sfhelper); if(FAILED(hr)) return hr; @@ -765,7 +786,7 @@ hr = SHGetPathFromIDListW(info->pidlRet, name); if(FAILED(hr)) goto cleanup; - + len = strlenW(name); if(len<MAX_PATH) name[len++] = '\'; @@ -773,6 +794,7 @@ ISFHelper_Release(sfhelper); if(FAILED(hr)) goto cleanup; +#endif
hr = E_FAIL; if(!CreateDirectoryW(name, NULL))
-
gadamopoulos＠svn.reactos.org