Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 30247: - Don't include <windows.h> if it's not needed. - Fix strange usage of TABs.
by fireball＠svn.reactos.org 07 Nov '07

07 Nov '07

Author: fireball Date: Thu Nov 8 01:34:05 2007 New Revision: 30247 URL: http://svn.reactos.org/svn/reactos?rev=30247&view=rev Log: - Don't include <windows.h> if it's not needed. - Fix strange usage of TABs. Modified: trunk/reactos/lib/sdk/libcntpr/string/wtol.c Modified: trunk/reactos/lib/sdk/libcntpr/string/wtol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/string/wt… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/string/wtol.c (original) +++ trunk/reactos/lib/sdk/libcntpr/string/wtol.c Thu Nov 8 01:34:05 2007 @@ -1,6 +1,8 @@ #include <string.h> -#include <stdlib.h> -#include <windows.h> +#include <ctype.h> +#include <basetsd.h> + +/* Implementation comes from wine/dlls/ntdll/wcstring.c */ /* * @implemented @@ -8,23 +10,23 @@ long _wtol(const wchar_t *str) { - ULONG RunningTotal = 0; + unsigned long RunningTotal = 0; char bMinus = 0; while (iswctype(*str, _SPACE) ) { - str++; + str++; } /* while */ if (*str == L'+') { - str++; + str++; } else if (*str == L'-') { - bMinus = 1; - str++; + bMinus = 1; + str++; } /* if */ while (*str >= L'0' && *str <= L'9') { - RunningTotal = RunningTotal * 10 + *str - L'0'; - str++; + RunningTotal = RunningTotal * 10 + *str - L'0'; + str++; } /* while */ return bMinus ? -RunningTotal : RunningTotal;

1 0

[greatlrd] 30246: add 40 more guids for ksguid.a
by greatlrd＠svn.reactos.org 07 Nov '07

07 Nov '07

Author: greatlrd Date: Thu Nov 8 00:45:50 2007 New Revision: 30246 URL: http://svn.reactos.org/svn/reactos?rev=30246&view=rev Log: add 40 more guids for ksguid.a Modified: branches/reactx/reactos/lib/sdk/ksguid/ksguid.c Modified: branches/reactx/reactos/lib/sdk/ksguid/ksguid.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/lib/sdk/ksguid/k… ============================================================================== --- branches/reactx/reactos/lib/sdk/ksguid/ksguid.c (original) +++ branches/reactx/reactos/lib/sdk/ksguid/ksguid.c Thu Nov 8 00:45:50 2007 @@ -74,6 +74,52 @@ + +DEFINE_GUID(KSCATEGORY_TVAUDIO, 0xA799A802, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0x24, 0x01, 0xDC, 0xD4); +DEFINE_GUID(KSCATEGORY_CROSSBAR, 0xA799A801, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0x24, 0x01, 0xDC, 0xD4); +DEFINE_GUID(KSCATEGORY_TVTUNER, 0xA799A800, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0x24, 0x01, 0xDC, 0xD4); +DEFINE_GUID(KSPROPSETID_CopyProt, 0x0E8A0A40, 0x6AEF, 0x11D0, 0x9E, 0xD0, 0x00, 0xA0, 0x24, 0xCA, 0x19, 0xB3); +DEFINE_GUID(KSPROPSETID_DvdSubPic, 0xAC390460, 0x43AF, 0x11D0, 0xBD, 0x6A, 0x00, 0x35, 0x05, 0xC1, 0x03, 0xA9); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_SUBPICTURE, 0xE06D802D, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSPROPSETID_AudioDecoderOut, 0x6CA6E020, 0x43BD, 0x11D0, 0xBD, 0x6A, 0x00, 0x35, 0x05, 0xC1, 0x03, 0xA9); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_SDDS_AUDIO, 0xE06D8034, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_DTS_AUDIO, 0xE06D8033, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSPROPSETID_AC3, 0xBFABE720, 0x6E1F, 0x11D0, 0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_AC3_AUDIO, 0xE06D80E4, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_AC3_AUDIO, 0xE06D802C, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_LPCM_AUDIO, 0xE06D80E6, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_LPCM_AUDIO, 0xE06D8032, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_MPEG2_AUDIO, 0xE06D80E5, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG2_AUDIO, 0xE06D802B, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSPROPSETID_Mpeg2Vid, 0xC8E11B60, 0x0CC9, 0x11D0, 0xBD, 0x69, 0x00, 0x35, 0x05, 0xC1, 0x03, 0xA9); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_MPEG2_VIDEO, 0xE06D80E3, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG2_VIDEO, 0xE06D8026, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_TYPE_MPEG2_TRANSPORT, 0xE06D8023, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_TYPE_MPEG2_PROGRAM, 0xE06D8022, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_TYPE_MPEG2_PES, 0xE06D8020, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_MPEG1_VIDEO, 0x05589F82, 0xC356, 0x11CE, 0xBF, 0x01, 0x00, 0xAA, 0x00, 0x55, 0x59, 0x5A); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG1Video, 0xE436EB86, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG1Payload, 0xE436EB81, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG1Packet, 0xE436EB80, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_DSS_AUDIO, 0xA0AF4F82, 0xE163, 0x11D0, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_DSS_VIDEO, 0xA0AF4F81, 0xE163, 0x11D0, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DIALECT_AC3_AUDIO, 0x36523B35, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DIALECT_MPEG2_AUDIO, 0x36523B34, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DIALECT_MPEG2_VIDEO, 0x36523B33, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DIALECT_MPEG1_AUDIO, 0x36523B32, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DIALECT_MPEG1_VIDEO, 0x36523B31, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_STANDARD_AC3_AUDIO, 0x36523B25, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_STANDARD_MPEG2_AUDIO, 0x36523B24, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_STANDARD_MPEG2_VIDEO, 0x36523B23, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_STANDARD_MPEG1_AUDIO, 0x36523B22, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_STANDARD_MPEG1_VIDEO, 0x36523B21, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_TYPE_STANDARD_PACK_HEADER, 0x36523B13, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_TYPE_STANDARD_PES_PACKET, 0x36523B12, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_TYPE_STANDARD_ELEMENTARY_STREAM, 0x36523B11, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_RIFFMIDI, 0x4995DAF0, 0x9EE6, 0x11D0, 0xA4, 0x0E, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MIDI_BUS, 0x2CA15FA0, 0x6CFE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MIDI, 0x1D262760, 0xE957, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSDATAFORMAT_TYPE_MIDI, 0x7364696D, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); DEFINE_GUID(KSDATAFORMAT_TYPE_MUSIC, 0xE725D360, 0x62CC, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); DEFINE_GUID(KSPROPSETID_Linear, 0x5A2FFE80, 0x16B9, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); DEFINE_GUID(KSPROPSETID_AudioGfx, 0x79A9312E, 0x59AE, 0x43B0, 0xA3, 0x50, 0x8B, 0x05, 0x28, 0x4C, 0xAB, 0x24); @@ -330,10 +376,6 @@ DEFINE_GUID(KSPROPSETID_General, 0x1464EDA5, 0x6A8F, 0x11D1, 0x9A, 0xA7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSPROPTYPESETID_General, 0x97E99BA0, 0xBDEA, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); - - - - DEFINE_GUID(PROPSETID_VIDCAP_DROPPEDFRAMES, 0xC6E13344, 0x30AC, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); DEFINE_GUID(PROPSETID_VIDCAP_VIDEOCONTROL, 0x6A2E0670, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); DEFINE_GUID(PROPSETID_VIDCAP_VIDEOCOMPRESSION, 0xC6E13343, 0x30AC, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56);

1 0

[greatlrd] 30245: add around 100 more guids for ksguid.a
by greatlrd＠svn.reactos.org 07 Nov '07

07 Nov '07

