Zebediah Figura : strmbase: IVideoWindow::get_Visible() returns OATRUE, not TRUE.
Alexandre Julliard
julliard at winehq.org
Wed Oct 9 14:36:29 CDT 2019
Module: wine
Branch: master
Commit: 6ef97acd1b151f801a824835c9cbfcc24d24040e
URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ef97acd1b151f801a824835c9cbfcc24d24040e
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Tue Oct 8 20:02:18 2019 -0500
strmbase: IVideoWindow::get_Visible() returns OATRUE, not TRUE.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/quartz/tests/videorenderer.c | 16 ++++++++--------
dlls/strmbase/window.c | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c
index e1b1f17c72..558dc26cb9 100644
--- a/dlls/quartz/tests/videorenderer.c
+++ b/dlls/quartz/tests/videorenderer.c
@@ -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);
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(!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
todo_wine ok(state == SW_MINIMIZE, "Got state %d.\n", 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(IsIconic(hwnd), "Window should be minimized.\n");
@@ -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);
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(!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
ok(state == SW_MAXIMIZE, "Got state %d.\n", 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(!IsIconic(hwnd), "Window should be minimized.\n");
@@ -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);
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(!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
hr = IVideoWindow_get_Visible(window, &state);
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)
@@ -1938,14 +1938,14 @@ static void test_video_window_autoshow(IVideoWindow *window, IFilterGraph2 *grap
hr = IVideoWindow_get_Visible(window, &l);
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);
ok(hr == S_OK, "Got hr %#x.\n", hr);
hr = IVideoWindow_get_Visible(window, &l);
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);
ok(hr == S_OK, "Got hr %#x.\n", hr);
diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c
index 66db2d6c07..ecedc17489 100644
--- a/dlls/strmbase/window.c
+++ b/dlls/strmbase/window.c
@@ -449,7 +449,7 @@ HRESULT WINAPI BaseControlWindowImpl_get_Visible(IVideoWindow *iface, LONG *pVis
TRACE("(%p/%p)->(%p)\n", This, iface, pVisible);
- *pVisible = IsWindowVisible(This->baseWindow.hWnd);
+ *pVisible = IsWindowVisible(This->baseWindow.hWnd) ? OATRUE : OAFALSE;
return S_OK;
}
More information about the wine-cvs
mailing list