Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-26 08:49:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32] CDefViewBckgrndMenu: Fix a crash when pasting on a new explorer window.

Browse source
This commit is contained in:
Mark Jansen 2018-02-05 17:12:00 +01:00
parent 2f8a7f36f5
commit 058c2658a4
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
dll/win32/shell32/CDefViewBckgrndMenu.cpp
View file

@ -210,7 +210,12 @@ CDefViewBckgrndMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi)
UINT idCmd = LOWORD(lpcmi->lpVerb); UINT idCmd = LOWORD(lpcmi->lpVerb);
if(HIWORD(lpcmi->lpVerb) != 0 || idCmd < m_LastFolderCMId) if(HIWORD(lpcmi->lpVerb) != 0 || idCmd < m_LastFolderCMId)
{ {
return m_folderCM->InvokeCommand(lpcmi); if (m_folderCM)
{
return m_folderCM->InvokeCommand(lpcmi);
}
WARN("m_folderCM is NULL!\n");
return E_NOTIMPL;
} }
/* The default part of the background menu doesn't have shifted ids so we need to convert the id offset to the real id */ /* The default part of the background menu doesn't have shifted ids so we need to convert the id offset to the real id */
@ -221,8 +226,13 @@ CDefViewBckgrndMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi)
{ {
case FCIDM_SHVIEW_INSERT: case FCIDM_SHVIEW_INSERT:
case FCIDM_SHVIEW_INSERTLINK: case FCIDM_SHVIEW_INSERTLINK:
lpcmi->lpVerb = MAKEINTRESOURCEA(idCmd); if (m_folderCM)
return m_folderCM->InvokeCommand(lpcmi); {
lpcmi->lpVerb = MAKEINTRESOURCEA(idCmd);
return m_folderCM->InvokeCommand(lpcmi);
}
WARN("m_folderCM is NULL!\n");
return E_NOTIMPL;
case FCIDM_SHVIEW_BIGICON: case FCIDM_SHVIEW_BIGICON:
case FCIDM_SHVIEW_SMALLICON: case FCIDM_SHVIEW_SMALLICON:
case FCIDM_SHVIEW_LISTVIEW: case FCIDM_SHVIEW_LISTVIEW: