October 2012 - Wine-commits

Daniel Lehman : msvcp90: In codecvt<wchar_t>::do_out, copy local buffer to *to_next.
by Alexandre Julliard 12 Oct '12

12 Oct '12

Module: wine Branch: master Commit: 8ed96ab041259d94f569e0a579b97e35fe75e05e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ed96ab041259d94f569e0a57… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Sep 27 14:54:02 2012 -0700 msvcp90: In codecvt<wchar_t>::do_out, copy local buffer to *to_next. --- dlls/msvcp90/locale.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 26f1fba..e5b9d6a 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -3273,6 +3273,7 @@ int __thiscall codecvt_wchar_do_out(const codecvt_wchar *this, int *state, } (*from_next)++; + memcpy_s(*to_next, to_end-*to_next, buf, size); (*to_next) += size; } }

1 0

Alexandre Julliard : setupapi: Fix buffer overflow in load_fake_dll.
by Alexandre Julliard 12 Oct '12

12 Oct '12

Module: wine Branch: master Commit: 8418115edfc785242c16ba1eca5c5a14f6e663b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8418115edfc785242c16ba1ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 12 11:21:14 2012 +0200 setupapi: Fix buffer overflow in load_fake_dll. Found by Daniel Lehman. --- dlls/setupapi/fakedll.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 645b7e8..7393e40 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -394,13 +394,13 @@ static void *load_fake_dll( const WCHAR *name, SIZE_T *size ) if ((p = strrchrW( name, '\\' ))) name = p + 1; i = 0; - if (build_dir) maxlen = strlen(build_dir) + sizeof("/programs/") + strlenW(name); + len = strlenW( name ); + if (build_dir) maxlen = strlen(build_dir) + sizeof("/programs/") + len; while ((path = wine_dll_enum_load_path( i++ ))) maxlen = max( maxlen, strlen(path) ); - maxlen += sizeof("/fakedlls") + strlenW(name) + 2; + maxlen += sizeof("/fakedlls") + len + sizeof(".fake"); if (!(file = HeapAlloc( GetProcessHeap(), 0, maxlen ))) return NULL; - len = strlenW( name ); pos = maxlen - len - sizeof(".fake"); if (!dll_name_WtoA( file + pos, name, len )) goto done; file[--pos] = '/';

1 0

Daniel Lehman : gdi32: Use HandleToULong inline function to convert handle to index instead of casting .
by Alexandre Julliard 12 Oct '12

12 Oct '12

Module: wine Branch: master Commit: ea6e0a833b86cbc1b0b518263d529dc4c32f9bcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea6e0a833b86cbc1b0b518263… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Apr 16 14:53:43 2012 -0700 gdi32: Use HandleToULong inline function to convert handle to index instead of casting. --- dlls/gdi32/gdiobj.c | 4 ++-- dlls/gdi32/tests/gdiobj.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 14ac692..06279dd 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -699,7 +699,7 @@ void *free_gdi_handle( HGDIOBJ handle ) GDIOBJHDR *object = NULL; int i; - i = ((ULONG_PTR)handle >> 2) - FIRST_LARGE_HANDLE; + i = (HandleToULong(handle) >> 2) - FIRST_LARGE_HANDLE; if (i >= 0 && i < MAX_LARGE_HANDLES) { EnterCriticalSection( &gdi_section ); @@ -732,7 +732,7 @@ void *GDI_GetObjPtr( HGDIOBJ handle, WORD type ) EnterCriticalSection( &gdi_section ); - i = ((UINT_PTR)handle >> 2) - FIRST_LARGE_HANDLE; + i = (HandleToULong(handle) >> 2) - FIRST_LARGE_HANDLE; if (i >= 0 && i < MAX_LARGE_HANDLES) { ptr = large_handles[i]; diff --git a/dlls/gdi32/tests/gdiobj.c b/dlls/gdi32/tests/gdiobj.c index c854311..3b9f734 100644 --- a/dlls/gdi32/tests/gdiobj.c +++ b/dlls/gdi32/tests/gdiobj.c @@ -319,10 +319,54 @@ static void test_region(void) DeleteObject(hrgn); } +static void test_handles_on_win64(void) +{ + int i; + BOOL ret; + DWORD type; + HRGN hrgn, hrgn_test; + + static const struct + { + ULONG high; + ULONG low; + BOOL ret; + } cases[] = + { + { 0x00000000, 0x00000000, TRUE }, + { 0x00000000, 0x0000ffe0, FALSE }, /* just over MAX_LARGE_HANDLES */ + { 0x00000000, 0x0000ffb0, FALSE }, /* just under MAX_LARGE_HANDLES */ + { 0xffffffff, 0xffff0000, FALSE }, + { 0xffffffff, 0x00000000, TRUE }, + { 0xdeadbeef, 0x00000000, TRUE }, + { 0xcccccccc, 0xcccccccc, FALSE } + }; + + if (sizeof(void*) != 8) + return; + + for (i = 0; i < sizeof(cases)/sizeof(cases[0]); i++) + { + hrgn = CreateRectRgn(10, 10, 20, 20); + hrgn_test = (HRGN)(ULONG_PTR)((ULONG_PTR)hrgn | ((ULONGLONG)cases[i].high << 32) | cases[i].low); + type = GetObjectType( hrgn_test ); + if (cases[i].ret) + ok( type == OBJ_REGION, "wrong type %u\n", type ); + else + ok( type == 0, "wrong type %u\n", type ); + ret = DeleteObject(hrgn_test); + ok( cases[i].ret == ret, "DeleteObject should return %s (%p)\n", + cases[i].ret ? "TRUE" : "FALSE", hrgn_test); + /* actually free it if above is expected to fail */ + if (!ret) DeleteObject(hrgn); + } +} + START_TEST(gdiobj) { test_gdi_objects(); test_thread_objects(); test_GetCurrentObject(); test_region(); + test_handles_on_win64(); }

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

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

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 : 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

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

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

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