Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 45683: [HAL] - Replace the inline assembly for entering V86 and the actual V86 stub with real assembly. This is neccesary for compiler portability. Also creating 16 bit V86 assembly using 32 bit inline assembly is rather hackish.
by tkreuzer＠svn.reactos.org 26 Feb '10

26 Feb '10

Author: tkreuzer Date: Fri Feb 26 01:07:22 2010 New Revision: 45683 URL: http://svn.reactos.org/svn/reactos?rev=45683&view=rev Log: [HAL] - Replace the inline assembly for entering V86 and the actual V86 stub with real assembly. This is neccesary for compiler portability. Also creating 16 bit V86 assembly using 32 bit inline assembly is rather hackish. Modified: trunk/reactos/hal/halx86/generic/bios.c trunk/reactos/hal/halx86/generic/trap.S trunk/reactos/hal/halx86/include/halp.h Modified: trunk/reactos/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bios.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] Fri Feb 26 01:07:22 2010 @@ -53,24 +53,6 @@ /* Context saved for return from v86 mode */ jmp_buf HalpSavedContext; -/* REAL MODE CODE AND STACK START HERE ****************************************/ - -VOID -DECLSPEC_NORETURN -HalpRealModeStart(VOID) -{ - /* Do the video BIOS interrupt */ - HalpCallBiosInterrupt(VIDEO_SERVICES, (SET_VIDEO_MODE << 8) | (GRAPHICS_MODE_12)); - - /* Issue the BOP */ - KiIssueBop(); - - /* We want the stack to be inside this function so we can map real mode */ - HalpRealModeStack(sizeof(ULONG), PAGE_SIZE / 2); - UNREACHABLE; -} - -/* REAL MODE CODE AND STACK END HERE ******************************************/ /* V86 OPCODE HANDLERS ********************************************************/ @@ -292,7 +274,7 @@ V86TrapFrame.Eip = CodeOffset; /* Exit to V86 mode */ - KiDirectTrapReturn((PKTRAP_FRAME)&V86TrapFrame); + HalpExitToV86((PKTRAP_FRAME)&V86TrapFrame); } /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/hal/halx86/generic/trap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/trap.S?… ============================================================================== --- trunk/reactos/hal/halx86/generic/trap.S [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/trap.S [iso-8859-1] Fri Feb 26 01:07:22 2010 @@ -20,4 +20,26 @@ TRAP_ENTRY HalpClockInterrupt, KI_PUSH_FAKE_ERROR_CODE TRAP_ENTRY HalpProfileInterrupt, KI_PUSH_FAKE_ERROR_CODE +PUBLIC @HalpExitToV86@4 +@HalpExitToV86@4: + /* Point esp to the iret frame and return */ + lea esp, [ecx + KTRAP_FRAME_EIP] + iret +/* Here starts the real mode code */ +.code16 +PUBLIC _HalpRealModeStart +_HalpRealModeStart: + /* INT 0x10: AH = 0 (Set video Mode), AL = 0x12 (Mode 12) */ + mov eax, HEX(12) + int HEX(10) + + /* BOP */ + .byte HEX(C4), HEX(C4) + +/* The real mode stack */ +.align 4 +.space 2048 +_HalpRealModeEnd: +PUBLIC _HalpRealModeEnd + Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Fri Feb 26 01:07:22 2010 @@ -73,44 +73,6 @@ // Video Modes for INT10h AH=00 (in AL) // #define GRAPHICS_MODE_12 0x12 /* 80x30 8x16 640x480 16/256K */ - -// -// Generates a 16-bit (real-mode or Virtual 8086) BIOS interrupt with a given AX */ -// -VOID -FORCEINLINE -HalpCallBiosInterrupt(IN ULONG Interrupt, - IN ULONG Ax) -{ - __asm__ __volatile__ - ( - ".byte 0x66\n" - "movl $%c[v], %%eax\n" - "int $%c[i]\n" - : - : [v] "i"(Ax), - [i] "i"(Interrupt) - ); -} - -// -// Constructs a stack of the given size and alignment in the real-mode .text region */ -// -VOID -FORCEINLINE -HalpRealModeStack(IN ULONG Alignment, - IN ULONG Size) -{ - __asm__ __volatile__ - ( - ".align %c[v]\n" - ".space %c[i]\n" - ".globl _HalpRealModeEnd\n_HalpRealModeEnd:\n" - : - : [v] "i"(Alignment), - [i] "i"(Size) - ); -} // // Commonly stated as being 1.19318MHz @@ -675,6 +637,18 @@ VOID ); +VOID +FASTCALL +HalpExitToV86( + PKTRAP_FRAME TrapFrame +); + +VOID +DECLSPEC_NORETURN +HalpRealModeStart( + VOID +); + // // Processor Halt Routine //

1 0

[janderwald] 45682: [PSDK] - Add KSPROPERTY_BDA_FREQUENCY_FILTER, KSPROPERTY_BDA_DIGITAL_DEMODULATOR, KSPROPERTY_BDA_LNB_INFO, KSPROPERTY_BDA_SIGNAL_STATS properties for BDAPLGIN
by janderwald＠svn.reactos.org 25 Feb '10

25 Feb '10

Author: janderwald Date: Thu Feb 25 23:31:02 2010 New Revision: 45682 URL: http://svn.reactos.org/svn/reactos?rev=45682&view=rev Log: [PSDK] - Add KSPROPERTY_BDA_FREQUENCY_FILTER, KSPROPERTY_BDA_DIGITAL_DEMODULATOR, KSPROPERTY_BDA_LNB_INFO, KSPROPERTY_BDA_SIGNAL_STATS properties for BDAPLGIN Modified: trunk/reactos/include/dxsdk/bdamedia.h Modified: trunk/reactos/include/dxsdk/bdamedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/bdamedia.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/bdamedia.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/bdamedia.h [iso-8859-1] Thu Feb 25 23:31:02 2010 @@ -253,6 +253,68 @@ 0,\ SupportHandler) +#define STATIC_KSPROPSETID_BdaFrequencyFilter \ + 0x71985f47, 0x1ca1, 0x11d3, 0x9c, 0xc8, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0 +DEFINE_GUIDSTRUCT("71985F47-1CA1-11d3-9CC8-00C04F7971E0", KSPROPSETID_BdaFrequencyFilter); +#define KSPROPSETID_BdaFrequencyFilter DEFINE_GUIDNAMED(KSPROPSETID_BdaFrequencyFilter) + +typedef enum { + KSPROPERTY_BDA_RF_TUNER_FREQUENCY = 0, + KSPROPERTY_BDA_RF_TUNER_POLARITY, + KSPROPERTY_BDA_RF_TUNER_RANGE, + KSPROPERTY_BDA_RF_TUNER_TRANSPONDER, + KSPROPERTY_BDA_RF_TUNER_BANDWIDTH, + KSPROPERTY_BDA_RF_TUNER_FREQUENCY_MULTIPLIER, + KSPROPERTY_BDA_RF_TUNER_CAPS, + KSPROPERTY_BDA_RF_TUNER_SCAN_STATUS, + KSPROPERTY_BDA_RF_TUNER_STANDARD, + KSPROPERTY_BDA_RF_TUNER_STANDARD_MODE +}KSPROPERTY_BDA_FREQUENCY_FILTER; + + +#define STATIC_KSPROPSETID_BdaDigitalDemodulator \ + 0xef30f379, 0x985b, 0x4d10, 0xb6, 0x40, 0xa7, 0x9d, 0x5e, 0x4, 0xe1, 0xe0 +DEFINE_GUIDSTRUCT("EF30F379-985B-4d10-B640-A79D5E04E1E0", KSPROPSETID_BdaDigitalDemodulator); +#define KSPROPSETID_BdaDigitalDemodulator DEFINE_GUIDNAMED(KSPROPSETID_BdaDigitalDemodulator) + +typedef enum { + KSPROPERTY_BDA_MODULATION_TYPE = 0, + KSPROPERTY_BDA_INNER_FEC_TYPE, + KSPROPERTY_BDA_INNER_FEC_RATE, + KSPROPERTY_BDA_OUTER_FEC_TYPE, + KSPROPERTY_BDA_OUTER_FEC_RATE, + KSPROPERTY_BDA_SYMBOL_RATE, + KSPROPERTY_BDA_SPECTRAL_INVERSION, + KSPROPERTY_BDA_GUARD_INTERVAL, + KSPROPERTY_BDA_TRANSMISSION_MODE, + KSPROPERTY_BDA_ROLL_OFF, + KSPROPERTY_BDA_PILOT, + KSPROPERTY_BDA_SIGNALTIMEOUTS +}KSPROPERTY_BDA_DIGITAL_DEMODULATOR; + +#define STATIC_KSPROPSETID_BdaLNBInfo \ + 0x992cf102, 0x49f9, 0x4719, 0xa6, 0x64, 0xc4, 0xf2, 0x3e, 0x24, 0x8, 0xf4 +DEFINE_GUIDSTRUCT("992CF102-49F9-4719-A664-C4F23E2408F4", KSPROPSETID_BdaLNBInfo); +#define KSPROPSETID_BdaLNBInfo DEFINE_GUIDNAMED(KSPROPSETID_BdaLNBInfo) + +typedef enum { + KSPROPERTY_BDA_LNB_LOF_LOW_BAND = 0, + KSPROPERTY_BDA_LNB_LOF_HIGH_BAND, + KSPROPERTY_BDA_LNB_SWITCH_FREQUENCY +}KSPROPERTY_BDA_LNB_INFO; + +#define STATIC_KSPROPSETID_BdaSignalStats \ + 0x1347d106, 0xcf3a, 0x428a, 0xa5, 0xcb, 0xac, 0xd, 0x9a, 0x2a, 0x43, 0x38 +DEFINE_GUIDSTRUCT("1347D106-CF3A-428a-A5CB-AC0D9A2A4338", KSPROPSETID_BdaSignalStats); +#define KSPROPSETID_BdaSignalStats DEFINE_GUIDNAMED(KSPROPSETID_BdaSignalStats) + +typedef enum { + KSPROPERTY_BDA_SIGNAL_STRENGTH = 0, + KSPROPERTY_BDA_SIGNAL_QUALITY, + KSPROPERTY_BDA_SIGNAL_PRESENT, + KSPROPERTY_BDA_SIGNAL_LOCKED, + KSPROPERTY_BDA_SAMPLE_TIME +}KSPROPERTY_BDA_SIGNAL_STATS; #endif

1 0

[janderwald] 45681: [BDAPLGIN] - Simply construction of CBDAFrequencyFilter, CBDALNBInfo, CBDASignalStatistics - Find IBDA_NetworkProvider in filter graph - Check for IBaseFilter interface when constructing the CBDADeviceControl object
by janderwald＠svn.reactos.org 25 Feb '10

25 Feb '10

