Skip to content

W
wine-winehq
Commit 6ef97acd authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard
Browse files
Options

strmbase: IVideoWindow::get_Visible() returns OATRUE, not TRUE.

Signed-off-by: 's avatarZebediah Figura <z.figura12@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 7272891e
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
dlls/quartz/tests/videorenderer.c
View file @ 6ef97acd
...@@ -1504,7 +1504,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw ...@@ -1504,7 +1504,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw
todo_wine ok(state == SW_SHOW, "Got state %d.\n", state); todo_wine ok(state == SW_SHOW, "Got state %d.\n", state);
hr = IVideoWindow_get_Visible(window, &state); hr = IVideoWindow_get_Visible(window, &state);
todo_wine ok(state == OATRUE, "Got state %d.\n", state); ok(state == OATRUE, "Got state %d.\n", state);
ok(IsWindowVisible(hwnd), "Window should be visible.\n"); ok(IsWindowVisible(hwnd), "Window should be visible.\n");
ok(!IsIconic(hwnd), "Window should not be minimized.\n"); ok(!IsIconic(hwnd), "Window should not be minimized.\n");
...@@ -1521,7 +1521,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw ...@@ -1521,7 +1521,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw
todo_wine ok(state == SW_MINIMIZE, "Got state %d.\n", state); todo_wine ok(state == SW_MINIMIZE, "Got state %d.\n", state);
hr = IVideoWindow_get_Visible(window, &state); hr = IVideoWindow_get_Visible(window, &state);
todo_wine ok(state == OATRUE, "Got state %d.\n", state); ok(state == OATRUE, "Got state %d.\n", state);
ok(IsWindowVisible(hwnd), "Window should be visible.\n"); ok(IsWindowVisible(hwnd), "Window should be visible.\n");
ok(IsIconic(hwnd), "Window should be minimized.\n"); ok(IsIconic(hwnd), "Window should be minimized.\n");
...@@ -1536,7 +1536,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw ...@@ -1536,7 +1536,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw
todo_wine ok(state == SW_SHOW, "Got state %d.\n", state); todo_wine ok(state == SW_SHOW, "Got state %d.\n", state);
hr = IVideoWindow_get_Visible(window, &state); hr = IVideoWindow_get_Visible(window, &state);
todo_wine ok(state == OATRUE, "Got state %d.\n", state); ok(state == OATRUE, "Got state %d.\n", state);
ok(IsWindowVisible(hwnd), "Window should be visible.\n"); ok(IsWindowVisible(hwnd), "Window should be visible.\n");
ok(!IsIconic(hwnd), "Window should not be minimized.\n"); ok(!IsIconic(hwnd), "Window should not be minimized.\n");
...@@ -1551,7 +1551,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw ...@@ -1551,7 +1551,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw
ok(state == SW_MAXIMIZE, "Got state %d.\n", state); ok(state == SW_MAXIMIZE, "Got state %d.\n", state);
hr = IVideoWindow_get_Visible(window, &state); hr = IVideoWindow_get_Visible(window, &state);
todo_wine ok(state == OATRUE, "Got state %d.\n", state); ok(state == OATRUE, "Got state %d.\n", state);
ok(IsWindowVisible(hwnd), "Window should be visible.\n"); ok(IsWindowVisible(hwnd), "Window should be visible.\n");
ok(!IsIconic(hwnd), "Window should be minimized.\n"); ok(!IsIconic(hwnd), "Window should be minimized.\n");
...@@ -1584,7 +1584,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw ...@@ -1584,7 +1584,7 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw
todo_wine ok(state == SW_SHOW, "Got state %d.\n", state); todo_wine ok(state == SW_SHOW, "Got state %d.\n", state);
hr = IVideoWindow_get_Visible(window, &state); hr = IVideoWindow_get_Visible(window, &state);
todo_wine ok(state == OATRUE, "Got state %d.\n", state); ok(state == OATRUE, "Got state %d.\n", state);
ok(IsWindowVisible(hwnd), "Window should be visible.\n"); ok(IsWindowVisible(hwnd), "Window should be visible.\n");
ok(!IsIconic(hwnd), "Window should not be minimized.\n"); ok(!IsIconic(hwnd), "Window should not be minimized.\n");
...@@ -1828,7 +1828,7 @@ static void test_video_window_owner(IVideoWindow *window, HWND hwnd, HWND our_hw ...@@ -1828,7 +1828,7 @@ static void test_video_window_owner(IVideoWindow *window, HWND hwnd, HWND our_hw
hr = IVideoWindow_get_Visible(window, &state); hr = IVideoWindow_get_Visible(window, &state);
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
todo_wine ok(state == OATRUE, "Got state %d.\n", state); ok(state == OATRUE, "Got state %d.\n", state);
} }
static void test_video_window_messages(IVideoWindow *window, HWND hwnd, HWND our_hwnd) static void test_video_window_messages(IVideoWindow *window, HWND hwnd, HWND our_hwnd)
...@@ -1938,14 +1938,14 @@ static void test_video_window_autoshow(IVideoWindow *window, IFilterGraph2 *grap ...@@ -1938,14 +1938,14 @@ static void test_video_window_autoshow(IVideoWindow *window, IFilterGraph2 *grap
hr = IVideoWindow_get_Visible(window, &l); hr = IVideoWindow_get_Visible(window, &l);
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
todo_wine ok(l == OATRUE, "Got %d.\n", l); ok(l == OATRUE, "Got %d.\n", l);
hr = IMediaControl_Stop(control); hr = IMediaControl_Stop(control);
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
hr = IVideoWindow_get_Visible(window, &l); hr = IVideoWindow_get_Visible(window, &l);
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
todo_wine ok(l == OATRUE, "Got %d.\n", l); ok(l == OATRUE, "Got %d.\n", l);
hr = IVideoWindow_put_AutoShow(window, OAFALSE); hr = IVideoWindow_put_AutoShow(window, OAFALSE);
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
......
dlls/strmbase/window.c
View file @ 6ef97acd
...@@ -449,7 +449,7 @@ HRESULT WINAPI BaseControlWindowImpl_get_Visible(IVideoWindow *iface, LONG *pVis ...@@ -449,7 +449,7 @@ HRESULT WINAPI BaseControlWindowImpl_get_Visible(IVideoWindow *iface, LONG *pVis
TRACE("(%p/%p)->(%p)\n", This, iface, pVisible); TRACE("(%p/%p)->(%p)\n", This, iface, pVisible);
*pVisible = IsWindowVisible(This->baseWindow.hWnd); *pVisible = IsWindowVisible(This->baseWindow.hWnd) ? OATRUE : OAFALSE;
return S_OK; return S_OK;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment