wineps.drv: Set the AP_D_InputSlot CUPS option if no input slot is specified.

This overrides a default InputSlot value specified or derived from the PPD and allows the tray to be auto-selected based on the media. Signed-off-by: Ken Thomases <ken@codeweavers.com> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wineps.drv: Set the AP_D_InputSlot CUPS option if no input slot is specified.
485840bc · Ken Thomases · Alexandre Julliard · d7f68cb5 · 485840bc
Commit 485840bc authored Mar 12, 2017 by Ken Thomases Committed by Alexandre Julliard Mar 13, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

ps.c dlls/wineps.drv/ps.c +5 -0

No files found.
--- a/dlls/wineps.drv/ps.c
+++ b/dlls/wineps.drv/ps.c
@@ -50,6 +50,7 @@ static const char *cups_duplexes[3] =
 };
 static const char cups_collate_false[] = "%cupsJobTicket: collate=false\n";
 static const char cups_collate_true[] = "%cupsJobTicket: collate=true\n";
+static const char cups_ap_d_inputslot[] = "%cupsJobTicket: AP_D_InputSlot=\n"; /* intentionally empty value */

 static const char psheader[] = /* title llx lly urx ury orientation */
 "%%%%Creator: Wine PostScript Driver\n"
@@ -375,6 +376,10 @@ static void write_cups_job_ticket( PHYSDEV dev, const struct ticket_info *info )
                write_spool( dev, cups_collate_true, sizeof(cups_collate_true) - 1 );
        }
    }
+
+    if (!(physDev->Devmode->dmPublic.dmFields & DM_DEFAULTSOURCE) ||
+        physDev->Devmode->dmPublic.u1.s1.dmDefaultSource == DMBIN_AUTO)
+        write_spool( dev, cups_ap_d_inputslot, sizeof(cups_ap_d_inputslot) - 1 );
 }

 INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title )