wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Nikolay Sivov : kernelbase: Add most of path API from shlwapi.
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: 1cef84a12473a753d06f355311c1117408a800f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cef84a12473a753d06f3553… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 21 14:22:19 2019 +0300 kernelbase: Add most of path API from shlwapi. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 38 ++-- dlls/kernelbase/path.c | 422 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 441 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1cef84a12473a753d06f…

1 0

Nikolay Sivov : comctl32/tooltips: Remove redundant condition.
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: d4c96034d042a9fef84b9a7d7f86da70c1f5d75a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4c96034d042a9fef84b9a7d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 21 13:15:56 2019 +0300 comctl32/tooltips: Remove redundant condition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tooltips.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 4b2298b..ce2bb8b 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1838,19 +1838,16 @@ TOOLTIPS_Destroy (TOOLTIPS_INFO *infoPtr) TTTOOL_INFO *toolPtr; UINT i; - /* free tools */ - if (infoPtr->tools) { - for (i = 0; i < infoPtr->uNumTools; i++) - { - toolPtr = &infoPtr->tools[i]; - - TOOLTIPS_FreeToolText (toolPtr); - TOOLTIPS_ResetSubclass (toolPtr); - } + for (i = 0; i < infoPtr->uNumTools; i++) + { + toolPtr = &infoPtr->tools[i]; - Free (infoPtr->tools); + TOOLTIPS_FreeToolText (toolPtr); + TOOLTIPS_ResetSubclass (toolPtr); } + Free (infoPtr->tools); + /* free title string */ Free (infoPtr->pszTitle); /* free title icon if not a standard one */

1 0

Nikolay Sivov : comctl32/tooltips: Add a helper to set tool text.
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: 30b0f3d2123bd56e20167b49e290a10106a8aba8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30b0f3d2123bd56e20167b49… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 21 13:15:55 2019 +0300 comctl32/tooltips: Add a helper to set tool text. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tooltips.c | 83 ++++++++++++++++++------------------------------ 1 file changed, 31 insertions(+), 52 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 163821a..4b2298b 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1150,6 +1150,35 @@ static void TOOLTIPS_FreeToolText(TTTOOL_INFO *toolPtr) } } +static void TOOLTIPS_SetToolText(TTTOOL_INFO *toolPtr, WCHAR *text, BOOL is_unicode) +{ + int len; + + TOOLTIPS_FreeToolText (toolPtr); + + if (IS_INTRESOURCE(text)) + toolPtr->lpszText = text; + else if (text == LPSTR_TEXTCALLBACKW) + toolPtr->lpszText = LPSTR_TEXTCALLBACKW; + else if (text) + { + if (is_unicode) + { + len = lstrlenW(text); + toolPtr->lpszText = Alloc ((len + 1) * sizeof(WCHAR)); + if (toolPtr->lpszText) + strcpyW (toolPtr->lpszText, text); + } + else + { + len = MultiByteToWideChar(CP_ACP, 0, (char *)text, -1, NULL, 0); + toolPtr->lpszText = Alloc (len * sizeof(WCHAR)); + if (toolPtr->lpszText) + MultiByteToWideChar(CP_ACP, 0, (char *)text, -1, toolPtr->lpszText, len); + } + } +} + static LRESULT TOOLTIPS_DelToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) { @@ -1663,32 +1692,7 @@ TOOLTIPS_SetToolInfoT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) toolPtr->rect = ti->rect; toolPtr->hinst = ti->hinst; - TOOLTIPS_FreeToolText (toolPtr); - - if (IS_INTRESOURCE(ti->lpszText)) { - TRACE("set string id %x\n", LOWORD(ti->lpszText)); - toolPtr->lpszText = ti->lpszText; - } - else { - if (ti->lpszText == LPSTR_TEXTCALLBACKW) - toolPtr->lpszText = LPSTR_TEXTCALLBACKW; - else { - if (ti->lpszText) { - if (isW) { - INT len = lstrlenW (ti->lpszText); - toolPtr->lpszText = Alloc ((len+1)*sizeof(WCHAR)); - strcpyW (toolPtr->lpszText, ti->lpszText); - } - else { - INT len = MultiByteToWideChar(CP_ACP, 0, (LPSTR)ti->lpszText, - -1, NULL, 0); - toolPtr->lpszText = Alloc (len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, (LPSTR)ti->lpszText, -1, - toolPtr->lpszText, len); - } - } - } - } + TOOLTIPS_SetToolText (toolPtr, ti->lpszText, isW); if (ti->cbSize >= TTTOOLINFOW_V2_SIZE) toolPtr->lParam = ti->lParam; @@ -1783,34 +1787,9 @@ TOOLTIPS_UpdateTipTextT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW toolPtr = &infoPtr->tools[nTool]; - /* copy tool text */ toolPtr->hinst = ti->hinst; - TOOLTIPS_FreeToolText(toolPtr); - - if (IS_INTRESOURCE(ti->lpszText)){ - toolPtr->lpszText = ti->lpszText; - } - else if (ti->lpszText) { - if (ti->lpszText == LPSTR_TEXTCALLBACKW) - toolPtr->lpszText = LPSTR_TEXTCALLBACKW; - else { - if (ti->lpszText) { - if (isW) { - INT len = lstrlenW (ti->lpszText); - toolPtr->lpszText = Alloc ((len+1)*sizeof(WCHAR)); - strcpyW (toolPtr->lpszText, ti->lpszText); - } - else { - INT len = MultiByteToWideChar(CP_ACP, 0, (LPSTR)ti->lpszText, - -1, NULL, 0); - toolPtr->lpszText = Alloc (len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, (LPSTR)ti->lpszText, -1, - toolPtr->lpszText, len); - } - } - } - } + TOOLTIPS_SetToolText(toolPtr, ti->lpszText, isW); if(infoPtr->nCurrentTool == -1) return 0; /* force repaint */

