[PATCH] user32: Don't call set_active_window from SetFocus (eterbug #4382)

Ilya Shpigor aclass="moz-txt-link-rfc2396E"href="mailto:shpigor etersoft.ru"
24 16:25:43 MSK 2009


---
 dlls/user32/focus.c |   11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c
index 707c677..ffe22cb 100644
--- a/dlls/user32/focus.c
+++ b/dlls/user32/focus.c
@@ -300,15 +300,8 @@ HWND WINAPI SetFocus( HWND hwnd )
         /* call hooks */
         if (HOOK_CallHooks( WH_CBT, HCBT_SETFOCUS, (WPARAM)hwnd, (LPARAM)previous, TRUE )) return 0;
 
-        /* activate hwndTop if needed. */
-        if (hwndTop != GetActiveWindow())
-        {
-            if (!set_active_window( hwndTop, NULL, FALSE, FALSE )) return 0;
-            if (!IsWindow( hwnd )) return 0;  /* Abort if window destroyed */
-
-            /* Do not change focus if the window is no longer active */
-            if (hwndTop != GetActiveWindow()) return 0;
-        }
+        /* Do not change focus if the window is no longer active */
+        if (hwndTop != GetActiveWindow()) return 0;
     }
     else /* NULL hwnd passed in */
     {
  </pre>
</blockquote>
-  ... 1     
    ,  <br>
        , 
       editbox-.<br>
<blockquote cite="mid:200911241635.51971.shpigor  etersoft.ru"
 type="cite">
  <pre wrap=""></pre>
  <pre wrap="">
<fieldset class="mimeAttachmentHeader"></fieldset>_______________________________________________
Wine-patches mailing list
<a class="moz-txt-link-abbreviated" href="mailto:Wine-patches  lists.etersoft.ru">Wine-patches  lists.etersoft.ru</a>
<a class="moz-txt-link-freetext" href="http://lists.etersoft.ru/mailman/listinfo/wine-patches">http://lists.etersoft.ru/mailman/listinfo/wine-patches</a>
  </pre>
</blockquote>
<br>
</body>
</html>

--------------010309050206040401010603--


Wine-devel