Author: greatlrd Date: Wed Nov 7 23:57:31 2007 New Revision: 30245 URL: http://svn.reactos.org/svn/reactos?rev=30245&view=rev Log: add around 100 more guids for ksguid.a Modified: branches/reactx/reactos/lib/sdk/ksguid/ksguid.c Modified: branches/reactx/reactos/lib/sdk/ksguid/ksguid.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/lib/sdk/ksguid/k… ============================================================================== --- branches/reactx/reactos/lib/sdk/ksguid/ksguid.c (original) +++ branches/reactx/reactos/lib/sdk/ksguid/ksguid.c Wed Nov 7 23:57:31 2007 @@ -14,224 +14,330 @@ #include <basetyps.h> #include <guiddef.h> - -DEFINE_GUID(IID_IKoInitializeParentDeviceObject, 0x21B36996, 0x8DE3, 0x11D1, 0x8A, 0xE0, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KoCreateObject, 0x72CF721C, 0x525A, 0x11D1, 0x9A, 0xA1, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(IID_IUnknown, 0x00000000, 0x0000, 0x0000, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46); -DEFINE_GUID(CLSID_Proxy, 0x17CCA71B, 0xECD7, 0x11D0, 0xB9, 0x08, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(IID_IKsTopology, 0x28F54683, 0x06FD, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(IID_IKsAggregateControl, 0x7F40EAC0, 0x3947, 0x11D2, 0x87, 0x4E, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(IID_IKsControl, 0x28F54685, 0x06FD, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(IID_IKsPropertySet, 0x31EFAC30, 0x515C, 0x11D0, 0xA9, 0xAA, 0x00, 0xAA, 0x00, 0x61, 0xBE, 0x93); -DEFINE_GUID(IID_IKsAllocatorEx, 0x091BB60A, 0x603F, 0x11D1, 0xB0, 0x67, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); -DEFINE_GUID(IID_IKsAllocator, 0x8DA64899, 0xC0D9, 0x11D0, 0x84, 0x13, 0x00, 0x00, 0xF8, 0x22, 0xFE, 0x8A); -DEFINE_GUID(IID_IKsClockPropertySet, 0x5C5CBD84, 0xE755, 0x11D0, 0xAC, 0x18, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(IID_IKsInterfaceHandler, 0xD3ABC7E0, 0x9A61, 0x11D0, 0xA4, 0x0D, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(IID_IKsDataTypeCompletion, 0x827D1A0E, 0x0F73, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(IID_IKsDataTypeHandler, 0x5FFBAA02, 0x49A3, 0x11D0, 0x9F, 0x36, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xA1); -DEFINE_GUID(IID_IKsPinPipe, 0xE539CD90, 0xA8B4, 0x11D1, 0x81, 0x89, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); -DEFINE_GUID(IID_IKsPinEx, 0x7BB38260, 0xD19C, 0x11D2, 0xB3, 0x8A, 0x00, 0xA0, 0xC9, 0x5E, 0xC2, 0x2E); -DEFINE_GUID(IID_IKsPin, 0xB611780D, 0xA2D9, 0x11CF, 0x9E, 0x53, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xA1); -DEFINE_GUID(IID_IKsObject, 0x423C13A2, 0x2070, 0x11D0, 0x9E, 0xF7, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xA1); - -DEFINE_GUID(CLSID_KsIBasicAudioInterfaceHandler, 0xB9F8AC3E, 0x0F71, 0x11D2, 0xB7, 0x2C, 0x00, 0xC0, 0x4F, 0xB6, 0xBD, 0x3D); - -DEFINE_GUID(CODECAPI_CURRENTCHANGELIST, 0x1CB14E83, 0x7D72, 0x4657, 0x83, 0xFD, 0x47, 0xA2, 0xC5, 0xB9, 0xD1, 0x3D); -DEFINE_GUID(CODECAPI_SUPPORTSEVENTS, 0x0581AF97, 0x7693, 0x4DBD, 0x9D, 0xCA, 0x3F, 0x9E, 0xBD, 0x65, 0x85, 0xA1); -DEFINE_GUID(CODECAPI_ALLSETTINGS, 0x6A577E92, 0x83E1, 0x4113, 0xAD, 0xC2, 0x4F, 0xCE, 0xC3, 0x2F, 0x83, 0xA1); -DEFINE_GUID(CODECAPI_SETALLDEFAULTS, 0x6C5E6A7C, 0xACF8, 0x4F55, 0xA9, 0x99, 0x1A, 0x62, 0x81, 0x09, 0x05, 0x1B); -DEFINE_GUID(CODECAPI_AUDIO_ENCODER, 0xB9D19A3E, 0xF897, 0x429C, 0xBC, 0x46, 0x81, 0x38, 0xB7, 0x27, 0x2B, 0x2D); -DEFINE_GUID(CODECAPI_VIDEO_ENCODER, 0x7112E8E1, 0x3D03, 0x47EF, 0x8E, 0x60, 0x03, 0xF1, 0xCF, 0x53, 0x73, 0x01); -DEFINE_GUID(CODECAPI_CHANGELISTS, 0x62B12ACF, 0xF6B0, 0x47D9, 0x94, 0x56, 0x96, 0xF2, 0x2C, 0x4E, 0x0B, 0x9D); -DEFINE_GUID(ENCAPIPARAM_BITRATE_MODE, 0xEE5FB25C, 0xC713, 0x40D1, 0x9D, 0x58, 0xC0, 0xD7, 0x24, 0x1E, 0x25, 0x0F); -DEFINE_GUID(ENCAPIPARAM_PEAK_BITRATE, 0x703F16A9, 0x3D48, 0x44A1, 0xB0, 0x77, 0x01, 0x8D, 0xFF, 0x91, 0x5D, 0x19); -DEFINE_GUID(ENCAPIPARAM_BITRATE, 0x49CC4C43, 0xCA83, 0x4AD4, 0xA9, 0xAF, 0xF3, 0x69, 0x6A, 0xF6, 0x66, 0xDF); - -DEFINE_GUID(KSCATEGORY_MULTIPLEXER, 0x7A5DE1D3, 0x01A1, 0x452C, 0xB4, 0x81, 0x4F, 0xA2, 0xB9, 0x62, 0x71, 0xE8); -DEFINE_GUID(KSCATEGORY_ENCODER, 0x19689BF6, 0xC384, 0x48FD, 0xAD, 0x51, 0x90, 0xE5, 0x8C, 0x79, 0xF7, 0x0B); -DEFINE_GUID(KSPROPSETID_TSRateChange, 0xA503C5C0, 0x1D1D, 0x11D1, 0xAD, 0x80, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); -DEFINE_GUID(KSDATAFORMAT_TYPE_DVD_ENCRYPTED_PACK, 0xED0B916A, 0x044D, 0x11D1, 0xAA, 0x78, 0x00, 0xC0, 0x4F, 0xC3, 0x1D, 0x60); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_Line21_GOPPacket, 0x6E8D4A23, 0x310C, 0x11D0, 0xB7, 0x9A, 0x00, 0xAA, 0x00, 0x37, 0x67, 0xA7); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_Line21_BytePair, 0x6E8D4A22, 0x310C, 0x11D0, 0xB7, 0x9A, 0x00, 0xAA, 0x00, 0x37, 0x67, 0xA7); -DEFINE_GUID(KSDATAFORMAT_TYPE_AUXLine21Data, 0x670AEA80, 0x3A82, 0x11D0, 0xB7, 0x9B, 0x00, 0xAA, 0x00, 0x37, 0x67, 0xA7); -DEFINE_GUID(KSEVENTSETID_VPVBINotify, 0xEC529B01, 0x1A1F, 0x11D1, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A); -DEFINE_GUID(KSEVENTSETID_VIDCAPTOSTI, 0xDB47DE20, 0xF628, 0x11D1, 0xBA, 0x41, 0x00, 0xA0, 0xC9, 0x0D, 0x2B, 0x05); -DEFINE_GUID(KSEVENTSETID_VPNotify, 0x20C5598E, 0xD3C8, 0x11D0, 0x8D, 0xFC, 0x00, 0xC0, 0x4F, 0xD7, 0xC0, 0x8B); -DEFINE_GUID(KSPROPSETID_VPVBIConfig, 0xEC529B00, 0x1A1F, 0x11D1, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A); - - - -DEFINE_GUID(KSNODETYPE_NOISE_SUPPRESS, 0xE07F903F, 0x62FD, 0x4E60, 0x8C, 0xDD, 0xDE, 0xA7, 0x23, 0x66, 0x65, 0xB5); -DEFINE_GUID(KSNODETYPE_AG, 0xE88C9BA0, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); -DEFINE_GUID(KSNODETYPE_EQUALIZER, 0x9D41B4A0, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); -DEFINE_GUID(KSNODETYPE_TONE, 0x7607E580, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); -DEFINE_GUID(KSNODETYPE_VOLUME, 0x3A5ACC00, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); -DEFINE_GUID(KSNODETYPE_MUTE, 0x02B223C0, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); -DEFINE_GUID(KSNODETYPE_SUM, 0xDA441A60, 0xC556, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); -DEFINE_GUID(KSNODETYPE_DEMUX, 0xC0EB67D4, 0xE807, 0x11D0, 0x95, 0x8A, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSNODETYPE_MUX, 0x2CEAF780, 0xC556, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); -DEFINE_GUID(KSNODETYPE_SUPERMIX, 0xE573ADC0, 0xC555, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); -DEFINE_GUID(KSNODETYPE_SRC, 0x9DB7B9E0, 0xC555, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); -DEFINE_GUID(KSNODETYPE_ADC, 0x4D837FE0, 0xC555, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); -DEFINE_GUID(KSNODETYPE_DAC, 0x507AE360, 0xC554, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); -DEFINE_GUID(KSPROPSETID_Audio, 0x45FFAAA0, 0x6E1B, 0x11D0, 0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); -DEFINE_GUID(KSPROPSETID_DrmAudioStream, 0x2F2C8DDD, 0x4198, 0x4FAC, 0xBA, 0x29, 0x61, 0xBB, 0x05, 0xB7, 0xDE, 0x06); -DEFINE_GUID(KSPROPSETID_RtAudio, 0xA855A48C, 0x2F78, 0x4729, 0x90, 0x51, 0x19, 0x68, 0x74, 0x6B, 0x9E, 0xEF); -DEFINE_GUID(KSPROPSETID_TopologyNode, 0x45FFAAA1, 0x6E1B, 0x11D0, 0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); -DEFINE_GUID(KSPROPSETID_Bibliographic, 0x07BA150E, 0xE2B1, 0x11D0, 0xAC, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_RIFFWAVE, 0xE436EB8B, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_RIFF, 0x4995DAEE, 0x9EE6, 0x11D0, 0xA4, 0x0E, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSPROPSETID_Itd3d, 0x6429F090, 0x9FD9, 0x11D0, 0xA7, 0x5B, 0x00, 0xA0, 0xC9, 0x03, 0x65, 0xE3); -DEFINE_GUID(KSPROPSETID_Hrtf3d, 0xB66DECB0, 0xA083, 0x11D0, 0x85, 0x1E, 0x00, 0xC0, 0x4F, 0xD9, 0xBA, 0xF3); -DEFINE_GUID(KSPROPSETID_DirectSound3DBuffer, 0x437B3411, 0xD060, 0x11D0, 0x85, 0x83, 0x00, 0xC0, 0x4F, 0xD9, 0xBA, 0xF3); -DEFINE_GUID(KSPROPSETID_DirectSound3DListener, 0x437B3414, 0xD060, 0x11D0, 0x85, 0x83, 0x00, 0xC0, 0x4F, 0xD9, 0xBA, 0xF3); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DSOUND, 0x518590A2, 0xA184, 0x11D0, 0x85, 0x22, 0x00, 0xC0, 0x4F, 0xD9, 0xBA, 0xF3); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_WAVEFORMATEX, 0x05589F81, 0xC356, 0x11CE, 0xBF, 0x01, 0x00, 0xAA, 0x00, 0x55, 0x59, 0x5A); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_VC_ID, 0xAD98D184, 0xAAC3, 0x11D0, 0xA4, 0x1C, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG, 0x00000050, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_ADPCM, 0x00000002, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MULAW, 0x00000007, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_ALAW, 0x00000006, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_DRM, 0x00000009, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_PCM, 0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_ANALOG, 0x6DBA3190, 0x67BD, 0x11CF, 0xA0, 0xF7, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_WAVEFORMATEX, 0x00000000, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -DEFINE_GUID(KSDATAFORMAT_TYPE_TEXT, 0x73747874, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -DEFINE_GUID(KSDATAFORMAT_TYPE_AUDIO, 0x73647561, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -DEFINE_GUID(KSDATAFORMAT_TYPE_VIDEO, 0x73646976, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -DEFINE_GUID(KSCATEGORY_ESCALANTE_PLATFORM_DRIVER, 0x74F3AEA8, 0x9768, 0x11D1, 0x8E, 0x07, 0x00, 0xA0, 0xC9, 0x5E, 0xC2, 0x2E); -DEFINE_GUID(KSCATEGORY_WDMAUD_USE_PIN_NAME, 0x47A4FA20, 0xA251, 0x11D1, 0xA0, 0x50, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); -DEFINE_GUID(KSCATEGORY_PREFERRED_MIDIOUT_DEVICE, 0xD6C50674, 0x72C1, 0x11D2, 0x97, 0x55, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); -DEFINE_GUID(KSCATEGORY_PREFERRED_WAVEIN_DEVICE, 0xD6C50671, 0x72C1, 0x11D2, 0x97, 0x55, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); -DEFINE_GUID(KSCATEGORY_PREFERRED_WAVEOUT_DEVICE, 0xD6C5066E, 0x72C1, 0x11D2, 0x97, 0x55, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); -DEFINE_GUID(KSCATEGORY_AUDIO_DEVICE, 0xFBF6F530, 0x07B9, 0x11D2, 0xA7, 0x1E, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); -DEFINE_GUID(KSCATEGORY_AUDIO_SPLITTER, 0x9EA331FA, 0xB91B, 0x45F8, 0x92, 0x85, 0xBD, 0x2B, 0xC7, 0x7A, 0xFC, 0xDE); -DEFINE_GUID(KSCATEGORY_AUDIO_GFX, 0x9BAF9572, 0x340C, 0x11D3, 0xAB, 0xDC, 0x00, 0xA0, 0xC9, 0x0A, 0xB1, 0x6F); -DEFINE_GUID(KSCATEGORY_WDMAUD, 0x3E227E76, 0x690D, 0x11D2, 0x81, 0x61, 0x00, 0x00, 0xF8, 0x77, 0x5B, 0xF1); -DEFINE_GUID(KSCATEGORY_SYSAUDIO, 0xA7C7A5B1, 0x5AF3, 0x11D1, 0x9C, 0xED, 0x00, 0xA0, 0x24, 0xBF, 0x04, 0x07); -DEFINE_GUID(KSCATEGORY_ACOUSTIC_ECHO_CANCEL, 0xBF963D80, 0xC559, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); -DEFINE_GUID(KSCATEGORY_VIRTUAL, 0x3503EAC4, 0x1F26, 0x11D1, 0x8A, 0xB0, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_TOPOLOGY, 0xDDA54A40, 0x1E4C, 0x11D1, 0xA0, 0x50, 0x40, 0x57, 0x05, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSCATEGORY_NETWORK, 0x67C9CC3C, 0x69C4, 0x11D2, 0x87, 0x59, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_TEXT, 0x6994AD06, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_VIDEO, 0x6994AD05, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_AUDIO, 0x6994AD04, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_DRM_DESCRAMBLE, 0xFFBB6E3F, 0xCCFE, 0x4D84, 0x90, 0xD9, 0x42, 0x14, 0x18, 0xB0, 0x3A, 0x8E); -DEFINE_GUID(KSNODETYPE_SWMIDI, 0xCB9BEFA0, 0xA251, 0x11D1, 0xA0, 0x50, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); -DEFINE_GUID(KSNODETYPE_SWSYNTH, 0x423274A0, 0x8B81, 0x11D1, 0xA0, 0x50, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); -DEFINE_GUID(KSNODETYPE_SYNTHESIZER, 0xDFF220F3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_MULTITRACK_RECORDER, 0xDFF220F2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_RADIO_TRANSMITTER, 0xDFF220F1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_RADIO_RECEIVER, 0xDFF220F0, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_DSS_AUDIO, 0xDFF220EF, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_CABLE_TUNER_AUDIO, 0xDFF220EE, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_SATELLITE_RECEIVER_AUDIO, 0xDFF220ED, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_TV_TUNER_AUDIO, 0xDFF220EC, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_DVD_AUDIO, 0xDFF220EB, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_VIDEO_DISC_AUDIO, 0xDFF220EA, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_VCR_AUDIO, 0xDFF220E8, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_PHONOGRAPH, 0xDFF220E8, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_ANALOG_TAPE, 0xDFF220E7, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_MINIDISK, 0xDFF220E6, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_DCC_IO_DIGITAL_COMPACT_CASSETTE, 0xDFF220E5, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_DAT_IO_DIGITAL_AUDIO_TAPE, 0xDFF220E4, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_CD_PLAYER, 0xDFF220E3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_EQUALIZATION_NOISE, 0xDFF220E2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_LEVEL_CALIBRATION_NOISE_SOURCE, 0xDFF220E1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_1394_DV_STREAM_SOUNDTRACK, 0xDFF21FE7, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_1394_DA_STREAM, 0xDFF21FE6, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_SPDIF_INTERFACE, 0xDFF21FE5, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_LEGACY_AUDIO_CONNECTOR, 0xDFF21FE4, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_LINE_CONNECTOR, 0xDFF21FE3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_DIGITAL_AUDIO_INTERFACE, 0xDFF21FE2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_ANALOG_CONNECTOR, 0xDFF21FE1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_DOWN_LINE_PHONE, 0xDFF21EE3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_TELEPHONE, 0xDFF21EE2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_PHONE_LINE, 0xDFF21EE1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_ECHO_CANCELING_SPEAKERPHONE, 0xDFF21DE5, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_ECHO_SUPPRESSING_SPEAKERPHONE, 0xDFF21DE4, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_SPEAKERPHONE_NO_ECHO_REDUCTION, 0xDFF21DE3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_HEADSET, 0xDFF21DE2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_HANDSET, 0xDFF21DE1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_LOW_FREQUENCY_EFFECTS_SPEAKER, 0xDFF21CE7, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_COMMUNICATION_SPEAKER, 0xDFF21CE6, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_ROOM_SPEAKER, 0xDFF21CE5, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_DESKTOP_SPEAKER, 0xDFF21CE4, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_HEAD_MOUNTED_DISPLAY_AUDIO, 0xDFF21CE3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_HEADPHONES, 0xDFF21CE2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_SPEAKER, 0xDFF21CE1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_MICROPHONE_ARRAY_PROCESSOR, 0x830A44F2, 0xA32D, 0x476B, 0xBE, 0x97, 0x42, 0x84, 0x56, 0x73, 0xB3, 0x5A); -DEFINE_GUID(KSNODETYPE_PROCESSING_MICROPHONE_ARRAY, 0xDFF21BE6, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_MICROPHONE_ARRAY, 0xDFF21BE5, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_OMNI_DIRECTIONAL_MICROPHONE, 0xDFF21BE4, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_PERSONAL_MICROPHONE, 0xDFF21BE3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_DESKTOP_MICROPHONE, 0xDFF21BE2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_MICROPHONE, 0xDFF21BE1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCOMPONENTID_USBAUDIO, 0x8F1275F0, 0x26E9, 0x4264, 0xBA, 0x4D, 0x39, 0xFF, 0xF0, 0x1D, 0x94, 0xAA); -DEFINE_GUID(KSINTERFACESETID_Media, 0x3A13EB40, 0x30A7, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSMEDIUMSETID_VPBus, 0xA18C15EC, 0xCE43, 0x11D0, 0xAB, 0xE7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSMEDIUMSETID_MidiBus, 0x05908040, 0x3246, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSPROPSETID_Service, 0x3C0D501B, 0x140B, 0x11D1, 0xB4, 0x0F, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNAME_Server, 0x3C0D501A, 0x140B, 0x11D1, 0xB4, 0x0F, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(GUID_BUS_INTERFACE_MEDIUMS, 0x4EC35C3E, 0x201B, 0x11D2, 0x87, 0x45, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSDEGRADESETID_Standard, 0x9F564180, 0x704C, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSEVENTSETID_Connection, 0x7F4BCBE0, 0x9EA5, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSEVENTSETID_Clock, 0x364D8E20, 0x62C7, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSPROPSETID_Clock, 0xDF12A4C0, 0xAC17, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSPROPSETID_Stream, 0x65AABA60, 0x98AE, 0x11CF, 0xA1, 0x0D, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); -DEFINE_GUID(KSPROPSETID_StreamInterface, 0x1FDD8EE1, 0x9CD3, 0x11D0, 0x82, 0xAA, 0x00, 0x00, 0xF8, 0x22, 0xFE, 0x8A); -DEFINE_GUID(KSPROPSETID_StreamAllocator, 0xCF6E4342, 0xEC87, 0x11CF, 0xA1, 0x30, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); -DEFINE_GUID(KSMETHODSETID_StreamAllocator, 0xCF6E4341, 0xEC87, 0x11CF, 0xA1, 0x30, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); -DEFINE_GUID(KSEVENTSETID_StreamAllocator, 0x75D95571, 0x073C, 0x11D0, 0xA1, 0x61, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); -DEFINE_GUID(KSMEMORY_TYPE_DEVICE_UNKNOWN, 0x091BB639, 0x603F, 0x11D1, 0xB0, 0x67, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); -DEFINE_GUID(KSMEMORY_TYPE_KERNEL_NONPAGED, 0x4A6D5FC4, 0x7895, 0x11D1, 0xB0, 0x69, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); -DEFINE_GUID(KSMEMORY_TYPE_KERNEL_PAGED, 0xD833F8F8, 0x7894, 0x11D1, 0xB0, 0x69, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); -DEFINE_GUID(KSMEMORY_TYPE_USER, 0x8CB0FC28, 0x7893, 0x11D1, 0xB0, 0x69, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); -DEFINE_GUID(KSMEMORY_TYPE_SYSTEM, 0x091BB638, 0x603F, 0x11D1, 0xB0, 0x67, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); -DEFINE_GUID(KSPROPSETID_Connection, 0x1D58C920, 0xAC9B, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSPROPSETID_Quality, 0xD16AD380, 0xAC1A, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_NONE, 0x0F6417D6, 0xC318, 0x11D0, 0xA4, 0x3F, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_FILEHANDLE, 0x65E8773C, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_FILENAME, 0xAA797B40, 0xE974, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_NONE, 0xE436EB8E, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); -DEFINE_GUID(KSDATAFORMAT_TYPE_STREAM, 0xE436EB83, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); -DEFINE_GUID(KSNAME_TopologyNode, 0x0621061A, 0xEE75, 0x11D0, 0xB9, 0x15, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNAME_Allocator, 0x642F5D00, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSNAME_Clock, 0x53172480, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSNAME_Pin, 0x146F1A80, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSNAME_Filter, 0x9B365890, 0x165F, 0x11D0, 0xA1, 0x95, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); -DEFINE_GUID(KSPROPSETID_Pin, 0x8C134960, 0x51AD, 0x11CF, 0x87, 0x8A, 0x94, 0xF8, 0x01, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSMEDIUMSETID_Standard, 0x4747B320, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSINTERFACESETID_FileIo, 0x8C6F932C, 0xE771, 0x11D0, 0xB8, 0xFF, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSINTERFACESETID_Standard, 0x1A8766A0, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSTIME_FORMAT_MEDIA_TIME, 0x7B785574, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); -DEFINE_GUID(KSTIME_FORMAT_FIELD, 0x7B785573, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); -DEFINE_GUID(KSTIME_FORMAT_SAMPLE, 0x7B785572, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); -DEFINE_GUID(KSTIME_FORMAT_BYTE, 0x7B785571, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); -DEFINE_GUID(KSTIME_FORMAT_FRAME, 0x7B785570, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); -DEFINE_GUID(KSCATEGORY_QUALITY, 0x97EBAACB, 0x95BD, 0x11D0, 0xA3, 0xEA, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_PROXY, 0x97EBAACA, 0x95BD, 0x11D0, 0xA3, 0xEA, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_CLOCK, 0x53172480, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSCATEGORY_FILESYSTEM, 0x760FED5E, 0x9357, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_MEDIUMTRANSFORM, 0xCF1DDA2E, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_INTERFACETRANSFORM, 0xCF1DDA2D, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_COMMUNICATIONSTRANSFORM, 0xCF1DDA2C, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_DATATRANSFORM, 0x2EB07EA0, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSCATEGORY_DATADECOMPRESSOR, 0x2721AE20, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSCATEGORY_DATACOMPRESSOR, 0x1E84C900, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSCATEGORY_SPLITTER, 0x0A4252A0, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSCATEGORY_MIXER, 0xAD809C00, 0x7B88, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSCATEGORY_RENDER, 0x65E8773E, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_CAPTURE, 0x65E8773D, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_BRIDGE, 0x085AFF00, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSPROPSETID_GM, 0xAF627536, 0xE719, 0x11D2, 0x8A, 0x1D, 0x00, 0x60, 0x97, 0xD2, 0xDF, 0x5D); -DEFINE_GUID(KSPROPSETID_Topology, 0x720D4AC0, 0x7533, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSPROPSETID_MediaSeeking, 0xEE904F0C, 0xD09B, 0x11D0, 0xAB, 0xE9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSMETHODSETID_StreamIo, 0x65D003CA, 0x1523, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSPROPSETID_General, 0x1464EDA5, 0x6A8F, 0x11D1, 0x9A, 0xA7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSPROPTYPESETID_General, 0x97E99BA0, 0xBDEA, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(GUID_NULL, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); -DEFINE_GUID(BUSID_SoftwareDeviceEnumerator, 0x4747B320, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); - - +DEFINE_GUID(BUSID_SoftwareDeviceEnumerator, 0x4747B320, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); + +DEFINE_GUID(IID_IKoInitializeParentDeviceObject, 0x21B36996, 0x8DE3, 0x11D1, 0x8A, 0xE0, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(IID_IUnknown, 0x00000000, 0x0000, 0x0000, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46); +DEFINE_GUID(IID_IKsTopology, 0x28F54683, 0x06FD, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(IID_IKsAggregateControl, 0x7F40EAC0, 0x3947, 0x11D2, 0x87, 0x4E, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(IID_IKsControl, 0x28F54685, 0x06FD, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(IID_IKsPropertySet, 0x31EFAC30, 0x515C, 0x11D0, 0xA9, 0xAA, 0x00, 0xAA, 0x00, 0x61, 0xBE, 0x93); +DEFINE_GUID(IID_IKsAllocatorEx, 0x091BB60A, 0x603F, 0x11D1, 0xB0, 0x67, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); +DEFINE_GUID(IID_IKsAllocator, 0x8DA64899, 0xC0D9, 0x11D0, 0x84, 0x13, 0x00, 0x00, 0xF8, 0x22, 0xFE, 0x8A); +DEFINE_GUID(IID_IKsClockPropertySet, 0x5C5CBD84, 0xE755, 0x11D0, 0xAC, 0x18, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(IID_IKsInterfaceHandler, 0xD3ABC7E0, 0x9A61, 0x11D0, 0xA4, 0x0D, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(IID_IKsDataTypeCompletion, 0x827D1A0E, 0x0F73, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(IID_IKsDataTypeHandler, 0x5FFBAA02, 0x49A3, 0x11D0, 0x9F, 0x36, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xA1); +DEFINE_GUID(IID_IKsPinPipe, 0xE539CD90, 0xA8B4, 0x11D1, 0x81, 0x89, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); +DEFINE_GUID(IID_IKsPinEx, 0x7BB38260, 0xD19C, 0x11D2, 0xB3, 0x8A, 0x00, 0xA0, 0xC9, 0x5E, 0xC2, 0x2E); +DEFINE_GUID(IID_IKsPin, 0xB611780D, 0xA2D9, 0x11CF, 0x9E, 0x53, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xA1); +DEFINE_GUID(IID_IKsObject, 0x423C13A2, 0x2070, 0x11D0, 0x9E, 0xF7, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xA1); + +DEFINE_GUID(CLSID_KsIBasicAudioInterfaceHandler, 0xB9F8AC3E, 0x0F71, 0x11D2, 0xB7, 0x2C, 0x00, 0xC0, 0x4F, 0xB6, 0xBD, 0x3D); +DEFINE_GUID(CLSID_Proxy, 0x17CCA71B, 0xECD7, 0x11D0, 0xB9, 0x08, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); + +DEFINE_GUID(CODECAPI_CURRENTCHANGELIST, 0x1CB14E83, 0x7D72, 0x4657, 0x83, 0xFD, 0x47, 0xA2, 0xC5, 0xB9, 0xD1, 0x3D); +DEFINE_GUID(CODECAPI_SUPPORTSEVENTS, 0x0581AF97, 0x7693, 0x4DBD, 0x9D, 0xCA, 0x3F, 0x9E, 0xBD, 0x65, 0x85, 0xA1); +DEFINE_GUID(CODECAPI_ALLSETTINGS, 0x6A577E92, 0x83E1, 0x4113, 0xAD, 0xC2, 0x4F, 0xCE, 0xC3, 0x2F, 0x83, 0xA1); +DEFINE_GUID(CODECAPI_SETALLDEFAULTS, 0x6C5E6A7C, 0xACF8, 0x4F55, 0xA9, 0x99, 0x1A, 0x62, 0x81, 0x09, 0x05, 0x1B); +DEFINE_GUID(CODECAPI_AUDIO_ENCODER, 0xB9D19A3E, 0xF897, 0x429C, 0xBC, 0x46, 0x81, 0x38, 0xB7, 0x27, 0x2B, 0x2D); +DEFINE_GUID(CODECAPI_VIDEO_ENCODER, 0x7112E8E1, 0x3D03, 0x47EF, 0x8E, 0x60, 0x03, 0xF1, 0xCF, 0x53, 0x73, 0x01); +DEFINE_GUID(CODECAPI_CHANGELISTS, 0x62B12ACF, 0xF6B0, 0x47D9, 0x94, 0x56, 0x96, 0xF2, 0x2C, 0x4E, 0x0B, 0x9D); + +DEFINE_GUID(ENCAPIPARAM_BITRATE_MODE, 0xEE5FB25C, 0xC713, 0x40D1, 0x9D, 0x58, 0xC0, 0xD7, 0x24, 0x1E, 0x25, 0x0F); +DEFINE_GUID(ENCAPIPARAM_PEAK_BITRATE, 0x703F16A9, 0x3D48, 0x44A1, 0xB0, 0x77, 0x01, 0x8D, 0xFF, 0x91, 0x5D, 0x19); +DEFINE_GUID(ENCAPIPARAM_BITRATE, 0x49CC4C43, 0xCA83, 0x4AD4, 0xA9, 0xAF, 0xF3, 0x69, 0x6A, 0xF6, 0x66, 0xDF); +DEFINE_GUID(EVENTSETID_CROSSBAR, 0x6A2E0641, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); + +DEFINE_GUID(GUID_NULL, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); +DEFINE_GUID(GUID_BUS_INTERFACE_MEDIUMS, 0x4EC35C3E, 0x201B, 0x11D2, 0x87, 0x45, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); + +DEFINE_GUID(KoCreateObject, 0x72CF721C, 0x525A, 0x11D1, 0x9A, 0xA1, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); + +DEFINE_GUID(KSCATEGORY_MULTIPLEXER, 0x7A5DE1D3, 0x01A1, 0x452C, 0xB4, 0x81, 0x4F, 0xA2, 0xB9, 0x62, 0x71, 0xE8); +DEFINE_GUID(KSCATEGORY_ENCODER, 0x19689BF6, 0xC384, 0x48FD, 0xAD, 0x51, 0x90, 0xE5, 0x8C, 0x79, 0xF7, 0x0B); +DEFINE_GUID(KSPROPSETID_TSRateChange, 0xA503C5C0, 0x1D1D, 0x11D1, 0xAD, 0x80, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); +DEFINE_GUID(KSDATAFORMAT_TYPE_DVD_ENCRYPTED_PACK, 0xED0B916A, 0x044D, 0x11D1, 0xAA, 0x78, 0x00, 0xC0, 0x4F, 0xC3, 0x1D, 0x60); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_Line21_GOPPacket, 0x6E8D4A23, 0x310C, 0x11D0, 0xB7, 0x9A, 0x00, 0xAA, 0x00, 0x37, 0x67, 0xA7); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_Line21_BytePair, 0x6E8D4A22, 0x310C, 0x11D0, 0xB7, 0x9A, 0x00, 0xAA, 0x00, 0x37, 0x67, 0xA7); +DEFINE_GUID(KSDATAFORMAT_TYPE_AUXLine21Data, 0x670AEA80, 0x3A82, 0x11D0, 0xB7, 0x9B, 0x00, 0xAA, 0x00, 0x37, 0x67, 0xA7); +DEFINE_GUID(KSEVENTSETID_VPVBINotify, 0xEC529B01, 0x1A1F, 0x11D1, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A); +DEFINE_GUID(KSEVENTSETID_VIDCAPTOSTI, 0xDB47DE20, 0xF628, 0x11D1, 0xBA, 0x41, 0x00, 0xA0, 0xC9, 0x0D, 0x2B, 0x05); +DEFINE_GUID(KSEVENTSETID_VPNotify, 0x20C5598E, 0xD3C8, 0x11D0, 0x8D, 0xFC, 0x00, 0xC0, 0x4F, 0xD7, 0xC0, 0x8B); +DEFINE_GUID(KSPROPSETID_VPVBIConfig, 0xEC529B00, 0x1A1F, 0x11D1, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A); +DEFINE_GUID(KSPROPSETID_VPConfig, 0xBC29A660, 0x30E3, 0x11D0, 0x9E, 0x69, 0x00, 0xC0, 0x4F, 0xD7, 0xC1, 0x5B); +DEFINE_GUID(KSPROPSETID_OverlayUpdate, 0x490EA5CF, 0x7681, 0x11D1, 0xA2, 0x1C, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_OVERLAY, 0xE436EB7F, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); +DEFINE_GUID(KSEVENTSETID_VIDCAP_TVAUDIO, 0x6A2E0651, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); +DEFINE_GUID(KSEVENTSETID_EXTDEV_Command, 0x109C7988, 0xB3CB, 0x11D2, 0xB4, 0x8E, 0x00, 0x60, 0x97, 0xB3, 0x39, 0x1B); + + + + +DEFINE_GUID(KSDATAFORMAT_TYPE_MUSIC, 0xE725D360, 0x62CC, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_Linear, 0x5A2FFE80, 0x16B9, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_AudioGfx, 0x79A9312E, 0x59AE, 0x43B0, 0xA3, 0x50, 0x8B, 0x05, 0x28, 0x4C, 0xAB, 0x24); +DEFINE_GUID(KSPROPSETID_Sysaudio_Pin, 0xA3A53220, 0xC6E4, 0x11D0, 0xB4, 0x65, 0x00, 0x00, 0x1A, 0x18, 0x18, 0xE6); +DEFINE_GUID(KSPROPSETID_Sysaudio, 0xCBE3FAA0, 0xCC75, 0x11D0, 0xB4, 0x65, 0x00, 0x00, 0x1A, 0x18, 0x18, 0xE6); +DEFINE_GUID(KSEVENTSETID_Sysaudio, 0x04800320, 0x4491, 0x11D1, 0xA0, 0x50, 0x40, 0x57, 0x05, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSEVENTSETID_LoopedStreaming, 0x4682B940, 0xC6EF, 0x11D0, 0x96, 0xD8, 0x00, 0xAA, 0x00, 0x51, 0xE5, 0x1D); +DEFINE_GUID(KSEVENTSETID_AudioControlChange, 0xE85E9698, 0xFA2F, 0x11D1, 0x95, 0xBD, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSPROPSETID_Cyclic, 0x3FFEAEA0, 0x2BEE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSEVENTSETID_Cyclic, 0x142C1AC0, 0x072A, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_WaveTable, 0x8539E660, 0x62E9, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSMUSIC_TECHNOLOGY_SWSYNTH, 0x37407736, 0x3620, 0x11D1, 0x85, 0xD3, 0x00, 0x00, 0xF8, 0x75, 0x43, 0x80); +DEFINE_GUID(KSMUSIC_TECHNOLOGY_WAVETABLE, 0x394EC7C0, 0x62E9, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSMUSIC_TECHNOLOGY_FMSYNTH, 0x252C5C80, 0x62E9, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSMUSIC_TECHNOLOGY_SQSYNTH, 0x0ECF4380, 0x62E9, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSMUSIC_TECHNOLOGY_PORT, 0x86C92E60, 0x62E8, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_Wave, 0x924E54B0, 0x630F, 0x11CF, 0xAD, 0xA7, 0x08, 0x00, 0x3E, 0x30, 0x49, 0x4A); +DEFINE_GUID(KSMETHODSETID_Wave_Queued, 0x7432C160, 0x8827, 0x11CF, 0xA1, 0x02, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); +DEFINE_GUID(KSPROPSETID_Wave_Queued, 0x16A15B10, 0x16F0, 0x11D0, 0xA1, 0x95, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); +DEFINE_GUID(KSPROPSETID_Acoustic_Echo_Cancel, 0xD7A4AF8B, 0x3DC1, 0x4902, 0x91, 0xEA, 0x8A, 0x15, 0xC9, 0x0E, 0x05, 0xB2); +DEFINE_GUID(KSMETHODSETID_Wavetable, 0xDCEF31EB, 0xD907, 0x11D0, 0x95, 0x83, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_PEAKMETER, 0x57E24340, 0xFC5B, 0x4612, 0xA5, 0x62, 0x72, 0xB1, 0x1A, 0x29, 0xDF, 0xAE); +DEFINE_GUID(KSAUDFNAME_VIDEO, 0x915DAEC4, 0xA434, 0x11D2, 0xAC, 0x52, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); +DEFINE_GUID(KSAUDFNAME_VIDEO_MUTE, 0x9B46E709, 0x992A, 0x11D2, 0xAC, 0x4D, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); +DEFINE_GUID(KSAUDFNAME_VIDEO_VOLUME, 0x9B46E708, 0x992A, 0x11D2, 0xAC, 0x4D, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); +DEFINE_GUID(KSAUDFNAME_3D_CENTER, 0x9F0670B4, 0x991F, 0x11D2, 0xAC, 0x4D, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); +DEFINE_GUID(KSAUDFNAME_3D_DEPTH, 0x63FF5747, 0x991F, 0x11D2, 0xAC, 0x4D, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); +DEFINE_GUID(KSAUDFNAME_ALTERNATE_MICROPHONE, 0x2BC31D6B, 0x96E3, 0x11D2, 0xAC, 0x4C, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); +DEFINE_GUID(KSAUDFNAME_MICROPHONE_BOOST, 0x2BC31D6A, 0x96E3, 0x11D2, 0xAC, 0x4C, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); +DEFINE_GUID(KSAUDFNAME_MONO_MIX_MUTE, 0x2BC31D69, 0x96E3, 0x11D2, 0xAC, 0x4C, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); +DEFINE_GUID(KSAUDFNAME_MONO_MIX_VOLUME, 0x22B0EAFE, 0x96E3, 0x11D2, 0xAC, 0x4C, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); +DEFINE_GUID(KSAUDFNAME_STEREO_MIX_MUTE, 0x22B0EAFD, 0x96E3, 0x11D2, 0xAC, 0x4C, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); +DEFINE_GUID(KSAUDFNAME_STEREO_MIX_VOLUME, 0x1AD247ED, 0x96E3, 0x11D2, 0xAC, 0x4C, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); +DEFINE_GUID(KSAUDFNAME_MONO_OUT_MUTE, 0x1AD247EC, 0x96E3, 0x11D2, 0xAC, 0x4C, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); +DEFINE_GUID(KSAUDFNAME_MONO_OUT_VOLUME, 0x1AD247EB, 0x96E3, 0x11D2, 0xAC, 0x4C, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); +DEFINE_GUID(KSAUDFNAME_MONO_MIX, 0x00DFF078, 0x96E3, 0x11D2, 0xAC, 0x4C, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); +DEFINE_GUID(KSAUDFNAME_STEREO_MIX, 0x00DFF077, 0x96E3, 0x11D2, 0xAC, 0x4C, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); +DEFINE_GUID(KSAUDFNAME_MONO_OUT, 0xF9B41DC3, 0x96E2, 0x11D2, 0xAC, 0x4C, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); +DEFINE_GUID(KSAUDFNAME_WAVE_OUT_MIX, 0x185FEE00, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_PC_SPEAKER, 0x185FEDFF, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_AUX, 0x185FEDFE, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_AUX_MUTE, 0x185FEDFD, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_AUX_VOLUME, 0x185FEDFC, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_CD_AUDIO, 0x185FEDFB, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_RECORDING_CONTROL, 0x185FEDFA, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_LINE_IN, 0x185FEDF9, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_MIDI, 0x185FEDF8, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_VOLUME_CONTROL, 0x185FEDF7, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_WAVE_IN_VOLUME, 0x185FEDF6, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_MIC_IN_VOLUME, 0x185FEDF5, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_LINE_IN_VOLUME, 0x185FEDF4, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_CD_IN_VOLUME, 0x185FEDF3, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_MIDI_IN_VOLUME, 0x185FEDF2, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_PC_SPEAKER_MUTE, 0x185FEDF1, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_PC_SPEAKER_VOLUME, 0x185FEDF0, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_RECORDING_SOURCE, 0x185FEDEF, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_MIC_MUTE, 0x185FEDEE, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_MIC_VOLUME, 0x185FEDED, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_LINE_MUTE, 0x185FEDEC, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_LINE_VOLUME, 0x185FEDEB, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_CD_MUTE, 0x185FEDEA, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_CD_VOLUME, 0x185FEDE9, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_MIDI_MUTE, 0x185FEDE8, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_MIDI_VOLUME, 0x185FEDE7, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_WAVE_MUTE, 0x185FEDE6, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_WAVE_VOLUME, 0x185FEDE5, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_MASTER_MUTE, 0x185FEDE4, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_MASTER_VOLUME, 0x185FEDE3, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_3D_STEREO, 0x185FEDE2, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_TREBLE, 0x185FEDE1, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_BASS, 0x185FEDE0, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSNODETYPE_PEAKMETER, 0xA085651E, 0x5F0D, 0x4B36, 0xA8, 0x69, 0xD1, 0x95, 0xD6, 0xAB, 0x4B, 0x9E); +DEFINE_GUID(KSNODETYPE_PROLOGIC_ENCODER, 0x8074C5B2, 0x3C66, 0x11D2, 0xB4, 0x5A, 0x30, 0x78, 0x30, 0x2C, 0x20, 0x30); +DEFINE_GUID(KSNODETYPE_DEV_SPECIFIC, 0x941C7AC0, 0xC559, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSALGORITHMINSTANCE_SYSTEM_MICROPHONE_ARRAY_PROCESSOR, 0xB6F5A0A0, 0x9E61, 0x4F8C, 0x91, 0xE3, 0x76, 0xCF, 0x0F, 0x3C, 0x47, 0x1F); +DEFINE_GUID(KSALGORITHMINSTANCE_SYSTEM_AGC, 0x950E55B9, 0x877C, 0x4C67, 0xBE, 0x08, 0xE4, 0x7B, 0x56, 0x11, 0x13, 0x0A); +DEFINE_GUID(KSALGORITHMINSTANCE_SYSTEM_NOISE_SUPPRESS, 0x5AB0882E, 0x7274, 0x4516, 0x87, 0x7D, 0x4E, 0xEE, 0x99, 0xBA, 0x4F, 0xD0); +DEFINE_GUID(KSALGORITHMINSTANCE_SYSTEM_ACOUSTIC_ECHO_CANCEL, 0x1C22C56D, 0x9879, 0x4F5B, 0xA3, 0x89, 0x27, 0x99, 0x6D, 0xDC, 0x28, 0x10); +DEFINE_GUID(KSNODETYPE_3D_EFFECTS, 0x55515860, 0xC559, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_CHORUS, 0x20173F20, 0xC559, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_REVERB, 0xEF0328E0, 0xC558, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_STEREO_ENHANCE, 0xAF6878AC, 0xE83F, 0x11D0, 0x95, 0x8A, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSNODETYPE_STEREO_WIDE, 0xA9E69800, 0xC558, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_PROLOGIC_DECODER, 0x831C2C80, 0xC558, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_LOUDNESS, 0x41887440, 0xC558, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_DELAY, 0x144981E0, 0xC558, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_NOISE_SUPPRESS, 0xE07F903F, 0x62FD, 0x4E60, 0x8C, 0xDD, 0xDE, 0xA7, 0x23, 0x66, 0x65, 0xB5); +DEFINE_GUID(KSNODETYPE_AG, 0xE88C9BA0, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_EQUALIZER, 0x9D41B4A0, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_TONE, 0x7607E580, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_VOLUME, 0x3A5ACC00, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_MUTE, 0x02B223C0, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_SUM, 0xDA441A60, 0xC556, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_DEMUX, 0xC0EB67D4, 0xE807, 0x11D0, 0x95, 0x8A, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSNODETYPE_MUX, 0x2CEAF780, 0xC556, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_SUPERMIX, 0xE573ADC0, 0xC555, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_SRC, 0x9DB7B9E0, 0xC555, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_ADC, 0x4D837FE0, 0xC555, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_DAC, 0x507AE360, 0xC554, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSPROPSETID_Audio, 0x45FFAAA0, 0x6E1B, 0x11D0, 0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_DrmAudioStream, 0x2F2C8DDD, 0x4198, 0x4FAC, 0xBA, 0x29, 0x61, 0xBB, 0x05, 0xB7, 0xDE, 0x06); +DEFINE_GUID(KSPROPSETID_RtAudio, 0xA855A48C, 0x2F78, 0x4729, 0x90, 0x51, 0x19, 0x68, 0x74, 0x6B, 0x9E, 0xEF); +DEFINE_GUID(KSPROPSETID_TopologyNode, 0x45FFAAA1, 0x6E1B, 0x11D0, 0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_Bibliographic, 0x07BA150E, 0xE2B1, 0x11D0, 0xAC, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_RIFFWAVE, 0xE436EB8B, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_RIFF, 0x4995DAEE, 0x9EE6, 0x11D0, 0xA4, 0x0E, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSPROPSETID_Itd3d, 0x6429F090, 0x9FD9, 0x11D0, 0xA7, 0x5B, 0x00, 0xA0, 0xC9, 0x03, 0x65, 0xE3); +DEFINE_GUID(KSPROPSETID_Hrtf3d, 0xB66DECB0, 0xA083, 0x11D0, 0x85, 0x1E, 0x00, 0xC0, 0x4F, 0xD9, 0xBA, 0xF3); +DEFINE_GUID(KSPROPSETID_DirectSound3DBuffer, 0x437B3411, 0xD060, 0x11D0, 0x85, 0x83, 0x00, 0xC0, 0x4F, 0xD9, 0xBA, 0xF3); +DEFINE_GUID(KSPROPSETID_DirectSound3DListener, 0x437B3414, 0xD060, 0x11D0, 0x85, 0x83, 0x00, 0xC0, 0x4F, 0xD9, 0xBA, 0xF3); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DSOUND, 0x518590A2, 0xA184, 0x11D0, 0x85, 0x22, 0x00, 0xC0, 0x4F, 0xD9, 0xBA, 0xF3); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_WAVEFORMATEX, 0x05589F81, 0xC356, 0x11CE, 0xBF, 0x01, 0x00, 0xAA, 0x00, 0x55, 0x59, 0x5A); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_VC_ID, 0xAD98D184, 0xAAC3, 0x11D0, 0xA4, 0x1C, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG, 0x00000050, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_ADPCM, 0x00000002, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MULAW, 0x00000007, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_ALAW, 0x00000006, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_DRM, 0x00000009, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_PCM, 0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_ANALOG, 0x6DBA3190, 0x67BD, 0x11CF, 0xA0, 0xF7, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_WAVEFORMATEX, 0x00000000, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_TYPE_TEXT, 0x73747874, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_TYPE_AUDIO, 0x73647561, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_TYPE_VIDEO, 0x73646976, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSCATEGORY_ESCALANTE_PLATFORM_DRIVER, 0x74F3AEA8, 0x9768, 0x11D1, 0x8E, 0x07, 0x00, 0xA0, 0xC9, 0x5E, 0xC2, 0x2E); +DEFINE_GUID(KSCATEGORY_WDMAUD_USE_PIN_NAME, 0x47A4FA20, 0xA251, 0x11D1, 0xA0, 0x50, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); +DEFINE_GUID(KSCATEGORY_PREFERRED_MIDIOUT_DEVICE, 0xD6C50674, 0x72C1, 0x11D2, 0x97, 0x55, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); +DEFINE_GUID(KSCATEGORY_PREFERRED_WAVEIN_DEVICE, 0xD6C50671, 0x72C1, 0x11D2, 0x97, 0x55, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); +DEFINE_GUID(KSCATEGORY_PREFERRED_WAVEOUT_DEVICE, 0xD6C5066E, 0x72C1, 0x11D2, 0x97, 0x55, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); +DEFINE_GUID(KSCATEGORY_AUDIO_DEVICE, 0xFBF6F530, 0x07B9, 0x11D2, 0xA7, 0x1E, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); +DEFINE_GUID(KSCATEGORY_AUDIO_SPLITTER, 0x9EA331FA, 0xB91B, 0x45F8, 0x92, 0x85, 0xBD, 0x2B, 0xC7, 0x7A, 0xFC, 0xDE); +DEFINE_GUID(KSCATEGORY_AUDIO_GFX, 0x9BAF9572, 0x340C, 0x11D3, 0xAB, 0xDC, 0x00, 0xA0, 0xC9, 0x0A, 0xB1, 0x6F); +DEFINE_GUID(KSCATEGORY_WDMAUD, 0x3E227E76, 0x690D, 0x11D2, 0x81, 0x61, 0x00, 0x00, 0xF8, 0x77, 0x5B, 0xF1); +DEFINE_GUID(KSCATEGORY_SYSAUDIO, 0xA7C7A5B1, 0x5AF3, 0x11D1, 0x9C, 0xED, 0x00, 0xA0, 0x24, 0xBF, 0x04, 0x07); +DEFINE_GUID(KSCATEGORY_ACOUSTIC_ECHO_CANCEL, 0xBF963D80, 0xC559, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSCATEGORY_VIRTUAL, 0x3503EAC4, 0x1F26, 0x11D1, 0x8A, 0xB0, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_TOPOLOGY, 0xDDA54A40, 0x1E4C, 0x11D1, 0xA0, 0x50, 0x40, 0x57, 0x05, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_NETWORK, 0x67C9CC3C, 0x69C4, 0x11D2, 0x87, 0x59, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_TEXT, 0x6994AD06, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_VIDEO, 0x6994AD05, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_AUDIO, 0x6994AD04, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_DRM_DESCRAMBLE, 0xFFBB6E3F, 0xCCFE, 0x4D84, 0x90, 0xD9, 0x42, 0x14, 0x18, 0xB0, 0x3A, 0x8E); +DEFINE_GUID(KSNODETYPE_SWMIDI, 0xCB9BEFA0, 0xA251, 0x11D1, 0xA0, 0x50, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); +DEFINE_GUID(KSNODETYPE_SWSYNTH, 0x423274A0, 0x8B81, 0x11D1, 0xA0, 0x50, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); +DEFINE_GUID(KSNODETYPE_SYNTHESIZER, 0xDFF220F3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_MULTITRACK_RECORDER, 0xDFF220F2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_RADIO_TRANSMITTER, 0xDFF220F1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_RADIO_RECEIVER, 0xDFF220F0, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_DSS_AUDIO, 0xDFF220EF, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_CABLE_TUNER_AUDIO, 0xDFF220EE, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_SATELLITE_RECEIVER_AUDIO, 0xDFF220ED, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_TV_TUNER_AUDIO, 0xDFF220EC, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_DVD_AUDIO, 0xDFF220EB, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_VIDEO_DISC_AUDIO, 0xDFF220EA, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_VCR_AUDIO, 0xDFF220E8, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_PHONOGRAPH, 0xDFF220E8, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_ANALOG_TAPE, 0xDFF220E7, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_MINIDISK, 0xDFF220E6, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_DCC_IO_DIGITAL_COMPACT_CASSETTE, 0xDFF220E5, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_DAT_IO_DIGITAL_AUDIO_TAPE, 0xDFF220E4, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_CD_PLAYER, 0xDFF220E3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_EQUALIZATION_NOISE, 0xDFF220E2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_LEVEL_CALIBRATION_NOISE_SOURCE, 0xDFF220E1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_1394_DV_STREAM_SOUNDTRACK, 0xDFF21FE7, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_1394_DA_STREAM, 0xDFF21FE6, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_SPDIF_INTERFACE, 0xDFF21FE5, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_LEGACY_AUDIO_CONNECTOR, 0xDFF21FE4, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_LINE_CONNECTOR, 0xDFF21FE3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_DIGITAL_AUDIO_INTERFACE, 0xDFF21FE2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_ANALOG_CONNECTOR, 0xDFF21FE1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_DOWN_LINE_PHONE, 0xDFF21EE3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_TELEPHONE, 0xDFF21EE2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_PHONE_LINE, 0xDFF21EE1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_ECHO_CANCELING_SPEAKERPHONE, 0xDFF21DE5, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_ECHO_SUPPRESSING_SPEAKERPHONE, 0xDFF21DE4, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_SPEAKERPHONE_NO_ECHO_REDUCTION, 0xDFF21DE3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_HEADSET, 0xDFF21DE2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_HANDSET, 0xDFF21DE1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_LOW_FREQUENCY_EFFECTS_SPEAKER, 0xDFF21CE7, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_COMMUNICATION_SPEAKER, 0xDFF21CE6, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_ROOM_SPEAKER, 0xDFF21CE5, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_DESKTOP_SPEAKER, 0xDFF21CE4, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_HEAD_MOUNTED_DISPLAY_AUDIO, 0xDFF21CE3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_HEADPHONES, 0xDFF21CE2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_SPEAKER, 0xDFF21CE1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_MICROPHONE_ARRAY_PROCESSOR, 0x830A44F2, 0xA32D, 0x476B, 0xBE, 0x97, 0x42, 0x84, 0x56, 0x73, 0xB3, 0x5A); +DEFINE_GUID(KSNODETYPE_PROCESSING_MICROPHONE_ARRAY, 0xDFF21BE6, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_MICROPHONE_ARRAY, 0xDFF21BE5, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_OMNI_DIRECTIONAL_MICROPHONE, 0xDFF21BE4, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_PERSONAL_MICROPHONE, 0xDFF21BE3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_DESKTOP_MICROPHONE, 0xDFF21BE2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_MICROPHONE, 0xDFF21BE1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCOMPONENTID_USBAUDIO, 0x8F1275F0, 0x26E9, 0x4264, 0xBA, 0x4D, 0x39, 0xFF, 0xF0, 0x1D, 0x94, 0xAA); +DEFINE_GUID(KSINTERFACESETID_Media, 0x3A13EB40, 0x30A7, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSMEDIUMSETID_VPBus, 0xA18C15EC, 0xCE43, 0x11D0, 0xAB, 0xE7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSMEDIUMSETID_MidiBus, 0x05908040, 0x3246, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_Service, 0x3C0D501B, 0x140B, 0x11D1, 0xB4, 0x0F, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNAME_Server, 0x3C0D501A, 0x140B, 0x11D1, 0xB4, 0x0F, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSDEGRADESETID_Standard, 0x9F564180, 0x704C, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSEVENTSETID_Connection, 0x7F4BCBE0, 0x9EA5, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSEVENTSETID_Clock, 0x364D8E20, 0x62C7, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_Clock, 0xDF12A4C0, 0xAC17, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_Stream, 0x65AABA60, 0x98AE, 0x11CF, 0xA1, 0x0D, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); +DEFINE_GUID(KSPROPSETID_StreamInterface, 0x1FDD8EE1, 0x9CD3, 0x11D0, 0x82, 0xAA, 0x00, 0x00, 0xF8, 0x22, 0xFE, 0x8A); +DEFINE_GUID(KSPROPSETID_StreamAllocator, 0xCF6E4342, 0xEC87, 0x11CF, 0xA1, 0x30, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); +DEFINE_GUID(KSMETHODSETID_StreamAllocator, 0xCF6E4341, 0xEC87, 0x11CF, 0xA1, 0x30, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); +DEFINE_GUID(KSEVENTSETID_StreamAllocator, 0x75D95571, 0x073C, 0x11D0, 0xA1, 0x61, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); +DEFINE_GUID(KSMEMORY_TYPE_DEVICE_UNKNOWN, 0x091BB639, 0x603F, 0x11D1, 0xB0, 0x67, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); +DEFINE_GUID(KSMEMORY_TYPE_KERNEL_NONPAGED, 0x4A6D5FC4, 0x7895, 0x11D1, 0xB0, 0x69, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); +DEFINE_GUID(KSMEMORY_TYPE_KERNEL_PAGED, 0xD833F8F8, 0x7894, 0x11D1, 0xB0, 0x69, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); +DEFINE_GUID(KSMEMORY_TYPE_USER, 0x8CB0FC28, 0x7893, 0x11D1, 0xB0, 0x69, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); +DEFINE_GUID(KSMEMORY_TYPE_SYSTEM, 0x091BB638, 0x603F, 0x11D1, 0xB0, 0x67, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); +DEFINE_GUID(KSPROPSETID_Connection, 0x1D58C920, 0xAC9B, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_Quality, 0xD16AD380, 0xAC1A, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_NONE, 0x0F6417D6, 0xC318, 0x11D0, 0xA4, 0x3F, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_FILEHANDLE, 0x65E8773C, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_FILENAME, 0xAA797B40, 0xE974, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_NONE, 0xE436EB8E, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); +DEFINE_GUID(KSDATAFORMAT_TYPE_STREAM, 0xE436EB83, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); +DEFINE_GUID(KSNAME_TopologyNode, 0x0621061A, 0xEE75, 0x11D0, 0xB9, 0x15, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNAME_Allocator, 0x642F5D00, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSNAME_Clock, 0x53172480, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSNAME_Pin, 0x146F1A80, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSNAME_Filter, 0x9B365890, 0x165F, 0x11D0, 0xA1, 0x95, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); +DEFINE_GUID(KSPROPSETID_Pin, 0x8C134960, 0x51AD, 0x11CF, 0x87, 0x8A, 0x94, 0xF8, 0x01, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSMEDIUMSETID_Standard, 0x4747B320, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSINTERFACESETID_FileIo, 0x8C6F932C, 0xE771, 0x11D0, 0xB8, 0xFF, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSINTERFACESETID_Standard, 0x1A8766A0, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSTIME_FORMAT_MEDIA_TIME, 0x7B785574, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); +DEFINE_GUID(KSTIME_FORMAT_FIELD, 0x7B785573, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); +DEFINE_GUID(KSTIME_FORMAT_SAMPLE, 0x7B785572, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); +DEFINE_GUID(KSTIME_FORMAT_BYTE, 0x7B785571, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); +DEFINE_GUID(KSTIME_FORMAT_FRAME, 0x7B785570, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); +DEFINE_GUID(KSCATEGORY_QUALITY, 0x97EBAACB, 0x95BD, 0x11D0, 0xA3, 0xEA, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_PROXY, 0x97EBAACA, 0x95BD, 0x11D0, 0xA3, 0xEA, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_CLOCK, 0x53172480, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_FILESYSTEM, 0x760FED5E, 0x9357, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_MEDIUMTRANSFORM, 0xCF1DDA2E, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_INTERFACETRANSFORM, 0xCF1DDA2D, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_COMMUNICATIONSTRANSFORM, 0xCF1DDA2C, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_DATATRANSFORM, 0x2EB07EA0, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_DATADECOMPRESSOR, 0x2721AE20, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_DATACOMPRESSOR, 0x1E84C900, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_SPLITTER, 0x0A4252A0, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_MIXER, 0xAD809C00, 0x7B88, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_RENDER, 0x65E8773E, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_CAPTURE, 0x65E8773D, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_BRIDGE, 0x085AFF00, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_GM, 0xAF627536, 0xE719, 0x11D2, 0x8A, 0x1D, 0x00, 0x60, 0x97, 0xD2, 0xDF, 0x5D); +DEFINE_GUID(KSPROPSETID_Topology, 0x720D4AC0, 0x7533, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_MediaSeeking, 0xEE904F0C, 0xD09B, 0x11D0, 0xAB, 0xE9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSMETHODSETID_StreamIo, 0x65D003CA, 0x1523, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSPROPSETID_General, 0x1464EDA5, 0x6A8F, 0x11D1, 0x9A, 0xA7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSPROPTYPESETID_General, 0x97E99BA0, 0xBDEA, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); + + + + + +DEFINE_GUID(PROPSETID_VIDCAP_DROPPEDFRAMES, 0xC6E13344, 0x30AC, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); +DEFINE_GUID(PROPSETID_VIDCAP_VIDEOCONTROL, 0x6A2E0670, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); +DEFINE_GUID(PROPSETID_VIDCAP_VIDEOCOMPRESSION, 0xC6E13343, 0x30AC, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); +DEFINE_GUID(PROPSETID_VIDCAP_TVAUDIO, 0x6A2E0650, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); +DEFINE_GUID(PROPSETID_VIDCAP_CROSSBAR, 0x6A2E0640, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); +DEFINE_GUID(PROPSETID_TIMECODE_READER, 0x9B496CE1, 0x811B, 0x11CF, 0x8C, 0x77, 0x00, 0xAA, 0x00, 0x6B, 0x68, 0x14); +DEFINE_GUID(PROPSETID_EXT_TRANSPORT, 0xA03CD5F0, 0x3045, 0x11CF, 0x8C, 0x44, 0x00, 0xAA, 0x00, 0x6B, 0x68, 0x14);

