[dquintana] 63548: [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, ...

Author: dquintana
Date: Sat Jun  7 23:26:35 2014
New Revision: 63548

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

Modified:
    branches/shell-experiments/base/shell/explorer-new/rshell.c
    branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp

Modified: branches/shell-experiments/base/shell/explorer-new/rshell.c
URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/exp...
==============================================================================
--- branches/shell-experiments/base/shell/explorer-new/rshell.c	[iso-8859-1] (original)
+++ branches/shell-experiments/base/shell/explorer-new/rshell.c	[iso-8859-1] Sat Jun  7 23:26:35 2014
@@ -22,7 +22,7 @@

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)
 {
@@ -47,7 +47,7 @@
                             ppv);   
 }

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

HANDLE WINAPI SHCreateDesktop(IShellDesktopTray *ShellDesk)
 {

Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp
URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/brow...
==============================================================================
--- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp	[iso-8859-1] (original)
+++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp	[iso-8859-1] Sat Jun  7 23:26:35 2014
@@ -73,6 +73,8 @@
 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;
@@ -132,8 +134,6 @@
         return hResult;
     return S_OK;
 }
-
-typedef HRESULT(*PMENUBAND_CONSTRUCTOR)(REFIID riid, void **ppv);

class CInternetToolbar;

@@ -594,9 +594,9 @@
     VARIANT                                 menuOut;
     HWND                                    ownerWindow;
     HRESULT                                 hResult;
+
     if (!pMenuBar)
         return E_POINTER;
-

*pMenuBar = NULL;