| ddraw.h (6.3.9600.17415-Windows 8.1) | | ddraw.h (10.0.10586.0-Windows 10 1511 10586.494) |
|---|
| | |
| skipping to change at line 17 | | skipping to change at line 17 |
|---|
| * | | * |
| ***************************************************************************/ | | ***************************************************************************/ |
| | |
| #ifndef __DDRAW_INCLUDED__ | | #ifndef __DDRAW_INCLUDED__ |
| #define __DDRAW_INCLUDED__ | | #define __DDRAW_INCLUDED__ |
| #include <winapifamily.h> | | #include <winapifamily.h> |
| | |
| #pragma region Desktop Family | | #pragma region Desktop Family |
| #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) | | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) |
| | |
|
| //Disable the nameless union warning when building internally | | // Always disable warning C4201: "nonstandard extension used : |
| #undef ENABLE_NAMELESS_UNION_PRAGMA | | // nameless struct/union" |
| #ifdef DIRECTX_REDIST | | |
| #define ENABLE_NAMELESS_UNION_PRAGMA | | |
| #endif | | |
| | |
| #ifdef ENABLE_NAMELESS_UNION_PRAGMA | | |
| #if _MSC_VER >= 1200 | | #if _MSC_VER >= 1200 |
| #pragma warning(push) | | #pragma warning(push) |
| #endif | | #endif |
| #pragma warning(disable:4201) | | #pragma warning(disable:4201) |
|
| #endif | | |
| | |
| /* | | /* |
| * If you wish an application built against the newest version of DirectDraw | | * If you wish an application built against the newest version of DirectDraw |
| * to run against an older DirectDraw run time then define DIRECTDRAW_VERSION | | * to run against an older DirectDraw run time then define DIRECTDRAW_VERSION |
| * to be the earlies version of DirectDraw you wish to run against. For, | | * to be the earlies version of DirectDraw you wish to run against. For, |
| * example if you wish an application to run against a DX 3 runtime define | | * example if you wish an application to run against a DX 3 runtime define |
| * DIRECTDRAW_VERSION to be 0x0300. | | * DIRECTDRAW_VERSION to be 0x0300. |
| */ | | */ |
| #ifndef DIRECTDRAW_VERSION | | #ifndef DIRECTDRAW_VERSION |
| #define DIRECTDRAW_VERSION 0x0700 | | #define DIRECTDRAW_VERSION 0x0700 |
| | |
| skipping to change at line 704 | | skipping to change at line 698 |
|---|
| typedef DDCAPS_DX6 DDCAPS; | | typedef DDCAPS_DX6 DDCAPS; |
| #else | | #else |
| typedef DDCAPS_DX7 DDCAPS; | | typedef DDCAPS_DX7 DDCAPS; |
| #endif | | #endif |
| | |
| typedef DDCAPS FAR* LPDDCAPS; | | typedef DDCAPS FAR* LPDDCAPS; |
| | |
| /* | | /* |
| * DDPIXELFORMAT | | * DDPIXELFORMAT |
| */ | | */ |
|
| | #ifndef _DDPIXELFORMAT_DEFINED |
| | #define _DDPIXELFORMAT_DEFINED |
| typedef struct _DDPIXELFORMAT | | typedef struct _DDPIXELFORMAT |
| { | | { |
| DWORD dwSize; // size of structure | | DWORD dwSize; // size of structure |
| DWORD dwFlags; // pixel format flags | | DWORD dwFlags; // pixel format flags |
| DWORD dwFourCC; // (FOURCC code) | | DWORD dwFourCC; // (FOURCC code) |
| union | | union |
| { | | { |
| DWORD dwRGBBitCount; // how many bits per pixel | | DWORD dwRGBBitCount; // how many bits per pixel |
| DWORD dwYUVBitCount; // how many bits per pixel | | DWORD dwYUVBitCount; // how many bits per pixel |
| DWORD dwZBufferBitDepth; // how many total bits/pixel in z buffer
(including any stencil bits) | | DWORD dwZBufferBitDepth; // how many total bits/pixel in z buffer
(including any stencil bits) |
| | |
| skipping to change at line 758 | | skipping to change at line 754 |
|---|
| } DUMMYUNIONNAMEN(4); | | } DUMMYUNIONNAMEN(4); |
| union | | union |
| { | | { |
| DWORD dwRGBAlphaBitMask; // mask for alpha channel | | DWORD dwRGBAlphaBitMask; // mask for alpha channel |
| DWORD dwYUVAlphaBitMask; // mask for alpha channel | | DWORD dwYUVAlphaBitMask; // mask for alpha channel |
| DWORD dwLuminanceAlphaBitMask;// mask for alpha channel | | DWORD dwLuminanceAlphaBitMask;// mask for alpha channel |
| DWORD dwRGBZBitMask; // mask for Z channel | | DWORD dwRGBZBitMask; // mask for Z channel |
| DWORD dwYUVZBitMask; // mask for Z channel | | DWORD dwYUVZBitMask; // mask for Z channel |
| } DUMMYUNIONNAMEN(5); | | } DUMMYUNIONNAMEN(5); |
| } DDPIXELFORMAT; | | } DDPIXELFORMAT; |
|
| | #endif // _DDPIXELFORMAT_DEFINED |
| | |
| typedef DDPIXELFORMAT FAR* LPDDPIXELFORMAT; | | typedef DDPIXELFORMAT FAR* LPDDPIXELFORMAT; |
| | |
| /* | | /* |
| * DDOVERLAYFX | | * DDOVERLAYFX |
| */ | | */ |
| typedef struct _DDOVERLAYFX | | typedef struct _DDOVERLAYFX |
| { | | { |
| DWORD dwSize; // size of structure | | DWORD dwSize; // size of structure |
| DWORD dwAlphaEdgeBlendBitDepth; // Bit depth used to specify con
stant for alpha edge blend | | DWORD dwAlphaEdgeBlendBitDepth; // Bit depth used to specify con
stant for alpha edge blend |
| | |
| skipping to change at line 5773 | | skipping to change at line 5770 |
|---|
| * created by CoCreateInstance() before it was initialized. | | * created by CoCreateInstance() before it was initialized. |
| */ | | */ |
| #define DDERR_NOTINITIALIZED CO_E_NOTINITIALIZED | | #define DDERR_NOTINITIALIZED CO_E_NOTINITIALIZED |
| | |
| /* Alpha bit depth constants */ | | /* Alpha bit depth constants */ |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| }; | | }; |
| #endif | | #endif |
| | |
|
| #ifdef ENABLE_NAMELESS_UNION_PRAGMA | | |
| #if _MSC_VER >= 1200 | | #if _MSC_VER >= 1200 |
| #pragma warning(pop) | | #pragma warning(pop) |
| #else | | #else |
| #pragma warning(default:4201) | | #pragma warning(default:4201) |
| #endif | | #endif |
|
| #endif | | |
| | |
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| #pragma endregion | | #pragma endregion |
| | |
| #endif //__DDRAW_INCLUDED__ | | #endif //__DDRAW_INCLUDED__ |
| | |
| End of changes. 6 change blocks. |
|---|
| 10 lines changed or deleted | | 5 lines changed or added |
|---|
|