1 0

[jimtabor] 30244: Win32k/Gdi32 - Use Batch with SetBrushOrgEx now, removed NtGdiGetBrushOrgEx, update all related files. - Fixed WinDC DCE death to all window DCE's. This will move to gdiobj as a check to see if a object handle is on deaths door. This prevents exceptions. - Implemented NtgdiGet/ABCCharWidth/sW, updated all related files. Float and Indices not supported yet. - Added Brush, Region and Font user attribute structures. Based on Yuan book. - All tested with linux qemu with AbiWord 2.4
by jimtabor＠svn.reactos.org 07 Nov '07

07 Nov '07

Author: jimtabor Date: Wed Nov 7 20:58:02 2007 New Revision: 30244 URL: http://svn.reactos.org/svn/reactos?rev=30244&view=rev Log: Win32k/Gdi32 - Use Batch with SetBrushOrgEx now, removed NtGdiGetBrushOrgEx, update all related files. - Fixed WinDC DCE death to all window DCE's. This will move to gdiobj as a check to see if a object handle is on deaths door. This prevents exceptions. - Implemented NtgdiGet/ABCCharWidth/sW, updated all related files. Float and Indices not supported yet. - Added Brush, Region and Font user attribute structures. Based on Yuan book. - All tested with linux qemu with AbiWord 2.4.1. Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/brush.c trunk/reactos/dll/win32/gdi32/objects/font.c trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/include/reactos/win32k/ntgdihdl.h trunk/reactos/include/reactos/win32k/ntgdityp.h trunk/reactos/subsystems/win32/win32k/ntuser/object.c trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/text.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Wed Nov 7 20:58:02 2007 @@ -1550,25 +1550,6 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } - -/* - * @unimplemented - */ -BOOL -STDCALL -GetCharWidthI(HDC hdc, - UINT giFirst, - UINT cgi, - LPWORD pgi, - LPINT lpBuffer -) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - /* * @implemented @@ -2385,30 +2366,6 @@ * @implemented * */ -BOOL -STDCALL -GetBrushOrgEx(HDC hdc,LPPOINT pt) -{ - /* FIXME some part are done in user mode */ - return NtGdiGetBrushOrgEx(hdc,pt); -} - -/* - * @implemented - * - */ -BOOL -STDCALL -GetCharABCWidthsFloatW(HDC hdc,UINT FirstChar,UINT LastChar,LPABCFLOAT abcF) -{ - - return FALSE; -} - -/* - * @implemented - * - */ int STDCALL GetDeviceCaps(HDC hdc, @@ -2444,52 +2401,6 @@ /* FIXME some part need be done in user mode */ return NtGdiGetClipBox(hdc, lprc); } - -/* - * @implemented - * - */ -BOOL -STDCALL -GetCharWidthFloatW(HDC hdc, - UINT iFirstChar, - UINT iLastChar, - PFLOAT pxBuffer) -{ - - return FALSE; -} - -/* - * @implemented - * - */ -BOOL -STDCALL -GetCharWidth32W(HDC hdc, - UINT iFirstChar, - UINT iLastChar, - LPINT lpBuffer) -{ - /* FIXME some part need be done in user mode */ - return NtGdiGetCharWidth32(hdc, iFirstChar, iLastChar, lpBuffer); -} - -/* - * @implemented - * - */ -BOOL -STDCALL -GetCharABCWidths(HDC hdc, - UINT uFirstChar, - UINT uLastChar, - LPABC lpabc) -{ - /* FIXME some part need be done in user mode */ - return NtGdiGetCharABCWidths(hdc, uFirstChar, uLastChar, lpabc); -} - /* * @implemented Modified: trunk/reactos/dll/win32/gdi32/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/br… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/brush.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/brush.c Wed Nov 7 20:58:02 2007 @@ -257,6 +257,25 @@ /* * @implemented + * + */ +BOOL +STDCALL +GetBrushOrgEx(HDC hdc,LPPOINT pt) +{ + PDC_ATTR Dc_Attr; + + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; + if (pt) + { + pt->x = Dc_Attr->ptlBrushOrigin.x; + pt->y = Dc_Attr->ptlBrushOrigin.y; + } + return TRUE; +} + +/* + * @implemented */ BOOL STDCALL @@ -265,6 +284,7 @@ int nYOrg, LPPOINT lppt) { + PDC_ATTR Dc_Attr; #if 0 // Handle something other than a normal dc object. if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) @@ -282,9 +302,6 @@ return FALSE; } #endif -#if 0 - PDC_ATTR Dc_Attr; - if (GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) { PTEB pTeb = NtCurrentTeb(); @@ -313,12 +330,17 @@ pTeb->GdiTebBatch.Offset += sizeof(GDIBSSETBRHORG); pTeb->GdiTebBatch.HDC = (ULONG)hdc; pTeb->GdiBatchCount++; - if (pTeb->GdiBatchCount >= GDI_BatchLimit) NtGdiFlush(); - + DPRINT("Loading the Flush!! COUNT-> %d\n", pTeb->GdiBatchCount); + + if (pTeb->GdiBatchCount >= GDI_BatchLimit) + { + DPRINT("Call GdiFlush!!\n"); + NtGdiFlush(); + DPRINT("Exit GdiFlush!!\n"); + } return TRUE; } } -#endif return NtGdiSetBrushOrg(hdc,nXOrg,nYOrg,lppt); } Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c Wed Nov 7 20:58:02 2007 @@ -419,88 +419,6 @@ return IntEnumFontFamilies(hdc, &LogFont, lpEnumFontFamProc, lParam, FALSE); } - -/* - * @implemented - */ -BOOL -STDCALL -GetCharWidthA ( - HDC hdc, - UINT iFirstChar, - UINT iLastChar, - LPINT lpBuffer - ) -{ -DPRINT1("GCWA iFirstChar %x\n",iFirstChar); - - return GetCharWidth32A ( hdc, iFirstChar, iLastChar, lpBuffer ); -} - - -/* - * @implemented - */ -BOOL -STDCALL -GetCharWidth32A( - HDC hdc, - UINT iFirstChar, - UINT iLastChar, - LPINT lpBuffer - ) -{ - INT i, wlen, count = (INT)(iLastChar - iFirstChar + 1); - LPSTR str; - LPWSTR wstr; - BOOL ret = TRUE; -DPRINT1("GCW32A iFirstChar %x\n",iFirstChar); - - if(count <= 0) return FALSE; - - str = HeapAlloc(GetProcessHeap(), 0, count); - for(i = 0; i < count; i++) - str[i] = (BYTE)(iFirstChar + i); - - wstr = FONT_mbtowc(NULL, str, count, &wlen, NULL); - - for(i = 0; i < wlen; i++) - { - /* FIXME should be NtGdiGetCharWidthW */ - if(!NtGdiGetCharWidth32 (hdc, wstr[i], wstr[i], lpBuffer)) - { - ret = FALSE; - break; - } - lpBuffer++; - } - - HeapFree(GetProcessHeap(), 0, str); - HeapFree(GetProcessHeap(), 0, wstr); - - return ret; -} - - -/* - * @implemented - */ -BOOL -STDCALL -GetCharWidthW ( - HDC hdc, - UINT iFirstChar, - UINT iLastChar, - LPINT lpBuffer - ) -{ -DPRINT1("GCW32w uFirstChar %x\n",iFirstChar); - - /* FIXME should be NtGdiGetCharWidthW */ - return NtGdiGetCharWidth32 ( hdc, iFirstChar, iLastChar, lpBuffer ); -} - - /* * @implemented */ @@ -518,6 +436,7 @@ DWORD ret=0; SIZE size; UINT i, nSet; + DPRINT("GetCharacterPlacementW\n"); if(dwFlags&(~GCP_REORDER)) DPRINT("flags 0x%08lx ignored\n", dwFlags); if(lpResults->lpClass) DPRINT("classes not implemented\n"); @@ -558,7 +477,7 @@ int c; for (i = 0; i < nSet; i++) { - if (NtGdiGetCharWidth32(hdc, lpString[i], lpString[i], &c)) + if (GetCharWidth32W(hdc, lpString[i], lpString[i], &c)) lpResults->lpDx[i]= c; } } @@ -582,9 +501,212 @@ return ret; } - -/* - * @unimplemented +/* + * @implemented + * + */ +BOOL +STDCALL +GetCharABCWidthsFloatW(HDC hdc, + UINT FirstChar, + UINT LastChar, + LPABCFLOAT abcF) +{ +DPRINT("GetCharABCWidthsFloatW\n"); + if ((!abcF) || (FirstChar > LastChar)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + return NtGdiGetCharABCWidthsW( hdc, + FirstChar, + (ULONG)(LastChar - FirstChar + 1), + (PWCHAR) NULL, + 0, + (PVOID)abcF); +} + +/* + * @implemented + * + */ +BOOL +STDCALL +GetCharWidthFloatW(HDC hdc, + UINT iFirstChar, + UINT iLastChar, + PFLOAT pxBuffer) +{ +DPRINT("GetCharWidthsFloatW\n"); + if ((!pxBuffer) || (iFirstChar > iLastChar)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + return NtGdiGetCharWidthW( hdc, + iFirstChar, + (ULONG)(iLastChar - iFirstChar + 1), + (PWCHAR) NULL, + 0, + (PVOID) pxBuffer); +} + +/* + * @implemented + * + */ +BOOL +STDCALL +GetCharWidthW(HDC hdc, + UINT iFirstChar, + UINT iLastChar, + LPINT lpBuffer) +{ +DPRINT("GetCharWidthsW\n"); + if ((!lpBuffer) || (iFirstChar > iLastChar)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + return NtGdiGetCharWidthW( hdc, + iFirstChar, + (ULONG)(iLastChar - iFirstChar + 1), + (PWCHAR) NULL, + GCW_NOFLOAT, + (PVOID) lpBuffer); +} + +/* + * @implemented + * + */ +BOOL +STDCALL +GetCharWidth32W(HDC hdc, + UINT iFirstChar, + UINT iLastChar, + LPINT lpBuffer) +{ +DPRINT("GetCharWidths32W\n"); + if ((!lpBuffer) || (iFirstChar > iLastChar)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + return NtGdiGetCharWidthW( hdc, + iFirstChar, + (ULONG)(iLastChar - iFirstChar + 1), + (PWCHAR) NULL, + GCW_NOFLOAT|GCW_WIN32, + (PVOID) lpBuffer); +} + + +/* + * @implemented + * + */ +BOOL +STDCALL +GetCharABCWidthsW(HDC hdc, + UINT FirstChar, + UINT LastChar, + LPABC lpabc) +{ +DPRINT("GetCharABCWidthsW\n"); + if ((!lpabc) || (FirstChar > LastChar)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + return NtGdiGetCharABCWidthsW( hdc, + FirstChar, + (ULONG)(LastChar - FirstChar + 1), + (PWCHAR) NULL, + GCABCW_NOFLOAT, + (PVOID)lpabc); +} + +/* + * @implemented + */ +BOOL +STDCALL +GetCharWidthA( + HDC hdc, + UINT iFirstChar, + UINT iLastChar, + LPINT lpBuffer + ) +{ +DPRINT("GetCharWidthsA\n"); + INT i, wlen, count = (INT)(iLastChar - iFirstChar + 1); + LPSTR str; + LPWSTR wstr; + BOOL ret = TRUE; + + if(count <= 0) return FALSE; + + str = HeapAlloc(GetProcessHeap(), 0, count); + for(i = 0; i < count; i++) + str[i] = (BYTE)(iFirstChar + i); + + wstr = FONT_mbtowc(NULL, str, count, &wlen, NULL); + + ret = NtGdiGetCharWidthW( hdc, + wstr[0], + (ULONG) count, + (PWCHAR) wstr, + GCW_NOFLOAT, + (PVOID) lpBuffer); + + HeapFree(GetProcessHeap(), 0, str); + HeapFree(GetProcessHeap(), 0, wstr); + + return ret; +} + +/* + * @implemented + */ +BOOL +STDCALL +GetCharWidth32A( + HDC hdc, + UINT iFirstChar, + UINT iLastChar, + LPINT lpBuffer + ) +{ +DPRINT("GetCharWidths32A\n"); + INT i, wlen, count = (INT)(iLastChar - iFirstChar + 1); + LPSTR str; + LPWSTR wstr; + BOOL ret = TRUE; + + if(count <= 0) return FALSE; + + str = HeapAlloc(GetProcessHeap(), 0, count); + for(i = 0; i < count; i++) + str[i] = (BYTE)(iFirstChar + i); + + wstr = FONT_mbtowc(NULL, str, count, &wlen, NULL); + + ret = NtGdiGetCharWidthW( hdc, + wstr[0], + (ULONG) count, + (PWCHAR) wstr, + GCW_NOFLOAT|GCW_WIN32, + (PVOID) lpBuffer); + + HeapFree(GetProcessHeap(), 0, str); + HeapFree(GetProcessHeap(), 0, wstr); + + return ret; +} + +/* + * @implemented */ BOOL APIENTRY @@ -595,10 +717,27 @@ PFLOAT pxBuffer ) { - /* FIXME what to do with iFirstChar and iLastChar ??? */ - return FALSE; -} - +DPRINT("GetCharWidthsFloatA\n"); + INT i, wlen, count = (INT)(iLastChar - iFirstChar + 1); + LPSTR str; + LPWSTR wstr; + BOOL ret = TRUE; + + if(count <= 0) return FALSE; + + str = HeapAlloc(GetProcessHeap(), 0, count); + for(i = 0; i < count; i++) + str[i] = (BYTE)(iFirstChar + i); + + wstr = FONT_mbtowc(NULL, str, count, &wlen, NULL); + + ret = NtGdiGetCharWidthW( hdc, wstr[0], (ULONG) count, (PWCHAR) wstr, 0, (PVOID) pxBuffer); + + HeapFree(GetProcessHeap(), 0, str); + HeapFree(GetProcessHeap(), 0, wstr); + + return ret; +} /* * @implemented @@ -612,14 +751,35 @@ LPABC lpabc ) { -DPRINT1("GCABCWA uFirstChar %x\n",uFirstChar); - -return NtGdiGetCharABCWidths(hdc, uFirstChar, uLastChar, lpabc); -} - - -/* - * @unimplemented +DPRINT("GetCharABCWidthsA\n"); + INT i, wlen, count = (INT)(uLastChar - uFirstChar + 1); + LPSTR str; + LPWSTR wstr; + BOOL ret = TRUE; + + if(count <= 0) return FALSE; + + str = HeapAlloc(GetProcessHeap(), 0, count); + for(i = 0; i < count; i++) + str[i] = (BYTE)(uFirstChar + i); + + wstr = FONT_mbtowc(hdc, str, count, &wlen, NULL); + + ret = NtGdiGetCharABCWidthsW( hdc, + wstr[0], + (ULONG)count, + (PWCHAR)wstr, + GCABCW_NOFLOAT, + (PVOID)lpabc); + + HeapFree(GetProcessHeap(), 0, str); + HeapFree(GetProcessHeap(), 0, wstr); + + return ret; +} + +/* + * @implemented */ BOOL APIENTRY @@ -630,10 +790,27 @@ LPABCFLOAT lpABCF ) { -DPRINT1("GCABCWFA iFirstChar %x\n",iFirstChar); - - /* FIXME what to do with iFirstChar and iLastChar ??? */ - return FALSE; +DPRINT("GetCharABCWidthsFloatA\n"); + INT i, wlen, count = (INT)(iLastChar - iFirstChar + 1); + LPSTR str; + LPWSTR wstr; + BOOL ret = TRUE; + + if (count <= 0) return FALSE; + + str = HeapAlloc(GetProcessHeap(), 0, count); + + for(i = 0; i < count; i++) + str[i] = (BYTE)(iFirstChar + i); + + wstr = FONT_mbtowc( hdc, str, count, &wlen, NULL ); + + ret = NtGdiGetCharABCWidthsW( hdc,wstr[0],(ULONG)count, (PWCHAR)wstr, 0, (PVOID)lpABCF); + + HeapFree( GetProcessHeap(), 0, str ); + HeapFree( GetProcessHeap(), 0, wstr ); + + return ret; } /* @@ -645,10 +822,42 @@ UINT giFirst, UINT cgi, LPWORD pgi, - LPABC lpabc + LPABC lpabc) +{ +DPRINT("GetCharABCWidthsI\n"); + return NtGdiGetCharABCWidthsW( hdc, + giFirst, + (ULONG) cgi, + (PWCHAR) pgi, + GCABCW_NOFLOAT|GCABCW_INDICES, + (PVOID)lpabc); +} + +/* + * @implemented + */ +BOOL +STDCALL +GetCharWidthI(HDC hdc, + UINT giFirst, + UINT cgi, + LPWORD pgi, + LPINT lpBuffer ) { - return NtGdiGetCharABCWidthsW( hdc, giFirst, (ULONG) cgi, (PWCHAR) pgi, 3, (PVOID)lpabc); +DPRINT("GetCharWidthsI\n"); + if (!lpBuffer || (!pgi && (giFirst == MAXUSHORT))) // Cannot be at max. + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (!cgi) return TRUE; + return NtGdiGetCharWidthW( hdc, + giFirst, + cgi, + (PWCHAR) pgi, + GCW_INDICES|GCW_NOFLOAT|GCW_WIN32, + (PVOID) lpBuffer ); } /* @@ -730,7 +939,9 @@ CONST MAT2 *lpmat2 ) { - DPRINT1("GetGlyphOutlineW uChar %x\n", uChar); + DPRINT("GetGlyphOutlineW uChar %x\n", uChar); + if (!lpgm & !lpmat2) return GDI_ERROR; + if (!lpvBuffer) cbBuffer = 0; return NtGdiGetGlyphOutline ( hdc, uChar, uFormat, lpgm, cbBuffer, lpvBuffer, (CONST LPMAT2)lpmat2, TRUE); } Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Wed Nov 7 20:58:02 2007 @@ -79,15 +79,6 @@ LPSIZE ); -BOOL -STDCALL -NtGdiGetCharWidth32( - HDC hDC, - UINT FirstChar, - UINT LastChar, - LPINT Buffer -); - /* Use NtGdiAddFontResourceW */ int STDCALL @@ -210,9 +201,6 @@ /* Should be done in user-mode using shared GDI Objects. */ INT STDCALL NtGdiGetBkMode(HDC hDC); - -/* Should be done in user-mode using shared GDI Objects. */ -BOOL STDCALL NtGdiGetBrushOrgEx(HDC hDC, LPPOINT brushOrg); /* Use NtGdiGetCharABCWidthsW */ BOOL Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Wed Nov 7 20:58:02 2007 @@ -283,4 +283,26 @@ RGNATTR VisRectRegion; } DC_ATTR, *PDC_ATTR; +typedef struct _BRUSH_ATTR +{ + LOGBRUSH logbrush; + DWORD dwUnused[3]; +} BRUSH_ATTR, *PBRUSH_ATTR; + +typedef struct _REGION_ATTR +{ + DWORD dwUnknown1; + DWORD dwUnknown2; + LONG right; + LONG bottom; + LONG left; + LONG top; +} REGION_ATTR, *PREGION_ATTR; + +typedef struct _FONT_ATTR +{ + DWORD dwUnknown; + void *pCharWidthData; +} FONT_ATTR, *PFONT_ATTR; + #endif Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h Wed Nov 7 20:58:02 2007 @@ -77,8 +77,6 @@ GdiGetDCOrg = 6, } GETDCPOINT, *PGETDCPOINT; -#define GDIBATCHBUFSIZE 0x136*4 -#define GDI_BATCH_LIMIT 20 typedef enum _GDIBATCHCMD { @@ -104,6 +102,21 @@ /* FIXME: Unknown */ typedef DWORD FULLSCREENCONTROL; typedef DWORD LFTYPE; + +/* DEFINES *******************************************************************/ + +#define GDIBATCHBUFSIZE 0x136*4 +#define GDI_BATCH_LIMIT 20 + +// NtGdiGetCharWidthW Flags +#define GCW_WIN32 0x0001 +#define GCW_NOFLOAT 0x0002 +#define GCW_INDICES 0x0008 + +// NtGdiGetCharABCWidthW Flags +#define GCABCW_NOFLOAT 0x0001 +#define GCABCW_INDICES 0x0002 + /* TYPES *********************************************************************/ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/object.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/object.c Wed Nov 7 20:58:02 2007 @@ -55,7 +55,7 @@ { PUSER_HANDLE_ENTRY entry; -// DPRINT1("handles used %i\n",usedHandles); + DPRINT("handles used %i\n",usedHandles); if (ht->freelist) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Wed Nov 7 20:58:02 2007 @@ -678,7 +678,18 @@ if(Force && !GDIOBJ_OwnedByCurrentProcess(GdiHandleTable, pdce->hDC)) { DPRINT1("Change ownership for DCE!\n"); - DC_SetOwnership( pdce->hDC, PsGetCurrentProcess()); + INT Index = GDI_HANDLE_GET_INDEX(pdce->hDC); + PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; + + // Must take control of handles that are not in the process of going away. + if ((Entry->Type & ~GDI_ENTRY_REUSE_MASK) != 0 && Entry->KernelData != NULL) + { + DC_SetOwnership( pdce->hDC, PsGetCurrentProcess()); + } + else + { + DPRINT1("Attempted to change ownership of an DCEhDC 0x%x currently being destroyed!!!\n",pdce->hDC); + } } NtGdiDeleteObjectApp(pdce->hDC); Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Wed Nov 7 20:58:02 2007 @@ -1137,7 +1137,6 @@ DC_GET_VAL( COLORREF, NtGdiGetBkColor, Dc_Attr.crBackgroundClr ) DC_GET_VAL( INT, NtGdiGetBkMode, Dc_Attr.jBkMode ) -DC_GET_VAL_EX( GetBrushOrgEx, Dc_Attr.ptlBrushOrigin.x, Dc_Attr.ptlBrushOrigin.y, POINT, x, y ) HANDLE STDCALL Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Wed Nov 7 20:58:02 2007 @@ -2130,12 +2130,18 @@ return FALSE; } + /* + * @implemented + */ BOOL STDCALL -NtGdiGetCharABCWidths(HDC hDC, - UINT FirstChar, - UINT LastChar, - LPABC abc) +NtGdiGetCharABCWidthsW( + IN HDC hDC, + IN UINT FirstChar, + IN ULONG Count, + IN OPTIONAL PWCHAR pwch, + IN FLONG fl, + OUT PVOID Buffer) { LPABC SafeBuffer; PDC dc; @@ -2146,14 +2152,21 @@ UINT i, glyph_index, BufferSize; HFONT hFont = 0; NTSTATUS Status; - - if (LastChar < FirstChar) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); + LPABC abc = NULL; + LPABCFLOAT abcf = NULL; + + if (!fl) + { + abcf = (LPABCFLOAT) Buffer; + // Not supported yet! return FALSE; } - - BufferSize = (LastChar - FirstChar + 1) * sizeof(ABC); + else + abc = (LPABC) Buffer; + + if (fl & GCABCW_INDICES) return FALSE; // Not supported yet! + + BufferSize = Count * sizeof(ABC); SafeBuffer = ExAllocatePoolWithTag(PagedPool, BufferSize, TAG_GDITEXT); if (SafeBuffer == NULL) { @@ -2214,7 +2227,7 @@ (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? 11 : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)); - for (i = FirstChar; i <= LastChar; i++) + for (i = FirstChar; i < FirstChar+Count; i++) { int adv, lsb, bbx, left, right; @@ -2252,45 +2265,17 @@ } /* - * @unimplemented - */ -BOOL -STDCALL -NtGdiGetCharABCWidthsW( - IN HDC hdc, - IN UINT wchFirst, - IN ULONG cwch, - IN OPTIONAL PWCHAR pwch, - IN FLONG fl, - OUT PVOID pvBuf) - { - UNIMPLEMENTED; - return FALSE; -} - - /* - * @unimplemented + * @implemented */ BOOL STDCALL NtGdiGetCharWidthW( - IN HDC hdc, - IN UINT wcFirst, - IN UINT cwc, + IN HDC hDC, + IN UINT FirstChar, + IN UINT Count, IN OPTIONAL PWCHAR pwc, IN FLONG fl, - OUT PVOID pvBuf) -{ - UNIMPLEMENTED; - return FALSE; -} - -BOOL -STDCALL -NtGdiGetCharWidth32(HDC hDC, - UINT FirstChar, - UINT LastChar, - LPINT Buffer) + OUT PVOID Buffer) { LPINT SafeBuffer; PDC dc; @@ -2300,14 +2285,20 @@ FT_CharMap charmap, found = NULL; UINT i, glyph_index, BufferSize; HFONT hFont = 0; - - if (LastChar < FirstChar) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); + PFLOAT BufF = NULL; + LPINT Buf = NULL; + + if (fl == 0) + { + BufF = (PFLOAT) Buffer; return FALSE; } - - BufferSize = (LastChar - FirstChar + 1) * sizeof(INT); + else + Buf = (LPINT) Buffer; + + if (fl & GCW_INDICES) return FALSE; + + BufferSize = Count * sizeof(INT); SafeBuffer = ExAllocatePoolWithTag(PagedPool, BufferSize, TAG_GDITEXT); if (SafeBuffer == NULL) { @@ -2369,7 +2360,7 @@ - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? 11 : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)); - for (i = FirstChar; i <= LastChar; i++) + for (i = FirstChar; i < FirstChar+Count; i++) { glyph_index = FT_Get_Char_Index(face, i); FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); @@ -2410,7 +2401,7 @@ OUTLINETEXTMETRICW *potm; INT i; FT_Face face; - WCHAR DefChar = 0, tmDefaultChar; + WCHAR DefChar = 0; PWSTR Buffer = NULL; ULONG Size; @@ -2441,18 +2432,20 @@ return GDI_ERROR; } - Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL); - potm = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT); - if (!potm) + if (iMode & GGI_MARK_NONEXISTING_GLYPHS) DefChar = 0x001f; /* Indicate non existence */ + else { - Status = ERROR_NOT_ENOUGH_MEMORY; - goto ErrorRet; + Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL); + potm = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT); + if (!potm) + { + Status = ERROR_NOT_ENOUGH_MEMORY; + goto ErrorRet; + } + IntGetOutlineTextMetrics(FontGDI, Size, potm); + DefChar = potm->otmTextMetrics.tmDefaultChar; // May need this. + ExFreePool(potm); } - IntGetOutlineTextMetrics(FontGDI, Size, potm); - tmDefaultChar = potm->otmTextMetrics.tmDefaultChar; // May need this. - ExFreePool(potm); - - if (iMode & GGI_MARK_NONEXISTING_GLYPHS) DefChar = 0x001f; /* Indicate non existence */ _SEH_TRY { @@ -2474,11 +2467,7 @@ for (i = 0; i < cwc; i++) { Buffer[i] = FT_Get_Char_Index(face, UnSafepwc[i]); - if (Buffer[i] == 0) - { - if (!DefChar) DefChar = tmDefaultChar; - Buffer[i] = DefChar; - } + if (Buffer[i] == 0) Buffer[i] = DefChar; } IntUnLockFreeType; Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Wed Nov 7 20:58:02 2007 @@ -746,9 +746,6 @@ NtGdiGetAspectRatioFilterEx 2 NtGdiGetBkColor 1 NtGdiGetBkMode 1 -NtGdiGetBrushOrgEx 2 -NtGdiGetCharABCWidths 4 -NtGdiGetCharWidth32 4 NtGdiGetClipBox 2 NtGdiGetColorSpace 1 NtGdiGetCurrentPositionEx 2

