summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2001-11-22 05:56:09 +0000
committerGerald Carter <jerry@samba.org>2001-11-22 05:56:09 +0000
commit116740a5df6294b0a4e244f575108ded87452c18 (patch)
tree1326b89821403425d0226e6990a266c7d2f338fe /source3/include
parent456cdf6aeeb5806083904f109ec05e0fa5a67349 (diff)
downloadsamba-116740a5df6294b0a4e244f575108ded87452c18.tar.gz
samba-116740a5df6294b0a4e244f575108ded87452c18.tar.bz2
samba-116740a5df6294b0a4e244f575108ded87452c18.zip
merge from 2.2
(This used to be commit 96b3a65a73d403a41bf1b3aba79bd743698344ac)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/rpc_reg.h5
-rwxr-xr-xsource3/include/rpc_spoolss.h68
2 files changed, 65 insertions, 8 deletions
diff --git a/source3/include/rpc_reg.h b/source3/include/rpc_reg.h
index 1906eb1aad..8fe40be6f7 100644
--- a/source3/include/rpc_reg.h
+++ b/source3/include/rpc_reg.h
@@ -59,6 +59,11 @@
#define HKEY_LOCAL_MACHINE 0x80000002
#define HKEY_USERS 0x80000003
+#define REG_SZ 1
+#define REG_BINARY 3
+#define REG_DWORD 4
+#define REG_MULTI_SZ 7
+
/* REG_Q_OPEN_HKCR */
typedef struct q_reg_open_hkcr_info
{
diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index 0b551c3a1a..72b9d10718 100755
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -57,13 +57,6 @@
#define SPOOLSS_SPOOLERINIT 0x3f
#define SPOOLSS_RESETPRINTEREX 0x40
#define SPOOLSS_ROUTERREFRESHPRINTERCHANGENOTIFICATION 0x42
-*/
-
-/*
- * Unimplement Win2k specific RPC's
-
-#define SPOOLSS_ENUMPRINTERDATAEX 0x4f
-#define SPOOLSS_ENUMPRINTERKEY 0x50
#define SPOOLSS_DELETEPRINTERDATAEX 0x51
#define SPOOLSS_DELETEPRINTERDRIVEREX 0x54
#define SPOOLSS_ADDPRINTERDRIVEREX 0x59
@@ -118,8 +111,11 @@
#define SPOOLSS_ADDPRINTEREX 0x46
#define SPOOLSS_ENUMPRINTERDATA 0x48
#define SPOOLSS_DELETEPRINTERDATA 0x49
-#define SPOOLSS_GETPRINTERDATAEX 0x4e
#define SPOOLSS_SETPRINTERDATAEX 0x4d
+#define SPOOLSS_GETPRINTERDATAEX 0x4e
+#define SPOOLSS_ENUMPRINTERDATAEX 0x4f
+#define SPOOLSS_ENUMPRINTERKEY 0x50
+
#define PRINTER_CONTROL_UNPAUSE 0x00000000
#define PRINTER_CONTROL_PAUSE 0x00000001
@@ -1906,7 +1902,63 @@ typedef struct spool_r_setprinterdataex
}
SPOOL_R_SETPRINTERDATAEX;
+
+typedef struct spool_q_enumprinterkey
+{
+ POLICY_HND handle;
+ UNISTR2 key;
+ uint32 size;
+}
+SPOOL_Q_ENUMPRINTERKEY;
+
+typedef struct spool_r_enumprinterkey
+{
+ BUFFER5 keys;
+ uint32 needed; /* in bytes */
+ WERROR status;
+}
+SPOOL_R_ENUMPRINTERKEY;
+
+typedef struct printer_enum_values
+{
+ UNISTR valuename;
+ uint32 value_len;
+ uint32 type;
+ uint8 *data;
+ uint32 data_len;
+
+}
+PRINTER_ENUM_VALUES;
+
+typedef struct printer_enum_values_ctr
+{
+ uint32 size;
+ uint32 size_of_array;
+ PRINTER_ENUM_VALUES *values;
+}
+PRINTER_ENUM_VALUES_CTR;
+
+typedef struct spool_q_enumprinterdataex
+{
+ POLICY_HND handle;
+ UNISTR2 key;
+ uint32 size;
+}
+SPOOL_Q_ENUMPRINTERDATAEX;
+
+typedef struct spool_r_enumprinterdataex
+{
+ PRINTER_ENUM_VALUES_CTR ctr;
+ uint32 needed;
+ uint32 returned;
+ WERROR status;
+}
+SPOOL_R_ENUMPRINTERDATAEX;
+
+
+
#define PRINTER_DRIVER_VERSION 2
#define PRINTER_DRIVER_ARCHITECTURE "Windows NT x86"
#endif /* _RPC_SPOOLSS_H */
+