wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

Christian Costa : quartz: Remove redundant traces.
by Alexandre Julliard 12 Oct '12

12 Oct '12

Module: wine Branch: master Commit: 80b33cf38bd4b7ce9803f6796fdb8e083a1c6e34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80b33cf38bd4b7ce9803f6796… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Oct 12 05:35:46 2012 +0200 quartz: Remove redundant traces. --- dlls/quartz/filtergraph.c | 44 ++++++++++++++++++++++++++------------------ 1 files changed, 26 insertions(+), 18 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 58d8588..c31de59 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -351,7 +351,7 @@ static ULONG WINAPI FilterGraph2_AddRef(IFilterGraph2 *iface) { IFilterGraphImpl *This = impl_from_IFilterGraph2(iface); - TRACE("(%p/%p)->() calling FilterGraph AddRef\n", This, iface); + TRACE("(%p/%p)->()\n", This, iface); return IUnknown_AddRef(This->outer_unk); } @@ -360,7 +360,7 @@ static ULONG WINAPI FilterGraph2_Release(IFilterGraph2 *iface) { IFilterGraphImpl *This = impl_from_IFilterGraph2(iface); - TRACE("(%p/%p)->() calling FilterGraph Release\n", This, iface); + TRACE("(%p/%p)->()\n", This, iface); return IUnknown_Release(This->outer_unk); } @@ -457,11 +457,11 @@ static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface, IBaseFilter * IBaseFilter_SetSyncSource(pFilter, This->refClock); } else - CoTaskMemFree(wszFilterName); + CoTaskMemFree(wszFilterName); if (SUCCEEDED(hr) && duplicate_name) - return VFW_S_DUPLICATE_NAME; - + return VFW_S_DUPLICATE_NAME; + return hr; } @@ -1664,13 +1664,13 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface, LPCWSTR IFileSourceFilter_Release(pfile); return S_OK; - + error: if (pfile) IFileSourceFilter_Release(pfile); IFilterGraph2_RemoveFilter(iface, preader); IBaseFilter_Release(preader); - + return hr; } @@ -1869,8 +1869,8 @@ static HRESULT ExploreGraph(IFilterGraphImpl* pGraph, IPin* pOutputPin, fnFoundF for(i = 0; i < nb; i++) { /* Explore the graph downstream from this pin - * FIXME: We should prevent exploring from a pin more than once. This can happens when - * several input pins are connected to the same output (a MUX for instance). */ + * FIXME: We should prevent exploring from a pin more than once. This can happens when + * several input pins are connected to the same output (a MUX for instance). */ ExploreGraph(pGraph, ppPins[i], FoundFilter, data); IPin_Release(ppPins[i]); } @@ -2638,22 +2638,26 @@ static ULONG WINAPI MediaPosition_Release(IMediaPosition *iface) } /*** IDispatch methods ***/ -static HRESULT WINAPI MediaPosition_GetTypeInfoCount(IMediaPosition *iface, UINT* pctinfo){ +static HRESULT WINAPI MediaPosition_GetTypeInfoCount(IMediaPosition *iface, UINT* pctinfo) +{ FIXME("(%p) stub!\n", iface); return E_NOTIMPL; } -static HRESULT WINAPI MediaPosition_GetTypeInfo(IMediaPosition *iface, UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo){ +static HRESULT WINAPI MediaPosition_GetTypeInfo(IMediaPosition *iface, UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo) +{ FIXME("(%p) stub!\n", iface); return E_NOTIMPL; } -static HRESULT WINAPI MediaPosition_GetIDsOfNames(IMediaPosition* iface, REFIID riid, LPOLESTR* rgszNames, UINT cNames, LCID lcid, DISPID* rgDispId){ +static HRESULT WINAPI MediaPosition_GetIDsOfNames(IMediaPosition* iface, REFIID riid, LPOLESTR* rgszNames, UINT cNames, LCID lcid, DISPID* rgDispId) +{ FIXME("(%p) stub!\n", iface); return E_NOTIMPL; } -static HRESULT WINAPI MediaPosition_Invoke(IMediaPosition* iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS* pDispParams, VARIANT* pVarResult, EXCEPINFO* pExcepInfo, UINT* puArgErr){ +static HRESULT WINAPI MediaPosition_Invoke(IMediaPosition* iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS* pDispParams, VARIANT* pVarResult, EXCEPINFO* pExcepInfo, UINT* puArgErr) +{ FIXME("(%p) stub!\n", iface); return E_NOTIMPL; } @@ -2753,12 +2757,14 @@ static HRESULT WINAPI MediaPosition_put_StopTime(IMediaPosition * iface, REFTIME &reftime, AM_SEEKING_AbsolutePositioning); } -static HRESULT WINAPI MediaPosition_get_PrerollTime(IMediaPosition * iface, REFTIME *pllTime){ +static HRESULT WINAPI MediaPosition_get_PrerollTime(IMediaPosition * iface, REFTIME *pllTime) +{ FIXME("(%p)->(%p) stub!\n", iface, pllTime); return E_NOTIMPL; } -static HRESULT WINAPI MediaPosition_put_PrerollTime(IMediaPosition * iface, REFTIME llTime){ +static HRESULT WINAPI MediaPosition_put_PrerollTime(IMediaPosition * iface, REFTIME llTime) +{ FIXME("(%p)->(%f) stub!\n", iface, llTime); return E_NOTIMPL; } @@ -2775,12 +2781,14 @@ static HRESULT WINAPI MediaPosition_get_Rate(IMediaPosition * iface, double *pdR return IMediaSeeking_GetRate(&This->IMediaSeeking_iface, pdRate); } -static HRESULT WINAPI MediaPosition_CanSeekForward(IMediaPosition * iface, LONG *pCanSeekForward){ +static HRESULT WINAPI MediaPosition_CanSeekForward(IMediaPosition * iface, LONG *pCanSeekForward) +{ FIXME("(%p)->(%p) stub!\n", iface, pCanSeekForward); return E_NOTIMPL; } -static HRESULT WINAPI MediaPosition_CanSeekBackward(IMediaPosition * iface, LONG *pCanSeekBackward){ +static HRESULT WINAPI MediaPosition_CanSeekBackward(IMediaPosition * iface, LONG *pCanSeekBackward) +{ FIXME("(%p)->(%p) stub!\n", iface, pCanSeekBackward); return E_NOTIMPL; } @@ -4088,7 +4096,7 @@ static HRESULT WINAPI VideoWindow_put_Caption(IVideoWindow *iface, BSTR strCapti IFilterGraphImpl *This = impl_from_IVideoWindow(iface); IVideoWindow *pVideoWindow; HRESULT hr; - + TRACE("(%p/%p)->(%s (%p))\n", This, iface, debugstr_w(strCaption), strCaption); EnterCriticalSection(&This->cs);

1 0

Christian Costa : amstream: Render source file in IAMMultiMediaStreamImpl_OpenFile.
by Alexandre Julliard 12 Oct '12

12 Oct '12

Module: wine Branch: master Commit: 01f07fe4280ef1501f9802a2c29495b5f535fbc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01f07fe4280ef1501f9802a2c… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Oct 12 07:16:06 2012 +0200 amstream: Render source file in IAMMultiMediaStreamImpl_OpenFile. --- dlls/amstream/amstream.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index a78abee..833d360 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -432,6 +432,9 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac This->ipin = ipin; } + if (SUCCEEDED(ret) && !(flags & AMMSF_NORENDER)) + ret = IGraphBuilder_Render(This->pFilterGraph, This->ipin); + if (EnumPins) IEnumPins_Release(EnumPins); if (BaseFilter)

1 0

Christian Costa : amstream: Check filename pointer in IAMMultiMediaStreamImpl_OpenFile.
by Alexandre Julliard 12 Oct '12

12 Oct '12

Module: wine Branch: master Commit: 7272256a609f12e361190230e6876f5877d61af1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7272256a609f12e361190230e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Oct 12 07:15:58 2012 +0200 amstream: Check filename pointer in IAMMultiMediaStreamImpl_OpenFile. --- dlls/amstream/amstream.c | 9 ++++++--- dlls/amstream/tests/amstream.c | 4 ++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 293e2b9..a78abee 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -397,7 +397,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream return hr; } -static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* iface, LPCWSTR pszFileName, DWORD dwFlags) +static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* iface, LPCWSTR filename, DWORD flags) { IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); HRESULT ret = S_OK; @@ -407,14 +407,17 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac PIN_DIRECTION pin_direction; const WCHAR sourceW[] = {'S','o','u','r','c','e',0}; - TRACE("(%p/%p)->(%s,%x)\n", This, iface, debugstr_w(pszFileName), dwFlags); + TRACE("(%p/%p)->(%s,%x)\n", This, iface, debugstr_w(filename), flags); + + if (!filename) + return E_POINTER; /* If Initialize was not called before, we do it here */ if (!This->pFilterGraph) ret = IAMMultiMediaStream_Initialize(iface, STREAMTYPE_READ, 0, NULL); if (SUCCEEDED(ret)) - ret = IGraphBuilder_AddSourceFilter(This->pFilterGraph, pszFileName, sourceW, &BaseFilter); + ret = IGraphBuilder_AddSourceFilter(This->pFilterGraph, filename, sourceW, &BaseFilter); if (SUCCEEDED(ret)) ret = IBaseFilter_EnumPins(BaseFilter, &EnumPins); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 6a198e0..5121b35 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -412,6 +412,10 @@ static void test_media_streams(void) } } + /* Test open file with no filename */ + hr = IAMMultiMediaStream_OpenFile(pams, NULL, 0); + ok(hr == E_POINTER, "IAMMultiMediaStream_OpenFile returned %x instead of %x\n", hr, E_POINTER); + if (video_stream) IMediaStream_Release(video_stream); if (audio_stream)

1 0

Christian Costa : amstream: Display new ref in AddRef and Release.
by Alexandre Julliard 12 Oct '12

12 Oct '12

Module: wine Branch: master Commit: 9bdf98171830ec6ba7b431f20c60dd3605598aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bdf98171830ec6ba7b431f20… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Oct 12 07:15:50 2012 +0200 amstream: Display new ref in AddRef and Release. --- dlls/amstream/mediastreamfilter.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index ee9d970..9d38b72 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -133,17 +133,22 @@ static HRESULT WINAPI MediaStreamFilterImpl_QueryInterface(IMediaStreamFilter *i static ULONG WINAPI MediaStreamFilterImpl_AddRef(IMediaStreamFilter *iface) { - return BaseFilterImpl_AddRef((IBaseFilter*)iface); + IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); + ULONG ref = BaseFilterImpl_AddRef(&This->filter.IBaseFilter_iface); + + TRACE("(%p)->(): new ref = %u\n", iface, ref); + + return ref; } static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter *iface) { IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); - ULONG refCount = BaseFilterImpl_Release((IBaseFilter*)iface); + ULONG ref = BaseFilterImpl_Release(&This->filter.IBaseFilter_iface); - TRACE("(%p)->() Release from %d\n", iface, refCount + 1); + TRACE("(%p)->(): new ref = %u\n", iface, ref); - if (!refCount) + if (!ref) { int i; for (i = 0; i < This->nb_streams; i++) @@ -154,7 +159,7 @@ static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter *iface) HeapFree(GetProcessHeap(), 0, This); } - return refCount; + return ref; } /*** IPersist methods ***/