1 0

[cfinck] 30243: Add a feature to update an existing RosBE-Unix installation and only recompile the changed tools in this case
by cfinck＠svn.reactos.org 07 Nov '07

07 Nov '07

Author: cfinck Date: Wed Nov 7 19:46:04 2007 New Revision: 30243 URL: http://svn.reactos.org/svn/reactos?rev=30243&view=rev Log: Add a feature to update an existing RosBE-Unix installation and only recompile the changed tools in this case Modified: trunk/tools/RosBE-Unix/RosBE-Builder.sh Modified: trunk/tools/RosBE-Unix/RosBE-Builder.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Unix/RosBE-Builder.sh?… ============================================================================== --- trunk/tools/RosBE-Unix/RosBE-Builder.sh (original) +++ trunk/tools/RosBE-Unix/RosBE-Builder.sh Wed Nov 7 19:46:04 2007 @@ -8,6 +8,7 @@ # Constants ROSBE_VERSION="0.3.7-SVN" +KNOWN_ROSBE_VERSIONS="0.3.6 0.3.7-SVN" DEFAULT_INSTALL_DIR="/usr/RosBE" NEEDED_TOOLS="bison flex gcc g++ grep makeinfo" # GNU Make has a special check @@ -54,6 +55,36 @@ fi fi } + +showchoice() +{ + default_value="$1" + valid_choices="$2" + + breakloop=false + choice="" + + while true; do + read -p "Your choice [$default_value]: " choice + + if [ "$choice" = "" ]; then + choice="$default_value" + break + fi + + for valid_choice in $valid_choices; do + if [ "$choice" = "$valid_choice" ]; then + breakloop=true + break + fi + done + + if $breakloop; then + break + fi + done +} + echo "*******************************************************************************" echo "* ReactOS Build Environment for Unix-based Operating Systems *" @@ -144,6 +175,7 @@ createdir=false installdir="" +update=false while [ "$installdir" = "" ]; do read -p "[$DEFAULT_INSTALL_DIR] " installdir @@ -162,14 +194,54 @@ elif [ -d "$installdir" ]; then # Check if the directory is empty if [ ! "`ls $installdir`" = "" ]; then - echo "The directory \"$installdir\" is not empty. Do you really want to continue? (yes/no)" - read -p "[no] " answer - echo - - if [ "$answer" != "yes" ]; then - echo "Please enter another directory!" + if [ -f "$installdir/RosBE-Version" ]; then + # Allow the user to update an already installed RosBE version + choice="" + installed_version=`cat "$installdir/RosBE-Version"` + + for known_version in $KNOWN_ROSBE_VERSIONS; do + if [ "$known_version" = "$installed_version" ]; then + if [ "$installed_version" = "$ROSBE_VERSION" ]; then + echo "The current version of the Build Environment is already installed in this directory." + echo "Please choose one of the following options:" + echo + echo " (R)einstall all components of the Build Environment" + echo " (C)hoose a different installation directory" + echo + + showchoice "R" "r R c C" + else + echo "An older version of the Build Environment has been found in this directory." + echo "Please choose one of the following options:" + echo + echo " (U)pdate the existing Build Environment" + echo " (R)einstall all new components of the Build Environment" + echo " (C)hoose a different installation directory" + echo + + showchoice "U" "u U r R c C" + fi + + echo + break + fi + done + + if [ "$choice" = "U" ] || [ "$choice" = "u" ]; then + update=true + elif [ "$choice" = "C" ] || [ "$choice" = "c" ]; then + echo "Please enter another directory!" + installdir="" + fi + else + echo "The directory \"$installdir\" is not empty. Do you really want to continue? (yes/no)" + read -p "[no] " answer echo - installdir="" + + if [ "$answer" != "yes" ]; then + echo "Please enter another directory!" + installdir="" + fi fi fi @@ -191,11 +263,54 @@ exit 1 fi -# Create the directory if necessary -if $createdir; then - if ! mkdir -p "$installdir"; then - redmsg "Could not create \"$installdir\", aborted!" - exit 1 +if $update; then + setvalues=false + + process_cpucount=false + process_mingwruntime=false + process_w32api=false + process_binutils=false + process_gcc=false + process_make=false + process_nasm=false + process_buildtime=false + + # Logic behind this update part: + # - KNOWN_ROSBE_VERSIONS contains all versions from the oldest to the newest one (in this order!) + # - setvalues will be set to true, when the iterator reaches the installed version + # - Then the processing settings of the installed and the later versions will be applied. + # (i.e. if gcc changed from 0.3.7 to 0.3.8, but not from 0.3.6 to 0.3.7, the gcc build will correctly be reprocessed + # if the user has an installed RosBE 0.3.6 and wants to update to 0.3.8) + for known_version in $KNOWN_ROSBE_VERSIONS; do + if [ "$known_version" = "$installed_version" ]; then + setvalues=true + fi + + if $setvalues; then + case "$known_version" in + "0.3.6") + # TODO: Define what has to be reprocessed, when updating from 0.3.6 to the next version + process_cpucount=true + ;; + esac + fi + done +else + process_cpucount=true + process_mingwruntime=true + process_w32api=true + process_binutils=true + process_gcc=true + process_make=true + process_nasm=true + process_buildtime=true + + # Create the directory if necessary + if $createdir; then + if ! mkdir -p "$installdir"; then + redmsg "Could not create \"$installdir\", aborted!" + exit 1 + fi fi fi @@ -214,150 +329,168 @@ mkdir -p "$installdir/mingw32" >& /dev/null # cpucount -echo -n "Compiling cpucount... " -gcc -o "$installdir/bin/cpucount" "$SCRIPTDIR/tools/cpucount.c" -checkrun +if $process_cpucount; then + echo -n "Compiling cpucount... " + gcc -o "$installdir/bin/cpucount" "$SCRIPTDIR/tools/cpucount.c" + checkrun +fi + CPUCOUNT=`$installdir/bin/cpucount` +cd "$installdir/mingw32" # mingw-runtime -echo -n "Extracting mingw-runtime... " -cd "$installdir/mingw32" -tar -xjf "$SOURCEDIR/mingw-runtime.tar.bz2" >& "$SCRIPTDIR/tar.log" -checkrun "tar" +if $process_mingwruntime; then + echo -n "Extracting mingw-runtime... " + tar -xjf "$SOURCEDIR/mingw-runtime.tar.bz2" >& "$SCRIPTDIR/tar.log" + checkrun "tar" +fi # w32api -echo -n "Extracting w32api... " -tar -xjf "$SOURCEDIR/w32api.tar.bz2" >& "$SCRIPTDIR/tar.log" -checkrun "tar" +if $process_w32api; then + echo -n "Extracting w32api... " + tar -xjf "$SOURCEDIR/w32api.tar.bz2" >& "$SCRIPTDIR/tar.log" + checkrun "tar" +fi + cd "$SOURCEDIR" # binutils -rm -rf "binutils" -rm -rf "binutils-build" - -echo -n "Extracting binutils... " -tar -xjf "binutils.tar.bz2" >& "$SCRIPTDIR/tar.log" -checkrun "tar" - -echo -n "Configuring binutils... " -mkdir "binutils-build" -cd "binutils-build" -../binutils/configure --prefix="$installdir" --target=mingw32 --disable-nls --with-gcc \ - --with-gnu-as --with-gnu-ld --disable-shared >& "$SCRIPTDIR/configure.log" -checkrun "configure" - -echo -n "Building binutils... " -$makecmd -j $CPUCOUNT CFLAGS="-O2 -fno-exceptions" LDFLAGS="-s" >& "$SCRIPTDIR/make.log" -checkrun "make" - -echo -n "Installing binutils... " -$makecmd install >& "$SCRIPTDIR/make.log" -checkrun "make" - -echo -n "Cleaning up binutils... " -cd "$SOURCEDIR" -rm -rf "binutils-build" -rm -rf "binutils" -checkrun +if $process_binutils; then + rm -rf "binutils" + rm -rf "binutils-build" + + echo -n "Extracting binutils... " + tar -xjf "binutils.tar.bz2" >& "$SCRIPTDIR/tar.log" + checkrun "tar" + + echo -n "Configuring binutils... " + mkdir "binutils-build" + cd "binutils-build" + ../binutils/configure --prefix="$installdir" --target=mingw32 --disable-nls --with-gcc \ + --with-gnu-as --with-gnu-ld --disable-shared >& "$SCRIPTDIR/configure.log" + checkrun "configure" + + echo -n "Building binutils... " + $makecmd -j $CPUCOUNT CFLAGS="-O2 -fno-exceptions" LDFLAGS="-s" >& "$SCRIPTDIR/make.log" + checkrun "make" + + echo -n "Installing binutils... " + $makecmd install >& "$SCRIPTDIR/make.log" + checkrun "make" + + echo -n "Cleaning up binutils... " + cd "$SOURCEDIR" + rm -rf "binutils-build" + rm -rf "binutils" + checkrun +fi # gcc -rm -rf "gcc" -rm -rf "gcc-build" - -echo -n "Extracting gcc... " -tar -xjf "gcc.tar.bz2" >& "$SCRIPTDIR/tar.log" -checkrun "tar" - -echo -n "Configuring gcc... " -mkdir "gcc-build" -cd "gcc-build" -../gcc/configure --prefix="$installdir" --target=mingw32 \ - --with-headers="$installdir/mingw32/include"--with-gcc --with-gnu-ld \ - --with-gnu-as --enable-languages=c,c++ --enable-checking=release \ - --enable-threads=win32 --disable-win32-registry --disable-nls \ - --disable-shared >& "$SCRIPTDIR/configure.log" -checkrun "configure" - -echo -n "Building gcc... " -$makecmd -j $CPUCOUNT CFLAGS="-O2" CXXFLAGS="-O2" LDFLAGS="-s" >& "$SCRIPTDIR/make.log" -checkrun "make" - -echo -n "Installing gcc... " -$makecmd install >& "$SCRIPTDIR/make.log" -checkrun "make" - -echo -n "Cleaning up gcc... " -cd "$SOURCEDIR" -rm -rf "gcc-build" -rm -rf "gcc" -checkrun +if $process_gcc; then + rm -rf "gcc" + rm -rf "gcc-build" + + echo -n "Extracting gcc... " + tar -xjf "gcc.tar.bz2" >& "$SCRIPTDIR/tar.log" + checkrun "tar" + + echo -n "Configuring gcc... " + mkdir "gcc-build" + cd "gcc-build" + ../gcc/configure --prefix="$installdir" --target=mingw32 \ + --with-headers="$installdir/mingw32/include"--with-gcc --with-gnu-ld \ + --with-gnu-as --enable-languages=c,c++ --enable-checking=release \ + --enable-threads=win32 --disable-win32-registry --disable-nls \ + --disable-shared >& "$SCRIPTDIR/configure.log" + checkrun "configure" + + echo -n "Building gcc... " + $makecmd -j $CPUCOUNT CFLAGS="-O2" CXXFLAGS="-O2" LDFLAGS="-s" >& "$SCRIPTDIR/make.log" + checkrun "make" + + echo -n "Installing gcc... " + $makecmd install >& "$SCRIPTDIR/make.log" + checkrun "make" + + echo -n "Cleaning up gcc... " + cd "$SOURCEDIR" + rm -rf "gcc-build" + rm -rf "gcc" + checkrun +fi # make -rm -rf "make" -rm -rf "make-build" - -echo -n "Extracting make... " -tar -xjf "make.tar.bz2" >& "$SCRIPTDIR/tar.log" -checkrun "tar" - -echo -n "Configuring make... " -mkdir "make-build" -cd "make-build" -../make/configure --prefix="$installdir" --target=mingw32 \ - --disable-dependency-tracking --disable-nls \ - --enable-case-insensitive-file-system --disable-job-server --disable-rpath \ - --program-prefix=mingw32- >& "$SCRIPTDIR/configure.log" -checkrun "configure" - -echo -n "Building make... " -$makecmd -j $CPUCOUNT CFLAGS="-s -O2 -mms-bitfields" >& "$SCRIPTDIR/make.log" -checkrun "make" - -echo -n "Installing make... " -$makecmd install >& "$SCRIPTDIR/make.log" -checkrun "make" - -echo -n "Cleaning up make... " -cd "$SOURCEDIR" -rm -rf "make-build" -rm -rf "make" -checkrun +if $process_make; then + rm -rf "make" + rm -rf "make-build" + + echo -n "Extracting make... " + tar -xjf "make.tar.bz2" >& "$SCRIPTDIR/tar.log" + checkrun "tar" + + echo -n "Configuring make... " + mkdir "make-build" + cd "make-build" + ../make/configure --prefix="$installdir" --target=mingw32 \ + --disable-dependency-tracking --disable-nls \ + --enable-case-insensitive-file-system --disable-job-server --disable-rpath \ + --program-prefix=mingw32- >& "$SCRIPTDIR/configure.log" + checkrun "configure" + + echo -n "Building make... " + $makecmd -j $CPUCOUNT CFLAGS="-s -O2 -mms-bitfields" >& "$SCRIPTDIR/make.log" + checkrun "make" + + echo -n "Installing make... " + $makecmd install >& "$SCRIPTDIR/make.log" + checkrun "make" + + echo -n "Cleaning up make... " + cd "$SOURCEDIR" + rm -rf "make-build" + rm -rf "make" + checkrun +fi # nasm -rm -rf "nasm" -rm -rf "nasm-build" - -echo -n "Extracting nasm... " -tar -xjf "nasm.tar.bz2" >& "$SCRIPTDIR/tar.log" -checkrun "tar" - -echo -n "Configuring nasm... " -mkdir "nasm-build" -cd "nasm-build" -../nasm/configure --prefix="$installdir" --target=mingw32 >& "$SCRIPTDIR/configure.log" -checkrun "configure" - -echo -n "Building nasm... " -$makecmd -j $CPUCOUNT >& "$SCRIPTDIR/make.log" -checkrun "make" - -echo -n "Installing nasm... " -$makecmd install >& "$SCRIPTDIR/make.log" -checkrun "make" - -echo -n "Cleaning up nasm... " -cd "$SOURCEDIR" -rm -rf "nasm-build" -rm -rf "nasm" -checkrun +if $process_nasm; then + rm -rf "nasm" + rm -rf "nasm-build" + + echo -n "Extracting nasm... " + tar -xjf "nasm.tar.bz2" >& "$SCRIPTDIR/tar.log" + checkrun "tar" + + echo -n "Configuring nasm... " + mkdir "nasm-build" + cd "nasm-build" + ../nasm/configure --prefix="$installdir" --target=mingw32 >& "$SCRIPTDIR/configure.log" + checkrun "configure" + + echo -n "Building nasm... " + $makecmd -j $CPUCOUNT >& "$SCRIPTDIR/make.log" + checkrun "make" + + echo -n "Installing nasm... " + $makecmd install >& "$SCRIPTDIR/make.log" + checkrun "make" + + echo -n "Cleaning up nasm... " + cd "$SOURCEDIR" + rm -rf "nasm-build" + rm -rf "nasm" + checkrun +fi # Final actions echo boldmsg "Final actions" -echo -n "Compiling buildtime... " -gcc -o "$installdir/bin/buildtime" "$SCRIPTDIR/tools/buildtime.c" -checkrun +if $process_buildtime; then + echo -n "Compiling buildtime... " + gcc -o "$installdir/bin/buildtime" "$SCRIPTDIR/tools/buildtime.c" + checkrun +fi echo -n "Removing unneeded files... " rm -rf "$installdir/mingw32/sys-include"

