reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-02-10 22:35:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

explorer: Avoid crashing when the desktop launchers are not initialized.

Browse Source
This commit is contained in:
Alexandre Julliard 2013-10-18 13:29:39 +02:00
parent 040bd407c7
commit 0d40cdc779
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
programs/explorer/desktop.c
View File

@ -88,8 +88,10 @@ static RECT get_title_rect( unsigned int index )
static const struct launcher *launcher_from_point( int x, int y ) static const struct launcher *launcher_from_point( int x, int y )
{ {
RECT icon, title; RECT icon, title;
unsigned int index = x / launcher_size + (y / launcher_size) * launchers_per_row; unsigned int index;
if (!nb_launchers) return NULL;
index = x / launcher_size + (y / launcher_size) * launchers_per_row;
if (index >= nb_launchers) return NULL; if (index >= nb_launchers) return NULL;
icon = get_icon_rect( index ); icon = get_icon_rect( index );
@ -523,6 +525,7 @@ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPAR
return 0; return 0;
case WM_LBUTTONDBLCLK: case WM_LBUTTONDBLCLK:
if (!using_root)
{ {
const struct launcher *launcher = launcher_from_point( (short)LOWORD(lp), (short)HIWORD(lp) ); const struct launcher *launcher = launcher_from_point( (short)LOWORD(lp), (short)HIWORD(lp) );
if (launcher) do_launch( launcher ); if (launcher) do_launch( launcher );