Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 16:36:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Renamed internal Direct3D9 structure to make more sense

Browse source 
svn path=/trunk/; revision=33131
This commit is contained in:
Gregor Brunmar 2008-04-24 18:29:50 +00:00
parent a8253264f5
commit 48b2c90e2f
4 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reactos/dll/directx/d3d9/d3d9_caps.c
View file

@ -157,7 +157,7 @@ BOOL GetDeviceData(LPD3D9_DEVICEDATA pDeviceData)
else else
{ {
D3D9_DRIVERCAPS DriverCaps; D3D9_DRIVERCAPS DriverCaps;
D3D9_UnknownA8h unknownA8h; D3D9_CALLBACKS D3D9Callbacks;
if (FALSE == CanReenableDirectDrawObject(pDeviceData->pUnknown6BC)) if (FALSE == CanReenableDirectDrawObject(pDeviceData->pUnknown6BC))
{ {
@ -168,7 +168,7 @@ BOOL GetDeviceData(LPD3D9_DEVICEDATA pDeviceData)
bRet = GetD3D9DriverInfo( bRet = GetD3D9DriverInfo(
pDeviceData->pUnknown6BC, pDeviceData->pUnknown6BC,
&DriverCaps, &DriverCaps,
&unknownA8h, &D3D9Callbacks,
pDeviceData->szDeviceName, pDeviceData->szDeviceName,
pDeviceData->hD3DRefDll, pDeviceData->hD3DRefDll,
&GlobalDriverData, &GlobalDriverData,
@ -222,7 +222,7 @@ BOOL GetDeviceData(LPD3D9_DEVICEDATA pDeviceData)
bRet = GetD3D9DriverInfo( bRet = GetD3D9DriverInfo(
pDeviceData->pUnknown6BC, pDeviceData->pUnknown6BC,
&pDeviceData->DriverCaps, &pDeviceData->DriverCaps,
&pDeviceData->_UnknownA8h, &pDeviceData->D3D9Callbacks,
pDeviceData->szDeviceName, pDeviceData->szDeviceName,
pDeviceData->hD3DRefDll, pDeviceData->hD3DRefDll,
&GlobalDriverData, &GlobalDriverData,
@ -252,7 +252,7 @@ BOOL GetDeviceData(LPD3D9_DEVICEDATA pDeviceData)
bRet = GetD3D9DriverInfo( bRet = GetD3D9DriverInfo(
pDeviceData->pUnknown6BC, pDeviceData->pUnknown6BC,
&pDeviceData->DriverCaps, &pDeviceData->DriverCaps,
&pDeviceData->_UnknownA8h, &pDeviceData->D3D9Callbacks,
pDeviceData->szDeviceName, pDeviceData->szDeviceName,
pDeviceData->hD3DRefDll, pDeviceData->hD3DRefDll,
&GlobalDriverData, &GlobalDriverData,
@ -334,7 +334,7 @@ static void ResetGetDriverInfo2Data(DD_GETDRIVERINFO2DATA* DrvInfo2, DWORD dwTyp
BOOL GetD3D9DriverInfo( D3D9_Unknown6BC* pUnknown6BC, BOOL GetD3D9DriverInfo( D3D9_Unknown6BC* pUnknown6BC,
LPD3D9_DRIVERCAPS pDriverCaps, LPD3D9_DRIVERCAPS pDriverCaps,
D3D9_UnknownA8h* pUnknownA8h, D3D9_CALLBACKS* pD3D9Callbacks,
LPCSTR lpszDeviceName, LPCSTR lpszDeviceName,
HMODULE hD3dRefDll, HMODULE hD3dRefDll,
D3DHAL_GLOBALDRIVERDATA* pGblDriverData, D3DHAL_GLOBALDRIVERDATA* pGblDriverData,

2
reactos/dll/directx/d3d9/d3d9_caps.h
View file

@ -22,7 +22,7 @@ BOOL CanReenableDirectDrawObject(D3D9_Unknown6BC* ppUnknown);
BOOL GetD3D9DriverInfo( D3D9_Unknown6BC* pUnknown6BC, BOOL GetD3D9DriverInfo( D3D9_Unknown6BC* pUnknown6BC,
LPD3D9_DRIVERCAPS pDriverCaps, LPD3D9_DRIVERCAPS pDriverCaps,
D3D9_UnknownA8h* pUnknownA8h, D3D9_CALLBACKS* pD3D9Callbacks,
LPCSTR lpszDeviceName, LPCSTR lpszDeviceName,
HMODULE hD3dRefDll, HMODULE hD3dRefDll,
D3DHAL_GLOBALDRIVERDATA* pGblDriverData, D3DHAL_GLOBALDRIVERDATA* pGblDriverData,

4
reactos/dll/directx/d3d9/d3d9_create.c
View file

@ -139,11 +139,11 @@ static BOOL GetDirect3D9AdapterInfo(IN OUT LPDIRECT3D9_DISPLAYADAPTER pDisplayAd
if (pDisplayAdapter->bInUseFlag) if (pDisplayAdapter->bInUseFlag)
{ {
pDeviceData->_UnknownA8h.DeviceType = D3DDEVTYPE_HAL; pDeviceData->D3D9Callbacks.DeviceType = D3DDEVTYPE_HAL;
} }
else if (IsGDIDriver(hDC)) else if (IsGDIDriver(hDC))
{ {
pDeviceData->_UnknownA8h.DeviceType = D3DDEVTYPE_REF; pDeviceData->D3D9Callbacks.DeviceType = D3DDEVTYPE_REF;
} }
if (FALSE == GetDeviceData(pDeviceData)) if (FALSE == GetDeviceData(pDeviceData))

7
reactos/dll/directx/d3d9/d3d9_private.h
View file

@ -26,6 +26,7 @@ typedef struct _D3D9Unknown6BC_
/* 0x0030 */ DWORD dwUnknown0030; /* 0x0030 */ DWORD dwUnknown0030;
/* 0x0034 */ ULONG DeviceUniq; /* 0x0034 */ ULONG DeviceUniq;
/* 0x0038 */ DWORD dwUnknown0038; /* 0x0038 */ DWORD dwUnknown0038;
/* 0x003c */ DWORD dwUnknown003c;
/* 0x0040 */ D3DFORMAT RawDisplayFormat; /* 0x0040 */ D3DFORMAT RawDisplayFormat;
/* 0x0044 */ D3DFORMAT DisplayFormat; /* 0x0044 */ D3DFORMAT DisplayFormat;
/* 0x0048 */ LONG lDisplayPitch; /* 0x0048 */ LONG lDisplayPitch;
@ -84,7 +85,7 @@ typedef struct _tagD3D9_DRIVERCAPS
/* 0x0174 */ D3DQUERYTYPE* pSupportedQueriesList; /* 0x0174 */ D3DQUERYTYPE* pSupportedQueriesList;
} D3D9_DRIVERCAPS, FAR *LPD3D9_DRIVERCAPS; } D3D9_DRIVERCAPS, FAR *LPD3D9_DRIVERCAPS;
typedef struct _tagUnknownA8h_ typedef struct _tagD3D9_CALLBACKS
{ {
/* 0x0000 */ DWORD DdCreateSurface; /* 0x0000 */ DWORD DdCreateSurface;
/* 0x0004 */ DWORD DdDestroySurface; /* 0x0004 */ DWORD DdDestroySurface;
@ -128,12 +129,12 @@ typedef struct _tagUnknownA8h_
/* 0x009c */ DWORD DXVAExecute; /* 0x009c */ DWORD DXVAExecute;
/* 0x00a0 */ DWORD DXVAQueryStatus; /* 0x00a0 */ DWORD DXVAQueryStatus;
/* 0x00a4 */ D3DDEVTYPE DeviceType; /* 0x00a4 */ D3DDEVTYPE DeviceType;
} D3D9_UnknownA8h; } D3D9_CALLBACKS;
typedef struct _tagD3D9_DEVICEDATA_ typedef struct _tagD3D9_DEVICEDATA_
{ {
/* 0x0000 */ D3D9_DRIVERCAPS DriverCaps; /* 0x0000 */ D3D9_DRIVERCAPS DriverCaps;
/* 0x0178 */ D3D9_UnknownA8h _UnknownA8h; /* 0x0178 */ D3D9_CALLBACKS D3D9Callbacks;
/* 0x0220 */ CHAR szDeviceName[CCHDEVICENAME]; /* 0x0220 */ CHAR szDeviceName[CCHDEVICENAME];
/* 0x0240 */ HDC hDC; /* 0x0240 */ HDC hDC;
/* 0x0244 */ GUID DisplayGuid; /* 0x0244 */ GUID DisplayGuid;