1 0

[gedmurphy] 30242: initialize the main settings settings struct earlier as we'll need it to outside of the dialog
by gedmurphy＠svn.reactos.org 07 Nov '07

07 Nov '07

Author: gedmurphy Date: Wed Nov 7 17:59:43 2007 New Revision: 30242 URL: http://svn.reactos.org/svn/reactos?rev=30242&view=rev Log: initialize the main settings settings struct earlier as we'll need it to outside of the dialog Modified: trunk/reactos/base/applications/mstsc/connectdialog.c trunk/reactos/base/applications/mstsc/todo.h trunk/reactos/base/applications/mstsc/uimain.h trunk/reactos/base/applications/mstsc/win32.c Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c Wed Nov 7 17:59:43 2007 @@ -900,7 +900,8 @@ static BOOL -OnMainCreate(HWND hwnd) +OnMainCreate(HWND hwnd, + PRDPSETTINGS pRdpSettings) { PINFO pInfo; TCITEM item; @@ -915,10 +916,8 @@ GWLP_USERDATA, (LONG_PTR)pInfo); - /* read the default .rdp file */ - pInfo->pRdpSettings = LoadRdpSettingsFromFile(NULL); - if (!pInfo->pRdpSettings) - return FALSE; + /* add main settings pointer */ + pInfo->pRdpSettings = pRdpSettings; pInfo->hHeader = (HBITMAP)LoadImage(hInst, MAKEINTRESOURCE(IDB_HEADER), @@ -989,7 +988,7 @@ switch(Message) { case WM_INITDIALOG: - OnMainCreate(hDlg); + OnMainCreate(hDlg, (PRDPSETTINGS)lParam); break; case WM_COMMAND: @@ -1064,20 +1063,6 @@ { if (pInfo) { - if (pInfo->pRdpSettings) - { - if (pInfo->pRdpSettings->pSettings) - { - HeapFree(GetProcessHeap(), - 0, - pInfo->pRdpSettings->pSettings); - } - - HeapFree(GetProcessHeap(), - 0, - pInfo->pRdpSettings); - } - HeapFree(GetProcessHeap(), 0, pInfo); @@ -1096,7 +1081,8 @@ } BOOL -OpenRDPConnectDialog(HINSTANCE hInstance) +OpenRDPConnectDialog(HINSTANCE hInstance, + PRDPSETTINGS pRdpSettings) { INITCOMMONCONTROLSEX iccx; @@ -1106,8 +1092,9 @@ iccx.dwICC = ICC_TAB_CLASSES; InitCommonControlsEx(&iccx); - return (DialogBox(hInst, - MAKEINTRESOURCE(IDD_CONNECTDIALOG), - NULL, - (DLGPROC)DlgProc) == IDOK); -} + return (DialogBoxParam(hInst, + MAKEINTRESOURCE(IDD_CONNECTDIALOG), + NULL, + (DLGPROC)DlgProc, + pRdpSettings) == IDOK); +} Modified: trunk/reactos/base/applications/mstsc/todo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/to… ============================================================================== --- trunk/reactos/base/applications/mstsc/todo.h (original) +++ trunk/reactos/base/applications/mstsc/todo.h Wed Nov 7 17:59:43 2007 @@ -17,7 +17,7 @@ INT NumSettings; } RDPSETTINGS, *PRDPSETTINGS; - +BOOL OpenRDPConnectDialog(HINSTANCE hInstance, PRDPSETTINGS pRdpSettings); PRDPSETTINGS LoadRdpSettingsFromFile(LPWSTR lpFile); BOOL SaveRdpSettingsToFile(LPWSTR lpFile, PRDPSETTINGS pRdpSettings); INT GetIntegerFromSettings(PRDPSETTINGS pSettings, LPWSTR lpValue); Modified: trunk/reactos/base/applications/mstsc/uimain.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ui… ============================================================================== --- trunk/reactos/base/applications/mstsc/uimain.h (original) +++ trunk/reactos/base/applications/mstsc/uimain.h Wed Nov 7 17:59:43 2007 @@ -74,7 +74,3 @@ #define UI_MAX(a, b) (((a) > (b)) ? (a) : (b)) #undef UI_MIN #define UI_MIN(a, b) (((a) < (b)) ? (a) : (b)) - -/* in connectdialog.c */ -BOOL OpenRDPConnectDialog(); - Modified: trunk/reactos/base/applications/mstsc/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/wi… ============================================================================== --- trunk/reactos/base/applications/mstsc/win32.c (original) +++ trunk/reactos/base/applications/mstsc/win32.c Wed Nov 7 17:59:43 2007 @@ -23,6 +23,7 @@ #include <winuser.h> #include <stdio.h> #include "uimain.h" +#include "todo.h" #include "resource.h" extern char g_username[]; @@ -1290,24 +1291,40 @@ #else /* WITH_DEBUG */ /*****************************************************************************/ int WINAPI -WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, - LPTSTR lpCmdLine, int nCmdShow) -{ - WSADATA d; - int ret = 1; - - WSAStartup(MAKEWORD(2, 0), &d); - - //if (mi_process_cl(lpCmdLine)) - //{ - if (OpenRDPConnectDialog(hInstance)) - { - ui_main(); - ret = 0; - } - //} - - WSACleanup(); +WinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPTSTR lpCmdLine, + int nCmdShow) +{ + PRDPSETTINGS pRdpSettings; + WSADATA d; + int ret = 1; + + if (WSAStartup(MAKEWORD(2, 0), &d) == 0) + { + pRdpSettings = LoadRdpSettingsFromFile(NULL); + + if (pRdpSettings) + { + //mi_process_cl(lpCmdLine) + if (OpenRDPConnectDialog(hInstance, + pRdpSettings)) + { + ui_main(); + ret = 0; + } + + HeapFree(GetProcessHeap(), + 0, + pRdpSettings->pSettings); + + HeapFree(GetProcessHeap(), + 0, + pRdpSettings); + } + + WSACleanup(); + } return ret; }

1 0

[gedmurphy] 30241: - add code to set changes to the main configuration and use it for the resolution slider - fix a bug in showing the current resolution in the label
by gedmurphy＠svn.reactos.org 07 Nov '07

07 Nov '07

Author: gedmurphy Date: Wed Nov 7 16:49:31 2007 New Revision: 30241 URL: http://svn.reactos.org/svn/reactos?rev=30241&view=rev Log: - add code to set changes to the main configuration and use it for the resolution slider - fix a bug in showing the current resolution in the label Modified: trunk/reactos/base/applications/mstsc/connectdialog.c trunk/reactos/base/applications/mstsc/rdpfile.c trunk/reactos/base/applications/mstsc/todo.h Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c Wed Nov 7 16:49:31 2007 @@ -557,6 +557,14 @@ 0, (LPARAM)Buffer); + /* save new settings */ + SetIntegerToSettings(pInfo->pRdpSettings, + L"desktopwidth", + pInfo->DisplayDeviceList->Resolutions[position].dmPelsWidth); + SetIntegerToSettings(pInfo->pRdpSettings, + L"desktopheight", + pInfo->DisplayDeviceList->Resolutions[position].dmPelsHeight); + } @@ -568,7 +576,6 @@ TCHAR Pixel[64]; DWORD index, i, num; DWORD MaxBpp = 0; - UINT HighBpp; DWORD width, height; UINT types[4]; @@ -588,20 +595,9 @@ switch (MaxBpp) { case 32: - case 24: - HighBpp = IDS_HIGHCOLOR24; - num = 4; - break; - - case 16: - HighBpp = IDS_HIGHCOLOR16; - num = 3; - break; - - case 8: - HighBpp = IDS_256COLORS; - num = 1; - break; + case 24: num = 4; break; + case 16: num = 3; break; + case 8: num = 1; break; } types[0] = IDS_256COLORS; @@ -659,23 +655,6 @@ TRUE, MAKELONG(0, pInfo->DisplayDeviceList->ResolutionsCount)); //extra 1 for full screen - if (LoadString(hInst, - IDS_PIXEL, - Pixel, - sizeof(Pixel) / sizeof(TCHAR))) - { - _stprintf(Buffer, - Pixel, - pInfo->CurrentDisplayDevice->CurrentSettings->dmPelsWidth, - pInfo->CurrentDisplayDevice->CurrentSettings->dmPelsHeight, - Pixel); - SendDlgItemMessage(pInfo->hDisplayPage, - IDC_SETTINGS_RESOLUTION_TEXT, - WM_SETTEXT, - 0, - (LPARAM)Buffer); - } - width = GetIntegerFromSettings(pInfo->pRdpSettings, L"desktopwidth"); height = GetIntegerFromSettings(pInfo->pRdpSettings, L"desktopheight"); @@ -693,6 +672,23 @@ index); break; } + } + + if (LoadString(hInst, + IDS_PIXEL, + Pixel, + sizeof(Pixel) / sizeof(TCHAR))) + { + _stprintf(Buffer, + Pixel, + width, + height, + Pixel); + SendDlgItemMessage(pInfo->hDisplayPage, + IDC_SETTINGS_RESOLUTION_TEXT, + WM_SETTEXT, + 0, + (LPARAM)Buffer); } } } Modified: trunk/reactos/base/applications/mstsc/rdpfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… ============================================================================== --- trunk/reactos/base/applications/mstsc/rdpfile.c (original) +++ trunk/reactos/base/applications/mstsc/rdpfile.c Wed Nov 7 16:49:31 2007 @@ -16,6 +16,64 @@ L"compression", }; + + +BOOL +SetIntegerToSettings(PRDPSETTINGS pRdpSettings, + LPWSTR lpKey, + INT Value) +{ + BOOL bRet = FALSE; + + if (pRdpSettings) + { + INT i; + + for (i = 0; i < pRdpSettings->NumSettings; i++) + { + if (wcscmp(pRdpSettings->pSettings[i].Key, lpKey) == 0) + { + if (pRdpSettings->pSettings[i].Type == L'i') + { + pRdpSettings->pSettings[i].Value.i = Value; + bRet = TRUE; + break; + } + } + } + } + + return bRet; +} + + +BOOL +SetStringToSettings(PRDPSETTINGS pRdpSettings, + LPWSTR lpKey, + LPWSTR lpValue) +{ + BOOL bRet = FALSE; + + if (pRdpSettings) + { + INT i; + + for (i = 0; i < pRdpSettings->NumSettings; i++) + { + if (wcscmp(pRdpSettings->pSettings[i].Key, lpKey) == 0) + { + if (pRdpSettings->pSettings[i].Type == L's') + { + wcscpy(pRdpSettings->pSettings[i].Value.i, lpValue); + bRet = TRUE; + break; + } + } + } + } + + return bRet; +} INT Modified: trunk/reactos/base/applications/mstsc/todo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/to… ============================================================================== --- trunk/reactos/base/applications/mstsc/todo.h (original) +++ trunk/reactos/base/applications/mstsc/todo.h Wed Nov 7 16:49:31 2007 @@ -22,3 +22,5 @@ BOOL SaveRdpSettingsToFile(LPWSTR lpFile, PRDPSETTINGS pRdpSettings); INT GetIntegerFromSettings(PRDPSETTINGS pSettings, LPWSTR lpValue); LPWSTR GetStringFromSettings(PRDPSETTINGS pSettings, LPWSTR lpValue); +BOOL SetIntegerToSettings(PRDPSETTINGS pRdpSettings, LPWSTR lpKey, INT Value); +BOOL SetStringToSettings(PRDPSETTINGS pRdpSettings, LPWSTR lpKey, LPWSTR lpValue);

