Henri Verbeet : ddraw: Use wined3d_get_adapter_display_mode() in ddraw7_GetFourCCCodes().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0833a639a9056b2302bc5fbfd1fc84162488aab5
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0833a639a9056b2302bc5fbfd1...

Author: Henri Verbeet 
Date:   Wed Jun 20 17:45:17 2012 +0200

ddraw: Use wined3d_get_adapter_display_mode() in ddraw7_GetFourCCCodes().

---

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;