From: Günther Deschner <gd@samba.org>
Date: Wed, 18 Nov 2009 14:39:52 +0000 (+0100)
Subject: s3-spoolss: move more defines out of nt_printing.h to spoolss.idl where they belong.
X-Git-Url: http://git.samba.org/samba.git/?p=gd%2Fsamba%2F.git;a=commitdiff_plain;h=800d6b7820bb949588a799f2835a3d6c07815571

s3-spoolss: move more defines out of nt_printing.h to spoolss.idl where they belong.

Guenther
---

diff --git a/librpc/gen_ndr/spoolss.h b/librpc/gen_ndr/spoolss.h
index af7536b36f2..a4c0010d5c7 100644
--- a/librpc/gen_ndr/spoolss.h
+++ b/librpc/gen_ndr/spoolss.h
@@ -23,6 +23,68 @@
 #define SPOOLSS_ARCHITECTURE_ALL	( "all" )
 #define SPOOLSS_ARCHITECTURE_NT_X86	( "Windows NT x86" )
 #define SPOOLSS_DEFAULT_SERVER_PATH	( "C:\\WINDOWS\\system32\\spool" )
+#define SPOOL_PRINTERDATA_KEY	( "PrinterDriverData" )
+#define SPOOL_DSSPOOLER_KEY	( "DsSpooler" )
+#define SPOOL_DSDRIVER_KEY	( "DsDriver" )
+#define SPOOL_DSUSER_KEY	( "DsUser" )
+#define SPOOL_PNPDATA_KEY	( "PnPData" )
+#define SPOOL_OID_KEY	( "OID" )
+#define SPOOL_REG_ASSETNUMBER	( "assetNumber" )
+#define SPOOL_REG_BYTESPERMINUTE	( "bytesPerMinute" )
+#define SPOOL_REG_DEFAULTPRIORITY	( "defaultPriority" )
+#define SPOOL_REG_DESCRIPTION	( "description" )
+#define SPOOL_REG_DRIVERNAME	( "driverName" )
+#define SPOOL_REG_DRIVERVERSION	( "driverVersion" )
+#define SPOOL_REG_FLAGS	( "flags" )
+#define SPOOL_REG_LOCATION	( "location" )
+#define SPOOL_REG_OPERATINGSYSTEM	( "operatingSystem" )
+#define SPOOL_REG_OPERATINGSYSTEMHOTFIX	( "operatingSystemHotfix" )
+#define SPOOL_REG_OPERATINGSYSTEMSERVICEPACK	( "operatingSystemServicePack" )
+#define SPOOL_REG_OPERATINGSYSTEMVERSION	( "operatingSystemVersion" )
+#define SPOOL_REG_PORTNAME	( "portName" )
+#define SPOOL_REG_PRINTATTRIBUTES	( "printAttributes" )
+#define SPOOL_REG_PRINTBINNAMES	( "printBinNames" )
+#define SPOOL_REG_PRINTCOLLATE	( "printCollate" )
+#define SPOOL_REG_PRINTCOLOR	( "printColor" )
+#define SPOOL_REG_PRINTDUPLEXSUPPORTED	( "printDuplexSupported" )
+#define SPOOL_REG_PRINTENDTIME	( "printEndTime" )
+#define SPOOL_REG_PRINTERNAME	( "printerName" )
+#define SPOOL_REG_PRINTFORMNAME	( "printFormName" )
+#define SPOOL_REG_PRINTKEEPPRINTEDJOBS	( "printKeepPrintedJobs" )
+#define SPOOL_REG_PRINTLANGUAGE	( "printLanguage" )
+#define SPOOL_REG_PRINTMACADDRESS	( "printMACAddress" )
+#define SPOOL_REG_PRINTMAXCOPIES	( "printMaxCopies" )
+#define SPOOL_REG_PRINTMAXRESOLUTIONSUPPORTED	( "printMaxResolutionSupported" )
+#define SPOOL_REG_PRINTMAXXEXTENT	( "printMaxXExtent" )
+#define SPOOL_REG_PRINTMAXYEXTENT	( "printMaxYExtent" )
+#define SPOOL_REG_PRINTMEDIAREADY	( "printMediaReady" )
+#define SPOOL_REG_PRINTMEDIASUPPORTED	( "printMediaSupported" )
+#define SPOOL_REG_PRINTMEMORY	( "printMemory" )
+#define SPOOL_REG_PRINTMINXEXTENT	( "printMinXExtent" )
+#define SPOOL_REG_PRINTMINYEXTENT	( "printMinYExtent" )
+#define SPOOL_REG_PRINTNETWORKADDRESS	( "printNetworkAddress" )
+#define SPOOL_REG_PRINTNOTIFY	( "printNotify" )
+#define SPOOL_REG_PRINTNUMBERUP	( "printNumberUp" )
+#define SPOOL_REG_PRINTORIENTATIONSSUPPORTED	( "printOrientationsSupported" )
+#define SPOOL_REG_PRINTOWNER	( "printOwner" )
+#define SPOOL_REG_PRINTPAGESPERMINUTE	( "printPagesPerMinute" )
+#define SPOOL_REG_PRINTRATE	( "printRate" )
+#define SPOOL_REG_PRINTRATEUNIT	( "printRateUnit" )
+#define SPOOL_REG_PRINTSEPARATORFILE	( "printSeparatorFile" )
+#define SPOOL_REG_PRINTSHARENAME	( "printShareName" )
+#define SPOOL_REG_PRINTSPOOLING	( "printSpooling" )
+#define SPOOL_REGVAL_PRINTWHILESPOOLING	( "PrintWhileSpooling" )
+#define SPOOL_REGVAL_PRINTAFTERSPOOLED	( "PrintAfterSpooled" )
+#define SPOOL_REGVAL_PRINTDIRECT	( "PrintDirect" )
+#define SPOOL_REG_PRINTSTAPLINGSUPPORTED	( "printStaplingSupported" )
+#define SPOOL_REG_PRINTSTARTTIME	( "printStartTime" )
+#define SPOOL_REG_PRINTSTATUS	( "printStatus" )
+#define SPOOL_REG_PRIORITY	( "priority" )
+#define SPOOL_REG_SERVERNAME	( "serverName" )
+#define SPOOL_REG_SHORTSERVERNAME	( "shortServerName" )
+#define SPOOL_REG_UNCNAME	( "uNCName" )
+#define SPOOL_REG_URL	( "url" )
+#define SPOOL_REG_VERSIONNUMBER	( "versionNumber" )
 #define SPL_LOCAL_PORT	( "Local Port" )
 #define SPL_TCPIP_PORT	( "Standard TCP/IP Port" )
 #define SPL_XCV_MONITOR_LOCALMON	( ",XcvMonitor Local Port" )
diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl
index d6092417bc3..bb517a10e12 100644
--- a/librpc/idl/spoolss.idl
+++ b/librpc/idl/spoolss.idl
@@ -1527,6 +1527,74 @@ import "misc.idl", "security.idl", "winreg.idl";
 		[default,flag(NDR_REMAINING)] DATA_BLOB data;
 	} spoolss_PrinterData;
 
+	/* predefined registry key names for printer data */
+
+	const string SPOOL_PRINTERDATA_KEY		= "PrinterDriverData";
+	const string SPOOL_DSSPOOLER_KEY		= "DsSpooler";
+	const string SPOOL_DSDRIVER_KEY			= "DsDriver";
+	const string SPOOL_DSUSER_KEY			= "DsUser";
+	const string SPOOL_PNPDATA_KEY			= "PnPData";
+	const string SPOOL_OID_KEY			= "OID";
+
+	/* predefined value names for printer data */
+
+	const string SPOOL_REG_ASSETNUMBER		= "assetNumber";
+	const string SPOOL_REG_BYTESPERMINUTE		= "bytesPerMinute";
+	const string SPOOL_REG_DEFAULTPRIORITY		= "defaultPriority";
+	const string SPOOL_REG_DESCRIPTION		= "description";
+	const string SPOOL_REG_DRIVERNAME		= "driverName";
+	const string SPOOL_REG_DRIVERVERSION		= "driverVersion";
+	const string SPOOL_REG_FLAGS			= "flags";
+	const string SPOOL_REG_LOCATION			= "location";
+	const string SPOOL_REG_OPERATINGSYSTEM		= "operatingSystem";
+	const string SPOOL_REG_OPERATINGSYSTEMHOTFIX	= "operatingSystemHotfix";
+	const string SPOOL_REG_OPERATINGSYSTEMSERVICEPACK = "operatingSystemServicePack";
+	const string SPOOL_REG_OPERATINGSYSTEMVERSION	= "operatingSystemVersion";
+	const string SPOOL_REG_PORTNAME			= "portName";
+	const string SPOOL_REG_PRINTATTRIBUTES		= "printAttributes";
+	const string SPOOL_REG_PRINTBINNAMES		= "printBinNames";
+	const string SPOOL_REG_PRINTCOLLATE		= "printCollate";
+	const string SPOOL_REG_PRINTCOLOR		= "printColor";
+	const string SPOOL_REG_PRINTDUPLEXSUPPORTED	= "printDuplexSupported";
+	const string SPOOL_REG_PRINTENDTIME		= "printEndTime";
+	const string SPOOL_REG_PRINTERNAME		= "printerName";
+	const string SPOOL_REG_PRINTFORMNAME		= "printFormName";
+	const string SPOOL_REG_PRINTKEEPPRINTEDJOBS	= "printKeepPrintedJobs";
+	const string SPOOL_REG_PRINTLANGUAGE		= "printLanguage";
+	const string SPOOL_REG_PRINTMACADDRESS		= "printMACAddress";
+	const string SPOOL_REG_PRINTMAXCOPIES		= "printMaxCopies";
+	const string SPOOL_REG_PRINTMAXRESOLUTIONSUPPORTED = "printMaxResolutionSupported";
+	const string SPOOL_REG_PRINTMAXXEXTENT		= "printMaxXExtent";
+	const string SPOOL_REG_PRINTMAXYEXTENT		= "printMaxYExtent";
+	const string SPOOL_REG_PRINTMEDIAREADY		= "printMediaReady";
+	const string SPOOL_REG_PRINTMEDIASUPPORTED	= "printMediaSupported";
+	const string SPOOL_REG_PRINTMEMORY		= "printMemory";
+	const string SPOOL_REG_PRINTMINXEXTENT		= "printMinXExtent";
+	const string SPOOL_REG_PRINTMINYEXTENT		= "printMinYExtent";
+	const string SPOOL_REG_PRINTNETWORKADDRESS	= "printNetworkAddress";
+	const string SPOOL_REG_PRINTNOTIFY		= "printNotify";
+	const string SPOOL_REG_PRINTNUMBERUP		= "printNumberUp";
+	const string SPOOL_REG_PRINTORIENTATIONSSUPPORTED = "printOrientationsSupported";
+	const string SPOOL_REG_PRINTOWNER		= "printOwner";
+	const string SPOOL_REG_PRINTPAGESPERMINUTE	= "printPagesPerMinute";
+	const string SPOOL_REG_PRINTRATE		= "printRate";
+	const string SPOOL_REG_PRINTRATEUNIT		= "printRateUnit";
+	const string SPOOL_REG_PRINTSEPARATORFILE	= "printSeparatorFile";
+	const string SPOOL_REG_PRINTSHARENAME		= "printShareName";
+	const string SPOOL_REG_PRINTSPOOLING		= "printSpooling";
+	const string SPOOL_REGVAL_PRINTWHILESPOOLING	= "PrintWhileSpooling";
+	const string SPOOL_REGVAL_PRINTAFTERSPOOLED	= "PrintAfterSpooled";
+	const string SPOOL_REGVAL_PRINTDIRECT		= "PrintDirect";
+	const string SPOOL_REG_PRINTSTAPLINGSUPPORTED	= "printStaplingSupported";
+	const string SPOOL_REG_PRINTSTARTTIME		= "printStartTime";
+	const string SPOOL_REG_PRINTSTATUS		= "printStatus";
+	const string SPOOL_REG_PRIORITY			= "priority";
+	const string SPOOL_REG_SERVERNAME		= "serverName";
+	const string SPOOL_REG_SHORTSERVERNAME		= "shortServerName";
+	const string SPOOL_REG_UNCNAME			= "uNCName";
+	const string SPOOL_REG_URL			= "url";
+	const string SPOOL_REG_VERSIONNUMBER		= "versionNumber";
+
 	[noopnum,noprint,public] WERROR _spoolss_GetPrinterData(
 		[in,ref] policy_handle *handle,
 		[in] 	 [string,charset(UTF16)] uint16 value_name[],
diff --git a/source3/include/nt_printing.h b/source3/include/nt_printing.h
index c074c8e665d..3a509a243a2 100644
--- a/source3/include/nt_printing.h
+++ b/source3/include/nt_printing.h
@@ -22,73 +22,6 @@
 #ifndef NT_PRINTING_H_
 #define NT_PRINTING_H_
 
-/* predefined registry key names for printer data */
-
-#define SPOOL_PRINTERDATA_KEY		"PrinterDriverData"
-#define SPOOL_DSSPOOLER_KEY		"DsSpooler"
-#define SPOOL_DSDRIVER_KEY		"DsDriver"
-#define SPOOL_DSUSER_KEY		"DsUser"
-#define SPOOL_PNPDATA_KEY		"PnPData"
-#define SPOOL_OID_KEY			"OID"
-
-/* predefined value names for printer data */
-#define SPOOL_REG_ASSETNUMBER		"assetNumber"
-#define SPOOL_REG_BYTESPERMINUTE	"bytesPerMinute"
-#define SPOOL_REG_DEFAULTPRIORITY	"defaultPriority"
-#define SPOOL_REG_DESCRIPTION		"description"
-#define SPOOL_REG_DRIVERNAME		"driverName"
-#define SPOOL_REG_DRIVERVERSION		"driverVersion"
-#define SPOOL_REG_FLAGS			"flags"
-#define SPOOL_REG_LOCATION		"location"
-#define SPOOL_REG_OPERATINGSYSTEM	"operatingSystem"
-#define SPOOL_REG_OPERATINGSYSTEMHOTFIX	"operatingSystemHotfix"
-#define SPOOL_REG_OPERATINGSYSTEMSERVICEPACK "operatingSystemServicePack"
-#define SPOOL_REG_OPERATINGSYSTEMVERSION "operatingSystemVersion"
-#define SPOOL_REG_PORTNAME		"portName"
-#define SPOOL_REG_PRINTATTRIBUTES	"printAttributes"
-#define SPOOL_REG_PRINTBINNAMES		"printBinNames"
-#define SPOOL_REG_PRINTCOLLATE		"printCollate"
-#define SPOOL_REG_PRINTCOLOR		"printColor"
-#define SPOOL_REG_PRINTDUPLEXSUPPORTED	"printDuplexSupported"
-#define SPOOL_REG_PRINTENDTIME		"printEndTime"
-#define SPOOL_REG_PRINTERNAME		"printerName"
-#define SPOOL_REG_PRINTFORMNAME		"printFormName"
-#define SPOOL_REG_PRINTKEEPPRINTEDJOBS	"printKeepPrintedJobs"
-#define SPOOL_REG_PRINTLANGUAGE		"printLanguage"
-#define SPOOL_REG_PRINTMACADDRESS	"printMACAddress"
-#define SPOOL_REG_PRINTMAXCOPIES	"printMaxCopies"
-#define SPOOL_REG_PRINTMAXRESOLUTIONSUPPORTED "printMaxResolutionSupported"
-#define SPOOL_REG_PRINTMAXXEXTENT	"printMaxXExtent"
-#define SPOOL_REG_PRINTMAXYEXTENT	"printMaxYExtent"
-#define SPOOL_REG_PRINTMEDIAREADY	"printMediaReady"
-#define SPOOL_REG_PRINTMEDIASUPPORTED	"printMediaSupported"
-#define SPOOL_REG_PRINTMEMORY		"printMemory"
-#define SPOOL_REG_PRINTMINXEXTENT	"printMinXExtent"
-#define SPOOL_REG_PRINTMINYEXTENT	"printMinYExtent"
-#define SPOOL_REG_PRINTNETWORKADDRESS	"printNetworkAddress"
-#define SPOOL_REG_PRINTNOTIFY		"printNotify"
-#define SPOOL_REG_PRINTNUMBERUP		"printNumberUp"
-#define SPOOL_REG_PRINTORIENTATIONSSUPPORTED "printOrientationsSupported"
-#define SPOOL_REG_PRINTOWNER		"printOwner"
-#define SPOOL_REG_PRINTPAGESPERMINUTE	"printPagesPerMinute"
-#define SPOOL_REG_PRINTRATE		"printRate"
-#define SPOOL_REG_PRINTRATEUNIT		"printRateUnit"
-#define SPOOL_REG_PRINTSEPARATORFILE	"printSeparatorFile"
-#define SPOOL_REG_PRINTSHARENAME	"printShareName"
-#define SPOOL_REG_PRINTSPOOLING		"printSpooling"
-#define SPOOL_REGVAL_PRINTWHILESPOOLING	"PrintWhileSpooling"
-#define SPOOL_REGVAL_PRINTAFTERSPOOLED	"PrintAfterSpooled"
-#define SPOOL_REGVAL_PRINTDIRECT	"PrintDirect"
-#define SPOOL_REG_PRINTSTAPLINGSUPPORTED "printStaplingSupported"
-#define SPOOL_REG_PRINTSTARTTIME	"printStartTime"
-#define SPOOL_REG_PRINTSTATUS		"printStatus"
-#define SPOOL_REG_PRIORITY		"priority"
-#define SPOOL_REG_SERVERNAME		"serverName"
-#define SPOOL_REG_SHORTSERVERNAME	"shortServerName"
-#define SPOOL_REG_UNCNAME		"uNCName"
-#define SPOOL_REG_URL			"url"
-#define SPOOL_REG_VERSIONNUMBER		"versionNumber"
-
 /* container for a single registry key */
 
 typedef struct {