1 0

[gedmurphy] 30240: - set the colors combo box according to the .rdp file - add a note for server browsing
by gedmurphy＠svn.reactos.org 07 Nov '07

07 Nov '07

Author: gedmurphy Date: Wed Nov 7 16:13:05 2007 New Revision: 30240 URL: http://svn.reactos.org/svn/reactos?rev=30240&view=rev Log: - set the colors combo box according to the .rdp file - add a note for server browsing Modified: trunk/reactos/base/applications/mstsc/connectdialog.c trunk/reactos/base/applications/mstsc/resource.h trunk/reactos/base/applications/mstsc/win32.c Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c Wed Nov 7 16:13:05 2007 @@ -262,6 +262,28 @@ { switch(LOWORD(wParam)) { + case IDC_SERVERCOMBO: + if (HIWORD(wParam) == CBN_SELCHANGE) + { + INT last, cur; + + cur = SendDlgItemMessage(hDlg, + IDC_SERVERCOMBO, + CB_GETCURSEL, + 0, + 0); + cur++; + + last = SendDlgItemMessage(hDlg, + IDC_SERVERCOMBO, + CB_GETCOUNT, + 0, + 0); + if (cur == last) + MessageBox(hDlg, _T("SMB is not yet supported"), _T("RDP error"), MB_ICONERROR); + } + break; + case IDC_SAVE: SaveRdpSettingsToFile(NULL, pInfo->pRdpSettings); break; @@ -548,6 +570,7 @@ DWORD MaxBpp = 0; UINT HighBpp; DWORD width, height; + UINT types[4]; pInfo->CurrentDisplayDevice = pInfo->DisplayDeviceList; /* Update global variable */ @@ -565,10 +588,26 @@ switch (MaxBpp) { case 32: - case 24: HighBpp = IDS_HIGHCOLOR24; break; - case 16: HighBpp = IDS_HIGHCOLOR16; break; - case 8: HighBpp = IDS_256COLORS; break; - } + case 24: + HighBpp = IDS_HIGHCOLOR24; + num = 4; + break; + + case 16: + HighBpp = IDS_HIGHCOLOR16; + num = 3; + break; + + case 8: + HighBpp = IDS_256COLORS; + num = 1; + break; + } + + types[0] = IDS_256COLORS; + types[1] = IDS_HIGHCOLOR15; + types[2] = IDS_HIGHCOLOR16; + types[3] = IDS_HIGHCOLOR24; /* Fill color depths combo box */ SendDlgItemMessage(pInfo->hDisplayPage, @@ -576,7 +615,6 @@ CB_RESETCONTENT, 0, 0); - num = HighBpp - IDS_256COLORS; for (i = 0, Current = pInfo->DisplayDeviceList->Settings; i <= num && Current != NULL; @@ -584,7 +622,7 @@ { TCHAR Buffer[64]; if (LoadString(hInst, - (IDS_256COLORS + i), + types[i], Buffer, sizeof(Buffer) / sizeof(TCHAR))) { @@ -604,7 +642,7 @@ IDC_BPPCOMBO, CB_SETITEMDATA, index, - Current->dmBitsPerPel); + types[i]); } } } @@ -731,7 +769,48 @@ } if (GotDev) + { + INT bpp, num, i; + BOOL bSet = FALSE; + FillResolutionsAndColors(pInfo); + + /* set color combo */ + bpp = GetIntegerFromSettings(pInfo->pRdpSettings, L"session bpp"); + + num = SendDlgItemMessage(pInfo->hDisplayPage, + IDC_BPPCOMBO, + CB_GETCOUNT, + 0, + 0); + for (i = 0; i < num; i++) + { + INT data = SendDlgItemMessage(pInfo->hDisplayPage, + IDC_BPPCOMBO, + CB_GETITEMDATA, + i, + 0); + if (data == bpp) + { + SendDlgItemMessage(pInfo->hDisplayPage, + IDC_BPPCOMBO, + CB_SETCURSEL, + i, + 0); + bSet = TRUE; + break; + } + } + + if (!bSet) + { + SendDlgItemMessage(pInfo->hDisplayPage, + IDC_BPPCOMBO, + CB_SETCURSEL, + num - 1, + 0); + } + } } Modified: trunk/reactos/base/applications/mstsc/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/re… ============================================================================== --- trunk/reactos/base/applications/mstsc/resource.h (original) +++ trunk/reactos/base/applications/mstsc/resource.h Wed Nov 7 16:13:05 2007 @@ -1,4 +1,9 @@ #define IDC_STATIC -1 + +#define IDS_256COLORS 8 +#define IDS_HIGHCOLOR15 15 +#define IDS_HIGHCOLOR16 16 +#define IDS_HIGHCOLOR24 24 #define IDD_CONNECTDIALOG 101 #define IDD_GENERAL 105 @@ -32,8 +37,3 @@ #define IDS_PIXEL 3006 #define IDS_FULLSCREEN 3007 #define IDS_BROWSESERVER 3008 - -#define IDS_256COLORS 4000 -#define IDS_HIGHCOLOR15 4001 -#define IDS_HIGHCOLOR16 4002 -#define IDS_HIGHCOLOR24 4003 Modified: trunk/reactos/base/applications/mstsc/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/wi… ============================================================================== --- trunk/reactos/base/applications/mstsc/win32.c (original) +++ trunk/reactos/base/applications/mstsc/win32.c Wed Nov 7 16:13:05 2007 @@ -1271,46 +1271,6 @@ return (state == 0); } -/*****************************************************************************/ -/* display the command line options available */ -static void -mi_show_params(void) -{ - char text1[512 * 4]; - TCHAR textx[512 * 4]; - TCHAR lcaption[64]; - - strcpy(text1, ""); - strcat(text1, "WinRDesktop - an RDP client based on rdesktop\r\n"); - strcat(text1, "You can't run this application without " ); - strcat(text1, "correct parameters\r\n"); - strcat(text1, "\r\n"); - strcat(text1, "command line options\r\n"); - strcat(text1, "\r\n"); - strcat(text1, "WinRDesktop [-g widthxheight] [-t port] [-a bpp]\r\n"); - strcat(text1, " [-f] [-u username] [-p password] [-d domain]\r\n"); - strcat(text1, " [-s shell] [-c working directory] [-n host name]\r\n"); - strcat(text1, " server-name-or-ip\r\n"); - strcat(text1, "\r\n"); - strcat(text1, "You can use a config file in the current directory\r\n"); - strcat(text1, "called WinRDesktop.ini\r\n"); - strcat(text1, "The file should look like this...\r\n"); - strcat(text1, "[main]\r\n"); - strcat(text1, "server=192.168.1.1\r\n"); - strcat(text1, "port=3389\r\n"); - strcat(text1, "username=user1\r\n"); - strcat(text1, "password=password1\r\n"); - strcat(text1, "bpp=16\r\n"); - strcat(text1, "geometry=800x600\r\n"); -#ifdef WITH_DEBUG - printf(text1); -#else /* WITH_DEBUG */ - str_to_uni(lcaption, "WinRDesktop"); - str_to_uni(textx, text1); - MessageBox(g_Wnd, textx, lcaption, MB_OK); -#endif /* WITH_DEBUG */ -} - #ifdef WITH_DEBUG /*****************************************************************************/ int @@ -1346,8 +1306,6 @@ ret = 0; } //} - else - mi_show_params(); WSACleanup();

1 0

[pschweitzer] 30239: - Silent last warning - Some code cleanup
by pschweitzer＠svn.reactos.org 07 Nov '07

07 Nov '07

