svn commit: samba r9503 - in branches/SAMBA_4_0/source: include
lib/registry lib/registry/common lib/registry/tools
tridge at samba.org
tridge at samba.org
Tue Aug 23 03:22:26 GMT 2005
Author: tridge
Date: 2005-08-23 03:22:25 +0000 (Tue, 23 Aug 2005)
New Revision: 9503
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9503
Log:
removed duplicate REG_* defines from registry.h now that they are
generated in winreg.h
Modified:
branches/SAMBA_4_0/source/include/registry.h
branches/SAMBA_4_0/source/lib/registry/common/reg_util.c
branches/SAMBA_4_0/source/lib/registry/reg_backend_ldb.c
branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c
Changeset:
Modified: branches/SAMBA_4_0/source/include/registry.h
===================================================================
--- branches/SAMBA_4_0/source/include/registry.h 2005-08-23 02:40:27 UTC (rev 9502)
+++ branches/SAMBA_4_0/source/include/registry.h 2005-08-23 03:22:25 UTC (rev 9503)
@@ -33,23 +33,7 @@
#define HKEY_PERFORMANCE_TEXT 0x80000050
#define HKEY_PERFORMANCE_NLSTEXT 0x80000060
-/* Registry data types */
-
#define REG_DELETE -1
-#define REG_NONE 0
-#define REG_SZ 1
-#define REG_EXPAND_SZ 2
-#define REG_BINARY 3
-#define REG_DWORD_LE 4
-#define REG_DWORD REG_DWORD_LE
-#define REG_DWORD_BE 5
-#define REG_LINK 6
-#define REG_MULTI_SZ 7
-#define REG_RESOURCE_LIST 8
-#define REG_FULL_RESOURCE_DESCRIPTOR 9
-#define REG_RESOURCE_REQUIREMENTS_LIST 10
-#define REG_QWORD_LE 11
-#define REG_QWORD REQ_QWORD_LE
#if 0
/* FIXME */
Modified: branches/SAMBA_4_0/source/lib/registry/common/reg_util.c
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/common/reg_util.c 2005-08-23 02:40:27 UTC (rev 9502)
+++ branches/SAMBA_4_0/source/lib/registry/common/reg_util.c 2005-08-23 03:22:25 UTC (rev 9503)
@@ -20,6 +20,7 @@
#include "includes.h"
#include "registry.h"
+#include "librpc/gen_ndr/winreg.h"
static const struct {
uint32_t id;
Modified: branches/SAMBA_4_0/source/lib/registry/reg_backend_ldb.c
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/reg_backend_ldb.c 2005-08-23 02:40:27 UTC (rev 9502)
+++ branches/SAMBA_4_0/source/lib/registry/reg_backend_ldb.c 2005-08-23 03:22:25 UTC (rev 9503)
@@ -22,6 +22,7 @@
#include "registry.h"
#include "lib/ldb/include/ldb.h"
#include "db_wrap.h"
+#include "librpc/gen_ndr/winreg.h"
struct ldb_key_data
{
@@ -51,7 +52,7 @@
*len = convert_string_talloc(mem_ctx, CH_UTF8, CH_UTF16, val->data, val->length, data);
break;
- case REG_DWORD_LE:
+ case REG_DWORD:
*len = 4;
*data = talloc(mem_ctx, uint32_t);
SIVAL(*data, 0, strtol(val->data, NULL, 0));
@@ -78,7 +79,7 @@
val.length = convert_string_talloc(mem_ctx, CH_UTF16, CH_UTF8, data, len, &val.data);
ldb_msg_add_value(ctx, msg, "data", &val);
break;
- case REG_DWORD_LE:
+ case REG_DWORD:
ldb_msg_add_string(ctx, msg, "data", talloc_asprintf(mem_ctx, "0x%x", IVAL(data, 0)));
break;
default:
Modified: branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c 2005-08-23 02:40:27 UTC (rev 9502)
+++ branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c 2005-08-23 03:22:25 UTC (rev 9503)
@@ -25,6 +25,7 @@
#include "registry.h"
#include "lib/cmdline/popt_common.h"
#include "system/filesys.h"
+#include "librpc/gen_ndr/winreg.h"
/*
* Routines to parse a REGEDIT4 file
More information about the samba-cvs
mailing list