Headers diff for shfolder.dll between 6.3.9600.17415-Windows 8.1 and 10.0.10586.0-Windows 10 1511 10586.494 versions



 shlobj.h (6.3.9600.17415-Windows 8.1)   shlobj.h (10.0.10586.0-Windows 10 1511 10586.494) 
skipping to change at line 20 skipping to change at line 20
#define _SHLOBJ_H_ #define _SHLOBJ_H_
#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)
#if (_MSC_VER >= 800) #if (_MSC_VER >= 800)
#if (_MSC_VER >= 1200) #if (_MSC_VER >= 1200)
#pragma warning(push) #pragma warning(push)
#ifndef _MSC_EXTENSIONS
#pragma warning(disable:4309) /* truncation of constant value */
#endif
#pragma warning(disable:4820) /* padding added after data member */
#endif #endif
#pragma warning(disable:4001) /* nonstandard extension : single line comment */ #pragma warning(disable:4001) /* nonstandard extension : single line comment */
#endif #endif
#ifndef SNDMSG #ifndef SNDMSG
#ifdef __cplusplus #ifdef __cplusplus
#define SNDMSG ::SendMessage #define SNDMSG ::SendMessage
#else #else
#define SNDMSG SendMessage #define SNDMSG SendMessage
#endif #endif
skipping to change at line 516 skipping to change at line 520
SLDF_VALID = 0x07FFF7FF, // bits that are valid for ::SetFlags() SLDF_VALID = 0x07FFF7FF, // bits that are valid for ::SetFlags()
#endif #endif
#else #else
SLDF_VALID = 0x003FF7FF, // bits that are valid for ::SetFlags() SLDF_VALID = 0x003FF7FF, // bits that are valid for ::SetFlags()
#endif #endif
#endif #endif
SLDF_RESERVED = (int) 0x80000000, // Reserve d-- so we can use the low word as an index value in the future SLDF_RESERVED = (int) 0x80000000, // Reserve d-- so we can use the low word as an index value in the future
#endif #endif
} SHELL_LINK_DATA_FLAGS; } SHELL_LINK_DATA_FLAGS;
DEFINE_ENUM_FLAG_OPERATORS(SHELL_LINK_DATA_FLAGS); DEFINE_ENUM_FLAG_OPERATORS(SHELL_LINK_DATA_FLAGS)
#if !defined(__cplusplus) && defined(_MSC_VER) && (_MSC_VER >= 1200) #if !defined(__cplusplus) && defined(_MSC_VER) && (_MSC_VER >= 1200)
#pragma warning(push) #pragma warning(push)
#pragma warning(disable:4201) /* nonstandard extension used : nameless struct/un ion */ #pragma warning(disable:4201) /* nonstandard extension used : nameless struct/un ion */
#endif #endif
typedef struct tagDATABLOCKHEADER typedef struct tagDATABLOCKHEADER
{ {
DWORD cbSize; // Size of this extra data block DWORD cbSize; // Size of this extra data block
DWORD dwSignature; // signature of this extra data block DWORD dwSignature; // signature of this extra data block
skipping to change at line 1185 skipping to change at line 1189
#define CSIDL_FLAG_DONT_VERIFY 0x4000 // combine with CSIDL_ val ue to return an unverified folder path #define CSIDL_FLAG_DONT_VERIFY 0x4000 // combine with CSIDL_ val ue to return an unverified folder path
#define CSIDL_FLAG_DONT_UNEXPAND 0x2000 // combine with CSIDL_ val ue to avoid unexpanding environment variables #define CSIDL_FLAG_DONT_UNEXPAND 0x2000 // combine with CSIDL_ val ue to avoid unexpanding environment variables
#if (NTDDI_VERSION >= NTDDI_WINXP) #if (NTDDI_VERSION >= NTDDI_WINXP)
#define CSIDL_FLAG_NO_ALIAS 0x1000 // combine with CSIDL_ val ue to insure non-alias versions of the pidl #define CSIDL_FLAG_NO_ALIAS 0x1000 // combine with CSIDL_ val ue to insure non-alias versions of the pidl
#define CSIDL_FLAG_PER_USER_INIT 0x0800 // combine with CSIDL_ val ue to indicate per-user init (eg. upgrade) #define CSIDL_FLAG_PER_USER_INIT 0x0800 // combine with CSIDL_ val ue to indicate per-user init (eg. upgrade)
#endif // NTDDI_WINXP #endif // NTDDI_WINXP
#define CSIDL_FLAG_MASK 0xFF00 // mask for all possible f lag values #define CSIDL_FLAG_MASK 0xFF00 // mask for all possible f lag values
_Check_return_ _Check_return_
SHSTDAPI SHGetSpecialFolderLocation(_Reserved_ HWND hwnd, _In_ int csidl, _Outpt r_ PIDLIST_ABSOLUTE *ppidl); STDAPI SHGetSpecialFolderLocation(_Reserved_ HWND hwnd, _In_ int csidl, _Outptr_ PIDLIST_ABSOLUTE *ppidl);
SHSTDAPI_(PIDLIST_ABSOLUTE) SHCloneSpecialIDList(_Reserved_ HWND hwnd, _In_ int csidl, _In_ BOOL fCreate); SHSTDAPI_(PIDLIST_ABSOLUTE) SHCloneSpecialIDList(_Reserved_ HWND hwnd, _In_ int csidl, _In_ BOOL fCreate);
_Success_(return != 0) _Success_(return != 0)
SHSTDAPI_(BOOL) SHGetSpecialFolderPathA(_Reserved_ HWND hwnd, _Out_writes_(MAX_P ATH) LPSTR pszPath, _In_ int csidl, _In_ BOOL fCreate); SHSTDAPI_(BOOL) SHGetSpecialFolderPathA(_Reserved_ HWND hwnd, _Out_writes_(MAX_P ATH) LPSTR pszPath, _In_ int csidl, _In_ BOOL fCreate);
_Success_(return != 0) _Success_(return != 0)
SHSTDAPI_(BOOL) SHGetSpecialFolderPathW(_Reserved_ HWND hwnd, _Out_writes_(MAX_P ATH) LPWSTR pszPath, _In_ int csidl, _In_ BOOL fCreate); SHSTDAPI_(BOOL) SHGetSpecialFolderPathW(_Reserved_ HWND hwnd, _Out_writes_(MAX_P ATH) LPWSTR pszPath, _In_ int csidl, _In_ BOOL fCreate);
#ifdef UNICODE #ifdef UNICODE
#define SHGetSpecialFolderPath SHGetSpecialFolderPathW #define SHGetSpecialFolderPath SHGetSpecialFolderPathW
#else #else
#define SHGetSpecialFolderPath SHGetSpecialFolderPathA #define SHGetSpecialFolderPath SHGetSpecialFolderPathA
skipping to change at line 1217 skipping to change at line 1221
SHFOLDERAPI SHGetFolderPathW(_Reserved_ HWND hwnd, _In_ int csidl, _In_opt_ HAND LE hToken, _In_ DWORD dwFlags, _Out_writes_(MAX_PATH) LPWSTR pszPath); SHFOLDERAPI SHGetFolderPathW(_Reserved_ HWND hwnd, _In_ int csidl, _In_opt_ HAND LE hToken, _In_ DWORD dwFlags, _Out_writes_(MAX_PATH) LPWSTR pszPath);
#ifdef UNICODE #ifdef UNICODE
#define SHGetFolderPath SHGetFolderPathW #define SHGetFolderPath SHGetFolderPathW
#else #else
#define SHGetFolderPath SHGetFolderPathA #define SHGetFolderPath SHGetFolderPathA
#endif // !UNICODE #endif // !UNICODE
SHSTDAPI SHGetFolderLocation(_Reserved_ HWND hwnd, _In_ int csidl, _In_opt_ HAND LE hToken, _In_ DWORD dwFlags, _Outptr_ PIDLIST_ABSOLUTE *ppidl); SHSTDAPI SHGetFolderLocation(_Reserved_ HWND hwnd, _In_ int csidl, _In_opt_ HAND LE hToken, _In_ DWORD dwFlags, _Outptr_ PIDLIST_ABSOLUTE *ppidl);
#endif // NTDDI_WIN2K #endif // NTDDI_WIN2K
#if (NTDDI_VERSION >= NTDDI_WINXP) #if (NTDDI_VERSION >= NTDDI_WINXP)
SHSTDAPI SHSetFolderPathA(_In_ int csidl, _In_opt_ HANDLE hToken, _In_ DWORD dwF STDAPI SHSetFolderPathA(_In_ int csidl, _In_opt_ HANDLE hToken, _In_ DWORD dwFla
lags, _In_ LPCSTR pszPath); gs, _In_ LPCSTR pszPath);
SHSTDAPI SHSetFolderPathW(_In_ int csidl, _In_opt_ HANDLE hToken, _In_ DWORD dwF STDAPI SHSetFolderPathW(_In_ int csidl, _In_opt_ HANDLE hToken, _In_ DWORD dwFla
lags, _In_ LPCWSTR pszPath); gs, _In_ LPCWSTR pszPath);
#ifdef UNICODE #ifdef UNICODE
#define SHSetFolderPath SHSetFolderPathW #define SHSetFolderPath SHSetFolderPathW
#else #else
#define SHSetFolderPath SHSetFolderPathA #define SHSetFolderPath SHSetFolderPathA
#endif // !UNICODE #endif // !UNICODE
SHSTDAPI SHGetFolderPathAndSubDirA(_Reserved_ HWND hwnd, _In_ int csidl, _In_opt STDAPI SHGetFolderPathAndSubDirA(_Reserved_ HWND hwnd, _In_ int csidl, _In_opt_
_ HANDLE hToken, _In_ DWORD dwFlags, _In_opt_ LPCSTR pszSubDir, _Out_writes_(MAX HANDLE hToken, _In_ DWORD dwFlags, _In_opt_ LPCSTR pszSubDir, _Out_writes_(MAX_P
_PATH) LPSTR pszPath); ATH) LPSTR pszPath);
SHSTDAPI SHGetFolderPathAndSubDirW(_Reserved_ HWND hwnd, _In_ int csidl, _In_opt STDAPI SHGetFolderPathAndSubDirW(_Reserved_ HWND hwnd, _In_ int csidl, _In_opt_
_ HANDLE hToken, _In_ DWORD dwFlags, _In_opt_ LPCWSTR pszSubDir, _Out_writes_(MA HANDLE hToken, _In_ DWORD dwFlags, _In_opt_ LPCWSTR pszSubDir, _Out_writes_(MAX_
X_PATH) LPWSTR pszPath); PATH) LPWSTR pszPath);
#ifdef UNICODE #ifdef UNICODE
#define SHGetFolderPathAndSubDir SHGetFolderPathAndSubDirW #define SHGetFolderPathAndSubDir SHGetFolderPathAndSubDirW
#else #else
#define SHGetFolderPathAndSubDir SHGetFolderPathAndSubDirA #define SHGetFolderPathAndSubDir SHGetFolderPathAndSubDirA
#endif // !UNICODE #endif // !UNICODE
#endif // NTDDI_VISTA #endif // NTDDI_VISTA
#if (NTDDI_VERSION >= NTDDI_VISTA) #if (NTDDI_VERSION >= NTDDI_VISTA)
// flags for Known Folder APIs // flags for Known Folder APIs
skipping to change at line 1289 skipping to change at line 1293
// Get the not-parent-relative default path. Only valid with KF_FLAG_DEFAULT _PATH // Get the not-parent-relative default path. Only valid with KF_FLAG_DEFAULT _PATH
KF_FLAG_NOT_PARENT_RELATIVE = 0x00000200, KF_FLAG_NOT_PARENT_RELATIVE = 0x00000200,
// Build simple IDList // Build simple IDList
KF_FLAG_SIMPLE_IDLIST = 0x00000100, KF_FLAG_SIMPLE_IDLIST = 0x00000100,
// only return the aliased IDLists, don't fallback to file system path // only return the aliased IDLists, don't fallback to file system path
KF_FLAG_ALIAS_ONLY = 0x80000000, KF_FLAG_ALIAS_ONLY = 0x80000000,
} KNOWN_FOLDER_FLAG; } KNOWN_FOLDER_FLAG;
DEFINE_ENUM_FLAG_OPERATORS(KNOWN_FOLDER_FLAG); DEFINE_ENUM_FLAG_OPERATORS(KNOWN_FOLDER_FLAG)
STDAPI SHGetKnownFolderIDList(_In_ REFKNOWNFOLDERID rfid, STDAPI SHGetKnownFolderIDList(_In_ REFKNOWNFOLDERID rfid,
_In_ DWORD /* KNOWN_FOLDER_FLAG */ dwFlags, _In_ DWORD /* KNOWN_FOLDER_FLAG */ dwFlags,
_In_opt_ HANDLE hToken, _In_opt_ HANDLE hToken,
_Outptr_ PIDLIST_ABSOLUTE *ppidl); _Outptr_ PIDLIST_ABSOLUTE *ppidl);
STDAPI SHSetKnownFolderPath(_In_ REFKNOWNFOLDERID rfid, STDAPI SHSetKnownFolderPath(_In_ REFKNOWNFOLDERID rfid,
_In_ DWORD /* KNOWN_FOLDER_FLAG */ dwFlags, _In_ DWORD /* KNOWN_FOLDER_FLAG */ dwFlags,
_In_opt_ HANDLE hToken, _In_opt_ HANDLE hToken,
_In_ PCWSTR pszPath); _In_ PCWSTR pszPath);
skipping to change at line 2174 skipping to change at line 2178
#define COMP_ELEM_CURITEMSTATE 0x00004000 #define COMP_ELEM_CURITEMSTATE 0x00004000
#define COMP_ELEM_ALL (COMP_ELEM_TYPE | COMP_ELEM_CHECKED | COMP_ELEM_DIRTY | \ #define COMP_ELEM_ALL (COMP_ELEM_TYPE | COMP_ELEM_CHECKED | COMP_ELEM_DIRTY | \
COMP_ELEM_NOSCROLL | COMP_ELEM_POS_LEFT | COMP_ELEM_SIZ E_WIDTH | \ COMP_ELEM_NOSCROLL | COMP_ELEM_POS_LEFT | COMP_ELEM_SIZ E_WIDTH | \
COMP_ELEM_SIZE_HEIGHT | COMP_ELEM_POS_ZINDEX | COMP_ELE M_SOURCE | \ COMP_ELEM_SIZE_HEIGHT | COMP_ELEM_POS_ZINDEX | COMP_ELE M_SOURCE | \
COMP_ELEM_FRIENDLYNAME | COMP_ELEM_POS_TOP | COMP_ELEM_ SUBSCRIBEDURL | \ COMP_ELEM_FRIENDLYNAME | COMP_ELEM_POS_TOP | COMP_ELEM_ SUBSCRIBEDURL | \
COMP_ELEM_ORIGINAL_CSI | COMP_ELEM_RESTORED_CSI | COMP_ ELEM_CURITEMSTATE) COMP_ELEM_ORIGINAL_CSI | COMP_ELEM_RESTORED_CSI | COMP_ ELEM_CURITEMSTATE)
//////////////////////////////////////////// ////////////////////////////////////////////
// Flags for IActiveDesktop::AddDesktopItemWithUI() // Flags for IActiveDesktop::AddDesktopItemWithUI()
typedef enum tagDTI_ADTIWUI enum tagDTI_ADTIWUI
{ {
DTI_ADDUI_DEFAULT = 0x00000000, DTI_ADDUI_DEFAULT = 0x00000000,
DTI_ADDUI_DISPSUBWIZARD = 0x00000001, DTI_ADDUI_DISPSUBWIZARD = 0x00000001,
DTI_ADDUI_POSITIONITEM = 0x00000002, DTI_ADDUI_POSITIONITEM = 0x00000002,
}; };
//////////////////////////////////////////// ////////////////////////////////////////////
// Flags for IActiveDesktop::AddUrl() // Flags for IActiveDesktop::AddUrl()
#define ADDURL_SILENT 0X0001 #define ADDURL_SILENT 0X0001
 End of changes. 7 change blocks. 
14 lines changed or deleted 18 lines changed or added

This html diff was produced by rfcdiff 1.41.