Author: pschweitzer Date: Wed Nov 7 15:12:02 2007 New Revision: 30239 URL: http://svn.reactos.org/svn/reactos?rev=30239&view=rev Log: - Silent last warning - Some code cleanup Modified: trunk/tools/RosBE-Windows/Tools/config/options.c Modified: trunk/tools/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE-Windows/Tools/config/options.c Wed Nov 7 15:12:02 2007 @@ -94,7 +94,6 @@ FILE *pFile; INT NbLines = 0; WCHAR optionsfile[MAX_PATH]; - PVOID *res; WCHAR *ptr, *ptr2; TCHAR TTempLine[25+MAX_PATH]; WCHAR WTempLine[25+MAX_PATH]; @@ -106,16 +105,17 @@ pFile = _wfopen(optionsfile, L"r"); if (pFile) { - res = (PVOID)fgets((char *)TTempLine, 24+MAX_PATH, pFile); - while (res) + while (fgets((char *)TTempLine, 24+MAX_PATH, pFile)) { MultiByteToWideChar(CP_ACP, 0, (char *)TTempLine, -1, WTempLine, sizeof(WTempLine)/sizeof(WTempLine[0])); ptr = wcstok(WTempLine, L" "); if (wcscmp(ptr, L"color") == 0) { ptr = wcstok(NULL, L" "); - LoadedSettings->background = strtoul((WCHAR*)&ptr[0], NULL, 16); - LoadedSettings->foreground = wcstoul(&ptr[1], NULL, 16); + ptr[2] = ptr[1]; + ptr[1] = 0; + LoadedSettings->background = wcstol(&ptr[0], NULL, 16); + LoadedSettings->foreground = wcstol(&ptr[2], NULL, 16); } else if (wcscmp(ptr, L"set") == 0) { @@ -124,19 +124,19 @@ ptr2 = wcstok(NULL, L"="); if (wcscmp(ptr, L"_ROSBE_SHOWTIME") == 0) { - LoadedSettings->showtime = wcstoul(ptr2, NULL, 2); + LoadedSettings->showtime = wcstol(ptr2, NULL, 2); } else if (wcscmp(ptr, L"_ROSBE_USECCACHE") == 0) { - LoadedSettings->useccache = wcstoul(ptr2, NULL, 2); + LoadedSettings->useccache = wcstol(ptr2, NULL, 2); } else if (wcscmp(ptr, L"_ROSBE_STRIP") == 0) { - LoadedSettings->strip = wcstoul(ptr2, NULL, 2); + LoadedSettings->strip = wcstol(ptr2, NULL, 2); } else if (wcscmp(ptr, L"_ROSBE_WRITELOG") == 0) { - LoadedSettings->writelog = wcstoul(ptr2, NULL, 2); + LoadedSettings->writelog = wcstol(ptr2, NULL, 2); } else if (wcscmp(ptr, L"_ROSBE_LOGDIR") == 0) { @@ -157,7 +157,6 @@ } free(TTempLine); free(WTempLine); - res = (PVOID)fgets((char *)TTempLine, 24+MAX_PATH, pFile); NbLines++; } fclose(pFile); @@ -186,18 +185,18 @@ SendDlgItemMessageW(hwnd, ID_STRIP, BM_SETCHECK, LoadedSettings->strip, 0); SetDlgItemText(hwnd, ID_MGWDIR, LoadedSettings->mingwpath); SetDlgItemText(hwnd, ID_LOGDIR, LoadedSettings->logdir); - SetDlgItemText(hwnd, ID_OBJDIR, LoadedSettings->objdir); if (LoadedSettings->objdir[0] != 0) { LoadedSettings->objstate = 1; + SetDlgItemText(hwnd, ID_OBJDIR, LoadedSettings->objdir); SendDlgItemMessage(hwnd, ID_OTHEROBJ, BM_SETCHECK, BST_CHECKED, 0); EnableWindow(GetDlgItem(hwnd, ID_BROWSEOBJ), TRUE); EnableWindow(GetDlgItem(hwnd, ID_OBJDIR), TRUE); } - SetDlgItemText(hwnd, ID_OUTDIR, LoadedSettings->outdir); if (LoadedSettings->outdir[0] != 0) { LoadedSettings->outstate = 1; + SetDlgItemText(hwnd, ID_OUTDIR, LoadedSettings->outdir); SendDlgItemMessage(hwnd, ID_OTHEROUT, BM_SETCHECK, BST_CHECKED, 0); EnableWindow(GetDlgItem(hwnd, ID_BROWSEOUT), TRUE); EnableWindow(GetDlgItem(hwnd, ID_OUTDIR), TRUE); @@ -304,7 +303,7 @@ case ID_OK: { if (!WriteSettings(Dlg)) - break; + break; } case ID_CANCEL: { @@ -366,10 +365,9 @@ case ID_SAVELOGS: { BOOL WriteLogSet; - INT Dialog1, Dialog2; - Dialog1 = ID_BROWSE; - Dialog2 = ID_LOGDIR; - WriteLogSet = SendDlgItemMessageW(Dlg, wParam, BM_GETCHECK, 0, 0) == BST_CHECKED; + INT Dialog1 = ID_BROWSE; + INT Dialog2 = ID_LOGDIR; + WriteLogSet = (SendDlgItemMessageW(Dlg, wParam, BM_GETCHECK, 0, 0) == BST_CHECKED); if (wParam == ID_OTHEROBJ) { Dialog1 = ID_BROWSEOBJ;

1 0

[hpoussin] 30238: On *nix systems, support absolute paths in ROS_INTERMEDIATE and ROS_OUTPUT See issue #2518 for more details.
by hpoussin＠svn.reactos.org 07 Nov '07

07 Nov '07

Author: hpoussin Date: Wed Nov 7 14:29:57 2007 New Revision: 30238 URL: http://svn.reactos.org/svn/reactos?rev=30238&view=rev Log: On *nix systems, support absolute paths in ROS_INTERMEDIATE and ROS_OUTPUT See issue #2518 for more details. Modified: trunk/reactos/Makefile trunk/reactos/tools/bin2c.mak trunk/reactos/tools/bin2res/bin2res.mak trunk/reactos/tools/buildno/buildno.mak trunk/reactos/tools/cabman/cabman.mak trunk/reactos/tools/cdmake/cdmake.mak trunk/reactos/tools/gendib/gendib.mak trunk/reactos/tools/mkhive/mkhive.mak trunk/reactos/tools/nci/nci.mak trunk/reactos/tools/ofw_interface/ofw_interface.mak trunk/reactos/tools/pefixup.mak trunk/reactos/tools/raddr2line.mak trunk/reactos/tools/rbuild/rbuild.mak trunk/reactos/tools/rgenstat/rgenstat.mak trunk/reactos/tools/rsym.mak trunk/reactos/tools/sysreg/sysreg.mak trunk/reactos/tools/widl/widl.mak trunk/reactos/tools/widl_new/widl.mak trunk/reactos/tools/winebuild/winebuild.mak trunk/reactos/tools/wmc/wmc.mak trunk/reactos/tools/wrc/wrc.mak Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=30238&r1=3023… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Wed Nov 7 14:29:57 2007 @@ -305,7 +305,6 @@ HOST=mingw32-linux endif ifeq ($(HOST),mingw32-linux) - export EXEPREFIX = ./ ifeq ($(OSTYPE),msys) export EXEPOSTFIX = .exe else @@ -317,7 +316,6 @@ cp = $(Q)cp NUL = /dev/null else # mingw32-windows - export EXEPREFIX = export EXEPOSTFIX = .exe ROS_EMPTY = export SEP = \$(ROS_EMPTY) Modified: trunk/reactos/tools/bin2c.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/bin2c.mak?rev=30238&… ============================================================================== --- trunk/reactos/tools/bin2c.mak (original) +++ trunk/reactos/tools/bin2c.mak Wed Nov 7 14:29:57 2007 @@ -7,7 +7,7 @@ BIN2C_OUT_ = $(BIN2C_OUT)$(SEP) BIN2C_TARGET = \ - $(EXEPREFIX)$(BIN2C_OUT_)bin2c$(EXEPOSTFIX) + $(BIN2C_OUT_)bin2c$(EXEPOSTFIX) BIN2C_SOURCES = \ $(BIN2C_BASE_)bin2c.c Modified: trunk/reactos/tools/bin2res/bin2res.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/bin2res/bin2res.mak?… ============================================================================== --- trunk/reactos/tools/bin2res/bin2res.mak (original) +++ trunk/reactos/tools/bin2res/bin2res.mak Wed Nov 7 14:29:57 2007 @@ -16,7 +16,7 @@ endif BIN2RES_TARGET = \ - $(EXEPREFIX)$(BIN2RES_OUT_)bin2res$(EXEPOSTFIX) + $(BIN2RES_OUT_)bin2res$(EXEPOSTFIX) BIN2RES_DEPENDS = $(BUILDNO_H) Modified: trunk/reactos/tools/buildno/buildno.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/buildno/buildno.mak?… ============================================================================== --- trunk/reactos/tools/buildno/buildno.mak (original) +++ trunk/reactos/tools/buildno/buildno.mak Wed Nov 7 14:29:57 2007 @@ -16,7 +16,7 @@ endif BUILDNO_TARGET = \ - $(EXEPREFIX)$(BUILDNO_OUT_)buildno$(EXEPOSTFIX) + $(BUILDNO_OUT_)buildno$(EXEPOSTFIX) BUILDNO_SOURCES = $(addprefix $(BUILDNO_BASE_), \ buildno.cpp \ Modified: trunk/reactos/tools/cabman/cabman.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabman.mak?re… ============================================================================== --- trunk/reactos/tools/cabman/cabman.mak (original) +++ trunk/reactos/tools/cabman/cabman.mak Wed Nov 7 14:29:57 2007 @@ -16,7 +16,7 @@ endif CABMAN_TARGET = \ - $(EXEPREFIX)$(CABMAN_OUT_)cabman$(EXEPOSTFIX) + $(CABMAN_OUT_)cabman$(EXEPOSTFIX) CABMAN_SOURCES = $(addprefix $(CABMAN_BASE_), \ cabinet.cxx \ Modified: trunk/reactos/tools/cdmake/cdmake.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.mak?re… ============================================================================== --- trunk/reactos/tools/cdmake/cdmake.mak (original) +++ trunk/reactos/tools/cdmake/cdmake.mak Wed Nov 7 14:29:57 2007 @@ -16,7 +16,7 @@ endif CDMAKE_TARGET = \ - $(EXEPREFIX)$(CDMAKE_OUT_)cdmake$(EXEPOSTFIX) + $(CDMAKE_OUT_)cdmake$(EXEPOSTFIX) CDMAKE_SOURCES = $(addprefix $(CDMAKE_BASE_), \ cdmake.c \ Modified: trunk/reactos/tools/gendib/gendib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/gendib/gendib.mak?re… ============================================================================== --- trunk/reactos/tools/gendib/gendib.mak (original) +++ trunk/reactos/tools/gendib/gendib.mak Wed Nov 7 14:29:57 2007 @@ -16,7 +16,7 @@ endif GENDIB_TARGET = \ - $(EXEPREFIX)$(GENDIB_OUT_)gendib$(EXEPOSTFIX) + $(GENDIB_OUT_)gendib$(EXEPOSTFIX) GENDIB_SOURCES = \ $(GENDIB_BASE_)gendib.c Modified: trunk/reactos/tools/mkhive/mkhive.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.mak?re… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.mak (original) +++ trunk/reactos/tools/mkhive/mkhive.mak Wed Nov 7 14:29:57 2007 @@ -16,7 +16,7 @@ endif MKHIVE_TARGET = \ - $(EXEPREFIX)$(MKHIVE_OUT_)mkhive$(EXEPOSTFIX) + $(MKHIVE_OUT_)mkhive$(EXEPOSTFIX) MKHIVE_SOURCES = $(addprefix $(MKHIVE_BASE_), \ binhive.c \ Modified: trunk/reactos/tools/nci/nci.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/nci.mak?rev=3023… ============================================================================== --- trunk/reactos/tools/nci/nci.mak (original) +++ trunk/reactos/tools/nci/nci.mak Wed Nov 7 14:29:57 2007 @@ -16,7 +16,7 @@ endif NCI_TARGET = \ - $(EXEPREFIX)$(NCI_OUT_)nci$(EXEPOSTFIX) + $(NCI_OUT_)nci$(EXEPOSTFIX) NCI_SOURCES = \ $(NCI_BASE_)ncitool.c Modified: trunk/reactos/tools/ofw_interface/ofw_interface.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/ofw_interface/ofw_in… ============================================================================== --- trunk/reactos/tools/ofw_interface/ofw_interface.mak (original) +++ trunk/reactos/tools/ofw_interface/ofw_interface.mak Wed Nov 7 14:29:57 2007 @@ -25,7 +25,7 @@ endif OFW_INTERFACE_TARGET = \ - $(EXEPREFIX)$(OFW_INTERFACE_OUT_)ofw_interface$(EXEPOSTFIX) + $(OFW_INTERFACE_OUT_)ofw_interface$(EXEPOSTFIX) OFW_INTERFACE_SOURCES = $(addprefix $(OFW_INTERFACE_BASE_), \ ofw_interface.cpp \ Modified: trunk/reactos/tools/pefixup.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/pefixup.mak?rev=3023… ============================================================================== --- trunk/reactos/tools/pefixup.mak (original) +++ trunk/reactos/tools/pefixup.mak Wed Nov 7 14:29:57 2007 @@ -7,7 +7,7 @@ PEFIXUP_OUT_ = $(PEFIXUP_OUT)$(SEP) PEFIXUP_TARGET = \ - $(EXEPREFIX)$(PEFIXUP_OUT_)pefixup$(EXEPOSTFIX) + $(PEFIXUP_OUT_)pefixup$(EXEPOSTFIX) PEFIXUP_SOURCES = \ $(PEFIXUP_BASE_)pefixup.c Modified: trunk/reactos/tools/raddr2line.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/raddr2line.mak?rev=3… ============================================================================== --- trunk/reactos/tools/raddr2line.mak (original) +++ trunk/reactos/tools/raddr2line.mak Wed Nov 7 14:29:57 2007 @@ -7,7 +7,7 @@ RADDR2LINE_OUT_ = $(RADDR2LINE_OUT)$(SEP) RADDR2LINE_TARGET = \ - $(EXEPREFIX)$(RADDR2LINE_OUT_)raddr2line$(EXEPOSTFIX) + $(RADDR2LINE_OUT_)raddr2line$(EXEPOSTFIX) RADDR2LINE_SOURCES = \ $(RADDR2LINE_BASE_)raddr2line.c \ Modified: trunk/reactos/tools/rbuild/rbuild.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.mak?re… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.mak (original) +++ trunk/reactos/tools/rbuild/rbuild.mak Wed Nov 7 14:29:57 2007 @@ -191,10 +191,10 @@ RBUILD_TARGET = \ - $(EXEPREFIX)$(RBUILD_OUT_)rbuild$(EXEPOSTFIX) + $(RBUILD_OUT_)rbuild$(EXEPOSTFIX) RBUILD_TEST_TARGET = \ - $(EXEPREFIX)$(RBUILD_OUT_)rbuild_test$(EXEPOSTFIX) + $(RBUILD_OUT_)rbuild_test$(EXEPOSTFIX) RBUILD_BACKEND_MINGW_BASE_SOURCES = $(addprefix $(RBUILD_MINGW_BASE_), \ mingw.cpp \ Modified: trunk/reactos/tools/rgenstat/rgenstat.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rgenstat/rgenstat.ma… ============================================================================== --- trunk/reactos/tools/rgenstat/rgenstat.mak (original) +++ trunk/reactos/tools/rgenstat/rgenstat.mak Wed Nov 7 14:29:57 2007 @@ -16,7 +16,7 @@ endif RGENSTAT_TARGET = \ - $(EXEPREFIX)$(RGENSTAT_OUT_)rgenstat$(EXEPOSTFIX) + $(RGENSTAT_OUT_)rgenstat$(EXEPOSTFIX) RGENSTAT_SOURCES = $(addprefix $(RGENSTAT_BASE_), \ rgenstat.c \ Modified: trunk/reactos/tools/rsym.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym.mak?rev=30238&r… ============================================================================== --- trunk/reactos/tools/rsym.mak (original) +++ trunk/reactos/tools/rsym.mak Wed Nov 7 14:29:57 2007 @@ -7,7 +7,7 @@ RSYM_OUT_ = $(RSYM_OUT)$(SEP) RSYM_TARGET = \ - $(EXEPREFIX)$(RSYM_OUT_)rsym$(EXEPOSTFIX) + $(RSYM_OUT_)rsym$(EXEPOSTFIX) RSYM_SOURCES = \ $(RSYM_BASE_)rsym.c \ Modified: trunk/reactos/tools/sysreg/sysreg.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.mak?re… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.mak (original) +++ trunk/reactos/tools/sysreg/sysreg.mak Wed Nov 7 14:29:57 2007 @@ -16,7 +16,7 @@ endif SYSREGBUILD_TARGET = \ - $(EXEPREFIX)$(SYSREGBUILD_OUT_)sysreg$(EXEPOSTFIX) + $(SYSREGBUILD_OUT_)sysreg$(EXEPOSTFIX) SYSREGBUILD_SOURCES = $(addprefix $(SYSREGBUILD_BASE_),\ conf_parser.cpp \ Modified: trunk/reactos/tools/widl/widl.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.mak?rev=30… ============================================================================== --- trunk/reactos/tools/widl/widl.mak (original) +++ trunk/reactos/tools/widl/widl.mak Wed Nov 7 14:29:57 2007 @@ -33,7 +33,7 @@ endif WIDL_TARGET = \ - $(EXEPREFIX)$(WIDL_OUT_)widl$(EXEPOSTFIX) + $(WIDL_OUT_)widl$(EXEPOSTFIX) WIDL_DEPENDS = $(BUILDNO_H) Modified: trunk/reactos/tools/widl_new/widl.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/widl.mak?re… ============================================================================== --- trunk/reactos/tools/widl_new/widl.mak (original) +++ trunk/reactos/tools/widl_new/widl.mak Wed Nov 7 14:29:57 2007 @@ -33,7 +33,7 @@ endif WIDL_TARGET = \ - $(EXEPREFIX)$(WIDL_OUT_)widl$(EXEPOSTFIX) + $(WIDL_OUT_)widl$(EXEPOSTFIX) WIDL_DEPENDS = $(BUILDNO_H) Modified: trunk/reactos/tools/winebuild/winebuild.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winebuild.… ============================================================================== --- trunk/reactos/tools/winebuild/winebuild.mak (original) +++ trunk/reactos/tools/winebuild/winebuild.mak Wed Nov 7 14:29:57 2007 @@ -16,7 +16,7 @@ endif WINEBUILD_TARGET = \ - $(EXEPREFIX)$(WINEBUILD_OUT_)winebuild$(EXEPOSTFIX) + $(WINEBUILD_OUT_)winebuild$(EXEPOSTFIX) WINEBUILD_DEPENDS = $(BUILDNO_H) Modified: trunk/reactos/tools/wmc/wmc.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/wmc.mak?rev=3023… ============================================================================== --- trunk/reactos/tools/wmc/wmc.mak (original) +++ trunk/reactos/tools/wmc/wmc.mak Wed Nov 7 14:29:57 2007 @@ -16,7 +16,7 @@ endif WMC_TARGET = \ - $(EXEPREFIX)$(WMC_OUT_)wmc$(EXEPOSTFIX) + $(WMC_OUT_)wmc$(EXEPOSTFIX) WMC_DEPENDS = $(BUILDNO_H) Modified: trunk/reactos/tools/wrc/wrc.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/wrc.mak?rev=3023… ============================================================================== --- trunk/reactos/tools/wrc/wrc.mak (original) +++ trunk/reactos/tools/wrc/wrc.mak Wed Nov 7 14:29:57 2007 @@ -33,7 +33,7 @@ endif WRC_TARGET = \ - $(EXEPREFIX)$(WRC_OUT_)wrc$(EXEPOSTFIX) + $(WRC_OUT_)wrc$(EXEPOSTFIX) WRC_DEPENDS = $(BUILDNO_H)

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