Author: janderwald Date: Thu Feb 25 17:14:54 2010 New Revision: 45681 URL: http://svn.reactos.org/svn/reactos?rev=45681&view=rev Log: [BDAPLGIN] - Simply construction of CBDAFrequencyFilter, CBDALNBInfo, CBDASignalStatistics - Find IBDA_NetworkProvider in filter graph - Check for IBaseFilter interface when constructing the CBDADeviceControl object Modified: trunk/reactos/dll/directx/bdaplgin/controlnode.cpp trunk/reactos/dll/directx/bdaplgin/devicecontrol.cpp trunk/reactos/dll/directx/bdaplgin/digitaldemo.cpp trunk/reactos/dll/directx/bdaplgin/frequencyfilter.cpp trunk/reactos/dll/directx/bdaplgin/lnbinfo.cpp trunk/reactos/dll/directx/bdaplgin/pincontrol.cpp trunk/reactos/dll/directx/bdaplgin/precomp.h trunk/reactos/dll/directx/bdaplgin/signalstatistics.cpp Modified: trunk/reactos/dll/directx/bdaplgin/controlnode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/contr… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/controlnode.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/bdaplgin/controlnode.cpp [iso-8859-1] Thu Feb 25 17:14:54 2010 @@ -31,12 +31,12 @@ return m_Ref; } - CControlNode(IUnknown * pUnkOuter, ULONG NodeType, ULONG PinId) : m_Ref(0), m_pUnkOuter(pUnkOuter), m_NodeType(NodeType), m_PinId(PinId){}; + CControlNode(HANDLE hFile, ULONG NodeType, ULONG PinId) : m_Ref(0), m_hFile(hFile), m_NodeType(NodeType), m_PinId(PinId){}; virtual ~CControlNode(){}; protected: LONG m_Ref; - IUnknown * m_pUnkOuter; + HANDLE m_hFile; ULONG m_NodeType; ULONG m_PinId; }; @@ -60,23 +60,20 @@ } else if(IsEqualGUID(refiid, IID_IBDA_FrequencyFilter)) { - return CBDAFrequencyFilter_fnConstructor(m_pUnkOuter, refiid, Output); + return CBDAFrequencyFilter_fnConstructor(m_hFile, refiid, Output); } else if(IsEqualGUID(refiid, IID_IBDA_SignalStatistics)) { - return CBDASignalStatistics_fnConstructor(m_pUnkOuter, refiid, Output); + return CBDASignalStatistics_fnConstructor(m_hFile, refiid, Output); } else if(IsEqualGUID(refiid, IID_IBDA_LNBInfo)) { - return CBDALNBInfo_fnConstructor(m_pUnkOuter, refiid, Output); + return CBDALNBInfo_fnConstructor(m_hFile, refiid, Output); } else if(IsEqualGUID(refiid, IID_IBDA_DigitalDemodulator)) { - return CBDADigitalDemodulator_fnConstructor(m_pUnkOuter, refiid, Output); + return CBDADigitalDemodulator_fnConstructor(m_hFile, refiid, Output); } - - - StringFromCLSID(refiid, &lpstr); swprintf(Buffer, L"CControlNode::QueryInterface: NoInterface for %s", lpstr); @@ -90,17 +87,14 @@ HRESULT WINAPI CControlNode_fnConstructor( - IUnknown * pUnkOuter, + HANDLE hFile, ULONG NodeType, ULONG PinId, REFIID riid, LPVOID * ppv) { - // sanity check - assert(pUnkOuter); - // construct device control - CControlNode * handler = new CControlNode(pUnkOuter, NodeType, PinId); + CControlNode * handler = new CControlNode(hFile, NodeType, PinId); OutputDebugStringW(L"CControlNode_fnConstructor\n"); Modified: trunk/reactos/dll/directx/bdaplgin/devicecontrol.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/devic… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/devicecontrol.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/bdaplgin/devicecontrol.cpp [iso-8859-1] Thu Feb 25 17:14:54 2010 @@ -21,6 +21,8 @@ const GUID IID_IKsObject = {0x423c13a2, 0x2070, 0x11d0, {0x9e, 0xf7, 0x00, 0xaa, 0x00, 0xa2, 0x16, 0xa1}}; const GUID KSPROPSETID_BdaTopology = {0xa14ee835, 0x0a23, 0x11d3, {0x9c, 0xc7, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0}}; const GUID KSMETHODSETID_BdaDeviceConfiguration = {0x71985f45, 0x1ca1, 0x11d3, {0x9c, 0xc8, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0}}; +const GUID IID_IBaseFilter = {0x56a86895, 0x0ad4, 0x11ce, {0xb0,0x3a, 0x00,0x20,0xaf,0x0b,0xa7,0x70}}; + class CBDADeviceControl : public IBDA_DeviceControl, public IBDA_Topology @@ -103,7 +105,7 @@ reinterpret_cast<IBDA_Topology*>(*Output)->AddRef(); return NOERROR; } -#if 0 + if (IsEqualIID(refiid, IID_IDistributorNotify)) { OutputDebugStringW(L"CBDADeviceControl::QueryInterface: No IDistributorNotify interface\n"); @@ -118,10 +120,8 @@ if (IsEqualGUID(refiid, IID_IBDA_NetworkProvider)) { - HRESULT hr = CoCreateInstance(CLSID_DVBTNetworkProvider, 0, CLSCTX_INPROC, IID_IBDA_NetworkProvider, (void**)Output); - swprintf(Buffer, L"CBDADeviceControl::QueryInterface: failed to construct IID_IBDA_NetworkProvider interface with %lx", hr); - OutputDebugStringW(Buffer); - return hr; + OutputDebugStringW(L"CBDADeviceControl::QueryInterface: No IID_IBDA_NetworkProvider interface\n"); + return E_NOINTERFACE; } if (IsEqualGUID(refiid, IID_IMatrixMixer)) @@ -141,7 +141,6 @@ OutputDebugStringW(L"CBDADeviceControl::QueryInterface: No IID_IAC3Filter interface\n"); return E_NOINTERFACE; } -#endif StringFromCLSID(refiid, &lpstr); swprintf(Buffer, L"CBDADeviceControl::QueryInterface: NoInterface for %s", lpstr); @@ -385,7 +384,7 @@ if (FAILED(hr)) return hr; - hr = CControlNode_fnConstructor(m_pUnkOuter, ulNodeType, PinId, IID_IUnknown, (LPVOID*)ppControlNode); + hr = CControlNode_fnConstructor(m_Handle, ulNodeType, PinId, IID_IUnknown, (LPVOID*)ppControlNode); swprintf(Buffer, L"CBDADeviceControl::GetControlNode: hr %lx\n", hr); OutputDebugStringW(Buffer); @@ -401,6 +400,7 @@ { HRESULT hr; IKsObject *pObject = NULL; + IBaseFilter *pFilter = NULL; HANDLE hFile; // sanity check @@ -409,9 +409,22 @@ // query for IKsObject hr = pUnkOuter->QueryInterface(IID_IKsObject, (void**)&pObject); + if (FAILED(hr)) + return E_NOINTERFACE; + // sanity check assert(hr == NOERROR); + // query for IBaseFilter interface support + hr = pUnkOuter->QueryInterface(IID_IBaseFilter, (void**)&pFilter); + + if (FAILED(hr)) + { + // release + pObject->Release(); + return E_NOINTERFACE; + } + // another sanity check assert(pObject != NULL); Modified: trunk/reactos/dll/directx/bdaplgin/digitaldemo.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/digit… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/digitaldemo.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/bdaplgin/digitaldemo.cpp [iso-8859-1] Thu Feb 25 17:14:54 2010 @@ -206,35 +206,10 @@ HRESULT WINAPI CBDADigitalDemodulator_fnConstructor( - IUnknown * pUnkOuter, + HANDLE hFile, REFIID riid, LPVOID * ppv) { - HRESULT hr; - IKsObject *pObject = NULL; - HANDLE hFile; - - // sanity check - assert(pUnkOuter); - - // query for IKsObject - hr = pUnkOuter->QueryInterface(IID_IKsObject, (void**)&pObject); - - // sanity check - assert(hr == NOERROR); - - // another sanity check - assert(pObject != NULL); - - // get file handle - hFile = pObject->KsGetObjectHandle(); - - // one more sanity check - assert(hFile != NULL && hFile != INVALID_HANDLE_VALUE); - - // release IKsObject interface - pObject->Release(); - // construct device control CBDADigitalDemodulator * handler = new CBDADigitalDemodulator(hFile); Modified: trunk/reactos/dll/directx/bdaplgin/frequencyfilter.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/frequ… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/frequencyfilter.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/bdaplgin/frequencyfilter.cpp [iso-8859-1] Thu Feb 25 17:14:54 2010 @@ -185,35 +185,10 @@ HRESULT WINAPI CBDAFrequencyFilter_fnConstructor( - IUnknown * pUnkOuter, + HANDLE hFile, REFIID riid, LPVOID * ppv) { - HRESULT hr; - IKsObject *pObject = NULL; - HANDLE hFile; - - // sanity check - assert(pUnkOuter); - - // query for IKsObject - hr = pUnkOuter->QueryInterface(IID_IKsObject, (void**)&pObject); - - // sanity check - assert(hr == NOERROR); - - // another sanity check - assert(pObject != NULL); - - // get file handle - hFile = pObject->KsGetObjectHandle(); - - // one more sanity check - assert(hFile != NULL && hFile != INVALID_HANDLE_VALUE); - - // release IKsObject interface - pObject->Release(); - // construct device control CBDAFrequencyFilter * handler = new CBDAFrequencyFilter(hFile); Modified: trunk/reactos/dll/directx/bdaplgin/lnbinfo.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/lnbin… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/lnbinfo.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/bdaplgin/lnbinfo.cpp [iso-8859-1] Thu Feb 25 17:14:54 2010 @@ -133,35 +133,10 @@ HRESULT WINAPI CBDALNBInfo_fnConstructor( - IUnknown * pUnkOuter, + HANDLE hFile, REFIID riid, LPVOID * ppv) { - HRESULT hr; - IKsObject *pObject = NULL; - HANDLE hFile; - - // sanity check - assert(pUnkOuter); - - // query for IKsObject - hr = pUnkOuter->QueryInterface(IID_IKsObject, (void**)&pObject); - - // sanity check - assert(hr == NOERROR); - - // another sanity check - assert(pObject != NULL); - - // get file handle - hFile = pObject->KsGetObjectHandle(); - - // one more sanity check - assert(hFile != NULL && hFile != INVALID_HANDLE_VALUE); - - // release IKsObject interface - pObject->Release(); - // construct device control CBDALNBInfo * handler = new CBDALNBInfo(hFile); Modified: trunk/reactos/dll/directx/bdaplgin/pincontrol.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/pinco… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/pincontrol.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/bdaplgin/pincontrol.cpp [iso-8859-1] Thu Feb 25 17:14:54 2010 @@ -10,6 +10,7 @@ #include "precomp.h" const GUID IID_IBDA_PinControl = {0x0DED49D5, 0xA8B7, 0x4d5d, {0x97, 0xA1, 0x12, 0xB0, 0xC1, 0x95, 0x87, 0x4D}}; +const GUID IID_IPin = {0x56a86891, 0x0ad4, 0x11ce, {0xb0, 0x3a, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}; class CBDAPinControl : public IBDA_PinControl { @@ -38,13 +39,14 @@ HRESULT STDMETHODCALLTYPE RegistrationContext(ULONG *pulRegistrationCtx); - CBDAPinControl(HANDLE hFile) : m_Ref(0), m_Handle(hFile){}; + CBDAPinControl(HANDLE hFile, IBDA_NetworkProvider * pProvider, IPin * pConnectedPin) : m_Ref(0), m_Handle(hFile), m_pProvider(pProvider), m_pConnectedPin(pConnectedPin){}; virtual ~CBDAPinControl(){}; protected: LONG m_Ref; HANDLE m_Handle; - + IBDA_NetworkProvider * m_pProvider; + IPin * m_pConnectedPin; }; HRESULT @@ -53,9 +55,6 @@ IN REFIID refiid, OUT PVOID* Output) { - WCHAR Buffer[MAX_PATH]; - LPOLESTR lpstr; - if (IsEqualGUID(refiid, IID_IUnknown)) { *Output = PVOID(this); @@ -69,10 +68,6 @@ return NOERROR; } - StringFromCLSID(refiid, &lpstr); - swprintf(Buffer, L"CBDADeviceControl::QueryInterface: NoInterface for %s", lpstr); - OutputDebugStringW(Buffer); - CoTaskMemFree(lpstr); return E_NOINTERFACE; } //------------------------------------------------------------------- @@ -109,7 +104,121 @@ REFIID riid, LPVOID * ppv) { - CBDAPinControl * handler = new CBDAPinControl(NULL); + HRESULT hr; + IKsObject * pObject = NULL; + IPin * pPin = NULL, * pConnectedPin = NULL; + IEnumFilters *pEnumFilters = NULL; + IBDA_NetworkProvider * pNetworkProvider = NULL; + IBaseFilter * ppFilter[1]; + PIN_INFO PinInfo; + FILTER_INFO FilterInfo; + HANDLE hFile = INVALID_HANDLE_VALUE; + + if (!pUnkOuter) + return E_POINTER; + + // query for IKsObject interface + hr = pUnkOuter->QueryInterface(IID_IKsObject, (void**)&pObject); + + if (FAILED(hr)) + return hr; + + // query for IPin interface + hr = pObject->QueryInterface(IID_IPin, (void**)&pPin); + + if (FAILED(hr)) + { + //clean up + pObject->Release(); + return hr; + } + + // get pin info + hr = pPin->QueryPinInfo(&PinInfo); + + if (FAILED(hr)) + { + //clean up + pObject->Release(); + pPin->Release(); + return hr; + } + + // sanity checks + assert(PinInfo.dir == PINDIR_OUTPUT); + assert(PinInfo.pFilter != NULL); + + // query filter info + hr = PinInfo.pFilter->QueryFilterInfo(&FilterInfo); + + // sanity check + assert(FilterInfo.pGraph != NULL); + + // get IEnumFilters interface + hr = FilterInfo.pGraph->EnumFilters(&pEnumFilters); + + if (FAILED(hr)) + { + //clean up + FilterInfo.pGraph->Release(); + PinInfo.pFilter->Release(); + pObject->Release(); + pPin->Release(); + return hr; + } + + while(pEnumFilters->Next(1, ppFilter, NULL) == S_OK) + { + // check if that filter supports the IBDA_NetworkProvider interface + hr = ppFilter[0]->QueryInterface(IID_IBDA_NetworkProvider, (void**)&pNetworkProvider); + + // release IBaseFilter + ppFilter[0]->Release(); + + if (SUCCEEDED(hr)) + break; + } + + // release IEnumFilters interface + pEnumFilters->Release(); + + // release IFilterGraph interface + FilterInfo.pGraph->Release(); + + // release IBaseFilter interface + PinInfo.pFilter->Release(); + + if (pNetworkProvider) + { + // get connected pin handle + hr = pPin->ConnectedTo(&pConnectedPin); + + // get file handle + hFile = pObject->KsGetObjectHandle(); + + if (FAILED(hr) || hFile == INVALID_HANDLE_VALUE) + { + // pin not connected + pNetworkProvider->Release(); + // set zero + pNetworkProvider = NULL; + } + } + + // release IPin + pPin->Release(); + + // release IKsObject + pObject->Release(); + + + if (pNetworkProvider == NULL) + { + // no network provider interface in graph + return E_NOINTERFACE; + } + + CBDAPinControl * handler = new CBDAPinControl(hFile, pNetworkProvider, pConnectedPin); OutputDebugStringW(L"CBDAPinControl_fnConstructor"); @@ -124,4 +233,4 @@ } return NOERROR; -} +} Modified: trunk/reactos/dll/directx/bdaplgin/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/preco… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/bdaplgin/precomp.h [iso-8859-1] Thu Feb 25 17:14:54 2010 @@ -54,7 +54,7 @@ HRESULT WINAPI CControlNode_fnConstructor( - IUnknown * pUnkOuter, + HANDLE hFile, ULONG NodeType, ULONG PinId, REFIID riid, @@ -65,7 +65,7 @@ HRESULT WINAPI CBDAFrequencyFilter_fnConstructor( - IUnknown * pUnkOuter, + HANDLE hFile, REFIID riid, LPVOID * ppv); @@ -74,7 +74,7 @@ HRESULT WINAPI CBDASignalStatistics_fnConstructor( - IUnknown * pUnkOuter, + HANDLE hFile, REFIID riid, LPVOID * ppv); @@ -83,7 +83,7 @@ HRESULT WINAPI CBDALNBInfo_fnConstructor( - IUnknown * pUnkOuter, + HANDLE hFile, REFIID riid, LPVOID * ppv); @@ -91,7 +91,7 @@ HRESULT WINAPI CBDADigitalDemodulator_fnConstructor( - IUnknown * pUnkOuter, + HANDLE hFile, REFIID riid, LPVOID * ppv); Modified: trunk/reactos/dll/directx/bdaplgin/signalstatistics.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/signa… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/signalstatistics.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/bdaplgin/signalstatistics.cpp [iso-8859-1] Thu Feb 25 17:14:54 2010 @@ -169,35 +169,10 @@ HRESULT WINAPI CBDASignalStatistics_fnConstructor( - IUnknown * pUnkOuter, + HANDLE hFile, REFIID riid, LPVOID * ppv) { - HRESULT hr; - IKsObject *pObject = NULL; - HANDLE hFile; - - // sanity check - assert(pUnkOuter); - - // query for IKsObject - hr = pUnkOuter->QueryInterface(IID_IKsObject, (void**)&pObject); - - // sanity check - assert(hr == NOERROR); - - // another sanity check - assert(pObject != NULL); - - // get file handle - hFile = pObject->KsGetObjectHandle(); - - // one more sanity check - assert(hFile != NULL && hFile != INVALID_HANDLE_VALUE); - - // release IKsObject interface - pObject->Release(); - // construct device control CBDASignalStatistics * handler = new CBDASignalStatistics(hFile);

