sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-11 16:58:40 +03:00
Code

r9503: removed duplicate REG_* defines from registry.h now that they are

Browse Source 
generated in winreg.h
This commit is contained in:
Andrew Tridgell 2005-08-23 03:22:25 +00:00 committed by Gerald (Jerry) Carter
parent 10b1f95790
commit fc15e1b003
4 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/include/registry.h
View File

@ -33,23 +33,7 @@
#define HKEY_PERFORMANCE_TEXT 0x80000050 #define HKEY_PERFORMANCE_TEXT 0x80000050
#define HKEY_PERFORMANCE_NLSTEXT 0x80000060 #define HKEY_PERFORMANCE_NLSTEXT 0x80000060
/* Registry data types */
#define REG_DELETE -1 #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 #if 0
/* FIXME */ /* FIXME */

1
source/lib/registry/common/reg_util.c
View File

@ -20,6 +20,7 @@
#include "includes.h" #include "includes.h"
#include "registry.h" #include "registry.h"
#include "librpc/gen_ndr/winreg.h"
static const struct { static const struct {
uint32_t id; uint32_t id;

5
source/lib/registry/reg_backend_ldb.c
View File

@ -22,6 +22,7 @@
#include "registry.h" #include "registry.h"
#include "lib/ldb/include/ldb.h" #include "lib/ldb/include/ldb.h"
#include "db_wrap.h" #include "db_wrap.h"
#include "librpc/gen_ndr/winreg.h"
struct ldb_key_data struct ldb_key_data
{ {
@ -51,7 +52,7 @@ static void reg_ldb_unpack_value(TALLOC_CTX *mem_ctx, struct ldb_message *msg, c
*len = convert_string_talloc(mem_ctx, CH_UTF8, CH_UTF16, val->data, val->length, data); *len = convert_string_talloc(mem_ctx, CH_UTF8, CH_UTF16, val->data, val->length, data);
break; break;
case REG_DWORD_LE: case REG_DWORD:
*len = 4; *len = 4;
*data = talloc(mem_ctx, uint32_t); *data = talloc(mem_ctx, uint32_t);
SIVAL(*data, 0, strtol(val->data, NULL, 0)); SIVAL(*data, 0, strtol(val->data, NULL, 0));
@ -78,7 +79,7 @@ static struct ldb_message *reg_ldb_pack_value(struct ldb_context *ctx, TALLOC_CT
val.length = convert_string_talloc(mem_ctx, CH_UTF16, CH_UTF8, data, len, &val.data); val.length = convert_string_talloc(mem_ctx, CH_UTF16, CH_UTF8, data, len, &val.data);
ldb_msg_add_value(ctx, msg, "data", &val); ldb_msg_add_value(ctx, msg, "data", &val);
break; break;
case REG_DWORD_LE: case REG_DWORD:
ldb_msg_add_string(ctx, msg, "data", talloc_asprintf(mem_ctx, "0x%x", IVAL(data, 0))); ldb_msg_add_string(ctx, msg, "data", talloc_asprintf(mem_ctx, "0x%x", IVAL(data, 0)));
break; break;
default: default:

1
source/lib/registry/tools/regpatch.c
View File

@ -25,6 +25,7 @@
#include "registry.h" #include "registry.h"
#include "lib/cmdline/popt_common.h" #include "lib/cmdline/popt_common.h"
#include "system/filesys.h" #include "system/filesys.h"
#include "librpc/gen_ndr/winreg.h"
/* /*
* Routines to parse a REGEDIT4 file * Routines to parse a REGEDIT4 file