Commit baf2721b authored by Raphael Junqueira's avatar Raphael Junqueira Committed by Alexandre Julliard

Some fixes on d3d8 and d3d9 headers.

parent 18873e77
...@@ -277,7 +277,7 @@ ICOM_DEFINE(IDirect3DDevice8,IUnknown) ...@@ -277,7 +277,7 @@ ICOM_DEFINE(IDirect3DDevice8,IUnknown)
#define IDirect3DDevice8_ShowCursor(p,a) (p)->lpVtbl->ShowCursor(p,a) #define IDirect3DDevice8_ShowCursor(p,a) (p)->lpVtbl->ShowCursor(p,a)
#define IDirect3DDevice8_CreateAdditionalSwapChain(p,a,b) (p)->lpVtbl->CreateAdditionalSwapChain(p,a,b) #define IDirect3DDevice8_CreateAdditionalSwapChain(p,a,b) (p)->lpVtbl->CreateAdditionalSwapChain(p,a,b)
#define IDirect3DDevice8_Reset(p,a) (p)->lpVtbl->Reset(p,a) #define IDirect3DDevice8_Reset(p,a) (p)->lpVtbl->Reset(p,a)
#define IDirect3DDevice8_Present(p,a,b,c,d) ICOM_CALL4,present,p,a,b,c,d) #define IDirect3DDevice8_Present(p,a,b,c,d) (p)->lpVtbl->Present(p,a,b,c,d)
#define IDirect3DDevice8_GetBackBuffer(p,a,b,c) (p)->lpVtbl->GetBackBuffer(p,a,b,c) #define IDirect3DDevice8_GetBackBuffer(p,a,b,c) (p)->lpVtbl->GetBackBuffer(p,a,b,c)
#define IDirect3DDevice8_GetRasterStatus(p,a) (p)->lpVtbl->GetRasterStatus(p,a) #define IDirect3DDevice8_GetRasterStatus(p,a) (p)->lpVtbl->GetRasterStatus(p,a)
#define IDirect3DDevice8_SetGammaRamp(p,a,b) (p)->lpVtbl->SetGammaRamp(p,a,b) #define IDirect3DDevice8_SetGammaRamp(p,a,b) (p)->lpVtbl->SetGammaRamp(p,a,b)
......
...@@ -1131,8 +1131,9 @@ typedef DWORD D3DCOLOR; ...@@ -1131,8 +1131,9 @@ typedef DWORD D3DCOLOR;
typedef struct _D3DADAPTER_IDENTIFIER9 { typedef struct _D3DADAPTER_IDENTIFIER9 {
char Driver[MAX_DEVICE_IDENTIFIER_STRING]; char Driver[MAX_DEVICE_IDENTIFIER_STRING];
char Description[MAX_DEVICE_IDENTIFIER_STRING]; char Description[MAX_DEVICE_IDENTIFIER_STRING];
char DeviceName[32]; /* Device name for GDI (ex. \\.\DISPLAY1) */ char DeviceName[32];
LARGE_INTEGER DriverVersion; LARGE_INTEGER DriverVersion;
DWORD VendorId; DWORD VendorId;
DWORD DeviceId; DWORD DeviceId;
DWORD SubSysId; DWORD SubSysId;
...@@ -1352,5 +1353,4 @@ typedef enum _D3DQUERYTYPE { ...@@ -1352,5 +1353,4 @@ typedef enum _D3DQUERYTYPE {
D3DQUERYTYPE_OCCLUSION = 9 D3DQUERYTYPE_OCCLUSION = 9
} D3DQUERYTYPE; } D3DQUERYTYPE;
#endif /* __WINE_D3D9TYPES_H */ #endif /* __WINE_D3D9TYPES_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment