Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 46888: [DDK] - Add missing wmidata.h definitions.
by akhaldi＠svn.reactos.org 15 Apr '10

15 Apr '10

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

1 0

[gschneider] 46887: [DESK] - Don't autoequip listview item selections upon item creation - Handle selections via SetItemState, select newly added items that way - Fixes current background wallpaper item not being selected initially and selection being ignored later See issue #5030, 5116 for more details.
by gschneider＠svn.reactos.org 15 Apr '10

15 Apr '10

Author: gschneider Date: Thu Apr 15 23:01:12 2010 New Revision: 46887 URL: http://svn.reactos.org/svn/reactos?rev=46887&view=rev Log: [DESK] - Don't autoequip listview item selections upon item creation - Handle selections via SetItemState, select newly added items that way - Fixes current background wallpaper item not being selected initially and selection being ignored later See issue #5030,5116 for more details. Modified: trunk/reactos/dll/cpl/desk/background.c Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] Thu Apr 15 23:01:12 2010 @@ -94,14 +94,17 @@ ZeroMemory(&listItem, sizeof(LV_ITEM)); listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; - listItem.state = LVIS_SELECTED; + listItem.state = 0; listItem.pszText = backgroundItem->szDisplayName; listItem.iImage = -1; listItem.iItem = pGlobalData->listViewItemCount; listItem.lParam = pGlobalData->listViewItemCount; (void)ListView_InsertItem(hwndBackgroundList, &listItem); - ListView_SetItemState(hwndBackgroundList, pGlobalData->listViewItemCount, LVIS_SELECTED, LVIS_SELECTED); + ListView_SetItemState(hwndBackgroundList, + pGlobalData->listViewItemCount, + LVIS_SELECTED, + LVIS_SELECTED); pGlobalData->listViewItemCount++; @@ -143,14 +146,17 @@ ZeroMemory(&listItem, sizeof(LV_ITEM)); listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; - listItem.state = LVIS_SELECTED; + listItem.state = 0; listItem.pszText = backgroundItem->szDisplayName; listItem.iImage = sfi.iIcon; listItem.iItem = pGlobalData->listViewItemCount; listItem.lParam = pGlobalData->listViewItemCount; (void)ListView_InsertItem(hwndBackgroundList, &listItem); - ListView_SetItemState(hwndBackgroundList, pGlobalData->listViewItemCount, LVIS_SELECTED, LVIS_SELECTED); + ListView_SetItemState(hwndBackgroundList, + pGlobalData->listViewItemCount, + LVIS_SELECTED, + LVIS_SELECTED); pGlobalData->listViewItemCount++; } @@ -454,13 +460,17 @@ ZeroMemory(&listItem, sizeof(LV_ITEM)); listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; - listItem.state = LVIS_SELECTED; + listItem.state = 0; listItem.pszText = backgroundItem->szDisplayName; listItem.iImage = sfi.iIcon; listItem.iItem = pGlobalData->listViewItemCount; listItem.lParam = pGlobalData->listViewItemCount; (void)ListView_InsertItem(hwndBackgroundList, &listItem); + ListView_SetItemState(hwndBackgroundList, + pGlobalData->listViewItemCount, + LVIS_SELECTED, + LVIS_SELECTED); SendMessage(hwndBackgroundList, WM_VSCROLL, SB_BOTTOM, 0); pGlobalData->listViewItemCount++;

1 0

[tkreuzer] 46886: [MSIMTF] Silence debug flood
by tkreuzer＠svn.reactos.org 15 Apr '10

15 Apr '10

Author: tkreuzer Date: Thu Apr 15 22:07:18 2010 New Revision: 46886 URL: http://svn.reactos.org/svn/reactos?rev=46886&view=rev Log: [MSIMTF] Silence debug flood Modified: trunk/reactos/dll/win32/msimtf/activeimmapp.c Modified: trunk/reactos/dll/win32/msimtf/activeimmapp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimtf/activeimm… ============================================================================== --- trunk/reactos/dll/win32/msimtf/activeimmapp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msimtf/activeimmapp.c [iso-8859-1] Thu Apr 15 22:07:18 2010 @@ -655,7 +655,7 @@ static HRESULT WINAPI ActiveIMMApp_OnDefWindowProc(IActiveIMMApp* This, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, LRESULT *plResult) { - FIXME("Stub (%p %x %lx %lx)\n",hWnd,Msg,wParam,lParam); + //FIXME("Stub (%p %x %lx %lx)\n",hWnd,Msg,wParam,lParam); return E_FAIL; }

