[ros-diffs] [gbrunmar] 33303: Changed struct in IDirect3DDevice9::GetAvailableTextureMem() based on feedback from GreatLord

[gbrunmar at svn.reactos.org]

Author: gbrunmar
Date: Mon May  5 14:15:26 2008
New Revision: 33303

URL: http://svn.reactos.org/svn/reactos?rev=33303&view=rev
Log:
Changed struct in IDirect3DDevice9::GetAvailableTextureMem() based on feedback from GreatLord

Modified:
    trunk/reactos/dll/directx/d3d9/d3d9_device.c
    trunk/reactos/dll/directx/d3d9/d3d9_private.h

Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_device.c?rev=33303&r1=33302&r2=33303&view=diff
==============================================================================
--- trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] Mon May  5 14:15:26 2008
@@ -88,13 +88,13 @@
 static UINT WINAPI IDirect3DDevice9Impl_GetAvailableTextureMem(LPDIRECT3DDEVICE9 iface)
 {
     UINT AvailableTextureMemory = 0;
-    DD_GETAVAILDRIVERMEMORYDATA ddGetAvailDriverMemoryData;
+    DDHAL_GETAVAILDRIVERMEMORYDATA ddGetAvailDriverMemoryData;
 
     LPDIRECT3DDEVICE9_INT This = impl_from_IDirect3DDevice9(iface);
     LOCK_D3DDEVICE9();
 
     memset(&ddGetAvailDriverMemoryData, 0, sizeof(ddGetAvailDriverMemoryData));
-    ddGetAvailDriverMemoryData.lpDD = (PDD_DIRECTDRAW_GLOBAL)&This->DeviceData[0].pUnknown6BC->hDD;
+    ddGetAvailDriverMemoryData.lpDD = (LPDDRAWI_DIRECTDRAW_GBL)&This->DeviceData[0].pUnknown6BC->hDD;
 
     if (DDHAL_DRIVER_HANDLED == (*This->DeviceData[0].D3D9Callbacks.DdGetAvailDriverMemory)(&ddGetAvailDriverMemoryData))
     {

Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_private.h?rev=33303&r1=33302&r2=33303&view=diff
==============================================================================
--- trunk/reactos/dll/directx/d3d9/d3d9_private.h [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/d3d9/d3d9_private.h [iso-8859-1] Mon May  5 14:15:26 2008
@@ -10,7 +10,7 @@
 
 #include <windows.h>
 #include <ddraw.h>
-#include <ddrawint.h>
+#include <ddrawi.h>
 
 #define D3D9_INT_MAX_NUM_ADAPTERS   12
 
@@ -108,7 +108,7 @@
 /* 0x0044 */    DWORD DdFlip;
 /* 0x0048 */    DWORD DdGetBltStatus;
 /* 0x004c */    DWORD DdGetFlipStatus;
-/* 0x0050 */    PDD_GETAVAILDRIVERMEMORY DdGetAvailDriverMemory;
+/* 0x0050 */    LPDDHAL_GETAVAILDRIVERMEMORY DdGetAvailDriverMemory;
 /* 0x0054 */    DWORD unknown0115;
 /* 0x0058 */    DWORD DdSetMode;
 /* 0x005c */    DWORD DdSetExclusiveMode;