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

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Thu Jun 21 19:35:33 2012 +0200

ddraw: Use wined3d_get_adapter_display_mode() in d3d7_EnumZBufferFormats().

---

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

diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index b0b2c31..6c45737 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -4642,7 +4642,12 @@ static HRESULT WINAPI d3d7_EnumZBufferFormats(IDirect3D7 *iface, REFCLSID device
      * not like that we'll have to find some workaround, like iterating over
      * all imaginable formats and collecting all the depth stencil formats we
      * can get. */
-    hr = 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);
+        wined3d_mutex_unlock();
+        return hr;
+    }

for (i = 0; i < (sizeof(formats) / sizeof(*formats)); ++i)
     {