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

Alexandre Julliard julliard at winehq.org
Thu Jun 21 15:03:41 CDT 2012


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Thu Jun 21 19:35:35 2012 +0200

ddraw: Use wined3d_get_adapter_display_mode() in d3d_device2_EnumTextureFormats().

---

 dlls/ddraw/device.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index aa16757..3179d02 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -1198,8 +1198,7 @@ static HRESULT WINAPI d3d_device2_EnumTextureFormats(IDirect3DDevice2 *iface,
     wined3d_mutex_lock();
 
     memset(&mode, 0, sizeof(mode));
-    hr = wined3d_device_get_display_mode(device->ddraw->wined3d_device, 0, &mode);
-    if (FAILED(hr))
+    if (FAILED(hr = wined3d_get_adapter_display_mode(device->ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode)))
     {
         wined3d_mutex_unlock();
         WARN("Cannot get the current adapter format\n");




More information about the wine-cvs mailing list