Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 16328: Fix halmp build for real
by ion＠svn.reactos.com 29 Jun '05

29 Jun '05

Fix halmp build for real Modified: trunk/reactos/hal/halx86/mp/mps.S _____ Modified: trunk/reactos/hal/halx86/mp/mps.S --- trunk/reactos/hal/halx86/mp/mps.S 2005-06-29 18:33:39 UTC (rev 16327) +++ trunk/reactos/hal/halx86/mp/mps.S 2005-06-29 19:05:46 UTC (rev 16328) @@ -11,7 +11,7 @@ /* INCLUDES ******************************************************************/ -#include <internal/i386/segment.h> +#include <ndk/i386/segment.h> /* FUNCTIONS *****************************************************************/

1 0

[navaraf] 16327: Use the correct structure in SetInterruptGate.
by navaraf＠svn.reactos.com 29 Jun '05

29 Jun '05

Use the correct structure in SetInterruptGate. Modified: trunk/reactos/hal/halx86/mp/apic.c _____ Modified: trunk/reactos/hal/halx86/mp/apic.c --- trunk/reactos/hal/halx86/mp/apic.c 2005-06-29 18:26:30 UTC (rev 16326) +++ trunk/reactos/hal/halx86/mp/apic.c 2005-06-29 18:33:39 UTC (rev 16327) @@ -905,12 +905,13 @@ VOID SetInterruptGate(ULONG index, ULONG address) { - KDESCRIPTOR *idt; + KIDTENTRY *idt; - idt = (KDESCRIPTOR*)((ULONG)KeGetCurrentKPCR()->IDT + index * sizeof(KDESCRIPTOR)); - idt->Pad = address & 0xffff; - idt->Limit = KERNEL_CS; - idt->Base = 0x8e00 + (address & 0xffff0000); + idt = (KIDTENTRY*)((ULONG)KeGetCurrentKPCR()->IDT + index * sizeof(KIDTENTRY)); + idt->Offset = address & 0xffff; + idt->Selector = KERNEL_CS; + idt->Access = 0x8e00; + idt->ExtendedOffset = address >> 16; } VOID HaliInitBSP(VOID)

1 0

[navaraf] 16326: We don't need to have uuids.h in each folder of the source tree, do we?
by navaraf＠svn.reactos.com 29 Jun '05

29 Jun '05

