Added more paper sizes and bin names to PPD parser.

This commit is contained in:
Huw D M Davies 1999-07-27 16:09:40 +00:00 committed by Alexandre Julliard
parent bc2ad4a267
commit 0f184bf01f
2 changed files with 42 additions and 14 deletions

View File

@ -30,16 +30,39 @@ static struct {
char *PSName; char *PSName;
WORD WinPage; WORD WinPage;
} PageTrans[] = { } PageTrans[] = {
{"A4", DMPAPER_A4}, {"A2", DMPAPER_A2},
{"Letter", DMPAPER_LETTER}, {"A3", DMPAPER_A3},
{"Legal", DMPAPER_LEGAL}, {"A4", DMPAPER_A4},
{"Executive", DMPAPER_EXECUTIVE}, {"A5", DMPAPER_A5},
{"Comm10", DMPAPER_ENV_10}, {"B4", DMPAPER_B4},
{"Monarch", DMPAPER_ENV_MONARCH}, {"B5", DMPAPER_B5},
{"DL", DMPAPER_ENV_DL}, {"C4", DMPAPER_ENV_C4},
{"C5", DMPAPER_ENV_C5}, {"C5", DMPAPER_ENV_C5},
{"B5", DMPAPER_ENV_B5}, {"C6", DMPAPER_ENV_C6},
{NULL, 0} {"Comm10", DMPAPER_ENV_10},
{"DL", DMPAPER_ENV_DL},
{"DoublePostcard", DMPAPER_DBL_JAPANESE_POSTCARD},
{"Env9", DMPAPER_ENV_9},
{"Env10", DMPAPER_ENV_10},
{"Env11", DMPAPER_ENV_11},
{"Env12", DMPAPER_ENV_12},
{"Env14", DMPAPER_ENV_14},
{"EnvC4", DMPAPER_ENV_C4},
{"EnvC5", DMPAPER_ENV_C5},
{"EnvC6", DMPAPER_ENV_C6},
{"EnvDL", DMPAPER_ENV_DL},
{"EnvISOB4", DMPAPER_ENV_B4},
{"EnvISOB5", DMPAPER_ENV_B5},
{"EnvISOB6", DMPAPER_ENV_B6},
{"EnvMonarch", DMPAPER_ENV_MONARCH},
{"Executive", DMPAPER_EXECUTIVE},
{"FanFoldGerman", DMPAPER_FANFOLD_STD_GERMAN},
{"FanFoldGermanLegal", DMPAPER_FANFOLD_LGL_GERMAN},
{"Legal", DMPAPER_LEGAL},
{"Letter", DMPAPER_LETTER},
{"Monarch", DMPAPER_ENV_MONARCH},
{"Postcard", DMPAPER_JAPANESE_POSTCARD},
{NULL, 0}
}; };
/* the same for bin names */ /* the same for bin names */
@ -48,10 +71,12 @@ static struct {
char *PSName; char *PSName;
WORD WinBin; WORD WinBin;
} BinTrans[] = { } BinTrans[] = {
{"Lower", DMBIN_LOWER},
{"Upper", DMBIN_UPPER},
{"Envelope", DMBIN_ENVELOPE}, {"Envelope", DMBIN_ENVELOPE},
{"LargeCapacity", DMBIN_LARGECAPACITY}, {"LargeCapacity", DMBIN_LARGECAPACITY},
{"Lower", DMBIN_LOWER},
{"ManualFeed", DMBIN_MANUAL},
{"Middle", DMBIN_MIDDLE},
{"Upper", DMBIN_UPPER},
{NULL, 0} {NULL, 0}
}; };

View File

@ -2817,8 +2817,11 @@ DECL_WINELIB_TYPE_AW(LPDEVMODE)
#define DMPAPER_B5_EXTRA 65 #define DMPAPER_B5_EXTRA 65
#define DMPAPER_A2 66 #define DMPAPER_A2 66
#define DMPAPER_A3_TRANSVERSE 67 #define DMPAPER_A3_TRANSVERSE 67
#define DMPAPER_A3_EXTRA_TRANSVERSE 68 #define DMPAPER_A3_EXTRA_TRANSVERSE 68
#define DMPAPER_LAST DMPAPER_A3_EXTRA_TRANSVERSE #define DMPAPER_DBL_JAPANESE_POSTCARD 69
#define DMPAPER_JAPANESE_POSTCARD_ROTATED 81
#define DMPAPER_DBL_JAPANESE_POSTCARD_ROTATED 82
#define DMPAPER_LAST DMPAPER_DBL_JAPANESE_POSTCARD_ROTATED
#define DMPAPER_USER 256 #define DMPAPER_USER 256
#define DMBIN_FIRST DMBIN_UPPER #define DMBIN_FIRST DMBIN_UPPER