diff --git a/reactos/dll/directx/d3d9/d3d9_caps.c b/reactos/dll/directx/d3d9/d3d9_caps.c index d87a01021b1..b3af6ef692c 100644 --- a/reactos/dll/directx/d3d9/d3d9_caps.c +++ b/reactos/dll/directx/d3d9/d3d9_caps.c @@ -157,7 +157,7 @@ BOOL GetDeviceData(LPD3D9_DEVICEDATA pDeviceData) else { D3D9_DRIVERCAPS DriverCaps; - D3D9_UnknownA8h unknownA8h; + D3D9_CALLBACKS D3D9Callbacks; if (FALSE == CanReenableDirectDrawObject(pDeviceData->pUnknown6BC)) { @@ -168,7 +168,7 @@ BOOL GetDeviceData(LPD3D9_DEVICEDATA pDeviceData) bRet = GetD3D9DriverInfo( pDeviceData->pUnknown6BC, &DriverCaps, - &unknownA8h, + &D3D9Callbacks, pDeviceData->szDeviceName, pDeviceData->hD3DRefDll, &GlobalDriverData, @@ -222,7 +222,7 @@ BOOL GetDeviceData(LPD3D9_DEVICEDATA pDeviceData) bRet = GetD3D9DriverInfo( pDeviceData->pUnknown6BC, &pDeviceData->DriverCaps, - &pDeviceData->_UnknownA8h, + &pDeviceData->D3D9Callbacks, pDeviceData->szDeviceName, pDeviceData->hD3DRefDll, &GlobalDriverData, @@ -252,7 +252,7 @@ BOOL GetDeviceData(LPD3D9_DEVICEDATA pDeviceData) bRet = GetD3D9DriverInfo( pDeviceData->pUnknown6BC, &pDeviceData->DriverCaps, - &pDeviceData->_UnknownA8h, + &pDeviceData->D3D9Callbacks, pDeviceData->szDeviceName, pDeviceData->hD3DRefDll, &GlobalDriverData, @@ -334,7 +334,7 @@ static void ResetGetDriverInfo2Data(DD_GETDRIVERINFO2DATA* DrvInfo2, DWORD dwTyp BOOL GetD3D9DriverInfo( D3D9_Unknown6BC* pUnknown6BC, LPD3D9_DRIVERCAPS pDriverCaps, - D3D9_UnknownA8h* pUnknownA8h, + D3D9_CALLBACKS* pD3D9Callbacks, LPCSTR lpszDeviceName, HMODULE hD3dRefDll, D3DHAL_GLOBALDRIVERDATA* pGblDriverData, diff --git a/reactos/dll/directx/d3d9/d3d9_caps.h b/reactos/dll/directx/d3d9/d3d9_caps.h index de4bcf5253e..6d23bda8961 100644 --- a/reactos/dll/directx/d3d9/d3d9_caps.h +++ b/reactos/dll/directx/d3d9/d3d9_caps.h @@ -22,7 +22,7 @@ BOOL CanReenableDirectDrawObject(D3D9_Unknown6BC* ppUnknown); BOOL GetD3D9DriverInfo( D3D9_Unknown6BC* pUnknown6BC, LPD3D9_DRIVERCAPS pDriverCaps, - D3D9_UnknownA8h* pUnknownA8h, + D3D9_CALLBACKS* pD3D9Callbacks, LPCSTR lpszDeviceName, HMODULE hD3dRefDll, D3DHAL_GLOBALDRIVERDATA* pGblDriverData, diff --git a/reactos/dll/directx/d3d9/d3d9_create.c b/reactos/dll/directx/d3d9/d3d9_create.c index 8b37b848ebc..0d41ee8ca29 100644 --- a/reactos/dll/directx/d3d9/d3d9_create.c +++ b/reactos/dll/directx/d3d9/d3d9_create.c @@ -139,11 +139,11 @@ static BOOL GetDirect3D9AdapterInfo(IN OUT LPDIRECT3D9_DISPLAYADAPTER pDisplayAd 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)) diff --git a/reactos/dll/directx/d3d9/d3d9_private.h b/reactos/dll/directx/d3d9/d3d9_private.h index bb98dacf670..c45795648d2 100644 --- a/reactos/dll/directx/d3d9/d3d9_private.h +++ b/reactos/dll/directx/d3d9/d3d9_private.h @@ -26,6 +26,7 @@ typedef struct _D3D9Unknown6BC_ /* 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 @@ typedef struct _tagD3D9_DRIVERCAPS /* 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 @@ typedef struct _tagUnknownA8h_ /* 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;