1 0

[janderwald] 45680: [BDAPLGIN] - Implement IBDA_Topology::GetNodeTypes, IBDA_Topology::GetNodeDescriptors, IBDA_Topology::GetNodeInterfaces, IBDA_Topology::GetPinTypes, IBDA_Topology::CreateTopology, IBDA_Topology::GetControlNode - Implement stub interfaces for control node, IBDA_DigitalDemodulator, IBDA_FrequencyFilter, IBDA_LNBInfo, IBDA_SignalStatistics
by janderwald＠svn.reactos.org 24 Feb '10

24 Feb '10

Author: janderwald Date: Wed Feb 24 19:37:07 2010 New Revision: 45680 URL: http://svn.reactos.org/svn/reactos?rev=45680&view=rev Log: [BDAPLGIN] - Implement IBDA_Topology::GetNodeTypes, IBDA_Topology::GetNodeDescriptors, IBDA_Topology::GetNodeInterfaces, IBDA_Topology::GetPinTypes, IBDA_Topology::CreateTopology, IBDA_Topology::GetControlNode - Implement stub interfaces for control node, IBDA_DigitalDemodulator, IBDA_FrequencyFilter, IBDA_LNBInfo, IBDA_SignalStatistics Added: trunk/reactos/dll/directx/bdaplgin/controlnode.cpp (with props) trunk/reactos/dll/directx/bdaplgin/digitaldemo.cpp (with props) trunk/reactos/dll/directx/bdaplgin/frequencyfilter.cpp (with props) trunk/reactos/dll/directx/bdaplgin/lnbinfo.cpp (with props) trunk/reactos/dll/directx/bdaplgin/signalstatistics.cpp (with props) Modified: trunk/reactos/dll/directx/bdaplgin/bdaplgin.cpp trunk/reactos/dll/directx/bdaplgin/bdaplgin.rbuild trunk/reactos/dll/directx/bdaplgin/devicecontrol.cpp trunk/reactos/dll/directx/bdaplgin/pincontrol.cpp trunk/reactos/dll/directx/bdaplgin/precomp.h Modified: trunk/reactos/dll/directx/bdaplgin/bdaplgin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/bdapl… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/bdaplgin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/bdaplgin/bdaplgin.cpp [iso-8859-1] Wed Feb 24 19:37:07 2010 @@ -31,6 +31,7 @@ switch (fdwReason) { case DLL_PROCESS_ATTACH: + CoInitialize(NULL); OutputDebugStringW(L"BDAPLGIN::DllMain()\n"); DisableThreadLibraryCalls(hInstDLL); break; Modified: trunk/reactos/dll/directx/bdaplgin/bdaplgin.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/bdapl… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/bdaplgin.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/bdaplgin/bdaplgin.rbuild [iso-8859-1] Wed Feb 24 19:37:07 2010 @@ -10,6 +10,7 @@ <library>ole32</library> <library>advapi32</library> <library>msvcrt</library> + <library>ksproxy</library> <group compilerset="gcc"> <compilerflag compiler="cxx">-fno-exceptions</compilerflag> <compilerflag compiler="cxx">-fno-rtti</compilerflag> @@ -21,7 +22,12 @@ <file>bdaplgin.cpp</file> <file>bdaplgin.rc</file> <file>classfactory.cpp</file> + <file>controlnode.cpp</file> <file>devicecontrol.cpp</file> + <file>digitaldemo.cpp</file> + <file>frequencyfilter.cpp</file> + <file>lnbinfo.cpp</file> <file>pincontrol.cpp</file> + <file>signalstatistics.cpp</file> </module> </group> Added: trunk/reactos/dll/directx/bdaplgin/controlnode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/contr… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/controlnode.cpp (added) +++ trunk/reactos/dll/directx/bdaplgin/controlnode.cpp [iso-8859-1] Wed Feb 24 19:37:07 2010 @@ -1,0 +1,118 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS BDA Proxy + * FILE: dll/directx/bdaplgin/controlnode.cpp + * PURPOSE: ControlNode interface + * + * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) + */ + +#include "precomp.h" + +class CControlNode : public IUnknown +{ +public: + STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); + + STDMETHODIMP_(ULONG) AddRef() + { + InterlockedIncrement(&m_Ref); + return m_Ref; + } + STDMETHODIMP_(ULONG) Release() + { + InterlockedDecrement(&m_Ref); + + if (!m_Ref) + { + delete this; + return 0; + } + return m_Ref; + } + + CControlNode(IUnknown * pUnkOuter, ULONG NodeType, ULONG PinId) : m_Ref(0), m_pUnkOuter(pUnkOuter), m_NodeType(NodeType), m_PinId(PinId){}; + virtual ~CControlNode(){}; + +protected: + LONG m_Ref; + IUnknown * m_pUnkOuter; + ULONG m_NodeType; + ULONG m_PinId; +}; + +HRESULT +STDMETHODCALLTYPE +CControlNode::QueryInterface( + IN REFIID refiid, + OUT PVOID* Output) +{ + WCHAR Buffer[MAX_PATH]; + LPOLESTR lpstr; + + *Output = NULL; + + if (IsEqualGUID(refiid, IID_IUnknown)) + { + *Output = PVOID(this); + reinterpret_cast<IUnknown*>(*Output)->AddRef(); + return NOERROR; + } + else if(IsEqualGUID(refiid, IID_IBDA_FrequencyFilter)) + { + return CBDAFrequencyFilter_fnConstructor(m_pUnkOuter, refiid, Output); + } + else if(IsEqualGUID(refiid, IID_IBDA_SignalStatistics)) + { + return CBDASignalStatistics_fnConstructor(m_pUnkOuter, refiid, Output); + } + else if(IsEqualGUID(refiid, IID_IBDA_LNBInfo)) + { + return CBDALNBInfo_fnConstructor(m_pUnkOuter, refiid, Output); + } + else if(IsEqualGUID(refiid, IID_IBDA_DigitalDemodulator)) + { + return CBDADigitalDemodulator_fnConstructor(m_pUnkOuter, refiid, Output); + } + + + + + StringFromCLSID(refiid, &lpstr); + swprintf(Buffer, L"CControlNode::QueryInterface: NoInterface for %s", lpstr); + OutputDebugStringW(Buffer); + CoTaskMemFree(lpstr); + + return E_NOINTERFACE; +} + + +HRESULT +WINAPI +CControlNode_fnConstructor( + IUnknown * pUnkOuter, + ULONG NodeType, + ULONG PinId, + REFIID riid, + LPVOID * ppv) +{ + // sanity check + assert(pUnkOuter); + + // construct device control + CControlNode * handler = new CControlNode(pUnkOuter, NodeType, PinId); + + OutputDebugStringW(L"CControlNode_fnConstructor\n"); + + if (!handler) + return E_OUTOFMEMORY; + + if (FAILED(handler->QueryInterface(riid, ppv))) + { + /* not supported */ + delete handler; + return E_NOINTERFACE; + } + + return NOERROR; +} Propchange: trunk/reactos/dll/directx/bdaplgin/controlnode.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/bdaplgin/devicecontrol.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/devic… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/devicecontrol.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/bdaplgin/devicecontrol.cpp [iso-8859-1] Wed Feb 24 19:37:07 2010 @@ -9,8 +9,18 @@ #include "precomp.h" +const GUID CLSID_DVBTNetworkProvider = {0x216c62df, 0x6d7f, 0x4e9a, {0x85, 0x71, 0x5, 0xf1, 0x4e, 0xdb, 0x76, 0x6a}}; +const GUID IID_IAC3Filter = {0xe4539501, 0xc609, 0x46ea, {0xad, 0x2a, 0x0e, 0x97, 0x00, 0x24, 0x56, 0x83}}; +const GUID IID_IAsyncReader = {0x56A868AA, 0x0AD4, 0x11CE, {0xB0, 0x3A, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70}}; +const GUID IID_IMatrixMixer = {0xafc57835, 0x2fd1, 0x4541, {0xa6, 0xd9, 0x0d, 0xb7, 0x18, 0x56, 0xe5, 0x89}}; +const GUID IID_IBDA_NetworkProvider = {0xfd501041, 0x8ebe, 0x11ce, {0x81, 0x83, 0x00, 0xaa, 0x00, 0x57, 0x7d, 0xa2}}; +const GUID IID_IAMOpenProgress = {0x8E1C39A1, 0xDE53, 0x11cf, {0xAA, 0x63, 0x00, 0x80, 0xC7, 0x44, 0x52, 0x8D}}; +const GUID IID_IDistributorNotify = {0x56a868af, 0x0ad4, 0x11ce, {0xb0, 0x3a, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}; const GUID IID_IBDA_DeviceControl = {0xFD0A5AF3, 0xB41D, 0x11d2, {0x9C, 0x95, 0x00, 0xC0, 0x4F, 0x79, 0x71, 0xE0}}; const GUID IID_IBDA_Topology = {0x79B56888, 0x7FEA, 0x4690, {0xB4, 0x5D, 0x38, 0xFD, 0x3C, 0x78, 0x49, 0xBE}}; +const GUID IID_IKsObject = {0x423c13a2, 0x2070, 0x11d0, {0x9e, 0xf7, 0x00, 0xaa, 0x00, 0xa2, 0x16, 0xa1}}; +const GUID KSPROPSETID_BdaTopology = {0xa14ee835, 0x0a23, 0x11d3, {0x9c, 0xc7, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0}}; +const GUID KSMETHODSETID_BdaDeviceConfiguration = {0x71985f45, 0x1ca1, 0x11d3, {0x9c, 0xc8, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0}}; class CBDADeviceControl : public IBDA_DeviceControl, public IBDA_Topology @@ -54,11 +64,12 @@ HRESULT STDMETHODCALLTYPE CreateTopology(ULONG ulInputPinId, ULONG ulOutputPinId); HRESULT STDMETHODCALLTYPE GetControlNode(ULONG ulInputPinId, ULONG ulOutputPinId, ULONG ulNodeType, IUnknown **ppControlNode); - CBDADeviceControl(HANDLE hFile) : m_Ref(0), m_Handle(hFile){}; + CBDADeviceControl(IUnknown * pUnkOuter, HANDLE hFile) : m_Ref(0), m_pUnkOuter(pUnkOuter), m_Handle(hFile){}; virtual ~CBDADeviceControl(){}; protected: LONG m_Ref; + IUnknown * m_pUnkOuter; HANDLE m_Handle; }; @@ -92,6 +103,45 @@ reinterpret_cast<IBDA_Topology*>(*Output)->AddRef(); return NOERROR; } +#if 0 + if (IsEqualIID(refiid, IID_IDistributorNotify)) + { + OutputDebugStringW(L"CBDADeviceControl::QueryInterface: No IDistributorNotify interface\n"); + return E_NOINTERFACE; + } + + if (IsEqualGUID(refiid, IID_IAMOpenProgress)) + { + OutputDebugStringW(L"CBDADeviceControl::QueryInterface: No IAMOpenProgress interface\n"); + return E_NOINTERFACE; + } + + if (IsEqualGUID(refiid, IID_IBDA_NetworkProvider)) + { + HRESULT hr = CoCreateInstance(CLSID_DVBTNetworkProvider, 0, CLSCTX_INPROC, IID_IBDA_NetworkProvider, (void**)Output); + swprintf(Buffer, L"CBDADeviceControl::QueryInterface: failed to construct IID_IBDA_NetworkProvider interface with %lx", hr); + OutputDebugStringW(Buffer); + return hr; + } + + if (IsEqualGUID(refiid, IID_IMatrixMixer)) + { + OutputDebugStringW(L"CBDADeviceControl::QueryInterface: No IID_IMatrixMixer interface\n"); + return E_NOINTERFACE; + } + + if (IsEqualGUID(refiid, IID_IAsyncReader)) + { + OutputDebugStringW(L"CBDADeviceControl::QueryInterface: No IID_IAsyncReader interface\n"); + return E_NOINTERFACE; + } + + if (IsEqualGUID(refiid, IID_IAC3Filter)) + { + OutputDebugStringW(L"CBDADeviceControl::QueryInterface: No IID_IAC3Filter interface\n"); + return E_NOINTERFACE; + } +#endif StringFromCLSID(refiid, &lpstr); swprintf(Buffer, L"CBDADeviceControl::QueryInterface: NoInterface for %s", lpstr); @@ -146,32 +196,102 @@ STDMETHODCALLTYPE CBDADeviceControl::GetNodeTypes(ULONG *pulcNodeTypes, ULONG ulcNodeTypesMax, ULONG * rgulNodeTypes) { - OutputDebugStringW(L"CBDADeviceControl::GetNodeTypes: NotImplemented\n"); - return E_NOTIMPL; + KSPROPERTY Property; + HRESULT hr; + ULONG BytesReturned; + WCHAR Buffer[100]; + + // setup request + Property.Set = KSPROPSETID_BdaTopology; + Property.Id = KSPROPERTY_BDA_NODE_TYPES; + Property.Flags = KSPROPERTY_TYPE_GET; + + // perform request + hr = KsSynchronousDeviceControl(m_Handle, IOCTL_KS_PROPERTY, (PVOID)&Property, sizeof(KSPROPERTY), rgulNodeTypes, sizeof(ULONG) * ulcNodeTypesMax, &BytesReturned); + + *pulcNodeTypes = (BytesReturned / sizeof(ULONG)); + + swprintf(Buffer, L"CBDADeviceControl::GetNodeTypes: hr %lx, BytesReturned %lu\n", hr, BytesReturned); + OutputDebugStringW(Buffer); + + return hr; } HRESULT STDMETHODCALLTYPE CBDADeviceControl::GetNodeDescriptors(ULONG *ulcNodeDescriptors, ULONG ulcNodeDescriptorsMax, BDANODE_DESCRIPTOR * rgNodeDescriptors) { - OutputDebugStringW(L"CBDADeviceControl::GetNodeDescriptors: NotImplemented\n"); - return E_NOTIMPL; + KSPROPERTY Property; + HRESULT hr; + ULONG BytesReturned; + WCHAR Buffer[100]; + + // setup request + Property.Set = KSPROPSETID_BdaTopology; + Property.Id = KSPROPERTY_BDA_NODE_DESCRIPTORS; + Property.Flags = KSPROPERTY_TYPE_GET; + + // perform request + hr = KsSynchronousDeviceControl(m_Handle, IOCTL_KS_PROPERTY, (PVOID)&Property, sizeof(KSPROPERTY), rgNodeDescriptors, sizeof(BDANODE_DESCRIPTOR) * ulcNodeDescriptorsMax, &BytesReturned); + + *ulcNodeDescriptors = (BytesReturned / sizeof(BDANODE_DESCRIPTOR)); + + swprintf(Buffer, L"CBDADeviceControl::GetNodeDescriptors: hr %lx, BytesReturned %lu\n", hr, BytesReturned); + OutputDebugStringW(Buffer); + + return hr; } HRESULT STDMETHODCALLTYPE CBDADeviceControl::GetNodeInterfaces(ULONG ulNodeType, ULONG *pulcInterfaces, ULONG ulcInterfacesMax, GUID * rgguidInterfaces) { - OutputDebugStringW(L"CBDADeviceControl::GetNodeInterfaces: NotImplemented\n"); - return E_NOTIMPL; + KSP_NODE Property; + HRESULT hr; + ULONG BytesReturned; + WCHAR Buffer[100]; + + // setup request + Property.Property.Set = KSPROPSETID_BdaTopology; + Property.Property.Id = KSPROPERTY_BDA_NODE_PROPERTIES; + Property.Property.Flags = KSPROPERTY_TYPE_GET; + Property.NodeId = ulNodeType; + Property.Reserved = 0; + + // perform request + hr = KsSynchronousDeviceControl(m_Handle, IOCTL_KS_PROPERTY, (PVOID)&Property, sizeof(KSP_NODE), rgguidInterfaces, sizeof(GUID) * ulcInterfacesMax, &BytesReturned); + + *pulcInterfaces = (BytesReturned / sizeof(GUID)); + + swprintf(Buffer, L"CBDADeviceControl::GetNodeInterfaces: hr %lx, BytesReturned %lu\n", hr, BytesReturned); + OutputDebugStringW(Buffer); + + return hr; } HRESULT STDMETHODCALLTYPE CBDADeviceControl::GetPinTypes(ULONG *pulcPinTypes, ULONG ulcPinTypesMax, ULONG *rgulPinTypes) { - OutputDebugStringW(L"CBDADeviceControl::GetPinTypes: NotImplemented\n"); - return E_NOTIMPL; + KSPROPERTY Property; + HRESULT hr; + ULONG BytesReturned; + WCHAR Buffer[100]; + + // setup request + Property.Set = KSPROPSETID_BdaTopology; + Property.Id = KSPROPERTY_BDA_PIN_TYPES; + Property.Flags = KSPROPERTY_TYPE_GET; + + // perform request + hr = KsSynchronousDeviceControl(m_Handle, IOCTL_KS_PROPERTY, (PVOID)&Property, sizeof(KSPROPERTY), rgulPinTypes, sizeof(ULONG) * ulcPinTypesMax, &BytesReturned); + + *pulcPinTypes = (BytesReturned / sizeof(ULONG)); + + swprintf(Buffer, L"CBDADeviceControl::GetPinTypes: hr %lx, BytesReturned %lu\n", hr, BytesReturned); + OutputDebugStringW(Buffer); + + return hr; } HRESULT @@ -216,18 +336,60 @@ HRESULT STDMETHODCALLTYPE -CBDADeviceControl::CreateTopology(ULONG ulInputPinId, ULONG ulOutputPinId){ - OutputDebugStringW(L"CBDADeviceControl::CreateTopology: NotImplemented\n"); - return E_NOTIMPL; -} - +CBDADeviceControl::CreateTopology(ULONG ulInputPinId, ULONG ulOutputPinId) +{ + KSM_BDA_PIN_PAIR Method; + WCHAR Buffer[100]; + HRESULT hr; + ULONG BytesReturned = 0; + + Method.Method.Flags = 0; + Method.Method.Id = KSMETHOD_BDA_CREATE_TOPOLOGY; + Method.Method.Set = KSMETHODSETID_BdaDeviceConfiguration; + Method.InputPinId = ulInputPinId; + Method.OutputPinId = ulOutputPinId; + + hr = KsSynchronousDeviceControl(m_Handle, IOCTL_KS_METHOD, (PVOID)&Method, sizeof(KSM_BDA_PIN_PAIR), NULL, 0, &BytesReturned); + + swprintf(Buffer, L"CBDADeviceControl::CreateTopology: hr %lx, BytesReturned %lu\n", hr, BytesReturned); + OutputDebugStringW(Buffer); + + return hr; +} HRESULT STDMETHODCALLTYPE CBDADeviceControl::GetControlNode(ULONG ulInputPinId, ULONG ulOutputPinId, ULONG ulNodeType, IUnknown **ppControlNode) { - OutputDebugStringW(L"CBDADeviceControl::GetControlNode: NotImplemented\n"); - return E_NOTIMPL; + KSP_BDA_NODE_PIN Property; + ULONG Dummy = 0; + HRESULT hr; + ULONG PinId = 0; + ULONG BytesReturned; + WCHAR Buffer[100]; + + //setup request + Property.Property.Set = KSPROPSETID_BdaTopology; + Property.Property.Id = KSPROPERTY_BDA_CONTROLLING_PIN_ID; + Property.Property.Flags = KSPROPERTY_TYPE_GET; + Property.ulInputPinId = ulInputPinId; + Property.ulOutputPinId = ulOutputPinId; + Property.ulNodeType = ulNodeType; + + // perform request + hr = KsSynchronousDeviceControl(m_Handle, IOCTL_KS_PROPERTY, (PVOID)&Property, sizeof(KSP_BDA_NODE_PIN) + sizeof(ULONG), &PinId, sizeof(ULONG), &BytesReturned); + + swprintf(Buffer, L"CBDADeviceControl::GetControlNode: hr %lx, BytesReturned %lu PinId %lu Dummy %lu\n", hr, BytesReturned, PinId, Dummy); + OutputDebugStringW(Buffer); + + if (FAILED(hr)) + return hr; + + hr = CControlNode_fnConstructor(m_pUnkOuter, ulNodeType, PinId, IID_IUnknown, (LPVOID*)ppControlNode); + + swprintf(Buffer, L"CBDADeviceControl::GetControlNode: hr %lx\n", hr); + OutputDebugStringW(Buffer); + return hr; } HRESULT @@ -237,7 +399,33 @@ REFIID riid, LPVOID * ppv) { - CBDADeviceControl * handler = new CBDADeviceControl(NULL); + HRESULT hr; + IKsObject *pObject = NULL; + HANDLE hFile; + + // sanity check + assert(pUnkOuter); + + // query for IKsObject + hr = pUnkOuter->QueryInterface(IID_IKsObject, (void**)&pObject); + + // sanity check + assert(hr == NOERROR); + + // another sanity check + assert(pObject != NULL); + + // get file handle + hFile = pObject->KsGetObjectHandle(); + + // one more sanity check + assert(hFile != NULL && hFile != INVALID_HANDLE_VALUE); + + // release IKsObject interface + pObject->Release(); + + // construct device control + CBDADeviceControl * handler = new CBDADeviceControl(pUnkOuter, hFile); OutputDebugStringW(L"CBDADeviceControl_fnConstructor\n"); Added: trunk/reactos/dll/directx/bdaplgin/digitaldemo.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/digit… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/digitaldemo.cpp (added) +++ trunk/reactos/dll/directx/bdaplgin/digitaldemo.cpp [iso-8859-1] Wed Feb 24 19:37:07 2010 @@ -1,0 +1,254 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS BDA Proxy + * FILE: dll/directx/bdaplgin/digitaldemo.cpp + * PURPOSE: IBDA_DigitalDemodulator interface + * + * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) + */ + +#include "precomp.h" + +const GUID IID_IBDA_DigitalDemodulator = {0xef30f379, 0x985b, 0x4d10, {0xb6, 0x40, 0xa7, 0x9d, 0x5e, 0x04, 0xe1, 0xe0}}; + +class CBDADigitalDemodulator : public IBDA_DigitalDemodulator +{ +public: + STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); + + STDMETHODIMP_(ULONG) AddRef() + { + InterlockedIncrement(&m_Ref); + return m_Ref; + } + STDMETHODIMP_(ULONG) Release() + { + InterlockedDecrement(&m_Ref); + + if (!m_Ref) + { + delete this; + return 0; + } + return m_Ref; + } + //IBDA_DigitalDemodulator methods + HRESULT STDMETHODCALLTYPE put_ModulationType(ModulationType *pModulationType); + HRESULT STDMETHODCALLTYPE get_ModulationType(ModulationType *pModulationType); + HRESULT STDMETHODCALLTYPE put_InnerFECMethod(FECMethod *pFECMethod); + HRESULT STDMETHODCALLTYPE get_InnerFECMethod(FECMethod *pFECMethod); + HRESULT STDMETHODCALLTYPE put_InnerFECRate(BinaryConvolutionCodeRate *pFECRate); + HRESULT STDMETHODCALLTYPE get_InnerFECRate(BinaryConvolutionCodeRate *pFECRate); + HRESULT STDMETHODCALLTYPE put_OuterFECMethod(FECMethod *pFECMethod); + HRESULT STDMETHODCALLTYPE get_OuterFECMethod(FECMethod *pFECMethod); + HRESULT STDMETHODCALLTYPE put_OuterFECRate(BinaryConvolutionCodeRate *pFECRate); + HRESULT STDMETHODCALLTYPE get_OuterFECRate(BinaryConvolutionCodeRate *pFECRate); + HRESULT STDMETHODCALLTYPE put_SymbolRate(ULONG *pSymbolRate); + HRESULT STDMETHODCALLTYPE get_SymbolRate(ULONG *pSymbolRate); + HRESULT STDMETHODCALLTYPE put_SpectralInversion(SpectralInversion *pSpectralInversion); + HRESULT STDMETHODCALLTYPE get_SpectralInversion(SpectralInversion *pSpectralInversion); + + CBDADigitalDemodulator(HANDLE hFile) : m_Ref(0), m_hFile(hFile){}; + ~CBDADigitalDemodulator(){}; + +protected: + LONG m_Ref; + HANDLE m_hFile; + +}; + +HRESULT +STDMETHODCALLTYPE +CBDADigitalDemodulator::QueryInterface( + IN REFIID refiid, + OUT PVOID* Output) +{ + WCHAR Buffer[MAX_PATH]; + LPOLESTR lpstr; + + *Output = NULL; + + if (IsEqualGUID(refiid, IID_IUnknown)) + { + *Output = PVOID(this); + reinterpret_cast<IUnknown*>(*Output)->AddRef(); + return NOERROR; + } + + if (IsEqualGUID(refiid, IID_IBDA_DigitalDemodulator)) + { + *Output = (IBDA_DigitalDemodulator*)(this); + reinterpret_cast<IBDA_DigitalDemodulator*>(*Output)->AddRef(); + return NOERROR; + } + + StringFromCLSID(refiid, &lpstr); + swprintf(Buffer, L"CBDADigitalDemodulator::QueryInterface: NoInterface for %s", lpstr); + OutputDebugStringW(Buffer); + CoTaskMemFree(lpstr); + + return E_NOINTERFACE; +} + +HRESULT +STDMETHODCALLTYPE +CBDADigitalDemodulator::put_ModulationType(ModulationType *pModulationType) +{ + OutputDebugStringW(L"CBDADigitalDemodulator::put_ModulationType NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDADigitalDemodulator::get_ModulationType(ModulationType *pModulationType) +{ + OutputDebugStringW(L"CBDADigitalDemodulator::get_ModulationType NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDADigitalDemodulator::put_InnerFECMethod(FECMethod *pFECMethod) +{ + OutputDebugStringW(L"CBDADigitalDemodulator::put_InnerFECMethod NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDADigitalDemodulator::get_InnerFECMethod(FECMethod *pFECMethod) +{ + OutputDebugStringW(L"CBDADigitalDemodulator::get_InnerFECMethod NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDADigitalDemodulator::put_InnerFECRate(BinaryConvolutionCodeRate *pFECRate) +{ + OutputDebugStringW(L"CBDADigitalDemodulator::put_InnerFECRate NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDADigitalDemodulator::get_InnerFECRate(BinaryConvolutionCodeRate *pFECRate) +{ + OutputDebugStringW(L"CBDADigitalDemodulator::get_InnerFECRate NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDADigitalDemodulator::put_OuterFECMethod(FECMethod *pFECMethod) +{ + OutputDebugStringW(L"CBDADigitalDemodulator::put_OuterFECMethod NotImplemented\n"); + return E_NOTIMPL; +} + + +HRESULT +STDMETHODCALLTYPE CBDADigitalDemodulator::get_OuterFECMethod(FECMethod *pFECMethod) +{ + OutputDebugStringW(L"CBDADigitalDemodulator::get_OuterFECMethod NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDADigitalDemodulator::put_OuterFECRate(BinaryConvolutionCodeRate *pFECRate) +{ + OutputDebugStringW(L"CBDADigitalDemodulator::put_OuterFECRate NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDADigitalDemodulator::get_OuterFECRate(BinaryConvolutionCodeRate *pFECRate) +{ + OutputDebugStringW(L"CBDADigitalDemodulator::get_OuterFECRate NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDADigitalDemodulator::put_SymbolRate(ULONG *pSymbolRate) +{ + OutputDebugStringW(L"CBDADigitalDemodulator::put_SymbolRate NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDADigitalDemodulator::get_SymbolRate(ULONG *pSymbolRate) +{ + OutputDebugStringW(L"CBDADigitalDemodulator::get_SymbolRate NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDADigitalDemodulator::put_SpectralInversion(SpectralInversion *pSpectralInversion) +{ + OutputDebugStringW(L"CBDADigitalDemodulator::put_SpectralInversion NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDADigitalDemodulator::get_SpectralInversion(SpectralInversion *pSpectralInversion) +{ + OutputDebugStringW(L"CBDADigitalDemodulator::get_SpectralInversion NotImplemented\n"); + return E_NOTIMPL; +} + + +HRESULT +WINAPI +CBDADigitalDemodulator_fnConstructor( + IUnknown * pUnkOuter, + REFIID riid, + LPVOID * ppv) +{ + HRESULT hr; + IKsObject *pObject = NULL; + HANDLE hFile; + + // sanity check + assert(pUnkOuter); + + // query for IKsObject + hr = pUnkOuter->QueryInterface(IID_IKsObject, (void**)&pObject); + + // sanity check + assert(hr == NOERROR); + + // another sanity check + assert(pObject != NULL); + + // get file handle + hFile = pObject->KsGetObjectHandle(); + + // one more sanity check + assert(hFile != NULL && hFile != INVALID_HANDLE_VALUE); + + // release IKsObject interface + pObject->Release(); + + // construct device control + CBDADigitalDemodulator * handler = new CBDADigitalDemodulator(hFile); + + OutputDebugStringW(L"CBDADigitalDemodulator_fnConstructor\n"); + + if (!handler) + return E_OUTOFMEMORY; + + if (FAILED(handler->QueryInterface(riid, ppv))) + { + /* not supported */ + delete handler; + return E_NOINTERFACE; + } + + return NOERROR; +} Propchange: trunk/reactos/dll/directx/bdaplgin/digitaldemo.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/bdaplgin/frequencyfilter.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/frequ… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/frequencyfilter.cpp (added) +++ trunk/reactos/dll/directx/bdaplgin/frequencyfilter.cpp [iso-8859-1] Wed Feb 24 19:37:07 2010 @@ -1,0 +1,233 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS BDA Proxy + * FILE: dll/directx/bdaplgin/frequencyfilter.cpp + * PURPOSE: IBDA_FrequencyFilter interface + * + * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) + */ + +#include "precomp.h" + +const GUID IID_IBDA_FrequencyFilter = {0x71985f47, 0x1ca1, 0x11d3, {0x9c, 0xc8, 0x00, 0xc0, 0x4f, 0x79, 0x71, 0xe0}}; + +class CBDAFrequencyFilter : public IBDA_FrequencyFilter +{ +public: + STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); + + STDMETHODIMP_(ULONG) AddRef() + { + InterlockedIncrement(&m_Ref); + return m_Ref; + } + STDMETHODIMP_(ULONG) Release() + { + InterlockedDecrement(&m_Ref); + + if (!m_Ref) + { + delete this; + return 0; + } + return m_Ref; + } + + HRESULT STDMETHODCALLTYPE put_Autotune(ULONG ulTransponder); + HRESULT STDMETHODCALLTYPE get_Autotune(ULONG *pulTransponder); + HRESULT STDMETHODCALLTYPE put_Frequency(ULONG ulFrequency); + HRESULT STDMETHODCALLTYPE get_Frequency(ULONG *pulFrequency); + HRESULT STDMETHODCALLTYPE put_Polarity(Polarisation Polarity); + HRESULT STDMETHODCALLTYPE get_Polarity(Polarisation *pPolarity); + HRESULT STDMETHODCALLTYPE put_Range(ULONG ulRange); + HRESULT STDMETHODCALLTYPE get_Range(ULONG *pulRange); + HRESULT STDMETHODCALLTYPE put_Bandwidth(ULONG ulBandwidth); + HRESULT STDMETHODCALLTYPE get_Bandwidth(ULONG *pulBandwidth); + HRESULT STDMETHODCALLTYPE put_FrequencyMultiplier(ULONG ulMultiplier); + HRESULT STDMETHODCALLTYPE get_FrequencyMultiplier(ULONG *pulMultiplier); + + CBDAFrequencyFilter(HANDLE hFile) : m_Ref(0), m_hFile(hFile){}; + virtual ~CBDAFrequencyFilter(){}; + +protected: + LONG m_Ref; + HANDLE m_hFile; +}; + +HRESULT +STDMETHODCALLTYPE +CBDAFrequencyFilter::QueryInterface( + IN REFIID refiid, + OUT PVOID* Output) +{ + WCHAR Buffer[MAX_PATH]; + LPOLESTR lpstr; + + *Output = NULL; + + if (IsEqualGUID(refiid, IID_IUnknown)) + { + *Output = PVOID(this); + reinterpret_cast<IUnknown*>(*Output)->AddRef(); + return NOERROR; + } + + if (IsEqualGUID(refiid, IID_IBDA_FrequencyFilter)) + { + *Output = (IBDA_FrequencyFilter*)(this); + reinterpret_cast<IBDA_FrequencyFilter*>(*Output)->AddRef(); + return NOERROR; + } + + StringFromCLSID(refiid, &lpstr); + swprintf(Buffer, L"CControlNode::QueryInterface: NoInterface for %s", lpstr); + OutputDebugStringW(Buffer); + CoTaskMemFree(lpstr); + + return E_NOINTERFACE; +} + +HRESULT +STDMETHODCALLTYPE +CBDAFrequencyFilter::put_Autotune(ULONG ulTransponder) +{ + OutputDebugStringW(L"CBDAFrequencyFilter::put_Autotune: NotImplemented\n"); + return E_NOINTERFACE; +} + +HRESULT +STDMETHODCALLTYPE +CBDAFrequencyFilter::get_Autotune(ULONG *pulTransponder) +{ + OutputDebugStringW(L"CBDAFrequencyFilter::get_Autotune\n"); + return E_NOINTERFACE; +} + +HRESULT +STDMETHODCALLTYPE +CBDAFrequencyFilter::put_Frequency(ULONG ulFrequency) +{ + OutputDebugStringW(L"CBDAFrequencyFilter::put_Frequency: NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDAFrequencyFilter::get_Frequency(ULONG *pulFrequency) +{ + OutputDebugStringW(L"CBDAFrequencyFilter::get_Frequency\n"); + return E_NOINTERFACE; +} + +HRESULT +STDMETHODCALLTYPE +CBDAFrequencyFilter::put_Polarity(Polarisation Polarity) +{ + OutputDebugStringW(L"CBDAFrequencyFilter::put_Polarity: NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDAFrequencyFilter::get_Polarity(Polarisation *pPolarity) +{ + OutputDebugStringW(L"CBDAFrequencyFilter::get_Polarity\n"); + return E_NOINTERFACE; +} + +HRESULT +STDMETHODCALLTYPE +CBDAFrequencyFilter::put_Range(ULONG ulRange) +{ + OutputDebugStringW(L"CBDAFrequencyFilter::put_Range: NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDAFrequencyFilter::get_Range(ULONG *pulRange) +{ + OutputDebugStringW(L"CBDAFrequencyFilter::get_Range\n"); + return E_NOINTERFACE; +} + +HRESULT +STDMETHODCALLTYPE +CBDAFrequencyFilter::put_Bandwidth(ULONG ulBandwidth) +{ + OutputDebugStringW(L"CBDAFrequencyFilter::put_Bandwidth: NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDAFrequencyFilter::get_Bandwidth(ULONG *pulBandwidth) +{ + OutputDebugStringW(L"CBDAFrequencyFilter::get_Bandwidth\n"); + return E_NOINTERFACE; +} +HRESULT +STDMETHODCALLTYPE +CBDAFrequencyFilter::put_FrequencyMultiplier(ULONG ulMultiplier) +{ + OutputDebugStringW(L"CBDAFrequencyFilter::put_FrequencyMultiplier: NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDAFrequencyFilter::get_FrequencyMultiplier(ULONG *pulMultiplier) +{ + OutputDebugStringW(L"CBDAFrequencyFilter::get_FrequencyMultiplier\n"); + return E_NOINTERFACE; +} + +HRESULT +WINAPI +CBDAFrequencyFilter_fnConstructor( + IUnknown * pUnkOuter, + REFIID riid, + LPVOID * ppv) +{ + HRESULT hr; + IKsObject *pObject = NULL; + HANDLE hFile; + + // sanity check + assert(pUnkOuter); + + // query for IKsObject + hr = pUnkOuter->QueryInterface(IID_IKsObject, (void**)&pObject); + + // sanity check + assert(hr == NOERROR); + + // another sanity check + assert(pObject != NULL); + + // get file handle + hFile = pObject->KsGetObjectHandle(); + + // one more sanity check + assert(hFile != NULL && hFile != INVALID_HANDLE_VALUE); + + // release IKsObject interface + pObject->Release(); + + // construct device control + CBDAFrequencyFilter * handler = new CBDAFrequencyFilter(hFile); + + OutputDebugStringW(L"CBDAFrequencyFilter_fnConstructor\n"); + + if (!handler) + return E_OUTOFMEMORY; + + if (FAILED(handler->QueryInterface(riid, ppv))) + { + /* not supported */ + delete handler; + return E_NOINTERFACE; + } + + return NOERROR; +} Propchange: trunk/reactos/dll/directx/bdaplgin/frequencyfilter.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/bdaplgin/lnbinfo.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/lnbin… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/lnbinfo.cpp (added) +++ trunk/reactos/dll/directx/bdaplgin/lnbinfo.cpp [iso-8859-1] Wed Feb 24 19:37:07 2010 @@ -1,0 +1,181 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS BDA Proxy + * FILE: dll/directx/bdaplgin/lnbinfo.cpp + * PURPOSE: IBDA_LNBInfo interface + * + * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) + */ + +#include "precomp.h" + +const GUID IID_IBDA_LNBInfo = {0x992cf102, 0x49f9, 0x4719, {0xa6, 0x64, 0xc4, 0xf2, 0x3e, 0x24, 0x08, 0xf4}}; + +class CBDALNBInfo : public IBDA_LNBInfo +{ +public: + STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); + + STDMETHODIMP_(ULONG) AddRef() + { + InterlockedIncrement(&m_Ref); + return m_Ref; + } + STDMETHODIMP_(ULONG) Release() + { + InterlockedDecrement(&m_Ref); + + if (!m_Ref) + { + delete this; + return 0; + } + return m_Ref; + } + + //IBDA_LNBInfo methods + HRESULT STDMETHODCALLTYPE put_LocalOscilatorFrequencyLowBand(ULONG ulLOFLow); + HRESULT STDMETHODCALLTYPE get_LocalOscilatorFrequencyLowBand(ULONG *pulLOFLow); + HRESULT STDMETHODCALLTYPE put_LocalOscilatorFrequencyHighBand(ULONG ulLOFHigh); + HRESULT STDMETHODCALLTYPE get_LocalOscilatorFrequencyHighBand(ULONG *pulLOFHigh); + HRESULT STDMETHODCALLTYPE put_HighLowSwitchFrequency(ULONG ulSwitchFrequency); + HRESULT STDMETHODCALLTYPE get_HighLowSwitchFrequency(ULONG *pulSwitchFrequency); + + CBDALNBInfo(HANDLE hFile) : m_Ref(0), m_hFile(hFile){}; + ~CBDALNBInfo(){}; + +protected: + LONG m_Ref; + HANDLE m_hFile; +}; + +HRESULT +STDMETHODCALLTYPE +CBDALNBInfo::QueryInterface( + IN REFIID refiid, + OUT PVOID* Output) +{ + WCHAR Buffer[MAX_PATH]; + LPOLESTR lpstr; + + *Output = NULL; + + if (IsEqualGUID(refiid, IID_IUnknown)) + { + *Output = PVOID(this); + reinterpret_cast<IUnknown*>(*Output)->AddRef(); + return NOERROR; + } + + if (IsEqualGUID(refiid, IID_IBDA_LNBInfo)) + { + *Output = (IBDA_LNBInfo*)(this); + reinterpret_cast<IBDA_LNBInfo*>(*Output)->AddRef(); + return NOERROR; + } + + StringFromCLSID(refiid, &lpstr); + swprintf(Buffer, L"CBDALNBInfo::QueryInterface: NoInterface for %s", lpstr); + OutputDebugStringW(Buffer); + CoTaskMemFree(lpstr); + + return E_NOINTERFACE; +} + +HRESULT +STDMETHODCALLTYPE +CBDALNBInfo::put_LocalOscilatorFrequencyLowBand(ULONG ulLOFLow) +{ + OutputDebugStringW(L"CBDALNBInfo::put_LocalOscilatorFrequencyLowBand NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDALNBInfo::get_LocalOscilatorFrequencyLowBand(ULONG *pulLOFLow) +{ + OutputDebugStringW(L"CBDALNBInfo::get_LocalOscilatorFrequencyLowBand NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDALNBInfo::put_LocalOscilatorFrequencyHighBand(ULONG ulLOFHigh) +{ + OutputDebugStringW(L"CBDALNBInfo::put_LocalOscilatorFrequencyHighBand NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDALNBInfo::get_LocalOscilatorFrequencyHighBand(ULONG *pulLOFHigh) +{ + OutputDebugStringW(L"CBDALNBInfo::get_LocalOscilatorFrequencyHighBand NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDALNBInfo::put_HighLowSwitchFrequency(ULONG ulSwitchFrequency) +{ + OutputDebugStringW(L"CBDALNBInfo::put_HighLowSwitchFrequency NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDALNBInfo::get_HighLowSwitchFrequency(ULONG *pulSwitchFrequency) +{ + OutputDebugStringW(L"CBDALNBInfo::get_HighLowSwitchFrequency NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +WINAPI +CBDALNBInfo_fnConstructor( + IUnknown * pUnkOuter, + REFIID riid, + LPVOID * ppv) +{ + HRESULT hr; + IKsObject *pObject = NULL; + HANDLE hFile; + + // sanity check + assert(pUnkOuter); + + // query for IKsObject + hr = pUnkOuter->QueryInterface(IID_IKsObject, (void**)&pObject); + + // sanity check + assert(hr == NOERROR); + + // another sanity check + assert(pObject != NULL); + + // get file handle + hFile = pObject->KsGetObjectHandle(); + + // one more sanity check + assert(hFile != NULL && hFile != INVALID_HANDLE_VALUE); + + // release IKsObject interface + pObject->Release(); + + // construct device control + CBDALNBInfo * handler = new CBDALNBInfo(hFile); + + OutputDebugStringW(L"CBDALNBInfo_fnConstructor\n"); + + if (!handler) + return E_OUTOFMEMORY; + + if (FAILED(handler->QueryInterface(riid, ppv))) + { + /* not supported */ + delete handler; + return E_NOINTERFACE; + } + + return NOERROR; +} Propchange: trunk/reactos/dll/directx/bdaplgin/lnbinfo.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/bdaplgin/pincontrol.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/pinco… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/pincontrol.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/bdaplgin/pincontrol.cpp [iso-8859-1] Wed Feb 24 19:37:07 2010 @@ -53,6 +53,9 @@ IN REFIID refiid, OUT PVOID* Output) { + WCHAR Buffer[MAX_PATH]; + LPOLESTR lpstr; + if (IsEqualGUID(refiid, IID_IUnknown)) { *Output = PVOID(this); @@ -65,7 +68,11 @@ reinterpret_cast<IBDA_PinControl*>(*Output)->AddRef(); return NOERROR; } - OutputDebugStringW(L"CBDAPinControl::QueryInterface: NoInterface!!!\n"); + + StringFromCLSID(refiid, &lpstr); + swprintf(Buffer, L"CBDADeviceControl::QueryInterface: NoInterface for %s", lpstr); + OutputDebugStringW(Buffer); + CoTaskMemFree(lpstr); return E_NOINTERFACE; } //------------------------------------------------------------------- Modified: trunk/reactos/dll/directx/bdaplgin/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/preco… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/bdaplgin/precomp.h [iso-8859-1] Wed Feb 24 19:37:07 2010 @@ -12,8 +12,10 @@ #include <wchar.h> #include <tchar.h> #include <uuids.h> +#include <bdatypes.h> #include <bdaiface.h> #include <bdamedia.h> +#include <assert.h> typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown* pUnkOuter, REFIID riid, LPVOID* ppvObject); @@ -47,5 +49,50 @@ REFIID riid, LPVOID * ppv); +/* controlnode.cpp */ + +HRESULT +WINAPI +CControlNode_fnConstructor( + IUnknown * pUnkOuter, + ULONG NodeType, + ULONG PinId, + REFIID riid, + LPVOID * ppv); + +/* frequencyfilter.cpp */ + +HRESULT +WINAPI +CBDAFrequencyFilter_fnConstructor( + IUnknown * pUnkOuter, + REFIID riid, + LPVOID * ppv); + +/* signalstatistics.cpp */ + +HRESULT +WINAPI +CBDASignalStatistics_fnConstructor( + IUnknown * pUnkOuter, + REFIID riid, + LPVOID * ppv); + +/* lnbinfo.cpp */ + +HRESULT +WINAPI +CBDALNBInfo_fnConstructor( + IUnknown * pUnkOuter, + REFIID riid, + LPVOID * ppv); + +/* digitaldemo.cpp */ +HRESULT +WINAPI +CBDADigitalDemodulator_fnConstructor( + IUnknown * pUnkOuter, + REFIID riid, + LPVOID * ppv); #endif Added: trunk/reactos/dll/directx/bdaplgin/signalstatistics.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/signa… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/signalstatistics.cpp (added) +++ trunk/reactos/dll/directx/bdaplgin/signalstatistics.cpp [iso-8859-1] Wed Feb 24 19:37:07 2010 @@ -1,0 +1,217 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS BDA Proxy + * FILE: dll/directx/bdaplgin/frequencyfilter.cpp + * PURPOSE: IBDA_FrequencyFilter interface + * + * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) + */ + +#include "precomp.h" + +const GUID IID_IBDA_SignalStatistics = {0x1347d106, 0xcf3a, 0x428a, {0xa5, 0xcb, 0xac, 0x0d, 0x9a, 0x2a, 0x43, 0x38}}; + +class CBDASignalStatistics : public IBDA_SignalStatistics +{ +public: + STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); + + STDMETHODIMP_(ULONG) AddRef() + { + InterlockedIncrement(&m_Ref); + return m_Ref; + } + STDMETHODIMP_(ULONG) Release() + { + InterlockedDecrement(&m_Ref); + + if (!m_Ref) + { + delete this; + return 0; + } + return m_Ref; + } + + // IBDA_SignalStatistics methods + HRESULT STDMETHODCALLTYPE put_SignalStrength(LONG lDbStrength); + HRESULT STDMETHODCALLTYPE get_SignalStrength(LONG *plDbStrength); + HRESULT STDMETHODCALLTYPE put_SignalQuality(LONG lPercentQuality); + HRESULT STDMETHODCALLTYPE get_SignalQuality(LONG *plPercentQuality); + HRESULT STDMETHODCALLTYPE put_SignalPresent(BOOLEAN fPresent); + HRESULT STDMETHODCALLTYPE get_SignalPresent(BOOLEAN *pfPresent); + HRESULT STDMETHODCALLTYPE put_SignalLocked(BOOLEAN fLocked); + HRESULT STDMETHODCALLTYPE get_SignalLocked(BOOLEAN *pfLocked); + HRESULT STDMETHODCALLTYPE put_SampleTime(LONG lmsSampleTime); + HRESULT STDMETHODCALLTYPE get_SampleTime(LONG *plmsSampleTime); + + CBDASignalStatistics(HANDLE hFile) : m_Ref(0), m_hFile(hFile){}; + ~CBDASignalStatistics(){}; + +protected: + LONG m_Ref; + HANDLE m_hFile; +}; + +HRESULT +STDMETHODCALLTYPE +CBDASignalStatistics::QueryInterface( + IN REFIID refiid, + OUT PVOID* Output) +{ + WCHAR Buffer[MAX_PATH]; + LPOLESTR lpstr; + + *Output = NULL; + + if (IsEqualGUID(refiid, IID_IUnknown)) + { + *Output = PVOID(this); + reinterpret_cast<IUnknown*>(*Output)->AddRef(); + return NOERROR; + } + + if (IsEqualGUID(refiid, IID_IBDA_SignalStatistics)) + { + *Output = (IBDA_SignalStatistics*)(this); + reinterpret_cast<IBDA_SignalStatistics*>(*Output)->AddRef(); + return NOERROR; + } + + StringFromCLSID(refiid, &lpstr); + swprintf(Buffer, L"CBDASignalStatistics::QueryInterface: NoInterface for %s", lpstr); + OutputDebugStringW(Buffer); + CoTaskMemFree(lpstr); + + return E_NOINTERFACE; +} + +HRESULT +STDMETHODCALLTYPE +CBDASignalStatistics::put_SignalStrength(LONG lDbStrength) +{ + OutputDebugStringW(L"CBDASignalStatistics::put_SignalStrength NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDASignalStatistics::get_SignalStrength(LONG *plDbStrength) +{ + OutputDebugStringW(L"CBDASignalStatistics::get_SignalStrength NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDASignalStatistics::put_SignalQuality(LONG lPercentQuality) +{ + OutputDebugStringW(L"CBDASignalStatistics::put_SignalQuality NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDASignalStatistics::get_SignalQuality(LONG *plPercentQuality) +{ + OutputDebugStringW(L"CBDASignalStatistics::get_SignalQuality NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDASignalStatistics::put_SignalPresent(BOOLEAN fPresent) +{ + OutputDebugStringW(L"CBDASignalStatistics::put_SignalPresent NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDASignalStatistics::get_SignalPresent(BOOLEAN *pfPresent) +{ + OutputDebugStringW(L"CBDASignalStatistics::get_SignalPresent NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDASignalStatistics::put_SignalLocked(BOOLEAN fLocked) +{ + OutputDebugStringW(L"CBDASignalStatistics::put_SignalLocked NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDASignalStatistics::get_SignalLocked(BOOLEAN *pfLocked) +{ + OutputDebugStringW(L"CBDASignalStatistics::get_SignalLocked NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDASignalStatistics::put_SampleTime(LONG lmsSampleTime) +{ + OutputDebugStringW(L"CBDASignalStatistics::put_SampleTime NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDASignalStatistics::get_SampleTime(LONG *plmsSampleTime) +{ + OutputDebugStringW(L"CBDASignalStatistics::get_SampleTime NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +WINAPI +CBDASignalStatistics_fnConstructor( + IUnknown * pUnkOuter, + REFIID riid, + LPVOID * ppv) +{ + HRESULT hr; + IKsObject *pObject = NULL; + HANDLE hFile; + + // sanity check + assert(pUnkOuter); + + // query for IKsObject + hr = pUnkOuter->QueryInterface(IID_IKsObject, (void**)&pObject); + + // sanity check + assert(hr == NOERROR); + + // another sanity check + assert(pObject != NULL); + + // get file handle + hFile = pObject->KsGetObjectHandle(); + + // one more sanity check + assert(hFile != NULL && hFile != INVALID_HANDLE_VALUE); + + // release IKsObject interface + pObject->Release(); + + // construct device control + CBDASignalStatistics * handler = new CBDASignalStatistics(hFile); + + OutputDebugStringW(L"CBDASignalStatistics_fnConstructor\n"); + + if (!handler) + return E_OUTOFMEMORY; + + if (FAILED(handler->QueryInterface(riid, ppv))) + { + /* not supported */ + delete handler; + return E_NOINTERFACE; + } + + return NOERROR; +} Propchange: trunk/reactos/dll/directx/bdaplgin/signalstatistics.cpp ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 45679: [BDAPLGIN] - Try fix build - Sorry folks
by janderwald＠svn.reactos.org 23 Feb '10

