Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 60609: [NTOSKRNL] * Fix logically dead code block. CID 731331. CORE-6681
by akhaldi＠svn.reactos.org 11 Oct '13

11 Oct '13

Author: akhaldi Date: Fri Oct 11 13:15:20 2013 New Revision: 60609 URL: http://svn.reactos.org/svn/reactos?rev=60609&view=rev Log: [NTOSKRNL] * Fix logically dead code block. CID 731331. CORE-6681 Modified: trunk/reactos/ntoskrnl/ex/win32k.c Modified: trunk/reactos/ntoskrnl/ex/win32k.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/win32k.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/ex/win32k.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/win32k.c [iso-8859-1] Fri Oct 11 13:15:20 2013 @@ -211,10 +211,10 @@ ObjectTypeInitializer.OkayToCloseProcedure = ExpDesktopOkToClose; ObjectTypeInitializer.OpenProcedure = ExpDesktopOpen; ObjectTypeInitializer.CloseProcedure = ExpDesktopClose; - ObCreateObjectType(&Name, - &ObjectTypeInitializer, - NULL, - &ExDesktopObjectType); + Status = ObCreateObjectType(&Name, + &ObjectTypeInitializer, + NULL, + &ExDesktopObjectType); if (!NT_SUCCESS(Status)) return FALSE; return TRUE;

1 0

[akhaldi] 60608: [DINPUT8] * Mark as synced with Wine 1.7.1 now that all the remaining DX related modules are in sync. CORE-7469
by akhaldi＠svn.reactos.org 11 Oct '13

11 Oct '13

Author: akhaldi Date: Fri Oct 11 13:14:46 2013 New Revision: 60608 URL: http://svn.reactos.org/svn/reactos?rev=60608&view=rev Log: [DINPUT8] * Mark as synced with Wine 1.7.1 now that all the remaining DX related modules are in sync. CORE-7469 Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Oct 11 13:14:46 2013 @@ -36,7 +36,7 @@ reactos/dll/directx/wine/ddraw # Synced to Wine-1.7.1 reactos/dll/directx/wine/devenum # Synced to Wine-1.7.1 reactos/dll/directx/wine/dinput # Synced to Wine-1.7.1 -reactos/dll/directx/wine/dinput8 # Synced to Wine-1.5.26 +reactos/dll/directx/wine/dinput8 # Synced to Wine-1.7.1 reactos/dll/directx/wine/dmusic # Synced to Wine-1.7.1 reactos/dll/directx/wine/dplay # Synced to Wine-1.7.1 reactos/dll/directx/wine/dplayx # Synced to Wine-1.7.1

1 0

[akhaldi] 60607: [QUARTZ_WINETEST] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 11 Oct '13

11 Oct '13

