Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[pschweitzer] 30129: Second part of my previous patch. - Previous settings are loaded - TODO list is now empty !
by pschweitzer＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: pschweitzer Date: Sun Nov 4 23:29:50 2007 New Revision: 30129 URL: http://svn.reactos.org/svn/reactos?rev=30129&view=rev Log: Second part of my previous patch. - Previous settings are loaded - TODO list is now empty ! Modified: trunk/tools/RosBE-Windows/Tools/config/options.c trunk/tools/RosBE-Windows/Tools/config/todo.txt 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 Sun Nov 4 23:29:50 2007 @@ -104,35 +104,93 @@ VOID LoadSettings(HWND hwnd, PSETTINGS LoadedSettings) { - // Loading settings is not yet implemented. This function just apply default settings. -#if 0 FILE *pFile; -#endif + INT NbLines = 0; WCHAR optionsfile[MAX_PATH]; + PVOID *res; + WCHAR *ptr, *ptr2; + TCHAR TTempLine[25+MAX_PATH]; + WCHAR WTempLine[25+MAX_PATH]; wcscpy(optionsfile, _wgetenv(L"APPDATA")); if ((wcslen(optionsfile) + wcslen(L"\\RosBE\\rosbe-options.cmd")) < MAX_PATH) wcscat(optionsfile, L"\\RosBE\\rosbe-options.cmd"); -#if 0 pFile = _wfopen(optionsfile, L"r"); if (pFile) { + res = (PVOID)fgets((char *)TTempLine, 24+MAX_PATH, pFile); + while (res) + { + MultiByteToWideChar(CP_ACP, 0, TTempLine, -1, WTempLine, (25+MAX_PATH)*sizeof(WCHAR)); + ptr = wcstok(WTempLine, L" "); + if (wcscmp(ptr, L"color") == 0) + { + ptr = wcstok(NULL, L" "); + LoadedSettings->background = strtoul((WCHAR*)&ptr[0], NULL, 16); + LoadedSettings->foreground = strtoul((WCHAR*)&ptr[1], NULL, 16); + } + else if (wcscmp(ptr, L"set") == 0) + { + ptr = wcstok(NULL, L" "); + ptr = wcstok(ptr, L"="); + ptr2 = wcstok(NULL, L"="); + if (wcscmp(ptr, L"_ROSBE_SHOWTIME") == 0) + { + LoadedSettings->showtime = strtoul(ptr2, NULL, 2); + } + else if (wcscmp(ptr, L"_ROSBE_USECCACHE") == 0) + { + LoadedSettings->useccache = strtoul(ptr2, NULL, 2); + } + else if (wcscmp(ptr, L"_ROSBE_STRIP") == 0) + { + LoadedSettings->strip = strtoul(ptr2, NULL, 2); + } + else if (wcscmp(ptr, L"_ROSBE_WRITELOG") == 0) + { + LoadedSettings->writelog = strtoul(ptr2, NULL, 2); + } + else if (wcscmp(ptr, L"_ROSBE_LOGDIR") == 0) + { + wcscpy(LoadedSettings->logdir, ptr2); + } + else if (wcscmp(ptr, L"_ROSBE_MINGWPATH") == 0) + { + wcscpy(LoadedSettings->mingwpath, ptr2); + } + else if (wcscmp(ptr, L"_ROSBE_OBJPATH") == 0) + { + wcscpy(LoadedSettings->objdir, ptr2); + } + else if (wcscmp(ptr, L"_ROSBE_OUTPATH") == 0) + { + wcscpy(LoadedSettings->outdir, ptr2); + } + } + res = (PVOID)fgets((char *)TTempLine, 24+MAX_PATH, pFile); + NbLines++; + } fclose(pFile); + free(pFile); } else { -#endif LoadedSettings->foreground = 0xa; LoadedSettings->background = 0; GetCurrentDirectory(MAX_PATH, LoadedSettings->mingwpath); if ((wcslen(LoadedSettings->mingwpath) + wcslen(MINGWVERSION)) < MAX_PATH) wcscat(LoadedSettings->mingwpath, MINGWVERSION); -#if 0 - } -#endif + } SendDlgItemMessageW(hwnd, IDC_FONT, CB_SETCURSEL, LoadedSettings->foreground, 0); SendDlgItemMessageW(hwnd, IDC_BACK, CB_SETCURSEL, LoadedSettings->background, 0); + SendDlgItemMessage(hwnd, ID_SHOWBUILDTIME, BM_SETCHECK, LoadedSettings->showtime, 0); + SendDlgItemMessage(hwnd, ID_SAVELOGS, BM_SETCHECK, LoadedSettings->writelog, 0); + SendDlgItemMessage(hwnd, ID_USECCACHE, BM_SETCHECK, LoadedSettings->useccache, 0); + 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); + SetDlgItemText(hwnd, ID_OUTDIR, LoadedSettings->outdir); } VOID SetSaveState(HWND hwnd, PSETTINGS DefaultSettings) Modified: trunk/tools/RosBE-Windows/Tools/config/todo.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/t… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/todo.txt (original) +++ trunk/tools/RosBE-Windows/Tools/config/todo.txt Sun Nov 4 23:29:50 2007 @@ -1,2 +1,2 @@ -ToDo: -- Load old settings +Empty :). +Feel free to fill in it with your desire

1 0

