Henri Verbeet : wined3d: Simplify a comparison in IWineD3DDeviceImpl_Reset( ).

Alexandre Julliard julliard at winehq.org
Tue Mar 16 11:49:15 CDT 2010


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Mon Mar 15 21:07:29 2010 +0100

wined3d: Simplify a comparison in IWineD3DDeviceImpl_Reset().

---

 dlls/wined3d/device.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index dc1cf29..239e2f4 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -6619,10 +6619,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE
         }
     }
 
-    if((pPresentationParameters->Windowed && !swapchain->presentParms.Windowed) ||
-       (swapchain->presentParms.Windowed && !pPresentationParameters->Windowed) ||
-        DisplayModeChanged) {
-
+    if (!pPresentationParameters->Windowed != !swapchain->presentParms.Windowed
+            || DisplayModeChanged)
+    {
         IWineD3DDevice_SetDisplayMode(iface, 0, &mode);
 
         if (!pPresentationParameters->Windowed)




More information about the wine-cvs mailing list