Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-25 12:14:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

[BROWSEUI][SHELL32] Treat OnWinEvent's result parameter as optional. CORE-14443

Browse source 
Windows's explorer can call it with NULL.
This commit is contained in:
Thomas Faber 2018-03-08 10:28:33 +01:00
parent 84a9284a3f
commit 0aed0fd167
No known key found for this signature in database
GPG key ID: 076E7C3D44720826
8 changed files with 44 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dll/win32/browseui/addressband.cpp
View file

@ -290,7 +290,8 @@ HRESULT STDMETHODCALLTYPE CAddressBand::OnWinEvent(
HRESULT hResult; HRESULT hResult;
RECT rect; RECT rect;
*theResult = 0; if (theResult)
*theResult = 0;
switch (uMsg) switch (uMsg)
{ {

3
dll/win32/browseui/addresseditbox.cpp
View file

@ -256,7 +256,8 @@ HRESULT STDMETHODCALLTYPE CAddressEditBox::OnWinEvent(
{ {
LPNMHDR hdr; LPNMHDR hdr;
*theResult = 0; if (theResult)
*theResult = 0;
switch (uMsg) switch (uMsg)
{ {

5
dll/win32/browseui/basebarsite.cpp
View file

@ -322,6 +322,7 @@ HRESULT STDMETHODCALLTYPE CBaseBarSite::OnWinEvent(
NMHDR *notifyHeader; NMHDR *notifyHeader;
// RECT newBounds; // RECT newBounds;
HRESULT hResult; HRESULT hResult;
LRESULT result;
hResult = S_OK; hResult = S_OK;
if (uMsg == WM_NOTIFY) if (uMsg == WM_NOTIFY)
@ -342,7 +343,9 @@ HRESULT STDMETHODCALLTYPE CBaseBarSite::OnWinEvent(
#endif #endif
break; break;
case NM_CUSTOMDRAW: case NM_CUSTOMDRAW:
*theResult = OnCustomDraw((LPNMCUSTOMDRAW)lParam); result = OnCustomDraw((LPNMCUSTOMDRAW)lParam);
if (theResult)
*theResult = result;
return S_OK; return S_OK;
} }
} }

20
dll/win32/browseui/explorerband.cpp
View file

@ -1265,13 +1265,17 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::GetSizeMax(ULARGE_INTEGER *pcbSize)
HRESULT STDMETHODCALLTYPE CExplorerBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) HRESULT STDMETHODCALLTYPE CExplorerBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult)
{ {
BOOL bHandled; BOOL bHandled;
LRESULT result;
if (uMsg == WM_NOTIFY) if (uMsg == WM_NOTIFY)
{ {
NMHDR *pNotifyHeader = (NMHDR*)lParam; NMHDR *pNotifyHeader = (NMHDR*)lParam;
switch (pNotifyHeader->code) switch (pNotifyHeader->code)
{ {
case TVN_ITEMEXPANDING: case TVN_ITEMEXPANDING:
*theResult = OnTreeItemExpanding((LPNMTREEVIEW)lParam); result = OnTreeItemExpanding((LPNMTREEVIEW)lParam);
if (theResult)
*theResult = result;
break; break;
case TVN_SELCHANGED: case TVN_SELCHANGED:
OnSelectionChanged((LPNMTREEVIEW)lParam); OnSelectionChanged((LPNMTREEVIEW)lParam);
@ -1281,7 +1285,8 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM
break; break;
case NM_RCLICK: case NM_RCLICK:
OnContextMenu(WM_CONTEXTMENU, (WPARAM)m_hWnd, GetMessagePos(), bHandled); OnContextMenu(WM_CONTEXTMENU, (WPARAM)m_hWnd, GetMessagePos(), bHandled);
*theResult = 1; if (theResult)
*theResult = 1;
break; break;
case TVN_BEGINDRAG: case TVN_BEGINDRAG:
case TVN_BEGINRDRAG: case TVN_BEGINRDRAG:
@ -1295,7 +1300,8 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM
LPCITEMIDLIST pChild; LPCITEMIDLIST pChild;
HRESULT hr; HRESULT hr;
*theResult = 1; if (theResult)
*theResult = 1;
NodeInfo *info = GetNodeInfo(dispInfo->item.hItem); NodeInfo *info = GetNodeInfo(dispInfo->item.hItem);
if (!info) if (!info)
return E_FAIL; return E_FAIL;
@ -1304,7 +1310,7 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM
return E_FAIL; return E_FAIL;
hr = pParent->GetAttributesOf(1, &pChild, &dwAttr); hr = pParent->GetAttributesOf(1, &pChild, &dwAttr);
if (SUCCEEDED(hr) && (dwAttr & SFGAO_CANRENAME)) if (SUCCEEDED(hr) && (dwAttr & SFGAO_CANRENAME) && theResult)
*theResult = 0; *theResult = 0;
return S_OK; return S_OK;
} }
@ -1314,7 +1320,8 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM
NodeInfo *info = GetNodeInfo(dispInfo->item.hItem); NodeInfo *info = GetNodeInfo(dispInfo->item.hItem);
HRESULT hr; HRESULT hr;
*theResult = 0; if (theResult)
*theResult = 0;
if (dispInfo->item.pszText) if (dispInfo->item.pszText)
{ {
LPITEMIDLIST pidlNew; LPITEMIDLIST pidlNew;
@ -1345,7 +1352,8 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM
ILFree(pidlNewAbs); ILFree(pidlNewAbs);
ILFree(pidlNew); ILFree(pidlNew);
*theResult = 1; if (theResult)
*theResult = 1;
} }
return S_OK; return S_OK;
} }

3
dll/win32/browseui/shellbars/CBandSite.cpp
View file

@ -708,7 +708,8 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM
TRACE("(%p, %p, %u, %p, %p, %p)\n", this, hWnd, uMsg, wParam, lParam, plrResult); TRACE("(%p, %p, %u, %p, %p, %p)\n", this, hWnd, uMsg, wParam, lParam, plrResult);
*plrResult = 0; if (plrResult)
*plrResult = 0;
if (m_hwndRebar == NULL) if (m_hwndRebar == NULL)
return E_FAIL; return E_FAIL;

16
dll/win32/browseui/shellbars/CISFBand.cpp
View file

@ -342,7 +342,8 @@ HRESULT CISFBand::CreateSimpleToolbar(HWND hWndParent)
if (chk) if (chk)
SHInvokeDefaultCommand(m_hWnd, m_pISF, (LPITEMIDLIST)tb.dwData); SHInvokeDefaultCommand(m_hWnd, m_pISF, (LPITEMIDLIST)tb.dwData);
*theResult = TRUE; if (theResult)
*theResult = TRUE;
break; break;
} }
case WM_NOTIFY: case WM_NOTIFY:
@ -393,18 +394,21 @@ HRESULT CISFBand::CreateSimpleToolbar(HWND hWndParent)
} }
} }
DestroyMenu(fmenu); DestroyMenu(fmenu);
*theResult = TRUE; if (theResult)
*theResult = TRUE;
break; break;
} }
default: default:
*theResult = FALSE; if (theResult)
*theResult = FALSE;
} }
break; break;
} }
default: default:
*theResult = FALSE; if (theResult)
*theResult = FALSE;
} }
return S_OK; return S_OK;

