From de3cb3af6f19477ee32bc52e71846f6302ea1329 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20Brandst=C3=A4tter?= <jbrandst@2ds.eu>
Date: Tue, 2 Sep 2014 13:35:00 +0200
Subject: [PATCH] wined3d: Fix trace output of emulated_textureram.

---
 dlls/wined3d/directx.c         | 3 ++-
 dlls/wined3d/wined3d_main.c    | 6 +++---
 dlls/wined3d/wined3d_private.h | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 9f00dcf3cc3..79b2590cab1 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1521,7 +1521,8 @@ static void init_driver_info(struct wined3d_driver_info *driver_info,
 
     if (wined3d_settings.emulated_textureram)
     {
-        TRACE("Overriding amount of video memory with %u bytes.\n", wined3d_settings.emulated_textureram);
+        TRACE("Overriding amount of video memory with 0x%s bytes.\n",
+                wine_dbgstr_longlong(wined3d_settings.emulated_textureram));
         driver_info->vram_bytes = wined3d_settings.emulated_textureram;
     }
 
diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c
index 7ab2448ab43..758ba43c3b2 100644
--- a/dlls/wined3d/wined3d_main.c
+++ b/dlls/wined3d/wined3d_main.c
@@ -256,10 +256,10 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL)
             int TmpVideoMemorySize = atoi(buffer);
             if(TmpVideoMemorySize > 0)
             {
-                wined3d_settings.emulated_textureram = TmpVideoMemorySize *1024*1024;
-                TRACE("Use %iMB = %d byte for emulated_textureram\n",
+                wined3d_settings.emulated_textureram = (UINT64)TmpVideoMemorySize *1024*1024;
+                TRACE("Use %iMiB = 0x%s bytes for emulated_textureram\n",
                         TmpVideoMemorySize,
-                        wined3d_settings.emulated_textureram);
+                        wine_dbgstr_longlong(wined3d_settings.emulated_textureram));
             }
             else
                 ERR("VideoMemorySize is %i but must be >0\n", TmpVideoMemorySize);
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index e99a7b4ad60..f55b1183c18 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -257,7 +257,7 @@ struct wined3d_settings
     unsigned short pci_vendor_id;
     unsigned short pci_device_id;
     /* Memory tracking and object counting. */
-    unsigned int emulated_textureram;
+    UINT64 emulated_textureram;
     char *logo;
     int allow_multisampling;
     BOOL strict_draw_ordering;