diff options
| author | Stefan Metzmacher <metze@samba.org> | 2005-05-02 13:37:05 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:16:26 -0500 |
| commit | 591ff7675dfe51f30029cb864df47bc8f6266494 (patch) | |
| tree | 313e307803f243ecb1bec13c6b0fc8eb97be28d7 /source4/librpc/idl | |
| parent | b686e0b9266c0e6029d9f87f187e56c8d2429586 (diff) | |
| download | samba-591ff7675dfe51f30029cb864df47bc8f6266494.tar.gz samba-591ff7675dfe51f30029cb864df47bc8f6266494.tar.bz2 samba-591ff7675dfe51f30029cb864df47bc8f6266494.zip | |
r6572: add "string_array" as new scalar type for handling SPOOLSS string array's
metze
(This used to be commit 23b529ee090e1858fc18794b949f7e466fa82b0e)
Diffstat (limited to 'source4/librpc/idl')
| -rw-r--r-- | source4/librpc/idl/idl_types.h | 5 | ||||
| -rw-r--r-- | source4/librpc/idl/spoolss.idl | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/source4/librpc/idl/idl_types.h b/source4/librpc/idl/idl_types.h index 65489100af..024b5632d3 100644 --- a/source4/librpc/idl/idl_types.h +++ b/source4/librpc/idl/idl_types.h @@ -81,6 +81,11 @@ */ #define utf8string [flag(STR_UTF8|STR_NULLTERM)] string +/* + a null terminated UCS2 string +*/ +#define nstring_array [flag(STR_NULLTERM)] string_array + #define NDR_NOALIGN LIBNDR_FLAG_NOALIGN #define NDR_REMAINING LIBNDR_FLAG_REMAINING #define NDR_ALIGN2 LIBNDR_FLAG_ALIGN2 diff --git a/source4/librpc/idl/spoolss.idl b/source4/librpc/idl/spoolss.idl index 5d909b4bed..5d4e957f07 100644 --- a/source4/librpc/idl/spoolss.idl +++ b/source4/librpc/idl/spoolss.idl @@ -409,7 +409,7 @@ [relative] nstring *data_file; [relative] nstring *config_file; [relative] nstring *help_file; - [relative] nstring *dependent_files; /* array */ + [relative] nstring_array *dependent_files; [relative] nstring *monitor_name; [relative] nstring *default_datatype; } spoolss_DriverInfo3; @@ -422,10 +422,10 @@ [relative] nstring *data_file; [relative] nstring *config_file; [relative] nstring *help_file; - [relative] nstring *dependent_files; /* array */ + [relative] nstring_array *dependent_files; [relative] nstring *monitor_name; [relative] nstring *default_datatype; - [relative] nstring *previous_names; /* array */ + [relative] nstring_array *previous_names; } spoolss_DriverInfo4; typedef struct { @@ -448,10 +448,10 @@ [relative] nstring *data_file; [relative] nstring *config_file; [relative] nstring *help_file; - [relative] nstring *dependent_files; /* array */ + [relative] nstring_array *dependent_files; [relative] nstring *monitor_name; [relative] nstring *default_datatype; - [relative] nstring *previous_names; /* array */ + [relative] nstring_array *previous_names; NTTIME driver_data; hyper driver_version; [relative] nstring *manufacturer_name; |