We don't need to have uuids.h in each folder of the source tree, do we? Deleted: trunk/reactos/w32api/uuids.h _____ Deleted: trunk/reactos/w32api/uuids.h --- trunk/reactos/w32api/uuids.h 2005-06-29 18:21:31 UTC (rev 16325) +++ trunk/reactos/w32api/uuids.h 2005-06-29 18:26:30 UTC (rev 16326) @@ -1,275 +0,0 @@ -/* - * Copyright (C) 2002 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef OUR_GUID_ENTRY -#define OUR_GUID_ENTRY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8); -#endif - -#define MEDIATYPE_NULL GUID_NULL -#define MEDIASUBTYPE_NULL GUID_NULL - -OUR_GUID_ENTRY(MEDIASUBTYPE_None, 0xe436eb8e, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(MEDIATYPE_Video, 0x73646976, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIATYPE_Audio, 0x73647561, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIATYPE_Text, 0x73747874, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIATYPE_Midi, 0x7364696d, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIATYPE_Stream, 0xe436eb83, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(MEDIATYPE_Interleaved, 0x73766169, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIATYPE_File, 0x656c6966, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIATYPE_ScriptCommand, 0x73636d64, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIATYPE_AUXLine21Data, 0x670aea80, 0x3a82, 0x11d0, 0xb7, 0x9b, 0x00, 0xaa, 0x00, 0x37, 0x67, 0xa7) -OUR_GUID_ENTRY(MEDIATYPE_Timecode, 0x0482dee3, 0x7817, 0x11cf, 0x8a, 0x03, 0x00, 0xaa, 0x00, 0x6e, 0xcb, 0x65) -OUR_GUID_ENTRY(MEDIATYPE_LMRT, 0x74726c6d, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIATYPE_URL_STREAM, 0x736c7275, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIASUBTYPE_YVU9, 0x39555659, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIASUBTYPE_Y411, 0x31313459, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIASUBTYPE_Y41P, 0x50313459, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIASUBTYPE_YUY2, 0x32595559, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIASUBTYPE_YVYU, 0x55595659, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIASUBTYPE_UYVY, 0x59565955, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIASUBTYPE_Y211, 0x31313259, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIASUBTYPE_YV12, 0x32315659, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIASUBTYPE_CLJR, 0x524a4c43, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIASUBTYPE_IF09, 0x39304649, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIASUBTYPE_CPLA, 0x414c5043, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIASUBTYPE_MJPG, 0x47504a4d, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIASUBTYPE_TVMJ, 0x4a4d5654, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIASUBTYPE_WAKE, 0x454b4157, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIASUBTYPE_CFCC, 0x43434643, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIASUBTYPE_IJPG, 0x47504a49, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIASUBTYPE_Plum, 0x6d756c50, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIASUBTYPE_DVCS, 0x53435644, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIASUBTYPE_DVSD, 0x44535644, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIASUBTYPE_MDVF, 0x4656444d, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIASUBTYPE_RGB1, 0xe436eb78, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(MEDIASUBTYPE_RGB4, 0xe436eb79, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(MEDIASUBTYPE_RGB8, 0xe436eb7a, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(MEDIASUBTYPE_RGB565, 0xe436eb7b, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(MEDIASUBTYPE_RGB555, 0xe436eb7c, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(MEDIASUBTYPE_RGB24, 0xe436eb7d, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(MEDIASUBTYPE_RGB32, 0xe436eb7e, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(MEDIASUBTYPE_Overlay, 0xe436eb7f, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG1Packet, 0xe436eb80, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG1Payload, 0xe436eb81, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG1AudioPayload, 0x00000050, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIATYPE_MPEG1SystemStream, 0xe436eb82, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG1System, 0xe436eb84, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG1VideoCD, 0xe436eb85, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG1Video, 0xe436eb86, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG1Audio, 0xe436eb87, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(MEDIASUBTYPE_Avi, 0xe436eb88, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(MEDIASUBTYPE_Asf, 0x3db80f90, 0x9412, 0x11d1, 0xad, 0xed, 0x00, 0x00, 0xf8, 0x75, 0x4b, 0x99) -OUR_GUID_ENTRY(MEDIASUBTYPE_QTMovie, 0xe436eb89, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(MEDIASUBTYPE_QTRpza, 0x617a7072, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIASUBTYPE_QTSmc, 0x20636d73, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIASUBTYPE_QTRle, 0x20656c72, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIASUBTYPE_QTJpeg, 0x6765706a, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIASUBTYPE_PCMAudio_Obsolete, 0xe436eb8a, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(MEDIASUBTYPE_PCM, 0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIASUBTYPE_WAVE, 0xe436eb8b, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(MEDIASUBTYPE_AU, 0xe436eb8c, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(MEDIASUBTYPE_AIFF, 0xe436eb8d, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(MEDIASUBTYPE_dvsd, 0x64737664, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIASUBTYPE_dvhd, 0x64687664, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIASUBTYPE_dvsl, 0x6c737664, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) -OUR_GUID_ENTRY(MEDIASUBTYPE_Line21_BytePair, 0x6e8d4a22, 0x310c, 0x11d0, 0xb7, 0x9a, 0x00, 0xaa, 0x00, 0x37, 0x67, 0xa7) -OUR_GUID_ENTRY(MEDIASUBTYPE_Line21_GOPPacket, 0x6e8d4a23, 0x310c, 0x11d0, 0xb7, 0x9a, 0x00, 0xaa, 0x00, 0x37, 0x67, 0xa7) -OUR_GUID_ENTRY(MEDIASUBTYPE_Line21_VBIRawData, 0x6e8d4a24, 0x310c, 0x11d0, 0xb7, 0x9a, 0x00, 0xaa, 0x00, 0x37, 0x67, 0xa7) -OUR_GUID_ENTRY(MEDIASUBTYPE_DssVideo, 0xa0af4f81, 0xe163, 0x11d0, 0xba, 0xd9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1a) -OUR_GUID_ENTRY(MEDIASUBTYPE_DssAudio, 0xa0af4f82, 0xe163, 0x11d0, 0xba, 0xd9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1a) -OUR_GUID_ENTRY(MEDIASUBTYPE_VPVideo, 0x5a9b6a40, 0x1a22, 0x11d1, 0xba, 0xd9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1a) -OUR_GUID_ENTRY(MEDIASUBTYPE_VPVBI, 0x5a9b6a41, 0x1a22, 0x11d1, 0xba, 0xd9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1a) -OUR_GUID_ENTRY(IID_IAMCutListElement, 0xcde29520, 0x3418, 0x11cf, 0xa5, 0xb0, 0x00, 0x20, 0xaf, 0x05, 0x3d, 0x8f) -OUR_GUID_ENTRY(IID_IAMFileCutListElement, 0xf0947070, 0x276c, 0x11d0, 0x83, 0x16, 0x00, 0x20, 0xaf, 0x11, 0xc0, 0x10) -OUR_GUID_ENTRY(IID_IAMVideoCutListElement, 0xcde29522, 0x3418, 0x11cf, 0xa5, 0xb0, 0x00, 0x20, 0xaf, 0x05, 0x3d, 0x8f) -OUR_GUID_ENTRY(IID_IAMAudioCutListElement, 0xcde29524, 0x3418, 0x11cf, 0xa5, 0xb0, 0x00, 0x20, 0xaf, 0x05, 0x3d, 0x8f) -OUR_GUID_ENTRY(CLSID_CutListSource, 0xa5ea8d20, 0x253d, 0x11d1, 0xb3, 0xf1, 0x00, 0xaa, 0x00, 0x37, 0x61, 0xc5) -OUR_GUID_ENTRY(IID_IStandardCutList, 0xa5ea8d29, 0x253d, 0x11d1, 0xb3, 0xf1, 0x00, 0xaa, 0x00, 0x37, 0x61, 0xc5) -OUR_GUID_ENTRY(IID_IFileClip, 0xa5ea8d2a, 0x253d, 0x11d1, 0xb3, 0xf1, 0x00, 0xaa, 0x00, 0x37, 0x61, 0xc5) -OUR_GUID_ENTRY(IID_ICutListGraphBuilder, 0xa5ea8d2c, 0x253d, 0x11d1, 0xb3, 0xf1, 0x00, 0xaa, 0x00, 0x37, 0x61, 0xc5) -OUR_GUID_ENTRY(CLSID_CutListGraphBuilder, 0xa5ea8d2f, 0x253d, 0x11d1, 0xb3, 0xf1, 0x00, 0xaa, 0x00, 0x37, 0x61, 0xc5) -OUR_GUID_ENTRY(CLSID_SimpleCutList, 0xa5ea8d30, 0x253d, 0x11d1, 0xb3, 0xf1, 0x00, 0xaa, 0x00, 0x37, 0x61, 0xc5) -OUR_GUID_ENTRY(CLSID_VideoFileClip, 0xa5ea8d31, 0x253d, 0x11d1, 0xb3, 0xf1, 0x00, 0xaa, 0x00, 0x37, 0x61, 0xc5) -OUR_GUID_ENTRY(CLSID_AudioFileClip, 0xa5ea8d32, 0x253d, 0x11d1, 0xb3, 0xf1, 0x00, 0xaa, 0x00, 0x37, 0x61, 0xc5) -OUR_GUID_ENTRY(CLSID_CutListCacheMemory, 0xa5ea8d33, 0x253d, 0x11d1, 0xb3, 0xf1, 0x00, 0xaa, 0x00, 0x37, 0x61, 0xc5) -OUR_GUID_ENTRY(CLSID_CaptureGraphBuilder, 0xbf87b6e0, 0x8c27, 0x11d0, 0xb3, 0xf0, 0x00, 0xaa, 0x00, 0x37, 0x61, 0xc5) -OUR_GUID_ENTRY(CLSID_CaptureGraphBuilder2, 0xbf87b6e1, 0x8c27, 0x11d0, 0xb3, 0xf0, 0x00, 0xaa, 0x00, 0x37, 0x61, 0xc5) -OUR_GUID_ENTRY(CLSID_ProtoFilterGraph, 0xe436ebb0, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(CLSID_SystemClock, 0xe436ebb1, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(CLSID_FilterMapper, 0xe436ebb2, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(CLSID_FilterGraph, 0xe436ebb3, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(CLSID_FilterGraphNoThread, 0xe436ebb8, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(CLSID_MPEG1Doc, 0xe4bbd160, 0x4269, 0x11ce, 0x83, 0x8d, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a) -OUR_GUID_ENTRY(CLSID_FileSource, 0x701722e0, 0x8ae3, 0x11ce, 0xa8, 0x5c, 0x00, 0xaa, 0x00, 0x2f, 0xea, 0xb5) -OUR_GUID_ENTRY(CLSID_MPEG1PacketPlayer, 0x26c25940, 0x4ca9, 0x11ce, 0xa8, 0x28, 0x00, 0xaa, 0x00, 0x2f, 0xea, 0xb5) -OUR_GUID_ENTRY(CLSID_MPEG1Splitter, 0x336475d0, 0x942a, 0x11ce, 0xa8, 0x70, 0x00, 0xaa, 0x00, 0x2f, 0xea, 0xb5) -OUR_GUID_ENTRY(CLSID_CMpegVideoCodec, 0xfeb50740, 0x7bef, 0x11ce, 0x9b, 0xd9, 0x00, 0x00, 0xe2, 0x02, 0x59, 0x9c) -OUR_GUID_ENTRY(CLSID_CMpegAudioCodec, 0x4a2286e0, 0x7bef, 0x11ce, 0x9b, 0xd9, 0x00, 0x00, 0xe2, 0x02, 0x59, 0x9c) -OUR_GUID_ENTRY(CLSID_TextRender, 0xe30629d3, 0x27e5, 0x11ce, 0x87, 0x5d, 0x00, 0x60, 0x8c, 0xb7, 0x80, 0x66) -OUR_GUID_ENTRY(CLSID_InfTee, 0xf8388a40, 0xd5bb, 0x11d0, 0xbe, 0x5a, 0x00, 0x80, 0xc7, 0x06, 0x56, 0x8e) -OUR_GUID_ENTRY(CLSID_AviSplitter, 0x1b544c20, 0xfd0b, 0x11ce, 0x8c, 0x63, 0x00, 0xaa, 0x00, 0x44, 0xb5, 0x1e) -OUR_GUID_ENTRY(CLSID_AviReader, 0x1b544c21, 0xfd0b, 0x11ce, 0x8c, 0x63, 0x00, 0xaa, 0x00, 0x44, 0xb5, 0x1e) -OUR_GUID_ENTRY(CLSID_VfwCapture, 0x1b544c22, 0xfd0b, 0x11ce, 0x8c, 0x63, 0x00, 0xaa, 0x00, 0x44, 0xb5, 0x1e) -OUR_GUID_ENTRY(CLSID_CaptureProperties, 0x1b544c22, 0xfd0b, 0x11ce, 0x8c, 0x63, 0x00, 0xaa, 0x00, 0x44, 0xb5, 0x1f) -OUR_GUID_ENTRY(CLSID_FGControl, 0xe436ebb4, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(CLSID_MOVReader, 0x44584800, 0xf8ee, 0x11ce, 0xb2, 0xd4, 0x00, 0xdd, 0x01, 0x10, 0x1b, 0x85) -OUR_GUID_ENTRY(CLSID_QuickTimeParser, 0xd51bd5a0, 0x7548, 0x11cf, 0xa5, 0x20, 0x00, 0x80, 0xc7, 0x7e, 0xf5, 0x8a) -OUR_GUID_ENTRY(CLSID_QTDec, 0xfdfe9681, 0x74a3, 0x11d0, 0xaf, 0xa7, 0x00, 0xaa, 0x00, 0xb6, 0x7a, 0x42) -OUR_GUID_ENTRY(CLSID_AVIDoc, 0xd3588ab0, 0x0781, 0x11ce, 0xb0, 0x3a, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(CLSID_AVIDocWriter, 0xd3588ab1, 0x0781, 0x11ce, 0xb0, 0x3a, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(CLSID_VideoRenderer, 0x70e102b0, 0x5556, 0x11ce, 0x97, 0xc0, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a) -OUR_GUID_ENTRY(CLSID_Colour, 0x1643e180, 0x90f5, 0x11ce, 0x97, 0xd5, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a) -OUR_GUID_ENTRY(CLSID_Dither, 0x1da08500, 0x9edc, 0x11cf, 0xbc, 0x10, 0x00, 0xaa, 0x00, 0xac, 0x74, 0xf6) -OUR_GUID_ENTRY(CLSID_ModexRenderer, 0x07167665, 0x5011, 0x11cf, 0xbf, 0x33, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a) -OUR_GUID_ENTRY(CLSID_AudioRender, 0xe30629d1, 0x27e5, 0x11ce, 0x87, 0x5d, 0x00, 0x60, 0x8c, 0xb7, 0x80, 0x66) -OUR_GUID_ENTRY(CLSID_AudioProperties, 0x05589faf, 0xc356, 0x11ce, 0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a) -OUR_GUID_ENTRY(CLSID_DSoundRender, 0x79376820, 0x07d0, 0x11cf, 0xa2, 0x4d, 0x00, 0x20, 0xaf, 0xd7, 0x97, 0x67) -OUR_GUID_ENTRY(CLSID_AudioRecord, 0xe30629d2, 0x27e5, 0x11ce, 0x87, 0x5d, 0x00, 0x60, 0x8c, 0xb7, 0x80, 0x66) -OUR_GUID_ENTRY(CLSID_AudioInputMixerProperties, 0x2ca8ca52, 0x3c3f, 0x11d2, 0xb7, 0x3d, 0x00, 0xc0, 0x4f, 0xb6, 0xbd, 0x3d) -OUR_GUID_ENTRY(CLSID_AVIDec, 0xcf49d4e0, 0x1115, 0x11ce, 0xb0, 0x3a, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(CLSID_AVIDraw, 0xa888df60, 0x1e90, 0x11cf, 0xac, 0x98, 0x00, 0xaa, 0x00, 0x4c, 0x0f, 0xa9) -OUR_GUID_ENTRY(CLSID_ACMWrapper, 0x6a08cf80, 0x0e18, 0x11cf, 0xa2, 0x4d, 0x00, 0x20, 0xaf, 0xd7, 0x97, 0x67) -OUR_GUID_ENTRY(CLSID_AsyncReader, 0xe436ebb5, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(CLSID_URLReader, 0xe436ebb6, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(CLSID_PersistMonikerPID, 0xe436ebb7, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) -OUR_GUID_ENTRY(CLSID_AMovie, 0x5f2759c0, 0x7685, 0x11cf, 0x8b, 0x23, 0x00, 0x80, 0x5f, 0x6c, 0xef, 0x60) -OUR_GUID_ENTRY(CLSID_AVICo, 0xd76e2820, 0x1563, 0x11cf, 0xac, 0x98, 0x00, 0xaa, 0x00, 0x4c, 0x0f, 0xa9) -OUR_GUID_ENTRY(CLSID_FileWriter, 0x8596e5f0, 0x0da5, 0x11d0, 0xbd, 0x21, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86) -OUR_GUID_ENTRY(CLSID_AviDest, 0xe2510970, 0xf137, 0x11ce, 0x8b, 0x67, 0x00, 0xaa, 0x00, 0xa3, 0xf1, 0xa6) -OUR_GUID_ENTRY(CLSID_AsfMux, 0xf560ae42, 0x6cdd, 0x11d1, 0xad, 0xe2, 0x00, 0x00, 0xf8, 0x75, 0x4b, 0x99) -OUR_GUID_ENTRY(CLSID_AviMuxProptyPage, 0xc647b5c0, 0x157c, 0x11d0, 0xbd, 0x23, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86) -OUR_GUID_ENTRY(CLSID_AviMuxProptyPage1, 0x0a9ae910, 0x85c0, 0x11d0, 0xbd, 0x42, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86) -OUR_GUID_ENTRY(CLSID_AVIMIDIRender, 0x07b65360, 0xc445, 0x11ce, 0xaf, 0xde, 0x00, 0xaa, 0x00, 0x6c, 0x14, 0xf4) -OUR_GUID_ENTRY(CLSID_DVVideoCodec, 0xb1b77c00, 0xc3e4, 0x11cf, 0xaf, 0x79, 0x00, 0xaa, 0x00, 0xb6, 0x7a, 0x42) -OUR_GUID_ENTRY(CLSID_DVVideoEnc, 0x13aa3650, 0xbb6f, 0x11d0, 0xaf, 0xb9, 0x00, 0xaa, 0x00, 0xb6, 0x7a, 0x42) -OUR_GUID_ENTRY(CLSID_DVSplitter, 0x4eb31670, 0x9fc6, 0x11cf, 0xaf, 0x6e, 0x00, 0xaa, 0x00, 0xb6, 0x7a, 0x42) -OUR_GUID_ENTRY(CLSID_DVMux, 0x129d7e40, 0xc10d, 0x11d0, 0xaf, 0xb9, 0x00, 0xaa, 0x00, 0xb6, 0x7a, 0x42) -OUR_GUID_ENTRY(CLSID_SeekingPassThru, 0x060af76c, 0x68dd, 0x11d0, 0x8f, 0xc1, 0x00, 0xc0, 0x4f, 0xd9, 0x18, 0x9d) -OUR_GUID_ENTRY(CLSID_Line21Decoder, 0x6e8d4a20, 0x310c, 0x11d0, 0xb7, 0x9a, 0x00, 0xaa, 0x00, 0x37, 0x67, 0xa7) -OUR_GUID_ENTRY(CLSID_OverlayMixer, 0xcd8743a1, 0x3736, 0x11d0, 0x9e, 0x69, 0x00, 0xc0, 0x4f, 0xd7, 0xc1, 0x5b) -OUR_GUID_ENTRY(CLSID_VBISurfaces, 0x814b9800, 0x1c88, 0x11d1, 0xba, 0xd9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1a) -OUR_GUID_ENTRY(CLSID_SystemDeviceEnum, 0x62be5d10, 0x60eb, 0x11d0, 0xbd, 0x3b, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86) -OUR_GUID_ENTRY(CLSID_CDeviceMoniker, 0x4315d437, 0x5b8c, 0x11d0, 0xbd, 0x3b, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86) -OUR_GUID_ENTRY(CLSID_VideoInputDeviceCategory, 0x860bb310, 0x5d01, 0x11d0, 0xbd, 0x3b, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86) -OUR_GUID_ENTRY(CLSID_CVidCapClassManager, 0x860bb310, 0x5d01, 0x11d0, 0xbd, 0x3b, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86) -OUR_GUID_ENTRY(CLSID_LegacyAmFilterCategory, 0x083863f1, 0x70de, 0x11d0, 0xbd, 0x40, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86) -OUR_GUID_ENTRY(CLSID_CQzFilterClassManager, 0x083863f1, 0x70de, 0x11d0, 0xbd, 0x40, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86) -OUR_GUID_ENTRY(CLSID_VideoCompressorCategory, 0x33d9a760, 0x90c8, 0x11d0, 0xbd, 0x43, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86) -OUR_GUID_ENTRY(CLSID_CIcmCoClassManager, 0x33d9a760, 0x90c8, 0x11d0, 0xbd, 0x43, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86) -OUR_GUID_ENTRY(CLSID_AudioCompressorCategory, 0x33d9a761, 0x90c8, 0x11d0, 0xbd, 0x43, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86) -OUR_GUID_ENTRY(CLSID_CAcmCoClassManager, 0x33d9a761, 0x90c8, 0x11d0, 0xbd, 0x43, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86) -OUR_GUID_ENTRY(CLSID_AudioInputDeviceCategory, 0x33d9a762, 0x90c8, 0x11d0, 0xbd, 0x43, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86) -OUR_GUID_ENTRY(CLSID_CWaveinClassManager, 0x33d9a762, 0x90c8, 0x11d0, 0xbd, 0x43, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86) -OUR_GUID_ENTRY(CLSID_AudioRendererCategory, 0xe0f158e1, 0xcb04, 0x11d0, 0xbd, 0x4e, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86) -OUR_GUID_ENTRY(CLSID_CWaveOutClassManager, 0xe0f158e1, 0xcb04, 0x11d0, 0xbd, 0x4e, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86) -OUR_GUID_ENTRY(CLSID_MidiRendererCategory, 0x4efe2452, 0x168a, 0x11d1, 0xbc, 0x76, 0x00, 0xc0, 0x4f, 0xb9, 0x45, 0x3b) -OUR_GUID_ENTRY(CLSID_CMidiOutClassManager, 0x4efe2452, 0x168a, 0x11d1, 0xbc, 0x76, 0x00, 0xc0, 0x4f, 0xb9, 0x45, 0x3b) -OUR_GUID_ENTRY(CLSID_TransmitCategory, 0xcc7bfb41, 0xf175, 0x11d1, 0xa3, 0x92, 0x00, 0xe0, 0x29, 0x1f, 0x39, 0x59) -OUR_GUID_ENTRY(CLSID_DeviceControlCategory, 0xcc7bfb46, 0xf175, 0x11d1, 0xa3, 0x92, 0x00, 0xe0, 0x29, 0x1f, 0x39, 0x59) -OUR_GUID_ENTRY(CLSID_ActiveMovieCategories, 0xda4e3da0, 0xd07d, 0x11d0, 0xbd, 0x50, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86) -OUR_GUID_ENTRY(CLSID_DVDHWDecodersCategory, 0x2721ae20, 0x7e70, 0x11d0, 0xa5, 0xd6, 0x28, 0xdb, 0x04, 0xc1, 0x00, 0x00) -OUR_GUID_ENTRY(CLSID_FilterMapper2, 0xcda42200, 0xbd88, 0x11d0, 0xbd, 0x4e, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86) -OUR_GUID_ENTRY(CLSID_MemoryAllocator, 0x1e651cc0, 0xb199, 0x11d0, 0x82, 0x12, 0x00, 0xc0, 0x4f, 0xc3, 0x2c, 0x45) -OUR_GUID_ENTRY(CLSID_MediaPropertyBag, 0xcdbd8d00, 0xc193, 0x11d0, 0xbd, 0x4e, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86) -OUR_GUID_ENTRY(CLSID_DvdGraphBuilder, 0xfcc152b7, 0xf372, 0x11d0, 0x8e, 0x00, 0x00, 0xc0, 0x4f, 0xd7, 0xc0, 0x8b) -OUR_GUID_ENTRY(CLSID_DVDNavigator, 0x9b8c4620, 0x2c1a, 0x11d0, 0x84, 0x93, 0x00, 0xa0, 0x24, 0x38, 0xad, 0x48) -OUR_GUID_ENTRY(CLSID_SmartTee, 0xcc58e280, 0x8aa1, 0x11d1, 0xb3, 0xf1, 0x00, 0xaa, 0x00, 0x37, 0x61, 0xc5) -OUR_GUID_ENTRY(FORMAT_None, 0x0f6417d6, 0xc318, 0x11d0, 0xa4, 0x3f, 0x00, 0xa0, 0xc9, 0x22, 0x31, 0x96) -OUR_GUID_ENTRY(FORMAT_VideoInfo, 0x05589f80, 0xc356, 0x11ce, 0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a) -OUR_GUID_ENTRY(FORMAT_VideoInfo2, 0xf72a76a0, 0xeb0a, 0x11d0, 0xac, 0xe4, 0x00, 0x00, 0xc0, 0xcc, 0x16, 0xba) -OUR_GUID_ENTRY(FORMAT_WaveFormatEx, 0x05589f81, 0xc356, 0x11ce, 0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a) -OUR_GUID_ENTRY(FORMAT_MPEGVideo, 0x05589f82, 0xc356, 0x11ce, 0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a) -OUR_GUID_ENTRY(FORMAT_MPEGStreams, 0x05589f83, 0xc356, 0x11ce, 0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a) -OUR_GUID_ENTRY(FORMAT_DvInfo, 0x05589f84, 0xc356, 0x11ce, 0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a) -OUR_GUID_ENTRY(CLSID_DirectDrawProperties, 0x944d4c00, 0xdd52, 0x11ce, 0xbf, 0x0e, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a) -OUR_GUID_ENTRY(CLSID_PerformanceProperties, 0x59ce6880, 0xacf8, 0x11cf, 0xb5, 0x6e, 0x00, 0x80, 0xc7, 0xc4, 0xb6, 0x8a) -OUR_GUID_ENTRY(CLSID_QualityProperties, 0x418afb70, 0xf8b8, 0x11ce, 0xaa, 0xc6, 0x00, 0x20, 0xaf, 0x0b, 0x99, 0xa3) -OUR_GUID_ENTRY(IID_IBaseVideoMixer, 0x61ded640, 0xe912, 0x11ce, 0xa0, 0x99, 0x00, 0xaa, 0x00, 0x47, 0x9a, 0x58) -OUR_GUID_ENTRY(IID_IDirectDrawVideo, 0x36d39eb0, 0xdd75, 0x11ce, 0xbf, 0x0e, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a) -OUR_GUID_ENTRY(IID_IQualProp, 0x1bd0ecb0, 0xf8e2, 0x11ce, 0xaa, 0xc6, 0x00, 0x20, 0xaf, 0x0b, 0x99, 0xa3) -OUR_GUID_ENTRY(CLSID_VPObject, 0xce292861, 0xfc88, 0x11d0, 0x9e, 0x69, 0x00, 0xc0, 0x4f, 0xd7, 0xc1, 0x5b) -OUR_GUID_ENTRY(IID_IVPObject, 0xce292862, 0xfc88, 0x11d0, 0x9e, 0x69, 0x00, 0xc0, 0x4f, 0xd7, 0xc1, 0x5b) -OUR_GUID_ENTRY(IID_IVPControl, 0x25df12c1, 0x3de0, 0x11d1, 0x9e, 0x69, 0x00, 0xc0, 0x4f, 0xd7, 0xc1, 0x5b) -OUR_GUID_ENTRY(CLSID_VPVBIObject, 0x814b9801, 0x1c88, 0x11d1, 0xba, 0xd9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1a) -OUR_GUID_ENTRY(IID_IVPVBIObject, 0x814b9802, 0x1c88, 0x11d1, 0xba, 0xd9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1a) -OUR_GUID_ENTRY(IID_IVPConfig, 0xbc29a660, 0x30e3, 0x11d0, 0x9e, 0x69, 0x00, 0xc0, 0x4f, 0xd7, 0xc1, 0x5b) -OUR_GUID_ENTRY(IID_IVPNotify, 0xc76794a1, 0xd6c5, 0x11d0, 0x9e, 0x69, 0x00, 0xc0, 0x4f, 0xd7, 0xc1, 0x5b) -OUR_GUID_ENTRY(IID_IVPNotify2, 0xebf47183, 0x8764, 0x11d1, 0x9e, 0x69, 0x00, 0xc0, 0x4f, 0xd7, 0xc1, 0x5b) -OUR_GUID_ENTRY(IID_IVPVBIConfig, 0xec529b00, 0x1a1f, 0x11d1, 0xba, 0xd9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1a) -OUR_GUID_ENTRY(IID_IVPVBINotify, 0xec529b01, 0x1a1f, 0x11d1, 0xba, 0xd9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1a) -OUR_GUID_ENTRY(IID_IMixerPinConfig, 0x593cdde1, 0x0759, 0x11d1, 0x9e, 0x69, 0x00, 0xc0, 0x4f, 0xd7, 0xc1, 0x5b) -OUR_GUID_ENTRY(IID_IMixerPinConfig2, 0xebf47182, 0x8764, 0x11d1, 0x9e, 0x69, 0x00, 0xc0, 0x4f, 0xd7, 0xc1, 0x5b) -OUR_GUID_ENTRY(CLSID_ModexProperties, 0x0618aa30, 0x6bc4, 0x11cf, 0xbf, 0x36, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a) -OUR_GUID_ENTRY(IID_IFullScreenVideo, 0xdd1d7110, 0x7836, 0x11cf, 0xbf, 0x47, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a) -OUR_GUID_ENTRY(IID_IFullScreenVideoEx, 0x53479470, 0xf1dd, 0x11cf, 0xbc, 0x42, 0x00, 0xaa, 0x00, 0xac, 0x74, 0xf6) -OUR_GUID_ENTRY(CLSID_DVDecPropertiesPage, 0x101193c0, 0x0bfe, 0x11d0, 0xaf, 0x91, 0x00, 0xaa, 0x00, 0xb6, 0x7a, 0x42) -OUR_GUID_ENTRY(CLSID_DVEncPropertiesPage, 0x4150f050, 0xbb6f, 0x11d0, 0xaf, 0xb9, 0x00, 0xaa, 0x00, 0xb6, 0x7a, 0x42) -OUR_GUID_ENTRY(CLSID_DVMuxPropertyPage, 0x4db880e0, 0xc10d, 0x11d0, 0xaf, 0xb9, 0x00, 0xaa, 0x00, 0xb6, 0x7a, 0x42) -OUR_GUID_ENTRY(IID_IAMDirectSound, 0x546f4260, 0xd53e, 0x11cf, 0xb3, 0xf0, 0x00, 0xaa, 0x00, 0x37, 0x61, 0xc5) -OUR_GUID_ENTRY(IID_IMpegAudioDecoder, 0xb45dd570, 0x3c77, 0x11d1, 0xab, 0xe1, 0x00, 0xa0, 0xc9, 0x05, 0xf3, 0x75) -OUR_GUID_ENTRY(IID_IAMLine21Decoder, 0x6e8d4a21, 0x310c, 0x11d0, 0xb7, 0x9a, 0x00, 0xaa, 0x00, 0x37, 0x67, 0xa7) -OUR_GUID_ENTRY(FORMAT_AnalogVideo, 0x0482dde0, 0x7817, 0x11cf, 0x8a, 0x03, 0x00, 0xaa, 0x00, 0x6e, 0xcb, 0x65) -OUR_GUID_ENTRY(MEDIATYPE_AnalogVideo, 0x0482dde1, 0x7817, 0x11cf, 0x8a, 0x03, 0x00, 0xaa, 0x00, 0x6e, 0xcb, 0x65) -OUR_GUID_ENTRY(MEDIASUBTYPE_AnalogVideo_NTSC_M, 0x0482dde2, 0x7817, 0x11cf, 0x8a, 0x03, 0x00, 0xaa, 0x00, 0x6e, 0xcb, 0x65) -OUR_GUID_ENTRY(MEDIASUBTYPE_AnalogVideo_PAL_B, 0x0482dde5, 0x7817, 0x11cf, 0x8a, 0x03, 0x00, 0xaa, 0x00, 0x6e, 0xcb, 0x65) -OUR_GUID_ENTRY(MEDIASUBTYPE_AnalogVideo_PAL_D, 0x0482dde6, 0x7817, 0x11cf, 0x8a, 0x03, 0x00, 0xaa, 0x00, 0x6e, 0xcb, 0x65) -OUR_GUID_ENTRY(MEDIASUBTYPE_AnalogVideo_PAL_G, 0x0482dde7, 0x7817, 0x11cf, 0x8a, 0x03, 0x00, 0xaa, 0x00, 0x6e, 0xcb, 0x65) -OUR_GUID_ENTRY(MEDIASUBTYPE_AnalogVideo_PAL_H, 0x0482dde8, 0x7817, 0x11cf, 0x8a, 0x03, 0x00, 0xaa, 0x00, 0x6e, 0xcb, 0x65) -OUR_GUID_ENTRY(MEDIASUBTYPE_AnalogVideo_PAL_I, 0x0482dde9, 0x7817, 0x11cf, 0x8a, 0x03, 0x00, 0xaa, 0x00, 0x6e, 0xcb, 0x65) -OUR_GUID_ENTRY(MEDIASUBTYPE_AnalogVideo_PAL_M, 0x0482ddea, 0x7817, 0x11cf, 0x8a, 0x03, 0x00, 0xaa, 0x00, 0x6e, 0xcb, 0x65) -OUR_GUID_ENTRY(MEDIASUBTYPE_AnalogVideo_PAL_N, 0x0482ddeb, 0x7817, 0x11cf, 0x8a, 0x03, 0x00, 0xaa, 0x00, 0x6e, 0xcb, 0x65) -OUR_GUID_ENTRY(MEDIASUBTYPE_AnalogVideo_SECAM_B, 0x0482ddf0, 0x7817, 0x11cf, 0x8a, 0x03, 0x00, 0xaa, 0x00, 0x6e, 0xcb, 0x65) -OUR_GUID_ENTRY(MEDIASUBTYPE_AnalogVideo_SECAM_D, 0x0482ddf1, 0x7817, 0x11cf, 0x8a, 0x03, 0x00, 0xaa, 0x00, 0x6e, 0xcb, 0x65) -OUR_GUID_ENTRY(MEDIASUBTYPE_AnalogVideo_SECAM_G, 0x0482ddf2, 0x7817, 0x11cf, 0x8a, 0x03, 0x00, 0xaa, 0x00, 0x6e, 0xcb, 0x65) -OUR_GUID_ENTRY(MEDIASUBTYPE_AnalogVideo_SECAM_H, 0x0482ddf3, 0x7817, 0x11cf, 0x8a, 0x03, 0x00, 0xaa, 0x00, 0x6e, 0xcb, 0x65) -OUR_GUID_ENTRY(MEDIASUBTYPE_AnalogVideo_SECAM_K, 0x0482ddf4, 0x7817, 0x11cf, 0x8a, 0x03, 0x00, 0xaa, 0x00, 0x6e, 0xcb, 0x65) -OUR_GUID_ENTRY(MEDIASUBTYPE_AnalogVideo_SECAM_K1, 0x0482ddf5, 0x7817, 0x11cf, 0x8a, 0x03, 0x00, 0xaa, 0x00, 0x6e, 0xcb, 0x65) -OUR_GUID_ENTRY(MEDIASUBTYPE_AnalogVideo_SECAM_L, 0x0482ddf6, 0x7817, 0x11cf, 0x8a, 0x03, 0x00, 0xaa, 0x00, 0x6e, 0xcb, 0x65) -OUR_GUID_ENTRY(MEDIATYPE_AnalogAudio, 0x0482dee1, 0x7817, 0x11cf, 0x8a, 0x03, 0x00, 0xaa, 0x00, 0x6e, 0xcb, 0x65) -OUR_GUID_ENTRY(TIME_FORMAT_NONE, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00) -OUR_GUID_ENTRY(TIME_FORMAT_FRAME, 0x7b785570, 0x8c82, 0x11cf, 0xbc, 0x0c, 0x00, 0xaa, 0x00, 0xac, 0x74, 0xf6) -OUR_GUID_ENTRY(TIME_FORMAT_BYTE, 0x7b785571, 0x8c82, 0x11cf, 0xbc, 0x0c, 0x00, 0xaa, 0x00, 0xac, 0x74, 0xf6) -OUR_GUID_ENTRY(TIME_FORMAT_SAMPLE, 0x7b785572, 0x8c82, 0x11cf, 0xbc, 0x0c, 0x00, 0xaa, 0x00, 0xac, 0x74, 0xf6) -OUR_GUID_ENTRY(TIME_FORMAT_FIELD, 0x7b785573, 0x8c82, 0x11cf, 0xbc, 0x0c, 0x00, 0xaa, 0x00, 0xac, 0x74, 0xf6) -OUR_GUID_ENTRY(TIME_FORMAT_MEDIA_TIME, 0x7b785574, 0x8c82, 0x11cf, 0xbc, 0x0c, 0x00, 0xaa, 0x00, 0xac, 0x74, 0xf6) -OUR_GUID_ENTRY(AMPROPSETID_Pin, 0x9b00f101, 0x1567, 0x11d1, 0xb3, 0xf1, 0x00, 0xaa, 0x00, 0x37, 0x61, 0xc5) -OUR_GUID_ENTRY(PIN_CATEGORY_CAPTURE, 0xfb6c4281, 0x0353, 0x11d1, 0x90, 0x5f, 0x00, 0x00, 0xc0, 0xcc, 0x16, 0xba) -OUR_GUID_ENTRY(PIN_CATEGORY_PREVIEW, 0xfb6c4282, 0x0353, 0x11d1, 0x90, 0x5f, 0x00, 0x00, 0xc0, 0xcc, 0x16, 0xba) -OUR_GUID_ENTRY(PIN_CATEGORY_ANALOGVIDEOIN, 0xfb6c4283, 0x0353, 0x11d1, 0x90, 0x5f, 0x00, 0x00, 0xc0, 0xcc, 0x16, 0xba) -OUR_GUID_ENTRY(PIN_CATEGORY_VBI, 0xfb6c4284, 0x0353, 0x11d1, 0x90, 0x5f, 0x00, 0x00, 0xc0, 0xcc, 0x16, 0xba) -OUR_GUID_ENTRY(PIN_CATEGORY_VIDEOPORT, 0xfb6c4285, 0x0353, 0x11d1, 0x90, 0x5f, 0x00, 0x00, 0xc0, 0xcc, 0x16, 0xba) -OUR_GUID_ENTRY(PIN_CATEGORY_NABTS, 0xfb6c4286, 0x0353, 0x11d1, 0x90, 0x5f, 0x00, 0x00, 0xc0, 0xcc, 0x16, 0xba) -OUR_GUID_ENTRY(PIN_CATEGORY_EDS, 0xfb6c4287, 0x0353, 0x11d1, 0x90, 0x5f, 0x00, 0x00, 0xc0, 0xcc, 0x16, 0xba) -OUR_GUID_ENTRY(PIN_CATEGORY_TELETEXT, 0xfb6c4288, 0x0353, 0x11d1, 0x90, 0x5f, 0x00, 0x00, 0xc0, 0xcc, 0x16, 0xba) -OUR_GUID_ENTRY(PIN_CATEGORY_CC, 0xfb6c4289, 0x0353, 0x11d1, 0x90, 0x5f, 0x00, 0x00, 0xc0, 0xcc, 0x16, 0xba) -OUR_GUID_ENTRY(PIN_CATEGORY_STILL, 0xfb6c428a, 0x0353, 0x11d1, 0x90, 0x5f, 0x00, 0x00, 0xc0, 0xcc, 0x16, 0xba) -OUR_GUID_ENTRY(PIN_CATEGORY_TIMECODE, 0xfb6c428b, 0x0353, 0x11d1, 0x90, 0x5f, 0x00, 0x00, 0xc0, 0xcc, 0x16, 0xba) -OUR_GUID_ENTRY(PIN_CATEGORY_VIDEOPORT_VBI, 0xfb6c428c, 0x0353, 0x11d1, 0x90, 0x5f, 0x00, 0x00, 0xc0, 0xcc, 0x16, 0xba) -OUR_GUID_ENTRY(LOOK_UPSTREAM_ONLY, 0xac798be0, 0x98e3, 0x11d1, 0xb3, 0xf1, 0x00, 0xaa, 0x00, 0x37, 0x61, 0xc5) -OUR_GUID_ENTRY(LOOK_DOWNSTREAM_ONLY, 0xac798be1, 0x98e3, 0x11d1, 0xb3, 0xf1, 0x00, 0xaa, 0x00, 0x37, 0x61, 0xc5) -OUR_GUID_ENTRY(CLSID_TVTunerFilterPropertyPage, 0x266eee41, 0x6c63, 0x11cf, 0x8a, 0x03, 0x00, 0xaa, 0x00, 0x6e, 0xcb, 0x65) -OUR_GUID_ENTRY(CLSID_CrossbarFilterPropertyPage, 0x71f96461, 0x78f3, 0x11d0, 0xa1, 0x8c, 0x00, 0xa0, 0xc9, 0x11, 0x89, 0x56) -OUR_GUID_ENTRY(CLSID_TVAudioFilterPropertyPage, 0x71f96463, 0x78f3, 0x11d0, 0xa1, 0x8c, 0x00, 0xa0, 0xc9, 0x11, 0x89, 0x56) -OUR_GUID_ENTRY(CLSID_VideoProcAmpPropertyPage, 0x71f96464, 0x78f3, 0x11d0, 0xa1, 0x8c, 0x00, 0xa0, 0xc9, 0x11, 0x89, 0x56) -OUR_GUID_ENTRY(CLSID_CameraControlPropertyPage, 0x71f96465, 0x78f3, 0x11d0, 0xa1, 0x8c, 0x00, 0xa0, 0xc9, 0x11, 0x89, 0x56) -OUR_GUID_ENTRY(CLSID_AnalogVideoDecoderPropertyPage, 0x71f96466, 0x78f3, 0x11d0, 0xa1, 0x8c, 0x00, 0xa0, 0xc9, 0x11, 0x89, 0x56) -OUR_GUID_ENTRY(CLSID_VideoStreamConfigPropertyPage, 0x71f96467, 0x78f3, 0x11d0, 0xa1, 0x8c, 0x00, 0xa0, 0xc9, 0x11, 0x89, 0x56) -OUR_GUID_ENTRY(CLSID_HTMLDocument, 0x25336920, 0x03f9, 0x11cf, 0x8f, 0xd0, 0x00, 0xaa, 0x00, 0x68, 0x6f, 0x13) - -#undef OUR_GUID_ENTRY

