[ros-diffs] [reactos] 01/01: [OSK] Delete WS_EX_NOACTIVATE workaround code

[Katayama Hirofumi MZ]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=47f3a4e144b897da0e0e8…

commit 47f3a4e144b897da0e0e8cb08c2909645061dec9
Author:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Sun Dec 4 10:15:56 2022 +0900
Commit:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
CommitDate: Sun Dec 4 10:15:56 2022 +0900

    [OSK] Delete WS_EX_NOACTIVATE workaround code
    
    CORE-18528
---
 base/applications/osk/main.c    | 16 ----------------
 base/applications/osk/precomp.h |  2 --
 2 files changed, 18 deletions(-)

diff --git a/base/applications/osk/main.c b/base/applications/osk/main.c
index 60a29ed5a56..680156639aa 100644
--- a/base/applications/osk/main.c
+++ b/base/applications/osk/main.c
@@ -550,9 +550,6 @@ int OSK_Timer(void)
     hWndActiveWindow = GetForegroundWindow();
     if (hWndActiveWindow != NULL && hWndActiveWindow != Globals.hMainWnd)
     {
-        /* FIXME: To be deleted when ReactOS will support WS_EX_NOACTIVATE */
-        Globals.hActiveWnd = hWndActiveWindow;
-
         /* Grab the current keyboard layout from the foreground window */
         dwThread = GetWindowThreadProcessId(hWndActiveWindow, NULL);
         hKeyboardLayout = GetKeyboardLayout(dwThread);
@@ -629,19 +626,6 @@ BOOL OSK_Command(WPARAM wCommand, HWND hWndControl)
     LONG WindowStyle;
     INT i;
 
-    /* FIXME: To be deleted when ReactOS will support WS_EX_NOACTIVATE */
-    if (Globals.hActiveWnd)
-    {
-        MSG msg;
-
-        SetForegroundWindow(Globals.hActiveWnd);
-        while (PeekMessageW(&msg, 0, 0, 0, PM_REMOVE))
-        {
-            TranslateMessage(&msg);
-            DispatchMessageW(&msg);
-        }
-    }
-
     /* KeyDown and/or KeyUp ? */
     WindowStyle = GetWindowLongW(hWndControl, GWL_STYLE);
     if ((WindowStyle & BS_AUTOCHECKBOX) == BS_AUTOCHECKBOX)
diff --git a/base/applications/osk/precomp.h b/base/applications/osk/precomp.h
index a427d4f95ec..ceb063db972 100644
--- a/base/applications/osk/precomp.h
+++ b/base/applications/osk/precomp.h
@@ -57,8 +57,6 @@ typedef struct
     HWND*      hKeys;
     HFONT      hFont;
     WCHAR      szTitle[MAX_PATH];
-    /* FIXME: To be deleted when ReactOS will support WS_EX_NOACTIVATE */
-    HWND       hActiveWnd;
 
     /* On-Screen Keyboard registry settings */
     BOOL       bShowWarning;