Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-04 11:44:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed some internal D3D9 structs as only COM objects should be named _INT

Browse source 
svn path=/trunk/; revision=32768
This commit is contained in:
Gregor Brunmar 2008-03-26 20:16:07 +00:00
parent 3523e8a76d
commit 3b4d8c9d07
6 changed files with 42 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/directx/d3d9/adapter.c
View file

@ -230,7 +230,7 @@ static void CopyDriverCaps(const D3DCAPS9* pSrcCaps, D3DCAPS9* pDstCaps)
pDstCaps->MaxPointSize = 1.0f; pDstCaps->MaxPointSize = 1.0f;
} }
HRESULT GetAdapterCaps(const LPDIRECT3D9_DISPLAYADAPTER_INT pDisplayAdapter, D3DDEVTYPE DeviceType, D3DCAPS9* pDstCaps) HRESULT GetAdapterCaps(const LPDIRECT3D9_DISPLAYADAPTER pDisplayAdapter, D3DDEVTYPE DeviceType, D3DCAPS9* pDstCaps)
{ {
HRESULT hResult = D3DERR_INVALIDDEVICE; HRESULT hResult = D3DERR_INVALIDDEVICE;
D3DCAPS9* pDriverCaps = NULL; D3DCAPS9* pDriverCaps = NULL;

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

@ -13,7 +13,7 @@ BOOL GetAdapterInfo(LPCSTR lpszDeviceName, D3DADAPTER_IDENTIFIER9* pIdentifier);
BOOL GetAdapterMode(LPCSTR lpszDeviceName, D3DDISPLAYMODE* pMode); BOOL GetAdapterMode(LPCSTR lpszDeviceName, D3DDISPLAYMODE* pMode);
HRESULT GetAdapterCaps(const LPDIRECT3D9_DISPLAYADAPTER_INT pDisplayAdapter, D3DDEVTYPE DeviceType, D3DCAPS9* pDstCaps); HRESULT GetAdapterCaps(const LPDIRECT3D9_DISPLAYADAPTER pDisplayAdapter, D3DDEVTYPE DeviceType, D3DCAPS9* pDstCaps);
HMONITOR GetAdapterMonitor(LPCSTR lpszDeviceName); HMONITOR GetAdapterMonitor(LPCSTR lpszDeviceName);

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

@ -15,7 +15,7 @@
static INT g_NumDevices = 0; static INT g_NumDevices = 0;
void CreateDisplayModeList(LPCSTR lpszDeviceName, D3DDISPLAYMODE* pDisplayModes, DWORD* pNumDisplayModes, D3DFORMAT Default16BitFormat, D3D9_Unknown6BC_INT* pUnknown6BC) void CreateDisplayModeList(LPCSTR lpszDeviceName, D3DDISPLAYMODE* pDisplayModes, DWORD* pNumDisplayModes, D3DFORMAT Default16BitFormat, D3D9_Unknown6BC* pUnknown6BC)
{ {
DEVMODEA DevMode; DEVMODEA DevMode;
DWORD ModeIndex = 0; DWORD ModeIndex = 0;
@ -68,9 +68,9 @@ void CreateDisplayModeList(LPCSTR lpszDeviceName, D3DDISPLAYMODE* pDisplayModes,
*pNumDisplayModes = ValidModes; *pNumDisplayModes = ValidModes;
} }
static void CreateInternalDeviceData(HDC hDC, LPCSTR lpszDeviceName, D3D9_Unknown6BC_INT** ppUnknown, D3DDEVTYPE DeviceType, HMODULE* hD3DRefDll) static void CreateInternalDeviceData(HDC hDC, LPCSTR lpszDeviceName, D3D9_Unknown6BC** ppUnknown, D3DDEVTYPE DeviceType, HMODULE* hD3DRefDll)
{ {
D3D9_Unknown6BC_INT* pUnknown6BC; D3D9_Unknown6BC* pUnknown6BC;
DWORD ValueSize; DWORD ValueSize;
if (ppUnknown) *ppUnknown = NULL; if (ppUnknown) *ppUnknown = NULL;
@ -83,7 +83,7 @@ static void CreateInternalDeviceData(HDC hDC, LPCSTR lpszDeviceName, D3D9_Unknow
return; return;
} }
pUnknown6BC = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(D3D9_Unknown6BC_INT)); pUnknown6BC = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(D3D9_Unknown6BC));
if (NULL == pUnknown6BC) if (NULL == pUnknown6BC)
{ {
DPRINT1("Out of memory"); DPRINT1("Out of memory");
@ -157,7 +157,7 @@ BOOL GetDeviceData(LPD3D9_DEVICEDATA pDeviceData)
else else
{ {
D3D9_DRIVERCAPS DriverCaps; D3D9_DRIVERCAPS DriverCaps;
D3D9_UnknownA8h_INT unknownA8h; D3D9_UnknownA8h unknownA8h;
if (FALSE == CanReenableDirectDrawObject(pDeviceData->pUnknown6BC)) if (FALSE == CanReenableDirectDrawObject(pDeviceData->pUnknown6BC))
{ {
@ -297,7 +297,7 @@ BOOL GetDeviceData(LPD3D9_DEVICEDATA pDeviceData)
BOOL CanReenableDirectDrawObject(D3D9_Unknown6BC_INT* pUnknown) BOOL CanReenableDirectDrawObject(D3D9_Unknown6BC* pUnknown)
{ {
BOOL bDisplayModeWasChanged; BOOL bDisplayModeWasChanged;
@ -332,9 +332,9 @@ static void ResetGetDriverInfo2Data(DD_GETDRIVERINFO2DATA* DrvInfo2, DWORD dwTyp
DrvInfo2->dwExpectedSize = dwExpectedSize; DrvInfo2->dwExpectedSize = dwExpectedSize;
} }
BOOL GetD3D9DriverInfo( D3D9_Unknown6BC_INT* pUnknown6BC, BOOL GetD3D9DriverInfo( D3D9_Unknown6BC* pUnknown6BC,
LPD3D9_DRIVERCAPS pDriverCaps, LPD3D9_DRIVERCAPS pDriverCaps,
D3D9_UnknownA8h_INT* pUnknownA8h, D3D9_UnknownA8h* pUnknownA8h,
LPCSTR lpszDeviceName, LPCSTR lpszDeviceName,
HMODULE hD3dRefDll, HMODULE hD3dRefDll,
D3DHAL_GLOBALDRIVERDATA* pGblDriverData, D3DHAL_GLOBALDRIVERDATA* pGblDriverData,

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

@ -14,15 +14,15 @@
#define DX9_DDI_VERSION 4 #define DX9_DDI_VERSION 4
void CreateDisplayModeList(LPCSTR lpszDeviceName, D3DDISPLAYMODE* pDisplayModes, DWORD* pNumDisplayModes, D3DFORMAT DisplayFormat, D3D9_Unknown6BC_INT* pUnknown6BC); void CreateDisplayModeList(LPCSTR lpszDeviceName, D3DDISPLAYMODE* pDisplayModes, DWORD* pNumDisplayModes, D3DFORMAT DisplayFormat, D3D9_Unknown6BC* pUnknown6BC);
BOOL GetDeviceData(LPD3D9_DEVICEDATA pDeviceData); BOOL GetDeviceData(LPD3D9_DEVICEDATA pDeviceData);
BOOL CanReenableDirectDrawObject(D3D9_Unknown6BC_INT* ppUnknown); BOOL CanReenableDirectDrawObject(D3D9_Unknown6BC* ppUnknown);
BOOL GetD3D9DriverInfo( D3D9_Unknown6BC_INT* pUnknown6BC, BOOL GetD3D9DriverInfo( D3D9_Unknown6BC* pUnknown6BC,
LPD3D9_DRIVERCAPS pDriverCaps, LPD3D9_DRIVERCAPS pDriverCaps,
D3D9_UnknownA8h_INT* pUnknownA8h, D3D9_UnknownA8h* pUnknownA8h,
LPCSTR lpszDeviceName, LPCSTR lpszDeviceName,
HMODULE hD3dRefDll, HMODULE hD3dRefDll,
D3DHAL_GLOBALDRIVERDATA* pGblDriverData, D3DHAL_GLOBALDRIVERDATA* pGblDriverData,

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

@ -36,7 +36,7 @@ static BOOL IsDirectDrawSupported()
return TRUE; return TRUE;
} }
static VOID SetAdapterInfo(IN OUT LPDIRECT3D9_DISPLAYADAPTER_INT pDisplayAdapter, IN LPDISPLAY_DEVICEA pDisplayDevice) static VOID SetAdapterInfo(IN OUT LPDIRECT3D9_DISPLAYADAPTER pDisplayAdapter, IN LPDISPLAY_DEVICEA pDisplayDevice)
{ {
memcpy(&pDisplayAdapter->DisplayGuid, &DISPLAY_GUID, sizeof(GUID)); memcpy(&pDisplayAdapter->DisplayGuid, &DISPLAY_GUID, sizeof(GUID));
@ -57,9 +57,9 @@ static BOOL IsGDIDriver(HDC hDC)
return FALSE; return FALSE;
} }
void GetDisplayAdapterFromDevice(IN OUT LPDIRECT3D9_DISPLAYADAPTER_INT pDisplayAdapters, IN DWORD AdapterIndex, IN LPD3D9_DEVICEDATA pDeviceData) void GetDisplayAdapterFromDevice(IN OUT LPDIRECT3D9_DISPLAYADAPTER pDisplayAdapters, IN DWORD AdapterIndex, IN LPD3D9_DEVICEDATA pDeviceData)
{ {
LPDIRECT3D9_DISPLAYADAPTER_INT pDisplayAdapter = &pDisplayAdapters[AdapterIndex]; LPDIRECT3D9_DISPLAYADAPTER pDisplayAdapter = &pDisplayAdapters[AdapterIndex];
DWORD FormatOpIndex; DWORD FormatOpIndex;
DWORD AdapterGroupId; DWORD AdapterGroupId;
DWORD NumAdaptersInGroup; DWORD NumAdaptersInGroup;
@ -113,11 +113,11 @@ void GetDisplayAdapterFromDevice(IN OUT LPDIRECT3D9_DISPLAYADAPTER_INT pDisplayA
} }
} }
static BOOL GetDirect3D9AdapterInfo(IN OUT LPDIRECT3D9_DISPLAYADAPTER_INT pDisplayAdapters, IN DWORD AdapterIndex) static BOOL GetDirect3D9AdapterInfo(IN OUT LPDIRECT3D9_DISPLAYADAPTER pDisplayAdapters, IN DWORD AdapterIndex)
{ {
HDC hDC; HDC hDC;
LPD3D9_DEVICEDATA pDeviceData; LPD3D9_DEVICEDATA pDeviceData;
LPDIRECT3D9_DISPLAYADAPTER_INT pDisplayAdapter = &pDisplayAdapters[AdapterIndex]; LPDIRECT3D9_DISPLAYADAPTER pDisplayAdapter = &pDisplayAdapters[AdapterIndex];
/* Test DC creation for the display device */ /* Test DC creation for the display device */
if (NULL == (hDC = CreateDCA(NULL, pDisplayAdapter->szDeviceName, NULL, NULL))) if (NULL == (hDC = CreateDCA(NULL, pDisplayAdapter->szDeviceName, NULL, NULL)))

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

@ -16,24 +16,22 @@
#define D3D9_INT_D3DCAPS8_VALID 1 #define D3D9_INT_D3DCAPS8_VALID 1
#define D3D9_INT_D3DCAPS9_VALID 2 #define D3D9_INT_D3DCAPS9_VALID 2
typedef struct _D3D9Unknown6BC_INT_ typedef struct _D3D9Unknown6BC_
{ {
/* 0x0000 */ HANDLE hDD; /* 0x0000 */ HANDLE hDD;
/* 0x0004 */ LPDWORD pUnknown0004; /* 0x0004 */ LPDWORD pUnknown0004;
/* 0x0008 */ /* 0x0008 */ DWORD dwUnknown0008;
/* 0x000c */ CHAR szDeviceName[CCHDEVICENAME]; /* 0x000c */ CHAR szDeviceName[CCHDEVICENAME];
/* 0x002c */ HLOCAL swDDICreateDirectDrawObject; /* 0x002c */ HLOCAL swDDICreateDirectDrawObject;
/* 0x0030 */ DWORD dwUnknown0030; /* 0x0030 */ DWORD dwUnknown0030;
/* 0x0034 */ ULONG DeviceUniq; /* 0x0034 */ ULONG DeviceUniq;
/* 0x0038 */ DWORD dwUnknown0038;
/* 0x0040 */ D3DFORMAT RawDisplayFormat; /* 0x0040 */ D3DFORMAT RawDisplayFormat;
/* 0x0044 */ D3DFORMAT DisplayFormat; /* 0x0044 */ D3DFORMAT DisplayFormat;
/* 0x0048 */ LONG lDisplayPitch; /* 0x0048 */ LONG lDisplayPitch;
/* 0x004c */ DWORD MajorDxVersion; /* 0x004c */ DWORD MajorDxVersion;
/* 0x0050 */ RECT DeviceRect; /* 0x0050 */ RECT DeviceRect;
/* 0x0060 */ /* 0x0060 */ DWORD dwUnknown0060;
/* 0x0064 */ DWORD unknown0064; // = 0 /* 0x0064 */ DWORD unknown0064; // = 0
/* 0x0068 */ BOOL bIsXPorLater; /* 0x0068 */ BOOL bIsXPorLater;
/* 0x006c */ DWORD DevVenId; // DeviceId << 10 | VendorId /* 0x006c */ DWORD DevVenId; // DeviceId << 10 | VendorId
@ -45,15 +43,23 @@ typedef struct _D3D9Unknown6BC_INT_
#endif #endif
/* 0x0078 */ DWORD bForceDriverFlagsOn; /* 0x0078 */ DWORD bForceDriverFlagsOn;
/* 0x007c */ DWORD bForceDriverFlagsOff; /* 0x007c */ DWORD bForceDriverFlagsOff;
/* 0x0080 */ DWORD dwUnknown0080;
/* 0x0084 */ DWORD dwCaps; /* 0x0084 */ DWORD dwCaps;
/* 0x0088 */ DWORD dwSVBCaps; /* 0x0088 */ DWORD dwSVBCaps;
/* 0x008c */ HMODULE _unknown0151; /* 0x008c */ HMODULE _unknown0151;
/* 0x0090 */ DWORD dwUnknown0090;
/* 0x0094 */ D3DDEVTYPE DeviceType; /* 0x0094 */ D3DDEVTYPE DeviceType;
/* 0x0098 */ DWORD dwUnknown0098;
/* 0x009c */ DWORD dwUnknown009c;
/* 0x00a0 */ DWORD dwUnknown00a0;
/* 0x00a4 */ DWORD dwUnknown00a4;
/* 0x00a8 */ DWORD dwUnknown00a8;
/* 0x00ac */ DWORD dwUnknown00ac;
/* 0x00b0 */ DWORD dwUnknown00b0;
/* 0x00b4 */ DWORD dwUnknown00b4;
/* 0x00b8 */ DWORD dwUnknown00b8;
/* 0x00BC */ DDGAMMARAMP lpGammaRamp; /* 0x00BC */ DDGAMMARAMP lpGammaRamp;
} D3D9_Unknown6BC_INT; } D3D9_Unknown6BC;
typedef struct _tagD3D9_DRIVERCAPS typedef struct _tagD3D9_DRIVERCAPS
{ {
@ -78,7 +84,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 _tagUnknownA8h_
{ {
/* 0x0000 */ DWORD DdCreateSurface; /* 0x0000 */ DWORD DdCreateSurface;
/* 0x0004 */ DWORD DdDestroySurface; /* 0x0004 */ DWORD DdDestroySurface;
@ -122,16 +128,16 @@ typedef struct _tagUnknownA8h
/* 0x009c */ DWORD DXVAExecute; /* 0x009c */ DWORD DXVAExecute;
/* 0x00a0 */ DWORD DXVAQueryStatus; /* 0x00a0 */ DWORD DXVAQueryStatus;
/* 0x00a4 */ D3DDEVTYPE DeviceType; /* 0x00a4 */ D3DDEVTYPE DeviceType;
} D3D9_UnknownA8h_INT; } D3D9_UnknownA8h;
typedef struct _tagD3D9_DEVICEDATA typedef struct _tagD3D9_DEVICEDATA_
{ {
/* 0x0000 */ D3D9_DRIVERCAPS DriverCaps; /* 0x0000 */ D3D9_DRIVERCAPS DriverCaps;
/* 0x0178 */ D3D9_UnknownA8h_INT _UnknownA8h; /* 0x0178 */ D3D9_UnknownA8h _UnknownA8h;
/* 0x0220 */ CHAR szDeviceName[CCHDEVICENAME]; /* 0x0220 */ CHAR szDeviceName[CCHDEVICENAME];
/* 0x0240 */ HDC hDC; /* 0x0240 */ HDC hDC;
/* 0x0244 */ GUID DisplayGuid; /* 0x0244 */ GUID DisplayGuid;
/* 0x0254 */ D3D9_Unknown6BC_INT* pUnknown6BC; /* 0x0254 */ D3D9_Unknown6BC* pUnknown6BC;
/* 0x0258 */ D3DDEVTYPE DeviceType; /* 0x0258 */ D3DDEVTYPE DeviceType;
/* 0x025c */ HMODULE hD3DRefDll; /* 0x025c */ HMODULE hD3DRefDll;
/* 0x0260 */ DWORD unknown0152; /* 0x0260 */ DWORD unknown0152;
@ -154,7 +160,7 @@ typedef struct _tagDIRECT3D9DisplayAdapterInfo_
/* 0x013c */ D3D9_DRIVERCAPS DriverCaps; /* 0x013c */ D3D9_DRIVERCAPS DriverCaps;
/* 0x02b4 */ DWORD unknown000104; /* 0x02b4 */ DWORD unknown000104;
/* 0x02b8 */ DWORD unknown000105; /* 0x02b8 */ DWORD unknown000105;
} Direct3D9DisplayAdapterInfo_INT, FAR* LPDIRECT3D9_DISPLAYADAPTER_INT; } Direct3D9DisplayAdapterInfo, FAR* LPDIRECT3D9_DISPLAYADAPTER;
typedef struct _tagDIRECT3D9_INT_ typedef struct _tagDIRECT3D9_INT_
{ {
@ -165,7 +171,7 @@ typedef struct _tagDIRECT3D9_INT_
/* 0x0024 */ struct _tagDIRECT3D9_INT_ *lpInt; /* 0x0024 */ struct _tagDIRECT3D9_INT_ *lpInt;
/* 0x0028 */ LONG dwRefCnt; /* Increases and decreases by AddRef() and Release() */ /* 0x0028 */ LONG dwRefCnt; /* Increases and decreases by AddRef() and Release() */
/* 0x002c */ UINT NumDisplayAdapters; /* 0x002c */ UINT NumDisplayAdapters;
/* 0x0030 */ Direct3D9DisplayAdapterInfo_INT DisplayAdapters[D3D9_INT_MAX_NUM_ADAPTERS]; /* 0x0030 */ Direct3D9DisplayAdapterInfo DisplayAdapters[D3D9_INT_MAX_NUM_ADAPTERS];
/* 0x2100 */ DWORD unknown002112; /* 0x2100 */ DWORD unknown002112;
/* 0x2104 */ DWORD unknown002113; /* 0x2104 */ DWORD unknown002113;
/* 0x2108 */ DWORD unknown002114; /* 0x2108 */ DWORD unknown002114;