Ros-diffs April 2010

ros-diffs@reactos.org

22 participants
435 discussions

[gschneider] 46897: [NOTEPAD] - Create a font even if no registry settings were loaded - Patch by Rafal Harabien, <rafalh1992 AT o2 DOT pl> See issue #4066 for more details.

by gschneider＠svn.reactos.org

Author: gschneider Date: Fri Apr 16 16:30:40 2010 New Revision: 46897 URL: http://svn.reactos.org/svn/reactos?rev=46897&view=rev Log: [NOTEPAD] - Create a font even if no registry settings were loaded - Patch by Rafal Harabien, <rafalh1992 AT o2 DOT pl> See issue #4066 for more details. Modified: trunk/reactos/base/applications/notepad/settings.c Modified: trunk/reactos/base/applications/notepad/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/settings.c [iso-8859-1] Fri Apr 16 16:30:40 2010 @@ -147,15 +147,15 @@ if (dwPointSize != 0) Globals.lfFont.lfHeight = HeightFromPointSize(dwPointSize); - hFont = CreateFontIndirect(&Globals.lfFont); - if (hFont) - { - if (Globals.hFont) - DeleteObject(Globals.hFont); - Globals.hFont = hFont; - } - RegCloseKey(hKey); + } + + hFont = CreateFontIndirect(&Globals.lfFont); + if (hFont) + { + if (Globals.hFont) + DeleteObject(Globals.hFont); + Globals.hFont = hFont; } }

14 years, 8 months

[akhaldi] 46896: [DDK] - Move lmon.h to PSDK and apply a consistent formatting.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Apr 16 15:42:34 2010 New Revision: 46896 URL: http://svn.reactos.org/svn/reactos?rev=46896&view=rev Log: [DDK] - Move lmon.h to PSDK and apply a consistent formatting. Added: branches/header-work/include/psdk/lmon.h - copied, changed from r46874, branches/header-work/include/ddk/lmon.h Removed: branches/header-work/include/ddk/lmon.h Removed: branches/header-work/include/ddk/lmon.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/lmon.h?… ============================================================================== --- branches/header-work/include/ddk/lmon.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/lmon.h (removed) @@ -1,27 +1,0 @@ - - -#ifdef UNICODE -#define PORT_INFO_FF PORT_INFO_FFW -#define PPORT_INFO_FF PPORT_INFO_FFW -#define LPPORT_INFO_FF LPPORT_INFO_FFW -#else -#define PORT_INFO_FF PORT_INFO_FFA -#define PPORT_INFO_FF PPORT_INFO_FFA -#define LPPORT_INFO_FF LPPORT_INFO_FFA -#endif - -typedef struct _PORT_INFO_FFW -{ - LPWSTR pName; - DWORD cbMonitorData; - LPBYTE pMonitorData; -} PORT_INFO_FFW, *PPORT_INFO_FFW, *LPPORT_INFO_FFW; - -typedef struct _PORT_INFO_FFA -{ - LPSTR pName; - DWORD cbMonitorData; - LPBYTE pMonitorData; -} PORT_INFO_FFA, *PPORT_INFO_FFA, *LPPORT_INFO_FFA; - - Copied: branches/header-work/include/psdk/lmon.h (from r46874, branches/header-work/include/ddk/lmon.h) URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/lmon.h… ============================================================================== --- branches/header-work/include/ddk/lmon.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/lmon.h [iso-8859-1] Fri Apr 16 15:42:34 2010 @@ -1,4 +1,3 @@ - #ifdef UNICODE #define PORT_INFO_FF PORT_INFO_FFW @@ -10,18 +9,14 @@ #define LPPORT_INFO_FF LPPORT_INFO_FFA #endif -typedef struct _PORT_INFO_FFW -{ - LPWSTR pName; - DWORD cbMonitorData; - LPBYTE pMonitorData; +typedef struct _PORT_INFO_FFW { + LPWSTR pName; + DWORD cbMonitorData; + LPBYTE pMonitorData; } PORT_INFO_FFW, *PPORT_INFO_FFW, *LPPORT_INFO_FFW; -typedef struct _PORT_INFO_FFA -{ - LPSTR pName; - DWORD cbMonitorData; - LPBYTE pMonitorData; +typedef struct _PORT_INFO_FFA { + LPSTR pName; + DWORD cbMonitorData; + LPBYTE pMonitorData; } PORT_INFO_FFA, *PPORT_INFO_FFA, *LPPORT_INFO_FFA; - -

14 years, 8 months

[akhaldi] 46895: [DDK] - Move ksuuids.h to PSDK, apply a consistent formatting, add some missing definitions and guard some with the appropriate NTDDI_VERSION.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Apr 16 15:38:34 2010 New Revision: 46895 URL: http://svn.reactos.org/svn/reactos?rev=46895&view=rev Log: [DDK] - Move ksuuids.h to PSDK, apply a consistent formatting, add some missing definitions and guard some with the appropriate NTDDI_VERSION. Added: branches/header-work/include/psdk/ksuuids.h - copied, changed from r46874, branches/header-work/include/ddk/ksuuids.h Removed: branches/header-work/include/ddk/ksuuids.h Removed: branches/header-work/include/ddk/ksuuids.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ksuuids… ============================================================================== --- branches/header-work/include/ddk/ksuuids.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ksuuids.h (removed) @@ -1,53 +1,0 @@ - - -OUR_GUID_ENTRY(MEDIATYPE_MPEG2_PACK, 0x36523B13, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A) -OUR_GUID_ENTRY(MEDIATYPE_MPEG2_PES, 0xE06D8020, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY( MEDIATYPE_MPEG2_SECTIONS, 0x455F176C, 0x4B06, 0x47CE, 0x9A, 0xEF, 0x8c, 0xAE, 0xF7, 0x3D, 0xF7, 0xB5) -OUR_GUID_ENTRY(MEDIASUBTYPE_ATSC_SI, 0xB3C7397C, 0xD303, 0x414D, 0xB3, 0x3C, 0x4E, 0xD2, 0xC9, 0xD2, 0x97, 0x33) -OUR_GUID_ENTRY(MEDIASUBTYPE_DVB_SI, 0xE9dD31A3, 0x221D, 0x4ADB, 0x85, 0x32, 0x9A, 0xF3, 0x9, 0xC1, 0xA4, 0x8) -OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2DATA, 0xC892E55B, 0x252D, 0x42B5, 0xA3, 0x16, 0xD9, 0x97, 0xE7, 0xA5, 0xD9, 0x95) -OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_VIDEO, 0xE06D8026, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(FORMAT_MPEG2_VIDEO, 0xE06D80E3, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(FORMAT_VIDEOINFO2, 0xF72A76A0, 0xEB0A, 0x11D0, 0xAC, 0xE4, 0x0, 0x0, 0xC0, 0xcc, 0x16, 0xBA) -OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_PROGRAM, 0xE06D8022, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_TRANSPORT, 0xE06D8023, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_TRANSPORT_STRIDE, 0x138AA9A4, 0x1EE2, 0x4C5B, 0x98, 0x8E, 0x19, 0xAB, 0xFD, 0xBC, 0x8A, 0x11) -OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_AUDIO, 0xE06D802B, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(MEDIASUBTYPE_DOLBY_AC3, 0xE06D802C, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_SUBPICTURE, 0xE06D802D, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_LPCM_AUDIO, 0xE06D8032, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(MEDIASUBTYPE_DTS, 0xE06D8033, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(MEDIASUBTYPE_SDDS, 0xE06D8034, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(MEDIATYPE_DVD_ENCRYPTED_PACK, 0xED0B916A, 0x044D, 0x11D1, 0xAA, 0x78, 0x00, 0xc0, 0x04F, 0xC3, 0x1D, 0x60) -OUR_GUID_ENTRY(MEDIATYPE_DVD_NAVIGATION, 0xE06D802E, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_NAVIGATION_PCI, 0xE06D802F, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_NAVIGATION_DSI, 0xE06D8030, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_NAVIGATION_PROVIDER, 0xE06D8031, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(FORMAT_MPEG2Video, 0xE06D80E3, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(FORMAT_DolbyAC3, 0xE06D80E4, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(FORMAT_MPEG2Audio, 0xE06D80E5, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(FORMAT_DVD_LPCMAudio, 0xE06D80E6, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(AM_KSPROPSETID_AC3, 0xBFABE720, 0x6E1F, 0x11D0, 0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00) -OUR_GUID_ENTRY(AM_KSPROPSETID_DvdSubPic, 0xAC390460, 0x43AF, 0x11D0, 0xBD, 0x6A, 0x00, 0x35, 0x05, 0xC1, 0x03, 0xA9) -OUR_GUID_ENTRY(AM_KSPROPSETID_CopyProt, 0x0E8A0A40, 0x6AEF, 0x11D0, 0x9E, 0xD0, 0x00, 0xA0, 0x24, 0xCA, 0x19, 0xB3) -OUR_GUID_ENTRY(AM_KSPROPSETID_TSRateChange, 0xA503C5C0, 0x1D1D, 0x11D1, 0xAD, 0x80, 0x44, 0x45, 0x53, 0x54, 0x0, 0x0) -OUR_GUID_ENTRY(AM_KSPROPSETID_DVD_RateChange, 0x3577EB09, 0x9582, 0x477F, 0xB2, 0x9C, 0xB0, 0xC4, 0x52, 0xA4, 0xFF, 0x9A) -OUR_GUID_ENTRY(AM_KSPROPSETID_DvdKaraoke, 0xAE4720AE, 0xAA71, 0x42D8, 0xB8, 0x2A, 0xFF, 0xFD, 0xF5, 0x8B, 0x76, 0xFD) -OUR_GUID_ENTRY(AM_KSPROPSETID_FrameStep, 0xC830ACBD, 0xAB07, 0x492F, 0x88, 0x52, 0x45, 0xB6, 0x98, 0x7C, 0x29, 0x79) -OUR_GUID_ENTRY(AM_KSCATEGORY_CAPTURE, 0x65E8773D, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) -OUR_GUID_ENTRY(AM_KSCATEGORY_RENDER, 0x65E8773E, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) -OUR_GUID_ENTRY(AM_KSCATEGORY_DATACOMPRESSOR, 0x1E84C900, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00) -OUR_GUID_ENTRY(AM_KSCATEGORY_AUDIO, 0x6994AD04, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) -OUR_GUID_ENTRY(AM_KSCATEGORY_VIDEO, 0x6994AD05, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) -OUR_GUID_ENTRY(AM_KSCATEGORY_TVTUNER, 0xA799A800, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xa0, 0x24, 0x01, 0xDC, 0xD4) -OUR_GUID_ENTRY(AM_KSCATEGORY_CROSSBAR, 0xA799A801, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xa0, 0x24, 0x01, 0xDC, 0xD4) -OUR_GUID_ENTRY(AM_KSCATEGORY_TVAUDIO, 0xA799A802, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xa0, 0x24, 0x01, 0xDC, 0xD4) -OUR_GUID_ENTRY(AM_KSCATEGORY_VBICODEC, 0x07DAD660, 0x22F1, 0x11D1, 0xa9, 0xF4, 0x00, 0xc0, 0x4F, 0xBB, 0xDE, 0x8F) -OUR_GUID_ENTRY(AM_KSCATEGORY_SPLITTER, 0x0A4252A0, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00) -OUR_GUID_ENTRY(IID_IKsInterfACeHandler, 0xD3ABC7E0, 0x9A61, 0x11D0, 0xA4, 0x0D, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) -OUR_GUID_ENTRY(IID_IKsDataTypeHandler, 0x5FFBAA02, 0x49A3, 0x11D0, 0x9F, 0x36, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xA1) -OUR_GUID_ENTRY(IID_IKsPin, 0xB61178D1, 0xA2D9, 0x11CF, 0x9E, 0x53, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xa1) -OUR_GUID_ENTRY(IID_IKsControl, 0x28F54685, 0x06FD, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) -OUR_GUID_ENTRY(IID_IKsPinFACtory, 0xCD5EBE6B, 0x8B6E, 0x11D1, 0x8A, 0xE0, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) -OUR_GUID_ENTRY(AM_INTERFACESETID_Standard, 0x1A8766A0, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00) - Copied: branches/header-work/include/psdk/ksuuids.h (from r46874, branches/header-work/include/ddk/ksuuids.h) URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/ksuuid… ============================================================================== --- branches/header-work/include/ddk/ksuuids.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/ksuuids.h [iso-8859-1] Fri Apr 16 15:38:34 2010 @@ -1,53 +1,74 @@ +OUR_GUID_ENTRY(MEDIATYPE_MPEG2_PACK, 0x36523B13, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A) +OUR_GUID_ENTRY(MEDIATYPE_MPEG2_PES, 0xE06D8020, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_WMDRM_TRANSPORT, 0x18BEC4EA, 0x4676, 0x450e, 0xB4, 0x78, 0x0C, 0xD8, 0x4C, 0x54, 0xB3, 0x27) +OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_VIDEO, 0xE06D8026, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(FORMAT_MPEG2_VIDEO, 0xE06D80E3, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(FORMAT_VIDEOINFO2, 0xF72A76A0, 0xEB0A, 0x11D0, 0xAC, 0xE4, 0x0, 0x0, 0xC0, 0xcc, 0x16, 0xBA) +OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_PROGRAM, 0xE06D8022, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_TRANSPORT, 0xE06D8023, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_AUDIO, 0xE06D802B, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_DOLBY_AC3, 0xE06D802C, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_SUBPICTURE, 0xE06D802D, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_LPCM_AUDIO, 0xE06D8032, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(MEDIATYPE_DVD_ENCRYPTED_PACK, 0xED0B916A, 0x044D, 0x11D1, 0xAA, 0x78, 0x00, 0xc0, 0x04F, 0xC3, 0x1D, 0x60) +OUR_GUID_ENTRY(MEDIATYPE_DVD_NAVIGATION, 0xE06D802E, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_NAVIGATION_PCI, 0xE06D802F, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_NAVIGATION_DSI, 0xE06D8030, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_NAVIGATION_PROVIDER, 0xE06D8031, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(FORMAT_MPEG2Video, 0xE06D80E3, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(FORMAT_DolbyAC3, 0xE06D80E4, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(FORMAT_MPEG2Audio, 0xE06D80E5, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(FORMAT_DVD_LPCMAudio, 0xE06D80E6, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(AM_KSPROPSETID_AC3, 0xBFABE720, 0x6E1F, 0x11D0, 0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00) +OUR_GUID_ENTRY(AM_KSPROPSETID_DvdSubPic, 0xAC390460, 0x43AF, 0x11D0, 0xBD, 0x6A, 0x00, 0x35, 0x05, 0xC1, 0x03, 0xA9) +OUR_GUID_ENTRY(AM_KSPROPSETID_CopyProt, 0x0E8A0A40, 0x6AEF, 0x11D0, 0x9E, 0xD0, 0x00, 0xA0, 0x24, 0xCA, 0x19, 0xB3) +OUR_GUID_ENTRY(AM_KSPROPSETID_TSRateChange, 0xA503C5C0, 0x1D1D, 0x11D1, 0xAD, 0x80, 0x44, 0x45, 0x53, 0x54, 0x0, 0x0) +OUR_GUID_ENTRY(AM_KSPROPSETID_MPEG4_MediaType_Attributes, 0xff6c4bfa, 0x7a9, 0x4c7b, 0xa2, 0x37, 0x67, 0x2f, 0x9d, 0x68, 0x6, 0x5f) +OUR_GUID_ENTRY(AM_KSCATEGORY_CAPTURE, 0x65E8773D, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) +OUR_GUID_ENTRY(AM_KSCATEGORY_RENDER, 0x65E8773E, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) +OUR_GUID_ENTRY(AM_KSCATEGORY_DATACOMPRESSOR, 0x1E84C900, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00) +OUR_GUID_ENTRY(AM_KSCATEGORY_AUDIO, 0x6994AD04, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) +OUR_GUID_ENTRY(AM_KSCATEGORY_VIDEO, 0x6994AD05, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) +OUR_GUID_ENTRY(AM_KSCATEGORY_TVTUNER, 0xA799A800, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xa0, 0x24, 0x01, 0xDC, 0xD4) +OUR_GUID_ENTRY(AM_KSCATEGORY_CROSSBAR, 0xA799A801, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xa0, 0x24, 0x01, 0xDC, 0xD4) +OUR_GUID_ENTRY(AM_KSCATEGORY_TVAUDIO, 0xA799A802, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xa0, 0x24, 0x01, 0xDC, 0xD4) +OUR_GUID_ENTRY(AM_KSCATEGORY_VBICODEC, 0x07DAD660, 0x22F1, 0x11D1, 0xa9, 0xF4, 0x00, 0xc0, 0x4F, 0xBB, 0xDE, 0x8F) +OUR_GUID_ENTRY(AM_KSCATEGORY_SPLITTER, 0x0A4252A0, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00) +OUR_GUID_ENTRY(IID_IKsInterfACeHandler, 0xD3ABC7E0, 0x9A61, 0x11D0, 0xA4, 0x0D, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) +OUR_GUID_ENTRY(IID_IKsDataTypeHandler, 0x5FFBAA02, 0x49A3, 0x11D0, 0x9F, 0x36, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xA1) +OUR_GUID_ENTRY(IID_IKsPin, 0xB61178D1, 0xA2D9, 0x11CF, 0x9E, 0x53, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xa1) +OUR_GUID_ENTRY(IID_IKsControl, 0x28F54685, 0x06FD, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) +OUR_GUID_ENTRY(IID_IKsPinFACtory, 0xCD5EBE6B, 0x8B6E, 0x11D1, 0x8A, 0xE0, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) +OUR_GUID_ENTRY(AM_INTERFACESETID_Standard, 0x1A8766A0, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00) -OUR_GUID_ENTRY(MEDIATYPE_MPEG2_PACK, 0x36523B13, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A) -OUR_GUID_ENTRY(MEDIATYPE_MPEG2_PES, 0xE06D8020, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY( MEDIATYPE_MPEG2_SECTIONS, 0x455F176C, 0x4B06, 0x47CE, 0x9A, 0xEF, 0x8c, 0xAE, 0xF7, 0x3D, 0xF7, 0xB5) -OUR_GUID_ENTRY(MEDIASUBTYPE_ATSC_SI, 0xB3C7397C, 0xD303, 0x414D, 0xB3, 0x3C, 0x4E, 0xD2, 0xC9, 0xD2, 0x97, 0x33) -OUR_GUID_ENTRY(MEDIASUBTYPE_DVB_SI, 0xE9dD31A3, 0x221D, 0x4ADB, 0x85, 0x32, 0x9A, 0xF3, 0x9, 0xC1, 0xA4, 0x8) -OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2DATA, 0xC892E55B, 0x252D, 0x42B5, 0xA3, 0x16, 0xD9, 0x97, 0xE7, 0xA5, 0xD9, 0x95) -OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_VIDEO, 0xE06D8026, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(FORMAT_MPEG2_VIDEO, 0xE06D80E3, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(FORMAT_VIDEOINFO2, 0xF72A76A0, 0xEB0A, 0x11D0, 0xAC, 0xE4, 0x0, 0x0, 0xC0, 0xcc, 0x16, 0xBA) -OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_PROGRAM, 0xE06D8022, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_TRANSPORT, 0xE06D8023, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_TRANSPORT_STRIDE, 0x138AA9A4, 0x1EE2, 0x4C5B, 0x98, 0x8E, 0x19, 0xAB, 0xFD, 0xBC, 0x8A, 0x11) -OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_AUDIO, 0xE06D802B, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(MEDIASUBTYPE_DOLBY_AC3, 0xE06D802C, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_SUBPICTURE, 0xE06D802D, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_LPCM_AUDIO, 0xE06D8032, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(MEDIASUBTYPE_DTS, 0xE06D8033, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(MEDIASUBTYPE_SDDS, 0xE06D8034, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(MEDIATYPE_DVD_ENCRYPTED_PACK, 0xED0B916A, 0x044D, 0x11D1, 0xAA, 0x78, 0x00, 0xc0, 0x04F, 0xC3, 0x1D, 0x60) -OUR_GUID_ENTRY(MEDIATYPE_DVD_NAVIGATION, 0xE06D802E, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_NAVIGATION_PCI, 0xE06D802F, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_NAVIGATION_DSI, 0xE06D8030, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_NAVIGATION_PROVIDER, 0xE06D8031, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(FORMAT_MPEG2Video, 0xE06D80E3, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(FORMAT_DolbyAC3, 0xE06D80E4, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(FORMAT_MPEG2Audio, 0xE06D80E5, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(FORMAT_DVD_LPCMAudio, 0xE06D80E6, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) -OUR_GUID_ENTRY(AM_KSPROPSETID_AC3, 0xBFABE720, 0x6E1F, 0x11D0, 0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00) -OUR_GUID_ENTRY(AM_KSPROPSETID_DvdSubPic, 0xAC390460, 0x43AF, 0x11D0, 0xBD, 0x6A, 0x00, 0x35, 0x05, 0xC1, 0x03, 0xA9) -OUR_GUID_ENTRY(AM_KSPROPSETID_CopyProt, 0x0E8A0A40, 0x6AEF, 0x11D0, 0x9E, 0xD0, 0x00, 0xA0, 0x24, 0xCA, 0x19, 0xB3) -OUR_GUID_ENTRY(AM_KSPROPSETID_TSRateChange, 0xA503C5C0, 0x1D1D, 0x11D1, 0xAD, 0x80, 0x44, 0x45, 0x53, 0x54, 0x0, 0x0) -OUR_GUID_ENTRY(AM_KSPROPSETID_DVD_RateChange, 0x3577EB09, 0x9582, 0x477F, 0xB2, 0x9C, 0xB0, 0xC4, 0x52, 0xA4, 0xFF, 0x9A) -OUR_GUID_ENTRY(AM_KSPROPSETID_DvdKaraoke, 0xAE4720AE, 0xAA71, 0x42D8, 0xB8, 0x2A, 0xFF, 0xFD, 0xF5, 0x8B, 0x76, 0xFD) -OUR_GUID_ENTRY(AM_KSPROPSETID_FrameStep, 0xC830ACBD, 0xAB07, 0x492F, 0x88, 0x52, 0x45, 0xB6, 0x98, 0x7C, 0x29, 0x79) -OUR_GUID_ENTRY(AM_KSCATEGORY_CAPTURE, 0x65E8773D, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) -OUR_GUID_ENTRY(AM_KSCATEGORY_RENDER, 0x65E8773E, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) -OUR_GUID_ENTRY(AM_KSCATEGORY_DATACOMPRESSOR, 0x1E84C900, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00) -OUR_GUID_ENTRY(AM_KSCATEGORY_AUDIO, 0x6994AD04, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) -OUR_GUID_ENTRY(AM_KSCATEGORY_VIDEO, 0x6994AD05, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) -OUR_GUID_ENTRY(AM_KSCATEGORY_TVTUNER, 0xA799A800, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xa0, 0x24, 0x01, 0xDC, 0xD4) -OUR_GUID_ENTRY(AM_KSCATEGORY_CROSSBAR, 0xA799A801, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xa0, 0x24, 0x01, 0xDC, 0xD4) -OUR_GUID_ENTRY(AM_KSCATEGORY_TVAUDIO, 0xA799A802, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xa0, 0x24, 0x01, 0xDC, 0xD4) -OUR_GUID_ENTRY(AM_KSCATEGORY_VBICODEC, 0x07DAD660, 0x22F1, 0x11D1, 0xa9, 0xF4, 0x00, 0xc0, 0x4F, 0xBB, 0xDE, 0x8F) -OUR_GUID_ENTRY(AM_KSCATEGORY_SPLITTER, 0x0A4252A0, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00) -OUR_GUID_ENTRY(IID_IKsInterfACeHandler, 0xD3ABC7E0, 0x9A61, 0x11D0, 0xA4, 0x0D, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) -OUR_GUID_ENTRY(IID_IKsDataTypeHandler, 0x5FFBAA02, 0x49A3, 0x11D0, 0x9F, 0x36, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xA1) -OUR_GUID_ENTRY(IID_IKsPin, 0xB61178D1, 0xA2D9, 0x11CF, 0x9E, 0x53, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xa1) -OUR_GUID_ENTRY(IID_IKsControl, 0x28F54685, 0x06FD, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) -OUR_GUID_ENTRY(IID_IKsPinFACtory, 0xCD5EBE6B, 0x8B6E, 0x11D1, 0x8A, 0xE0, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) -OUR_GUID_ENTRY(AM_INTERFACESETID_Standard, 0x1A8766A0, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00) +#if ( (NTDDI_VERSION >= NTDDI_WINXPSP2) && (NTDDI_VERSION < NTDDI_WS03) ) || (NTDDI_VERSION >= NTDDI_WS03SP1) +OUR_GUID_ENTRY(MEDIATYPE_MPEG2_SECTIONS, 0x455F176C, 0x4B06, 0x47CE, 0x9A, 0xEF, 0x8c, 0xAE, 0xF7, 0x3D, 0xF7, 0xB5) +OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_VERSIONED_TABLES, 0x1ed988b0, 0x3ffc, 0x4523, 0x87, 0x25, 0x34, 0x7b, 0xee, 0xc1, 0xa8, 0xa0) +OUR_GUID_ENTRY(MEDIASUBTYPE_ATSC_SI, 0xB3C7397C, 0xD303, 0x414D, 0xB3, 0x3C, 0x4E, 0xD2, 0xC9, 0xD2, 0x97, 0x33) +OUR_GUID_ENTRY(MEDIASUBTYPE_DVB_SI, 0xE9dD31A3, 0x221D, 0x4ADB, 0x85, 0x32, 0x9A, 0xF3, 0x9, 0xC1, 0xA4, 0x8) +OUR_GUID_ENTRY(MEDIASUBTYPE_ISDB_SI, 0xe89ad298, 0x3601, 0x4b06, 0xaa, 0xec, 0x9d, 0xde, 0xed, 0xcc, 0x5b, 0xd0) +OUR_GUID_ENTRY(MEDIASUBTYPE_TIF_SI, 0xec232eb2, 0xcb96, 0x4191, 0xb2, 0x26, 0xe, 0xa1, 0x29, 0xf3, 0x82, 0x50) +OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2DATA, 0xC892E55B, 0x252D, 0x42B5, 0xA3, 0x16, 0xD9, 0x97, 0xE7, 0xA5, 0xD9, 0x95) + +#endif + +#if (NTDDI_VERSION >= NTDDI_WINXP) + +OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_TRANSPORT_STRIDE, 0x138AA9A4, 0x1EE2, 0x4C5B, 0x98, 0x8E, 0x19, 0xAB, 0xFD, 0xBC, 0x8A, 0x11) +OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_UDCR_TRANSPORT, 0x18BEC4EA, 0x4676, 0x450e, 0xB4, 0x78, 0x0C, 0xD8, 0x4C, 0x54, 0xB3, 0x27) +OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_PBDA_TRANSPORT_RAW, 0x0d7aed42, 0xcb9a, 0x11db, 0x97, 0x5, 0x0, 0x50, 0x56, 0xc0, 0x0, 0x8) +OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_PBDA_TRANSPORT_PROCESSED, 0xaf748dd4, 0xd80, 0x11db, 0x97, 0x5, 0x0, 0x50, 0x56, 0xc0, 0x0, 0x8) +OUR_GUID_ENTRY(MEDIASUBTYPE_DTS, 0xE06D8033, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_SDDS, 0xE06D8034, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(AM_KSPROPSETID_DVD_RateChange, 0x3577EB09, 0x9582, 0x477F, 0xB2, 0x9C, 0xB0, 0xC4, 0x52, 0xA4, 0xFF, 0x9A) +OUR_GUID_ENTRY(AM_KSPROPSETID_DvdKaraoke, 0xAE4720AE, 0xAA71, 0x42D8, 0xB8, 0x2A, 0xFF, 0xFD, 0xF5, 0x8B, 0x76, 0xFD) +OUR_GUID_ENTRY(AM_KSPROPSETID_FrameStep, 0xC830ACBD, 0xAB07, 0x492F, 0x88, 0x52, 0x45, 0xB6, 0x98, 0x7C, 0x29, 0x79) + +#endif + +#if (NTDDI_VERSION >= NTDDI_WS03SP1) +OUR_GUID_ENTRY(AM_KSCATEGORY_VBICODEC_MI, 0x9c24a977, 0x951, 0x451a, 0x80, 0x6, 0xe, 0x49, 0xbd, 0x28, 0xcd, 0x5f) +#endif +

