sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-22 05:57:43 +03:00
Code

s3-printing: move driver_info_ctr_to_info8 to init_spoolss.h

Browse Source 
Guenther

Pair-Programmed-With: David Disseldorp <ddiss@suse.de>
This commit is contained in:
Günther Deschner 2011-07-05 02:12:24 +02:00
parent dd5375b4a1
commit 74e416031b
5 changed files with 92 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source3/include/nt_printing.h
View File

@ -153,9 +153,6 @@ bool is_printer_published(TALLOC_CTX *mem_ctx,
WERROR check_published_printers(struct messaging_context *msg_ctx);
bool driver_info_ctr_to_info8(struct spoolss_AddDriverInfoCtr *r,
struct spoolss_DriverInfo8 *_info8);
bool printer_driver_in_use(TALLOC_CTX *mem_ctx,
const struct auth_serversupplied_info *server_info,
struct messaging_context *msg_ctx,

90
source3/printing/nt_printing.c
View File

@ -1339,96 +1339,6 @@ WERROR spoolss_create_default_secdesc(TALLOC_CTX *mem_ctx,
return WERR_OK;
}
/****************************************************************************
****************************************************************************/
bool driver_info_ctr_to_info8(struct spoolss_AddDriverInfoCtr *r,
struct spoolss_DriverInfo8 *_info8)
{
struct spoolss_DriverInfo8 info8;
ZERO_STRUCT(info8);
switch (r->level) {
case 3:
info8.version = r->info.info3->version;
info8.driver_name = r->info.info3->driver_name;
info8.architecture = r->info.info3->architecture;
info8.driver_path = r->info.info3->driver_path;
info8.data_file = r->info.info3->data_file;
info8.config_file = r->info.info3->config_file;
info8.help_file = r->info.info3->help_file;
info8.monitor_name = r->info.info3->monitor_name;
info8.default_datatype = r->info.info3->default_datatype;
if (r->info.info3->dependent_files && r->info.info3->dependent_files->string) {
info8.dependent_files = r->info.info3->dependent_files->string;
}
break;
case 6:
info8.version = r->info.info6->version;
info8.driver_name = r->info.info6->driver_name;
info8.architecture = r->info.info6->architecture;
info8.driver_path = r->info.info6->driver_path;
info8.data_file = r->info.info6->data_file;
info8.config_file = r->info.info6->config_file;
info8.help_file = r->info.info6->help_file;
info8.monitor_name = r->info.info6->monitor_name;
info8.default_datatype = r->info.info6->default_datatype;
if (r->info.info6->dependent_files && r->info.info6->dependent_files->string) {
info8.dependent_files = r->info.info6->dependent_files->string;
}
info8.driver_date = r->info.info6->driver_date;
info8.driver_version = r->info.info6->driver_version;
info8.manufacturer_name = r->info.info6->manufacturer_name;
info8.manufacturer_url = r->info.info6->manufacturer_url;
info8.hardware_id = r->info.info6->hardware_id;
info8.provider = r->info.info6->provider;
break;
case 8:
info8.version = r->info.info8->version;
info8.driver_name = r->info.info8->driver_name;
info8.architecture = r->info.info8->architecture;
info8.driver_path = r->info.info8->driver_path;
info8.data_file = r->info.info8->data_file;
info8.config_file = r->info.info8->config_file;
info8.help_file = r->info.info8->help_file;
info8.monitor_name = r->info.info8->monitor_name;
info8.default_datatype = r->info.info8->default_datatype;
if (r->info.info8->dependent_files && r->info.info8->dependent_files->string) {
info8.dependent_files = r->info.info8->dependent_files->string;
}
if (r->info.info8->previous_names && r->info.info8->previous_names->string) {
info8.previous_names = r->info.info8->previous_names->string;
}
info8.driver_date = r->info.info8->driver_date;
info8.driver_version = r->info.info8->driver_version;
info8.manufacturer_name = r->info.info8->manufacturer_name;
info8.manufacturer_url = r->info.info8->manufacturer_url;
info8.hardware_id = r->info.info8->hardware_id;
info8.provider = r->info.info8->provider;
info8.print_processor = r->info.info8->print_processor;
info8.vendor_setup = r->info.info8->vendor_setup;
if (r->info.info8->color_profiles && r->info.info8->color_profiles->string) {
info8.color_profiles = r->info.info8->color_profiles->string;
}
info8.inf_path = r->info.info8->inf_path;
info8.printer_driver_attributes = r->info.info8->printer_driver_attributes;
if (r->info.info8->core_driver_dependencies && r->info.info8->core_driver_dependencies->string) {
info8.core_driver_dependencies = r->info.info8->core_driver_dependencies->string;
}
info8.min_inbox_driver_ver_date = r->info.info8->min_inbox_driver_ver_date;
info8.min_inbox_driver_ver_version = r->info.info8->min_inbox_driver_ver_version;
break;
default:
return false;
}
*_info8 = info8;
return true;
}
/****************************************************************************
Determine whether or not a particular driver is currently assigned
to a printer

89
source3/rpc_client/init_spoolss.c
View File

@ -119,3 +119,92 @@ void spoolss_printerinfo2_to_setprinterinfo2(const struct spoolss_PrinterInfo2 *
s->cjobs = i->cjobs;
s->averageppm = i->averageppm;
}
/****************************************************************************
****************************************************************************/
bool driver_info_ctr_to_info8(struct spoolss_AddDriverInfoCtr *r,
struct spoolss_DriverInfo8 *_info8)
{
struct spoolss_DriverInfo8 info8;
ZERO_STRUCT(info8);
switch (r->level) {
case 3:
info8.version = r->info.info3->version;
info8.driver_name = r->info.info3->driver_name;
info8.architecture = r->info.info3->architecture;
info8.driver_path = r->info.info3->driver_path;
info8.data_file = r->info.info3->data_file;
info8.config_file = r->info.info3->config_file;
info8.help_file = r->info.info3->help_file;
info8.monitor_name = r->info.info3->monitor_name;
info8.default_datatype = r->info.info3->default_datatype;
if (r->info.info3->dependent_files && r->info.info3->dependent_files->string) {
info8.dependent_files = r->info.info3->dependent_files->string;
}
break;
case 6:
info8.version = r->info.info6->version;
info8.driver_name = r->info.info6->driver_name;
info8.architecture = r->info.info6->architecture;
info8.driver_path = r->info.info6->driver_path;
info8.data_file = r->info.info6->data_file;
info8.config_file = r->info.info6->config_file;
info8.help_file = r->info.info6->help_file;
info8.monitor_name = r->info.info6->monitor_name;
info8.default_datatype = r->info.info6->default_datatype;
if (r->info.info6->dependent_files && r->info.info6->dependent_files->string) {
info8.dependent_files = r->info.info6->dependent_files->string;
}
info8.driver_date = r->info.info6->driver_date;
info8.driver_version = r->info.info6->driver_version;
info8.manufacturer_name = r->info.info6->manufacturer_name;
info8.manufacturer_url = r->info.info6->manufacturer_url;
info8.hardware_id = r->info.info6->hardware_id;
info8.provider = r->info.info6->provider;
break;
case 8:
info8.version = r->info.info8->version;
info8.driver_name = r->info.info8->driver_name;
info8.architecture = r->info.info8->architecture;
info8.driver_path = r->info.info8->driver_path;
info8.data_file = r->info.info8->data_file;
info8.config_file = r->info.info8->config_file;
info8.help_file = r->info.info8->help_file;
info8.monitor_name = r->info.info8->monitor_name;
info8.default_datatype = r->info.info8->default_datatype;
if (r->info.info8->dependent_files && r->info.info8->dependent_files->string) {
info8.dependent_files = r->info.info8->dependent_files->string;
}
if (r->info.info8->previous_names && r->info.info8->previous_names->string) {
info8.previous_names = r->info.info8->previous_names->string;
}
info8.driver_date = r->info.info8->driver_date;
info8.driver_version = r->info.info8->driver_version;
info8.manufacturer_name = r->info.info8->manufacturer_name;
info8.manufacturer_url = r->info.info8->manufacturer_url;
info8.hardware_id = r->info.info8->hardware_id;
info8.provider = r->info.info8->provider;
info8.print_processor = r->info.info8->print_processor;
info8.vendor_setup = r->info.info8->vendor_setup;
if (r->info.info8->color_profiles && r->info.info8->color_profiles->string) {
info8.color_profiles = r->info.info8->color_profiles->string;
}
info8.inf_path = r->info.info8->inf_path;
info8.printer_driver_attributes = r->info.info8->printer_driver_attributes;
if (r->info.info8->core_driver_dependencies && r->info.info8->core_driver_dependencies->string) {
info8.core_driver_dependencies = r->info.info8->core_driver_dependencies->string;
}
info8.min_inbox_driver_ver_date = r->info.info8->min_inbox_driver_ver_date;
info8.min_inbox_driver_ver_version = r->info.info8->min_inbox_driver_ver_version;
break;
default:
return false;
}
*_info8 = info8;
return true;
}

2
source3/rpc_client/init_spoolss.h
View File

@ -34,5 +34,7 @@ WERROR push_spoolss_PrinterData(TALLOC_CTX *mem_ctx, DATA_BLOB *blob,
union spoolss_PrinterData *data);
void spoolss_printerinfo2_to_setprinterinfo2(const struct spoolss_PrinterInfo2 *i,
struct spoolss_SetPrinterInfo2 *s);
bool driver_info_ctr_to_info8(struct spoolss_AddDriverInfoCtr *r,
struct spoolss_DriverInfo8 *_info8);
#endif /* _RPC_CLIENT_INIT_SPOOLSS_H_ */

1
source3/rpc_server/spoolss/srv_spoolss_util.c
View File

@ -32,6 +32,7 @@
#include "../libcli/registry/util_reg.h"
#include "../lib/tsocket/tsocket.h"
#include "printing/nt_printing_os2.h"
#include "rpc_client/init_spoolss.h"
#define TOP_LEVEL_PRINT_KEY "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Print"
#define TOP_LEVEL_PRINT_PRINTERS_KEY TOP_LEVEL_PRINT_KEY "\\Printers"