July 2008 - Wine-Commits - list.winehq.org

Alexander Dorofeyev : quartz/tests: Fix interface leaks in aggregation test .
by Alexandre Julliard July 18, 2008

July 18, 2008

Module: wine Branch: master Commit: 4afad0a4130cbcfd694122de6d06bd89d653c417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4afad0a4130cbcfd694122de6… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Jul 17 21:54:53 2008 +0300 quartz/tests: Fix interface leaks in aggregation test. --- dlls/quartz/tests/misc.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/tests/misc.c b/dlls/quartz/tests/misc.c index f310a77..95468b4 100644 --- a/dlls/quartz/tests/misc.c +++ b/dlls/quartz/tests/misc.c @@ -32,19 +32,20 @@ ok(ppv == NULL, "Pointer is %p\n", ppv); #define ADDREF_EXPECT(iface, num) if (iface) { \ - hr = IUnknown_AddRef(iface); \ - ok(hr == num, "IUnknown_AddRef should return %d, got %d\n", num, hr); \ + refCount = IUnknown_AddRef(iface); \ + ok(refCount == num, "IUnknown_AddRef should return %d, got %d\n", num, refCount); \ } #define RELEASE_EXPECT(iface, num) if (iface) { \ - hr = IUnknown_Release(iface); \ - ok(hr == num, "IUnknown_Release should return %d, got %d\n", num, hr); \ + refCount = IUnknown_Release(iface); \ + ok(refCount == num, "IUnknown_Release should return %d, got %d\n", num, refCount); \ } static void test_aggregation(const CLSID clsidOuter, const CLSID clsidInner, const IID iidOuter, const IID iidInner) { HRESULT hr; + ULONG refCount; IUnknown *pUnkOuter = NULL; IUnknown *pUnkInner = NULL; IUnknown *pUnkInnerFail = NULL; @@ -134,6 +135,16 @@ static void test_aggregation(const CLSID clsidOuter, const CLSID clsidInner, RELEASE_EXPECT(pUnkInnerTest, 2); RELEASE_EXPECT(pUnkOuter, 7); RELEASE_EXPECT(pUnkInner, 1); + + do + { + refCount = IUnknown_Release(pUnkInner); + } while (refCount); + + do + { + refCount = IUnknown_Release(pUnkOuter); + } while (refCount); } static void test_video_renderer_aggregations(void)

1 0

Alexander Dorofeyev : quartz/tests: Add filtermapper aggregation tests.
by Alexandre Julliard July 18, 2008

July 18, 2008

Module: wine Branch: master Commit: 33c6eeb9e3da88b6af4d950a6a88c82957550663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c6eeb9e3da88b6af4d950a6… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Jul 17 20:24:41 2008 +0300 quartz/tests: Add filtermapper aggregation tests. --- dlls/quartz/tests/misc.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/tests/misc.c b/dlls/quartz/tests/misc.c index bd902a8..f310a77 100644 --- a/dlls/quartz/tests/misc.c +++ b/dlls/quartz/tests/misc.c @@ -167,12 +167,27 @@ static void test_filter_graph_aggregations(void) } } +static void test_filter_mapper_aggregations(void) +{ + const IID * iids[] = { + &IID_IFilterMapper2, &IID_IFilterMapper + }; + int i; + + for (i = 0; i < sizeof(iids) / sizeof(iids[0]); i++) + { + test_aggregation(CLSID_SystemClock, CLSID_FilterMapper2, + IID_IReferenceClock, *iids[i]); + } +} + START_TEST(misc) { CoInitialize(NULL); test_video_renderer_aggregations(); test_filter_graph_aggregations(); + test_filter_mapper_aggregations(); CoUninitialize(); }

1 0

Alexander Dorofeyev : quartz/tests: Test querying IFilterMapper2 from FilterGraph.
by Alexandre Julliard July 18, 2008

July 18, 2008

Module: wine Branch: master Commit: 4bc76025ba15b92751be6af1f817e72abce46e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bc76025ba15b92751be6af1f… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Jul 17 20:24:33 2008 +0300 quartz/tests: Test querying IFilterMapper2 from FilterGraph. --- dlls/quartz/tests/filtermapper.c | 58 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index cf0a383..5a13902 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -286,12 +286,70 @@ static void test_legacy_filter_registration(void) if (pMapper2) IFilterMapper2_Release(pMapper2); } +static ULONG getRefcount(IUnknown *iface) +{ + IUnknown_AddRef(iface); + return IUnknown_Release(iface); +} + +static void test_ifiltermapper_from_filtergraph(void) +{ + IFilterGraph2* pgraph2 = NULL; + IFilterMapper2 *pMapper2 = NULL; + IFilterGraph *filtergraph = NULL; + HRESULT hr; + ULONG refcount; + + 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 = IFilterGraph2_QueryInterface(pgraph2, &IID_IFilterMapper2, (LPVOID*)&pMapper2); + ok(hr == S_OK, "IFilterGraph2_QueryInterface failed with %08x\n", hr); + if (!pMapper2) goto out; + + refcount = getRefcount((IUnknown*)pgraph2); + ok(refcount == 2, "unexpected reference count: %u\n", refcount); + refcount = getRefcount((IUnknown*)pMapper2); + ok(refcount == 2, "unexpected reference count: %u\n", refcount); + + IFilterMapper2_AddRef(pMapper2); + refcount = getRefcount((IUnknown*)pgraph2); + ok(refcount == 3, "unexpected reference count: %u\n", refcount); + refcount = getRefcount((IUnknown*)pMapper2); + ok(refcount == 3, "unexpected reference count: %u\n", refcount); + IFilterMapper2_Release(pMapper2); + + hr = IFilterMapper2_QueryInterface(pMapper2, &IID_IFilterGraph, (LPVOID*)&filtergraph); + ok(hr == S_OK, "IFilterMapper2_QueryInterface failed with %08x\n", hr); + if (!filtergraph) goto out; + + IFilterMapper2_Release(pMapper2); + pMapper2 = NULL; + IFilterGraph_Release(filtergraph); + filtergraph = NULL; + + hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterMapper2, (LPVOID*)&pMapper2); + ok(hr == S_OK, "CoCreateInstance failed with %08x\n", hr); + if (!pMapper2) goto out; + + hr = IFilterMapper2_QueryInterface(pMapper2, &IID_IFilterGraph, (LPVOID*)&filtergraph); + ok(hr == E_NOINTERFACE, "IFilterMapper2_QueryInterface unexpected result: %08x\n", hr); + + out: + + if (pMapper2) IFilterMapper2_Release(pMapper2); + if (filtergraph) IFilterGraph_Release(filtergraph); + if (pgraph2) IFilterGraph2_Release(pgraph2); +} + START_TEST(filtermapper) { CoInitialize(NULL); test_fm2_enummatchingfilters(); test_legacy_filter_registration(); + test_ifiltermapper_from_filtergraph(); CoUninitialize(); }

1 0

Alexander Dorofeyev : quartz: Aggregate filtermapper in filtergraph.
by Alexandre Julliard July 18, 2008

July 18, 2008