3
dll/win32/shell32/shellmenu/CMenuBand.cpp
View file

@ -723,7 +723,8 @@ HRESULT STDMETHODCALLTYPE CMenuBand::GetShellFolder(DWORD *pdwFlags, LPITEMIDLIS
HRESULT STDMETHODCALLTYPE CMenuBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) HRESULT STDMETHODCALLTYPE CMenuBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult)
{ {
*theResult = 0; if (theResult)
*theResult = 0;
if (uMsg == WM_WININICHANGE && wParam == SPI_SETFLATMENU) if (uMsg == WM_WININICHANGE && wParam == SPI_SETFLATMENU)
{ {

10
dll/win32/shell32/shellmenu/CMenuToolbars.cpp
View file

@ -49,8 +49,11 @@ LRESULT CMenuToolbarBase::OnWinEventWrap(UINT uMsg, WPARAM wParam, LPARAM lParam
HRESULT CMenuToolbarBase::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) HRESULT CMenuToolbarBase::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult)
{ {
NMHDR * hdr; NMHDR * hdr;
HRESULT hr;
LRESULT result;
*theResult = 0; if (theResult)
*theResult = 0;
switch (uMsg) switch (uMsg)
{ {
case WM_COMMAND: case WM_COMMAND:
@ -75,7 +78,10 @@ HRESULT CMenuToolbarBase::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
return S_OK; return S_OK;
case NM_CUSTOMDRAW: case NM_CUSTOMDRAW:
return OnCustomDraw(reinterpret_cast<LPNMTBCUSTOMDRAW>(hdr), theResult); hr = OnCustomDraw(reinterpret_cast<LPNMTBCUSTOMDRAW>(hdr), &result);
if (theResult)
*theResult = result;
return hr;
case TBN_GETINFOTIP: case TBN_GETINFOTIP:
return OnGetInfoTip(reinterpret_cast<LPNMTBGETINFOTIP>(hdr)); return OnGetInfoTip(reinterpret_cast<LPNMTBGETINFOTIP>(hdr));