Changeset 429 for trunk/server/librpc/idl

Timestamp:

Apr 9, 2010, 3:51:41 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.5.x: trunk update to 3.5.2

Location:

trunk/server

Files:

• . (modified) (1 prop)
• librpc/idl/spoolss.idl (modified) (3 diffs)
• librpc/idl/winreg.idl (modified) (1 diff)

trunk/server/librpc/idl/spoolss.idl

@@ -1622 +1622 @@
         const string SPOOL_REG_VERSIONNUMBER            = "versionNumber";
 
-        [noopnum,noprint,public] WERROR _spoolss_GetPrinterData(
+        WERROR spoolss_GetPrinterData(
                 [in,ref] policy_handle *handle,
                 [in]     [string,charset(UTF16)] uint16 value_name[],
+                [out,ref] winreg_Type *type,
+                [out,ref,size_is(offered)] uint8 *data,
                 [in]     uint32 offered,
-                [out,ref] winreg_Type *type,
-                [out,ref] DATA_BLOB *data,
                 [out,ref] uint32 *needed
         );
-        [noopnum,noprint,public] void __spoolss_GetPrinterData(
-                [in] winreg_Type type,
-                [out,ref,switch_is(type)] spoolss_PrinterData *data
-        );
-        [nopull,nopush,public] WERROR spoolss_GetPrinterData(
-                [in,ref] policy_handle *handle,
-                [in]     [string,charset(UTF16)] uint16 value_name[],
-                [in]     uint32 offered,
-                [out,ref] winreg_Type *type,
-                [out,ref,subcontext(4),subcontext_size(offered),switch_is(*type)] spoolss_PrinterData *data,
-                [out,ref] uint32 *needed
-        );
 
         /******************/
         /* Function: 0x1b */
-        [noopnum,nopull,noprint,public] WERROR _spoolss_SetPrinterData(
+        WERROR spoolss_SetPrinterData(
                 [in,ref] policy_handle *handle,
                 [in] [string,charset(UTF16)] uint16 value_name[],
                 [in] winreg_Type type,
-                [in] DATA_BLOB data,
-                [in] uint32 _offered
-        );
-        [noopnum,nopull,noprint,public] void __spoolss_SetPrinterData(
-                [in] winreg_Type type,
-                [out,ref,switch_is(type)] spoolss_PrinterData *data
-        );
-        [nopush] WERROR spoolss_SetPrinterData(
-                [in,ref] policy_handle *handle,
-                [in] [string,charset(UTF16)] uint16 value_name[],
-                [in] winreg_Type type,
-                [in,subcontext(4),switch_is(type)] spoolss_PrinterData data,
-                [in,value(ndr_size_spoolss_PrinterData(&data,type,ndr->iconv_convenience,flags))] uint32 _offered
+                [in,ref] [size_is(offered)] uint8 *data,
+                [in] uint32 offered
         );
 
@@ -2546 +2523 @@
         /******************/
         /* Function: 0x4d */
-        [noopnum,nopull,noprint,public] WERROR _spoolss_SetPrinterDataEx(
+        WERROR spoolss_SetPrinterDataEx(
                 [in,ref] policy_handle *handle,
                 [in] [string,charset(UTF16)] uint16 key_name[],
                 [in] [string,charset(UTF16)] uint16 value_name[],
                 [in] winreg_Type type,
-                [in] DATA_BLOB data,
-                [in] uint32 _offered
-        );
-        [noopnum,nopull,noprint,public] void __spoolss_SetPrinterDataEx(
-                [in] winreg_Type type,
-                [out,ref,switch_is(type)] spoolss_PrinterData *data
-        );
-        [nopush] WERROR spoolss_SetPrinterDataEx(
-                [in,ref] policy_handle *handle,
-                [in] [string,charset(UTF16)] uint16 key_name[],
-                [in] [string,charset(UTF16)] uint16 value_name[],
-                [in] winreg_Type type,
-                [in,subcontext(4),switch_is(type)] spoolss_PrinterData data,
-                [in,value(ndr_size_spoolss_PrinterData(&data,type,ndr->iconv_convenience,flags))] uint32 _offered
+                [in,ref] [size_is(offered)] uint8 *data,
+                [in] uint32 offered
         );
 
         /******************/
         /* Function: 0x4e */
-        [noopnum,noprint,public] WERROR _spoolss_GetPrinterDataEx(
+        WERROR spoolss_GetPrinterDataEx(
                 [in,ref] policy_handle *handle,
                 [in]     [string,charset(UTF16)] uint16 key_name[],
                 [in]     [string,charset(UTF16)] uint16 value_name[],
+                [out,ref] winreg_Type *type,
+                [out,ref,size_is(offered)] uint8 *data,
                 [in]     uint32 offered,
-                [out,ref] winreg_Type *type,
-                [out,ref] DATA_BLOB *data,
-                [out,ref] uint32 *needed
-        );
-        [noopnum,noprint,public] void __spoolss_GetPrinterDataEx(
-                [in] winreg_Type type,
-                [out,ref,switch_is(type)] spoolss_PrinterData *data
-        );
-        [nopull,nopush,public] WERROR spoolss_GetPrinterDataEx(
-                [in,ref] policy_handle *handle,
-                [in]     [string,charset(UTF16)] uint16 key_name[],
-                [in]     [string,charset(UTF16)] uint16 value_name[],
-                [in]     uint32 offered,
-                [out,ref] winreg_Type *type,
-                [out,ref,subcontext(4),subcontext_size(offered),switch_is(*type)] spoolss_PrinterData *data,
                 [out,ref] uint32 *needed
         );
@@ -2599 +2551 @@
                 [value(2*strlen_m_term(value_name))] uint32 value_name_len;
                 winreg_Type type;
-                [relative,switch_is(type),subcontext(0),subcontext_size(r->data_length)] spoolss_PrinterData *data;
-                [value(ndr_size_spoolss_PrinterData(data, type, ndr->iconv_convenience, ndr->flags))] uint32 data_length;
+                [relative,subcontext(0),subcontext_size(data_length),flag(NDR_REMAINING)] DATA_BLOB *data;
+                [value(data->length)] uint32 data_length;
         } spoolss_PrinterEnumValues;
 

trunk/server/librpc/idl/winreg.idl

@@ -257 +257 @@
                 [in,ref] winreg_String *value_name,
                 [in,out,unique] winreg_Type *type,
-                [in,out,unique,size_is(*data_size),length_is(*data_length)] uint8 *data,
+                [in,out,unique,size_is(data_size ? *data_size : 0),length_is(data_length ? *data_length : 0),range(0,0x4000000)] uint8 *data,
                 [in,out,unique] uint32 *data_size,
                 [in,out,unique] uint32 *data_length