Stefan Dösinger : wined3d: Make the glram parameter of WineD3DAdapterChangeGLRam signed.

[Alexandre Julliard]

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

Author: Stefan Dösinger 
Date:   Thu May 12 17:39:21 2011 +0200

wined3d: Make the glram parameter of WineD3DAdapterChangeGLRam signed.

---

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

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 8b486f8..7951d02 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -329,7 +329,7 @@ fail:
 }

/* Adjust the amount of used texture memory */
-unsigned int WineD3DAdapterChangeGLRam(IWineD3DDeviceImpl *device, unsigned int glram)
+unsigned int WineD3DAdapterChangeGLRam(IWineD3DDeviceImpl *device, int glram)
 {
     struct wined3d_adapter *adapter = device->adapter;

diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
index 253fc52..583e56f 100644
--- a/dlls/wined3d/resource.c
+++ b/dlls/wined3d/resource.c
@@ -137,7 +137,7 @@ void resource_cleanup(struct wined3d_resource *resource)
     if (resource->pool == WINED3DPOOL_DEFAULT)
     {
         TRACE("Decrementing device memory pool by %u.\n", resource->size);
-        WineD3DAdapterChangeGLRam(resource->device, -resource->size);
+        WineD3DAdapterChangeGLRam(resource->device,  0 - resource->size);
     }

LIST_FOR_EACH_SAFE(e1, e2, &resource->privateData)
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 599f449..f076748 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1541,7 +1541,7 @@ struct wined3d_adapter

BOOL initPixelFormats(struct wined3d_gl_info *gl_info, enum wined3d_pci_vendor vendor) DECLSPEC_HIDDEN;
 BOOL initPixelFormatsNoGL(struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN;
-extern unsigned int WineD3DAdapterChangeGLRam(IWineD3DDeviceImpl *D3DDevice, unsigned int glram) DECLSPEC_HIDDEN;
+extern unsigned int WineD3DAdapterChangeGLRam(IWineD3DDeviceImpl *D3DDevice, int glram) DECLSPEC_HIDDEN;
 extern void add_gl_compat_wrappers(struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN;

/*****************************************************************************