[greatlrd] 30128: Commit a ks.h header file from 2005 written by me, it is base on dxsdk 2004 dec, but it is not completed, I do not found the almost completed version of this header I wrote. so I add the version I found so it does not get lost. Our current ks.h are not completed and is full with hacks in psdk. it will be deleted later, when ks.h are finish it will merge down to trunks to let silveblade continue on some work.
by greatlrd＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: greatlrd Date: Sun Nov 4 22:47:36 2007 New Revision: 30128 URL: http://svn.reactos.org/svn/reactos?rev=30128&view=rev Log: Commit a ks.h header file from 2005 written by me, it is base on dxsdk 2004 dec, but it is not completed, I do not found the almost completed version of this header I wrote. so I add the version I found so it does not get lost. Our current ks.h are not completed and is full with hacks in psdk. it will be deleted later, when ks.h are finish it will merge down to trunks to let silveblade continue on some work. Added: branches/reactx/reactos/include/dxsdk/ks.h (with props) Added: branches/reactx/reactos/include/dxsdk/ks.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/dxsdk/ks… ============================================================================== --- branches/reactx/reactos/include/dxsdk/ks.h (added) +++ branches/reactx/reactos/include/dxsdk/ks.h Sun Nov 4 22:47:36 2007 @@ -1,0 +1,512 @@ +#if !defined(_KS_) +#define _KS_ + +#if defined(__TCS__) +#define _KS_NO_ANONYMOUS_STRUCTURES_ 1 +#endif + +#ifndef SIZEOF_ARRAY + #define SIZEOF_ARRAY(ar) (sizeof(ar)/sizeof((ar)[0])) +#endif + +#if !defined(_NTRTL_) + #ifndef DEFINE_GUIDEX + #define DEFINE_GUIDEX(name) EXTERN_C const CDECL GUID name + #endif + + #ifndef STATICGUIDOF + #define STATICGUIDOF(guid) STATIC_##guid + #endif +#endif + +#if defined(__cplusplus) && _MSC_VER >= 1100 + #define DEFINE_GUIDSTRUCT(g, n) struct __declspec(uuid(g)) n + #define DEFINE_GUIDNAMED(n) __uuidof(struct n) +#else + #define DEFINE_GUIDSTRUCT(g, n) DEFINE_GUIDEX(n) + #define DEFINE_GUIDNAMED(n) n +#endif + + +#define STATIC_GUID_NULL 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +DEFINE_GUIDSTRUCT("00000000-0000-0000-0000-000000000000", GUID_NULL); +#define GUID_NULL DEFINE_GUIDNAMED(GUID_NULL) + +#define STATIC_KSPROPTYPESETID_General 0x97E99BA0, 0xBDEA, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 +DEFINE_GUIDSTRUCT("97E99BA0-BDEA-11CF-A5D6-28DB04C10000", KSPROPTYPESETID_General); +#define KSPROPTYPESETID_General DEFINE_GUIDNAMED(KSPROPTYPESETID_General) + +#define STATIC_KSPROPSETID_General 0x1464EDA5, 0x6A8F, 0x11D1, 0x9A, 0xA7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 +DEFINE_GUIDSTRUCT("1464EDA5-6A8F-11D1-9AA7-00A0C9223196", KSPROPSETID_General); +#define KSPROPSETID_General DEFINE_GUIDNAMED(KSPROPSETID_General) + +#define STATIC_KSMETHODSETID_StreamIo 0x65D003CA, 0x1523, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 +DEFINE_GUIDSTRUCT("65D003CA-1523-11D2-B27A-00A0C9223196", KSMETHODSETID_StreamIo); +#define KSMETHODSETID_StreamIo DEFINE_GUIDNAMED(KSMETHODSETID_StreamIo) + +#define STATIC_KSPROPSETID_MediaSeeking 0xEE904F0C, 0xD09B, 0x11D0, 0xAB, 0xE9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 +DEFINE_GUIDSTRUCT("EE904F0C-D09B-11D0-ABE9-00A0C9223196", KSPROPSETID_MediaSeeking); +#define KSPROPSETID_MediaSeeking DEFINE_GUIDNAMED(KSPROPSETID_MediaSeeking) + +#define STATIC_KSPROPSETID_Topology 0x720D4AC0, 0x7533, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 +DEFINE_GUIDSTRUCT("720D4AC0-7533-11D0-A5D6-28DB04C10000", KSPROPSETID_Topology); +#define KSPROPSETID_Topology DEFINE_GUIDNAMED(KSPROPSETID_Topology) + +#define STATIC_KSCATEGORY_BRIDGE 0x085AFF00, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 +DEFINE_GUIDSTRUCT("085AFF00-62CE-11CF-A5D6-28DB04C10000", KSCATEGORY_BRIDGE); +#define KSCATEGORY_BRIDGE DEFINE_GUIDNAMED(KSCATEGORY_BRIDGE) + +#define STATIC_KSCATEGORY_CAPTURE 0x65E8773D, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 +DEFINE_GUIDSTRUCT("65E8773D-8F56-11D0-A3B9-00A0C9223196", KSCATEGORY_CAPTURE); +#define KSCATEGORY_CAPTURE DEFINE_GUIDNAMED(KSCATEGORY_CAPTURE) + +#define STATIC_KSCATEGORY_RENDER 0x65E8773E, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 +DEFINE_GUIDSTRUCT("65E8773E-8F56-11D0-A3B9-00A0C9223196", KSCATEGORY_RENDER); +#define KSCATEGORY_RENDER DEFINE_GUIDNAMED(KSCATEGORY_RENDER) + +#define STATIC_KSCATEGORY_MIXER 0xAD809C00, 0x7B88, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 +DEFINE_GUIDSTRUCT("AD809C00-7B88-11D0-A5D6-28DB04C10000", KSCATEGORY_MIXER); +#define KSCATEGORY_MIXER DEFINE_GUIDNAMED(KSCATEGORY_MIXER) + +#define STATIC_KSCATEGORY_SPLITTER 0x0A4252A0, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 +DEFINE_GUIDSTRUCT("0A4252A0-7E70-11D0-A5D6-28DB04C10000", KSCATEGORY_SPLITTER); +#define KSCATEGORY_SPLITTER DEFINE_GUIDNAMED(KSCATEGORY_SPLITTER) + +#define STATIC_KSCATEGORY_DATACOMPRESSOR 0x1E84C900, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 +DEFINE_GUIDSTRUCT("1E84C900-7E70-11D0-A5D6-28DB04C10000", KSCATEGORY_DATACOMPRESSOR); +#define KSCATEGORY_DATACOMPRESSOR DEFINE_GUIDNAMED(KSCATEGORY_DATACOMPRESSOR) + +#define STATIC_KSCATEGORY_DATADECOMPRESSOR 0x2721AE20, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 +DEFINE_GUIDSTRUCT("2721AE20-7E70-11D0-A5D6-28DB04C10000", KSCATEGORY_DATADECOMPRESSOR); +#define KSCATEGORY_DATADECOMPRESSOR DEFINE_GUIDNAMED(KSCATEGORY_DATADECOMPRESSOR) + +#define STATIC_KSCATEGORY_DATATRANSFORM 0x2EB07EA0, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 +DEFINE_GUIDSTRUCT("2EB07EA0-7E70-11D0-A5D6-28DB04C10000", KSCATEGORY_DATATRANSFORM); +#define KSCATEGORY_DATATRANSFORM DEFINE_GUIDNAMED(KSCATEGORY_DATATRANSFORM) + +#define STATIC_KSCATEGORY_COMMUNICATIONSTRANSFORM 0xCF1DDA2C, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 +DEFINE_GUIDSTRUCT("CF1DDA2C-9743-11D0-A3EE-00A0C9223196", KSCATEGORY_COMMUNICATIONSTRANSFORM); +#define KSCATEGORY_COMMUNICATIONSTRANSFORM DEFINE_GUIDNAMED(KSCATEGORY_COMMUNICATIONSTRANSFORM) + +#define STATIC_KSCATEGORY_INTERFACETRANSFORM 0xCF1DDA2D, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 +DEFINE_GUIDSTRUCT("CF1DDA2D-9743-11D0-A3EE-00A0C9223196", KSCATEGORY_INTERFACETRANSFORM); +#define KSCATEGORY_INTERFACETRANSFORM DEFINE_GUIDNAMED(KSCATEGORY_INTERFACETRANSFORM) + +#define STATIC_KSCATEGORY_MEDIUMTRANSFORM 0xCF1DDA2E, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 +DEFINE_GUIDSTRUCT("CF1DDA2E-9743-11D0-A3EE-00A0C9223196", KSCATEGORY_MEDIUMTRANSFORM); +#define KSCATEGORY_MEDIUMTRANSFORM DEFINE_GUIDNAMED(KSCATEGORY_MEDIUMTRANSFORM) + +#define STATIC_KSCATEGORY_FILESYSTEM 0x760FED5E, 0x9357, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 +DEFINE_GUIDSTRUCT("760FED5E-9357-11D0-A3CC-00A0C9223196", KSCATEGORY_FILESYSTEM); +#define KSCATEGORY_FILESYSTEM DEFINE_GUIDNAMED(KSCATEGORY_FILESYSTEM) + +#define STATIC_KSCATEGORY_CLOCK 0x53172480, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 +DEFINE_GUIDSTRUCT("53172480-4791-11D0-A5D6-28DB04C10000", KSCATEGORY_CLOCK); +#define KSCATEGORY_CLOCK DEFINE_GUIDNAMED(KSCATEGORY_CLOCK) + +#define STATIC_KSCATEGORY_PROXY 0x97EBAACA, 0x95BD, 0x11D0, 0xA3, 0xEA, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 +DEFINE_GUIDSTRUCT("97EBAACA-95BD-11D0-A3EA-00A0C9223196", KSCATEGORY_PROXY); +#define KSCATEGORY_PROXY DEFINE_GUIDNAMED(KSCATEGORY_PROXY) + +#define STATIC_KSCATEGORY_QUALITY 0x97EBAACB, 0x95BD, 0x11D0, 0xA3, 0xEA, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 +DEFINE_GUIDSTRUCT("97EBAACB-95BD-11D0-A3EA-00A0C9223196", KSCATEGORY_QUALITY); +#define KSCATEGORY_QUALITY DEFINE_GUIDNAMED(KSCATEGORY_QUALITY) + +#define STATIC_KSTIME_FORMAT_FRAME 0x7B785570, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6 +DEFINE_GUIDSTRUCT("7b785570-8c82-11cf-bc0c-00aa00ac74f6", KSTIME_FORMAT_FRAME); +#define KSTIME_FORMAT_FRAME DEFINE_GUIDNAMED(KSTIME_FORMAT_FRAME) + +#define STATIC_KSTIME_FORMAT_BYTE 0x7B785571, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6 +DEFINE_GUIDSTRUCT("7b785571-8c82-11cf-bc0c-00aa00ac74f6", KSTIME_FORMAT_BYTE); +#define KSTIME_FORMAT_BYTE DEFINE_GUIDNAMED(KSTIME_FORMAT_BYTE) + +#define STATIC_KSTIME_FORMAT_SAMPLE 0x7b785572, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6 +DEFINE_GUIDSTRUCT("7b785572-8c82-11cf-bc0c-00aa00ac74f6", KSTIME_FORMAT_SAMPLE); +#define KSTIME_FORMAT_SAMPLE DEFINE_GUIDNAMED(KSTIME_FORMAT_SAMPLE) + +#define STATIC_KSTIME_FORMAT_FIELD 0x7B785573, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6 +DEFINE_GUIDSTRUCT("7b785573-8c82-11cf-bc0c-00aa00ac74f6", KSTIME_FORMAT_FIELD); +#define KSTIME_FORMAT_FIELD DEFINE_GUIDNAMED(KSTIME_FORMAT_FIELD) + +#define STATIC_KSTIME_FORMAT_MEDIA_TIME 0x7B785574, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6 +DEFINE_GUIDSTRUCT("7b785574-8c82-11cf-bc0c-00aa00ac74f6", KSTIME_FORMAT_MEDIA_TIME); +#define KSTIME_FORMAT_MEDIA_TIME DEFINE_GUIDNAMED(KSTIME_FORMAT_MEDIA_TIME) + +#define STATIC_KSINTERFACESETID_Standard 0x1A8766A0, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 +DEFINE_GUIDSTRUCT("1A8766A0-62CE-11CF-A5D6-28DB04C10000", KSINTERFACESETID_Standard); +#define KSINTERFACESETID_Standard DEFINE_GUIDNAMED(KSINTERFACESETID_Standard) + +#define STATIC_KSINTERFACESETID_FileIo 0x8C6F932C, 0xE771, 0x11D0, 0xB8, 0xFF, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 +DEFINE_GUIDSTRUCT("8C6F932C-E771-11D0-B8FF-00A0C9223196", KSINTERFACESETID_FileIo); +#define KSINTERFACESETID_FileIo DEFINE_GUIDNAMED(KSINTERFACESETID_FileIo) + + + + + + + + + + + +#define STATIC_KSMEDIUMSETID_Standard 0x4747B320, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 +DEFINE_GUIDSTRUCT("4747B320-62CE-11CF-A5D6-28DB04C10000", KSMEDIUMSETID_Standard); +#define KSMEDIUMSETID_Standard DEFINE_GUIDNAMED(KSMEDIUMSETID_Standard) + +#define STATIC_KSPROPSETID_Pin 0x8C134960, 0x51AD, 0x11CF, 0x87, 0x8A, 0x94, 0xF8, 0x01, 0xC1, 0x00, 0x00 +DEFINE_GUIDSTRUCT("8C134960-51AD-11CF-878A-94F801C10000", KSPROPSETID_Pin); +#define KSPROPSETID_Pin DEFINE_GUIDNAMED(KSPROPSETID_Pin) + +#define STATIC_KSNAME_Filter 0x9b365890, 0x165F, 0x11D0, 0xA1, 0x95, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4 +DEFINE_GUIDSTRUCT("9b365890-165f-11d0-a195-0020afd156e4", KSNAME_Filter); +#define KSNAME_Filter DEFINE_GUIDNAMED(KSNAME_Filter) + +#define STATIC_KSNAME_Pin 0x146F1A80, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 +DEFINE_GUIDSTRUCT("146F1A80-4791-11D0-A5D6-28DB04C10000", KSNAME_Pin); +#define KSNAME_Pin DEFINE_GUIDNAMED(KSNAME_Pin) + +#define STATIC_KSNAME_Clock 0x53172480, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 +DEFINE_GUIDSTRUCT("53172480-4791-11D0-A5D6-28DB04C10000", KSNAME_Clock); +#define KSNAME_Clock DEFINE_GUIDNAMED(KSNAME_Clock) + +#define STATIC_KSNAME_Allocator 0x642F5D00, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 +DEFINE_GUIDSTRUCT("642F5D00-4791-11D0-A5D6-28DB04C10000", KSNAME_Allocator); +#define KSNAME_Allocator DEFINE_GUIDNAMED(KSNAME_Allocator) + +#define STATIC_KSNAME_TopologyNode 0x0621061A, 0xEE75, 0x11D0, 0xB9, 0x15, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 +DEFINE_GUIDSTRUCT("0621061A-EE75-11D0-B915-00A0C9223196", KSNAME_TopologyNode); +#define KSNAME_TopologyNode DEFINE_GUIDNAMED(KSNAME_TopologyNode) + +#define STATIC_KSDATAFORMAT_TYPE_STREAM 0xE436EB83, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70 +DEFINE_GUIDSTRUCT("E436EB83-524F-11CE-9F53-0020AF0BA770", KSDATAFORMAT_TYPE_STREAM); +#define KSDATAFORMAT_TYPE_STREAM DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_STREAM) + +#define STATIC_KSDATAFORMAT_SUBTYPE_NONE 0xE436EB8E, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70 +DEFINE_GUIDSTRUCT("E436EB8E-524F-11CE-9F53-0020AF0BA770", KSDATAFORMAT_SUBTYPE_NONE); +#define KSDATAFORMAT_SUBTYPE_NONE DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_NONE) + +#define STATIC_KSDATAFORMAT_SPECIFIER_FILENAME 0xAA797B40, 0xE974, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 +DEFINE_GUIDSTRUCT("AA797B40-E974-11CF-A5D6-28DB04C10000", KSDATAFORMAT_SPECIFIER_FILENAME); +#define KSDATAFORMAT_SPECIFIER_FILENAME DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_FILENAME) + +#define STATIC_KSDATAFORMAT_SPECIFIER_FILEHANDLE 0x65E8773C, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 +DEFINE_GUIDSTRUCT("65E8773C-8F56-11D0-A3B9-00A0C9223196", KSDATAFORMAT_SPECIFIER_FILEHANDLE); +#define KSDATAFORMAT_SPECIFIER_FILEHANDLE DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_FILEHANDLE) + +#define STATIC_KSDATAFORMAT_SPECIFIER_NONE 0x0F6417D6, 0xC318, 0x11D0, 0xA4, 0x3F, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 +DEFINE_GUIDSTRUCT("0F6417D6-C318-11D0-A43F-00A0C9223196", KSDATAFORMAT_SPECIFIER_NONE); +#define KSDATAFORMAT_SPECIFIER_NONE DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_NONE) + +#define STATIC_KSPROPSETID_Quality 0xD16AD380, 0xAC1A, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 +DEFINE_GUIDSTRUCT("D16AD380-AC1A-11CF-A5D6-28DB04C10000", KSPROPSETID_Quality); +#define KSPROPSETID_Quality DEFINE_GUIDNAMED(KSPROPSETID_Quality) + +#define STATIC_KSPROPSETID_Connection 0x1D58C920, 0xAC9B, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 +DEFINE_GUIDSTRUCT("1D58C920-AC9B-11CF-A5D6-28DB04C10000", KSPROPSETID_Connection); +#define KSPROPSETID_Connection DEFINE_GUIDNAMED(KSPROPSETID_Connection) + + + +#define STATIC_KSMEMORY_TYPE_SYSTEM 0x091BB638, 0x603F, 0x11D1, 0xB0, 0x67, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02 +DEFINE_GUIDSTRUCT("091bb638-603f-11d1-b067-00a0c9062802", KSMEMORY_TYPE_SYSTEM); +#define KSMEMORY_TYPE_SYSTEM DEFINE_GUIDNAMED(KSMEMORY_TYPE_SYSTEM) + +#define STATIC_KSMEMORY_TYPE_USER 0x8CB0FC28, 0x7893, 0x11D1, 0xB0, 0x69, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02 +DEFINE_GUIDSTRUCT("8cb0fc28-7893-11d1-b069-00a0c9062802", KSMEMORY_TYPE_USER); +#define KSMEMORY_TYPE_USER DEFINE_GUIDNAMED(KSMEMORY_TYPE_USER) + +#define STATIC_KSMEMORY_TYPE_KERNEL_PAGED 0xd833f8f8, 0x7894, 0x11D1, 0xB0, 0x69, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02 +DEFINE_GUIDSTRUCT("d833f8f8-7894-11d1-b069-00a0c9062802", KSMEMORY_TYPE_KERNEL_PAGED); +#define KSMEMORY_TYPE_KERNEL_PAGED DEFINE_GUIDNAMED(KSMEMORY_TYPE_KERNEL_PAGED) + +#define STATIC_KSMEMORY_TYPE_KERNEL_NONPAGED 0x4A6D5FC4, 0x7895, 0x11D1, 0xB0, 0x69, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02 +DEFINE_GUIDSTRUCT("4a6d5fc4-7895-11d1-b069-00a0c9062802", KSMEMORY_TYPE_KERNEL_NONPAGED); +#define KSMEMORY_TYPE_KERNEL_NONPAGED DEFINE_GUIDNAMED(KSMEMORY_TYPE_KERNEL_NONPAGED) + +#define STATIC_KSMEMORY_TYPE_DEVICE_UNKNOWN 0x091BB639, 0x603F, 0x11D1, 0xB0, 0x67, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02 +DEFINE_GUIDSTRUCT("091bb639-603f-11d1-b067-00a0c9062802", KSMEMORY_TYPE_DEVICE_UNKNOWN); +#define KSMEMORY_TYPE_DEVICE_UNKNOWN DEFINE_GUIDNAMED(KSMEMORY_TYPE_DEVICE_UNKNOWN) + +#define STATIC_KSEVENTSETID_StreamAllocator 0x75d95571, 0x073C, 0x11D0, 0xA1, 0x61, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xe4 +DEFINE_GUIDSTRUCT("75d95571-073c-11d0-a161-0020afd156e4", KSEVENTSETID_StreamAllocator); +#define KSEVENTSETID_StreamAllocator DEFINE_GUIDNAMED(KSEVENTSETID_StreamAllocator) + +#define STATIC_KSMETHODSETID_StreamAllocator 0xCF6E4341, 0xEC87, 0x11CF, 0xA1, 0x30, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4 +DEFINE_GUIDSTRUCT("cf6e4341-ec87-11cf-a130-0020afd156e4", KSMETHODSETID_StreamAllocator); +#define KSMETHODSETID_StreamAllocator DEFINE_GUIDNAMED(KSMETHODSETID_StreamAllocator) + +#define STATIC_KSPROPSETID_StreamAllocator 0xCf6E4342, 0xEC87, 0x11CF, 0xA1, 0x30, 0x00, 0x20, 0xAF, 0xd1, 0x56, 0xE4 +DEFINE_GUIDSTRUCT("cf6e4342-ec87-11cf-a130-0020afd156e4", KSPROPSETID_StreamAllocator); +#define KSPROPSETID_StreamAllocator DEFINE_GUIDNAMED(KSPROPSETID_StreamAllocator) + +#define STATIC_KSPROPSETID_StreamInterface 0x1FDD8EE1, 0x9CD3, 0x11D0, 0x82, 0xAA, 0x00, 0x00, 0xF8, 0x22, 0xFE, 0x8A +DEFINE_GUIDSTRUCT("1fdd8ee1-9cd3-11d0-82aa-0000f822fe8a", KSPROPSETID_StreamInterface); +#define KSPROPSETID_StreamInterface DEFINE_GUIDNAMED(KSPROPSETID_StreamInterface) + +#define STATIC_KSPROPSETID_Stream 0x65AABA60, 0x98AE, 0x11CF, 0xA1, 0x0D, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4 +DEFINE_GUIDSTRUCT("65aaba60-98ae-11cf-a10d-0020afd156e4", KSPROPSETID_Stream); +#define KSPROPSETID_Stream DEFINE_GUIDNAMED(KSPROPSETID_Stream) + +#define STATIC_KSPROPSETID_Clock 0xDF12A4C0, 0xAC17, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 +DEFINE_GUIDSTRUCT("DF12A4C0-AC17-11CF-A5D6-28DB04C10000", KSPROPSETID_Clock); +#define KSPROPSETID_Clock DEFINE_GUIDNAMED(KSPROPSETID_Clock) + +#define STATIC_KSEVENTSETID_Clock 0x364D8E20, 0x62C7, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 +DEFINE_GUIDSTRUCT("364D8E20-62C7-11CF-A5D6-28DB04C10000", KSEVENTSETID_Clock); +#define KSEVENTSETID_Clock DEFINE_GUIDNAMED(KSEVENTSETID_Clock) + +#define STATIC_KSEVENTSETID_Connection 0x7f4bcbe0, 0x9ea5, 0x11cf, 0xa5, 0xd6, 0x28, 0xdb, 0x04, 0xc1, 0x00, 0x00 +DEFINE_GUIDSTRUCT("7f4bcbe0-9ea5-11cf-a5d6-28db04c10000", KSEVENTSETID_Connection); +#define KSEVENTSETID_Connection DEFINE_GUIDNAMED(KSEVENTSETID_Connection) + +#define STATIC_KSDEGRADESETID_Standard 0x9F564180, 0x704C, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 +DEFINE_GUIDSTRUCT("9F564180-704C-11D0-A5D6-28DB04C10000", KSDEGRADESETID_Standard); +#define KSDEGRADESETID_Standard DEFINE_GUIDNAMED(KSDEGRADESETID_Standard) + +#define KSSTRING_Filter L"{9B365890-165F-11D0-A195-0020AFD156E4}" +#define KSSTRING_Pin L"{146F1A80-4791-11D0-A5D6-28DB04C10000}" +#define KSSTRING_Clock L"{53172480-4791-11D0-A5D6-28DB04C10000}" +#define KSSTRING_Allocator L"{642F5D00-4791-11D0-A5D6-28DB04C10000}" +#define KSSTRING_AllocatorEx L"{091BB63B-603F-11D1-B067-00A0C9062802}" +#define KSSTRING_TopologyNode L"{0621061A-EE75-11D0-B915-00A0C9223196}" + +#define IOCTL_KS_PROPERTY CTL_CODE(FILE_DEVICE_KS, 0x000, METHOD_NEITHER, FILE_ANY_ACCESS) +#define IOCTL_KS_ENABLE_EVENT CTL_CODE(FILE_DEVICE_KS, 0x001, METHOD_NEITHER, FILE_ANY_ACCESS) +#define IOCTL_KS_DISABLE_EVENT CTL_CODE(FILE_DEVICE_KS, 0x002, METHOD_NEITHER, FILE_ANY_ACCESS) +#define IOCTL_KS_METHOD CTL_CODE(FILE_DEVICE_KS, 0x003, METHOD_NEITHER, FILE_ANY_ACCESS) +#define IOCTL_KS_WRITE_STREAM CTL_CODE(FILE_DEVICE_KS, 0x004, METHOD_NEITHER, FILE_WRITE_ACCESS) +#define IOCTL_KS_READ_STREAM CTL_CODE(FILE_DEVICE_KS, 0x005, METHOD_NEITHER, FILE_READ_ACCESS) +#define IOCTL_KS_RESET_STATE CTL_CODE(FILE_DEVICE_KS, 0x006, METHOD_NEITHER, FILE_ANY_ACCESS) + +#define KSPRIORITY_LOW 0x00000001 +#define KSPRIORITY_NORMAL 0x40000000 +#define KSPRIORITY_HIGH 0x80000000 +#define KSPRIORITY_EXCLUSIVE 0xFFFFFFFF + +#define KSMETHOD_TYPE_NONE 0x00000000 +#define KSMETHOD_TYPE_READ 0x00000001 +#define KSMETHOD_TYPE_WRITE 0x00000002 +#define KSMETHOD_TYPE_MODIFY 0x00000003 +#define KSMETHOD_TYPE_SOURCE 0x00000004 +#define KSMETHOD_TYPE_SEND 0x00000001 +#define KSMETHOD_TYPE_SETSUPPORT 0x00000100 +#define KSMETHOD_TYPE_BASICSUPPORT 0x00000200 +#define KSMETHOD_TYPE_TOPOLOGY 0x10000000 + +#define KSPROPERTY_TYPE_GET 0x00000001 +#define KSPROPERTY_TYPE_SET 0x00000002 +#define KSPROPERTY_TYPE_SETSUPPORT 0x00000100 +#define KSPROPERTY_TYPE_BASICSUPPORT 0x00000200 +#define KSPROPERTY_TYPE_RELATIONS 0x00000400 +#define KSPROPERTY_TYPE_SERIALIZESET 0x00000800 +#define KSPROPERTY_TYPE_UNSERIALIZESET 0x00001000 +#define KSPROPERTY_TYPE_SERIALIZERAW 0x00002000 +#define KSPROPERTY_TYPE_UNSERIALIZERAW 0x00004000 +#define KSPROPERTY_TYPE_SERIALIZESIZE 0x00008000 +#define KSPROPERTY_TYPE_DEFAULTVALUES 0x00010000 +#define KSPROPERTY_TYPE_TOPOLOGY 0x10000000 + +#define KSPROPERTY_MEMBER_RANGES 0x00000001 +#define KSPROPERTY_MEMBER_STEPPEDRANGES 0x00000002 +#define KSPROPERTY_MEMBER_VALUES 0x00000003 +#define KSPROPERTY_MEMBER_FLAG_DEFAULT 0x00000001 +#define KSPROPERTY_MEMBER_FLAG_BASICSUPPORT_MULTICHANNEL 0x00000002 +#define KSPROPERTY_MEMBER_FLAG_BASICSUPPORT_UNIFORM 0x00000004 + +#define KSEVENTF_EVENT_HANDLE 0x00000001 +#define KSEVENTF_SEMAPHORE_HANDLE 0x00000002 + +#define KSEVENT_TYPE_ENABLE 0x00000001 +#define KSEVENT_TYPE_ONESHOT 0x00000002 +#define KSEVENT_TYPE_ENABLEBUFFERED 0x00000004 +#define KSEVENT_TYPE_SETSUPPORT 0x00000100 +#define KSEVENT_TYPE_BASICSUPPORT 0x00000200 +#define KSEVENT_TYPE_QUERYBUFFER 0x00000400 +#define KSEVENT_TYPE_TOPOLOGY 0x10000000 + +#define KSRELATIVEEVENT_FLAG_HANDLE 0x00000001 +#define KSRELATIVEEVENT_FLAG_POINTER 0x00000002 + +#define STATIC_KSTIME_FORMAT_NONE STATIC_GUID_NULL + +#define STATIC_KSDATAFORMAT_TYPE_WILDCARD STATIC_GUID_NULL +#define STATIC_KSDATAFORMAT_SUBTYPE_WILDCARD STATIC_GUID_NULL + +#define KSTIME_FORMAT_NONE GUID_NULL + +#define KSDATAFORMAT_TYPE_WILDCARD GUID_NULL +#define KSDATAFORMAT_SUBTYPE_WILDCARD GUID_NULL + +#define KSMEMORY_TYPE_WILDCARD GUID_NULL +#define KSMEMORY_TYPE_DONT_CARE GUID_NULL + +#define STATIC_KSMEMORY_TYPE_WILDCARD STATIC_GUID_NULL +#define STATIC_KSMEMORY_TYPE_DONT_CARE STATIC_GUID_NULL + +#define KS_TYPE_DONT_CARE GUID_NULL +#define STATIC_KS_TYPE_DONT_CARE STATIC_GUID_NULL + + +#define KSALLOCATOR_REQUIREMENTF_INPLACE_MODIFIER 0x00000001 +#define KSALLOCATOR_REQUIREMENTF_SYSTEM_MEMORY 0x00000002 +#define KSALLOCATOR_REQUIREMENTF_FRAME_INTEGRITY 0x00000004 +#define KSALLOCATOR_REQUIREMENTF_MUST_ALLOCATE 0x00000008 +#define KSALLOCATOR_REQUIREMENTF_PREFERENCES_ONLY 0x80000000 + +#define KSALLOCATOR_OPTIONF_COMPATIBLE 0x00000001 +#define KSALLOCATOR_OPTIONF_SYSTEM_MEMORY 0x00000002 +#define KSALLOCATOR_OPTIONF_VALID 0x00000003 + +#define KSALLOCATOR_FLAG_PARTIAL_READ_SUPPORT 0x00000010 +#define KSALLOCATOR_FLAG_DEVICE_SPECIFIC 0x00000020 +#define KSALLOCATOR_FLAG_CAN_ALLOCATE 0x00000040 +#define KSALLOCATOR_FLAG_INSIST_ON_FRAMESIZE_RATIO 0x00000080 + +#define KSALLOCATOR_FLAG_NO_FRAME_INTEGRITY 0x00000100 +#define KSALLOCATOR_FLAG_MULTIPLE_OUTPUT 0x00000200 +#define KSALLOCATOR_FLAG_CYCLE 0x00000400 +#define KSALLOCATOR_FLAG_ALLOCATOR_EXISTS 0x00000800 + +#define KSALLOCATOR_FLAG_INDEPENDENT_RANGES 0x00001000 +#define KSALLOCATOR_FLAG_ATTENTION_STEPPING 0x00002000 + +#define KSSTREAM_HEADER_OPTIONSF_SPLICEPOINT 0x00000001 +#define KSSTREAM_HEADER_OPTIONSF_PREROLL 0x00000002 +#define KSSTREAM_HEADER_OPTIONSF_DATADISCONTINUITY 0x00000004 +#define KSSTREAM_HEADER_OPTIONSF_TYPECHANGED 0x00000008 +#define KSSTREAM_HEADER_OPTIONSF_TIMEVALID 0x00000010 +#define KSSTREAM_HEADER_OPTIONSF_TIMEDISCONTINUITY 0x00000040 +#define KSSTREAM_HEADER_OPTIONSF_FLUSHONPAUSE 0x00000080 +#define KSSTREAM_HEADER_OPTIONSF_DURATIONVALID 0x00000100 +#define KSSTREAM_HEADER_OPTIONSF_ENDOFSTREAM 0x00000200 +#define KSSTREAM_HEADER_OPTIONSF_LOOPEDDATA 0x80000000 + +#define KSMEDIUM_TYPE_ANYINSTANCE 0 + +#if defined(_NTDDK_) + + #define STATIC_GUID_BUS_INTERFACE_MEDIUMS 0x4EC35C3E, 0x201B, 0x11D2, 0x87, 0x45, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + DEFINE_GUIDSTRUCT("4EC35C3E-201B-11D2-8745-00A0C9223196", GUID_BUS_INTERFACE_MEDIUMS); + #define GUID_BUS_INTERFACE_MEDIUMS DEFINE_GUIDNAMED(GUID_BUS_INTERFACE_MEDIUMS) + + #define STATIC_KSPROPSETID_GM 0xAF627536, 0xE719, 0x11D2, 0x8A, 0x1D, 0x00, 0x60, 0x97, 0xD2, 0xDF, 0x5D + DEFINE_GUIDSTRUCT("AF627536-E719-11D2-8A1D-006097D2DF5D", KSPROPSETID_GM); + #define KSPROPSETID_GM DEFINE_GUIDNAMED(KSPROPSETID_GM) + + #define KSEVENTF_EVENT_OBJECT 0x00000004 + #define KSEVENTF_SEMAPHORE_OBJECT 0x00000008 + #define KSEVENTF_DPC 0x00000010 + #define KSEVENTF_WORKITEM 0x00000020 + #define KSEVENTF_KSWORKITEM 0x00000080 + #define KSEVENTF_KSFILTERPROCESSING 0x00000100 + #define KSEVENTF_KSPINPROCESSING 0x00000200 + + #define KSPROBE_STREAMREAD 0x00000000 + #define KSPROBE_STREAMWRITE 0x00000001 + #define KSPROBE_ALLOCATEMDL 0x00000010 + #define KSPROBE_PROBEANDLOCK 0x00000020 + #define KSPROBE_SYSTEMADDRESS 0x00000040 + #define KSPROBE_MODIFY 0x00000200 + #define KSPROBE_STREAMWRITEMODIFY (KSPROBE_MODIFY | KSPROBE_STREAMWRITE) + #define KSPROBE_ALLOWFORMATCHANGE 0x00000080 + + #define KSSTREAM_READ KSPROBE_STREAMREAD + #define KSSTREAM_WRITE KSPROBE_STREAMWRITE + #define KSSTREAM_PAGED_DATA 0x00000000 + #define KSSTREAM_NONPAGED_DATA 0x00000100 + #define KSSTREAM_SYNCHRONOUS 0x00001000 + #define KSSTREAM_FAILUREEXCEPTION 0x00002000 + + #define KSEVENT_ENTRY_DELETED 1 + #define KSEVENT_ENTRY_ONESHOT 2 + #define KSEVENT_ENTRY_BUFFERED 4 + + #define KSDISPATCH_FASTIO 0x80000000 + + #define KSCREATE_ITEM_SECURITYCHANGED 0x00000001 + #define KSCREATE_ITEM_WILDCARD 0x00000002 + #define KSCREATE_ITEM_NOPARAMETERS 0x00000004 + #define KSCREATE_ITEM_FREEONSTOP 0x00000008 + + #define BUS_INTERFACE_REFERENCE_VERSION 0x100 + #define STATIC_REFERENCE_BUS_INTERFACE STATIC_KSMEDIUMSETID_Standard + #define REFERENCE_BUS_INTERFACE KSMEDIUMSETID_Standard + +#endif + +typedef enum +{ + KSRESET_BEGIN, + KSRESET_END +} KSRESET; + +typedef enum +{ + KSSTATE_STOP, + KSSTATE_ACQUIRE, + KSSTATE_PAUSE, + KSSTATE_RUN +} KSSTATE, *PKSSTATE; + +#if defined(_NTDDK_) && !defined(__wtypes_h__) +enum VARENUM +{ + VT_EMPTY = 0, + VT_NULL = 1, + VT_I2 = 2, + VT_I4 = 3, + VT_R4 = 4, + VT_R8 = 5, + VT_CY = 6, + VT_DATE = 7, + VT_BSTR = 8, + VT_DISPATCH = 9, + VT_ERROR = 10, + VT_BOOL = 11, + VT_VARIANT = 12, + VT_UNKNOWN = 13, + VT_DECIMAL = 14, + VT_I1 = 16, + VT_UI1 = 17, + VT_UI2 = 18, + VT_UI4 = 19, + VT_I8 = 20, + VT_UI8 = 21, + VT_INT = 22, + VT_UINT = 23, + VT_VOID = 24, + VT_HRESULT = 25, + VT_PTR = 26, + VT_SAFEARRAY = 27, + VT_CARRAY = 28, + VT_USERDEFINED = 29, + VT_LPSTR = 30, + VT_LPWSTR = 31, + VT_FILETIME = 64, + VT_BLOB = 65, + VT_STREAM = 66, + VT_STORAGE = 67, + VT_STREAMED_OBJECT = 68, + VT_STORED_OBJECT = 69, + VT_BLOB_OBJECT = 70, + VT_CF = 71, + VT_CLSID = 72, + VT_VECTOR = 0x1000, + VT_ARRAY = 0x2000, + VT_BYREF = 0x4000, + VT_RESERVED = 0x8000, + VT_ILLEGAL = 0xffff, + VT_ILLEGALMASKED = 0xfff, + VT_TYPEMASK = 0xfff +}; +#endif + +typedef enum +{ + KSPROPERTY_GENERAL_COMPONENTID +} KSPROPERTY_GENERAL; + + + +#endif // _KS_ Propchange: branches/reactx/reactos/include/dxsdk/ks.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 30127: - implement renaming of MyComputer object - doesnot work yet because ISF_Desktop_fnSetNameOf is _not_ implemented See issue #376 for more details.
by janderwald＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: janderwald Date: Sun Nov 4 22:28:55 2007 New Revision: 30127 URL: http://svn.reactos.org/svn/reactos?rev=30127&view=rev Log: - implement renaming of MyComputer object - doesnot work yet because ISF_Desktop_fnSetNameOf is _not_ implemented See issue #376 for more details. Modified: trunk/reactos/dll/win32/shell32/shfldr_mycomp.c Modified: trunk/reactos/dll/win32/shell32/shfldr_mycomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_m… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_mycomp.c (original) +++ trunk/reactos/dll/win32/shell32/shfldr_mycomp.c Sun Nov 4 22:28:55 2007 @@ -61,6 +61,7 @@ /* both paths are parsible from the desktop */ LPITEMIDLIST pidlRoot; /* absolute pidl */ + LPWSTR sName; } IGenericSFImpl; static const IShellFolder2Vtbl vt_ShellFolder2; @@ -102,7 +103,8 @@ HRESULT WINAPI ISF_MyComputer_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) { IGenericSFImpl *sf; - + DWORD dwSize; + WCHAR szName[100]; TRACE ("unkOut=%p %s\n", pUnkOuter, shdebugstr_guid (riid)); if (!ppv) @@ -123,6 +125,24 @@ { IUnknown_Release (_IUnknown_ (sf)); return E_NOINTERFACE; + } + + dwSize = sizeof(szName); + if (RegGetValueW(HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\CLSID\\{20D04FE0-3AEA-1069-A2D8-08002B30309D}", + NULL, + RRF_RT_REG_SZ, + NULL, + szName, + &dwSize) == ERROR_SUCCESS) + { + szName[MAX_PATH-1] = 0; + sf->sName = SHAlloc((strlenW(szName)+1) * sizeof(WCHAR)); + if (sf->sName) + { + lstrcpyW( sf->sName, szName ); + } + TRACE("sName %s\n", debugstr_w(sf->sName)); } TRACE ("--(%p)\n", sf); @@ -649,7 +669,13 @@ else { /* user friendly name */ - HCR_GetClassNameW (clsid, pszPath, MAX_PATH); + + if (_ILIsMyComputer(pidl) && This->sName) + strcpyW(pszPath, This->sName); + else + HCR_GetClassNameW (clsid, pszPath, MAX_PATH); + + TRACE("pszPath %s\n", debugstr_w(pszPath)); } } else @@ -722,9 +748,45 @@ LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut) { IGenericSFImpl *This = (IGenericSFImpl *)iface; - FIXME ("(%p)->(%p,pidl=%p,%s,%u,%p)\n", This, + LPWSTR sName; + HKEY hKey; + UINT length; + + TRACE ("(%p)->(%p,pidl=%p,%s,%u,%p)\n", This, hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut); - return E_FAIL; + + if (pPidlOut != NULL) + { + *pPidlOut = _ILCreateMyComputer(); + } + + length = (strlenW(lpName)+1) * sizeof(WCHAR); + sName = SHAlloc(length); + + if (!sName) + { + return E_OUTOFMEMORY; + } + + if (RegOpenKeyExW(HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\CLSID\\{20D04FE0-3AEA-1069-A2D8-08002B30309D}", + 0, + KEY_WRITE, + &hKey) != ERROR_SUCCESS) + { + WARN("Error: failed to open registry key\n"); + } + else + { + RegSetValueExW(hKey, NULL, 0, REG_SZ, (const LPBYTE)lpName, length); + RegCloseKey(hKey); + } + + lstrcpyW(sName, lpName); + SHFree(This->sName); + This->sName = sName; + TRACE("result %s\n", debugstr_w(This->sName)); + return S_OK; } static HRESULT WINAPI ISF_MyComputer_fnGetDefaultSearchGUID (