Author: akhaldi Date: Fri Oct 11 13:13:45 2013 New Revision: 60607 URL: http://svn.reactos.org/svn/reactos?rev=60607&view=rev Log: [QUARTZ_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Added: trunk/rostests/winetests/quartz/fil_data.idl (with props) Modified: trunk/rostests/winetests/quartz/CMakeLists.txt trunk/rostests/winetests/quartz/avisplitter.c trunk/rostests/winetests/quartz/dsoundrender.c trunk/rostests/winetests/quartz/filtergraph.c trunk/rostests/winetests/quartz/filtermapper.c trunk/rostests/winetests/quartz/memallocator.c trunk/rostests/winetests/quartz/misc.c trunk/rostests/winetests/quartz/referenceclock.c trunk/rostests/winetests/quartz/testlist.c trunk/rostests/winetests/quartz/videorenderer.c Modified: trunk/rostests/winetests/quartz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/CMakeLis… ============================================================================== --- trunk/rostests/winetests/quartz/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/CMakeLists.txt [iso-8859-1] Fri Oct 11 13:13:45 2013 @@ -1,7 +1,3 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) list(APPEND SOURCE avisplitter.c @@ -15,7 +11,8 @@ testlist.c) add_executable(quartz_winetest ${SOURCE}) -target_link_libraries(quartz_winetest wine uuid) +target_link_libraries(quartz_winetest uuid) +add_dependencies(quartz_winetest quartz_idlheader) set_module_type(quartz_winetest win32cui) add_importlibs(quartz_winetest ole32 oleaut32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET quartz_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/quartz/avisplitter.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/avisplit… ============================================================================== --- trunk/rostests/winetests/quartz/avisplitter.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/avisplitter.c [iso-8859-1] Fri Oct 11 13:13:45 2013 @@ -89,29 +89,23 @@ ULONG ref; IUnknown *iface= NULL; - hr = IUnknown_QueryInterface(pAviSplitter, &IID_IBaseFilter, - (void**)&iface); - - ok(hr == S_OK, - "IID_IBaseFilter should exist, got %08x!\n", GetLastError()); - if (hr == S_OK) - { - ref = IUnknown_Release(iface); - iface = NULL; - ok(ref == 1, "Reference is %u, expected 1\n", ref); - } - - hr = IUnknown_QueryInterface(pAviSplitter, &IID_IMediaSeeking, - (void**)&iface); - if (hr == S_OK) - ref = IUnknown_Release(iface); - iface = NULL; - todo_wine ok(hr == E_NOINTERFACE, - "Query for IMediaSeeking returned: %08x\n", hr); - -/* These interfaces should not be present: - IID_IKsPropertySet, IID_IMediaPosition, IID_IQualityControl, IID_IQualProp -*/ +#define TEST_INTERFACE(riid,expected) do { \ + hr = IUnknown_QueryInterface(pAviSplitter, &riid, (void**)&iface); \ + ok( hr == expected, #riid" should %s got %08X\n", expected==S_OK ? "exist" : "not be present", GetLastError() ); \ + if (hr == S_OK) { \ + ref = IUnknown_Release(iface); \ + ok(ref == 1, "Reference is %u, expected 1\n", ref); \ + } \ + iface = NULL; \ + } while(0) + + TEST_INTERFACE(IID_IBaseFilter,S_OK); + TEST_INTERFACE(IID_IMediaSeeking,E_NOINTERFACE); + TEST_INTERFACE(IID_IKsPropertySet,E_NOINTERFACE); + TEST_INTERFACE(IID_IMediaPosition,E_NOINTERFACE); + TEST_INTERFACE(IID_IQualityControl,E_NOINTERFACE); + TEST_INTERFACE(IID_IQualProp,E_NOINTERFACE); +#undef TEST_INTERFACE } static void test_pin(IPin *pin) @@ -179,10 +173,10 @@ static const char afile[] = "test.avi"; /* This test doesn't use the quartz filtergraph because it makes it impossible - * to be certain that a thread is really one owned by the avi splitter - * A lot of the decoder filters will also have their own thread, and windows' + * to be certain that a thread is really one owned by the avi splitter. + * A lot of the decoder filters will also have their own thread, and Windows' * filtergraph has a separate thread for start/stop/seeking requests. - * By avoiding the filtergraph all together and connecting streams directly to + * By avoiding the filtergraph altogether and connecting streams directly to * the null renderer I am sure that this is not the case here. */ static void test_threads(void) @@ -206,7 +200,7 @@ return; } - /* Before doing anything (number of threads at the start differs per OS) */ + /* Before doing anything (the thread count at the start differs per OS) */ baselevel = count_threads(); file = CreateFileW(wfile, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, @@ -233,7 +227,7 @@ ok(hr == E_NOINTERFACE, "Avi splitter returns unexpected error: %08x\n", hr); if (pfile) - IUnknown_Release(pfile); + IFileSourceFilter_Release(pfile); pfile = NULL; hr = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, @@ -242,7 +236,7 @@ if (hr != S_OK) goto fail; - hr = IUnknown_QueryInterface(preader, &IID_IFileSourceFilter, + hr = IBaseFilter_QueryInterface(preader, &IID_IFileSourceFilter, (void**)&pfile); ok(hr == S_OK, "Could not get IFileSourceFilter: %08x\n", hr); if (hr != S_OK) @@ -271,7 +265,7 @@ if (hr != S_OK) goto fail; - IUnknown_Release(enumpins); + IEnumPins_Release(enumpins); enumpins = NULL; hr = IBaseFilter_EnumPins(pavi, &enumpins); @@ -286,7 +280,7 @@ curlevel = count_threads(); ok(curlevel == baselevel, - "Amount of threads should be %d not %d\n", baselevel, curlevel); + "The thread count should be %d not %d\n", baselevel, curlevel); hr = IPin_Connect(filepin, avipin, NULL); ok(hr == S_OK, "Could not connect: %08x\n", hr); @@ -296,9 +290,9 @@ expected = 1 + baselevel; curlevel = count_threads(); ok(curlevel == expected, - "Amount of threads should be %d not %d\n", expected, curlevel); - - IUnknown_Release(avipin); + "The thread count should be %d not %d\n", expected, curlevel); + + IPin_Release(avipin); avipin = NULL; IEnumPins_Reset(enumpins); @@ -309,7 +303,6 @@ */ while (IEnumPins_Next(enumpins, 1, &avipin, NULL) == S_OK) { - ok(hr == S_OK, "hr: %08x\n", hr); IPin_QueryDirection(avipin, &dir); if (dir == PINDIR_OUTPUT) { @@ -341,18 +334,18 @@ ++expected; } - IUnknown_Release(avipin); + IPin_Release(avipin); avipin = NULL; } if (avipin) - IUnknown_Release(avipin); + IPin_Release(avipin); avipin = NULL; if (hr != S_OK) goto fail2; /* At this point there is a minimalistic connected avi splitter that can - * Be used for all sorts of source filter tests, however that still needs + * be used for all sorts of source filter tests. However that still needs * to be written at a later time. * * Interesting tests: @@ -372,7 +365,7 @@ curlevel = count_threads(); ok(curlevel == expected, - "Amount of threads should be %d not %d\n", expected, curlevel); + "The thread count should be %d not %d\n", expected, curlevel); IBaseFilter_Pause(pavi); IBaseFilter_Pause(preader); @@ -421,10 +414,10 @@ if (hr != S_OK) skip("Prerequisites not matched, skipping remainder of test\n"); if (enumpins) - IUnknown_Release(enumpins); + IEnumPins_Release(enumpins); if (avipin) - IUnknown_Release(avipin); + IPin_Release(avipin); if (filepin) { IPin *to = NULL; @@ -435,20 +428,20 @@ IPin_Disconnect(filepin); IPin_Disconnect(to); } - IUnknown_Release(filepin); + IPin_Release(filepin); } if (preader) - IUnknown_Release(preader); + IBaseFilter_Release(preader); if (pavi) - IUnknown_Release(pavi); + IBaseFilter_Release(pavi); if (pfile) - IUnknown_Release(pfile); + IFileSourceFilter_Release(pfile); curlevel = count_threads(); todo_wine ok(curlevel == baselevel, - "Amount of threads should be %d not %d\n", baselevel, curlevel); + "The thread count should be %d not %d\n", baselevel, curlevel); } START_TEST(avisplitter) Modified: trunk/rostests/winetests/quartz/dsoundrender.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/dsoundre… ============================================================================== --- trunk/rostests/winetests/quartz/dsoundrender.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/dsoundrender.c [iso-8859-1] Fri Oct 11 13:13:45 2013 @@ -33,7 +33,7 @@ ok(ppv != NULL, "Pointer is NULL\n"); #define RELEASE_EXPECT(iface, num) if (iface) { \ - hr = IUnknown_Release(iface); \ + hr = IUnknown_Release((IUnknown*)iface); \ ok(hr == num, "IUnknown_Release should return %d, got %d\n", num, hr); \ } @@ -148,11 +148,11 @@ ok(hr == S_OK, "Couldn't load default device: %08x\n", hr); } RELEASE_EXPECT(ppb, 1); + } QI_SUCCEED(pDSRender, IID_IMediaPosition, pMediaPosition); RELEASE_EXPECT(pMediaPosition, 1); QI_SUCCEED(pDSRender, IID_IQualityControl, pQualityControl); RELEASE_EXPECT(pQualityControl, 1); - } } static void test_pin(IPin *pin) @@ -221,11 +221,11 @@ START_TEST(dsoundrender) { -if(!winetest_interactive) -{ - skip("Skipping dsoundrender test, see ROSTESTS_116\n"); - return; -} + if (!winetest_interactive) + { + skip("Skipping dsoundrender test, see ROSTESTS-116\n"); + return; + } CoInitialize(NULL); if (!create_dsound_renderer()) return; Added: trunk/rostests/winetests/quartz/fil_data.idl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/fil_data… ============================================================================== --- trunk/rostests/winetests/quartz/fil_data.idl (added) +++ trunk/rostests/winetests/quartz/fil_data.idl [iso-8859-1] Fri Oct 11 13:13:45 2013 @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2009 Vitaliy Margolen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "objidl.idl"; +import "strmif.idl"; +import "unknwn.idl"; + + +/***************************************************************************** + * IAMFilterData interface + * + * Notes: + * - This interface is deprecated and IFilterMapper2 should be used instead. + * - There is no full replacement for IAMFilterData::ParseFilterData short of manually + * parsing out the REGFILTER2 struct from the binary blob. + */ +[ + object, + uuid(97f7c4d4-547b-4a5f-8332-536430ad2e4d), + pointer_default(unique) +] +interface IAMFilterData : IUnknown +{ + typedef [unique] IAMFilterData *LPIAMFILTERDATA; + + HRESULT ParseFilterData( + [in] BYTE * rgbFilterData, + [in] ULONG cb, + [out] BYTE ** prgbRegFilter2); + + HRESULT CreateFilterData( + [in] REGFILTER2 * prf2, + [out] BYTE ** prgbFilterData, + [out] ULONG * pcb); +} Propchange: trunk/rostests/winetests/quartz/fil_data.idl ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/winetests/quartz/filtergraph.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/filtergr… ============================================================================== --- trunk/rostests/winetests/quartz/filtergraph.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/filtergraph.c [iso-8859-1] Fri Oct 11 13:13:45 2013 @@ -19,35 +19,35 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> - #define COBJMACROS +#define CONST_VTABLE #include "wine/test.h" #include "dshow.h" #include "control.h" -#define FILE_LEN 9 -static const char avifileA[FILE_LEN] = "test.avi"; -static const char mpegfileA[FILE_LEN] = "test.mpg"; - -IGraphBuilder* pgraph; +typedef struct TestFilterImpl +{ + IBaseFilter IBaseFilter_iface; + + LONG refCount; + CRITICAL_SECTION csFilter; + FILTER_STATE state; + FILTER_INFO filterInfo; + CLSID clsid; + IPin **ppPins; + UINT nPins; +} TestFilterImpl; + +static const WCHAR avifile[] = {'t','e','s','t','.','a','v','i',0}; +static const WCHAR mpegfile[] = {'t','e','s','t','.','m','p','g',0}; + +static IGraphBuilder *pgraph; static int createfiltergraph(void) { return S_OK == CoCreateInstance( &CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IGraphBuilder, (LPVOID*)&pgraph); -} - -static void renderfile(const char * fileA) -{ - HRESULT hr; - WCHAR fileW[FILE_LEN]; - - MultiByteToWideChar(CP_ACP, 0, fileA, -1, fileW, FILE_LEN); - - hr = IGraphBuilder_RenderFile(pgraph, fileW, NULL); - ok(hr==S_OK, "RenderFile returned: %x\n", hr); } static void rungraph(void) @@ -141,17 +141,19 @@ ok(hr==0, "Releasing filtergraph returned: %x\n", hr); } -static void test_render_run(const char * fileA) +static void test_render_run(const WCHAR *file) { HANDLE h; + HRESULT hr; if (!createfiltergraph()) return; - h = CreateFileA(fileA, 0, 0, NULL, OPEN_EXISTING, 0, NULL); + h = CreateFileW(file, 0, 0, NULL, OPEN_EXISTING, 0, NULL); if (h != INVALID_HANDLE_VALUE) { CloseHandle(h); - renderfile(fileA); + hr = IGraphBuilder_RenderFile(pgraph, file, NULL); + ok(hr==S_OK, "RenderFile returned: %x\n", hr); rungraph(); } @@ -234,7 +236,7 @@ hr = IGraphBuilder_AddFilter(pgraph, pF, NULL); ok(hr == S_OK, "IGraphBuilder_AddFilter returned: %x\n", hr); - IMediaFilter_Release(pF); + IBaseFilter_Release(pF); } static void test_mediacontrol(void) @@ -245,26 +247,26 @@ IMediaFilter *filter = NULL; IMediaControl *control = NULL; - IFilterGraph2_SetDefaultSyncSource(pgraph); - hr = IFilterGraph2_QueryInterface(pgraph, &IID_IMediaSeeking, (void**) &seeking); + IGraphBuilder_SetDefaultSyncSource(pgraph); + hr = IGraphBuilder_QueryInterface(pgraph, &IID_IMediaSeeking, (void**) &seeking); ok(hr == S_OK, "QueryInterface IMediaControl failed: %08x\n", hr); if (FAILED(hr)) return; - hr = IFilterGraph2_QueryInterface(pgraph, &IID_IMediaFilter, (void**) &filter); + hr = IGraphBuilder_QueryInterface(pgraph, &IID_IMediaFilter, (void**) &filter); ok(hr == S_OK, "QueryInterface IMediaFilter failed: %08x\n", hr); if (FAILED(hr)) { - IUnknown_Release(seeking); + IMediaSeeking_Release(seeking); return; } - hr = IFilterGraph2_QueryInterface(pgraph, &IID_IMediaControl, (void**) &control); + hr = IGraphBuilder_QueryInterface(pgraph, &IID_IMediaControl, (void**) &control); ok(hr == S_OK, "QueryInterface IMediaControl failed: %08x\n", hr); if (FAILED(hr)) { - IUnknown_Release(seeking); - IUnknown_Release(filter); + IMediaSeeking_Release(seeking); + IMediaFilter_Release(filter); return; } @@ -286,9 +288,9 @@ hr = IMediaControl_GetState(control, 1000, NULL); ok(hr == E_POINTER, "GetState expected %08x, got %08x\n", E_POINTER, hr); - IUnknown_Release(control); - IUnknown_Release(seeking); - IUnknown_Release(filter); + IMediaControl_Release(control); + IMediaSeeking_Release(seeking); + IMediaFilter_Release(filter); releasefiltergraph(); } @@ -364,7 +366,7 @@ typedef struct IEnumMediaTypesImpl { - const IEnumMediaTypesVtbl * lpVtbl; + IEnumMediaTypes IEnumMediaTypes_iface; LONG refCount; AM_MEDIA_TYPE *pMediaTypes; ULONG cMediaTypes; @@ -373,6 +375,11 @@ static const struct IEnumMediaTypesVtbl IEnumMediaTypesImpl_Vtbl; +static inline IEnumMediaTypesImpl *impl_from_IEnumMediaTypes(IEnumMediaTypes *iface) +{ + return CONTAINING_RECORD(iface, IEnumMediaTypesImpl, IEnumMediaTypes_iface); +} + static HRESULT IEnumMediaTypesImpl_Construct(const AM_MEDIA_TYPE * pMediaTypes, ULONG cMediaTypes, IEnumMediaTypes ** ppEnum) { ULONG i; @@ -383,7 +390,7 @@ *ppEnum = NULL; return E_OUTOFMEMORY; } - pEnumMediaTypes->lpVtbl = &IEnumMediaTypesImpl_Vtbl; + pEnumMediaTypes->IEnumMediaTypes_iface.lpVtbl = &IEnumMediaTypesImpl_Vtbl; pEnumMediaTypes->refCount = 1; pEnumMediaTypes->uIndex = 0; pEnumMediaTypes->cMediaTypes = cMediaTypes; @@ -396,7 +403,7 @@ CoTaskMemFree(pEnumMediaTypes->pMediaTypes); return E_OUTOFMEMORY; } - *ppEnum = (IEnumMediaTypes *)(&pEnumMediaTypes->lpVtbl); + *ppEnum = &pEnumMediaTypes->IEnumMediaTypes_iface; return S_OK; } @@ -420,7 +427,7 @@ static ULONG WINAPI IEnumMediaTypesImpl_AddRef(IEnumMediaTypes * iface) { - IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface; + IEnumMediaTypesImpl *This = impl_from_IEnumMediaTypes(iface); ULONG refCount = InterlockedIncrement(&This->refCount); return refCount; @@ -428,7 +435,7 @@ static ULONG WINAPI IEnumMediaTypesImpl_Release(IEnumMediaTypes * iface) { - IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface; + IEnumMediaTypesImpl *This = impl_from_IEnumMediaTypes(iface); ULONG refCount = InterlockedDecrement(&This->refCount); if (!refCount) @@ -445,7 +452,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Next(IEnumMediaTypes * iface, ULONG cMediaTypes, AM_MEDIA_TYPE ** ppMediaTypes, ULONG * pcFetched) { ULONG cFetched; - IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface; + IEnumMediaTypesImpl *This = impl_from_IEnumMediaTypes(iface); cFetched = min(This->cMediaTypes, This->uIndex + cMediaTypes) - This->uIndex; @@ -474,7 +481,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Skip(IEnumMediaTypes * iface, ULONG cMediaTypes) { - IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface; + IEnumMediaTypesImpl *This = impl_from_IEnumMediaTypes(iface); if (This->uIndex + cMediaTypes < This->cMediaTypes) { @@ -486,7 +493,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Reset(IEnumMediaTypes * iface) { - IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface; + IEnumMediaTypesImpl *This = impl_from_IEnumMediaTypes(iface); This->uIndex = 0; return S_OK; @@ -495,7 +502,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Clone(IEnumMediaTypes * iface, IEnumMediaTypes ** ppEnum) { HRESULT hr; - IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface; + IEnumMediaTypesImpl *This = impl_from_IEnumMediaTypes(iface); hr = IEnumMediaTypesImpl_Construct(This->pMediaTypes, This->cMediaTypes, ppEnum); if (FAILED(hr)) @@ -526,14 +533,19 @@ typedef struct ITestPinImpl { - const struct IPinVtbl * lpVtbl; - LONG refCount; - LPCRITICAL_SECTION pCritSec; - PIN_INFO pinInfo; - IPin * pConnectedTo; - AM_MEDIA_TYPE mtCurrent; - LPVOID pUserData; + IPin IPin_iface; + LONG refCount; + LPCRITICAL_SECTION pCritSec; + PIN_INFO pinInfo; + IPin * pConnectedTo; + AM_MEDIA_TYPE mtCurrent; + LPVOID pUserData; } ITestPinImpl; + +static inline ITestPinImpl *impl_from_IPin(IPin *iface) +{ + return CONTAINING_RECORD(iface, ITestPinImpl, IPin_iface); +} static HRESULT WINAPI TestFilter_Pin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) { @@ -555,20 +567,19 @@ static ULONG WINAPI TestFilter_Pin_AddRef(IPin * iface) { - ITestPinImpl *This = (ITestPinImpl *)iface; + ITestPinImpl *This = impl_from_IPin(iface); ULONG refCount = InterlockedIncrement(&This->refCount); return refCount; } static ULONG WINAPI TestFilter_Pin_Release(IPin * iface) { - ITestPinImpl *This = (ITestPinImpl *)iface; + ITestPinImpl *This = impl_from_IPin(iface); ULONG refCount = InterlockedDecrement(&This->refCount); if (!refCount) { FreeMediaType(&This->mtCurrent); - This->lpVtbl = NULL; CoTaskMemFree(This); return 0; } @@ -583,7 +594,7 @@ static HRESULT WINAPI TestFilter_InputPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) { - ITestPinImpl *This = (ITestPinImpl *)iface; + ITestPinImpl *This = impl_from_IPin(iface); PIN_DIRECTION pindirReceive; HRESULT hr = S_OK; @@ -621,7 +632,7 @@ static HRESULT WINAPI TestFilter_Pin_Disconnect(IPin * iface) { HRESULT hr; - ITestPinImpl *This = (ITestPinImpl *)iface; + ITestPinImpl *This = impl_from_IPin(iface); EnterCriticalSection(This->pCritSec); { @@ -642,7 +653,7 @@ static HRESULT WINAPI TestFilter_Pin_ConnectedTo(IPin * iface, IPin ** ppPin) { HRESULT hr; - ITestPinImpl *This = (ITestPinImpl *)iface; + ITestPinImpl *This = impl_from_IPin(iface); EnterCriticalSection(This->pCritSec); { @@ -666,7 +677,7 @@ static HRESULT WINAPI TestFilter_Pin_ConnectionMediaType(IPin * iface, AM_MEDIA_TYPE * pmt) { HRESULT hr; - ITestPinImpl *This = (ITestPinImpl *)iface; + ITestPinImpl *This = impl_from_IPin(iface); EnterCriticalSection(This->pCritSec); { @@ -688,7 +699,7 @@ static HRESULT WINAPI TestFilter_Pin_QueryPinInfo(IPin * iface, PIN_INFO * pInfo) { - ITestPinImpl *This = (ITestPinImpl *)iface; + ITestPinImpl *This = impl_from_IPin(iface); Copy_PinInfo(pInfo, &This->pinInfo); IBaseFilter_AddRef(pInfo->pFilter); @@ -698,7 +709,7 @@ static HRESULT WINAPI TestFilter_Pin_QueryDirection(IPin * iface, PIN_DIRECTION * pPinDir) { - ITestPinImpl *This = (ITestPinImpl *)iface; + ITestPinImpl *This = impl_from_IPin(iface); *pPinDir = This->pinInfo.dir; @@ -712,7 +723,7 @@ static HRESULT WINAPI TestFilter_Pin_QueryAccept(IPin * iface, const AM_MEDIA_TYPE * pmt) { - ITestPinImpl *This = (ITestPinImpl *)iface; + ITestPinImpl *This = impl_from_IPin(iface); if (IsEqualIID(&pmt->majortype, &This->mtCurrent.majortype) && (IsEqualIID(&pmt->subtype, &This->mtCurrent.subtype) || IsEqualIID(&GUID_NULL, &This->mtCurrent.subtype))) @@ -723,7 +734,7 @@ static HRESULT WINAPI TestFilter_Pin_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum) { - ITestPinImpl *This = (ITestPinImpl *)iface; + ITestPinImpl *This = impl_from_IPin(iface); return IEnumMediaTypesImpl_Construct(&This->mtCurrent, 1, ppEnum); } @@ -781,15 +792,15 @@ } /* Private helper function */ -static HRESULT TestFilter_OutputPin_ConnectSpecific(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) -{ - ITestPinImpl *This = (ITestPinImpl *)iface; +static HRESULT TestFilter_OutputPin_ConnectSpecific(ITestPinImpl * This, IPin * pReceivePin, + const AM_MEDIA_TYPE * pmt) +{ HRESULT hr; This->pConnectedTo = pReceivePin; IPin_AddRef(pReceivePin); - hr = IPin_ReceiveConnection(pReceivePin, iface, pmt); + hr = IPin_ReceiveConnection(pReceivePin, &This->IPin_iface, pmt); if (FAILED(hr)) { @@ -802,7 +813,7 @@ static HRESULT WINAPI TestFilter_OutputPin_Connect(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) { - ITestPinImpl *This = (ITestPinImpl *)iface; + ITestPinImpl *This = impl_from_IPin(iface); HRESULT hr; EnterCriticalSection(This->pCritSec); @@ -810,11 +821,11 @@ /* if we have been a specific type to connect with, then we can either connect * with that or fail. We cannot choose different AM_MEDIA_TYPE */ if (pmt && !IsEqualGUID(&pmt->majortype, &GUID_NULL) && !IsEqualGUID(&pmt->subtype, &GUID_NULL)) - hr = TestFilter_OutputPin_ConnectSpecific(iface, pReceivePin, pmt); + hr = TestFilter_OutputPin_ConnectSpecific(This, pReceivePin, pmt); else { if (( !pmt || CompareMediaTypes(pmt, &This->mtCurrent, TRUE) ) && - (TestFilter_OutputPin_ConnectSpecific(iface, pReceivePin, &This->mtCurrent) == S_OK)) + (TestFilter_OutputPin_ConnectSpecific(This, pReceivePin, &This->mtCurrent) == S_OK)) hr = S_OK; else hr = VFW_E_NO_ACCEPTABLE_TYPES; } /* if negotiate media type */ @@ -864,29 +875,34 @@ Copy_PinInfo(&pPinImpl->pinInfo, pPinInfo); pPinImpl->mtCurrent = *pinmt; - pPinImpl->lpVtbl = Pin_Vtbl; - - *ppPin = (IPin *)pPinImpl; + pPinImpl->IPin_iface.lpVtbl = Pin_Vtbl; + + *ppPin = &pPinImpl->IPin_iface; return S_OK; } /* IEnumPins implementation */ -typedef HRESULT (* FNOBTAINPIN)(IBaseFilter *iface, ULONG pos, IPin **pin, DWORD *lastsynctick); +typedef HRESULT (* FNOBTAINPIN)(TestFilterImpl *tf, ULONG pos, IPin **pin, DWORD *lastsynctick); typedef struct IEnumPinsImpl { - const IEnumPinsVtbl * lpVtbl; + IEnumPins IEnumPins_iface; LONG refCount; ULONG uIndex; - IBaseFilter *base; + TestFilterImpl *base; FNOBTAINPIN receive_pin; DWORD synctime; } IEnumPinsImpl; static const struct IEnumPinsVtbl IEnumPinsImpl_Vtbl; -static HRESULT IEnumPinsImpl_Construct(IEnumPins ** ppEnum, FNOBTAINPIN receive_pin, IBaseFilter *base) +static inline IEnumPinsImpl *impl_from_IEnumPins(IEnumPins *iface) +{ + return CONTAINING_RECORD(iface, IEnumPinsImpl, IEnumPins_iface); +} + +static HRESULT createenumpins(IEnumPins ** ppEnum, FNOBTAINPIN receive_pin, TestFilterImpl *base) { IEnumPinsImpl * pEnumPins; @@ -899,13 +915,13 @@ *ppEnum = NULL; return E_OUTOFMEMORY; } - pEnumPins->lpVtbl = &IEnumPinsImpl_Vtbl; + pEnumPins->IEnumPins_iface.lpVtbl = &IEnumPinsImpl_Vtbl; pEnumPins->refCount = 1; pEnumPins->uIndex = 0; pEnumPins->receive_pin = receive_pin; pEnumPins->base = base; - IBaseFilter_AddRef(base); - *ppEnum = (IEnumPins *)(&pEnumPins->lpVtbl); + IBaseFilter_AddRef(&base->IBaseFilter_iface); + *ppEnum = &pEnumPins->IEnumPins_iface; receive_pin(base, ~0, NULL, &pEnumPins->synctime); @@ -932,7 +948,7 @@ static ULONG WINAPI IEnumPinsImpl_AddRef(IEnumPins * iface) { - IEnumPinsImpl *This = (IEnumPinsImpl *)iface; + IEnumPinsImpl *This = impl_from_IEnumPins(iface); ULONG refCount = InterlockedIncrement(&This->refCount); return refCount; @@ -940,12 +956,12 @@ static ULONG WINAPI IEnumPinsImpl_Release(IEnumPins * iface) { - IEnumPinsImpl *This = (IEnumPinsImpl *)iface; + IEnumPinsImpl *This = impl_from_IEnumPins(iface); ULONG refCount = InterlockedDecrement(&This->refCount); if (!refCount) { - IBaseFilter_Release(This->base); + IBaseFilter_Release(&This->base->IBaseFilter_iface); CoTaskMemFree(This); return 0; } @@ -955,7 +971,7 @@ static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin ** ppPins, ULONG * pcFetched) { - IEnumPinsImpl *This = (IEnumPinsImpl *)iface; + IEnumPinsImpl *This = impl_from_IEnumPins(iface); DWORD synctime = This->synctime; HRESULT hr = S_OK; ULONG i = 0; @@ -994,7 +1010,7 @@ static HRESULT WINAPI IEnumPinsImpl_Skip(IEnumPins * iface, ULONG cPins) { - IEnumPinsImpl *This = (IEnumPinsImpl *)iface; + IEnumPinsImpl *This = impl_from_IEnumPins(iface); DWORD synctime = This->synctime; HRESULT hr; IPin *pin = NULL; @@ -1014,7 +1030,7 @@ static HRESULT WINAPI IEnumPinsImpl_Reset(IEnumPins * iface) { - IEnumPinsImpl *This = (IEnumPinsImpl *)iface; + IEnumPinsImpl *This = impl_from_IEnumPins(iface); This->receive_pin(This->base, ~0, NULL, &This->synctime); @@ -1025,9 +1041,9 @@ static HRESULT WINAPI IEnumPinsImpl_Clone(IEnumPins * iface, IEnumPins ** ppEnum) { HRESULT hr; - IEnumPinsImpl *This = (IEnumPinsImpl *)iface; - - hr = IEnumPinsImpl_Construct(ppEnum, This->receive_pin, This->base); + IEnumPinsImpl *This = impl_from_IEnumPins(iface); + + hr = createenumpins(ppEnum, This->receive_pin, This->base); if (FAILED(hr)) return hr; return IEnumPins_Skip(*ppEnum, This->uIndex); @@ -1053,22 +1069,15 @@ const GUID *mediasubtype; } TestFilterPinData; -typedef struct TestFilterImpl -{ - const IBaseFilterVtbl * lpVtbl; - - LONG refCount; - CRITICAL_SECTION csFilter; - FILTER_STATE state; - FILTER_INFO filterInfo; - CLSID clsid; - IPin ** ppPins; - UINT nPins; -} TestFilterImpl; - static const IBaseFilterVtbl TestFilter_Vtbl; -static HRESULT TestFilter_Create(const CLSID* pClsid, const TestFilterPinData *pinData, LPVOID * ppv) +static inline TestFilterImpl *impl_from_IBaseFilter(IBaseFilter *iface) +{ + return CONTAINING_RECORD(iface, TestFilterImpl, IBaseFilter_iface); +} + +static HRESULT createtestfilter(const CLSID* pClsid, const TestFilterPinData *pinData, + TestFilterImpl **tf) { static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0}; static const WCHAR wcsOutputPinName[] = {'o','u','t','p','u','t',' ','p','i','n',0}; @@ -1082,9 +1091,10 @@ if (!pTestFilter) return E_OUTOFMEMORY; pTestFilter->clsid = *pClsid; - pTestFilter->lpVtbl = &TestFilter_Vtbl; + pTestFilter->IBaseFilter_iface.lpVtbl = &TestFilter_Vtbl; pTestFilter->refCount = 1; InitializeCriticalSection(&pTestFilter->csFilter); + pTestFilter->csFilter.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": TestFilterImpl.csFilter"); pTestFilter->state = State_Stopped; ZeroMemory(&pTestFilter->filterInfo, sizeof(FILTER_INFO)); @@ -1108,7 +1118,7 @@ mt.subtype = *pinData[i].mediasubtype; pinInfo.dir = pinData[i].pinDir; - pinInfo.pFilter = (IBaseFilter *)pTestFilter; + pinInfo.pFilter = &pTestFilter->IBaseFilter_iface; if (pinInfo.dir == PINDIR_INPUT) { lstrcpynW(pinInfo.achName, wcsInputPinName, sizeof(pinInfo.achName) / sizeof(pinInfo.achName[0])); @@ -1126,7 +1136,7 @@ } pTestFilter->nPins = nPins; - *ppv = pTestFilter; + *tf = pTestFilter; return S_OK; error: @@ -1139,6 +1149,7 @@ } } CoTaskMemFree(pTestFilter->ppPins); + pTestFilter->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&pTestFilter->csFilter); CoTaskMemFree(pTestFilter); @@ -1147,7 +1158,7 @@ static HRESULT WINAPI TestFilter_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) { - TestFilterImpl *This = (TestFilterImpl *)iface; + TestFilterImpl *This = impl_from_IBaseFilter(iface); *ppv = NULL; @@ -1171,7 +1182,7 @@ static ULONG WINAPI TestFilter_AddRef(IBaseFilter * iface) { - TestFilterImpl *This = (TestFilterImpl *)iface; + TestFilterImpl *This = impl_from_IBaseFilter(iface); ULONG refCount = InterlockedIncrement(&This->refCount); return refCount; @@ -1179,7 +1190,7 @@ static ULONG WINAPI TestFilter_Release(IBaseFilter * iface) { - TestFilterImpl *This = (TestFilterImpl *)iface; + TestFilterImpl *This = impl_from_IBaseFilter(iface); ULONG refCount = InterlockedDecrement(&This->refCount); if (!refCount) @@ -1201,8 +1212,8 @@ } CoTaskMemFree(This->ppPins); - This->lpVtbl = NULL; - + + This->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csFilter); CoTaskMemFree(This); @@ -1216,7 +1227,7 @@ static HRESULT WINAPI TestFilter_GetClassID(IBaseFilter * iface, CLSID * pClsid) { - TestFilterImpl *This = (TestFilterImpl *)iface; + TestFilterImpl *This = impl_from_IBaseFilter(iface); *pClsid = This->clsid; @@ -1242,7 +1253,7 @@ static HRESULT WINAPI TestFilter_GetState(IBaseFilter * iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState) { - TestFilterImpl *This = (TestFilterImpl *)iface; + TestFilterImpl *This = impl_from_IBaseFilter(iface); EnterCriticalSection(&This->csFilter); { @@ -1265,24 +1276,24 @@ /** IBaseFilter implementation **/ -static HRESULT TestFilter_GetPin(IBaseFilter *iface, ULONG pos, IPin **pin, DWORD *lastsynctick) -{ - TestFilterImpl *This = (TestFilterImpl *)iface; - +static HRESULT getpin_callback(TestFilterImpl *tf, ULONG pos, IPin **pin, DWORD *lastsynctick) +{ /* Our pins are static, not changing so setting static tick count is ok */ *lastsynctick = 0; - if (pos >= This->nPins) + if (pos >= tf->nPins) return S_FALSE; - *pin = This->ppPins[pos]; + *pin = tf->ppPins[pos]; IPin_AddRef(*pin); return S_OK; } static HRESULT WINAPI TestFilter_EnumPins(IBaseFilter * iface, IEnumPins **ppEnum) { - return IEnumPinsImpl_Construct(ppEnum, TestFilter_GetPin, iface); + TestFilterImpl *This = impl_from_IBaseFilter(iface); + + return createenumpins(ppEnum, getpin_callback, This); } static HRESULT WINAPI TestFilter_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin) @@ -1292,7 +1303,7 @@ static HRESULT WINAPI TestFilter_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO *pInfo) { - TestFilterImpl *This = (TestFilterImpl *)iface; + TestFilterImpl *This = impl_from_IBaseFilter(iface); lstrcpyW(pInfo->achName, This->filterInfo.achName); pInfo->pGraph = This->filterInfo.pGraph; @@ -1306,7 +1317,7 @@ static HRESULT WINAPI TestFilter_JoinFilterGraph(IBaseFilter * iface, IFilterGraph *pGraph, LPCWSTR pName) { HRESULT hr = S_OK; - TestFilterImpl *This = (TestFilterImpl *)iface; + TestFilterImpl *This = impl_from_IBaseFilter(iface); EnterCriticalSection(&This->csFilter); { @@ -1349,10 +1360,15 @@ typedef struct TestClassFactoryImpl { - IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; const TestFilterPinData *filterPinData; const CLSID *clsid; } TestClassFactoryImpl; + +static inline TestClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, TestClassFactoryImpl, IClassFactory_iface); +} static HRESULT WINAPI Test_IClassFactory_QueryInterface( LPCLASSFACTORY iface, @@ -1389,18 +1405,18 @@ REFIID riid, LPVOID *ppvObj) { - TestClassFactoryImpl *This = (TestClassFactoryImpl *)iface; + TestClassFactoryImpl *This = impl_from_IClassFactory(iface); HRESULT hr; - IUnknown *punk = NULL; + TestFilterImpl *testfilter; *ppvObj = NULL; if (pUnkOuter) return CLASS_E_NOAGGREGATION; - hr = TestFilter_Create(This->clsid, This->filterPinData, (LPVOID *) &punk); + hr = createtestfilter(This->clsid, This->filterPinData, &testfilter); if (SUCCEEDED(hr)) { - hr = IUnknown_QueryInterface(punk, riid, ppvObj); - IUnknown_Release(punk); + hr = IBaseFilter_QueryInterface(&testfilter->IBaseFilter_iface, riid, ppvObj); + IBaseFilter_Release(&testfilter->IBaseFilter_iface); } return hr; } @@ -1464,8 +1480,8 @@ HRESULT hr; IFilterGraph2* pgraph2 = NULL; IFilterMapper2 *pMapper2 = NULL; - IBaseFilter* ptestfilter = NULL; - IBaseFilter* ptestfilter2 = NULL; + TestFilterImpl *ptestfilter = NULL; + TestFilterImpl *ptestfilter2 = NULL; static const CLSID CLSID_TestFilter2 = { 0x37a4edb0, 0x4d13, @@ -1517,9 +1533,18 @@ { PINDIR_INPUT, &mediasubtype2 }, { 0, 0 } }; - TestClassFactoryImpl Filter1ClassFactory = { &TestClassFactory_Vtbl, PinData2, &CLSID_TestFilter2 }; - TestClassFactoryImpl Filter2ClassFactory = { &TestClassFactory_Vtbl, PinData4, &CLSID_TestFilter3 }; - TestClassFactoryImpl Filter3ClassFactory = { &TestClassFactory_Vtbl, PinData5, &CLSID_TestFilter4 }; + TestClassFactoryImpl Filter1ClassFactory = { + { &TestClassFactory_Vtbl }, + PinData2, &CLSID_TestFilter2 + }; + TestClassFactoryImpl Filter2ClassFactory = { + { &TestClassFactory_Vtbl }, + PinData4, &CLSID_TestFilter3 + }; + TestClassFactoryImpl Filter3ClassFactory = { + { &TestClassFactory_Vtbl }, + PinData5, &CLSID_TestFilter4 + }; char ConnectedFilterName1[MAX_FILTER_NAME]; char ConnectedFilterName2[MAX_FILTER_NAME]; REGFILTER2 rgf2; @@ -1541,40 +1566,40 @@ ok(hr == S_OK, "CoCreateInstance failed with %08x\n", hr); if (!pgraph2) return; - hr = TestFilter_Create(&GUID_NULL, PinData1, (LPVOID)&ptestfilter); - ok(hr == S_OK, "TestFilter_Create failed with %08x\n", hr); + hr = createtestfilter(&GUID_NULL, PinData1, &ptestfilter); + ok(hr == S_OK, "createtestfilter failed with %08x\n", hr); if (FAILED(hr)) goto out; - hr = IFilterGraph2_AddFilter(pgraph2, ptestfilter, wszFilterInstanceName1); + hr = IFilterGraph2_AddFilter(pgraph2, &ptestfilter->IBaseFilter_iface, wszFilterInstanceName1); ok(hr == S_OK, "IFilterGraph2_AddFilter failed with %08x\n", hr); - hr = TestFilter_Create(&GUID_NULL, PinData2, (LPVOID)&ptestfilter2); - ok(hr == S_OK, "TestFilter_Create failed with %08x\n", hr); + hr = createtestfilter(&GUID_NULL, PinData2, &ptestfilter2); + ok(hr == S_OK, "createtestfilter failed with %08x\n", hr); if (FAILED(hr)) goto out; - hr = IFilterGraph2_AddFilter(pgraph2, ptestfilter2, wszFilterInstanceName2); + hr = IFilterGraph2_AddFilter(pgraph2, &ptestfilter2->IBaseFilter_iface, wszFilterInstanceName2); ok(hr == S_OK, "IFilterGraph2_AddFilter failed with %08x\n", hr); - IBaseFilter_Release(ptestfilter2); + IBaseFilter_Release(&ptestfilter2->IBaseFilter_iface); ptestfilter2 = NULL; - hr = TestFilter_Create(&GUID_NULL, PinData3, (LPVOID)&ptestfilter2); - ok(hr == S_OK, "TestFilter_Create failed with %08x\n", hr); + hr = createtestfilter(&GUID_NULL, PinData3, &ptestfilter2); + ok(hr == S_OK, "createtestfilter failed with %08x\n", hr); if (FAILED(hr)) goto out; - hr = IFilterGraph2_AddFilter(pgraph2, ptestfilter2, wszFilterInstanceName3); + hr = IFilterGraph2_AddFilter(pgraph2, &ptestfilter2->IBaseFilter_iface, wszFilterInstanceName3); ok(hr == S_OK, "IFilterGraph2_AddFilter failed with %08x\n", hr); - hr = IFilterGraph2_Render(pgraph2, ((TestFilterImpl*)ptestfilter)->ppPins[0]); + hr = IFilterGraph2_Render(pgraph2, ptestfilter->ppPins[0]); ok(hr == S_OK, "IFilterGraph2_Render failed with %08x\n", hr); - hr = get_connected_filter_name((TestFilterImpl*)ptestfilter, ConnectedFilterName1); + hr = get_connected_filter_name(ptestfilter, ConnectedFilterName1); IFilterGraph2_Release(pgraph2); pgraph2 = NULL; - IBaseFilter_Release(ptestfilter); + IBaseFilter_Release(&ptestfilter->IBaseFilter_iface); ptestfilter = NULL; - IBaseFilter_Release(ptestfilter2); + IBaseFilter_Release(&ptestfilter2->IBaseFilter_iface); ptestfilter2 = NULL; if (hr == E_NOTIMPL) @@ -1587,45 +1612,45 @@ ok(hr == S_OK, "CoCreateInstance failed with %08x\n", hr); if (!pgraph2) goto out; - hr = TestFilter_Create(&GUID_NULL, PinData1, (LPVOID)&ptestfilter); - ok(hr == S_OK, "TestFilter_Create failed with %08x\n", hr); + hr = createtestfilter(&GUID_NULL, PinData1, &ptestfilter); + ok(hr == S_OK, "createtestfilter failed with %08x\n", hr); if (FAILED(hr)) goto out; - hr = IFilterGraph2_AddFilter(pgraph2, ptestfilter, wszFilterInstanceName1); + hr = IFilterGraph2_AddFilter(pgraph2, &ptestfilter->IBaseFilter_iface, wszFilterInstanceName1); ok(hr == S_OK, "IFilterGraph2_AddFilter failed with %08x\n", hr); - hr = TestFilter_Create(&GUID_NULL, PinData3, (LPVOID)&ptestfilter2); - ok(hr == S_OK, "TestFilter_Create failed with %08x\n", hr); + hr = createtestfilter(&GUID_NULL, PinData3, &ptestfilter2); + ok(hr == S_OK, "createtestfilter failed with %08x\n", hr); if (FAILED(hr)) goto out; - hr = IFilterGraph2_AddFilter(pgraph2, ptestfilter2, wszFilterInstanceName3); + hr = IFilterGraph2_AddFilter(pgraph2, &ptestfilter2->IBaseFilter_iface, wszFilterInstanceName3); ok(hr == S_OK, "IFilterGraph2_AddFilter failed with %08x\n", hr); - IBaseFilter_Release(ptestfilter2); + IBaseFilter_Release(&ptestfilter2->IBaseFilter_iface); ptestfilter2 = NULL; - hr = TestFilter_Create(&GUID_NULL, PinData2, (LPVOID)&ptestfilter2); - ok(hr == S_OK, "TestFilter_Create failed with %08x\n", hr); + hr = createtestfilter(&GUID_NULL, PinData2, &ptestfilter2); + ok(hr == S_OK, "createtestfilter failed with %08x\n", hr); if (FAILED(hr)) goto out; - hr = IFilterGraph2_AddFilter(pgraph2, ptestfilter2, wszFilterInstanceName2); + hr = IFilterGraph2_AddFilter(pgraph2, &ptestfilter2->IBaseFilter_iface, wszFilterInstanceName2); ok(hr == S_OK, "IFilterGraph2_AddFilter failed with %08x\n", hr); - hr = IFilterGraph2_Render(pgraph2, ((TestFilterImpl*)ptestfilter)->ppPins[0]); + hr = IFilterGraph2_Render(pgraph2, ptestfilter->ppPins[0]); ok(hr == S_OK, "IFilterGraph2_Render failed with %08x\n", hr); hr = IFilterGraph2_Disconnect(pgraph2, NULL); ok(hr == E_POINTER, "IFilterGraph2_Disconnect failed. Expected E_POINTER, received %08x\n", hr); - get_connected_filter_name((TestFilterImpl*)ptestfilter, ConnectedFilterName2); + get_connected_filter_name(ptestfilter, ConnectedFilterName2); ok(lstrcmp(ConnectedFilterName1, ConnectedFilterName2), "expected connected filters to be different but got %s both times\n", ConnectedFilterName1); IFilterGraph2_Release(pgraph2); pgraph2 = NULL; - IBaseFilter_Release(ptestfilter); + IBaseFilter_Release(&ptestfilter->IBaseFilter_iface); ptestfilter = NULL; - IBaseFilter_Release(ptestfilter2); + IBaseFilter_Release(&ptestfilter2->IBaseFilter_iface); ptestfilter2 = NULL; /* Test if any preference is given to existing renderer which renders the pin directly vs @@ -1636,96 +1661,96 @@ ok(hr == S_OK, "CoCreateInstance failed with %08x\n", hr); if (!pgraph2) goto out; - hr = TestFilter_Create(&GUID_NULL, PinData1, (LPVOID)&ptestfilter); - ok(hr == S_OK, "TestFilter_Create failed with %08x\n", hr); + hr = createtestfilter(&GUID_NULL, PinData1, &ptestfilter); + ok(hr == S_OK, "createtestfilter failed with %08x\n", hr); if (FAILED(hr)) goto out; - hr = IFilterGraph2_AddFilter(pgraph2, ptestfilter, wszFilterInstanceName1); + hr = IFilterGraph2_AddFilter(pgraph2, &ptestfilter->IBaseFilter_iface, wszFilterInstanceName1); ok(hr == S_OK, "IFilterGraph2_AddFilter failed with %08x\n", hr); - hr = TestFilter_Create(&GUID_NULL, PinData2, (LPVOID)&ptestfilter2); - ok(hr == S_OK, "TestFilter_Create failed with %08x\n", hr); + hr = createtestfilter(&GUID_NULL, PinData2, &ptestfilter2); + ok(hr == S_OK, "createtestfilter failed with %08x\n", hr); if (FAILED(hr)) goto out; - hr = IFilterGraph2_AddFilter(pgraph2, ptestfilter2, wszFilterInstanceName2); + hr = IFilterGraph2_AddFilter(pgraph2, &ptestfilter2->IBaseFilter_iface, wszFilterInstanceName2); ok(hr == S_OK, "IFilterGraph2_AddFilter failed with %08x\n", hr); - IBaseFilter_Release(ptestfilter2); + IBaseFilter_Release(&ptestfilter2->IBaseFilter_iface); ptestfilter2 = NULL; - hr = TestFilter_Create(&GUID_NULL, PinData4, (LPVOID)&ptestfilter2); - ok(hr == S_OK, "TestFilter_Create failed with %08x\n", hr); + hr = createtestfilter(&GUID_NULL, PinData4, &ptestfilter2); + ok(hr == S_OK, "createtestfilter failed with %08x\n", hr); if (FAILED(hr)) goto out; - hr = IFilterGraph2_AddFilter(pgraph2, ptestfilter2, wszFilterInstanceName3); + hr = IFilterGraph2_AddFilter(pgraph2, &ptestfilter2->IBaseFilter_iface, wszFilterInstanceName3); ok(hr == S_OK, "IFilterGraph2_AddFilter failed with %08x\n", hr); - IBaseFilter_Release(ptestfilter2); + IBaseFilter_Release(&ptestfilter2->IBaseFilter_iface); ptestfilter2 = NULL; - hr = TestFilter_Create(&GUID_NULL, PinData5, (LPVOID)&ptestfilter2); - ok(hr == S_OK, "TestFilter_Create failed with %08x\n", hr); + hr = createtestfilter(&GUID_NULL, PinData5, &ptestfilter2); + ok(hr == S_OK, "createtestfilter failed with %08x\n", hr); if (FAILED(hr)) goto out; - hr = IFilterGraph2_AddFilter(pgraph2, ptestfilter2, wszFilterInstanceName4); + hr = IFilterGraph2_AddFilter(pgraph2, &ptestfilter2->IBaseFilter_iface, wszFilterInstanceName4); ok(hr == S_OK, "IFilterGraph2_AddFilter failed with %08x\n", hr); - hr = IFilterGraph2_Render(pgraph2, ((TestFilterImpl*)ptestfilter)->ppPins[0]); + hr = IFilterGraph2_Render(pgraph2, ptestfilter->ppPins[0]); ok(hr == S_OK, "IFilterGraph2_Render failed with %08x\n", hr); - get_connected_filter_name((TestFilterImpl*)ptestfilter, ConnectedFilterName1); + get_connected_filter_name(ptestfilter, ConnectedFilterName1); ok(!lstrcmp(ConnectedFilterName1, "TestfilterInstance3") || !lstrcmp(ConnectedFilterName1, "TestfilterInstance2"), "unexpected connected filter: %s\n", ConnectedFilterName1); IFilterGraph2_Release(pgraph2); pgraph2 = NULL; - IBaseFilter_Release(ptestfilter); + IBaseFilter_Release(&ptestfilter->IBaseFilter_iface); ptestfilter = NULL; - IBaseFilter_Release(ptestfilter2); + IBaseFilter_Release(&ptestfilter2->IBaseFilter_iface); ptestfilter2 = NULL; hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (LPVOID*)&pgraph2); ok(hr == S_OK, "CoCreateInstance failed with %08x\n", hr); if (!pgraph2) goto out; - hr = TestFilter_Create(&GUID_NULL, PinData1, (LPVOID)&ptestfilter); - ok(hr == S_OK, "TestFilter_Create failed with %08x\n", hr); + hr = createtestfilter(&GUID_NULL, PinData1, &ptestfilter); + ok(hr == S_OK, "createtestfilter failed with %08x\n", hr); if (FAILED(hr)) goto out; - hr = IFilterGraph2_AddFilter(pgraph2, ptestfilter, wszFilterInstanceName1); + hr = IFilterGraph2_AddFilter(pgraph2, &ptestfilter->IBaseFilter_iface, wszFilterInstanceName1); ok(hr == S_OK, "IFilterGraph2_AddFilter failed with %08x\n", hr); - hr = TestFilter_Create(&GUID_NULL, PinData4, (LPVOID)&ptestfilter2); - ok(hr == S_OK, "TestFilter_Create failed with %08x\n", hr); + hr = createtestfilter(&GUID_NULL, PinData4, &ptestfilter2); + ok(hr == S_OK, "createtestfilter failed with %08x\n", hr); if (FAILED(hr)) goto out; - hr = IFilterGraph2_AddFilter(pgraph2, ptestfilter2, wszFilterInstanceName3); + hr = IFilterGraph2_AddFilter(pgraph2, &ptestfilter2->IBaseFilter_iface, wszFilterInstanceName3); ok(hr == S_OK, "IFilterGraph2_AddFilter failed with %08x\n", hr); - IBaseFilter_Release(ptestfilter2); + IBaseFilter_Release(&ptestfilter2->IBaseFilter_iface); ptestfilter2 = NULL; - hr = TestFilter_Create(&GUID_NULL, PinData5, (LPVOID)&ptestfilter2); - ok(hr == S_OK, "TestFilter_Create failed with %08x\n", hr); + hr = createtestfilter(&GUID_NULL, PinData5, &ptestfilter2); + ok(hr == S_OK, "createtestfilter failed with %08x\n", hr); if (FAILED(hr)) goto out; - hr = IFilterGraph2_AddFilter(pgraph2, ptestfilter2, wszFilterInstanceName4); + hr = IFilterGraph2_AddFilter(pgraph2, &ptestfilter2->IBaseFilter_iface, wszFilterInstanceName4); ok(hr == S_OK, "IFilterGraph2_AddFilter failed with %08x\n", hr); - IBaseFilter_Release(ptestfilter2); + IBaseFilter_Release(&ptestfilter2->IBaseFilter_iface); ptestfilter2 = NULL; - hr = TestFilter_Create(&GUID_NULL, PinData2, (LPVOID)&ptestfilter2); - ok(hr == S_OK, "TestFilter_Create failed with %08x\n", hr); + hr = createtestfilter(&GUID_NULL, PinData2, &ptestfilter2); + ok(hr == S_OK, "createtestfilter failed with %08x\n", hr); if (FAILED(hr)) goto out; - hr = IFilterGraph2_AddFilter(pgraph2, ptestfilter2, wszFilterInstanceName2); + hr = IFilterGraph2_AddFilter(pgraph2, &ptestfilter2->IBaseFilter_iface, wszFilterInstanceName2); ok(hr == S_OK, "IFilterGraph2_AddFilter failed with %08x\n", hr); - hr = IFilterGraph2_Render(pgraph2, ((TestFilterImpl*)ptestfilter)->ppPins[0]); + hr = IFilterGraph2_Render(pgraph2, ptestfilter->ppPins[0]); ok(hr == S_OK, "IFilterGraph2_Render failed with %08x\n", hr); - get_connected_filter_name((TestFilterImpl*)ptestfilter, ConnectedFilterName2); + get_connected_filter_name(ptestfilter, ConnectedFilterName2); ok(!lstrcmp(ConnectedFilterName2, "TestfilterInstance3") || !lstrcmp(ConnectedFilterName2, "TestfilterInstance2"), "unexpected connected filter: %s\n", ConnectedFilterName2); ok(lstrcmp(ConnectedFilterName1, ConnectedFilterName2), @@ -1733,9 +1758,9 @@ IFilterGraph2_Release(pgraph2); pgraph2 = NULL; - IBaseFilter_Release(ptestfilter); + IBaseFilter_Release(&ptestfilter->IBaseFilter_iface); ptestfilter = NULL; - IBaseFilter_Release(ptestfilter2); + IBaseFilter_Release(&ptestfilter2->IBaseFilter_iface); ptestfilter2 = NULL; /* Test if renderers are tried before non-renderers (intermediary filters). */ @@ -1747,31 +1772,34 @@ ok(hr == S_OK, "CoCreateInstance failed with %08x\n", hr); if (!pMapper2) goto out; - hr = TestFilter_Create(&GUID_NULL, PinData1, (LPVOID)&ptestfilter); - ok(hr == S_OK, "TestFilter_Create failed with %08x\n", hr); + hr = createtestfilter(&GUID_NULL, PinData1, &ptestfilter); + ok(hr == S_OK, "createtestfilter failed with %08x\n", hr); if (FAILED(hr)) goto out; - hr = IFilterGraph2_AddFilter(pgraph2, ptestfilter, wszFilterInstanceName1); + hr = IFilterGraph2_AddFilter(pgraph2, &ptestfilter->IBaseFilter_iface, wszFilterInstanceName1); ok(hr == S_OK, "IFilterGraph2_AddFilter failed with %08x\n", hr); /* Register our filters with COM and with Filtermapper. */ - hr = CoRegisterClassObject(Filter1ClassFactory.clsid, (IUnknown *)&Filter1ClassFactory, - CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &cookie1); + hr = CoRegisterClassObject(Filter1ClassFactory.clsid, + (IUnknown *)&Filter1ClassFactory.IClassFactory_iface, CLSCTX_INPROC_SERVER, + REGCLS_MULTIPLEUSE, &cookie1); ok(hr == S_OK, "CoRegisterClassObject failed with %08x\n", hr); if (FAILED(hr)) goto out; - hr = CoRegisterClassObject(Filter2ClassFactory.clsid, (IUnknown *)&Filter2ClassFactory, - CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &cookie2); + hr = CoRegisterClassObject(Filter2ClassFactory.clsid, + (IUnknown *)&Filter2ClassFactory.IClassFactory_iface, CLSCTX_INPROC_SERVER, + REGCLS_MULTIPLEUSE, &cookie2); ok(hr == S_OK, "CoRegisterClassObject failed with %08x\n", hr); if (FAILED(hr)) goto out; - hr = CoRegisterClassObject(Filter3ClassFactory.clsid, (IUnknown *)&Filter3ClassFactory, - CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &cookie3); + hr = CoRegisterClassObject(Filter3ClassFactory.clsid, + (IUnknown *)&Filter3ClassFactory.IClassFactory_iface, CLSCTX_INPROC_SERVER, + REGCLS_MULTIPLEUSE, &cookie3); ok(hr == S_OK, "CoRegisterClassObject failed with %08x\n", hr); if (FAILED(hr)) goto out; rgf2.dwVersion = 2; rgf2.dwMerit = MERIT_UNLIKELY; - S1(U(rgf2)).cPins2 = 1; - S1(U(rgf2)).rgPins2 = rgPins2; + S2(U(rgf2)).cPins2 = 1; + S2(U(rgf2)).rgPins2 = rgPins2; rgPins2[0].dwFlags = REG_PINFLAG_B_RENDERER; rgPins2[0].cInstances = 1; rgPins2[0].nMediaTypes = 1; @@ -1784,39 +1812,44 @@ hr = IFilterMapper2_RegisterFilter(pMapper2, &CLSID_TestFilter2, wszFilterInstanceName2, NULL, &CLSID_LegacyAmFilterCategory, NULL, &rgf2); - ok(hr == S_OK, "IFilterMapper2_RegisterFilter failed with %x\n", hr); - - rgf2.dwMerit = MERIT_PREFERRED; - rgPinType[0].clsMinorType = &mediasubtype2; - - hr = IFilterMapper2_RegisterFilter(pMapper2, &CLSID_TestFilter4, wszFilterInstanceName4, NULL, + if (hr == E_ACCESSDENIED) + skip("Not authorized to register filters\n"); + else + { + ok(hr == S_OK, "IFilterMapper2_RegisterFilter failed with %x\n", hr); + + rgf2.dwMerit = MERIT_PREFERRED; + rgPinType[0].clsMinorType = &mediasubtype2; + + hr = IFilterMapper2_RegisterFilter(pMapper2, &CLSID_TestFilter4, wszFilterInstanceName4, NULL, &CLSID_LegacyAmFilterCategory, NULL, &rgf2); - ok(hr == S_OK, "IFilterMapper2_RegisterFilter failed with %x\n", hr); - - S1(U(rgf2)).cPins2 = 2; - rgPins2[0].dwFlags = 0; - rgPinType[0].clsMinorType = &mediasubtype1; - - rgPins2[1].dwFlags = REG_PINFLAG_B_OUTPUT; - rgPins2[1].cInstances = 1; - rgPins2[1].nMediaTypes = 1; - rgPins2[1].lpMediaType = &rgPinType[1]; - rgPins2[1].nMediums = 0; - rgPins2[1].lpMedium = NULL; - rgPins2[1].clsPinCategory = NULL; - rgPinType[1].clsMajorType = &MEDIATYPE_Video; - rgPinType[1].clsMinorType = &mediasubtype2; - - hr = IFilterMapper2_RegisterFilter(pMapper2, &CLSID_TestFilter3, wszFilterInstanceName3, NULL, + ok(hr == S_OK, "IFilterMapper2_RegisterFilter failed with %x\n", hr); + + S2(U(rgf2)).cPins2 = 2; + rgPins2[0].dwFlags = 0; + rgPinType[0].clsMinorType = &mediasubtype1; + + rgPins2[1].dwFlags = REG_PINFLAG_B_OUTPUT; + rgPins2[1].cInstances = 1; + rgPins2[1].nMediaTypes = 1; + rgPins2[1].lpMediaType = &rgPinType[1]; + rgPins2[1].nMediums = 0; + rgPins2[1].lpMedium = NULL; + rgPins2[1].clsPinCategory = NULL; + rgPinType[1].clsMajorType = &MEDIATYPE_Video; + rgPinType[1].clsMinorType = &mediasubtype2; + + hr = IFilterMapper2_RegisterFilter(pMapper2, &CLSID_TestFilter3, wszFilterInstanceName3, NULL, &CLSID_LegacyAmFilterCategory, NULL, &rgf2); - ok(hr == S_OK, "IFilterMapper2_RegisterFilter failed with %x\n", hr); - - hr = IFilterGraph2_Render(pgraph2, ((TestFilterImpl*)ptestfilter)->ppPins[0]); - ok(hr == S_OK, "IFilterGraph2_Render failed with %08x\n", hr); - - get_connected_filter_name((TestFilterImpl*)ptestfilter, ConnectedFilterName1); - ok(!lstrcmp(ConnectedFilterName1, "TestfilterInstance3"), - "unexpected connected filter: %s\n", ConnectedFilterName1); + ok(hr == S_OK, "IFilterMapper2_RegisterFilter failed with %x\n", hr); + + hr = IFilterGraph2_Render(pgraph2, ptestfilter->ppPins[0]); + ok(hr == S_OK, "IFilterGraph2_Render failed with %08x\n", hr); + + get_connected_filter_name(ptestfilter, ConnectedFilterName1); + ok(!lstrcmp(ConnectedFilterName1, "TestfilterInstance3"), + "unexpected connected filter: %s\n", ConnectedFilterName1); + } hr = IFilterMapper2_UnregisterFilter(pMapper2, &CLSID_LegacyAmFilterCategory, NULL, &CLSID_TestFilter2); @@ -1830,8 +1863,8 @@ out: - if (ptestfilter) IBaseFilter_Release(ptestfilter); - if (ptestfilter2) IBaseFilter_Release(ptestfilter2); + if (ptestfilter) IBaseFilter_Release(&ptestfilter->IBaseFilter_iface); + if (ptestfilter2) IBaseFilter_Release(&ptestfilter2->IBaseFilter_iface); if (pgraph2) IFilterGraph2_Release(pgraph2); if (pMapper2) IFilterMapper2_Release(pMapper2); @@ -1845,20 +1878,27 @@ START_TEST(filtergraph) { + HRESULT hr; + + if (!winetest_interactive) + { + skip("Skipping filtergraph test, see ROSTESTS-116\n"); + return; + } + CoInitializeEx(NULL, COINIT_MULTITHREADED); -if(!winetest_interactive) -{ - skip("Skipping filtergraph test, see ROSTESTS_116\n"); - return; -} -else{ - test_render_run(avifileA); - test_render_run(mpegfileA); + hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, + &IID_IGraphBuilder, (LPVOID*)&pgraph); + if (FAILED(hr)) { + skip("Creating filtergraph returned %08x, skipping tests\n", hr); + return; + } + test_render_run(avifile); + test_render_run(mpegfile); test_graph_builder(); test_graph_builder_addfilter(); test_mediacontrol(); test_filter_graph2(); test_render_filter_priority(); -} CoUninitialize(); } Modified: trunk/rostests/winetests/quartz/filtermapper.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/filterma… ============================================================================== --- trunk/rostests/winetests/quartz/filtermapper.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/filtermapper.c [iso-8859-1] Fri Oct 11 13:13:45 2013 @@ -24,6 +24,9 @@ #include "winbase.h" #include "initguid.h" #include "dshow.h" +#include "winternl.h" + +#include "fil_data.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -101,8 +104,8 @@ /* Test that a test renderer filter is returned when enumerating filters with bRender=FALSE */ rgf2.dwVersion = 2; rgf2.dwMerit = MERIT_UNLIKELY; - S1(U(rgf2)).cPins2 = 1; - S1(U(rgf2)).rgPins2 = rgPins2; + S2(U(rgf2)).cPins2 = 1; + S2(U(rgf2)).rgPins2 = rgPins2; rgPins2[0].dwFlags = REG_PINFLAG_B_RENDERER; rgPins2[0].cInstances = 1; @@ -117,58 +120,63 @@ hr = IFilterMapper2_RegisterFilter(pMapper, &clsidFilter1, wszFilterName1, NULL, &CLSID_LegacyAmFilterCategory, NULL, &rgf2); - ok(hr == S_OK, "IFilterMapper2_RegisterFilter failed with %x\n", hr); - - rgPins2[0].dwFlags = 0; - - rgPins2[1].dwFlags = REG_PINFLAG_B_OUTPUT; - rgPins2[1].cInstances = 1; - rgPins2[1].nMediaTypes = 1; - rgPins2[1].lpMediaType = &rgPinType; - rgPins2[1].nMediums = 0; - rgPins2[1].lpMedium = NULL; - rgPins2[1].clsPinCategory = NULL; - - S1(U(rgf2)).cPins2 = 2; - - hr = IFilterMapper2_RegisterFilter(pMapper, &clsidFilter2, wszFilterName2, NULL, + if (hr == E_ACCESSDENIED) + skip("Not authorized to register filters\n"); + else + { + ok(hr == S_OK, "IFilterMapper2_RegisterFilter failed with %x\n", hr); + + rgPins2[0].dwFlags = 0; + + rgPins2[1].dwFlags = REG_PINFLAG_B_OUTPUT; + rgPins2[1].cInstances = 1; + rgPins2[1].nMediaTypes = 1; + rgPins2[1].lpMediaType = &rgPinType; + rgPins2[1].nMediums = 0; + rgPins2[1].lpMedium = NULL; + rgPins2[1].clsPinCategory = NULL; + + S2(U(rgf2)).cPins2 = 2; + + hr = IFilterMapper2_RegisterFilter(pMapper, &clsidFilter2, wszFilterName2, NULL, &CLSID_LegacyAmFilterCategory, NULL, &rgf2); - ok(hr == S_OK, "IFilterMapper2_RegisterFilter failed with %x\n", hr); - - hr = IFilterMapper2_EnumMatchingFilters(pMapper, &pEnum, 0, TRUE, MERIT_UNLIKELY, TRUE, + ok(hr == S_OK, "IFilterMapper2_RegisterFilter failed with %x\n", hr); + + hr = IFilterMapper2_EnumMatchingFilters(pMapper, &pEnum, 0, TRUE, MERIT_UNLIKELY, TRUE, 0, NULL, NULL, &GUID_NULL, FALSE, FALSE, 0, NULL, NULL, &GUID_NULL); - ok(hr == S_OK, "IFilterMapper2_EnumMatchingFilters failed with %x\n", hr); - if (SUCCEEDED(hr) && pEnum) - { - found = enum_find_filter(wszFilterName1, pEnum); - ok(found, "EnumMatchingFilters failed to return the test filter 1\n"); - } - - if (pEnum) IEnumMoniker_Release(pEnum); - pEnum = NULL; - - hr = IFilterMapper2_EnumMatchingFilters(pMapper, &pEnum, 0, TRUE, MERIT_UNLIKELY, TRUE, + ok(hr == S_OK, "IFilterMapper2_EnumMatchingFilters failed with %x\n", hr); + if (SUCCEEDED(hr) && pEnum) + { + found = enum_find_filter(wszFilterName1, pEnum); + ok(found, "EnumMatchingFilters failed to return the test filter 1\n"); + } + + if (pEnum) IEnumMoniker_Release(pEnum); + pEnum = NULL; + + hr = IFilterMapper2_EnumMatchingFilters(pMapper, &pEnum, 0, TRUE, MERIT_UNLIKELY, TRUE, 0, NULL, NULL, &GUID_NULL, FALSE, FALSE, 0, NULL, NULL, &GUID_NULL); - ok(hr == S_OK, "IFilterMapper2_EnumMatchingFilters failed with %x\n", hr); - if (SUCCEEDED(hr) && pEnum) - { - found = enum_find_filter(wszFilterName2, pEnum); - ok(found, "EnumMatchingFilters failed to return the test filter 2\n"); - } - - if (pEnum) IEnumMoniker_Release(pEnum); - pEnum = NULL; - - /* Non renderer must not be returned with bRender=TRUE */ - - hr = IFilterMapper2_EnumMatchingFilters(pMapper, &pEnum, 0, TRUE, MERIT_UNLIKELY, TRUE, + ok(hr == S_OK, "IFilterMapper2_EnumMatchingFilters failed with %x\n", hr); + if (SUCCEEDED(hr) && pEnum) + { + found = enum_find_filter(wszFilterName2, pEnum); + ok(found, "EnumMatchingFilters failed to return the test filter 2\n"); + } + + if (pEnum) IEnumMoniker_Release(pEnum); + pEnum = NULL; + + /* Non renderer must not be returned with bRender=TRUE */ + + hr = IFilterMapper2_EnumMatchingFilters(pMapper, &pEnum, 0, TRUE, MERIT_UNLIKELY, TRUE, 0, NULL, NULL, &GUID_NULL, TRUE, FALSE, 0, NULL, NULL, &GUID_NULL); - ok(hr == S_OK, "IFilterMapper2_EnumMatchingFilters failed with %x\n", hr); - - if (SUCCEEDED(hr) && pEnum) - { - found = enum_find_filter(wszFilterName1, pEnum); - ok(found, "EnumMatchingFilters failed to return the test filter 1\n"); + ok(hr == S_OK, "IFilterMapper2_EnumMatchingFilters failed with %x\n", hr); + + if (SUCCEEDED(hr) && pEnum) + { + found = enum_find_filter(wszFilterName1, pEnum); + ok(found, "EnumMatchingFilters failed to return the test filter 1\n"); + } } if (pEnum) IEnumMoniker_Release(pEnum); @@ -245,67 +253,72 @@ /* Register---- functions need a filter class key to write pin and pin media type data to. Create a bogus * class key for it. */ lRet = RegCreateKeyExA(HKEY_CLASSES_ROOT, szRegKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL); - ok(lRet == ERROR_SUCCESS, "RegCreateKeyExA failed with %x\n", HRESULT_FROM_WIN32(lRet)); - - /* Set default value - this is interpreted as "friendly name" later. */ - lRet = RegSetValueExA(hKey, NULL, 0, REG_SZ, (LPBYTE)szFilterName, lstrlenA(szFilterName) + 1); - ok(lRet == ERROR_SUCCESS, "RegSetValueExA failed with %x\n", HRESULT_FROM_WIN32(lRet)); - - if (hKey) RegCloseKey(hKey); - hKey = NULL; - - hr = IFilterMapper_RegisterFilter(pMapper, clsidFilter, wszFilterName, MERIT_UNLIKELY); - ok(hr == S_OK, "IFilterMapper_RegisterFilter failed with %x\n", hr); - - hr = IFilterMapper_RegisterPin(pMapper, clsidFilter, wszPinName, TRUE, FALSE, FALSE, FALSE, GUID_NULL, NULL); - ok(hr == S_OK, "IFilterMapper_RegisterPin failed with %x\n", hr); - - hr = IFilterMapper_RegisterPinType(pMapper, clsidFilter, wszPinName, GUID_NULL, GUID_NULL); - ok(hr == S_OK, "IFilterMapper_RegisterPinType failed with %x\n", hr); - - hr = IFilterMapper2_EnumMatchingFilters(pMapper2, &pEnum, 0, TRUE, MERIT_UNLIKELY, TRUE, + if (lRet == ERROR_ACCESS_DENIED) + skip("Not authorized to register filters\n"); + else + { + ok(lRet == ERROR_SUCCESS, "RegCreateKeyExA failed with %x\n", HRESULT_FROM_WIN32(lRet)); + + /* Set default value - this is interpreted as "friendly name" later. */ + lRet = RegSetValueExA(hKey, NULL, 0, REG_SZ, (LPBYTE)szFilterName, lstrlenA(szFilterName) + 1); + ok(lRet == ERROR_SUCCESS, "RegSetValueExA failed with %x\n", HRESULT_FROM_WIN32(lRet)); + + if (hKey) RegCloseKey(hKey); + hKey = NULL; + + hr = IFilterMapper_RegisterFilter(pMapper, clsidFilter, wszFilterName, MERIT_UNLIKELY); + ok(hr == S_OK, "IFilterMapper_RegisterFilter failed with %x\n", hr); + + hr = IFilterMapper_RegisterPin(pMapper, clsidFilter, wszPinName, TRUE, FALSE, FALSE, FALSE, GUID_NULL, NULL); + ok(hr == S_OK, "IFilterMapper_RegisterPin failed with %x\n", hr); + + hr = IFilterMapper_RegisterPinType(pMapper, clsidFilter, wszPinName, GUID_NULL, GUID_NULL); + ok(hr == S_OK, "IFilterMapper_RegisterPinType failed with %x\n", hr); + + hr = IFilterMapper2_EnumMatchingFilters(pMapper2, &pEnum, 0, TRUE, MERIT_UNLIKELY, TRUE, 0, NULL, NULL, &GUID_NULL, FALSE, FALSE, 0, NULL, NULL, &GUID_NULL); - ok(hr == S_OK, "IFilterMapper2_EnumMatchingFilters failed with %x\n", hr); - if (SUCCEEDED(hr) && pEnum) - { - found = enum_find_filter(wszFilterName, pEnum); - ok(found, "IFilterMapper2_EnumMatchingFilters failed to return the test filter\n"); + ok(hr == S_OK, "IFilterMapper2_EnumMatchingFilters failed with %x\n", hr); + if (SUCCEEDED(hr) && pEnum) + { + found = enum_find_filter(wszFilterName, pEnum); + ok(found, "IFilterMapper2_EnumMatchingFilters failed to return the test filter\n"); + } + + if (pEnum) IEnumMoniker_Release(pEnum); + pEnum = NULL; + + found = FALSE; + hr = IFilterMapper_EnumMatchingFilters(pMapper, &pRegEnum, MERIT_UNLIKELY, TRUE, GUID_NULL, GUID_NULL, + FALSE, FALSE, GUID_NULL, GUID_NULL); + ok(hr == S_OK, "IFilterMapper_EnumMatchingFilters failed with %x\n", hr); + if (SUCCEEDED(hr) && pRegEnum) + { + ULONG cFetched; + REGFILTER *prgf; + + while(!found && IEnumRegFilters_Next(pRegEnum, 1, &prgf, &cFetched) == S_OK) + { + CHAR val[512]; + + WideCharToMultiByte(CP_ACP, 0, prgf->Name, -1, val, sizeof(val), 0, 0); + if (!lstrcmpA(val, szFilterName)) found = TRUE; + + CoTaskMemFree(prgf); + } + + IEnumRegFilters_Release(pRegEnum); + } + ok(found, "IFilterMapper_EnumMatchingFilters failed to return the test filter\n"); + + hr = IFilterMapper_UnregisterFilter(pMapper, clsidFilter); + ok(hr == S_OK, "FilterMapper_UnregisterFilter failed with %x\n", hr); + + lRet = RegOpenKeyExA(HKEY_CLASSES_ROOT, szClsid, 0, KEY_WRITE | DELETE, &hKey); + ok(lRet == ERROR_SUCCESS, "RegOpenKeyExA failed with %x\n", HRESULT_FROM_WIN32(lRet)); + + lRet = RegDeleteKeyA(hKey, szGuidstring); + ok(lRet == ERROR_SUCCESS, "RegDeleteKeyA failed with %x\n", HRESULT_FROM_WIN32(lRet)); } - - if (pEnum) IEnumMoniker_Release(pEnum); - pEnum = NULL; - - found = FALSE; - hr = IFilterMapper_EnumMatchingFilters(pMapper, &pRegEnum, MERIT_UNLIKELY, TRUE, GUID_NULL, GUID_NULL, - FALSE, FALSE, GUID_NULL, GUID_NULL); - ok(hr == S_OK, "IFilterMapper_EnumMatchingFilters failed with %x\n", hr); - if (SUCCEEDED(hr) && pRegEnum) - { - ULONG cFetched; - REGFILTER *prgf; - - while(!found && IEnumRegFilters_Next(pRegEnum, 1, &prgf, &cFetched) == S_OK) - { - CHAR val[512]; - - WideCharToMultiByte(CP_ACP, 0, prgf->Name, -1, val, sizeof(val), 0, 0); - if (!lstrcmpA(val, szFilterName)) found = TRUE; - - CoTaskMemFree(prgf); - } - - IEnumRegFilters_Release(pRegEnum); - } - ok(found, "IFilterMapper_EnumMatchingFilters failed to return the test filter\n"); - - hr = IFilterMapper_UnregisterFilter(pMapper, clsidFilter); - ok(hr == S_OK, "FilterMapper_UnregisterFilter failed with %x\n", hr); - - lRet = RegOpenKeyExA(HKEY_CLASSES_ROOT, szClsid, 0, KEY_WRITE | DELETE, &hKey); - ok(lRet == ERROR_SUCCESS, "RegOpenKeyExA failed with %x\n", HRESULT_FROM_WIN32(lRet)); - - lRet = RegDeleteKeyA(hKey, szGuidstring); - ok(lRet == ERROR_SUCCESS, "RegDeleteKeyA failed with %x\n", HRESULT_FROM_WIN32(lRet)); if (hKey) RegCloseKey(hKey); hKey = NULL; @@ -405,8 +418,8 @@ ZeroMemory(&rgf2, sizeof(rgf2)); rgf2.dwVersion = 1; rgf2.dwMerit = MERIT_UNLIKELY; - S(U(rgf2)).cPins = 1; - S(U(rgf2)).rgPins = &rgPins; + S1(U(rgf2)).cPins = 1; + S1(U(rgf2)).rgPins = &rgPins; rgPins.strName = wszPinName; rgPins.bRendered = 1; @@ -420,6 +433,11 @@ hr = IFilterMapper2_RegisterFilter(pMapper, &clsidFilter1, wszFilterName1, NULL, &CLSID_LegacyAmFilterCategory, NULL, &rgf2); + if (hr == E_ACCESSDENIED) + { + skip("Not authorized to register filters\n"); + goto out; + } ok(hr == S_OK, "IFilterMapper2_RegisterFilter failed with %x\n", hr); hr = IFilterMapper2_UnregisterFilter(pMapper, &CLSID_LegacyAmFilterCategory, NULL, &clsidFilter1); @@ -429,8 +447,8 @@ ZeroMemory(&rgf2, sizeof(rgf2)); rgf2.dwVersion = 2; rgf2.dwMerit = MERIT_UNLIKELY; - S1(U(rgf2)).cPins2 = 1; - S1(U(rgf2)).rgPins2 = &rgPins2; + S2(U(rgf2)).cPins2 = 1; + S2(U(rgf2)).rgPins2 = &rgPins2; rgPins2.dwFlags = REG_PINFLAG_B_RENDERER; rgPins2.cInstances = 1; @@ -452,6 +470,70 @@ if (pMapper) IFilterMapper2_Release(pMapper); } +static void test_parse_filter_data(void) +{ + static const BYTE data_block[] = { + 0x02,0x00,0x00,0x00,0xff,0xff,0x5f,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x70,0x69,0x33, + 0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x30,0x74,0x79,0x33,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x31,0x70,0x69,0x33, + 0x08,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x30,0x74,0x79,0x33,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x76,0x69,0x64,0x73, + 0x00,0x00,0x10,0x00,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}; + + BYTE *prgbRegFilter2 = NULL; + REGFILTER2 *pRegFilter = NULL; + IFilterMapper2 *pMapper = NULL; + SAFEARRAYBOUND saBound; + SAFEARRAY *psa = NULL; + LPBYTE pbSAData = NULL; + HRESULT hr; + + IAMFilterData *pData = NULL; + + hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, + &IID_IFilterMapper2, (LPVOID*)&pMapper); + ok((hr == S_OK || broken(hr != S_OK)), "CoCreateInstance failed with %x\n", hr); + if (FAILED(hr)) goto out; + + hr = IFilterMapper2_QueryInterface(pMapper, &IID_IAMFilterData, (LPVOID*)&pData); + ok((hr == S_OK || broken(hr != S_OK)), "Unable to find IID_IAMFilterData interface\n"); + if (FAILED(hr)) goto out; + + saBound.lLbound = 0; + saBound.cElements = sizeof(data_block); + psa = SafeArrayCreate(VT_UI1, 1, &saBound); + ok(psa != NULL, "Unable to crate safe array\n"); + if (!psa) goto out; + hr = SafeArrayAccessData(psa, (LPVOID *)&pbSAData); + ok(hr == S_OK, "Unable to access array data\n"); + if (FAILED(hr)) goto out; + memcpy(pbSAData, data_block, sizeof(data_block)); + + hr = IAMFilterData_ParseFilterData(pData, pbSAData, sizeof(data_block), &prgbRegFilter2); + /* We cannot do anything here. prgbRegFilter2 is very unstable */ + /* Pre Vista, this is a stack pointer so anything that changes the stack invalidats it */ + /* Post Vista, it is a static pointer in the data section of the module */ + pRegFilter =((REGFILTER2**)prgbRegFilter2)[0]; + ok (hr==S_OK,"Failed to Parse filter Data\n"); + + ok(IsBadReadPtr(prgbRegFilter2,sizeof(REGFILTER2*))==0,"Bad read pointer returned\n"); + ok(IsBadReadPtr(pRegFilter,sizeof(REGFILTER2))==0,"Bad read pointer for FilterData\n"); + ok(pRegFilter->dwMerit == 0x5fffff,"Incorrect merit returned\n"); + +out: + if (pRegFilter) + CoTaskMemFree(pRegFilter); + if (psa) + { + SafeArrayUnaccessData(psa); + SafeArrayDestroy(psa); + } + if (pData) + IAMFilterData_Release(pData); + if (pMapper) + IFilterMapper2_Release(pMapper); +} START_TEST(filtermapper) { @@ -461,6 +543,7 @@ test_legacy_filter_registration(); test_ifiltermapper_from_filtergraph(); test_register_filter_with_null_clsMinorType(); + test_parse_filter_data(); CoUninitialize(); } Modified: trunk/rostests/winetests/quartz/memallocator.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/memalloc… ============================================================================== --- trunk/rostests/winetests/quartz/memallocator.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/memallocator.c [iso-8859-1] Fri Oct 11 13:13:45 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include <assert.h> #define COBJMACROS @@ -71,9 +69,9 @@ hr = IMemAllocator_GetBuffer(pMemAllocator, &sample2, NULL, NULL, 0); ok(hr==S_OK, "Could not get a buffer: %x\n", hr); - IUnknown_Release(sample); + IMediaSample_Release(sample); if (sample2) - IUnknown_Release(sample2); + IMediaSample_Release(sample2); hr = IMemAllocator_Decommit(pMemAllocator); ok(hr==S_OK, "Cecommit returned: %x\n", hr); Modified: trunk/rostests/winetests/quartz/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/misc.c?r… ============================================================================== --- trunk/rostests/winetests/quartz/misc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/misc.c [iso-8859-1] Fri Oct 11 13:13:45 2013 @@ -69,6 +69,11 @@ /* for aggregation, we should only be able to request IUnknown */ hr = CoCreateInstance(&clsidInner, pUnkOuter, CLSCTX_INPROC_SERVER, &iidInner, (LPVOID*)&pUnkInnerFail); + if (hr == REGDB_E_CLASSNOTREG) + { + skip("Class not registered\n"); + return; + } ok(hr == E_NOINTERFACE, "CoCreateInstance returned %x\n", hr); ok(pUnkInnerFail == NULL, "pUnkInnerFail is not NULL\n"); @@ -157,6 +162,19 @@ } while (refCount); } +static void test_null_renderer_aggregations(void) +{ + const IID * iids[] = { + &IID_IMediaFilter, &IID_IBaseFilter + }; + int i; + + for (i = 0; i < sizeof(iids) / sizeof(iids[0]); i++) + { + test_aggregation(CLSID_SystemClock, CLSID_NullRenderer, IID_IReferenceClock, *iids[i]); + } +} + static void test_video_renderer_aggregations(void) { const IID * iids[] = { @@ -206,15 +224,17 @@ { CoInitialize(NULL); -if(!winetest_interactive) -{ - skip("Skipping misc test, see ROSTESTS_116\n"); - return; -} -else{ - test_video_renderer_aggregations(); - test_filter_graph_aggregations(); - test_filter_mapper_aggregations(); -} + if (!winetest_interactive) + { + skip("Skipping misc test, see ROSTESTS-116\n"); + return; + } + else + { + test_null_renderer_aggregations(); + test_video_renderer_aggregations(); + test_filter_graph_aggregations(); + test_filter_mapper_aggregations(); + } CoUninitialize(); } Modified: trunk/rostests/winetests/quartz/referenceclock.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/referenc… ============================================================================== --- trunk/rostests/winetests/quartz/referenceclock.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/referenceclock.c [iso-8859-1] Fri Oct 11 13:13:45 2013 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include <assert.h> #define COBJMACROS Modified: trunk/rostests/winetests/quartz/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/testlist… ============================================================================== --- trunk/rostests/winetests/quartz/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/testlist.c [iso-8859-1] Fri Oct 11 13:13:45 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_avisplitter(void); extern void func_dsoundrender(void); Modified: trunk/rostests/winetests/quartz/videorenderer.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/videoren… ============================================================================== --- trunk/rostests/winetests/quartz/videorenderer.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/videorenderer.c [iso-8859-1] Fri Oct 11 13:13:45 2013 @@ -28,7 +28,7 @@ ok(ppv != NULL, "Pointer is NULL\n"); #define RELEASE_EXPECT(iface, num) if (iface) { \ - hr = IUnknown_Release(iface); \ + hr = IUnknown_Release((IUnknown*)iface); \ ok(hr == num, "IUnknown_Release should return %d, got %d\n", num, hr); \ } @@ -70,18 +70,18 @@ RELEASE_EXPECT(pBasicVideo, 1); QI_SUCCEED(pVideoRenderer, IID_IMediaSeeking, pMediaSeeking); RELEASE_EXPECT(pMediaSeeking, 1); + QI_SUCCEED(pVideoRenderer, IID_IQualityControl, pQualityControl); + RELEASE_EXPECT(pQualityControl, 1); todo_wine { QI_SUCCEED(pVideoRenderer, IID_IDirectDrawVideo, pDirectDrawVideo); RELEASE_EXPECT(pDirectDrawVideo, 1); QI_SUCCEED(pVideoRenderer, IID_IKsPropertySet, pKsPropertySet); RELEASE_EXPECT(pKsPropertySet, 1); - QI_SUCCEED(pVideoRenderer, IID_IMediaPosition, pMediaPosition); - RELEASE_EXPECT(pMediaPosition, 1); - QI_SUCCEED(pVideoRenderer, IID_IQualityControl, pQualityControl); - RELEASE_EXPECT(pQualityControl, 1); QI_SUCCEED(pVideoRenderer, IID_IQualProp, pQualProp); RELEASE_EXPECT(pQualProp, 1); } + QI_SUCCEED(pVideoRenderer, IID_IMediaPosition, pMediaPosition); + RELEASE_EXPECT(pMediaPosition, 1); QI_SUCCEED(pVideoRenderer, IID_IVideoWindow, pVideoWindow); RELEASE_EXPECT(pVideoWindow, 1); } @@ -156,15 +156,16 @@ if (!create_video_renderer()) return; -if(!winetest_interactive) -{ - skip("Skipping filtergraph test, see ROSTESTS_116\n"); - return; -} -else{ - test_query_interface(); - test_basefilter(); -} + if (!winetest_interactive) + { + skip("Skipping filtergraph test, see ROSTESTS-116\n"); + return; + } + else + { + test_query_interface(); + test_basefilter(); + } release_video_renderer(); CoUninitialize();

