--- mstools/h/commdlg.h 2018/08/09 18:21:03 1.1.1.3 +++ mstools/h/commdlg.h 2018/08/09 18:22:56 1.1.1.4 @@ -1,6 +1,6 @@ /*++ -Copyright (c) 1992 Microsoft Corporation +Copyright (c) 1992-1993 Microsoft Corporation Module Name: @@ -23,7 +23,7 @@ Revision History: #ifdef __cplusplus extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ +#endif /* __cplusplus */ typedef UINT (APIENTRY *LPOFNHOOKPROC) (HWND, UINT, WPARAM, LPARAM); @@ -45,7 +45,7 @@ typedef struct tagOFNA { WORD nFileOffset; WORD nFileExtension; LPCSTR lpstrDefExt; - DWORD lCustData; + LPARAM lCustData; LPOFNHOOKPROC lpfnHook; LPCSTR lpTemplateName; } OPENFILENAMEA; @@ -68,7 +68,7 @@ typedef struct tagOFNW { WORD nFileOffset; WORD nFileExtension; LPCWSTR lpstrDefExt; - DWORD lCustData; + LPARAM lCustData; LPOFNHOOKPROC lpfnHook; LPCWSTR lpTemplateName; } OPENFILENAMEW; @@ -127,6 +127,7 @@ short APIENTRY GetFileTitleW(LPCWSTR #define OFN_NOREADONLYRETURN 0x00008000 #define OFN_NOTESTFILECREATE 0x00010000 #define OFN_NONETWORKBUTTON 0x00020000 +#define OFN_NOLONGNAMES 0x00040000 // Return values for the registered message sent to the hook function // when a sharing violation occurs. OFN_SHAREFALLTHROUGH allows the @@ -144,26 +145,26 @@ short APIENTRY GetFileTitleW(LPCWSTR typedef UINT (APIENTRY *LPCCHOOKPROC) (HWND, UINT, WPARAM, LPARAM); -typedef struct { +typedef struct tagCHOOSECOLORA { DWORD lStructSize; HWND hwndOwner; HWND hInstance; - DWORD rgbResult; - LPDWORD lpCustColors; + COLORREF rgbResult; + COLORREF* lpCustColors; DWORD Flags; - DWORD lCustData; + LPARAM lCustData; LPCCHOOKPROC lpfnHook; LPCSTR lpTemplateName; } CHOOSECOLORA; -typedef struct { +typedef struct tagCHOOSECOLORW { DWORD lStructSize; HWND hwndOwner; HWND hInstance; - DWORD rgbResult; - LPDWORD lpCustColors; + COLORREF rgbResult; + COLORREF* lpCustColors; DWORD Flags; - DWORD lCustData; + LPARAM lCustData; LPCCHOOKPROC lpfnHook; LPCWSTR lpTemplateName; } CHOOSECOLORW; @@ -197,7 +198,7 @@ BOOL APIENTRY ChooseColorW(LPCHOOSECOLO typedef UINT (APIENTRY *LPFRHOOKPROC) (HWND, UINT, WPARAM, LPARAM); -typedef struct { +typedef struct tagFINDREPLACEA { DWORD lStructSize; // size of this struct 0x20 HWND hwndOwner; // handle to owner's window HINSTANCE hInstance; // instance handle of.EXE that @@ -207,12 +208,12 @@ typedef struct { LPSTR lpstrReplaceWith; // ptr. to replace string WORD wFindWhatLen; // size of find buffer WORD wReplaceWithLen; // size of replace buffer - DWORD lCustData; // data passed to hook fn. + LPARAM lCustData; // data passed to hook fn. LPFRHOOKPROC lpfnHook; // ptr. to hook fn. or NULL LPCSTR lpTemplateName; // custom template name } FINDREPLACEA; -typedef struct { +typedef struct tagFINDREPLACEW { DWORD lStructSize; // size of this struct 0x20 HWND hwndOwner; // handle to owner's window HINSTANCE hInstance; // instance handle of.EXE that @@ -222,7 +223,7 @@ typedef struct { LPWSTR lpstrReplaceWith; // ptr. to replace string WORD wFindWhatLen; // size of find buffer WORD wReplaceWithLen; // size of replace buffer - DWORD lCustData; // data passed to hook fn. + LPARAM lCustData; // data passed to hook fn. LPFRHOOKPROC lpfnHook; // ptr. to hook fn. or NULL LPCWSTR lpTemplateName; // custom template name } FINDREPLACEW; @@ -275,15 +276,15 @@ HWND APIENTRY ReplaceTextW(LPFINDREP typedef UINT (APIENTRY *LPCFHOOKPROC) (HWND, UINT, WPARAM, LPARAM); -typedef struct { +typedef struct tagCHOOSEFONTA { DWORD lStructSize; HWND hwndOwner; // caller's window handle HDC hDC; // printer DC/IC or NULL LPLOGFONTA lpLogFont; // ptr. to a LOGFONT struct INT iPointSize; // 10 * size in points of selected font DWORD Flags; // enum. type flags - DWORD rgbColors; // returned text color - DWORD lCustData; // data passed to hook fn. + COLORREF rgbColors; // returned text color + LPARAM lCustData; // data passed to hook fn. LPCFHOOKPROC lpfnHook; // ptr. to hook function LPCSTR lpTemplateName; // custom template name HINSTANCE hInstance; // instance handle of.EXE that @@ -293,21 +294,21 @@ typedef struct { WORD nFontType; // same value reported to the EnumFonts // call back with the extra FONTTYPE_ // bits added - WORD ___MISSING_ALIGNMENT__; + WORD ___MISSING_ALIGNMENT__; INT nSizeMin; // minimum pt size allowed & INT nSizeMax; // max pt size allowed if // CF_LIMITSIZE is used } CHOOSEFONTA; -typedef struct { +typedef struct tagCHOOSEFONTW { DWORD lStructSize; HWND hwndOwner; // caller's window handle HDC hDC; // printer DC/IC or NULL LPLOGFONTW lpLogFont; // ptr. to a LOGFONT struct INT iPointSize; // 10 * size in points of selected font DWORD Flags; // enum. type flags - DWORD rgbColors; // returned text color - DWORD lCustData; // data passed to hook fn. + COLORREF rgbColors; // returned text color + LPARAM lCustData; // data passed to hook fn. LPCFHOOKPROC lpfnHook; // ptr. to hook function LPCWSTR lpTemplateName; // custom template name HINSTANCE hInstance; // instance handle of.EXE that @@ -317,7 +318,7 @@ typedef struct { WORD nFontType; // same value reported to the EnumFonts // call back with the extra FONTTYPE_ // bits added - WORD ___MISSING_ALIGNMENT__; + WORD ___MISSING_ALIGNMENT__; INT nSizeMin; // minimum pt size allowed & INT nSizeMax; // max pt size allowed if // CF_LIMITSIZE is used @@ -355,7 +356,7 @@ BOOL APIENTRY ChooseFontW(LPCHOOSEFONTW) #define CF_APPLY 0x00000200L #define CF_ANSIONLY 0x00000400L #define CF_NOVECTORFONTS 0x00000800L -#define CF_NOOEMFONTS CF_NOVECTORFONTS +#define CF_NOOEMFONTS CF_NOVECTORFONTS #define CF_NOSIMULATIONS 0x00001000L #define CF_LIMITSIZE 0x00002000L #define CF_FIXEDPITCHONLY 0x00004000L @@ -428,8 +429,8 @@ typedef UINT (APIENTRY *LPSETUPHOOKPROC) typedef struct tagPDA { DWORD lStructSize; HWND hwndOwner; - HANDLE hDevMode; - HANDLE hDevNames; + HGLOBAL hDevMode; + HGLOBAL hDevNames; HDC hDC; DWORD Flags; WORD nFromPage; @@ -438,20 +439,20 @@ typedef struct tagPDA { WORD nMaxPage; WORD nCopies; HINSTANCE hInstance; - DWORD lCustData; + LPARAM lCustData; LPPRINTHOOKPROC lpfnPrintHook; LPSETUPHOOKPROC lpfnSetupHook; LPCSTR lpPrintTemplateName; LPCSTR lpSetupTemplateName; - HANDLE hPrintTemplate; - HANDLE hSetupTemplate; + HGLOBAL hPrintTemplate; + HGLOBAL hSetupTemplate; } PRINTDLGA; typedef struct tagPDW { DWORD lStructSize; HWND hwndOwner; - HANDLE hDevMode; - HANDLE hDevNames; + HGLOBAL hDevMode; + HGLOBAL hDevNames; HDC hDC; DWORD Flags; WORD nFromPage; @@ -460,13 +461,13 @@ typedef struct tagPDW { WORD nMaxPage; WORD nCopies; HINSTANCE hInstance; - DWORD lCustData; + LPARAM lCustData; LPPRINTHOOKPROC lpfnPrintHook; LPSETUPHOOKPROC lpfnSetupHook; LPCWSTR lpPrintTemplateName; LPCWSTR lpSetupTemplateName; - HANDLE hPrintTemplate; - HANDLE hSetupTemplate; + HGLOBAL hPrintTemplate; + HGLOBAL hSetupTemplate; } PRINTDLGW; #ifdef UNICODE @@ -510,13 +511,14 @@ BOOL APIENTRY PrintDlgW(LPPRINTDLGW #define PD_USEDEVMODECOPIES 0x00040000 #define PD_DISABLEPRINTTOFILE 0x00080000 #define PD_HIDEPRINTTOFILE 0x00100000 +#define PD_NONETWORKBUTTON 0x00200000 typedef struct tagDEVNAMES { WORD wDriverOffset; WORD wDeviceOffset; WORD wOutputOffset; WORD wDefault; -} DEVNAMES; +} DEVNAMES; typedef DEVNAMES * LPDEVNAMES; @@ -526,7 +528,7 @@ DWORD APIENTRY CommDlgExtendedError( #ifdef __cplusplus } -#endif /* __cplusplus */ +#endif /* __cplusplus */ #ifndef RC_INVOKED #pragma pack()