23 Feb '10

Author: janderwald Date: Tue Feb 23 22:28:51 2010 New Revision: 45679 URL: http://svn.reactos.org/svn/reactos?rev=45679&view=rev Log: [BDAPLGIN] - Try fix build - Sorry folks Added: trunk/reactos/dll/directx/bdaplgin/bdaplgin.rc (with props) Added: trunk/reactos/dll/directx/bdaplgin/bdaplgin.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/bdapl… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/bdaplgin.rc (added) +++ trunk/reactos/dll/directx/bdaplgin/bdaplgin.rc [iso-8859-1] Tue Feb 23 22:28:51 2010 @@ -1,0 +1,12 @@ +#include <windows.h> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS BDA Device Control Plug-in for MPEG2 based networks\0" +#define REACTOS_STR_INTERNAL_NAME "BdaPlgin.ax\0" +#define REACTOS_STR_ORIGINAL_FILENAME "BdaPlgin.ax\0" +#define REACTOS_STR_PRODUCT_VERSION "5.3.2600.3264\0" +#define REACTOS_STR_FILE_VERSION "5.3.2600.3264\0" + +#include <reactos/version.rc> Propchange: trunk/reactos/dll/directx/bdaplgin/bdaplgin.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 45678: Maarten Kroese UITOOLS95_DrawFrameCaption improvements: - Change FIXED_PITCH to DEFAULT_PITCH (because Marlett is not a fixed pitch font). - Change from SYMBOL_CHARSET to DEFAULT_CHARSET, it's correct according to MSDN, because SYMBOL_CHARSET implies that it can fall back to another font, but that is never what we want. - FW_NORMAL to FW_DONTCARE. - This patch should be sent to Wine, however their Marlett font hides these problems.
by fireball＠svn.reactos.org 23 Feb '10