14 years, 8 months

[akhaldi] 46894: [DDK] - Move ksdebug.h to PSDK, apply a consistent formatting, add missing evntrace.h inclusion and improve a couple of definitions. [PSDK] evntrace.h : Introduce pragma once, apply a consistent formatting and add several missing definitions.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Apr 16 15:19:55 2010 New Revision: 46894 URL: http://svn.reactos.org/svn/reactos?rev=46894&view=rev Log: [DDK] - Move ksdebug.h to PSDK, apply a consistent formatting, add missing evntrace.h inclusion and improve a couple of definitions. [PSDK] evntrace.h : Introduce pragma once, apply a consistent formatting and add several missing definitions. Added: branches/header-work/include/psdk/ksdebug.h - copied, changed from r46874, branches/header-work/include/ddk/ksdebug.h Removed: branches/header-work/include/ddk/ksdebug.h Modified: branches/header-work/include/psdk/evntrace.h Removed: branches/header-work/include/ddk/ksdebug.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ksdebug… ============================================================================== --- branches/header-work/include/ddk/ksdebug.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ksdebug.h (removed) @@ -1,116 +1,0 @@ - -#if !defined(_KSDEBUG_) -#define _KSDEBUG_ - -#if !defined(REMIND) -#define QUOTE(x) #x -#define QQUOTE(y) QUOTE(y) -#define REMIND(str) __FILE__ "(" QQUOTE(__LINE__) ") : " str -#endif - -#if defined(__cplusplus) -extern "C" { -#endif -#if defined(_NTDDK_) - -#define DEBUGLVL_ERROR 0 -#define DEBUGLVL_TERSE 1 -#define DEBUGLVL_VERBOSE 2 -#define DEBUGLVL_BLAB 3 - - - -#if (DBG) - -#if defined(IRPMJFUNCDESC) -static const PCHAR IrpMjFuncDesc[] = -{ - "IRP_MJ_CREATE", - "IRP_MJ_CREATE_NAMED_PIPE", - "IRP_MJ_CLOSE", - "IRP_MJ_READ", - "IRP_MJ_WRITE", - "IRP_MJ_QUERY_INFORMATION", - "IRP_MJ_SET_INFORMATION", - "IRP_MJ_QUERY_EA", - "IRP_MJ_SET_EA", - "IRP_MJ_FLUSH_BUFFERS", - "IRP_MJ_QUERY_VOLUME_INFORMATION", - "IRP_MJ_SET_VOLUME_INFORMATION", - "IRP_MJ_DIRECTORY_CONTROL", - "IRP_MJ_FILE_SYSTEM_CONTROL", - "IRP_MJ_DEVICE_CONTROL", - "IRP_MJ_INTERNAL_DEVICE_CONTROL", - "IRP_MJ_SHUTDOWN", - "IRP_MJ_LOCK_CONTROL", - "IRP_MJ_CLEANUP", - "IRP_MJ_CREATE_MAILSLOT", - "IRP_MJ_QUERY_SECURITY", - "IRP_MJ_SET_SECURITY", - "IRP_MJ_SET_POWER", - "IRP_MJ_QUERY_POWER" -}; -#endif -#endif - -#if (DBG) - #if !defined( DEBUG_LEVEL ) - #if defined( DEBUG_VARIABLE ) - #if defined( KSDEBUG_INIT ) - ULONG DEBUG_VARIABLE = DEBUGLVL_TERSE; - #else - extern ULONG DEBUG_VARIABLE; - #endif - #else - #define DEBUG_VARIABLE DEBUGLVL_TERSE - #endif - #else - #if defined( DEBUG_VARIABLE ) - #if defined( KSDEBUG_INIT ) - ULONG DEBUG_VARIABLE = DEBUG_LEVEL; - #else - extern ULONG DEBUG_VARIABLE; - #endif - #else - #define DEBUG_VARIABLE DEBUG_LEVEL - #endif - #endif - - #define _DbgPrintFEx(component, lvl, strings) \ - { \ - if ((lvl) <= DEBUG_VARIABLE)\ - {\ - DbgPrintEx(component, lvl, STR_MODULENAME);\ - DbgPrintEx(component, lvl, strings);\ - DbgPrintEx(component, lvl, "\n");\ - if ((lvl) == DEBUGLVL_ERROR)\ - {\ - DbgBreakPoint();\ - } \ - } \ - } - - #define _DbgPrintF(lvl, strings)\ - { \ - if (((lvl)==DEBUG_VARIABLE) || (lvl < DEBUG_VARIABLE))\ - {\ - DbgPrint(STR_MODULENAME);\ - DbgPrint##strings;\ - DbgPrint("\n");\ - if ((lvl) == DEBUGLVL_ERROR)\ - {\ - DbgBreakPoint();\ - } \ - } \ - } -#else - #define _DbgPrintF(lvl, strings) - #define _DbgPrintFEx(component, lvl, strings) -#endif -#endif - - -#if defined(__cplusplus) -} -#endif -#endif Modified: branches/header-work/include/psdk/evntrace.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/evntra… ============================================================================== --- branches/header-work/include/psdk/evntrace.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/evntrace.h [iso-8859-1] Fri Apr 16 15:19:55 2010 @@ -1,5 +1,4 @@ -#ifndef _EVNTRACE_ -#define _EVNTRACE_ +#pragma once #ifndef WMIAPI #ifndef MIDL_PASS @@ -8,67 +7,321 @@ #else #define WMIAPI DECLSPEC_IMPORT __stdcall #endif +#endif /* MIDL_PASS */ +#endif /* WMIAPI */ + +#include <guiddef.h> + +#ifdef __cplusplus +extern "C" { #endif + +DEFINE_GUID (EventTraceGuid, 0x68fdd900, 0x4a3e, 0x11d1, 0x84, 0xf4, 0x00, 0x00, 0xf8, 0x04, 0x64, 0xe3); +DEFINE_GUID (SystemTraceControlGuid, 0x9e814aad, 0x3204, 0x11d2, 0x9a, 0x82, 0x00, 0x60, 0x08, 0xa8, 0x69, 0x39); +DEFINE_GUID (EventTraceConfigGuid, 0x01853a65, 0x418f, 0x4f36, 0xae, 0xfc, 0xdc, 0x0f, 0x1d, 0x2f, 0xd2, 0x35); +DEFINE_GUID (DefaultTraceSecurityGuid, 0x0811c1af, 0x7a07, 0x4a06, 0x82, 0xed, 0x86, 0x94, 0x55, 0xcd, 0xf7, 0x13); + +#define KERNEL_LOGGER_NAMEW L"NT Kernel Logger" +#define GLOBAL_LOGGER_NAMEW L"GlobalLogger" +#define EVENT_LOGGER_NAMEW L"EventLog" +#define DIAG_LOGGER_NAMEW L"DiagLog" + +#define KERNEL_LOGGER_NAMEA "NT Kernel Logger" +#define GLOBAL_LOGGER_NAMEA "GlobalLogger" +#define EVENT_LOGGER_NAMEA "EventLog" +#define DIAG_LOGGER_NAMEA "DiagLog" + +#define MAX_MOF_FIELDS 16 + +#ifndef _TRACEHANDLE_DEFINED +#define _TRACEHANDLE_DEFINED +typedef ULONG64 TRACEHANDLE, *PTRACEHANDLE; #endif -typedef struct _EVENT_TRACE_PROPERTIES -{ - WNODE_HEADER Wnode; - ULONG BufferSize; - ULONG MinimumBuffers; - ULONG MaximumBuffers; - ULONG MaximumFileSize; - ULONG LogFileMode; - ULONG FlushTimer; - ULONG EnableFlags; - LONG AgeLimit; - ULONG NumberOfBuffers; - ULONG FreeBuffers; - ULONG EventsLost; - ULONG BuffersWritten; - ULONG LogBuffersLost; - ULONG RealTimeBuffersLost; - HANDLE LoggerThreadId; - ULONG LogFileNameOffset; - ULONG LoggerNameOffset; -} EVENT_TRACE_PROPERTIES, *PEVENT_TRACE_PROPERTIES; - -typedef struct _EVENT_TRACE_HEADER -{ - USHORT Size; - union { - USHORT FieldTypeFlags; +#define SYSTEM_EVENT_TYPE 1 + +#define EVENT_TRACE_TYPE_INFO 0x00 +#define EVENT_TRACE_TYPE_START 0x01 +#define EVENT_TRACE_TYPE_END 0x02 +#define EVENT_TRACE_TYPE_STOP 0x02 +#define EVENT_TRACE_TYPE_DC_START 0x03 +#define EVENT_TRACE_TYPE_DC_END 0x04 +#define EVENT_TRACE_TYPE_EXTENSION 0x05 +#define EVENT_TRACE_TYPE_REPLY 0x06 +#define EVENT_TRACE_TYPE_DEQUEUE 0x07 +#define EVENT_TRACE_TYPE_RESUME 0x07 +#define EVENT_TRACE_TYPE_CHECKPOINT 0x08 +#define EVENT_TRACE_TYPE_SUSPEND 0x08 +#define EVENT_TRACE_TYPE_WINEVT_SEND 0x09 +#define EVENT_TRACE_TYPE_WINEVT_RECEIVE 0XF0 + +#define TRACE_LEVEL_NONE 0 +#define TRACE_LEVEL_CRITICAL 1 +#define TRACE_LEVEL_FATAL 1 +#define TRACE_LEVEL_ERROR 2 +#define TRACE_LEVEL_WARNING 3 +#define TRACE_LEVEL_INFORMATION 4 +#define TRACE_LEVEL_VERBOSE 5 +#define TRACE_LEVEL_RESERVED6 6 +#define TRACE_LEVEL_RESERVED7 7 +#define TRACE_LEVEL_RESERVED8 8 +#define TRACE_LEVEL_RESERVED9 9 + +#define EVENT_TRACE_TYPE_LOAD 0x0A + +#define EVENT_TRACE_TYPE_IO_READ 0x0A +#define EVENT_TRACE_TYPE_IO_WRITE 0x0B +#define EVENT_TRACE_TYPE_IO_READ_INIT 0x0C +#define EVENT_TRACE_TYPE_IO_WRITE_INIT 0x0D +#define EVENT_TRACE_TYPE_IO_FLUSH 0x0E +#define EVENT_TRACE_TYPE_IO_FLUSH_INIT 0x0F + +#define EVENT_TRACE_TYPE_MM_TF 0x0A +#define EVENT_TRACE_TYPE_MM_DZF 0x0B +#define EVENT_TRACE_TYPE_MM_COW 0x0C +#define EVENT_TRACE_TYPE_MM_GPF 0x0D +#define EVENT_TRACE_TYPE_MM_HPF 0x0E +#define EVENT_TRACE_TYPE_MM_AV 0x0F + +#define EVENT_TRACE_TYPE_SEND 0x0A +#define EVENT_TRACE_TYPE_RECEIVE 0x0B +#define EVENT_TRACE_TYPE_CONNECT 0x0C +#define EVENT_TRACE_TYPE_DISCONNECT 0x0D +#define EVENT_TRACE_TYPE_RETRANSMIT 0x0E +#define EVENT_TRACE_TYPE_ACCEPT 0x0F +#define EVENT_TRACE_TYPE_RECONNECT 0x10 +#define EVENT_TRACE_TYPE_CONNFAIL 0x11 +#define EVENT_TRACE_TYPE_COPY_TCP 0x12 +#define EVENT_TRACE_TYPE_COPY_ARP 0x13 +#define EVENT_TRACE_TYPE_ACKFULL 0x14 +#define EVENT_TRACE_TYPE_ACKPART 0x15 +#define EVENT_TRACE_TYPE_ACKDUP 0x16 + +#define EVENT_TRACE_TYPE_GUIDMAP 0x0A +#define EVENT_TRACE_TYPE_CONFIG 0x0B +#define EVENT_TRACE_TYPE_SIDINFO 0x0C +#define EVENT_TRACE_TYPE_SECURITY 0x0D + +#define EVENT_TRACE_TYPE_REGCREATE 0x0A +#define EVENT_TRACE_TYPE_REGOPEN 0x0B +#define EVENT_TRACE_TYPE_REGDELETE 0x0C +#define EVENT_TRACE_TYPE_REGQUERY 0x0D +#define EVENT_TRACE_TYPE_REGSETVALUE 0x0E +#define EVENT_TRACE_TYPE_REGDELETEVALUE 0x0F +#define EVENT_TRACE_TYPE_REGQUERYVALUE 0x10 +#define EVENT_TRACE_TYPE_REGENUMERATEKEY 0x11 +#define EVENT_TRACE_TYPE_REGENUMERATEVALUEKEY 0x12 +#define EVENT_TRACE_TYPE_REGQUERYMULTIPLEVALUE 0x13 +#define EVENT_TRACE_TYPE_REGSETINFORMATION 0x14 +#define EVENT_TRACE_TYPE_REGFLUSH 0x15 +#define EVENT_TRACE_TYPE_REGKCBCREATE 0x16 +#define EVENT_TRACE_TYPE_REGKCBDELETE 0x17 +#define EVENT_TRACE_TYPE_REGKCBRUNDOWNBEGIN 0x18 +#define EVENT_TRACE_TYPE_REGKCBRUNDOWNEND 0x19 +#define EVENT_TRACE_TYPE_REGVIRTUALIZE 0x1A +#define EVENT_TRACE_TYPE_REGCLOSE 0x1B +#define EVENT_TRACE_TYPE_REGSETSECURITY 0x1C +#define EVENT_TRACE_TYPE_REGQUERYSECURITY 0x1D +#define EVENT_TRACE_TYPE_REGCOMMIT 0x1E +#define EVENT_TRACE_TYPE_REGPREPARE 0x1F +#define EVENT_TRACE_TYPE_REGROLLBACK 0x20 +#define EVENT_TRACE_TYPE_REGMOUNTHIVE 0x21 + +#define EVENT_TRACE_TYPE_CONFIG_CPU 0x0A +#define EVENT_TRACE_TYPE_CONFIG_PHYSICALDISK 0x0B +#define EVENT_TRACE_TYPE_CONFIG_LOGICALDISK 0x0C +#define EVENT_TRACE_TYPE_CONFIG_NIC 0x0D +#define EVENT_TRACE_TYPE_CONFIG_VIDEO 0x0E +#define EVENT_TRACE_TYPE_CONFIG_SERVICES 0x0F +#define EVENT_TRACE_TYPE_CONFIG_POWER 0x10 +#define EVENT_TRACE_TYPE_CONFIG_NETINFO 0x11 + +#define EVENT_TRACE_TYPE_CONFIG_IRQ 0x15 +#define EVENT_TRACE_TYPE_CONFIG_PNP 0x16 +#define EVENT_TRACE_TYPE_CONFIG_IDECHANNEL 0x17 +#define EVENT_TRACE_TYPE_CONFIG_PLATFORM 0x19 + +#define EVENT_TRACE_FLAG_PROCESS 0x00000001 +#define EVENT_TRACE_FLAG_THREAD 0x00000002 +#define EVENT_TRACE_FLAG_IMAGE_LOAD 0x00000004 + +#define EVENT_TRACE_FLAG_DISK_IO 0x00000100 +#define EVENT_TRACE_FLAG_DISK_FILE_IO 0x00000200 + +#define EVENT_TRACE_FLAG_MEMORY_PAGE_FAULTS 0x00001000 +#define EVENT_TRACE_FLAG_MEMORY_HARD_FAULTS 0x00002000 + +#define EVENT_TRACE_FLAG_NETWORK_TCPIP 0x00010000 + +#define EVENT_TRACE_FLAG_REGISTRY 0x00020000 +#define EVENT_TRACE_FLAG_DBGPRINT 0x00040000 + +#define EVENT_TRACE_FLAG_PROCESS_COUNTERS 0x00000008 +#define EVENT_TRACE_FLAG_CSWITCH 0x00000010 +#define EVENT_TRACE_FLAG_DPC 0x00000020 +#define EVENT_TRACE_FLAG_INTERRUPT 0x00000040 +#define EVENT_TRACE_FLAG_SYSTEMCALL 0x00000080 + +#define EVENT_TRACE_FLAG_DISK_IO_INIT 0x00000400 + +#define EVENT_TRACE_FLAG_ALPC 0x00100000 +#define EVENT_TRACE_FLAG_SPLIT_IO 0x00200000 + +#define EVENT_TRACE_FLAG_DRIVER 0x00800000 +#define EVENT_TRACE_FLAG_PROFILE 0x01000000 +#define EVENT_TRACE_FLAG_FILE_IO 0x02000000 +#define EVENT_TRACE_FLAG_FILE_IO_INIT 0x04000000 + +#define EVENT_TRACE_FLAG_DISPATCHER 0x00000800 +#define EVENT_TRACE_FLAG_VIRTUAL_ALLOC 0x00004000 + +#define EVENT_TRACE_FLAG_EXTENSION 0x80000000 +#define EVENT_TRACE_FLAG_FORWARD_WMI 0x40000000 +#define EVENT_TRACE_FLAG_ENABLE_RESERVE 0x20000000 + +#define EVENT_TRACE_FILE_MODE_NONE 0x00000000 +#define EVENT_TRACE_FILE_MODE_SEQUENTIAL 0x00000001 +#define EVENT_TRACE_FILE_MODE_CIRCULAR 0x00000002 +#define EVENT_TRACE_FILE_MODE_APPEND 0x00000004 + +#define EVENT_TRACE_REAL_TIME_MODE 0x00000100 +#define EVENT_TRACE_DELAY_OPEN_FILE_MODE 0x00000200 +#define EVENT_TRACE_BUFFERING_MODE 0x00000400 +#define EVENT_TRACE_PRIVATE_LOGGER_MODE 0x00000800 +#define EVENT_TRACE_ADD_HEADER_MODE 0x00001000 + +#define EVENT_TRACE_USE_GLOBAL_SEQUENCE 0x00004000 +#define EVENT_TRACE_USE_LOCAL_SEQUENCE 0x00008000 + +#define EVENT_TRACE_RELOG_MODE 0x00010000 + +#define EVENT_TRACE_USE_PAGED_MEMORY 0x01000000 + +#define EVENT_TRACE_FILE_MODE_NEWFILE 0x00000008 +#define EVENT_TRACE_FILE_MODE_PREALLOCATE 0x00000020 + +#define EVENT_TRACE_NONSTOPPABLE_MODE 0x00000040 +#define EVENT_TRACE_SECURE_MODE 0x00000080 +#define EVENT_TRACE_USE_KBYTES_FOR_SIZE 0x00002000 +#define EVENT_TRACE_PRIVATE_IN_PROC 0x00020000 +#define EVENT_TRACE_MODE_RESERVED 0x00100000 + +#define EVENT_TRACE_NO_PER_PROCESSOR_BUFFERING 0x10000000 + +#define EVENT_TRACE_CONTROL_QUERY 0 +#define EVENT_TRACE_CONTROL_STOP 1 +#define EVENT_TRACE_CONTROL_UPDATE 2 + +#define EVENT_TRACE_CONTROL_FLUSH 3 + +#define TRACE_MESSAGE_SEQUENCE 1 +#define TRACE_MESSAGE_GUID 2 +#define TRACE_MESSAGE_COMPONENTID 4 +#define TRACE_MESSAGE_TIMESTAMP 8 +#define TRACE_MESSAGE_PERFORMANCE_TIMESTAMP 16 +#define TRACE_MESSAGE_SYSTEMINFO 32 + +#define TRACE_MESSAGE_POINTER32 0x0040 +#define TRACE_MESSAGE_POINTER64 0x0080 + +#define TRACE_MESSAGE_FLAG_MASK 0xFFFF + +#define TRACE_MESSAGE_MAXIMUM_SIZE 8*1024 + +#define EVENT_TRACE_USE_PROCTIME 0x0001 +#define EVENT_TRACE_USE_NOCPUTIME 0x0002 + +#define TRACE_HEADER_FLAG_USE_TIMESTAMP 0x00000200 +#define TRACE_HEADER_FLAG_TRACED_GUID 0x00020000 +#define TRACE_HEADER_FLAG_LOG_WNODE 0x00040000 +#define TRACE_HEADER_FLAG_USE_GUID_PTR 0x00080000 +#define TRACE_HEADER_FLAG_USE_MOF_PTR 0x00100000 + +#define ETW_NULL_TYPE_VALUE 0 +#define ETW_OBJECT_TYPE_VALUE 1 +#define ETW_STRING_TYPE_VALUE 2 +#define ETW_SBYTE_TYPE_VALUE 3 +#define ETW_BYTE_TYPE_VALUE 4 +#define ETW_INT16_TYPE_VALUE 5 +#define ETW_UINT16_TYPE_VALUE 6 +#define ETW_INT32_TYPE_VALUE 7 +#define ETW_UINT32_TYPE_VALUE 8 +#define ETW_INT64_TYPE_VALUE 9 +#define ETW_UINT64_TYPE_VALUE 10 +#define ETW_CHAR_TYPE_VALUE 11 +#define ETW_SINGLE_TYPE_VALUE 12 +#define ETW_DOUBLE_TYPE_VALUE 13 +#define ETW_BOOLEAN_TYPE_VALUE 14 +#define ETW_DECIMAL_TYPE_VALUE 15 + +#define ETW_GUID_TYPE_VALUE 101 +#define ETW_ASCIICHAR_TYPE_VALUE 102 +#define ETW_ASCIISTRING_TYPE_VALUE 103 +#define ETW_COUNTED_STRING_TYPE_VALUE 104 +#define ETW_POINTER_TYPE_VALUE 105 +#define ETW_SIZET_TYPE_VALUE 106 +#define ETW_HIDDEN_TYPE_VALUE 107 +#define ETW_BOOL_TYPE_VALUE 108 +#define ETW_COUNTED_ANSISTRING_TYPE_VALUE 109 +#define ETW_REVERSED_COUNTED_STRING_TYPE_VALUE 110 +#define ETW_REVERSED_COUNTED_ANSISTRING_TYPE_VALUE 111 +#define ETW_NON_NULL_TERMINATED_STRING_TYPE_VALUE 112 +#define ETW_REDUCED_ANSISTRING_TYPE_VALUE 113 +#define ETW_REDUCED_STRING_TYPE_VALUE 114 +#define ETW_SID_TYPE_VALUE 115 +#define ETW_VARIANT_TYPE_VALUE 116 +#define ETW_PTVECTOR_TYPE_VALUE 117 +#define ETW_WMITIME_TYPE_VALUE 118 +#define ETW_DATETIME_TYPE_VALUE 119 +#define ETW_REFRENCE_TYPE_VALUE 120 + +#define TRACE_PROVIDER_FLAG_LEGACY 0x00000001 +#define TRACE_PROVIDER_FLAG_PRE_ENABLE 0x00000002 + +#define EVENT_CONTROL_CODE_DISABLE_PROVIDER 0 +#define EVENT_CONTROL_CODE_ENABLE_PROVIDER 1 +#define EVENT_CONTROL_CODE_CAPTURE_STATE 2 + +#define DEFINE_TRACE_MOF_FIELD(MOF, ptr, length, type) \ + (MOF)->DataPtr = (ULONG64)(ULONG_PTR) ptr; \ + (MOF)->Length = (ULONG) length; \ + (MOF)->DataType = (ULONG) type; + +typedef struct _EVENT_TRACE_HEADER { + USHORT Size; + _ANONYMOUS_UNION union { + USHORT FieldTypeFlags; + _ANONYMOUS_STRUCT struct { + UCHAR HeaderType; + UCHAR MarkerFlags; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + _ANONYMOUS_UNION union { + ULONG Version; struct { - UCHAR HeaderType; - UCHAR MarkerFlags; - }; - }; - union { - ULONG Version; - struct { - UCHAR Type; - UCHAR Level; - USHORT Version; + UCHAR Type; + UCHAR Level; + USHORT Version; } Class; - }; - ULONG ThreadId; - ULONG ProcessId; - LARGE_INTEGER TimeStamp; - union { - GUID Guid; - ULONGLONG GuidPtr; - }; - union { - struct { - ULONG ClientContext; - ULONG Flags; - }; - struct { - ULONG KernelTime; - ULONG UserTime; - }; - ULONG64 ProcessorTime; - }; + } DUMMYUNIONNAME2; + ULONG ThreadId; + ULONG ProcessId; + LARGE_INTEGER TimeStamp; + _ANONYMOUS_UNION union { + GUID Guid; + ULONGLONG GuidPtr; + } DUMMYUNIONNAME3; + _ANONYMOUS_UNION union { + _ANONYMOUS_STRUCT struct { + ULONG KernelTime; + ULONG UserTime; + } DUMMYSTRUCTNAME; + ULONG64 ProcessorTime; + _ANONYMOUS_STRUCT struct { + ULONG ClientContext; + ULONG Flags; + } DUMMYSTRUCTNAME2; + } DUMMYUNIONNAME4; } EVENT_TRACE_HEADER; #ifndef PEVENT_TRACE_HEADER_DEFINED @@ -76,35 +329,767 @@ typedef struct _EVENT_TRACE_HEADER *PEVENT_TRACE_HEADER; #endif - -typedef ULONG64 TRACEHANDLE, *PTRACEHANDLE; -typedef ULONG (WINAPI *WMIDPREQUEST)( - WMIDPREQUESTCODE RequestCode, - PVOID RequestContext, - ULONG *BufferSize, - PVOID Buffer -); - -typedef struct _TRACE_GUID_REGISTRATION -{ - LPCGUID Guid; - HANDLE RegHandle; +typedef struct _EVENT_INSTANCE_HEADER { + USHORT Size; + _ANONYMOUS_UNION union { + USHORT FieldTypeFlags; + _ANONYMOUS_STRUCT struct { + UCHAR HeaderType; + UCHAR MarkerFlags; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + _ANONYMOUS_UNION union { + ULONG Version; + struct { + UCHAR Type; + UCHAR Level; + USHORT Version; + } Class; + } DUMMYUNIONNAME2; + ULONG ThreadId; + ULONG ProcessId; + LARGE_INTEGER TimeStamp; + ULONGLONG RegHandle; + ULONG InstanceId; + ULONG ParentInstanceId; + _ANONYMOUS_UNION union { + _ANONYMOUS_STRUCT struct { + ULONG KernelTime; + ULONG UserTime; + } DUMMYSTRUCTNAME; + ULONG64 ProcessorTime; + _ANONYMOUS_STRUCT struct { + ULONG EventId; + ULONG Flags; + } DUMMYSTRUCTNAME2; + } DUMMYUNIONNAME3; + ULONGLONG ParentRegHandle; +} EVENT_INSTANCE_HEADER, *PEVENT_INSTANCE_HEADER; + +typedef struct _MOF_FIELD { + ULONG64 DataPtr; + ULONG Length; + ULONG DataType; +} MOF_FIELD, *PMOF_FIELD; + +typedef struct _EVENT_INSTANCE_INFO { + HANDLE RegHandle; + ULONG InstanceId; +} EVENT_INSTANCE_INFO, *PEVENT_INSTANCE_INFO; + +typedef struct _TRACE_GUID_PROPERTIES { + GUID Guid; + ULONG GuidType; + ULONG LoggerId; + ULONG EnableLevel; + ULONG EnableFlags; + BOOLEAN IsEnable; +} TRACE_GUID_PROPERTIES, *PTRACE_GUID_PROPERTIES; + +typedef struct _ETW_BUFFER_CONTEXT { + UCHAR ProcessorNumber; + UCHAR Alignment; + USHORT LoggerId; +} ETW_BUFFER_CONTEXT, *PETW_BUFFER_CONTEXT; + +typedef struct _TRACE_ENABLE_INFO { + ULONG IsEnabled; + UCHAR Level; + UCHAR Reserved1; + USHORT LoggerId; + ULONG EnableProperty; + ULONG Reserved2; + ULONGLONG MatchAnyKeyword; + ULONGLONG MatchAllKeyword; +} TRACE_ENABLE_INFO, *PTRACE_ENABLE_INFO; + +typedef struct _TRACE_PROVIDER_INSTANCE_INFO { + ULONG NextOffset; + ULONG EnableCount; + ULONG Pid; + ULONG Flags; +} TRACE_PROVIDER_INSTANCE_INFO, *PTRACE_PROVIDER_INSTANCE_INFO; + +typedef struct _TRACE_GUID_INFO { + ULONG InstanceCount; + ULONG Reserved; +} TRACE_GUID_INFO, *PTRACE_GUID_INFO; + +typedef struct _EVENT_TRACE { + EVENT_TRACE_HEADER Header; + ULONG InstanceId; + ULONG ParentInstanceId; + GUID ParentGuid; + PVOID MofData; + ULONG MofLength; + _ANONYMOUS_UNION union { + ULONG ClientContext; + ETW_BUFFER_CONTEXT BufferContext; + } DUMMYUNIONNAME; +} EVENT_TRACE, *PEVENT_TRACE; + +#if !(defined(_NTDDK_) || defined(_NTIFS_)) || defined(_WMIKM_) + +typedef struct _TRACE_LOGFILE_HEADER { + ULONG BufferSize; + _ANONYMOUS_UNION union { + ULONG Version; + struct { + UCHAR MajorVersion; + UCHAR MinorVersion; + UCHAR SubVersion; + UCHAR SubMinorVersion; + } VersionDetail; + } DUMMYUNIONNAME; + ULONG ProviderVersion; + ULONG NumberOfProcessors; + LARGE_INTEGER EndTime; + ULONG TimerResolution; + ULONG MaximumFileSize; + ULONG LogFileMode; + ULONG BuffersWritten; + _ANONYMOUS_UNION union { + GUID LogInstanceGuid; + _ANONYMOUS_STRUCT struct { + ULONG StartBuffers; + ULONG PointerSize; + ULONG EventsLost; + ULONG CpuSpeedInMHz; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME2; +#if defined(_WMIKM_) + PWCHAR LoggerName; + PWCHAR LogFileName; + RTL_TIME_ZONE_INFORMATION TimeZone; +#else + LPWSTR LoggerName; + LPWSTR LogFileName; + TIME_ZONE_INFORMATION TimeZone; +#endif + LARGE_INTEGER BootTime; + LARGE_INTEGER PerfFreq; + LARGE_INTEGER StartTime; + ULONG ReservedFlags; + ULONG BuffersLost; +} TRACE_LOGFILE_HEADER, *PTRACE_LOGFILE_HEADER; + +typedef struct _TRACE_LOGFILE_HEADER32 { + ULONG BufferSize; + _ANONYMOUS_UNION union { + ULONG Version; + struct { + UCHAR MajorVersion; + UCHAR MinorVersion; + UCHAR SubVersion; + UCHAR SubMinorVersion; + } VersionDetail; + } DUMMYUNIONNAME; + ULONG ProviderVersion; + ULONG NumberOfProcessors; + LARGE_INTEGER EndTime; + ULONG TimerResolution; + ULONG MaximumFileSize; + ULONG LogFileMode; + ULONG BuffersWritten; + _ANONYMOUS_UNION union { + GUID LogInstanceGuid; + _ANONYMOUS_STRUCT struct { + ULONG StartBuffers; + ULONG PointerSize; + ULONG EventsLost; + ULONG CpuSpeedInMHz; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME2; +#if defined(_WMIKM_) + ULONG32 LoggerName; + ULONG32 LogFileName; + RTL_TIME_ZONE_INFORMATION TimeZone; +#else + ULONG32 LoggerName; + ULONG32 LogFileName; + TIME_ZONE_INFORMATION TimeZone; +#endif + LARGE_INTEGER BootTime; + LARGE_INTEGER PerfFreq; + LARGE_INTEGER StartTime; + ULONG ReservedFlags; + ULONG BuffersLost; +} TRACE_LOGFILE_HEADER32, *PTRACE_LOGFILE_HEADER32; + +typedef struct _TRACE_LOGFILE_HEADER64 { + ULONG BufferSize; + _ANONYMOUS_UNION union { + ULONG Version; + struct { + UCHAR MajorVersion; + UCHAR MinorVersion; + UCHAR SubVersion; + UCHAR SubMinorVersion; + } VersionDetail; + } DUMMYUNIONNAME; + ULONG ProviderVersion; + ULONG NumberOfProcessors; + LARGE_INTEGER EndTime; + ULONG TimerResolution; + ULONG MaximumFileSize; + ULONG LogFileMode; + ULONG BuffersWritten; + _ANONYMOUS_UNION union { + GUID LogInstanceGuid; + _ANONYMOUS_STRUCT struct { + ULONG StartBuffers; + ULONG PointerSize; + ULONG EventsLost; + ULONG CpuSpeedInMHz; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME2; +#if defined(_WMIKM_) + ULONG64 LoggerName; + ULONG64 LogFileName; + RTL_TIME_ZONE_INFORMATION TimeZone; +#else + ULONG64 LoggerName; + ULONG64 LogFileName; + TIME_ZONE_INFORMATION TimeZone; +#endif + LARGE_INTEGER BootTime; + LARGE_INTEGER PerfFreq; + LARGE_INTEGER StartTime; + ULONG ReservedFlags; + ULONG BuffersLost; +} TRACE_LOGFILE_HEADER64, *PTRACE_LOGFILE_HEADER64; + +#endif /* !_NTDDK_ || _WMIKM_ */ + +#if !defined(_WMIKM_) && !defined(_NTDDK_) && !defined(_NTIFS_) + +#define ENABLE_TRACE_PARAMETERS_VERSION 1 + +typedef struct _EVENT_TRACE_PROPERTIES { + WNODE_HEADER Wnode; + ULONG BufferSize; + ULONG MinimumBuffers; + ULONG MaximumBuffers; + ULONG MaximumFileSize; + ULONG LogFileMode; + ULONG FlushTimer; + ULONG EnableFlags; + LONG AgeLimit; + ULONG NumberOfBuffers; + ULONG FreeBuffers; + ULONG EventsLost; + ULONG BuffersWritten; + ULONG LogBuffersLost; + ULONG RealTimeBuffersLost; + HANDLE LoggerThreadId; + ULONG LogFileNameOffset; + ULONG LoggerNameOffset; +} EVENT_TRACE_PROPERTIES, *PEVENT_TRACE_PROPERTIES; + +typedef struct _TRACE_GUID_REGISTRATION { + LPCGUID Guid; + HANDLE RegHandle; } TRACE_GUID_REGISTRATION, *PTRACE_GUID_REGISTRATION; - -ULONG WMIAPI TraceEvent(TRACEHANDLE,PEVENT_TRACE_HEADER); -TRACEHANDLE WMIAPI GetTraceLoggerHandle(PVOID); -ULONG WMIAPI GetTraceEnableFlags(TRACEHANDLE); -UCHAR WMIAPI GetTraceEnableLevel(TRACEHANDLE); -ULONG WMIAPI RegisterTraceGuidsA(WMIDPREQUEST,PVOID,LPCGUID,ULONG,PTRACE_GUID_REGISTRATION,LPCSTR,LPCSTR,PTRACEHANDLE); -ULONG WMIAPI RegisterTraceGuidsW(WMIDPREQUEST,PVOID,LPCGUID,ULONG,PTRACE_GUID_REGISTRATION,LPCWSTR,LPCWSTR,PTRACEHANDLE); -ULONG WMIAPI UnregisterTraceGuids(TRACEHANDLE); - -#if defined (UNICODE) || defined (_UNICODE) +typedef struct _EVENT_RECORD EVENT_RECORD, *PEVENT_RECORD; +typedef struct _EVENT_TRACE_LOGFILEW EVENT_TRACE_LOGFILEW, *PEVENT_TRACE_LOGFILEW; +typedef struct _EVENT_TRACE_LOGFILEA EVENT_TRACE_LOGFILEA, *PEVENT_TRACE_LOGFILEA; +typedef struct _EVENT_FILTER_DESCRIPTOR EVENT_FILTER_DESCRIPTOR, *PEVENT_FILTER_DESCRIPTOR; + +typedef ULONG +(WINAPI *PEVENT_TRACE_BUFFER_CALLBACKW)( + PEVENT_TRACE_LOGFILEW Logfile); + +typedef ULONG +(WINAPI *PEVENT_TRACE_BUFFER_CALLBACKA)( + PEVENT_TRACE_LOGFILEA Logfile); + +typedef VOID +(WINAPI *PEVENT_CALLBACK)( + PEVENT_TRACE pEvent ); + +typedef VOID +(WINAPI *PEVENT_RECORD_CALLBACK)( + PEVENT_RECORD EventRecord); + +typedef ULONG +(WINAPI *WMIDPREQUEST)( + IN WMIDPREQUESTCODE RequestCode, + IN PVOID RequestContext, + IN OUT ULONG *BufferSize, + IN OUT PVOID Buffer); + +struct _EVENT_TRACE_LOGFILEW { + LPWSTR LogFileName; + LPWSTR LoggerName; + LONGLONG CurrentTime; + ULONG BuffersRead; + _ANONYMOUS_UNION union { + ULONG LogFileMode; + ULONG ProcessTraceMode; + } DUMMYUNIONNAME; + EVENT_TRACE CurrentEvent; + TRACE_LOGFILE_HEADER LogfileHeader; + PEVENT_TRACE_BUFFER_CALLBACKW BufferCallback; + ULONG BufferSize; + ULONG Filled; + ULONG EventsLost; + _ANONYMOUS_UNION union { + PEVENT_CALLBACK EventCallback; + PEVENT_RECORD_CALLBACK EventRecordCallback; + } DUMMYUNIONNAME2; + ULONG IsKernelTrace; + PVOID Context; +}; + +struct _EVENT_TRACE_LOGFILEA { + LPSTR LogFileName; + LPSTR LoggerName; + LONGLONG CurrentTime; + ULONG BuffersRead; + _ANONYMOUS_UNION union { + ULONG LogFileMode; + ULONG ProcessTraceMode; + } DUMMYUNIONNAME; + EVENT_TRACE CurrentEvent; + TRACE_LOGFILE_HEADER LogfileHeader; + PEVENT_TRACE_BUFFER_CALLBACKA BufferCallback; + ULONG BufferSize; + ULONG Filled; + ULONG EventsLost; + _ANONYMOUS_UNION union { + PEVENT_CALLBACK EventCallback; + PEVENT_RECORD_CALLBACK EventRecordCallback; + } DUMMYUNIONNAME2; + ULONG IsKernelTrace; + PVOID Context; +}; + +#if defined(_UNICODE) || defined(UNICODE) + +#define PEVENT_TRACE_BUFFER_CALLBACK PEVENT_TRACE_BUFFER_CALLBACKW +#define EVENT_TRACE_LOGFILE EVENT_TRACE_LOGFILEW +#define PEVENT_TRACE_LOGFILE PEVENT_TRACE_LOGFILEW +#define KERNEL_LOGGER_NAME KERNEL_LOGGER_NAMEW +#define GLOBAL_LOGGER_NAME GLOBAL_LOGGER_NAMEW +#define EVENT_LOGGER_NAME EVENT_LOGGER_NAMEW + +#else + +#define PEVENT_TRACE_BUFFER_CALLBACK PEVENT_TRACE_BUFFER_CALLBACKA +#define EVENT_TRACE_LOGFILE EVENT_TRACE_LOGFILEA +#define PEVENT_TRACE_LOGFILE PEVENT_TRACE_LOGFILEA +#define KERNEL_LOGGER_NAME KERNEL_LOGGER_NAMEA +#define GLOBAL_LOGGER_NAME GLOBAL_LOGGER_NAMEA +#define EVENT_LOGGER_NAME EVENT_LOGGER_NAMEA + +#endif /* defined(_UNICODE) || defined(UNICODE) */ + +typedef enum _TRACE_QUERY_INFO_CLASS { + TraceGuidQueryList, + TraceGuidQueryInfo, + TraceGuidQueryProcess, + TraceStackTracingInfo, + MaxTraceSetInfoClass +} TRACE_QUERY_INFO_CLASS, TRACE_INFO_CLASS; + +typedef struct _CLASSIC_EVENT_ID { + GUID EventGuid; + UCHAR Type; + UCHAR Reserved[7]; +} CLASSIC_EVENT_ID, *PCLASSIC_EVENT_ID; + +typedef struct _ENABLE_TRACE_PARAMETERS { + ULONG Version; + ULONG EnableProperty; + ULONG ControlFlags; + GUID SourceId; + PEVENT_FILTER_DESCRIPTOR EnableFilterDesc; +} ENABLE_TRACE_PARAMETERS, *PENABLE_TRACE_PARAMETERS; + +#define INVALID_PROCESSTRACE_HANDLE ((TRACEHANDLE)INVALID_HANDLE_VALUE) + +#if defined(UNICODE) || defined(_UNICODE) + #define RegisterTraceGuids RegisterTraceGuidsW +#define StartTrace StartTraceW +#define ControlTrace ControlTraceW + +#if defined(__TRACE_W2K_COMPATIBLE) + +#define StopTrace(a,b,c) ControlTraceW((a),(b),(c), EVENT_TRACE_CONTROL_STOP) +#define QueryTrace(a,b,c) ControlTraceW((a),(b),(c), EVENT_TRACE_CONTROL_QUERY) +#define UpdateTrace(a,b,c) ControlTraceW((a),(b),(c), EVENT_TRACE_CONTROL_UPDATE) + #else + +#define StopTrace StopTraceW +#define QueryTrace QueryTraceW +#define UpdateTrace UpdateTraceW + +#endif /* defined(__TRACE_W2K_COMPATIBLE) */ + +#if (NTDDI_VERSION >= NTDDI_WINXP) +#define FlushTrace FlushTraceW +#endif + +#define QueryAllTraces QueryAllTracesW +#define OpenTrace OpenTraceW + +#else /* defined(UNICODE) || defined(_UNICODE) */ + #define RegisterTraceGuids RegisterTraceGuidsA +#define StartTrace StartTraceA +#define ControlTrace ControlTraceA + +#if defined(__TRACE_W2K_COMPATIBLE) + +#define StopTrace(a,b,c) ControlTraceA((a),(b),(c), EVENT_TRACE_CONTROL_STOP) +#define QueryTrace(a,b,c) ControlTraceA((a),(b),(c), EVENT_TRACE_CONTROL_QUERY) +#define UpdateTrace(a,b,c) ControlTraceA((a),(b),(c), EVENT_TRACE_CONTROL_UPDATE) + +#else + +#define StopTrace StopTraceA +#define QueryTrace QueryTraceA +#define UpdateTrace UpdateTraceA + +#endif /* defined(__TRACE_W2K_COMPATIBLE) */ + +#if (NTDDI_VERSION >= NTDDI_WINXP) +#define FlushTrace FlushTraceA #endif -#endif /* ENVTRACE_H */ - +#define QueryAllTraces QueryAllTracesA +#define OpenTrace OpenTraceA + +#endif /* defined(UNICODE) || defined(_UNICODE) */ + +EXTERN_C +ULONG +WMIAPI +StartTraceW( + OUT PTRACEHANDLE TraceHandle, + IN LPCWSTR InstanceName, + IN OUT PEVENT_TRACE_PROPERTIES Properties); + +EXTERN_C +ULONG +WMIAPI +StartTraceA( + OUT PTRACEHANDLE TraceHandle, + IN LPCSTR InstanceName, + IN OUT PEVENT_TRACE_PROPERTIES Properties); + +EXTERN_C +ULONG +WMIAPI +StopTraceW( + IN TRACEHANDLE TraceHandle, + IN LPCWSTR InstanceName OPTIONAL, + IN OUT PEVENT_TRACE_PROPERTIES Properties); + +EXTERN_C +ULONG +WMIAPI +StopTraceA( + IN TRACEHANDLE TraceHandle, + IN LPCSTR InstanceName OPTIONAL, + IN OUT PEVENT_TRACE_PROPERTIES Properties); + +EXTERN_C +ULONG +WMIAPI +QueryTraceW( + IN TRACEHANDLE TraceHandle, + IN LPCWSTR InstanceName OPTIONAL, + IN OUT PEVENT_TRACE_PROPERTIES Properties); + +EXTERN_C +ULONG +WMIAPI +QueryTraceA( + IN TRACEHANDLE TraceHandle, + IN LPCSTR InstanceName OPTIONAL, + IN OUT PEVENT_TRACE_PROPERTIES Properties); + +EXTERN_C +ULONG +WMIAPI +UpdateTraceW( + IN TRACEHANDLE TraceHandle, + IN LPCWSTR InstanceName OPTIONAL, + IN OUT PEVENT_TRACE_PROPERTIES Properties); + +EXTERN_C +ULONG +WMIAPI +UpdateTraceA( + IN TRACEHANDLE TraceHandle, + IN LPCSTR InstanceName OPTIONAL, + IN OUT PEVENT_TRACE_PROPERTIES Properties); + +EXTERN_C +ULONG +WMIAPI +ControlTraceW( + IN TRACEHANDLE TraceHandle, + IN LPCWSTR InstanceName OPTIONAL, + IN OUT PEVENT_TRACE_PROPERTIES Properties, + IN ULONG ControlCode); + +EXTERN_C +ULONG +WMIAPI +ControlTraceA( + IN TRACEHANDLE TraceHandle, + IN LPCSTR InstanceName OPTIONAL, + IN OUT PEVENT_TRACE_PROPERTIES Properties, + IN ULONG ControlCode); + +EXTERN_C +ULONG +WMIAPI +QueryAllTracesW( + OUT PEVENT_TRACE_PROPERTIES *PropertyArray, + IN ULONG PropertyArrayCount, + OUT PULONG LoggerCount); + +EXTERN_C +ULONG +WMIAPI +QueryAllTracesA( + OUT PEVENT_TRACE_PROPERTIES *PropertyArray, + IN ULONG PropertyArrayCount, + OUT PULONG LoggerCount); + +EXTERN_C +ULONG +WMIAPI +EnableTrace( + IN ULONG Enable, + IN ULONG EnableFlag, + IN ULONG EnableLevel, + IN LPCGUID ControlGuid, + IN TRACEHANDLE TraceHandle); + +EXTERN_C +ULONG +WMIAPI +CreateTraceInstanceId( + IN HANDLE RegHandle, + IN OUT PEVENT_INSTANCE_INFO InstInfo); + +EXTERN_C +ULONG +WMIAPI +TraceEvent( + IN TRACEHANDLE TraceHandle, + IN PEVENT_TRACE_HEADER EventTrace); + +EXTERN_C +ULONG +WMIAPI +TraceEventInstance( + IN TRACEHANDLE TraceHandle, + IN PEVENT_INSTANCE_HEADER EventTrace, + IN PEVENT_INSTANCE_INFO InstInfo, + IN PEVENT_INSTANCE_INFO ParentInstInfo OPTIONAL); + +EXTERN_C +ULONG +WMIAPI +RegisterTraceGuidsW( + IN WMIDPREQUEST RequestAddress, + IN PVOID RequestContext OPTIONAL, + IN LPCGUID ControlGuid, + IN ULONG GuidCount, + IN PTRACE_GUID_REGISTRATION TraceGuidReg OPTIONAL, + IN LPCWSTR MofImagePath OPTIONAL, + IN LPCWSTR MofResourceName OPTIONAL, + OUT PTRACEHANDLE RegistrationHandle); + +EXTERN_C +ULONG +WMIAPI +RegisterTraceGuidsA( + IN WMIDPREQUEST RequestAddress, + IN PVOID RequestContext OPTIONAL, + IN LPCGUID ControlGuid, + IN ULONG GuidCount, + IN PTRACE_GUID_REGISTRATION TraceGuidReg OPTIONAL, + IN LPCSTR MofImagePath OPTIONAL, + IN LPCSTR MofResourceName OPTIONAL, + OUT PTRACEHANDLE RegistrationHandle); + +EXTERN_C +ULONG +WMIAPI +UnregisterTraceGuids( + IN TRACEHANDLE RegistrationHandle); + +EXTERN_C +TRACEHANDLE +WMIAPI +GetTraceLoggerHandle( + IN PVOID Buffer); + +EXTERN_C +UCHAR +WMIAPI +GetTraceEnableLevel( + IN TRACEHANDLE TraceHandle); + +EXTERN_C +ULONG +WMIAPI +GetTraceEnableFlags( + IN TRACEHANDLE TraceHandle); + +EXTERN_C +TRACEHANDLE +WMIAPI +OpenTraceA( + IN OUT PEVENT_TRACE_LOGFILEA Logfile); + +EXTERN_C +TRACEHANDLE +WMIAPI +OpenTraceW( + IN OUT PEVENT_TRACE_LOGFILEW Logfile); + +EXTERN_C +ULONG +WMIAPI +ProcessTrace( + IN PTRACEHANDLE HandleArray, + IN ULONG HandleCount, + IN LPFILETIME StartTime OPTIONAL, + IN LPFILETIME EndTime OPTIONAL); + +EXTERN_C +ULONG +WMIAPI +CloseTrace( + IN TRACEHANDLE TraceHandle); + +EXTERN_C +ULONG +WMIAPI +SetTraceCallback( + IN LPCGUID pGuid, + IN PEVENT_CALLBACK EventCallback); + +EXTERN_C +ULONG +WMIAPI +RemoveTraceCallback( + IN LPCGUID pGuid); + +EXTERN_C +ULONG +__cdecl +TraceMessage( + IN TRACEHANDLE LoggerHandle, + IN ULONG MessageFlags, + IN LPCGUID MessageGuid, + IN USHORT MessageNumber, + ...); + +EXTERN_C +ULONG +TraceMessageVa( + IN TRACEHANDLE LoggerHandle, + IN ULONG MessageFlags, + IN LPCGUID MessageGuid, + IN USHORT MessageNumber, + IN va_list MessageArgList); + +#if (WINVER >= _WIN32_WINNT_WINXP) + +EXTERN_C +ULONG +WMIAPI +EnumerateTraceGuids( + IN OUT PTRACE_GUID_PROPERTIES *GuidPropertiesArray, + IN ULONG PropertyArrayCount, + OUT PULONG GuidCount); + +EXTERN_C +ULONG +WMIAPI +FlushTraceW( + IN TRACEHANDLE TraceHandle, + IN LPCWSTR InstanceName OPTIONAL, + IN OUT PEVENT_TRACE_PROPERTIES Properties); + +EXTERN_C +ULONG +WMIAPI +FlushTraceA( + IN TRACEHANDLE TraceHandle, + IN LPCSTR InstanceName OPTIONAL, + IN OUT PEVENT_TRACE_PROPERTIES Properties); + +#endif /* (WINVER >= _WIN32_WINNT_WINXP) */ + +#if (WINVER >= _WIN32_WINNT_VISTA) + +EXTERN_C +ULONG +WMIAPI +EnableTraceEx( + IN LPCGUID ProviderId, + IN LPCGUID SourceId OPTIONAL, + IN TRACEHANDLE TraceHandle, + IN ULONG IsEnabled, + IN UCHAR Level, + IN ULONGLONG MatchAnyKeyword, + IN ULONGLONG MatchAllKeyword, + IN ULONG EnableProperty, + IN PEVENT_FILTER_DESCRIPTOR EnableFilterDesc OPTIONAL); + +EXTERN_C +ULONG +WMIAPI +EnumerateTraceGuidsEx( + IN TRACE_QUERY_INFO_CLASS TraceQueryInfoClass, + IN PVOID InBuffer OPTIONAL, + IN ULONG InBufferSize, + OUT PVOID OutBuffer OPTIONAL, + IN ULONG OutBufferSize, + OUT PULONG ReturnLength); + +#endif /* (WINVER >= _WIN32_WINNT_VISTA) */ + +#if (WINVER >= _WIN32_WINNT_WIN7) + +EXTERN_C +ULONG +WMIAPI +EnableTraceEx2( + IN TRACEHANDLE TraceHandle, + IN LPCGUID ProviderId, + IN ULONG ControlCode, + IN UCHAR Level, + IN ULONGLONG MatchAnyKeyword, + IN ULONGLONG MatchAllKeyword, + IN ULONG Timeout, + IN PENABLE_TRACE_PARAMETERS EnableParameters OPTIONAL); + +EXTERN_C +ULONG +WMIAPI +TraceSetInformation( + IN TRACEHANDLE SessionHandle, + IN TRACE_INFO_CLASS InformationClass, + IN PVOID TraceInformation, + IN ULONG InformationLength); + +#endif /* (WINVER >= _WIN32_WINNT_WIN7) */ + +#endif /* !defined(_WMIKM_) && !defined(_NTDDK_) && !defined(_NTIFS_) */ + +#ifdef __cplusplus +} /* extern "C" */ +#endif Copied: branches/header-work/include/psdk/ksdebug.h (from r46874, branches/header-work/include/ddk/ksdebug.h) URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/ksdebu… ============================================================================== --- branches/header-work/include/ddk/ksdebug.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/ksdebug.h [iso-8859-1] Fri Apr 16 15:19:55 2010 @@ -1,3 +1,4 @@ +#include <evntrace.h> #if !defined(_KSDEBUG_) #define _KSDEBUG_ @@ -11,106 +12,111 @@ #if defined(__cplusplus) extern "C" { #endif -#if defined(_NTDDK_) - -#define DEBUGLVL_ERROR 0 -#define DEBUGLVL_TERSE 1 -#define DEBUGLVL_VERBOSE 2 -#define DEBUGLVL_BLAB 3 - - #if (DBG) #if defined(IRPMJFUNCDESC) -static const PCHAR IrpMjFuncDesc[] = -{ - "IRP_MJ_CREATE", - "IRP_MJ_CREATE_NAMED_PIPE", - "IRP_MJ_CLOSE", - "IRP_MJ_READ", - "IRP_MJ_WRITE", - "IRP_MJ_QUERY_INFORMATION", - "IRP_MJ_SET_INFORMATION", - "IRP_MJ_QUERY_EA", - "IRP_MJ_SET_EA", - "IRP_MJ_FLUSH_BUFFERS", - "IRP_MJ_QUERY_VOLUME_INFORMATION", - "IRP_MJ_SET_VOLUME_INFORMATION", - "IRP_MJ_DIRECTORY_CONTROL", - "IRP_MJ_FILE_SYSTEM_CONTROL", - "IRP_MJ_DEVICE_CONTROL", - "IRP_MJ_INTERNAL_DEVICE_CONTROL", - "IRP_MJ_SHUTDOWN", - "IRP_MJ_LOCK_CONTROL", - "IRP_MJ_CLEANUP", - "IRP_MJ_CREATE_MAILSLOT", - "IRP_MJ_QUERY_SECURITY", - "IRP_MJ_SET_SECURITY", - "IRP_MJ_SET_POWER", - "IRP_MJ_QUERY_POWER" +static const PCHAR IrpMjFuncDesc[] = { + "IRP_MJ_CREATE", + "IRP_MJ_CREATE_NAMED_PIPE", + "IRP_MJ_CLOSE", + "IRP_MJ_READ", + "IRP_MJ_WRITE", + "IRP_MJ_QUERY_INFORMATION", + "IRP_MJ_SET_INFORMATION", + "IRP_MJ_QUERY_EA", + "IRP_MJ_SET_EA", + "IRP_MJ_FLUSH_BUFFERS", + "IRP_MJ_QUERY_VOLUME_INFORMATION", + "IRP_MJ_SET_VOLUME_INFORMATION", + "IRP_MJ_DIRECTORY_CONTROL", + "IRP_MJ_FILE_SYSTEM_CONTROL", + "IRP_MJ_DEVICE_CONTROL", + "IRP_MJ_INTERNAL_DEVICE_CONTROL", + "IRP_MJ_SHUTDOWN", + "IRP_MJ_LOCK_CONTROL", + "IRP_MJ_CLEANUP", + "IRP_MJ_CREATE_MAILSLOT", + "IRP_MJ_QUERY_SECURITY", + "IRP_MJ_SET_SECURITY", + "IRP_MJ_SET_POWER", + "IRP_MJ_QUERY_POWER" }; -#endif -#endif +#endif /* defined(IRPMJFUNCDESC) */ + +#endif /* DBG */ + +#if defined(_NTDDK_) + +#define DEBUGLVL_BLAB TRACE_LEVEL_VERBOSE +#define DEBUGLVL_VERBOSE TRACE_LEVEL_VERBOSE +#define DEBUGLVL_TERSE TRACE_LEVEL_INFORMATION +#define DEBUGLVL_ERROR TRACE_LEVEL_ERROR + +#define DEBUGLVL_WARNING TRACE_LEVEL_WARNING +#define DEBUGLVL_INFO TRACE_LEVEL_INFORMATION #if (DBG) #if !defined( DEBUG_LEVEL ) - #if defined( DEBUG_VARIABLE ) - #if defined( KSDEBUG_INIT ) - ULONG DEBUG_VARIABLE = DEBUGLVL_TERSE; - #else - extern ULONG DEBUG_VARIABLE; - #endif + #if defined( DEBUG_VARIABLE ) + #if defined( KSDEBUG_INIT ) + ULONG DEBUG_VARIABLE = DEBUGLVL_TERSE; #else - #define DEBUG_VARIABLE DEBUGLVL_TERSE + extern ULONG DEBUG_VARIABLE; #endif + #else + #define DEBUG_VARIABLE DEBUGLVL_TERSE + #endif #else - #if defined( DEBUG_VARIABLE ) - #if defined( KSDEBUG_INIT ) - ULONG DEBUG_VARIABLE = DEBUG_LEVEL; - #else - extern ULONG DEBUG_VARIABLE; - #endif + #if defined( DEBUG_VARIABLE ) + #if defined( KSDEBUG_INIT ) + ULONG DEBUG_VARIABLE = DEBUG_LEVEL; #else - #define DEBUG_VARIABLE DEBUG_LEVEL + extern ULONG DEBUG_VARIABLE; #endif + #else + #define DEBUG_VARIABLE DEBUG_LEVEL + #endif #endif - #define _DbgPrintFEx(component, lvl, strings) \ - { \ - if ((lvl) <= DEBUG_VARIABLE)\ - {\ - DbgPrintEx(component, lvl, STR_MODULENAME);\ - DbgPrintEx(component, lvl, strings);\ - DbgPrintEx(component, lvl, "\n");\ - if ((lvl) == DEBUGLVL_ERROR)\ - {\ - DbgBreakPoint();\ - } \ - } \ - } - - #define _DbgPrintF(lvl, strings)\ - { \ - if (((lvl)==DEBUG_VARIABLE) || (lvl < DEBUG_VARIABLE))\ - {\ - DbgPrint(STR_MODULENAME);\ - DbgPrint##strings;\ - DbgPrint("\n");\ - if ((lvl) == DEBUGLVL_ERROR)\ - {\ - DbgBreakPoint();\ +#if (NTDDI_VERSION >= NTDDI_WINXP) + #define _DbgPrintFEx(component, lvl, strings) { \ + if ((lvl) <= DEBUG_VARIABLE) { \ + DbgPrintEx(component, lvl, STR_MODULENAME); \ + DbgPrintEx(component, lvl, strings); \ + DbgPrintEx(component, lvl, "\n"); \ + if ((lvl) == DEBUGLVL_ERROR) { \ + DbgBreakPoint(); \ } \ } \ - } + } +#endif /* (NTDDI_VERSION >= NTDDI_WINXP) */ + + #define _DbgPrintF(lvl, strings) { \ + if (((lvl)==DEBUG_VARIABLE) || (lvl < DEBUG_VARIABLE)) { \ + DbgPrint(STR_MODULENAME); \ + DbgPrint##strings; \ + DbgPrint("\n"); \ + if ((lvl) == DEBUGLVL_ERROR) { \ + DbgBreakPoint(); \ + } \ + } \ + } + #else - #define _DbgPrintF(lvl, strings) - #define _DbgPrintFEx(component, lvl, strings) -#endif + +#define _DbgPrintF(lvl, strings) + +#if (NTDDI_VERSION >= NTDDI_WINXP) +#define _DbgPrintFEx(component, lvl, strings) #endif +#endif /* DBG */ + +#endif /* defined(_NTDDK_) */ #if defined(__cplusplus) } #endif -#endif + +#endif /* _KSDEBUG_ */

