system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-02 20:18:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

wineps.drv: Remove paper sizes that lack either a PageSize or a PaperDimension entry in the PPD.

Browse source
This commit is contained in:
Huw Davies 2007-03-08 14:44:26 +00:00 committed by Alexandre Julliard
parent 277f474451
commit 6316429c80
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
dlls/wineps.drv/ppd.c
View file

@ -551,6 +551,7 @@ PPD *PSDRV_ParsePPD(char *fname)
PPD *ppd; PPD *ppd;
PPDTuple tuple; PPDTuple tuple;
char *default_pagesize = NULL, *default_duplex = NULL; char *default_pagesize = NULL, *default_duplex = NULL;
PAGESIZE *page, *page_cursor2;
TRACE("file '%s'\n", fname); TRACE("file '%s'\n", fname);
@ -647,7 +648,6 @@ PPD *PSDRV_ParsePPD(char *fname)
} }
else if(!strcmp("*PageSize", tuple.key)) { else if(!strcmp("*PageSize", tuple.key)) {
PAGESIZE *page;
page = PSDRV_PPDGetPageSizeInfo(ppd, tuple.option); page = PSDRV_PPDGetPageSizeInfo(ppd, tuple.option);
if(!page->Name) { if(!page->Name) {
@ -694,7 +694,6 @@ PPD *PSDRV_ParsePPD(char *fname)
} }
else if(!strcmp("*ImageableArea", tuple.key)) { else if(!strcmp("*ImageableArea", tuple.key)) {
PAGESIZE *page;
page = PSDRV_PPDGetPageSizeInfo(ppd, tuple.option); page = PSDRV_PPDGetPageSizeInfo(ppd, tuple.option);
if(!page->Name) { if(!page->Name) {
@ -719,7 +718,6 @@ PPD *PSDRV_ParsePPD(char *fname)
else if(!strcmp("*PaperDimension", tuple.key)) { else if(!strcmp("*PaperDimension", tuple.key)) {
PAGESIZE *page;
page = PSDRV_PPDGetPageSizeInfo(ppd, tuple.option); page = PSDRV_PPDGetPageSizeInfo(ppd, tuple.option);
if(!page->Name) { if(!page->Name) {
@ -859,10 +857,25 @@ PPD *PSDRV_ParsePPD(char *fname)
} }
/* Remove any partial page size entries, that is any without a PageSize or a PaperDimension (we can
cope with a missing ImageableArea). */
LIST_FOR_EACH_ENTRY_SAFE(page, page_cursor2, &ppd->PageSizes, PAGESIZE, entry)
{
if(!page->InvocationString || !page->PaperDimension)
{
WARN("Removing page %s since it has a missing %s entry\n", debugstr_a(page->FullName),
page->InvocationString ? "PaperDimension" : "InvocationString");
HeapFree(PSDRV_Heap, 0, page->Name);
HeapFree(PSDRV_Heap, 0, page->FullName);
HeapFree(PSDRV_Heap, 0, page->InvocationString);
HeapFree(PSDRV_Heap, 0, page->ImageableArea);
HeapFree(PSDRV_Heap, 0, page->PaperDimension);
list_remove(&page->entry);
}
}
ppd->DefaultPageSize = NULL; ppd->DefaultPageSize = NULL;
if(default_pagesize) { if(default_pagesize) {
PAGESIZE *page;
LIST_FOR_EACH_ENTRY(page, &ppd->PageSizes, PAGESIZE, entry) { LIST_FOR_EACH_ENTRY(page, &ppd->PageSizes, PAGESIZE, entry) {
if(!strcmp(page->Name, default_pagesize)) { if(!strcmp(page->Name, default_pagesize)) {
ppd->DefaultPageSize = page; ppd->DefaultPageSize = page;