Menu
▾
▴
[MinGW-cvs] w32api/include/ddk cfg.h,1.3,1.4 mcd.h,1.2,1.3 srb.h,1.3,1.4 storport.h,1.2,1.3 video.h,1.4,1.5 winddk.h,1.5,1.6
|
From: <ea...@us...> - 2004-02-15 07:42:04
|
Update of /cvsroot/mingw/w32api/include/ddk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31627/include/ddk Modified Files: cfg.h mcd.h srb.h storport.h video.h winddk.h Log Message: Merge winsup changes Index: cfg.h =================================================================== RCS file: /cvsroot/mingw/w32api/include/ddk/cfg.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** cfg.h 12 Sep 2003 13:26:51 -0000 1.3 --- cfg.h 15 Feb 2004 07:35:01 -0000 1.4 *************** *** 100,103 **** --- 100,123 ---- #define MAX_LCPRI 0x0000FFFF + #define DN_ROOT_ENUMERATED 0x00000001 /* Was enumerated by ROOT */ + #define DN_DRIVER_LOADED 0x00000002 /* Has Register_Device_Driver */ + #define DN_ENUM_LOADED 0x00000004 /* Has Register_Enumerator */ + #define DN_STARTED 0x00000008 /* Is currently configured */ + #define DN_MANUAL 0x00000010 /* Manually installed */ + #define DN_NEED_TO_ENUM 0x00000020 /* May need reenumeration */ + #define DN_NOT_FIRST_TIME 0x00000040 /* Has received a config */ + #define DN_HARDWARE_ENUM 0x00000080 /* Enum generates hardware ID */ + #define DN_LIAR 0x00000100 /* Lied about can reconfig once */ + #define DN_HAS_MARK 0x00000200 /* Not CM_Create_DevNode lately */ + #define DN_HAS_PROBLEM 0x00000400 /* Need device installer */ + #define DN_FILTERED 0x00000800 /* Is filtered */ + #define DN_MOVED 0x00001000 /* Has been moved */ + #define DN_DISABLEABLE 0x00002000 /* Can be rebalanced */ + #define DN_REMOVABLE 0x00004000 /* Can be removed */ + #define DN_PRIVATE_PROBLEM 0x00008000 /* Has a private problem */ + #define DN_MF_PARENT 0x00010000 /* Multi function parent */ + #define DN_MF_CHILD 0x00020000 /* Multi function child */ + #define DN_WILL_BE_REMOVED 0x00040000 /* Devnode is being removed */ + typedef enum _PNP_VETO_TYPE { PNP_VetoTypeUnknown, Index: mcd.h =================================================================== RCS file: /cvsroot/mingw/w32api/include/ddk/mcd.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mcd.h 19 Nov 2002 14:45:07 -0000 1.2 --- mcd.h 15 Feb 2004 07:35:01 -0000 1.3 *************** *** 49,53 **** #endif ! #if DBG #define DebugPrint(x) ChangerClassDebugPrint x #else --- 49,53 ---- #endif ! #ifdef DBG #define DebugPrint(x) ChangerClassDebugPrint x #else Index: srb.h =================================================================== RCS file: /cvsroot/mingw/w32api/include/ddk/srb.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** srb.h 12 Sep 2003 13:26:51 -0000 1.3 --- srb.h 15 Feb 2004 07:35:01 -0000 1.4 *************** *** 42,46 **** #endif ! #if DBG #define DebugPrint(x) ScsiDebugPrint x #else --- 42,46 ---- #endif ! #ifdef DBG #define DebugPrint(x) ScsiDebugPrint x #else *************** *** 65,69 **** #define MAXIMUM_CDB_SIZE 12 ! #if DBG #define SCSI_PORT_SIGNATURE 0x54524f50 #endif --- 65,69 ---- #define MAXIMUM_CDB_SIZE 12 ! #ifdef DBG #define SCSI_PORT_SIGNATURE 0x54524f50 #endif Index: storport.h =================================================================== RCS file: /cvsroot/mingw/w32api/include/ddk/storport.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** storport.h 19 Nov 2002 14:45:07 -0000 1.2 --- storport.h 15 Feb 2004 07:35:01 -0000 1.3 *************** *** 412,416 **** IN PVOID Context); ! #if DBG #define DebugPrint(x) StorPortDebugPrint x #else --- 412,416 ---- IN PVOID Context); ! #ifdef DBG #define DebugPrint(x) StorPortDebugPrint x #else Index: video.h =================================================================== RCS file: /cvsroot/mingw/w32api/include/ddk/video.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** video.h 12 Sep 2003 13:26:51 -0000 1.4 --- video.h 15 Feb 2004 07:35:01 -0000 1.5 *************** *** 92,96 **** ! #if DBG #define PAGED_CODE() \ --- 92,96 ---- ! #ifdef DBG #define PAGED_CODE() \ *************** *** 1554,1558 **** IN ULONG Length); ! #if DBG #define VideoDebugPrint(x) VideoPortDebugPrint x #else --- 1554,1558 ---- IN ULONG Length); ! #ifdef DBG #define VideoDebugPrint(x) VideoPortDebugPrint x #else Index: winddk.h =================================================================== RCS file: /cvsroot/mingw/w32api/include/ddk/winddk.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** winddk.h 12 Sep 2003 13:26:51 -0000 1.5 --- winddk.h 15 Feb 2004 07:35:01 -0000 1.6 *************** *** 67,71 **** #define POINTER_ALIGNMENT ! /* --- 67,77 ---- #define POINTER_ALIGNMENT ! #ifdef NONAMELESSUNION ! # define _DDK_DUMMYUNION_MEMBER(name) DUMMYUNIONNAME.name ! # define _DDK_DUMMYUNION_N_MEMBER(n, name) DUMMYUNIONNAME##n.name ! #else ! # define _DDK_DUMMYUNION_MEMBER(name) name ! # define _DDK_DUMMYUNION_N_MEMBER(n, name) name ! #endif /* *************** *** 168,171 **** --- 174,185 ---- #define MAXIMUM_PRIORITY 32 + #define FILE_SUPERSEDED 0x00000000 + #define FILE_OPENED 0x00000001 + #define FILE_CREATED 0x00000002 + #define FILE_OVERWRITTEN 0x00000003 + #define FILE_EXISTS 0x00000004 + #define FILE_DOES_NOT_EXIST 0x00000005 + + /* also in winnt.h */ #define FILE_LIST_DIRECTORY 0x00000001 #define FILE_READ_DATA 0x00000001 *************** *** 183,193 **** #define FILE_WRITE_ATTRIBUTES 0x00000100 - #define FILE_SUPERSEDED 0x00000000 - #define FILE_OPENED 0x00000001 - #define FILE_CREATED 0x00000002 - #define FILE_OVERWRITTEN 0x00000003 - #define FILE_EXISTS 0x00000004 - #define FILE_DOES_NOT_EXIST 0x00000005 - #define FILE_SHARE_READ 0x00000001 #define FILE_SHARE_WRITE 0x00000002 --- 197,200 ---- *************** *** 280,284 **** --- 287,298 ---- FILE_APPEND_DATA | \ SYNCHRONIZE) + /* end winnt.h */ + #define DIRECTORY_QUERY (0x0001) + #define DIRECTORY_TRAVERSE (0x0002) + #define DIRECTORY_CREATE_OBJECT (0x0004) + #define DIRECTORY_CREATE_SUBDIRECTORY (0x0008) + #define DIRECTORY_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0xF) + /* Exported object types */ extern NTOSAPI POBJECT_TYPE ExDesktopObjectType; *************** *** 3162,3166 **** typedef struct _IO_REMOVE_LOCK { IO_REMOVE_LOCK_COMMON_BLOCK Common; ! #if DBG IO_REMOVE_LOCK_DBG_BLOCK Dbg; #endif --- 3176,3180 ---- typedef struct _IO_REMOVE_LOCK { IO_REMOVE_LOCK_COMMON_BLOCK Common; ! #ifdef DBG IO_REMOVE_LOCK_DBG_BLOCK Dbg; #endif *************** *** 3939,3943 **** IN PCHAR Message); ! #if DBG #define ASSERT(exp) \ --- 3953,3957 ---- IN PCHAR Message); ! #ifdef DBG #define ASSERT(exp) \ *************** *** 5049,5053 **** Entry = InterlockedPopEntrySList(&Lookaside->ListHead); if (Entry == NULL) { ! Lookaside->AllocateMisses++; Entry = (Lookaside->Allocate)(Lookaside->Type, Lookaside->Size, Lookaside->Tag); } --- 5063,5067 ---- Entry = InterlockedPopEntrySList(&Lookaside->ListHead); if (Entry == NULL) { ! Lookaside->_DDK_DUMMYUNION_MEMBER(AllocateMisses)++; Entry = (Lookaside->Allocate)(Lookaside->Type, Lookaside->Size, Lookaside->Tag); } *************** *** 5064,5068 **** Entry = InterlockedPopEntrySList(&Lookaside->ListHead); if (Entry == NULL) { ! Lookaside->AllocateMisses++; Entry = (Lookaside->Allocate)(Lookaside->Type, Lookaside->Size, Lookaside->Tag); --- 5078,5082 ---- Entry = InterlockedPopEntrySList(&Lookaside->ListHead); if (Entry == NULL) { ! Lookaside->_DDK_DUMMYUNION_MEMBER(AllocateMisses)++; Entry = (Lookaside->Allocate)(Lookaside->Type, Lookaside->Size, Lookaside->Tag); *************** *** 5180,5184 **** Lookaside->TotalFrees++; if (ExQueryDepthSList(&Lookaside->ListHead) >= Lookaside->Depth) { ! Lookaside->FreeMisses++; (Lookaside->Free)(Entry); } else { --- 5194,5198 ---- Lookaside->TotalFrees++; if (ExQueryDepthSList(&Lookaside->ListHead) >= Lookaside->Depth) { ! Lookaside->_DDK_DUMMYUNION_N_MEMBER(2,FreeMisses)++; (Lookaside->Free)(Entry); } else { *************** *** 5195,5199 **** Lookaside->TotalFrees++; if (ExQueryDepthSList(&Lookaside->ListHead) >= Lookaside->Depth) { ! Lookaside->FreeMisses++; (Lookaside->Free)(Entry); } else { --- 5209,5213 ---- Lookaside->TotalFrees++; if (ExQueryDepthSList(&Lookaside->ListHead) >= Lookaside->Depth) { ! Lookaside->_DDK_DUMMYUNION_N_MEMBER(2,FreeMisses)++; (Lookaside->Free)(Entry); } else { *************** *** 5533,5537 **** IN SUITE_TYPE SuiteType); ! #if DBG #define PAGED_CODE() { \ --- 5547,5551 ---- IN SUITE_TYPE SuiteType); ! #ifdef DBG #define PAGED_CODE() { \ *************** *** 9060,9064 **** IN BOOLEAN State); ! #if DBG #define KdPrint(_x_) DbgPrint _x_ --- 9074,9078 ---- IN BOOLEAN State); ! #ifdef DBG #define KdPrint(_x_) DbgPrint _x_ |