March 2019 - Wine-Commits - list.winehq.org

Zebediah Figura : quartz/systemclock: Simplify SystemClockImpl_GetTime().
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: 9068ad0f0935ff512ff9f0277cf5d988ff8e86f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9068ad0f0935ff512ff9f027… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 13 09:54:05 2019 -0500 quartz/systemclock: Simplify SystemClockImpl_GetTime(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/systemclock.c | 38 +++++++++++++++++++------------------- dlls/quartz/tests/systemclock.c | 4 ++-- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 1638e11..c809ce4 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -44,8 +44,7 @@ typedef struct SystemClockImpl { HANDLE adviseThread; DWORD adviseThreadId; BOOL adviseThreadActive; - REFERENCE_TIME lastRefTime; - DWORD lastTimeTickCount; + REFERENCE_TIME last_time; CRITICAL_SECTION safe; SystemClockAdviseEntry* pSingleShotAdvise; @@ -240,26 +239,28 @@ static ULONG WINAPI SystemClockImpl_Release(IReferenceClock* iface) { return ref; } -static HRESULT WINAPI SystemClockImpl_GetTime(IReferenceClock* iface, REFERENCE_TIME* pTime) { - SystemClockImpl *This = impl_from_IReferenceClock(iface); - DWORD curTimeTickCount; - HRESULT hr = S_OK; +static HRESULT WINAPI SystemClockImpl_GetTime(IReferenceClock *iface, REFERENCE_TIME *time) +{ + SystemClockImpl *clock = impl_from_IReferenceClock(iface); + REFERENCE_TIME ret; + HRESULT hr; - TRACE("(%p, %p)\n", This, pTime); + TRACE("clock %p, time %p.\n", clock, time); - if (NULL == pTime) { - return E_POINTER; - } + if (!time) { + return E_POINTER; + } - curTimeTickCount = GetTickCount(); + ret = GetTickCount64() * 10000; - EnterCriticalSection(&This->safe); - if (This->lastTimeTickCount == curTimeTickCount) hr = S_FALSE; - This->lastRefTime += (REFERENCE_TIME) (DWORD) (curTimeTickCount - This->lastTimeTickCount) * (REFERENCE_TIME) 10000; - This->lastTimeTickCount = curTimeTickCount; - *pTime = This->lastRefTime; - LeaveCriticalSection(&This->safe); - return hr; + EnterCriticalSection(&clock->safe); + + hr = (ret == clock->last_time) ? S_FALSE : S_OK; + *time = clock->last_time = ret; + + LeaveCriticalSection(&clock->safe); + + return hr; } static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock* iface, REFERENCE_TIME rtBaseTime, REFERENCE_TIME rtStreamTime, HEVENT hEvent, DWORD_PTR* pdwAdviseCookie) { @@ -389,7 +390,6 @@ HRESULT QUARTZ_CreateSystemClock(IUnknown * pUnkOuter, LPVOID * ppv) { obj->IReferenceClock_iface.lpVtbl = &SystemClock_Vtbl; obj->ref = 0; /* will be inited by QueryInterface */ - obj->lastTimeTickCount = GetTickCount(); InitializeCriticalSection(&obj->safe); obj->safe.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SystemClockImpl.safe"); diff --git a/dlls/quartz/tests/systemclock.c b/dlls/quartz/tests/systemclock.c index c960d98..258e198 100644 --- a/dlls/quartz/tests/systemclock.c +++ b/dlls/quartz/tests/systemclock.c @@ -77,10 +77,10 @@ static void test_get_time(void) time2 = GetTickCount64() * 10000; else time2 = GetTickCount() * 10000; - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); ok(time1 % 10000 == 0, "Expected no less than 1ms coarseness, but got time %s.\n", wine_dbgstr_longlong(time1)); - todo_wine ok(abs(time1 - time2) < 20 * 10000, "Expected about %s, got %s.\n", + ok(abs(time1 - time2) < 20 * 10000, "Expected about %s, got %s.\n", wine_dbgstr_longlong(time2), wine_dbgstr_longlong(time1)); hr = IReferenceClock_GetTime(clock, &time2);

1 0

Zebediah Figura : quartz/tests: Clean up test_IReferenceClock_query_interface().
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: c3e4b3a30e1bbd927d12c5b45d1c18aefdd26f54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3e4b3a30e1bbd927d12c5b4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 13 09:54:03 2019 -0500 quartz/tests: Clean up test_IReferenceClock_query_interface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/systemclock.c | 55 ++++++++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 20 deletions(-) diff --git a/dlls/quartz/tests/systemclock.c b/dlls/quartz/tests/systemclock.c index c051565..5b82a44 100644 --- a/dlls/quartz/tests/systemclock.c +++ b/dlls/quartz/tests/systemclock.c @@ -1,5 +1,5 @@ /* - * Unit tests for Direct Show functions - IReferenceClock + * System clock unit tests * * Copyright (C) 2007 Alex Villacís Lasso * @@ -19,30 +19,45 @@ */ #define COBJMACROS - -#include "wine/test.h" -#include "uuids.h" #include "dshow.h" -#include "control.h" +#include "wine/test.h" -static void test_IReferenceClock_query_interface(const char * clockdesc, IReferenceClock * pClock) +static IReferenceClock *create_system_clock(void) { - HRESULT hr; - IUnknown *pF; + IReferenceClock *filter = NULL; + HRESULT hr = CoCreateInstance(&CLSID_SystemClock, NULL, CLSCTX_INPROC_SERVER, + &IID_IReferenceClock, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + return filter; +} + +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + +static void test_interfaces(void) +{ + IReferenceClock *clock = create_system_clock(); + ULONG ref; - hr = IReferenceClock_QueryInterface(pClock, &IID_IUnknown, (void**)&pF); - ok(hr == S_OK, "IReferenceClock_QueryInterface returned %x\n", hr); - ok(pF != NULL, "pF is NULL\n"); - if (SUCCEEDED(hr)) IUnknown_Release(pF); + check_interface(clock, &IID_IReferenceClock, TRUE); + check_interface(clock, &IID_IUnknown, TRUE); - hr = IReferenceClock_QueryInterface(pClock, &IID_IDirectDraw, (void**)&pF); - ok(hr == E_NOINTERFACE, "IReferenceClock_QueryInterface returned %x\n", hr); - ok(pF == NULL, "pF is not NULL\n"); + check_interface(clock, &IID_IDirectDraw, FALSE); - hr = IReferenceClock_QueryInterface(pClock, &IID_IReferenceClock, (void**)&pF); - ok(hr == S_OK, "IReferenceClock_QueryInterface returned %x\n", hr); - ok(pF != NULL, "pF is NULL\n"); - if (SUCCEEDED(hr)) IUnknown_Release(pF); + ref = IReferenceClock_Release(clock); + ok(!ref, "Got outstanding refcount %d.\n", ref); } /* The following method expects a reference clock that will keep ticking for @@ -99,7 +114,6 @@ static void test_IReferenceClock_SystemClock(void) ok(hr == S_OK, "Unable to create reference clock from system clock %x\n", hr); if (hr == S_OK) { - test_IReferenceClock_query_interface("SystemClock", pReferenceClock); test_IReferenceClock_methods("SystemClock", pReferenceClock); IReferenceClock_Release(pReferenceClock); } @@ -109,6 +123,7 @@ START_TEST(systemclock) { CoInitialize(NULL); + test_interfaces(); test_IReferenceClock_SystemClock(); CoUninitialize();

1 0

Józef Kucia : ucrtbase: Add more _o forwards.
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: a7ba23b583a4740b6efacd28d90aa8fc04021c0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7ba23b583a4740b6efacd28… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 13 10:10:16 2019 +0100 ucrtbase: Add more _o forwards. For dxc.exe. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 32 +++++++++++----------- dlls/ucrtbase/ucrtbase.spec | 32 +++++++++++----------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 3ae943f..7a9ccfa 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -94,7 +94,7 @@ @ stub _o____lc_collate_cp_func @ stub _o____lc_locale_name_func @ stub _o____mb_cur_max_func -@ stub _o___acrt_iob_func +@ cdecl _o___acrt_iob_func(long) ucrtbase._o___acrt_iob_func @ stub _o___conio_common_vcprintf @ stub _o___conio_common_vcprintf_p @ stub _o___conio_common_vcprintf_s @@ -143,10 +143,10 @@ @ stub _o___pctype_func @ stub _o___pwctype_func @ stub _o___std_exception_copy -@ stub _o___std_exception_destroy +@ cdecl _o___std_exception_destroy(ptr) ucrtbase._o___std_exception_destroy @ cdecl _o___std_type_info_destroy_list(ptr) ucrtbase._o___std_type_info_destroy_list @ stub _o___std_type_info_name -@ stub _o___stdio_common_vfprintf +@ cdecl _o___stdio_common_vfprintf(int64 ptr str ptr ptr) ucrtbase._o___stdio_common_vfprintf @ stub _o___stdio_common_vfprintf_p @ stub _o___stdio_common_vfprintf_s @ stub _o___stdio_common_vfscanf @@ -154,11 +154,11 @@ @ stub _o___stdio_common_vfwprintf_p @ stub _o___stdio_common_vfwprintf_s @ stub _o___stdio_common_vfwscanf -@ stub _o___stdio_common_vsnprintf_s +@ cdecl _o___stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) ucrtbase._o___stdio_common_vsnprintf_s @ stub _o___stdio_common_vsnwprintf_s @ stub _o___stdio_common_vsprintf @ stub _o___stdio_common_vsprintf_p -@ stub _o___stdio_common_vsprintf_s +@ cdecl _o___stdio_common_vsprintf_s(int64 ptr long str ptr ptr) ucrtbase._o___stdio_common_vsprintf_s @ stub _o___stdio_common_vsscanf @ stub _o___stdio_common_vswprintf @ stub _o___stdio_common_vswprintf_p @@ -240,7 +240,7 @@ @ stub _o__endthread @ stub _o__endthreadex @ stub _o__eof -@ stub _o__errno +@ cdecl _o__errno() ucrtbase._o__errno @ stub _o__except1 @ cdecl _o__execute_onexit_table(ptr) ucrtbase._o__execute_onexit_table @ stub _o__execv @@ -281,7 +281,7 @@ @ stub _o__findnext64 @ stub _o__findnext64i32 @ stub _o__flushall -@ stub _o__fpclass +@ cdecl _o__fpclass(double) ucrtbase._o__fpclass @ stub _o__fpclassf @ stub _o__fputc_nolock @ stub _o__fputchar @@ -985,15 +985,15 @@ @ stub _o_getwchar @ stub _o_hypot @ stub _o_is_wctype -@ stub _o_isalnum -@ stub _o_isalpha +@ cdecl _o_isalnum(long) ucrtbase._o_isalnum +@ cdecl _o_isalpha(long) ucrtbase._o_isalpha @ stub _o_isblank @ stub _o_iscntrl -@ stub _o_isdigit +@ cdecl _o_isdigit(long) ucrtbase._o_isdigit @ stub _o_isgraph @ stub _o_isleadbyte @ stub _o_islower -@ stub _o_isprint +@ cdecl _o_isprint(long) ucrtbase._o_isprint @ stub _o_ispunct @ stub _o_isspace @ stub _o_isupper @@ -1075,12 +1075,12 @@ @ stub _o_puts @ stub _o_putwc @ stub _o_putwchar -@ stub _o_qsort +@ cdecl _o_qsort(ptr long long ptr) ucrtbase._o_qsort @ stub _o_qsort_s @ stub _o_raise @ stub _o_rand @ stub _o_rand_s -@ stub _o_realloc +@ cdecl _o_realloc(ptr long) ucrtbase._o_realloc @ stub _o_remainder @ stub _o_remainderf @ stub _o_remainderl @@ -1113,7 +1113,7 @@ @ stub _o_sqrt @ stub _o_sqrtf @ stub _o_srand -@ stub _o_strcat_s +@ cdecl _o_strcat_s(str long str) ucrtbase._o_strcat_s @ stub _o_strcoll @ stub _o_strcpy_s @ stub _o_strerror @@ -1128,7 +1128,7 @@ @ stub _o_strtol @ stub _o_strtold @ stub _o_strtoll -@ stub _o_strtoul +@ cdecl _o_strtoul(str ptr long) ucrtbase._o_strtoul @ stub _o_strtoull @ stub _o_system @ stub _o_tan @@ -1141,7 +1141,7 @@ @ stub _o_tgammal @ stub _o_tmpfile_s @ stub _o_tmpnam_s -@ stub _o_tolower +@ cdecl _o_tolower(long) ucrtbase._o_tolower @ cdecl _o_toupper(long) ucrtbase._o_toupper @ stub _o_towlower @ stub _o_towupper diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index f4ad66c..770dd4f 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -758,7 +758,7 @@ @ stub _o____lc_collate_cp_func @ stub _o____lc_locale_name_func @ stub _o____mb_cur_max_func -@ stub _o___acrt_iob_func +@ cdecl _o___acrt_iob_func(long) MSVCRT___acrt_iob_func @ stub _o___conio_common_vcprintf @ stub _o___conio_common_vcprintf_p @ stub _o___conio_common_vcprintf_s @@ -807,10 +807,10 @@ @ stub _o___pctype_func @ stub _o___pwctype_func @ stub _o___std_exception_copy -@ stub _o___std_exception_destroy +@ cdecl _o___std_exception_destroy(ptr) MSVCRT___std_exception_destroy @ cdecl _o___std_type_info_destroy_list(ptr) MSVCRT_type_info_destroy_list @ stub _o___std_type_info_name -@ stub _o___stdio_common_vfprintf +@ cdecl _o___stdio_common_vfprintf(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfprintf @ stub _o___stdio_common_vfprintf_p @ stub _o___stdio_common_vfprintf_s @ stub _o___stdio_common_vfscanf @@ -818,11 +818,11 @@ @ stub _o___stdio_common_vfwprintf_p @ stub _o___stdio_common_vfwprintf_s @ stub _o___stdio_common_vfwscanf -@ stub _o___stdio_common_vsnprintf_s +@ cdecl _o___stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) MSVCRT__stdio_common_vsnprintf_s @ stub _o___stdio_common_vsnwprintf_s @ stub _o___stdio_common_vsprintf @ stub _o___stdio_common_vsprintf_p -@ stub _o___stdio_common_vsprintf_s +@ cdecl _o___stdio_common_vsprintf_s(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf_s @ stub _o___stdio_common_vsscanf @ stub _o___stdio_common_vswprintf @ stub _o___stdio_common_vswprintf_p @@ -904,7 +904,7 @@ @ stub _o__endthread @ stub _o__endthreadex @ stub _o__eof -@ stub _o__errno +@ cdecl _o__errno() MSVCRT__errno @ stub _o__except1 @ cdecl _o__execute_onexit_table(ptr) MSVCRT__execute_onexit_table @ stub _o__execv @@ -945,7 +945,7 @@ @ stub _o__findnext64 @ stub _o__findnext64i32 @ stub _o__flushall -@ stub _o__fpclass +@ cdecl _o__fpclass(double) MSVCRT__fpclass @ stub _o__fpclassf @ stub _o__fputc_nolock @ stub _o__fputchar @@ -1649,15 +1649,15 @@ @ stub _o_getwchar @ stub _o_hypot @ stub _o_is_wctype -@ stub _o_isalnum -@ stub _o_isalpha +@ cdecl _o_isalnum(long) MSVCRT_isalnum +@ cdecl _o_isalpha(long) MSVCRT_isalpha @ stub _o_isblank @ stub _o_iscntrl -@ stub _o_isdigit +@ cdecl _o_isdigit(long) MSVCRT_isdigit @ stub _o_isgraph @ stub _o_isleadbyte @ stub _o_islower -@ stub _o_isprint +@ cdecl _o_isprint(long) MSVCRT_isprint @ stub _o_ispunct @ stub _o_isspace @ stub _o_isupper @@ -1740,12 +1740,12 @@ @ stub _o_puts @ stub _o_putwc @ stub _o_putwchar -@ stub _o_qsort +@ cdecl _o_qsort(ptr long long ptr) MSVCRT_qsort @ stub _o_qsort_s @ stub _o_raise @ stub _o_rand @ stub _o_rand_s -@ stub _o_realloc +@ cdecl _o_realloc(ptr long) MSVCRT_realloc @ stub _o_remainder @ stub _o_remainderf @ stub _o_remainderl @@ -1778,7 +1778,7 @@ @ stub _o_sqrt @ stub _o_sqrtf @ stub _o_srand -@ stub _o_strcat_s +@ cdecl _o_strcat_s(str long str) MSVCRT_strcat_s @ stub _o_strcoll @ stub _o_strcpy_s @ stub _o_strerror @@ -1793,7 +1793,7 @@ @ stub _o_strtol @ stub _o_strtold @ stub _o_strtoll -@ stub _o_strtoul +@ cdecl _o_strtoul(str ptr long) MSVCRT_strtoul @ stub _o_strtoull @ stub _o_system @ stub _o_tan @@ -1806,7 +1806,7 @@ @ stub _o_tgammal @ stub _o_tmpfile_s @ stub _o_tmpnam_s -@ stub _o_tolower +@ cdecl _o_tolower(long) MSVCRT__tolower @ cdecl _o_toupper(long) MSVCRT__toupper @ stub _o_towlower @ stub _o_towupper

1 0

Nikolay Sivov : mfplat: Forward CopyAllItems() for stream descriptor.
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: 78936b928543a0a6cc0d69511a4f0886f675b060 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78936b928543a0a6cc0d6951… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 13 09:29:37 2019 +0300 mfplat: Forward CopyAllItems() for stream descriptor. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 27ca405..d27d5ef 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -750,9 +750,8 @@ static HRESULT WINAPI stream_descriptor_GetItemByIndex(IMFStreamDescriptor *ifac static HRESULT WINAPI stream_descriptor_CopyAllItems(IMFStreamDescriptor *iface, IMFAttributes *dest) { - FIXME("%p, %p.\n", iface, dest); - - return E_NOTIMPL; + struct stream_desc *stream_desc = impl_from_IMFStreamDescriptor(iface); + return IMFAttributes_CopyAllItems(&stream_desc->attributes.IMFAttributes_iface, dest); } static HRESULT WINAPI stream_descriptor_GetStreamIdentifier(IMFStreamDescriptor *iface, DWORD *identifier)

1 0

Nikolay Sivov : mfreadwrite: Keep source reference in source reader.
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: eca0e8bb4f740983d6cc23438e807b13569f323a URL: https://source.winehq.org/git/wine.git/?a=commit;h=eca0e8bb4f740983d6cc2343… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 13 09:29:34 2019 +0300 mfreadwrite: Keep source reference in source reader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 88903ce..6b6c516 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -70,10 +70,11 @@ HRESULT WINAPI DllUnregisterServer(void) return __wine_unregister_resources( mfinstance ); } -typedef struct _srcreader +typedef struct source_reader { IMFSourceReader IMFSourceReader_iface; - LONG ref; + LONG refcount; + IMFMediaSource *source; } srcreader; struct sink_writer @@ -117,7 +118,7 @@ static HRESULT WINAPI src_reader_QueryInterface(IMFSourceReader *iface, REFIID r static ULONG WINAPI src_reader_AddRef(IMFSourceReader *iface) { srcreader *This = impl_from_IMFSourceReader(iface); - ULONG ref = InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->refcount); TRACE("(%p) ref=%u\n", This, ref); @@ -126,17 +127,18 @@ static ULONG WINAPI src_reader_AddRef(IMFSourceReader *iface) static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) { - srcreader *This = impl_from_IMFSourceReader(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct source_reader *reader = impl_from_IMFSourceReader(iface); + ULONG refcount = InterlockedDecrement(&reader->refcount); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("%p, refcount %d.\n", iface, refcount); - if (!ref) + if (!refcount) { - HeapFree(GetProcessHeap(), 0, This); + IMFMediaSource_Release(reader->source); + heap_free(reader); } - return ref; + return refcount; } static HRESULT WINAPI src_reader_GetStreamSelection(IMFSourceReader *iface, DWORD index, BOOL *selected) @@ -244,7 +246,9 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri return E_OUTOFMEMORY; object->IMFSourceReader_iface.lpVtbl = &srcreader_vtbl; - object->ref = 1; + object->refcount = 1; + object->source = source; + IMFMediaSource_AddRef(object->source); hr = IMFSourceReader_QueryInterface(&object->IMFSourceReader_iface, riid, out); IMFSourceReader_Release(&object->IMFSourceReader_iface);

1 0

Nikolay Sivov : mfplat: Add support for work item priority.
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: e3b048c16230f4a71d65ab947f35bdb0d54cefa6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3b048c16230f4a71d65ab94… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 13 09:29:33 2019 +0300 mfplat: Add support for work item priority. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mfplat.spec | 2 ++ dlls/mfplat/queue.c | 92 +++++++++++++++++++++++++++++++++++++++---------- include/mfapi.h | 2 ++ 3 files changed, 77 insertions(+), 19 deletions(-) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index c47af72..be5d8b2 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -123,7 +123,9 @@ @ stdcall MFLockWorkQueue(long) @ stdcall MFPutWaitingWorkItem(long long ptr ptr) @ stdcall MFPutWorkItem(long ptr ptr) +@ stdcall MFPutWorkItem2(long long ptr ptr) @ stdcall MFPutWorkItemEx(long ptr) +@ stdcall MFPutWorkItemEx2(long long ptr) @ stub MFRecordError @ stdcall MFRemovePeriodicCallback(long) @ stdcall MFScheduleWorkItem(ptr ptr int64 ptr) diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index e579168..c2cc623 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -59,10 +59,17 @@ struct work_item } u; }; +static const TP_CALLBACK_PRIORITY priorities[] = +{ + TP_CALLBACK_PRIORITY_HIGH, + TP_CALLBACK_PRIORITY_NORMAL, + TP_CALLBACK_PRIORITY_LOW, +}; + struct queue { TP_POOL *pool; - TP_CALLBACK_ENVIRON_V3 env; + TP_CALLBACK_ENVIRON_V3 envs[ARRAY_SIZE(priorities)]; CRITICAL_SECTION cs; struct list pending_items; }; @@ -160,16 +167,23 @@ static void release_work_item(struct work_item *item) static void init_work_queue(MFASYNC_WORKQUEUE_TYPE queue_type, struct queue *queue) { - unsigned int max_thread; + TP_CALLBACK_ENVIRON_V3 env; + unsigned int max_thread, i; queue->pool = CreateThreadpool(NULL); - memset(&queue->env, 0, sizeof(queue->env)); - queue->env.Version = 3; - queue->env.Size = sizeof(queue->env); - queue->env.Pool = queue->pool; - queue->env.CleanupGroup = CreateThreadpoolCleanupGroup(); - queue->env.CleanupGroupCancelCallback = standard_queue_cleanup_callback; - queue->env.CallbackPriority = TP_CALLBACK_PRIORITY_NORMAL; + + memset(&env, 0, sizeof(env)); + env.Version = 3; + env.Size = sizeof(env); + env.Pool = queue->pool; + env.CleanupGroup = CreateThreadpoolCleanupGroup(); + env.CleanupGroupCancelCallback = standard_queue_cleanup_callback; + env.CallbackPriority = TP_CALLBACK_PRIORITY_NORMAL; + for (i = 0; i < ARRAY_SIZE(queue->envs); ++i) + { + queue->envs[i] = env; + queue->envs[i].CallbackPriority = priorities[i]; + } list_init(&queue->pending_items); InitializeCriticalSection(&queue->cs); @@ -267,7 +281,7 @@ static void shutdown_queue(struct queue *queue) if (!queue->pool) return; - CloseThreadpoolCleanupGroupMembers(queue->env.CleanupGroup, TRUE, NULL); + CloseThreadpoolCleanupGroupMembers(queue->envs[0].CleanupGroup, TRUE, NULL); CloseThreadpool(queue->pool); queue->pool = NULL; @@ -339,15 +353,23 @@ static void CALLBACK standard_queue_worker(TP_CALLBACK_INSTANCE *instance, void release_work_item(item); } -static HRESULT queue_submit_item(struct queue *queue, IMFAsyncResult *result) +static HRESULT queue_submit_item(struct queue *queue, LONG priority, IMFAsyncResult *result) { + TP_CALLBACK_PRIORITY callback_priority; struct work_item *item; TP_WORK *work_object; if (!(item = alloc_work_item(queue, result))) return E_OUTOFMEMORY; - work_object = CreateThreadpoolWork(standard_queue_worker, item, (TP_CALLBACK_ENVIRON *)&queue->env); + if (priority == 0) + callback_priority = TP_CALLBACK_PRIORITY_NORMAL; + else if (priority < 0) + callback_priority = TP_CALLBACK_PRIORITY_LOW; + else + callback_priority = TP_CALLBACK_PRIORITY_HIGH; + work_object = CreateThreadpoolWork(standard_queue_worker, item, + (TP_CALLBACK_ENVIRON *)&queue->envs[callback_priority]); SubmitThreadpoolWork(work_object); TRACE("dispatched %p.\n", result); @@ -355,7 +377,7 @@ static HRESULT queue_submit_item(struct queue *queue, IMFAsyncResult *result) return S_OK; } -static HRESULT queue_put_work_item(DWORD queue_id, IMFAsyncResult *result) +static HRESULT queue_put_work_item(DWORD queue_id, LONG priority, IMFAsyncResult *result) { struct queue *queue; HRESULT hr; @@ -363,7 +385,7 @@ static HRESULT queue_put_work_item(DWORD queue_id, IMFAsyncResult *result) if (FAILED(hr = grab_queue(queue_id, &queue))) return hr; - hr = queue_submit_item(queue, result); + hr = queue_submit_item(queue, priority, result); return hr; } @@ -380,7 +402,7 @@ static HRESULT invoke_async_callback(IMFAsyncResult *result) if (FAILED(lock_user_queue(queue))) queue = MFASYNC_CALLBACK_QUEUE_STANDARD; - hr = queue_put_work_item(queue, result); + hr = queue_put_work_item(queue, 0, result); unlock_user_queue(queue); @@ -486,7 +508,8 @@ static HRESULT queue_submit_wait(struct queue *queue, HANDLE event, LONG priorit else callback = waiting_item_callback; - item->u.wait_object = CreateThreadpoolWait(callback, item, (TP_CALLBACK_ENVIRON *)&queue->env); + item->u.wait_object = CreateThreadpoolWait(callback, item, + (TP_CALLBACK_ENVIRON *)&queue->envs[TP_CALLBACK_PRIORITY_NORMAL]); SetThreadpoolWait(item->u.wait_object, event, NULL); TRACE("dispatched %p.\n", result); @@ -519,7 +542,8 @@ static HRESULT queue_submit_timer(struct queue *queue, IMFAsyncResult *result, I filetime.dwLowDateTime = t.u.LowPart; filetime.dwHighDateTime = t.u.HighPart; - item->u.timer_object = CreateThreadpoolTimer(callback, item, (TP_CALLBACK_ENVIRON *)&queue->env); + item->u.timer_object = CreateThreadpoolTimer(callback, item, + (TP_CALLBACK_ENVIRON *)&queue->envs[TP_CALLBACK_PRIORITY_NORMAL]); SetThreadpoolTimer(item->u.timer_object, &filetime, period, 0); TRACE("dispatched %p.\n", result); @@ -828,7 +852,27 @@ HRESULT WINAPI MFPutWorkItem(DWORD queue, IMFAsyncCallback *callback, IUnknown * if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &result))) return hr; - hr = queue_put_work_item(queue, result); + hr = queue_put_work_item(queue, 0, result); + + IMFAsyncResult_Release(result); + + return hr; +} + +/*********************************************************************** + * MFPutWorkItem2 (mfplat.@) + */ +HRESULT WINAPI MFPutWorkItem2(DWORD queue, LONG priority, IMFAsyncCallback *callback, IUnknown *state) +{ + IMFAsyncResult *result; + HRESULT hr; + + TRACE("%#x, %d, %p, %p.\n", queue, priority, callback, state); + + if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &result))) + return hr; + + hr = queue_put_work_item(queue, priority, result); IMFAsyncResult_Release(result); @@ -842,7 +886,17 @@ HRESULT WINAPI MFPutWorkItemEx(DWORD queue, IMFAsyncResult *result) { TRACE("%#x, %p\n", queue, result); - return queue_put_work_item(queue, result); + return queue_put_work_item(queue, 0, result); +} + +/*********************************************************************** + * MFPutWorkItemEx2 (mfplat.@) + */ +HRESULT WINAPI MFPutWorkItemEx2(DWORD queue, LONG priority, IMFAsyncResult *result) +{ + TRACE("%#x, %d, %p\n", queue, priority, result); + + return queue_put_work_item(queue, priority, result); } /*********************************************************************** diff --git a/include/mfapi.h b/include/mfapi.h index fd5fbeb..21876fe 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -173,7 +173,9 @@ HRESULT WINAPI MFTEnumEx(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_IN HRESULT WINAPI MFInvokeCallback(IMFAsyncResult *result); HRESULT WINAPI MFLockPlatform(void); HRESULT WINAPI MFPutWorkItem(DWORD queue, IMFAsyncCallback *callback, IUnknown *state); +HRESULT WINAPI MFPutWorkItem2(DWORD queue, LONG priority, IMFAsyncCallback *callback, IUnknown *state); HRESULT WINAPI MFPutWorkItemEx(DWORD queue, IMFAsyncResult *result); +HRESULT WINAPI MFPutWorkItemEx2(DWORD queue, LONG priority, IMFAsyncResult *result); HRESULT WINAPI MFScheduleWorkItem(IMFAsyncCallback *callback, IUnknown *state, INT64 timeout, MFWORKITEM_KEY *key); HRESULT WINAPI MFScheduleWorkItemEx(IMFAsyncResult *result, INT64 timeout, MFWORKITEM_KEY *key); HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags, UINT32 cinput,

1 0

Matteo Bruni : d3d8/tests: Add a test for CheckDeviceFormat() with an unsupported adapter format.
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: f3609e0d8d158b9755643ad44f0412e301bb065b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3609e0d8d158b9755643ad4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 12 21:25:04 2019 +0100 d3d8/tests: Add a test for CheckDeviceFormat() with an unsupported adapter format. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 51dd3ae..d5989b8 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8148,6 +8148,13 @@ static void test_check_device_format(void) ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x, device type %#x.\n", hr, device_type); } + hr = IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_A8R8G8B8, + 0, D3DRTYPE_TEXTURE, D3DFMT_X8R8G8B8); + ok(hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + 0, D3DRTYPE_TEXTURE, D3DFMT_X8R8G8B8); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_VERTEXBUFFER, D3DFMT_VERTEXDATA); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);

1 0

Zebediah Figura : quartz/tests: Rename referenceclock.c to systemclock.c.
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: a71e6442f8143ee238e5a3322f4b44c18e1b1038 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a71e6442f8143ee238e5a332… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 13 09:54:02 2019 -0500 quartz/tests: Rename referenceclock.c to systemclock.c. To match the Wine source file. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/Makefile.in | 2 +- dlls/quartz/tests/{referenceclock.c => systemclock.c} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index 61f53b6..f4c56c1 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -12,7 +12,7 @@ C_SRCS = \ memallocator.c \ misc.c \ mpegsplit.c \ - referenceclock.c \ + systemclock.c \ videorenderer.c \ waveparser.c diff --git a/dlls/quartz/tests/referenceclock.c b/dlls/quartz/tests/systemclock.c similarity index 99% rename from dlls/quartz/tests/referenceclock.c rename to dlls/quartz/tests/systemclock.c index 4721675..c051565 100644 --- a/dlls/quartz/tests/referenceclock.c +++ b/dlls/quartz/tests/systemclock.c @@ -105,7 +105,7 @@ static void test_IReferenceClock_SystemClock(void) } } -START_TEST(referenceclock) +START_TEST(systemclock) { CoInitialize(NULL);

1 0

Zebediah Figura : quartz/tests: Rewrite test_IReferenceClock_methods().
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: 8907220c5ab52f90d1297e1aa8da033f6ace0365 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8907220c5ab52f90d1297e1a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 13 09:54:04 2019 -0500 quartz/tests: Rewrite test_IReferenceClock_methods(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/systemclock.c | 87 ++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 54 deletions(-) diff --git a/dlls/quartz/tests/systemclock.c b/dlls/quartz/tests/systemclock.c index 5b82a44..c960d98 100644 --- a/dlls/quartz/tests/systemclock.c +++ b/dlls/quartz/tests/systemclock.c @@ -22,6 +22,8 @@ #include "dshow.h" #include "wine/test.h" +static ULONGLONG (WINAPI *pGetTickCount64)(void); + static IReferenceClock *create_system_clock(void) { IReferenceClock *filter = NULL; @@ -60,71 +62,48 @@ static void test_interfaces(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } -/* The following method expects a reference clock that will keep ticking for - * at least 5 seconds since its creation. This method assumes no other methods - * were called on the IReferenceClock interface since its creation. - */ -static void test_IReferenceClock_methods(const char * clockdesc, IReferenceClock * pClock) +static void test_get_time(void) { + IReferenceClock *clock = create_system_clock(); + REFERENCE_TIME time1, time2; HRESULT hr; - REFERENCE_TIME time1; - REFERENCE_TIME time2; - LONG diff; - - /* Test response from invalid (NULL) argument */ - hr = IReferenceClock_GetTime(pClock, NULL); - ok (hr == E_POINTER, "%s - Expected E_POINTER (0x%08x), got 0x%08x\n", clockdesc, E_POINTER, hr); - - /* Test response for valid value - try 1 */ - /* TODO: test whether Windows actually returns S_FALSE in its first invocation */ - time1 = (REFERENCE_TIME)0xdeadbeef; - hr = IReferenceClock_GetTime(pClock, &time1); - ok (hr == S_FALSE || hr == S_OK, "%s - Expected S_OK or S_FALSE, got 0x%08x\n", clockdesc, hr); - ok (time1 != 0xdeadbeef, "%s - value was NOT changed on return!\n", clockdesc); - - /* Test response for valid value - try 2 */ - time2 = (REFERENCE_TIME)0xdeadbeef; - hr = IReferenceClock_GetTime(pClock, &time2); - ok (hr == S_FALSE || hr == S_OK, "%s - Expected S_OK or S_FALSE, got 0x%08x\n", clockdesc, hr); - ok (time2 != 0xdeadbeef, "%s - value was NOT changed on return!\n", clockdesc); - - /* In case the second invocation managed to return S_FALSE, MSDN says the - returned time is the same as the previous one. */ - ok ((hr != S_FALSE || time1 == time2), "%s - returned S_FALSE, but values not equal!\n", clockdesc); - - time1 = time2; - Sleep(1000); /* Sleep for at least 1 second */ - hr = IReferenceClock_GetTime(pClock, &time2); - /* After a 1-second sleep, there is no excuse to get S_FALSE (see TODO above) */ - ok (hr == S_OK, "%s - Expected S_OK, got 0x%08x\n", clockdesc, hr); - - /* FIXME: How much deviation should be allowed after a sleep? */ - /* 0.3% is common, and 0.4% is sometimes observed. */ - diff = time2 - time1; - ok (9940000 <= diff && diff <= 10240000, "%s - Expected difference around 10000000, got %u\n", clockdesc, diff); - -} + ULONG ref; -static void test_IReferenceClock_SystemClock(void) -{ - IReferenceClock * pReferenceClock; - HRESULT hr; + hr = IReferenceClock_GetTime(clock, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IReferenceClock_GetTime(clock, &time1); + if (pGetTickCount64) + time2 = GetTickCount64() * 10000; + else + time2 = GetTickCount() * 10000; + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time1 % 10000 == 0, "Expected no less than 1ms coarseness, but got time %s.\n", + wine_dbgstr_longlong(time1)); + todo_wine ok(abs(time1 - time2) < 20 * 10000, "Expected about %s, got %s.\n", + wine_dbgstr_longlong(time2), wine_dbgstr_longlong(time1)); + + hr = IReferenceClock_GetTime(clock, &time2); + ok(hr == (time2 == time1 ? S_FALSE : S_OK), "Got hr %#x.\n", hr); + + Sleep(100); + hr = IReferenceClock_GetTime(clock, &time2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time2 - time1 > 98 * 10000, "Expected about %s, but got %s.\n", + wine_dbgstr_longlong(time1 + 98 * 10000), wine_dbgstr_longlong(time2)); - hr = CoCreateInstance(&CLSID_SystemClock, NULL, CLSCTX_INPROC_SERVER, &IID_IReferenceClock, (LPVOID*)&pReferenceClock); - ok(hr == S_OK, "Unable to create reference clock from system clock %x\n", hr); - if (hr == S_OK) - { - test_IReferenceClock_methods("SystemClock", pReferenceClock); - IReferenceClock_Release(pReferenceClock); - } + ref = IReferenceClock_Release(clock); + ok(!ref, "Got outstanding refcount %d.\n", ref); } START_TEST(systemclock) { CoInitialize(NULL); + pGetTickCount64 = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "GetTickCount64"); + test_interfaces(); - test_IReferenceClock_SystemClock(); + test_get_time(); CoUninitialize(); }