1 0

[navaraf] 16325: I feel like trying to fit a cube into a circle-shaped hole on those little things kids play with... but however ugly the change can look it makes the MP HAL not freeze during boot.
by navaraf＠svn.reactos.com 29 Jun '05

29 Jun '05

I feel like trying to fit a cube into a circle-shaped hole on those little things kids play with... but however ugly the change can look it makes the MP HAL not freeze during boot. Modified: trunk/reactos/hal/halx86/mp/apic.c _____ Modified: trunk/reactos/hal/halx86/mp/apic.c --- trunk/reactos/hal/halx86/mp/apic.c 2005-06-29 18:18:19 UTC (rev 16324) +++ trunk/reactos/hal/halx86/mp/apic.c 2005-06-29 18:21:31 UTC (rev 16325) @@ -908,8 +908,9 @@ KDESCRIPTOR *idt; idt = (KDESCRIPTOR*)((ULONG)KeGetCurrentKPCR()->IDT + index * sizeof(KDESCRIPTOR)); - idt->Limit = address & 0xffff; - idt->Base = 0x8e00 + (address &0xffff0000); + idt->Pad = address & 0xffff; + idt->Limit = KERNEL_CS; + idt->Base = 0x8e00 + (address & 0xffff0000); } VOID HaliInitBSP(VOID)

1 0

[gvg] 16324: zebasoftis <zebasoftis@gmail.com>:
by gvg＠svn.reactos.com 29 Jun '05

