OSDN Git Service

(root) / mingw / mingw-org-wsl.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Redo the filters based on assumptions discussed in mingw-dvlpr list.
[mingw/mingw-org-wsl.git] / include / commdlg.h
diff --git a/include/commdlg.h b/include/commdlg.h
index 41ed7f6..71ceec7 100644 (file)
--- a/include/commdlg.h
+++ b/include/commdlg.h
@@ -24,6 +24,7 @@
 #ifndef _COMMDLG_H
 #define _COMMDLG_H
 #pragma GCC system_header
+#include <_mingw.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -137,9 +138,6 @@ extern "C" {
 #define OFN_SHARENOWARN 1
 #define OFN_SHAREWARN 0
 #define OFN_NODEREFERENCELINKS 0x100000
-#if (_WIN32_WINNT >= 0x0500)
-#define OFN_DONTADDTORECENT 0x02000000
-#endif
 #define FR_DIALOGTERM 64
 #define FR_DOWN 1
 #define FR_ENABLEHOOK 256
@@ -184,16 +182,6 @@ extern "C" {
 #define PD_DISABLEPRINTTOFILE  0x00080000
 #define PD_HIDEPRINTTOFILE     0x00100000
 #define PD_NONETWORKBUTTON     0x00200000
-#if (_WIN32_WINNT >= 0x0500)
-#define PD_CURRENTPAGE 0x00400000
-#define PD_NOCURRENTPAGE       0x00800000
-#define PD_EXCLUSIONFLAGS      0x01000000 
-#define PD_USELARGETEMPLATE    0x10000000
-#define PD_RESULT_CANCEL       0
-#define PD_RESULT_PRINT        1
-#define PD_RESULT_APPLY        2
-#define START_PAGE_GENERAL     0XFFFFFFFF
-#endif
 #define PSD_DEFAULTMINMARGINS  0
 #define PSD_INWININIINTLMEASURE        0
 #define PSD_MINMARGINS 1
@@ -224,9 +212,6 @@ extern "C" {
 #define CD_LBSELSUB      1
 #define CD_LBSELADD      2
 #define DN_DEFAULTPRN  1
-#if (_WIN32_WINNT >= 0x0500)
-#define OPENFILENAME_SIZE_VERSION_400  76
-#endif
 
 #ifndef SNDMSG
 #ifdef __cplusplus
@@ -487,7 +472,65 @@ typedef struct tagPDW {
        HANDLE hPrintTemplate;
        HANDLE hSetupTemplate;
 } PRINTDLGW,*LPPRINTDLGW;
-#if (WINVER >= 0x0500) && !defined (_OBJC_NO_COM)
+
+BOOL WINAPI ChooseColorA(LPCHOOSECOLORA);
+BOOL WINAPI ChooseColorW(LPCHOOSECOLORW);
+BOOL WINAPI ChooseFontA(LPCHOOSEFONTA);
+BOOL WINAPI ChooseFontW(LPCHOOSEFONTW);
+DWORD WINAPI CommDlgExtendedError(void);
+HWND WINAPI FindTextA(LPFINDREPLACEA);
+HWND WINAPI FindTextW(LPFINDREPLACEW);
+short WINAPI GetFileTitleA(LPCSTR,LPSTR,WORD);
+short WINAPI GetFileTitleW(LPCWSTR,LPWSTR,WORD);
+BOOL WINAPI GetOpenFileNameA(LPOPENFILENAMEA);
+BOOL WINAPI GetOpenFileNameW(LPOPENFILENAMEW);
+BOOL WINAPI GetSaveFileNameA(LPOPENFILENAMEA);
+BOOL WINAPI GetSaveFileNameW(LPOPENFILENAMEW);
+BOOL WINAPI PageSetupDlgA(LPPAGESETUPDLGA);
+BOOL WINAPI PageSetupDlgW(LPPAGESETUPDLGW);
+BOOL WINAPI PrintDlgA(LPPRINTDLGA);
+BOOL WINAPI PrintDlgW(LPPRINTDLGW);
+HWND WINAPI ReplaceTextA(LPFINDREPLACEA);
+HWND WINAPI ReplaceTextW(LPFINDREPLACEW);
+
+#define LBSELCHSTRING  __AW(LBSELCHSTRING)
+#define SHAREVISTRING  __AW(SHAREVISTRING)
+#define FILEOKSTRING   __AW(FILEOKSTRING)
+#define COLOROKSTRING  __AW(COLOROKSTRING)
+#define SETRGBSTRING   __AW(SETRGBSTRING)
+#define HELPMSGSTRING  __AW(HELPMSGSTRING)
+#define FINDMSGSTRING  __AW(FINDMSGSTRING)
+typedef __AW(CHOOSECOLOR) CHOOSECOLOR,*LPCHOOSECOLOR;
+typedef __AW(CHOOSEFONT) CHOOSEFONT,*LPCHOOSEFONT;
+typedef __AW(FINDREPLACE) FINDREPLACE,*LPFINDREPLACE;
+typedef __AW(OPENFILENAME) OPENFILENAME,*LPOPENFILENAME;
+typedef __AW(OFNOTIFY) OFNOTIFY,*LPOFNOTIFY;
+typedef __AW(PAGESETUPDLG) PAGESETUPDLG,*LPPAGESETUPDLG;
+typedef __AW(PRINTDLG) PRINTDLG,*LPPRINTDLG;
+#define ChooseColor __AW(ChooseColor)
+#define ChooseFont __AW(ChooseFont)
+#define FindText __AW(FindText)
+#define GetFileTitle __AW(GetFileTitle)
+#define GetOpenFileName __AW(GetOpenFileName)
+#define GetSaveFileName __AW(GetSaveFileName)
+#define PageSetupDlg __AW(PageSetupDlg)
+#define PrintDlg __AW(PrintDlg)
+#define ReplaceText __AW(ReplaceText)
+
+#if (WINVER >= 0x0500) 
+#define OFN_DONTADDTORECENT 0x02000000
+#define PD_CURRENTPAGE 0x00400000
+#define PD_NOCURRENTPAGE       0x00800000
+#define PD_EXCLUSIONFLAGS      0x01000000 
+#define PD_USELARGETEMPLATE    0x10000000
+#define PD_RESULT_CANCEL       0
+#define PD_RESULT_PRINT        1
+#define PD_RESULT_APPLY        2
+#define START_PAGE_GENERAL     0XFFFFFFFF
+#define OPENFILENAME_SIZE_VERSION_400  76
+#ifndef _OBJC_NO_COM
+typedef __AW(PRINTDLGEX) PRINTDLGEX, *LPPRINTDLGEX;
+#define PrintDlgEx __AW(PrintDlgEx)
 #include <unknwn.h>  /* for LPUNKNOWN  */ 
 #include <prsht.h>   /* for HPROPSHEETPAGE  */
 typedef struct tagPRINTPAGERANGE {
@@ -540,90 +583,13 @@ typedef struct tagPDEXW {
    DWORD nStartPage;
    DWORD dwResultAction;
 } PRINTDLGEXW, *LPPRINTDLGEXW;
-#endif /* WINVER >= 0x0500 */
-
-BOOL WINAPI ChooseColorA(LPCHOOSECOLORA);
-BOOL WINAPI ChooseColorW(LPCHOOSECOLORW);
-BOOL WINAPI ChooseFontA(LPCHOOSEFONTA);
-BOOL WINAPI ChooseFontW(LPCHOOSEFONTW);
-DWORD WINAPI CommDlgExtendedError(void);
-HWND WINAPI FindTextA(LPFINDREPLACEA);
-HWND WINAPI FindTextW(LPFINDREPLACEW);
-short WINAPI GetFileTitleA(LPCSTR,LPSTR,WORD);
-short WINAPI GetFileTitleW(LPCWSTR,LPWSTR,WORD);
-BOOL WINAPI GetOpenFileNameA(LPOPENFILENAMEA);
-BOOL WINAPI GetOpenFileNameW(LPOPENFILENAMEW);
-BOOL WINAPI GetSaveFileNameA(LPOPENFILENAMEA);
-BOOL WINAPI GetSaveFileNameW(LPOPENFILENAMEW);
-BOOL WINAPI PageSetupDlgA(LPPAGESETUPDLGA);
-BOOL WINAPI PageSetupDlgW(LPPAGESETUPDLGW);
-BOOL WINAPI PrintDlgA(LPPRINTDLGA);
-BOOL WINAPI PrintDlgW(LPPRINTDLGW);
-HWND WINAPI ReplaceTextA(LPFINDREPLACEA);
-HWND WINAPI ReplaceTextW(LPFINDREPLACEW);
-#if (WINVER >= 0x0500) && !defined (_OBJC_NO_COM)
 HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA);
 HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW);
+#endif /* _OBJC_NO_COM */
 #endif /* WINVER >= 0x0500 */
 
-#ifdef UNICODE
-#define LBSELCHSTRING  LBSELCHSTRINGW
-#define SHAREVISTRING  SHAREVISTRINGW
-#define FILEOKSTRING   FILEOKSTRINGW
-#define COLOROKSTRING  COLOROKSTRINGW
-#define SETRGBSTRING   SETRGBSTRINGW
-#define HELPMSGSTRING  HELPMSGSTRINGW
-#define FINDMSGSTRING  FINDMSGSTRINGW
-typedef CHOOSECOLORW CHOOSECOLOR,*LPCHOOSECOLOR;
-typedef CHOOSEFONTW CHOOSEFONT,*LPCHOOSEFONT;
-typedef FINDREPLACEW FINDREPLACE,*LPFINDREPLACE;
-typedef OPENFILENAMEW OPENFILENAME,*LPOPENFILENAME;
-typedef OFNOTIFYW OFNOTIFY,*LPOFNOTIFY;
-typedef PAGESETUPDLGW PAGESETUPDLG,*LPPAGESETUPDLG;
-typedef PRINTDLGW PRINTDLG,*LPPRINTDLG;
-#define ChooseColor ChooseColorW
-#define ChooseFont ChooseFontW
-#define FindText FindTextW
-#define GetFileTitle GetFileTitleW
-#define GetOpenFileName GetOpenFileNameW
-#define GetSaveFileName GetSaveFileNameW
-#define PageSetupDlg PageSetupDlgW
-#define PrintDlg PrintDlgW
-#define ReplaceText ReplaceTextW
-#if (WINVER >= 0x0500) && !defined (_OBJC_NO_COM)
-typedef PRINTDLGEXW PRINTDLGEX, *LPPRINTDLGEX;
-#define PrintDlgEx PrintDlgExW
-#endif /* WINVER >= 0x0500 */
-#else /* UNICODE */
-#define LBSELCHSTRING  LBSELCHSTRINGA
-#define SHAREVISTRING  SHAREVISTRINGA
-#define FILEOKSTRING   FILEOKSTRINGA
-#define COLOROKSTRING  COLOROKSTRINGA
-#define SETRGBSTRING   SETRGBSTRINGA
-#define HELPMSGSTRING  HELPMSGSTRINGA
-#define FINDMSGSTRING  FINDMSGSTRINGA
-typedef CHOOSECOLORA CHOOSECOLOR,*LPCHOOSECOLOR;
-typedef CHOOSEFONTA CHOOSEFONT,*LPCHOOSEFONT;
-typedef FINDREPLACEA FINDREPLACE,*LPFINDREPLACE;
-typedef OPENFILENAMEA OPENFILENAME,*LPOPENFILENAME;
-typedef OFNOTIFYA OFNOTIFY,*LPOFNOTIFY;
-typedef PAGESETUPDLGA PAGESETUPDLG,*LPPAGESETUPDLG;
-typedef PRINTDLGA PRINTDLG,*LPPRINTDLG;
-#define ChooseColor ChooseColorA
-#define ChooseFont ChooseFontA
-#define FindText FindTextA
-#define GetFileTitle GetFileTitleA
-#define GetOpenFileName GetOpenFileNameA
-#define GetSaveFileName GetSaveFileNameA
-#define PageSetupDlg PageSetupDlgA
-#define PrintDlg PrintDlgA
-#define ReplaceText ReplaceTextA
-#if (WINVER >= 0x0500) && !defined (_OBJC_NO_COM)
-typedef PRINTDLGEXA PRINTDLGEX, *LPPRINTDLGEX;
-#define PrintDlgEx PrintDlgExA
-#endif /* WINVER >= 0x0500 */
-#endif /* UNICODE */
 #pragma pack(pop)
+
 #ifdef __cplusplus
 }
 #endif
The MinGW.OSDN Windows System Libraries. Formerly designated as "MinGW.org Windows System Libraries", this encapsulates the "mingwrt" C runtime library extensions, and the "w32api" 32-bit MS-Windows API libraries.
About OSDN
Find Software
Develop Software
Help