r25731: Document winreg_NotifyChangeKeyValue's notify flags.

Guenther
(This used to be commit 4468b1cc49bd4a92c08aeb76419abfe00791b2c2)

diff --git a/source4/librpc/idl/winreg.idl b/source4/librpc/idl/winreg.idl
index d8f50990db2f454377e47ac1d27270d2776cb3ce..5d0085c969646554f4f933b92e0828edf8b0963a 100644 (file)
--- a/source4/librpc/idl/winreg.idl
+++ b/source4/librpc/idl/winreg.idl
@@ -19,8 +19,8 @@ import "lsa.idl", "initshutdown.idl", "security.idl";
                KEY_QUERY_VALUE                 = 0x00001,
                KEY_SET_VALUE                   = 0x00002,
                KEY_CREATE_SUB_KEY              = 0x00004,
-               KEY_ENUMERATE_SUB_KEYS  = 0x00008,
-               KEY_NOTIFY                              = 0x00010,
+               KEY_ENUMERATE_SUB_KEYS          = 0x00008,
+               KEY_NOTIFY                      = 0x00010,
                KEY_CREATE_LINK                 = 0x00020,
                KEY_WOW64_64KEY                 = 0x00100,
                KEY_WOW64_32KEY                 = 0x00200
@@ -195,13 +195,20 @@ import "lsa.idl", "initshutdown.idl", "security.idl";
 
        /******************/
        /* Function: 0x0e */
+       typedef [public,bitmap32bit] bitmap {
+               REG_NOTIFY_CHANGE_NAME          = 0x00000001,
+               REG_NOTIFY_CHANGE_ATTRIBUTES    = 0x00000002,
+               REG_NOTIFY_CHANGE_LAST_SET      = 0x00000004,
+               REG_NOTIFY_CHANGE_SECURITY      = 0x00000008
+       } winreg_NotifyChangeType;
+
        [public] WERROR winreg_NotifyChangeKeyValue(
                [in,ref] policy_handle *handle,
-               [in] uint8 watch_subtree,
-               [in] uint32 notify_filter,
+               [in] boolean8 watch_subtree,
+               [in] winreg_NotifyChangeType notify_filter,
                [in] uint32 unknown,
                [in] winreg_String string1,
-               [in] winreg_String string2, 
+               [in] winreg_String string2,
                [in] uint32 unknown2
        );
 

diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index 4b00c0326002af8def313fac15f5c4654b69ea5e..4c765f72a20a7f8802b2b0faf44e92a7d043d95f 100644 (file)
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -78,7 +78,7 @@ static bool test_NotifyChangeKeyValue(struct dcerpc_pipe *p,
        struct winreg_NotifyChangeKeyValue r;
 
        r.in.handle = handle;
-       r.in.watch_subtree = 1;
+       r.in.watch_subtree = true;
        r.in.notify_filter = 0;
        r.in.unknown = r.in.unknown2 = 0;
        init_winreg_String(&r.in.string1, NULL);
@@ -90,7 +90,8 @@ static bool test_NotifyChangeKeyValue(struct dcerpc_pipe *p,
 
        if (!W_ERROR_IS_OK(r.out.result)) {
                torture_comment(tctx,
-                               "NotifyChangeKeyValue failed - %s - not considering\n", win_errstr(r.out.result));
+                               "NotifyChangeKeyValue failed - %s - not considering\n",
+                               win_errstr(r.out.result));
                return true;
        }