[ros-diffs] [gadamopoulos] 59927: [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 para...

Author: gadamopoulos
Date: Sat Aug 31 16:55:49 2013
New Revision: 59927

URL: http://svn.reactos.org/svn/reactos?rev=59927&view=rev
Log:
[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.

Modified:
    trunk/reactos/dll/win32/browseui/addresseditbox.cpp
    trunk/reactos/dll/win32/browseui/shellbrowser.cpp
    trunk/reactos/lib/atl/atlwin.h

Modified: trunk/reactos/dll/win32/browseui/addresseditbox.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address…
==============================================================================
--- trunk/reactos/dll/win32/browseui/addresseditbox.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/browseui/addresseditbox.cpp	[iso-8859-1] Sat Aug 31 16:55:49
2013
@@ -50,7 +50,7 @@
 HRESULT STDMETHODCALLTYPE CAddressEditBox::SetOwner(IUnknown *)
 {
     // connect to browser connection point
-    return E_NOTIMPL;
+    return 0;
 }
 
 HRESULT STDMETHODCALLTYPE CAddressEditBox::FileSysChange(long param8, long paramC)

Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr…
==============================================================================
--- trunk/reactos/dll/win32/browseui/shellbrowser.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp	[iso-8859-1] Sat Aug 31 16:55:49
2013
@@ -798,17 +798,12 @@
                     _AtlBaseModule.GetModuleInstance(), 0);
     fStatusBarVisible = true;
 
-    LPITEMIDLIST                            desktopPIDL;
     FOLDERSETTINGS                          newFolderSettings;
 
-    // browse desktop
-    hResult = SHGetFolderLocation(NULL, CSIDL_DESKTOP, NULL, 0, &desktopPIDL);
-    if (FAILED(hResult))
-        return hResult;
+    // browse 
     newFolderSettings.ViewMode = FVM_LIST;
     newFolderSettings.fFlags = 0;
-    hResult = BrowseToPIDL(desktopPIDL, BTP_UPDATE_NEXT_HISTORY);
-    ILFree(desktopPIDL);
+    hResult = BrowseToPIDL(pidl, BTP_UPDATE_NEXT_HISTORY);
     if (FAILED(hResult))
         return hResult;
 

Modified: trunk/reactos/lib/atl/atlwin.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlwin.h?rev=59927…
==============================================================================
--- trunk/reactos/lib/atl/atlwin.h	[iso-8859-1] (original)
+++ trunk/reactos/lib/atl/atlwin.h	[iso-8859-1] Sat Aug 31 16:55:49 2013
@@ -585,10 +585,7 @@
 
 	LRESULT DefWindowProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 	{
-		CWindowImplBaseT<TBase, TWinTraits>	*pThis;
-
-		pThis = reinterpret_cast<CWindowImplBaseT<TBase, TWinTraits> *>(this);
-		return ::CallWindowProc(m_pfnSuperWindowProc, pThis->m_hWnd, uMsg, wParam, lParam);
+		return ::CallWindowProc(m_pfnSuperWindowProc, this->m_hWnd, uMsg, wParam, lParam);
 	}
 
 	BOOL SubclassWindow(HWND hWnd)