Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 08:25:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[BROWSEUI]

Browse source 
* 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
This commit is contained in:
David Quintana 2014-06-07 23:26:35 +00:00
parent 7ddd2648be
commit 02bd6eebde
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
base/shell/explorer-new/rshell.c
View file

@ -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)
{ {

6
dll/win32/browseui/internettoolbar.cpp
View file

@ -73,6 +73,8 @@ extern HRESULT CreateBrandBand(REFIID riid, void **ppv);
extern HRESULT CreateBandProxy(REFIID riid, void **ppv); extern HRESULT CreateBandProxy(REFIID riid, void **ppv);
extern HRESULT CreateAddressBand(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) HRESULT IUnknown_HasFocusIO(IUnknown * punk)
{ {
CComPtr<IInputObject> pio; 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 CInternetToolbar;
class CDockSite : class CDockSite :
@ -594,10 +594,10 @@ HRESULT CInternetToolbar::CreateMenuBar(IShellMenu **pMenuBar)
VARIANT menuOut; VARIANT menuOut;
HWND ownerWindow; HWND ownerWindow;
HRESULT hResult; HRESULT hResult;
if (!pMenuBar) if (!pMenuBar)
return E_POINTER; return E_POINTER;
*pMenuBar = NULL; *pMenuBar = NULL;
hResult = E_FAIL; hResult = E_FAIL;