comdlg32: Populate psia_results before making any callbacks.
This commit is contained in:
parent
062f92a99c
commit
7311a9fc6e
@ -536,9 +536,6 @@ static HRESULT on_default_action(FileDialogImpl *This)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case ONOPEN_OPEN:
|
case ONOPEN_OPEN:
|
||||||
if(events_OnFileOk(This) != S_OK)
|
|
||||||
break;
|
|
||||||
|
|
||||||
hr = SHGetDesktopFolder(&psf_desktop);
|
hr = SHGetDesktopFolder(&psf_desktop);
|
||||||
if(SUCCEEDED(hr))
|
if(SUCCEEDED(hr))
|
||||||
{
|
{
|
||||||
@ -547,10 +544,11 @@ static HRESULT on_default_action(FileDialogImpl *This)
|
|||||||
|
|
||||||
hr = SHCreateShellItemArray(NULL, psf_desktop, file_count, (PCUITEMID_CHILD_ARRAY)pidla,
|
hr = SHCreateShellItemArray(NULL, psf_desktop, file_count, (PCUITEMID_CHILD_ARRAY)pidla,
|
||||||
&This->psia_results);
|
&This->psia_results);
|
||||||
if(SUCCEEDED(hr))
|
|
||||||
ret = S_OK;
|
|
||||||
|
|
||||||
IShellFolder_Release(psf_desktop);
|
IShellFolder_Release(psf_desktop);
|
||||||
|
|
||||||
|
if(SUCCEEDED(hr) && events_OnFileOk(This) == S_OK)
|
||||||
|
ret = S_OK;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user