1 0

[janderwald] 30126: - add registry setting to support changing desktop object name - uncomment fileext setting
by janderwald＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: janderwald Date: Sun Nov 4 21:26:24 2007 New Revision: 30126 URL: http://svn.reactos.org/svn/reactos?rev=30126&view=rev Log: - add registry setting to support changing desktop object name - uncomment fileext setting Modified: trunk/reactos/boot/bootdata/hivedef.inf Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf (original) +++ trunk/reactos/boot/bootdata/hivedef.inf Sun Nov 4 21:26:24 2007 @@ -47,7 +47,8 @@ HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders",,0x00000012 -;HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\FileExts",,0x00000012 +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\FileExts",,0x00000012 +HKCU,"Software\Microsoft\Windows\CurrentVersion\Explorer\CLSID\{20D04FE0-3AEA-1069-A2D8-08002B30309D}",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows NT",,0x00000012

1 0

[greatlrd] 30125: start remove stuff got home made stuff or base on wine dx add global file version of dx dll.
by greatlrd＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: greatlrd Date: Sun Nov 4 20:50:09 2007 New Revision: 30125 URL: http://svn.reactos.org/svn/reactos?rev=30125&view=rev Log: start remove stuff got home made stuff or base on wine dx add global file version of dx dll. Removed: branches/reactx/reactos/dll/directx/devenum/ branches/reactx/reactos/dll/directx/dinput/ branches/reactx/reactos/dll/directx/dplay/ Modified: branches/reactx/reactos/dll/directx/d3d8/d3d8.rc branches/reactx/reactos/dll/directx/d3d8thk/d3d8thk.rc branches/reactx/reactos/dll/directx/d3d9/d3d9.rc branches/reactx/reactos/dll/directx/ddraw/ddraw.rc Modified: branches/reactx/reactos/dll/directx/d3d8/d3d8.rc URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/d3d8… ============================================================================== --- branches/reactx/reactos/dll/directx/d3d8/d3d8.rc (original) +++ branches/reactx/reactos/dll/directx/d3d8/d3d8.rc Sun Nov 4 20:50:09 2007 @@ -5,9 +5,6 @@ #define REACTOS_STR_INTERNAL_NAME "d3d8\0" #define REACTOS_STR_ORIGINAL_FILENAME "d3d8.dll\0" -#define REACTOS_FILEVERSION 5,3,0,900 -#define REACTOS_STR_FILE_VERSION "5.3.0.900" -#define REACTOS_PRODUCTVERSION 5,3,0,900 -#define REACTOS_STR_PRODUCT_VERSION "5.3" +#include <reactos/reactx.h> #include <reactos/version.rc> Modified: branches/reactx/reactos/dll/directx/d3d8thk/d3d8thk.rc URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/d3d8… ============================================================================== --- branches/reactx/reactos/dll/directx/d3d8thk/d3d8thk.rc (original) +++ branches/reactx/reactos/dll/directx/d3d8thk/d3d8thk.rc Sun Nov 4 20:50:09 2007 @@ -3,9 +3,6 @@ #define REACTOS_STR_INTERNAL_NAME "d3d8thk\0" #define REACTOS_STR_ORIGINAL_FILENAME "d3d8thk.dll\0" -#define REACTOS_FILEVERSION 5,3,0,900 -#define REACTOS_STR_FILE_VERSION "5.3.0.900" -#define REACTOS_PRODUCTVERSION 5,3,0,900 -#define REACTOS_STR_PRODUCT_VERSION "5.3" +#include <reactos/reactx.h> #include <reactos/version.rc> Modified: branches/reactx/reactos/dll/directx/d3d9/d3d9.rc URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/d3d9… ============================================================================== --- branches/reactx/reactos/dll/directx/d3d9/d3d9.rc (original) +++ branches/reactx/reactos/dll/directx/d3d9/d3d9.rc Sun Nov 4 20:50:09 2007 @@ -5,9 +5,6 @@ #define REACTOS_STR_INTERNAL_NAME "d3d9\0" #define REACTOS_STR_ORIGINAL_FILENAME "d3d9.dll\0" -#define REACTOS_FILEVERSION 5,3,0,900 -#define REACTOS_STR_FILE_VERSION "5.3.0.900" -#define REACTOS_PRODUCTVERSION 5,3,0,900 -#define REACTOS_STR_PRODUCT_VERSION "5.3" +#include <reactos/reactx.h> #include <reactos/version.rc> Modified: branches/reactx/reactos/dll/directx/ddraw/ddraw.rc URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/ddraw.rc (original) +++ branches/reactx/reactos/dll/directx/ddraw/ddraw.rc Sun Nov 4 20:50:09 2007 @@ -5,9 +5,6 @@ #define REACTOS_STR_INTERNAL_NAME "ddraw\0" #define REACTOS_STR_ORIGINAL_FILENAME "ddraw.dll\0" -#define REACTOS_FILEVERSION 5,3,0,900 -#define REACTOS_STR_FILE_VERSION "5.3.0.900" -#define REACTOS_PRODUCTVERSION 5,3,0,900 -#define REACTOS_STR_PRODUCT_VERSION "5.3" +#include <reactos/reactx.h> #include <reactos/version.rc>