14 years, 8 months

[gedmurphy] 46893: Fix the make path. Should fix building using the RosBuild config in Visual Studio

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri Apr 16 12:48:02 2010 New Revision: 46893 URL: http://svn.reactos.org/svn/reactos?rev=46893&view=rev Log: Fix the make path. Should fix building using the RosBuild config in Visual Studio Modified: trunk/reactos/rosbuild.bat Modified: trunk/reactos/rosbuild.bat URL: http://svn.reactos.org/svn/reactos/trunk/reactos/rosbuild.bat?rev=46893&r1=… ============================================================================== --- trunk/reactos/rosbuild.bat [iso-8859-1] (original) +++ trunk/reactos/rosbuild.bat [iso-8859-1] Fri Apr 16 12:48:02 2010 @@ -41,7 +41,7 @@ ::echo RosBE insall path = %_ROSBE_FULL_PATH_% :: Set the path which contains our build tools -set _ROSBE_BIN_PATH=%_ROSBE_FULL_PATH_%i386\bin +set _ROSBE_BIN_PATH=%_ROSBE_FULL_PATH_%Tools :: Add the path to the search path path=%path%;%_ROSBE_BIN_PATH%

14 years, 8 months

[jgardou] 46892: revert the DC list stuff, it's not worth it (tm). Things will be done differently

