| commctrl.h (5.82-Windows 8.1) | | commctrl.h (5.82-Windows 10 1511 10586.494) |
| | |
| skipping to change at line 19 | | skipping to change at line 19 |
| * * | | * * |
| \*****************************************************************************/ | | \*****************************************************************************/ |
| | |
| #ifndef _INC_COMMCTRL | | #ifndef _INC_COMMCTRL |
| #define _INC_COMMCTRL | | #define _INC_COMMCTRL |
| | |
| #if defined(_MSC_VER) && (_MSC_VER >= 1200) | | #if defined(_MSC_VER) && (_MSC_VER >= 1200) |
| #pragma warning(push) | | #pragma warning(push) |
| #pragma warning(disable:4001) /* nonstandard extension : single line comment */ | | #pragma warning(disable:4001) /* nonstandard extension : single line comment */ |
| #pragma warning(disable:4201) /* nonstandard extension used : nameless struct/un
ion */ | | #pragma warning(disable:4201) /* nonstandard extension used : nameless struct/un
ion */ |
|
| | #pragma warning(disable:4820) /* padding added after data member */ |
| #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) |
| | |
| #ifndef _HRESULT_DEFINED | | #ifndef _HRESULT_DEFINED |
| #define _HRESULT_DEFINED | | #define _HRESULT_DEFINED |
| typedef _Return_type_success_(return >= 0) long HRESULT; | | typedef _Return_type_success_(return >= 0) long HRESULT; |
| | |
| skipping to change at line 4705 | | skipping to change at line 4706 |
| #define TVS_EX_NOINDENTSTATE 0x0008 | | #define TVS_EX_NOINDENTSTATE 0x0008 |
| #define TVS_EX_RICHTOOLTIP 0x0010 | | #define TVS_EX_RICHTOOLTIP 0x0010 |
| #define TVS_EX_AUTOHSCROLL 0x0020 | | #define TVS_EX_AUTOHSCROLL 0x0020 |
| #define TVS_EX_FADEINOUTEXPANDOS 0x0040 | | #define TVS_EX_FADEINOUTEXPANDOS 0x0040 |
| #define TVS_EX_PARTIALCHECKBOXES 0x0080 | | #define TVS_EX_PARTIALCHECKBOXES 0x0080 |
| #define TVS_EX_EXCLUSIONCHECKBOXES 0x0100 | | #define TVS_EX_EXCLUSIONCHECKBOXES 0x0100 |
| #define TVS_EX_DIMMEDCHECKBOXES 0x0200 | | #define TVS_EX_DIMMEDCHECKBOXES 0x0200 |
| #define TVS_EX_DRAWIMAGEASYNC 0x0400 | | #define TVS_EX_DRAWIMAGEASYNC 0x0400 |
| #endif | | #endif |
| | |
|
| | #if (NTDDI_VERSION >= NTDDI_WINTHRESHOLD) |
| | #endif |
| | |
| // end_r_commctrl | | // end_r_commctrl |
| | |
| struct _TREEITEM; | | struct _TREEITEM; |
| typedef struct _TREEITEM *HTREEITEM; | | typedef struct _TREEITEM *HTREEITEM; |
| | |
| #define TVIF_TEXT 0x0001 | | #define TVIF_TEXT 0x0001 |
| #define TVIF_IMAGE 0x0002 | | #define TVIF_IMAGE 0x0002 |
| #define TVIF_PARAM 0x0004 | | #define TVIF_PARAM 0x0004 |
| #define TVIF_STATE 0x0008 | | #define TVIF_STATE 0x0008 |
| #define TVIF_HANDLE 0x0010 | | #define TVIF_HANDLE 0x0010 |
| | |
| End of changes. 2 change blocks. |
| 0 lines changed or deleted | | 4 lines changed or added |
|
| prsht.h (5.82-Windows 8.1) | | prsht.h (5.82-Windows 10 1511 10586.494) |
| | |
| skipping to change at line 13 | | skipping to change at line 13 |
| /*****************************************************************************\ | | /*****************************************************************************\ |
| * * | | * * |
| * prsht.h - - Interface for the Windows Property Sheet Pages * | | * prsht.h - - Interface for the Windows Property Sheet Pages * |
| * * | | * * |
| * Version 1.0 * | | * Version 1.0 * |
| * * | | * * |
| * Copyright (c) Microsoft Corporation. All rights reserved. * | | * Copyright (c) Microsoft Corporation. All rights reserved. * |
| * * | | * * |
| \*****************************************************************************/ | | \*****************************************************************************/ |
| | |
|
| | #if defined(_MSC_VER) && (_MSC_VER >= 1200) |
| | #pragma warning(push) |
| | #pragma warning(disable:4001) /* nonstandard extension 'single line comment' was |
| | used */ |
| | #pragma warning(disable:4201) /* nonstandard extension used : nameless struct/un |
| | ion */ |
| | #pragma warning(disable:4820) /* padding added after data member */ |
| | #endif |
| | |
| #ifndef _PRSHT_H_ | | #ifndef _PRSHT_H_ |
| #define _PRSHT_H_ | | #define _PRSHT_H_ |
| | |
| // | | // |
| // Define API decoration for direct importing of DLL references. | | // Define API decoration for direct importing of DLL references. |
| // | | // |
| #ifndef WINCOMMCTRLAPI | | #ifndef WINCOMMCTRLAPI |
| #if !defined(_COMCTL32_) && defined(_WIN32) | | #if !defined(_COMCTL32_) && defined(_WIN32) |
| #define WINCOMMCTRLAPI DECLSPEC_IMPORT | | #define WINCOMMCTRLAPI DECLSPEC_IMPORT |
| #else | | #else |
| | |
| skipping to change at line 46 | | skipping to change at line 53 |
| #define DUMMYUNIONNAME5 u5 | | #define DUMMYUNIONNAME5 u5 |
| #else | | #else |
| #define DUMMYUNIONNAME | | #define DUMMYUNIONNAME |
| #define DUMMYUNIONNAME2 | | #define DUMMYUNIONNAME2 |
| #define DUMMYUNIONNAME3 | | #define DUMMYUNIONNAME3 |
| #define DUMMYUNIONNAME4 | | #define DUMMYUNIONNAME4 |
| #define DUMMYUNIONNAME5 | | #define DUMMYUNIONNAME5 |
| #endif | | #endif |
| #endif // DUMMYUNIONNAME | | #endif // DUMMYUNIONNAME |
| | |
|
| #if defined(_MSC_VER) && (_MSC_VER >= 1200) | | |
| #pragma warning(push) | | |
| #pragma warning(disable:4201) /* nonstandard extension used : nameless struct/un | | |
| ion */ | | |
| #endif | | |
| | | |
| #ifdef _WIN64 | | #ifdef _WIN64 |
| #include <pshpack8.h> | | #include <pshpack8.h> |
| #else | | #else |
| #include <pshpack4.h> | | #include <pshpack4.h> |
| #endif | | #endif |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| extern "C" { | | extern "C" { |
| #endif | | #endif |
| | |
| | |
| skipping to change at line 842 | | skipping to change at line 844 |
| | |
| #define PROP_SM_CXDLG 212 | | #define PROP_SM_CXDLG 212 |
| #define PROP_SM_CYDLG 188 | | #define PROP_SM_CYDLG 188 |
| | |
| #define PROP_MED_CXDLG 227 | | #define PROP_MED_CXDLG 227 |
| #define PROP_MED_CYDLG 215 | | #define PROP_MED_CYDLG 215 |
| | |
| #define PROP_LG_CXDLG 252 | | #define PROP_LG_CXDLG 252 |
| #define PROP_LG_CYDLG 218 | | #define PROP_LG_CYDLG 218 |
| | |
|
| #if defined(_MSC_VER) && (_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 |
| | |
| #if !defined(RC_INVOKED) /* RC complains about long symbols in #ifs */ | | #if !defined(RC_INVOKED) /* RC complains about long symbols in #ifs */ |
| #if defined(ISOLATION_AWARE_ENABLED) && (ISOLATION_AWARE_ENABLED != 0) | | #if defined(ISOLATION_AWARE_ENABLED) && (ISOLATION_AWARE_ENABLED != 0) |
| #include "prsht.inl" | | #include "prsht.inl" |
| #endif /* ISOLATION_AWARE_ENABLED */ | | #endif /* ISOLATION_AWARE_ENABLED */ |
| #endif /* RC */ | | #endif /* RC */ |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| } | | } |
| #endif | | #endif |
| | |
| #include <poppack.h> | | #include <poppack.h> |
| | |
|
| #endif // _PRSHT_H_ | | #endif /* _PRSHT_H_ */ |
| | |
| | #if defined(_MSC_VER) && (_MSC_VER >= 1200) |
| | #pragma warning(pop) |
| | #endif |
| | |
| End of changes. 4 change blocks. |
| 10 lines changed or deleted | | 9 lines changed or added |
|