29 Jun '05

zebasoftis <zebasoftis(a)gmail.com>: Add Polish translation Added: trunk/reactos/lib/userenv/Pl.rc Modified: trunk/reactos/lib/userenv/userenv.rc _____ Added: trunk/reactos/lib/userenv/Pl.rc --- trunk/reactos/lib/userenv/Pl.rc 2005-06-29 17:36:05 UTC (rev 16323) +++ trunk/reactos/lib/userenv/Pl.rc 2005-06-29 18:18:19 UTC (rev 16324) @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2005 Sebastian Gasiorek + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" + IDS_APPDATA "Dane aplikacji" + IDS_DESKTOP "Pulpit" + IDS_FAVORITES "Ulubione" + IDS_STARTMENU "Menu Start" + IDS_PROGRAMS "Menu Start\\Programy" + IDS_ADMINTOOLS "Menu Start\\Programy\\Narz?¬ia administracyjne" + IDS_STARTUP "Menu Start\\Programy\\Autostart" + IDS_MYDOCUMENTS "Moje dokumenty" + IDS_MYPICTURES "Moje dokumenty\\Moje obrazy" + IDS_MYMUSIC "Moje dokumenty\\Moja muzyka" + IDS_MYVIDEOS "Moje dokumenty\\Moje wideo" + IDS_TEMPLATES "Szablony" + IDS_RECENT "Recent" + IDS_SENDTO "SendTo" + IDS_PRINTHOOD "PrintHood" + IDS_NETHOOD "NetHood" + IDS_LOCALSETTINGS "Ustawienia lokalne" + IDS_LOCALAPPDATA "Ustawienia lokalne\\Dane aplikacji" + IDS_TEMP "Ustawienia lokalne\\Temp" + IDS_CACHE "Ustawienia lokalne\\Temporary Internet Files" + IDS_HISTORY "Ustawienia lokalne\\Historia" + IDS_COOKIES "Cookies" + IDS_PROGRAMFILES "%SystemDrive%\\Program Files" +END Property changes on: trunk/reactos/lib/userenv/Pl.rc ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/userenv/userenv.rc --- trunk/reactos/lib/userenv/userenv.rc 2005-06-29 17:36:05 UTC (rev 16323) +++ trunk/reactos/lib/userenv/userenv.rc 2005-06-29 18:18:19 UTC (rev 16324) @@ -38,5 +38,6 @@ #include "En.rc" #include "De.rc" +#include "Pl.rc" #include "Sv.rc" #include "Ru.rc"

1 0

[ion] 16323: Fix idt descriptor code properly
by ion＠svn.reactos.com 29 Jun '05

29 Jun '05

Fix idt descriptor code properly Modified: trunk/reactos/hal/halx86/mp/apic.c _____ Modified: trunk/reactos/hal/halx86/mp/apic.c --- trunk/reactos/hal/halx86/mp/apic.c 2005-06-29 17:22:57 UTC (rev 16322) +++ trunk/reactos/hal/halx86/mp/apic.c 2005-06-29 17:36:05 UTC (rev 16323) @@ -908,8 +908,8 @@ KDESCRIPTOR *idt; idt = (KDESCRIPTOR*)((ULONG)KeGetCurrentKPCR()->IDT + index * sizeof(KDESCRIPTOR)); - idt->Limit = ((address)&0xffff) + (KERNEL_CS << 16); - idt->Base = 0x8e00 + ((address)&0xffff0000); + idt->Limit = address & 0xffff; + idt->Base = 0x8e00 + (address &0xffff0000); } VOID HaliInitBSP(VOID)

1 0

[ion] 16322: Fix HALMP build
by ion＠svn.reactos.com 29 Jun '05

29 Jun '05

Fix HALMP build Modified: trunk/reactos/hal/halx86/mp/apic.c _____ Modified: trunk/reactos/hal/halx86/mp/apic.c --- trunk/reactos/hal/halx86/mp/apic.c 2005-06-29 09:35:02 UTC (rev 16321) +++ trunk/reactos/hal/halx86/mp/apic.c 2005-06-29 17:22:57 UTC (rev 16322) @@ -905,11 +905,11 @@ VOID SetInterruptGate(ULONG index, ULONG address) { - IDT_DESCRIPTOR *idt; + KDESCRIPTOR *idt; - idt = (IDT_DESCRIPTOR*)((ULONG)KeGetCurrentKPCR()->IDT + index * sizeof(IDT_DESCRIPTOR)); - idt->a = (((ULONG)address)&0xffff) + (KERNEL_CS << 16); - idt->b = 0x8e00 + (((ULONG)address)&0xffff0000); + idt = (KDESCRIPTOR*)((ULONG)KeGetCurrentKPCR()->IDT + index * sizeof(KDESCRIPTOR)); + idt->Limit = ((address)&0xffff) + (KERNEL_CS << 16); + idt->Base = 0x8e00 + ((address)&0xffff0000); } VOID HaliInitBSP(VOID)

1 0

[navaraf] 16321: Fix warnings.
by navaraf＠svn.reactos.com 29 Jun '05

29 Jun '05