1 0

[akhaldi] 60606: [QUARTZ] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 11 Oct '13

11 Oct '13

Author: akhaldi Date: Fri Oct 11 13:13:18 2013 New Revision: 60606 URL: http://svn.reactos.org/svn/reactos?rev=60606&view=rev Log: [QUARTZ] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/directx/wine/quartz/filtermapper.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/quartz/filtermapper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/filtermapper.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/filtermapper.c [iso-8859-1] Fri Oct 11 13:13:18 2013 @@ -305,7 +305,7 @@ hr = HRESULT_FROM_WIN32(lRet); } - CloseHandle(hKey); + RegCloseKey(hKey); CoTaskMemFree(wClsidCategory); CoTaskMemFree(wClsidAMCat); @@ -1285,7 +1285,7 @@ { lRet = RegSetValueExW(hKey, NULL, 0, REG_SZ, (const BYTE*)szName, (strlenW(szName) + 1) * sizeof(WCHAR)); hr = HRESULT_FROM_WIN32(lRet); - CloseHandle(hKey); + RegCloseKey(hKey); } if (SUCCEEDED(hr)) @@ -1301,7 +1301,7 @@ { lRet = RegSetValueExW(hKey, wszMeritName, 0, REG_DWORD, (LPBYTE)&dwMerit, sizeof(dwMerit)); hr = HRESULT_FROM_WIN32(lRet); - CloseHandle(hKey); + RegCloseKey(hKey); } CoTaskMemFree(wszClsid); @@ -1405,9 +1405,9 @@ CoTaskMemFree(wszClsid); if (hKey) - CloseHandle(hKey); + RegCloseKey(hKey); if (hPinsKey) - CloseHandle(hPinsKey); + RegCloseKey(hPinsKey); return hr; } @@ -1478,7 +1478,7 @@ lRet = RegCreateKeyExW(hKey, wszKeyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkeyDummy, NULL); hr = HRESULT_FROM_WIN32(lRet); - CloseHandle(hKey); + RegCloseKey(hKey); if (hkeyDummy) RegCloseKey(hkeyDummy); } @@ -1512,7 +1512,7 @@ { lRet = RegDeleteKeyW(hKey, wszClsid); hr = HRESULT_FROM_WIN32(lRet); - CloseHandle(hKey); + RegCloseKey(hKey); } if (SUCCEEDED(hr)) @@ -1534,7 +1534,7 @@ if (lRet != ERROR_SUCCESS) hr = HRESULT_FROM_WIN32(lRet); - CloseHandle(hKey); + RegCloseKey(hKey); } CoTaskMemFree(wszClsid); @@ -1596,7 +1596,7 @@ CoTaskMemFree(wszClsid); if (hKey) - CloseHandle(hKey); + RegCloseKey(hKey); return hr; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Oct 11 13:13:18 2013 @@ -45,7 +45,7 @@ reactos/dll/directx/wine/dxgi # Synced to Wine-1.7.1 reactos/dll/directx/wine/msdmo # Synced to Wine-1.7.1 reactos/dll/directx/wine/qedit # Synced to Wine-1.7.1 -reactos/dll/directx/wine/quartz # Synced to Wine-1.5.26 +reactos/dll/directx/wine/quartz # Synced to Wine-1.7.1 reactos/dll/directx/wine/wined3d # Synced to Wine-1.7.1 reactos/dll/win32/activeds # Synced to Wine-1.1.43?