by jgardou＠svn.reactos.org

Author: jgardou Date: Fri Apr 16 11:49:05 2010 New Revision: 46892 URL: http://svn.reactos.org/svn/reactos?rev=46892&view=rev Log: revert the DC list stuff, it's not worth it (tm). Things will be done differently Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Fri Apr 16 11:49:05 2010 @@ -117,8 +117,8 @@ { if (dctype == DCTYPE_DIRECT) { - /* Lock ppdev exclusively */ - EngAcquireSemaphore(ppdev->hsemDevLock); + /* Lock ppdev */ + EngAcquireSemaphoreShared(ppdev->hsemDevLock); } /* Setup some basic fields */ @@ -159,54 +159,8 @@ if (dctype == DCTYPE_DIRECT) { - PDC pdcTmp; /* Direct DCs get the surface from the PDEV */ pdc->dclevel.pSurface = PDEVOBJ_pSurface(ppdev); - - /* Maintain a list of DC attached to this device */ - /* We must sort them so when locking them one after the other we don't risk deadlocks */ - /* The greatest the first, as in GDIOBJ_LockMultiplObjs */ - if((ULONG_PTR)pdc->dclevel.pSurface->hDC < (ULONG_PTR)pdc->BaseObject.hHmgr) - { - /* Insert it at the head of the list */ - pdc->hdcNext = pdc->dclevel.pSurface->hDC ; - pdc->dclevel.pSurface->hDC = pdc->BaseObject.hHmgr ; - pdcTmp = DC_LockDc(pdc->hdcNext); - if(pdcTmp) - { - pdcTmp->hdcPrev = pdc->BaseObject.hHmgr ; - DC_UnlockDc(pdcTmp); - } - } - else - { - HDC hdcTmp = pdc->dclevel.pSurface->hDC; - HDC hdcNext = NULL ; - HDC hdcPrev = NULL ; - /* Find its place */ - while((ULONG_PTR)hdcTmp > (ULONG_PTR)pdc->BaseObject.hHmgr) - { - pdcTmp = DC_LockDc(hdcTmp); - hdcNext = hdcTmp ; - hdcPrev = pdcTmp->hdcPrev ; - hdcTmp = pdcTmp->hdcNext ; - DC_UnlockDc(pdcTmp); - } - pdc->hdcPrev = hdcPrev; - pdc->hdcNext = hdcNext; - /* Insert it */ - pdcTmp = DC_LockDc(hdcPrev); - ASSERT(pdcTmp) ; /* There should always be a previous */ - pdcTmp->hdcNext = pdc->BaseObject.hHmgr ; - DC_UnlockDc(pdcTmp) ; - - pdcTmp = DC_LockDc(hdcNext); - if(pdcTmp) /* Last one is NULL */ - { - pdcTmp->hdcPrev = pdc->BaseObject.hHmgr; - DC_UnlockDc(pdcTmp); - } - } pdc->erclBounds.left = 0x7fffffff; pdc->erclBounds.top = 0x7fffffff; @@ -370,6 +324,8 @@ // pdc->dclevel.pFont = LFONT_ShareLockFont(pdc->dcattr.hlfntNew); /* Other stuff */ + pdc->hdcNext = NULL; + pdc->hdcPrev = NULL; pdc->ipfdDevMax = 0x0000ffff; pdc->ulCopyCount = -1; pdc->ptlDoBanding.x = 0; @@ -419,34 +375,9 @@ PATH_Delete(pdc->dclevel.hPath); - if(pdc->dctype == DCTYPE_DIRECT) - { - EngAcquireSemaphore(pdc->ppdev->hsemDevLock); - /* Remove it from the list of DC attached to the Device */ - PDC tmpDC = DC_LockDc(pdc->hdcNext); - if(tmpDC != NULL) - { - tmpDC->hdcPrev = pdc->hdcPrev ; - DC_UnlockDc(tmpDC); - } - tmpDC = DC_LockDc(pdc->hdcPrev); - if(tmpDC != NULL) - { - tmpDC->hdcNext = pdc->hdcNext ; - DC_UnlockDc(tmpDC); - } - /* Reassign list head if needed */ - if(pdc->BaseObject.hHmgr == pdc->dclevel.pSurface->hDC) - { - /* Sanity check */ - ASSERT(pdc->hdcPrev == NULL); - pdc->dclevel.pSurface->hDC = pdc->hdcNext; - } - EngReleaseSemaphore(pdc->ppdev->hsemDevLock) ; - } - if(pdc->dclevel.pSurface) SURFACE_ShareUnlockSurface(pdc->dclevel.pSurface); + PDEVOBJ_vRelease(pdc->ppdev) ; return TRUE;

