Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-21 12:40:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix two more build issues caused by greatlod's d3d header change and ndk bug

Browse source 
svn path=/trunk/; revision=16239
This commit is contained in:
Alex Ionescu 2005-06-23 05:07:25 +00:00
parent 5eefe9bdd1
commit 1a1adca582
3 changed files with 41 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/include/ddk/d3dhal.h
View file

@ -26,7 +26,7 @@
extern "C" { extern "C" {
#endif #endif
#include <ddrawi.h> #include <ddk/ddrawi.h>
#include <d3d.h> #include <d3d.h>
/***************************************************************************** /*****************************************************************************

38
reactos/include/ndk/obtypes.h
View file

@ -11,10 +11,6 @@
/* DEPENDENCIES **************************************************************/ /* DEPENDENCIES **************************************************************/
/* EXPORTED DATA *************************************************************/
extern NTOSAPI POBJECT_TYPE ObDirectoryType;
extern NTOSAPI PDEVICE_MAP ObSystemDeviceMap;
/* CONSTANTS *****************************************************************/ /* CONSTANTS *****************************************************************/
/* Values for DosDeviceDriveType */ /* Values for DosDeviceDriveType */
@ -46,5 +42,39 @@ typedef struct _OBJECT_BASIC_INFORMATION
} OBJECT_BASIC_INFORMATION, *POBJECT_BASIC_INFORMATION; } OBJECT_BASIC_INFORMATION, *POBJECT_BASIC_INFORMATION;
/* FIXME: Add Object Structures Here */ /* FIXME: Add Object Structures Here */
/*
* FIXME: These will eventually become centerfold in the compliant Ob Manager
* For now, they are only here so Device Map is properly defined before the header
* changes
*/
typedef struct _OBJECT_DIRECTORY_ENTRY
{
struct _OBJECT_DIRECTORY_ENTRY *ChainLink;
PVOID Object;
ULONG HashValue;
} OBJECT_DIRECTORY_ENTRY, *POBJECT_DIRECTORY_ENTRY;
#define NUMBER_HASH_BUCKETS 37
typedef struct _OBJECT_DIRECTORY
{
struct _OBJECT_DIRECTORY_ENTRY *HashBuckets[NUMBER_HASH_BUCKETS];
struct _EX_PUSH_LOCK *Lock;
struct _DEVICE_MAP *DeviceMap;
ULONG SessionId;
} OBJECT_DIRECTORY, *POBJECT_DIRECTORY;
typedef struct _DEVICE_MAP
{
POBJECT_DIRECTORY DosDevicesDirectory;
POBJECT_DIRECTORY GlobalDosDevicesDirectory;
ULONG ReferenceCount;
ULONG DriveMap;
UCHAR DriveType[32];
} DEVICE_MAP, *PDEVICE_MAP;
/* EXPORTED DATA *************************************************************/
extern NTOSAPI POBJECT_TYPE ObDirectoryType;
extern NTOSAPI PDEVICE_MAP ObSystemDeviceMap;
#endif #endif

6
reactos/include/ndk/umtypes.h
View file

@ -104,6 +104,12 @@
#define FSCTL_PIPE_INTERNAL_READ_OVFLOW \ #define FSCTL_PIPE_INTERNAL_READ_OVFLOW \
CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2048, METHOD_BUFFERED, FILE_READ_DATA) CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2048, METHOD_BUFFERED, FILE_READ_DATA)
/* Macros for current Process/Thread built-in 'special' ID */
#define NtCurrentProcess() ( (HANDLE)(LONG_PTR) -1 )
#define ZwCurrentProcess() NtCurrentProcess()
#define NtCurrentThread() ( (HANDLE)(LONG_PTR) -2 )
#define ZwCurrentThread() NtCurrentThread()
/* Kernel Shared Data Constants */ /* Kernel Shared Data Constants */
#define PROCESSOR_FEATURE_MAX 64 #define PROCESSOR_FEATURE_MAX 64
#define SharedUserData ((KUSER_SHARED_DATA * CONST) USER_SHARED_DATA) #define SharedUserData ((KUSER_SHARED_DATA * CONST) USER_SHARED_DATA)