1 0

[akhaldi] 60605: [QEDIT] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 11 Oct '13

11 Oct '13

Author: akhaldi Date: Fri Oct 11 13:12:40 2013 New Revision: 60605 URL: http://svn.reactos.org/svn/reactos?rev=60605&view=rev Log: [QEDIT] * Sync with Wine 1.7.1. CORE-7469 Added: trunk/reactos/dll/directx/wine/qedit/qedit.rc (with props) trunk/reactos/dll/directx/wine/qedit/qedit_classes.idl (with props) trunk/reactos/dll/directx/wine/qedit/qedit_classes.rgs (with props) Removed: trunk/reactos/dll/directx/wine/qedit/regsvr.c Modified: trunk/reactos/dll/directx/wine/qedit/CMakeLists.txt trunk/reactos/dll/directx/wine/qedit/main.c trunk/reactos/dll/directx/wine/qedit/mediadet.c trunk/reactos/dll/directx/wine/qedit/qedit_private.h trunk/reactos/dll/directx/wine/qedit/samplegrabber.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/qedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/CMa… ============================================================================== --- trunk/reactos/dll/directx/wine/qedit/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/qedit/CMakeLists.txt [iso-8859-1] Fri Oct 11 13:12:40 2013 @@ -1,35 +1,17 @@ add_definitions(-D__WINESRC__) - -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(qedit.dll qedit.spec) -add_library(qedit SHARED +list(APPEND SOURCE main.c mediadet.c - regsvr.c samplegrabber.c ${CMAKE_CURRENT_BINARY_DIR}/qedit.def) -set_module_type(qedit win32dll UNICODE) - -target_link_libraries(qedit - strmiids - uuid - wine) - -add_importlibs(qedit - msvcrt - advapi32 - ole32 - oleaut32 - kernel32 - ntdll) - +add_library(qedit SHARED ${SOURCE} qedit.rc) +set_module_type(qedit win32dll) +target_link_libraries(qedit strmiids uuid wine) +add_importlibs(qedit ole32 oleaut32 msvcrt kernel32 ntdll) add_pch(qedit qedit_private.h) -add_dependencies(qedit dxsdk) add_cd_file(TARGET qedit DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/qedit/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/mai… ============================================================================== --- trunk/reactos/dll/directx/wine/qedit/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/qedit/main.c [iso-8859-1] Fri Oct 11 13:12:40 2013 @@ -18,18 +18,20 @@ */ #include "qedit_private.h" +#include <rpcproxy.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(qedit); + +static HINSTANCE instance; BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { switch(fdwReason) { case DLL_PROCESS_ATTACH: + instance = hInstDLL; DisableThreadLibraryCalls(hInstDLL); break; - case DLL_PROCESS_DETACH: - break; } return TRUE; } @@ -38,12 +40,16 @@ * DirectShow ClassFactory */ typedef struct { - IClassFactory ITF_IClassFactory; - + IClassFactory IClassFactory_iface; LONG ref; HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj); } IClassFactoryImpl; +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + struct object_creation_info { const CLSID *clsid; @@ -56,34 +62,30 @@ { &CLSID_SampleGrabber, SampleGrabber_create }, }; -static HRESULT WINAPI -DSCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) -{ - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - +static HRESULT WINAPI DSCF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj) +{ if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { IClassFactory_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } *ppobj = NULL; - WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); + WARN("(%p)->(%s,%p), not found\n", iface, debugstr_guid(riid), ppobj); return E_NOINTERFACE; } -static ULONG WINAPI DSCF_AddRef(LPCLASSFACTORY iface) -{ - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; +static ULONG WINAPI DSCF_AddRef(IClassFactory *iface) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); return InterlockedIncrement(&This->ref); } -static ULONG WINAPI DSCF_Release(LPCLASSFACTORY iface) -{ - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - +static ULONG WINAPI DSCF_Release(IClassFactory *iface) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedDecrement(&This->ref); if (ref == 0) @@ -92,15 +94,19 @@ return ref; } -static HRESULT WINAPI DSCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) -{ - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; +static HRESULT WINAPI DSCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, REFIID riid, + void **ppobj) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); HRESULT hres; LPUNKNOWN punk; TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); *ppobj = NULL; + if (pOuter && !IsEqualGUID(&IID_IUnknown, riid)) + return E_INVALIDARG; + hres = This->pfnCreateInstance(pOuter, (LPVOID *) &punk); if (SUCCEEDED(hres)) { hres = IUnknown_QueryInterface(punk, riid, ppobj); @@ -109,9 +115,9 @@ return hres; } -static HRESULT WINAPI DSCF_LockServer(LPCLASSFACTORY iface, BOOL dolock) -{ - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; +static HRESULT WINAPI DSCF_LockServer(IClassFactory *iface, BOOL dolock) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); FIXME("(%p)->(%d),stub!\n",This,dolock); return S_OK; } @@ -131,7 +137,7 @@ */ HRESULT WINAPI DllCanUnloadNow(void) { - return S_OK; + return S_FALSE; } /******************************************************************************* @@ -175,11 +181,27 @@ factory = CoTaskMemAlloc(sizeof(*factory)); if (factory == NULL) return E_OUTOFMEMORY; - factory->ITF_IClassFactory.lpVtbl = &DSCF_Vtbl; + factory->IClassFactory_iface.lpVtbl = &DSCF_Vtbl; factory->ref = 1; factory->pfnCreateInstance = object_creation[i].pfnCreateInstance; - *ppv = &(factory->ITF_IClassFactory); + *ppv = &factory->IClassFactory_iface; return S_OK; } + +/*********************************************************************** + * DllRegisterServer (QEDIT.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources( instance ); +} + +/*********************************************************************** + * DllUnregisterServer (QEDIT.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources( instance ); +} Modified: trunk/reactos/dll/directx/wine/qedit/mediadet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/med… ============================================================================== --- trunk/reactos/dll/directx/wine/qedit/mediadet.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/qedit/mediadet.c [iso-8859-1] Fri Oct 11 13:12:40 2013 @@ -33,8 +33,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(qedit); typedef struct MediaDetImpl { - const IMediaDetVtbl *MediaDet_Vtbl; - LONG refCount; + IUnknown IUnknown_inner; + IMediaDet IMediaDet_iface; + IUnknown *outer_unk; + LONG ref; IGraphBuilder *graph; IBaseFilter *source; IBaseFilter *splitter; @@ -42,6 +44,16 @@ LONG cur_stream; IPin *cur_pin; } MediaDetImpl; + +static inline MediaDetImpl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, MediaDetImpl, IUnknown_inner); +} + +static inline MediaDetImpl *impl_from_IMediaDet(IMediaDet *iface) +{ + return CONTAINING_RECORD(iface, MediaDetImpl, IMediaDet_iface); +} static void MD_cleanup(MediaDetImpl *This) { @@ -57,64 +69,98 @@ This->cur_stream = 0; } -static ULONG WINAPI MediaDet_AddRef(IMediaDet* iface) -{ - MediaDetImpl *This = (MediaDetImpl *)iface; - ULONG refCount = InterlockedIncrement(&This->refCount); - TRACE("(%p)->() AddRef from %d\n", This, refCount - 1); - return refCount; -} - -static ULONG WINAPI MediaDet_Release(IMediaDet* iface) -{ - MediaDetImpl *This = (MediaDetImpl *)iface; - ULONG refCount = InterlockedDecrement(&This->refCount); - TRACE("(%p)->() Release from %d\n", This, refCount + 1); - - if (refCount == 0) +/* MediaDet inner IUnknown */ +static HRESULT WINAPI MediaDet_inner_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + MediaDetImpl *This = impl_from_IUnknown(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown)) + *ppv = &This->IUnknown_inner; + else if (IsEqualIID(riid, &IID_IMediaDet)) + *ppv = &This->IMediaDet_iface; + else + WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppv); + + if (!*ppv) + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI MediaDet_inner_AddRef(IUnknown *iface) +{ + MediaDetImpl *This = impl_from_IUnknown(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) new ref = %u\n", This, ref); + + return ref; +} + +static ULONG WINAPI MediaDet_inner_Release(IUnknown *iface) +{ + MediaDetImpl *This = impl_from_IUnknown(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) new ref = %u\n", This, ref); + + if (ref == 0) { MD_cleanup(This); CoTaskMemFree(This); return 0; } - return refCount; -} - -static HRESULT WINAPI MediaDet_QueryInterface(IMediaDet* iface, REFIID riid, - void **ppvObject) -{ - MediaDetImpl *This = (MediaDetImpl *)iface; - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); - - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IMediaDet)) { - MediaDet_AddRef(iface); - *ppvObject = This; - return S_OK; - } - *ppvObject = NULL; - WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppvObject); - return E_NOINTERFACE; + return ref; +} + +static const IUnknownVtbl mediadet_vtbl = +{ + MediaDet_inner_QueryInterface, + MediaDet_inner_AddRef, + MediaDet_inner_Release, +}; + +/* IMediaDet implementation */ +static HRESULT WINAPI MediaDet_QueryInterface(IMediaDet *iface, REFIID riid, void **ppv) +{ + MediaDetImpl *This = impl_from_IMediaDet(iface); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); +} + +static ULONG WINAPI MediaDet_AddRef(IMediaDet *iface) +{ + MediaDetImpl *This = impl_from_IMediaDet(iface); + return IUnknown_AddRef(This->outer_unk); +} + +static ULONG WINAPI MediaDet_Release(IMediaDet *iface) +{ + MediaDetImpl *This = impl_from_IMediaDet(iface); + return IUnknown_Release(This->outer_unk); } static HRESULT WINAPI MediaDet_get_Filter(IMediaDet* iface, IUnknown **pVal) { - MediaDetImpl *This = (MediaDetImpl *)iface; + MediaDetImpl *This = impl_from_IMediaDet(iface); FIXME("(%p)->(%p): not implemented!\n", This, pVal); return E_NOTIMPL; } static HRESULT WINAPI MediaDet_put_Filter(IMediaDet* iface, IUnknown *newVal) { - MediaDetImpl *This = (MediaDetImpl *)iface; + MediaDetImpl *This = impl_from_IMediaDet(iface); FIXME("(%p)->(%p): not implemented!\n", This, newVal); return E_NOTIMPL; } static HRESULT WINAPI MediaDet_get_OutputStreams(IMediaDet* iface, LONG *pVal) { - MediaDetImpl *This = (MediaDetImpl *)iface; + MediaDetImpl *This = impl_from_IMediaDet(iface); IEnumPins *pins; IPin *pin; HRESULT hr; @@ -158,7 +204,7 @@ static HRESULT WINAPI MediaDet_get_CurrentStream(IMediaDet* iface, LONG *pVal) { - MediaDetImpl *This = (MediaDetImpl *)iface; + MediaDetImpl *This = impl_from_IMediaDet(iface); TRACE("(%p)\n", This); if (!pVal) @@ -211,7 +257,7 @@ static HRESULT WINAPI MediaDet_put_CurrentStream(IMediaDet* iface, LONG newVal) { - MediaDetImpl *This = (MediaDetImpl *)iface; + MediaDetImpl *This = impl_from_IMediaDet(iface); HRESULT hr; TRACE("(%p)->(%d)\n", This, newVal); @@ -237,28 +283,28 @@ static HRESULT WINAPI MediaDet_get_StreamType(IMediaDet* iface, GUID *pVal) { - MediaDetImpl *This = (MediaDetImpl *)iface; - FIXME("(%p)->(%p): not implemented!\n", This, debugstr_guid(pVal)); + MediaDetImpl *This = impl_from_IMediaDet(iface); + FIXME("(%p)->(%s): not implemented!\n", This, debugstr_guid(pVal)); return E_NOTIMPL; } static HRESULT WINAPI MediaDet_get_StreamTypeB(IMediaDet* iface, BSTR *pVal) { - MediaDetImpl *This = (MediaDetImpl *)iface; + MediaDetImpl *This = impl_from_IMediaDet(iface); FIXME("(%p)->(%p): not implemented!\n", This, pVal); return E_NOTIMPL; } static HRESULT WINAPI MediaDet_get_StreamLength(IMediaDet* iface, double *pVal) { - MediaDetImpl *This = (MediaDetImpl *)iface; + MediaDetImpl *This = impl_from_IMediaDet(iface); FIXME("(%p): stub!\n", This); return VFW_E_INVALIDMEDIATYPE; } static HRESULT WINAPI MediaDet_get_Filename(IMediaDet* iface, BSTR *pVal) { - MediaDetImpl *This = (MediaDetImpl *)iface; + MediaDetImpl *This = impl_from_IMediaDet(iface); IFileSourceFilter *file; LPOLESTR name; HRESULT hr; @@ -378,52 +424,56 @@ if (FAILED(hr)) return hr; - hr = IEnumMoniker_Next(filters, 1, &mon, NULL); + hr = E_NOINTERFACE; + while (IEnumMoniker_Next(filters, 1, &mon, NULL) == S_OK) + { + hr = GetFilterInfo(mon, &clsid, &var); + IMoniker_Release(mon); + if (FAILED(hr)) + continue; + + hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **) &splitter); + if (FAILED(hr)) + { + VariantClear(&var); + continue; + } + + hr = IGraphBuilder_AddFilter(This->graph, splitter, + V_UNION(&var, bstrVal)); + VariantClear(&var); + This->splitter = splitter; + if (FAILED(hr)) + goto retry; + + hr = IBaseFilter_EnumPins(This->source, &pins); + if (FAILED(hr)) + goto retry; + IEnumPins_Next(pins, 1, &source_pin, NULL); + IEnumPins_Release(pins); + + hr = IBaseFilter_EnumPins(splitter, &pins); + if (FAILED(hr)) + { + IPin_Release(source_pin); + goto retry; + } + IEnumPins_Next(pins, 1, &splitter_pin, NULL); + IEnumPins_Release(pins); + + hr = IPin_Connect(source_pin, splitter_pin, NULL); + IPin_Release(source_pin); + IPin_Release(splitter_pin); + if (SUCCEEDED(hr)) + break; + +retry: + IBaseFilter_Release(splitter); + This->splitter = NULL; + } + IEnumMoniker_Release(filters); - if (hr != S_OK) /* No matches, what do we do? */ - return E_NOINTERFACE; - - hr = GetFilterInfo(mon, &clsid, &var); - IMoniker_Release(mon); - if (FAILED(hr)) - return hr; - - hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, - &IID_IBaseFilter, (void **) &splitter); - if (FAILED(hr)) - { - VariantClear(&var); - return hr; - } - - hr = IGraphBuilder_AddFilter(This->graph, splitter, - V_UNION(&var, bstrVal)); - VariantClear(&var); - if (FAILED(hr)) - { - IBaseFilter_Release(splitter); - return hr; - } - This->splitter = splitter; - - hr = IBaseFilter_EnumPins(This->source, &pins); - if (FAILED(hr)) - return hr; - IEnumPins_Next(pins, 1, &source_pin, NULL); - IEnumPins_Release(pins); - - hr = IBaseFilter_EnumPins(splitter, &pins); - if (FAILED(hr)) - { - IPin_Release(source_pin); - return hr; - } - IEnumPins_Next(pins, 1, &splitter_pin, NULL); - IEnumPins_Release(pins); - - hr = IPin_Connect(source_pin, splitter_pin, NULL); - IPin_Release(source_pin); - IPin_Release(splitter_pin); if (FAILED(hr)) return hr; @@ -433,7 +483,7 @@ static HRESULT WINAPI MediaDet_put_Filename(IMediaDet* iface, BSTR newVal) { static const WCHAR reader[] = {'R','e','a','d','e','r',0}; - MediaDetImpl *This = (MediaDetImpl *)iface; + MediaDetImpl *This = impl_from_IMediaDet(iface); IGraphBuilder *gb; IBaseFilter *bf; HRESULT hr; @@ -472,7 +522,7 @@ LONG *pBufferSize, char *pBuffer, LONG Width, LONG Height) { - MediaDetImpl *This = (MediaDetImpl *)iface; + MediaDetImpl *This = impl_from_IMediaDet(iface); FIXME("(%p)->(%f %p %p %d %d): not implemented!\n", This, StreamTime, pBufferSize, pBuffer, Width, Height); return E_NOTIMPL; @@ -482,7 +532,7 @@ double StreamTime, LONG Width, LONG Height, BSTR Filename) { - MediaDetImpl *This = (MediaDetImpl *)iface; + MediaDetImpl *This = impl_from_IMediaDet(iface); FIXME("(%p)->(%f %d %d %p): not implemented!\n", This, StreamTime, Width, Height, Filename); return E_NOTIMPL; } @@ -490,7 +540,7 @@ static HRESULT WINAPI MediaDet_get_StreamMediaType(IMediaDet* iface, AM_MEDIA_TYPE *pVal) { - MediaDetImpl *This = (MediaDetImpl *)iface; + MediaDetImpl *This = impl_from_IMediaDet(iface); IEnumMediaTypes *types; AM_MEDIA_TYPE *pmt; HRESULT hr; @@ -524,14 +574,14 @@ static HRESULT WINAPI MediaDet_GetSampleGrabber(IMediaDet* iface, ISampleGrabber **ppVal) { - MediaDetImpl *This = (MediaDetImpl *)iface; + MediaDetImpl *This = impl_from_IMediaDet(iface); FIXME("(%p)->(%p): not implemented!\n", This, ppVal); return E_NOTIMPL; } static HRESULT WINAPI MediaDet_get_FrameRate(IMediaDet* iface, double *pVal) { - MediaDetImpl *This = (MediaDetImpl *)iface; + MediaDetImpl *This = impl_from_IMediaDet(iface); AM_MEDIA_TYPE mt; VIDEOINFOHEADER *vh; HRESULT hr; @@ -561,7 +611,7 @@ static HRESULT WINAPI MediaDet_EnterBitmapGrabMode(IMediaDet* iface, double SeekTime) { - MediaDetImpl *This = (MediaDetImpl *)iface; + MediaDetImpl *This = impl_from_IMediaDet(iface); FIXME("(%p)->(%f): not implemented!\n", This, SeekTime); return E_NOTIMPL; } @@ -594,9 +644,6 @@ TRACE("(%p,%p)\n", ppv, pUnkOuter); - if (pUnkOuter) - return CLASS_E_NOAGGREGATION; - obj = CoTaskMemAlloc(sizeof(MediaDetImpl)); if (NULL == obj) { *ppv = NULL; @@ -604,8 +651,9 @@ } ZeroMemory(obj, sizeof(MediaDetImpl)); - obj->refCount = 1; - obj->MediaDet_Vtbl = &IMediaDet_VTable; + obj->ref = 1; + obj->IUnknown_inner.lpVtbl = &mediadet_vtbl; + obj->IMediaDet_iface.lpVtbl = &IMediaDet_VTable; obj->graph = NULL; obj->source = NULL; obj->splitter = NULL; @@ -614,5 +662,11 @@ obj->cur_stream = 0; *ppv = obj; - return S_OK; -} + if (pUnkOuter) + obj->outer_unk = pUnkOuter; + else + obj->outer_unk = &obj->IUnknown_inner; + + *ppv = &obj->IUnknown_inner; + return S_OK; +} Added: trunk/reactos/dll/directx/wine/qedit/qedit.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/qed… ============================================================================== --- trunk/reactos/dll/directx/wine/qedit/qedit.rc (added) +++ trunk/reactos/dll/directx/wine/qedit/qedit.rc [iso-8859-1] Fri Oct 11 13:12:40 2013 @@ -0,0 +1 @@ +1 WINE_REGISTRY qedit_classes.rgs Propchange: trunk/reactos/dll/directx/wine/qedit/qedit.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/wine/qedit/qedit_classes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/qed… ============================================================================== --- trunk/reactos/dll/directx/wine/qedit/qedit_classes.idl (added) +++ trunk/reactos/dll/directx/wine/qedit/qedit_classes.idl [iso-8859-1] Fri Oct 11 13:12:40 2013 @@ -0,0 +1,32 @@ +/* + * COM Classes for qedit + * + * Copyright 2010 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + threading(both), + uuid(65bd0711-24d2-4ff7-9324-ed2e5d3abafa) +] +coclass MediaDet { interface IMediaDet; } + +[ + helpstring("Sample Grabber"), + threading(both), + uuid(c1f400a0-3f08-11d3-9f0b-006008039e37) +] +coclass SampleGrabber { interface ISampleGrabber; } Propchange: trunk/reactos/dll/directx/wine/qedit/qedit_classes.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/wine/qedit/qedit_classes.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/qed… ============================================================================== --- trunk/reactos/dll/directx/wine/qedit/qedit_classes.rgs (added) +++ trunk/reactos/dll/directx/wine/qedit/qedit_classes.rgs [iso-8859-1] Fri Oct 11 13:12:40 2013 @@ -0,0 +1,17 @@ +HKCR +{ + NoRemove Interface + { + } + NoRemove CLSID + { + '{65BD0711-24D2-4FF7-9324-ED2E5D3ABAFA}' = s 'MediaDet' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } + '{C1F400A0-3F08-11D3-9F0B-006008039E37}' = s 'Sample Grabber' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } + } +} Propchange: trunk/reactos/dll/directx/wine/qedit/qedit_classes.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/wine/qedit/qedit_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/qed… ============================================================================== --- trunk/reactos/dll/directx/wine/qedit/qedit_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/qedit/qedit_private.h [iso-8859-1] Fri Oct 11 13:12:40 2013 @@ -1,9 +1,6 @@ /* DirectShow Editing Services (qedit.dll) * * Copyright 2008 Google (Lei Zhang) - * - * This file contains the (internal) driver registration functions, - * driver enumeration APIs and DirectDraw creation functions. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -43,7 +40,7 @@ #define __WINE_DDRAW_H /* ROS HACK */ #include <qedit.h> -HRESULT MediaDet_create(IUnknown *pUnkOuter, LPVOID *ppObj); -HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppObj); +HRESULT MediaDet_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; +HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; #endif /* __QEDIT_PRIVATE_INCLUDED__ */ Removed: trunk/reactos/dll/directx/wine/qedit/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/reg… ============================================================================== --- trunk/reactos/dll/directx/wine/qedit/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/qedit/regsvr.c (removed) @@ -1,330 +0,0 @@ -/* - * self-registerable dll functions for qedit.dll - * - * Copyright (C) 2008 Google (Lei Zhang) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "qedit_private.h" -//#include "winreg.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(qedit); - -struct regsvr_coclass -{ - CLSID const *clsid; /* NULL for end of list */ - LPCSTR name; /* can be NULL to omit */ - LPCSTR ips; /* can be NULL to omit */ - LPCSTR ips32; /* can be NULL to omit */ - LPCSTR ips32_tmodel; /* can be NULL to omit */ - LPCSTR progid; /* can be NULL to omit */ - LPCSTR viprogid; /* can be NULL to omit */ - LPCSTR progid_extra; /* can be NULL to omit */ -}; - -static HRESULT register_coclasses(struct regsvr_coclass const *list); -static HRESULT unregister_coclasses(struct regsvr_coclass const *list); - -/*********************************************************************** - * static string constants - */ -static WCHAR const clsid_keyname[6] = { - 'C', 'L', 'S', 'I', 'D', 0 }; -static WCHAR const curver_keyname[7] = { - 'C', 'u', 'r', 'V', 'e', 'r', 0 }; -static WCHAR const ips_keyname[13] = { - 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', 0 }; -static WCHAR const ips32_keyname[15] = { - 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', '3', '2', 0 }; -static WCHAR const progid_keyname[7] = { - 'P', 'r', 'o', 'g', 'I', 'D', 0 }; -static WCHAR const viprogid_keyname[25] = { - 'V', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'd', 'e', 'p', - 'e', 'n', 'd', 'e', 'n', 't', 'P', 'r', 'o', 'g', 'I', 'D', - 0 }; -static char const tmodel_valuename[] = "ThreadingModel"; - -/*********************************************************************** - * static helper functions - */ -static LONG register_key_defvalueW(HKEY base, WCHAR const *name, - WCHAR const *value); -static LONG register_key_defvalueA(HKEY base, WCHAR const *name, - char const *value); -static LONG register_progid(WCHAR const *clsid, - char const *progid, char const *curver_progid, - char const *name, char const *extra); - - - -/*********************************************************************** - * register_coclasses - */ -static HRESULT register_coclasses(struct regsvr_coclass const *list) -{ - LONG res = ERROR_SUCCESS; - HKEY coclass_key; - - res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &coclass_key, NULL); - if (res != ERROR_SUCCESS) goto error_return; - - for (; res == ERROR_SUCCESS && list->clsid; ++list) { - WCHAR buf[39]; - HKEY clsid_key; - - StringFromGUID2(list->clsid, buf, 39); - res = RegCreateKeyExW(coclass_key, buf, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &clsid_key, NULL); - if (res != ERROR_SUCCESS) goto error_close_coclass_key; - - if (list->name) { - res = RegSetValueExA(clsid_key, NULL, 0, REG_SZ, - (CONST BYTE*)(list->name), - strlen(list->name) + 1); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - if (list->ips) { - res = register_key_defvalueA(clsid_key, ips_keyname, list->ips); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - if (list->ips32) { - HKEY ips32_key; - - res = RegCreateKeyExW(clsid_key, ips32_keyname, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, - &ips32_key, NULL); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - - res = RegSetValueExA(ips32_key, NULL, 0, REG_SZ, - (CONST BYTE*)list->ips32, - lstrlenA(list->ips32) + 1); - if (res == ERROR_SUCCESS && list->ips32_tmodel) - res = RegSetValueExA(ips32_key, tmodel_valuename, 0, REG_SZ, - (CONST BYTE*)list->ips32_tmodel, - strlen(list->ips32_tmodel) + 1); - RegCloseKey(ips32_key); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - if (list->progid) { - res = register_key_defvalueA(clsid_key, progid_keyname, - list->progid); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - - res = register_progid(buf, list->progid, NULL, - list->name, list->progid_extra); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - if (list->viprogid) { - res = register_key_defvalueA(clsid_key, viprogid_keyname, - list->viprogid); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - - res = register_progid(buf, list->viprogid, list->progid, - list->name, list->progid_extra); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - -error_close_clsid_key: - RegCloseKey(clsid_key); - } - -error_close_coclass_key: - RegCloseKey(coclass_key); -error_return: - return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; -} - -/*********************************************************************** - * unregister_coclasses - */ -static HRESULT unregister_coclasses(struct regsvr_coclass const *list) -{ - LONG res = ERROR_SUCCESS; - HKEY coclass_key; - - res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, - KEY_READ | KEY_WRITE, &coclass_key); - if (res == ERROR_FILE_NOT_FOUND) return S_OK; - if (res != ERROR_SUCCESS) goto error_return; - - for (; res == ERROR_SUCCESS && list->clsid; ++list) { - WCHAR buf[39]; - - StringFromGUID2(list->clsid, buf, 39); - res = RegDeleteTreeW(coclass_key, buf); - if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; - if (res != ERROR_SUCCESS) goto error_close_coclass_key; - - if (list->progid) { - res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); - if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; - if (res != ERROR_SUCCESS) goto error_close_coclass_key; - } - - if (list->viprogid) { - res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); - if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; - if (res != ERROR_SUCCESS) goto error_close_coclass_key; - } - } - -error_close_coclass_key: - RegCloseKey(coclass_key); -error_return: - return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; -} - -/*********************************************************************** - * regsvr_key_defvalueW - */ -static LONG register_key_defvalueW( - HKEY base, - WCHAR const *name, - WCHAR const *value) -{ - LONG res; - HKEY key; - - res = RegCreateKeyExW(base, name, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &key, NULL); - if (res != ERROR_SUCCESS) return res; - res = RegSetValueExW(key, NULL, 0, REG_SZ, (CONST BYTE*)value, - (lstrlenW(value) + 1) * sizeof(WCHAR)); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * regsvr_key_defvalueA - */ -static LONG register_key_defvalueA( - HKEY base, - WCHAR const *name, - char const *value) -{ - LONG res; - HKEY key; - - res = RegCreateKeyExW(base, name, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &key, NULL); - if (res != ERROR_SUCCESS) return res; - res = RegSetValueExA(key, NULL, 0, REG_SZ, (CONST BYTE*)value, - lstrlenA(value) + 1); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * regsvr_progid - */ -static LONG register_progid( - WCHAR const *clsid, - char const *progid, - char const *curver_progid, - char const *name, - char const *extra) -{ - LONG res; - HKEY progid_key; - - res = RegCreateKeyExA(HKEY_CLASSES_ROOT, progid, 0, - NULL, 0, KEY_READ | KEY_WRITE, NULL, - &progid_key, NULL); - if (res != ERROR_SUCCESS) return res; - - if (name) { - res = RegSetValueExA(progid_key, NULL, 0, REG_SZ, - (CONST BYTE*)name, strlen(name) + 1); - if (res != ERROR_SUCCESS) goto error_close_progid_key; - } - - if (clsid) { - res = register_key_defvalueW(progid_key, clsid_keyname, clsid); - if (res != ERROR_SUCCESS) goto error_close_progid_key; - } - - if (curver_progid) { - res = register_key_defvalueA(progid_key, curver_keyname, - curver_progid); - if (res != ERROR_SUCCESS) goto error_close_progid_key; - } - - if (extra) { - HKEY extra_key; - - res = RegCreateKeyExA(progid_key, extra, 0, - NULL, 0, KEY_READ | KEY_WRITE, NULL, - &extra_key, NULL); - if (res == ERROR_SUCCESS) - RegCloseKey(extra_key); - } - -error_close_progid_key: - RegCloseKey(progid_key); - return res; -} - -/*********************************************************************** - * coclass list - */ -static struct regsvr_coclass const coclass_list[] = { - { &CLSID_MediaDet, - "MediaDet", - NULL, - "qedit.dll", - "Both" - }, - { &CLSID_SampleGrabber, - "Sample Grabber", - NULL, - "qedit.dll", - "Both" - }, - { NULL } /* list terminator */ -}; - -/*********************************************************************** - * DllRegisterServer (QEDIT.@) - */ -HRESULT WINAPI DllRegisterServer(void) -{ - HRESULT hr; - - TRACE("\n"); - - hr = register_coclasses(coclass_list); - return hr; -} - -/*********************************************************************** - * DllUnregisterServer (QEDIT.@) - */ -HRESULT WINAPI DllUnregisterServer(void) -{ - HRESULT hr; - - TRACE("\n"); - - hr = unregister_coclasses(coclass_list); - return hr; -} Modified: trunk/reactos/dll/directx/wine/qedit/samplegrabber.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/sam… ============================================================================== --- trunk/reactos/dll/directx/wine/qedit/samplegrabber.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/qedit/samplegrabber.c [iso-8859-1] Fri Oct 11 13:12:40 2013 @@ -32,12 +32,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(qedit); -static WCHAR const vendor_name[] = { 'W', 'i', 'n', 'e', 0 }; -static WCHAR const pin_in_name[] = { 'I', 'n', 0 }; -static WCHAR const pin_out_name[] = { 'O', 'u', 't', 0 }; - -IEnumPins *pinsenum_create(IBaseFilter *filter, IPin **pins, ULONG pinCount); -IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype); +static const WCHAR vendor_name[] = { 'W', 'i', 'n', 'e', 0 }; +static const WCHAR pin_in_name[] = { 'I', 'n', 0 }; +static const WCHAR pin_out_name[] = { 'O', 'u', 't', 0 }; + +static IEnumPins *pinsenum_create(IBaseFilter *filter, IPin **pins, ULONG pinCount); +static IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype); /* Fixed pins enumerator, holds filter referenced */ typedef struct _PE_Impl { @@ -88,7 +88,7 @@ if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IEnumPins)) { Fixed_IEnumPins_AddRef(iface); - *ppvObject = &(This->pins); + *ppvObject = This->pins; return S_OK; } *ppvObject = NULL; @@ -171,7 +171,7 @@ Fixed_IEnumPins_Clone, }; -IEnumPins *pinsenum_create(IBaseFilter *filter, IPin **pins, ULONG pinCount) +static IEnumPins *pinsenum_create(IBaseFilter *filter, IPin **pins, ULONG pinCount) { ULONG len = sizeof(PE_Impl) + (pinCount * sizeof(IPin *)); PE_Impl *obj = CoTaskMemAlloc(len); @@ -324,7 +324,7 @@ Single_IEnumMediaTypes_Clone, }; -IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype) +static IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype) { ME_Impl *obj = CoTaskMemAlloc(sizeof(ME_Impl)); if (obj) { @@ -351,20 +351,29 @@ /* Sample Grabber pin implementation */ typedef struct _SG_Pin { - const IPinVtbl* lpVtbl; + IPin IPin_iface; PIN_DIRECTION dir; WCHAR const *name; struct _SG_Impl *sg; IPin *pair; } SG_Pin; +static inline SG_Pin *impl_from_IPin(IPin *iface) +{ + return CONTAINING_RECORD(iface, SG_Pin, IPin_iface); +} + /* Sample Grabber filter implementation */ typedef struct _SG_Impl { - const IBaseFilterVtbl* IBaseFilter_Vtbl; - const ISampleGrabberVtbl* ISampleGrabber_Vtbl; - const IMemInputPinVtbl* IMemInputPin_Vtbl; - /* TODO: IMediaPosition, IMediaSeeking, IQualityControl */ - LONG refCount; + IUnknown IUnknown_inner; + IBaseFilter IBaseFilter_iface; + ISampleGrabber ISampleGrabber_iface; + IMemInputPin IMemInputPin_iface; + /* IMediaSeeking and IMediaPosition are implemented by ISeekingPassThru */ + IUnknown* seekthru_unk; + /* TODO: IQualityControl */ + IUnknown *outer_unk; + LONG ref; CRITICAL_SECTION critSect; FILTER_INFO info; FILTER_STATE state; @@ -387,20 +396,24 @@ OneShot_Past, }; -/* Get the SampleGrabber implementation This pointer from various interface pointers */ +static inline SG_Impl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, SG_Impl, IUnknown_inner); +} + static inline SG_Impl *impl_from_IBaseFilter(IBaseFilter *iface) { - return (SG_Impl *)((char*)iface - FIELD_OFFSET(SG_Impl, IBaseFilter_Vtbl)); + return CONTAINING_RECORD(iface, SG_Impl, IBaseFilter_iface); } static inline SG_Impl *impl_from_ISampleGrabber(ISampleGrabber *iface) { - return (SG_Impl *)((char*)iface - FIELD_OFFSET(SG_Impl, ISampleGrabber_Vtbl)); + return CONTAINING_RECORD(iface, SG_Impl, ISampleGrabber_iface); } static inline SG_Impl *impl_from_IMemInputPin(IMemInputPin *iface) { - return (SG_Impl *)((char*)iface - FIELD_OFFSET(SG_Impl, IMemInputPin_Vtbl)); + return CONTAINING_RECORD(iface, SG_Impl, IMemInputPin_iface); } @@ -422,65 +435,77 @@ CoTaskMemFree(This->mtype.pbFormat); if (This->bufferData) CoTaskMemFree(This->bufferData); + if(This->seekthru_unk) + IUnknown_Release(This->seekthru_unk); This->critSect.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->critSect); } -/* Common helper AddRef called from all interfaces */ -static ULONG SampleGrabber_addref(SG_Impl *This) -{ - ULONG refCount = InterlockedIncrement(&This->refCount); - TRACE("(%p) new ref = %u\n", This, refCount); - return refCount; -} - -/* Common helper Release called from all interfaces */ -static ULONG SampleGrabber_release(SG_Impl *This) -{ - ULONG refCount = InterlockedDecrement(&This->refCount); - TRACE("(%p) new ref = %u\n", This, refCount); - if (refCount == 0) +/* SampleGrabber inner IUnknown */ +static HRESULT WINAPI SampleGrabber_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + SG_Impl *This = impl_from_IUnknown(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown)) + *ppv = &This->IUnknown_inner; + else if (IsEqualIID(riid, &IID_IPersist) || IsEqualIID(riid, &IID_IMediaFilter) || + IsEqualIID(riid, &IID_IBaseFilter)) + *ppv = &This->IBaseFilter_iface; + else if (IsEqualIID(riid, &IID_ISampleGrabber)) + *ppv = &This->ISampleGrabber_iface; + else if (IsEqualIID(riid, &IID_IMemInputPin)) + *ppv = &This->IMemInputPin_iface; + else if (IsEqualIID(riid, &IID_IMediaPosition)) + return IUnknown_QueryInterface(This->seekthru_unk, riid, ppv); + else if (IsEqualIID(riid, &IID_IMediaSeeking)) + return IUnknown_QueryInterface(This->seekthru_unk, riid, ppv); + else if (IsEqualIID(riid, &IID_IQualityControl)) + FIXME("IQualityControl not implemented\n"); + else + WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppv); + + if (!*ppv) + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI SampleGrabber_AddRef(IUnknown *iface) +{ + SG_Impl *This = impl_from_IUnknown(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) new ref = %u\n", This, ref); + + return ref; +} + +static ULONG WINAPI SampleGrabber_Release(IUnknown *iface) +{ + SG_Impl *This = impl_from_IUnknown(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) new ref = %u\n", This, ref); + + if (ref == 0) { SampleGrabber_cleanup(This); CoTaskMemFree(This); return 0; } - return refCount; -} - -/* Common helper QueryInterface called from all interfaces */ -static HRESULT SampleGrabber_query(SG_Impl *This, REFIID riid, void **ppvObject) -{ - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); - - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IPersist) || - IsEqualIID(riid, &IID_IMediaFilter) || - IsEqualIID(riid, &IID_IBaseFilter)) { - SampleGrabber_addref(This); - *ppvObject = &(This->IBaseFilter_Vtbl); - return S_OK; - } - else if (IsEqualIID(riid, &IID_ISampleGrabber)) { - SampleGrabber_addref(This); - *ppvObject = &(This->ISampleGrabber_Vtbl); - return S_OK; - } - else if (IsEqualIID(riid, &IID_IMemInputPin)) { - SampleGrabber_addref(This); - *ppvObject = &(This->IMemInputPin_Vtbl); - return S_OK; - } - else if (IsEqualIID(riid, &IID_IMediaPosition)) - FIXME("IMediaPosition not implemented\n"); - else if (IsEqualIID(riid, &IID_IMediaSeeking)) - FIXME("IMediaSeeking not implemented\n"); - else if (IsEqualIID(riid, &IID_IQualityControl)) - FIXME("IQualityControl not implemented\n"); - *ppvObject = NULL; - WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppvObject); - return E_NOINTERFACE; -} + return ref; +} + +static const IUnknownVtbl samplegrabber_vtbl = +{ + SampleGrabber_QueryInterface, + SampleGrabber_AddRef, + SampleGrabber_Release, +}; /* Helper that buffers data and/or calls installed sample callbacks */ static void SampleGrabber_callback(SG_Impl *This, IMediaSample *sample) @@ -546,23 +571,26 @@ /* IUnknown */ static HRESULT WINAPI -SampleGrabber_IBaseFilter_QueryInterface(IBaseFilter *iface, REFIID riid, void **ppvObject) -{ - return SampleGrabber_query(impl_from_IBaseFilter(iface), riid, ppvObject); +SampleGrabber_IBaseFilter_QueryInterface(IBaseFilter *iface, REFIID riid, void **ppv) +{ + SG_Impl *This = impl_from_IBaseFilter(iface); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } /* IUnknown */ static ULONG WINAPI SampleGrabber_IBaseFilter_AddRef(IBaseFilter *iface) { - return SampleGrabber_addref(impl_from_IBaseFilter(iface)); + SG_Impl *This = impl_from_IBaseFilter(iface); + return IUnknown_AddRef(This->outer_unk); } /* IUnknown */ static ULONG WINAPI SampleGrabber_IBaseFilter_Release(IBaseFilter *iface) { - return SampleGrabber_release(impl_from_IBaseFilter(iface)); + SG_Impl *This = impl_from_IBaseFilter(iface); + return IUnknown_Release(This->outer_unk); } /* IPersist */ @@ -658,8 +686,8 @@ TRACE("(%p)->(%p)\n", This, pins); if (!pins) return E_POINTER; - pin[0] = (IPin*)&This->pin_in.lpVtbl; - pin[1] = (IPin*)&This->pin_out.lpVtbl; + pin[0] = &This->pin_in.IPin_iface; + pin[1] = &This->pin_out.IPin_iface; *pins = pinsenum_create(iface, pin, 2); return *pins ? S_OK : E_OUTOFMEMORY; } @@ -674,14 +702,14 @@ return E_POINTER; if (!lstrcmpiW(id,pin_in_name)) { - SampleGrabber_addref(This); - *pin = (IPin*)&(This->pin_in.lpVtbl); + *pin = &This->pin_in.IPin_iface; + IPin_AddRef(*pin); return S_OK; } else if (!lstrcmpiW(id,pin_out_name)) { - SampleGrabber_addref(This); - *pin = (IPin*)&(This->pin_out.lpVtbl); + *pin = &This->pin_out.IPin_iface; + IPin_AddRef(*pin); return S_OK; } *pin = NULL; @@ -732,23 +760,26 @@ /* IUnknown */ static HRESULT WINAPI -SampleGrabber_ISampleGrabber_QueryInterface(ISampleGrabber *iface, REFIID riid, void **ppvObject) -{ - return SampleGrabber_query(impl_from_ISampleGrabber(iface), riid, ppvObject); +SampleGrabber_ISampleGrabber_QueryInterface(ISampleGrabber *iface, REFIID riid, void **ppv) +{ + SG_Impl *This = impl_from_ISampleGrabber(iface); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } /* IUnknown */ static ULONG WINAPI SampleGrabber_ISampleGrabber_AddRef(ISampleGrabber *iface) { - return SampleGrabber_addref(impl_from_ISampleGrabber(iface)); + SG_Impl *This = impl_from_ISampleGrabber(iface); + return IUnknown_AddRef(This->outer_unk); } /* IUnknown */ static ULONG WINAPI SampleGrabber_ISampleGrabber_Release(ISampleGrabber *iface) { - return SampleGrabber_release(impl_from_ISampleGrabber(iface)); + SG_Impl *This = impl_from_ISampleGrabber(iface); + return IUnknown_Release(This->outer_unk); } /* ISampleGrabber */ @@ -879,23 +910,26 @@ /* IUnknown */ static HRESULT WINAPI -SampleGrabber_IMemInputPin_QueryInterface(IMemInputPin *iface, REFIID riid, void **ppvObject) -{ - return SampleGrabber_query(impl_from_IMemInputPin(iface), riid, ppvObject); +SampleGrabber_IMemInputPin_QueryInterface(IMemInputPin *iface, REFIID riid, void **ppv) +{ + SG_Impl *This = impl_from_IMemInputPin(iface); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } /* IUnknown */ static ULONG WINAPI SampleGrabber_IMemInputPin_AddRef(IMemInputPin *iface) { - return SampleGrabber_addref(impl_from_IMemInputPin(iface)); + SG_Impl *This = impl_from_IMemInputPin(iface); + return IUnknown_AddRef(This->outer_unk); } /* IUnknown */ static ULONG WINAPI SampleGrabber_IMemInputPin_Release(IMemInputPin *iface) { - return SampleGrabber_release(impl_from_IMemInputPin(iface)); + SG_Impl *This = impl_from_IMemInputPin(iface); + return IUnknown_Release(This->outer_unk); } /* IMemInputPin */ @@ -994,37 +1028,41 @@ static ULONG WINAPI SampleGrabber_IPin_AddRef(IPin *iface) { - return SampleGrabber_addref(((SG_Pin *)iface)->sg); + SG_Pin *This = impl_from_IPin(iface); + return ISampleGrabber_AddRef(&This->sg->ISampleGrabber_iface); } /* IUnknown */ static ULONG WINAPI SampleGrabber_IPin_Release(IPin *iface) { - return SampleGrabber_release(((SG_Pin *)iface)->sg); -} - -/* IUnknown */ -static HRESULT WINAPI -SampleGrabber_IPin_QueryInterface(IPin *iface, REFIID riid, void **ppvObject) -{ - SG_Pin *This = (SG_Pin *)iface; - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); - - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IPin)) { - SampleGrabber_addref(This->sg); - *ppvObject = This; - return S_OK; - } - else if (IsEqualIID(riid, &IID_IMemInputPin)) { - SampleGrabber_addref(This->sg); - *ppvObject = &(This->sg->IMemInputPin_Vtbl); - return S_OK; - } - *ppvObject = NULL; - WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppvObject); - return E_NOINTERFACE; + SG_Pin *This = impl_from_IPin(iface); + return ISampleGrabber_Release(&This->sg->ISampleGrabber_iface); +} + +/* IUnknown */ +static HRESULT WINAPI +SampleGrabber_IPin_QueryInterface(IPin *iface, REFIID riid, void **ppv) +{ + SG_Pin *This = impl_from_IPin(iface); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IPin)) + *ppv = iface; + else if (IsEqualIID(riid, &IID_IMemInputPin)) + *ppv = &This->sg->IMemInputPin_iface; + else if (IsEqualIID(riid, &IID_IMediaSeeking)) + return IUnknown_QueryInterface(&This->sg->IUnknown_inner, riid, ppv); + else if (IsEqualIID(riid, &IID_IMediaPosition)) + return IUnknown_QueryInterface(&This->sg->IUnknown_inner, riid, ppv); + else { + WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } /* IPin - input pin */ @@ -1039,8 +1077,9 @@ static HRESULT WINAPI SampleGrabber_Out_IPin_Connect(IPin *iface, IPin *receiver, const AM_MEDIA_TYPE *type) { - SG_Pin *This = (SG_Pin *)iface; + SG_Pin *This = impl_from_IPin(iface); HRESULT hr; + TRACE("(%p)->(%p, %p)\n", This, receiver, type); if (!receiver) return E_POINTER; @@ -1070,7 +1109,7 @@ !IsEqualGUID(&type->formattype, &GUID_NULL) && !type->pbFormat) return VFW_E_TYPE_NOT_ACCEPTED; - hr = IPin_ReceiveConnection(receiver,(IPin*)&This->lpVtbl,type); + hr = IPin_ReceiveConnection(receiver, &This->IPin_iface, type); if (FAILED(hr)) return hr; This->pair = receiver; @@ -1087,7 +1126,8 @@ static HRESULT WINAPI SampleGrabber_In_IPin_ReceiveConnection(IPin *iface, IPin *connector, const AM_MEDIA_TYPE *type) { - SG_Pin *This = (SG_Pin *)iface; + SG_Pin *This = impl_from_IPin(iface); + TRACE("(%p)->(%p, %p)\n", This, connector, type); if (!connector) return E_POINTER; @@ -1142,7 +1182,8 @@ static HRESULT WINAPI SampleGrabber_In_IPin_Disconnect(IPin *iface) { - SG_Pin *This = (SG_Pin *)iface; + SG_Pin *This = impl_from_IPin(iface); + TRACE("(%p)->() pair = %p\n", This, This->pair); if (This->sg->state != State_Stopped) return VFW_E_NOT_STOPPED; @@ -1157,7 +1198,8 @@ static HRESULT WINAPI SampleGrabber_Out_IPin_Disconnect(IPin *iface) { - SG_Pin *This = (SG_Pin *)iface; + SG_Pin *This = impl_from_IPin(iface); + TRACE("(%p)->() pair = %p\n", This, This->pair); if (This->sg->state != State_Stopped) return VFW_E_NOT_STOPPED; @@ -1176,7 +1218,8 @@ static HRESULT WINAPI SampleGrabber_IPin_ConnectedTo(IPin *iface, IPin **pin) { - SG_Pin *This = (SG_Pin *)iface; + SG_Pin *This = impl_from_IPin(iface); + TRACE("(%p)->(%p) pair = %p\n", This, pin, This->pair); if (!pin) return E_POINTER; @@ -1192,7 +1235,8 @@ static HRESULT WINAPI SampleGrabber_IPin_ConnectionMediaType(IPin *iface, AM_MEDIA_TYPE *mtype) { - SG_Pin *This = (SG_Pin *)iface; + SG_Pin *This = impl_from_IPin(iface); + TRACE("(%p)->(%p)\n", This, mtype); if (!mtype) return E_POINTER; @@ -1210,12 +1254,13 @@ static HRESULT WINAPI SampleGrabber_IPin_QueryPinInfo(IPin *iface, PIN_INFO *info) { - SG_Pin *This = (SG_Pin *)iface; + SG_Pin *This = impl_from_IPin(iface); + TRACE("(%p)->(%p)\n", This, info); if (!info) return E_POINTER; - SampleGrabber_addref(This->sg); - info->pFilter = (IBaseFilter *)This->sg; + IBaseFilter_AddRef(&This->sg->IBaseFilter_iface); + info->pFilter = &This->sg->IBaseFilter_iface; info->dir = This->dir; lstrcpynW(info->achName,This->name,MAX_PIN_NAME); return S_OK; @@ -1225,7 +1270,8 @@ static HRESULT WINAPI SampleGrabber_IPin_QueryDirection(IPin *iface, PIN_DIRECTION *dir) { - SG_Pin *This = (SG_Pin *)iface; + SG_Pin *This = impl_from_IPin(iface); + TRACE("(%p)->(%p)\n", This, dir); if (!dir) return E_POINTER; @@ -1237,7 +1283,8 @@ static HRESULT WINAPI SampleGrabber_IPin_QueryId(IPin *iface, LPWSTR *id) { - SG_Pin *This = (SG_Pin *)iface; + SG_Pin *This = impl_from_IPin(iface); + int len; TRACE("(%p)->(%p)\n", This, id); if (!id) @@ -1260,7 +1307,8 @@ static HRESULT WINAPI SampleGrabber_IPin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **mtypes) { - SG_Pin *This = (SG_Pin *)iface; + SG_Pin *This = impl_from_IPin(iface); + TRACE("(%p)->(%p)\n", This, mtypes); if (!mtypes) return E_POINTER; @@ -1272,15 +1320,16 @@ static HRESULT WINAPI SampleGrabber_In_IPin_QueryInternalConnections(IPin *iface, IPin **pins, ULONG *nPins) { - SG_Pin *This = (SG_Pin *)iface; + SG_Pin *This = impl_from_IPin(iface); + TRACE("(%p)->(%p, %p) size = %u\n", This, pins, nPins, (nPins ? *nPins : 0)); if (!nPins) return E_POINTER; if (*nPins) { if (!pins) return E_POINTER; - IPin_AddRef((IPin*)&This->sg->pin_out.lpVtbl); - *pins = (IPin*)&This->sg->pin_out.lpVtbl; + IPin_AddRef(&This->sg->pin_out.IPin_iface); + *pins = &This->sg->pin_out.IPin_iface; *nPins = 1; return S_OK; } @@ -1426,11 +1475,10 @@ HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppv) { SG_Impl* obj = NULL; + ISeekingPassThru *passthru; + HRESULT hr; TRACE("(%p,%p)\n", ppv, pUnkOuter); - - if (pUnkOuter) - return CLASS_E_NOAGGREGATION; obj = CoTaskMemAlloc(sizeof(SG_Impl)); if (NULL == obj) { @@ -1439,16 +1487,17 @@ } ZeroMemory(obj, sizeof(SG_Impl)); - obj->refCount = 1; - obj->IBaseFilter_Vtbl = &IBaseFilter_VTable; - obj->ISampleGrabber_Vtbl = &ISampleGrabber_VTable; - obj->IMemInputPin_Vtbl = &IMemInputPin_VTable; - obj->pin_in.lpVtbl = &IPin_In_VTable; + obj->ref = 1; + obj->IUnknown_inner.lpVtbl = &samplegrabber_vtbl; + obj->IBaseFilter_iface.lpVtbl = &IBaseFilter_VTable; + obj->ISampleGrabber_iface.lpVtbl = &ISampleGrabber_VTable; + obj->IMemInputPin_iface.lpVtbl = &IMemInputPin_VTable; + obj->pin_in.IPin_iface.lpVtbl = &IPin_In_VTable; obj->pin_in.dir = PINDIR_INPUT; obj->pin_in.name = pin_in_name; obj->pin_in.sg = obj; obj->pin_in.pair = NULL; - obj->pin_out.lpVtbl = &IPin_Out_VTable; + obj->pin_out.IPin_iface.lpVtbl = &IPin_Out_VTable; obj->pin_out.dir = PINDIR_OUTPUT; obj->pin_out.name = pin_out_name; obj->pin_out.sg = obj; @@ -1469,7 +1518,19 @@ obj->oneShot = OneShot_None; obj->bufferLen = -1; obj->bufferData = NULL; - *ppv = obj; - - return S_OK; -} + + if (pUnkOuter) + obj->outer_unk = pUnkOuter; + else + obj->outer_unk = &obj->IUnknown_inner; + + hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown*)obj, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&obj->seekthru_unk); + if(hr) + return hr; + IUnknown_QueryInterface(obj->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru); + ISeekingPassThru_Init(passthru, FALSE, &obj->pin_in.IPin_iface); + ISeekingPassThru_Release(passthru); + + *ppv = &obj->IUnknown_inner; + return S_OK; +} Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Oct 11 13:12:40 2013 @@ -44,7 +44,7 @@ reactos/dll/directx/wine/dxdiagn # Synced to Wine-1.7.1 reactos/dll/directx/wine/dxgi # Synced to Wine-1.7.1 reactos/dll/directx/wine/msdmo # Synced to Wine-1.7.1 -reactos/dll/directx/wine/qedit # Autosync +reactos/dll/directx/wine/qedit # Synced to Wine-1.7.1 reactos/dll/directx/wine/quartz # Synced to Wine-1.5.26 reactos/dll/directx/wine/wined3d # Synced to Wine-1.7.1