1 0

[jgardou] 46885: [WIN32K] - Maintain a list of DC attached to a PDEVOBJ No functional change for now, stay tuned!
by jgardou＠svn.reactos.org 15 Apr '10

15 Apr '10

Author: jgardou Date: Thu Apr 15 21:07:07 2010 New Revision: 46885 URL: http://svn.reactos.org/svn/reactos?rev=46885&view=rev Log: [WIN32K] - Maintain a list of DC attached to a PDEVOBJ No functional change for now, stay tuned! Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Thu Apr 15 21:07:07 2010 @@ -117,8 +117,8 @@ { if (dctype == DCTYPE_DIRECT) { - /* Lock ppdev */ - EngAcquireSemaphoreShared(ppdev->hsemDevLock); + /* Lock ppdev exclusively */ + EngAcquireSemaphore(ppdev->hsemDevLock); } /* Setup some basic fields */ @@ -161,6 +161,30 @@ { /* Direct DCs get the surface from the PDEV */ pdc->dclevel.pSurface = PDEVOBJ_pSurface(ppdev); + + /* Maintain a list of DC attached to this device */ + if(!pdc->dclevel.pSurface->hDC) + pdc->dclevel.pSurface->hDC = pdc->BaseObject.hHmgr ; + else + { + PDC Surf_Dc = DC_LockDc(pdc->dclevel.pSurface->hDC); + if(!Surf_Dc) + { + DPRINT1("Something went wrong with device DC list!\n"); + /* Save what can be saved ... */ + pdc->dclevel.pSurface->hDC = pdc->BaseObject.hHmgr; + } + else + { + /* Insert this one at the head of the list */ + pdc->hdcNext = Surf_Dc->BaseObject.hHmgr; + /* Sanity check */ + ASSERT(NULL == Surf_Dc->hdcPrev); + Surf_Dc->hdcPrev = pdc->BaseObject.hHmgr ; + pdc->dclevel.pSurface->hDC = pdc->BaseObject.hHmgr; + DC_UnlockDc(Surf_Dc); + } + } pdc->erclBounds.left = 0x7fffffff; pdc->erclBounds.top = 0x7fffffff; @@ -324,8 +348,6 @@ // pdc->dclevel.pFont = LFONT_ShareLockFont(pdc->dcattr.hlfntNew); /* Other stuff */ - pdc->hdcNext = NULL; - pdc->hdcPrev = NULL; pdc->ipfdDevMax = 0x0000ffff; pdc->ulCopyCount = -1; pdc->ptlDoBanding.x = 0; @@ -375,9 +397,34 @@ PATH_Delete(pdc->dclevel.hPath); + if(pdc->dctype == DCTYPE_DIRECT) + { + EngAcquireSemaphore(pdc->ppdev->hsemDevLock); + /* Remove it from the list of DC attached to the Device */ + PDC tmpDC = DC_LockDc(pdc->hdcNext); + if(tmpDC != NULL) + { + tmpDC->hdcPrev = pdc->hdcPrev ; + DC_UnlockDc(tmpDC); + } + tmpDC = DC_LockDc(pdc->hdcPrev); + if(tmpDC != NULL) + { + tmpDC->hdcNext = pdc->hdcNext ; + DC_UnlockDc(tmpDC); + } + /* Reassign list head if needed */ + if(pdc->BaseObject.hHmgr == pdc->dclevel.pSurface->hDC) + { + /* Sanity check */ + ASSERT(pdc->hdcPrev == NULL); + pdc->dclevel.pSurface->hDC = pdc->hdcNext; + } + EngReleaseSemaphore(pdc->ppdev->hsemDevLock) ; + } + if(pdc->dclevel.pSurface) SURFACE_ShareUnlockSurface(pdc->dclevel.pSurface); - PDEVOBJ_vRelease(pdc->ppdev) ; return TRUE;

1 0

[tkreuzer] 46884: [RBUILD] - Link C++ apps to libsupc++.a, needed for recent versions of gcc - remove amd64 hack
by tkreuzer＠svn.reactos.org 15 Apr '10

