system/wine
system/wine
1
0
Fork 0
mirror of https://github.com/wine-mirror/wine synced 2024-07-10 04:46:10 +00:00
Code Issues Projects Releases Wiki Activity

wineps.drv: Only merge dmDefaultSource member of devmodes when a slot is found.

Browse Source 
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:
Danyil Blyschak 2024-05-24 16:13:46 -05:00 committed by Alexandre Julliard
parent b3fa23e88d
commit 11a386960e
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/wineps.drv/driver.c
View File

@ -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 )

2
dlls/wineps.drv/unixlib.c
View File

@ -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)