23 Feb '10

Author: fireball Date: Tue Feb 23 21:58:12 2010 New Revision: 45678 URL: http://svn.reactos.org/svn/reactos?rev=45678&view=rev Log: Maarten Kroese UITOOLS95_DrawFrameCaption improvements: - Change FIXED_PITCH to DEFAULT_PITCH (because Marlett is not a fixed pitch font). - Change from SYMBOL_CHARSET to DEFAULT_CHARSET, it's correct according to MSDN, because SYMBOL_CHARSET implies that it can fall back to another font, but that is never what we want. - FW_NORMAL to FW_DONTCARE. - This patch should be sent to Wine, however their Marlett font hides these problems. Modified: branches/arwinss/reactos/dll/win32/user32/uitools.c Modified: branches/arwinss/reactos/dll/win32/user32/uitools.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/uitools.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/uitools.c [iso-8859-1] Tue Feb 23 21:58:12 2010 @@ -924,9 +924,9 @@ return FALSE; } - hf = CreateFontW(-SmallDiam, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, - SYMBOL_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, - DEFAULT_QUALITY, FIXED_PITCH|FF_DONTCARE, glyphFontName); + hf = CreateFontW(-SmallDiam, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, + DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, + DEFAULT_QUALITY, DEFAULT_PITCH|FF_DONTCARE, glyphFontName); alignsave = SetTextAlign(dc, TA_TOP|TA_LEFT); bksave = SetBkMode(dc, TRANSPARENT); clrsave = GetTextColor(dc);