Module: wine Branch: master Commit: 0bea470dfc155f080abed42b5bde1e8af315801f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bea470dfc155f080abed42b5… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Jul 17 20:24:24 2008 +0300 quartz: Aggregate filtermapper in filtergraph. --- dlls/quartz/filtergraph.c | 47 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index b82cbcd..19dbb8c 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -176,6 +176,7 @@ typedef struct _IFilterGraphImpl { /* IVideoFrameStep */ LONG ref; + IUnknown *punkFilterMapper2; IFilterMapper2 * pFilterMapper2; IBaseFilter ** ppFiltersInGraph; LPWSTR * pFilterNames; @@ -260,6 +261,12 @@ static HRESULT WINAPI FilterGraphInner_QueryInterface(IUnknown * iface, } else if (IsEqualGUID(&IID_IMediaPosition, riid)) { *ppvObj = &(This->IMediaPosition_vtbl); TRACE(" returning IMediaPosition interface (%p)\n", *ppvObj); + } else if (IsEqualGUID(&IID_IFilterMapper, riid)) { + TRACE(" requesting IFilterMapper interface from aggregated filtermapper (%p)\n", *ppvObj); + return IUnknown_QueryInterface(This->punkFilterMapper2, riid, ppvObj); + } else if (IsEqualGUID(&IID_IFilterMapper2, riid)) { + *ppvObj = This->pFilterMapper2; + TRACE(" returning IFilterMapper2 interface from aggregated filtermapper (%p)\n", *ppvObj); } else { *ppvObj = NULL; FIXME("unknown interface %s\n", debugstr_guid(riid)); @@ -289,6 +296,8 @@ static ULONG WINAPI FilterGraphInner_Release(IUnknown * iface) if (ref == 0) { int i; + This->ref = 1; /* guard against reentrancy (aggregation). */ + IMediaControl_Stop((IMediaControl*)&(This->IMediaControl_vtbl)); while (This->nFilters) @@ -302,7 +311,19 @@ static ULONG WINAPI FilterGraphInner_Release(IUnknown * iface) if (This->ItfCacheEntries[i].iface) IUnknown_Release(This->ItfCacheEntries[i].iface); } - IFilterMapper2_Release(This->pFilterMapper2); + + /* AddRef on controlling IUnknown, to compensate for Release of cached IFilterMapper2 interface below. + + * NOTE: Filtergraph_AddRef isn't suitable, because bUnkOuterValid may be FALSE but punkOuter non-NULL + * and already passed as punkOuter to filtermapper in FilterGraph_create - this will happen in case of + * CoCreateInstance of filtergraph with non-null pUnkOuter and REFIID other than IID_Unknown that is + * cleaning up after error. */ + if (This->pUnkOuter) IUnknown_AddRef(This->pUnkOuter); + else IUnknown_AddRef((IUnknown*)&This->IInner_vtbl); + + IFilterMapper2_Release(This->pFilterMapper2); + IUnknown_Release(This->punkFilterMapper2); + CloseHandle(This->hEventCompletion); EventsQueue_Destroy(&This->evqueue); This->cs.DebugInfo->Spare[0] = 0; @@ -5394,11 +5415,31 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) memcpy(&fimpl->timeformatseek, &TIME_FORMAT_MEDIA_TIME, sizeof(GUID)); fimpl->start_time = fimpl->position = 0; fimpl->stop_position = -1; + fimpl->punkFilterMapper2 = NULL; + + /* create Filtermapper aggregated. */ + hr = CoCreateInstance(&CLSID_FilterMapper2, pUnkOuter ? pUnkOuter : (IUnknown*)&fimpl->IInner_vtbl, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (LPVOID*)&fimpl->punkFilterMapper2); + + if (SUCCEEDED(hr)) { + hr = IUnknown_QueryInterface(fimpl->punkFilterMapper2, &IID_IFilterMapper2, (LPVOID*)&fimpl->pFilterMapper2); + } + + if (SUCCEEDED(hr)) { + /* Release controlling IUnknown - compensate refcount increase from caching IFilterMapper2 interface. */ + if (pUnkOuter) IUnknown_Release(pUnkOuter); + else IUnknown_Release((IUnknown*)&fimpl->IInner_vtbl); + } - hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterMapper2, (LPVOID*)&fimpl->pFilterMapper2); if (FAILED(hr)) { ERR("Unable to create filter mapper (%x)\n", hr); - return hr; + if (fimpl->punkFilterMapper2) IUnknown_Release(fimpl->punkFilterMapper2); + CloseHandle(fimpl->hEventCompletion); + EventsQueue_Destroy(&fimpl->evqueue); + fimpl->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&fimpl->cs); + CoTaskMemFree(fimpl); + return hr; } IFilterGraph2_SetDefaultSyncSource((IFilterGraph2*)fimpl);

1 0

Alexander Dorofeyev : quartz: Make Filtermapper aggregatable.
by Alexandre Julliard July 18, 2008

July 18, 2008

