[browseui]

- Improve the stub for CAddressEditBox::SetOwner to make the rest of browseui happy for now
- In CShellBrowser::Initialize browse to the pidl that is passed as parameter instead of always browsing to the desktop folder
- Fix a bug in atl class CContainedWindowT::DefWindowProc that was calling the window proc with an invalid hwnd.

svn path=/trunk/; revision=59927
This commit is contained in:
Giannis Adamopoulos 2013-08-31 16:55:49 +00:00
parent 0b93a97e44
commit bbb71f8ed5
3 changed files with 4 additions and 12 deletions

View file

@ -50,7 +50,7 @@ CAddressEditBox::~CAddressEditBox()
HRESULT STDMETHODCALLTYPE CAddressEditBox::SetOwner(IUnknown *) HRESULT STDMETHODCALLTYPE CAddressEditBox::SetOwner(IUnknown *)
{ {
// connect to browser connection point // connect to browser connection point
return E_NOTIMPL; return 0;
} }
HRESULT STDMETHODCALLTYPE CAddressEditBox::FileSysChange(long param8, long paramC) HRESULT STDMETHODCALLTYPE CAddressEditBox::FileSysChange(long param8, long paramC)

View file

@ -798,17 +798,12 @@ HRESULT CShellBrowser::Initialize(LPITEMIDLIST pidl, long b, long c, long d)
_AtlBaseModule.GetModuleInstance(), 0); _AtlBaseModule.GetModuleInstance(), 0);
fStatusBarVisible = true; fStatusBarVisible = true;
LPITEMIDLIST desktopPIDL;
FOLDERSETTINGS newFolderSettings; FOLDERSETTINGS newFolderSettings;
// browse desktop // browse
hResult = SHGetFolderLocation(NULL, CSIDL_DESKTOP, NULL, 0, &desktopPIDL);
if (FAILED(hResult))
return hResult;
newFolderSettings.ViewMode = FVM_LIST; newFolderSettings.ViewMode = FVM_LIST;
newFolderSettings.fFlags = 0; newFolderSettings.fFlags = 0;
hResult = BrowseToPIDL(desktopPIDL, BTP_UPDATE_NEXT_HISTORY); hResult = BrowseToPIDL(pidl, BTP_UPDATE_NEXT_HISTORY);
ILFree(desktopPIDL);
if (FAILED(hResult)) if (FAILED(hResult))
return hResult; return hResult;

View file

@ -585,10 +585,7 @@ public:
LRESULT DefWindowProc(UINT uMsg, WPARAM wParam, LPARAM lParam) LRESULT DefWindowProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
CWindowImplBaseT<TBase, TWinTraits> *pThis; return ::CallWindowProc(m_pfnSuperWindowProc, this->m_hWnd, uMsg, wParam, lParam);
pThis = reinterpret_cast<CWindowImplBaseT<TBase, TWinTraits> *>(this);
return ::CallWindowProc(m_pfnSuperWindowProc, pThis->m_hWnd, uMsg, wParam, lParam);
} }
BOOL SubclassWindow(HWND hWnd) BOOL SubclassWindow(HWND hWnd)