15 Apr '10

Author: tkreuzer Date: Thu Apr 15 20:47:44 2010 New Revision: 46884 URL: http://svn.reactos.org/svn/reactos?rev=46884&view=rev Log: [RBUILD] - Link C++ apps to libsupc++.a, needed for recent versions of gcc - remove amd64 hack Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Thu Apr 15 20:47:44 2010 @@ -481,13 +481,10 @@ fprintf ( fMakefile, "PROJECT_CCLIBS := \"$(shell ${TARGET_CC} -print-libgcc-file-name)\"\n" ); - fprintf ( fMakefile, "PROJECT_CXXLIBS := \"$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)\" \"$(shell ${TARGET_CPP} -print-libgcc-file-name)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)\"" ); + fprintf ( fMakefile, "PROJECT_CXXLIBS := \"$(shell ${TARGET_CPP} -print-file-name=libsupc++.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)\" \"$(shell ${TARGET_CPP} -print-libgcc-file-name)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)\"" ); - /* hack to get libgcc_eh.a, should check mingw version or something */ - if (Environment::GetArch() == "amd64") - fprintf ( fMakefile, " \"$(shell ${TARGET_CPP} -print-file-name=libgcc_eh.a)\"" ); /* hack to get _get_output_format, needed by libmingwex */ - else if (Environment::GetArch() == "i386") + if (Environment::GetArch() == "i386") fprintf ( fMakefile, " \"$(shell ${TARGET_CPP} -print-file-name=libcoldname.a)\" "); fprintf ( fMakefile,"\n"); }

1 0

[tkreuzer] 46883: [GENINC] Add some more constants
by tkreuzer＠svn.reactos.org 15 Apr '10

15 Apr '10

Author: tkreuzer Date: Thu Apr 15 20:42:48 2010 New Revision: 46883 URL: http://svn.reactos.org/svn/reactos?rev=46883&view=rev Log: [GENINC] Add some more constants Modified: trunk/reactos/tools/geninc/data.c Modified: trunk/reactos/tools/geninc/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/geninc/data.c?rev=46… ============================================================================== --- trunk/reactos/tools/geninc/data.c [iso-8859-1] (original) +++ trunk/reactos/tools/geninc/data.c [iso-8859-1] Thu Apr 15 20:42:48 2010 @@ -350,6 +350,15 @@ #ifdef _M_IX86 + HEADER("EFLAGS"), + CONSTANT(EFLAGS_TF), + CONSTANT(EFLAGS_INTERRUPT_MASK), + CONSTANT(EFLAGS_V86_MASK), + CONSTANT(EFLAGS_ALIGN_CHECK), + CONSTANT(EFLAGS_VIF), + CONSTANT(EFLAGS_VIP), + CONSTANT(EFLAGS_USER_SANITIZE), + HEADER("KDGT selectors"), CONSTANT(KGDT_R3_DATA), CONSTANT(KGDT_R3_CODE), @@ -412,6 +421,13 @@ // CONSTANT(XSAVE_PRESENT), #elif defined(_M_AMD64) + + HEADER("EFLAGS"), + CONSTANT(EFLAGS_TF_MASK), + CONSTANT(EFLAGS_TF_SHIFT), + CONSTANT(EFLAGS_IF_MASK), + CONSTANT(EFLAGS_IF_SHIFT), + CONSTANT(EFLAGS_ID_MASK), HEADER("Hypervisor Enlightenment Definitions"), CONSTANT(HV_MMU_USE_HYPERCALL_FOR_ADDRESS_SWITCH),

1 0

[gschneider] 46882: [SHELL32] - Use the default action when starting processes from the run dialog (r29143, lost due to a sync) - Control panels can be launched from run again - Display localized error text as messagebox caption instead of "Nix" See issue #4026 for more details.
by gschneider＠svn.reactos.org 15 Apr '10

15 Apr '10

