Merge branch 'selftest' of git://git.samba.org/jelmer/samba

[ira/wip.git] / source3 / librpc / gen_ndr / winreg.h

diff --git a/source3/librpc/gen_ndr/winreg.h b/source3/librpc/gen_ndr/winreg.h
index 8c498963b6df1b7dc8fee8050335a43937f2385e..fbbab33c8d5d3b202fa43ed854aad4b71c14a7e0 100644 (file)
--- a/source3/librpc/gen_ndr/winreg.h
+++ b/source3/librpc/gen_ndr/winreg.h
@@ -3,13 +3,10 @@
 #include <stdint.h>
 
 #include "librpc/gen_ndr/lsa.h"
-#include "librpc/gen_ndr/initshutdown.h"
 #include "librpc/gen_ndr/security.h"
 #ifndef _HEADER_winreg
 #define _HEADER_winreg
 
-;
-
 /* bitmap winreg_AccessMask */
 #define KEY_QUERY_VALUE ( 0x00001 )
 #define KEY_SET_VALUE ( 0x00002 )
@@ -20,8 +17,6 @@
 #define KEY_WOW64_64KEY ( 0x00100 )
 #define KEY_WOW64_32KEY ( 0x00200 )
 
-;
-
 enum winreg_Type
 #ifndef USE_UINT_ENUMS
  {
@@ -89,17 +84,17 @@ enum winreg_CreateAction
 ;
 
 struct winreg_StringBuf {
-       uint16_t length;/* [value(strlen_m_term_null(name)*2)] */
-       uint16_t size;
-       const char *name;/* [unique,length_is(length/2),charset(UTF16),size_is(size/2)] */
-};
-
-struct winreg_ValNameBuf {
        uint16_t length;/* [value(strlen_m_term(name)*2)] */
        uint16_t size;
        const char *name;/* [unique,length_is(length/2),charset(UTF16),size_is(size/2)] */
 };
 
+/* bitmap winreg_NotifyChangeType */
+#define REG_NOTIFY_CHANGE_NAME ( 0x00000001 )
+#define REG_NOTIFY_CHANGE_ATTRIBUTES ( 0x00000002 )
+#define REG_NOTIFY_CHANGE_LAST_SET ( 0x00000004 )
+#define REG_NOTIFY_CHANGE_SECURITY ( 0x00000008 )
+
 struct KeySecurityAttribute {
        uint32_t data_size;
        struct KeySecurityData sec_data;
@@ -266,7 +261,7 @@ struct winreg_EnumValue {
        struct {
                struct policy_handle *handle;/* [ref] */
                uint32_t enum_index;
-               struct winreg_ValNameBuf *name;/* [ref] */
+               struct winreg_StringBuf *name;/* [ref] */
                enum winreg_Type *type;/* [unique] */
                uint8_t *value;/* [unique,length_is(*length),size_is(*size)] */
                uint32_t *size;/* [unique] */
@@ -274,7 +269,7 @@ struct winreg_EnumValue {
        } in;
 
        struct {
-               struct winreg_ValNameBuf *name;/* [ref] */
+               struct winreg_StringBuf *name;/* [ref] */
                enum winreg_Type *type;/* [unique] */
                uint8_t *value;/* [unique,length_is(*length),size_is(*size)] */
                uint32_t *size;/* [unique] */
@@ -385,18 +380,18 @@ struct winreg_QueryInfoKey {
 struct winreg_QueryValue {
        struct {
                struct policy_handle *handle;/* [ref] */
-               struct winreg_String value_name;
+               struct winreg_String *value_name;/* [ref] */
                enum winreg_Type *type;/* [unique] */
-               uint8_t *data;/* [unique,length_is(*value_length),size_is(*data_size)] */
+               uint8_t *data;/* [unique,length_is(*data_length),size_is(*data_size)] */
                uint32_t *data_size;/* [unique] */
-               uint32_t *value_length;/* [unique] */
+               uint32_t *data_length;/* [unique] */
        } in;
 
        struct {
                enum winreg_Type *type;/* [unique] */
-               uint8_t *data;/* [unique,length_is(*value_length),size_is(*data_size)] */
+               uint8_t *data;/* [unique,length_is(*data_length),size_is(*data_size)] */
                uint32_t *data_size;/* [unique] */
-               uint32_t *value_length;/* [unique] */
+               uint32_t *data_length;/* [unique] */
                WERROR result;
        } out;
 
@@ -442,7 +437,7 @@ struct winreg_SaveKey {
 struct winreg_SetKeySecurity {
        struct {
                struct policy_handle *handle;/* [ref] */
-               uint32_t access_mask;
+               uint32_t sec_info;
                struct KeySecurityData *sd;/* [ref] */
        } in;
 
@@ -480,10 +475,10 @@ struct winreg_UnLoadKey {
 struct winreg_InitiateSystemShutdown {
        struct {
                uint16_t *hostname;/* [unique] */
-               struct initshutdown_String *message;/* [unique] */
+               struct lsa_StringLarge *message;/* [unique] */
                uint32_t timeout;
                uint8_t force_apps;
-               uint8_t reboot;
+               uint8_t do_reboot;
        } in;
 
        struct {
@@ -568,10 +563,10 @@ struct winreg_QueryMultipleValues {
 struct winreg_InitiateSystemShutdownEx {
        struct {
                uint16_t *hostname;/* [unique] */
-               struct initshutdown_String *message;/* [unique] */
+               struct lsa_StringLarge *message;/* [unique] */
                uint32_t timeout;
                uint8_t force_apps;
-               uint8_t reboot;
+               uint8_t do_reboot;
                uint32_t reason;
        } in;