From: Alistair Leslie-Hughes leslie_alistair@hotmail.com
--- dlls/wineps.drv/afm.c | 2 +- dlls/wineps.drv/data/agl.h | 70 +++++----- dlls/wineps.drv/mkagl.c | 2 +- dlls/wineps.drv/printproc.c | 2 +- dlls/wineps.drv/psdrv.h | 248 ++++++++++++++++++------------------ dlls/wineps.drv/text.c | 2 +- 6 files changed, 163 insertions(+), 163 deletions(-)
diff --git a/dlls/wineps.drv/afm.c b/dlls/wineps.drv/afm.c index ef4f4485b22..0f3f89b5f5c 100644 --- a/dlls/wineps.drv/afm.c +++ b/dlls/wineps.drv/afm.c @@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
/* ptr to fonts for which we have afm files */ -DECLSPEC_HIDDEN FONTFAMILY *PSDRV_AFMFontList = NULL; +FONTFAMILY *PSDRV_AFMFontList = NULL;
/*********************************************************** diff --git a/dlls/wineps.drv/data/agl.h b/dlls/wineps.drv/data/agl.h index ef493b674e8..794ed8e6022 100644 --- a/dlls/wineps.drv/data/agl.h +++ b/dlls/wineps.drv/data/agl.h @@ -1,38 +1,38 @@ -DECLSPEC_HIDDEN extern const AFM PSDRV_AvantGarde_Demi; -DECLSPEC_HIDDEN extern const AFM PSDRV_AvantGarde_DemiOblique; -DECLSPEC_HIDDEN extern const AFM PSDRV_AvantGarde_Book; -DECLSPEC_HIDDEN extern const AFM PSDRV_AvantGarde_BookOblique; -DECLSPEC_HIDDEN extern const AFM PSDRV_Bookman_Demi; -DECLSPEC_HIDDEN extern const AFM PSDRV_Bookman_DemiItalic; -DECLSPEC_HIDDEN extern const AFM PSDRV_Bookman_Light; -DECLSPEC_HIDDEN extern const AFM PSDRV_Bookman_LightItalic; -DECLSPEC_HIDDEN extern const AFM PSDRV_Courier_Bold; -DECLSPEC_HIDDEN extern const AFM PSDRV_Courier_BoldOblique; -DECLSPEC_HIDDEN extern const AFM PSDRV_Courier; -DECLSPEC_HIDDEN extern const AFM PSDRV_Courier_Oblique; -DECLSPEC_HIDDEN extern const AFM PSDRV_Helvetica; -DECLSPEC_HIDDEN extern const AFM PSDRV_Helvetica_Bold; -DECLSPEC_HIDDEN extern const AFM PSDRV_Helvetica_BoldOblique; -DECLSPEC_HIDDEN extern const AFM PSDRV_Helvetica_Narrow; -DECLSPEC_HIDDEN extern const AFM PSDRV_Helvetica_Narrow_Bold; -DECLSPEC_HIDDEN extern const AFM PSDRV_Helvetica_Narrow_BoldOblique; -DECLSPEC_HIDDEN extern const AFM PSDRV_Helvetica_Narrow_Oblique; -DECLSPEC_HIDDEN extern const AFM PSDRV_Helvetica_Oblique; -DECLSPEC_HIDDEN extern const AFM PSDRV_NewCenturySchlbk_Bold; -DECLSPEC_HIDDEN extern const AFM PSDRV_NewCenturySchlbk_BoldItalic; -DECLSPEC_HIDDEN extern const AFM PSDRV_NewCenturySchlbk_Italic; -DECLSPEC_HIDDEN extern const AFM PSDRV_NewCenturySchlbk_Roman; -DECLSPEC_HIDDEN extern const AFM PSDRV_Palatino_Bold; -DECLSPEC_HIDDEN extern const AFM PSDRV_Palatino_BoldItalic; -DECLSPEC_HIDDEN extern const AFM PSDRV_Palatino_Italic; -DECLSPEC_HIDDEN extern const AFM PSDRV_Palatino_Roman; -DECLSPEC_HIDDEN extern const AFM PSDRV_Symbol; -DECLSPEC_HIDDEN extern const AFM PSDRV_Times_Bold; -DECLSPEC_HIDDEN extern const AFM PSDRV_Times_BoldItalic; -DECLSPEC_HIDDEN extern const AFM PSDRV_Times_Italic; -DECLSPEC_HIDDEN extern const AFM PSDRV_Times_Roman; -DECLSPEC_HIDDEN extern const AFM PSDRV_ZapfChancery_MediumItalic; -DECLSPEC_HIDDEN extern const AFM PSDRV_ZapfDingbats; +extern const AFM PSDRV_AvantGarde_Demi; +extern const AFM PSDRV_AvantGarde_DemiOblique; +extern const AFM PSDRV_AvantGarde_Book; +extern const AFM PSDRV_AvantGarde_BookOblique; +extern const AFM PSDRV_Bookman_Demi; +extern const AFM PSDRV_Bookman_DemiItalic; +extern const AFM PSDRV_Bookman_Light; +extern const AFM PSDRV_Bookman_LightItalic; +extern const AFM PSDRV_Courier_Bold; +extern const AFM PSDRV_Courier_BoldOblique; +extern const AFM PSDRV_Courier; +extern const AFM PSDRV_Courier_Oblique; +extern const AFM PSDRV_Helvetica; +extern const AFM PSDRV_Helvetica_Bold; +extern const AFM PSDRV_Helvetica_BoldOblique; +extern const AFM PSDRV_Helvetica_Narrow; +extern const AFM PSDRV_Helvetica_Narrow_Bold; +extern const AFM PSDRV_Helvetica_Narrow_BoldOblique; +extern const AFM PSDRV_Helvetica_Narrow_Oblique; +extern const AFM PSDRV_Helvetica_Oblique; +extern const AFM PSDRV_NewCenturySchlbk_Bold; +extern const AFM PSDRV_NewCenturySchlbk_BoldItalic; +extern const AFM PSDRV_NewCenturySchlbk_Italic; +extern const AFM PSDRV_NewCenturySchlbk_Roman; +extern const AFM PSDRV_Palatino_Bold; +extern const AFM PSDRV_Palatino_BoldItalic; +extern const AFM PSDRV_Palatino_Italic; +extern const AFM PSDRV_Palatino_Roman; +extern const AFM PSDRV_Symbol; +extern const AFM PSDRV_Times_Bold; +extern const AFM PSDRV_Times_BoldItalic; +extern const AFM PSDRV_Times_Italic; +extern const AFM PSDRV_Times_Roman; +extern const AFM PSDRV_ZapfChancery_MediumItalic; +extern const AFM PSDRV_ZapfDingbats; #define GN_A (PSDRV_AGLGlyphNames + 0) #define GN_AE (PSDRV_AGLGlyphNames + 1) #define GN_AEacute (PSDRV_AGLGlyphNames + 2) diff --git a/dlls/wineps.drv/mkagl.c b/dlls/wineps.drv/mkagl.c index ca9702656ae..7c18cbd720d 100644 --- a/dlls/wineps.drv/mkagl.c +++ b/dlls/wineps.drv/mkagl.c @@ -217,7 +217,7 @@ static void read_afms(FILE *f_c, FILE *f_h) if (font_family[i] == '-') font_family[i] = '_';
- fprintf(f_h, "DECLSPEC_HIDDEN extern const AFM PSDRV_%s;\n", font_family); + fprintf(f_h, "extern const AFM PSDRV_%s;\n", font_family); fprintf(f_c, " &PSDRV_%s,\n", font_family);
while (1) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 34b3ec897a4..9cd1efd5d5d 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -1125,7 +1125,7 @@ static inline INT INTERNAL_YWSTODS(HDC hdc, INT height) return pt[1].y - pt[0].y; }
-extern const unsigned short bidi_direction_table[] DECLSPEC_HIDDEN; +extern const unsigned short bidi_direction_table[];
/*------------------------------------------------------------------------ Bidirectional Character Types diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index cef02735b8f..7b0582bd258 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -143,8 +143,8 @@ typedef struct _tagFONTFAMILY { struct _tagFONTFAMILY *next; /* next family */ } FONTFAMILY;
-extern FONTFAMILY *PSDRV_AFMFontList DECLSPEC_HIDDEN; -extern const AFM *const PSDRV_BuiltinAFMs[] DECLSPEC_HIDDEN; /* last element is NULL */ +extern FONTFAMILY *PSDRV_AFMFontList; +extern const AFM *const PSDRV_BuiltinAFMs[]; /* last element is NULL */
typedef struct { @@ -369,178 +369,178 @@ typedef struct } print_ctx;
extern print_ctx *create_print_ctx( HDC hdc, const WCHAR *device, - const DEVMODEW *devmode ) DECLSPEC_HIDDEN; + const DEVMODEW *devmode );
/* * Every glyph name in the Adobe Glyph List and the 35 core PostScript fonts */
-extern const INT PSDRV_AGLGlyphNamesSize DECLSPEC_HIDDEN; -extern GLYPHNAME PSDRV_AGLGlyphNames[] DECLSPEC_HIDDEN; +extern const INT PSDRV_AGLGlyphNamesSize; +extern GLYPHNAME PSDRV_AGLGlyphNames[];
/* * The AGL encoding vector */
-extern const INT PSDRV_AGLbyNameSize DECLSPEC_HIDDEN; /* sorted by name */ -extern const UNICODEGLYPH PSDRV_AGLbyName[] DECLSPEC_HIDDEN; /* duplicates omitted */ +extern const INT PSDRV_AGLbyNameSize; /* sorted by name */ +extern const UNICODEGLYPH PSDRV_AGLbyName[]; /* duplicates omitted */
-extern const INT PSDRV_AGLbyUVSize DECLSPEC_HIDDEN; /* sorted by UV */ -extern const UNICODEGLYPH PSDRV_AGLbyUV[] DECLSPEC_HIDDEN; /* duplicates included */ +extern const INT PSDRV_AGLbyUVSize; /* sorted by UV */ +extern const UNICODEGLYPH PSDRV_AGLbyUV[]; /* duplicates included */
-extern HINSTANCE PSDRV_hInstance DECLSPEC_HIDDEN; -extern HANDLE PSDRV_Heap DECLSPEC_HIDDEN; -extern char *PSDRV_ANSIVector[256] DECLSPEC_HIDDEN; +extern HINSTANCE PSDRV_hInstance; +extern HANDLE PSDRV_Heap; +extern char *PSDRV_ANSIVector[256];
-extern INPUTSLOT *find_slot( PPD *ppd, const DEVMODEW *dm ) DECLSPEC_HIDDEN; -extern PAGESIZE *find_pagesize( PPD *ppd, const DEVMODEW *dm ) DECLSPEC_HIDDEN; -extern DUPLEX *find_duplex( PPD *ppd, const DEVMODEW *dm ) DECLSPEC_HIDDEN; +extern INPUTSLOT *find_slot( PPD *ppd, const DEVMODEW *dm ); +extern PAGESIZE *find_pagesize( PPD *ppd, const DEVMODEW *dm ); +extern DUPLEX *find_duplex( PPD *ppd, const DEVMODEW *dm );
/* GDI driver functions */ extern BOOL PSDRV_Arc( print_ctx *ctx, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; + INT xstart, INT ystart, INT xend, INT yend ); extern BOOL PSDRV_Chord( print_ctx *ctx, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; -extern BOOL PSDRV_Ellipse( print_ctx *ctx, INT left, INT top, INT right, INT bottom) DECLSPEC_HIDDEN; -extern INT PSDRV_EndPage( print_ctx *ctx ) DECLSPEC_HIDDEN; + INT xstart, INT ystart, INT xend, INT yend ); +extern BOOL PSDRV_Ellipse( print_ctx *ctx, INT left, INT top, INT right, INT bottom); +extern INT PSDRV_EndPage( print_ctx *ctx ); extern INT PSDRV_ExtEscape( print_ctx *ctx, INT nEscape, INT cbInput, LPCVOID in_data, - INT cbOutput, LPVOID out_data ) DECLSPEC_HIDDEN; + INT cbOutput, LPVOID out_data ); extern BOOL PSDRV_ExtTextOut( print_ctx *ctx, INT x, INT y, UINT flags, - const RECT *lprect, LPCWSTR str, UINT count, const INT *lpDx ) DECLSPEC_HIDDEN; -extern BOOL PSDRV_FillPath( print_ctx *ctx ) DECLSPEC_HIDDEN; -extern BOOL PSDRV_LineTo(print_ctx *ctx, INT x, INT y) DECLSPEC_HIDDEN; -extern BOOL PSDRV_PaintRgn( print_ctx *ctx, HRGN hrgn ) DECLSPEC_HIDDEN; -extern BOOL PSDRV_PatBlt(print_ctx *ctx, struct ps_bitblt_coords *dst, DWORD dwRop) DECLSPEC_HIDDEN; + const RECT *lprect, LPCWSTR str, UINT count, const INT *lpDx ); +extern BOOL PSDRV_FillPath( print_ctx *ctx ); +extern BOOL PSDRV_LineTo(print_ctx *ctx, INT x, INT y); +extern BOOL PSDRV_PaintRgn( print_ctx *ctx, HRGN hrgn ); +extern BOOL PSDRV_PatBlt(print_ctx *ctx, struct ps_bitblt_coords *dst, DWORD dwRop); extern BOOL PSDRV_Pie( print_ctx *ctx, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; -extern BOOL PSDRV_PolyBezier( print_ctx *ctx, const POINT *pts, DWORD count ) DECLSPEC_HIDDEN; -extern BOOL PSDRV_PolyBezierTo( print_ctx *ctx, const POINT *pts, DWORD count ) DECLSPEC_HIDDEN; -extern BOOL PSDRV_PolyPolygon( print_ctx *ctx, const POINT* pts, const INT* counts, UINT polygons ) DECLSPEC_HIDDEN; -extern BOOL PSDRV_PolyPolyline( print_ctx *ctx, const POINT* pts, const DWORD* counts, DWORD polylines ) DECLSPEC_HIDDEN; + INT xstart, INT ystart, INT xend, INT yend ); +extern BOOL PSDRV_PolyBezier( print_ctx *ctx, const POINT *pts, DWORD count ); +extern BOOL PSDRV_PolyBezierTo( print_ctx *ctx, const POINT *pts, DWORD count ); +extern BOOL PSDRV_PolyPolygon( print_ctx *ctx, const POINT* pts, const INT* counts, UINT polygons ); +extern BOOL PSDRV_PolyPolyline( print_ctx *ctx, const POINT* pts, const DWORD* counts, DWORD polylines ); extern DWORD PSDRV_PutImage( print_ctx *ctx, HRGN clip, BITMAPINFO *info, const struct ps_image_bits *bits, struct ps_bitblt_coords *src, - struct ps_bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; -extern BOOL PSDRV_Rectangle( print_ctx *ctx, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; + struct ps_bitblt_coords *dst, DWORD rop ); +extern BOOL PSDRV_Rectangle( print_ctx *ctx, INT left, INT top, INT right, INT bottom ); extern BOOL PSDRV_RoundRect( print_ctx *ctx, INT left, INT top, INT right, - INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; -extern HBRUSH PSDRV_SelectBrush( print_ctx *ctx, HBRUSH hbrush, const struct ps_brush_pattern *pattern ) DECLSPEC_HIDDEN; -extern HFONT PSDRV_SelectFont( print_ctx *ctx, HFONT hfont, UINT *aa_flags ) DECLSPEC_HIDDEN; -extern HPEN PSDRV_SelectPen( print_ctx *ctx, HPEN hpen, const struct ps_brush_pattern *pattern ) DECLSPEC_HIDDEN; -extern COLORREF PSDRV_SetBkColor( print_ctx *ctx, COLORREF color ) DECLSPEC_HIDDEN; -extern COLORREF PSDRV_SetDCBrushColor( print_ctx *ctx, COLORREF color ) DECLSPEC_HIDDEN; -extern COLORREF PSDRV_SetDCPenColor( print_ctx *ctx, COLORREF color ) DECLSPEC_HIDDEN; -extern COLORREF PSDRV_SetPixel( print_ctx *ctx, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; -extern COLORREF PSDRV_SetTextColor( print_ctx *ctx, COLORREF color ) DECLSPEC_HIDDEN; -extern BOOL PSDRV_StrokeAndFillPath( print_ctx *ctx ) DECLSPEC_HIDDEN; -extern BOOL PSDRV_StrokePath( print_ctx *ctx ) DECLSPEC_HIDDEN; - -extern BOOL PSDRV_ResetDC( print_ctx *ctx, const DEVMODEW *lpInitData ) DECLSPEC_HIDDEN; + INT bottom, INT ell_width, INT ell_height ); +extern HBRUSH PSDRV_SelectBrush( print_ctx *ctx, HBRUSH hbrush, const struct ps_brush_pattern *pattern ); +extern HFONT PSDRV_SelectFont( print_ctx *ctx, HFONT hfont, UINT *aa_flags ); +extern HPEN PSDRV_SelectPen( print_ctx *ctx, HPEN hpen, const struct ps_brush_pattern *pattern ); +extern COLORREF PSDRV_SetBkColor( print_ctx *ctx, COLORREF color ); +extern COLORREF PSDRV_SetDCBrushColor( print_ctx *ctx, COLORREF color ); +extern COLORREF PSDRV_SetDCPenColor( print_ctx *ctx, COLORREF color ); +extern COLORREF PSDRV_SetPixel( print_ctx *ctx, INT x, INT y, COLORREF color ); +extern COLORREF PSDRV_SetTextColor( print_ctx *ctx, COLORREF color ); +extern BOOL PSDRV_StrokeAndFillPath( print_ctx *ctx ); +extern BOOL PSDRV_StrokePath( print_ctx *ctx ); + +extern BOOL PSDRV_ResetDC( print_ctx *ctx, const DEVMODEW *lpInitData ); extern void PSDRV_MergeDevmodes(PSDRV_DEVMODE *dm1, const DEVMODEW *dm2, - PRINTERINFO *pi) DECLSPEC_HIDDEN; -extern BOOL PSDRV_GetFontMetrics(void) DECLSPEC_HIDDEN; -extern PPD *PSDRV_ParsePPD(const WCHAR *fname, HANDLE printer) DECLSPEC_HIDDEN; -extern PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) DECLSPEC_HIDDEN; -extern const AFM *PSDRV_FindAFMinList(FONTFAMILY *head, LPCSTR name) DECLSPEC_HIDDEN; + PRINTERINFO *pi); +extern BOOL PSDRV_GetFontMetrics(void); +extern PPD *PSDRV_ParsePPD(const WCHAR *fname, HANDLE printer); +extern PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name); +extern const AFM *PSDRV_FindAFMinList(FONTFAMILY *head, LPCSTR name); extern BOOL PSDRV_AddAFMtoList(FONTFAMILY **head, const AFM *afm, - BOOL *p_added) DECLSPEC_HIDDEN; -extern void PSDRV_FreeAFMList( FONTFAMILY *head ) DECLSPEC_HIDDEN; + BOOL *p_added); +extern void PSDRV_FreeAFMList( FONTFAMILY *head );
-extern INT PSDRV_XWStoDS( print_ctx *ctx, INT width ) DECLSPEC_HIDDEN; +extern INT PSDRV_XWStoDS( print_ctx *ctx, INT width );
-extern BOOL PSDRV_Brush(print_ctx *ctx, BOOL EO) DECLSPEC_HIDDEN; -extern BOOL PSDRV_SetFont( print_ctx *ctx, BOOL vertical ) DECLSPEC_HIDDEN; -extern BOOL PSDRV_SetPen( print_ctx *ctx ) DECLSPEC_HIDDEN; +extern BOOL PSDRV_Brush(print_ctx *ctx, BOOL EO); +extern BOOL PSDRV_SetFont( print_ctx *ctx, BOOL vertical ); +extern BOOL PSDRV_SetPen( print_ctx *ctx );
-extern void PSDRV_AddClip( print_ctx *ctx, HRGN hrgn ) DECLSPEC_HIDDEN; -extern void PSDRV_SetClip( print_ctx *ctx ) DECLSPEC_HIDDEN; -extern void PSDRV_ResetClip( print_ctx *ctx ) DECLSPEC_HIDDEN; +extern void PSDRV_AddClip( print_ctx *ctx, HRGN hrgn ); +extern void PSDRV_SetClip( print_ctx *ctx ); +extern void PSDRV_ResetClip( print_ctx *ctx );
extern void PSDRV_CreateColor( print_ctx *ctx, PSCOLOR *pscolor, - COLORREF wincolor ) DECLSPEC_HIDDEN; -extern PSRGB rgb_to_grayscale_scale( void ) DECLSPEC_HIDDEN; -extern char PSDRV_UnicodeToANSI(int u) DECLSPEC_HIDDEN; - -extern INT PSDRV_WriteHeader( print_ctx *ctx, LPCWSTR title ) DECLSPEC_HIDDEN; -extern INT PSDRV_WriteFooter( print_ctx *ctx ) DECLSPEC_HIDDEN; -extern INT PSDRV_WriteNewPage( print_ctx *ctx ) DECLSPEC_HIDDEN; -extern INT PSDRV_WriteEndPage( print_ctx *ctx ) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteMoveTo(print_ctx *ctx, INT x, INT y) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteLineTo(print_ctx *ctx, INT x, INT y) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteStroke(print_ctx *ctx) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteRectangle(print_ctx *ctx, INT x, INT y, INT width, INT height) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteRRectangle(print_ctx *ctx, INT x, INT y, INT width, INT height) DECLSPEC_HIDDEN; + COLORREF wincolor ); +extern PSRGB rgb_to_grayscale_scale( void ); +extern char PSDRV_UnicodeToANSI(int u); + +extern INT PSDRV_WriteHeader( print_ctx *ctx, LPCWSTR title ); +extern INT PSDRV_WriteFooter( print_ctx *ctx ); +extern INT PSDRV_WriteNewPage( print_ctx *ctx ); +extern INT PSDRV_WriteEndPage( print_ctx *ctx ); +extern BOOL PSDRV_WriteMoveTo(print_ctx *ctx, INT x, INT y); +extern BOOL PSDRV_WriteLineTo(print_ctx *ctx, INT x, INT y); +extern BOOL PSDRV_WriteStroke(print_ctx *ctx); +extern BOOL PSDRV_WriteRectangle(print_ctx *ctx, INT x, INT y, INT width, INT height); +extern BOOL PSDRV_WriteRRectangle(print_ctx *ctx, INT x, INT y, INT width, INT height); extern BOOL PSDRV_WriteSetFont(print_ctx *ctx, const char *name, matrix size, INT escapement, - BOOL fake_italic) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteGlyphShow(print_ctx *ctx, LPCSTR g_name) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteSetPen(print_ctx *ctx) DECLSPEC_HIDDEN; + BOOL fake_italic); +extern BOOL PSDRV_WriteGlyphShow(print_ctx *ctx, LPCSTR g_name); +extern BOOL PSDRV_WriteSetPen(print_ctx *ctx); extern BOOL PSDRV_WriteArc(print_ctx *ctx, INT x, INT y, INT w, INT h, - double ang1, double ang2) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteCurveTo(print_ctx *ctx, POINT pts[3]) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteSetColor(print_ctx *ctx, PSCOLOR *color) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteSetBrush(print_ctx *ctx) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteFill(print_ctx *ctx) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteEOFill(print_ctx *ctx) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteGSave(print_ctx *ctx) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteGRestore(print_ctx *ctx) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteNewPath(print_ctx *ctx) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteClosePath(print_ctx *ctx) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteClip(print_ctx *ctx) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteRectClip(print_ctx *ctx, INT x, INT y, INT w, INT h) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteRectClip2(print_ctx *ctx, CHAR *pszArrayName) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteEOClip(print_ctx *ctx) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteHatch(print_ctx *ctx) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteRotate(print_ctx *ctx, float ang) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteIndexColorSpaceBegin(print_ctx *ctx, int size) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteIndexColorSpaceEnd(print_ctx *ctx) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteRGBQUAD(print_ctx *ctx, const RGBQUAD *rgb, int number) DECLSPEC_HIDDEN; + double ang1, double ang2); +extern BOOL PSDRV_WriteCurveTo(print_ctx *ctx, POINT pts[3]); +extern BOOL PSDRV_WriteSetColor(print_ctx *ctx, PSCOLOR *color); +extern BOOL PSDRV_WriteSetBrush(print_ctx *ctx); +extern BOOL PSDRV_WriteFill(print_ctx *ctx); +extern BOOL PSDRV_WriteEOFill(print_ctx *ctx); +extern BOOL PSDRV_WriteGSave(print_ctx *ctx); +extern BOOL PSDRV_WriteGRestore(print_ctx *ctx); +extern BOOL PSDRV_WriteNewPath(print_ctx *ctx); +extern BOOL PSDRV_WriteClosePath(print_ctx *ctx); +extern BOOL PSDRV_WriteClip(print_ctx *ctx); +extern BOOL PSDRV_WriteRectClip(print_ctx *ctx, INT x, INT y, INT w, INT h); +extern BOOL PSDRV_WriteRectClip2(print_ctx *ctx, CHAR *pszArrayName); +extern BOOL PSDRV_WriteEOClip(print_ctx *ctx); +extern BOOL PSDRV_WriteHatch(print_ctx *ctx); +extern BOOL PSDRV_WriteRotate(print_ctx *ctx, float ang); +extern BOOL PSDRV_WriteIndexColorSpaceBegin(print_ctx *ctx, int size); +extern BOOL PSDRV_WriteIndexColorSpaceEnd(print_ctx *ctx); +extern BOOL PSDRV_WriteRGBQUAD(print_ctx *ctx, const RGBQUAD *rgb, int number); extern BOOL PSDRV_WriteImage(print_ctx *ctx, WORD depth, BOOL grayscale, INT xDst, INT yDst, INT widthDst, INT heightDst, INT widthSrc, - INT heightSrc, BOOL mask, BOOL top_down) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteBytes(print_ctx *ctx, const BYTE *bytes, DWORD number) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteData(print_ctx *ctx, const BYTE *byte, DWORD number) DECLSPEC_HIDDEN; -extern DWORD PSDRV_WriteSpool(print_ctx *ctx, LPCSTR lpData, DWORD cch) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteDIBPatternDict(print_ctx *ctx, const BITMAPINFO *bmi, BYTE *bits, UINT usage) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteArrayPut(print_ctx *ctx, CHAR *pszArrayName, INT nIndex, LONG lCoord) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteArrayDef(print_ctx *ctx, CHAR *pszArrayName, INT nSize) DECLSPEC_HIDDEN; + INT heightSrc, BOOL mask, BOOL top_down); +extern BOOL PSDRV_WriteBytes(print_ctx *ctx, const BYTE *bytes, DWORD number); +extern BOOL PSDRV_WriteData(print_ctx *ctx, const BYTE *byte, DWORD number); +extern DWORD PSDRV_WriteSpool(print_ctx *ctx, LPCSTR lpData, DWORD cch); +extern BOOL PSDRV_WriteDIBPatternDict(print_ctx *ctx, const BITMAPINFO *bmi, BYTE *bits, UINT usage); +extern BOOL PSDRV_WriteArrayPut(print_ctx *ctx, CHAR *pszArrayName, INT nIndex, LONG lCoord); +extern BOOL PSDRV_WriteArrayDef(print_ctx *ctx, CHAR *pszArrayName, INT nSize);
-extern INT PSDRV_StartPage( print_ctx *ctx ) DECLSPEC_HIDDEN; +extern INT PSDRV_StartPage( print_ctx *ctx );
-INT PSDRV_GlyphListInit(void) DECLSPEC_HIDDEN; -const GLYPHNAME *PSDRV_GlyphName(LPCSTR szName) DECLSPEC_HIDDEN; -VOID PSDRV_IndexGlyphList(void) DECLSPEC_HIDDEN; -BOOL PSDRV_GetType1Metrics(void) DECLSPEC_HIDDEN; -SHORT PSDRV_CalcAvgCharWidth(const AFM *afm) DECLSPEC_HIDDEN; +INT PSDRV_GlyphListInit(void); +const GLYPHNAME *PSDRV_GlyphName(LPCSTR szName); +VOID PSDRV_IndexGlyphList(void); +BOOL PSDRV_GetType1Metrics(void); +SHORT PSDRV_CalcAvgCharWidth(const AFM *afm);
-extern BOOL PSDRV_WriteSetBuiltinFont(print_ctx *ctx) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteBuiltinGlyphShow(print_ctx *ctx, LPCWSTR str, INT count) DECLSPEC_HIDDEN; +extern BOOL PSDRV_WriteSetBuiltinFont(print_ctx *ctx); +extern BOOL PSDRV_WriteBuiltinGlyphShow(print_ctx *ctx, LPCWSTR str, INT count);
-extern BOOL PSDRV_WriteSetDownloadFont(print_ctx *ctx, BOOL vertical) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteDownloadGlyphShow(print_ctx *ctx, const WORD *glyphs, UINT count) DECLSPEC_HIDDEN; -extern BOOL PSDRV_EmptyDownloadList(print_ctx *ctx, BOOL write_undef) DECLSPEC_HIDDEN; +extern BOOL PSDRV_WriteSetDownloadFont(print_ctx *ctx, BOOL vertical); +extern BOOL PSDRV_WriteDownloadGlyphShow(print_ctx *ctx, const WORD *glyphs, UINT count); +extern BOOL PSDRV_EmptyDownloadList(print_ctx *ctx, BOOL write_undef);
-extern DWORD write_spool( print_ctx *ctx, const void *data, DWORD num ) DECLSPEC_HIDDEN; +extern DWORD write_spool( print_ctx *ctx, const void *data, DWORD num );
#define MAX_G_NAME 31 /* max length of PS glyph name */ -extern void get_glyph_name(HDC hdc, WORD index, char *name) DECLSPEC_HIDDEN; +extern void get_glyph_name(HDC hdc, WORD index, char *name);
extern TYPE1 *T1_download_header(print_ctx *ctx, char *ps_name, - RECT *bbox, UINT emsize) DECLSPEC_HIDDEN; + RECT *bbox, UINT emsize); extern BOOL T1_download_glyph(print_ctx *ctx, DOWNLOAD *pdl, - DWORD index, char *glyph_name) DECLSPEC_HIDDEN; -extern void T1_free(TYPE1 *t1) DECLSPEC_HIDDEN; + DWORD index, char *glyph_name); +extern void T1_free(TYPE1 *t1);
extern TYPE42 *T42_download_header(print_ctx *ctx, char *ps_name, - RECT *bbox, UINT emsize) DECLSPEC_HIDDEN; + RECT *bbox, UINT emsize); extern BOOL T42_download_glyph(print_ctx *ctx, DOWNLOAD *pdl, - DWORD index, char *glyph_name) DECLSPEC_HIDDEN; -extern void T42_free(TYPE42 *t42) DECLSPEC_HIDDEN; + DWORD index, char *glyph_name); +extern void T42_free(TYPE42 *t42);
-extern DWORD RLE_encode(BYTE *in_buf, DWORD len, BYTE *out_buf) DECLSPEC_HIDDEN; -extern DWORD ASCII85_encode(BYTE *in_buf, DWORD len, BYTE *out_buf) DECLSPEC_HIDDEN; +extern DWORD RLE_encode(BYTE *in_buf, DWORD len, BYTE *out_buf); +extern DWORD ASCII85_encode(BYTE *in_buf, DWORD len, BYTE *out_buf);
-extern void passthrough_enter(print_ctx *ctx) DECLSPEC_HIDDEN; -extern void passthrough_leave(print_ctx *ctx) DECLSPEC_HIDDEN; +extern void passthrough_enter(print_ctx *ctx); +extern void passthrough_leave(print_ctx *ctx);
#define push_lc_numeric(x) do { \ const char *tmplocale = setlocale(LC_NUMERIC,NULL); \ diff --git a/dlls/wineps.drv/text.c b/dlls/wineps.drv/text.c index 7342378effd..4041f2175d6 100644 --- a/dlls/wineps.drv/text.c +++ b/dlls/wineps.drv/text.c @@ -40,7 +40,7 @@ static BOOL PSDRV_Text(print_ctx *ctx, INT x, INT y, UINT flags, LPCWSTR str, UINT count, BOOL bDrawBackground, const INT *lpDx);
-extern const unsigned short vertical_orientation_table[] DECLSPEC_HIDDEN; +extern const unsigned short vertical_orientation_table[];
static BOOL check_unicode_tategaki(WCHAR uchar) {