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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 11a386960ebcc7de0e194912bae28c99ff2f899e
URL:    https://gitlab.winehq.org/wine/wine/-/commit/11a386960ebcc7de0e194912bae28c9...

Author: Danyil Blyschak 
Date:   Fri May 24 16:13:46 2024 -0500

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.

---

dlls/wineps.drv/driver.c  | 2 --
 dlls/wineps.drv/unixlib.c | 2 --
 2 files changed, 4 deletions(-)

diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c
index d56118e5e2c..1170e161b17 100644
--- a/dlls/wineps.drv/driver.c
+++ b/dlls/wineps.drv/driver.c
@@ -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 )
diff --git a/dlls/wineps.drv/unixlib.c b/dlls/wineps.drv/unixlib.c
index e9b009b0e87..a96f919c02a 100644
--- a/dlls/wineps.drv/unixlib.c
+++ b/dlls/wineps.drv/unixlib.c
@@ -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)