mirror of
https://github.com/reactos/reactos.git
synced 2025-02-22 16:36:33 +00:00
[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
This commit is contained in:
parent
7ddd2648be
commit
02bd6eebde
2 changed files with 5 additions and 5 deletions
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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);
|
||||
|
||||
typedef HRESULT(WINAPI * PMENUBAND_CONSTRUCTOR)(REFIID riid, void **ppv);
|
||||
|
||||
HRESULT IUnknown_HasFocusIO(IUnknown * punk)
|
||||
{
|
||||
CComPtr<IInputObject> pio;
|
||||
|
@ -133,8 +135,6 @@ HRESULT IUnknown_CloseDW(IUnknown * punk, DWORD dwReserved)
|
|||
return S_OK;
|
||||
}
|
||||
|
||||
typedef HRESULT(*PMENUBAND_CONSTRUCTOR)(REFIID riid, void **ppv);
|
||||
|
||||
class CInternetToolbar;
|
||||
|
||||
class CDockSite :
|
||||
|
@ -594,10 +594,10 @@ HRESULT CInternetToolbar::CreateMenuBar(IShellMenu **pMenuBar)
|
|||
VARIANT menuOut;
|
||||
HWND ownerWindow;
|
||||
HRESULT hResult;
|
||||
|
||||
if (!pMenuBar)
|
||||
return E_POINTER;
|
||||
|
||||
|
||||
*pMenuBar = NULL;
|
||||
|
||||
hResult = E_FAIL;
|
||||
|
|
Loading…
Reference in a new issue