1 0

Nikolay Sivov : mfplat: Use newer threadpool environment structure.
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: 1654116dd278f2f24cc297eb715833eb4331447d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1654116dd278f2f24cc297eb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 13 09:29:32 2019 +0300 mfplat: Use newer threadpool environment structure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/queue.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index 66f8588..e579168 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -62,7 +62,7 @@ struct work_item struct queue { TP_POOL *pool; - TP_CALLBACK_ENVIRON env; + TP_CALLBACK_ENVIRON_V3 env; CRITICAL_SECTION cs; struct list pending_items; }; @@ -163,10 +163,13 @@ static void init_work_queue(MFASYNC_WORKQUEUE_TYPE queue_type, struct queue *que unsigned int max_thread; queue->pool = CreateThreadpool(NULL); - queue->env.Version = 1; + memset(&queue->env, 0, sizeof(queue->env)); + queue->env.Version = 3; + queue->env.Size = sizeof(queue->env); queue->env.Pool = queue->pool; queue->env.CleanupGroup = CreateThreadpoolCleanupGroup(); queue->env.CleanupGroupCancelCallback = standard_queue_cleanup_callback; + queue->env.CallbackPriority = TP_CALLBACK_PRIORITY_NORMAL; list_init(&queue->pending_items); InitializeCriticalSection(&queue->cs); @@ -344,7 +347,7 @@ static HRESULT queue_submit_item(struct queue *queue, IMFAsyncResult *result) if (!(item = alloc_work_item(queue, result))) return E_OUTOFMEMORY; - work_object = CreateThreadpoolWork(standard_queue_worker, item, &queue->env); + work_object = CreateThreadpoolWork(standard_queue_worker, item, (TP_CALLBACK_ENVIRON *)&queue->env); SubmitThreadpoolWork(work_object); TRACE("dispatched %p.\n", result); @@ -483,7 +486,7 @@ static HRESULT queue_submit_wait(struct queue *queue, HANDLE event, LONG priorit else callback = waiting_item_callback; - item->u.wait_object = CreateThreadpoolWait(callback, item, &queue->env); + item->u.wait_object = CreateThreadpoolWait(callback, item, (TP_CALLBACK_ENVIRON *)&queue->env); SetThreadpoolWait(item->u.wait_object, event, NULL); TRACE("dispatched %p.\n", result); @@ -516,7 +519,7 @@ static HRESULT queue_submit_timer(struct queue *queue, IMFAsyncResult *result, I filetime.dwLowDateTime = t.u.LowPart; filetime.dwHighDateTime = t.u.HighPart; - item->u.timer_object = CreateThreadpoolTimer(callback, item, &queue->env); + item->u.timer_object = CreateThreadpoolTimer(callback, item, (TP_CALLBACK_ENVIRON *)&queue->env); SetThreadpoolTimer(item->u.timer_object, &filetime, period, 0); TRACE("dispatched %p.\n", result);

1 0