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

[Alexandre Julliard]

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

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

ddraw: Use wined3d_get_adapter_display_mode() in CreateSurface().

---

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

diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index 979fb94..b0b2c31 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -2892,11 +2892,11 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD,
     desc2.u4.ddpfPixelFormat.dwSize=sizeof(DDPIXELFORMAT); /* Just to be sure */

/* Get the video mode from WineD3D - we will need it */
-    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 read display mode from wined3d\n");
-        switch(ddraw->orig_bpp)
+        ERR("Failed to get display mode, hr %#x.\n", hr);
+
+        switch (ddraw->orig_bpp)
         {
             case 8:
                 mode.format_id = WINED3DFMT_P8_UINT;