Author: dquintana
Date: Mon May 19 21:55:09 2014
New Revision: 63378
URL: http://svn.reactos.org/svn/reactos?rev=63378&view=rev
Log:
[BROWSEUI]
* Moved some code from ParseNow into Execute, pending future improvements to
the code flow.
Modified:
branches/shell-experiments/dll/win32/browseui/addressband.cpp
branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp
branches/shell-experiments/dll/win32/browseui/addresseditbox.h
branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp
Modified: branches/shell-experiments/dll/win32/browseui/addressband.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/browseui/addressband.cpp?rev=63378&r1=63377&r2=63378&view=diff
==============================================================================
--- branches/shell-experiments/dll/win32/browseui/addressband.cpp
[iso-8859-1] (original)
+++ branches/shell-experiments/dll/win32/browseui/addressband.cpp
[iso-8859-1] Mon May 19 21:55:09 2014
@@ -525,6 +525,7 @@
if (notifyHeader->hwndFrom == fGoButton)
{
fAddressEditBox->ParseNow(0);
+ fAddressEditBox->Execute(0);
}
return 0;
}
Modified: branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp?rev=63378&r1=63377&r2=63378&view=diff
==============================================================================
--- branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp
[iso-8859-1] (original)
+++ branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp
[iso-8859-1] Mon May 19 21:55:09 2014
@@ -68,17 +68,25 @@
HRESULT STDMETHODCALLTYPE CAddressEditBox::Init(HWND comboboxEx, HWND
editControl, long param14, IUnknown *param18)
{
+ CComPtr<IBrowserService> browserService;
+
fCombobox.SubclassWindow(comboboxEx);
fEditWindow.SubclassWindow(editControl);
fSite = param18;
- return S_OK;
+
+ // take advice to watch events
+ HRESULT hResult = IUnknown_QueryService(param18, SID_SShellBrowser,
IID_PPV_ARG(IBrowserService, &browserService));
+ if (SUCCEEDED(hResult))
+ {
+ if (SUCCEEDED(hResult))
+ hResult = AtlAdvise(browserService, static_cast<IDispatch
*>(this), DIID_DWebBrowserEvents, &fAdviseCookie);
+ }
+
+ return hResult;
}
HRESULT STDMETHODCALLTYPE CAddressEditBox::SetCurrentDir(long paramC)
{
- LPWSTR strC = reinterpret_cast<LPWSTR>(paramC);
- fEditWindow.SetWindowText(strC);
-
return E_NOTIMPL;
}
@@ -86,7 +94,6 @@
{
WCHAR address[4096];
ULONG eaten;
- LPITEMIDLIST pidl;
ULONG attributes;
HRESULT hr;
HWND topLevelWindow;
@@ -100,17 +107,39 @@
CComPtr<IShellFolder> psfDesktop;
hr = SHGetDesktopFolder(&psfDesktop);
- hr = psfDesktop->ParseDisplayName(topLevelWindow, NULL, address, &eaten,
&pidl, &attributes);
+ hr = psfDesktop->ParseDisplayName(topLevelWindow, NULL, address, &eaten,
&pidlLastParsed, &attributes);
+ return hr;
+}
+
+HRESULT STDMETHODCALLTYPE CAddressEditBox::Execute(long paramC)
+{
+ HRESULT hr;
+
+ if (!pidlLastParsed)
+ return E_FAIL;
+
+ CComPtr<IShellBrowser> pisb;
+ hr = IUnknown_QueryService(fSite, SID_SShellBrowser,
IID_PPV_ARG(IShellBrowser, &pisb));
if (SUCCEEDED(hr))
{
- hr = pisb->BrowseObject(pidl, 0);
+ hr = pisb->BrowseObject(pidlLastParsed, 0);
+ if (FAILED(hr))
+ {
+ HWND topLevelWindow;
+ LPCITEMIDLIST pidlChild;
+ CComPtr<IShellFolder> sf;
+ CComPtr<IShellBrowser> pisb;
+
+ hr = IUnknown_QueryService(fSite, SID_SShellBrowser,
IID_PPV_ARG(IShellBrowser, &pisb));
+
+ IUnknown_GetWindow(pisb, &topLevelWindow);
+
+ hr = SHBindToParent(pidlLastParsed, IID_PPV_ARG(IShellFolder,
&sf), &pidlChild);
+
+ SHInvokeDefaultCommand(topLevelWindow, sf, pidlChild);
+ }
}
return hr;
-}
-
-HRESULT STDMETHODCALLTYPE CAddressEditBox::Execute(long paramC)
-{
- return E_NOTIMPL;
}
HRESULT STDMETHODCALLTYPE CAddressEditBox::Save(long paramC)
@@ -127,7 +156,11 @@
HRESULT STDMETHODCALLTYPE CAddressEditBox::IsWindowOwner(HWND hWnd)
{
- return E_NOTIMPL;
+ if (fCombobox.m_hWnd == hWnd)
+ return S_OK;
+ if (fEditWindow.m_hWnd == hWnd)
+ return S_OK;
+ return S_FALSE;
}
HRESULT STDMETHODCALLTYPE CAddressEditBox::QueryStatus(
@@ -161,8 +194,16 @@
HRESULT STDMETHODCALLTYPE CAddressEditBox::Invoke(DISPID dispIdMember, REFIID
riid, LCID lcid,
WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO
*pExcepInfo, UINT *puArgErr)
{
- // on navigate complete, change edit section of combobox
- return E_NOTIMPL;
+ if (pDispParams == NULL)
+ return E_INVALIDARG;
+
+ switch (dispIdMember)
+ {
+ case DISPID_NAVIGATECOMPLETE2:
+ case DISPID_DOCUMENTCOMPLETE:
+ pidlLastParsed = NULL;
+ }
+ return S_OK;
}
HRESULT STDMETHODCALLTYPE CAddressEditBox::GetClassID(CLSID *pClassID)
Modified: branches/shell-experiments/dll/win32/browseui/addresseditbox.h
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/browseui/addresseditbox.h?rev=63378&r1=63377&r2=63378&view=diff
==============================================================================
--- branches/shell-experiments/dll/win32/browseui/addresseditbox.h
[iso-8859-1] (original)
+++ branches/shell-experiments/dll/win32/browseui/addresseditbox.h
[iso-8859-1] Mon May 19 21:55:09 2014
@@ -35,7 +35,9 @@
private:
CContainedWindow fCombobox;
CContainedWindow fEditWindow;
- CComPtr<IUnknown> fSite;
+ DWORD fAdviseCookie;
+ CComPtr<IUnknown> fSite;
+ LPITEMIDLIST pidlLastParsed;
public:
CAddressEditBox();
~CAddressEditBox();
Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp?rev=63378&r1=63377&r2=63378&view=diff
==============================================================================
--- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp
[iso-8859-1] (original)
+++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp
[iso-8859-1] Mon May 19 21:55:09 2014
@@ -826,6 +826,9 @@
// called by shell view to browse to new folder
// also called by explorer band to navigate to new folder
hResult = SHBindToFolder(pidl, &newFolder);
+ if (FAILED(hResult))
+ return hResult;
+
newFolderSettings.ViewMode = FVM_ICON;
newFolderSettings.fFlags = 0;
hResult = BrowseToPath(newFolder, pidl, &newFolderSettings, flags);
