=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: ddraw: Cleanup ddraw_get_d3dcaps().

[Alexandre Julliard]

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

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Sat Dec  2 10:24:34 2017 +0100

ddraw: Cleanup ddraw_get_d3dcaps().

Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/ddraw/ddraw.c | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index 5f90a75..d3e491c 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -1420,23 +1420,10 @@ HRESULT ddraw_get_d3dcaps(const struct ddraw *ddraw, D3DDEVICEDESC7 *caps)
     caps->dwMinTextureHeight = 1;
 
     /* Convert DWORDs safely to WORDs */
-    if (wined3d_caps.MaxTextureBlendStages > 0xffff)
-        caps->wMaxTextureBlendStages = 0xffff;
-    else
-        caps->wMaxTextureBlendStages = (WORD)wined3d_caps.MaxTextureBlendStages;
-    if (wined3d_caps.MaxSimultaneousTextures > 0xffff)
-        caps->wMaxSimultaneousTextures = 0xffff;
-    else
-        caps->wMaxSimultaneousTextures = (WORD)wined3d_caps.MaxSimultaneousTextures;
-
-    if (wined3d_caps.MaxUserClipPlanes > 0xffff)
-        caps->wMaxUserClipPlanes = 0xffff;
-    else
-        caps->wMaxUserClipPlanes = (WORD)wined3d_caps.MaxUserClipPlanes;
-    if (wined3d_caps.MaxVertexBlendMatrices > 0xffff)
-        caps->wMaxVertexBlendMatrices = 0xffff;
-    else
-        caps->wMaxVertexBlendMatrices = (WORD)wined3d_caps.MaxVertexBlendMatrices;
+    caps->wMaxTextureBlendStages = min(wined3d_caps.MaxTextureBlendStages, 0xffff);
+    caps->wMaxSimultaneousTextures = min(wined3d_caps.MaxSimultaneousTextures, 0xffff);
+    caps->wMaxUserClipPlanes = min(wined3d_caps.MaxUserClipPlanes, D3DMAXUSERCLIPPLANES);
+    caps->wMaxVertexBlendMatrices = min(wined3d_caps.MaxVertexBlendMatrices, 0xffff);
 
     caps->deviceGUID = IID_IDirect3DTnLHalDevice;