r11072: add routines for converting REG_MULTI_SZ to and from char**

(This used to be commit e858eed813b5a9a8d57262142c5bbde2951b5590)

2 files changed, 117 insertions, 1 deletions

diff --git a/source3/registry/reg_util.c b/source3/registry/reg_util.c
index 9f19db2646..4338699c00 100644
--- a/source3/registry/reg_util.c
+++ b/source3/registry/reg_util.c
@@ -125,3 +125,107 @@ char* reg_remaining_path( const char *key )
 	return p;
 }
 
+/**********************************************************************
+*********************************************************************/
+
+int regval_convert_multi_sz( uint16 *multi_string, size_t multi_len, char ***values )
+{
+	char **sz;
+	int i;
+	int num_strings = 0;
+	fstring buffer;
+	uint16 *wp;
+	
+	*values = NULL;
+	
+	/* just count the NULLs */
+	
+	for ( i=0; (i<multi_len-1) && !(multi_string[i]==0x0 && multi_string[i+1]==0x0); i++ ) {
+		if ( multi_string[i] == 0x0 )
+			num_strings++;
+	}
+	
+	if ( num_strings == 0 )
+		return 0;
+	
+	if ( !(sz = TALLOC_ARRAY( NULL, char*, num_strings+1 )) ) {
+		DEBUG(0,("reg_convert_multi_sz: talloc() failed!\n"));
+		return -1;
+	}
+
+	wp = multi_string;
+	
+	for ( i=0; i<num_strings; i++ ) {
+		rpcstr_pull( buffer, wp, sizeof(buffer), -1, STR_TERMINATE );
+		sz[i] = talloc_strdup( sz, buffer );
+		
+		/* skip to the next string NULL and then one more */
+		while ( *wp )
+			wp++;
+		wp++;
+	}
+	
+	/* tag the array off with an empty string */
+	sz[i] = '\0';
+	
+	*values = sz;
+	
+	return num_strings;
+}
+
+/**********************************************************************
+ Returns number of bytes, not number of unicode characters
+*********************************************************************/
+
+size_t regval_build_multi_sz( char **values, uint16 **buffer )
+{
+	int i;
+	size_t buf_size = 0;
+	uint16 *buf, *b;
+	UNISTR2 sz;
+	
+	/* go ahead and alloc some space */
+	
+	if ( !(buf = TALLOC_ARRAY( NULL, uint16, 2 )) ) {
+		DEBUG(0,("regval_build_multi_sz: talloc() failed!\n"));
+		return 0;
+	}
+	
+	for ( i=0; values[i]; i++ ) {
+		ZERO_STRUCT( sz );
+		
+		init_unistr2( &sz, values[i], UNI_STR_TERMINATE );
+		
+		/* Alloc some more memory.  Always add one one to account for the 
+		   double NULL termination */
+		   
+		b = TALLOC_REALLOC_ARRAY( NULL, buf, uint16, buf_size+sz.uni_str_len+1 );
+		if ( !b ) {
+			DEBUG(0,("regval_build_multi_sz: talloc() reallocation error!\n"));
+			TALLOC_FREE( buffer );
+			return 0;
+		}
+		buf = b;
+
+		/* copy the unistring2 buffer and increment the size */	
+		
+		memcpy( buf+buf_size, sz.buffer, sz.uni_str_len );
+		buf_size += sz.uni_str_len;
+		
+		/* cleanup rather than leaving memory hanging around */
+		TALLOC_FREE( sz.buffer );
+	}
+	
+	buf[buf_size++] = 0x0;
+
+	*buffer = buf;
+
+	/* return number of bytes */
+	return buf_size*2;
+}
+
+
+
+
+
+
diff --git a/source3/rpc_server/srv_reg_nt.c b/source3/rpc_server/srv_reg_nt.c
index 4cd824c9ef..35a060c38e 100644
--- a/source3/rpc_server/srv_reg_nt.c
+++ b/source3/rpc_server/srv_reg_nt.c
@@ -537,9 +537,21 @@ WERROR _reg_enum_value(pipes_struct *p, REG_Q_ENUM_VALUE *q_u, REG_R_ENUM_VALUE
 		goto done;
 	}
 
+#if 0	/* JERRY TEST CODE */
 	if ( val->type == REG_MULTI_SZ ) {
-
+		char **str;
+		int num_strings = regval_convert_multi_sz( (uint16*)regval_data_p(val), regval_size(val), &str );
+		uint16 *buffer;
+		size_t buf_size;
+		
+		
+		if ( num_strings )
+			buf_size = regval_build_multi_sz( str, &buffer );
+		
+		TALLOC_FREE( str );
+		TALLOC_FREE( buffer );
 	}
+#endif
 	
 	DEBUG(10,("_reg_enum_value: retrieved value named  [%s]\n", val->valuename));