November 2010 - Wine-commits

André Hentschel : wldap32/tests: Fix skipping if server is unavailable.
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: 08400e9dd79e965d1339c16f58286cf205421bb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08400e9dd79e965d1339c16f5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Nov 29 17:52:47 2010 +0100 wldap32/tests: Fix skipping if server is unavailable. --- dlls/wldap32/tests/parse.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 61bc9ca..98e6b80 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -93,7 +93,7 @@ static void test_ldap_search_extW( LDAP *ld ) timelimit = 20; ret = ldap_search_extW( ld, base, LDAP_SCOPE_SUBTREE, filter, NULL, 0, NULL, NULL, timelimit, 0, &message ); - if (ret == LDAP_SERVER_DOWN) + if (ret == LDAP_SERVER_DOWN || ret == LDAP_UNAVAILABLE) { skip("test server can't be reached\n"); return;

1 0

Maarten Lankhorst : winegstreamer: Prevent gstreamer from being unloaded.
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: e0169705d927c0be0455df7fba6ac525217d42f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0169705d927c0be0455df7fb… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Nov 29 10:44:19 2010 +0100 winegstreamer: Prevent gstreamer from being unloaded. --- dlls/winegstreamer/main.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index ac9e97b..941f433 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -261,6 +261,15 @@ DWORD Gstreamer_init(void) { FIXME("Failed to initialize gstreamer: %s\n", err->message); g_error_free(err); } + if (inited) { + HINSTANCE newhandle; + /* Unloading glib is a bad idea.. it installs atexit handlers, + * so never unload the dll after loading */ + GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, + (LPCWSTR)hInst, &newhandle); + if (!newhandle) + ERR("Could not pin module %p\n", hInst); + } } return inited; }

1 0