Author: gschneider Date: Thu Apr 15 18:33:25 2010 New Revision: 46882 URL: http://svn.reactos.org/svn/reactos?rev=46882&view=rev Log: [SHELL32] - Use the default action when starting processes from the run dialog (r29143, lost due to a sync) - Control panels can be launched from run again - Display localized error text as messagebox caption instead of "Nix" See issue #4026 for more details. Modified: trunk/reactos/dll/win32/shell32/dialogs.c Modified: trunk/reactos/dll/win32/shell32/dialogs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs.… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs.c [iso-8859-1] Thu Apr 15 18:33:25 2010 @@ -344,7 +344,7 @@ else pdir[3] = '\0'; } - if (ShellExecuteA(NULL, "open", psz, NULL, pdir, SW_SHOWNORMAL) < (HINSTANCE)33) + if (ShellExecuteA(NULL, NULL, psz, NULL, pdir, SW_SHOWNORMAL) < (HINSTANCE)33) { char *pszSysMsg = NULL ; FormatMessageA ( @@ -357,7 +357,7 @@ ) ; sprintf (szMsg, "Error: %s", pszSysMsg) ; LocalFree ((HLOCAL)pszSysMsg) ; - MessageBoxA (hwnd, szMsg, "Nix", MB_OK | MB_ICONEXCLAMATION) ; + MessageBoxA (hwnd, szMsg, NULL, MB_OK | MB_ICONEXCLAMATION) ; HeapFree(GetProcessHeap(), 0, psz); HeapFree(GetProcessHeap(), 0, pdir);

1 0

[janderwald] 46881: [BDASUP] - Fix build
by janderwald＠svn.reactos.org 15 Apr '10

15 Apr '10

Author: janderwald Date: Thu Apr 15 16:09:38 2010 New Revision: 46881 URL: http://svn.reactos.org/svn/reactos?rev=46881&view=rev Log: [BDASUP] - Fix build Modified: trunk/reactos/drivers/multimedia/bdasup/precomp.h Modified: trunk/reactos/drivers/multimedia/bdasup/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/bdasup/… ============================================================================== --- trunk/reactos/drivers/multimedia/bdasup/precomp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/bdasup/precomp.h [iso-8859-1] Thu Apr 15 16:09:38 2010 @@ -3,6 +3,9 @@ #include <ntddk.h> #include <windef.h> #include <ks.h> +#define NOBITMAP +#include <mmreg.h> +#include <ksmedia.h> #include <bdatypes.h> #include <bdamedia.h> #include <bdasup.h>

1 0

[janderwald] 46880: [PSDK] - Add KS_DATARANGE_BDA_TRANSPORT Type - Fix build
by janderwald＠svn.reactos.org 15 Apr '10

15 Apr '10

Author: janderwald Date: Thu Apr 15 14:54:04 2010 New Revision: 46880 URL: http://svn.reactos.org/svn/reactos?rev=46880&view=rev Log: [PSDK] - Add KS_DATARANGE_BDA_TRANSPORT Type - Fix build 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 Apr 15 14:54:04 2010 @@ -317,6 +317,20 @@ }KSPROPERTY_BDA_SIGNAL_STATS; +typedef struct tagBDA_TRANSPORT_INFO { + ULONG ulcbPhyiscalPacket; + ULONG ulcbPhyiscalFrame; + ULONG ulcbPhyiscalFrameAlignment; + REFERENCE_TIME AvgTimePerFrame; + +} BDA_TRANSPORT_INFO, *PBDA_TRANSPORT_INFO; + +typedef struct tagKS_DATARANGE_BDA_TRANSPORT +{ + KSDATARANGE DataRange; + BDA_TRANSPORT_INFO BdaTransportInfo; +} KS_DATARANGE_BDA_TRANSPORT, *PKS_DATARANGE_BDA_TRANSPORT; + /* ------------------------------------------------------------ BDA Stream Format GUIDs */

1 0

[janderwald] 46879: [MSDVBNP] - Fix category description [KSPROXY] - Create pin handle when other pin is connecting to the output pin - Defer loading proxy plugins when the pin is about to connect
by janderwald＠svn.reactos.org 15 Apr '10

15 Apr '10