1 0

[janderwald] 45677: [DXSDK] - Add BDA Change Sync Method Set [BDAPLGIN] - Add "BDA Device Control Plug-in for MPEG2 based networks" stub
by janderwald＠svn.reactos.org 23 Feb '10

23 Feb '10

Author: janderwald Date: Tue Feb 23 18:40:34 2010 New Revision: 45677 URL: http://svn.reactos.org/svn/reactos?rev=45677&view=rev Log: [DXSDK] - Add BDA Change Sync Method Set [BDAPLGIN] - Add "BDA Device Control Plug-in for MPEG2 based networks" stub Added: trunk/reactos/dll/directx/bdaplgin/ (with props) trunk/reactos/dll/directx/bdaplgin/bdaplgin.cpp (with props) trunk/reactos/dll/directx/bdaplgin/bdaplgin.rbuild (with props) trunk/reactos/dll/directx/bdaplgin/bdaplgin.spec (with props) trunk/reactos/dll/directx/bdaplgin/classfactory.cpp (contents, props changed) - copied, changed from r45668, trunk/reactos/dll/directx/ksproxy/classfactory.cpp trunk/reactos/dll/directx/bdaplgin/devicecontrol.cpp (with props) trunk/reactos/dll/directx/bdaplgin/pincontrol.cpp (with props) trunk/reactos/dll/directx/bdaplgin/precomp.h (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/dll/directx/directx.rbuild trunk/reactos/include/dxsdk/bdamedia.h Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=456… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Tue Feb 23 18:40:34 2010 @@ -25,6 +25,7 @@ <property name="BASEADDRESS_MSGSM32ACM" value="0x56db0000" /> <property name="BASEADDRESS_MSG711ACM" value="0x584f0000" /> <property name="BASEADDRESS_IMAADP32ACM" value="0x585e0000" /> + <property name="BASEADDRESS_BDAPLGIN" value="0x58600000" /> <property name="BASEADDRESS_TELEPHON" value="0x58750000" /> <property name="BASEADDRESS_PWRCFG" value="0x587e0000" /> <property name="BASEADDRESS_MMSYS" value="0x588a0000" /> Propchange: trunk/reactos/dll/directx/bdaplgin/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Feb 23 18:40:34 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/directx/bdaplgin/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/directx/bdaplgin/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/directx/bdaplgin/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/directx/bdaplgin/bdaplgin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/bdapl… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/bdaplgin.cpp (added) +++ trunk/reactos/dll/directx/bdaplgin/bdaplgin.cpp [iso-8859-1] Tue Feb 23 18:40:34 2010 @@ -1,0 +1,106 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS BDA Proxy + * FILE: dll/directx/bdaplgin/classfactory.cpp + * PURPOSE: ClassFactory interface + * + * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) + */ + +#include "precomp.h" + +const GUID CBDADeviceControl_GUID = {STATIC_KSMETHODSETID_BdaChangeSync}; +const GUID CBDAPinControl_GUID = {0x0DED49D5, 0xA8B7, 0x4d5d, {0x97, 0xA1, 0x12, 0xB0, 0xC1, 0x95, 0x87, 0x4D}}; + + +static INTERFACE_TABLE InterfaceTable[] = +{ + {&CBDADeviceControl_GUID, CBDADeviceControl_fnConstructor}, + {&CBDAPinControl_GUID, CBDAPinControl_fnConstructor}, + {NULL, NULL} +}; + +extern "C" +BOOL +WINAPI +DllMain( + HINSTANCE hInstDLL, + DWORD fdwReason, + LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + OutputDebugStringW(L"BDAPLGIN::DllMain()\n"); + DisableThreadLibraryCalls(hInstDLL); + break; + default: + break; + } + + return TRUE; +} + + +extern "C" +KSDDKAPI +HRESULT +WINAPI +DllUnregisterServer(void) +{ + return S_OK; +} + +extern "C" +KSDDKAPI +HRESULT +WINAPI +DllRegisterServer(void) +{ + return S_OK; +} + +KSDDKAPI +HRESULT +WINAPI +DllGetClassObject( + REFCLSID rclsid, + REFIID riid, + LPVOID *ppv) +{ + UINT i; + HRESULT hres = E_OUTOFMEMORY; + IClassFactory * pcf = NULL; + + if (!ppv) + return E_INVALIDARG; + + *ppv = NULL; + + for (i = 0; InterfaceTable[i].riid; i++) + { + if (IsEqualIID(*InterfaceTable[i].riid, rclsid)) + { + pcf = CClassFactory_fnConstructor(InterfaceTable[i].lpfnCI, NULL, NULL); + break; + } + } + + if (!pcf) + { + return CLASS_E_CLASSNOTAVAILABLE; + } + + hres = pcf->QueryInterface(riid, ppv); + pcf->Release(); + + return hres; +} + +KSDDKAPI +HRESULT +WINAPI +DllCanUnloadNow(void) +{ + return S_OK; +} Propchange: trunk/reactos/dll/directx/bdaplgin/bdaplgin.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/bdaplgin/bdaplgin.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/bdapl… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/bdaplgin.rbuild (added) +++ trunk/reactos/dll/directx/bdaplgin/bdaplgin.rbuild [iso-8859-1] Tue Feb 23 18:40:34 2010 @@ -1,0 +1,27 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="bdaplgin" type="win32dll" baseaddress="${BASEADDRESS_BDAPLGIN}" installbase="system32" installname="bdaplgin.ax"> + <importlibrary definition="bdaplgin.spec" /> + <include base="bdaplgin">.</include> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>ole32</library> + <library>advapi32</library> + <library>msvcrt</library> + <group compilerset="gcc"> + <compilerflag compiler="cxx">-fno-exceptions</compilerflag> + <compilerflag compiler="cxx">-fno-rtti</compilerflag> + </group> + <group compilerset="msc"> + <compilerflag compiler="cxx">/GR-</compilerflag> + </group> + + <file>bdaplgin.cpp</file> + <file>bdaplgin.rc</file> + <file>classfactory.cpp</file> + <file>devicecontrol.cpp</file> + <file>pincontrol.cpp</file> +</module> +</group> Propchange: trunk/reactos/dll/directx/bdaplgin/bdaplgin.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/bdaplgin/bdaplgin.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/bdapl… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/bdaplgin.spec (added) +++ trunk/reactos/dll/directx/bdaplgin/bdaplgin.spec [iso-8859-1] Tue Feb 23 18:40:34 2010 @@ -1,0 +1,4 @@ +@ stdcall DllCanUnloadNow() +@ stdcall DllGetClassObject(ptr ptr ptr) +@ stdcall DllRegisterServer() +@ stdcall DllUnregisterServer() Propchange: trunk/reactos/dll/directx/bdaplgin/bdaplgin.spec ------------------------------------------------------------------------------ svn:eol-style = native Copied: trunk/reactos/dll/directx/bdaplgin/classfactory.cpp (from r45668, trunk/reactos/dll/directx/ksproxy/classfactory.cpp) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/class… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/classfactory.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/bdaplgin/classfactory.cpp [iso-8859-1] Tue Feb 23 18:40:34 2010 @@ -1,12 +1,15 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS WDM Streaming ActiveMovie Proxy - * FILE: dll/directx/ksproxy/classfactory.cpp + * PROJECT: ReactOS BDA Proxy + * FILE: dll/directx/bdaplgin/classfactory.cpp * PURPOSE: ClassFactory interface * * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) */ #include "precomp.h" + +const GUID IID_IUnknown = {0x00000000, 0x0000, 0x0000, {0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}; +const GUID IID_IClassFactory = {0x00000001, 0x0000, 0x0000, {0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}; class CClassFactory : public IClassFactory { Propchange: trunk/reactos/dll/directx/bdaplgin/classfactory.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/directx/bdaplgin/classfactory.cpp ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Feb 23 18:40:34 2010 @@ -1,0 +1,1 @@ +/branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/classfactory.cpp:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 Added: trunk/reactos/dll/directx/bdaplgin/devicecontrol.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/devic… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/devicecontrol.cpp (added) +++ trunk/reactos/dll/directx/bdaplgin/devicecontrol.cpp [iso-8859-1] Tue Feb 23 18:40:34 2010 @@ -1,0 +1,255 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS BDA Proxy + * FILE: dll/directx/bdaplgin/classfactory.cpp + * PURPOSE: ClassFactory interface + * + * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) + */ + +#include "precomp.h" + +const GUID IID_IBDA_DeviceControl = {0xFD0A5AF3, 0xB41D, 0x11d2, {0x9C, 0x95, 0x00, 0xC0, 0x4F, 0x79, 0x71, 0xE0}}; +const GUID IID_IBDA_Topology = {0x79B56888, 0x7FEA, 0x4690, {0xB4, 0x5D, 0x38, 0xFD, 0x3C, 0x78, 0x49, 0xBE}}; + +class CBDADeviceControl : public IBDA_DeviceControl, + public IBDA_Topology +{ +public: + STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); + + STDMETHODIMP_(ULONG) AddRef() + { + InterlockedIncrement(&m_Ref); + return m_Ref; + } + STDMETHODIMP_(ULONG) Release() + { + InterlockedDecrement(&m_Ref); + + if (!m_Ref) + { + delete this; + return 0; + } + return m_Ref; + } + + // IBDA_DeviceControl methods + HRESULT STDMETHODCALLTYPE StartChanges( void); + HRESULT STDMETHODCALLTYPE CheckChanges( void); + HRESULT STDMETHODCALLTYPE CommitChanges( void); + HRESULT STDMETHODCALLTYPE GetChangeState(ULONG *pState); + + // IBDA_Topology methods + HRESULT STDMETHODCALLTYPE GetNodeTypes(ULONG *pulcNodeTypes, ULONG ulcNodeTypesMax, ULONG * rgulNodeTypes); + HRESULT STDMETHODCALLTYPE GetNodeDescriptors(ULONG *ulcNodeDescriptors, ULONG ulcNodeDescriptorsMax, BDANODE_DESCRIPTOR * rgNodeDescriptors); + HRESULT STDMETHODCALLTYPE GetNodeInterfaces(ULONG ulNodeType, ULONG *pulcInterfaces, ULONG ulcInterfacesMax, GUID * rgguidInterfaces); + HRESULT STDMETHODCALLTYPE GetPinTypes(ULONG *pulcPinTypes, ULONG ulcPinTypesMax, ULONG *rgulPinTypes); + HRESULT STDMETHODCALLTYPE GetTemplateConnections(ULONG *pulcConnections, ULONG ulcConnectionsMax, BDA_TEMPLATE_CONNECTION * rgConnections); + HRESULT STDMETHODCALLTYPE CreatePin(ULONG ulPinType, ULONG *pulPinId); + HRESULT STDMETHODCALLTYPE DeletePin(ULONG ulPinId); + HRESULT STDMETHODCALLTYPE SetMediaType(ULONG ulPinId, AM_MEDIA_TYPE *pMediaType); + HRESULT STDMETHODCALLTYPE SetMedium(ULONG ulPinId, REGPINMEDIUM *pMedium); + HRESULT STDMETHODCALLTYPE CreateTopology(ULONG ulInputPinId, ULONG ulOutputPinId); + HRESULT STDMETHODCALLTYPE GetControlNode(ULONG ulInputPinId, ULONG ulOutputPinId, ULONG ulNodeType, IUnknown **ppControlNode); + + CBDADeviceControl(HANDLE hFile) : m_Ref(0), m_Handle(hFile){}; + virtual ~CBDADeviceControl(){}; + +protected: + LONG m_Ref; + HANDLE m_Handle; +}; + +HRESULT +STDMETHODCALLTYPE +CBDADeviceControl::QueryInterface( + IN REFIID refiid, + OUT PVOID* Output) +{ + WCHAR Buffer[MAX_PATH]; + LPOLESTR lpstr; + + *Output = NULL; + + if (IsEqualGUID(refiid, IID_IUnknown)) + { + *Output = PVOID(this); + reinterpret_cast<IUnknown*>(*Output)->AddRef(); + return NOERROR; + } + if (IsEqualGUID(refiid, IID_IBDA_DeviceControl)) + { + *Output = (IBDA_DeviceControl*)(this); + reinterpret_cast<IBDA_DeviceControl*>(*Output)->AddRef(); + return NOERROR; + } + + if (IsEqualGUID(refiid, IID_IBDA_Topology)) + { + *Output = (IBDA_Topology*)(this); + reinterpret_cast<IBDA_Topology*>(*Output)->AddRef(); + return NOERROR; + } + + StringFromCLSID(refiid, &lpstr); + swprintf(Buffer, L"CBDADeviceControl::QueryInterface: NoInterface for %s", lpstr); + OutputDebugStringW(Buffer); + CoTaskMemFree(lpstr); + + return E_NOINTERFACE; +} + + +//------------------------------------------------------------------- +// IBDA_DeviceControl methods +// +HRESULT +STDMETHODCALLTYPE +CBDADeviceControl::StartChanges( void) +{ + OutputDebugStringW(L"CBDADeviceControl::StartChanges: NotImplemented\n"); + return E_NOTIMPL; +} + + +HRESULT +STDMETHODCALLTYPE +CBDADeviceControl::CheckChanges( void) +{ + OutputDebugStringW(L"CBDADeviceControl::CheckChanges: NotImplemented\n"); + return E_NOTIMPL; +} + + +HRESULT +STDMETHODCALLTYPE +CBDADeviceControl::CommitChanges( void) +{ + OutputDebugStringW(L"CBDADeviceControl::CommitChanges: NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDADeviceControl::GetChangeState(ULONG *pState) +{ + OutputDebugStringW(L"CBDADeviceControl::GetChangeState: NotImplemented\n"); + return E_NOTIMPL; +} + +//------------------------------------------------------------------- +// IBDA_Topology methods +// +HRESULT +STDMETHODCALLTYPE +CBDADeviceControl::GetNodeTypes(ULONG *pulcNodeTypes, ULONG ulcNodeTypesMax, ULONG * rgulNodeTypes) +{ + OutputDebugStringW(L"CBDADeviceControl::GetNodeTypes: NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDADeviceControl::GetNodeDescriptors(ULONG *ulcNodeDescriptors, ULONG ulcNodeDescriptorsMax, BDANODE_DESCRIPTOR * rgNodeDescriptors) +{ + OutputDebugStringW(L"CBDADeviceControl::GetNodeDescriptors: NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDADeviceControl::GetNodeInterfaces(ULONG ulNodeType, ULONG *pulcInterfaces, ULONG ulcInterfacesMax, GUID * rgguidInterfaces) +{ + OutputDebugStringW(L"CBDADeviceControl::GetNodeInterfaces: NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDADeviceControl::GetPinTypes(ULONG *pulcPinTypes, ULONG ulcPinTypesMax, ULONG *rgulPinTypes) +{ + OutputDebugStringW(L"CBDADeviceControl::GetPinTypes: NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDADeviceControl::GetTemplateConnections(ULONG *pulcConnections, ULONG ulcConnectionsMax, BDA_TEMPLATE_CONNECTION * rgConnections) +{ + OutputDebugStringW(L"CBDADeviceControl::GetTemplateConnections: NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDADeviceControl::CreatePin(ULONG ulPinType, ULONG *pulPinId) +{ + OutputDebugStringW(L"CBDADeviceControl::CreatePin: NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDADeviceControl::DeletePin(ULONG ulPinId) +{ + OutputDebugStringW(L"CBDADeviceControl::DeletePin: NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDADeviceControl::SetMediaType(ULONG ulPinId, AM_MEDIA_TYPE *pMediaType) +{ + OutputDebugStringW(L"CBDADeviceControl::SetMediaType: NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDADeviceControl::SetMedium(ULONG ulPinId, REGPINMEDIUM *pMedium) +{ + OutputDebugStringW(L"CBDADeviceControl::SetMedium: NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDADeviceControl::CreateTopology(ULONG ulInputPinId, ULONG ulOutputPinId){ + OutputDebugStringW(L"CBDADeviceControl::CreateTopology: NotImplemented\n"); + return E_NOTIMPL; +} + + +HRESULT +STDMETHODCALLTYPE +CBDADeviceControl::GetControlNode(ULONG ulInputPinId, ULONG ulOutputPinId, ULONG ulNodeType, IUnknown **ppControlNode) +{ + OutputDebugStringW(L"CBDADeviceControl::GetControlNode: NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +WINAPI +CBDADeviceControl_fnConstructor( + IUnknown * pUnkOuter, + REFIID riid, + LPVOID * ppv) +{ + CBDADeviceControl * handler = new CBDADeviceControl(NULL); + + OutputDebugStringW(L"CBDADeviceControl_fnConstructor\n"); + + if (!handler) + return E_OUTOFMEMORY; + + if (FAILED(handler->QueryInterface(riid, ppv))) + { + /* not supported */ + delete handler; + return E_NOINTERFACE; + } + + return NOERROR; +} Propchange: trunk/reactos/dll/directx/bdaplgin/devicecontrol.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/bdaplgin/pincontrol.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/pinco… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/pincontrol.cpp (added) +++ trunk/reactos/dll/directx/bdaplgin/pincontrol.cpp [iso-8859-1] Tue Feb 23 18:40:34 2010 @@ -1,0 +1,120 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS BDA Proxy + * FILE: dll/directx/bdaplgin/classfactory.cpp + * PURPOSE: ClassFactory interface + * + * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) + */ + +#include "precomp.h" + +const GUID IID_IBDA_PinControl = {0x0DED49D5, 0xA8B7, 0x4d5d, {0x97, 0xA1, 0x12, 0xB0, 0xC1, 0x95, 0x87, 0x4D}}; + +class CBDAPinControl : public IBDA_PinControl +{ +public: + STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); + + STDMETHODIMP_(ULONG) AddRef() + { + InterlockedIncrement(&m_Ref); + return m_Ref; + } + STDMETHODIMP_(ULONG) Release() + { + InterlockedDecrement(&m_Ref); + + if (!m_Ref) + { + delete this; + return 0; + } + return m_Ref; + } + // IBDA_PinControl methods + HRESULT STDMETHODCALLTYPE GetPinID(ULONG *pulPinID); + HRESULT STDMETHODCALLTYPE GetPinType(ULONG *pulPinType); + HRESULT STDMETHODCALLTYPE RegistrationContext(ULONG *pulRegistrationCtx); + + + CBDAPinControl(HANDLE hFile) : m_Ref(0), m_Handle(hFile){}; + virtual ~CBDAPinControl(){}; + +protected: + LONG m_Ref; + HANDLE m_Handle; + +}; + +HRESULT +STDMETHODCALLTYPE +CBDAPinControl::QueryInterface( + IN REFIID refiid, + OUT PVOID* Output) +{ + if (IsEqualGUID(refiid, IID_IUnknown)) + { + *Output = PVOID(this); + reinterpret_cast<IUnknown*>(*Output)->AddRef(); + return NOERROR; + } + if (IsEqualGUID(refiid, IID_IBDA_PinControl)) + { + *Output = (IBDA_PinControl*)(this); + reinterpret_cast<IBDA_PinControl*>(*Output)->AddRef(); + return NOERROR; + } + OutputDebugStringW(L"CBDAPinControl::QueryInterface: NoInterface!!!\n"); + return E_NOINTERFACE; +} +//------------------------------------------------------------------- +// IBDA_PinControl methods +// +HRESULT +STDMETHODCALLTYPE +CBDAPinControl::GetPinID(ULONG *pulPinID) +{ + OutputDebugStringW(L"CBDAPinControl::GetPinID: NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDAPinControl::GetPinType(ULONG *pulPinType) +{ + OutputDebugStringW(L"CBDAPinControl::GetPinType: NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +STDMETHODCALLTYPE +CBDAPinControl::RegistrationContext(ULONG *pulRegistrationCtx) +{ + OutputDebugStringW(L"CBDAPinControl::RegistrationContext: NotImplemented\n"); + return E_NOTIMPL; +} + +HRESULT +WINAPI +CBDAPinControl_fnConstructor( + IUnknown * pUnkOuter, + REFIID riid, + LPVOID * ppv) +{ + CBDAPinControl * handler = new CBDAPinControl(NULL); + + OutputDebugStringW(L"CBDAPinControl_fnConstructor"); + + if (!handler) + return E_OUTOFMEMORY; + + if (FAILED(handler->QueryInterface(riid, ppv))) + { + /* not supported */ + delete handler; + return E_NOINTERFACE; + } + + return NOERROR; +} Propchange: trunk/reactos/dll/directx/bdaplgin/pincontrol.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/bdaplgin/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/preco… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/precomp.h (added) +++ trunk/reactos/dll/directx/bdaplgin/precomp.h [iso-8859-1] Tue Feb 23 18:40:34 2010 @@ -1,0 +1,51 @@ +#ifndef PRECOMP_H__ +#define PRECOMP_H__ + +#define BUILDING_KS +#define _KSDDK_ +#include <dshow.h> +//#include <streams.h> +#include <ks.h> +#define __STREAMS__ +#include <ksproxy.h> +#include <stdio.h> +#include <wchar.h> +#include <tchar.h> +#include <uuids.h> +#include <bdaiface.h> +#include <bdamedia.h> + +typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown* pUnkOuter, REFIID riid, LPVOID* ppvObject); + +typedef struct +{ + const GUID* riid; + LPFNCREATEINSTANCE lpfnCI; +} INTERFACE_TABLE; + +/* classfactory.cpp */ +IClassFactory * +CClassFactory_fnConstructor( + LPFNCREATEINSTANCE lpfnCI, + PLONG pcRefDll, + IID * riidInst); + +/* devicecontrol.cpp */ +HRESULT +WINAPI +CBDADeviceControl_fnConstructor( + IUnknown * pUnkOuter, + REFIID riid, + LPVOID * ppv); + + +/* pincontrol.cpp */ +HRESULT +WINAPI +CBDAPinControl_fnConstructor( + IUnknown * pUnkOuter, + REFIID riid, + LPVOID * ppv); + + +#endif Propchange: trunk/reactos/dll/directx/bdaplgin/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/directx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/directx.rbuild… ============================================================================== --- trunk/reactos/dll/directx/directx.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/directx.rbuild [iso-8859-1] Tue Feb 23 18:40:34 2010 @@ -3,6 +3,9 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude"> <directory name="amstream"> <xi:include href="amstream/amstream.rbuild" /> + </directory> + <directory name="bdaplgin"> + <xi:include href="bdaplgin/bdaplgin.rbuild" /> </directory> <directory name="d3d8thk"> <xi:include href="d3d8thk/d3d8thk.rbuild" /> Modified: trunk/reactos/include/dxsdk/bdamedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/bdamedia.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/bdamedia.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/bdamedia.h [iso-8859-1] Tue Feb 23 18:40:34 2010 @@ -201,4 +201,58 @@ NULL, 0, NULL, NULL, 0) +/* ------------------------------------------------------------ + BDA Change Sync Method Set {FD0A5AF3-B41D-11d2-9C95-00C04F7971E0} +*/ + +#define STATIC_KSMETHODSETID_BdaChangeSync \ + 0xfd0a5af3, 0xb41d, 0x11d2, {0x9c, 0x95, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0} +DEFINE_GUIDSTRUCT("FD0A5AF3-B41D-11d2-9C95-00C04F7971E0", KSMETHODSETID_BdaChangeSync); +#define KSMETHODSETID_BdaChangeSync DEFINE_GUIDNAMED(KSMETHODSETID_BdaChangeSync) + +typedef enum { + KSMETHOD_BDA_START_CHANGES = 0, + KSMETHOD_BDA_CHECK_CHANGES, + KSMETHOD_BDA_COMMIT_CHANGES, + KSMETHOD_BDA_GET_CHANGE_STATE +} KSMETHOD_BDA_CHANGE_SYNC; + +#define DEFINE_KSMETHOD_ITEM_BDA_START_CHANGES(MethodHandler, SupportHandler)\ + DEFINE_KSMETHOD_ITEM(\ + KSMETHOD_BDA_START_CHANGES,\ + KSMETHOD_TYPE_NONE,\ + (MethodHandler),\ + sizeof(KSMETHOD),\ + 0,\ + SupportHandler) + +#define DEFINE_KSMETHOD_ITEM_BDA_CHECK_CHANGES(MethodHandler, SupportHandler)\ + DEFINE_KSMETHOD_ITEM(\ + KSMETHOD_BDA_CHECK_CHANGES,\ + KSMETHOD_TYPE_NONE,\ + (MethodHandler),\ + sizeof(KSMETHOD),\ + 0,\ + SupportHandler) + +#define DEFINE_KSMETHOD_ITEM_BDA_COMMIT_CHANGES(MethodHandler, SupportHandler)\ + DEFINE_KSMETHOD_ITEM(\ + KSMETHOD_BDA_COMMIT_CHANGES,\ + KSMETHOD_TYPE_NONE,\ + (MethodHandler),\ + sizeof(KSMETHOD),\ + 0,\ + SupportHandler) + +#define DEFINE_KSMETHOD_ITEM_BDA_GET_CHANGE_STATE(MethodHandler, SupportHandler)\ + DEFINE_KSMETHOD_ITEM(\ + KSMETHOD_BDA_GET_CHANGE_STATE,\ + KSMETHOD_TYPE_READ,\ + (MethodHandler),\ + sizeof(KSMETHOD),\ + 0,\ + SupportHandler) + + + #endif

