[PATCH v2 4/4] strmbase: Create the video window with the correct styles. (original) (raw)
Zebediah Figura z.figura12 at gmail.com
Thu Dec 5 23:08:32 CST 2019
- Previous message (by thread): [PATCH v2 3/4] quartz/tests: Port IVideoWindow tests to the VMR.
- Next message (by thread): [PATCH v2 1/4] strmbase: Correctly implement IVideoWindow::NotifyOwnerMessage().
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
dlls/quartz/tests/videorenderer.c | 8 ++++---- dlls/quartz/tests/vmr7.c | 8 ++++---- dlls/quartz/tests/vmr9.c | 8 ++++---- dlls/strmbase/window.c | 3 ++- 4 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index b2202d7ae7..2b4b166958 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1391,11 +1391,11 @@ static void test_video_window_style(IVideoWindow *window, HWND hwnd, HWND our_hw hr = IVideoWindow_get_WindowStyle(window, &style); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(style == (WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW), + ok(style == (WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); style = GetWindowLongA(hwnd, GWL_STYLE); - todo_wine ok(style == (WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW), + ok(style == (WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); hr = IVideoWindow_put_WindowStyle(window, style | WS_DISABLED); @@ -1414,10 +1414,10 @@ static void test_video_window_style(IVideoWindow *window, HWND hwnd, HWND our_hw hr = IVideoWindow_get_WindowStyle(window, &style); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(style == (WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); + ok(style == (WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); style = GetWindowLongA(hwnd, GWL_STYLE); - todo_wine ok(style == (WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); + ok(style == (WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index fd4c69a441..224ae3c717 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -1525,11 +1525,11 @@ static void test_video_window_style(IVideoWindow *window, HWND hwnd, HWND our_hw hr = IVideoWindow_get_WindowStyle(window, &style); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(style == (WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW), + ok(style == (WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); style = GetWindowLongA(hwnd, GWL_STYLE); - todo_wine ok(style == (WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW), + ok(style == (WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); hr = IVideoWindow_put_WindowStyle(window, style | WS_DISABLED); @@ -1548,10 +1548,10 @@ static void test_video_window_style(IVideoWindow *window, HWND hwnd, HWND our_hw hr = IVideoWindow_get_WindowStyle(window, &style); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(style == (WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); + ok(style == (WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); style = GetWindowLongA(hwnd, GWL_STYLE); - todo_wine ok(style == (WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); + ok(style == (WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 5d5c7a4756..fd6901d211 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1525,11 +1525,11 @@ static void test_video_window_style(IVideoWindow *window, HWND hwnd, HWND our_hw hr = IVideoWindow_get_WindowStyle(window, &style); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(style == (WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW), + ok(style == (WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); style = GetWindowLongA(hwnd, GWL_STYLE); - todo_wine ok(style == (WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW), + ok(style == (WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); hr = IVideoWindow_put_WindowStyle(window, style | WS_DISABLED); @@ -1548,10 +1548,10 @@ static void test_video_window_style(IVideoWindow *window, HWND hwnd, HWND our_hw hr = IVideoWindow_get_WindowStyle(window, &style); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(style == (WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); + ok(style == (WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); style = GetWindowLongA(hwnd, GWL_STYLE); - todo_wine ok(style == (WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); + ok(style == (WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW), "Got style %#x.\n", style); ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index 04132aaab1..07a12eca26 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -118,7 +118,8 @@ HRESULT WINAPI BaseWindowImpl_PrepareWindow(BaseWindow *This) return E_FAIL; } - This->hWnd = CreateWindowExW(0, class_nameW, windownameW, WS_SIZEBOX, + This->hWnd = CreateWindowExW(0, class_nameW, windownameW, + WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, NULL, NULL);
2.24.0
- Previous message (by thread): [PATCH v2 3/4] quartz/tests: Port IVideoWindow tests to the VMR.
- Next message (by thread): [PATCH v2 1/4] strmbase: Correctly implement IVideoWindow::NotifyOwnerMessage().
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]