[PATCH 0/2] MR1073: Fix video flickering.

[PATCH 1/2] quartz/tests: Add a background brush test for video renderer.

[Akihiro Sagawa]

From: Akihiro Sagawa

---
 dlls/quartz/tests/videorenderer.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c
index 0c5f7f440ef..24f30146981 100644
--- a/dlls/quartz/tests/videorenderer.c
+++ b/dlls/quartz/tests/videorenderer.c
@@ -2329,6 +2329,7 @@ static void test_video_window(void)
     WNDCLASSA window_class = {0};
     struct testfilter source;
     LONG width, height, l;
+    ULONG_PTR background;
     IVideoWindow *window;
     IBaseFilter *filter;
     HWND hwnd, our_hwnd;
@@ -2366,6 +2367,9 @@ static void test_video_window(void)
     tid = GetWindowThreadProcessId(hwnd, NULL);
     ok(tid == GetCurrentThreadId(), "Expected tid %#lx, got %#lx.\n", GetCurrentThreadId(), tid);

+    background = GetClassLongPtrW(hwnd, GCLP_HBRBACKGROUND);
+    todo_wine ok(!background, "Expected NULL brush, got %#Ix\n", background);
+
     hr = IBaseFilter_QueryInterface(filter, &IID_IVideoWindow, (void **)&window);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);

[PATCH 2/2] quartz: Fix video flickering.

[Akihiro Sagawa]

From: Akihiro Sagawa

---
 dlls/quartz/tests/videorenderer.c | 2 +-
 dlls/quartz/window.c              | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c
index 24f30146981..fccb32d06d0 100644
--- a/dlls/quartz/tests/videorenderer.c
+++ b/dlls/quartz/tests/videorenderer.c
@@ -2368,7 +2368,7 @@ static void test_video_window(void)
     ok(tid == GetCurrentThreadId(), "Expected tid %#lx, got %#lx.\n", GetCurrentThreadId(), tid);

background = GetClassLongPtrW(hwnd, GCLP_HBRBACKGROUND);
-    todo_wine ok(!background, "Expected NULL brush, got %#Ix\n", background);
+    ok(!background, "Expected NULL brush, got %#Ix\n", background);

hr = IBaseFilter_QueryInterface(filter, &IID_IVideoWindow, (void **)&window);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c
index 3e19d9b582e..2064be7e320 100644
--- a/dlls/quartz/window.c
+++ b/dlls/quartz/window.c
@@ -101,7 +101,6 @@ HRESULT video_window_create_window(struct video_window *window)

winclass.lpfnWndProc = WndProcW;
     winclass.cbWndExtra = sizeof(window);
-    winclass.hbrBackground = GetStockObject(BLACK_BRUSH);
     winclass.lpszClassName = class_name;
     if (!RegisterClassW(&winclass) && GetLastError() != ERROR_CLASS_ALREADY_EXISTS)
     {

[PATCH 2/2] quartz: Fix video flickering.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=125033

Your paranoid android.

=== w10pro64 (32 bit report) ===

quartz:
videorenderer.c:1001: Test failed: Got hr 0x1.

=== w10pro64_en_AE_u8 (64 bit report) ===

quartz:
videorenderer.c:1378: Test failed: Wait failed.
videorenderer.c:1379: Test failed: Got hr 0x103.
videorenderer.c:1381: Test failed: Got hr 0x40237.

=== w10pro64_zh_CN (64 bit report) ===

quartz:
videorenderer.c:1098: Test failed: Wait failed.
videorenderer.c:1100: Test failed: Got hr 0x103.
videorenderer.c:1156: Test failed: Got hr 0x80004005.

=== debian11 (32 bit report) ===

ddraw:
ddraw7.c:15663: Test failed: Expected unsynchronised map for flags 0x1000.
ddraw7.c:15663: Test failed: Expected unsynchronised map for flags 0x3000.

=== debian11 (build log) ===

Use of uninitialized value $Flaky in addition (+) at /home/testbot/lib/WineTestBot/LogUtils.pm line 720, <$LogFile> line 24754.
Use of uninitialized value $Flaky in addition (+) at /home/testbot/lib/WineTestBot/LogUtils.pm line 720, <$LogFile> line 24754.
Use of uninitialized value $Flaky in addition (+) at /home/testbot/lib/WineTestBot/LogUtils.pm line 720, <$LogFile> line 24754.

[PATCH 0/2] MR1073: Fix video flickering. - approved

[Zebediah Figura (＠zfigura)]

This merge request was approved by Zebediah Figura.