[PATCH v2 0/1] MR5720: wineps.drv: Only merge dmDefaultSource member of devmodes when a slot is found.

[Danyil Blyschak (＠blyss)]

There is a check earlier in the PSDRV_MergeDevmodes/merge_devmodes functions to update
dmDefaultSource if a slot is found, and so this member should not be
updated again with no such check.

--
  v2: wineps.drv: Only merge dmDefaultSource member of devmodes when a slot is found.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/5720

[PATCH v2 1/1] wineps.drv: Only merge dmDefaultSource member of devmodes when a slot is found.

[Danyil Blyschak]

From: Danyil Blyschak <dblyschak(a)codeweavers.com>

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

https://gitlab.winehq.org/wine/wine/-/merge_requests/5720

[PATCH v2 1/1] wineps.drv: Only merge dmDefaultSource member of devmodes when a slot is found.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=145874

Your paranoid android.


=== debian11b (build log) ===

error: patch failed: dlls/wineps.drv/driver.c:181
error: patch failed: dlls/wineps.drv/unixlib.c:422
Task: Patch failed to apply

[PATCH v2 0/1] MR5720: wineps.drv: Only merge dmDefaultSource member of devmodes when a slot is found. - approved

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/5720