s3-build: re-run make samba3-idl after winreg changes.

[kai/samba.git] / source3 / librpc / gen_ndr / ndr_winreg.c

diff --git a/source3/librpc/gen_ndr/ndr_winreg.c b/source3/librpc/gen_ndr/ndr_winreg.c
index cc0d800f51d483ad1bb9dfb6285cafd135cf933f..818ce65936040c7b771db744a7edf09e1bfe1620 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_winreg.c
+++ b/source3/librpc/gen_ndr/ndr_winreg.c
@@ -4,7 +4,6 @@
 #include "librpc/gen_ndr/ndr_winreg.h"
 
 #include "librpc/gen_ndr/ndr_lsa.h"
-#include "librpc/gen_ndr/ndr_initshutdown.h"
 #include "librpc/gen_ndr/ndr_security.h"
 static enum ndr_err_code ndr_push_winreg_AccessMask(struct ndr_push *ndr, int ndr_flags, uint32_t r)
 {
@@ -35,13 +34,13 @@ _PUBLIC_ void ndr_print_winreg_AccessMask(struct ndr_print *ndr, const char *nam
        ndr->depth--;
 }
 
-static enum ndr_err_code ndr_push_winreg_Type(struct ndr_push *ndr, int ndr_flags, enum winreg_Type r)
+_PUBLIC_ enum ndr_err_code ndr_push_winreg_Type(struct ndr_push *ndr, int ndr_flags, enum winreg_Type r)
 {
        NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
        return NDR_ERR_SUCCESS;
 }
 
-static enum ndr_err_code ndr_pull_winreg_Type(struct ndr_pull *ndr, int ndr_flags, enum winreg_Type *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_winreg_Type(struct ndr_pull *ndr, int ndr_flags, enum winreg_Type *r)
 {
        uint32_t v;
        NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
@@ -414,6 +413,31 @@ _PUBLIC_ void ndr_print_winreg_ValNameBuf(struct ndr_print *ndr, const char *nam
        ndr->depth--;
 }
 
+_PUBLIC_ enum ndr_err_code ndr_push_winreg_NotifyChangeType(struct ndr_push *ndr, int ndr_flags, uint32_t r)
+{
+       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
+       return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_pull_winreg_NotifyChangeType(struct ndr_pull *ndr, int ndr_flags, uint32_t *r)
+{
+       uint32_t v;
+       NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
+       *r = v;
+       return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_winreg_NotifyChangeType(struct ndr_print *ndr, const char *name, uint32_t r)
+{
+       ndr_print_uint32(ndr, name, r);
+       ndr->depth++;
+       ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "REG_NOTIFY_CHANGE_NAME", REG_NOTIFY_CHANGE_NAME, r);
+       ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "REG_NOTIFY_CHANGE_ATTRIBUTES", REG_NOTIFY_CHANGE_ATTRIBUTES, r);
+       ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "REG_NOTIFY_CHANGE_LAST_SET", REG_NOTIFY_CHANGE_LAST_SET, r);
+       ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "REG_NOTIFY_CHANGE_SECURITY", REG_NOTIFY_CHANGE_SECURITY, r);
+       ndr->depth--;
+}
+
 static enum ndr_err_code ndr_push_KeySecurityAttribute(struct ndr_push *ndr, int ndr_flags, const struct KeySecurityAttribute *r)
 {
        if (ndr_flags & NDR_SCALARS) {
@@ -688,7 +712,7 @@ _PUBLIC_ void ndr_print_winreg_OpenHKCU(struct ndr_print *ndr, const char *name,
        ndr->depth--;
 }
 
-static enum ndr_err_code ndr_push_winreg_OpenHKLM(struct ndr_push *ndr, int flags, const struct winreg_OpenHKLM *r)
+_PUBLIC_ enum ndr_err_code ndr_push_winreg_OpenHKLM(struct ndr_push *ndr, int flags, const struct winreg_OpenHKLM *r)
 {
        if (flags & NDR_IN) {
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.system_name));
@@ -707,7 +731,7 @@ static enum ndr_err_code ndr_push_winreg_OpenHKLM(struct ndr_push *ndr, int flag
        return NDR_ERR_SUCCESS;
 }
 
-static enum ndr_err_code ndr_pull_winreg_OpenHKLM(struct ndr_pull *ndr, int flags, struct winreg_OpenHKLM *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_winreg_OpenHKLM(struct ndr_pull *ndr, int flags, struct winreg_OpenHKLM *r)
 {
        uint32_t _ptr_system_name;
        TALLOC_CTX *_mem_save_system_name_0;
@@ -952,7 +976,7 @@ _PUBLIC_ void ndr_print_winreg_OpenHKU(struct ndr_print *ndr, const char *name,
        ndr->depth--;
 }
 
-static enum ndr_err_code ndr_push_winreg_CloseKey(struct ndr_push *ndr, int flags, const struct winreg_CloseKey *r)
+_PUBLIC_ enum ndr_err_code ndr_push_winreg_CloseKey(struct ndr_push *ndr, int flags, const struct winreg_CloseKey *r)
 {
        if (flags & NDR_IN) {
                if (r->in.handle == NULL) {
@@ -970,7 +994,7 @@ static enum ndr_err_code ndr_push_winreg_CloseKey(struct ndr_push *ndr, int flag
        return NDR_ERR_SUCCESS;
 }
 
-static enum ndr_err_code ndr_pull_winreg_CloseKey(struct ndr_pull *ndr, int flags, struct winreg_CloseKey *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_winreg_CloseKey(struct ndr_pull *ndr, int flags, struct winreg_CloseKey *r)
 {
        TALLOC_CTX *_mem_save_handle_0;
        if (flags & NDR_IN) {
@@ -1028,7 +1052,7 @@ _PUBLIC_ void ndr_print_winreg_CloseKey(struct ndr_print *ndr, const char *name,
        ndr->depth--;
 }
 
-static enum ndr_err_code ndr_push_winreg_CreateKey(struct ndr_push *ndr, int flags, const struct winreg_CreateKey *r)
+_PUBLIC_ enum ndr_err_code ndr_push_winreg_CreateKey(struct ndr_push *ndr, int flags, const struct winreg_CreateKey *r)
 {
        if (flags & NDR_IN) {
                if (r->in.handle == NULL) {
@@ -1062,7 +1086,7 @@ static enum ndr_err_code ndr_push_winreg_CreateKey(struct ndr_push *ndr, int fla
        return NDR_ERR_SUCCESS;
 }
 
-static enum ndr_err_code ndr_pull_winreg_CreateKey(struct ndr_pull *ndr, int flags, struct winreg_CreateKey *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_winreg_CreateKey(struct ndr_pull *ndr, int flags, struct winreg_CreateKey *r)
 {
        uint32_t _ptr_secdesc;
        uint32_t _ptr_action_taken;
@@ -1187,7 +1211,7 @@ _PUBLIC_ void ndr_print_winreg_CreateKey(struct ndr_print *ndr, const char *name
        ndr->depth--;
 }
 
-static enum ndr_err_code ndr_push_winreg_DeleteKey(struct ndr_push *ndr, int flags, const struct winreg_DeleteKey *r)
+_PUBLIC_ enum ndr_err_code ndr_push_winreg_DeleteKey(struct ndr_push *ndr, int flags, const struct winreg_DeleteKey *r)
 {
        if (flags & NDR_IN) {
                if (r->in.handle == NULL) {
@@ -1202,7 +1226,7 @@ static enum ndr_err_code ndr_push_winreg_DeleteKey(struct ndr_push *ndr, int fla
        return NDR_ERR_SUCCESS;
 }
 
-static enum ndr_err_code ndr_pull_winreg_DeleteKey(struct ndr_pull *ndr, int flags, struct winreg_DeleteKey *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_winreg_DeleteKey(struct ndr_pull *ndr, int flags, struct winreg_DeleteKey *r)
 {
        TALLOC_CTX *_mem_save_handle_0;
        if (flags & NDR_IN) {
@@ -1307,7 +1331,7 @@ _PUBLIC_ void ndr_print_winreg_DeleteValue(struct ndr_print *ndr, const char *na
        ndr->depth--;
 }
 
-static enum ndr_err_code ndr_push_winreg_EnumKey(struct ndr_push *ndr, int flags, const struct winreg_EnumKey *r)
+_PUBLIC_ enum ndr_err_code ndr_push_winreg_EnumKey(struct ndr_push *ndr, int flags, const struct winreg_EnumKey *r)
 {
        if (flags & NDR_IN) {
                if (r->in.handle == NULL) {
@@ -1346,7 +1370,7 @@ static enum ndr_err_code ndr_push_winreg_EnumKey(struct ndr_push *ndr, int flags
        return NDR_ERR_SUCCESS;
 }
 
-static enum ndr_err_code ndr_pull_winreg_EnumKey(struct ndr_pull *ndr, int flags, struct winreg_EnumKey *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_winreg_EnumKey(struct ndr_pull *ndr, int flags, struct winreg_EnumKey *r)
 {
        uint32_t _ptr_keyclass;
        uint32_t _ptr_last_changed_time;
@@ -1494,7 +1518,7 @@ _PUBLIC_ void ndr_print_winreg_EnumKey(struct ndr_print *ndr, const char *name,
        ndr->depth--;
 }
 
-static enum ndr_err_code ndr_push_winreg_EnumValue(struct ndr_push *ndr, int flags, const struct winreg_EnumValue *r)
+_PUBLIC_ enum ndr_err_code ndr_push_winreg_EnumValue(struct ndr_push *ndr, int flags, const struct winreg_EnumValue *r)
 {
        if (flags & NDR_IN) {
                if (r->in.handle == NULL) {
@@ -1555,7 +1579,7 @@ static enum ndr_err_code ndr_push_winreg_EnumValue(struct ndr_push *ndr, int fla
        return NDR_ERR_SUCCESS;
 }
 
-static enum ndr_err_code ndr_pull_winreg_EnumValue(struct ndr_pull *ndr, int flags, struct winreg_EnumValue *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_winreg_EnumValue(struct ndr_pull *ndr, int flags, struct winreg_EnumValue *r)
 {
        uint32_t _ptr_type;
        uint32_t _ptr_value;
@@ -1809,7 +1833,7 @@ _PUBLIC_ void ndr_print_winreg_EnumValue(struct ndr_print *ndr, const char *name
        ndr->depth--;
 }
 
-static enum ndr_err_code ndr_push_winreg_FlushKey(struct ndr_push *ndr, int flags, const struct winreg_FlushKey *r)
+_PUBLIC_ enum ndr_err_code ndr_push_winreg_FlushKey(struct ndr_push *ndr, int flags, const struct winreg_FlushKey *r)
 {
        if (flags & NDR_IN) {
                if (r->in.handle == NULL) {
@@ -1823,7 +1847,7 @@ static enum ndr_err_code ndr_push_winreg_FlushKey(struct ndr_push *ndr, int flag
        return NDR_ERR_SUCCESS;
 }
 
-static enum ndr_err_code ndr_pull_winreg_FlushKey(struct ndr_pull *ndr, int flags, struct winreg_FlushKey *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_winreg_FlushKey(struct ndr_pull *ndr, int flags, struct winreg_FlushKey *r)
 {
        TALLOC_CTX *_mem_save_handle_0;
        if (flags & NDR_IN) {
@@ -1866,7 +1890,7 @@ _PUBLIC_ void ndr_print_winreg_FlushKey(struct ndr_print *ndr, const char *name,
        ndr->depth--;
 }
 
-static enum ndr_err_code ndr_push_winreg_GetKeySecurity(struct ndr_push *ndr, int flags, const struct winreg_GetKeySecurity *r)
+_PUBLIC_ enum ndr_err_code ndr_push_winreg_GetKeySecurity(struct ndr_push *ndr, int flags, const struct winreg_GetKeySecurity *r)
 {
        if (flags & NDR_IN) {
                if (r->in.handle == NULL) {
@@ -1889,7 +1913,7 @@ static enum ndr_err_code ndr_push_winreg_GetKeySecurity(struct ndr_push *ndr, in
        return NDR_ERR_SUCCESS;
 }
 
-static enum ndr_err_code ndr_pull_winreg_GetKeySecurity(struct ndr_pull *ndr, int flags, struct winreg_GetKeySecurity *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_winreg_GetKeySecurity(struct ndr_pull *ndr, int flags, struct winreg_GetKeySecurity *r)
 {
        TALLOC_CTX *_mem_save_handle_0;
        TALLOC_CTX *_mem_save_sd_0;
@@ -2066,7 +2090,7 @@ _PUBLIC_ void ndr_print_winreg_LoadKey(struct ndr_print *ndr, const char *name,
        ndr->depth--;
 }
 
-static enum ndr_err_code ndr_push_winreg_NotifyChangeKeyValue(struct ndr_push *ndr, int flags, const struct winreg_NotifyChangeKeyValue *r)
+_PUBLIC_ enum ndr_err_code ndr_push_winreg_NotifyChangeKeyValue(struct ndr_push *ndr, int flags, const struct winreg_NotifyChangeKeyValue *r)
 {
        if (flags & NDR_IN) {
                if (r->in.handle == NULL) {
@@ -2074,7 +2098,7 @@ static enum ndr_err_code ndr_push_winreg_NotifyChangeKeyValue(struct ndr_push *n
                }
                NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS, r->in.handle));
                NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.watch_subtree));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.notify_filter));
+               NDR_CHECK(ndr_push_winreg_NotifyChangeType(ndr, NDR_SCALARS, r->in.notify_filter));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.unknown));
                NDR_CHECK(ndr_push_winreg_String(ndr, NDR_SCALARS|NDR_BUFFERS, &r->in.string1));
                NDR_CHECK(ndr_push_winreg_String(ndr, NDR_SCALARS|NDR_BUFFERS, &r->in.string2));
@@ -2086,7 +2110,7 @@ static enum ndr_err_code ndr_push_winreg_NotifyChangeKeyValue(struct ndr_push *n
        return NDR_ERR_SUCCESS;
 }
 
-static enum ndr_err_code ndr_pull_winreg_NotifyChangeKeyValue(struct ndr_pull *ndr, int flags, struct winreg_NotifyChangeKeyValue *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_winreg_NotifyChangeKeyValue(struct ndr_pull *ndr, int flags, struct winreg_NotifyChangeKeyValue *r)
 {
        TALLOC_CTX *_mem_save_handle_0;
        if (flags & NDR_IN) {
@@ -2098,7 +2122,7 @@ static enum ndr_err_code ndr_pull_winreg_NotifyChangeKeyValue(struct ndr_pull *n
                NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS, r->in.handle));
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_handle_0, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.watch_subtree));
-               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.notify_filter));
+               NDR_CHECK(ndr_pull_winreg_NotifyChangeType(ndr, NDR_SCALARS, &r->in.notify_filter));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.unknown));
                NDR_CHECK(ndr_pull_winreg_String(ndr, NDR_SCALARS|NDR_BUFFERS, &r->in.string1));
                NDR_CHECK(ndr_pull_winreg_String(ndr, NDR_SCALARS|NDR_BUFFERS, &r->in.string2));
@@ -2125,7 +2149,7 @@ _PUBLIC_ void ndr_print_winreg_NotifyChangeKeyValue(struct ndr_print *ndr, const
                ndr_print_policy_handle(ndr, "handle", r->in.handle);
                ndr->depth--;
                ndr_print_uint8(ndr, "watch_subtree", r->in.watch_subtree);
-               ndr_print_uint32(ndr, "notify_filter", r->in.notify_filter);
+               ndr_print_winreg_NotifyChangeType(ndr, "notify_filter", r->in.notify_filter);
                ndr_print_uint32(ndr, "unknown", r->in.unknown);
                ndr_print_winreg_String(ndr, "string1", &r->in.string1);
                ndr_print_winreg_String(ndr, "string2", &r->in.string2);
@@ -2141,7 +2165,7 @@ _PUBLIC_ void ndr_print_winreg_NotifyChangeKeyValue(struct ndr_print *ndr, const
        ndr->depth--;
 }
 
-static enum ndr_err_code ndr_push_winreg_OpenKey(struct ndr_push *ndr, int flags, const struct winreg_OpenKey *r)
+_PUBLIC_ enum ndr_err_code ndr_push_winreg_OpenKey(struct ndr_push *ndr, int flags, const struct winreg_OpenKey *r)
 {
        if (flags & NDR_IN) {
                if (r->in.parent_handle == NULL) {
@@ -2162,7 +2186,7 @@ static enum ndr_err_code ndr_push_winreg_OpenKey(struct ndr_push *ndr, int flags
        return NDR_ERR_SUCCESS;
 }
 
-static enum ndr_err_code ndr_pull_winreg_OpenKey(struct ndr_pull *ndr, int flags, struct winreg_OpenKey *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_winreg_OpenKey(struct ndr_pull *ndr, int flags, struct winreg_OpenKey *r)
 {
        TALLOC_CTX *_mem_save_parent_handle_0;
        TALLOC_CTX *_mem_save_handle_0;
@@ -2227,7 +2251,7 @@ _PUBLIC_ void ndr_print_winreg_OpenKey(struct ndr_print *ndr, const char *name,
        ndr->depth--;
 }
 
-static enum ndr_err_code ndr_push_winreg_QueryInfoKey(struct ndr_push *ndr, int flags, const struct winreg_QueryInfoKey *r)
+_PUBLIC_ enum ndr_err_code ndr_push_winreg_QueryInfoKey(struct ndr_push *ndr, int flags, const struct winreg_QueryInfoKey *r)
 {
        if (flags & NDR_IN) {
                if (r->in.handle == NULL) {
@@ -2281,7 +2305,7 @@ static enum ndr_err_code ndr_push_winreg_QueryInfoKey(struct ndr_push *ndr, int
        return NDR_ERR_SUCCESS;
 }
 
-static enum ndr_err_code ndr_pull_winreg_QueryInfoKey(struct ndr_pull *ndr, int flags, struct winreg_QueryInfoKey *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_winreg_QueryInfoKey(struct ndr_pull *ndr, int flags, struct winreg_QueryInfoKey *r)
 {
        TALLOC_CTX *_mem_save_handle_0;
        TALLOC_CTX *_mem_save_classname_0;
@@ -2463,7 +2487,7 @@ _PUBLIC_ void ndr_print_winreg_QueryInfoKey(struct ndr_print *ndr, const char *n
        ndr->depth--;
 }
 
-static enum ndr_err_code ndr_push_winreg_QueryValue(struct ndr_push *ndr, int flags, const struct winreg_QueryValue *r)
+_PUBLIC_ enum ndr_err_code ndr_push_winreg_QueryValue(struct ndr_push *ndr, int flags, const struct winreg_QueryValue *r)
 {
        if (flags & NDR_IN) {
                if (r->in.handle == NULL) {
@@ -2482,16 +2506,16 @@ static enum ndr_err_code ndr_push_winreg_QueryValue(struct ndr_push *ndr, int fl
                if (r->in.data) {
                        NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->in.data_size));
                        NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->in.value_length));
-                       NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->in.data, *r->in.value_length));
+                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->in.data_length));
+                       NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->in.data, *r->in.data_length));
                }
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.data_size));
                if (r->in.data_size) {
                        NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->in.data_size));
                }
-               NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.value_length));
-               if (r->in.value_length) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->in.value_length));
+               NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.data_length));
+               if (r->in.data_length) {
+                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->in.data_length));
                }
        }
        if (flags & NDR_OUT) {
@@ -2503,34 +2527,34 @@ static enum ndr_err_code ndr_push_winreg_QueryValue(struct ndr_push *ndr, int fl
                if (r->out.data) {
                        NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.data_size));
                        NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.value_length));
-                       NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->out.data, *r->out.value_length));
+                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.data_length));
+                       NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->out.data, *r->out.data_length));
                }
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->out.data_size));
                if (r->out.data_size) {
                        NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.data_size));
                }
-               NDR_CHECK(ndr_push_unique_ptr(ndr, r->out.value_length));
-               if (r->out.value_length) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.value_length));
+               NDR_CHECK(ndr_push_unique_ptr(ndr, r->out.data_length));
+               if (r->out.data_length) {
+                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.data_length));
                }
                NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
        }
        return NDR_ERR_SUCCESS;
 }
 
-static enum ndr_err_code ndr_pull_winreg_QueryValue(struct ndr_pull *ndr, int flags, struct winreg_QueryValue *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_winreg_QueryValue(struct ndr_pull *ndr, int flags, struct winreg_QueryValue *r)
 {
        uint32_t _ptr_type;
        uint32_t _ptr_data;
        uint32_t _ptr_data_size;
-       uint32_t _ptr_value_length;
+       uint32_t _ptr_data_length;
        TALLOC_CTX *_mem_save_handle_0;
        TALLOC_CTX *_mem_save_value_name_0;
        TALLOC_CTX *_mem_save_type_0;
        TALLOC_CTX *_mem_save_data_0;
        TALLOC_CTX *_mem_save_data_size_0;
-       TALLOC_CTX *_mem_save_value_length_0;
+       TALLOC_CTX *_mem_save_data_length_0;
        if (flags & NDR_IN) {
                ZERO_STRUCT(r->out);
 
@@ -2590,25 +2614,25 @@ static enum ndr_err_code ndr_pull_winreg_QueryValue(struct ndr_pull *ndr, int fl
                        NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->in.data_size));
                        NDR_PULL_SET_MEM_CTX(ndr, _mem_save_data_size_0, 0);
                }
-               NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_value_length));
-               if (_ptr_value_length) {
-                       NDR_PULL_ALLOC(ndr, r->in.value_length);
+               NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_data_length));
+               if (_ptr_data_length) {
+                       NDR_PULL_ALLOC(ndr, r->in.data_length);
                } else {
-                       r->in.value_length = NULL;
+                       r->in.data_length = NULL;
                }
-               if (r->in.value_length) {
-                       _mem_save_value_length_0 = NDR_PULL_GET_MEM_CTX(ndr);
-                       NDR_PULL_SET_MEM_CTX(ndr, r->in.value_length, 0);
-                       NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->in.value_length));
-                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_value_length_0, 0);
+               if (r->in.data_length) {
+                       _mem_save_data_length_0 = NDR_PULL_GET_MEM_CTX(ndr);
+                       NDR_PULL_SET_MEM_CTX(ndr, r->in.data_length, 0);
+                       NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->in.data_length));
+                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_data_length_0, 0);
                }
                if (r->in.data) {
                        if (r->in.data_size == NULL) return ndr_pull_error(ndr, NDR_ERR_INVALID_POINTER, "NULL Pointer for size_is()");
                        NDR_CHECK(ndr_check_array_size(ndr, (void*)&r->in.data, *r->in.data_size));
                }
                if (r->in.data) {
-                       if (r->in.value_length == NULL) return ndr_pull_error(ndr, NDR_ERR_INVALID_POINTER, "NULL Pointer for length_is()");
-                       NDR_CHECK(ndr_check_array_length(ndr, (void*)&r->in.data, *r->in.value_length));
+                       if (r->in.data_length == NULL) return ndr_pull_error(ndr, NDR_ERR_INVALID_POINTER, "NULL Pointer for length_is()");
+                       NDR_CHECK(ndr_check_array_length(ndr, (void*)&r->in.data, *r->in.data_length));
                }
        }
        if (flags & NDR_OUT) {
@@ -2654,17 +2678,17 @@ static enum ndr_err_code ndr_pull_winreg_QueryValue(struct ndr_pull *ndr, int fl
                        NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out.data_size));
                        NDR_PULL_SET_MEM_CTX(ndr, _mem_save_data_size_0, 0);
                }