Andrew Nguyen : msvcrt: Add some definitions and prototypes to float.h.
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: 92705a48dceabfac11e4f42bb4109dc55e7a06c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92705a48dceabfac11e4f42bb… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Nov 29 06:07:18 2010 -0600 msvcrt: Add some definitions and prototypes to float.h. --- include/msvcrt/float.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/msvcrt/float.h b/include/msvcrt/float.h index 270e175..33ebb68 100644 --- a/include/msvcrt/float.h +++ b/include/msvcrt/float.h @@ -128,6 +128,16 @@ extern "C" { #define _FPE_STACKUNDERFLOW 0x8b #define _FPE_EXPLICITGEN 0x8c +#if defined(__i386__) +#define _CW_DEFAULT (_RC_NEAR + _PC_53 + _EM_INVALID + _EM_ZERODIVIDE + _EM_OVERFLOW + _EM_UNDERFLOW + _EM_INEXACT + _EM_DENORMAL) +#elif defined(__x86_64__) +#define _CW_DEFAULT (_RC_NEAR + _PC_64 + _EM_INVALID + _EM_ZERODIVIDE + _EM_OVERFLOW + _EM_UNDERFLOW + _EM_INEXACT + _EM_DENORMAL) +#endif + +unsigned int __cdecl _control87(unsigned int, unsigned int); +unsigned int __cdecl _controlfp(unsigned int, unsigned int); +errno_t __cdecl _controlfp_s(unsigned int *, unsigned int, unsigned int); + double __cdecl _copysign (double, double); double __cdecl _chgsign (double); double __cdecl _scalb(double, __msvcrt_long);

1 0

Paul Vriens : atl/tests: Skip tests on old versions of atl.dll.
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: bbbd5a4917c4b9d21f8846adceb95ffa3a18d02b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbbd5a4917c4b9d21f8846adc… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Nov 28 15:40:31 2010 +0100 atl/tests: Skip tests on old versions of atl.dll. --- dlls/atl/tests/registrar.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/atl/tests/registrar.c b/dlls/atl/tests/registrar.c index 422608b..9c5dd23 100644 --- a/dlls/atl/tests/registrar.c +++ b/dlls/atl/tests/registrar.c @@ -59,6 +59,12 @@ static void test_registrar(void) INT count; WCHAR *textW = NULL; + if (!GetProcAddress(GetModuleHandleA("atl.dll"), "AtlAxAttachControl")) + { + win_skip("Old versions of atl.dll don't support binary values\n"); + return; + } + hr = CoCreateInstance(&CLSID_Registrar, NULL, CLSCTX_INPROC_SERVER, &IID_IRegistrar, (void**)&registrar); if (FAILED(hr)) { @@ -78,7 +84,7 @@ static void test_registrar(void) MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, count); hr = IRegistrar_StringRegister(registrar, textW); - ok(SUCCEEDED(hr), "IRegistar_StringRegister failed, hr = 0x%08X\n", hr); + ok(SUCCEEDED(hr), "IRegistrar_StringRegister failed, hr = 0x%08X\n", hr); lret = RegOpenKeyA(HKEY_CLASSES_ROOT, "eebf73c4-50fd-478f-bbcf-db212221227a", &key); ok(lret == ERROR_SUCCESS, "error %d opening registry key\n", lret); @@ -106,20 +112,22 @@ static void test_registrar(void) size = 4; lret = RegQueryValueExA(key, "binary_quoted", NULL, NULL, bytes, &size); ok(lret == ERROR_SUCCESS, "RegQueryValueA, failed, error %d\n", lret); - ok(bytes[0] = 0xde && bytes[1] == 0xad && bytes[2] == 0xbe && bytes[3] == 0xef, + ok(bytes[0] == 0xde && bytes[1] == 0xad && bytes[2] == 0xbe && bytes[3] == 0xef, "binary quoted value was not preserved (it's 0x%02X%02X%02X%02X)\n", 0xff & bytes[0], 0xff & bytes[1], 0xff & bytes[2], 0xff & bytes[3]); size = 4; lret = RegQueryValueExA(key, "binary_unquoted", NULL, NULL, bytes, &size); ok(lret == ERROR_SUCCESS, "RegQueryValueA, failed, error %d\n", lret); - ok(bytes[0] = 0xde && bytes[1] == 0xad && bytes[2] == 0xbe && bytes[3] == 0xef, + ok(bytes[0] == 0xde && bytes[1] == 0xad && bytes[2] == 0xbe && bytes[3] == 0xef, "binary unquoted value was not preserved (it's 0x%02X%02X%02X%02X)\n", 0xff & bytes[0], 0xff & bytes[1], 0xff & bytes[2], 0xff & bytes[3]); hr = IRegistrar_StringUnregister(registrar, textW); - ok(SUCCEEDED(hr), "IRegistar_StringUnregister failed, hr = 0x%08X\n", hr); + ok(SUCCEEDED(hr), "IRegistrar_StringUnregister failed, hr = 0x%08X\n", hr); RegCloseKey(key); + + HeapFree(GetProcessHeap(), 0, textW); } else skip("allocating memory failed\n");

1 0

Daniel Zimmermann : wtsapi32: Add some stubs.
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: 32e1137837f067d6c123e19cde0a667584c212e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32e1137837f067d6c123e19cd… Author: Daniel Zimmermann <netzimme(a)googlemail.com> Date: Sun Nov 28 17:14:56 2010 +0100 wtsapi32: Add some stubs. --- dlls/wtsapi32/wtsapi32.c | 249 +++++++++++++++++++++++++++++++++++++++++-- dlls/wtsapi32/wtsapi32.spec | 44 +++++--- include/wtsapi32.h | 15 +++- 3 files changed, 281 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32e1137837f067d6c123e…

1 0

Maarten Lankhorst : quartz: Silence fixmes in sound renderer.
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: 9ff6c7d1c71927553979ba6c2c63023036cb561b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ff6c7d1c71927553979ba6c2… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Nov 29 10:44:14 2010 +0100 quartz: Silence fixmes in sound renderer. --- dlls/quartz/dsoundrender.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index bb7fc2d..3805ea9 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -176,7 +176,7 @@ static HRESULT DSoundRender_GetWritePos(DSoundRenderImpl *This, DWORD *ret_write *ret_writepos = writepos; } else if (delta_t < 0) { REFERENCE_TIME past, min_writepos_t; - FIXME("Delta too big %i/%i, overwriting old data or even skipping\n", (int)delta_t / 10000, (int)max_lag / 10000); + WARN("Delta too big %i/%i, overwriting old data or even skipping\n", (int)delta_t / 10000, (int)max_lag / 10000); if (min_writepos >= playpos) min_writepos_t = cur + time_from_pos(This, min_writepos - playpos); else @@ -184,19 +184,19 @@ static HRESULT DSoundRender_GetWritePos(DSoundRenderImpl *This, DWORD *ret_write past = min_writepos_t - write_at; if (past >= 0) { DWORD skipbytes = pos_from_time(This, past); - FIXME("Skipping %u bytes\n", skipbytes); + WARN("Skipping %u bytes\n", skipbytes); *skip = skipbytes; *ret_writepos = min_writepos; } else { DWORD aheadbytes = pos_from_time(This, -past); - FIXME("Advancing %u bytes\n", aheadbytes); + WARN("Advancing %u bytes\n", aheadbytes); *ret_writepos = (min_writepos + aheadbytes) % This->buf_size; } } else /* delta_t > 0 */ { DWORD aheadbytes; - FIXME("Delta too big %i/%i, too far ahead\n", (int)delta_t / 10000, (int)max_lag / 10000); + WARN("Delta too big %i/%i, too far ahead\n", (int)delta_t / 10000, (int)max_lag / 10000); aheadbytes = pos_from_time(This, delta_t); - FIXME("Advancing %u bytes\n", aheadbytes); + WARN("Advancing %u bytes\n", aheadbytes); if (delta_t >= DSoundRenderer_Max_Fill) return S_FALSE; *ret_writepos = (min_writepos + aheadbytes) % This->buf_size;

1 0

Maarten Lankhorst : strmbase: Fix qos.
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: 82129d7ad8a11875e5ed21fadc79444e86db5075 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82129d7ad8a11875e5ed21fad… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Nov 29 10:44:15 2010 +0100 strmbase: Fix qos. --- dlls/strmbase/qualitycontrol.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index 2492c3d..ad6d942 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -157,7 +157,7 @@ HRESULT QualityControlRender_WaitFor(QualityControlImpl *This, IMediaSample *sam IReferenceClock_Unadvise(This->clock, cookie); } else #endif - if (jitter < 0) { + if (jitter < -10000) { TRACE("Sleeping for %i ms\n", (int)-jitter/10000); WaitForSingleObject(ev, -jitter/10000); } @@ -183,7 +183,7 @@ void QualityControlRender_DoQOS(QualityControlImpl *priv) REFERENCE_TIME start, stop, jitter, pt, entered, left, duration; double rate; - if (!priv->clock) + if (!priv->clock || priv->current_rstart < 0) return; start = priv->current_rstart; @@ -275,10 +275,10 @@ void QualityControlRender_DoQOS(QualityControlImpl *priv) priv->current_jitter += (priv->current_rstop - priv->current_rstart); q.Type = (jitter > 0 ? Famine : Flood); q.Proportion = (LONG)(1000. / priv->avg_rate); - if (q.Proportion < 500) - q.Proportion = 500; - else if (q.Proportion > 2000) - q.Proportion = 2000; + if (q.Proportion < 200) + q.Proportion = 200; + else if (q.Proportion > 5000) + q.Proportion = 5000; q.Late = priv->current_jitter; q.TimeStamp = priv->current_rstart; TRACE("Late: %i from %i, rate: %g\n", (int)(q.Late/10000), (int)(q.TimeStamp/10000), 1./priv->avg_rate);

1 0

Maarten Lankhorst : quartz: Unregister window class after shutdown.
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: d4185badf1731184698857c7ecf271795335629f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4185badf1731184698857c7e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Nov 29 10:44:16 2010 +0100 quartz: Unregister window class after shutdown. --- dlls/quartz/main.c | 2 ++ dlls/quartz/quartz_private.h | 1 + dlls/quartz/videorenderer.c | 32 ++++++++++++++++++++------------ 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 7828487..93c93a0 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -37,6 +37,8 @@ static DWORD dll_ref = 0; /* For the moment, do nothing here. */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { + if (fdwReason == DLL_PROCESS_DETACH) + video_unregister_windowclass(); return QUARTZ_DllMain( hInstDLL, fdwReason, lpv ); } diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 3094b1b..4bc9de5 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -67,6 +67,7 @@ HRESULT IEnumRegFiltersImpl_Construct(REGFILTER * pInRegFilters, const ULONG siz HRESULT IEnumFiltersImpl_Construct(IBaseFilter ** ppFilters, ULONG nFilters, IEnumFilters ** ppEnum); extern const char * qzdebugstr_guid(const GUID * id); +extern void video_unregister_windowclass(void) DECLSPEC_HIDDEN; BOOL CompareMediaTypes(const AM_MEDIA_TYPE * pmt1, const AM_MEDIA_TYPE * pmt2, BOOL bWildcards); void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 31c9ab5..290864b 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -164,12 +164,11 @@ static LRESULT CALLBACK VideoWndProcA(HWND hwnd, UINT uMsg, WPARAM wParam, LPARA return 0; } -static BOOL CreateRenderingWindow(VideoRendererImpl* This) -{ +static BOOL video_register_windowclass(void) { WNDCLASSA winclass; + if (wnd_class_registered) + return 1; - TRACE("(%p)->()\n", This); - winclass.style = 0; winclass.lpfnWndProc = VideoWndProcA; winclass.cbClsExtra = 0; @@ -180,17 +179,26 @@ static BOOL CreateRenderingWindow(VideoRendererImpl* This) winclass.hbrBackground = GetStockObject(BLACK_BRUSH); winclass.lpszMenuName = NULL; winclass.lpszClassName = "Wine ActiveMovie Class"; - - if (!wnd_class_registered) + if (!RegisterClassA(&winclass)) { - if (!RegisterClassA(&winclass)) - { - ERR("Unable to register window %u\n", GetLastError()); - return FALSE; - } - wnd_class_registered = TRUE; + ERR("Unable to register window class: %u\n", GetLastError()); + return FALSE; } + wnd_class_registered = 1; + return 1; +} + +void video_unregister_windowclass(void) { + if (!wnd_class_registered) + return; + UnregisterClassA("Wine ActiveMovie Class", NULL); +} +static BOOL CreateRenderingWindow(VideoRendererImpl* This) +{ + TRACE("(%p)->()\n", This); + if (!video_register_windowclass()) + return FALSE; This->hWnd = CreateWindowExA(0, "Wine ActiveMovie Class", "Wine ActiveMovie Window", WS_SIZEBOX, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, NULL, NULL);

1 0

Maarten Lankhorst : quartz: Fix timestamping in avi decoder.
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: f0ebe19bfcf28ff7e7b6524165bfa0cf175273d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0ebe19bfcf28ff7e7b652416… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Nov 29 10:44:17 2010 +0100 quartz: Fix timestamping in avi decoder. --- dlls/quartz/avidec.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 02f7674..dcd8093 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -160,8 +160,8 @@ static HRESULT WINAPI AVIDec_Receive(TransformFilter *tf, IMediaSample *pSample) flags |= ICDECOMPRESS_PREROLL; if (IMediaSample_IsSyncPoint(pSample) != S_OK) flags |= ICDECOMPRESS_NOTKEYFRAME; - if (IMediaSample_GetTime(pSample, &tStart, NULL) == S_OK && - AVIDec_DropSample(This, tStart)) + hr = IMediaSample_GetTime(pSample, &tStart, &tStop); + if (hr == S_OK && AVIDec_DropSample(This, tStart)) flags |= ICDECOMPRESS_HURRYUP; res = ICDecompress(This->hvid, flags, This->pBihIn, pbSrcStream, This->pBihOut, pbDstStream); @@ -169,8 +169,10 @@ static HRESULT WINAPI AVIDec_Receive(TransformFilter *tf, IMediaSample *pSample) ERR("Error occurred during the decompression (%x)\n", res); /* Drop sample if its intended to be dropped */ - if (flags & ICDECOMPRESS_HURRYUP) + if (flags & ICDECOMPRESS_HURRYUP) { + hr = S_OK; goto error; + } IMediaSample_SetActualDataLength(pOutSample, This->pBihOut->biSizeImage); @@ -178,8 +180,10 @@ static HRESULT WINAPI AVIDec_Receive(TransformFilter *tf, IMediaSample *pSample) IMediaSample_SetDiscontinuity(pOutSample, (IMediaSample_IsDiscontinuity(pSample) == S_OK)); IMediaSample_SetSyncPoint(pOutSample, (IMediaSample_IsSyncPoint(pSample) == S_OK)); - if (IMediaSample_GetTime(pSample, &tStart, &tStop) == S_OK) + if (hr == S_OK) IMediaSample_SetTime(pOutSample, &tStart, &tStop); + else if (hr == VFW_S_NO_STOP_TIME) + IMediaSample_SetTime(pOutSample, &tStart, NULL); else IMediaSample_SetTime(pOutSample, NULL, NULL);

1 0

Maarten Lankhorst : quartz: Handle selecting default sync source better.
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: 2b016601783125d3ab422ff075b2169dd8506aa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b016601783125d3ab422ff07… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Nov 29 10:44:18 2010 +0100 quartz: Handle selecting default sync source better. --- dlls/quartz/filtergraph.c | 34 ++++++++++++++++++++++++++++++---- 1 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 7b3fec9..f431cdb 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -200,6 +200,7 @@ typedef struct _IFilterGraphImpl { IUnknown * pUnkOuter; BOOL bUnkOuterValid; BOOL bAggregatable; + BOOL defaultclock; GUID timeformatseek; REFERENCE_TIME start_time; REFERENCE_TIME pause_time; @@ -754,17 +755,38 @@ static HRESULT WINAPI FilterGraph2_Disconnect(IFilterGraph2 *iface, IPin *ppin) static HRESULT WINAPI FilterGraph2_SetDefaultSyncSource(IFilterGraph2 *iface) { ICOM_THIS_MULTI(IFilterGraphImpl, IFilterGraph2_vtbl, iface); IReferenceClock *pClock = NULL; - HRESULT hr; + HRESULT hr = S_OK; + int i; - TRACE("(%p/%p)->() semi-stub\n", iface, This); + TRACE("(%p/%p)->() live sources not handled properly!\n", iface, This); - hr = CoCreateInstance(&CLSID_SystemClock, NULL, CLSCTX_INPROC_SERVER, &IID_IReferenceClock, (LPVOID*)&pClock); + EnterCriticalSection(&This->cs); + + for (i = 0; i < This->nFilters; ++i) + { + DWORD miscflags; + IAMFilterMiscFlags *flags = NULL; + IUnknown_QueryInterface(This->ppFiltersInGraph[i], &IID_IAMFilterMiscFlags, (void**)&flags); + if (!flags) + continue; + miscflags = IAMFilterMiscFlags_GetMiscFlags(flags); + IUnknown_Release(flags); + if (miscflags == AM_FILTER_MISC_FLAGS_IS_RENDERER) + IUnknown_QueryInterface(This->ppFiltersInGraph[i], &IID_IReferenceClock, (void**)&pClock); + if (pClock) + break; + } + + if (!pClock) + hr = CoCreateInstance(&CLSID_SystemClock, NULL, CLSCTX_INPROC_SERVER, &IID_IReferenceClock, (LPVOID*)&pClock); if (SUCCEEDED(hr)) { hr = IMediaFilter_SetSyncSource((IMediaFilter*)&(This->IMediaFilter_vtbl), pClock); + This->defaultclock = TRUE; IReferenceClock_Release(pClock); } + LeaveCriticalSection(&This->cs); return hr; } @@ -1931,6 +1953,9 @@ static HRESULT WINAPI MediaControl_Run(IMediaControl *iface) { goto out; This->EcCompleteCount = 0; + if (This->defaultclock && !This->refClock) + IFilterGraph2_SetDefaultSyncSource((IFilterGraph2*)This); + if (This->refClock) { REFERENCE_TIME now; @@ -5075,6 +5100,7 @@ static HRESULT WINAPI MediaFilter_SetSyncSource(IMediaFilter *iface, IReferenceC This->refClock = pClock; if (This->refClock) IReferenceClock_AddRef(This->refClock); + This->defaultclock = FALSE; if (This->HandleEcClockChanged) { @@ -5428,6 +5454,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) fimpl->pUnkOuter = pUnkOuter; fimpl->bUnkOuterValid = FALSE; fimpl->bAggregatable = FALSE; + fimpl->defaultclock = TRUE; fimpl->IInner_vtbl = &IInner_VTable; fimpl->IFilterGraph2_vtbl = &IFilterGraph2_VTable; fimpl->IMediaControl_vtbl = &IMediaControl_VTable; @@ -5490,7 +5517,6 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) CoTaskMemFree(fimpl); return hr; } - IFilterGraph2_SetDefaultSyncSource((IFilterGraph2*)fimpl); *ppObj = fimpl; return S_OK;

1 0