Author: gbrunmar Date: Thu Apr 24 13:29:50 2008 New Revision: 33131
URL: http://svn.reactos.org/svn/reactos?rev=33131&view=rev Log: Renamed internal Direct3D9 structure to make more sense
Modified: trunk/reactos/dll/directx/d3d9/d3d9_caps.c trunk/reactos/dll/directx/d3d9/d3d9_caps.h trunk/reactos/dll/directx/d3d9/d3d9_create.c trunk/reactos/dll/directx/d3d9/d3d9_private.h
Modified: trunk/reactos/dll/directx/d3d9/d3d9_caps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_caps.... ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_caps.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_caps.c [iso-8859-1] Thu Apr 24 13:29:50 2008 @@ -157,7 +157,7 @@ else { D3D9_DRIVERCAPS DriverCaps; - D3D9_UnknownA8h unknownA8h; + D3D9_CALLBACKS D3D9Callbacks;
if (FALSE == CanReenableDirectDrawObject(pDeviceData->pUnknown6BC)) { @@ -168,7 +168,7 @@ bRet = GetD3D9DriverInfo( pDeviceData->pUnknown6BC, &DriverCaps, - &unknownA8h, + &D3D9Callbacks, pDeviceData->szDeviceName, pDeviceData->hD3DRefDll, &GlobalDriverData, @@ -222,7 +222,7 @@ bRet = GetD3D9DriverInfo( pDeviceData->pUnknown6BC, &pDeviceData->DriverCaps, - &pDeviceData->_UnknownA8h, + &pDeviceData->D3D9Callbacks, pDeviceData->szDeviceName, pDeviceData->hD3DRefDll, &GlobalDriverData, @@ -252,7 +252,7 @@ bRet = GetD3D9DriverInfo( pDeviceData->pUnknown6BC, &pDeviceData->DriverCaps, - &pDeviceData->_UnknownA8h, + &pDeviceData->D3D9Callbacks, pDeviceData->szDeviceName, pDeviceData->hD3DRefDll, &GlobalDriverData, @@ -334,7 +334,7 @@
BOOL GetD3D9DriverInfo( D3D9_Unknown6BC* pUnknown6BC, LPD3D9_DRIVERCAPS pDriverCaps, - D3D9_UnknownA8h* pUnknownA8h, + D3D9_CALLBACKS* pD3D9Callbacks, LPCSTR lpszDeviceName, HMODULE hD3dRefDll, D3DHAL_GLOBALDRIVERDATA* pGblDriverData,
Modified: trunk/reactos/dll/directx/d3d9/d3d9_caps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_caps.... ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_caps.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_caps.h [iso-8859-1] Thu Apr 24 13:29:50 2008 @@ -22,7 +22,7 @@
BOOL GetD3D9DriverInfo( D3D9_Unknown6BC* pUnknown6BC, LPD3D9_DRIVERCAPS pDriverCaps, - D3D9_UnknownA8h* pUnknownA8h, + D3D9_CALLBACKS* pD3D9Callbacks, LPCSTR lpszDeviceName, HMODULE hD3dRefDll, D3DHAL_GLOBALDRIVERDATA* pGblDriverData,
Modified: trunk/reactos/dll/directx/d3d9/d3d9_create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_creat... ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_create.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_create.c [iso-8859-1] Thu Apr 24 13:29:50 2008 @@ -139,11 +139,11 @@
if (pDisplayAdapter->bInUseFlag) { - pDeviceData->_UnknownA8h.DeviceType = D3DDEVTYPE_HAL; + pDeviceData->D3D9Callbacks.DeviceType = D3DDEVTYPE_HAL; } else if (IsGDIDriver(hDC)) { - pDeviceData->_UnknownA8h.DeviceType = D3DDEVTYPE_REF; + pDeviceData->D3D9Callbacks.DeviceType = D3DDEVTYPE_REF; }
if (FALSE == GetDeviceData(pDeviceData))
Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_priva... ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h [iso-8859-1] Thu Apr 24 13:29:50 2008 @@ -26,6 +26,7 @@ /* 0x0030 */ DWORD dwUnknown0030; /* 0x0034 */ ULONG DeviceUniq; /* 0x0038 */ DWORD dwUnknown0038; +/* 0x003c */ DWORD dwUnknown003c; /* 0x0040 */ D3DFORMAT RawDisplayFormat; /* 0x0044 */ D3DFORMAT DisplayFormat; /* 0x0048 */ LONG lDisplayPitch; @@ -84,7 +85,7 @@ /* 0x0174 */ D3DQUERYTYPE* pSupportedQueriesList; } D3D9_DRIVERCAPS, FAR *LPD3D9_DRIVERCAPS;
-typedef struct _tagUnknownA8h_ +typedef struct _tagD3D9_CALLBACKS { /* 0x0000 */ DWORD DdCreateSurface; /* 0x0004 */ DWORD DdDestroySurface; @@ -128,12 +129,12 @@ /* 0x009c */ DWORD DXVAExecute; /* 0x00a0 */ DWORD DXVAQueryStatus; /* 0x00a4 */ D3DDEVTYPE DeviceType; -} D3D9_UnknownA8h; +} D3D9_CALLBACKS;
typedef struct _tagD3D9_DEVICEDATA_ { /* 0x0000 */ D3D9_DRIVERCAPS DriverCaps; -/* 0x0178 */ D3D9_UnknownA8h _UnknownA8h; +/* 0x0178 */ D3D9_CALLBACKS D3D9Callbacks; /* 0x0220 */ CHAR szDeviceName[CCHDEVICENAME]; /* 0x0240 */ HDC hDC; /* 0x0244 */ GUID DisplayGuid;