1 0

Alistair Leslie-Hughes : include: dbs.idl: Add missing defines.
by Alexandre Julliard 12 Oct '12

12 Oct '12

Module: wine Branch: master Commit: d183cc6dfba31ce2090b5e70a6c79741a1830cb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d183cc6dfba31ce2090b5e70a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 12 10:31:21 2012 +1100 include: dbs.idl: Add missing defines. --- include/dbs.idl | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 172 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d183cc6dfba31ce2090b5…

1 0

Jacek Caban : jscript: Removed SysFreeString calls missed in previous patch .
by Alexandre Julliard 12 Oct '12

12 Oct '12

Module: wine Branch: master Commit: ec8a57b6de23fe3a1fab0293e99b3da807cc95a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec8a57b6de23fe3a1fab0293e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 12 11:48:18 2012 +0200 jscript: Removed SysFreeString calls missed in previous patch. --- dlls/jscript/date.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index ebf1454..f192824 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -714,18 +714,13 @@ static inline HRESULT create_utc_string(script_ctx_t *ctx, vdisp_t *jsthis, jsva day = date_from_time(date->time); date_str = jsstr_alloc_buf(len); - if(!date_str) { - SysFreeString(week); - SysFreeString(month); + if(!date_str) return E_OUTOFMEMORY; - } + sprintfW(date_str->str, formatAD?formatADW:formatBCW, week, day, month, year, (int)hour_from_time(date->time), (int)min_from_time(date->time), (int)sec_from_time(date->time)); - SysFreeString(week); - SysFreeString(month); - *r = jsval_string(date_str); } return S_OK;