Fix warnings. Modified: trunk/reactos/boot/freeldr/freeldr/multiboot.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/multiboot.c --- trunk/reactos/boot/freeldr/freeldr/multiboot.c 2005-06-29 07:09:25 UTC (rev 16320) +++ trunk/reactos/boot/freeldr/freeldr/multiboot.c 2005-06-29 09:35:02 UTC (rev 16321) @@ -71,25 +71,6 @@ /* Kernel Entrypoint in Physical Memory */ ULONG_PTR KernelEntry; -/* Page Directory and Tables for non-PAE Systems */ -extern ULONG_PTR startup_pagedirectory; -extern ULONG_PTR lowmem_pagetable; -extern ULONG_PTR kernel_pagetable; -extern ULONG_PTR hyperspace_pagetable; -extern ULONG_PTR _pae_pagedirtable; -extern ULONG_PTR apic_pagetable; -extern ULONG_PTR kpcr_pagetable; - -/* Page Directory and Tables for PAE Systems */ -extern ULONG_PTR startup_pagedirectorytable_pae; -extern ULONG_PTR startup_pagedirectory_pae; -extern ULONG_PTR lowmem_pagetable_pae; -extern ULONG_PTR kernel_pagetable_pae; -extern ULONG_PTR hyperspace_pagetable_pae; -extern ULONG_PTR pagedirtable_pae; -extern ULONG_PTR apic_pagetable_pae; -extern ULONG_PTR kpcr_pagetable_pae; - typedef struct _HARDWARE_PTE_X86 { ULONG Valid : 1; ULONG Write : 1; @@ -126,7 +107,7 @@ typedef struct _PAGE_DIRECTORY_X86 { HARDWARE_PTE_X86 Pde[1024]; -} PAGE_DIRECTORY_x86, *PPAGE_DIRECTORY_X86; +} PAGE_DIRECTORY_X86, *PPAGE_DIRECTORY_X86; typedef struct _PAGE_DIRECTORY_X64 { HARDWARE_PTE_X64 Pde[2048]; @@ -136,6 +117,25 @@ HARDWARE_PTE_X64 Pde[4]; } PAGE_DIRECTORY_TABLE_X64, *PPAGE_DIRECTORY_TABLE_X64; +/* Page Directory and Tables for non-PAE Systems */ +extern PAGE_DIRECTORY_X86 startup_pagedirectory; +extern PAGE_DIRECTORY_X86 lowmem_pagetable; +extern PAGE_DIRECTORY_X86 kernel_pagetable; +extern ULONG_PTR hyperspace_pagetable; +extern ULONG_PTR _pae_pagedirtable; +extern PAGE_DIRECTORY_X86 apic_pagetable; +extern PAGE_DIRECTORY_X86 kpcr_pagetable; + +/* Page Directory and Tables for PAE Systems */ +extern PAGE_DIRECTORY_TABLE_X64 startup_pagedirectorytable_pae; +extern PAGE_DIRECTORY_X64 startup_pagedirectory_pae; +extern PAGE_DIRECTORY_X64 lowmem_pagetable_pae; +extern PAGE_DIRECTORY_X64 kernel_pagetable_pae; +extern ULONG_PTR hyperspace_pagetable_pae; +extern ULONG_PTR pagedirtable_pae; +extern PAGE_DIRECTORY_X64 apic_pagetable_pae; +extern PAGE_DIRECTORY_X64 kpcr_pagetable_pae; + /* FUNCTIONS *****************************************************************/ /*++

1 0

[navaraf] 16320: Move the inclusion of <debug.h> to individual files and consolidate the inclusion of DDRAW/D3D headers a bit.
by navaraf＠svn.reactos.com 29 Jun '05

29 Jun '05

Move the inclusion of <debug.h> to individual files and consolidate the inclusion of DDRAW/D3D headers a bit. Modified: trunk/reactos/subsys/win32k/dib/dib.c Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c Modified: trunk/reactos/subsys/win32k/eng/bitblt.c Modified: trunk/reactos/subsys/win32k/eng/brush.c Modified: trunk/reactos/subsys/win32k/eng/clip.c Modified: trunk/reactos/subsys/win32k/eng/copybits.c Modified: trunk/reactos/subsys/win32k/eng/debug.c Modified: trunk/reactos/subsys/win32k/eng/device.c Modified: trunk/reactos/subsys/win32k/eng/driverobj.c Modified: trunk/reactos/subsys/win32k/eng/error.c Modified: trunk/reactos/subsys/win32k/eng/event.c Modified: trunk/reactos/subsys/win32k/eng/float.c Modified: trunk/reactos/subsys/win32k/eng/gradient.c Modified: trunk/reactos/subsys/win32k/eng/lineto.c Modified: trunk/reactos/subsys/win32k/eng/mem.c Modified: trunk/reactos/subsys/win32k/eng/misc.c Modified: trunk/reactos/subsys/win32k/eng/mouse.c Modified: trunk/reactos/subsys/win32k/eng/paint.c Modified: trunk/reactos/subsys/win32k/eng/palette.c Modified: trunk/reactos/subsys/win32k/eng/perfcnt.c Modified: trunk/reactos/subsys/win32k/eng/semaphor.c Modified: trunk/reactos/subsys/win32k/eng/sort.c Modified: trunk/reactos/subsys/win32k/eng/surface.c Modified: trunk/reactos/subsys/win32k/eng/transblt.c Modified: trunk/reactos/subsys/win32k/eng/window.c Modified: trunk/reactos/subsys/win32k/eng/xlate.c Modified: trunk/reactos/subsys/win32k/include/win32k.h Modified: trunk/reactos/subsys/win32k/ldr/loader.c Modified: trunk/reactos/subsys/win32k/main/dllmain.c Modified: trunk/reactos/subsys/win32k/misc/error.c Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsys/win32k/ntddraw/stubs.c Modified: trunk/reactos/subsys/win32k/ntuser/accelerator.c Modified: trunk/reactos/subsys/win32k/ntuser/csr.c Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c Modified: trunk/reactos/subsys/win32k/ntuser/focus.c Modified: trunk/reactos/subsys/win32k/ntuser/hook.c Modified: trunk/reactos/subsys/win32k/ntuser/hotkey.c Modified: trunk/reactos/subsys/win32k/ntuser/input.c Modified: trunk/reactos/subsys/win32k/ntuser/message.c Modified: trunk/reactos/subsys/win32k/ntuser/monitor.c Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsys/win32k/ntuser/painting.c Modified: trunk/reactos/subsys/win32k/ntuser/prop.c Modified: trunk/reactos/subsys/win32k/ntuser/timer.c Modified: trunk/reactos/subsys/win32k/ntuser/vis.c Modified: trunk/reactos/subsys/win32k/ntuser/window.c Modified: trunk/reactos/subsys/win32k/objects/bezier.c Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c Modified: trunk/reactos/subsys/win32k/objects/brush.c Modified: trunk/reactos/subsys/win32k/objects/cliprgn.c Modified: trunk/reactos/subsys/win32k/objects/color.c Modified: trunk/reactos/subsys/win32k/objects/coord.c Modified: trunk/reactos/subsys/win32k/objects/dc.c Modified: trunk/reactos/subsys/win32k/objects/dib.c Modified: trunk/reactos/subsys/win32k/objects/fillshap.c Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c Modified: trunk/reactos/subsys/win32k/objects/icm.c Modified: trunk/reactos/subsys/win32k/objects/line.c Modified: trunk/reactos/subsys/win32k/objects/metafile.c Modified: trunk/reactos/subsys/win32k/objects/paint.c Modified: trunk/reactos/subsys/win32k/objects/palette.c Modified: trunk/reactos/subsys/win32k/objects/path.c Modified: trunk/reactos/subsys/win32k/objects/pen.c Modified: trunk/reactos/subsys/win32k/objects/polyfill.c Modified: trunk/reactos/subsys/win32k/objects/print.c Modified: trunk/reactos/subsys/win32k/objects/rect.c Modified: trunk/reactos/subsys/win32k/objects/region.c Modified: trunk/reactos/subsys/win32k/objects/stockobj.c Modified: trunk/reactos/subsys/win32k/objects/text.c Modified: trunk/reactos/subsys/win32k/objects/wingl.c Modified: trunk/reactos/subsys/win32k/stubs/stubs.c Modified: trunk/reactos/subsys/win32k/stubs/xpstubs.c Modified: trunk/reactos/subsys/win32k/w32k.h _____ Modified: trunk/reactos/subsys/win32k/dib/dib.c --- trunk/reactos/subsys/win32k/dib/dib.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/dib/dib.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -17,8 +17,12 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* $Id$ */ + #include <w32k.h> +#define NDEBUG +#include <debug.h> + /* Static data */ unsigned char notmask[2] = { 0x0f, 0xf0 }; _____ Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c --- trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -20,6 +20,9 @@ #include <w32k.h> +#define NDEBUG +#include <debug.h> + VOID DIB_16BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c) { _____ Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c --- trunk/reactos/subsys/win32k/dib/dib1bpp.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/dib/dib1bpp.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -19,6 +19,9 @@ /* $Id$ */ #include <w32k.h> +#define NDEBUG +#include <debug.h> + VOID DIB_1BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c) { _____ Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c --- trunk/reactos/subsys/win32k/dib/dib24bpp.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/dib/dib24bpp.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -17,8 +17,12 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* $Id$ */ + #include <w32k.h> +#define NDEBUG +#include <debug.h> + VOID DIB_24BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c) { _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -17,11 +17,12 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* $Id$ */ + #include <w32k.h> +#define NDEBUG +#include <debug.h> - - VOID DIB_32BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c) { _____ Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c --- trunk/reactos/subsys/win32k/dib/dib4bpp.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/dib/dib4bpp.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -17,8 +17,12 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* $Id$ */ + #include <w32k.h> +#define NDEBUG +#include <debug.h> + VOID DIB_4BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c) { _____ Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c --- trunk/reactos/subsys/win32k/dib/dib8bpp.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/dib/dib8bpp.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -17,8 +17,12 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* $Id$ */ + #include <w32k.h> +#define NDEBUG +#include <debug.h> + VOID DIB_8BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c) { _____ Modified: trunk/reactos/subsys/win32k/eng/bitblt.c --- trunk/reactos/subsys/win32k/eng/bitblt.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/eng/bitblt.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -26,8 +26,12 @@ * REVISION HISTORY: * 2/10/1999: Created */ + #include <w32k.h> +#define NDEBUG +#include <debug.h> + typedef BOOLEAN STDCALL (*PBLTRECTFUNC)(SURFOBJ* OutputObj, SURFOBJ* InputObj, SURFOBJ* Mask, _____ Modified: trunk/reactos/subsys/win32k/eng/brush.c --- trunk/reactos/subsys/win32k/eng/brush.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/eng/brush.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -26,8 +26,12 @@ * REVISION HISTORY: * 3/7/1999: Created */ + #include <w32k.h> +#define NDEBUG +#include <debug.h> + /* * @implemented */ _____ Modified: trunk/reactos/subsys/win32k/eng/clip.c --- trunk/reactos/subsys/win32k/eng/clip.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/eng/clip.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -26,8 +26,12 @@ * REVISION HISTORY: * 21/8/1999: Created */ + #include <w32k.h> +#define NDEBUG +#include <debug.h> + static inline int CompareRightDown(const PRECT r1, const PRECT r2) { _____ Modified: trunk/reactos/subsys/win32k/eng/copybits.c --- trunk/reactos/subsys/win32k/eng/copybits.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/eng/copybits.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -25,8 +25,12 @@ * REVISION HISTORY: * 8/18/1999: Created */ + #include <w32k.h> +#define NDEBUG +#include <debug.h> + /* * @implemented */ _____ Modified: trunk/reactos/subsys/win32k/eng/debug.c --- trunk/reactos/subsys/win32k/eng/debug.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/eng/debug.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -26,8 +26,12 @@ * REVISION HISTORY: * 11/7/1999: Created */ + #include <w32k.h> +#define NDEBUG +#include <debug.h> + /* * @implemented */ _____ Modified: trunk/reactos/subsys/win32k/eng/device.c --- trunk/reactos/subsys/win32k/eng/device.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/eng/device.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -26,8 +26,12 @@ * REVISION HISTORY: * 3/7/1999: Created */ + #include <w32k.h> +#define NDEBUG +#include <debug.h> + /* * @implemented */ _____ Modified: trunk/reactos/subsys/win32k/eng/driverobj.c --- trunk/reactos/subsys/win32k/eng/driverobj.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/eng/driverobj.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -25,8 +25,11 @@ * REVISION HISTORY: * 04/01/2005: Created */ + #include <w32k.h> +#define NDEBUG +#include <debug.h> /*!\brief Called when the process is terminated. * _____ Modified: trunk/reactos/subsys/win32k/eng/error.c --- trunk/reactos/subsys/win32k/eng/error.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/eng/error.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -1,5 +1,8 @@ #include <w32k.h> +#define NDEBUG +#include <debug.h> + /* * @implemented */ _____ Modified: trunk/reactos/subsys/win32k/eng/event.c --- trunk/reactos/subsys/win32k/eng/event.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/eng/event.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -26,8 +26,12 @@ * REVISION HISTORY: * 2/10/1999: Created */ + #include <w32k.h> +#define NDEBUG +#include <debug.h> + BOOL STDCALL EngCreateEvent ( OUT PEVENT *Event ) _____ Modified: trunk/reactos/subsys/win32k/eng/float.c --- trunk/reactos/subsys/win32k/eng/float.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/eng/float.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -25,8 +25,12 @@ * PROGRAMER: Jason Filby * REVISION HISTORY: */ + #include <w32k.h> +#define NDEBUG +#include <debug.h> + BOOL STDCALL EngRestoreFloatingPointState ( IN VOID *Buffer ) _____ Modified: trunk/reactos/subsys/win32k/eng/gradient.c --- trunk/reactos/subsys/win32k/eng/gradient.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/eng/gradient.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -26,8 +26,12 @@ * REVISION HISTORY: * 3/7/1999: Created */ + #include <w32k.h> +#define NDEBUG +#include <debug.h> + /* MACROS *********************************************************************/ const LONG LINC[2] = {-1, 1}; _____ Modified: trunk/reactos/subsys/win32k/eng/lineto.c --- trunk/reactos/subsys/win32k/eng/lineto.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/eng/lineto.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -18,8 +18,12 @@ * * $Id$ */ + #include <w32k.h> +#define NDEBUG +#include <debug.h> + static void FASTCALL TranslateRects(RECT_ENUM *RectEnum, POINTL* Translate) { _____ Modified: trunk/reactos/subsys/win32k/eng/mem.c --- trunk/reactos/subsys/win32k/eng/mem.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/eng/mem.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -29,6 +29,9 @@ #include <w32k.h> +#define NDEBUG +#include <debug.h> + typedef struct _USERMEMHEADER { ULONG Tag; _____ Modified: trunk/reactos/subsys/win32k/eng/misc.c --- trunk/reactos/subsys/win32k/eng/misc.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/eng/misc.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -17,8 +17,12 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* $Id$ */ + #include <w32k.h> +#define NDEBUG +#include <debug.h> + BOOL STDCALL IntEngEnter(PINTENG_ENTER_LEAVE EnterLeave, SURFOBJ *DestObj, _____ Modified: trunk/reactos/subsys/win32k/eng/mouse.c --- trunk/reactos/subsys/win32k/eng/mouse.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/eng/mouse.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -26,8 +26,12 @@ * 06-06-2001 CSH Created */ /* INCLUDES ******************************************************************/ + #include <w32k.h> +#define NDEBUG +#include <debug.h> + /* FUNCTIONS *****************************************************************/ INT INTERNAL_CALL _____ Modified: trunk/reactos/subsys/win32k/eng/paint.c --- trunk/reactos/subsys/win32k/eng/paint.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/eng/paint.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -29,6 +29,9 @@ #include <w32k.h> +#define NDEBUG +#include <debug.h> + BOOL STDCALL FillSolid(SURFOBJ *Surface, PRECTL pRect, ULONG iColor) { LONG y; _____ Modified: trunk/reactos/subsys/win32k/eng/palette.c --- trunk/reactos/subsys/win32k/eng/palette.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/eng/palette.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -26,8 +26,12 @@ * REVISION HISTORY: * 11/7/1999: Created */ + #include <w32k.h> +#define NDEBUG +#include <debug.h> + /* * @implemented */ _____ Modified: trunk/reactos/subsys/win32k/eng/perfcnt.c --- trunk/reactos/subsys/win32k/eng/perfcnt.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/eng/perfcnt.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -24,8 +24,12 @@ * FILE: subsys/win32k/eng/perfcnt.c * PROGRAMER: Ge van Geldorp */ + #include <w32k.h> +#define NDEBUG +#include <debug.h> + /* * @implemented */ _____ Modified: trunk/reactos/subsys/win32k/eng/semaphor.c --- trunk/reactos/subsys/win32k/eng/semaphor.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/eng/semaphor.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -1,5 +1,8 @@ #include <w32k.h> +#define NDEBUG +#include <debug.h> + /* * @implemented */ _____ Modified: trunk/reactos/subsys/win32k/eng/sort.c --- trunk/reactos/subsys/win32k/eng/sort.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/eng/sort.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -17,8 +17,12 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* $Id$ */ + #include <w32k.h> +#define NDEBUG +#include <debug.h> + /* * @implemented */ _____ Modified: trunk/reactos/subsys/win32k/eng/surface.c --- trunk/reactos/subsys/win32k/eng/surface.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/eng/surface.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -30,8 +30,12 @@ * - Create a GDI bitmap with all formats, perform all drawing operations on them, render to VGA surface * refer to \test\microwin\src\engine\devdraw.c for info on correct pixel plotting for various formats */ + #include <w32k.h> +#define NDEBUG +#include <debug.h> + enum Rle_EscapeCodes { RLE_EOL = 0, /* End of line */ _____ Modified: trunk/reactos/subsys/win32k/eng/transblt.c --- trunk/reactos/subsys/win32k/eng/transblt.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/eng/transblt.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -26,8 +26,11 @@ * REVISION HISTORY: * 4/6/2004: Created */ + #include <w32k.h> +#define NDEBUG +#include <debug.h> BOOL STDCALL EngTransparentBlt(SURFOBJ *Dest, _____ Modified: trunk/reactos/subsys/win32k/eng/window.c --- trunk/reactos/subsys/win32k/eng/window.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/eng/window.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -31,6 +31,9 @@ #include <w32k.h> +#define NDEBUG +#include <debug.h> + /* * Calls the WNDOBJCHANGEPROC of the given WNDOBJ */ _____ Modified: trunk/reactos/subsys/win32k/eng/xlate.c --- trunk/reactos/subsys/win32k/eng/xlate.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/eng/xlate.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -29,6 +29,9 @@ #include <w32k.h> +#define NDEBUG +#include <debug.h> + static inline ULONG ShiftAndMask(XLATEGDI *XlateGDI, ULONG Color) { _____ Modified: trunk/reactos/subsys/win32k/include/win32k.h --- trunk/reactos/subsys/win32k/include/win32k.h 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/include/win32k.h 2005-06-29 07:09:25 UTC (rev 16320) @@ -31,6 +31,7 @@ #include <include/input.h> #include <include/inteng.h> #include <include/intgdi.h> +#include <include/intddraw.h> #include <include/menu.h> #include <include/monitor.h> #include <include/mouse.h> _____ Modified: trunk/reactos/subsys/win32k/ldr/loader.c --- trunk/reactos/subsys/win32k/ldr/loader.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/ldr/loader.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -19,6 +19,7 @@ /* $Id$ * */ + #include <w32k.h> #define NDEBUG _____ Modified: trunk/reactos/subsys/win32k/main/dllmain.c --- trunk/reactos/subsys/win32k/main/dllmain.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/main/dllmain.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -20,12 +20,12 @@ * * Entry Point for win32k.sys */ -#include <win32k/ntddraw.h> /* FIXME: FIX THIS! */ + #include <w32k.h> +#include <win32k/ntddraw.h> #include <include/napi.h> #define NDEBUG -#include <win32k/debug1.h> #include <debug.h> BOOL INTERNAL_CALL GDI_CleanupForProcess (struct _EPROCESS *Process); _____ Modified: trunk/reactos/subsys/win32k/misc/error.c --- trunk/reactos/subsys/win32k/misc/error.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/misc/error.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -26,8 +26,12 @@ * REVISION HISTORY: * 06-06-2001 CSH Created */ + #include <w32k.h> +#define NDEBUG +#include <debug.h> + VOID FASTCALL SetLastNtError(NTSTATUS Status) { _____ Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c --- trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -1,5 +1,4 @@ /* - * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Native DirectDraw implementation @@ -8,14 +7,8 @@ * REVISION HISTORY: * 25-10-2003 PB Created */ -/* FIXME: FOR THE LOVE OF GOD SOMEONE PLEASE FIX THIS FUCKFEST */ -#include <ddk/ntddk.h> -#include <win32k/ntddraw.h> -#include <ddk/winddi.h> + #include <w32k.h> -#include <win32k/win32k.h> -#include <include/intddraw.h> -#include <win32k/gdiobj.h> #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/subsys/win32k/ntddraw/stubs.c --- trunk/reactos/subsys/win32k/ntddraw/stubs.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/ntddraw/stubs.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -1,5 +1,4 @@ /* - * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Native DirectDraw stubs @@ -8,12 +7,8 @@ * REVISION HISTORY: * 25-10-2003 PB Created */ -/* FIXME: FOR THE LOVE OF GOD SOMEONE PLEASE FIX THIS FUCKFEST */ -#include <ddk/ntddk.h> -#include <win32k/ntddraw.h> -#include <ddk/winddi.h> + #include <w32k.h> -#include <win32k/win32k.h> #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/subsys/win32k/ntuser/accelerator.c --- trunk/reactos/subsys/win32k/ntuser/accelerator.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/ntuser/accelerator.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -48,6 +48,7 @@ */ /* INCLUDES ******************************************************************/ + #include <w32k.h> #define NDEBUG _____ Modified: trunk/reactos/subsys/win32k/ntuser/csr.c --- trunk/reactos/subsys/win32k/ntuser/csr.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/ntuser/csr.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -9,6 +9,9 @@ #include <w32k.h> +#define NDEBUG +#include <debug.h> + static HANDLE WindowsApiPort = NULL; PEPROCESS CsrProcess = NULL; _____ Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c --- trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -38,6 +38,9 @@ #include <w32k.h> +#define NDEBUG +#include <debug.h> + static PAGED_LOOKASIDE_LIST ProcessLookasideList; static LIST_ENTRY CurIconList; static FAST_MUTEX CurIconListLock; _____ Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c --- trunk/reactos/subsys/win32k/ntuser/desktop.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/ntuser/desktop.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -28,8 +28,12 @@ */ /* INCLUDES ******************************************************************/ + #include <w32k.h> +#define NDEBUG +#include <debug.h> + /* GLOBALS *******************************************************************/ /* Currently active desktop */ _____ Modified: trunk/reactos/subsys/win32k/ntuser/focus.c --- trunk/reactos/subsys/win32k/ntuser/focus.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/ntuser/focus.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -22,7 +22,6 @@ #include <w32k.h> #define NDEBUG -#include <win32k/debug1.h> #include <debug.h> HWND FASTCALL _____ Modified: trunk/reactos/subsys/win32k/ntuser/hook.c --- trunk/reactos/subsys/win32k/ntuser/hook.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/ntuser/hook.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -32,7 +32,7 @@ #include <w32k.h> #define NDEBUG -#include <win32k/debug1.h> +#include <debug.h> #define HOOKID_TO_INDEX(HookId) (HookId - WH_MINHOOK) _____ Modified: trunk/reactos/subsys/win32k/ntuser/hotkey.c --- trunk/reactos/subsys/win32k/ntuser/hotkey.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/ntuser/hotkey.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -34,7 +34,6 @@ #define NDEBUG #include <debug.h> - /* GLOBALS *******************************************************************/ /* FUNCTIONS *****************************************************************/ _____ Modified: trunk/reactos/subsys/win32k/ntuser/input.c --- trunk/reactos/subsys/win32k/ntuser/input.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/ntuser/input.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -30,9 +30,11 @@ /* INCLUDES ******************************************************************/ #include <w32k.h> -#include <rosrtl/string.h> #include <ddk/ntddkbd.h> +#define NDEBUG +#include <debug.h> + /* GLOBALS *******************************************************************/ static HANDLE MouseDeviceHandle; _____ Modified: trunk/reactos/subsys/win32k/ntuser/message.c --- trunk/reactos/subsys/win32k/ntuser/message.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/ntuser/message.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -30,7 +30,6 @@ /* INCLUDES ******************************************************************/ #include <w32k.h> -#include <pseh.h> #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/subsys/win32k/ntuser/monitor.c --- trunk/reactos/subsys/win32k/ntuser/monitor.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/ntuser/monitor.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -35,7 +35,7 @@ #define MONITOR_DEFAULTTOPRIMARY 1 #define MONITOR_DEFAULTTONEAREST 2 -//#define NDEBUG +#define NDEBUG #include <debug.h> /* GLOBALS *******************************************************************/ _____ Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c --- trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -32,7 +32,6 @@ #include <w32k.h> #define NDEBUG -#include <win32k/debug1.h> #include <debug.h> /* GLOBALS *******************************************************************/ _____ Modified: trunk/reactos/subsys/win32k/ntuser/painting.c --- trunk/reactos/subsys/win32k/ntuser/painting.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/ntuser/painting.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -33,7 +33,7 @@ #include <w32k.h> #define NDEBUG -#include <win32k/debug1.h> +#include <debug.h> #define DCX_USESTYLE 0x10000 _____ Modified: trunk/reactos/subsys/win32k/ntuser/prop.c --- trunk/reactos/subsys/win32k/ntuser/prop.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/ntuser/prop.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -30,7 +30,7 @@ #include <w32k.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> typedef struct _PROPLISTITEM _____ Modified: trunk/reactos/subsys/win32k/ntuser/timer.c --- trunk/reactos/subsys/win32k/ntuser/timer.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/ntuser/timer.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -32,7 +32,7 @@ #include <w32k.h> -#undef NDEBUG +#define NDEBUG #include <debug.h> /* GLOBALS *******************************************************************/ _____ Modified: trunk/reactos/subsys/win32k/ntuser/vis.c --- trunk/reactos/subsys/win32k/ntuser/vis.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/ntuser/vis.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -28,7 +28,6 @@ #include <w32k.h> #define NDEBUG -#include <win32k/debug1.h> #include <debug.h> HRGN FASTCALL _____ Modified: trunk/reactos/subsys/win32k/ntuser/window.c --- trunk/reactos/subsys/win32k/ntuser/window.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/ntuser/window.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -30,6 +30,9 @@ #include <w32k.h> +#define NDEBUG +#include <debug.h> + static WndProcHandle *WndProcHandlesArray = 0; static WORD WndProcHandlesArraySize = 0; #define WPH_SIZE 0x40 /* the size to add to the WndProcHandle array each time */ _____ Modified: trunk/reactos/subsys/win32k/objects/bezier.c --- trunk/reactos/subsys/win32k/objects/bezier.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/objects/bezier.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -20,6 +20,9 @@ #include <w32k.h> +#define NDEBUG +#include <debug.h> + /****************************************************************** * * *Very* simple bezier drawing code, _____ Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c --- trunk/reactos/subsys/win32k/objects/bitmaps.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/objects/bitmaps.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -17,8 +17,12 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* $Id$ */ + #include <w32k.h> +#define NDEBUG +#include <debug.h> + #define IN_RECT(r,x,y) \ ( \ (x) >= (r).left && \ _____ Modified: trunk/reactos/subsys/win32k/objects/brush.c --- trunk/reactos/subsys/win32k/objects/brush.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/objects/brush.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -19,8 +19,12 @@ * * $Id$ */ + #include <w32k.h> +#define NDEBUG +#include <debug.h> + static const USHORT HatchBrushes[NB_HATCH_STYLES][8] = { {0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00}, /* HS_HORIZONTAL */ _____ Modified: trunk/reactos/subsys/win32k/objects/cliprgn.c --- trunk/reactos/subsys/win32k/objects/cliprgn.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/objects/cliprgn.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -17,8 +17,12 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* $Id$ */ + #include <w32k.h> +#define NDEBUG +#include <debug.h> + int FASTCALL CLIPPING_UpdateGCRegion(DC* Dc) { _____ Modified: trunk/reactos/subsys/win32k/objects/color.c --- trunk/reactos/subsys/win32k/objects/color.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/objects/color.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -17,8 +17,12 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* $Id$ */ + #include <w32k.h> +#define NDEBUG +#include <debug.h> + // FIXME: Use PXLATEOBJ logicalToSystem instead of int *mapping int COLOR_gapStart = 256; _____ Modified: trunk/reactos/subsys/win32k/objects/coord.c --- trunk/reactos/subsys/win32k/objects/coord.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/objects/coord.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -26,8 +26,12 @@ */ /* INCLUDES ******************************************************************/ + #include <w32k.h> +#define NDEBUG +#include <debug.h> + /* FUNCTIONS *****************************************************************/ BOOL FASTCALL _____ Modified: trunk/reactos/subsys/win32k/objects/dc.c --- trunk/reactos/subsys/win32k/objects/dc.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/objects/dc.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -21,8 +21,12 @@ * DC.C - Device context functions * */ + #include <w32k.h> +#define NDEBUG +#include <debug.h> + #ifndef OBJ_COLORSPACE #define OBJ_COLORSPACE (14) #endif _____ Modified: trunk/reactos/subsys/win32k/objects/dib.c --- trunk/reactos/subsys/win32k/objects/dib.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/objects/dib.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -18,9 +18,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + #include <w32k.h> -#include <pseh.h> +#define NDEBUG +#include <debug.h> + UINT STDCALL NtGdiSetDIBColorTable(HDC hDC, UINT StartIndex, UINT Entries, CONST RGBQUAD *Colors) { _____ Modified: trunk/reactos/subsys/win32k/objects/fillshap.c --- trunk/reactos/subsys/win32k/objects/fillshap.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/objects/fillshap.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -16,8 +16,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + #include <w32k.h> +#define NDEBUG +#include <debug.h> + /* * a couple macros to fill a single pixel or a line */ _____ Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c --- trunk/reactos/subsys/win32k/objects/gdiobj.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/objects/gdiobj.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -21,6 +21,7 @@ * * $Id$ */ + #include <w32k.h> #define NDEBUG _____ Modified: trunk/reactos/subsys/win32k/objects/icm.c --- trunk/reactos/subsys/win32k/objects/icm.c 2005-06-29 00:11:39 UTC (rev 16319) +++ trunk/reactos/subsys/win32k/objects/icm.c 2005-06-29 07:09:25 UTC (rev 16320) @@ -17,8 +17,12 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* $Id$ */ + #include <w32k.h> +#define NDEBUG +#include <debug.h> [truncated at 1000 lines; 270 more skipped]