14 years, 8 months

[jgardou] 46891: [WIN32K] - Introduce deadlocks killer GDIOBJ_LockMultipleObjs, unused for now - Make the PDEVOBJ DCs list a sorted list Didicated to Physicus

by jgardou＠svn.reactos.org

Author: jgardou Date: Fri Apr 16 00:38:04 2010 New Revision: 46891 URL: http://svn.reactos.org/svn/reactos?rev=46891&view=rev Log: [WIN32K] - Introduce deadlocks killer GDIOBJ_LockMultipleObjs, unused for now - Make the PDEVOBJ DCs list a sorted list Didicated to Physicus Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/gdiobj.h branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c branches/reactos-yarotows/subsystems/win32/win32k/objects/gdiobj.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/gdiobj.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] Fri Apr 16 00:38:04 2010 @@ -34,6 +34,7 @@ typedef PVOID PGDIOBJ; typedef BOOL (INTERNAL_CALL *GDICLEANUPPROC)(PVOID ObjectBody); +typedef VOID (INTERNAL_CALL *GDILOCKOBJPROC)(PVOID ObjectBody); /* Every GDI Object must have this standard type of header. * It's for thread locking. */ @@ -71,6 +72,7 @@ BOOL INTERNAL_CALL GDIOBJ_FreeObjByHandle (HGDIOBJ hObj, DWORD ObjectType); PGDIOBJ INTERNAL_CALL GDIOBJ_LockObj (HGDIOBJ hObj, DWORD ObjectType); PGDIOBJ INTERNAL_CALL GDIOBJ_ShareLockObj (HGDIOBJ hObj, DWORD ObjectType); +VOID INTERNAL_CALL GDIOBJ_LockMultipleObjs(ULONG ulCount, IN HGDIOBJ* ahObj, OUT PGDIOBJ* apObj); PVOID INTERNAL_CALL GDI_MapHandleTable(PSECTION_OBJECT SectionObject, PEPROCESS Process); @@ -87,7 +89,7 @@ BOOL FASTCALL IntGdiSetRegionOwner(HRGN,DWORD); /*! - * Release GDI object. Every object locked by GDIOBJ_LockObj() must be unlocked. + * Release GDI object. Every object locked by GDIOBJ_LockObj() must be unlocked. * You should unlock the object * as soon as you don't need to have access to it's data. Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Fri Apr 16 00:38:04 2010 @@ -159,30 +159,52 @@ if (dctype == DCTYPE_DIRECT) { + PDC pdcTmp; /* Direct DCs get the surface from the PDEV */ pdc->dclevel.pSurface = PDEVOBJ_pSurface(ppdev); /* Maintain a list of DC attached to this device */ - if(!pdc->dclevel.pSurface->hDC) + /* We must sort them so when locking them one after the other we don't risk deadlocks */ + /* The greatest the first, as in GDIOBJ_LockMultiplObjs */ + if((ULONG_PTR)pdc->dclevel.pSurface->hDC < (ULONG_PTR)pdc->BaseObject.hHmgr) + { + /* Insert it at the head of the list */ + pdc->hdcNext = pdc->dclevel.pSurface->hDC ; pdc->dclevel.pSurface->hDC = pdc->BaseObject.hHmgr ; + pdcTmp = DC_LockDc(pdc->hdcNext); + if(pdcTmp) + { + pdcTmp->hdcPrev = pdc->BaseObject.hHmgr ; + DC_UnlockDc(pdcTmp); + } + } else { - PDC Surf_Dc = DC_LockDc(pdc->dclevel.pSurface->hDC); - if(!Surf_Dc) + HDC hdcTmp = pdc->dclevel.pSurface->hDC; + HDC hdcNext = NULL ; + HDC hdcPrev = NULL ; + /* Find its place */ + while((ULONG_PTR)hdcTmp > (ULONG_PTR)pdc->BaseObject.hHmgr) { - DPRINT1("Something went wrong with device DC list!\n"); - /* Save what can be saved ... */ - pdc->dclevel.pSurface->hDC = pdc->BaseObject.hHmgr; + pdcTmp = DC_LockDc(hdcTmp); + hdcNext = hdcTmp ; + hdcPrev = pdcTmp->hdcPrev ; + hdcTmp = pdcTmp->hdcNext ; + DC_UnlockDc(pdcTmp); } - else + pdc->hdcPrev = hdcPrev; + pdc->hdcNext = hdcNext; + /* Insert it */ + pdcTmp = DC_LockDc(hdcPrev); + ASSERT(pdcTmp) ; /* There should always be a previous */ + pdcTmp->hdcNext = pdc->BaseObject.hHmgr ; + DC_UnlockDc(pdcTmp) ; + + pdcTmp = DC_LockDc(hdcNext); + if(pdcTmp) /* Last one is NULL */ { - /* Insert this one at the head of the list */ - pdc->hdcNext = Surf_Dc->BaseObject.hHmgr; - /* Sanity check */ - ASSERT(NULL == Surf_Dc->hdcPrev); - Surf_Dc->hdcPrev = pdc->BaseObject.hHmgr ; - pdc->dclevel.pSurface->hDC = pdc->BaseObject.hHmgr; - DC_UnlockDc(Surf_Dc); + pdcTmp->hdcPrev = pdc->BaseObject.hHmgr; + DC_UnlockDc(pdcTmp); } } Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Fri Apr 16 00:38:04 2010 @@ -1625,6 +1625,40 @@ return MappedView; } +/* Locks multiple objects at a time */ +VOID +INTERNAL_CALL +GDIOBJ_LockMultipleObjs(ULONG ulCount, + IN HGDIOBJ* ahObj, + OUT PGDIOBJ* apObj) +{ + UINT i; + HGDIOBJ hTmp ; + BOOL unsorted = TRUE; + /* We bubble-sort them */ + while(unsorted) + { + unsorted = FALSE ; + for(i=0; i<ulCount - 1; i++) + { + /* The greatest the first */ + if((ULONG_PTR)ahObj[i] < (ULONG_PTR)ahObj[i+1]) + { + hTmp = ahObj[i]; + ahObj[i]=ahObj[i+1]; + ahObj[i+1] = hTmp; + unsorted = TRUE ; + } + } + } + /* Then we lock them */ + for(i=0; i<ulCount; i++) + { + apObj[i]=GDIOBJ_LockObj(ahObj[i], GDI_OBJECT_TYPE_DONTCARE); + } +} + + /** PUBLIC FUNCTIONS **********************************************************/ BOOL

