[BROWSEUI]

* Fix stack corruption in VS2010 builds. No idea why it doesn't crash with other compilers.

[EXPLORER-NEW]
* Fix a similar bug that does not appear to cause any issue, but is a bug regardless.

svn path=/branches/shell-experiments/; revision=63548

diff --git a/base/shell/explorer-new/rshell.c b/base/shell/explorer-new/rshell.c
index 897b7b4..1ea863a 100644 (file)
--- a/base/shell/explorer-new/rshell.c
+++ b/base/shell/explorer-new/rshell.c
@@ -22,7 +22,7 @@
 
 static HINSTANCE hRShell = NULL;
 
 
 static HINSTANCE hRShell = NULL;
 

-typedef HRESULT(*PSTARTMENU_CONSTRUCTOR)(REFIID riid, void **ppv);
+typedef HRESULT(WINAPI * PSTARTMENU_CONSTRUCTOR)(REFIID riid, void **ppv);

 
 HRESULT CStartMenu_Constructor(REFIID riid, void **ppv)
 {
 
 HRESULT CStartMenu_Constructor(REFIID riid, void **ppv)
 {


@@ -47,7 +47,7 @@ HRESULT CStartMenu_Constructor(REFIID riid, void **ppv)
                             ppv);   
 }
 
                             ppv);   
 }
 

-typedef HANDLE(WINAPI *PSHCREATEDESKTOP)(IShellDesktopTray *ShellDesk);
+typedef HANDLE(WINAPI * PSHCREATEDESKTOP)(IShellDesktopTray *ShellDesk);

 
 HANDLE WINAPI SHCreateDesktop(IShellDesktopTray *ShellDesk)
 {
 
 HANDLE WINAPI SHCreateDesktop(IShellDesktopTray *ShellDesk)
 {

diff --git a/dll/win32/browseui/internettoolbar.cpp b/dll/win32/browseui/internettoolbar.cpp
index eaad484..c630347 100644 (file)
--- a/dll/win32/browseui/internettoolbar.cpp
+++ b/dll/win32/browseui/internettoolbar.cpp
@@ -73,6 +73,8 @@ extern HRESULT CreateBrandBand(REFIID riid, void **ppv);
 extern HRESULT CreateBandProxy(REFIID riid, void **ppv);
 extern HRESULT CreateAddressBand(REFIID riid, void **ppv);
 
 extern HRESULT CreateBandProxy(REFIID riid, void **ppv);
 extern HRESULT CreateAddressBand(REFIID riid, void **ppv);
 

+typedef HRESULT(WINAPI * PMENUBAND_CONSTRUCTOR)(REFIID riid, void **ppv);
+

 HRESULT IUnknown_HasFocusIO(IUnknown * punk)
 {
     CComPtr<IInputObject> pio;
 HRESULT IUnknown_HasFocusIO(IUnknown * punk)
 {
     CComPtr<IInputObject> pio;


@@ -133,8 +135,6 @@ HRESULT IUnknown_CloseDW(IUnknown * punk, DWORD dwReserved)
     return S_OK;
 }
 
     return S_OK;
 }
 

-typedef HRESULT(*PMENUBAND_CONSTRUCTOR)(REFIID riid, void **ppv);
-

 class CInternetToolbar;
 
 class CDockSite :
 class CInternetToolbar;
 
 class CDockSite :


@@ -594,10 +594,10 @@ HRESULT CInternetToolbar::CreateMenuBar(IShellMenu **pMenuBar)
     VARIANT                                 menuOut;
     HWND                                    ownerWindow;
     HRESULT                                 hResult;
     VARIANT                                 menuOut;
     HWND                                    ownerWindow;
     HRESULT                                 hResult;

+

     if (!pMenuBar)
         return E_POINTER;
 
     if (!pMenuBar)
         return E_POINTER;
 

-

     *pMenuBar = NULL;
 
     hResult = E_FAIL;
     *pMenuBar = NULL;
 
     hResult = E_FAIL;