[PATCH 5/5] ddraw: Use wined3d_get_adapter_display_mode() in ddraw7_GetFourCCCodes().

Henri Verbeet hverbeet at codeweavers.com
Wed Jun 20 10:45:17 CDT 2012


---
 dlls/ddraw/ddraw.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index 6424492..ce3eade 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -1513,7 +1513,11 @@ static HRESULT WINAPI ddraw7_GetFourCCCodes(IDirectDraw7 *iface, DWORD *NumCodes
 
     TRACE("iface %p, codes_count %p, codes %p.\n", iface, NumCodes, Codes);
 
-    wined3d_device_get_display_mode(ddraw->wined3d_device, 0, &mode);
+    if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode)))
+    {
+        ERR("Failed to get display mode, hr %#x.\n", hr);
+        return hr;
+    }
 
     outsize = NumCodes && Codes ? *NumCodes : 0;
 
-- 
1.7.3.4




More information about the wine-patches mailing list