system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-01 20:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

wineps: Always initialize the Windows page type.

Browse source
This commit is contained in:
Huw Davies 2014-04-16 11:58:01 +01:00 committed by Alexandre Julliard
parent 293c53e22f
commit ef08f69efc
1 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -816,26 +816,13 @@ PPD *PSDRV_ParsePPD( const WCHAR *fname, HANDLE printer )
tuple.value = NULL;
}
else if(!strcmp("*PageSize", tuple.key)) {
else if(!strcmp("*PageSize", tuple.key))
{
page = get_pagesize( ppd, tuple.option, TRUE );
if(!page->Name) {
int i;
page->Name = tuple.option;
tuple.option = NULL;
for(i = 0; PageTrans[i].PSName; i++) {
if(!strcmp(PageTrans[i].PSName, page->Name)) { /* case ? */
page->WinPage = PageTrans[i].WinPage;
break;
}
}
if(!page->WinPage) {
TRACE("Can't find Windows page type for '%s' - using %u\n",
page->Name, UserPageType);
page->WinPage = UserPageType++;
}
}
if(!page->FullName) {
if(tuple.opttrans) {
@ -851,7 +838,24 @@ PPD *PSDRV_ParsePPD( const WCHAR *fname, HANDLE printer )
page->InvocationString = tuple.value;
tuple.value = NULL;
}
}
if (!page->WinPage)
{
int i;
for (i = 0; PageTrans[i].PSName; i++)
{
if (!strcmp( PageTrans[i].PSName, page->Name ))
{
page->WinPage = PageTrans[i].WinPage;
break;
}
}
if (!page->WinPage)
{
TRACE( "Can't find Windows page type for %s - using %u\n", debugstr_a(page->Name), UserPageType );
page->WinPage = UserPageType++;
}
}
}
else if(!strcmp("*DefaultPageSize", tuple.key))
{