Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-25 16:10:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Revert my SHOpenWithDialog changes

Browse source 
svn path=/trunk/; revision=40667
This commit is contained in:
Johannes Anderwald 2009-04-23 12:51:59 +00:00
parent c8b09007ed
commit 9478e3b4e7
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reactos/dll/win32/shell32/shlexec.c
View file

@ -1431,8 +1431,6 @@ void do_error_dialog( UINT_PTR retval, HWND hwnd )
WCHAR msg[2048];
int error_code=GetLastError();
//FIXME
// call SHOpenWithDialog
if (retval == SE_ERR_NOASSOC)
LoadStringW(shell32_hInstance, IDS_SHLEXEC_NOASSOC, msg, sizeof(msg)/sizeof(WCHAR));
else
@ -1597,9 +1595,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc )
Info.pcszClass = NULL;
Info.oaifInFlags = OAIF_ALLOW_REGISTRATION | OAIF_EXEC;
if (SHOpenWithDialog(sei_tmp.hwnd, &Info))
retval = 33; //FIXME
else
//if (SHOpenWithDialog(sei_tmp.hwnd, &Info) != S_OK)
do_error_dialog(retval, sei_tmp.hwnd);
}
HeapFree(GetProcessHeap(), 0, wszApplicationName);
@ -1827,9 +1823,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc )
Info.pcszClass = NULL;
Info.oaifInFlags = OAIF_ALLOW_REGISTRATION | OAIF_EXEC;
if (SHOpenWithDialog(sei_tmp.hwnd, &Info))
retval = 33; //FIXME
else
//if (SHOpenWithDialog(sei_tmp.hwnd, &Info) != S_OK)
do_error_dialog(retval, sei_tmp.hwnd);
}