github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add switch to declare printer as default or not

Browse Source
This commit is contained in:
Simon Nivault 2022-09-20 10:36:45 +02:00 committed by akallabeth
parent 8d97215881
commit 82b58325a3
7 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
channels/printer/client/cups/printer_cups.c
View File

@ -378,12 +378,12 @@ static rdpPrinter** printer_cups_enum_printers(rdpPrinterDriver* driver)
} }
static rdpPrinter* printer_cups_get_printer(rdpPrinterDriver* driver, const char* name, static rdpPrinter* printer_cups_get_printer(rdpPrinterDriver* driver, const char* name,
const char* driverName) const char* driverName, BOOL isDefault)
{ {
rdpCupsPrinterDriver* cups_driver = (rdpCupsPrinterDriver*)driver; rdpCupsPrinterDriver* cups_driver = (rdpCupsPrinterDriver*)driver;
WINPR_ASSERT(cups_driver); WINPR_ASSERT(cups_driver);
return printer_cups_new_printer(cups_driver, name, driverName, FALSE); return printer_cups_new_printer(cups_driver, name, driverName, isDefault);
} }
static void printer_cups_add_ref_driver(rdpPrinterDriver* driver) static void printer_cups_add_ref_driver(rdpPrinterDriver* driver)

2
channels/printer/client/printer_main.c
View File

@ -1072,7 +1072,7 @@ UINT printer_DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints)
if (name && name[0]) if (name && name[0])
{ {
WINPR_ASSERT(driver->GetPrinter); WINPR_ASSERT(driver->GetPrinter);
rdpPrinter* printer = driver->GetPrinter(driver, name, driver_name); rdpPrinter* printer = driver->GetPrinter(driver, name, driver_name, device->IsDefault);
if (!printer) if (!printer)
{ {

4
channels/printer/client/win/printer_win.c
View File

@ -384,7 +384,7 @@ static rdpPrinter** printer_win_enum_printers(rdpPrinterDriver* driver)
} }
static rdpPrinter* printer_win_get_printer(rdpPrinterDriver* driver, const char* name, static rdpPrinter* printer_win_get_printer(rdpPrinterDriver* driver, const char* name,
const char* driverName) const char* driverName, BOOL isDefault)
{ {
WCHAR* driverNameW = NULL; WCHAR* driverNameW = NULL;
WCHAR* nameW = NULL; WCHAR* nameW = NULL;
@ -404,7 +404,7 @@ static rdpPrinter* printer_win_get_printer(rdpPrinterDriver* driver, const char*
return NULL; return NULL;
} }
myPrinter = printer_win_new_printer(win_driver, nameW, driverNameW, FALSE); myPrinter = printer_win_new_printer(win_driver, nameW, driverNameW, isDefault);
free(driverNameW); free(driverNameW);
free(nameW); free(nameW);

2
client/common/cmdline.c
View File

@ -502,7 +502,7 @@ BOOL freerdp_client_print_command_line_help_ex(int argc, char** argv,
printf("Serial Port Redirection: /serial:<name>,<device>,[SerCx2|SerCx|Serial],[permissive]\n"); printf("Serial Port Redirection: /serial:<name>,<device>,[SerCx2|SerCx|Serial],[permissive]\n");
printf("Serial Port Redirection: /serial:COM1,/dev/ttyS0\n"); printf("Serial Port Redirection: /serial:COM1,/dev/ttyS0\n");
printf("Parallel Port Redirection: /parallel:<name>,<device>\n"); printf("Parallel Port Redirection: /parallel:<name>,<device>\n");
printf("Printer Redirection: /printer:<device>,<driver>\n"); printf("Printer Redirection: /printer:<device>,<driver>,[default]\n");
printf("TCP redirection: /rdp2tcp:/usr/bin/rdp2tcp\n"); printf("TCP redirection: /rdp2tcp:/usr/bin/rdp2tcp\n");
printf("\n"); printf("\n");
printf("Audio Output Redirection: /sound:sys:oss,dev:1,format:1\n"); printf("Audio Output Redirection: /sound:sys:oss,dev:1,format:1\n");

2
include/freerdp/client/printer.h
View File

@ -34,7 +34,7 @@ typedef rdpPrinter** (*pcEnumPrinters)(rdpPrinterDriver* driver);
typedef void (*pcReleaseEnumPrinters)(rdpPrinter** printers); typedef void (*pcReleaseEnumPrinters)(rdpPrinter** printers);
typedef rdpPrinter* (*pcGetPrinter)(rdpPrinterDriver* driver, const char* name, typedef rdpPrinter* (*pcGetPrinter)(rdpPrinterDriver* driver, const char* name,
const char* driverName); const char* driverName, BOOL isDefault);
typedef void (*pcReferencePrinter)(rdpPrinter* printer); typedef void (*pcReferencePrinter)(rdpPrinter* printer);
struct rdp_printer_driver struct rdp_printer_driver

1
include/freerdp/settings.h
View File

@ -452,6 +452,7 @@ typedef struct
{ {
RDPDR_DEVICE device; RDPDR_DEVICE device;
char* DriverName; char* DriverName;
BOOL IsDefault;
} RDPDR_PRINTER; } RDPDR_PRINTER;
typedef struct typedef struct

5
libfreerdp/common/settings.c
View File

@ -334,6 +334,11 @@ RDPDR_DEVICE* freerdp_device_new(UINT32 Type, size_t count, const char* args[])
if (!device.printer->DriverName) if (!device.printer->DriverName)
goto fail; goto fail;
} }
if (count > 2)
{
device.printer->IsDefault = _stricmp(args[2], "default") == 0;
}
break; break;
case RDPDR_DTYP_SERIAL: case RDPDR_DTYP_SERIAL:
if (count > 1) if (count > 1)