1 0

[akhaldi] 60604: [MSDMO] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 11 Oct '13

11 Oct '13

Author: akhaldi Date: Fri Oct 11 13:11:30 2013 New Revision: 60604 URL: http://svn.reactos.org/svn/reactos?rev=60604&view=rev Log: [MSDMO] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/directx/wine/msdmo/CMakeLists.txt trunk/reactos/dll/directx/wine/msdmo/dmoreg.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/msdmo/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/msdmo/CMa… ============================================================================== --- trunk/reactos/dll/directx/wine/msdmo/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/msdmo/CMakeLists.txt [iso-8859-1] Fri Oct 11 13:11:30 2013 @@ -1,29 +1,16 @@ - add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(msdmo.dll msdmo.spec) -add_library(msdmo SHARED +list(APPEND SOURCE dmoreg.c dmort.c stubs.c - rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/msdmo.def) -set_module_type(msdmo win32dll UNICODE) - +add_library(msdmo SHARED ${SOURCE} rsrc.rc) +set_module_type(msdmo win32dll) target_link_libraries(msdmo uuid wine mediaobj_guid) - -add_importlibs(msdmo - msvcrt - user32 - advapi32 - ole32 - kernel32 - ntdll) - -add_dependencies(msdmo dxsdk psdk) - +add_importlibs(msdmo user32 advapi32 ole32 msvcrt kernel32 ntdll) add_cd_file(TARGET msdmo DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/msdmo/dmoreg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/msdmo/dmo… ============================================================================== --- trunk/reactos/dll/directx/wine/msdmo/dmoreg.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/msdmo/dmoreg.c [iso-8859-1] Fri Oct 11 13:11:30 2013 @@ -89,7 +89,7 @@ typedef struct { - const IEnumDMOVtbl *lpVtbl; + IEnumDMO IEnumDMO_iface; LONG ref; DWORD index; const GUID* guidCategory; @@ -100,6 +100,11 @@ DMO_PARTIAL_MEDIATYPE *pOutTypes; HKEY hkey; } IEnumDMOImpl; + +static inline IEnumDMOImpl *impl_from_IEnumDMO(IEnumDMO *iface) +{ + return CONTAINING_RECORD(iface, IEnumDMOImpl, IEnumDMO_iface); +} static HRESULT read_types(HKEY root, LPCWSTR key, ULONG *supplied, ULONG requested, DMO_PARTIAL_MEDIATYPE* types); @@ -332,12 +337,10 @@ /************************************************************************** -* IEnumDMO_Destructor +* IEnumDMOImpl_Destructor */ -static BOOL IEnumDMO_Destructor(IEnumDMO* iface) -{ - IEnumDMOImpl *This = (IEnumDMOImpl *)iface; - +static BOOL IEnumDMOImpl_Destructor(IEnumDMOImpl* This) +{ TRACE("%p\n", This); if (This->hkey) @@ -370,7 +373,7 @@ if (lpedmo) { lpedmo->ref = 1; - lpedmo->lpVtbl = &edmovt; + lpedmo->IEnumDMO_iface.lpVtbl = &edmovt; lpedmo->index = -1; lpedmo->guidCategory = guidCategory; lpedmo->dwFlags = dwFlags; @@ -417,7 +420,7 @@ lerr: if(!ret) { - IEnumDMO_Destructor((IEnumDMO*)lpedmo); + IEnumDMOImpl_Destructor(lpedmo); HeapFree(GetProcessHeap(),0,lpedmo); lpedmo = NULL; } @@ -434,7 +437,7 @@ */ static ULONG WINAPI IEnumDMO_fnAddRef(IEnumDMO * iface) { - IEnumDMOImpl *This = (IEnumDMOImpl *)iface; + IEnumDMOImpl *This = impl_from_IEnumDMO(iface); return InterlockedIncrement(&This->ref); } @@ -447,7 +450,7 @@ REFIID riid, LPVOID *ppvObj) { - IEnumDMOImpl *This = (IEnumDMOImpl *)iface; + IEnumDMOImpl *This = impl_from_IEnumDMO(iface); *ppvObj = NULL; @@ -471,12 +474,12 @@ */ static ULONG WINAPI IEnumDMO_fnRelease(IEnumDMO * iface) { - IEnumDMOImpl *This = (IEnumDMOImpl *)iface; + IEnumDMOImpl *This = impl_from_IEnumDMO(iface); ULONG refCount = InterlockedDecrement(&This->ref); if (!refCount) { - IEnumDMO_Destructor((IEnumDMO*)This); + IEnumDMOImpl_Destructor(This); HeapFree(GetProcessHeap(),0,This); } return refCount; @@ -503,7 +506,7 @@ UINT count = 0; HRESULT hres = S_OK; - IEnumDMOImpl *This = (IEnumDMOImpl *)iface; + IEnumDMOImpl *This = impl_from_IEnumDMO(iface); TRACE("--> (%p) %d %p %p %p\n", iface, cItemsToFetch, pCLSID, Names, pcItemsFetched); @@ -642,7 +645,7 @@ */ static HRESULT WINAPI IEnumDMO_fnSkip(IEnumDMO * iface, DWORD cItemsToSkip) { - IEnumDMOImpl *This = (IEnumDMOImpl *)iface; + IEnumDMOImpl *This = impl_from_IEnumDMO(iface); This->index += cItemsToSkip; @@ -655,7 +658,7 @@ */ static HRESULT WINAPI IEnumDMO_fnReset(IEnumDMO * iface) { - IEnumDMOImpl *This = (IEnumDMOImpl *)iface; + IEnumDMOImpl *This = impl_from_IEnumDMO(iface); This->index = -1; @@ -668,7 +671,7 @@ */ static HRESULT WINAPI IEnumDMO_fnClone(IEnumDMO * iface, IEnumDMO **ppEnum) { - IEnumDMOImpl *This = (IEnumDMOImpl *)iface; + IEnumDMOImpl *This = impl_from_IEnumDMO(iface); FIXME("(%p)->() to (%p)->() E_NOTIMPL\n", This, ppEnum); @@ -802,9 +805,9 @@ HRESULT ret = S_OK; WCHAR szguid[64]; - TRACE ("(%s,%u,%p,%p,%u,%p,%p),stub!\n", debugstr_guid(clsidDMO), - ulInputTypesRequested, pulInputTypesSupplied, pInputTypes, - ulOutputTypesRequested, pulOutputTypesSupplied, pOutputTypes); + TRACE ("(%s,%u,%p,%p,%u,%p,%p)\n", debugstr_guid(clsidDMO), ulInputTypesRequested, + pulInputTypesSupplied, pInputTypes, ulOutputTypesRequested, pulOutputTypesSupplied, + pOutputTypes); if (ERROR_SUCCESS != RegOpenKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, KEY_READ, &root)) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Oct 11 13:11:30 2013 @@ -43,7 +43,7 @@ reactos/dll/directx/wine/dsound # Synced to Wine-1.7.1 reactos/dll/directx/wine/dxdiagn # Synced to Wine-1.7.1 reactos/dll/directx/wine/dxgi # Synced to Wine-1.7.1 -reactos/dll/directx/wine/msdmo # Autosync +reactos/dll/directx/wine/msdmo # Synced to Wine-1.7.1 reactos/dll/directx/wine/qedit # Autosync reactos/dll/directx/wine/quartz # Synced to Wine-1.5.26 reactos/dll/directx/wine/wined3d # Synced to Wine-1.7.1

