[PATCH 1/5] wined3d: Fix mode comparison in wined3d_set_adapter_display_mode.

Stefan Dösinger stefan at codeweavers.com
Wed Nov 19 13:13:49 CST 2014


It looks like 107751 was applied by accident. This patch fixes the
issues Henri pointed out in 107751.
---
 dlls/wined3d/directx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index dbd433b..794496b 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -3325,7 +3325,7 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d,
     }
     else
     {
-        if(!EnumDisplaySettingsW(adapter->DeviceName, ENUM_REGISTRY_SETTINGS, &new_mode))
+        if (!EnumDisplaySettingsW(adapter->DeviceName, ENUM_REGISTRY_SETTINGS, &new_mode))
         {
             ERR("Failed to read mode from registry.\n");
             return WINED3DERR_NOTAVAILABLE;
@@ -3344,7 +3344,7 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d,
             && (current_mode.dmDisplayFrequency == new_mode.dmDisplayFrequency
             || !(new_mode.dmFields & DM_DISPLAYFREQUENCY))
             && (current_mode.u2.dmDisplayFlags == new_mode.u2.dmDisplayFlags
-            || new_mode.dmFields & DM_DISPLAYFLAGS))
+            || !(new_mode.dmFields & DM_DISPLAYFLAGS)))
     {
         TRACE("Skipping redundant mode setting call.\n");
         return WINED3D_OK;
-- 
2.0.4




More information about the wine-patches mailing list