Headers diff for comdlg32.dll between 6.1.7601.17514-Windows_7.0 and 6.3.9600.17415-Windows_8.1 versions



 commdlg.h (6.1.7601.17514-Windows_7.0)   commdlg.h (6.3.9600.17415-Windows_8.1) 
#include <winapifamily.h>
/************************************************************************ /************************************************************************
* * * *
* commdlg.h -- This module defines the 32-Bit Common Dialog APIs * * commdlg.h -- This module defines the 32-Bit Common Dialog APIs *
* * * *
* Copyright (c) Microsoft Corporation. All rights reserved. * * Copyright (c) Microsoft Corporation. All rights reserved. *
* * * *
************************************************************************/ ************************************************************************/
#ifndef _INC_COMMDLG #ifndef _INC_COMMDLG
#define _INC_COMMDLG #define _INC_COMMDLG
skipping to change at line 46 skipping to change at line 48
#include <prsht.h> #include <prsht.h>
#if !defined(_WIN64) #if !defined(_WIN64)
#include <pshpack1.h> /* Assume byte packing throughout */ #include <pshpack1.h> /* Assume byte packing throughout */
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* Assume C declarations for C++ */ extern "C" { /* Assume C declarations for C++ */
#endif /* __cplusplus */ #endif /* __cplusplus */
#pragma region Desktop Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
// //
// Define API decoration for direct importing of DLL references. // Define API decoration for direct importing of DLL references.
// //
#ifndef WINCOMMDLGAPI #ifndef WINCOMMDLGAPI
#if !defined(_COMDLG32_) #if !defined(_COMDLG32_)
#define WINCOMMDLGAPI DECLSPEC_IMPORT #define WINCOMMDLGAPI DECLSPEC_IMPORT
#else #else
#define WINCOMMDLGAPI #define WINCOMMDLGAPI
#endif #endif
#endif // WINCOMMDLGAPI #endif // WINCOMMDLGAPI
skipping to change at line 251 skipping to change at line 256
#define GetOpenFileName GetOpenFileNameA #define GetOpenFileName GetOpenFileNameA
#endif // !UNICODE #endif // !UNICODE
WINCOMMDLGAPI BOOL APIENTRY GetSaveFileNameA(LPOPENFILENAMEA); WINCOMMDLGAPI BOOL APIENTRY GetSaveFileNameA(LPOPENFILENAMEA);
WINCOMMDLGAPI BOOL APIENTRY GetSaveFileNameW(LPOPENFILENAMEW); WINCOMMDLGAPI BOOL APIENTRY GetSaveFileNameW(LPOPENFILENAMEW);
#ifdef UNICODE #ifdef UNICODE
#define GetSaveFileName GetSaveFileNameW #define GetSaveFileName GetSaveFileNameW
#else #else
#define GetSaveFileName GetSaveFileNameA #define GetSaveFileName GetSaveFileNameA
#endif // !UNICODE #endif // !UNICODE
WINCOMMDLGAPI short APIENTRY GetFileTitleA(LPCSTR, __out_ecount(cchSize) LPSTR B WINCOMMDLGAPI short APIENTRY GetFileTitleA(LPCSTR, _Out_writes_(cchSize) LPSTR B
uf, __in WORD cchSize); uf, _In_ WORD cchSize);
WINCOMMDLGAPI short APIENTRY GetFileTitleW(LPCWSTR, __out_ecount(cchSize) LPWSTR WINCOMMDLGAPI short APIENTRY GetFileTitleW(LPCWSTR, _Out_writes_(cchSize) LPWSTR
Buf, __in WORD cchSize); Buf, _In_ WORD cchSize);
#ifdef UNICODE #ifdef UNICODE
#define GetFileTitle GetFileTitleW #define GetFileTitle GetFileTitleW
#else #else
#define GetFileTitle GetFileTitleA #define GetFileTitle GetFileTitleA
#endif // !UNICODE #endif // !UNICODE
#define OFN_READONLY 0x00000001 #define OFN_READONLY 0x00000001
#define OFN_OVERWRITEPROMPT 0x00000002 #define OFN_OVERWRITEPROMPT 0x00000002
#define OFN_HIDEREADONLY 0x00000004 #define OFN_HIDEREADONLY 0x00000004
#define OFN_NOCHANGEDIR 0x00000008 #define OFN_NOCHANGEDIR 0x00000008
skipping to change at line 863 skipping to change at line 868
HGLOBAL hSetupTemplate; HGLOBAL hSetupTemplate;
} PRINTDLGW, *LPPRINTDLGW; } PRINTDLGW, *LPPRINTDLGW;
#ifdef UNICODE #ifdef UNICODE
typedef PRINTDLGW PRINTDLG; typedef PRINTDLGW PRINTDLG;
typedef LPPRINTDLGW LPPRINTDLG; typedef LPPRINTDLGW LPPRINTDLG;
#else #else
typedef PRINTDLGA PRINTDLG; typedef PRINTDLGA PRINTDLG;
typedef LPPRINTDLGA LPPRINTDLG; typedef LPPRINTDLGA LPPRINTDLG;
#endif // UNICODE #endif // UNICODE
WINCOMMDLGAPI BOOL APIENTRY PrintDlgA(__inout LPPRINTDLGA pPD); WINCOMMDLGAPI _Success_(return != FALSE) BOOL APIENTRY PrintDlgA(_Inout_ LPPRINT
WINCOMMDLGAPI BOOL APIENTRY PrintDlgW(__inout LPPRINTDLGW pPD); DLGA pPD);
WINCOMMDLGAPI _Success_(return != FALSE) BOOL APIENTRY PrintDlgW(_Inout_ LPPRINT
DLGW pPD);
#ifdef UNICODE #ifdef UNICODE
#define PrintDlg PrintDlgW #define PrintDlg PrintDlgW
#else #else
#define PrintDlg PrintDlgA #define PrintDlg PrintDlgA
#endif // !UNICODE #endif // !UNICODE
#if(WINVER >= 0x0500) #if(WINVER >= 0x0500)
#ifdef STDMETHOD #ifdef STDMETHOD
skipping to change at line 910 skipping to change at line 915
// IPrintDialogServices interface. // IPrintDialogServices interface.
// //
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
#undef INTERFACE #undef INTERFACE
#define INTERFACE IPrintDialogCallback #define INTERFACE IPrintDialogCallback
DECLARE_INTERFACE_IID_(IPrintDialogCallback, IUnknown, "5852A2C3-6530-11D1-B6A3- 0000F8757BF9") DECLARE_INTERFACE_IID_(IPrintDialogCallback, IUnknown, "5852A2C3-6530-11D1-B6A3- 0000F8757BF9")
{ {
// *** IUnknown methods *** // *** IUnknown methods ***
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID *ppvObj) PURE; STDMETHOD(QueryInterface) (THIS_ _In_ REFIID riid, _Outptr_ void **ppvObj) P URE;
STDMETHOD_(ULONG, AddRef) (THIS) PURE; STDMETHOD_(ULONG, AddRef) (THIS) PURE;
STDMETHOD_(ULONG, Release) (THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE;
// *** IPrintDialogCallback methods *** // *** IPrintDialogCallback methods ***
STDMETHOD(InitDone) (THIS) PURE; STDMETHOD(InitDone) (THIS) PURE;
STDMETHOD(SelectionChange) (THIS) PURE; STDMETHOD(SelectionChange) (THIS) PURE;
STDMETHOD(HandleMessage) (THIS_ HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *pResult) PURE; STDMETHOD(HandleMessage) (THIS_ HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *pResult) PURE;
}; };
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
// //
// IPrintDialogServices Interface // IPrintDialogServices Interface
skipping to change at line 941 skipping to change at line 946
// Returns the port name for the currently selected printer. // Returns the port name for the currently selected printer.
// //
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
#undef INTERFACE #undef INTERFACE
#define INTERFACE IPrintDialogServices #define INTERFACE IPrintDialogServices
DECLARE_INTERFACE_IID_(IPrintDialogServices, IUnknown, "509AAEDA-5639-11D1-B6A1- 0000F8757BF9") DECLARE_INTERFACE_IID_(IPrintDialogServices, IUnknown, "509AAEDA-5639-11D1-B6A1- 0000F8757BF9")
{ {
// *** IUnknown methods *** // *** IUnknown methods ***
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID *ppvObj) PURE; STDMETHOD(QueryInterface) (THIS_ _In_ REFIID riid, _Outptr_ void **ppvObj) P URE;
STDMETHOD_(ULONG, AddRef) (THIS) PURE; STDMETHOD_(ULONG, AddRef) (THIS) PURE;
STDMETHOD_(ULONG, Release) (THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE;
// *** IPrintDialogServices methods *** // *** IPrintDialogServices methods ***
STDMETHOD(GetCurrentDevMode) (THIS_ __inout LPDEVMODE pDevMode, __inout UINT STDMETHOD(GetCurrentDevMode) (THIS_ _Inout_ LPDEVMODE pDevMode, _Inout_ UINT
*pcbSize) PURE; *pcbSize) PURE;
STDMETHOD(GetCurrentPrinterName) (THIS_ __out_ecount_opt(*pcchSize) LPWSTR p STDMETHOD(GetCurrentPrinterName) (THIS_ _Out_writes_opt_(*pcchSize) LPWSTR p
PrinterName, __inout UINT *pcchSize) PURE; PrinterName, _Inout_ UINT *pcchSize) PURE;
STDMETHOD(GetCurrentPortName) (THIS_ __out_ecount_opt(*pcchSize) LPWSTR pPor STDMETHOD(GetCurrentPortName) (THIS_ _Out_writes_opt_(*pcchSize) LPWSTR pPor
tName, __inout UINT *pcchSize) PURE; tName, _Inout_ UINT *pcchSize) PURE;
}; };
// //
// Page Range structure for PrintDlgEx. // Page Range structure for PrintDlgEx.
// //
typedef struct tagPRINTPAGERANGE { typedef struct tagPRINTPAGERANGE {
DWORD nFromPage; DWORD nFromPage;
DWORD nToPage; DWORD nToPage;
} PRINTPAGERANGE; } PRINTPAGERANGE;
typedef PRINTPAGERANGE *LPPRINTPAGERANGE; typedef PRINTPAGERANGE *LPPRINTPAGERANGE;
skipping to change at line 1021 skipping to change at line 1026
DWORD dwResultAction; // result action if S_OK is retur ned DWORD dwResultAction; // result action if S_OK is retur ned
} PRINTDLGEXW, *LPPRINTDLGEXW; } PRINTDLGEXW, *LPPRINTDLGEXW;
#ifdef UNICODE #ifdef UNICODE
typedef PRINTDLGEXW PRINTDLGEX; typedef PRINTDLGEXW PRINTDLGEX;
typedef LPPRINTDLGEXW LPPRINTDLGEX; typedef LPPRINTDLGEXW LPPRINTDLGEX;
#else #else
typedef PRINTDLGEXA PRINTDLGEX; typedef PRINTDLGEXA PRINTDLGEX;
typedef LPPRINTDLGEXA LPPRINTDLGEX; typedef LPPRINTDLGEXA LPPRINTDLGEX;
#endif // UNICODE #endif // UNICODE
WINCOMMDLGAPI HRESULT APIENTRY PrintDlgExA(__inout LPPRINTDLGEXA pPD); WINCOMMDLGAPI HRESULT APIENTRY PrintDlgExA(_Inout_ LPPRINTDLGEXA pPD);
WINCOMMDLGAPI HRESULT APIENTRY PrintDlgExW(__inout LPPRINTDLGEXW pPD); WINCOMMDLGAPI HRESULT APIENTRY PrintDlgExW(_Inout_ LPPRINTDLGEXW pPD);
#ifdef UNICODE #ifdef UNICODE
#define PrintDlgEx PrintDlgExW #define PrintDlgEx PrintDlgExW
#else #else
#define PrintDlgEx PrintDlgExA #define PrintDlgEx PrintDlgExA
#endif // !UNICODE #endif // !UNICODE
#endif #endif
#endif /* WINVER >= 0x0500 */ #endif /* WINVER >= 0x0500 */
skipping to change at line 1188 skipping to change at line 1193
#define PSD_DISABLEPAPER 0x00000200 #define PSD_DISABLEPAPER 0x00000200
#define PSD_SHOWHELP 0x00000800 // must be same as PD_* #define PSD_SHOWHELP 0x00000800 // must be same as PD_*
#define PSD_ENABLEPAGESETUPHOOK 0x00002000 // must be same as PD_* #define PSD_ENABLEPAGESETUPHOOK 0x00002000 // must be same as PD_*
#define PSD_ENABLEPAGESETUPTEMPLATE 0x00008000 // must be same as PD_* #define PSD_ENABLEPAGESETUPTEMPLATE 0x00008000 // must be same as PD_*
#define PSD_ENABLEPAGESETUPTEMPLATEHANDLE 0x00020000 // must be same as PD_* #define PSD_ENABLEPAGESETUPTEMPLATEHANDLE 0x00020000 // must be same as PD_*
#define PSD_ENABLEPAGEPAINTHOOK 0x00040000 #define PSD_ENABLEPAGEPAINTHOOK 0x00040000
#define PSD_DISABLEPAGEPAINTING 0x00080000 #define PSD_DISABLEPAGEPAINTING 0x00080000
#define PSD_NONETWORKBUTTON 0x00200000 // must be same as PD_* #define PSD_NONETWORKBUTTON 0x00200000 // must be same as PD_*
#endif /* WINVER >= 0x0400 */ #endif /* WINVER >= 0x0400 */
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */
#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 "commdlg.inl" #include "commdlg.inl"
#endif /* ISOLATION_AWARE_ENABLED */ #endif /* ISOLATION_AWARE_ENABLED */
#endif /* RC */ #endif /* RC */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
 End of changes. 11 change blocks. 
18 lines changed or deleted 28 lines changed or added

This html diff was produced by rfcdiff 1.41.