1 0

Alexandre Julliard : ole32/tests: Fix a test failure on newer Windows versions.
by Alexandre Julliard 12 Oct '12

12 Oct '12

Module: wine Branch: master Commit: cba98a2d8e127bc8e0f379abb107435bb2171388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cba98a2d8e127bc8e0f379abb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 12 11:54:03 2012 +0200 ole32/tests: Fix a test failure on newer Windows versions. --- dlls/ole32/tests/propvariant.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 2de480a..769d49a 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -463,8 +463,9 @@ static void test_varianttoproperty(void) 0, FALSE, 0); ok(propvalue == own_propvalue, "unexpected propvalue %p\n", propvalue); - ok(len == 0, "unexpected length %d\n", len); - ok(propvalue->dwType == 0xdeadbeef, "unexpected type %d\n", propvalue->dwType); + ok(len == 4 || broken(len == 0) /* before Vista */, "unexpected length %d\n", len); + if (len) ok(!memcmp(propvalue, serialized_empty, 4), "got wrong data\n"); + else ok(propvalue->dwType == 0xdeadbeef, "unexpected type %d\n", propvalue->dwType); propvar.vt = VT_NULL; len = 20;

1 0

Alexandre Julliard : ntdll/tests: Fix some test failures on Windows.
by Alexandre Julliard 12 Oct '12