14 years, 8 months

[akhaldi] 46890: [DDK] - Move kcom.h to PSDK and apply a consistent formatting.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Apr 16 00:28:50 2010 New Revision: 46890 URL: http://svn.reactos.org/svn/reactos?rev=46890&view=rev Log: [DDK] - Move kcom.h to PSDK and apply a consistent formatting. Added: branches/header-work/include/psdk/kcom.h - copied, changed from r46874, branches/header-work/include/ddk/kcom.h Removed: branches/header-work/include/ddk/kcom.h Removed: branches/header-work/include/ddk/kcom.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/kcom.h?… ============================================================================== --- branches/header-work/include/ddk/kcom.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/kcom.h (removed) @@ -1,259 +1,0 @@ -#if !defined(_KS_) -#error KS.H must be included before KCOM.H -#endif - -#if !defined(_KCOM_) -#define _KCOM_ - -#if defined(__cplusplus) -extern "C" { -#endif - -#define STATIC_KoCreateObject 0x72CF721CL, 0x525A, 0x11D1, 0x9A, 0xA1, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 -DEFINE_GUIDSTRUCT("72CF721C-525A-11D1-9AA1-00A0C9223196", KoCreateObject); -#define KOSTRING_CreateObject L"{72CF721C-525A-11D1-9AA1-00A0C9223196}" - -#ifndef CLSCTX_KERNEL_SERVER -#define CLSCTX_KERNEL_SERVER 0x00000200 -#endif - -#if !defined(__cplusplus) || _MSC_VER < 1100 -#define STATIC_IID_IKoInitializeParentDeviceObject 0x21B36996, 0x8DE3, 0x11D1, 0x8A, 0xE0, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 -DEFINE_GUIDEX(IID_IKoInitializeParentDeviceObject); -#else -interface __declspec(uuid("21B36996-8DE3-11D1-8AE0-00A0C9223196")) IKoInitializeParentDeviceObject; -#endif - -#ifndef COMDDKMETHOD -#ifdef _COMDDK_ -#define COMDDKMETHOD -#else -#define COMDDKMETHOD DECLSPEC_IMPORT -#endif -#endif - -#ifdef _COMDDK_ -#define COMDDKAPI -#else -#define COMDDKAPI DECLSPEC_IMPORT -#endif - -typedef -NTSTATUS -(*KoCreateObjectHandler)( IN REFCLSID ClassId, - IN IUnknown* UnkOuter OPTIONAL, - IN REFIID InterfaceId, - OUT PVOID* Interface); - -#undef INTERFACE -#define INTERFACE INonDelegatedUnknown -DECLARE_INTERFACE(INonDelegatedUnknown) -{ - STDMETHOD(NonDelegatedQueryInterface) - ( - THIS_ - IN REFIID InterfaceId, - OUT PVOID* Interface - ) PURE; - - STDMETHOD_(ULONG,NonDelegatedAddRef) - ( - THIS - ) PURE; - - STDMETHOD_(ULONG,NonDelegatedRelease) - ( - THIS - ) PURE; -}; - -#undef INTERFACE -#define INTERFACE IIndirectedUnknown -DECLARE_INTERFACE(IIndirectedUnknown) -{ - STDMETHOD(IndirectedQueryInterface) - ( - THIS_ - IN REFIID InterfaceId, - OUT PVOID* Interface - ) PURE; - - STDMETHOD_(ULONG,IndirectedAddRef) - ( - THIS - ) PURE; - - STDMETHOD_(ULONG,IndirectedRelease) - ( - THIS - ) PURE; -}; - - -#undef INTERFACE -#define INTERFACE IKoInitializeParentDeviceObject -DECLARE_INTERFACE_(IKoInitializeParentDeviceObject, IUnknown) -{ - STDMETHOD(SetParentDeviceObject) - ( - THIS_ - IN PDEVICE_OBJECT ParentDeviceObject - ) PURE; -}; - - - -#if defined(__cplusplus) - - -class CBaseUnknown : public INonDelegatedUnknown, public IIndirectedUnknown -{ - protected: - LONG m_RefCount; - private: - BOOLEAN m_UsingClassId; - CLSID m_ClassId; - protected: - IUnknown* m_UnknownOuter; - public: - COMDDKMETHOD CBaseUnknown (IN REFCLSID ClassId, IN IUnknown* UnknownOuter OPTIONAL = NULL); - COMDDKMETHOD CBaseUnknown(IN IUnknown* UnknownOuter OPTIONAL = NULL); - COMDDKMETHOD virtual ~CBaseUnknown(); - COMDDKMETHOD STDMETHODIMP_(ULONG) NonDelegatedAddRef(); - COMDDKMETHOD STDMETHODIMP_(ULONG) NonDelegatedRelease(); - COMDDKMETHOD STDMETHODIMP NonDelegatedQueryInterface(IN REFIID InterfaceId,OUT PVOID* Interface); - COMDDKMETHOD STDMETHODIMP_(ULONG) IndirectedAddRef(); - COMDDKMETHOD STDMETHODIMP_(ULONG) IndirectedRelease(); - COMDDKMETHOD STDMETHODIMP IndirectedQueryInterface(IN REFIID InterfaceId, OUT PVOID* Interface); -}; - - -#if !defined(DEFINE_ABSTRACT_UNKNOWN) - -#define DEFINE_ABSTRACT_UNKNOWN() \ - STDMETHOD(QueryInterface)(THIS_ REFIID InterfaceId, PVOID* Interface) PURE; \ - STDMETHOD_(ULONG,AddRef)(THIS) PURE; \ - STDMETHOD_(ULONG,Release)(THIS) PURE; - -#endif - -#define DEFINE_STD_UNKNOWN() \ - STDMETHODIMP NonDelegatedQueryInterface( REFIID InterfaceId, PVOID* Interface); \ - STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); \ - STDMETHODIMP_(ULONG) AddRef(); \ - STDMETHODIMP_(ULONG) Release(); - -#define IMPLEMENT_STD_UNKNOWN(Class) \ - STDMETHODIMP Class::QueryInterface( REFIID InterfaceId, PVOID* Interface) \ - { \ - return m_UnknownOuter->QueryInterface(InterfaceId, Interface);\ - } \ - STDMETHODIMP_(ULONG) Class::AddRef() \ - { \ - return m_UnknownOuter->AddRef(); \ - } \ - STDMETHODIMP_(ULONG) Class::Release() \ - { \ - return m_UnknownOuter->Release(); \ - } -#else - -COMDDKAPI -void -NTAPI -KoRelease( IN REFCLSID ClassId); -#endif // !__cplusplus - -COMDDKAPI -NTSTATUS -NTAPI -KoCreateInstance( IN REFCLSID ClassId, - IN IUnknown* UnkOuter OPTIONAL, - IN ULONG ClsContext, - IN REFIID InterfaceId, - OUT PVOID* Interface); - -COMDDKAPI -NTSTATUS -NTAPI -KoDeviceInitialize( IN PDEVICE_OBJECT DeviceObject); - -COMDDKAPI -NTSTATUS -NTAPI -KoDriverInitialize( IN PDRIVER_OBJECT DriverObject, - IN PUNICODE_STRING RegistryPathName, - IN KoCreateObjectHandler CreateObjectHandler); - - -#if defined(__cplusplus) -} -#endif - -#ifdef __cplusplus - -#ifndef _NEW_DELETE_OPERATORS_ -#define _NEW_DELETE_OPERATORS_ - -inline PVOID operator new -( - size_t iSize, - POOL_TYPE poolType -) -{ - PVOID result = ExAllocatePoolWithTag(poolType,iSize,'wNCK'); - if (result) - { - RtlZeroMemory(result,iSize); - } - return result; -} - -inline PVOID operator new -( - size_t iSize, - POOL_TYPE poolType, - ULONG tag -) -{ - PVOID result = ExAllocatePoolWithTag(poolType,iSize,tag); - if (result) - { - RtlZeroMemory(result,iSize); - } - return result; -} - -inline void __cdecl operator delete -( - PVOID pVoid -) -{ - ExFreePool(pVoid); -} - -#endif - -#if defined(_SYS_GUID_OPERATOR_EQ_) -#define _GUID_OPERATORS_ -//#pragma message("WARNING: Using system operator==/!= for GUIDs") -#endif - -#ifndef _GUID_OPERATORS_ -#define _GUID_OPERATORS_ - -__inline BOOL operator==(const GUID& guidOne, const GUID& guidOther) -{ - return IsEqualGUIDAligned(guidOne,guidOther); -} -__inline BOOL operator!=(const GUID& guidOne, const GUID& guidOther) -{ - return !(guidOne == guidOther); -} - -#endif - -#endif - -#endif - Copied: branches/header-work/include/psdk/kcom.h (from r46874, branches/header-work/include/ddk/kcom.h) URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/kcom.h… ============================================================================== --- branches/header-work/include/ddk/kcom.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/kcom.h [iso-8859-1] Fri Apr 16 00:28:50 2010 @@ -18,10 +18,14 @@ #endif #if !defined(__cplusplus) || _MSC_VER < 1100 + #define STATIC_IID_IKoInitializeParentDeviceObject 0x21B36996, 0x8DE3, 0x11D1, 0x8A, 0xE0, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 DEFINE_GUIDEX(IID_IKoInitializeParentDeviceObject); -#else + +#else + interface __declspec(uuid("21B36996-8DE3-11D1-8AE0-00A0C9223196")) IKoInitializeParentDeviceObject; + #endif #ifndef COMDDKMETHOD @@ -40,101 +44,84 @@ typedef NTSTATUS -(*KoCreateObjectHandler)( IN REFCLSID ClassId, - IN IUnknown* UnkOuter OPTIONAL, - IN REFIID InterfaceId, - OUT PVOID* Interface); +(*KoCreateObjectHandler)( + IN REFCLSID ClassId, + IN IUnknown* UnkOuter OPTIONAL, + IN REFIID InterfaceId, + OUT PVOID* Interface); #undef INTERFACE #define INTERFACE INonDelegatedUnknown -DECLARE_INTERFACE(INonDelegatedUnknown) -{ - STDMETHOD(NonDelegatedQueryInterface) - ( +DECLARE_INTERFACE(INonDelegatedUnknown) { + STDMETHOD(NonDelegatedQueryInterface)( THIS_ IN REFIID InterfaceId, OUT PVOID* Interface ) PURE; - STDMETHOD_(ULONG,NonDelegatedAddRef) - ( - THIS - ) PURE; - - STDMETHOD_(ULONG,NonDelegatedRelease) - ( + STDMETHOD_(ULONG,NonDelegatedAddRef)( + THIS + ) PURE; + + STDMETHOD_(ULONG,NonDelegatedRelease)( THIS ) PURE; }; #undef INTERFACE #define INTERFACE IIndirectedUnknown -DECLARE_INTERFACE(IIndirectedUnknown) -{ - STDMETHOD(IndirectedQueryInterface) - ( +DECLARE_INTERFACE(IIndirectedUnknown) { + STDMETHOD(IndirectedQueryInterface)( THIS_ IN REFIID InterfaceId, OUT PVOID* Interface ) PURE; - STDMETHOD_(ULONG,IndirectedAddRef) - ( - THIS - ) PURE; - - STDMETHOD_(ULONG,IndirectedRelease) - ( - THIS - ) PURE; -}; - + STDMETHOD_(ULONG,IndirectedAddRef)( + THIS + ) PURE; + + STDMETHOD_(ULONG,IndirectedRelease)( + THIS + ) PURE; +}; #undef INTERFACE #define INTERFACE IKoInitializeParentDeviceObject -DECLARE_INTERFACE_(IKoInitializeParentDeviceObject, IUnknown) -{ - STDMETHOD(SetParentDeviceObject) - ( +DECLARE_INTERFACE_(IKoInitializeParentDeviceObject, IUnknown) { + STDMETHOD(SetParentDeviceObject)( THIS_ IN PDEVICE_OBJECT ParentDeviceObject ) PURE; }; - - #if defined(__cplusplus) - -class CBaseUnknown : public INonDelegatedUnknown, public IIndirectedUnknown -{ - protected: - LONG m_RefCount; - private: - BOOLEAN m_UsingClassId; - CLSID m_ClassId; - protected: - IUnknown* m_UnknownOuter; - public: - COMDDKMETHOD CBaseUnknown (IN REFCLSID ClassId, IN IUnknown* UnknownOuter OPTIONAL = NULL); - COMDDKMETHOD CBaseUnknown(IN IUnknown* UnknownOuter OPTIONAL = NULL); - COMDDKMETHOD virtual ~CBaseUnknown(); - COMDDKMETHOD STDMETHODIMP_(ULONG) NonDelegatedAddRef(); - COMDDKMETHOD STDMETHODIMP_(ULONG) NonDelegatedRelease(); - COMDDKMETHOD STDMETHODIMP NonDelegatedQueryInterface(IN REFIID InterfaceId,OUT PVOID* Interface); - COMDDKMETHOD STDMETHODIMP_(ULONG) IndirectedAddRef(); - COMDDKMETHOD STDMETHODIMP_(ULONG) IndirectedRelease(); - COMDDKMETHOD STDMETHODIMP IndirectedQueryInterface(IN REFIID InterfaceId, OUT PVOID* Interface); -}; - +class CBaseUnknown : public INonDelegatedUnknown, public IIndirectedUnknown { + protected: + LONG m_RefCount; + private: + BOOLEAN m_UsingClassId; + CLSID m_ClassId; + protected: + IUnknown* m_UnknownOuter; + public: + COMDDKMETHOD CBaseUnknown (IN REFCLSID ClassId, IN IUnknown* UnknownOuter OPTIONAL = NULL); + COMDDKMETHOD CBaseUnknown(IN IUnknown* UnknownOuter OPTIONAL = NULL); + COMDDKMETHOD virtual ~CBaseUnknown(); + COMDDKMETHOD STDMETHODIMP_(ULONG) NonDelegatedAddRef(); + COMDDKMETHOD STDMETHODIMP_(ULONG) NonDelegatedRelease(); + COMDDKMETHOD STDMETHODIMP NonDelegatedQueryInterface(IN REFIID InterfaceId,OUT PVOID* Interface); + COMDDKMETHOD STDMETHODIMP_(ULONG) IndirectedAddRef(); + COMDDKMETHOD STDMETHODIMP_(ULONG) IndirectedRelease(); + COMDDKMETHOD STDMETHODIMP IndirectedQueryInterface(IN REFIID InterfaceId, OUT PVOID* Interface); +}; #if !defined(DEFINE_ABSTRACT_UNKNOWN) - #define DEFINE_ABSTRACT_UNKNOWN() \ STDMETHOD(QueryInterface)(THIS_ REFIID InterfaceId, PVOID* Interface) PURE; \ STDMETHOD_(ULONG,AddRef)(THIS) PURE; \ STDMETHOD_(ULONG,Release)(THIS) PURE; - #endif #define DEFINE_STD_UNKNOWN() \ @@ -144,46 +131,49 @@ STDMETHODIMP_(ULONG) Release(); #define IMPLEMENT_STD_UNKNOWN(Class) \ - STDMETHODIMP Class::QueryInterface( REFIID InterfaceId, PVOID* Interface) \ - { \ + STDMETHODIMP Class::QueryInterface( REFIID InterfaceId, PVOID* Interface) { \ return m_UnknownOuter->QueryInterface(InterfaceId, Interface);\ } \ - STDMETHODIMP_(ULONG) Class::AddRef() \ - { \ + STDMETHODIMP_(ULONG) Class::AddRef() { \ return m_UnknownOuter->AddRef(); \ } \ - STDMETHODIMP_(ULONG) Class::Release() \ - { \ + STDMETHODIMP_(ULONG) Class::Release() { \ return m_UnknownOuter->Release(); \ } + #else COMDDKAPI void NTAPI -KoRelease( IN REFCLSID ClassId); -#endif // !__cplusplus - -COMDDKAPI -NTSTATUS -NTAPI -KoCreateInstance( IN REFCLSID ClassId, - IN IUnknown* UnkOuter OPTIONAL, - IN ULONG ClsContext, - IN REFIID InterfaceId, - OUT PVOID* Interface); - -COMDDKAPI -NTSTATUS -NTAPI -KoDeviceInitialize( IN PDEVICE_OBJECT DeviceObject); - -COMDDKAPI -NTSTATUS -NTAPI -KoDriverInitialize( IN PDRIVER_OBJECT DriverObject, - IN PUNICODE_STRING RegistryPathName, - IN KoCreateObjectHandler CreateObjectHandler); +KoRelease( + IN REFCLSID ClassId); + +#endif /* !__cplusplus */ + +COMDDKAPI +NTSTATUS +NTAPI +KoCreateInstance( + IN REFCLSID ClassId, + IN IUnknown* UnkOuter OPTIONAL, + IN ULONG ClsContext, + IN REFIID InterfaceId, + OUT PVOID* Interface); + +COMDDKAPI +NTSTATUS +NTAPI +KoDeviceInitialize( + IN PDEVICE_OBJECT DeviceObject); + +COMDDKAPI +NTSTATUS +NTAPI +KoDriverInitialize( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPathName, + IN KoCreateObjectHandler CreateObjectHandler); #if defined(__cplusplus) @@ -195,44 +185,36 @@ #ifndef _NEW_DELETE_OPERATORS_ #define _NEW_DELETE_OPERATORS_ -inline PVOID operator new -( +inline PVOID operator new( size_t iSize, - POOL_TYPE poolType -) + POOL_TYPE poolType) { PVOID result = ExAllocatePoolWithTag(poolType,iSize,'wNCK'); - if (result) - { + if (result) { RtlZeroMemory(result,iSize); } return result; } -inline PVOID operator new -( - size_t iSize, - POOL_TYPE poolType, - ULONG tag -) +inline PVOID operator new( + size_t iSize, + POOL_TYPE poolType, + ULONG tag) { PVOID result = ExAllocatePoolWithTag(poolType,iSize,tag); - if (result) - { + if (result) { RtlZeroMemory(result,iSize); } return result; } -inline void __cdecl operator delete -( - PVOID pVoid -) +inline void __cdecl operator delete( + PVOID pVoid) { - ExFreePool(pVoid); -} - -#endif + if (pVoid) ExFreePool(pVoid); +} + +#endif /* _NEW_DELETE_OPERATORS_ */ #if defined(_SYS_GUID_OPERATOR_EQ_) #define _GUID_OPERATORS_ @@ -242,18 +224,16 @@ #ifndef _GUID_OPERATORS_ #define _GUID_OPERATORS_ -__inline BOOL operator==(const GUID& guidOne, const GUID& guidOther) -{ +__inline BOOL operator==(const GUID& guidOne, const GUID& guidOther) { return IsEqualGUIDAligned(guidOne,guidOther); } -__inline BOOL operator!=(const GUID& guidOne, const GUID& guidOther) -{ + +__inline BOOL operator!=(const GUID& guidOne, const GUID& guidOther) { return !(guidOne == guidOther); } -#endif - -#endif - -#endif - +#endif /* _GUID_OPERATORS_ */ + +#endif /* __cplusplus */ + +#endif /* _KCOM_ */