1 0

[aandrejevic] 60603: [SOFT386] Fix a bug in Soft386ExceptionWithErrorCode. The instruction pointer exceptions can return to should point to the instruction that caused the exception.
by aandrejevic＠svn.reactos.org 11 Oct '13

11 Oct '13

Author: aandrejevic Date: Fri Oct 11 12:24:05 2013 New Revision: 60603 URL: http://svn.reactos.org/svn/reactos?rev=60603&view=rev Log: [SOFT386] Fix a bug in Soft386ExceptionWithErrorCode. The instruction pointer exceptions can return to should point to the instruction that caused the exception. Modified: branches/ntvdm/include/reactos/libs/soft386/soft386.h branches/ntvdm/lib/soft386/common.c branches/ntvdm/lib/soft386/soft386.c Modified: branches/ntvdm/include/reactos/libs/soft386/soft386.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/soft… ============================================================================== --- branches/ntvdm/include/reactos/libs/soft386/soft386.h [iso-8859-1] (original) +++ branches/ntvdm/include/reactos/libs/soft386/soft386.h [iso-8859-1] Fri Oct 11 12:24:05 2013 @@ -319,7 +319,7 @@ SOFT386_BOP_PROC BopCallback; SOFT386_REG GeneralRegs[SOFT386_NUM_GEN_REGS]; SOFT386_SEG_REG SegmentRegs[SOFT386_NUM_SEG_REGS]; - SOFT386_REG InstPtr; + SOFT386_REG InstPtr, SavedInstPtr; SOFT386_FLAGS_REG Flags; SOFT386_TABLE_REG Gdtr, Idtr, Ldtr, Tss; ULONGLONG TimeStampCounter; Modified: branches/ntvdm/lib/soft386/common.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/common.c?rev=… ============================================================================== --- branches/ntvdm/lib/soft386/common.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/common.c [iso-8859-1] Fri Oct 11 12:24:05 2013 @@ -469,6 +469,9 @@ return; } + /* Restore the IP to the saved IP */ + State->InstPtr = State->SavedInstPtr; + if (!Soft386GetIntVector(State, ExceptionCode, &IdtEntry)) { /* Modified: branches/ntvdm/lib/soft386/soft386.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/soft386.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/soft386.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/soft386.c [iso-8859-1] Fri Oct 11 12:24:05 2013 @@ -56,6 +56,9 @@ /* Main execution loop */ do { + /* If this is a new instruction, save the IP */ + if (State->PrefixFlags == 0) State->SavedInstPtr = State->InstPtr; + /* Perform an instruction fetch */ if (!Soft386FetchByte(State, &Opcode)) continue;

1 0

[jimtabor] 60602: [Win32k] - Add drawing support to win32k. Needed for scrolls server side and nonclient support for icons.
by jimtabor＠svn.reactos.org 10 Oct '13

10 Oct '13

