Headers diff for comdlg32.dll between 6.00.3790.3959-Windows 5.0 and 6.0.6002.18005-Windows 6.0 versions



 commdlg.h (6.00.3790.3959-Windows 5.0)   commdlg.h (6.0.6002.18005-Windows 6.0) 
skipping to change at line 182 skipping to change at line 182
WORD nFileExtension; WORD nFileExtension;
LPCSTR lpstrDefExt; LPCSTR lpstrDefExt;
LPARAM lCustData; LPARAM lCustData;
LPOFNHOOKPROC lpfnHook; LPOFNHOOKPROC lpfnHook;
LPCSTR lpTemplateName; LPCSTR lpTemplateName;
#ifdef _MAC #ifdef _MAC
LPEDITMENU lpEditInfo; LPEDITMENU lpEditInfo;
LPCSTR lpstrPrompt; LPCSTR lpstrPrompt;
#endif #endif
#if (_WIN32_WINNT >= 0x0500) #if (_WIN32_WINNT >= 0x0500)
void * pvReserved; void * pvReserved;
DWORD dwReserved; DWORD dwReserved;
DWORD FlagsEx; DWORD FlagsEx;
#endif // (_WIN32_WINNT >= 0x0500) #endif // (_WIN32_WINNT >= 0x0500)
} OPENFILENAMEA, *LPOPENFILENAMEA; } OPENFILENAMEA, *LPOPENFILENAMEA;
typedef struct tagOFNW { typedef struct tagOFNW {
DWORD lStructSize; DWORD lStructSize;
HWND hwndOwner; HWND hwndOwner;
HINSTANCE hInstance; HINSTANCE hInstance;
LPCWSTR lpstrFilter; LPCWSTR lpstrFilter;
LPWSTR lpstrCustomFilter; LPWSTR lpstrCustomFilter;
skipping to change at line 213 skipping to change at line 213
WORD nFileExtension; WORD nFileExtension;
LPCWSTR lpstrDefExt; LPCWSTR lpstrDefExt;
LPARAM lCustData; LPARAM lCustData;
LPOFNHOOKPROC lpfnHook; LPOFNHOOKPROC lpfnHook;
LPCWSTR lpTemplateName; LPCWSTR lpTemplateName;
#ifdef _MAC #ifdef _MAC
LPEDITMENU lpEditInfo; LPEDITMENU lpEditInfo;
LPCSTR lpstrPrompt; LPCSTR lpstrPrompt;
#endif #endif
#if (_WIN32_WINNT >= 0x0500) #if (_WIN32_WINNT >= 0x0500)
void * pvReserved; void * pvReserved;
DWORD dwReserved; DWORD dwReserved;
DWORD FlagsEx; DWORD FlagsEx;
#endif // (_WIN32_WINNT >= 0x0500) #endif // (_WIN32_WINNT >= 0x0500)
} OPENFILENAMEW, *LPOPENFILENAMEW; } OPENFILENAMEW, *LPOPENFILENAMEW;
#ifdef UNICODE #ifdef UNICODE
typedef OPENFILENAMEW OPENFILENAME; typedef OPENFILENAMEW OPENFILENAME;
typedef LPOPENFILENAMEW LPOPENFILENAME; typedef LPOPENFILENAMEW LPOPENFILENAME;
#else #else
typedef OPENFILENAMEA OPENFILENAME; typedef OPENFILENAMEA OPENFILENAME;
typedef LPOPENFILENAMEA LPOPENFILENAME; typedef LPOPENFILENAMEA LPOPENFILENAME;
skipping to change at line 251 skipping to change at line 251
#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, LPSTR, WORD); WINCOMMDLGAPI short APIENTRY GetFileTitleA(LPCSTR, __out_ecount(cchSize) LPSTR B
WINCOMMDLGAPI short APIENTRY GetFileTitleW(LPCWSTR, LPWSTR, WORD); uf, __in WORD cchSize);
WINCOMMDLGAPI short APIENTRY GetFileTitleW(LPCWSTR, __out_ecount(cchSize) LPWSTR
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 282 skipping to change at line 282
#define OFN_CREATEPROMPT 0x00002000 #define OFN_CREATEPROMPT 0x00002000
#define OFN_SHAREAWARE 0x00004000 #define OFN_SHAREAWARE 0x00004000
#define OFN_NOREADONLYRETURN 0x00008000 #define OFN_NOREADONLYRETURN 0x00008000
#define OFN_NOTESTFILECREATE 0x00010000 #define OFN_NOTESTFILECREATE 0x00010000
#define OFN_NONETWORKBUTTON 0x00020000 #define OFN_NONETWORKBUTTON 0x00020000
#define OFN_NOLONGNAMES 0x00040000 // force no long names for 4 .x modules #define OFN_NOLONGNAMES 0x00040000 // force no long names for 4 .x modules
#if(WINVER >= 0x0400) #if(WINVER >= 0x0400)
#define OFN_EXPLORER 0x00080000 // new look commdlg #define OFN_EXPLORER 0x00080000 // new look commdlg
#define OFN_NODEREFERENCELINKS 0x00100000 #define OFN_NODEREFERENCELINKS 0x00100000
#define OFN_LONGNAMES 0x00200000 // force long names for 3.x modules #define OFN_LONGNAMES 0x00200000 // force long names for 3.x modules
// OFN_ENABLEINCLUDENOTIFY and OFN_ENABLESIZING require
// Windows 2000 or higher to have any effect.
#define OFN_ENABLEINCLUDENOTIFY 0x00400000 // send include message to c allback #define OFN_ENABLEINCLUDENOTIFY 0x00400000 // send include message to c allback
#define OFN_ENABLESIZING 0x00800000 #define OFN_ENABLESIZING 0x00800000
#endif /* WINVER >= 0x0400 */ #endif /* WINVER >= 0x0400 */
#if (_WIN32_WINNT >= 0x0500) #if (_WIN32_WINNT >= 0x0500)
#define OFN_DONTADDTORECENT 0x02000000 #define OFN_DONTADDTORECENT 0x02000000
#define OFN_FORCESHOWHIDDEN 0x10000000 // Show All files including S ystem and hidden files #define OFN_FORCESHOWHIDDEN 0x10000000 // Show All files including S ystem and hidden files
#endif // (_WIN32_WINNT >= 0x0500) #endif // (_WIN32_WINNT >= 0x0500)
//FlagsEx Values //FlagsEx Values
#if (_WIN32_WINNT >= 0x0500) #if (_WIN32_WINNT >= 0x0500)
skipping to change at line 369 skipping to change at line 371
#define CDN_LAST (0U-699U) #define CDN_LAST (0U-699U)
// Notifications from Open or Save dialog // Notifications from Open or Save dialog
#define CDN_INITDONE (CDN_FIRST - 0x0000) #define CDN_INITDONE (CDN_FIRST - 0x0000)
#define CDN_SELCHANGE (CDN_FIRST - 0x0001) #define CDN_SELCHANGE (CDN_FIRST - 0x0001)
#define CDN_FOLDERCHANGE (CDN_FIRST - 0x0002) #define CDN_FOLDERCHANGE (CDN_FIRST - 0x0002)
#define CDN_SHAREVIOLATION (CDN_FIRST - 0x0003) #define CDN_SHAREVIOLATION (CDN_FIRST - 0x0003)
#define CDN_HELP (CDN_FIRST - 0x0004) #define CDN_HELP (CDN_FIRST - 0x0004)
#define CDN_FILEOK (CDN_FIRST - 0x0005) #define CDN_FILEOK (CDN_FIRST - 0x0005)
#define CDN_TYPECHANGE (CDN_FIRST - 0x0006) #define CDN_TYPECHANGE (CDN_FIRST - 0x0006)
#if (NTDDI_VERSION >= NTDDI_WIN2K)
#define CDN_INCLUDEITEM (CDN_FIRST - 0x0007) #define CDN_INCLUDEITEM (CDN_FIRST - 0x0007)
#endif // (NTDDI_VERSION >= NTDDI_WIN2K)
#define CDM_FIRST (WM_USER + 100) #define CDM_FIRST (WM_USER + 100)
#define CDM_LAST (WM_USER + 200) #define CDM_LAST (WM_USER + 200)
// Messages to query information from the Open or Save dialogs // Messages to query information from the Open or Save dialogs
// lParam = pointer to text buffer that gets filled in // lParam = pointer to text buffer that gets filled in
// wParam = max number of characters of the text buffer (including NULL) // wParam = max number of characters of the text buffer (including NULL)
// return = < 0 if error; number of characters needed (including NULL) // return = < 0 if error; number of characters needed (including NULL)
#define CDM_GETSPEC (CDM_FIRST + 0x0000) #define CDM_GETSPEC (CDM_FIRST + 0x0000)
#define CommDlg_OpenSave_GetSpecA(_hdlg, _psz, _cbmax) \ #define CommDlg_OpenSave_GetSpecA(_hdlg, _psz, _cbmax) \
(int)SNDMSG(_hdlg, CDM_GETSPEC, (WPARAM)_cbmax, (LPARAM)(LPSTR)_psz) (int)SNDMSG(_hdlg, CDM_GETSPEC, (WPARAM)(_cbmax), (LPARAM)(LPSTR)(_psz))
#define CommDlg_OpenSave_GetSpecW(_hdlg, _psz, _cbmax) \ #define CommDlg_OpenSave_GetSpecW(_hdlg, _psz, _cbmax) \
(int)SNDMSG(_hdlg, CDM_GETSPEC, (WPARAM)_cbmax, (LPARAM)(LPWSTR)_psz) (int)SNDMSG(_hdlg, CDM_GETSPEC, (WPARAM)(_cbmax), (LPARAM)(LPWSTR)(_psz) )
#ifdef UNICODE #ifdef UNICODE
#define CommDlg_OpenSave_GetSpec CommDlg_OpenSave_GetSpecW #define CommDlg_OpenSave_GetSpec CommDlg_OpenSave_GetSpecW
#else #else
#define CommDlg_OpenSave_GetSpec CommDlg_OpenSave_GetSpecA #define CommDlg_OpenSave_GetSpec CommDlg_OpenSave_GetSpecA
#endif // !UNICODE #endif // !UNICODE
// lParam = pointer to text buffer that gets filled in // lParam = pointer to text buffer that gets filled in
// wParam = max number of characters of the text buffer (including NULL) // wParam = max number of characters of the text buffer (including NULL)
// return = < 0 if error; number of characters needed (including NULL) // return = < 0 if error; number of characters needed (including NULL)
#define CDM_GETFILEPATH (CDM_FIRST + 0x0001) #define CDM_GETFILEPATH (CDM_FIRST + 0x0001)
#define CommDlg_OpenSave_GetFilePathA(_hdlg, _psz, _cbmax) \ #define CommDlg_OpenSave_GetFilePathA(_hdlg, _psz, _cbmax) \
(int)SNDMSG(_hdlg, CDM_GETFILEPATH, (WPARAM)_cbmax, (LPARAM)(LPSTR)_psz) (int)SNDMSG(_hdlg, CDM_GETFILEPATH, (WPARAM)(_cbmax), (LPARAM)(LPSTR)(_p sz))
#define CommDlg_OpenSave_GetFilePathW(_hdlg, _psz, _cbmax) \ #define CommDlg_OpenSave_GetFilePathW(_hdlg, _psz, _cbmax) \
(int)SNDMSG(_hdlg, CDM_GETFILEPATH, (WPARAM)_cbmax, (LPARAM)(LPWSTR)_psz ) (int)SNDMSG(_hdlg, CDM_GETFILEPATH, (WPARAM)(_cbmax), (LPARAM)(LPWSTR)(_ psz))
#ifdef UNICODE #ifdef UNICODE
#define CommDlg_OpenSave_GetFilePath CommDlg_OpenSave_GetFilePathW #define CommDlg_OpenSave_GetFilePath CommDlg_OpenSave_GetFilePathW
#else #else
#define CommDlg_OpenSave_GetFilePath CommDlg_OpenSave_GetFilePathA #define CommDlg_OpenSave_GetFilePath CommDlg_OpenSave_GetFilePathA
#endif // !UNICODE #endif // !UNICODE
// lParam = pointer to text buffer that gets filled in // lParam = pointer to text buffer that gets filled in
// wParam = max number of characters of the text buffer (including NULL) // wParam = max number of characters of the text buffer (including NULL)
// return = < 0 if error; number of characters needed (including NULL) // return = < 0 if error; number of characters needed (including NULL)
#define CDM_GETFOLDERPATH (CDM_FIRST + 0x0002) #define CDM_GETFOLDERPATH (CDM_FIRST + 0x0002)
#define CommDlg_OpenSave_GetFolderPathA(_hdlg, _psz, _cbmax) \ #define CommDlg_OpenSave_GetFolderPathA(_hdlg, _psz, _cbmax) \
(int)SNDMSG(_hdlg, CDM_GETFOLDERPATH, (WPARAM)_cbmax, (LPARAM)(LPSTR)_ps z) (int)SNDMSG(_hdlg, CDM_GETFOLDERPATH, (WPARAM)(_cbmax), (LPARAM)(LPSTR)( _psz))
#define CommDlg_OpenSave_GetFolderPathW(_hdlg, _psz, _cbmax) \ #define CommDlg_OpenSave_GetFolderPathW(_hdlg, _psz, _cbmax) \
(int)SNDMSG(_hdlg, CDM_GETFOLDERPATH, (WPARAM)_cbmax, (LPARAM)(LPWSTR)_p sz) (int)SNDMSG(_hdlg, CDM_GETFOLDERPATH, (WPARAM)(_cbmax), (LPARAM)(LPWSTR) (_psz))
#ifdef UNICODE #ifdef UNICODE
#define CommDlg_OpenSave_GetFolderPath CommDlg_OpenSave_GetFolderPathW #define CommDlg_OpenSave_GetFolderPath CommDlg_OpenSave_GetFolderPathW
#else #else
#define CommDlg_OpenSave_GetFolderPath CommDlg_OpenSave_GetFolderPathA #define CommDlg_OpenSave_GetFolderPath CommDlg_OpenSave_GetFolderPathA
#endif // !UNICODE #endif // !UNICODE
// lParam = pointer to ITEMIDLIST buffer that gets filled in // lParam = pointer to ITEMIDLIST buffer that gets filled in
// wParam = size of the ITEMIDLIST buffer // wParam = size of the ITEMIDLIST buffer
// return = < 0 if error; length of buffer needed // return = < 0 if error; length of buffer needed
#define CDM_GETFOLDERIDLIST (CDM_FIRST + 0x0003) #define CDM_GETFOLDERIDLIST (CDM_FIRST + 0x0003)
#define CommDlg_OpenSave_GetFolderIDList(_hdlg, _pidl, _cbmax) \ #define CommDlg_OpenSave_GetFolderIDList(_hdlg, _pidl, _cbmax) \
(int)SNDMSG(_hdlg, CDM_GETFOLDERIDLIST, (WPARAM)_cbmax, (LPARAM)(LPVOID) _pidl) (int)SNDMSG(_hdlg, CDM_GETFOLDERIDLIST, (WPARAM)(_cbmax), (LPARAM)(LPVOI D)(_pidl))
// lParam = pointer to a string // lParam = pointer to a string
// wParam = ID of control to change // wParam = ID of control to change
// return = not used // return = not used
#define CDM_SETCONTROLTEXT (CDM_FIRST + 0x0004) #define CDM_SETCONTROLTEXT (CDM_FIRST + 0x0004)
#define CommDlg_OpenSave_SetControlText(_hdlg, _id, _text) \ #define CommDlg_OpenSave_SetControlText(_hdlg, _id, _text) \
(void)SNDMSG(_hdlg, CDM_SETCONTROLTEXT, (WPARAM)_id, (LPARAM)(LPSTR)_tex t) (void)SNDMSG(_hdlg, CDM_SETCONTROLTEXT, (WPARAM)(_id), (LPARAM)(LPSTR)(_ text))
// lParam = not used // lParam = not used
// wParam = ID of control to change // wParam = ID of control to change
// return = not used // return = not used
#define CDM_HIDECONTROL (CDM_FIRST + 0x0005) #define CDM_HIDECONTROL (CDM_FIRST + 0x0005)
#define CommDlg_OpenSave_HideControl(_hdlg, _id) \ #define CommDlg_OpenSave_HideControl(_hdlg, _id) \
(void)SNDMSG(_hdlg, CDM_HIDECONTROL, (WPARAM)_id, 0) (void)SNDMSG(_hdlg, CDM_HIDECONTROL, (WPARAM)(_id), 0)
// lParam = pointer to default extension (no dot) // lParam = pointer to default extension (no dot)
// wParam = not used // wParam = not used
// return = not used // return = not used
#define CDM_SETDEFEXT (CDM_FIRST + 0x0006) #define CDM_SETDEFEXT (CDM_FIRST + 0x0006)
#define CommDlg_OpenSave_SetDefExt(_hdlg, _pszext) \ #define CommDlg_OpenSave_SetDefExt(_hdlg, _pszext) \
(void)SNDMSG(_hdlg, CDM_SETDEFEXT, 0, (LPARAM)(LPSTR)_pszext) (void)SNDMSG(_hdlg, CDM_SETDEFEXT, 0, (LPARAM)(LPSTR)(_pszext))
#endif /* WINVER >= 0x0400 */ #endif /* WINVER >= 0x0400 */
#ifndef _MAC #ifndef _MAC
typedef struct tagCHOOSECOLORA { typedef struct tagCHOOSECOLORA {
DWORD lStructSize; DWORD lStructSize;
HWND hwndOwner; HWND hwndOwner;
HWND hInstance; HWND hInstance;
COLORREF rgbResult; COLORREF rgbResult;
COLORREF* lpCustColors; COLORREF* lpCustColors;
DWORD Flags; DWORD Flags;
skipping to change at line 586 skipping to change at line 590
#define FR_SHOWHELP 0x00000080 #define FR_SHOWHELP 0x00000080
#define FR_ENABLEHOOK 0x00000100 #define FR_ENABLEHOOK 0x00000100
#define FR_ENABLETEMPLATE 0x00000200 #define FR_ENABLETEMPLATE 0x00000200
#define FR_NOUPDOWN 0x00000400 #define FR_NOUPDOWN 0x00000400
#define FR_NOMATCHCASE 0x00000800 #define FR_NOMATCHCASE 0x00000800
#define FR_NOWHOLEWORD 0x00001000 #define FR_NOWHOLEWORD 0x00001000
#define FR_ENABLETEMPLATEHANDLE 0x00002000 #define FR_ENABLETEMPLATEHANDLE 0x00002000
#define FR_HIDEUPDOWN 0x00004000 #define FR_HIDEUPDOWN 0x00004000
#define FR_HIDEMATCHCASE 0x00008000 #define FR_HIDEMATCHCASE 0x00008000
#define FR_HIDEWHOLEWORD 0x00010000 #define FR_HIDEWHOLEWORD 0x00010000
#if (NTDDI_VERSION >= NTDDI_WIN2K)
#define FR_RAW 0x00020000 #define FR_RAW 0x00020000
#define FR_MATCHDIAC 0x20000000 #define FR_MATCHDIAC 0x20000000
#define FR_MATCHKASHIDA 0x40000000 #define FR_MATCHKASHIDA 0x40000000
#define FR_MATCHALEFHAMZA 0x80000000 #define FR_MATCHALEFHAMZA 0x80000000
#endif // (NTDDI_VERSION >= NTDDI_WIN2K)
WINCOMMDLGAPI HWND APIENTRY FindTextA(LPFINDREPLACEA); WINCOMMDLGAPI HWND APIENTRY FindTextA(LPFINDREPLACEA);
WINCOMMDLGAPI HWND APIENTRY FindTextW(LPFINDREPLACEW); WINCOMMDLGAPI HWND APIENTRY FindTextW(LPFINDREPLACEW);
#ifdef UNICODE #ifdef UNICODE
#define FindText FindTextW #define FindText FindTextW
#else #else
#define FindText FindTextA #define FindText FindTextA
#endif // !UNICODE #endif // !UNICODE
#ifndef _MAC #ifndef _MAC
WINCOMMDLGAPI HWND APIENTRY ReplaceTextA(LPFINDREPLACEA); WINCOMMDLGAPI HWND APIENTRY ReplaceTextA(LPFINDREPLACEA);
skipping to change at line 640 skipping to change at line 646
// contains cust. dlg. template // contains cust. dlg. template
LPSTR lpszStyle; // return the style field here LPSTR lpszStyle; // return the style field here
// must be LF_FACESIZE or bigger // must be LF_FACESIZE or bigger
WORD nFontType; // same value reported to the EnumFonts WORD nFontType; // same value reported to the EnumFonts
// call back with the extra FONTTYPE_ // call back with the extra FONTTYPE_
// bits added // bits added
WORD ___MISSING_ALIGNMENT__; WORD ___MISSING_ALIGNMENT__;
INT nSizeMin; // minimum pt size allowed & INT nSizeMin; // minimum pt size allowed &
INT nSizeMax; // max pt size allowed if INT nSizeMax; // max pt size allowed if
// CF_LIMITSIZE is used // CF_LIMITSIZE is used
} CHOOSEFONTA, *LPCHOOSEFONTA; } CHOOSEFONTA;
typedef struct tagCHOOSEFONTW { typedef struct tagCHOOSEFONTW {
DWORD lStructSize; DWORD lStructSize;
HWND hwndOwner; // caller's window handle HWND hwndOwner; // caller's window handle
HDC hDC; // printer DC/IC or NULL HDC hDC; // printer DC/IC or NULL
LPLOGFONTW lpLogFont; // ptr. to a LOGFONT struct LPLOGFONTW lpLogFont; // ptr. to a LOGFONT struct
INT iPointSize; // 10 * size in points of selected font INT iPointSize; // 10 * size in points of selected font
DWORD Flags; // enum. type flags DWORD Flags; // enum. type flags
COLORREF rgbColors; // returned text color COLORREF rgbColors; // returned text color
LPARAM lCustData; // data passed to hook fn. LPARAM lCustData; // data passed to hook fn.
LPCFHOOKPROC lpfnHook; // ptr. to hook function LPCFHOOKPROC lpfnHook; // ptr. to hook function
skipping to change at line 663 skipping to change at line 669
// contains cust. dlg. template // contains cust. dlg. template
LPWSTR lpszStyle; // return the style field here LPWSTR lpszStyle; // return the style field here
// must be LF_FACESIZE or bigger // must be LF_FACESIZE or bigger
WORD nFontType; // same value reported to the EnumFonts WORD nFontType; // same value reported to the EnumFonts
// call back with the extra FONTTYPE_ // call back with the extra FONTTYPE_
// bits added // bits added
WORD ___MISSING_ALIGNMENT__; WORD ___MISSING_ALIGNMENT__;
INT nSizeMin; // minimum pt size allowed & INT nSizeMin; // minimum pt size allowed &
INT nSizeMax; // max pt size allowed if INT nSizeMax; // max pt size allowed if
// CF_LIMITSIZE is used // CF_LIMITSIZE is used
} CHOOSEFONTW, *LPCHOOSEFONTW; } CHOOSEFONTW;
#ifdef UNICODE #ifdef UNICODE
typedef CHOOSEFONTW CHOOSEFONT; typedef CHOOSEFONTW CHOOSEFONT;
typedef LPCHOOSEFONTW LPCHOOSEFONT;
#else #else
typedef CHOOSEFONTA CHOOSEFONT; typedef CHOOSEFONTA CHOOSEFONT;
#endif // UNICODE
typedef CHOOSEFONTA *LPCHOOSEFONTA;
typedef CHOOSEFONTW *LPCHOOSEFONTW;
#ifdef UNICODE
typedef LPCHOOSEFONTW LPCHOOSEFONT;
#else
typedef LPCHOOSEFONTA LPCHOOSEFONT; typedef LPCHOOSEFONTA LPCHOOSEFONT;
#endif // UNICODE #endif // UNICODE
typedef const CHOOSEFONTA *PCCHOOSEFONTA;
typedef const CHOOSEFONTW *PCCHOOSEFONTW;
#ifdef UNICODE
typedef CHOOSEFONTW CHOOSEFONT;
typedef PCCHOOSEFONTW PCCHOOSEFONT;
#else
typedef CHOOSEFONTA CHOOSEFONT;
typedef PCCHOOSEFONTA PCCHOOSEFONT;
#endif // UNICODE
WINCOMMDLGAPI BOOL APIENTRY ChooseFontA(LPCHOOSEFONTA); WINCOMMDLGAPI BOOL APIENTRY ChooseFontA(LPCHOOSEFONTA);
WINCOMMDLGAPI BOOL APIENTRY ChooseFontW(LPCHOOSEFONTW); WINCOMMDLGAPI BOOL APIENTRY ChooseFontW(LPCHOOSEFONTW);
#ifdef UNICODE #ifdef UNICODE
#define ChooseFont ChooseFontW #define ChooseFont ChooseFontW
#else #else
#define ChooseFont ChooseFontA #define ChooseFont ChooseFontA
#endif // !UNICODE #endif // !UNICODE
#define CF_SCREENFONTS 0x00000001 #define CF_SCREENFONTS 0x00000001
skipping to change at line 729 skipping to change at line 749
#define BOLD_FONTTYPE 0x0100 #define BOLD_FONTTYPE 0x0100
#define ITALIC_FONTTYPE 0x0200 #define ITALIC_FONTTYPE 0x0200
#define REGULAR_FONTTYPE 0x0400 #define REGULAR_FONTTYPE 0x0400
// EnumFonts callback routine only uses these bits, so we can use the rest // EnumFonts callback routine only uses these bits, so we can use the rest
// #define RASTER_FONTTYPE 0x001 // #define RASTER_FONTTYPE 0x001
// #define DEVICE_FONTTYPE 0x002 // #define DEVICE_FONTTYPE 0x002
// #define TRUETYPE_FONTTYPE 0x004 // #define TRUETYPE_FONTTYPE 0x004
#ifdef WINNT #if (NTDDI_VERSION >= NTDDI_WIN2K)
#define PS_OPENTYPE_FONTTYPE 0x10000 #define PS_OPENTYPE_FONTTYPE 0x10000
#define TT_OPENTYPE_FONTTYPE 0x20000 #define TT_OPENTYPE_FONTTYPE 0x20000
#define TYPE1_FONTTYPE 0x40000 #define TYPE1_FONTTYPE 0x40000
#endif #endif // (NTDDI_VERSION >= NTDDI_WIN2K)
#define WM_CHOOSEFONT_GETLOGFONT (WM_USER + 1) #define WM_CHOOSEFONT_GETLOGFONT (WM_USER + 1)
#if (NTDDI_VERSION >= NTDDI_WIN2K)
#define WM_CHOOSEFONT_SETLOGFONT (WM_USER + 101) #define WM_CHOOSEFONT_SETLOGFONT (WM_USER + 101)
#define WM_CHOOSEFONT_SETFLAGS (WM_USER + 102) #define WM_CHOOSEFONT_SETFLAGS (WM_USER + 102)
#endif // (NTDDI_VERSION >= NTDDI_WIN2K)
// strings used to obtain unique window message for communication // strings used to obtain unique window message for communication
// between dialog and caller // between dialog and caller
#define LBSELCHSTRINGA "commdlg_LBSelChangedNotify" #define LBSELCHSTRINGA "commdlg_LBSelChangedNotify"
#define SHAREVISTRINGA "commdlg_ShareViolation" #define SHAREVISTRINGA "commdlg_ShareViolation"
#define FILEOKSTRINGA "commdlg_FileNameOK" #define FILEOKSTRINGA "commdlg_FileNameOK"
#define COLOROKSTRINGA "commdlg_ColorOK" #define COLOROKSTRINGA "commdlg_ColorOK"
#define SETRGBSTRINGA "commdlg_SetRGBColor" #define SETRGBSTRINGA "commdlg_SetRGBColor"
#define HELPMSGSTRINGA "commdlg_help" #define HELPMSGSTRINGA "commdlg_help"
skipping to change at line 879 skipping to change at line 901
// IObjectWithSite::SetSite(punkSite) // IObjectWithSite::SetSite(punkSite)
// IPrintDialogCallback usually paired with IObjectWithSite. // IPrintDialogCallback usually paired with IObjectWithSite.
// Provides the IUnknown pointer of the site to QI for the // Provides the IUnknown pointer of the site to QI for the
// IPrintDialogServices interface. // IPrintDialogServices interface.
// //
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
#undef INTERFACE #undef INTERFACE
#define INTERFACE IPrintDialogCallback #define INTERFACE IPrintDialogCallback
DECLARE_INTERFACE_(IPrintDialogCallback, IUnknown) 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_ REFIID riid, LPVOID *ppvObj) PURE;
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;
skipping to change at line 910 skipping to change at line 932
// Returns the printer name for the currently selected printer. // Returns the printer name for the currently selected printer.
// //
// IPrintDialogServices::GetCurrentPortName(pPortName, pcchSize) // IPrintDialogServices::GetCurrentPortName(pPortName, pcchSize)
// 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_(IPrintDialogServices, IUnknown) 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_ REFIID riid, LPVOID *ppvObj) PURE;
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_ LPDEVMODE pDevMode, UINT *pcbSize) PURE; STDMETHOD(GetCurrentDevMode) (THIS_ __inout LPDEVMODE pDevMode, __inout UINT
STDMETHOD(GetCurrentPrinterName) (THIS_ LPTSTR pPrinterName, UINT *pcchSize) *pcbSize) PURE;
PURE; STDMETHOD(GetCurrentPrinterName) (THIS_ __out_ecount_opt(*pcchSize) LPWSTR p
STDMETHOD(GetCurrentPortName) (THIS_ LPTSTR pPortName, UINT *pcchSize) PURE; PrinterName, __inout UINT *pcchSize) PURE;
STDMETHOD(GetCurrentPortName) (THIS_ __out_ecount_opt(*pcchSize) LPWSTR pPor
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, *LPPRINTPAGERANGE; } PRINTPAGERANGE;
typedef PRINTPAGERANGE *LPPRINTPAGERANGE;
typedef const PRINTPAGERANGE *PCPRINTPAGERANGE;
// //
// PrintDlgEx structure. // PrintDlgEx structure.
// //
typedef struct tagPDEXA { typedef struct tagPDEXA {
DWORD lStructSize; // size of structure in bytes DWORD lStructSize; // size of structure in bytes
HWND hwndOwner; // caller's window handle HWND hwndOwner; // caller's window handle
HGLOBAL hDevMode; // handle to DevMode HGLOBAL hDevMode; // handle to DevMode
HGLOBAL hDevNames; // handle to DevNames HGLOBAL hDevNames; // handle to DevNames
HDC hDC; // printer DC/IC or NULL HDC hDC; // printer DC/IC or NULL
skipping to change at line 1066 skipping to change at line 1090
#endif /* WINVER >= 0x0500 */ #endif /* WINVER >= 0x0500 */
// //
// Device Names structure for PrintDlg and PrintDlgEx. // Device Names structure for PrintDlg and PrintDlgEx.
// //
typedef struct tagDEVNAMES { typedef struct tagDEVNAMES {
WORD wDriverOffset; WORD wDriverOffset;
WORD wDeviceOffset; WORD wDeviceOffset;
WORD wOutputOffset; WORD wOutputOffset;
WORD wDefault; WORD wDefault;
} DEVNAMES, *LPDEVNAMES; } DEVNAMES;
typedef DEVNAMES *LPDEVNAMES;
typedef const DEVNAMES *PCDEVNAMES;
#define DN_DEFAULTPRN 0x0001 #define DN_DEFAULTPRN 0x0001
WINCOMMDLGAPI DWORD APIENTRY CommDlgExtendedError(VOID); WINCOMMDLGAPI DWORD APIENTRY CommDlgExtendedError(VOID);
#if(WINVER >= 0x0400) #if(WINVER >= 0x0400)
#define WM_PSD_PAGESETUPDLG (WM_USER ) #define WM_PSD_PAGESETUPDLG (WM_USER )
#define WM_PSD_FULLPAGERECT (WM_USER+1) #define WM_PSD_FULLPAGERECT (WM_USER+1)
#define WM_PSD_MINMARGINRECT (WM_USER+2) #define WM_PSD_MINMARGINRECT (WM_USER+2)
#define WM_PSD_MARGINRECT (WM_USER+3) #define WM_PSD_MARGINRECT (WM_USER+3)
skipping to change at line 1158 skipping to change at line 1184
#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 */
#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"
#if !defined(ISOLATION_AWARE_USE_STATIC_LIBRARY)
#define ISOLATION_AWARE_USE_STATIC_LIBRARY 0
#endif
#if !defined(ISOLATION_AWARE_BUILD_STATIC_LIBRARY)
#define ISOLATION_AWARE_BUILD_STATIC_LIBRARY 0
#endif
#if !defined(ISOLATION_AWARE_INLINE)
#if ISOLATION_AWARE_BUILD_STATIC_LIBRARY
#define ISOLATION_AWARE_INLINE /* nothing */
#else
#if defined(__cplusplus)
#define ISOLATION_AWARE_INLINE inline
#else
#define ISOLATION_AWARE_INLINE __inline
#endif
#endif
#endif
#if !ISOLATION_AWARE_USE_STATIC_LIBRARY
FARPROC WINAPI CommdlgIsolationAwarePrivatetRgCebPnQQeRff_pbZQYTQP_QYY(LPCSTR ps
zProcName);
#endif /* ISOLATION_AWARE_USE_STATIC_LIBRARY */
BOOL WINAPI IsolationAwareGetOpenFileNameA(LPOPENFILENAMEA unnamed1);
BOOL WINAPI IsolationAwareGetOpenFileNameW(LPOPENFILENAMEW unnamed1);
BOOL WINAPI IsolationAwareGetSaveFileNameA(LPOPENFILENAMEA unnamed1);
BOOL WINAPI IsolationAwareGetSaveFileNameW(LPOPENFILENAMEW unnamed1);
short WINAPI IsolationAwareGetFileTitleA(LPCSTR unnamed1,LPSTR unnamed2,WORD unn
amed3);
short WINAPI IsolationAwareGetFileTitleW(LPCWSTR unnamed1,LPWSTR unnamed2,WORD u
nnamed3);
BOOL WINAPI IsolationAwareChooseColorA(LPCHOOSECOLORA unnamed1);
BOOL WINAPI IsolationAwareChooseColorW(LPCHOOSECOLORW unnamed1);
HWND WINAPI IsolationAwareFindTextA(LPFINDREPLACEA unnamed1);
HWND WINAPI IsolationAwareFindTextW(LPFINDREPLACEW unnamed1);
HWND WINAPI IsolationAwareReplaceTextA(LPFINDREPLACEA unnamed1);
HWND WINAPI IsolationAwareReplaceTextW(LPFINDREPLACEW unnamed1);
BOOL WINAPI IsolationAwareChooseFontA(LPCHOOSEFONTA unnamed1);
BOOL WINAPI IsolationAwareChooseFontW(LPCHOOSEFONTW unnamed1);
BOOL WINAPI IsolationAwarePrintDlgA(LPPRINTDLGA unnamed1);
BOOL WINAPI IsolationAwarePrintDlgW(LPPRINTDLGW unnamed1);
#if defined(STDMETHOD) && (WINVER >= 0x0500)
HRESULT WINAPI IsolationAwarePrintDlgExA(LPPRINTDLGEXA unnamed1);
HRESULT WINAPI IsolationAwarePrintDlgExW(LPPRINTDLGEXW unnamed1);
#endif /* defined(STDMETHOD) && (WINVER >= 0x0500) */
DWORD WINAPI IsolationAwareCommDlgExtendedError(void);
BOOL WINAPI IsolationAwarePageSetupDlgA(LPPAGESETUPDLGA unnamed1);
BOOL WINAPI IsolationAwarePageSetupDlgW(LPPAGESETUPDLGW unnamed1);
ISOLATION_AWARE_INLINE HRESULT CommdlgIsolationAwarePrivateJVaQPGbueRfhYg(void)
{
DWORD dwLastError = GetLastError();
if (dwLastError == NO_ERROR)
dwLastError = ERROR_INTERNAL_ERROR;
return HRESULT_FROM_WIN32(dwLastError);
}
#if defined(UNICODE)
#define IsolationAwareChooseColor IsolationAwareChooseColorW
#define IsolationAwareChooseFont IsolationAwareChooseFontW
#define IsolationAwareFindText IsolationAwareFindTextW
#define IsolationAwareGetFileTitle IsolationAwareGetFileTitleW
#define IsolationAwareGetOpenFileName IsolationAwareGetOpenFileNameW
#define IsolationAwareGetSaveFileName IsolationAwareGetSaveFileNameW
#define IsolationAwarePageSetupDlg IsolationAwarePageSetupDlgW
#define IsolationAwarePrintDlg IsolationAwarePrintDlgW
#define IsolationAwarePrintDlgEx IsolationAwarePrintDlgExW
#define IsolationAwareReplaceText IsolationAwareReplaceTextW
#else /* UNICODE */
#define IsolationAwareChooseColor IsolationAwareChooseColorA
#define IsolationAwareChooseFont IsolationAwareChooseFontA
#define IsolationAwareFindText IsolationAwareFindTextA
#define IsolationAwareGetFileTitle IsolationAwareGetFileTitleA
#define IsolationAwareGetOpenFileName IsolationAwareGetOpenFileNameA
#define IsolationAwareGetSaveFileName IsolationAwareGetSaveFileNameA
#define IsolationAwarePageSetupDlg IsolationAwarePageSetupDlgA
#define IsolationAwarePrintDlg IsolationAwarePrintDlgA
#define IsolationAwarePrintDlgEx IsolationAwarePrintDlgExA
#define IsolationAwareReplaceText IsolationAwareReplaceTextA
#endif /* UNICODE */
#if !ISOLATION_AWARE_USE_STATIC_LIBRARY
ISOLATION_AWARE_INLINE BOOL WINAPI IsolationAwareGetOpenFileNameA(LPOPENFILENAME
A unnamed1)
{
BOOL fResult = FALSE;
typedef BOOL (WINAPI* PFN)(LPOPENFILENAMEA unnamed1);
static PFN s_pfn;
ULONG_PTR ulpCookie = 0;
const BOOL fActivateActCtxSuccess = IsolationAwarePrivateT_SqbjaYRiRY || Iso
lationAwarePrivatenPgViNgRzlnPgpgk(&ulpCookie);
if (!fActivateActCtxSuccess)
return fResult;
__try
{
if (s_pfn == NULL)
{
s_pfn = (PFN)CommdlgIsolationAwarePrivatetRgCebPnQQeRff_pbZQYTQP_QYY
("GetOpenFileNameA");
if (s_pfn == NULL)
__leave;
}
fResult = s_pfn(unnamed1);
}
__finally
{
if (!IsolationAwarePrivateT_SqbjaYRiRY)
{
const BOOL fPreserveLastError = (fResult == FALSE);
const DWORD dwLastError = fPreserveLastError ? GetLastError() : NO_E
RROR;
(void)IsolationAwareDeactivateActCtx(0, ulpCookie);
if (fPreserveLastError)
SetLastError(dwLastError);
}
}
return fResult;
}
ISOLATION_AWARE_INLINE BOOL WINAPI IsolationAwareGetOpenFileNameW(LPOPENFILENAME
W unnamed1)
{
BOOL fResult = FALSE;
typedef BOOL (WINAPI* PFN)(LPOPENFILENAMEW unnamed1);
static PFN s_pfn;
ULONG_PTR ulpCookie = 0;
const BOOL fActivateActCtxSuccess = IsolationAwarePrivateT_SqbjaYRiRY || Iso
lationAwarePrivatenPgViNgRzlnPgpgk(&ulpCookie);
if (!fActivateActCtxSuccess)
return fResult;
__try
{
if (s_pfn == NULL)
{
s_pfn = (PFN)CommdlgIsolationAwarePrivatetRgCebPnQQeRff_pbZQYTQP_QYY
("GetOpenFileNameW");
if (s_pfn == NULL)
__leave;
}
fResult = s_pfn(unnamed1);
}
__finally
{
if (!IsolationAwarePrivateT_SqbjaYRiRY)
{
const BOOL fPreserveLastError = (fResult == FALSE);
const DWORD dwLastError = fPreserveLastError ? GetLastError() : NO_E
RROR;
(void)IsolationAwareDeactivateActCtx(0, ulpCookie);
if (fPreserveLastError)
SetLastError(dwLastError);
}
}
return fResult;
}
ISOLATION_AWARE_INLINE BOOL WINAPI IsolationAwareGetSaveFileNameA(LPOPENFILENAME
A unnamed1)
{
BOOL fResult = FALSE;
typedef BOOL (WINAPI* PFN)(LPOPENFILENAMEA unnamed1);
static PFN s_pfn;
ULONG_PTR ulpCookie = 0;
const BOOL fActivateActCtxSuccess = IsolationAwarePrivateT_SqbjaYRiRY || Iso
lationAwarePrivatenPgViNgRzlnPgpgk(&ulpCookie);
if (!fActivateActCtxSuccess)
return fResult;
__try
{
if (s_pfn == NULL)
{
s_pfn = (PFN)CommdlgIsolationAwarePrivatetRgCebPnQQeRff_pbZQYTQP_QYY
("GetSaveFileNameA");
if (s_pfn == NULL)
__leave;
}
fResult = s_pfn(unnamed1);
}
__finally
{
if (!IsolationAwarePrivateT_SqbjaYRiRY)
{
const BOOL fPreserveLastError = (fResult == FALSE);
const DWORD dwLastError = fPreserveLastError ? GetLastError() : NO_E
RROR;
(void)IsolationAwareDeactivateActCtx(0, ulpCookie);
if (fPreserveLastError)
SetLastError(dwLastError);
}
}
return fResult;
}
ISOLATION_AWARE_INLINE BOOL WINAPI IsolationAwareGetSaveFileNameW(LPOPENFILENAME
W unnamed1)
{
BOOL fResult = FALSE;
typedef BOOL (WINAPI* PFN)(LPOPENFILENAMEW unnamed1);
static PFN s_pfn;
ULONG_PTR ulpCookie = 0;
const BOOL fActivateActCtxSuccess = IsolationAwarePrivateT_SqbjaYRiRY || Iso
lationAwarePrivatenPgViNgRzlnPgpgk(&ulpCookie);
if (!fActivateActCtxSuccess)
return fResult;
__try
{
if (s_pfn == NULL)
{
s_pfn = (PFN)CommdlgIsolationAwarePrivatetRgCebPnQQeRff_pbZQYTQP_QYY
("GetSaveFileNameW");
if (s_pfn == NULL)
__leave;
}
fResult = s_pfn(unnamed1);
}
__finally
{
if (!IsolationAwarePrivateT_SqbjaYRiRY)
{
const BOOL fPreserveLastError = (fResult == FALSE);
const DWORD dwLastError = fPreserveLastError ? GetLastError() : NO_E
RROR;
(void)IsolationAwareDeactivateActCtx(0, ulpCookie);
if (fPreserveLastError)
SetLastError(dwLastError);
}
}
return fResult;
}
ISOLATION_AWARE_INLINE short WINAPI IsolationAwareGetFileTitleA(LPCSTR unnamed1,
LPSTR unnamed2,WORD unnamed3)
{
short nResult = -1;
typedef short (WINAPI* PFN)(LPCSTR unnamed1,LPSTR unnamed2,WORD unnamed3);
static PFN s_pfn;
ULONG_PTR ulpCookie = 0;
const BOOL fActivateActCtxSuccess = IsolationAwarePrivateT_SqbjaYRiRY || Iso
lationAwarePrivatenPgViNgRzlnPgpgk(&ulpCookie);
if (!fActivateActCtxSuccess)
return nResult;
__try
{
if (s_pfn == NULL)
{
s_pfn = (PFN)CommdlgIsolationAwarePrivatetRgCebPnQQeRff_pbZQYTQP_QYY
("GetFileTitleA");
if (s_pfn == NULL)
__leave;
}
nResult = s_pfn(unnamed1,unnamed2,unnamed3);
}
__finally
{
if (!IsolationAwarePrivateT_SqbjaYRiRY)
{
const BOOL fPreserveLastError = (nResult == -1);
const DWORD dwLastError = fPreserveLastError ? GetLastError() : NO_E
RROR;
(void)IsolationAwareDeactivateActCtx(0, ulpCookie);
if (fPreserveLastError)
SetLastError(dwLastError);
}
}
return nResult;
}
ISOLATION_AWARE_INLINE short WINAPI IsolationAwareGetFileTitleW(LPCWSTR unnamed1
,LPWSTR unnamed2,WORD unnamed3)
{
short nResult = -1;
typedef short (WINAPI* PFN)(LPCWSTR unnamed1,LPWSTR unnamed2,WORD unnamed3);
static PFN s_pfn;
ULONG_PTR ulpCookie = 0;
const BOOL fActivateActCtxSuccess = IsolationAwarePrivateT_SqbjaYRiRY || Iso
lationAwarePrivatenPgViNgRzlnPgpgk(&ulpCookie);
if (!fActivateActCtxSuccess)
return nResult;
__try
{
if (s_pfn == NULL)
{
s_pfn = (PFN)CommdlgIsolationAwarePrivatetRgCebPnQQeRff_pbZQYTQP_QYY
("GetFileTitleW");
if (s_pfn == NULL)
__leave;
}
nResult = s_pfn(unnamed1,unnamed2,unnamed3);
}
__finally
{
if (!IsolationAwarePrivateT_SqbjaYRiRY)
{
const BOOL fPreserveLastError = (nResult == -1);
const DWORD dwLastError = fPreserveLastError ? GetLastError() : NO_E
RROR;
(void)IsolationAwareDeactivateActCtx(0, ulpCookie);
if (fPreserveLastError)
SetLastError(dwLastError);
}
}
return nResult;
}
ISOLATION_AWARE_INLINE BOOL WINAPI IsolationAwareChooseColorA(LPCHOOSECOLORA unn
amed1)
{
BOOL fResult = FALSE;
typedef BOOL (WINAPI* PFN)(LPCHOOSECOLORA unnamed1);
static PFN s_pfn;
ULONG_PTR ulpCookie = 0;
const BOOL fActivateActCtxSuccess = IsolationAwarePrivateT_SqbjaYRiRY || Iso
lationAwarePrivatenPgViNgRzlnPgpgk(&ulpCookie);
if (!fActivateActCtxSuccess)
return fResult;
__try
{
if (s_pfn == NULL)
{
s_pfn = (PFN)CommdlgIsolationAwarePrivatetRgCebPnQQeRff_pbZQYTQP_QYY
("ChooseColorA");
if (s_pfn == NULL)
__leave;
}
fResult = s_pfn(unnamed1);
}
__finally
{
if (!IsolationAwarePrivateT_SqbjaYRiRY)
{
const BOOL fPreserveLastError = (fResult == FALSE);
const DWORD dwLastError = fPreserveLastError ? GetLastError() : NO_E
RROR;
(void)IsolationAwareDeactivateActCtx(0, ulpCookie);
if (fPreserveLastError)
SetLastError(dwLastError);
}
}
return fResult;
}
ISOLATION_AWARE_INLINE BOOL WINAPI IsolationAwareChooseColorW(LPCHOOSECOLORW unn
amed1)
{
BOOL fResult = FALSE;
typedef BOOL (WINAPI* PFN)(LPCHOOSECOLORW unnamed1);
static PFN s_pfn;
ULONG_PTR ulpCookie = 0;
const BOOL fActivateActCtxSuccess = IsolationAwarePrivateT_SqbjaYRiRY || Iso
lationAwarePrivatenPgViNgRzlnPgpgk(&ulpCookie);
if (!fActivateActCtxSuccess)
return fResult;
__try
{
if (s_pfn == NULL)
{
s_pfn = (PFN)CommdlgIsolationAwarePrivatetRgCebPnQQeRff_pbZQYTQP_QYY
("ChooseColorW");
if (s_pfn == NULL)
__leave;
}
fResult = s_pfn(unnamed1);
}
__finally
{
if (!IsolationAwarePrivateT_SqbjaYRiRY)
{
const BOOL fPreserveLastError = (fResult == FALSE);
const DWORD dwLastError = fPreserveLastError ? GetLastError() : NO_E
RROR;
(void)IsolationAwareDeactivateActCtx(0, ulpCookie);
if (fPreserveLastError)
SetLastError(dwLastError);
}
}
return fResult;
}
ISOLATION_AWARE_INLINE HWND WINAPI IsolationAwareFindTextA(LPFINDREPLACEA unname
d1)
{
HWND windowResult = NULL;
typedef HWND (WINAPI* PFN)(LPFINDREPLACEA unnamed1);
static PFN s_pfn;
ULONG_PTR ulpCookie = 0;
const BOOL fActivateActCtxSuccess = IsolationAwarePrivateT_SqbjaYRiRY || Iso
lationAwarePrivatenPgViNgRzlnPgpgk(&ulpCookie);
if (!fActivateActCtxSuccess)
return windowResult;
__try
{
if (s_pfn == NULL)
{
s_pfn = (PFN)CommdlgIsolationAwarePrivatetRgCebPnQQeRff_pbZQYTQP_QYY
("FindTextA");
if (s_pfn == NULL)
__leave;
}
windowResult = s_pfn(unnamed1);
}
__finally
{
if (!IsolationAwarePrivateT_SqbjaYRiRY)
{
const BOOL fPreserveLastError = (windowResult == NULL);
const DWORD dwLastError = fPreserveLastError ? GetLastError() : NO_E
RROR;
(void)IsolationAwareDeactivateActCtx(0, ulpCookie);
if (fPreserveLastError)
SetLastError(dwLastError);
}
}
return windowResult;
}
ISOLATION_AWARE_INLINE HWND WINAPI IsolationAwareFindTextW(LPFINDREPLACEW unname
d1)
{
HWND windowResult = NULL;
typedef HWND (WINAPI* PFN)(LPFINDREPLACEW unnamed1);
static PFN s_pfn;
ULONG_PTR ulpCookie = 0;
const BOOL fActivateActCtxSuccess = IsolationAwarePrivateT_SqbjaYRiRY || Iso
lationAwarePrivatenPgViNgRzlnPgpgk(&ulpCookie);
if (!fActivateActCtxSuccess)
return windowResult;
__try
{
if (s_pfn == NULL)
{
s_pfn = (PFN)CommdlgIsolationAwarePrivatetRgCebPnQQeRff_pbZQYTQP_QYY
("FindTextW");
if (s_pfn == NULL)
__leave;
}
windowResult = s_pfn(unnamed1);
}
__finally
{
if (!IsolationAwarePrivateT_SqbjaYRiRY)
{
const BOOL fPreserveLastError = (windowResult == NULL);
const DWORD dwLastError = fPreserveLastError ? GetLastError() : NO_E
RROR;
(void)IsolationAwareDeactivateActCtx(0, ulpCookie);
if (fPreserveLastError)
SetLastError(dwLastError);
}
}
return windowResult;
}
ISOLATION_AWARE_INLINE HWND WINAPI IsolationAwareReplaceTextA(LPFINDREPLACEA unn
amed1)
{
HWND windowResult = NULL;
typedef HWND (WINAPI* PFN)(LPFINDREPLACEA unnamed1);
static PFN s_pfn;
ULONG_PTR ulpCookie = 0;
const BOOL fActivateActCtxSuccess = IsolationAwarePrivateT_SqbjaYRiRY || Iso
lationAwarePrivatenPgViNgRzlnPgpgk(&ulpCookie);
if (!fActivateActCtxSuccess)
return windowResult;
__try
{
if (s_pfn == NULL)
{
s_pfn = (PFN)CommdlgIsolationAwarePrivatetRgCebPnQQeRff_pbZQYTQP_QYY
("ReplaceTextA");
if (s_pfn == NULL)
__leave;
}
windowResult = s_pfn(unnamed1);
}
__finally
{
if (!IsolationAwarePrivateT_SqbjaYRiRY)
{
const BOOL fPreserveLastError = (windowResult == NULL);
const DWORD dwLastError = fPreserveLastError ? GetLastError() : NO_E
RROR;
(void)IsolationAwareDeactivateActCtx(0, ulpCookie);
if (fPreserveLastError)
SetLastError(dwLastError);
}
}
return windowResult;
}
ISOLATION_AWARE_INLINE HWND WINAPI IsolationAwareReplaceTextW(LPFINDREPLACEW unn
amed1)
{
HWND windowResult = NULL;
typedef HWND (WINAPI* PFN)(LPFINDREPLACEW unnamed1);
static PFN s_pfn;
ULONG_PTR ulpCookie = 0;
const BOOL fActivateActCtxSuccess = IsolationAwarePrivateT_SqbjaYRiRY || Iso
lationAwarePrivatenPgViNgRzlnPgpgk(&ulpCookie);
if (!fActivateActCtxSuccess)
return windowResult;
__try
{
if (s_pfn == NULL)
{
s_pfn = (PFN)CommdlgIsolationAwarePrivatetRgCebPnQQeRff_pbZQYTQP_QYY
("ReplaceTextW");
if (s_pfn == NULL)
__leave;
}
windowResult = s_pfn(unnamed1);
}
__finally
{
if (!IsolationAwarePrivateT_SqbjaYRiRY)
{
const BOOL fPreserveLastError = (windowResult == NULL);
const DWORD dwLastError = fPreserveLastError ? GetLastError() : NO_E
RROR;
(void)IsolationAwareDeactivateActCtx(0, ulpCookie);
if (fPreserveLastError)
SetLastError(dwLastError);
}
}
return windowResult;
}
ISOLATION_AWARE_INLINE BOOL WINAPI IsolationAwareChooseFontA(LPCHOOSEFONTA unnam
ed1)
{
BOOL fResult = FALSE;
typedef BOOL (WINAPI* PFN)(LPCHOOSEFONTA unnamed1);
static PFN s_pfn;
ULONG_PTR ulpCookie = 0;
const BOOL fActivateActCtxSuccess = IsolationAwarePrivateT_SqbjaYRiRY || Iso
lationAwarePrivatenPgViNgRzlnPgpgk(&ulpCookie);
if (!fActivateActCtxSuccess)
return fResult;
__try
{
if (s_pfn == NULL)
{
s_pfn = (PFN)CommdlgIsolationAwarePrivatetRgCebPnQQeRff_pbZQYTQP_QYY
("ChooseFontA");
if (s_pfn == NULL)
__leave;
}
fResult = s_pfn(unnamed1);
}
__finally
{
if (!IsolationAwarePrivateT_SqbjaYRiRY)
{
const BOOL fPreserveLastError = (fResult == FALSE);
const DWORD dwLastError = fPreserveLastError ? GetLastError() : NO_E
RROR;
(void)IsolationAwareDeactivateActCtx(0, ulpCookie);
if (fPreserveLastError)
SetLastError(dwLastError);
}
}
return fResult;
}
ISOLATION_AWARE_INLINE BOOL WINAPI IsolationAwareChooseFontW(LPCHOOSEFONTW unnam
ed1)
{
BOOL fResult = FALSE;
typedef BOOL (WINAPI* PFN)(LPCHOOSEFONTW unnamed1);
static PFN s_pfn;
ULONG_PTR ulpCookie = 0;
const BOOL fActivateActCtxSuccess = IsolationAwarePrivateT_SqbjaYRiRY || Iso
lationAwarePrivatenPgViNgRzlnPgpgk(&ulpCookie);
if (!fActivateActCtxSuccess)
return fResult;
__try
{
if (s_pfn == NULL)
{
s_pfn = (PFN)CommdlgIsolationAwarePrivatetRgCebPnQQeRff_pbZQYTQP_QYY
("ChooseFontW");
if (s_pfn == NULL)
__leave;
}
fResult = s_pfn(unnamed1);
}
__finally
{
if (!IsolationAwarePrivateT_SqbjaYRiRY)
{
const BOOL fPreserveLastError = (fResult == FALSE);
const DWORD dwLastError = fPreserveLastError ? GetLastError() : NO_E
RROR;
(void)IsolationAwareDeactivateActCtx(0, ulpCookie);
if (fPreserveLastError)
SetLastError(dwLastError);
}
}
return fResult;
}
ISOLATION_AWARE_INLINE BOOL WINAPI IsolationAwarePrintDlgA(LPPRINTDLGA unnamed1)
{
BOOL fResult = FALSE;
typedef BOOL (WINAPI* PFN)(LPPRINTDLGA unnamed1);
static PFN s_pfn;
ULONG_PTR ulpCookie = 0;
const BOOL fActivateActCtxSuccess = IsolationAwarePrivateT_SqbjaYRiRY || Iso
lationAwarePrivatenPgViNgRzlnPgpgk(&ulpCookie);
if (!fActivateActCtxSuccess)
return fResult;
__try
{
if (s_pfn == NULL)
{
s_pfn = (PFN)CommdlgIsolationAwarePrivatetRgCebPnQQeRff_pbZQYTQP_QYY
("PrintDlgA");
if (s_pfn == NULL)
__leave;
}
fResult = s_pfn(unnamed1);
}
__finally
{
if (!IsolationAwarePrivateT_SqbjaYRiRY)
{
const BOOL fPreserveLastError = (fResult == FALSE);
const DWORD dwLastError = fPreserveLastError ? GetLastError() : NO_E
RROR;
(void)IsolationAwareDeactivateActCtx(0, ulpCookie);
if (fPreserveLastError)
SetLastError(dwLastError);
}
}
return fResult;
}
ISOLATION_AWARE_INLINE BOOL WINAPI IsolationAwarePrintDlgW(LPPRINTDLGW unnamed1)
{
BOOL fResult = FALSE;
typedef BOOL (WINAPI* PFN)(LPPRINTDLGW unnamed1);
static PFN s_pfn;
ULONG_PTR ulpCookie = 0;
const BOOL fActivateActCtxSuccess = IsolationAwarePrivateT_SqbjaYRiRY || Iso
lationAwarePrivatenPgViNgRzlnPgpgk(&ulpCookie);
if (!fActivateActCtxSuccess)
return fResult;
__try
{
if (s_pfn == NULL)
{
s_pfn = (PFN)CommdlgIsolationAwarePrivatetRgCebPnQQeRff_pbZQYTQP_QYY
("PrintDlgW");
if (s_pfn == NULL)
__leave;
}
fResult = s_pfn(unnamed1);
}
__finally
{
if (!IsolationAwarePrivateT_SqbjaYRiRY)
{
const BOOL fPreserveLastError = (fResult == FALSE);
const DWORD dwLastError = fPreserveLastError ? GetLastError() : NO_E
RROR;
(void)IsolationAwareDeactivateActCtx(0, ulpCookie);
if (fPreserveLastError)
SetLastError(dwLastError);
}
}
return fResult;
}
#if defined(STDMETHOD) && (WINVER >= 0x0500)
ISOLATION_AWARE_INLINE HRESULT WINAPI IsolationAwarePrintDlgExA(LPPRINTDLGEXA un
named1)
{
HRESULT result = S_OK;
typedef HRESULT (WINAPI* PFN)(LPPRINTDLGEXA unnamed1);
static PFN s_pfn;
ULONG_PTR ulpCookie = 0;
const BOOL fActivateActCtxSuccess = IsolationAwarePrivateT_SqbjaYRiRY || Iso
lationAwarePrivatenPgViNgRzlnPgpgk(&ulpCookie);
if (!fActivateActCtxSuccess)
return CommdlgIsolationAwarePrivateJVaQPGbueRfhYg();
__try
{
if (s_pfn == NULL)
{
s_pfn = (PFN)CommdlgIsolationAwarePrivatetRgCebPnQQeRff_pbZQYTQP_QYY
("PrintDlgExA");
if (s_pfn == NULL)
{
result = CommdlgIsolationAwarePrivateJVaQPGbueRfhYg();
__leave;
}
}
result = s_pfn(unnamed1);
}
__finally
{
if (!IsolationAwarePrivateT_SqbjaYRiRY)
{
(void)IsolationAwareDeactivateActCtx(0, ulpCookie);
}
}
return result;
}
ISOLATION_AWARE_INLINE HRESULT WINAPI IsolationAwarePrintDlgExW(LPPRINTDLGEXW un
named1)
{
HRESULT result = S_OK;
typedef HRESULT (WINAPI* PFN)(LPPRINTDLGEXW unnamed1);
static PFN s_pfn;
ULONG_PTR ulpCookie = 0;
const BOOL fActivateActCtxSuccess = IsolationAwarePrivateT_SqbjaYRiRY || Iso
lationAwarePrivatenPgViNgRzlnPgpgk(&ulpCookie);
if (!fActivateActCtxSuccess)
return CommdlgIsolationAwarePrivateJVaQPGbueRfhYg();
__try
{
if (s_pfn == NULL)
{
s_pfn = (PFN)CommdlgIsolationAwarePrivatetRgCebPnQQeRff_pbZQYTQP_QYY
("PrintDlgExW");
if (s_pfn == NULL)
{
result = CommdlgIsolationAwarePrivateJVaQPGbueRfhYg();
__leave;
}
}
result = s_pfn(unnamed1);
}
__finally
{
if (!IsolationAwarePrivateT_SqbjaYRiRY)
{
(void)IsolationAwareDeactivateActCtx(0, ulpCookie);
}
}
return result;
}
#endif /* defined(STDMETHOD) && (WINVER >= 0x0500) */
ISOLATION_AWARE_INLINE DWORD WINAPI IsolationAwareCommDlgExtendedError(void)
{
DWORD nResult = 0 ;
typedef DWORD (WINAPI* PFN)(void);
static PFN s_pfn;
ULONG_PTR ulpCookie = 0;
const BOOL fActivateActCtxSuccess = IsolationAwarePrivateT_SqbjaYRiRY || Iso
lationAwarePrivatenPgViNgRzlnPgpgk(&ulpCookie);
if (!fActivateActCtxSuccess)
return nResult;
__try
{
if (s_pfn == NULL)
{
s_pfn = (PFN)CommdlgIsolationAwarePrivatetRgCebPnQQeRff_pbZQYTQP_QYY
("CommDlgExtendedError");
if (s_pfn == NULL)
__leave;
}
nResult = s_pfn();
}
__finally
{
if (!IsolationAwarePrivateT_SqbjaYRiRY)
{
const BOOL fPreserveLastError = (nResult == 0 );
const DWORD dwLastError = fPreserveLastError ? GetLastError() : NO_E
RROR;
(void)IsolationAwareDeactivateActCtx(0, ulpCookie);
if (fPreserveLastError)
SetLastError(dwLastError);
}
}
return nResult;
}
ISOLATION_AWARE_INLINE BOOL WINAPI IsolationAwarePageSetupDlgA(LPPAGESETUPDLGA u
nnamed1)
{
BOOL fResult = FALSE;
typedef BOOL (WINAPI* PFN)(LPPAGESETUPDLGA unnamed1);
static PFN s_pfn;
ULONG_PTR ulpCookie = 0;
const BOOL fActivateActCtxSuccess = IsolationAwarePrivateT_SqbjaYRiRY || Iso
lationAwarePrivatenPgViNgRzlnPgpgk(&ulpCookie);
if (!fActivateActCtxSuccess)
return fResult;
__try
{
if (s_pfn == NULL)
{
s_pfn = (PFN)CommdlgIsolationAwarePrivatetRgCebPnQQeRff_pbZQYTQP_QYY
("PageSetupDlgA");
if (s_pfn == NULL)
__leave;
}
fResult = s_pfn(unnamed1);
}
__finally
{
if (!IsolationAwarePrivateT_SqbjaYRiRY)
{
const BOOL fPreserveLastError = (fResult == FALSE);
const DWORD dwLastError = fPreserveLastError ? GetLastError() : NO_E
RROR;
(void)IsolationAwareDeactivateActCtx(0, ulpCookie);
if (fPreserveLastError)
SetLastError(dwLastError);
}
}
return fResult;
}
ISOLATION_AWARE_INLINE BOOL WINAPI IsolationAwarePageSetupDlgW(LPPAGESETUPDLGW u
nnamed1)
{
BOOL fResult = FALSE;
typedef BOOL (WINAPI* PFN)(LPPAGESETUPDLGW unnamed1);
static PFN s_pfn;
ULONG_PTR ulpCookie = 0;
const BOOL fActivateActCtxSuccess = IsolationAwarePrivateT_SqbjaYRiRY || Iso
lationAwarePrivatenPgViNgRzlnPgpgk(&ulpCookie);
if (!fActivateActCtxSuccess)
return fResult;
__try
{
if (s_pfn == NULL)
{
s_pfn = (PFN)CommdlgIsolationAwarePrivatetRgCebPnQQeRff_pbZQYTQP_QYY
("PageSetupDlgW");
if (s_pfn == NULL)
__leave;
}
fResult = s_pfn(unnamed1);
}
__finally
{
if (!IsolationAwarePrivateT_SqbjaYRiRY)
{
const BOOL fPreserveLastError = (fResult == FALSE);
const DWORD dwLastError = fPreserveLastError ? GetLastError() : NO_E
RROR;
(void)IsolationAwareDeactivateActCtx(0, ulpCookie);
if (fPreserveLastError)
SetLastError(dwLastError);
}
}
return fResult;
}
ISOLATION_AWARE_INLINE FARPROC WINAPI CommdlgIsolationAwarePrivatetRgCebPnQQeRff
_pbZQYTQP_QYY(LPCSTR pszProcName)
/* This function is shared by the other stubs in this header. */
{
FARPROC proc = NULL;
static HMODULE s_module;
BOOL fActivateActCtxSuccess = FALSE;
ULONG_PTR ulpCookie = 0;
const static IsolationAwarePrivatepBAFGnAG_zBqHyr_vAsB
c = { IsolationAwarePrivatezlybNQyVOeNeln, IsolationAwarePrivatezlybNQyV
OeNelJ, "Comdlg32.dll", L"Comdlg32.dll" };
static IsolationAwarePrivatezHGnoyr_zBqHyr_vAsB m;
__try
{
if (!IsolationAwarePrivateT_SqbjaYRiRY)
{
fActivateActCtxSuccess = IsolationAwarePrivatenPgViNgRzlnPgpgk(&ulpC
ookie);
if (!fActivateActCtxSuccess)
__leave;
}
proc = IsolationAwarePrivatezltRgCebPnQQeRff(&c, &m, pszProcName);
}
__finally
{
if (!IsolationAwarePrivateT_SqbjaYRiRY && fActivateActCtxSuccess)
{
const DWORD dwLastError = (proc == NULL) ? GetLastError() : NO_ERROR
;
(void)IsolationAwareDeactivateActCtx(0, ulpCookie);
if (proc == NULL)
SetLastError(dwLastError);
}
}
return proc;
}
#endif /* ISOLATION_AWARE_USE_STATIC_LIBRARY */
#define ChooseColorA IsolationAwareChooseColorA
#define ChooseColorW IsolationAwareChooseColorW
#define ChooseFontA IsolationAwareChooseFontA
#define ChooseFontW IsolationAwareChooseFontW
#define CommDlgExtendedError IsolationAwareCommDlgExtendedError
#define FindTextA IsolationAwareFindTextA
#define FindTextW IsolationAwareFindTextW
#define GetFileTitleA IsolationAwareGetFileTitleA
#define GetFileTitleW IsolationAwareGetFileTitleW
#define GetOpenFileNameA IsolationAwareGetOpenFileNameA
#define GetOpenFileNameW IsolationAwareGetOpenFileNameW
#define GetSaveFileNameA IsolationAwareGetSaveFileNameA
#define GetSaveFileNameW IsolationAwareGetSaveFileNameW
#define PageSetupDlgA IsolationAwarePageSetupDlgA
#define PageSetupDlgW IsolationAwarePageSetupDlgW
#define PrintDlgA IsolationAwarePrintDlgA
#define PrintDlgExA IsolationAwarePrintDlgExA
#define PrintDlgExW IsolationAwarePrintDlgExW
#define PrintDlgW IsolationAwarePrintDlgW
#define ReplaceTextA IsolationAwareReplaceTextA
#define ReplaceTextW IsolationAwareReplaceTextW
#endif /* ISOLATION_AWARE_ENABLED */ #endif /* ISOLATION_AWARE_ENABLED */
#endif /* RC */ #endif /* RC */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#if !defined(_WIN64) #if !defined(_WIN64)
#include <poppack.h> #include <poppack.h>
#endif #endif
 End of changes. 33 change blocks. 
952 lines changed or deleted 58 lines changed or added

This html diff was produced by rfcdiff 1.41.