https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4ccad609e0f07285dcf36c9a7bdad5b7c8dd8bad

commit 4ccad609e0f07285dcf36c9a7bdad5b7c8dd8bad
Author:     Katayama Hirofumi MZ <[email protected]>
AuthorDate: Thu Oct 25 22:59:44 2018 +0900
Commit:     GitHub <[email protected]>
CommitDate: Thu Oct 25 22:59:44 2018 +0900

    [USER32] Fix Task Switcher (#976)
    
    This fix is needed for the Delphi GUI programs.
    - Don't enumerate the windows whose owner window exists.
    - Use PostMessage SC_RESTORE instead of ShowWindowAsync SW_RESTORE.
    CORE-15165
---
 win32ss/user/user32/controls/appswitch.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/win32ss/user/user32/controls/appswitch.c 
b/win32ss/user/user32/controls/appswitch.c
index c776008ad0..c2898b9e13 100644
--- a/win32ss/user/user32/controls/appswitch.c
+++ b/win32ss/user/user32/controls/appswitch.c
@@ -125,7 +125,7 @@ void ResizeAndCenter(HWND hwnd, int width, int height)
 void MakeWindowActive(HWND hwnd)
 {
    if (IsIconic(hwnd))
-      ShowWindowAsync(hwnd, SW_RESTORE);
+      PostMessageW(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0);
 
    BringWindowToTop(hwnd);  // same as: 
SetWindowPos(hwnd,HWND_TOP,0,0,0,0,SWP_NOMOVE|SWP_NOSIZE); ?
    SetForegroundWindow(hwnd);
@@ -171,6 +171,9 @@ BOOL CALLBACK EnumerateCallback(HWND window, LPARAM lParam)
    if (!IsWindowVisible(window))
             return TRUE;
 
+   if (GetWindow(window, GW_OWNER) != NULL)
+       return TRUE;
+
    GetClassNameW(window, windowText, _countof(windowText));
    if ((wcscmp(L"Shell_TrayWnd", windowText)==0) ||
        (wcscmp(L"Progman", windowText)==0) )

Reply via email to