Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Wed, 25 Feb 2009 14:22:31 +0000 (15:22 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 25 Feb 2009 14:22:31 +0000 (15:22 +0100)
1  2 
librpc/gen_ndr/spoolss.h

diff --combined librpc/gen_ndr/spoolss.h
index c960d5439bc25338619e4cd49460748af7794f38,ff2eb1b8c0d6314f2d4277929292a1ff0b89c672..4ecb2a71b60e712197698f3ef662b57d54c05c89
@@@ -2,8 -2,6 +2,8 @@@
  
  #include <stdint.h>
  
 +#include "libcli/util/ntstatus.h"
 +
  #include "librpc/gen_ndr/misc.h"
  #include "librpc/gen_ndr/security.h"
  #include "librpc/gen_ndr/winreg.h"
@@@ -960,8 -958,27 +960,27 @@@ struct spoolss_FormInfo1 
        struct spoolss_FormArea area;
  };
  
+ /* bitmap spoolss_FormStringType */
+ #define SPOOLSS_FORM_STRING_TYPE_NONE ( 0x00000001 )
+ #define SPOOLSS_FORM_STRING_TYPE_MUI_DLL ( 0x00000002 )
+ #define SPOOLSS_FORM_STRING_TYPE_LANG_PAIR ( 0x00000004 )
+ struct spoolss_FormInfo2 {
+       enum spoolss_FormFlags flags;
+       const char * form_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       struct spoolss_FormSize size;
+       struct spoolss_FormArea area;
+       const char * keyword;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       uint32_t string_type;
+       const char * mui_dll;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       uint32_t ressource_id;
+       const char * display_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       uint32_t lang_id;
+ };
  union spoolss_FormInfo {
        struct spoolss_FormInfo1 info1;/* [case] */
+       struct spoolss_FormInfo2 info2;/* [case(2)] */
  }/* [relative_base,gensize,public,nodiscriminant] */;
  
  struct spoolss_AddFormInfo1 {