-               NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_value_length));
-               if (_ptr_value_length) {
-                       NDR_PULL_ALLOC(ndr, r->out.value_length);
+               NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_data_length));
+               if (_ptr_data_length) {
+                       NDR_PULL_ALLOC(ndr, r->out.data_length);
                } else {
-                       r->out.value_length = NULL;
+                       r->out.data_length = NULL;
                }
-               if (r->out.value_length) {
-                       _mem_save_value_length_0 = NDR_PULL_GET_MEM_CTX(ndr);
-                       NDR_PULL_SET_MEM_CTX(ndr, r->out.value_length, 0);
-                       NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out.value_length));
-                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_value_length_0, 0);
+               if (r->out.data_length) {
+                       _mem_save_data_length_0 = NDR_PULL_GET_MEM_CTX(ndr);
+                       NDR_PULL_SET_MEM_CTX(ndr, r->out.data_length, 0);
+                       NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out.data_length));
+                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_data_length_0, 0);
                }
                NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
                if (r->out.data) {
@@ -2672,8 +2696,8 @@ static enum ndr_err_code ndr_pull_winreg_QueryValue(struct ndr_pull *ndr, int fl
                        NDR_CHECK(ndr_check_array_size(ndr, (void*)&r->out.data, *r->out.data_size));
                }
                if (r->out.data) {
-                       if (r->out.value_length == NULL) return ndr_pull_error(ndr, NDR_ERR_INVALID_POINTER, "NULL Pointer for length_is()");
-                       NDR_CHECK(ndr_check_array_length(ndr, (void*)&r->out.data, *r->out.value_length));
+                       if (r->out.data_length == NULL) return ndr_pull_error(ndr, NDR_ERR_INVALID_POINTER, "NULL Pointer for length_is()");
+                       NDR_CHECK(ndr_check_array_length(ndr, (void*)&r->out.data, *r->out.data_length));
                }
        }
        return NDR_ERR_SUCCESS;
