ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

comdlg32: Check file dialog's FOIShellView before accessing it.

This commit is contained in:
Juan Lang 2007-06-07 12:28:32 -07:00 committed by Alexandre Julliard
parent 13f18ee759
commit e14b6dcf7c
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/comdlg32/filedlg.c
View File

@ -2021,7 +2021,8 @@ BOOL FILEDLG95_OnOpen(HWND hwnd)
}
else if( nOpenAction == ONOPEN_SEARCH )
{
IShellView_Refresh(fodInfos->Shell.FOIShellView);
if (fodInfos->Shell.FOIShellView)
IShellView_Refresh(fodInfos->Shell.FOIShellView);
}
COMDLG32_SHFree(pidlCurrent);
SendMessageW(fodInfos->DlgInfos.hwndFileName, EM_SETSEL, 0, -1);
@ -2322,8 +2323,11 @@ static void FILEDLG95_SHELL_Clean(HWND hwnd)
COMDLG32_SHFree(fodInfos->ShellInfos.pidlAbsCurrent);
/* clean Shell interfaces */
IShellView_DestroyViewWindow(fodInfos->Shell.FOIShellView);
IShellView_Release(fodInfos->Shell.FOIShellView);
if (fodInfos->Shell.FOIShellView)
{
IShellView_DestroyViewWindow(fodInfos->Shell.FOIShellView);
IShellView_Release(fodInfos->Shell.FOIShellView);
}
IShellFolder_Release(fodInfos->Shell.FOIShellFolder);
IShellBrowser_Release(fodInfos->Shell.FOIShellBrowser);
if (fodInfos->Shell.FOIDataObject)
@ -2483,7 +2487,8 @@ static BOOL FILEDLG95_FILETYPE_OnCommand(HWND hwnd, WORD wNotifyCode)
}
/* Refresh the actual view to display the included items*/
IShellView_Refresh(fodInfos->Shell.FOIShellView);
if (fodInfos->Shell.FOIShellView)
IShellView_Refresh(fodInfos->Shell.FOIShellView);
}
}
return FALSE;