mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-07 18:47:56 +00:00
wineps.drv: Only merge dmDefaultSource member of devmodes when a slot is found.
In the PSDRV_MergeDevmodes and merge_devmodes functions, there is a check earlier to update dmDefaultSource only if a slot is found, and so this member should not be updated again with no such check.
This commit is contained in:
parent
b3fa23e88d
commit
11a386960e
|
@ -181,8 +181,6 @@ void PSDRV_MergeDevmodes( PSDRV_DEVMODE *dm1, const DEVMODEW *dm2, PRINTERINFO *
|
|||
TRACE("Trying to change to unsupported bin %d\n", dm2->dmDefaultSource);
|
||||
}
|
||||
|
||||
if (dm2->dmFields & DM_DEFAULTSOURCE )
|
||||
dm1->dmPublic.dmDefaultSource = dm2->dmDefaultSource;
|
||||
if (dm2->dmFields & DM_PRINTQUALITY )
|
||||
dm1->dmPublic.dmPrintQuality = dm2->dmPrintQuality;
|
||||
if (dm2->dmFields & DM_COLOR )
|
||||
|
|
|
@ -422,8 +422,6 @@ static void merge_devmodes(PSDRV_DEVMODE *dm1, const DEVMODEW *dm2,
|
|||
TRACE("Trying to change to unsupported bin %d\n", dm2->dmDefaultSource);
|
||||
}
|
||||
|
||||
if (dm2->dmFields & DM_DEFAULTSOURCE)
|
||||
dm1->dmPublic.dmDefaultSource = dm2->dmDefaultSource;
|
||||
if (dm2->dmFields & DM_PRINTQUALITY)
|
||||
dm1->dmPublic.dmPrintQuality = dm2->dmPrintQuality;
|
||||
if (dm2->dmFields & DM_COLOR)
|
||||
|
|
Loading…
Reference in a new issue