12 Oct '12

Module: wine Branch: master Commit: be2b45ce0ae76830718b35dc565929a2b27ce04a URL: http://source.winehq.org/git/wine.git/?a=commit;h=be2b45ce0ae76830718b35dc5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 12 11:47:01 2012 +0200 ntdll/tests: Fix some test failures on Windows. --- dlls/ntdll/tests/info.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index b376d93..333dc4a 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -681,10 +681,10 @@ static void test_query_processor_power_info(void) ok( status == STATUS_BUFFER_TOO_SMALL, "Expected STATUS_BUFFER_TOO_SMALL, got %08x\n", status); status = pNtPowerInformation(ProcessorInformation, 0, 0, 0, size); - ok( status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + ok( status == STATUS_SUCCESS || status == STATUS_INVALID_PARAMETER, "Got %08x\n", status); status = pNtPowerInformation(ProcessorInformation, 0, 0, ppi, 0); - ok( status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + ok( status == STATUS_BUFFER_TOO_SMALL || status == STATUS_INVALID_PARAMETER, "Got %08x\n", status); } } else

1 0

Alexandre Julliard : gdi32: Add helper functions for converting between handle and index.
by Alexandre Julliard 12 Oct '12

12 Oct '12

Module: wine Branch: master Commit: 2f92af70e0346a071e7393c553eca468646ca269 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f92af70e0346a071e7393c55… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 12 11:36:24 2012 +0200 gdi32: Add helper functions for converting between handle and index. Also rename all instances of "large handles" since that's the only handle type now. --- dlls/gdi32/gdiobj.c | 67 ++++++++++++++++++++++++++++---------------------- 1 files changed, 37 insertions(+), 30 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 06279dd..9da5533 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -600,12 +600,22 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) return TRUE; } -#define FIRST_LARGE_HANDLE 16 -#define MAX_LARGE_HANDLES ((GDI_HEAP_SIZE >> 2) - FIRST_LARGE_HANDLE) -static GDIOBJHDR *large_handles[MAX_LARGE_HANDLES]; -static int next_large_handle; +#define FIRST_GDI_HANDLE 16 +#define MAX_GDI_HANDLES ((GDI_HEAP_SIZE >> 2) - FIRST_GDI_HANDLE) +static GDIOBJHDR *gdi_handles[MAX_GDI_HANDLES]; +static int next_gdi_handle; static LONG debug_count; +static inline HGDIOBJ index_to_handle( int index ) +{ + return ULongToHandle( (index + FIRST_GDI_HANDLE) << 2); +} + +static inline int handle_to_index( HGDIOBJ handle ) +{ + return (HandleToULong(handle) >> 2) - FIRST_GDI_HANDLE; +} + static const char *gdi_obj_type( unsigned type ) { switch ( type ) @@ -632,20 +642,19 @@ static void dump_gdi_objects( void ) { int i; - TRACE( "%u objects:\n", MAX_LARGE_HANDLES ); + TRACE( "%u objects:\n", MAX_GDI_HANDLES ); EnterCriticalSection( &gdi_section ); - for (i = 0; i < MAX_LARGE_HANDLES; i++) + for (i = 0; i < MAX_GDI_HANDLES; i++) { - if (!large_handles[i]) + if (!gdi_handles[i]) { - TRACE( "index %d handle %p FREE\n", i, (HGDIOBJ)(ULONG_PTR)((i + FIRST_LARGE_HANDLE) << 2) ); + TRACE( "index %d handle %p FREE\n", i, index_to_handle( i )); continue; } TRACE( "handle %p obj %p type %s selcount %u deleted %u\n", - (HGDIOBJ)(ULONG_PTR)((i + FIRST_LARGE_HANDLE) << 2), - large_handles[i], gdi_obj_type( large_handles[i]->type ), - large_handles[i]->selcount, large_handles[i]->deleted ); + index_to_handle( i ), gdi_handles[i], gdi_obj_type( gdi_handles[i]->type ), + gdi_handles[i]->selcount, gdi_handles[i]->deleted ); } LeaveCriticalSection( &gdi_section ); } @@ -668,10 +677,10 @@ HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs obj->hdcs = NULL; EnterCriticalSection( &gdi_section ); - for (i = next_large_handle + 1; i < MAX_LARGE_HANDLES; i++) - if (!large_handles[i]) goto found; - for (i = 0; i <= next_large_handle; i++) - if (!large_handles[i]) goto found; + for (i = next_gdi_handle + 1; i < MAX_GDI_HANDLES; i++) + if (!gdi_handles[i]) goto found; + for (i = 0; i <= next_gdi_handle; i++) + if (!gdi_handles[i]) goto found; LeaveCriticalSection( &gdi_section ); ERR( "out of GDI object handles, expect a crash\n" ); @@ -679,13 +688,13 @@ HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs return 0; found: - large_handles[i] = obj; - next_large_handle = i; + gdi_handles[i] = obj; + next_gdi_handle = i; LeaveCriticalSection( &gdi_section ); TRACE( "allocated %s %p %u/%u\n", - gdi_obj_type(type), (HGDIOBJ)(ULONG_PTR)((i + FIRST_LARGE_HANDLE) << 2), - InterlockedIncrement( &debug_count ), MAX_LARGE_HANDLES ); - return (HGDIOBJ)(ULONG_PTR)((i + FIRST_LARGE_HANDLE) << 2); + gdi_obj_type(type), index_to_handle( i ), + InterlockedIncrement( &debug_count ), MAX_GDI_HANDLES ); + return index_to_handle( i ); } @@ -697,20 +706,19 @@ HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs void *free_gdi_handle( HGDIOBJ handle ) { GDIOBJHDR *object = NULL; - int i; + int i = handle_to_index( handle ); - i = (HandleToULong(handle) >> 2) - FIRST_LARGE_HANDLE; - if (i >= 0 && i < MAX_LARGE_HANDLES) + if (i >= 0 && i < MAX_GDI_HANDLES) { EnterCriticalSection( &gdi_section ); - object = large_handles[i]; - large_handles[i] = NULL; + object = gdi_handles[i]; + gdi_handles[i] = NULL; LeaveCriticalSection( &gdi_section ); } if (object) { TRACE( "freed %s %p %u/%u\n", gdi_obj_type( object->type ), handle, - InterlockedDecrement( &debug_count ) + 1, MAX_LARGE_HANDLES ); + InterlockedDecrement( &debug_count ) + 1, MAX_GDI_HANDLES ); object->type = 0; /* mark it as invalid */ object->funcs = NULL; } @@ -728,14 +736,13 @@ void *free_gdi_handle( HGDIOBJ handle ) void *GDI_GetObjPtr( HGDIOBJ handle, WORD type ) { GDIOBJHDR *ptr = NULL; - int i; + int i = handle_to_index( handle ); EnterCriticalSection( &gdi_section ); - i = (HandleToULong(handle) >> 2) - FIRST_LARGE_HANDLE; - if (i >= 0 && i < MAX_LARGE_HANDLES) + if (i >= 0 && i < MAX_GDI_HANDLES) { - ptr = large_handles[i]; + ptr = gdi_handles[i]; if (ptr && type && ptr->type != type) ptr = NULL; }

