summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-02-09 15:22:37 +0100
committerGünther Deschner <gd@samba.org>2009-02-09 15:59:04 +0100
commit4d78ece6571d4c8f051188ff1be06080c1b2b1a9 (patch)
treed8b9183acb3bd346fc67153b3fe9f0d341e0ecba
parentc94c777d9cc951d71cf1c8efc8f56f16a3da75c1 (diff)
downloadsamba-4d78ece6571d4c8f051188ff1be06080c1b2b1a9.tar.gz
samba-4d78ece6571d4c8f051188ff1be06080c1b2b1a9.tar.bz2
samba-4d78ece6571d4c8f051188ff1be06080c1b2b1a9.zip
s3-spoolss: move PRINTER_ENUM_ICONMASK to IDL.
Guenther
-rw-r--r--librpc/gen_ndr/spoolss.h1
-rw-r--r--librpc/idl/spoolss.idl9
-rw-r--r--source3/include/rpc_spoolss.h1
3 files changed, 10 insertions, 1 deletions
diff --git a/librpc/gen_ndr/spoolss.h b/librpc/gen_ndr/spoolss.h
index cfb802f7fb..ddf514a08a 100644
--- a/librpc/gen_ndr/spoolss.h
+++ b/librpc/gen_ndr/spoolss.h
@@ -8,6 +8,7 @@
#ifndef _HEADER_spoolss
#define _HEADER_spoolss
+#define PRINTER_ENUM_ICONMASK ( (PRINTER_ENUM_ICON1|PRINTER_ENUM_ICON2|PRINTER_ENUM_ICON3|PRINTER_ENUM_ICON4|PRINTER_ENUM_ICON5|PRINTER_ENUM_ICON6|PRINTER_ENUM_ICON7|PRINTER_ENUM_ICON8) )
#define SPOOLSS_ARCHITECTURE_NT_X86 ( "Windows NT x86" )
#define SERVER_ALL_ACCESS ( SEC_STD_REQUIRED|SERVER_ACCESS_ADMINISTER|SERVER_ACCESS_ENUMERATE )
#define SERVER_READ ( SEC_STD_READ_CONTROL|SERVER_ACCESS_ENUMERATE )
diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl
index e9705c6061..09646c9d67 100644
--- a/librpc/idl/spoolss.idl
+++ b/librpc/idl/spoolss.idl
@@ -117,6 +117,15 @@ import "misc.idl", "security.idl", "winreg.idl";
PRINTER_ENUM_HIDE = 0x01000000
} spoolss_EnumPrinterFlags;
+ const int PRINTER_ENUM_ICONMASK = (PRINTER_ENUM_ICON1 |
+ PRINTER_ENUM_ICON2 |
+ PRINTER_ENUM_ICON3 |
+ PRINTER_ENUM_ICON4 |
+ PRINTER_ENUM_ICON5 |
+ PRINTER_ENUM_ICON6 |
+ PRINTER_ENUM_ICON7 |
+ PRINTER_ENUM_ICON8); /* 0x00ff0000 */
+
typedef struct {
spoolss_EnumPrinterFlags flags;
[relative] nstring *name;
diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index 4aa51b2674..feabd3fff7 100644
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -266,7 +266,6 @@ PRINTER_MESSAGE_INFO;
#define DEF_PRIORITY 1
/* the flags of each printers */
-#define PRINTER_ENUM_ICONMASK 0x00ff0000
#define DRIVER_ANY_VERSION 0xffffffff
#define DRIVER_MAX_VERSION 4