| ntquery.h (6.3.9600.17415-Windows 8.1) | | ntquery.h (10.0.10586.0-Windows 10 1511 10586.494) |
|---|
| | |
| skipping to change at line 25 | | skipping to change at line 25 |
|---|
| #if _MSC_VER > 1000 | | #if _MSC_VER > 1000 |
| #pragma once | | #pragma once |
| #endif | | #endif |
| #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) |
| | |
| #include "stgprop.h" | | #include "stgprop.h" |
| | |
|
| | #if _MSC_VER >= 1200 |
| | #pragma warning(push) |
| | #pragma warning(disable:4820) // padding added after data member |
| | #endif |
| | |
| #if defined(__cplusplus) | | #if defined(__cplusplus) |
| extern "C" | | extern "C" |
| { | | { |
| #endif | | #endif |
| | |
| #define CI_VERSION_WDS30 0x102 // 258 | | #define CI_VERSION_WDS30 0x102 // 258 |
| #define CI_VERSION_WDS40 0x109 // 265 | | #define CI_VERSION_WDS40 0x109 // 265 |
| #define CI_VERSION_WIN70 0x700 // 1792 | | #define CI_VERSION_WIN70 0x700 // 1792 |
| | |
| // | | // |
| | |
| skipping to change at line 420 | | skipping to change at line 425 |
|---|
| WCHAR const * pwszSortColumns, // may be NULL | | WCHAR const * pwszSortColumns, // may be NULL |
| WCHAR const * pwszGroupings, // may be NULL | | WCHAR const * pwszGroupings, // may be NULL |
| DBCOMMANDTREE * * ppTree, | | DBCOMMANDTREE * * ppTree, |
| ULONG cProperties, | | ULONG cProperties, |
| /*optional*/ CIPROPERTYDEF * pReserved, | | /*optional*/ CIPROPERTYDEF * pReserved, |
| LCID LocaleID ); | | LCID LocaleID ); |
| | |
| #endif // __ICommandTree_INTERFACE_DEFINED__ | | #endif // __ICommandTree_INTERFACE_DEFINED__ |
| #endif // __ICommand_INTERFACE_DEFINED__ | | #endif // __ICommand_INTERFACE_DEFINED__ |
| | |
|
| STDAPI_(void) CIShutdown(); | | STDAPI_(void) CIShutdown(void); |
| | |
| #if defined(__cplusplus) | | #if defined(__cplusplus) |
| } | | } |
| #endif | | #endif |
| | |
|
| | #if _MSC_VER >= 1200 |
| | #pragma warning(pop) |
| | #endif |
| | |
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| #pragma endregion | | #pragma endregion |
| | |
| #endif // __NTQUERY_H__ | | #endif // __NTQUERY_H__ |
| | |
| End of changes. 3 change blocks. |
|---|
| 1 lines changed or deleted | | 10 lines changed or added |
|---|
|