1 0

[janderwald] 45676: [DDK] - Fix IID_IUnknown definition 3/X
by janderwald＠svn.reactos.org 23 Feb '10

23 Feb '10

Author: janderwald Date: Tue Feb 23 18:25:46 2010 New Revision: 45676 URL: http://svn.reactos.org/svn/reactos?rev=45676&view=rev Log: [DDK] - Fix IID_IUnknown definition 3/X Modified: trunk/reactos/include/ddk/punknown.h Modified: trunk/reactos/include/ddk/punknown.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/punknown.h?rev… ============================================================================== --- trunk/reactos/include/ddk/punknown.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/punknown.h [iso-8859-1] Tue Feb 23 18:25:46 2010 @@ -33,7 +33,7 @@ #define __IUnknown_INTERFACE_DEFINED__ DEFINE_GUID( IID_IUnknown, - 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x46); + 0x00000000, 0x0000, 0x0000, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46); #undef INTERFACE #define INTERFACE IUnknown

1 0

[janderwald] 45675: [KSPROXY] - Fix IID_IUnknown definition 3/X
by janderwald＠svn.reactos.org 23 Feb '10

23 Feb '10

Author: janderwald Date: Tue Feb 23 18:19:45 2010 New Revision: 45675 URL: http://svn.reactos.org/svn/reactos?rev=45675&view=rev Log: [KSPROXY] - Fix IID_IUnknown definition 3/X Modified: trunk/reactos/dll/directx/ksproxy/datatype.cpp Modified: trunk/reactos/dll/directx/ksproxy/datatype.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/dataty… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/datatype.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/datatype.cpp [iso-8859-1] Tue Feb 23 18:19:45 2010 @@ -9,7 +9,7 @@ #include "precomp.h" /* FIXME guid mess */ -const GUID IID_IUnknown = {0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x46}}; +const GUID IID_IUnknown = {0x00000000, 0x0000, 0x0000, {0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}; const GUID IID_IClassFactory = {0x00000001, 0x0000, 0x0000, {0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}; const GUID IID_IKsDataTypeHandler = {0x5FFBAA02, 0x49A3, 0x11D0, {0x9F, 0x36, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xA1}}; const GUID MEDIATYPE_Audio = {0x73647561, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};

1 0

[janderwald] 45674: [KS] - Fix IID_IUnknown definition 2/X
by janderwald＠svn.reactos.org 23 Feb '10

23 Feb '10

Author: janderwald Date: Tue Feb 23 18:18:07 2010 New Revision: 45674 URL: http://svn.reactos.org/svn/reactos?rev=45674&view=rev Log: [KS] - Fix IID_IUnknown definition 2/X Modified: trunk/reactos/drivers/ksfilter/ks/kcom.c Modified: trunk/reactos/drivers/ksfilter/ks/kcom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/kcom.c… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/kcom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/kcom.c [iso-8859-1] Tue Feb 23 18:18:07 2010 @@ -9,7 +9,7 @@ #include "priv.h" -const GUID IID_IUnknown = {0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x46}}; +const GUID IID_IUnknown = {0x00000000, 0x0000, 0x0000, {0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}; /* http://msdn2.microsoft.com/en-us/library/ms809781.aspx */ COMDDKAPI NTSTATUS NTAPI

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