svn commit: samba r11243 - in branches/SAMBA_4_0/source: librpc/idl torture/rpc

[jelmer]

Author: jelmer
Date: 2005-10-21 13:06:21 +0000 (Fri, 21 Oct 2005)
New Revision: 11243

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11243

Log:
length and size can now be filled in automatically.

Modified:
   branches/SAMBA_4_0/source/librpc/idl/winreg.idl
   branches/SAMBA_4_0/source/torture/rpc/winreg.c


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/winreg.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/winreg.idl     2005-10-21 12:50:39 UTC 
(rev 11242)
+++ branches/SAMBA_4_0/source/librpc/idl/winreg.idl     2005-10-21 13:06:21 UTC 
(rev 11243)
@@ -130,11 +130,8 @@
        );
 
        typedef struct {
-               /* we can't use value(strlen_m(name)*2) here as it
-                  doesn't propogate to the length_is() property
-                  below. Jelmer, can this be fixed? */
-               uint16 length; 
-               uint16 size;
+               [value(strlen_m(name)*2)] uint16 length; 
+               [value(strlen_m(name)*2)] uint16 size;
                [size_is(size/2),length_is(length/2),charset(UTF16)] uint16 
*name;
        } winreg_StringBuf;
 

Modified: branches/SAMBA_4_0/source/torture/rpc/winreg.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/winreg.c      2005-10-21 12:50:39 UTC 
(rev 11242)
+++ branches/SAMBA_4_0/source/torture/rpc/winreg.c      2005-10-21 13:06:21 UTC 
(rev 11243)
@@ -402,9 +402,7 @@
 
        printf("Testing EnumKey\n\n");
 
-       class.length = 0;
-       class.size   = 0;
-       class.name   = NULL;
+       class.name   = "";
 
        r.in.handle = handle;
        r.in.enum_index = 0;
@@ -414,8 +412,6 @@
        r.in.last_changed_time = &t;
 
        do {
-               name.length = 0;
-               name.size   = 1024;
                name.name   = NULL;
 
                status = dcerpc_winreg_EnumKey(p, mem_ctx, &r);
@@ -536,8 +532,6 @@
 
        printf("testing EnumValue\n");
 
-       name.length = 0;
-       name.size   = 1024;
        name.name   = "";
 
        r.in.handle = handle;