From 796cade5585f1237e2c047293ad6a9b8a4e923ba Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 30 Sep 2005 17:13:37 +0000 Subject: r10656: BIG merge from trunk. Features not copied over * \PIPE\unixinfo * winbindd's {group,alias}membership new functions * winbindd's lookupsids() functionality * swat (trunk changes to be reverted as per discussion with Deryck) --- source/include/rpc_reg.h | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'source/include/rpc_reg.h') diff --git a/source/include/rpc_reg.h b/source/include/rpc_reg.h index f6ddf5b9adf..b24b640237f 100644 --- a/source/include/rpc_reg.h +++ b/source/include/rpc_reg.h @@ -25,8 +25,6 @@ #ifndef _RPC_REG_H /* _RPC_REG_H */ #define _RPC_REG_H -#include "reg_objects.h" - /* RPC opnum */ #define REG_OPEN_HKCR 0x00 @@ -50,6 +48,7 @@ #define REG_SET_VALUE 0x16 #define REG_SHUTDOWN 0x18 #define REG_ABORT_SHUTDOWN 0x19 +#define REG_OPEN_HKPT 0x20 #define REG_GETVERSION 0x1a #define REG_SHUTDOWN_EX 0x1e @@ -63,6 +62,9 @@ #define KEY_HKLM "HKLM" #define KEY_HKU "HKU" #define KEY_HKCR "HKCR" +#define KEY_HKPD "HKPD" +#define KEY_HKPT "HKPT" +#define KEY_SERVICES "HKLM\\SYSTEM\\CurrentControlSet\\Services" #define KEY_PRINTING "HKLM\\SYSTEM\\CurrentControlSet\\Control\\Print" #define KEY_PRINTING_2K "HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Print\\Printers" #define KEY_PRINTING_PORTS "HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Ports" @@ -85,6 +87,16 @@ #define REG_FULL_RESOURCE_DESCRIPTOR 9 #define REG_RESOURCE_REQUIREMENTS_LIST 10 +/* + * Registry key types + * Most keys are going to be GENERIC -- may need a better name? + * HKPD and HKPT are used by reg_perfcount.c + * they are special keys that congtain performance data + */ +#define REG_KEY_GENERIC 0 +#define REG_KEY_HKPD 1 +#define REG_KEY_HKPT 2 + /* * container for function pointers to enumeration routines * for vitural registry view @@ -108,9 +120,8 @@ typedef struct { /* structure to store the registry handles */ typedef struct _RegistryKey { - struct _RegistryKey *prev, *next; - - pstring name; /* full name of registry key */ + uint32 type; + char *name; /* full name of registry key */ uint32 access_granted; REGISTRY_HOOK *hook; } REGISTRY_KEY; -- cgit