Module: wine Branch: master Commit: d39ee6701901ca101d4546a6ca401c5f2de034c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d39ee6701901ca101d4546a6c… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Jul 17 20:24:15 2008 +0300 quartz: Make Filtermapper aggregatable. --- dlls/quartz/filtermapper.c | 94 +++++++++++++++++++++++++++++++++++++------ 1 files changed, 81 insertions(+), 13 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index aa92cc8..9d8c9d6 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -91,9 +91,14 @@ typedef struct FilterMapper2Impl const IFilterMapper2Vtbl *lpVtbl; const IFilterMapperVtbl *lpVtblFilterMapper; const IAMFilterDataVtbl *lpVtblAMFilterData; + const IUnknownVtbl *IInner_vtbl; LONG refCount; + IUnknown * pUnkOuter; + BOOL bUnkOuterValid; + BOOL bAggregatable; } FilterMapper2Impl; +static const IUnknownVtbl IInner_VTable; static const IFilterMapper2Vtbl fm2vtbl; static const IFilterMapperVtbl fmvtbl; static const IAMFilterDataVtbl AMFilterDataVtbl; @@ -108,6 +113,11 @@ static inline FilterMapper2Impl *impl_from_IAMFilterData( IAMFilterData *iface ) return (FilterMapper2Impl *)((char*)iface - FIELD_OFFSET(FilterMapper2Impl, lpVtblAMFilterData)); } +static inline FilterMapper2Impl *impl_from_inner_IUnknown( IUnknown *iface ) +{ + return (FilterMapper2Impl *)((char*)iface - FIELD_OFFSET(FilterMapper2Impl, IInner_vtbl)); +} + static const WCHAR wszClsidSlash[] = {'C','L','S','I','D','\\',0}; static const WCHAR wszSlashInstance[] = {'\\','I','n','s','t','a','n','c','e','\\',0}; static const WCHAR wszSlash[] = {'\\',0}; @@ -214,13 +224,14 @@ HRESULT FilterMapper2_create(IUnknown *pUnkOuter, LPVOID *ppObj) TRACE("(%p, %p)\n", pUnkOuter, ppObj); - if (pUnkOuter) - return CLASS_E_NOAGGREGATION; - pFM2impl = CoTaskMemAlloc(sizeof(*pFM2impl)); if (!pFM2impl) return E_OUTOFMEMORY; + pFM2impl->pUnkOuter = pUnkOuter; + pFM2impl->bUnkOuterValid = FALSE; + pFM2impl->bAggregatable = FALSE; + pFM2impl->IInner_vtbl = &IInner_VTable; pFM2impl->lpVtbl = &fm2vtbl; pFM2impl->lpVtblFilterMapper = &fmvtbl; pFM2impl->lpVtblAMFilterData = &AMFilterDataVtbl; @@ -249,20 +260,22 @@ HRESULT FilterMapper_create(IUnknown *pUnkOuter, LPVOID *ppObj) return hr; } -/*** IUnknown methods ***/ +/*** IUnknown (inner) methods ***/ -static HRESULT WINAPI FilterMapper2_QueryInterface(IFilterMapper2 * iface, REFIID riid, LPVOID *ppv) +static HRESULT WINAPI Inner_QueryInterface(IUnknown * iface, REFIID riid, LPVOID * ppv) { - FilterMapper2Impl *This = (FilterMapper2Impl *)iface; - + FilterMapper2Impl *This = impl_from_inner_IUnknown(iface); TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); + if (This->bAggregatable) + This->bUnkOuterValid = TRUE; + *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = iface; + *ppv = &This->IInner_vtbl; else if (IsEqualIID(riid, &IID_IFilterMapper2)) - *ppv = iface; + *ppv = This; else if (IsEqualIID(riid, &IID_IFilterMapper)) *ppv = &This->lpVtblFilterMapper; else if (IsEqualIID(riid, &IID_IAMFilterData)) @@ -278,9 +291,9 @@ static HRESULT WINAPI FilterMapper2_QueryInterface(IFilterMapper2 * iface, REFII return E_NOINTERFACE; } -static ULONG WINAPI FilterMapper2_AddRef(IFilterMapper2 * iface) +static ULONG WINAPI Inner_AddRef(IUnknown * iface) { - FilterMapper2Impl *This = (FilterMapper2Impl *)iface; + FilterMapper2Impl *This = impl_from_inner_IUnknown(iface); ULONG refCount = InterlockedIncrement(&This->refCount); TRACE("(%p)->() AddRef from %d\n", This, refCount - 1); @@ -288,9 +301,9 @@ static ULONG WINAPI FilterMapper2_AddRef(IFilterMapper2 * iface) return refCount; } -static ULONG WINAPI FilterMapper2_Release(IFilterMapper2 * iface) +static ULONG WINAPI Inner_Release(IUnknown * iface) { - FilterMapper2Impl *This = (FilterMapper2Impl *)iface; + FilterMapper2Impl *This = impl_from_inner_IUnknown(iface); ULONG refCount = InterlockedDecrement(&This->refCount); TRACE("(%p)->() Release from %d\n", This, refCount + 1); @@ -303,6 +316,61 @@ static ULONG WINAPI FilterMapper2_Release(IFilterMapper2 * iface) return refCount; } +static const IUnknownVtbl IInner_VTable = +{ + Inner_QueryInterface, + Inner_AddRef, + Inner_Release +}; + +static HRESULT WINAPI FilterMapper2_QueryInterface(IFilterMapper2 * iface, REFIID riid, LPVOID *ppv) +{ + FilterMapper2Impl *This = (FilterMapper2Impl *)iface; + + if (This->bAggregatable) + This->bUnkOuterValid = TRUE; + + if (This->pUnkOuter) + { + if (This->bAggregatable) + return IUnknown_QueryInterface(This->pUnkOuter, riid, ppv); + + if (IsEqualIID(riid, &IID_IUnknown)) + { + HRESULT hr; + + IUnknown_AddRef((IUnknown *)&(This->IInner_vtbl)); + hr = IUnknown_QueryInterface((IUnknown *)&(This->IInner_vtbl), riid, ppv); + IUnknown_Release((IUnknown *)&(This->IInner_vtbl)); + This->bAggregatable = TRUE; + return hr; + } + + *ppv = NULL; + return E_NOINTERFACE; + } + + return IUnknown_QueryInterface((IUnknown *)&(This->IInner_vtbl), riid, ppv); +} + +static ULONG WINAPI FilterMapper2_AddRef(IFilterMapper2 * iface) +{ + FilterMapper2Impl *This = (FilterMapper2Impl *)iface; + + if (This->pUnkOuter && This->bUnkOuterValid) + return IUnknown_AddRef(This->pUnkOuter); + return IUnknown_AddRef((IUnknown *)&(This->IInner_vtbl)); +} + +static ULONG WINAPI FilterMapper2_Release(IFilterMapper2 * iface) +{ + FilterMapper2Impl *This = (FilterMapper2Impl *)iface; + + if (This->pUnkOuter && This->bUnkOuterValid) + return IUnknown_Release(This->pUnkOuter); + return IUnknown_Release((IUnknown *)&(This->IInner_vtbl)); +} + /*** IFilterMapper2 methods ***/ static HRESULT WINAPI FilterMapper2_CreateCategory(

1 0

Zac Brown : ntdll: Remove byte reversed U+3000 (CJK space) from being checked in RtlIsTextUnicode.
by Alexandre Julliard July 18, 2008

July 18, 2008

Module: wine Branch: master Commit: 38f6dbc55ac0f3e85b4e9ff06c0048b1e6807270 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38f6dbc55ac0f3e85b4e9ff06… Author: Zac Brown <zac(a)zacbrown.org> Date: Thu Jul 17 16:01:02 2008 -0700 ntdll: Remove byte reversed U+3000 (CJK space) from being checked in RtlIsTextUnicode. --- dlls/ntdll/rtlstr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index 60cd888..0e98588 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -1593,7 +1593,7 @@ NTSTATUS WINAPI RtlFindCharInUnicodeString( BOOLEAN WINAPI RtlIsTextUnicode( LPCVOID buf, INT len, INT *pf ) { static const WCHAR std_control_chars[] = {'\r','\n','\t',' ',0x3000,0}; - static const WCHAR byterev_control_chars[] = {0x0d00,0x0a00,0x0900,0x2000,0x0030,0}; + static const WCHAR byterev_control_chars[] = {0x0d00,0x0a00,0x0900,0x2000,0}; const WCHAR *s = buf; int i; unsigned int flags = ~0U, out_flags = 0;

1 0

Michael Stefaniuc : msxml3: Remove redundant NULL check before HeapFree ( Smatch).
by Alexandre Julliard July 18, 2008

July 18, 2008

Module: wine Branch: master Commit: 5330f7171dc09dc2e02713e4c11db3f4587ff4c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5330f7171dc09dc2e02713e4c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 17 22:49:06 2008 +0200 msxml3: Remove redundant NULL check before HeapFree (Smatch). --- dlls/msxml3/saxreader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 5fbcf89..d544fdf 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1036,7 +1036,7 @@ static HRESULT WINAPI isaxxmlreader_parse( xmlFreeParserCtxt(locator->pParserCtxt); locator->pParserCtxt = NULL; } - if(data) HeapFree(GetProcessHeap(), 0, data); + HeapFree(GetProcessHeap(), 0, data); ISAXLocator_Release((ISAXLocator*)&locator->lpSAXLocatorVtbl); return hr; }

1 0

H. Verbeet : d3d9: Correct some shader comments.
by Alexandre Julliard July 18, 2008

July 18, 2008

Module: wine Branch: master Commit: c876c929a281283264e71b13e1330e661eec9120 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c876c929a281283264e71b13e… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Jul 17 22:42:00 2008 +0200 d3d9: Correct some shader comments. --- dlls/d3d9/tests/visual.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 016d10d..fdba43b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5335,10 +5335,10 @@ static void vshader_version_varying_test(IDirect3DDevice9 *device) { 0x0200001f, 0x8001000a, 0x900f0003, /* dcl_color1 v3 */ 0x0200001f, 0x8000000b, 0x900f0004, /* dcl_fog v4 */ 0x0200001f, 0x80030005, 0x900f0005, /* dcl_texcoord3 v5 */ - 0x0200001f, 0x80000003, 0x900f0006, - 0x0200001f, 0x80000006, 0x900f0007, - 0x0200001f, 0x80000001, 0x900f0008, - 0x0200001f, 0x8000000c, 0x900f0009, + 0x0200001f, 0x80000003, 0x900f0006, /* dcl_normal v6 */ + 0x0200001f, 0x80000006, 0x900f0007, /* dcl_tangent v7 */ + 0x0200001f, 0x80000001, 0x900f0008, /* dcl_blendweight v8 */ + 0x0200001f, 0x8000000c, 0x900f0009, /* dcl_depth v9 */ 0x02000001, 0x800f0000, 0xa0e40000, /* mov r0, c0 */ 0x0200001b, 0xf0e40800, 0xf0e40000, /* loop aL, i0 */ @@ -5371,9 +5371,9 @@ static void vshader_version_varying_test(IDirect3DDevice9 *device) { DWORD vs_2_code[] = { 0xfffe0200, /* vs_2_0 */ 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ - 0x05000051, 0xa00f0000, 0x3dcccccd, 0x00000000, 0x00000000, 0x00000000, /* def c0, 0.5, 0.0, 0.0, 0.0 */ - 0x05000051, 0xa00f0001, 0x00000000, 0x3e4ccccd, 0x00000000, 0x00000000, /* def c1, 0.0, 0.5, 0.0, 0.0 */ - 0x05000051, 0xa00f0002, 0x00000000, 0x00000000, 0x3ecccccd, 0x00000000, /* def c2, 0.0, 0.0, 0.5, 0.0 */ + 0x05000051, 0xa00f0000, 0x3dcccccd, 0x00000000, 0x00000000, 0x00000000, /* def c0, 0.1, 0.0, 0.0, 0.0 */ + 0x05000051, 0xa00f0001, 0x00000000, 0x3e4ccccd, 0x00000000, 0x00000000, /* def c1, 0.0, 0.2, 0.0, 0.0 */ + 0x05000051, 0xa00f0002, 0x00000000, 0x00000000, 0x3ecccccd, 0x00000000, /* def c2, 0.0, 0.0, 0.4, 0.0 */ 0x05000051, 0xa00f0003, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, /* def c3, 1.0, 1.0, 1.0, 1.0 */ 0x02000001, 0xd00f0000, 0xa0e40002, /* mov oD0, c2 */ 0x02000001, 0xd00f0001, 0xa0e40000, /* mov oD1, c0 */

1 0

H. Verbeet : d3d9: Replace color_near() with color_match().
by Alexandre Julliard July 18, 2008

July 18, 2008

Module: wine Branch: master Commit: 0bebad66f7a6e0ff4d5cada19f060e09ed661069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bebad66f7a6e0ff4d5cada19… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Jul 17 22:41:53 2008 +0200 d3d9: Replace color_near() with color_match(). --- dlls/d3d9/tests/visual.c | 28 ++++------------------------ 1 files changed, 4 insertions(+), 24 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c625214..016d10d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6373,26 +6373,6 @@ out: IDirect3D9_Release(d3d); } -/* Return true if color is near the expected value */ -static int color_near(DWORD color, DWORD expected) -{ - const BYTE slop = 2; - - BYTE r, g, b; - BYTE rx, gx, bx; - r = (color & 0x00ff0000) >> 16; - g = (color & 0x0000ff00) >> 8; - b = (color & 0x000000ff); - rx = (expected & 0x00ff0000) >> 16; - gx = (expected & 0x0000ff00) >> 8; - bx = (expected & 0x000000ff); - - return - ((r >= (rx - slop)) && (r <= (rx + slop))) && - ((g >= (gx - slop)) && (g <= (gx + slop))) && - ((b >= (bx - slop)) && (b <= (bx + slop))); -} - static void shademode_test(IDirect3DDevice9 *device) { /* Render a quad and try all of the different fixed function shading models. */ @@ -6494,9 +6474,9 @@ static void shademode_test(IDirect3DDevice9 *device) case D3DSHADE_GOURAUD: /* Should be an interpolated blend */ - ok(color_near(color0, 0x000dca28), + ok(color_match(color0, D3DCOLOR_ARGB(0x00, 0x0d, 0xca, 0x28), 2), "GOURAUD shading has color0 %08x, expected 0x00dca28\n", color0); - ok(color_near(color1, 0x000d45c7), + ok(color_match(color1, D3DCOLOR_ARGB(0x00, 0x0d, 0x45, 0xc7), 2), "GOURAUD shading has color1 %08x, expected 0x000d45c7\n", color1); color0_gouraud = color0; @@ -6506,9 +6486,9 @@ static void shademode_test(IDirect3DDevice9 *device) break; case D3DSHADE_PHONG: /* Should be the same as GOURAUD, since no hardware implements this */ - ok(color_near(color0, 0x000dca28), + ok(color_match(color0, D3DCOLOR_ARGB(0x00, 0x0d, 0xca, 0x28), 2), "PHONG shading has color0 %08x, expected 0x000dca28\n", color0); - ok(color_near(color1, 0x000d45c7), + ok(color_match(color1, D3DCOLOR_ARGB(0x00, 0x0d, 0x45, 0xc7), 2), "PHONG shading has color1 %08x, expected 0x000d45c7\n", color1); ok(color0 == color0_gouraud, "difference between GOURAUD and PHONG shading detected: %08x %08x\n",

1 0

Alexandre Julliard : icmp: The import library is not needed.
by Alexandre Julliard July 18, 2008

July 18, 2008

Module: wine Branch: master Commit: b4bc3f26a0ee83fc6b42b6fa303135733185eea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4bc3f26a0ee83fc6b42b6fa3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 18 11:11:29 2008 +0200 icmp: The import library is not needed. --- dlls/Makefile.in | 5 ----- dlls/icmp/Makefile.in | 1 - 2 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index add8d40..73c823f 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -588,7 +588,6 @@ IMPORT_LIBS = \ glu32/libglu32.$(IMPLIBEXT) \ hid/libhid.$(IMPLIBEXT) \ hlink/libhlink.$(IMPLIBEXT) \ - icmp/libicmp.$(IMPLIBEXT) \ imagehlp/libimagehlp.$(IMPLIBEXT) \ imm32/libimm32.$(IMPLIBEXT) \ inetcomm/libinetcomm.$(IMPLIBEXT) \ @@ -724,7 +723,6 @@ CROSS_IMPLIBS = \ glu32/libglu32.a \ hid/libhid.a \ hlink/libhlink.a \ - icmp/libicmp.a \ imagehlp/libimagehlp.a \ imm32/libimm32.a \ inetcomm/libinetcomm.a \ @@ -955,9 +953,6 @@ hid/libhid.def hid/libhid.a: hid/hid.spec $(WINEBUILD) hlink/libhlink.def hlink/libhlink.a: hlink/hlink.spec $(WINEBUILD) @cd hlink && $(MAKE) `basename $@` -icmp/libicmp.def icmp/libicmp.a: icmp/icmp.spec $(WINEBUILD) - @cd icmp && $(MAKE) `basename $@` - imagehlp/libimagehlp.def imagehlp/libimagehlp.a: imagehlp/imagehlp.spec $(WINEBUILD) @cd imagehlp && $(MAKE) `basename $@` diff --git a/dlls/icmp/Makefile.in b/dlls/icmp/Makefile.in index 3154034..966a977 100644 --- a/dlls/icmp/Makefile.in +++ b/dlls/icmp/Makefile.in @@ -3,7 +3,6 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = icmp.dll -IMPORTLIB = icmp IMPORTS = kernel32 @MAKE_DLL_RULES@

1 0