1 0

[greatlrd] 30124: global header for directx version info for the rc file.
by greatlrd＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: greatlrd Date: Sun Nov 4 20:43:50 2007 New Revision: 30124 URL: http://svn.reactos.org/svn/reactos?rev=30124&view=rev Log: global header for directx version info for the rc file. Added: branches/reactx/reactos/include/reactos/reactx.h (with props) Added: branches/reactx/reactos/include/reactos/reactx.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/reactx.h (added) +++ branches/reactx/reactos/include/reactos/reactx.h Sun Nov 4 20:43:50 2007 @@ -1,0 +1,4 @@ +#define REACTOS_FILEVERSION 5,3,0,900 +#define REACTOS_STR_FILE_VERSION "5.3.0.900" +#define REACTOS_PRODUCTVERSION 5,3,0,900 +#define REACTOS_STR_PRODUCT_VERSION "5.3" Propchange: branches/reactx/reactos/include/reactos/reactx.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 30123: start remove stuff got home made stuff or base on wine dx
by greatlrd＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: greatlrd Date: Sun Nov 4 20:33:57 2007 New Revision: 30123 URL: http://svn.reactos.org/svn/reactos?rev=30123&view=rev Log: start remove stuff got home made stuff or base on wine dx Removed: branches/reactx/reactos/dll/directx/dsound/ branches/reactx/reactos/dll/directx/dxdiagn/ branches/reactx/reactos/dll/directx/wine/ Modified: branches/reactx/reactos/dll/directx/directx.rbuild Modified: branches/reactx/reactos/dll/directx/directx.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/dire… ============================================================================== --- branches/reactx/reactos/dll/directx/directx.rbuild (original) +++ branches/reactx/reactos/dll/directx/directx.rbuild Sun Nov 4 20:33:57 2007 @@ -4,35 +4,5 @@ <directory name="d3d8thk"> <xi:include href="d3d8thk/d3d8thk.rbuild" /> </directory> - <directory name="devenum"> - <xi:include href="devenum/devenum.rbuild" /> - </directory> - <directory name="ddraw"> - <xi:include href="ddraw/ddraw.rbuild" /> - </directory> - <directory name="dinput"> - <xi:include href="dinput/dinput.rbuild" /> - </directory> - <directory name="dinput8"> - <xi:include href="dinput8/dinput8.rbuild" /> - </directory> - <directory name="dplay"> - <xi:include href="dplay/dplay.rbuild" /> - </directory> - <directory name="dplayx"> - <xi:include href="dplayx/dplayx.rbuild" /> - </directory> - <directory name="dsound"> - <xi:include href="dsound/dsound.rbuild" /> - </directory> - <directory name="dxdiagn"> - <xi:include href="dxdiagn/dxdiagn.rbuild" /> - </directory> - - <directory name="wine"> - <xi:include href="wine/wine.rbuild" /> - </directory> - <directory name="d3d9"> - <xi:include href="d3d9/d3d9.rbuild" /> - </directory> + </group>