Author: janderwald Date: Thu Apr 15 13:08:19 2010 New Revision: 46879 URL: http://svn.reactos.org/svn/reactos?rev=46879&view=rev Log: [MSDVBNP] - Fix category description [KSPROXY] - Create pin handle when other pin is connecting to the output pin - Defer loading proxy plugins when the pin is about to connect Modified: trunk/reactos/dll/directx/bdaplgin/pincontrol.cpp trunk/reactos/dll/directx/ksproxy/output_pin.cpp trunk/reactos/dll/directx/msdvbnp/msdvbnp.cpp 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 Apr 15 13:08:19 2010 @@ -336,6 +336,7 @@ if (SUCCEEDED(hr)) { // register device filter + OutputDebugStringW(L"CBDAPinControl_fnConstructor registering device filter with network provider\n"); hr = pNetworkProvider->RegisterDeviceFilter(pUnknown, &RegistrationCtx); if (SUCCEEDED(hr)) { @@ -361,7 +362,6 @@ WCHAR Buffer[100]; swprintf(Buffer, L"CBDAPinControl_fnConstructor failed to register filter with %lx\n", hr); OutputDebugStringW(Buffer); - DebugBreak(); } } } Modified: trunk/reactos/dll/directx/ksproxy/output_pin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/output… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/output_pin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/output_pin.cpp [iso-8859-1] Thu Apr 15 13:08:19 2010 @@ -246,8 +246,16 @@ ZeroMemory(m_FramingProp, sizeof(m_FramingProp)); ZeroMemory(m_FramingEx, sizeof(m_FramingEx)); + ZeroMemory(&m_MediaFormat, sizeof(AM_MEDIA_TYPE)); hr = KsGetMediaType(0, &m_MediaFormat, KsObjectParent->KsGetObjectHandle(), m_PinId); + +#ifdef KSPROXY_TRACE + WCHAR Buffer[100]; + swprintf(Buffer, L"COutputPin::COutputPin Format %p pbFormat %lu\n", &m_MediaFormat, m_MediaFormat.cbFormat); + OutputDebugStringW(Buffer); +#endif + assert(hr == S_OK); InitializeCriticalSection(&m_Lock); @@ -1518,6 +1526,8 @@ HRESULT hr; ALLOCATOR_PROPERTIES Properties; IMemAllocatorCallbackTemp *pMemCallback; + LPGUID pGuid; + ULONG NumGuids = 0; #ifdef KSPROXY_TRACE WCHAR Buffer[200]; @@ -1540,6 +1550,20 @@ pmt = &m_MediaFormat; } + if (m_hPin == INVALID_HANDLE_VALUE) + { + hr = CreatePin(pmt); + if (FAILED(hr)) + { +#ifdef KSPROXY_TRACE + swprintf(Buffer, L"COutputPin::Connect CreatePin handle failed with %lx\n", hr); + OutputDebugStringW(Buffer); +#endif + return hr; + } + } + + // query for IMemInput interface hr = pReceivePin->QueryInterface(IID_IMemInputPin, (void**)&m_MemInputPin); if (FAILED(hr)) @@ -1648,10 +1672,24 @@ return hr; } - if (!m_hPin) - { - //FIXME create pin handle - assert(0); + + assert(m_hPin != INVALID_HANDLE_VALUE); + + // get all supported sets + if (m_Plugins.size() == 0) + { + if (GetSupportedSets(&pGuid, &NumGuids)) + { + // load all proxy plugins + if (FAILED(LoadProxyPlugins(pGuid, NumGuids))); + { +#ifdef KSPROXY_TRACE + OutputDebugStringW(L"COutputPin::Connect LoadProxyPlugins failed\n"); +#endif + } + // free sets + CoTaskMemFree(pGuid); + } } // receive connection; @@ -2093,6 +2131,7 @@ // pin already exists //CloseHandle(m_hPin); //m_hPin = INVALID_HANDLE_VALUE; + OutputDebugStringW(L"COutputPin::CreatePinHandle pin already exists\n"); return S_OK; } @@ -2105,9 +2144,10 @@ if (!PinConnect) { // failed + OutputDebugStringW(L"COutputPin::CreatePinHandle out of memory\n"); return E_OUTOFMEMORY; } - + OutputDebugStringW(L"COutputPin::CreatePinHandle copy pinconnect\n"); // setup request CopyMemory(&PinConnect->Interface, Interface, sizeof(KSPIN_INTERFACE)); CopyMemory(&PinConnect->Medium, Medium, sizeof(KSPIN_MEDIUM)); @@ -2118,7 +2158,7 @@ // get dataformat offset DataFormat = (PKSDATAFORMAT)(PinConnect + 1); - + OutputDebugStringW(L"COutputPin::CreatePinHandle copy format\n"); // copy data format DataFormat->FormatSize = sizeof(KSDATAFORMAT) + pmt->cbFormat; DataFormat->Flags = 0; @@ -2131,13 +2171,19 @@ if (pmt->cbFormat) { // copy extended format + WCHAR Buffer[100]; + swprintf(Buffer, L"COutputPin::CreatePinHandle copy format %p pbFormat %lu\n", pmt, pmt->cbFormat); + OutputDebugStringW(Buffer); CopyMemory((DataFormat + 1), pmt->pbFormat, pmt->cbFormat); } // get IKsObject interface hr = m_ParentFilter->QueryInterface(IID_IKsObject, (LPVOID*)&KsObjectParent); if (FAILED(hr)) - return hr; + { + OutputDebugStringW(L"COutputPin::CreatePinHandle no IID_IKsObject interface\n"); + return hr; + } // get parent filter handle hFilter = KsObjectParent->KsGetObjectHandle(); @@ -2146,13 +2192,19 @@ KsObjectParent->Release(); if (!hFilter) + { + OutputDebugStringW(L"COutputPin::CreatePinHandle no filter handle\n"); return E_HANDLE; - + } + + OutputDebugStringW(L"COutputPin::CreatePinHandle before creating pin\n"); // create pin - hr = KsCreatePin(hFilter, PinConnect, GENERIC_READ, &m_hPin); - - if (SUCCEEDED(hr)) - { + DWORD dwError = KsCreatePin(hFilter, PinConnect, GENERIC_READ, &m_hPin); + + if (dwError == ERROR_SUCCESS) + { + OutputDebugStringW(L"COutputPin::CreatePinHandle created pin\n"); + // store current interface / medium CopyMemory(&m_Medium, Medium, sizeof(KSPIN_MEDIUM)); CopyMemory(&m_Interface, Interface, sizeof(KSPIN_INTERFACE)); @@ -2205,37 +2257,12 @@ OutputDebugStringW(L"COutputPin::CreatePinHandle failed to initialize i/o thread\n"); } - LPGUID pGuid; - ULONG NumGuids = 0; - - // get all supported sets - hr = GetSupportedSets(&pGuid, &NumGuids); - if (FAILED(hr)) - { -#ifdef KSPROXY_TRACE - OutputDebugStringW(L"COutputPin::CreatePinHandle GetSupportedSets failed\n"); -#endif - return hr; - } - - // load all proxy plugins - hr = LoadProxyPlugins(pGuid, NumGuids); - if (FAILED(hr)) - { -#ifdef KSPROXY_TRACE - OutputDebugStringW(L"COutputPin::CreatePinHandle LoadProxyPlugins failed\n"); -#endif - return hr; - } - - // free sets - CoTaskMemFree(pGuid); - - //TODO // connect pin pipes } + else + OutputDebugStringW(L"COutputPin::CreatePinHandle failed to create pin\n"); // free pin connect CoTaskMemFree(PinConnect); Modified: trunk/reactos/dll/directx/msdvbnp/msdvbnp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdvbnp/msdvbn… ============================================================================== --- trunk/reactos/dll/directx/msdvbnp/msdvbnp.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/msdvbnp/msdvbnp.cpp [iso-8859-1] Thu Apr 15 13:08:19 2010 @@ -152,7 +152,7 @@ } RegisterBDAComponent(hFilter, L"{71985F4A-1CA1-11d3-9CC8-00C04F7971E0}", L"BDA Playback Filter"); - RegisterBDAComponent(hFilter, L"{71985F4B-1CA1-11D3-9CC8-00C04F7971E0}", L"BDA Network Providerss"); + RegisterBDAComponent(hFilter, L"{71985F4B-1CA1-11D3-9CC8-00C04F7971E0}", L"BDA Network Providers"); RegisterBDAComponent(hFilter, L"{71985F48-1CA1-11d3-9CC8-00C04F7971E0}", L"BDA Source Filter"); RegisterBDAComponent(hFilter, L"{A2E3074F-6C3D-11D3-B653-00C04F79498E}", L"BDA Transport Information Renderers"); RegisterBDAComponent(hFilter, L"{FD0A5AF4-B41D-11d2-9C95-00C04F7971E0}", L"BDA Receiver Component");

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