Author: jimtabor Date: Thu Oct 10 22:07:10 2013 New Revision: 60602 URL: http://svn.reactos.org/svn/reactos?rev=60602&view=rev Log: [Win32k] - Add drawing support to win32k. Needed for scrolls server side and nonclient support for icons. Added: trunk/reactos/win32ss/user/ntuser/draw.c (with props) Modified: trunk/reactos/win32ss/CMakeLists.txt trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] Thu Oct 10 22:07:10 2013 @@ -108,6 +108,7 @@ user/ntuser/defwnd.c user/ntuser/desktop.c user/ntuser/display.c + user/ntuser/draw.c user/ntuser/event.c user/ntuser/focus.c user/ntuser/guicheck.c Added: trunk/reactos/win32ss/user/ntuser/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/draw.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/draw.c (added) +++ trunk/reactos/win32ss/user/ntuser/draw.c [iso-8859-1] Thu Oct 10 22:07:10 2013 @@ -0,0 +1,1069 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Win32k subsystem + * PURPOSE: Win32ss internal drawing support. + * FILE: win32ss/user/ntuser/draw.c + * PROGRAMER: + */ + +// +// Original code from Wine see user32/windows/draw.c. +// +// + +#include <win32k.h> + +/* These tables are used in: + * UITOOLS_DrawDiagEdge() + * UITOOLS_DrawRectEdge() + */ +static const signed char LTInnerNormal[] = { + -1, -1, -1, -1, + -1, COLOR_BTNHIGHLIGHT, COLOR_BTNHIGHLIGHT, -1, + -1, COLOR_3DDKSHADOW, COLOR_3DDKSHADOW, -1, + -1, -1, -1, -1 +}; + +static const signed char LTOuterNormal[] = { + -1, COLOR_3DLIGHT, COLOR_BTNSHADOW, -1, + COLOR_BTNHIGHLIGHT, COLOR_3DLIGHT, COLOR_BTNSHADOW, -1, + COLOR_3DDKSHADOW, COLOR_3DLIGHT, COLOR_BTNSHADOW, -1, + -1, COLOR_3DLIGHT, COLOR_BTNSHADOW, -1 +}; + +static const signed char RBInnerNormal[] = { + -1, -1, -1, -1, + -1, COLOR_BTNSHADOW, COLOR_BTNSHADOW, -1, + -1, COLOR_3DLIGHT, COLOR_3DLIGHT, -1, + -1, -1, -1, -1 +}; + +static const signed char RBOuterNormal[] = { + -1, COLOR_3DDKSHADOW, COLOR_BTNHIGHLIGHT, -1, + COLOR_BTNSHADOW, COLOR_3DDKSHADOW, COLOR_BTNHIGHLIGHT, -1, + COLOR_3DLIGHT, COLOR_3DDKSHADOW, COLOR_BTNHIGHLIGHT, -1, + -1, COLOR_3DDKSHADOW, COLOR_BTNHIGHLIGHT, -1 +}; + +static const signed char LTInnerSoft[] = { + -1, -1, -1, -1, + -1, COLOR_3DLIGHT, COLOR_3DLIGHT, -1, + -1, COLOR_BTNSHADOW, COLOR_BTNSHADOW, -1, + -1, -1, -1, -1 +}; + +static const signed char LTOuterSoft[] = { + -1, COLOR_BTNHIGHLIGHT, COLOR_3DDKSHADOW, -1, + COLOR_3DLIGHT, COLOR_BTNHIGHLIGHT, COLOR_3DDKSHADOW, -1, + COLOR_BTNSHADOW, COLOR_BTNHIGHLIGHT, COLOR_3DDKSHADOW, -1, + -1, COLOR_BTNHIGHLIGHT, COLOR_3DDKSHADOW, -1 +}; + +#define RBInnerSoft RBInnerNormal /* These are the same */ +#define RBOuterSoft RBOuterNormal + +static const signed char LTRBOuterMono[] = { + -1, COLOR_WINDOWFRAME, COLOR_WINDOWFRAME, COLOR_WINDOWFRAME, + COLOR_WINDOW, COLOR_WINDOWFRAME, COLOR_WINDOWFRAME, COLOR_WINDOWFRAME, + COLOR_WINDOW, COLOR_WINDOWFRAME, COLOR_WINDOWFRAME, COLOR_WINDOWFRAME, + COLOR_WINDOW, COLOR_WINDOWFRAME, COLOR_WINDOWFRAME, COLOR_WINDOWFRAME, +}; + +static const signed char LTRBInnerMono[] = { + -1, -1, -1, -1, + -1, COLOR_WINDOW, COLOR_WINDOW, COLOR_WINDOW, + -1, COLOR_WINDOW, COLOR_WINDOW, COLOR_WINDOW, + -1, COLOR_WINDOW, COLOR_WINDOW, COLOR_WINDOW, +}; + +static const signed char LTRBOuterFlat[] = { + -1, COLOR_BTNSHADOW, COLOR_BTNSHADOW, COLOR_BTNSHADOW, + COLOR_BTNFACE, COLOR_BTNSHADOW, COLOR_BTNSHADOW, COLOR_BTNSHADOW, + COLOR_BTNFACE, COLOR_BTNSHADOW, COLOR_BTNSHADOW, COLOR_BTNSHADOW, + COLOR_BTNFACE, COLOR_BTNSHADOW, COLOR_BTNSHADOW, COLOR_BTNSHADOW, +}; + +static const signed char LTRBInnerFlat[] = { + -1, -1, -1, -1, + -1, COLOR_BTNFACE, COLOR_BTNFACE, COLOR_BTNFACE, + -1, COLOR_BTNFACE, COLOR_BTNFACE, COLOR_BTNFACE, + -1, COLOR_BTNFACE, COLOR_BTNFACE, COLOR_BTNFACE, +}; + +/* Ported from WINE20020904 */ +/* Same as DrawEdge invoked with BF_DIAGONAL */ +BOOL FASTCALL IntDrawDiagEdge(HDC hdc, LPRECT rc, UINT uType, UINT uFlags) +{ + POINT Points[4]; + signed char InnerI, OuterI; + HPEN InnerPen, OuterPen; + POINT SavePoint; + HPEN SavePen; + int spx, spy; + int epx, epy; + int Width = rc->right - rc->left; + int Height= rc->bottom - rc->top; + int SmallDiam = Width > Height ? Height : Width; + BOOL retval = !( ((uType & BDR_INNER) == BDR_INNER + || (uType & BDR_OUTER) == BDR_OUTER) + && !(uFlags & (BF_FLAT|BF_MONO)) ); + int add = (LTRBInnerMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? 1 : 0) + + (LTRBOuterMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? 1 : 0); + + /* Init some vars */ + OuterPen = InnerPen = (HPEN)NtGdiGetStockObject(NULL_PEN); + SavePen = (HPEN)NtGdiSelectPen(hdc, InnerPen); + spx = spy = epx = epy = 0; /* Satisfy the compiler... */ + + /* Determine the colors of the edges */ + if(uFlags & BF_MONO) + { + InnerI = LTRBInnerMono[uType & (BDR_INNER|BDR_OUTER)]; + OuterI = LTRBOuterMono[uType & (BDR_INNER|BDR_OUTER)]; + } + else if(uFlags & BF_FLAT) + { + InnerI = LTRBInnerFlat[uType & (BDR_INNER|BDR_OUTER)]; + OuterI = LTRBOuterFlat[uType & (BDR_INNER|BDR_OUTER)]; + } + else if(uFlags & BF_SOFT) + { + if(uFlags & BF_BOTTOM) + { + InnerI = RBInnerSoft[uType & (BDR_INNER|BDR_OUTER)]; + OuterI = RBOuterSoft[uType & (BDR_INNER|BDR_OUTER)]; + } + else + { + InnerI = LTInnerSoft[uType & (BDR_INNER|BDR_OUTER)]; + OuterI = LTOuterSoft[uType & (BDR_INNER|BDR_OUTER)]; + } + } + else + { + if(uFlags & BF_BOTTOM) + { + InnerI = RBInnerNormal[uType & (BDR_INNER|BDR_OUTER)]; + OuterI = RBOuterNormal[uType & (BDR_INNER|BDR_OUTER)]; + } + else + { + InnerI = LTInnerNormal[uType & (BDR_INNER|BDR_OUTER)]; + OuterI = LTOuterNormal[uType & (BDR_INNER|BDR_OUTER)]; + } + } + + if(InnerI != -1) + InnerPen = NtGdiGetStockObject(DC_PEN); + if(OuterI != -1) + OuterPen = NtGdiGetStockObject(DC_PEN); + + GreMoveTo(hdc, 0, 0, &SavePoint); + + /* Don't ask me why, but this is what is visible... */ + /* This must be possible to do much simpler, but I fail to */ + /* see the logic in the MS implementation (sigh...). */ + /* So, this might look a bit brute force here (and it is), but */ + /* it gets the job done;) */ + + switch(uFlags & BF_RECT) + { + case 0: + case BF_LEFT: + case BF_BOTTOM: + case BF_BOTTOMLEFT: + /* Left bottom endpoint */ + epx = rc->left-1; + spx = epx + SmallDiam; + epy = rc->bottom; + spy = epy - SmallDiam; + break; + + case BF_TOPLEFT: + case BF_BOTTOMRIGHT: + /* Left top endpoint */ + epx = rc->left-1; + spx = epx + SmallDiam; + epy = rc->top-1; + spy = epy + SmallDiam; + break; + + case BF_TOP: + case BF_RIGHT: + case BF_TOPRIGHT: + case BF_RIGHT|BF_LEFT: + case BF_RIGHT|BF_LEFT|BF_TOP: + case BF_BOTTOM|BF_TOP: + case BF_BOTTOM|BF_TOP|BF_LEFT: + case BF_BOTTOMRIGHT|BF_LEFT: + case BF_BOTTOMRIGHT|BF_TOP: + case BF_RECT: + /* Right top endpoint */ + spx = rc->left; + epx = spx + SmallDiam; + spy = rc->bottom-1; + epy = spy - SmallDiam; + break; + } + + GreMoveTo(hdc, spx, spy, NULL); + NtGdiSelectPen(hdc, OuterPen); + IntSetDCPenColor(hdc, IntGetSysColor(OuterI)); + NtGdiLineTo(hdc, epx, epy); + + NtGdiSelectPen(hdc, InnerPen); + IntSetDCPenColor(hdc, IntGetSysColor(InnerI)); + + switch(uFlags & (BF_RECT|BF_DIAGONAL)) + { + case BF_DIAGONAL_ENDBOTTOMLEFT: + case (BF_DIAGONAL|BF_BOTTOM): + case BF_DIAGONAL: + case (BF_DIAGONAL|BF_LEFT): + GreMoveTo(hdc, spx-1, spy, NULL); + NtGdiLineTo(hdc, epx, epy-1); + Points[0].x = spx-add; + Points[0].y = spy; + Points[1].x = rc->left; + Points[1].y = rc->top; + Points[2].x = epx+1; + Points[2].y = epy-1-add; + Points[3] = Points[2]; + break; + + case BF_DIAGONAL_ENDBOTTOMRIGHT: + GreMoveTo(hdc, spx-1, spy, NULL); + NtGdiLineTo(hdc, epx, epy+1); + Points[0].x = spx-add; + Points[0].y = spy; + Points[1].x = rc->left; + Points[1].y = rc->bottom-1; + Points[2].x = epx+1; + Points[2].y = epy+1+add; + Points[3] = Points[2]; + break; + + case (BF_DIAGONAL|BF_BOTTOM|BF_RIGHT|BF_TOP): + case (BF_DIAGONAL|BF_BOTTOM|BF_RIGHT|BF_TOP|BF_LEFT): + case BF_DIAGONAL_ENDTOPRIGHT: + case (BF_DIAGONAL|BF_RIGHT|BF_TOP|BF_LEFT): + GreMoveTo(hdc, spx+1, spy, NULL); + NtGdiLineTo(hdc, epx, epy+1); + Points[0].x = epx-1; + Points[0].y = epy+1+add; + Points[1].x = rc->right-1; + Points[1].y = rc->top+add; + Points[2].x = rc->right-1; + Points[2].y = rc->bottom-1; + Points[3].x = spx+add; + Points[3].y = spy; + break; + + case BF_DIAGONAL_ENDTOPLEFT: + GreMoveTo(hdc, spx, spy-1, NULL); + NtGdiLineTo(hdc, epx+1, epy); + Points[0].x = epx+1+add; + Points[0].y = epy+1; + Points[1].x = rc->right-1; + Points[1].y = rc->top; + Points[2].x = rc->right-1; + Points[2].y = rc->bottom-1-add; + Points[3].x = spx; + Points[3].y = spy-add; + break; + + case (BF_DIAGONAL|BF_TOP): + case (BF_DIAGONAL|BF_BOTTOM|BF_TOP): + case (BF_DIAGONAL|BF_BOTTOM|BF_TOP|BF_LEFT): + GreMoveTo(hdc, spx+1, spy-1, NULL); + NtGdiLineTo(hdc, epx, epy); + Points[0].x = epx-1; + Points[0].y = epy+1; + Points[1].x = rc->right-1; + Points[1].y = rc->top; + Points[2].x = rc->right-1; + Points[2].y = rc->bottom-1-add; + Points[3].x = spx+add; + Points[3].y = spy-add; + break; + + case (BF_DIAGONAL|BF_RIGHT): + case (BF_DIAGONAL|BF_RIGHT|BF_LEFT): + case (BF_DIAGONAL|BF_RIGHT|BF_LEFT|BF_BOTTOM): + GreMoveTo(hdc, spx, spy, NULL); + NtGdiLineTo(hdc, epx-1, epy+1); + Points[0].x = spx; + Points[0].y = spy; + Points[1].x = rc->left; + Points[1].y = rc->top+add; + Points[2].x = epx-1-add; + Points[2].y = epy+1+add; + Points[3] = Points[2]; + break; + } + + /* Fill the interior if asked */ + if((uFlags & BF_MIDDLE) && retval) + { + HBRUSH hbsave; + HPEN hpsave; + hbsave = (HBRUSH)NtGdiSelectBrush(hdc, NtGdiGetStockObject(DC_BRUSH)); + hpsave = (HPEN)NtGdiSelectPen(hdc, NtGdiGetStockObject(DC_PEN)); + IntSetDCBrushColor(hdc, IntGetSysColor(uFlags & BF_MONO ? COLOR_WINDOW : COLOR_BTNFACE)); + IntSetDCPenColor(hdc, IntGetSysColor(uFlags & BF_MONO ? COLOR_WINDOW : COLOR_BTNFACE)); + IntPolygon(hdc, Points, 4); + NtGdiSelectBrush(hdc, hbsave); + NtGdiSelectPen(hdc, hpsave); + } + + /* Adjust rectangle if asked */ + if(uFlags & BF_ADJUST) + { + if(uFlags & BF_LEFT) + rc->left += add; + if(uFlags & BF_RIGHT) + rc->right -= add; + if(uFlags & BF_TOP) + rc->top += add; + if(uFlags & BF_BOTTOM) + rc->bottom -= add; + } + + /* Cleanup */ + NtGdiSelectPen(hdc, SavePen); + GreMoveTo(hdc, SavePoint.x, SavePoint.y, NULL); + + return retval; +} + +/* Ported from WINE20020904 */ +/* Same as DrawEdge invoked without BF_DIAGONAL + * + * 23-Nov-1997: Changed by Bertho Stultiens + * + * Well, I started testing this and found out that there are a few things + * that weren't quite as win95. The following rewrite should reproduce + * win95 results completely. + * The colorselection is table-driven to avoid awfull if-statements. + * The table below show the color settings. + * + * Pen selection table for uFlags = 0 + * + * uType | LTI | LTO | RBI | RBO + * ------+-------+-------+-------+------- + * 0000 | x | x | x | x + * 0001 | x | 22 | x | 21 + * 0010 | x | 16 | x | 20 + * 0011 | x | x | x | x + * ------+-------+-------+-------+------- + * 0100 | x | 20 | x | 16 + * 0101 | 20 | 22 | 16 | 21 + * 0110 | 20 | 16 | 16 | 20 + * 0111 | x | x | x | x + * ------+-------+-------+-------+------- + * 1000 | x | 21 | x | 22 + * 1001 | 21 | 22 | 22 | 21 + * 1010 | 21 | 16 | 22 | 20 + * 1011 | x | x | x | x + * ------+-------+-------+-------+------- + * 1100 | x | x | x | x + * 1101 | x | x (22)| x | x (21) + * 1110 | x | x (16)| x | x (20) + * 1111 | x | x | x | x + * + * Pen selection table for uFlags = BF_SOFT + * + * uType | LTI | LTO | RBI | RBO + * ------+-------+-------+-------+------- + * 0000 | x | x | x | x + * 0001 | x | 20 | x | 21 + * 0010 | x | 21 | x | 20 + * 0011 | x | x | x | x + * ------+-------+-------+-------+------- + * 0100 | x | 22 | x | 16 + * 0101 | 22 | 20 | 16 | 21 + * 0110 | 22 | 21 | 16 | 20 + * 0111 | x | x | x | x + * ------+-------+-------+-------+------- + * 1000 | x | 16 | x | 22 + * 1001 | 16 | 20 | 22 | 21 + * 1010 | 16 | 21 | 22 | 20 + * 1011 | x | x | x | x + * ------+-------+-------+-------+------- + * 1100 | x | x | x | x + * 1101 | x | x (20)| x | x (21) + * 1110 | x | x (21)| x | x (20) + * 1111 | x | x | x | x + * + * x = don't care; (n) = is what win95 actually uses + * LTI = left Top Inner line + * LTO = left Top Outer line + * RBI = Right Bottom Inner line + * RBO = Right Bottom Outer line + * 15 = COLOR_BTNFACE + * 16 = COLOR_BTNSHADOW + * 20 = COLOR_BTNHIGHLIGHT + * 21 = COLOR_3DDKSHADOW + * 22 = COLOR_3DLIGHT + */ +BOOL FASTCALL IntDrawRectEdge(HDC hdc, LPRECT rc, UINT uType, UINT uFlags) +{ + signed char LTInnerI, LTOuterI; + signed char RBInnerI, RBOuterI; + HPEN LTInnerPen, LTOuterPen; + HPEN RBInnerPen, RBOuterPen; + RECT InnerRect = *rc; + POINT SavePoint; + HPEN SavePen; + int LBpenplus = 0; + int LTpenplus = 0; + int RTpenplus = 0; + int RBpenplus = 0; + BOOL retval = !( ((uType & BDR_INNER) == BDR_INNER + || (uType & BDR_OUTER) == BDR_OUTER) + && !(uFlags & (BF_FLAT|BF_MONO)) ); + /* Init some vars */ + LTInnerPen = LTOuterPen = RBInnerPen = RBOuterPen = (HPEN)NtGdiGetStockObject(NULL_PEN); + SavePen = (HPEN)NtGdiSelectPen(hdc, LTInnerPen); + + /* Determine the colors of the edges */ + if(uFlags & BF_MONO) + { + LTInnerI = RBInnerI = LTRBInnerMono[uType & (BDR_INNER|BDR_OUTER)]; + LTOuterI = RBOuterI = LTRBOuterMono[uType & (BDR_INNER|BDR_OUTER)]; + } + else if(uFlags & BF_FLAT) + { + LTInnerI = RBInnerI = LTRBInnerFlat[uType & (BDR_INNER|BDR_OUTER)]; + LTOuterI = RBOuterI = LTRBOuterFlat[uType & (BDR_INNER|BDR_OUTER)]; + + /* Bertho Stultiens states above that this function exactly matches win95 + * In win98 BF_FLAT rectangles have an inner border same color as the + * middle (COLOR_BTNFACE). I believe it's the same for win95 but since + * I don't know I go with Bertho and just sets it for win98 until proven + * otherwise. + * Dennis BjÃ¶rklund, 10 June, 99 + */ + if( LTInnerI != -1 ) + LTInnerI = RBInnerI = COLOR_BTNFACE; + } + else if(uFlags & BF_SOFT) + { + LTInnerI = LTInnerSoft[uType & (BDR_INNER|BDR_OUTER)]; + LTOuterI = LTOuterSoft[uType & (BDR_INNER|BDR_OUTER)]; + RBInnerI = RBInnerSoft[uType & (BDR_INNER|BDR_OUTER)]; + RBOuterI = RBOuterSoft[uType & (BDR_INNER|BDR_OUTER)]; + } + else + { + LTInnerI = LTInnerNormal[uType & (BDR_INNER|BDR_OUTER)]; + LTOuterI = LTOuterNormal[uType & (BDR_INNER|BDR_OUTER)]; + RBInnerI = RBInnerNormal[uType & (BDR_INNER|BDR_OUTER)]; + RBOuterI = RBOuterNormal[uType & (BDR_INNER|BDR_OUTER)]; + } + + if((uFlags & BF_BOTTOMLEFT) == BF_BOTTOMLEFT) + LBpenplus = 1; + if((uFlags & BF_TOPRIGHT) == BF_TOPRIGHT) + RTpenplus = 1; + if((uFlags & BF_BOTTOMRIGHT) == BF_BOTTOMRIGHT) + RBpenplus = 1; + if((uFlags & BF_TOPLEFT) == BF_TOPLEFT) + LTpenplus = 1; + + if(LTInnerI != -1) + LTInnerPen = NtGdiGetStockObject(DC_PEN); + if(LTOuterI != -1) + LTOuterPen = NtGdiGetStockObject(DC_PEN); + if(RBInnerI != -1) + RBInnerPen = NtGdiGetStockObject(DC_PEN); + if(RBOuterI != -1) + RBOuterPen = NtGdiGetStockObject(DC_PEN); + if((uFlags & BF_MIDDLE) && retval) + { + FillRect(hdc, &InnerRect, IntGetSysColorBrush(uFlags & BF_MONO ? + COLOR_WINDOW : COLOR_BTNFACE)); + } + GreMoveTo(hdc, 0, 0, &SavePoint); + + /* Draw the outer edge */ + NtGdiSelectPen(hdc, LTOuterPen); + IntSetDCPenColor(hdc, IntGetSysColor(LTOuterI)); + if(uFlags & BF_TOP) + { + GreMoveTo(hdc, InnerRect.left, InnerRect.top, NULL); + NtGdiLineTo(hdc, InnerRect.right, InnerRect.top); + } + if(uFlags & BF_LEFT) + { + GreMoveTo(hdc, InnerRect.left, InnerRect.top, NULL); + NtGdiLineTo(hdc, InnerRect.left, InnerRect.bottom); + } + NtGdiSelectPen(hdc, RBOuterPen); + IntSetDCPenColor(hdc, IntGetSysColor(RBOuterI)); + if(uFlags & BF_BOTTOM) + { + GreMoveTo(hdc, InnerRect.left, InnerRect.bottom-1, NULL); + NtGdiLineTo(hdc, InnerRect.right, InnerRect.bottom-1); + } + if(uFlags & BF_RIGHT) + { + GreMoveTo(hdc, InnerRect.right-1, InnerRect.top, NULL); + NtGdiLineTo(hdc, InnerRect.right-1, InnerRect.bottom); + } + + /* Draw the inner edge */ + NtGdiSelectPen(hdc, LTInnerPen); + IntSetDCPenColor(hdc, IntGetSysColor(LTInnerI)); + if(uFlags & BF_TOP) + { + GreMoveTo(hdc, InnerRect.left+LTpenplus, InnerRect.top+1, NULL); + NtGdiLineTo(hdc, InnerRect.right-RTpenplus, InnerRect.top+1); + } + if(uFlags & BF_LEFT) + { + GreMoveTo(hdc, InnerRect.left+1, InnerRect.top+LTpenplus, NULL); + NtGdiLineTo(hdc, InnerRect.left+1, InnerRect.bottom-LBpenplus); + } + NtGdiSelectPen(hdc, RBInnerPen); + IntSetDCPenColor(hdc, IntGetSysColor(RBInnerI)); + if(uFlags & BF_BOTTOM) + { + GreMoveTo(hdc, InnerRect.left+LBpenplus, InnerRect.bottom-2, NULL); + NtGdiLineTo(hdc, InnerRect.right-RBpenplus, InnerRect.bottom-2); + } + if(uFlags & BF_RIGHT) + { + GreMoveTo(hdc, InnerRect.right-2, InnerRect.top+RTpenplus, NULL); + NtGdiLineTo(hdc, InnerRect.right-2, InnerRect.bottom-RBpenplus); + } + + if( ((uFlags & BF_MIDDLE) && retval) || (uFlags & BF_ADJUST) ) + { + int add = (LTRBInnerMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? 1 : 0) + + (LTRBOuterMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? 1 : 0); + + if(uFlags & BF_LEFT) + InnerRect.left += add; + if(uFlags & BF_RIGHT) + InnerRect.right -= add; + if(uFlags & BF_TOP) + InnerRect.top += add; + if(uFlags & BF_BOTTOM) + InnerRect.bottom -= add; + + if(uFlags & BF_ADJUST) + *rc = InnerRect; + } + + /* Cleanup */ + NtGdiSelectPen(hdc, SavePen); + GreMoveTo(hdc, SavePoint.x, SavePoint.y, NULL); + return retval; +} + +int FASTCALL UITOOLS_MakeSquareRect(LPRECT src, LPRECT dst) +{ + int Width = src->right - src->left; + int Height = src->bottom - src->top; + int SmallDiam = Width > Height ? Height : Width; + + *dst = *src; + + /* Make it a square box */ + if(Width < Height) /* SmallDiam == Width */ + { + dst->top += (Height-Width)/2; + dst->bottom = dst->top + SmallDiam; + } + else if(Width > Height) /* SmallDiam == Height */ + { + dst->left += (Width-Height)/2; + dst->right = dst->left + SmallDiam; + } + + return SmallDiam; +} + +/* Ported from WINE20020904 */ +void FASTCALL UITOOLS_DrawCheckedRect( HDC dc, LPRECT rect ) +{ + if(IntGetSysColor(COLOR_BTNHIGHLIGHT) == RGB(255, 255, 255)) + { + HBRUSH hbsave; + COLORREF bg; + + FillRect(dc, rect, IntGetSysColorBrush(COLOR_BTNFACE)); + bg = IntGdiSetBkColor(dc, RGB(255, 255, 255)); + hbsave = NtGdiSelectBrush(dc, gpsi->hbrGray); + NtGdiPatBlt(dc, rect->left, rect->top, rect->right-rect->left, rect->bottom-rect->top, 0x00FA0089); + NtGdiSelectBrush(dc, hbsave); + IntGdiSetBkColor(dc, bg); + } + else + { + FillRect(dc, rect, IntGetSysColorBrush(COLOR_BTNHIGHLIGHT)); + } +} + +/* Ported from WINE20020904 */ +/* Draw a push button coming from DrawFrameControl() + * + * Does a pretty good job in emulating MS behavior. Some quirks are + * however there because MS uses a TrueType font (Marlett) to draw + * the buttons. + * + * FIXME: This looks a little bit strange, needs to be rewritten completely + * (several quirks with adjust, DFCS_CHECKED aso) + */ +BOOL FASTCALL UITOOLS95_DFC_ButtonPush(HDC dc, LPRECT r, UINT uFlags) +{ + UINT edge; + RECT myr = *r; + + if(uFlags & (DFCS_PUSHED | DFCS_CHECKED | DFCS_FLAT)) + edge = EDGE_SUNKEN; + else + edge = EDGE_RAISED; + + if(uFlags & DFCS_CHECKED) + { + if(uFlags & DFCS_MONO) + IntDrawRectEdge(dc, &myr, edge, BF_MONO|BF_RECT|BF_ADJUST); + else + IntDrawRectEdge(dc, &myr, edge, (uFlags&DFCS_FLAT)|BF_RECT|BF_SOFT|BF_ADJUST); + + UITOOLS_DrawCheckedRect( dc, &myr ); + } + else + { + if(uFlags & DFCS_MONO) + { + IntDrawRectEdge(dc, &myr, edge, BF_MONO|BF_RECT|BF_ADJUST); + FillRect(dc, &myr, IntGetSysColorBrush(COLOR_BTNFACE)); + } + else + { + IntDrawRectEdge(dc, r, edge, (uFlags&DFCS_FLAT) | BF_MIDDLE | BF_RECT | BF_SOFT); + } + } + + /* Adjust rectangle if asked */ + if(uFlags & DFCS_ADJUSTRECT) + { + r->left += 2; + r->right -= 2; + r->top += 2; + r->bottom -= 2; + } + + return TRUE; +} + +BOOL FASTCALL UITOOLS95_DFC_ButtonCheckRadio(HDC dc, LPRECT r, UINT uFlags, BOOL Radio) +{ + LOGFONTW lf; + HFONT hFont, hOldFont; + int i; + WCHAR OutRight, OutLeft, InRight, InLeft, Center; + + if (Radio) + { + OutRight = 'j'; // Outer right + OutLeft = 'k'; // Outer left + InRight = 'l'; // inner left + InLeft = 'm'; // inner right + Center = 'n'; // center + } else + { + OutRight = 'c'; // Outer right + OutLeft = 'd'; // Outer left + InRight = 'e'; // inner left + InLeft = 'f'; // inner right + Center = 'g'; // center + } + + RtlZeroMemory(&lf, sizeof(LOGFONTW)); + lf.lfHeight = r->top - r->bottom; + lf.lfWidth = 0; + lf.lfWeight = FW_NORMAL; + lf.lfCharSet = DEFAULT_CHARSET; + RtlCopyMemory(lf.lfFaceName, L"Marlett", sizeof(L"Marlett")); + hFont = GreCreateFontIndirectW(&lf); + hOldFont = NtGdiSelectFont(dc, hFont); + + if(Radio && ((uFlags & 0xff) == DFCS_BUTTONRADIOMASK)) + { + IntGdiSetBkMode(dc, OPAQUE); + IntGdiSetTextColor(dc, IntGetSysColor(COLOR_WINDOWFRAME)); + GreTextOutW(dc, r->left, r->top, &Center, 1); + IntGdiSetBkMode(dc, TRANSPARENT); + IntGdiSetTextColor(dc, IntGetSysColor(COLOR_WINDOWFRAME)); + GreTextOutW(dc, r->left, r->top, &OutRight, 1); + IntGdiSetTextColor(dc, IntGetSysColor(COLOR_WINDOWFRAME)); + GreTextOutW(dc, r->left, r->top, &OutLeft, 1); + } + else + { + IntGdiSetBkMode(dc, TRANSPARENT); + + /* Center section, white for active, grey for inactive */ + i= !(uFlags & (DFCS_INACTIVE|DFCS_PUSHED)) ? COLOR_WINDOW : COLOR_BTNFACE; + IntGdiSetTextColor(dc, IntGetSysColor(i)); + GreTextOutW(dc, r->left, r->top, &Center, 1); + + if(uFlags & (DFCS_FLAT | DFCS_MONO)) + { + IntGdiSetTextColor(dc, IntGetSysColor(COLOR_WINDOWFRAME)); + GreTextOutW(dc, r->left, r->top, &OutRight, 1); + GreTextOutW(dc, r->left, r->top, &OutLeft, 1); + GreTextOutW(dc, r->left, r->top, &InRight, 1); + GreTextOutW(dc, r->left, r->top, &InLeft, 1); + } + else + { + IntGdiSetTextColor(dc, IntGetSysColor(COLOR_BTNSHADOW)); + GreTextOutW(dc, r->left, r->top, &OutRight, 1); + IntGdiSetTextColor(dc, IntGetSysColor(COLOR_BTNHIGHLIGHT)); + GreTextOutW(dc, r->left, r->top, &OutLeft, 1); + IntGdiSetTextColor(dc, IntGetSysColor(COLOR_3DDKSHADOW)); + GreTextOutW(dc, r->left, r->top, &InRight, 1); + IntGdiSetTextColor(dc, IntGetSysColor(COLOR_3DLIGHT)); + GreTextOutW(dc, r->left, r->top, &InLeft, 1); + } + } + + if(uFlags & DFCS_CHECKED) + { + WCHAR Check = (Radio) ? 'i' : 'b'; + + IntGdiSetTextColor(dc, IntGetSysColor(COLOR_WINDOWTEXT)); + GreTextOutW(dc, r->left, r->top, &Check, 1); + } + + IntGdiSetTextColor(dc, IntGetSysColor(COLOR_WINDOWTEXT)); + NtGdiSelectFont(dc, hOldFont); + GreDeleteObject(hFont); + + return TRUE; +} + +/* Ported from WINE20020904 */ +BOOL FASTCALL UITOOLS95_DrawFrameButton(HDC hdc, LPRECT rc, UINT uState) +{ + switch(uState & 0xff) + { + case DFCS_BUTTONPUSH: + return UITOOLS95_DFC_ButtonPush(hdc, rc, uState); + + case DFCS_BUTTONCHECK: + case DFCS_BUTTON3STATE: + return UITOOLS95_DFC_ButtonCheckRadio(hdc, rc, uState, FALSE); + + case DFCS_BUTTONRADIOIMAGE: + case DFCS_BUTTONRADIOMASK: + case DFCS_BUTTONRADIO: + return UITOOLS95_DFC_ButtonCheckRadio(hdc, rc, uState, TRUE); + +/* + default: + DbgPrint("Invalid button state=0x%04x\n", uState); +*/ + } + return FALSE; +} + +BOOL FASTCALL UITOOLS95_DrawFrameCaption(HDC dc, LPRECT r, UINT uFlags) +{ + LOGFONTW lf; + HFONT hFont, hOldFont; + COLORREF clrsave; + RECT myr; + INT bkmode; + WCHAR Symbol; + switch(uFlags & 0xff) + { + case DFCS_CAPTIONCLOSE: + Symbol = 'r'; + break; + case DFCS_CAPTIONHELP: + Symbol = 's'; + break; + case DFCS_CAPTIONMIN: + Symbol = '0'; + break; + case DFCS_CAPTIONMAX: + Symbol = '1'; + break; + case DFCS_CAPTIONRESTORE: + Symbol = '2'; + break; + default: + return FALSE; + } + IntDrawRectEdge(dc,r,(uFlags&DFCS_PUSHED) ? EDGE_SUNKEN : EDGE_RAISED, BF_RECT | BF_MIDDLE | BF_SOFT); + RtlZeroMemory(&lf, sizeof(LOGFONTW)); + UITOOLS_MakeSquareRect(r, &myr); + myr.left += 1; + myr.top += 1; + myr.right -= 1; + myr.bottom -= 1; + if(uFlags & DFCS_PUSHED) + RECTL_vOffsetRect(&myr,1,1); + lf.lfHeight = myr.bottom - myr.top; + lf.lfWidth = 0; + lf.lfWeight = FW_NORMAL; + lf.lfCharSet = DEFAULT_CHARSET; + RtlCopyMemory(lf.lfFaceName, L"Marlett", sizeof(L"Marlett")); + hFont = GreCreateFontIndirectW(&lf); + /* save font and text color */ + hOldFont = NtGdiSelectFont(dc, hFont); + clrsave = GreGetTextColor(dc); + bkmode = GreGetBkMode(dc); + /* set color and drawing mode */ + IntGdiSetBkMode(dc, TRANSPARENT); + if(uFlags & DFCS_INACTIVE) + { + /* draw shadow */ + IntGdiSetTextColor(dc, IntGetSysColor(COLOR_BTNHIGHLIGHT)); + GreTextOutW(dc, myr.left + 1, myr.top + 1, &Symbol, 1); + } + IntGdiSetTextColor(dc, IntGetSysColor((uFlags & DFCS_INACTIVE) ? COLOR_BTNSHADOW : COLOR_BTNTEXT)); + /* draw selected symbol */ + GreTextOutW(dc, myr.left, myr.top, &Symbol, 1); + /* restore previous settings */ + IntGdiSetTextColor(dc, clrsave); + NtGdiSelectFont(dc, hOldFont); + IntGdiSetBkMode(dc, bkmode); + GreDeleteObject(hFont); + return TRUE; +} + +BOOL FASTCALL UITOOLS95_DrawFrameScroll(HDC dc, LPRECT r, UINT uFlags) +{ + LOGFONTW lf; + HFONT hFont, hOldFont; + COLORREF clrsave; + RECT myr; + INT bkmode; + WCHAR Symbol; + switch(uFlags & 0xff) + { + case DFCS_SCROLLCOMBOBOX: + case DFCS_SCROLLDOWN: + Symbol = '6'; + break; + + case DFCS_SCROLLUP: + Symbol = '5'; + break; + + case DFCS_SCROLLLEFT: + Symbol = '3'; + break; + + case DFCS_SCROLLRIGHT: + Symbol = '4'; + break; + + case DFCS_SCROLLSIZEGRIP: + case DFCS_SCROLLSIZEGRIPRIGHT: + RtlZeroMemory(&lf, sizeof(LOGFONTW)); + UITOOLS_MakeSquareRect(r, &myr); + lf.lfHeight = myr.bottom - myr.top; + lf.lfWidth = 0; + lf.lfWeight = FW_NORMAL; + lf.lfCharSet = DEFAULT_CHARSET; + RtlCopyMemory(lf.lfFaceName, L"Marlett", sizeof(L"Marlett")); + hFont = GreCreateFontIndirectW(&lf); + /* save font and text color */ + hOldFont = NtGdiSelectFont(dc, hFont); + clrsave = GreGetTextColor(dc); + bkmode = GreGetBkMode(dc); + /* set color and drawing mode */ + IntGdiSetBkMode(dc, TRANSPARENT); + if (!(uFlags & (DFCS_MONO | DFCS_FLAT))) + { + IntGdiSetTextColor(dc, IntGetSysColor(COLOR_BTNHIGHLIGHT)); + /* draw selected symbol */ + Symbol = ((uFlags & 0xff) == DFCS_SCROLLSIZEGRIP) ? 'o' : 'x'; + GreTextOutW(dc, myr.left, myr.top, &Symbol, 1); + IntGdiSetTextColor(dc, IntGetSysColor(COLOR_BTNSHADOW)); + } else + IntGdiSetTextColor(dc, IntGetSysColor(COLOR_WINDOWFRAME)); + /* draw selected symbol */ + Symbol = ((uFlags & 0xff) == DFCS_SCROLLSIZEGRIP) ? 'p' : 'y'; + GreTextOutW(dc, myr.left, myr.top, &Symbol, 1); + /* restore previous settings */ + IntGdiSetTextColor(dc, clrsave); + NtGdiSelectFont(dc, hOldFont); + IntGdiSetBkMode(dc, bkmode); + GreDeleteObject(hFont); + return TRUE; + default: + return FALSE; + } + IntDrawRectEdge(dc, r, (uFlags & DFCS_PUSHED) ? EDGE_SUNKEN : EDGE_RAISED, (uFlags&DFCS_FLAT) | BF_MIDDLE | BF_RECT); + RtlZeroMemory(&lf, sizeof(LOGFONTW)); + UITOOLS_MakeSquareRect(r, &myr); + myr.left += 1; + myr.top += 1; + myr.right -= 1; + myr.bottom -= 1; + if(uFlags & DFCS_PUSHED) + RECTL_vOffsetRect(&myr,1,1); + lf.lfHeight = myr.bottom - myr.top; + lf.lfWidth = 0; + lf.lfWeight = FW_NORMAL; + lf.lfCharSet = DEFAULT_CHARSET; + RtlCopyMemory(lf.lfFaceName, L"Marlett", sizeof(L"Marlett")); + hFont = GreCreateFontIndirectW(&lf); + /* save font and text color */ + hOldFont = NtGdiSelectFont(dc, hFont); + clrsave = GreGetTextColor(dc); + bkmode = GreGetBkMode(dc); + /* set color and drawing mode */ + IntGdiSetBkMode(dc, TRANSPARENT); + if(uFlags & DFCS_INACTIVE) + { + /* draw shadow */ + IntGdiSetTextColor(dc, IntGetSysColor(COLOR_BTNHIGHLIGHT)); + GreTextOutW(dc, myr.left + 1, myr.top + 1, &Symbol, 1); + } + IntGdiSetTextColor(dc, IntGetSysColor((uFlags & DFCS_INACTIVE) ? COLOR_BTNSHADOW : COLOR_BTNTEXT)); + /* draw selected symbol */ + GreTextOutW(dc, myr.left, myr.top, &Symbol, 1); + /* restore previous settings */ + IntGdiSetTextColor(dc, clrsave); + NtGdiSelectFont(dc, hOldFont); + IntGdiSetBkMode(dc, bkmode); + GreDeleteObject(hFont); + return TRUE; +} + +BOOL FASTCALL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags) +{ + LOGFONTW lf; + HFONT hFont, hOldFont; + WCHAR Symbol; + switch(uFlags & 0xff) + { + case DFCS_MENUARROW: + Symbol = '8'; + break; + + case DFCS_MENUARROWRIGHT: + Symbol = 'w'; // FIXME: needs to confirm + break; + + case DFCS_MENUBULLET: + Symbol = 'h'; + break; + + case DFCS_MENUCHECK: + Symbol = 'a'; + break; + + default: +/* + DbgPrint("Invalid menu; flags=0x%04x\n", uFlags); +*/ + return FALSE; + } + /* acquire ressources only if valid menu */ + RtlZeroMemory(&lf, sizeof(LOGFONTW)); + lf.lfHeight = r->bottom - r->top; + lf.lfWidth = 0; + lf.lfWeight = FW_NORMAL; + lf.lfCharSet = DEFAULT_CHARSET; + RtlCopyMemory(lf.lfFaceName, L"Marlett", sizeof(L"Marlett")); + hFont = GreCreateFontIndirectW(&lf); + /* save font */ + hOldFont = NtGdiSelectFont(dc, hFont); + // FIXME selecting color doesn't work +#if 0 + if(uFlags & DFCS_INACTIVE) + { + /* draw shadow */ + IntGdiSetTextColor(dc, IntGetSysColor(COLOR_BTNHIGHLIGHT)); + GreTextOutW(dc, r->left + 1, r->top + 1, &Symbol, 1); + } + IntGdiSetTextColor(dc, IntGetSysColor((uFlags & DFCS_INACTIVE) ? COLOR_BTNSHADOW : COLOR_BTNTEXT)); +#endif + /* draw selected symbol */ + GreTextOutW(dc, r->left, r->top, &Symbol, 1); + /* restore previous settings */ + NtGdiSelectFont(dc, hOldFont); + GreDeleteObject(hFont); + return TRUE; +} + +// +// +// Win32ss API support. +// +// + + +INT WINAPI +FillRect(HDC hDC, CONST RECT *lprc, HBRUSH hbr) +{ + BOOL Ret; + HBRUSH prevhbr = NULL; + + /* Select brush if specified */ + if (hbr) + { + /* Handle system colors */ + if (hbr <= (HBRUSH)(COLOR_MENUBAR + 1)) + hbr = IntGetSysColorBrush(PtrToUlong(hbr) - 1); + + prevhbr = NtGdiSelectBrush(hDC, hbr); + if (prevhbr == NULL) + return (INT)FALSE; + } + + Ret = NtGdiPatBlt(hDC, lprc->left, lprc->top, lprc->right - lprc->left, + lprc->bottom - lprc->top, PATCOPY); + + /* Select old brush */ + if (prevhbr) + NtGdiSelectBrush(hDC, prevhbr); + + return (INT)Ret; +} + +BOOL WINAPI +DrawEdge(HDC hDC, LPRECT rc, UINT edge, UINT flags) +{ + if (flags & BF_DIAGONAL) + return IntDrawDiagEdge(hDC, rc, edge, flags); + else + return IntDrawRectEdge(hDC, rc, edge, flags); +} + +BOOL WINAPI +DrawFrameControl(HDC hDC, LPRECT rc, UINT uType, UINT uState) +{ + if (GreGetMapMode(hDC) != MM_TEXT) + return FALSE; + + switch(uType) + { + case DFC_BUTTON: + return UITOOLS95_DrawFrameButton(hDC, rc, uState); + case DFC_CAPTION: + return UITOOLS95_DrawFrameCaption(hDC, rc, uState); + case DFC_MENU: + return UITOOLS95_DrawFrameMenu(hDC, rc, uState); +#if 0 + case DFC_POPUPMENU: + UNIMPLEMENTED; + break; +#endif + case DFC_SCROLL: + return UITOOLS95_DrawFrameScroll(hDC, rc, uState); + } + return FALSE; +} + Propchange: trunk/reactos/win32ss/user/ntuser/draw.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/win32ss/user/ntuser/draw.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Thu Oct 10 22:07:10 2013 @@ -1767,7 +1767,7 @@ Class->hIconSmIntern = co_IntCopyImage( Class->hIcon, IMAGE_ICON, UserGetSystemMetrics( SM_CXSMICON ), UserGetSystemMetrics( SM_CYSMICON ), 0 ); - ERR("IntCreateWindow hIconSmIntern %p\n",Class->hIconSmIntern); + TRACE("IntCreateWindow hIconSmIntern %p\n",Class->hIconSmIntern); Class->CSF_flags |= CSF_CACHEDSMICON; }

