Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-28 06:02:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Guard some current cmlib includes against new cm branch

Browse source 
- Remove NTSYSAPI from NtBuildNumber definition in NDK.

svn path=/trunk/; revision=24416
This commit is contained in:
Alex Ionescu 2006-10-05 23:01:38 +00:00
parent 8859463623
commit 45d84c9668
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/include/ndk/extypes.h
View file

@ -63,7 +63,7 @@ extern POBJECT_TYPE NTSYSAPI ExTimerType;
// //
// Exported NT Build Number // Exported NT Build Number
// //
extern ULONG NTSYSAPI NtBuildNumber; extern ULONG NtBuildNumber;
// //
// Invalid Handle Value Constant // Invalid Handle Value Constant

4
reactos/lib/cmlib/cmdata.h
View file

@ -18,6 +18,8 @@
#define REG_VALUE_CELL_ID 0x6b76 #define REG_VALUE_CELL_ID 0x6b76
#define REG_SECURITY_CELL_ID 0x6b73 #define REG_SECURITY_CELL_ID 0x6b73
#ifndef _CM_
#include <pshpack1.h> #include <pshpack1.h>
typedef struct _CM_VIEW_OF_FILE typedef struct _CM_VIEW_OF_FILE
@ -147,4 +149,6 @@ typedef struct _CM_KEY_SECURITY
#include <poppack.h> #include <poppack.h>
#endif
#endif /* CMLIB_CMDATA_H */ #endif /* CMLIB_CMDATA_H */

4
reactos/lib/cmlib/cmlib.h
View file

@ -64,7 +64,7 @@ typedef struct _HMAP_ENTRY
{ {
ULONG_PTR Bin; ULONG_PTR Bin;
ULONG_PTR Block; ULONG_PTR Block;
PCM_VIEW_OF_FILE CmHive; struct _CM_VIEW_OF_FILE *CmHive;
ULONG MemAlloc; ULONG MemAlloc;
} HMAP_ENTRY, *PHMAP_ENTRY; } HMAP_ENTRY, *PHMAP_ENTRY;
@ -118,6 +118,7 @@ typedef struct _HHIVE
DUAL Storage[HvMaxStorageType]; DUAL Storage[HvMaxStorageType];
} HHIVE, *PHHIVE; } HHIVE, *PHHIVE;
#ifndef _CM_
typedef struct _EREGISTRY_HIVE typedef struct _EREGISTRY_HIVE
{ {
HHIVE Hive; HHIVE Hive;
@ -129,6 +130,7 @@ typedef struct _EREGISTRY_HIVE
HANDLE HiveHandle; HANDLE HiveHandle;
HANDLE LogHandle; HANDLE LogHandle;
} EREGISTRY_HIVE, *PEREGISTRY_HIVE; } EREGISTRY_HIVE, *PEREGISTRY_HIVE;
#endif
/* /*
* Public functions. * Public functions.