winex11.drv: avoid shadowing a parameter
Austin English
austinenglish at gmail.com
Wed Mar 9 03:08:48 CST 2011
--
-Austin
-------------- next part --------------
diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c
index 6e4225c..e9df531 100644
--- a/dlls/winex11.drv/event.c
+++ b/dlls/winex11.drv/event.c
@@ -676,11 +676,11 @@ static void X11DRV_FocusIn( HWND hwnd, XEvent *xev )
if (!can_activate_window(hwnd))
{
- HWND hwnd = GetFocus();
- if (hwnd) hwnd = GetAncestor( hwnd, GA_ROOT );
- if (!hwnd) hwnd = GetActiveWindow();
- if (!hwnd) hwnd = x11drv_thread_data()->last_focus;
- if (hwnd && can_activate_window(hwnd)) set_focus( event->display, hwnd, CurrentTime );
+ HWND hwnd_tmp = GetFocus();
+ if (hwnd_tmp) hwnd_tmp = GetAncestor( hwnd_tmp, GA_ROOT );
+ if (!hwnd_tmp) hwnd_tmp = GetActiveWindow();
+ if (!hwnd_tmp) hwnd_tmp = x11drv_thread_data()->last_focus;
+ if (hwnd_tmp && can_activate_window(hwnd_tmp)) set_focus( event->display, hwnd_tmp, CurrentTime );
}
else SetForegroundWindow( hwnd );
}
More information about the wine-patches
mailing list