1 0

Dmitry Timoshkov : gdiplus: Add a test for GdipMeasureDriverString called with not NULL matrix.
by Alexandre Julliard 12 Oct '12

12 Oct '12

Module: wine Branch: master Commit: 22336a121b7da984319d08f1f9a1ed8abfbc8df7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22336a121b7da984319d08f1f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 12 14:00:53 2012 +0900 gdiplus: Add a test for GdipMeasureDriverString called with not NULL matrix. --- dlls/gdiplus/tests/font.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index c06a954..568f9b7 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -885,6 +885,15 @@ todo_wine expectf_(-100.0, bounds.Y, 0.05); todo_wine expectf(height, bounds.Height); + set_rect_empty(&bounds); + status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, + DriverStringOptionsCmapLookup, matrix, &bounds); + expect(Ok, status); + expectf(0.0, bounds.X); +todo_wine + expectf_(-100.0, bounds.Y, 0.05); +todo_wine + expectf(height, bounds.Height); /* scale matrix */ status = GdipScaleMatrix(matrix, 2.0, 3.0, MatrixOrderAppend); @@ -924,6 +933,15 @@ todo_wine expectf_(-100.0, bounds.Y, 0.05); todo_wine expectf(height, bounds.Height); + set_rect_empty(&bounds); + status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, + DriverStringOptionsCmapLookup, matrix, &bounds); + expect(Ok, status); + expectf(0.0, bounds.X); +todo_wine + expectf_(-300.0, bounds.Y, 0.15); +todo_wine + expectf(height * 3.0, bounds.Height); /* scale + ratate matrix */ status = GdipRotateMatrix(matrix, 45.0, MatrixOrderAppend); @@ -963,6 +981,16 @@ todo_wine expectf_(-100.0, bounds.Y, 0.05); todo_wine expectf(height, bounds.Height); + set_rect_empty(&bounds); + status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, + DriverStringOptionsCmapLookup, matrix, &bounds); + expect(Ok, status); +todo_wine + expectf_(-43.814377, bounds.X, 0.05); +todo_wine + expectf_(-212.235611, bounds.Y, 0.05); +todo_wine + expectf_(340.847534, bounds.Height, 0.05); /* scale + ratate + shear matrix */ status = GdipShearMatrix(matrix, 4.0, 5.0, MatrixOrderAppend); @@ -1002,6 +1030,16 @@ todo_wine expectf_(-100.0, bounds.Y, 0.05); todo_wine expectf(height, bounds.Height); + set_rect_empty(&bounds); + status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, + DriverStringOptionsCmapLookup, matrix, &bounds); + expect(Ok, status); +todo_wine + expectf_(-636.706848, bounds.X, 0.05); +todo_wine + expectf_(-175.257523, bounds.Y, 0.05); +todo_wine + expectf_(1532.984985, bounds.Height, 0.05); /* scale + ratate + shear + translate matrix */ status = GdipTranslateMatrix(matrix, 10.0, 20.0, MatrixOrderAppend); @@ -1041,6 +1079,16 @@ todo_wine expectf_(-100.0, bounds.Y, 0.05); todo_wine expectf(height, bounds.Height); + set_rect_empty(&bounds); + status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, + DriverStringOptionsCmapLookup, matrix, &bounds); + expect(Ok, status); +todo_wine + expectf_(-626.706848, bounds.X, 0.05); +todo_wine + expectf_(-155.257523, bounds.Y, 0.05); +todo_wine + expectf_(1532.984985, bounds.Height, 0.05); GdipDeleteMatrix(matrix); GdipDeleteFont(font);

1 0

← Newer
1
...
56
57
58
59
60
61
62
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2012