14 years, 8 months

[akhaldi] 46889: [DDK] - d4drvif.h : Introduce pragma once, apply a consistent formatting, group related definitions and add several missing ones. - d4iface.h : Introduce pragma once, apply a consistent formatting and group related definitions. - dderror.h : Introduce pragma once and apply a consistent formatting. - dxapi.h : Apply consistent formatting. - fltsafe.h : Guard FLOATSAFE inside the proper NTDDI_VERSION and apply a consistent formatting. - kbdmou.h : Introduce pragma once, apply a co

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Apr 15 23:56:39 2010 New Revision: 46889 URL: http://svn.reactos.org/svn/reactos?rev=46889&view=rev Log: [DDK] - d4drvif.h : Introduce pragma once, apply a consistent formatting, group related definitions and add several missing ones. - d4iface.h : Introduce pragma once, apply a consistent formatting and group related definitions. - dderror.h : Introduce pragma once and apply a consistent formatting. - dxapi.h : Apply consistent formatting. - fltsafe.h : Guard FLOATSAFE inside the proper NTDDI_VERSION and apply a consistent formatting. - kbdmou.h : Introduce pragma once, apply a consistent formatting and add a missing wmidata.h inclusion. - ntddmou.h : Move to PSDK, introduce pragma once, apply a consistent formatting and add several missing definitions. [PSDK] - ntddkbd.h : Introduce pragma once, apply a consistent formatting and add several missing definitions. Added: branches/header-work/include/psdk/ntddmou.h - copied, changed from r46790, branches/header-work/include/ddk/ntddmou.h Removed: branches/header-work/include/ddk/ntddmou.h Modified: branches/header-work/include/ddk/d4drvif.h branches/header-work/include/ddk/d4iface.h branches/header-work/include/ddk/dderror.h branches/header-work/include/ddk/dxapi.h branches/header-work/include/ddk/fltsafe.h branches/header-work/include/ddk/kbdmou.h branches/header-work/include/psdk/ntddkbd.h Modified: branches/header-work/include/ddk/d4drvif.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/d4drvif… ============================================================================== --- branches/header-work/include/ddk/d4drvif.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/d4drvif.h [iso-8859-1] Thu Apr 15 23:56:39 2010 @@ -20,17 +20,34 @@ * */ -#ifndef __D4DRVIF_H -#define __D4DRVIF_H - -#include "d4iface.h" +#pragma once #ifdef __cplusplus extern "C" { #endif -#define FILE_DEVICE_DOT4 0x3a -#define IOCTL_DOT4_USER_BASE 2049 +#define MAX_SERVICE_LENGTH 40 + +#ifndef CTL_CODE + +#define CTL_CODE( DeviceType, Function, Method, Access ) ( \ + ((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method) \ +) + +#define METHOD_BUFFERED 0 +#define METHOD_IN_DIRECT 1 +#define METHOD_OUT_DIRECT 2 +#define METHOD_NEITHER 3 + +#define FILE_ANY_ACCESS 0 +#define FILE_READ_ACCESS 0x0001 +#define FILE_WRITE_ACCESS 0x0002 + +#endif /* CTL_CODE */ + +#define FILE_DEVICE_DOT4 0x3a +#define IOCTL_DOT4_USER_BASE 2049 +#define IOCTL_DOT4_LAST IOCTL_DOT4_USER_BASE + 9 #define IOCTL_DOT4_ADD_ACTIVITY_BROADCAST \ CTL_CODE(FILE_DEVICE_DOT4, IOCTL_DOT4_USER_BASE + 4, METHOD_BUFFERED, FILE_ANY_ACCESS) @@ -63,37 +80,33 @@ CTL_CODE(FILE_DEVICE_DOT4, IOCTL_DOT4_USER_BASE + 3, METHOD_IN_DIRECT, FILE_ANY_ACCESS) -#define MAX_SERVICE_LENGTH 40 - typedef struct _DOT4_DC_CREATE_DATA { - unsigned char bPsid; - CHAR pServiceName[MAX_SERVICE_LENGTH + 1]; - unsigned char bType; - ULONG ulBufferSize; - USHORT usMaxHtoPPacketSize; - USHORT usMaxPtoHPacketSize; + unsigned char bPsid; + CHAR pServiceName[MAX_SERVICE_LENGTH + 1]; + unsigned char bType; + ULONG ulBufferSize; + USHORT usMaxHtoPPacketSize; + USHORT usMaxPtoHPacketSize; unsigned char bHsid; } DOT4_DC_CREATE_DATA, *PDOT4_DC_CREATE_DATA; typedef struct _DOT4_DC_DESTROY_DATA { - unsigned char bHsid; + unsigned char bHsid; } DOT4_DC_DESTROY_DATA, *PDOT4_DC_DESTROY_DATA; typedef struct _DOT4_DC_OPEN_DATA { - unsigned char bHsid; - unsigned char fAddActivity; - CHANNEL_HANDLE hChannelHandle; + unsigned char bHsid; + unsigned char fAddActivity; + CHANNEL_HANDLE hChannelHandle; } DOT4_DC_OPEN_DATA, *PDOT4_DC_OPEN_DATA; typedef struct _DOT4_DRIVER_CMD { - CHANNEL_HANDLE hChannelHandle; - ULONG ulSize; - ULONG ulOffset; - ULONG ulTimeout; + CHANNEL_HANDLE hChannelHandle; + ULONG ulSize; + ULONG ulOffset; + ULONG ulTimeout; } DOT4_DRIVER_CMD, *PDOT4_DRIVER_CMD; #ifdef __cplusplus } #endif - -#endif /* __D4DRVIF_H */ Modified: branches/header-work/include/ddk/d4iface.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/d4iface… ============================================================================== --- branches/header-work/include/ddk/d4iface.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/d4iface.h [iso-8859-1] Thu Apr 15 23:56:39 2010 @@ -1,19 +1,8 @@ -#ifndef _DOT4_IFACE_H -#define _DOT4_IFACE_H +#pragma once #ifdef __cplusplus extern "C" { #endif - -typedef unsigned long CHANNEL_HANDLE; -typedef CHANNEL_HANDLE *PCHANNEL_HANDLE; - -typedef struct _DOT4_ACTIVITY -{ - ULONG ulMessage; - ULONG ulByteCount; - CHANNEL_HANDLE hChannel; -} DOT4_ACTIVITY, *PDOT4_ACTIVITY; #define DOT4_MAX_CHANNELS 128 #define NO_TIMEOUT 0 @@ -40,8 +29,14 @@ #define CONFIG_UPLOAD 14 #define CONFIG_DOWNLOAD 15 +typedef unsigned long CHANNEL_HANDLE, *PCHANNEL_HANDLE; + +typedef struct _DOT4_ACTIVITY { + ULONG ulMessage; + ULONG ulByteCount; + CHANNEL_HANDLE hChannel; +} DOT4_ACTIVITY, *PDOT4_ACTIVITY; + #ifdef __cplusplus } #endif -#endif - Modified: branches/header-work/include/ddk/dderror.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/dderror… ============================================================================== --- branches/header-work/include/ddk/dderror.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/dderror.h [iso-8859-1] Thu Apr 15 23:56:39 2010 @@ -1,20 +1,18 @@ +#pragma once -#ifndef _DDERROR_ -#define _DDERROR_ #define _WINERROR_ -#define NO_ERROR 0 -#define ERROR_INVALID_FUNCTION 1 -#define ERROR_NOT_ENOUGH_MEMORY 8 -#define ERROR_DEV_NOT_EXIST 55 -#define ERROR_INVALID_PARAMETER 87 -#define ERROR_INSUFFICIENT_BUFFER 122 -#define ERROR_INVALID_NAME 123 -#define ERROR_BUSY 170 -#define ERROR_MORE_DATA 234 -#define WAIT_TIMEOUT 258 -#define ERROR_IO_PENDING 997 -#define ERROR_DEVICE_REINITIALIZATION_NEEDED 1164 -#define ERROR_CONTINUE 1246 -#define ERROR_NO_MORE_DEVICES 1248 -#endif +#define NO_ERROR 0 +#define ERROR_INVALID_FUNCTION 1 +#define ERROR_NOT_ENOUGH_MEMORY 8 +#define ERROR_DEV_NOT_EXIST 55 +#define ERROR_INVALID_PARAMETER 87 +#define ERROR_INSUFFICIENT_BUFFER 122 +#define ERROR_INVALID_NAME 123 +#define ERROR_BUSY 170 +#define ERROR_MORE_DATA 234 +#define WAIT_TIMEOUT 258 +#define ERROR_IO_PENDING 997 +#define ERROR_DEVICE_REINITIALIZATION_NEEDED 1164 +#define ERROR_CONTINUE 1246 +#define ERROR_NO_MORE_DEVICES 1248 Modified: branches/header-work/include/ddk/dxapi.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/dxapi.h… ============================================================================== --- branches/header-work/include/ddk/dxapi.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/dxapi.h [iso-8859-1] Thu Apr 15 23:56:39 2010 @@ -1,4 +1,10 @@ +ULONG +DxApiGetVersion(); -ULONG DxApiGetVersion(); -ULONG DxApi( IN ULONG dwFunctionNum,IN PVOID lpvInBuffer, IN ULONG cbInBuffer, - IN PVOID lpvOutBuffer, IN ULONG cbOutBuffer); +ULONG +DxApi( + IN ULONG dwFunctionNum, + IN PVOID lpvInBuffer, + IN ULONG cbInBuffer, + IN PVOID lpvOutBuffer, + IN ULONG cbOutBuffer); Modified: branches/header-work/include/ddk/fltsafe.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/fltsafe… ============================================================================== --- branches/header-work/include/ddk/fltsafe.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/fltsafe.h [iso-8859-1] Thu Apr 15 23:56:39 2010 @@ -1,19 +1,14 @@ - -struct FLOATSAFE -{ - KFLOATING_SAVE FloatSave; - NTSTATUS ntStatus; - - FLOATSAFE::FLOATSAFE(void) - { - ntStatus = KeSaveFloatingPointState(&FloatSave); - } - - FLOATSAFE::~FLOATSAFE(void) - { - if (NT_SUCCESS(ntStatus)) - { - KeRestoreFloatingPointState(&FloatSave); - } - } +#if (NTDDI_VERSION >= NTDDI_WINXP) +struct FLOATSAFE { + KFLOATING_SAVE FloatSave; + NTSTATUS ntStatus; + FLOATSAFE::FLOATSAFE(void) { + ntStatus = KeSaveFloatingPointState(&FloatSave); + } + FLOATSAFE::~FLOATSAFE(void) { + if (NT_SUCCESS(ntStatus)) { + KeRestoreFloatingPointState(&FloatSave); + } + } }; +#endif Modified: branches/header-work/include/ddk/kbdmou.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/kbdmou.… ============================================================================== --- branches/header-work/include/ddk/kbdmou.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/kbdmou.h [iso-8859-1] Thu Apr 15 23:56:39 2010 @@ -20,8 +20,7 @@ * */ -#ifndef __KBDMOU_H -#define __KBDMOU_H +#pragma once #include <ntddkbd.h> #include <ntddmou.h> @@ -77,15 +76,15 @@ CTL_CODE(FILE_DEVICE_MOUSE, 0x0400, METHOD_NEITHER, FILE_ANY_ACCESS) typedef struct _CONNECT_DATA { - PDEVICE_OBJECT ClassDeviceObject; - PVOID ClassService; + PDEVICE_OBJECT ClassDeviceObject; + PVOID ClassService; } CONNECT_DATA, *PCONNECT_DATA; typedef VOID (STDAPICALLTYPE *PSERVICE_CALLBACK_ROUTINE)( - IN PVOID NormalContext, - IN PVOID SystemArgument1, - IN PVOID SystemArgument2, - IN OUT PVOID SystemArgument3); + IN PVOID NormalContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2, + IN OUT PVOID SystemArgument3); -#endif /* __KBDMOU_H */ +#include <wmidata.h> Removed: branches/header-work/include/ddk/ntddmou.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntddmou… ============================================================================== --- branches/header-work/include/ddk/ntddmou.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ntddmou.h (removed) @@ -1,109 +1,0 @@ -/* - * ntddmou.h - * - * Mouse device IOCTL interface. - * - * This file is part of the w32api package. - * - * Contributors: - * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - */ - -#ifndef __NTDDMOU_H -#define __NTDDMOU_H - -#ifdef __cplusplus -extern "C" { -#endif - -#define DD_MOUSE_DEVICE_NAME "\\Device\\PointerClass" -#define DD_MOUSE_DEVICE_NAME_U L"\\Device\\PointerClass" - -#define IOCTL_MOUSE_QUERY_ATTRIBUTES \ - CTL_CODE(FILE_DEVICE_MOUSE, 0, METHOD_BUFFERED, FILE_ANY_ACCESS) - -DEFINE_GUID(GUID_DEVINTERFACE_MOUSE, \ - 0x378de44c, 0x56ef, 0x11d1, 0xbc, 0x8c, 0x00, 0xa0, 0xc9, 0x14, 0x05, 0xdd); - -#define MOUSE_ERROR_VALUE_BASE 20000 - -/* MOUSE_INPUT_DATA.ButtonFlags constants */ -#define MOUSE_LEFT_BUTTON_DOWN 0x0001 -#define MOUSE_LEFT_BUTTON_UP 0x0002 -#define MOUSE_RIGHT_BUTTON_DOWN 0x0004 -#define MOUSE_RIGHT_BUTTON_UP 0x0008 -#define MOUSE_MIDDLE_BUTTON_DOWN 0x0010 -#define MOUSE_MIDDLE_BUTTON_UP 0x0020 -#define MOUSE_BUTTON_4_DOWN 0x0040 -#define MOUSE_BUTTON_4_UP 0x0080 -#define MOUSE_BUTTON_5_DOWN 0x0100 -#define MOUSE_BUTTON_5_UP 0x0200 -#define MOUSE_WHEEL 0x0400 - -#define MOUSE_BUTTON_1_DOWN MOUSE_LEFT_BUTTON_DOWN -#define MOUSE_BUTTON_1_UP MOUSE_LEFT_BUTTON_UP -#define MOUSE_BUTTON_2_DOWN MOUSE_RIGHT_BUTTON_DOWN -#define MOUSE_BUTTON_2_UP MOUSE_RIGHT_BUTTON_UP -#define MOUSE_BUTTON_3_DOWN MOUSE_MIDDLE_BUTTON_DOWN -#define MOUSE_BUTTON_3_UP MOUSE_MIDDLE_BUTTON_UP - -/* MOUSE_INPUT_DATA.Flags constants */ -#define MOUSE_MOVE_RELATIVE 0 -#define MOUSE_MOVE_ABSOLUTE 1 -#define MOUSE_VIRTUAL_DESKTOP 0x02 -#define MOUSE_ATTRIBUTES_CHANGED 0x04 - -typedef struct _MOUSE_INPUT_DATA { - USHORT UnitId; - USHORT Flags; - _ANONYMOUS_UNION union { - ULONG Buttons; - _ANONYMOUS_STRUCT struct { - USHORT ButtonFlags; - USHORT ButtonData; - } DUMMYSTRUCTNAME; - } DUMMYUNIONNAME; - ULONG RawButtons; - LONG LastX; - LONG LastY; - ULONG ExtraInformation; -} MOUSE_INPUT_DATA, *PMOUSE_INPUT_DATA; - -typedef struct _MOUSE_UNIT_ID_PARAMETER { - USHORT UnitId; -} MOUSE_UNIT_ID_PARAMETER, *PMOUSE_UNIT_ID_PARAMETER; - -/* MOUSE_ATTRIBUTES.MouseIdentifier constants */ -#define MOUSE_INPORT_HARDWARE 0x0001 -#define MOUSE_I8042_HARDWARE 0x0002 -#define MOUSE_SERIAL_HARDWARE 0x0004 -#define BALLPOINT_I8042_HARDWARE 0x0008 -#define BALLPOINT_SERIAL_HARDWARE 0x0010 -#define WHEELMOUSE_I8042_HARDWARE 0x0020 -#define WHEELMOUSE_SERIAL_HARDWARE 0x0040 -#define MOUSE_HID_HARDWARE 0x0080 -#define WHEELMOUSE_HID_HARDWARE 0x0100 - -typedef struct _MOUSE_ATTRIBUTES { - USHORT MouseIdentifier; - USHORT NumberOfButtons; - USHORT SampleRate; - ULONG InputDataQueueLength; -} MOUSE_ATTRIBUTES, *PMOUSE_ATTRIBUTES; - -#ifdef __cplusplus -} -#endif - -#endif /* __NTDDMOU_H */ Modified: branches/header-work/include/psdk/ntddkbd.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/ntddkb… ============================================================================== --- branches/header-work/include/psdk/ntddkbd.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/ntddkbd.h [iso-8859-1] Thu Apr 15 23:56:39 2010 @@ -20,8 +20,7 @@ * */ -#ifndef __NTDDKBD_H -#define __NTDDKBD_H +#pragma once #ifdef __cplusplus extern "C" { @@ -48,20 +47,33 @@ #define IOCTL_KEYBOARD_SET_INDICATORS \ CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0002, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_KEYBOARD_INSERT_DATA \ + CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0040, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_KEYBOARD_QUERY_IME_STATUS \ + CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0400, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_KEYBOARD_SET_IME_STATUS \ + CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0401, METHOD_BUFFERED, FILE_ANY_ACCESS) DEFINE_GUID(GUID_DEVINTERFACE_KEYBOARD, \ 0x884b96c3, 0x56ef, 0x11d1, 0xbc, 0x8c, 0x00, 0xa0, 0xc9, 0x14, 0x05, 0xdd); +#define GUID_CLASS_KEYBOARD GUID_DEVINTERFACE_KEYBOARD /* Obsolete */ + #define KEYBOARD_ERROR_VALUE_BASE 10000 /* KEYBOARD_INPUT_DATA.MakeCode constants */ -#define KEYBOARD_OVERRUN_MAKE_CODE 0xFF +#define KEYBOARD_OVERRUN_MAKE_CODE 0xFF /* KEYBOARD_INPUT_DATA.Flags constants */ -#define KEY_MAKE 0 -#define KEY_BREAK 1 -#define KEY_E0 2 -#define KEY_E1 4 +#define KEY_MAKE 0 +#define KEY_BREAK 1 +#define KEY_E0 2 +#define KEY_E1 4 +#define KEY_TERMSRV_SET_LED 8 +#define KEY_TERMSRV_SHADOW 0x10 +#define KEY_TERMSRV_VKPACKET 0x20 #define KEYBOARD_LED_INJECTED 0x8000 #define KEYBOARD_SHADOW 0x4000 @@ -71,66 +83,64 @@ #define KEYBOARD_SCROLL_LOCK_ON 1 typedef struct _KEYBOARD_INPUT_DATA { - USHORT UnitId; - USHORT MakeCode; - USHORT Flags; - USHORT Reserved; - ULONG ExtraInformation; + USHORT UnitId; + USHORT MakeCode; + USHORT Flags; + USHORT Reserved; + ULONG ExtraInformation; } KEYBOARD_INPUT_DATA, *PKEYBOARD_INPUT_DATA; typedef struct _KEYBOARD_TYPEMATIC_PARAMETERS { - USHORT UnitId; - USHORT Rate; - USHORT Delay; + USHORT UnitId; + USHORT Rate; + USHORT Delay; } KEYBOARD_TYPEMATIC_PARAMETERS, *PKEYBOARD_TYPEMATIC_PARAMETERS; typedef struct _KEYBOARD_ID { - UCHAR Type; - UCHAR Subtype; + UCHAR Type; + UCHAR Subtype; } KEYBOARD_ID, *PKEYBOARD_ID; #define ENHANCED_KEYBOARD(Id) ((Id).Type == 2 || (Id).Type == 4 || FAREAST_KEYBOARD(Id)) -#define FAREAST_KEYBOARD(Id) ((Id).Type == 7 || (Id).Type == 8) +#define FAREAST_KEYBOARD(Id) ((Id).Type == 7 || (Id).Type == 8) typedef struct _KEYBOARD_INDICATOR_PARAMETERS { - USHORT UnitId; - USHORT LedFlags; + USHORT UnitId; + USHORT LedFlags; } KEYBOARD_INDICATOR_PARAMETERS, *PKEYBOARD_INDICATOR_PARAMETERS; typedef struct _INDICATOR_LIST { - USHORT MakeCode; - USHORT IndicatorFlags; + USHORT MakeCode; + USHORT IndicatorFlags; } INDICATOR_LIST, *PINDICATOR_LIST; typedef struct _KEYBOARD_INDICATOR_TRANSLATION { - USHORT NumberOfIndicatorKeys; - INDICATOR_LIST IndicatorList[1]; + USHORT NumberOfIndicatorKeys; + INDICATOR_LIST IndicatorList[1]; } KEYBOARD_INDICATOR_TRANSLATION, *PKEYBOARD_INDICATOR_TRANSLATION; typedef struct _KEYBOARD_ATTRIBUTES { - KEYBOARD_ID KeyboardIdentifier; - USHORT KeyboardMode; - USHORT NumberOfFunctionKeys; - USHORT NumberOfIndicators; - USHORT NumberOfKeysTotal; - ULONG InputDataQueueLength; - KEYBOARD_TYPEMATIC_PARAMETERS KeyRepeatMinimum; - KEYBOARD_TYPEMATIC_PARAMETERS KeyRepeatMaximum; + KEYBOARD_ID KeyboardIdentifier; + USHORT KeyboardMode; + USHORT NumberOfFunctionKeys; + USHORT NumberOfIndicators; + USHORT NumberOfKeysTotal; + ULONG InputDataQueueLength; + KEYBOARD_TYPEMATIC_PARAMETERS KeyRepeatMinimum; + KEYBOARD_TYPEMATIC_PARAMETERS KeyRepeatMaximum; } KEYBOARD_ATTRIBUTES, *PKEYBOARD_ATTRIBUTES; typedef struct _KEYBOARD_UNIT_ID_PARAMETER { - USHORT UnitId; + USHORT UnitId; } KEYBOARD_UNIT_ID_PARAMETER, *PKEYBOARD_UNIT_ID_PARAMETER; typedef struct _KEYBOARD_IME_STATUS { - USHORT UnitId; - ULONG ImeOpen; - ULONG ImeConvMode; + USHORT UnitId; + ULONG ImeOpen; + ULONG ImeConvMode; } KEYBOARD_IME_STATUS, *PKEYBOARD_IME_STATUS; #ifdef __cplusplus } #endif - -#endif /* __NTDDKBD_H */ Copied: branches/header-work/include/psdk/ntddmou.h (from r46790, branches/header-work/include/ddk/ntddmou.h) URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/ntddmo… ============================================================================== --- branches/header-work/include/ddk/ntddmou.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/ntddmou.h [iso-8859-1] Thu Apr 15 23:56:39 2010 @@ -20,8 +20,7 @@ * */ -#ifndef __NTDDMOU_H -#define __NTDDMOU_H +#pragma once #ifdef __cplusplus extern "C" { @@ -33,8 +32,13 @@ #define IOCTL_MOUSE_QUERY_ATTRIBUTES \ CTL_CODE(FILE_DEVICE_MOUSE, 0, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_MOUSE_INSERT_DATA \ + CTL_CODE(FILE_DEVICE_MOUSE, 1, METHOD_BUFFERED, FILE_ANY_ACCESS) + DEFINE_GUID(GUID_DEVINTERFACE_MOUSE, \ 0x378de44c, 0x56ef, 0x11d1, 0xbc, 0x8c, 0x00, 0xa0, 0xc9, 0x14, 0x05, 0xdd); + +#define GUID_CLASS_MOUSE GUID_DEVINTERFACE_MOUSE /* Obsolete */ #define MOUSE_ERROR_VALUE_BASE 20000 @@ -50,6 +54,7 @@ #define MOUSE_BUTTON_5_DOWN 0x0100 #define MOUSE_BUTTON_5_UP 0x0200 #define MOUSE_WHEEL 0x0400 +#define MOUSE_HWHEEL 0x0800 #define MOUSE_BUTTON_1_DOWN MOUSE_LEFT_BUTTON_DOWN #define MOUSE_BUTTON_1_UP MOUSE_LEFT_BUTTON_UP @@ -63,25 +68,29 @@ #define MOUSE_MOVE_ABSOLUTE 1 #define MOUSE_VIRTUAL_DESKTOP 0x02 #define MOUSE_ATTRIBUTES_CHANGED 0x04 +#if(_WIN32_WINNT >= 0x0600) +#define MOUSE_MOVE_NOCOALESCE 0x08 +#endif +#define MOUSE_TERMSRV_SRC_SHADOW 0x100 typedef struct _MOUSE_INPUT_DATA { - USHORT UnitId; - USHORT Flags; - _ANONYMOUS_UNION union { - ULONG Buttons; - _ANONYMOUS_STRUCT struct { - USHORT ButtonFlags; - USHORT ButtonData; - } DUMMYSTRUCTNAME; - } DUMMYUNIONNAME; - ULONG RawButtons; - LONG LastX; - LONG LastY; - ULONG ExtraInformation; + USHORT UnitId; + USHORT Flags; + _ANONYMOUS_UNION union { + ULONG Buttons; + _ANONYMOUS_STRUCT struct { + USHORT ButtonFlags; + USHORT ButtonData; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + ULONG RawButtons; + LONG LastX; + LONG LastY; + ULONG ExtraInformation; } MOUSE_INPUT_DATA, *PMOUSE_INPUT_DATA; typedef struct _MOUSE_UNIT_ID_PARAMETER { - USHORT UnitId; + USHORT UnitId; } MOUSE_UNIT_ID_PARAMETER, *PMOUSE_UNIT_ID_PARAMETER; /* MOUSE_ATTRIBUTES.MouseIdentifier constants */ @@ -94,16 +103,15 @@ #define WHEELMOUSE_SERIAL_HARDWARE 0x0040 #define MOUSE_HID_HARDWARE 0x0080 #define WHEELMOUSE_HID_HARDWARE 0x0100 +#define HORIZONTAL_WHEEL_PRESENT 0x8000 typedef struct _MOUSE_ATTRIBUTES { - USHORT MouseIdentifier; - USHORT NumberOfButtons; - USHORT SampleRate; - ULONG InputDataQueueLength; + USHORT MouseIdentifier; + USHORT NumberOfButtons; + USHORT SampleRate; + ULONG InputDataQueueLength; } MOUSE_ATTRIBUTES, *PMOUSE_ATTRIBUTES; #ifdef __cplusplus } #endif - -#endif /* __NTDDMOU_H */

14 years, 8 months

[akhaldi] 46888: [DDK] - Add missing wmidata.h definitions.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Apr 15 23:40:44 2010 New Revision: 46888 URL: http://svn.reactos.org/svn/reactos?rev=46888&view=rev Log: [DDK] - Add missing wmidata.h definitions. Added: branches/header-work/include/ddk/wmidata.h (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: branches/header-work/include/ddk/wmidata.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/wmidata…

14 years, 8 months

← Newer
1
...
15
16
17
18
19
20
21
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2010