diff --git a/base/shell/explorer-new/rshell.c b/base/shell/explorer-new/rshell.c index 897b7b4d774..1ea863ab7ba 100644 --- a/base/shell/explorer-new/rshell.c +++ b/base/shell/explorer-new/rshell.c @@ -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 @@ HRESULT CStartMenu_Constructor(REFIID riid, void **ppv) ppv); } -typedef HANDLE(WINAPI *PSHCREATEDESKTOP)(IShellDesktopTray *ShellDesk); +typedef HANDLE(WINAPI * PSHCREATEDESKTOP)(IShellDesktopTray *ShellDesk); HANDLE WINAPI SHCreateDesktop(IShellDesktopTray *ShellDesk) { diff --git a/dll/win32/browseui/internettoolbar.cpp b/dll/win32/browseui/internettoolbar.cpp index eaad484da07..c630347ec8b 100644 --- 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); +typedef HRESULT(WINAPI * PMENUBAND_CONSTRUCTOR)(REFIID riid, void **ppv); + HRESULT IUnknown_HasFocusIO(IUnknown * punk) { CComPtr 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;