From 41ea3205766683203eb18de4fe083a223f6d6344 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 11 Mar 2009 14:10:13 +0100 Subject: [PATCH] wineps.drv: Make all exported entry points CDECL. --- dlls/wineps.drv/bitblt.c | 2 +- dlls/wineps.drv/bitmap.c | 8 +++--- dlls/wineps.drv/brush.c | 2 +- dlls/wineps.drv/builtin.c | 12 ++++----- dlls/wineps.drv/clipping.c | 2 +- dlls/wineps.drv/color.c | 4 +-- dlls/wineps.drv/driver.c | 11 ++++---- dlls/wineps.drv/escape.c | 12 ++++----- dlls/wineps.drv/font.c | 2 +- dlls/wineps.drv/graphics.c | 38 +++++++++++++-------------- dlls/wineps.drv/init.c | 10 +++---- dlls/wineps.drv/pen.c | 2 +- dlls/wineps.drv/psdrv.h | 54 +------------------------------------- dlls/wineps.drv/text.c | 6 ++--- 14 files changed, 56 insertions(+), 109 deletions(-) diff --git a/dlls/wineps.drv/bitblt.c b/dlls/wineps.drv/bitblt.c index 023133f2fff..d3d8ee3da73 100644 --- a/dlls/wineps.drv/bitblt.c +++ b/dlls/wineps.drv/bitblt.c @@ -28,7 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); * * PSDRV_PatBlt */ -BOOL PSDRV_PatBlt(PSDRV_PDEVICE *physDev, INT x, INT y, INT width, INT height, DWORD dwRop) +BOOL CDECL PSDRV_PatBlt(PSDRV_PDEVICE *physDev, INT x, INT y, INT width, INT height, DWORD dwRop) { POINT pt[2]; diff --git a/dlls/wineps.drv/bitmap.c b/dlls/wineps.drv/bitmap.c index fd0238348f2..0c350d2206c 100644 --- a/dlls/wineps.drv/bitmap.c +++ b/dlls/wineps.drv/bitmap.c @@ -222,10 +222,10 @@ static inline DWORD max_ascii85_size(DWORD size) * bit depths. * Compression not implemented. */ -INT PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT widthDst, - INT heightDst, INT xSrc, INT ySrc, - INT widthSrc, INT heightSrc, const void *bits, - const BITMAPINFO *info, UINT wUsage, DWORD dwRop ) +INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT widthDst, + INT heightDst, INT xSrc, INT ySrc, + INT widthSrc, INT heightSrc, const void *bits, + const BITMAPINFO *info, UINT wUsage, DWORD dwRop ) { LONG fullSrcWidth, fullSrcHeight; INT widthbytes; diff --git a/dlls/wineps.drv/brush.c b/dlls/wineps.drv/brush.c index 690e913c7d7..e55bf1a8c1b 100644 --- a/dlls/wineps.drv/brush.c +++ b/dlls/wineps.drv/brush.c @@ -27,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); /*********************************************************************** * SelectBrush (WINEPS.@) */ -HBRUSH PSDRV_SelectBrush( PSDRV_PDEVICE *physDev, HBRUSH hbrush ) +HBRUSH CDECL PSDRV_SelectBrush( PSDRV_PDEVICE *physDev, HBRUSH hbrush ) { LOGBRUSH logbrush; diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index c075049914c..b8c53491bfa 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -254,7 +254,7 @@ BOOL PSDRV_WriteBuiltinGlyphShow(PSDRV_PDEVICE *physDev, LPCWSTR str, INT count) /*********************************************************************** * PSDRV_GetTextMetrics */ -BOOL PSDRV_GetTextMetrics(PSDRV_PDEVICE *physDev, TEXTMETRICW *metrics) +BOOL CDECL PSDRV_GetTextMetrics(PSDRV_PDEVICE *physDev, TEXTMETRICW *metrics) { assert(physDev->font.fontloc == Builtin); @@ -305,8 +305,8 @@ const AFMMETRICS *PSDRV_UVMetrics(LONG UV, const AFM *afm) /*********************************************************************** * PSDRV_GetTextExtentExPoint */ -BOOL PSDRV_GetTextExtentExPoint(PSDRV_PDEVICE *physDev, LPCWSTR str, INT count, - INT maxExt, LPINT lpnFit, LPINT alpDx, LPSIZE size) +BOOL CDECL PSDRV_GetTextExtentExPoint(PSDRV_PDEVICE *physDev, LPCWSTR str, INT count, + INT maxExt, LPINT lpnFit, LPINT alpDx, LPSIZE size) { int nfit = 0; int i; @@ -343,7 +343,7 @@ BOOL PSDRV_GetTextExtentExPoint(PSDRV_PDEVICE *physDev, LPCWSTR str, INT count, /*********************************************************************** * PSDRV_GetCharWidth */ -BOOL PSDRV_GetCharWidth(PSDRV_PDEVICE *physDev, UINT firstChar, UINT lastChar, LPINT buffer) +BOOL CDECL PSDRV_GetCharWidth(PSDRV_PDEVICE *physDev, UINT firstChar, UINT lastChar, LPINT buffer) { UINT i; @@ -403,8 +403,8 @@ static UINT PSDRV_GetFontMetric(HDC hdc, const AFM *afm, /*********************************************************************** * PSDRV_EnumDeviceFonts */ -BOOL PSDRV_EnumDeviceFonts( PSDRV_PDEVICE *physDev, LPLOGFONTW plf, - FONTENUMPROCW proc, LPARAM lp ) +BOOL CDECL PSDRV_EnumDeviceFonts( PSDRV_PDEVICE *physDev, LPLOGFONTW plf, + FONTENUMPROCW proc, LPARAM lp ) { ENUMLOGFONTEXW lf; NEWTEXTMETRICEXW tm; diff --git a/dlls/wineps.drv/clipping.c b/dlls/wineps.drv/clipping.c index 3540b768de8..f201dd16191 100644 --- a/dlls/wineps.drv/clipping.c +++ b/dlls/wineps.drv/clipping.c @@ -27,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); /*********************************************************************** * PSDRV_SetDeviceClipping */ -void PSDRV_SetDeviceClipping( PSDRV_PDEVICE *physDev, HRGN vis_rgn, HRGN clip_rgn ) +void CDECL PSDRV_SetDeviceClipping( PSDRV_PDEVICE *physDev, HRGN vis_rgn, HRGN clip_rgn ) { /* We could set a dirty flag here to speed up PSDRV_SetClip */ return; diff --git a/dlls/wineps.drv/color.c b/dlls/wineps.drv/color.c index 3dbbe20febd..3c5d5c88575 100644 --- a/dlls/wineps.drv/color.c +++ b/dlls/wineps.drv/color.c @@ -117,7 +117,7 @@ void PSDRV_CreateColor( PSDRV_PDEVICE *physDev, PSCOLOR *pscolor, /*********************************************************************** * PSDRV_SetBkColor */ -COLORREF PSDRV_SetBkColor( PSDRV_PDEVICE *physDev, COLORREF color ) +COLORREF CDECL PSDRV_SetBkColor( PSDRV_PDEVICE *physDev, COLORREF color ) { PSDRV_CreateColor(physDev, &physDev->bkColor, color); return color; @@ -127,7 +127,7 @@ COLORREF PSDRV_SetBkColor( PSDRV_PDEVICE *physDev, COLORREF color ) /*********************************************************************** * PSDRV_SetTextColor */ -COLORREF PSDRV_SetTextColor( PSDRV_PDEVICE *physDev, COLORREF color ) +COLORREF CDECL PSDRV_SetTextColor( PSDRV_PDEVICE *physDev, COLORREF color ) { PSDRV_CreateColor(physDev, &physDev->font.color, color); physDev->font.set = FALSE; diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index d6980651ad3..158ea1f35e5 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -331,9 +331,9 @@ static int (WINAPI *pPropertySheet) (LPCPROPSHEETHEADERW); * * Just returns default devmode at the moment. No use of initialization file. */ -INT PSDRV_ExtDeviceMode(LPSTR lpszDriver, HWND hwnd, LPDEVMODEA lpdmOutput, - LPSTR lpszDevice, LPSTR lpszPort, LPDEVMODEA lpdmInput, - LPSTR lpszProfile, DWORD dwMode) +INT CDECL PSDRV_ExtDeviceMode(LPSTR lpszDriver, HWND hwnd, LPDEVMODEA lpdmOutput, + LPSTR lpszDevice, LPSTR lpszPort, LPDEVMODEA lpdmInput, + LPSTR lpszProfile, DWORD dwMode) { PRINTERINFO *pi = PSDRV_FindPrinterInfo(lpszDevice); if(!pi) return -1; @@ -437,9 +437,8 @@ INT16 WINAPI PSDRV_ExtDeviceMode16(HWND16 hwnd, HANDLE16 hDriver, * Returns * Result depends on the setting of fwCapability. -1 indicates failure. */ -DWORD PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszPort, - WORD fwCapability, LPSTR lpszOutput, - LPDEVMODEA lpDevMode) +DWORD CDECL PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszPort, + WORD fwCapability, LPSTR lpszOutput, LPDEVMODEA lpDevMode) { PRINTERINFO *pi; DEVMODEA *lpdm; diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index b3974615e1f..c594bea6aa3 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -36,8 +36,8 @@ static const char psbegindocument[] = /********************************************************************** * ExtEscape (WINEPS.@) */ -INT PSDRV_ExtEscape( PSDRV_PDEVICE *physDev, INT nEscape, INT cbInput, LPCVOID in_data, - INT cbOutput, LPVOID out_data ) +INT CDECL PSDRV_ExtEscape( PSDRV_PDEVICE *physDev, INT nEscape, INT cbInput, LPCVOID in_data, + INT cbOutput, LPVOID out_data ) { switch(nEscape) { @@ -341,7 +341,7 @@ INT PSDRV_ExtEscape( PSDRV_PDEVICE *physDev, INT nEscape, INT cbInput, LPCVOID i /************************************************************************ * PSDRV_StartPage */ -INT PSDRV_StartPage( PSDRV_PDEVICE *physDev ) +INT CDECL PSDRV_StartPage( PSDRV_PDEVICE *physDev ) { if(!physDev->job.OutOfPage) { FIXME("Already started a page?\n"); @@ -363,7 +363,7 @@ INT PSDRV_StartPage( PSDRV_PDEVICE *physDev ) /************************************************************************ * PSDRV_EndPage */ -INT PSDRV_EndPage( PSDRV_PDEVICE *physDev ) +INT CDECL PSDRV_EndPage( PSDRV_PDEVICE *physDev ) { if(physDev->job.OutOfPage) { FIXME("Already ended a page?\n"); @@ -429,7 +429,7 @@ static INT PSDRV_StartDocA( PSDRV_PDEVICE *physDev, const DOCINFOA *doc ) /************************************************************************ * PSDRV_StartDoc */ -INT PSDRV_StartDoc( PSDRV_PDEVICE *physDev, const DOCINFOW *doc ) +INT CDECL PSDRV_StartDoc( PSDRV_PDEVICE *physDev, const DOCINFOW *doc ) { DOCINFOA docA; INT ret, len; @@ -471,7 +471,7 @@ INT PSDRV_StartDoc( PSDRV_PDEVICE *physDev, const DOCINFOW *doc ) /************************************************************************ * PSDRV_EndDoc */ -INT PSDRV_EndDoc( PSDRV_PDEVICE *physDev ) +INT CDECL PSDRV_EndDoc( PSDRV_PDEVICE *physDev ) { INT ret = 1; if(!physDev->job.hJob) { diff --git a/dlls/wineps.drv/font.c b/dlls/wineps.drv/font.c index 9e0ae394256..7f54954f1df 100644 --- a/dlls/wineps.drv/font.c +++ b/dlls/wineps.drv/font.c @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); /*********************************************************************** * SelectFont (WINEPS.@) */ -HFONT PSDRV_SelectFont( PSDRV_PDEVICE *physDev, HFONT hfont, HANDLE gdiFont ) +HFONT CDECL PSDRV_SelectFont( PSDRV_PDEVICE *physDev, HFONT hfont, HANDLE gdiFont ) { LOGFONTW lf; BOOL subst = FALSE; diff --git a/dlls/wineps.drv/graphics.c b/dlls/wineps.drv/graphics.c index 2d98abd3d39..657599bf283 100644 --- a/dlls/wineps.drv/graphics.c +++ b/dlls/wineps.drv/graphics.c @@ -85,7 +85,7 @@ static void PSDRV_DrawLine( PSDRV_PDEVICE *physDev ) /*********************************************************************** * PSDRV_LineTo */ -BOOL PSDRV_LineTo(PSDRV_PDEVICE *physDev, INT x, INT y) +BOOL CDECL PSDRV_LineTo(PSDRV_PDEVICE *physDev, INT x, INT y) { POINT pt[2]; @@ -111,7 +111,7 @@ BOOL PSDRV_LineTo(PSDRV_PDEVICE *physDev, INT x, INT y) /*********************************************************************** * PSDRV_Rectangle */ -BOOL PSDRV_Rectangle( PSDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom ) +BOOL CDECL PSDRV_Rectangle( PSDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom ) { RECT rect; @@ -149,8 +149,8 @@ BOOL PSDRV_Rectangle( PSDRV_PDEVICE *physDev, INT left, INT top, INT right, INT /*********************************************************************** * PSDRV_RoundRect */ -BOOL PSDRV_RoundRect( PSDRV_PDEVICE *physDev, INT left, INT top, INT right, - INT bottom, INT ell_width, INT ell_height ) +BOOL CDECL PSDRV_RoundRect( PSDRV_PDEVICE *physDev, INT left, INT top, INT right, + INT bottom, INT ell_width, INT ell_height ) { RECT rect[2]; @@ -268,8 +268,8 @@ static BOOL PSDRV_DrawArc( PSDRV_PDEVICE *physDev, INT left, INT top, /*********************************************************************** * PSDRV_Arc */ -BOOL PSDRV_Arc( PSDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +BOOL CDECL PSDRV_Arc( PSDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) { return PSDRV_DrawArc( physDev, left, top, right, bottom, xstart, ystart, xend, yend, 0 ); } @@ -277,8 +277,8 @@ BOOL PSDRV_Arc( PSDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom /*********************************************************************** * PSDRV_Chord */ -BOOL PSDRV_Chord( PSDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +BOOL CDECL PSDRV_Chord( PSDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) { return PSDRV_DrawArc( physDev, left, top, right, bottom, xstart, ystart, xend, yend, 1 ); } @@ -287,8 +287,8 @@ BOOL PSDRV_Chord( PSDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bott /*********************************************************************** * PSDRV_Pie */ -BOOL PSDRV_Pie( PSDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +BOOL CDECL PSDRV_Pie( PSDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) { return PSDRV_DrawArc( physDev, left, top, right, bottom, xstart, ystart, xend, yend, 2 ); } @@ -297,7 +297,7 @@ BOOL PSDRV_Pie( PSDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom /*********************************************************************** * PSDRV_Ellipse */ -BOOL PSDRV_Ellipse( PSDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom) +BOOL CDECL PSDRV_Ellipse( PSDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom) { INT x, y, w, h; RECT rect; @@ -332,8 +332,8 @@ BOOL PSDRV_Ellipse( PSDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bo /*********************************************************************** * PSDRV_PolyPolyline */ -BOOL PSDRV_PolyPolyline( PSDRV_PDEVICE *physDev, const POINT* pts, const DWORD* counts, - DWORD polylines ) +BOOL CDECL PSDRV_PolyPolyline( PSDRV_PDEVICE *physDev, const POINT* pts, const DWORD* counts, + DWORD polylines ) { DWORD polyline, line, total; POINT *dev_pts, *pt; @@ -368,7 +368,7 @@ BOOL PSDRV_PolyPolyline( PSDRV_PDEVICE *physDev, const POINT* pts, const DWORD* /*********************************************************************** * PSDRV_Polyline */ -BOOL PSDRV_Polyline( PSDRV_PDEVICE *physDev, const POINT* pt, INT count ) +BOOL CDECL PSDRV_Polyline( PSDRV_PDEVICE *physDev, const POINT* pt, INT count ) { return PSDRV_PolyPolyline( physDev, pt, (LPDWORD) &count, 1 ); } @@ -377,8 +377,8 @@ BOOL PSDRV_Polyline( PSDRV_PDEVICE *physDev, const POINT* pt, INT count ) /*********************************************************************** * PSDRV_PolyPolygon */ -BOOL PSDRV_PolyPolygon( PSDRV_PDEVICE *physDev, const POINT* pts, const INT* counts, - UINT polygons ) +BOOL CDECL PSDRV_PolyPolygon( PSDRV_PDEVICE *physDev, const POINT* pts, const INT* counts, + UINT polygons ) { DWORD polygon, total; INT line; @@ -420,7 +420,7 @@ BOOL PSDRV_PolyPolygon( PSDRV_PDEVICE *physDev, const POINT* pts, const INT* cou /*********************************************************************** * PSDRV_Polygon */ -BOOL PSDRV_Polygon( PSDRV_PDEVICE *physDev, const POINT* pt, INT count ) +BOOL CDECL PSDRV_Polygon( PSDRV_PDEVICE *physDev, const POINT* pt, INT count ) { return PSDRV_PolyPolygon( physDev, pt, &count, 1 ); } @@ -429,7 +429,7 @@ BOOL PSDRV_Polygon( PSDRV_PDEVICE *physDev, const POINT* pt, INT count ) /*********************************************************************** * PSDRV_SetPixel */ -COLORREF PSDRV_SetPixel( PSDRV_PDEVICE *physDev, INT x, INT y, COLORREF color ) +COLORREF CDECL PSDRV_SetPixel( PSDRV_PDEVICE *physDev, INT x, INT y, COLORREF color ) { PSCOLOR pscolor; POINT pt; @@ -454,7 +454,7 @@ COLORREF PSDRV_SetPixel( PSDRV_PDEVICE *physDev, INT x, INT y, COLORREF color ) /*********************************************************************** * PSDRV_PaintRgn */ -BOOL PSDRV_PaintRgn( PSDRV_PDEVICE *physDev, HRGN hrgn ) +BOOL CDECL PSDRV_PaintRgn( PSDRV_PDEVICE *physDev, HRGN hrgn ) { RGNDATA *rgndata = NULL; diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 61e31d8778e..78aa0cb4f6d 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -296,8 +296,8 @@ static LPDEVMODEA DEVMODEdupWtoA(HANDLE heap, const DEVMODEW *dmW) /********************************************************************** * PSDRV_CreateDC */ -BOOL PSDRV_CreateDC( HDC hdc, PSDRV_PDEVICE **pdev, LPCWSTR driver, LPCWSTR device, - LPCWSTR output, const DEVMODEW* initData ) +BOOL CDECL PSDRV_CreateDC( HDC hdc, PSDRV_PDEVICE **pdev, LPCWSTR driver, LPCWSTR device, + LPCWSTR output, const DEVMODEW* initData ) { PSDRV_PDEVICE *physDev; PRINTERINFO *pi; @@ -381,7 +381,7 @@ BOOL PSDRV_CreateDC( HDC hdc, PSDRV_PDEVICE **pdev, LPCWSTR driver, LPCWSTR devi /********************************************************************** * PSDRV_DeleteDC */ -BOOL PSDRV_DeleteDC( PSDRV_PDEVICE *physDev ) +BOOL CDECL PSDRV_DeleteDC( PSDRV_PDEVICE *physDev ) { TRACE("\n"); @@ -396,7 +396,7 @@ BOOL PSDRV_DeleteDC( PSDRV_PDEVICE *physDev ) /********************************************************************** * ResetDC (WINEPS.@) */ -HDC PSDRV_ResetDC( PSDRV_PDEVICE *physDev, const DEVMODEW *lpInitData ) +HDC CDECL PSDRV_ResetDC( PSDRV_PDEVICE *physDev, const DEVMODEW *lpInitData ) { if(lpInitData) { HRGN hrgn; @@ -414,7 +414,7 @@ HDC PSDRV_ResetDC( PSDRV_PDEVICE *physDev, const DEVMODEW *lpInitData ) /*********************************************************************** * GetDeviceCaps (WINEPS.@) */ -INT PSDRV_GetDeviceCaps( PSDRV_PDEVICE *physDev, INT cap ) +INT CDECL PSDRV_GetDeviceCaps( PSDRV_PDEVICE *physDev, INT cap ) { switch(cap) { diff --git a/dlls/wineps.drv/pen.c b/dlls/wineps.drv/pen.c index ffe6d1fb47c..ab7bc5b6a76 100644 --- a/dlls/wineps.drv/pen.c +++ b/dlls/wineps.drv/pen.c @@ -37,7 +37,7 @@ static const char PEN_alternate[] = "1"; /*********************************************************************** * SelectPen (WINEPS.@) */ -HPEN PSDRV_SelectPen( PSDRV_PDEVICE *physDev, HPEN hpen ) +HPEN CDECL PSDRV_SelectPen( PSDRV_PDEVICE *physDev, HPEN hpen ) { LOGPEN logpen; diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index fcdc78df20c..0661fdf20c2 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -476,60 +476,8 @@ extern BOOL PSDRV_WriteDIBPatternDict(PSDRV_PDEVICE *physDev, BITMAPINFO *bmi, U extern BOOL PSDRV_WriteArrayPut(PSDRV_PDEVICE *physDev, CHAR *pszArrayName, INT nIndex, LONG lCoord); extern BOOL PSDRV_WriteArrayDef(PSDRV_PDEVICE *physDev, CHAR *pszArrayName, INT nSize); -extern BOOL PSDRV_Arc( PSDRV_PDEVICE *physDev, INT left, INT top, INT right, - INT bottom, INT xstart, INT ystart, - INT xend, INT yend ); -extern BOOL PSDRV_Chord( PSDRV_PDEVICE *physDev, INT left, INT top, INT right, - INT bottom, INT xstart, INT ystart, - INT xend, INT yend ); -extern BOOL PSDRV_Ellipse( PSDRV_PDEVICE *physDev, INT left, INT top, INT right, - INT bottom ); -extern INT PSDRV_EndDoc( PSDRV_PDEVICE *physDev ); -extern INT PSDRV_EndPage( PSDRV_PDEVICE *physDev ); -extern BOOL PSDRV_ExtTextOut( PSDRV_PDEVICE *physDev, INT x, INT y, UINT flags, - const RECT *lprect, LPCWSTR str, UINT count, - const INT *lpDx ); -extern BOOL PSDRV_GetCharWidth( PSDRV_PDEVICE *physDev, UINT firstChar, UINT lastChar, - LPINT buffer ); -extern BOOL PSDRV_GetTextExtentExPoint( PSDRV_PDEVICE *physDev, LPCWSTR str, INT count, - INT maxExt, LPINT lpnFit, LPINT alpDx, LPSIZE size ); -extern BOOL PSDRV_GetTextMetrics( PSDRV_PDEVICE *physDev, TEXTMETRICW *metrics ); -extern BOOL PSDRV_LineTo( PSDRV_PDEVICE *physDev, INT x, INT y ); -extern BOOL PSDRV_PatBlt( PSDRV_PDEVICE *physDev, INT x, INT y, INT width, INT height, DWORD - dwRop); -extern BOOL PSDRV_Pie( PSDRV_PDEVICE *physDev, INT left, INT top, INT right, - INT bottom, INT xstart, INT ystart, - INT xend, INT yend ); -extern BOOL PSDRV_Polygon( PSDRV_PDEVICE *physDev, const POINT* pt, INT count ); -extern BOOL PSDRV_Polyline( PSDRV_PDEVICE *physDev, const POINT* pt, INT count ); -extern BOOL PSDRV_PolyPolygon( PSDRV_PDEVICE *physDev, const POINT* pts, const INT* counts, - UINT polygons ); -extern BOOL PSDRV_PolyPolyline( PSDRV_PDEVICE *physDev, const POINT* pts, const DWORD* counts, - DWORD polylines ); -extern BOOL PSDRV_Rectangle( PSDRV_PDEVICE *physDev, INT left, INT top, INT right, - INT bottom ); -extern BOOL PSDRV_RoundRect(PSDRV_PDEVICE *physDev, INT left, INT top, INT right, - INT bottom, INT ell_width, INT ell_height); -extern COLORREF PSDRV_SetBkColor( PSDRV_PDEVICE *physDev, COLORREF color ); -extern COLORREF PSDRV_SetPixel( PSDRV_PDEVICE *physDev, INT x, INT y, COLORREF color ); -extern COLORREF PSDRV_SetTextColor( PSDRV_PDEVICE *physDev, COLORREF color ); -extern INT PSDRV_StartDoc( PSDRV_PDEVICE *physDev, const DOCINFOW *doc ); -extern INT PSDRV_StartPage( PSDRV_PDEVICE *physDev ); -extern INT PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, - INT widthDst, INT heightDst, INT xSrc, - INT ySrc, INT widthSrc, INT heightSrc, - const void *bits, const BITMAPINFO *info, - UINT wUsage, DWORD dwRop ); +extern INT CDECL PSDRV_StartPage( PSDRV_PDEVICE *physDev ); -extern INT PSDRV_ExtDeviceMode(LPSTR lpszDriver, HWND hwnd, - LPDEVMODEA lpdmOutput, - LPSTR lpszDevice, LPSTR lpszPort, - LPDEVMODEA lpdmInput, LPSTR lpszProfile, - DWORD dwMode); -extern DWORD PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, - LPCSTR lpszPort, - WORD fwCapability, LPSTR lpszOutput, - LPDEVMODEA lpdm); INT PSDRV_GlyphListInit(void); const GLYPHNAME *PSDRV_GlyphName(LPCSTR szName); VOID PSDRV_IndexGlyphList(void); diff --git a/dlls/wineps.drv/text.c b/dlls/wineps.drv/text.c index 282ce354161..310e1cb39e5 100644 --- a/dlls/wineps.drv/text.c +++ b/dlls/wineps.drv/text.c @@ -36,9 +36,9 @@ static BOOL PSDRV_Text(PSDRV_PDEVICE *physDev, INT x, INT y, UINT flags, /*********************************************************************** * PSDRV_ExtTextOut */ -BOOL PSDRV_ExtTextOut( PSDRV_PDEVICE *physDev, INT x, INT y, UINT flags, - const RECT *lprect, LPCWSTR str, UINT count, - const INT *lpDx ) +BOOL CDECL PSDRV_ExtTextOut( PSDRV_PDEVICE *physDev, INT x, INT y, UINT flags, + const RECT *lprect, LPCWSTR str, UINT count, + const INT *lpDx ) { BOOL bResult = TRUE; BOOL bClipped = FALSE;