@@ -2706,8 +2730,8 @@ _PUBLIC_ void ndr_print_winreg_QueryValue(struct ndr_print *ndr, const char *nam
                ndr_print_ptr(ndr, "data", r->in.data);
                ndr->depth++;
                if (r->in.data) {
-                       if (r->in.value_length == NULL) return;
-                       ndr_print_array_uint8(ndr, "data", r->in.data, *r->in.value_length);
+                       if (r->in.data_length == NULL) return;
+                       ndr_print_array_uint8(ndr, "data", r->in.data, *r->in.data_length);
                }
                ndr->depth--;
                ndr_print_ptr(ndr, "data_size", r->in.data_size);
@@ -2716,10 +2740,10 @@ _PUBLIC_ void ndr_print_winreg_QueryValue(struct ndr_print *ndr, const char *nam
                        ndr_print_uint32(ndr, "data_size", *r->in.data_size);
                }
                ndr->depth--;
-               ndr_print_ptr(ndr, "value_length", r->in.value_length);
+               ndr_print_ptr(ndr, "data_length", r->in.data_length);
                ndr->depth++;
-               if (r->in.value_length) {
-                       ndr_print_uint32(ndr, "value_length", *r->in.value_length);
+               if (r->in.data_length) {
+                       ndr_print_uint32(ndr, "data_length", *r->in.data_length);
                }
                ndr->depth--;
                ndr->depth--;
@@ -2736,8 +2760,8 @@ _PUBLIC_ void ndr_print_winreg_QueryValue(struct ndr_print *ndr, const char *nam
                ndr_print_ptr(ndr, "data", r->out.data);
                ndr->depth++;
                if (r->out.data) {
-                       if (r->out.value_length == NULL) return;
-                       ndr_print_array_uint8(ndr, "data", r->out.data, *r->out.value_length);
+                       if (r->out.data_length == NULL) return;
+                       ndr_print_array_uint8(ndr, "data", r->out.data, *r->out.data_length);
                }
                ndr->depth--;
                ndr_print_ptr(ndr, "data_size", r->out.data_size);
@@ -2746,10 +2770,10 @@ _PUBLIC_ void ndr_print_winreg_QueryValue(struct ndr_print *ndr, const char *nam
                        ndr_print_uint32(ndr, "data_size", *r->out.data_size);
                }
                ndr->depth--;
-               ndr_print_ptr(ndr, "value_length", r->out.value_length);
+               ndr_print_ptr(ndr, "data_length", r->out.data_length);
                ndr->depth++;
-               if (r->out.value_length) {
-                       ndr_print_uint32(ndr, "value_length", *r->out.value_length);
+               if (r->out.data_length) {
+                       ndr_print_uint32(ndr, "data_length", *r->out.data_length);
                }
                ndr->depth--;
                ndr_print_WERROR(ndr, "result", r->out.result);
@@ -3181,7 +3205,7 @@ static enum ndr_err_code ndr_push_winreg_InitiateSystemShutdown(struct ndr_push
                }
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.message));
                if (r->in.message) {
-                       NDR_CHECK(ndr_push_initshutdown_String(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.message));
+                       NDR_CHECK(ndr_push_lsa_StringLarge(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.message));
                }
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.timeout));
                NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.force_apps));
