[PATCH 0/2] MR9478: d2d1/tests: Explicitly use WARP device for IWICBitmapLock tests.

[Nikolay Sivov (＠nsivov)]

In attempt to fix new test failures after 5384fb816b0271a069af907397c00d695ff15bae.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/9478

[PATCH 1/2] d2d1/tests: Explicitly use WARP device for IWICBitmapLock tests.

[Nikolay Sivov]

From: Nikolay Sivov <nsivov(a)codeweavers.com>

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
 dlls/d2d1/tests/d2d1.c | 50 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 48 insertions(+), 2 deletions(-)

diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c
index f01f51661d9..2222c31d80f 100644
--- a/dlls/d2d1/tests/d2d1.c
+++ b/dlls/d2d1/tests/d2d1.c
@@ -1273,6 +1273,39 @@ static IDXGIDevice *create_device(BOOL d3d11)
     return device;
 }
 
+static IDXGIDevice *create_warp_device(BOOL d3d11)
+{
+    IUnknown *d3d_device;
+    IDXGIDevice *device;
+    HRESULT hr;
+
+    if (d3d11)
+    {
+        D3D_FEATURE_LEVEL level = D3D_FEATURE_LEVEL_11_0;
+
+        if (FAILED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL,
+                D3D11_CREATE_DEVICE_BGRA_SUPPORT, &level, 1, D3D11_SDK_VERSION,
+                (ID3D11Device **)&d3d_device, NULL, NULL)))
+        {
+            return NULL;
+        }
+    }
+    else
+    {
+        if (FAILED((D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_WARP, NULL,
+                D3D10_CREATE_DEVICE_BGRA_SUPPORT, D3D10_FEATURE_LEVEL_10_0, D3D10_1_SDK_VERSION,
+                (ID3D10Device1 **)&d3d_device))))
+        {
+            return NULL;
+        }
+    }
+    hr = IUnknown_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&device);
+    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+    IUnknown_Release(d3d_device);
+
+    return device;
+}
+
 static HWND create_window(void)
 {
     RECT r = {0, 0, 640, 480};
@@ -5352,10 +5385,12 @@ static void test_alpha_mode(BOOL d3d11)
 static void test_shared_bitmap(BOOL d3d11)
 {
     IWICBitmap *wic_bitmap1, *wic_bitmap2;
+    ID2D1DeviceContext *sw_device_context;
     ID2D1GdiInteropRenderTarget *interop;
     D2D1_RENDER_TARGET_PROPERTIES desc;
     D2D1_BITMAP_PROPERTIES bitmap_desc;
     ID2D1RenderTarget *rt1, *rt2, *rt3;
+    IDXGIDevice *device2, *warp_device;
     IDXGISurface *surface2;
     ID2D1Factory *factory1, *factory2;
     IWICImagingFactory *wic_factory;
@@ -5368,7 +5403,7 @@ static void test_shared_bitmap(BOOL d3d11)
     IWICBitmapLock *wic_lock;
     IDXGISurface1 *surface3;
     ID2D1Bitmap1 *bitmap3;
-    IDXGIDevice *device2;
+    ID2D1Device *device;
     WICRect wic_rect;
     ULONG refcount;
     HWND window2;
@@ -5651,6 +5686,16 @@ static void test_shared_bitmap(BOOL d3d11)
     ID2D1Bitmap_Release(bitmap1);
 
     /* Using IWICBitmapLock */
+    warp_device = create_warp_device(d3d11);
+
+    hr = ID2D1Factory1_CreateDevice(ctx.factory1, warp_device, &device);
+    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+    IDXGIDevice_Release(warp_device);
+
+    hr = ID2D1Device_CreateDeviceContext(device, D2D1_DEVICE_CONTEXT_OPTIONS_NONE, &sw_device_context);
+    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+    ID2D1Device_Release(device);
+
     wic_rect.X = wic_rect.Y = 0;
     wic_rect.Width = 32;
     wic_rect.Height = 16;
@@ -5658,7 +5703,7 @@ static void test_shared_bitmap(BOOL d3d11)
     ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
 
     refcount = get_refcount(wic_lock);
-    hr = ID2D1RenderTarget_CreateSharedBitmap(ctx.rt, &IID_IWICBitmapLock, wic_lock, NULL, &bitmap1);
+    hr = ID2D1DeviceContext_CreateSharedBitmap(sw_device_context, &IID_IWICBitmapLock, wic_lock, NULL, &bitmap1);
     todo_wine
     ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
     todo_wine
@@ -5695,6 +5740,7 @@ if (hr == S_OK)
     }
     ID2D1Bitmap_Release(bitmap1);
 }
+    ID2D1DeviceContext_Release(sw_device_context);
     IWICBitmapLock_Release(wic_lock);
 
     ID2D1RenderTarget_Release(rt1);
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/9478

[PATCH 2/2] d2d1/tests: Print adapter information.

[Nikolay Sivov]

From: Nikolay Sivov <nsivov(a)codeweavers.com>

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
 dlls/d2d1/tests/d2d1.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c
index 2222c31d80f..556d93a970f 100644
--- a/dlls/d2d1/tests/d2d1.c
+++ b/dlls/d2d1/tests/d2d1.c
@@ -1273,6 +1273,31 @@ static IDXGIDevice *create_device(BOOL d3d11)
     return device;
 }
 
+static void print_adapter_info(void)
+{
+    DXGI_ADAPTER_DESC adapter_desc;
+    IDXGIAdapter *adapter;
+    IDXGIDevice *device;
+    HRESULT hr;
+
+    if (!(device = create_device(TRUE)))
+        device = create_device(FALSE);
+
+    if (!device)
+        return;
+
+    hr = IDXGIDevice_GetAdapter(device, &adapter);
+    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+    hr = IDXGIAdapter_GetDesc(adapter, &adapter_desc);
+    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+
+    trace("Adapter: %s, %04x:%04x.\n", wine_dbgstr_w(adapter_desc.Description),
+            adapter_desc.VendorId, adapter_desc.DeviceId);
+
+    IDXGIDevice_Release(device);
+    IDXGIAdapter_Release(adapter);
+}
+
 static IDXGIDevice *create_warp_device(BOOL d3d11)
 {
     IUnknown *d3d_device;
@@ -17276,6 +17301,8 @@ START_TEST(d2d1)
             use_mt = FALSE;
     }
 
+    print_adapter_info();
+
     queue_test(test_clip);
     queue_test(test_state_block);
     queue_test(test_color_brush);
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/9478