[PATCH 7/7] ddraw: Add Ramp device as possible return from surface QI.

Jeff Smith whydoubt at gmail.com
Thu Dec 12 23:00:08 CST 2019


Signed-off-by: Jeff Smith <whydoubt at gmail.com>
---
 dlls/ddraw/surface.c      | 3 ++-
 dlls/ddraw/tests/ddraw1.c | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index fda42f2982..0fe5a7c48c 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -216,7 +216,8 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface,
     {
         if (IsEqualGUID(riid, &IID_D3DDEVICE_WineD3D)
                 || IsEqualGUID(riid, &IID_IDirect3DHALDevice)
-                || IsEqualGUID(riid, &IID_IDirect3DRGBDevice))
+                || IsEqualGUID(riid, &IID_IDirect3DRGBDevice)
+                || (IsEqualGUID(riid, &IID_IDirect3DRampDevice) && This->version < 3))
         {
             wined3d_mutex_lock();
             if (!This->device1)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index fbf6e4d9d9..3b148a96e7 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -4149,6 +4149,7 @@ static void test_rt_caps(void)
 {
     test_rt_caps_riid(&IID_IDirect3DHALDevice, "HAL", TRUE);
     test_rt_caps_riid(&IID_IDirect3DRGBDevice, "RGB", FALSE);
+    test_rt_caps_riid(&IID_IDirect3DRampDevice, "Ramp", FALSE);
 }
 
 static void test_primary_caps(void)
-- 
2.23.0




More information about the wine-devel mailing list