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

[Alexandre Julliard]

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

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

ddraw: Use wined3d_get_adapter_display_mode() in ddraw7_GetDisplayMode().

---

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

diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index f38734b..6424492 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -1421,10 +1421,7 @@ static HRESULT WINAPI ddraw7_GetDisplayMode(IDirectDraw7 *iface, DDSURFACEDESC2
         return DDERR_INVALIDPARAMS;
     }

-    /* The necessary members of LPDDSURFACEDESC and LPDDSURFACEDESC2 are equal,
-     * so one method can be used for all versions (Hopefully) */
-    hr = wined3d_device_get_display_mode(ddraw->wined3d_device, 0, &mode);
-    if (FAILED(hr))
+    if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode)))
     {
         ERR("Failed to get display mode, hr %#x.\n", hr);
         wined3d_mutex_unlock();