1 0

[janderwald] 30122: - check if group policy is active - in this case check if the shell extension has been registered as approved and only accept it if it is listed
by janderwald＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: janderwald Date: Sun Nov 4 20:07:40 2007 New Revision: 30122 URL: http://svn.reactos.org/svn/reactos?rev=30122&view=rev Log: - check if group policy is active - in this case check if the shell extension has been registered as approved and only accept it if it is listed Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Sun Nov 4 20:07:40 2007 @@ -80,7 +80,7 @@ } ItemCmImpl; UINT -SH_EnumerateDynamicContextHandlerForKey(LPWSTR szFileClass, ItemCmImpl *This, IDataObject * pDataObj); +SH_EnumerateDynamicContextHandlerForKey(LPWSTR szFileClass, ItemCmImpl *This, IDataObject * pDataObj, DWORD bGroupPolicyActive); WCHAR *build_paths_list(LPCWSTR wszBasePath, int cidl, LPCITEMIDLIST *pidls); WCHAR *strdupW(LPWSTR str); static const IContextMenu2Vtbl cmvt; @@ -310,9 +310,22 @@ UINT idCmdFirst = 0x6000; UINT idCmdLast = 0xFFF0; PDynamicShellEntry curEntry; + DWORD bGroupPolicyActive = FALSE; + DWORD dwSize; static WCHAR szAny[] = { '*',0}; - SH_EnumerateDynamicContextHandlerForKey(szAny, This, pDataObj); + dwSize = sizeof(DWORD); + RegGetValueW(HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\Explorer", + L"EnforceShellExtensionSecurity", + RRF_RT_DWORD, + NULL, + &bGroupPolicyActive, + &dwSize); + + + + SH_EnumerateDynamicContextHandlerForKey(szAny, This, pDataObj, bGroupPolicyActive); for (i = 0; i < This->cidl; i++) { @@ -326,7 +339,7 @@ if (hr == S_OK) { memcpy(&buffer[6], pwszCLSID, 38 * sizeof(WCHAR)); - SH_EnumerateDynamicContextHandlerForKey(buffer, This, pDataObj); + SH_EnumerateDynamicContextHandlerForKey(buffer, This, pDataObj, bGroupPolicyActive); } } @@ -335,7 +348,7 @@ ebuf[0] = L'.'; buffer[0] = L'\0'; if (MultiByteToWideChar(CP_ACP, 0, ebuf, -1, buffer, 111)) - SH_EnumerateDynamicContextHandlerForKey(buffer, This, pDataObj); + SH_EnumerateDynamicContextHandlerForKey(buffer, This, pDataObj, bGroupPolicyActive); } } TRACE("-- done loading\n"); @@ -1159,7 +1172,7 @@ } UINT -SH_EnumerateDynamicContextHandlerForKey(const LPWSTR szFileClass, ItemCmImpl *This, IDataObject * pDataObj) +SH_EnumerateDynamicContextHandlerForKey(const LPWSTR szFileClass, ItemCmImpl *This, IDataObject * pDataObj, DWORD bGroupPolicyActive) { HKEY hKey; WCHAR szKey[MAX_PATH] = {0}; @@ -1191,18 +1204,53 @@ if (res == ERROR_SUCCESS) { hResult = CLSIDFromString(szName, &clsid); - if (hResult != NOERROR) + if (hResult != S_OK) { dwName = MAX_PATH; if (RegGetValueW(hKey, szName, NULL, RRF_RT_REG_SZ, NULL, szKey, &dwName) == ERROR_SUCCESS) { - hResult = CLSIDFromString(szKey, &clsid); + if (CLSIDFromString(szKey, &clsid) == S_OK) + { + if (bGroupPolicyActive) + { + if (RegGetValueW(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved", + szKey, + RRF_RT_REG_SZ, + NULL, + NULL, + &dwName) == ERROR_SUCCESS) + { + SH_LoadDynamicContextMenuHandler(hKey, &clsid, This, pDataObj); + } + + } + else + { + SH_LoadDynamicContextMenuHandler(hKey, &clsid, This, pDataObj); + } + } } } - TRACE("hResult %x szKey %s name %s\n",hResult, debugstr_w(szKey), debugstr_w(szName)); if (hResult == S_OK) { - SH_LoadDynamicContextMenuHandler(hKey, &clsid, This, pDataObj); + if (bGroupPolicyActive) + { + if (RegGetValueW(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved", + szKey, + RRF_RT_REG_SZ, + NULL, + NULL, + &dwName) == ERROR_SUCCESS) + { + SH_LoadDynamicContextMenuHandler(hKey, &clsid, This, pDataObj); + } + } + else + { + SH_LoadDynamicContextMenuHandler(hKey, &clsid, This, pDataObj); + } } } dwIndex++;

