Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 05:25:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMLIB][NTOS:CM] Deduplicate other common definitions between CMLIB and the NTOS CM

Browse source 
Addendum to commit 8c2454e (r70605). Credits and courtesy go to Hermès BÉLUSCA - MAÏTO.

CORE-10802 CORE-10793
This commit is contained in:
George Bișoc 2022-07-10 14:35:53 +02:00
parent 10126e7710
commit 54a00aa8eb
No known key found for this signature in database
GPG key ID: 49452AAF629C81F3
2 changed files with 15 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

26
sdk/lib/cmlib/cmlib.h
View file

@ -122,7 +122,7 @@
IN PRTL_BITMAP BitMapHeader);
#define RtlCheckBit(BMH,BP) (((((PLONG)(BMH)->Buffer)[(BP) / 32]) >> ((BP) % 32)) & 0x1)
#define UNREFERENCED_PARAMETER(P) {(P)=(P);}
#define UNREFERENCED_PARAMETER(P) ((void)(P))
#define PKTHREAD PVOID
#define PKGUARDED_MUTEX PVOID
@ -152,7 +152,9 @@
#undef PAGED_CODE
#define PAGED_CODE()
#define REGISTRY_ERROR ((ULONG)0x00000051L)
#else
//
// Debug/Tracing support
//
@ -214,17 +216,13 @@
#include "hivedata.h"
#include "cmdata.h"
#if defined(_TYPEDEFS_HOST_H) || defined(_BLDR_)
/* Forward declarations */
typedef struct _CM_KEY_SECURITY_CACHE_ENTRY *PCM_KEY_SECURITY_CACHE_ENTRY;
typedef struct _CM_KEY_CONTROL_BLOCK *PCM_KEY_CONTROL_BLOCK;
typedef struct _CM_CELL_REMAP_BLOCK *PCM_CELL_REMAP_BLOCK;
#define PCM_KEY_SECURITY_CACHE_ENTRY PVOID
#define PCM_KEY_CONTROL_BLOCK PVOID
#define PCM_CELL_REMAP_BLOCK PVOID
// See also ntoskrnl/include/internal/cm.h
#define CMP_SECURITY_HASH_LISTS 64
// #endif // Commented out until one finds a way to properly include
// this header in the bootloader and in ntoskrnl.
// See ntoskrnl/include/internal/cm.h
#define CMP_SECURITY_HASH_LISTS 64
//
// Use Count Log and Entry
@ -291,8 +289,6 @@ typedef struct _CMHIVE
PKTHREAD CreatorOwner;
} CMHIVE, *PCMHIVE;
#endif // See comment above
typedef struct _HV_HIVE_CELL_PAIR
{
PHHIVE Hive;
@ -312,9 +308,9 @@ typedef struct _HV_TRACK_CELL_REF
extern ULONG CmlibTraceLevel;
//
// Hack since bigkeys are not yet supported
// Hack since big keys are not yet supported
//
#define ASSERT_VALUE_BIG(h, s) \
#define ASSERT_VALUE_BIG(h, s) \
ASSERTMSG("Big keys not supported!\n", !CmpIsKeyValueBig(h, s));
//