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

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Wed Jun 20 17:45:15 2012 +0200

ddraw: Use wined3d_get_adapter_display_mode() in ddraw_create_swapchain().

---

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

diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index e5bd7d6..f38734b 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -670,12 +670,7 @@ static HRESULT ddraw_create_swapchain(struct ddraw *ddraw, HWND window, BOOL win
     struct wined3d_display_mode mode;
     HRESULT hr = WINED3D_OK;
 
-    /* FIXME: wined3d_get_adapter_display_mode() would be more appropriate
-     * here, since we don't actually have a swapchain yet, but
-     * wined3d_device_get_display_mode() has some special handling for color
-     * depth changes. */
-    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.\n");
         return hr;