| d3d9.h (6.1.7601.17514-Windows_7.0) | | d3d9.h (6.3.9600.17415-Windows_8.1) |
| | |
| skipping to change at line 20 | | skipping to change at line 20 |
| #ifndef _D3D9_H_ | | #ifndef _D3D9_H_ |
| #define _D3D9_H_ | | #define _D3D9_H_ |
| | |
| #ifndef DIRECT3D_VERSION | | #ifndef DIRECT3D_VERSION |
| #define DIRECT3D_VERSION 0x0900 | | #define DIRECT3D_VERSION 0x0900 |
| #endif //DIRECT3D_VERSION | | #endif //DIRECT3D_VERSION |
| | |
| // include this file content only if compiling for DX9 interfaces | | // include this file content only if compiling for DX9 interfaces |
| #if(DIRECT3D_VERSION >= 0x0900) | | #if(DIRECT3D_VERSION >= 0x0900) |
| | |
|
| | #include <winapifamily.h> |
| | #pragma region Desktop Family |
| | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) |
| | |
| /* This identifier is passed to Direct3DCreate9 in order to ensure that an | | /* This identifier is passed to Direct3DCreate9 in order to ensure that an |
| * application was built against the correct header files. This number is | | * application was built against the correct header files. This number is |
| * incremented whenever a header (or other) change would require applications | | * incremented whenever a header (or other) change would require applications |
| * to be rebuilt. If the version doesn't match, Direct3DCreate9 will fail. | | * to be rebuilt. If the version doesn't match, Direct3DCreate9 will fail. |
| * (The number itself has no meaning.)*/ | | * (The number itself has no meaning.)*/ |
| | |
| #ifdef D3D_DEBUG_INFO | | #ifdef D3D_DEBUG_INFO |
| #define D3D_SDK_VERSION (32 | 0x80000000) | | #define D3D_SDK_VERSION (32 | 0x80000000) |
| #define D3D9b_SDK_VERSION (31 | 0x80000000) | | #define D3D9b_SDK_VERSION (31 | 0x80000000) |
| | |
| | |
| skipping to change at line 2492 | | skipping to change at line 2495 |
| #define IDirect3DSwapChain9Ex_GetDevice(p,a) (p)->GetDevice(a) | | #define IDirect3DSwapChain9Ex_GetDevice(p,a) (p)->GetDevice(a) |
| #define IDirect3DSwapChain9Ex_GetPresentParameters(p,a) (p)->GetPresentParameter
s(a) | | #define IDirect3DSwapChain9Ex_GetPresentParameters(p,a) (p)->GetPresentParameter
s(a) |
| #define IDirect3DSwapChain9Ex_GetLastPresentCount(p,a) (p)->GetLastPresentCount(
a) | | #define IDirect3DSwapChain9Ex_GetLastPresentCount(p,a) (p)->GetLastPresentCount(
a) |
| #define IDirect3DSwapChain9Ex_GetPresentStats(p,a) (p)->GetPresentStats(a) | | #define IDirect3DSwapChain9Ex_GetPresentStats(p,a) (p)->GetPresentStats(a) |
| #define IDirect3DSwapChain9Ex_GetDisplayModeEx(p,a,b) (p)->GetDisplayModeEx(a,b) | | #define IDirect3DSwapChain9Ex_GetDisplayModeEx(p,a,b) (p)->GetDisplayModeEx(a,b) |
| #endif | | #endif |
| | |
| #endif // !D3D_DISABLE_9EX | | #endif // !D3D_DISABLE_9EX |
| /* -- D3D9Ex only */ | | /* -- D3D9Ex only */ |
| | |
|
| | /* D3D9Ex only -- */ |
| | #if !defined(D3D_DISABLE_9EX) |
| | |
| #undef INTERFACE | | #undef INTERFACE |
| #define INTERFACE IDirect3D9ExOverlayExtension | | #define INTERFACE IDirect3D9ExOverlayExtension |
| | |
| DECLARE_INTERFACE_(IDirect3D9ExOverlayExtension, IUnknown) | | DECLARE_INTERFACE_(IDirect3D9ExOverlayExtension, IUnknown) |
| { | | { |
| /*** IUnknown methods ***/ | | /*** IUnknown methods ***/ |
| STDMETHOD(QueryInterface)(THIS_ REFIID riid, void** ppvObj) PURE; | | STDMETHOD(QueryInterface)(THIS_ REFIID riid, void** ppvObj) PURE; |
| STDMETHOD_(ULONG,AddRef)(THIS) PURE; | | STDMETHOD_(ULONG,AddRef)(THIS) PURE; |
| STDMETHOD_(ULONG,Release)(THIS) PURE; | | STDMETHOD_(ULONG,Release)(THIS) PURE; |
| | |
| | |
| skipping to change at line 2646 | | skipping to change at line 2652 |
| #define IDirect3DCryptoSession9_GetCertificate(p,a,b) (p)->GetCertificate(a,b) | | #define IDirect3DCryptoSession9_GetCertificate(p,a,b) (p)->GetCertificate(a,b) |
| #define IDirect3DCryptoSession9_NegotiateKeyExchange(p,a,b) (p)->NegotiateKeyExc
hange(a,b) | | #define IDirect3DCryptoSession9_NegotiateKeyExchange(p,a,b) (p)->NegotiateKeyExc
hange(a,b) |
| #define IDirect3DCryptoSession9_EncryptionBlt(p,a,b,c,d) (p)->EncryptionBlt(a,b,
c,d) | | #define IDirect3DCryptoSession9_EncryptionBlt(p,a,b,c,d) (p)->EncryptionBlt(a,b,
c,d) |
| #define IDirect3DCryptoSession9_DecryptionBlt(p,a,b,c,d,e,f) (p)->DecryptionBlt(
a,b,c,d,e,f) | | #define IDirect3DCryptoSession9_DecryptionBlt(p,a,b,c,d,e,f) (p)->DecryptionBlt(
a,b,c,d,e,f) |
| #define IDirect3DCryptoSession9_GetSurfacePitch(p,a,b) (p)->GetSurfacePitch(a,b) | | #define IDirect3DCryptoSession9_GetSurfacePitch(p,a,b) (p)->GetSurfacePitch(a,b) |
| #define IDirect3DCryptoSession9_StartSessionKeyRefresh(p,a,b) (p)->StartSessionK
eyRefresh(a,b) | | #define IDirect3DCryptoSession9_StartSessionKeyRefresh(p,a,b) (p)->StartSessionK
eyRefresh(a,b) |
| #define IDirect3DCryptoSession9_FinishSessionKeyRefresh(p) (p)->FinishSessionKey
Refresh() | | #define IDirect3DCryptoSession9_FinishSessionKeyRefresh(p) (p)->FinishSessionKey
Refresh() |
| #define IDirect3DCryptoSession9_GetEncryptionBltKey(p,a,b) (p)->GetEncryptionBlt
Key(a,b) | | #define IDirect3DCryptoSession9_GetEncryptionBltKey(p,a,b) (p)->GetEncryptionBlt
Key(a,b) |
| #endif | | #endif |
| | |
|
| | /* -- D3D9Ex only */ |
| | #endif // !D3D_DISABLE_9EX |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| }; | | }; |
| #endif | | #endif |
| | |
|
| | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| | #pragma endregion |
| | |
| #endif /* (DIRECT3D_VERSION >= 0x0900) */ | | #endif /* (DIRECT3D_VERSION >= 0x0900) */ |
| #endif /* _D3D_H_ */ | | #endif /* _D3D_H_ */ |
| | |
| End of changes. 4 change blocks. |
| 0 lines changed or deleted | | 13 lines changed or added |
|