1 0

[greatlrd] 30121: Fill in more info in the lockup tables.
by greatlrd＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: greatlrd Date: Sun Nov 4 19:49:20 2007 New Revision: 30121 URL: http://svn.reactos.org/svn/reactos?rev=30121&view=rev Log: Fill in more info in the lockup tables. Modified: branches/reactx/reactos/drivers/directx/dxapi/dxapi_driver.h Modified: branches/reactx/reactos/drivers/directx/dxapi/dxapi_driver.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxapi/dxapi_driver.h (original) +++ branches/reactx/reactos/drivers/directx/dxapi/dxapi_driver.h Sun Nov 4 19:49:20 2007 @@ -57,8 +57,10 @@ 0, // DD_DXAPI_OPENDIRECTDRAW 0, // DD_DXAPI_OPENSURFACE 0, // DD_DXAPI_OPENVIDEOPORT - 0, // DD_DXAPI_GETKERNELCAPS - 0, // DD_DXAPI_GET_VP_FIELD_NUMBER + /* DD_DXAPI_GETKERNELCAPS */ + sizeof(HANDLE), + /* DD_DXAPI_GET_VP_FIELD_NUMBER */ + sizeof(DDGETFIELDNUMIN), 0, // DD_DXAPI_SET_VP_FIELD_NUMBER 0, // DD_DXAPI_SET_VP_SKIP_FIELD 0, // DD_DXAPI_GET_SURFACE_STATE @@ -95,8 +97,10 @@ 0, // DD_DXAPI_OPENDIRECTDRAW 0, // DD_DXAPI_OPENSURFACE 0, // DD_DXAPI_OPENVIDEOPORT - 0, // DD_DXAPI_GETKERNELCAPS - 0, // DD_DXAPI_GET_VP_FIELD_NUMBER + /* DD_DXAPI_GETKERNELCAPS */ + sizeof(DDGETKERNELCAPSOUT), + /* DD_DXAPI_GET_VP_FIELD_NUMBER */ + sizeof(DDGETFIELDNUMOUT), 0, // DD_DXAPI_SET_VP_FIELD_NUMBER 0, // DD_DXAPI_SET_VP_SKIP_FIELD 0, // DD_DXAPI_GET_SURFACE_STATE