1 0

[pschweitzer] 60601: [PSAPI_APITEST] Add tests for GetDeviceDriverBaseName Replace 0x00000000 -> NULL. Dedicated to Thomas ; -)
by pschweitzer＠svn.reactos.org 10 Oct '13

10 Oct '13

Author: pschweitzer Date: Thu Oct 10 19:18:43 2013 New Revision: 60601 URL: http://svn.reactos.org/svn/reactos?rev=60601&view=rev Log: [PSAPI_APITEST] Add tests for GetDeviceDriverBaseName Replace 0x00000000 -> NULL. Dedicated to Thomas ;-) Modified: trunk/rostests/apitests/psapi/psapi.c trunk/rostests/apitests/psapi/testlist.c Modified: trunk/rostests/apitests/psapi/psapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/psapi/psapi.c?re… ============================================================================== --- trunk/rostests/apitests/psapi/psapi.c [iso-8859-1] (original) +++ trunk/rostests/apitests/psapi/psapi.c [iso-8859-1] Thu Oct 10 19:18:43 2013 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS api tests * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Test for GetDeviceDriverFileName + * PURPOSE: Test for GetDeviceDriverFileName & GetDeviceDriverBaseName * PROGRAMMER: Pierre Schweitzer */ @@ -25,14 +25,14 @@ Snap = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, 0); if (Snap == INVALID_HANDLE_VALUE) { - return (LPVOID)0x00000000; + return NULL; } Module.dwSize = sizeof(MODULEENTRY32); if(!Module32First(Snap, &Module)) { CloseHandle(Snap); - return (LPVOID)0x00000000; + return NULL; } do @@ -45,10 +45,10 @@ } while(Module32Next(Snap, &Module)); CloseHandle(Snap); - return (LPVOID)0x00000000; -} - -static BOOLEAN IntGetModuleInformation(LPCSTR Module, BOOLEAN IsDriver, BOOLEAN IsProcMod, TEST_MODULE_INFO * Info) + return NULL; +} + +static BOOLEAN IntGetModuleInformation(LPCSTR Module, BOOLEAN IsDriver, BOOLEAN IsProcMod, BOOLEAN BaseName, TEST_MODULE_INFO * Info) { CHAR System[255]; UINT Len; @@ -85,9 +85,17 @@ return FALSE; } - /* Skip disk */ - strcpy(Info->Path, System + 2); - Info->Len = strlen(Info->Path); + if (BaseName) + { + strcpy(Info->Path, Module); + Info->Len = strlen(Info->Path); + } + else + { + /* Skip disk */ + strcpy(Info->Path, System + 2); + Info->Len = strlen(Info->Path); + } return TRUE; } @@ -103,7 +111,7 @@ ok(Len == 0, "Len: %lu\n", Len); ok(GetLastError() == ERROR_INVALID_HANDLE, "Error: %lx\n", GetLastError()); - if (IntGetModuleInformation("ntdll.dll", FALSE, TRUE, &ModInfo)) + if (IntGetModuleInformation("ntdll.dll", FALSE, TRUE, FALSE, &ModInfo)) { SetLastError(0xDEADBEEF); Len = GetDeviceDriverFileNameA(ModInfo.ImageBase, FileName, 255); @@ -126,7 +134,7 @@ skip("Couldn't find info about ntdll.dll\n"); } - if (IntGetModuleInformation("msvcrt.dll", FALSE, TRUE, &ModInfo)) + if (IntGetModuleInformation("msvcrt.dll", FALSE, TRUE, FALSE, &ModInfo)) { SetLastError(0xDEADBEEF); Len = GetDeviceDriverFileNameA(ModInfo.ImageBase, FileName, 255); @@ -138,7 +146,7 @@ skip("Couldn't find info about msvcrt.dll\n"); } - if (IntGetModuleInformation("psapi.dll", FALSE, TRUE, &ModInfo)) + if (IntGetModuleInformation("psapi.dll", FALSE, TRUE, FALSE, &ModInfo)) { SetLastError(0xDEADBEEF); Len = GetDeviceDriverFileNameA(ModInfo.ImageBase, FileName, 255); @@ -150,3 +158,62 @@ skip("Couldn't find info about psapi.dll\n"); } } + +START_TEST(GetDeviceDriverBaseName) +{ + DWORD Len; + CHAR FileName[255]; + TEST_MODULE_INFO ModInfo; + + SetLastError(0xDEADBEEF); + Len = GetDeviceDriverBaseNameA(0, FileName, 255); + ok(Len == 0, "Len: %lu\n", Len); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Error: %lx\n", GetLastError()); + + if (IntGetModuleInformation("ntdll.dll", FALSE, TRUE, TRUE, &ModInfo)) + { + SetLastError(0xDEADBEEF); + Len = GetDeviceDriverBaseNameA(ModInfo.ImageBase, FileName, 255); + ok(Len == ModInfo.Len, "Len: %lu\n", Len); + ok(GetLastError() == 0xDEADBEEF, "Error: %lx\n", GetLastError()); + ok(lstrcmpiA(ModInfo.Path, FileName) == 0, "File name: %s\n", FileName); + + /* Test with too small buffer */ + SetLastError(0xDEADBEEF); + ModInfo.Len--; + ModInfo.Path[ModInfo.Len] = 0; + FileName[ModInfo.Len] = 0; + Len = GetDeviceDriverBaseNameA(ModInfo.ImageBase, FileName, ModInfo.Len); + ok(Len == ModInfo.Len, "Len: %lu\n", Len); + ok(GetLastError() == 0xDEADBEEF, "Error: %lx\n", GetLastError()); + ok(lstrcmpiA(ModInfo.Path, FileName) == 0, "File name: %s\n", FileName); + } + else + { + skip("Couldn't find info about ntdll.dll\n"); + } + + if (IntGetModuleInformation("msvcrt.dll", FALSE, TRUE, TRUE, &ModInfo)) + { + SetLastError(0xDEADBEEF); + Len = GetDeviceDriverBaseNameA(ModInfo.ImageBase, FileName, 255); + ok(Len == 0, "Len: %lu\n", Len); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Error: %lx\n", GetLastError()); + } + else + { + skip("Couldn't find info about msvcrt.dll\n"); + } + + if (IntGetModuleInformation("psapi.dll", FALSE, TRUE, TRUE, &ModInfo)) + { + SetLastError(0xDEADBEEF); + Len = GetDeviceDriverBaseNameA(ModInfo.ImageBase, FileName, 255); + ok(Len == 0, "Len: %lu\n", Len); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Error: %lx\n", GetLastError()); + } + else + { + skip("Couldn't find info about psapi.dll\n"); + } +} Modified: trunk/rostests/apitests/psapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/psapi/testlist.c… ============================================================================== --- trunk/rostests/apitests/psapi/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/psapi/testlist.c [iso-8859-1] Thu Oct 10 19:18:43 2013 @@ -4,10 +4,12 @@ #include <wine/test.h> extern void func_GetDeviceDriverFileName(void); +extern void func_GetDeviceDriverBaseName(void); const struct test winetest_testlist[] = { { "GetDeviceDriverFileName", func_GetDeviceDriverFileName }, + { "GetDeviceDriverBaseName", func_GetDeviceDriverBaseName }, { 0, 0 } };

1 0

[aandrejevic] 60600: [SOFT386] Implement the REP prefix for the INS instruction.
by aandrejevic＠svn.reactos.org 10 Oct '13

10 Oct '13

Author: aandrejevic Date: Thu Oct 10 19:01:41 2013 New Revision: 60600 URL: http://svn.reactos.org/svn/reactos?rev=60600&view=rev Log: [SOFT386] Implement the REP prefix for the INS instruction. Modified: branches/ntvdm/lib/soft386/common.h branches/ntvdm/lib/soft386/opcodes.c Modified: branches/ntvdm/lib/soft386/common.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/common.h?rev=… ============================================================================== --- branches/ntvdm/lib/soft386/common.h [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/common.h [iso-8859-1] Thu Oct 10 19:01:41 2013 @@ -33,6 +33,9 @@ #define SIGN_FLAG_LONG 0x80000000 #define REAL_MODE_FLAGS_MASK 0x17FD5 #define PROT_MODE_FLAGS_MASK 0x10DD5 + +/* Block size for string operations */ +#define STRING_BLOCK_SIZE 4096 #define GET_SEGMENT_RPL(s) ((s) & 3) #define GET_SEGMENT_INDEX(s) ((s) & 0xFFF8) Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Thu Oct 10 19:01:41 2013 @@ -6311,7 +6311,6 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeIns) { - ULONG Data = 0; ULONG DataSize; BOOLEAN OperandSize, AddressSize; @@ -6330,48 +6329,114 @@ { /* The ADSIZE prefix toggles the size */ AddressSize = !AddressSize; - } - - if ((State->PrefixFlags & SOFT386_PREFIX_REP) - || (State->PrefixFlags & SOFT386_PREFIX_REPNZ)) - { - // TODO: The REP/REPZ/REPNZ prefixes need to be implemented! - Soft386Exception(State, SOFT386_EXCEPTION_UD); - return FALSE; } /* Calculate the size */ if (Opcode == 0x6C) DataSize = sizeof(UCHAR); else DataSize = OperandSize ? sizeof(ULONG) : sizeof(USHORT); - /* Read from the I/O port */ - State->IoReadCallback(State, - State->GeneralRegs[SOFT386_REG_EDX].LowWord, - &Data, - DataSize); - - /* Write to the destination operand */ - if (!Soft386WriteMemory(State, - SOFT386_REG_ES, - AddressSize ? State->GeneralRegs[SOFT386_REG_EDI].Long - : State->GeneralRegs[SOFT386_REG_EDI].LowWord, - &Data, - DataSize)) - { - /* Exception occurred */ - return FALSE; - } - - /* Increment/decrement EDI */ - if (OperandSize) - { - if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].Long += DataSize; - else State->GeneralRegs[SOFT386_REG_EDI].Long -= DataSize; + if (State->PrefixFlags & SOFT386_PREFIX_REP) + { + UCHAR Block[STRING_BLOCK_SIZE]; + ULONG Count = OperandSize ? State->GeneralRegs[SOFT386_REG_ECX].Long + : State->GeneralRegs[SOFT386_REG_ECX].LowWord; + + /* Transfer until finished */ + while (Count) + { + ULONG Processed = min(Count, STRING_BLOCK_SIZE / DataSize); + + /* Read from the I/O port */ + State->IoReadCallback(State, + State->GeneralRegs[SOFT386_REG_EDX].LowWord, + Block, + Processed * DataSize); + + if (State->Flags.Df) + { + ULONG i, j; + + /* Reduce EDI by the number of bytes to transfer */ + if (AddressSize) State->GeneralRegs[SOFT386_REG_EDI].Long -= Processed * DataSize; + else State->GeneralRegs[SOFT386_REG_EDI].LowWord -= Processed * DataSize; + + /* Reverse the block data */ + for (i = 0; i < Processed / 2; i++) + { + /* Swap the values */ + for (j = 0; j < DataSize; j++) + { + UCHAR Temp = Block[i * DataSize + j]; + Block[i * DataSize + j] = Block[(Processed - i - 1) * DataSize + j]; + Block[(Processed - i - 1) * DataSize + j] = Temp; + } + } + } + + /* Write to memory */ + if (!Soft386WriteMemory(State, + SOFT386_REG_ES, + AddressSize ? State->GeneralRegs[SOFT386_REG_EDI].Long + : State->GeneralRegs[SOFT386_REG_EDI].LowWord, + Block, + Processed * DataSize)) + { + /* Set ECX */ + if (OperandSize) State->GeneralRegs[SOFT386_REG_ECX].Long = Count; + else State->GeneralRegs[SOFT386_REG_ECX].LowWord = LOWORD(Count); + + /* Exception occurred */ + return FALSE; + } + + if (!State->Flags.Df) + { + /* Increase EDI by the number of bytes transfered */ + if (AddressSize) State->GeneralRegs[SOFT386_REG_EDI].Long += Processed * DataSize; + else State->GeneralRegs[SOFT386_REG_EDI].LowWord += Processed * DataSize; + } + + /* Reduce the total count by the number processed in this run */ + Count -= Processed; + } + + /* Clear ECX */ + if (OperandSize) State->GeneralRegs[SOFT386_REG_ECX].Long = 0; + else State->GeneralRegs[SOFT386_REG_ECX].LowWord = 0; } else { - if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].LowWord += DataSize; - else State->GeneralRegs[SOFT386_REG_EDI].LowWord -= DataSize; + ULONG Data = 0; + + /* Read from the I/O port */ + State->IoReadCallback(State, + State->GeneralRegs[SOFT386_REG_EDX].LowWord, + &Data, + DataSize); + + /* Write to the destination operand */ + if (!Soft386WriteMemory(State, + SOFT386_REG_ES, + AddressSize ? State->GeneralRegs[SOFT386_REG_EDI].Long + : State->GeneralRegs[SOFT386_REG_EDI].LowWord, + &Data, + DataSize)) + { + /* Exception occurred */ + return FALSE; + } + + /* Increment/decrement EDI */ + if (OperandSize) + { + if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].Long += DataSize; + else State->GeneralRegs[SOFT386_REG_EDI].Long -= DataSize; + } + else + { + if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].LowWord += DataSize; + else State->GeneralRegs[SOFT386_REG_EDI].LowWord -= DataSize; + } } /* Return success */

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