@@ -3221,7 +3245,7 @@ static enum ndr_err_code ndr_pull_winreg_InitiateSystemShutdown(struct ndr_pull
                if (r->in.message) {
                        _mem_save_message_0 = NDR_PULL_GET_MEM_CTX(ndr);
                        NDR_PULL_SET_MEM_CTX(ndr, r->in.message, 0);
-                       NDR_CHECK(ndr_pull_initshutdown_String(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.message));
+                       NDR_CHECK(ndr_pull_lsa_StringLarge(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.message));
                        NDR_PULL_SET_MEM_CTX(ndr, _mem_save_message_0, 0);
                }
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.timeout));
@@ -3253,7 +3277,7 @@ _PUBLIC_ void ndr_print_winreg_InitiateSystemShutdown(struct ndr_print *ndr, con
                ndr_print_ptr(ndr, "message", r->in.message);
                ndr->depth++;
                if (r->in.message) {
-                       ndr_print_initshutdown_String(ndr, "message", r->in.message);
+                       ndr_print_lsa_StringLarge(ndr, "message", r->in.message);
                }
                ndr->depth--;
                ndr_print_uint32(ndr, "timeout", r->in.timeout);
@@ -3335,7 +3359,7 @@ _PUBLIC_ void ndr_print_winreg_AbortSystemShutdown(struct ndr_print *ndr, const
        ndr->depth--;
 }
 
-static enum ndr_err_code ndr_push_winreg_GetVersion(struct ndr_push *ndr, int flags, const struct winreg_GetVersion *r)
+_PUBLIC_ enum ndr_err_code ndr_push_winreg_GetVersion(struct ndr_push *ndr, int flags, const struct winreg_GetVersion *r)
 {
        if (flags & NDR_IN) {
                if (r->in.handle == NULL) {
@@ -3353,7 +3377,7 @@ static enum ndr_err_code ndr_push_winreg_GetVersion(struct ndr_push *ndr, int fl
        return NDR_ERR_SUCCESS;
 }
 
-static enum ndr_err_code ndr_pull_winreg_GetVersion(struct ndr_pull *ndr, int flags, struct winreg_GetVersion *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_winreg_GetVersion(struct ndr_pull *ndr, int flags, struct winreg_GetVersion *r)
 {
        TALLOC_CTX *_mem_save_handle_0;
        TALLOC_CTX *_mem_save_version_0;
@@ -3588,7 +3612,7 @@ _PUBLIC_ void ndr_print_winreg_OpenHKDD(struct ndr_print *ndr, const char *name,
        ndr->depth--;
 }
 
-static enum ndr_err_code ndr_push_winreg_QueryMultipleValues(struct ndr_push *ndr, int flags, const struct winreg_QueryMultipleValues *r)
+_PUBLIC_ enum ndr_err_code ndr_push_winreg_QueryMultipleValues(struct ndr_push *ndr, int flags, const struct winreg_QueryMultipleValues *r)
 {
        uint32_t cntr_values_1;
        if (flags & NDR_IN) {
@@ -3650,7 +3674,7 @@ static enum ndr_err_code ndr_push_winreg_QueryMultipleValues(struct ndr_push *nd
        return NDR_ERR_SUCCESS;
 }
 
-static enum ndr_err_code ndr_pull_winreg_QueryMultipleValues(struct ndr_pull *ndr, int flags, struct winreg_QueryMultipleValues *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_winreg_QueryMultipleValues(struct ndr_pull *ndr, int flags, struct winreg_QueryMultipleValues *r)
 {
        uint32_t cntr_values_1;
        uint32_t _ptr_buffer;
@@ -3872,7 +3896,7 @@ static enum ndr_err_code ndr_push_winreg_InitiateSystemShutdownEx(struct ndr_pus
                }
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.message));
                if (r->in.message) {
-                       NDR_CHECK(ndr_push_initshutdown_String(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.message));
+                       NDR_CHECK(ndr_push_lsa_StringLarge(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.message));
                }
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.timeout));
                NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.force_apps));
@@ -3913,7 +3937,7 @@ static enum ndr_err_code ndr_pull_winreg_InitiateSystemShutdownEx(struct ndr_pul
                if (r->in.message) {
                        _mem_save_message_0 = NDR_PULL_GET_MEM_CTX(ndr);
                        NDR_PULL_SET_MEM_CTX(ndr, r->in.message, 0);
-                       NDR_CHECK(ndr_pull_initshutdown_String(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.message));
+                       NDR_CHECK(ndr_pull_lsa_StringLarge(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.message));
                        NDR_PULL_SET_MEM_CTX(ndr, _mem_save_message_0, 0);
                }
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.timeout));
@@ -3946,7 +3970,7 @@ _PUBLIC_ void ndr_print_winreg_InitiateSystemShutdownEx(struct ndr_print *ndr, c
                ndr_print_ptr(ndr, "message", r->in.message);
                ndr->depth++;
                if (r->in.message) {
-                       ndr_print_initshutdown_String(ndr, "message", r->in.message);
+                       ndr_print_lsa_StringLarge(ndr, "message", r->in.message);
                }
                ndr->depth--;
                ndr_print_uint32(ndr, "timeout", r->in.timeout);