1 0

[greatlrd] 30120: Implement DxGetVersionNumber comment up some functions that are implement.
by greatlrd＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: greatlrd Date: Sun Nov 4 19:23:11 2007 New Revision: 30120 URL: http://svn.reactos.org/svn/reactos?rev=30120&view=rev Log: Implement DxGetVersionNumber comment up some functions that are implement. Modified: branches/reactx/reactos/drivers/directx/dxapi/dxapi_driver.h branches/reactx/reactos/drivers/directx/dxapi/main.c Modified: branches/reactx/reactos/drivers/directx/dxapi/dxapi_driver.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxapi/dxapi_driver.h (original) +++ branches/reactx/reactos/drivers/directx/dxapi/dxapi_driver.h Sun Nov 4 19:23:11 2007 @@ -24,7 +24,7 @@ #include <ddk/ddkmapi.h> /* Prototypes */ -VOID DxGetVersionNumber(PVOID lpvInBuffer, PVOID lpvOutBuffer); +VOID DxGetVersionNumber(PVOID lpvInBuffer, LPDDGETVERSIONNUMBER lpvOutBuffer); VOID DxCloseHandle(PVOID lpvInBuffer, PVOID lpvOutBuffer); VOID DxOpenDirectDraw(PVOID lpvInBuffer, PVOID lpvOutBuffer); VOID DxOpenSurface(PVOID lpvInBuffer, PVOID lpvOutBuffer); Modified: branches/reactx/reactos/drivers/directx/dxapi/main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxapi/main.c (original) +++ branches/reactx/reactos/drivers/directx/dxapi/main.c Sun Nov 4 19:23:11 2007 @@ -10,32 +10,7 @@ */ - -/* DDK/NDK/SDK Headers */ -/* DDK/NDK/SDK Headers */ -#include <ddk/ntddk.h> -#include <ddk/ntddmou.h> -#include <ddk/ntifs.h> -#include <ddk/tvout.h> -#include <ndk/ntndk.h> - - - -#include <stdarg.h> -#include <windef.h> -#include <winerror.h> -#include <wingdi.h> -#include <winddi.h> -#include <winuser.h> -#include <prntfont.h> -#include <dde.h> -#include <wincon.h> - -#include <ddk/ddkmapi.h> #include "dxapi_driver.h" - - - NTSTATUS DriverEntry(IN PVOID Context1, @@ -57,6 +32,19 @@ +/*++ +* @name DxApiGetVersion +* @implemented +* +* The function DxApiGetVersion return the dsound version, and it always return 4.02 +* +* @return +* Always return 4.02 +* +* @remarks. +* none +* +*--*/ ULONG DxApiGetVersion() { @@ -65,11 +53,49 @@ } -/* protype from dxapi.h and ddkmapi.h from ddk, MSDN does not provide protype for this api, only which - * functions it support, if u search in msdn you found full documations for each function - * for each functions. - */ - + +/*++ +* @name DxApi +* @implemented +* +* The function DxApi calls to diffent functions, follow functions +* are supported +* DxGetVersionNumber, DxCloseHandle, DxOpenDirectDraw, DxOpenSurface, +* DxOpenVideoPort, DxGetKernelCaps, DxGetFieldNumber, DxSetFieldNumber, +* DxSetSkipPattern, DxGetSurfaceState, DxSetSurfaceState, DxLock, +* DxFlipOverlay, DxFlipVideoPort, DxGetCurrentAutoflip, DxGetPreviousAutoflip, +* DxRegisterEvent, DxUnregisterEvent, DxGetPolarity, DxOpenVpCatureDevice, +* DxAddVpCaptureBuffer, DxFlushVpCaptureBuffs +* +* See ddkmapi.h as well + +* +* @param ULONG dwFunctionNum +* The function id we want call on in the dxapi.sys see ddkmapi.h for the id +* +* @param PVOID lpvInBuffer +* Our input buffer to the functions we call to, This param can be NULL +* +* @param ULONG cbInBuffer +* Our size in bytes of the input buffer, rember wrong size will result in the function +* does not being call. +* +* @param PVOID lpvOutBuffer +* Our Output buffer, there the function fill in the info, this param can not +* be null. if it null the functions we trying call on will not be call +* +* @param ULONG cbOutBuffer +* Our size in bytes of the output buffer, rember wrong size will result in the function +* does not being call. +* +* @return +* Return Always 0. +* +* @remarks. +* before call to any of this functions, do not forget set lpvOutBuffer->ddRVal = DDERR_GEN*, +* if that member exists in the outbuffer ; +* +*--*/ DWORD DxApi(ULONG dwFunctionNum, PVOID lpvInBuffer, @@ -92,14 +118,28 @@ } gDxApiEntryPoint[dwFunctionNum].pfn(lpvInBuffer, lpvOutBuffer); - return 0; } -VOID -DxGetVersionNumber(PVOID lpvInBuffer, PVOID lpvOutBuffer) -{ - /* FIXME Unimplement */ +/*++ +* @name DxGetVersionNumber +* @implemented +* +* The function DxGetVersionNumber return dxapi interface version, that is 1.0 +* +* @return +* Always return 1.0 +* +* @remarks. +* none +* +*--*/ +VOID +DxGetVersionNumber(PVOID lpvInBuffer, LPDDGETVERSIONNUMBER lpvOutBuffer) +{ + lpvOutBuffer->ddRVal = DD_OK; + lpvOutBuffer->dwMajorVersion = 1; + lpvOutBuffer->dwMinorVersion = 0; } VOID

1 0

← Newer
1
...
77
78
79
80
81
82
83
...
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2007