Zebediah Figura : strmbase: Don't move or activate the window in IVideoWindow::put_WindowStyle().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ab98626afa03674db2ae3cb6c5eaffce31505617
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=ab98626afa03674db2ae3cb6c5eaffce31505617

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Tue Oct  8 20:02:19 2019 -0500

strmbase: Don't move or activate the window in IVideoWindow::put_WindowStyle().

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/quartz/tests/videorenderer.c | 2 +-
 dlls/strmbase/window.c            | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c
index 558dc26cb9..1c16fa1f82 100644
--- a/dlls/quartz/tests/videorenderer.c
+++ b/dlls/quartz/tests/videorenderer.c
@@ -1438,7 +1438,7 @@ static void test_video_window_style(IVideoWindow *window, HWND hwnd, HWND our_hw
     style = GetWindowLongA(hwnd, GWL_STYLE);
     todo_wine ok(style == (WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style);
 
-    todo_wine ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow());
+    ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow());
 
     hr = IVideoWindow_get_WindowStyleEx(window, &style);
     ok(hr == S_OK, "Got hr %#x.\n", hr);
diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c
index ecedc17489..206aecb8de 100644
--- a/dlls/strmbase/window.c
+++ b/dlls/strmbase/window.c
@@ -330,7 +330,8 @@ HRESULT WINAPI BaseControlWindowImpl_put_WindowStyle(IVideoWindow *iface, LONG W
         return E_INVALIDARG;
 
     SetWindowLongW(This->baseWindow.hWnd, GWL_STYLE, WindowStyle);
-    SetWindowPos(This->baseWindow.hWnd,0,0,0,0,0,SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOZORDER);
+    SetWindowPos(This->baseWindow.hWnd, 0, 0, 0, 0, 0,
+            SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
     This->baseWindow.WindowStyles = WindowStyle;
 
     return S_OK;