=?UTF-8?Q?Stefan=20D=C3=B6singer=20?=: wined3d: Fix mode comparison in wined3d_set_adapter_display_mode.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Nov 20 09:54:14 CST 2014
Module: wine
Branch: master
Commit: a835ae864362e02e055c91bbb7163cbb8b0349d5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a835ae864362e02e055c91bbb7163cbb8b0349d5
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Wed Nov 19 20:13:49 2014 +0100
wined3d: Fix mode comparison in wined3d_set_adapter_display_mode.
---
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;
More information about the wine-cvs
mailing list