1 0

Nikolay Sivov : comctl32/tooltips: Add a helper to free tool text.
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: 4da84a13189e1c714dba01fcfc221b8dcb7a6f7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4da84a13189e1c714dba01fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 21 13:15:54 2019 +0300 comctl32/tooltips: Add a helper to free tool text. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tooltips.c | 48 ++++++++++++++++++------------------------------ 1 file changed, 18 insertions(+), 30 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index b1e8f51..163821a 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1140,6 +1140,16 @@ static void TOOLTIPS_ResetSubclass (const TTTOOL_INFO *toolPtr) TOOLTIPS_SubclassProc, 1, 0); } +static void TOOLTIPS_FreeToolText(TTTOOL_INFO *toolPtr) +{ + if (toolPtr->lpszText) + { + if (!IS_INTRESOURCE(toolPtr->lpszText) && toolPtr->lpszText != LPSTR_TEXTCALLBACKW) + Free(toolPtr->lpszText); + toolPtr->lpszText = NULL; + } +} + static LRESULT TOOLTIPS_DelToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) { @@ -1163,14 +1173,8 @@ TOOLTIPS_DelToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) /* make sure the tooltip has disappeared before deleting it */ TOOLTIPS_Hide(infoPtr); - /* delete text string */ toolPtr = &infoPtr->tools[nTool]; - if (toolPtr->lpszText) { - if ( (toolPtr->lpszText != LPSTR_TEXTCALLBACKW) && - !IS_INTRESOURCE(toolPtr->lpszText) ) - Free (toolPtr->lpszText); - } - + TOOLTIPS_FreeToolText (toolPtr); TOOLTIPS_ResetSubclass (toolPtr); /* delete tool from tool list */ @@ -1635,7 +1639,6 @@ TOOLTIPS_SetTitleT (TOOLTIPS_INFO *infoPtr, UINT_PTR uTitleIcon, LPCWSTR pszTitl return TRUE; } - static LRESULT TOOLTIPS_SetToolInfoT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) { @@ -1660,12 +1663,7 @@ TOOLTIPS_SetToolInfoT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) toolPtr->rect = ti->rect; toolPtr->hinst = ti->hinst; - if ( (toolPtr->lpszText) && - !IS_INTRESOURCE(toolPtr->lpszText) ) { - if( toolPtr->lpszText != LPSTR_TEXTCALLBACKW) - Free (toolPtr->lpszText); - toolPtr->lpszText = NULL; - } + TOOLTIPS_FreeToolText (toolPtr); if (IS_INTRESOURCE(ti->lpszText)) { TRACE("set string id %x\n", LOWORD(ti->lpszText)); @@ -1788,6 +1786,8 @@ TOOLTIPS_UpdateTipTextT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW /* copy tool text */ toolPtr->hinst = ti->hinst; + TOOLTIPS_FreeToolText(toolPtr); + if (IS_INTRESOURCE(ti->lpszText)){ toolPtr->lpszText = ti->lpszText; } @@ -1795,12 +1795,6 @@ TOOLTIPS_UpdateTipTextT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW if (ti->lpszText == LPSTR_TEXTCALLBACKW) toolPtr->lpszText = LPSTR_TEXTCALLBACKW; else { - if ( (toolPtr->lpszText) && - !IS_INTRESOURCE(toolPtr->lpszText) ) { - if( toolPtr->lpszText != LPSTR_TEXTCALLBACKW) - Free (toolPtr->lpszText); - toolPtr->lpszText = NULL; - } if (ti->lpszText) { if (isW) { INT len = lstrlenW (ti->lpszText); @@ -1867,17 +1861,11 @@ TOOLTIPS_Destroy (TOOLTIPS_INFO *infoPtr) /* free tools */ if (infoPtr->tools) { - for (i = 0; i < infoPtr->uNumTools; i++) { - toolPtr = &infoPtr->tools[i]; - if (toolPtr->lpszText) { - if ( (toolPtr->lpszText != LPSTR_TEXTCALLBACKW) && - !IS_INTRESOURCE(toolPtr->lpszText) ) - { - Free (toolPtr->lpszText); - toolPtr->lpszText = NULL; - } - } + for (i = 0; i < infoPtr->uNumTools; i++) + { + toolPtr = &infoPtr->tools[i]; + TOOLTIPS_FreeToolText (toolPtr); TOOLTIPS_ResetSubclass (toolPtr); }

1 0

Jacek Caban : ntoskrnl.exe: Implement PsGetThreadProcessId.
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: 2f7e7863e0e0866495364da6cd4582f374f59e88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f7e7863e0e0866495364da6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 21 12:11:44 2019 +0200 ntoskrnl.exe: Implement PsGetThreadProcessId. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 1 + include/ddk/ntddk.h | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 89f7674..dbadacc 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2688,6 +2688,15 @@ HANDLE WINAPI PsGetThreadId(PETHREAD thread) return thread->kthread.id.UniqueThread; } +/********************************************************************* + * PsGetThreadProcessId (NTOSKRNL.@) + */ +HANDLE WINAPI PsGetThreadProcessId( PETHREAD thread ) +{ + TRACE( "%p -> %p\n", thread, thread->kthread.id.UniqueProcess ); + return thread->kthread.id.UniqueProcess; +} + /*********************************************************************** * KeInsertQueue (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0105afb..202e919 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -902,7 +902,7 @@ @ stub PsGetThreadHardErrorsAreDisabled @ stdcall PsGetThreadId(ptr) @ stub PsGetThreadProcess -@ stub PsGetThreadProcessId +@ stdcall PsGetThreadProcessId(ptr) @ stub PsGetThreadSessionId @ stub PsGetThreadTeb @ stub PsGetThreadWin32Thread diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 1ad468e..688c608 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -346,6 +346,7 @@ static void test_current_thread(BOOL is_system) ok(current != *pPsInitialSystemProcess, "current == PsInitialSystemProcess\n"); ok(PsGetProcessId(current) == PsGetCurrentProcessId(), "process IDs don't match\n"); + ok(PsGetThreadProcessId((PETHREAD)KeGetCurrentThread()) == PsGetCurrentProcessId(), "process IDs don't match\n"); thread = PsGetCurrentThread(); ret = wait_single( thread, 0 ); diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 74df919..d6ecbae 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -221,6 +221,7 @@ void WINAPI KeSetTargetProcessorDpc(PRKDPC,CCHAR); BOOLEAN WINAPI MmIsAddressValid(void *); HANDLE WINAPI PsGetProcessId(PEPROCESS); HANDLE WINAPI PsGetThreadId(PETHREAD); +HANDLE WINAPI PsGetThreadProcessId(PETHREAD); NTSTATUS WINAPI PsSetCreateProcessNotifyRoutine(PCREATE_PROCESS_NOTIFY_ROUTINE,BOOLEAN); NTSTATUS WINAPI PsSetCreateProcessNotifyRoutineEx(PCREATE_PROCESS_NOTIFY_ROUTINE_EX,BOOLEAN); NTSTATUS WINAPI PsSetCreateThreadNotifyRoutine(PCREATE_THREAD_NOTIFY_ROUTINE);

1 0

Zebediah Figura : qedit/nullrenderer: Don't expose IAMFilterMiscFlags.
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: c48320199324289e4ab9c38fe7dd45d6d70c8503 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c48320199324289e4ab9c38f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 20 17:44:06 2019 -0500 qedit/nullrenderer: Don't expose IAMFilterMiscFlags. This reverts 443e24fe887f6c0233b159fd6e034f2dfb09fdf2. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/nullrenderer.c | 40 ---------------------------------------- dlls/qedit/tests/nullrenderer.c | 2 +- 2 files changed, 1 insertion(+), 41 deletions(-) diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c index 6ba70cb..c9319fb 100644 --- a/dlls/qedit/nullrenderer.c +++ b/dlls/qedit/nullrenderer.c @@ -30,7 +30,6 @@ typedef struct NullRendererImpl { BaseRenderer renderer; IUnknown IUnknown_inner; - IAMFilterMiscFlags IAMFilterMiscFlags_iface; IUnknown *outer_unk; } NullRendererImpl; @@ -82,8 +81,6 @@ static HRESULT WINAPI NullRendererInner_QueryInterface(IUnknown *iface, REFIID r if (IsEqualIID(riid, &IID_IUnknown)) *ppv = &This->IUnknown_inner; - else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags)) - *ppv = &This->IAMFilterMiscFlags_iface; else { HRESULT hr; @@ -174,42 +171,6 @@ static const IBaseFilterVtbl NullRenderer_Vtbl = BaseFilterImpl_QueryVendorInfo }; -static NullRendererImpl *impl_from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface) -{ - return CONTAINING_RECORD(iface, NullRendererImpl, IAMFilterMiscFlags_iface); -} - -static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, REFIID riid, - void **ppv) -{ - NullRendererImpl *This = impl_from_IAMFilterMiscFlags(iface); - return IUnknown_QueryInterface(This->outer_unk, riid, ppv); -} - -static ULONG WINAPI AMFilterMiscFlags_AddRef(IAMFilterMiscFlags *iface) -{ - NullRendererImpl *This = impl_from_IAMFilterMiscFlags(iface); - return IUnknown_AddRef(This->outer_unk); -} - -static ULONG WINAPI AMFilterMiscFlags_Release(IAMFilterMiscFlags *iface) -{ - NullRendererImpl *This = impl_from_IAMFilterMiscFlags(iface); - return IUnknown_Release(This->outer_unk); -} - -static ULONG WINAPI AMFilterMiscFlags_GetMiscFlags(IAMFilterMiscFlags *iface) -{ - return AM_FILTER_MISC_FLAGS_IS_RENDERER; -} - -static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl = { - AMFilterMiscFlags_QueryInterface, - AMFilterMiscFlags_AddRef, - AMFilterMiscFlags_Release, - AMFilterMiscFlags_GetMiscFlags -}; - HRESULT NullRenderer_create(IUnknown *pUnkOuter, void **ppv) { static const WCHAR sink_name[] = {'I','n',0}; @@ -223,7 +184,6 @@ HRESULT NullRenderer_create(IUnknown *pUnkOuter, void **ppv) pNullRenderer = CoTaskMemAlloc(sizeof(NullRendererImpl)); pNullRenderer->IUnknown_inner.lpVtbl = &IInner_VTable; - pNullRenderer->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl; if (pUnkOuter) pNullRenderer->outer_unk = pUnkOuter; diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c index 0ae17b1..a45f30a 100644 --- a/dlls/qedit/tests/nullrenderer.c +++ b/dlls/qedit/tests/nullrenderer.c @@ -68,7 +68,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IPersist, TRUE); check_interface(filter, &IID_IUnknown, TRUE); - todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, FALSE); + check_interface(filter, &IID_IAMFilterMiscFlags, FALSE); check_interface(filter, &IID_IBasicAudio, FALSE); check_interface(filter, &IID_IBasicVideo, FALSE); check_interface(filter, &IID_IKsPropertySet, FALSE);

1 0

Zebediah Figura : quartz/dsoundrender: Don't expose IAMFilterMiscFlags.
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: 19b5b68cdebe571f35cb6a14629e5ca7e2d50b49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19b5b68cdebe571f35cb6a14… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 20 17:44:05 2019 -0500 quartz/dsoundrender: Don't expose IAMFilterMiscFlags. This reverts 0196da9b4d2a9689a0a5bc219bb393ac590ad088. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 36 ------------------------------------ dlls/quartz/tests/dsoundrender.c | 2 +- 2 files changed, 1 insertion(+), 37 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 31862d2..844085a 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -47,7 +47,6 @@ static const IBaseFilterVtbl DSoundRender_Vtbl; static const IBasicAudioVtbl IBasicAudio_Vtbl; static const IReferenceClockVtbl IReferenceClock_Vtbl; static const IAMDirectSoundVtbl IAMDirectSound_Vtbl; -static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl; typedef struct DSoundRenderImpl { @@ -56,7 +55,6 @@ typedef struct DSoundRenderImpl IReferenceClock IReferenceClock_iface; IAMDirectSound IAMDirectSound_iface; - IAMFilterMiscFlags IAMFilterMiscFlags_iface; IDirectSound8 *dsound; LPDIRECTSOUNDBUFFER dsbuffer; @@ -100,11 +98,6 @@ static inline DSoundRenderImpl *impl_from_IAMDirectSound(IAMDirectSound *iface) return CONTAINING_RECORD(iface, DSoundRenderImpl, IAMDirectSound_iface); } -static inline DSoundRenderImpl *impl_from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface) -{ - return CONTAINING_RECORD(iface, DSoundRenderImpl, IAMFilterMiscFlags_iface); -} - static REFERENCE_TIME time_from_pos(DSoundRenderImpl *This, DWORD pos) { WAVEFORMATEX *wfx = (WAVEFORMATEX*)This->renderer.pInputPin->pin.mtCurrent.pbFormat; REFERENCE_TIME ret = 10000000; @@ -642,7 +635,6 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) BasicAudio_Init(&pDSoundRender->basicAudio,&IBasicAudio_Vtbl); pDSoundRender->IReferenceClock_iface.lpVtbl = &IReferenceClock_Vtbl; pDSoundRender->IAMDirectSound_iface.lpVtbl = &IAMDirectSound_Vtbl; - pDSoundRender->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl; if (SUCCEEDED(hr)) { @@ -700,8 +692,6 @@ static HRESULT WINAPI DSoundRender_QueryInterface(IBaseFilter * iface, REFIID ri *ppv = &This->IReferenceClock_iface; else if (IsEqualIID(riid, &IID_IAMDirectSound)) *ppv = &This->IAMDirectSound_iface; - else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags)) - *ppv = &This->IAMFilterMiscFlags_iface; else { HRESULT hr; @@ -1284,29 +1274,3 @@ static const IAMDirectSoundVtbl IAMDirectSound_Vtbl = AMDirectSound_SetFocusWindow, AMDirectSound_GetFocusWindow }; - -static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, REFIID riid, void **ppv) { - DSoundRenderImpl *This = impl_from_IAMFilterMiscFlags(iface); - return IBaseFilter_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppv); -} - -static ULONG WINAPI AMFilterMiscFlags_AddRef(IAMFilterMiscFlags *iface) { - DSoundRenderImpl *This = impl_from_IAMFilterMiscFlags(iface); - return IBaseFilter_AddRef(&This->renderer.filter.IBaseFilter_iface); -} - -static ULONG WINAPI AMFilterMiscFlags_Release(IAMFilterMiscFlags *iface) { - DSoundRenderImpl *This = impl_from_IAMFilterMiscFlags(iface); - return IBaseFilter_Release(&This->renderer.filter.IBaseFilter_iface); -} - -static ULONG WINAPI AMFilterMiscFlags_GetMiscFlags(IAMFilterMiscFlags *iface) { - return AM_FILTER_MISC_FLAGS_IS_RENDERER; -} - -static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl = { - AMFilterMiscFlags_QueryInterface, - AMFilterMiscFlags_AddRef, - AMFilterMiscFlags_Release, - AMFilterMiscFlags_GetMiscFlags -}; diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index 09bd473..9e01aec 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -144,7 +144,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IReferenceClock, TRUE); check_interface(filter, &IID_IUnknown, TRUE); - todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, FALSE); + check_interface(filter, &IID_IAMFilterMiscFlags, FALSE); check_interface(filter, &IID_IBasicVideo, FALSE); check_interface(filter, &IID_IDispatch, FALSE); check_interface(filter, &IID_IKsPropertySet, FALSE);

1 0

Zebediah Figura : quartz/videorenderer: Don't expose IAMFilterMiscFlags.
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: 75af3556a8dc73e0d8c2068a9768f375bdeb38db URL: https://source.winehq.org/git/wine.git/?a=commit;h=75af3556a8dc73e0d8c2068a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 20 17:44:04 2019 -0500 quartz/videorenderer: Don't expose IAMFilterMiscFlags. This reverts 822c3fe9eab143c0213a0e5a95d9ecdf77c93b38. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 2 +- dlls/quartz/videorenderer.c | 40 --------------------------------------- 2 files changed, 1 insertion(+), 41 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 93ce8d1..fdd4dfb 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -74,7 +74,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IUnknown, TRUE); check_interface(filter, &IID_IVideoWindow, TRUE); - todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, FALSE); + check_interface(filter, &IID_IAMFilterMiscFlags, FALSE); check_interface(filter, &IID_IBasicAudio, FALSE); check_interface(filter, &IID_IDispatch, FALSE); check_interface(filter, &IID_IOverlay, FALSE); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index f3d817b..3a84aba 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -47,7 +47,6 @@ typedef struct VideoRendererImpl BaseControlVideo baseControlVideo; IUnknown IUnknown_inner; - IAMFilterMiscFlags IAMFilterMiscFlags_iface; IUnknown *outer_unk; BOOL init; @@ -659,8 +658,6 @@ static HRESULT WINAPI VideoRendererInner_QueryInterface(IUnknown *iface, REFIID *ppv = &This->baseControlVideo.IBasicVideo_iface; else if (IsEqualIID(riid, &IID_IVideoWindow)) *ppv = &This->baseControlWindow.IVideoWindow_iface; - else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags)) - *ppv = &This->IAMFilterMiscFlags_iface; else { HRESULT hr; @@ -980,42 +977,6 @@ static const IVideoWindowVtbl IVideoWindow_VTable = BaseControlWindowImpl_IsCursorHidden }; -static VideoRendererImpl *impl_from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface) -{ - return CONTAINING_RECORD(iface, VideoRendererImpl, IAMFilterMiscFlags_iface); -} - -static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, REFIID riid, - void **ppv) -{ - VideoRendererImpl *This = impl_from_IAMFilterMiscFlags(iface); - return IUnknown_QueryInterface(This->outer_unk, riid, ppv); -} - -static ULONG WINAPI AMFilterMiscFlags_AddRef(IAMFilterMiscFlags *iface) -{ - VideoRendererImpl *This = impl_from_IAMFilterMiscFlags(iface); - return IUnknown_AddRef(This->outer_unk); -} - -static ULONG WINAPI AMFilterMiscFlags_Release(IAMFilterMiscFlags *iface) -{ - VideoRendererImpl *This = impl_from_IAMFilterMiscFlags(iface); - return IUnknown_Release(This->outer_unk); -} - -static ULONG WINAPI AMFilterMiscFlags_GetMiscFlags(IAMFilterMiscFlags *iface) -{ - return AM_FILTER_MISC_FLAGS_IS_RENDERER; -} - -static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl = { - AMFilterMiscFlags_QueryInterface, - AMFilterMiscFlags_AddRef, - AMFilterMiscFlags_Release, - AMFilterMiscFlags_GetMiscFlags -}; - HRESULT VideoRenderer_create(IUnknown *pUnkOuter, void **ppv) { static const WCHAR sink_name[] = {'I','n',0}; @@ -1028,7 +989,6 @@ HRESULT VideoRenderer_create(IUnknown *pUnkOuter, void **ppv) pVideoRenderer = CoTaskMemAlloc(sizeof(VideoRendererImpl)); pVideoRenderer->IUnknown_inner.lpVtbl = &IInner_VTable; - pVideoRenderer->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl; pVideoRenderer->init = FALSE; ZeroMemory(&pVideoRenderer->SourceRect, sizeof(RECT));

1 0

Zebediah Figura : quartz/filtergraph: Don' t require IAMFilterMiscFlags in IFilterGraph::SetDefaultSyncSource().
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: 8e302b83ad35a512a2a8eefc958b9c44b63af35e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e302b83ad35a512a2a8eefc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 20 17:44:03 2019 -0500 quartz/filtergraph: Don't require IAMFilterMiscFlags in IFilterGraph::SetDefaultSyncSource(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 11 +---------- dlls/quartz/tests/filtergraph.c | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 60cc368..9606a49 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -918,16 +918,7 @@ static HRESULT WINAPI FilterGraph2_SetDefaultSyncSource(IFilterGraph2 *iface) LIST_FOR_EACH_ENTRY(filter, &This->filters, struct filter, entry) { - DWORD miscflags; - IAMFilterMiscFlags *flags = NULL; - IBaseFilter_QueryInterface(filter->filter, &IID_IAMFilterMiscFlags, (void **)&flags); - if (!flags) - continue; - miscflags = IAMFilterMiscFlags_GetMiscFlags(flags); - IAMFilterMiscFlags_Release(flags); - if (miscflags == AM_FILTER_MISC_FLAGS_IS_RENDERER) - IBaseFilter_QueryInterface(filter->filter, &IID_IReferenceClock, (void **)&pClock); - if (pClock) + if (IBaseFilter_QueryInterface(filter->filter, &IID_IReferenceClock, (void **)&pClock) == S_OK) break; } diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 0842029..e6f2afa 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3737,7 +3737,7 @@ static void test_default_sync_source(void) hr = IMediaFilter_GetSyncSource(filter, &clock); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(clock == &source.IReferenceClock_iface, "Got unexpected clock.\n"); + ok(clock == &source.IReferenceClock_iface, "Got unexpected clock.\n"); IReferenceClock_Release(clock); /* The documentation says that connected filters are preferred, but this

1 0

Zebediah Figura : quartz/tests: Add some tests for IFilterGraph:: SetDefaultSyncSource().
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: f4cbb2de238441ccbab08e231a61f2d5b32a3bb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4cbb2de238441ccbab08e23… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 20 17:44:02 2019 -0500 quartz/tests: Add some tests for IFilterGraph::SetDefaultSyncSource(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 143 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 143 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 79841e6..0842029 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1171,6 +1171,8 @@ struct testfilter BOOL support_testguid; LONGLONG seek_duration, seek_current, seek_stop; double seek_rate; + + IReferenceClock IReferenceClock_iface; }; static inline struct testfilter *impl_from_IEnumPins(IEnumPins *iface) @@ -1278,6 +1280,12 @@ static HRESULT WINAPI testfilter_QueryInterface(IBaseFilter *iface, REFIID iid, IMediaSeeking_AddRef(*out); return S_OK; } + else if (IsEqualGUID(iid, &IID_IReferenceClock) && filter->IReferenceClock_iface.lpVtbl) + { + *out = &filter->IReferenceClock_iface; + IMediaSeeking_AddRef(*out); + return S_OK; + } *out = NULL; return E_NOINTERFACE; @@ -1672,6 +1680,66 @@ static const IMediaSeekingVtbl testseek_vtbl = testseek_GetPreroll, }; +static struct testfilter *impl_from_IReferenceClock(IReferenceClock *iface) +{ + return CONTAINING_RECORD(iface, struct testfilter, IReferenceClock_iface); +} + +static HRESULT WINAPI testclock_QueryInterface(IReferenceClock *iface, REFIID iid, void **out) +{ + struct testfilter *filter = impl_from_IReferenceClock(iface); + return IBaseFilter_QueryInterface(&filter->IBaseFilter_iface, iid, out); +} + +static ULONG WINAPI testclock_AddRef(IReferenceClock *iface) +{ + struct testfilter *filter = impl_from_IReferenceClock(iface); + return InterlockedIncrement(&filter->ref); +} + +static ULONG WINAPI testclock_Release(IReferenceClock *iface) +{ + struct testfilter *filter = impl_from_IReferenceClock(iface); + return InterlockedDecrement(&filter->ref); +} + +static HRESULT WINAPI testclock_GetTime(IReferenceClock *iface, REFERENCE_TIME *time) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testclock_AdviseTime(IReferenceClock *iface, + REFERENCE_TIME base, REFERENCE_TIME offset, HEVENT event, DWORD_PTR *cookie) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testclock_AdvisePeriodic(IReferenceClock *iface, + REFERENCE_TIME start, REFERENCE_TIME period, HSEMAPHORE semaphore, DWORD_PTR *cookie) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testclock_Unadvise(IReferenceClock *iface, DWORD_PTR cookie) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static const IReferenceClockVtbl testclock_vtbl = +{ + testclock_QueryInterface, + testclock_AddRef, + testclock_Release, + testclock_GetTime, + testclock_AdviseTime, + testclock_AdvisePeriodic, + testclock_Unadvise, +}; + struct testfilter_cf { IClassFactory IClassFactory_iface; @@ -3629,6 +3697,80 @@ static void test_graph_seeking(void) ok(filter2.ref == 1, "Got outstanding refcount %d.\n", filter2.ref); } +static void test_default_sync_source(void) +{ + struct testpin source_pin, sink1_pin, sink2_pin; + struct testfilter source, sink1, sink2; + + IFilterGraph2 *graph = create_graph(); + IReferenceClock *clock; + IMediaFilter *filter; + HRESULT hr; + ULONG ref; + + testsink_init(&sink1_pin); + testsink_init(&sink2_pin); + testsource_init(&source_pin, NULL, 0); + testfilter_init(&source, &source_pin, 1); + testfilter_init(&sink1, &sink1_pin, 1); + testfilter_init(&sink2, &sink2_pin, 1); + + IFilterGraph2_AddFilter(graph, &sink1.IBaseFilter_iface, NULL); + IFilterGraph2_AddFilter(graph, &sink2.IBaseFilter_iface, NULL); + IFilterGraph2_AddFilter(graph, &source.IBaseFilter_iface, NULL); + IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink1_pin.IPin_iface, NULL); + + IFilterGraph2_QueryInterface(graph, &IID_IMediaFilter, (void **)&filter); + + hr = IFilterGraph2_SetDefaultSyncSource(graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaFilter_GetSyncSource(filter, &clock); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!clock, "Reference clock not set.\n"); + IReferenceClock_Release(clock); + + source.IReferenceClock_iface.lpVtbl = &testclock_vtbl; + + hr = IFilterGraph2_SetDefaultSyncSource(graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaFilter_GetSyncSource(filter, &clock); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(clock == &source.IReferenceClock_iface, "Got unexpected clock.\n"); + IReferenceClock_Release(clock); + + /* The documentation says that connected filters are preferred, but this + * does not in fact seem to be the case. */ + + sink2.IReferenceClock_iface.lpVtbl = &testclock_vtbl; + + hr = IFilterGraph2_SetDefaultSyncSource(graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaFilter_GetSyncSource(filter, &clock); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(clock == &sink2.IReferenceClock_iface, "Got unexpected clock.\n"); + IReferenceClock_Release(clock); + + sink1.IReferenceClock_iface.lpVtbl = &testclock_vtbl; + + hr = IFilterGraph2_SetDefaultSyncSource(graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaFilter_GetSyncSource(filter, &clock); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(clock == &sink1.IReferenceClock_iface, "Got unexpected clock.\n"); + IReferenceClock_Release(clock); + + IMediaFilter_Release(filter); + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(sink1.ref == 1, "Got outstanding refcount %d.\n", sink1.ref); + ok(sink2.ref == 1, "Got outstanding refcount %d.\n", sink2.ref); + ok(source.ref == 1, "Got outstanding refcount %d.\n", source.ref); +} + START_TEST(filtergraph) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -3649,6 +3791,7 @@ START_TEST(filtergraph) test_filter_state(); test_ec_complete(); test_graph_seeking(); + test_default_sync_source(); CoUninitialize(); test_render_with_multithread();

1 0

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 May 2019