1 0

[sedwards] 16319: move a few more headers to the PSDK
by sedwards＠svn.reactos.com 29 Jun '05

29 Jun '05

move a few more headers to the PSDK Deleted: trunk/reactos/include/wine/msiquery.h Deleted: trunk/reactos/include/wine/npapi.h Deleted: trunk/reactos/include/wine/winternl.h Modified: trunk/reactos/lib/crt/except/unwind.c Modified: trunk/reactos/lib/crt/wine/cpp.c Modified: trunk/reactos/lib/crt/wine/cppexcept.c Added: trunk/reactos/w32api/include/msiquery.h Added: trunk/reactos/w32api/include/npapi.h Modified: trunk/reactos/w32api/include/wininet.h Added: trunk/reactos/w32api/include/winternl.h _____ Deleted: trunk/reactos/include/wine/msiquery.h --- trunk/reactos/include/wine/msiquery.h 2005-06-28 23:36:28 UTC (rev 16318) +++ trunk/reactos/include/wine/msiquery.h 2005-06-29 00:11:39 UTC (rev 16319) @@ -1,180 +0,0 @@ -/* - * Copyright (C) 2002,2003 Mike McCormack - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef __WINE_MSIQUERY_H -#define __WINE_MSIQUERY_H - -#include <msi.h> - -typedef enum tagMSICONDITION -{ - MSICONDITION_FALSE = 0, - MSICONDITION_TRUE = 1, - MSICONDITION_NONE = 2, - MSICONDITION_ERROR = 3, -} MSICONDITION; - -#define MSI_NULL_INTEGER 0x80000000 - -typedef enum tagMSICOLINFO -{ - MSICOLINFO_NAMES = 0, - MSICOLINFO_TYPES = 1 -} MSICOLINFO; - -typedef enum tagMSIMODIFY -{ - MSIMODIFY_REFRESH = 0, - MSIMODIFY_INSERT = 1, - MSIMODIFY_UPDATE = 2, - MSIMODIFY_ASSIGN = 3, - MSIMODIFY_REPLACE = 4, - MSIMODIFY_MERGE = 5, - MSIMODIFY_DELETE = 6, - MSIMODIFY_INSERT_TEMPORARY = 7, - MSIMODIFY_VALIDATE = 8, - MSIMODIFY_VALIDATE_NEW = 9, - MSIMODIFY_VALIDATE_FIELD = 10, - MSIMODIFY_VALIDATE_DELETE = 11 -} MSIMODIFY; - -#define MSI_NULL_INTEGER 0x80000000 - -#define MSIDBOPEN_READONLY (LPCTSTR)0 -#define MSIDBOPEN_TRANSACT (LPCTSTR)1 -#define MSIDBOPEN_DIRECT (LPCTSTR)2 -#define MSIDBOPEN_CREATE (LPCTSTR)3 -#define MSIDBOPEN_CREATEDIRECT (LPCTSTR)4 - -typedef enum tagMSIRUNMODE -{ - MSIRUNMODE_ADMIN = 0, - MSIRUNMODE_ADVERTISE = 1, - MSIRUNMODE_MAINTENANCE = 2, - MSIRUNMODE_ROLLBACKENABLED = 3, - MSIRUNMODE_LOGENABLED = 4, - MSIRUNMODE_OPERATIONS = 5, - MSIRUNMODE_REBOOTATEND = 6, - MSIRUNMODE_REBOOTNOW = 7, - MSIRUNMODE_CABINET = 8, - MSIRUNMODE_SOURCESHORTNAMES = 9, - MSIRUNMODE_TARGETSHORTNAMES = 10, - MSIRUNMODE_RESERVED11 = 11, - MSIRUNMODE_WINDOWS9X = 12, - MSIRUNMODE_ZAWENABLED = 13, - MSIRUNMODE_RESERVED14 = 14, - MSIRUNMODE_RESERVED15 = 15, - MSIRUNMODE_SCHEDULED = 16, - MSIRUNMODE_ROLLBACK = 17, - MSIRUNMODE_COMMIT = 18 -} MSIRUNMODE; - -/* view manipulation */ -UINT WINAPI MsiViewFetch(MSIHANDLE,MSIHANDLE*); -UINT WINAPI MsiViewExecute(MSIHANDLE,MSIHANDLE); -UINT WINAPI MsiViewClose(MSIHANDLE); -UINT WINAPI MsiDatabaseOpenViewA(MSIHANDLE,LPCSTR,MSIHANDLE*); -UINT WINAPI MsiDatabaseOpenViewW(MSIHANDLE,LPCWSTR,MSIHANDLE*); -#define MsiDatabaseOpenView WINELIB_NAME_AW(MsiDatabaseOpenView) - -/* record manipulation */ -MSIHANDLE WINAPI MsiCreateRecord(unsigned int); -UINT WINAPI MsiRecordClearData(MSIHANDLE); -UINT WINAPI MsiRecordSetInteger(MSIHANDLE,unsigned int,int); -UINT WINAPI MsiRecordSetStringA(MSIHANDLE,unsigned int,LPCSTR); -UINT WINAPI MsiRecordSetStringW(MSIHANDLE,unsigned int,LPCWSTR); -#define MsiRecordSetString WINELIB_NAME_AW(MsiRecordSetString) -UINT WINAPI MsiRecordGetStringA(MSIHANDLE,unsigned int,LPSTR,DWORD*); -UINT WINAPI MsiRecordGetStringW(MSIHANDLE,unsigned int,LPWSTR,DWORD*); -#define MsiRecordGetString WINELIB_NAME_AW(MsiRecordGetString) -UINT WINAPI MsiRecordGetFieldCount(MSIHANDLE); -int WINAPI MsiRecordGetInteger(MSIHANDLE,unsigned int); -UINT WINAPI MsiRecordDataSize(MSIHANDLE,unsigned int); -BOOL WINAPI MsiRecordIsNull(MSIHANDLE,unsigned int); -UINT WINAPI MsiFormatRecordA(MSIHANDLE,MSIHANDLE,LPSTR,DWORD*); -UINT WINAPI MsiFormatRecordW(MSIHANDLE,MSIHANDLE,LPWSTR,DWORD*); -#define MsiFormatRecord WINELIB_NAME_AW(MsiFormatRecord) -UINT WINAPI MsiRecordSetStreamA(MSIHANDLE,unsigned int,LPCSTR); -UINT WINAPI MsiRecordSetStreamW(MSIHANDLE,unsigned int,LPCWSTR); -#define MsiRecordSetStream WINELIB_NAME_AW(MsiRecordSetStream) -UINT WINAPI MsiRecordReadStream(MSIHANDLE,unsigned int,char*,DWORD *); - -UINT WINAPI MsiDatabaseGetPrimaryKeysA(MSIHANDLE,LPCSTR,MSIHANDLE*); -UINT WINAPI MsiDatabaseGetPrimaryKeysW(MSIHANDLE,LPCWSTR,MSIHANDLE*); -#define MsiDatabaseGetPrimaryKeys WINELIB_NAME_AW(MsiDatabaseGetPrimaryKeys) - -/* installing */ -UINT WINAPI MsiDoActionA(MSIHANDLE,LPCSTR ); -UINT WINAPI MsiDoActionW(MSIHANDLE,LPCWSTR ); -#define MsiDoAction WINELIB_NAME_AW(MsiDoAction) - -/* database transforms */ -UINT WINAPI MsiDatabaseApplyTransformA(MSIHANDLE,LPCSTR,int); -UINT WINAPI MsiDatabaseApplyTransformW(MSIHANDLE,LPCWSTR,int); -#define MsiDatabaseApplyTransform WINELIB_NAME_AW(MsiDatabaseApplyTransform) -UINT WINAPI MsiDatabaseGenerateTransformA(MSIHANDLE,MSIHANDLE,LPCSTR,int,int); -UINT WINAPI MsiDatabaseGenerateTransformW(MSIHANDLE,MSIHANDLE,LPCWSTR,int,int); -#define MsiDatabaseGenerateTransform WINELIB_NAME_AW(MsiDatabaseGenerateTransform) - -UINT WINAPI MsiDatabaseCommit(MSIHANDLE); - -/* install state */ -UINT WINAPI MsiGetFeatureStateA(MSIHANDLE,LPSTR,INSTALLSTATE*,INSTALLSTATE*); -UINT WINAPI MsiGetFeatureStateW(MSIHANDLE,LPWSTR,INSTALLSTATE*,INSTALLSTATE*); -#define MsiGetFeatureState WINELIB_NAME_AW(MsiGetFeatureState) -UINT WINAPI MsiGetComponentStateA(MSIHANDLE,LPSTR,INSTALLSTATE*,INSTALLSTATE*); -UINT WINAPI MsiGetComponentStateW(MSIHANDLE,LPWSTR,INSTALLSTATE*,INSTALLSTATE*); -#define MsiGetComponentState WINELIB_NAME_AW(MsiGetComponentState) - -MSICONDITION WINAPI MsiEvaluateConditionA(MSIHANDLE,LPCSTR); -MSICONDITION WINAPI MsiEvaluateConditionW(MSIHANDLE,LPCWSTR); -#define MsiEvaluateCondition WINELIB_NAME_AW(MsiEvaluateCondition) - -/* property functions */ -UINT WINAPI MsiGetPropertyA(MSIHANDLE, LPCSTR, LPSTR, DWORD*); -UINT WINAPI MsiGetPropertyW(MSIHANDLE, LPCWSTR, LPWSTR, DWORD*); -#define MsiGetProperty WINELIB_NAME_AW(MsiGetProperty) - -UINT WINAPI MsiSetPropertyA(MSIHANDLE, LPCSTR, LPCSTR); -UINT WINAPI MsiSetPropertyW(MSIHANDLE, LPCWSTR, LPCWSTR); -#define MsiSetProperty WINELIB_NAME_AW(MsiSetProperty) - -UINT WINAPI MsiGetTargetPathA(MSIHANDLE,LPCSTR,LPSTR,DWORD*); -UINT WINAPI MsiGetTargetPathW(MSIHANDLE,LPCWSTR,LPWSTR,DWORD*); -#define MsiGetTargetPath WINELIB_NAME_AW(MsiGetTargetPath) - -UINT WINAPI MsiSetTargetPathA(MSIHANDLE, LPCSTR, LPCSTR); -UINT WINAPI MsiSetTargetPathW(MSIHANDLE, LPCWSTR, LPCWSTR); -#define MsiSetTargetPath WINELIB_NAME_AW(MsiSetTargetPath) - -UINT WINAPI MsiGetSourcePathA(MSIHANDLE,LPCSTR,LPSTR,DWORD*); -UINT WINAPI MsiGetSourcePathW(MSIHANDLE,LPCWSTR,LPWSTR,DWORD*); -#define MsiGetSourcePath WINELIB_NAME_AW(MsiGetSourcePath) - -MSIHANDLE WINAPI MsiGetActiveDatabase(MSIHANDLE); - -UINT WINAPI MsiViewGetColumnInfo(MSIHANDLE, MSICOLINFO, MSIHANDLE*); -INT WINAPI MsiProcessMessage(MSIHANDLE, INSTALLMESSAGE, MSIHANDLE); - -UINT WINAPI MsiSetFeatureStateA(MSIHANDLE, LPCSTR, INSTALLSTATE); -UINT WINAPI MsiSetFeatureStateW(MSIHANDLE, LPCWSTR, INSTALLSTATE); -#define MsiSetFeatureState WINELIB_NAME_AW(MsiSetFeatureState) - -BOOL WINAPI MsiGetMode(MSIHANDLE, MSIRUNMODE); - -#endif /* __WINE_MSIQUERY_H */ _____ Deleted: trunk/reactos/include/wine/npapi.h --- trunk/reactos/include/wine/npapi.h 2005-06-28 23:36:28 UTC (rev 16318) +++ trunk/reactos/include/wine/npapi.h 2005-06-29 00:11:39 UTC (rev 16319) @@ -1,203 +0,0 @@ -/* - * Copyright (C) 2004 Juan Lang - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -#ifndef __WINE_NPAPI_H__ -#define __WINE_NPAPI_H__ - -/* capabilities */ -#define WNNC_SPEC_VERSION 0x00000001 -#define WNNC_SPEC_VERSION51 0x00050001 -#define WNNC_NET_TYPE 0x00000002 -#define WNNC_NET_NONE 0x00000000 - -#define WNNC_DRIVER_VERSION 0x00000003 - -#define WNNC_USER 0x00000004 -#define WNNC_USR_GETUSER 0x00000001 - -#define WNNC_CONNECTION 0x00000006 -#define WNNC_CON_ADDCONNECTION 0x00000001 -#define WNNC_CON_CANCELCONNECTION 0x00000002 -#define WNNC_CON_GETCONNECTIONS 0x00000004 -#define WNNC_CON_ADDCONNECTION3 0x00000008 - -#define WNNC_DIALOG 0x00000008 -#define WNNC_DLG_DEVICEMODE 0x00000001 -#define WNNC_DLG_PROPERTYDIALOG 0x00000020 -#define WNNC_DLG_SEARCHDIALOG 0x00000040 -#define WNNC_DLG_FORMATNETWORKNAME 0x00000080 - -#define WNNC_ADMIN 0x00000009 -#define WNNC_ADM_GETDIRECTORYTYPE 0x00000001 -#define WNNC_ADM_DIRECTORYNOTIFY 0x00000002 - -#define WNNC_ENUMERATION 0x0000000b -#define WNNC_ENUM_GLOBAL 0x00000001 -#define WNNC_ENUM_LOCAL 0x00000002 - -#define WNNC_START 0x0000000c -#define WNNC_WAIT_FOR_START 0x00000001 - -typedef DWORD APIENTRY (*PF_NPGetCaps)(DWORD ndex); - -/* get user */ -typedef DWORD APIENTRY (*PF_NPGetUser)(LPWSTR lpName, LPWSTR lpUserName, - LPDWORD lpnBufferLen); - -/* enumeration-related */ -typedef DWORD APIENTRY (*PF_NPOpenEnum)(DWORD dwScope, DWORD dwType, DWORD dwUsage, - LPNETRESOURCEW lpNetResource, LPHANDLE lphEnum); -typedef DWORD APIENTRY (*PF_NPEnumResource)(HANDLE hEnum, LPDWORD lpcCount, - LPVOID lpBuffer, LPDWORD lpBufferSize); -typedef DWORD APIENTRY (*PF_NPCloseEnum)(HANDLE hEnum); - -/* connection-related */ -typedef DWORD APIENTRY (*PF_NPAddConnection)(LPNETRESOURCEW lpNetResource, - LPWSTR lpPassword, LPWSTR lpUserName); -typedef DWORD APIENTRY (*PF_NPAddConnection3)(HWND hwndOwner, - LPNETRESOURCEW lpNetResource, LPWSTR lpPassword, LPWSTR lpUserName, - DWORD dwFlags); -typedef DWORD APIENTRY (*PF_NPCancelConnection)(LPWSTR lpName, BOOL fForce); -typedef DWORD APIENTRY (*PF_NPGetConnection)(LPWSTR lpLocalName, - LPWSTR lpRemoteName, LPDWORD lpnBufferLen); - -/* network name manipulation */ -typedef DWORD APIENTRY (*PF_NPGetUniversalName)(LPWSTR lpLocalPath, - DWORD dwInfoLevel, LPVOID lpBuffer, LPDWORD lpnBufferSize); -typedef DWORD APIENTRY (*PF_NPFormatNetworkName)(LPWSTR lpRemoteName, - LPWSTR lpFormattedName, LPDWORD lpnLength, DWORD dwFlags, - DWORD dwAveCharPerLine); - -/* dialogs */ -typedef DWORD APIENTRY (*PF_NPDeviceMode)(HWND hParent); - -/* search dialog */ -#define WNSRCH_REFRESH_FIRST_LEVEL 0x00000001 - -typedef DWORD APIENTRY (*PF_NPSearchDialog)(HWND hwndParent, - LPNETRESOURCEW lpNetResource, LPVOID lpBuffer, DWORD cbBuffer, - LPDWORD lpnFlags); - -/* property dialog */ - -#define WNTYPE_DRIVE 1 -#define WNTYPE_FILE 2 -#define WNTYPE_PRINTER 3 -#define WNTYPE_COMM 4 - -#define WNPS_FILE 0 -#define WNPS_DIR 1 -#define WNPS_MULT 2 - -typedef DWORD APIENTRY (*PF_NPGetPropertyText)(DWORD iButton, DWORD nPropSel, - LPWSTR lpName, LPWSTR lpButtonName, DWORD nButtonNameLen, DWORD nType); - -typedef DWORD APIENTRY (*PF_NPPropertyDialog)(HWND hwndParent, DWORD iButtonDlg, - DWORD nPropSel, LPWSTR lpFileName, DWORD nType); - -/* admin */ -#define WNDT_NORMAL 0 -#define WNDT_NETWORK 1 - -#define WNDN_MKDIR 1 -#define WNDN_RMDIR 2 -#define WNDN_MVDIR 3 - -typedef DWORD APIENTRY (*PF_NPGetDirectoryType)(LPWSTR lpName, LPINT lpType, - BOOL bFlushCache); -typedef DWORD APIENTRY (*PF_NPDirectoryNotify)(HWND hwnd, LPWSTR lpDir, - DWORD dwOper); - -/* permission editor dialogs */ -#define WNPERMC_PERM 0x00000001 -#define WNPERMC_AUDIT 0x00000002 -#define WNPERMC_OWNER 0x00000004 - -typedef DWORD APIENTRY (*PF_NPFMXGetPermCaps)(LPWSTR lpDriveName); - -#define WNPERM_DLG_PERM 0 -#define WNPERM_DLG_AUDIT 1 -#define WNPERM_DLG_OWNER 2 - -typedef DWORD APIENTRY (*PF_NPFMXEditPerm)(LPWSTR lpDriveName, HWND hwndFMX, - DWORD nDialogType); - -typedef DWORD APIENTRY (*PF_NPFMXGetPermHelp)(LPWSTR lpDriveName, - DWORD nDialogType, BOOL fDirectory, LPVOID lpFileNameBuffer, - LPDWORD lpBufferSize, LPDWORD lpnHelpContext); - -VOID WINAPI WNetSetLastErrorA(DWORD err, LPSTR lpError, LPSTR lpProviders); -VOID WINAPI WNetSetLastErrorW(DWORD err, LPWSTR lpError, LPWSTR lpProviders); -#define WNetSetLastError WINELIB_NAME_AW(WNetSetLastError) - -/* provider classes */ -#define WN_NETWORK_CLASS 0x00000001 -#define WN_CREDENTIAL_CLASS 0x00000002 -#define WN_PRIMARY_AUTHENT_CLASS 0x00000004 -#define WN_SERVICE_CLASS 0x00000008 - -#define WN_VALID_LOGON_ACCOUNT 0x00000001 -#define WN_NT_PASSWORD_CHANGED 0x00000002 - -/* notifications */ -typedef DWORD APIENTRY (*PF_NPLogonNotify)(PLUID lpLogonId, - LPCWSTR lpAuthentInfoType, LPVOID lpAuthentInfo, - LPCWSTR lpPreviousAuthentInfoType, LPVOID lpPreviousAuthentInfo, - LPWSTR lpStationName, LPVOID StationHandle, LPWSTR *lpLogonScript); -typedef DWORD APIENTRY (*PF_NPPasswordChangeNotify)(LPCWSTR lpAuthentInfoType, - LPVOID lpAuthentInfo, LPCWSTR lpPreviousAuthentInfoType, - LPVOID lpPreviousAuthentInfo, LPWSTR lpStationName, LPVOID StationHandle, - DWORD dwChangeInfo); - -#define NOTIFY_PRE 0x00000001 -#define NOTIFY_POST 0x00000002 - -typedef struct _NOTIFYINFO -{ - DWORD dwNotifyStatus; - DWORD dwOperationStatus; - LPVOID lpContext; -} NOTIFYINFO, *LPNOTIFYINFO; - -/* FIXME: NetResource is declared as a NETRESOURCE in psdk, not a NETRESOURCEW, - * but how can the type change in a service provider? Defaulting to wide-char - * for consistency with the rest of the api. - */ -typedef struct _NOTIFYADD -{ - HWND hwndOwner; - NETRESOURCEW NetResource; - DWORD dwAddFlags; -} NOTIFYADD, *LPNOTIFYADD; - -/* FIXME: lpName and lpProvider are declared as LPTSTRs in psdk, but again - * for consistency with rest of api defaulting to LPWSTRs. - */ -typedef struct _NOTIFYCANCEL -{ - LPWSTR lpName; - LPWSTR lpProvider; - DWORD dwFlags; - BOOL fForce; -} NOTIFYCANCEL, *LPNOTIFYCANCEL; - -typedef DWORD APIENTRY (*PF_AddConnectNotify)(LPNOTIFYINFO lpNotifyInfo, - LPNOTIFYADD lpAddInfo); -typedef DWORD APIENTRY (*PF_CancelConnectNotify)(LPNOTIFYINFO lpNotifyInfo, - LPNOTIFYADD lpAddInfo); - -#endif /* ndef __WINE_NPAPI_H__ */ _____ Deleted: trunk/reactos/include/wine/winternl.h --- trunk/reactos/include/wine/winternl.h 2005-06-28 23:36:28 UTC (rev 16318) +++ trunk/reactos/include/wine/winternl.h 2005-06-29 00:11:39 UTC (rev 16319) @@ -1,1475 +0,0 @@ -/* - * Internal NT APIs and data structures - * - * Copyright (C) the Wine project - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef __WINE_WINTERNAL_H -#define __WINE_WINTERNAL_H - -#include <windef.h> -#include <wine/winnt.h> - -#ifdef __cplusplus -extern "C" { -#endif /* defined(__cplusplus) */ - - -/********************************************************************** - * Fundamental types and data structures - */ - -typedef LONG NTSTATUS, *PNTSTATUS; - -typedef CONST char *PCSZ; - -typedef short CSHORT; -typedef CSHORT *PCSHORT; - -typedef struct _STRING { - USHORT Length; - USHORT MaximumLength; - PCHAR Buffer; -} STRING, *PSTRING; - -typedef STRING ANSI_STRING; -typedef PSTRING PANSI_STRING; -typedef const STRING *PCANSI_STRING; - -typedef STRING OEM_STRING; -typedef PSTRING POEM_STRING; -typedef const STRING *PCOEM_STRING; - -typedef struct _UNICODE_STRING { - USHORT Length; /* bytes */ - USHORT MaximumLength; /* bytes */ - PWSTR Buffer; -} UNICODE_STRING, *PUNICODE_STRING; - -typedef const UNICODE_STRING *PCUNICODE_STRING; - -typedef struct _CLIENT_ID -{ - HANDLE UniqueProcess; - HANDLE UniqueThread; -} CLIENT_ID, *PCLIENT_ID; - -typedef struct _CURDIR -{ - UNICODE_STRING DosPath; - PVOID Handle; -} CURDIR, *PCURDIR; - -typedef struct RTL_DRIVE_LETTER_CURDIR -{ - USHORT Flags; - USHORT Length; - ULONG TimeStamp; - UNICODE_STRING DosPath; -} RTL_DRIVE_LETTER_CURDIR, *PRTL_DRIVE_LETTER_CURDIR; - -typedef struct tagRTL_BITMAP { - ULONG SizeOfBitMap; /* Number of bits in the bitmap */ - LPBYTE BitMapBuffer; /* Bitmap data, assumed sized to a DWORD boundary */ -} RTL_BITMAP, *PRTL_BITMAP; - -typedef const RTL_BITMAP *PCRTL_BITMAP; - -typedef struct tagRTL_BITMAP_RUN { - ULONG StartOfRun; /* Bit position at which run starts - FIXME: Name? */ - ULONG SizeOfRun; /* Size of the run in bits - FIXME: Name? */ -} RTL_BITMAP_RUN, *PRTL_BITMAP_RUN; - -typedef const RTL_BITMAP_RUN *PCRTL_BITMAP_RUN; - -typedef struct _RTL_USER_PROCESS_PARAMETERS -{ - ULONG AllocationSize; - ULONG Size; - ULONG Flags; - ULONG DebugFlags; - HANDLE hConsole; - ULONG ProcessGroup; - HANDLE hStdInput; - HANDLE hStdOutput; - HANDLE hStdError; - UNICODE_STRING CurrentDirectoryName; - HANDLE CurrentDirectoryHandle; - UNICODE_STRING DllPath; - UNICODE_STRING ImagePathName; - UNICODE_STRING CommandLine; - PWSTR Environment; - ULONG dwX; - ULONG dwY; - ULONG dwXSize; - ULONG dwYSize; - ULONG dwXCountChars; - ULONG dwYCountChars; - ULONG dwFillAttribute; - ULONG dwFlags; - ULONG wShowWindow; - UNICODE_STRING WindowTitle; - UNICODE_STRING Desktop; - UNICODE_STRING ShellInfo; - UNICODE_STRING RuntimeInfo; - RTL_DRIVE_LETTER_CURDIR DLCurrentDirectory[0x20]; -} RTL_USER_PROCESS_PARAMETERS, *PRTL_USER_PROCESS_PARAMETERS; - -/* value for Flags field (FIXME: not the correct name) */ -#define PROCESS_PARAMS_FLAG_NORMALIZED 1 - -typedef struct _PEB_LDR_DATA -{ - ULONG Length; - BOOLEAN Initialized; - PVOID SsHandle; - LIST_ENTRY InLoadOrderModuleList; - LIST_ENTRY InMemoryOrderModuleList; - LIST_ENTRY InInitializationOrderModuleList; -} PEB_LDR_DATA, *PPEB_LDR_DATA; - -/********************************************************************** * - * PEB data structure - */ -typedef struct _PEB -{ - BYTE Reserved1[2]; /* 00 */ - BYTE BeingDebugged; /* 02 */ - BYTE Reserved2[5]; /* 03 */ - HMODULE ImageBaseAddress; /* 08 */ - PPEB_LDR_DATA LdrData; /* 0c */ - RTL_USER_PROCESS_PARAMETERS *ProcessParameters; /* 10 */ - PVOID __pad_14; /* 14 */ - HANDLE ProcessHeap; /* 18 */ - BYTE __pad_1c[36]; /* 1c */ - PRTL_BITMAP TlsBitmap; /* 40 */ - ULONG TlsBitmapBits[2]; /* 44 */ - BYTE __pad_4c[104]; /* 4c */ - ULONG ImageSubSystem; /* b4 */ - BYTE __pad_b8[48]; /* b8 */ - PVOID Reserved3[59]; /* e8 */ - ULONG SessionId; /* 1d4 */ -} PEB, *PPEB; - - -/********************************************************************** * - * TEB data structure - */ -#if defined(_NTSYSTEM_) || defined(_KERNEL32_) /* hack, should go away */ -# define WINE_NO_TEB -#endif - -#ifndef WINE_NO_TEB /* don't define TEB if included from thread.h */ -# ifndef WINE_TEB_DEFINED -# define WINE_TEB_DEFINED -typedef struct _TEB -{ - NT_TIB Tib; /* 000 */ - PVOID EnvironmentPointer; /* 01c */ - CLIENT_ID ClientId; /* 020 */ - PVOID ActiveRpcHandle; /* 028 */ - PVOID ThreadLocalStoragePointer; /* 02c */ - PPEB Peb; /* 030 */ - ULONG LastErrorValue; /* 034 */ - BYTE __pad038[140]; /* 038 */ - ULONG CurrentLocale; /* 0c4 */ - BYTE __pad0c8[1752]; /* 0c8 */ - PVOID Reserved2[278]; /* 7a0 */ - UNICODE_STRING StaticUnicodeString; /* bf8 used by advapi32 */ - WCHAR StaticUnicodeBuffer[261]; /* c00 used by advapi32 */ - PVOID DeallocationStack; /* e0c */ - PVOID TlsSlots[64]; /* e10 */ - LIST_ENTRY TlsLinks; /* f10 */ - PVOID Reserved4[26]; /* f18 */ - PVOID ReservedForOle; /* f80 Windows 2000 only */ - PVOID Reserved5[4]; /* f84 */ - PVOID TlsExpansionSlots; /* f94 */ -} TEB, *PTEB; -# endif /* WINE_TEB_DEFINED */ -#endif /* WINE_NO_TEB */ - -/********************************************************************** * - * Enums - */ - -typedef enum _FILE_INFORMATION_CLASS { - FileDirectoryInformation = 1, - FileFullDirectoryInformation, - FileBothDirectoryInformation, - FileBasicInformation, - FileStandardInformation, - FileInternalInformation, - FileEaInformation, - FileAccessInformation, - FileNameInformation, - FileRenameInformation, - FileLinkInformation, - FileNamesInformation, - FileDispositionInformation, - FilePositionInformation, - FileFullEaInformation, - FileModeInformation, - FileAlignmentInformation, - FileAllInformation, - FileAllocationInformation, - FileEndOfFileInformation, - FileAlternateNameInformation, - FileStreamInformation, - FilePipeInformation, - FilePipeLocalInformation, - FilePipeRemoteInformation, - FileMailslotQueryInformation, - FileMailslotSetInformation, - FileCompressionInformation, - FileObjectIdInformation, - FileCompletionInformation, - FileMoveClusterInformation, - FileQuotaInformation, - FileReparsePointInformation, - FileNetworkOpenInformation, - FileAttributeTagInformation, - FileTrackingInformation, - FileMaximumInformation -} FILE_INFORMATION_CLASS, *PFILE_INFORMATION_CLASS; - -#include <pshpack8.h> -typedef struct _FILE_BASIC_INFORMATION { - LARGE_INTEGER CreationTime; - LARGE_INTEGER LastAccessTime; - LARGE_INTEGER LastWriteTime; - LARGE_INTEGER ChangeTime; - ULONG FileAttributes; -} FILE_BASIC_INFORMATION, *PFILE_BASIC_INFORMATION; -#include <poppack.h> - -typedef struct _FILE_STANDARD_INFORMATION { - LARGE_INTEGER AllocationSize; - LARGE_INTEGER EndOfFile; - ULONG NumberOfLinks; - BOOLEAN DeletePending; - BOOLEAN Directory; -} FILE_STANDARD_INFORMATION, *PFILE_STANDARD_INFORMATION; - -typedef struct _FILE_POSITION_INFORMATION { - LARGE_INTEGER CurrentByteOffset; -} FILE_POSITION_INFORMATION, *PFILE_POSITION_INFORMATION; - -typedef struct _FILE_ALIGNMENT_INFORMATION { - ULONG AlignmentRequirement; -} FILE_ALIGNMENT_INFORMATION, *PFILE_ALIGNMENT_INFORMATION; - -typedef struct _FILE_NETWORK_OPEN_INFORMATION { - LARGE_INTEGER CreationTime; - LARGE_INTEGER LastAccessTime; - LARGE_INTEGER LastWriteTime; - LARGE_INTEGER ChangeTime; - LARGE_INTEGER AllocationSize; - LARGE_INTEGER EndOfFile; - ULONG FileAttributes; -} FILE_NETWORK_OPEN_INFORMATION, *PFILE_NETWORK_OPEN_INFORMATION; - -typedef struct _FILE_FULL_EA_INFORMATION { - ULONG NextEntryOffset; - UCHAR Flags; - UCHAR EaNameLength; - USHORT EaValueLength; - CHAR EaName[1]; -} FILE_FULL_EA_INFORMATION, *PFILE_FULL_EA_INFORMATION; - -typedef struct _FILE_STREAM_INFORMATION -{ - ULONG NextEntryOffset; - ULONG StreamNameLength; - LARGE_INTEGER StreamSize; - LARGE_INTEGER StreamAllocationSize; - WCHAR StreamName[1]; -} FILE_STREAM_INFORMATION, *PFILE_STREAM_INFORMATION; - -struct _FILE_ATTRIBUTE_TAG_INFORMATION -{ - ULONG FileAttributes; - ULONG ReparseTag; -} FILE_ATTRIBUTE_TAG_INFORMATION, *PFILE_ATTRIBUTE_TAG_INFORMATION; - -typedef enum _FSINFOCLASS { - FileFsVolumeInformation = 1, - FileFsLabelInformation, - FileFsSizeInformation, - FileFsDeviceInformation, - FileFsAttributeInformation, - FileFsControlInformation, - FileFsFullSizeInformation, - FileFsObjectIdInformation, - FileFsMaximumInformation -} FS_INFORMATION_CLASS, *PFS_INFORMATION_CLASS; - -typedef enum _KEY_INFORMATION_CLASS { - KeyBasicInformation, - KeyNodeInformation, - KeyFullInformation -} KEY_INFORMATION_CLASS; - -typedef enum _KEY_VALUE_INFORMATION_CLASS { - KeyValueBasicInformation, - KeyValueFullInformation, - KeyValuePartialInformation, - KeyValueFullInformationAlign64, - KeyValuePartialInformationAlign64 -} KEY_VALUE_INFORMATION_CLASS; - -typedef enum _OBJECT_INFORMATION_CLASS { - ObjectBasicInformation, - ObjectNameInformation, - ObjectTypeInformation, - ObjectAllInformation, - ObjectDataInformation -} OBJECT_INFORMATION_CLASS, *POBJECT_INFORMATION_CLASS; - -typedef enum _PROCESSINFOCLASS { - ProcessBasicInformation = 0, - ProcessQuotaLimits = 1, - ProcessIoCounters = 2, - ProcessVmCounters = 3, - ProcessTimes = 4, - ProcessBasePriority = 5, - ProcessRaisePriority = 6, - ProcessDebugPort = 7, - ProcessExceptionPort = 8, - ProcessAccessToken = 9, - ProcessLdtInformation = 10, - ProcessLdtSize = 11, - ProcessDefaultHardErrorMode = 12, - ProcessIoPortHandlers = 13, - ProcessPooledUsageAndLimits = 14, - ProcessWorkingSetWatch = 15, - ProcessUserModeIOPL = 16, - ProcessEnableAlignmentFaultFixup = 17, - ProcessPriorityClass = 18, - ProcessWx86Information = 19, - ProcessHandleCount = 20, - ProcessAffinityMask = 21, - ProcessPriorityBoost = 22, - ProcessDeviceMap = 23, - ProcessSessionInformation = 24, - ProcessForegroundInformation = 25, - ProcessWow64Information = 26, - MaxProcessInfoClass -} PROCESSINFOCLASS; - -typedef enum _SECTION_INHERIT { - ViewShare = 1, - ViewUnmap = 2 -} SECTION_INHERIT; - -typedef enum SYSTEM_INFORMATION_CLASS { - SystemBasicInformation = 0, - Unknown1, - SystemPerformanceInformation = 2, - SystemTimeOfDayInformation = 3, /* was SystemTimeInformation */ - Unknown4, - SystemProcessInformation = 5, - Unknown6, - Unknown7, - SystemProcessorPerformanceInformation = 8, - Unknown9, - Unknown10, - SystemDriverInformation, - Unknown12, - Unknown13, - Unknown14, - Unknown15, - SystemHandleList, - Unknown17, - Unknown18, - Unknown19, - Unknown20, - SystemCacheInformation, - Unknown22, - SystemInterruptInformation = 23, - SystemExceptionInformation = 33, - SystemRegistryQuotaInformation = 37, - SystemLookasideInformation = 45 -} SYSTEM_INFORMATION_CLASS, *PSYSTEM_INFORMATION_CLASS; - -typedef enum _TIMER_TYPE { - NotificationTimer, - SynchronizationTimer -} TIMER_TYPE; - -typedef enum _THREADINFOCLASS { - ThreadBasicInformation, - ThreadTimes, - ThreadPriority, - ThreadBasePriority, - ThreadAffinityMask, - ThreadImpersonationToken, - ThreadDescriptorTableEntry, - ThreadEnableAlignmentFaultFixup, - ThreadEventPair_Reusable, - ThreadQuerySetWin32StartAddress, - ThreadZeroTlsCell, - ThreadPerformanceCount, - ThreadAmILastThread, - ThreadIdealProcessor, - ThreadPriorityBoost, - ThreadSetTlsArrayAddress, - ThreadIsIoPending, - MaxThreadInfoClass -} THREADINFOCLASS; - -typedef struct _THREAD_BASIC_INFORMATION -{ - NTSTATUS ExitStatus; - PVOID TebBaseAddress; - CLIENT_ID ClientId; - ULONG AffinityMask; - LONG Priority; - LONG BasePriority; -} THREAD_BASIC_INFORMATION, *PTHREAD_BASIC_INFORMATION; - - -typedef enum _WINSTATIONINFOCLASS { - WinStationInformation = 8 -} WINSTATIONINFOCLASS; - -typedef enum -{ - MemoryBasicInformation = 0 -} MEMORY_INFORMATION_CLASS; - -/* return type of RtlDetermineDosPathNameType_U (FIXME: not the correct names) */ -typedef enum -{ - INVALID_PATH = 0, - UNC_PATH, /* "//foo" */ - ABSOLUTE_DRIVE_PATH, /* "c:/foo" */ - RELATIVE_DRIVE_PATH, /* "c:foo" */ - ABSOLUTE_PATH, /* "/foo" */ - RELATIVE_PATH, /* "foo" */ - DEVICE_PATH, /* "//./foo" */ - UNC_DOT_PATH /* "//." */ -} DOS_PATHNAME_TYPE; - -/********************************************************************** * - * IA64 specific types and data structures - */ - -#ifdef __ia64__ - -typedef struct _FRAME_POINTERS { - ULONGLONG MemoryStackFp; - ULONGLONG BackingStoreFp; -} FRAME_POINTERS, *PFRAME_POINTERS; - -#define UNWIND_HISTORY_TABLE_SIZE 12 - -typedef struct _RUNTIME_FUNCTION { - ULONG BeginAddress; - ULONG EndAddress; - ULONG UnwindInfoAddress; -} RUNTIME_FUNCTION, *PRUNTIME_FUNCTION; - -typedef struct _UNWIND_HISTORY_TABLE_ENTRY { - ULONG64 ImageBase; - ULONG64 Gp; - PRUNTIME_FUNCTION FunctionEntry; -} UNWIND_HISTORY_TABLE_ENTRY, *PUNWIND_HISTORY_TABLE_ENTRY; - -typedef struct _UNWIND_HISTORY_TABLE { - ULONG Count; - UCHAR Search; - ULONG64 LowAddress; - ULONG64 HighAddress; - UNWIND_HISTORY_TABLE_ENTRY Entry[UNWIND_HISTORY_TABLE_SIZE]; -} UNWIND_HISTORY_TABLE, *PUNWIND_HISTORY_TABLE; - -#endif /* defined(__ia64__) */ - -/********************************************************************** * - * Types and data structures - */ - -/* This is used by NtQuerySystemInformation */ -/* FIXME: Isn't THREAD_INFO and THREADINFO the same structure? */ -typedef struct { - FILETIME ftKernelTime; - FILETIME ftUserTime; - FILETIME ftCreateTime; - DWORD dwTickCount; - DWORD dwStartAddress; - DWORD dwOwningPID; - DWORD dwThreadID; - DWORD dwCurrentPriority; - DWORD dwBasePriority; - DWORD dwContextSwitches; - DWORD dwThreadState; - DWORD dwWaitReason; -} THREADINFO, *PTHREADINFO; - -/* FIXME: Isn't THREAD_INFO and THREADINFO the same structure? */ -typedef struct _THREAD_INFO{ - DWORD Unknown1[6]; - DWORD ThreadID; - DWORD Unknown2[3]; - DWORD Status; - DWORD WaitReason; - DWORD Unknown3[4]; -} THREAD_INFO, PTHREAD_INFO; - -/********************************************************************** * - * Types and data structures - */ - -typedef struct _IO_STATUS_BLOCK { - union { - NTSTATUS Status; - PVOID Pointer; - } DUMMYUNIONNAME; - - ULONG_PTR Information; -} IO_STATUS_BLOCK, *PIO_STATUS_BLOCK; - -typedef void (WINAPI * PIO_APC_ROUTINE)(PVOID,PIO_STATUS_BLOCK,ULONG); - -typedef struct _KEY_BASIC_INFORMATION { - LARGE_INTEGER LastWriteTime; - ULONG TitleIndex; - ULONG NameLength; - WCHAR Name[1]; -} KEY_BASIC_INFORMATION, *PKEY_BASIC_INFORMATION; - -typedef struct _KEY_NODE_INFORMATION -{ - LARGE_INTEGER LastWriteTime; - ULONG TitleIndex; - ULONG ClassOffset; - ULONG ClassLength; - ULONG NameLength; - WCHAR Name[1]; - /* Class[1]; */ -} KEY_NODE_INFORMATION, *PKEY_NODE_INFORMATION; - -typedef struct _KEY_FULL_INFORMATION -{ - LARGE_INTEGER LastWriteTime; - ULONG TitleIndex; - ULONG ClassOffset; - ULONG ClassLength; - ULONG SubKeys; - ULONG MaxNameLen; - ULONG MaxClassLen; - ULONG Values; - ULONG MaxValueNameLen; - ULONG MaxValueDataLen; - WCHAR Class[1]; -} KEY_FULL_INFORMATION, *PKEY_FULL_INFORMATION; - -typedef struct _KEY_VALUE_ENTRY -{ - PUNICODE_STRING ValueName; - ULONG DataLength; - ULONG DataOffset; - ULONG Type; -} KEY_VALUE_ENTRY, *PKEY_VALUE_ENTRY; - -typedef struct _KEY_VALUE_BASIC_INFORMATION { - ULONG TitleIndex; - ULONG Type; - ULONG NameLength; - WCHAR Name[1]; -} KEY_VALUE_BASIC_INFORMATION, *PKEY_VALUE_BASIC_INFORMATION; - -typedef struct _KEY_VALUE_FULL_INFORMATION { - ULONG TitleIndex; - ULONG Type; - ULONG DataOffset; - ULONG DataLength; - ULONG NameLength; - WCHAR Name[1]; [truncated at 1000 lines; 3359 more skipped]

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs