=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Fix driver version check.

Alexandre Julliard julliard at wine.codeweavers.com
Tue Apr 12 06:45:26 CDT 2016


Module: wine
Branch: stable
Commit: 53370ec5d0d560bc8e998c92616098cb8dfcd28a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=53370ec5d0d560bc8e998c92616098cb8dfcd28a

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Tue Mar 22 13:41:46 2016 +0100

wined3d: Fix driver version check.

The previous check didn't catch older Windows versions for which
dwMinorVersion > 2.

Spotted by Michael Müller.

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>
(cherry picked from commit 97c70c86be26e02a398411877d6e6a26367d3ab8)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

 dlls/wined3d/directx.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 07ceed6..254102e 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1511,8 +1511,7 @@ static void init_driver_info(struct wined3d_driver_info *driver_info,
      * In order to avoid this application bug we limit the amount of video memory
      * to LONG_MAX for older Windows versions.
      */
-    if (os_version.dwMajorVersion <= 5 && os_version.dwMinorVersion <= 2
-            && driver_info->vram_bytes > LONG_MAX)
+    if (driver_model < DRIVER_MODEL_NT6X && driver_info->vram_bytes > LONG_MAX)
     {
         TRACE("Limiting amount of video memory to %#lx bytes for OS version older than Vista.\n", LONG_MAX);
         driver_info->vram_bytes = LONG_MAX;




More information about the wine-cvs mailing list