From a8d8b52d6fe705c0dda35e60483f814a211ff9be Mon Sep 17 00:00:00 2001 From: Eric Pouech Date: Mon, 18 Apr 2005 10:01:07 +0000 Subject: [PATCH] Added proper definition for PRINTDLGEX[AW] structures. --- dlls/commdlg/printdlg.c | 5 ++-- include/commdlg.h | 61 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 2 deletions(-) diff --git a/dlls/commdlg/printdlg.c b/dlls/commdlg/printdlg.c index 5bcb9f0ba38..6bd5f826886 100644 --- a/dlls/commdlg/printdlg.c +++ b/dlls/commdlg/printdlg.c @@ -3021,15 +3021,16 @@ BOOL WINAPI PageSetupDlgW(LPPAGESETUPDLGW setupdlg) { /*********************************************************************** * PrintDlgExA (COMDLG32.@) */ -HRESULT WINAPI PrintDlgExA(LPVOID lpPrintDlgExA) /* [???] FIXME: LPPRINTDLGEXA */ +HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA lpPrintDlgExA) { FIXME("stub\n"); return E_NOTIMPL; } + /*********************************************************************** * PrintDlgExW (COMDLG32.@) */ -HRESULT WINAPI PrintDlgExW(LPVOID lpPrintDlgExW) /* [???] FIXME: LPPRINTDLGEXW */ +HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW lpPrintDlgExW) { FIXME("stub\n"); return E_NOTIMPL; diff --git a/include/commdlg.h b/include/commdlg.h index ee7545d6fce..aa793028266 100644 --- a/include/commdlg.h +++ b/include/commdlg.h @@ -662,6 +662,64 @@ DECL_WINELIB_TYPE_AW(LPPAGESETUPDLG) #define PSD_ENABLEPAGEPAINTHOOK 0x00040000 #define PSD_DISABLEPAGEPAINTING 0x00080000 +typedef struct tagPRINTPAGERANGE +{ + DWORD nFromPage; + DWORD nToPage; +} PRINTPAGERANGE, *LPPRINTPAGERANGE; + +typedef struct tagPDEXA +{ + DWORD lStructSize; + HWND hwndOwner; + HGLOBAL hDevMode; + HGLOBAL hDevNames; + HDC hDC; + DWORD Flags; + DWORD Flags2; + DWORD ExclusionFlags; + DWORD nPageRanges; + DWORD nMaxPageRanges; + LPPRINTPAGERANGE lpPageRanges; + DWORD nMinPage; + DWORD nMaxPage; + DWORD nCopies; + HINSTANCE hInstance; + LPCSTR lpPrintTemplateName; + void* /*LPUNKNOWN*/ lpCallback; + DWORD nPropertyPages; + HPROPSHEETPAGE* lphPropertyPages; + DWORD nStartPage; + DWORD dwResultAction; +} PRINTDLGEXA, *LPPRINTDLGEXA; + +typedef struct tagPDEXW +{ + DWORD lStructSize; + HWND hwndOwner; + HGLOBAL hDevMode; + HGLOBAL hDevNames; + HDC hDC; + DWORD Flags; + DWORD Flags2; + DWORD ExclusionFlags; + DWORD nPageRanges; + DWORD nMaxPageRanges; + LPPRINTPAGERANGE lpPageRanges; + DWORD nMinPage; + DWORD nMaxPage; + DWORD nCopies; + HINSTANCE hInstance; + LPCWSTR lpPrintTemplateName; + void* /*LPUNKNOWN*/ lpCallback; + DWORD nPropertyPages; + HPROPSHEETPAGE* lphPropertyPages; + DWORD nStartPage; + DWORD dwResultAction; +} PRINTDLGEXW, *LPPRINTDLGEXW; + +DECL_WINELIB_TYPE_AW(PRINTDLGEX) +DECL_WINELIB_TYPE_AW(LPPRINTDLGEX) BOOL WINAPI ChooseColorA(LPCHOOSECOLORA lpChCol); BOOL WINAPI ChooseColorW(LPCHOOSECOLORW lpChCol); @@ -685,6 +743,9 @@ BOOL WINAPI PageSetupDlgW( LPPAGESETUPDLGW ); BOOL WINAPI PrintDlgA( LPPRINTDLGA printdlg); BOOL WINAPI PrintDlgW( LPPRINTDLGW printdlg); #define PrintDlg WINELIB_NAME_AW(PrintDlg) +HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA); +HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW); +#define PrintDlgEx WINELIB_NAME_AW(PrintDlgEx) HWND WINAPI ReplaceTextA( LPFINDREPLACEA lpFind); HWND WINAPI ReplaceTextW( LPFINDREPLACEW lpFind); #define ReplaceText WINELIB_NAME_AW(ReplaceText)