wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Huw Davies : riched20: Handle WM_CHAR's unicode conversion in the host.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 9fa993022eab6408243e440f962d1c20a624b803 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fa993022eab6408243e440f… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 11 08:51:02 2021 +0000 riched20: Handle WM_CHAR's unicode conversion in the host. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 23 ++++++----------------- dlls/riched20/txthost.c | 8 ++++++++ 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index cacad463963..3d17d2d974f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2744,11 +2744,8 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) return FALSE; } -static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode, - LPARAM flags, BOOL unicode) +static LRESULT handle_wm_char( ME_TextEditor *editor, WCHAR wstr, LPARAM flags ) { - WCHAR wstr; - if (editor->bMouseCaptured) return 0; @@ -2758,14 +2755,6 @@ static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode, return 0; /* FIXME really 0 ? */ } - if (unicode) - wstr = (WCHAR)charCode; - else - { - CHAR charA = charCode; - MultiByteToWideChar(CP_ACP, 0, &charA, 1, &wstr, 1); - } - if (editor->bEmulateVersion10 && wstr == '\r') handle_enter(editor); @@ -4379,7 +4368,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if ((editor->nEventMask & ENM_KEYEVENTS) && !ME_FilterEvent(editor, msg, &wParam, &lParam)) return 0; - return ME_Char(editor, wParam, lParam, unicode); + return handle_wm_char( editor, wParam, lParam ); case WM_UNICHAR: if (unicode) { @@ -4389,11 +4378,11 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if(wParam > 0xffff) /* convert to surrogates */ { wParam -= 0x10000; - ME_Char(editor, (wParam >> 10) + 0xd800, 0, TRUE); - ME_Char(editor, (wParam & 0x03ff) + 0xdc00, 0, TRUE); - } else { - ME_Char(editor, wParam, 0, TRUE); + handle_wm_char( editor, (wParam >> 10) + 0xd800, 0 ); + handle_wm_char( editor, (wParam & 0x03ff) + 0xdc00, 0 ); } + else + handle_wm_char( editor, wParam, 0 ); } return 0; } diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 17b6daf7517..ac561ef4c83 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -780,6 +780,14 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, editor = host->editor; switch (msg) { + case WM_CHAR: + { + WCHAR wc = wparam; + + if (!unicode) MultiByteToWideChar( CP_ACP, 0, (char *)&wparam, 1, &wc, 1 ); + hr = ITextServices_TxSendMessage( host->text_srv, msg, wc, lparam, &res ); + break; + } case WM_DESTROY: ITextHost_Release( &host->ITextHost_iface ); return 0;

1 0

Huw Davies : riched20: Handle WM_SETTEXT's unicode conversion in the host.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 21fc1b530d4499d71a32d861bed201094e0529d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21fc1b530d4499d71a32d861… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 11 08:51:01 2021 +0000 riched20: Handle WM_SETTEXT's unicode conversion in the host. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 2 +- dlls/riched20/txthost.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 9ac5d49a3db..cacad463963 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3953,7 +3953,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_StreamInRTFString(editor, 0, (char *)lParam); } else - ME_SetText(editor, (void*)lParam, unicode); + ME_SetText( editor, (void*)lParam, TRUE ); } else TRACE("WM_SETTEXT - NULL\n"); diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 9f183def2dd..17b6daf7517 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -865,6 +865,18 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, SetWindowLongW( hwnd, GWL_STYLE, style ); return res; } + case WM_SETTEXT: + { + char *textA = (char *)lparam; + WCHAR *text = (WCHAR *)lparam; + int len; + + if (!unicode && textA && strncmp( textA, "{\\rtf", 5 ) && strncmp( textA, "{\\urtf", 6 )) + text = ME_ToUnicode( CP_ACP, textA, &len ); + hr = ITextServices_TxSendMessage( host->text_srv, msg, wparam, (LPARAM)text, &res ); + if (text != (WCHAR *)lparam) ME_EndToUnicode( CP_ACP, text ); + break; + } default: res = ME_HandleMessage( editor, msg, wparam, lparam, unicode, &hr ); }

1 0

Huw Davies : riched20: Handle WM_DESTROY in the host.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 64bbbda2fd54db62c7cb3c031bd2a8b48d78e4e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64bbbda2fd54db62c7cb3c03… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 11 08:51:00 2021 +0000 riched20: Handle WM_DESTROY in the host. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 3 --- dlls/riched20/txthost.c | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 516cd104d31..9ac5d49a3db 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4277,9 +4277,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case WM_CREATE: return ME_WmCreate(editor, lParam, unicode); - case WM_DESTROY: - ME_DestroyEditor(editor); - return 0; case WM_SETCURSOR: { POINT cursor_pos; diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 51dccf3b7ed..9f183def2dd 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -780,6 +780,10 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, editor = host->editor; switch (msg) { + case WM_DESTROY: + ITextHost_Release( &host->ITextHost_iface ); + return 0; + case WM_ERASEBKGND: { HDC hdc = (HDC)wparam;

1 0

Huw Davies : riched20: Add ITextServices stdcall wrappers.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 7ea39932844ebafb0ef6eb60954b97ddf7b99793 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ea39932844ebafb0ef6eb60… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 11 08:50:59 2021 +0000 riched20: Add ITextServices stdcall wrappers. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 31 +++++++++++++++++++--- dlls/riched20/editstr.h | 4 --- dlls/riched20/txthost.c | 8 +++--- dlls/riched20/txtsrv.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 102 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 38d99f4351a..ee2cde833c4 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -318,10 +318,11 @@ static inline ME_DisplayItem *cell_get_di(ME_Cell *cell) /* txthost.c */ #ifdef __ASM_USE_THISCALL_WRAPPER -#define TXTHOST_VTABLE(This) (&itextHostStdcallVtbl) -#else /* __i386__ */ +extern const struct ITextHostVtbl text_host_stdcall_vtbl DECLSPEC_HIDDEN; +#define TXTHOST_VTABLE(This) (&text_host_stdcall_vtbl) +#else #define TXTHOST_VTABLE(This) (This)->lpVtbl -#endif /* __i386__ */ +#endif /*** ITextHost methods ***/ #define ITextHost_TxGetDC(This) TXTHOST_VTABLE(This)->TxGetDC(This) #define ITextHost_TxReleaseDC(This,a) TXTHOST_VTABLE(This)->TxReleaseDC(This,a) @@ -379,6 +380,30 @@ void ME_EmptyUndoStack(ME_TextEditor *editor) DECLSPEC_HIDDEN; /* txtsrv.c */ HRESULT create_text_services( IUnknown *outer, ITextHost *text_host, IUnknown **unk, BOOL emulate_10, ME_TextEditor **editor ) DECLSPEC_HIDDEN; +#ifdef __ASM_USE_THISCALL_WRAPPER +extern const struct ITextServicesVtbl text_services_stdcall_vtbl DECLSPEC_HIDDEN; +#define TXTSERV_VTABLE(This) (&text_services_stdcall_vtbl) +#else +#define TXTSERV_VTABLE(This) (This)->lpVtbl +#endif +#define ITextServices_TxSendMessage(This,a,b,c,d) TXTSERV_VTABLE(This)->TxSendMessage(This,a,b,c,d) +#define ITextServices_TxDraw(This,a,b,c,d,e,f,g,h,i,j,k,l) TXTSERV_VTABLE(This)->ITextServices_TxDraw(This,a,b,c,d,e,f,g,h,i,j,k,l) +#define ITextServices_TxGetHScroll(This,a,b,c,d,e) TXTSERV_VTABLE(This)->TxGetHScroll(This,a,b,c,d,e) +#define ITextServices_TxGetVScroll(This,a,b,c,d,e) TXTSERV_VTABLE(This)->TxGetVScroll(This,a,b,c,d,e) +#define ITextServices_OnTxSetCursor(This,a,b,c,d,e,f,g,h,i) TXTSERV_VTABLE(This)->OnTxSetCursor(This,a,b,c,d,e,f,g,h,i) +#define ITextServices_TxQueryHitPoint(This,a,b,c,d,e,f,g,h,i,j) TXTSERV_VTABLE(This)->TxQueryHitPoint(This,a,b,c,d,e,f,g,h,i,j) +#define ITextServices_OnTxInplaceActivate(This,a) TXTSERV_VTABLE(This)->OnTxInplaceActivate(This,a) +#define ITextServices_OnTxInplaceDeactivate(This) TXTSERV_VTABLE(This)->OnTxInplaceDeactivate(This) +#define ITextServices_OnTxUIActivate(This) TXTSERV_VTABLE(This)->OnTxUIActivate(This) +#define ITextServices_OnTxUIDeactivate(This) TXTSERV_VTABLE(This)->OnTxUIDeactivate(This) +#define ITextServices_TxGetText(This,a) TXTSERV_VTABLE(This)->TxGetText(This,a) +#define ITextServices_TxSetText(This,a) TXTSERV_VTABLE(This)->TxSetText(This,a) +#define ITextServices_TxGetCurTargetX(This,a) TXTSERV_VTABLE(This)->TxGetCurTargetX(This,a) +#define ITextServices_TxGetBaseLinePos(This,a) TXTSERV_VTABLE(This)->TxGetBaseLinePos(This,a) +#define ITextServices_TxGetNaturalSize(This,a,b,c,d,e,f,g,h) TXTSERV_VTABLE(This)->TxGetNaturalSize(This,a,b,c,d,e,f,g,h) +#define ITextServices_TxGetDropTarget(This,a) TXTSERV_VTABLE(This)->TxGetDropTarget(This,a) +#define ITextServices_OnTxPropertyBitsChange(This,a,b) TXTSERV_VTABLE(This)->OnTxPropertyBitsChange(This,a,b) +#define ITextServices_TxGetCachedSize(This,a,b) TXTSERV_VTABLE(This)->TxGetCachedSize(This,a,b) /* writer.c */ LRESULT ME_StreamOutRange(ME_TextEditor *editor, DWORD dwFormat, const ME_Cursor *start, int nChars, EDITSTREAM *stream) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 204e078c986..57dd45136af 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -49,10 +49,6 @@ #include "wine/list.h" #include "wine/rbtree.h" -#ifdef __ASM_USE_THISCALL_WRAPPER -extern const struct ITextHostVtbl itextHostStdcallVtbl DECLSPEC_HIDDEN; -#endif /* __i386__ */ - typedef struct tagME_String { WCHAR *szData; diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 291c9a3b677..51dccf3b7ed 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -584,7 +584,8 @@ DEFINE_STDCALL_WRAPPER(39,ITextHostImpl_TxImmGetContext,4) DEFINE_STDCALL_WRAPPER(40,ITextHostImpl_TxImmReleaseContext,8) DEFINE_STDCALL_WRAPPER(41,ITextHostImpl_TxGetSelectionBarWidth,8) -const ITextHostVtbl itextHostStdcallVtbl = { +const ITextHostVtbl text_host_stdcall_vtbl = +{ NULL, NULL, NULL, @@ -629,9 +630,10 @@ const ITextHostVtbl itextHostStdcallVtbl = { STDCALL(ITextHostImpl_TxGetSelectionBarWidth), }; -#endif /* __i386__ */ +#endif /* __ASM_USE_THISCALL_WRAPPER */ -static const ITextHostVtbl textHostVtbl = { +static const ITextHostVtbl textHostVtbl = +{ ITextHostImpl_QueryInterface, ITextHostImpl_AddRef, ITextHostImpl_Release, diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 49d1c706076..7893888af57 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -339,6 +339,75 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetCachedSize(ITextServices *ifac return E_NOTIMPL; } +#ifdef __ASM_USE_THISCALL_WRAPPER + +#define STDCALL(func) (void *) __stdcall_ ## func +#ifdef _MSC_VER +#define DEFINE_STDCALL_WRAPPER(num,func) \ + __declspec(naked) HRESULT __stdcall_##func(void) \ + { \ + __asm pop eax \ + __asm pop ecx \ + __asm push eax \ + __asm mov eax, [ecx] \ + __asm jmp dword ptr [eax + 4*num] \ + } +#else /* _MSC_VER */ +#define DEFINE_STDCALL_WRAPPER(num,func) \ + extern HRESULT __stdcall_ ## func(void); \ + __ASM_GLOBAL_FUNC(__stdcall_ ## func, \ + "popl %eax\n\t" \ + "popl %ecx\n\t" \ + "pushl %eax\n\t" \ + "movl (%ecx), %eax\n\t" \ + "jmp *(4*(" #num "))(%eax)" ) +#endif /* _MSC_VER */ + +DEFINE_STDCALL_WRAPPER(3, ITextServices_TxSendMessage) +DEFINE_STDCALL_WRAPPER(4, ITextServices_TxDraw) +DEFINE_STDCALL_WRAPPER(5, ITextServices_TxGetHScroll) +DEFINE_STDCALL_WRAPPER(6, ITextServices_TxGetVScroll) +DEFINE_STDCALL_WRAPPER(7, ITextServices_OnTxSetCursor) +DEFINE_STDCALL_WRAPPER(8, ITextServices_TxQueryHitPoint) +DEFINE_STDCALL_WRAPPER(9, ITextServices_OnTxInplaceActivate) +DEFINE_STDCALL_WRAPPER(10, ITextServices_OnTxInplaceDeactivate) +DEFINE_STDCALL_WRAPPER(11, ITextServices_OnTxUIActivate) +DEFINE_STDCALL_WRAPPER(12, ITextServices_OnTxUIDeactivate) +DEFINE_STDCALL_WRAPPER(13, ITextServices_TxGetText) +DEFINE_STDCALL_WRAPPER(14, ITextServices_TxSetText) +DEFINE_STDCALL_WRAPPER(15, ITextServices_TxGetCurTargetX) +DEFINE_STDCALL_WRAPPER(16, ITextServices_TxGetBaseLinePos) +DEFINE_STDCALL_WRAPPER(17, ITextServices_TxGetNaturalSize) +DEFINE_STDCALL_WRAPPER(18, ITextServices_TxGetDropTarget) +DEFINE_STDCALL_WRAPPER(19, ITextServices_OnTxPropertyBitsChange) +DEFINE_STDCALL_WRAPPER(20, ITextServices_TxGetCachedSize) + +const ITextServicesVtbl text_services_stdcall_vtbl = +{ + NULL, + NULL, + NULL, + STDCALL(ITextServices_TxSendMessage), + STDCALL(ITextServices_TxDraw), + STDCALL(ITextServices_TxGetHScroll), + STDCALL(ITextServices_TxGetVScroll), + STDCALL(ITextServices_OnTxSetCursor), + STDCALL(ITextServices_TxQueryHitPoint), + STDCALL(ITextServices_OnTxInplaceActivate), + STDCALL(ITextServices_OnTxInplaceDeactivate), + STDCALL(ITextServices_OnTxUIActivate), + STDCALL(ITextServices_OnTxUIDeactivate), + STDCALL(ITextServices_TxGetText), + STDCALL(ITextServices_TxSetText), + STDCALL(ITextServices_TxGetCurTargetX), + STDCALL(ITextServices_TxGetBaseLinePos), + STDCALL(ITextServices_TxGetNaturalSize), + STDCALL(ITextServices_TxGetDropTarget), + STDCALL(ITextServices_OnTxPropertyBitsChange), + STDCALL(ITextServices_TxGetCachedSize), +}; + +#endif /* __ASM_USE_THISCALL_WRAPPER */ static const ITextServicesVtbl textservices_vtbl = {

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 5e222aff6624f1e0b0452ff627ccfd6096cbf587 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e222aff6624f1e0b0452ff6… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Mar 11 10:21:23 2021 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/po/fi.po b/po/fi.po index ccc0f1da8e6..db71721c80f 100644 --- a/po/fi.po +++ b/po/fi.po @@ -19,26 +19,20 @@ msgid "Security" msgstr "Turvallisuus" #: dlls/aclui/aclui.rc:32 -#, fuzzy -#| msgid "&User name:" msgid "&Group or user names:" -msgstr "&Käyttäjänimi:" +msgstr "&Ryhmät ja käyttäjät:" #: dlls/aclui/aclui.rc:38 -#, fuzzy -#| msgid "Yellow" msgid "Allow" -msgstr "Keltainen" +msgstr "Salli" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "Estä" #: dlls/aclui/aclui.rc:47 -#, fuzzy -#| msgid "Permission denied" msgid "Permissions for %1" -msgstr "Pääsy estetty" +msgstr "Oikeudet taholle %1" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall"

1 0

Zebediah Figura : strmbase: Rename pfnCheckMediaType to renderer_query_accept.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 646f2040d855cf2185e900c16fe2758d4ef07bfd URL: https://source.winehq.org/git/wine.git/?a=commit;h=646f2040d855cf2185e900c1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 10 19:23:37 2021 -0600 strmbase: Rename pfnCheckMediaType to renderer_query_accept. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.c | 4 ++-- dlls/qedit/nullrenderer.c | 5 ++--- dlls/quartz/videorenderer.c | 4 ++-- dlls/quartz/vmr9.c | 4 ++-- dlls/strmbase/renderer.c | 4 ++-- include/wine/strmbase.h | 3 +-- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index 001839026b2..ff89d85ac8c 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -54,7 +54,7 @@ static HRESULT WINAPI evr_DoRenderSample(struct strmbase_renderer *iface, IMedia return E_NOTIMPL; } -static HRESULT WINAPI evr_CheckMediaType(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) +static HRESULT evr_query_accept(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) { FIXME("Not implemented.\n"); return E_NOTIMPL; @@ -62,7 +62,7 @@ static HRESULT WINAPI evr_CheckMediaType(struct strmbase_renderer *iface, const static const struct strmbase_renderer_ops renderer_ops = { - .pfnCheckMediaType = evr_CheckMediaType, + .renderer_query_accept = evr_query_accept, .pfnDoRenderSample = evr_DoRenderSample, .renderer_destroy = evr_destroy, }; diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c index e703ea24305..a9319b06efe 100644 --- a/dlls/qedit/nullrenderer.c +++ b/dlls/qedit/nullrenderer.c @@ -41,9 +41,8 @@ static HRESULT WINAPI NullRenderer_DoRenderSample(struct strmbase_renderer *ifac return S_OK; } -static HRESULT WINAPI NullRenderer_CheckMediaType(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) +static HRESULT null_renderer_query_accept(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) { - TRACE("Not a stub!\n"); return S_OK; } @@ -57,7 +56,7 @@ static void null_renderer_destroy(struct strmbase_renderer *iface) static const struct strmbase_renderer_ops renderer_ops = { - .pfnCheckMediaType = NullRenderer_CheckMediaType, + .renderer_query_accept = null_renderer_query_accept, .pfnDoRenderSample = NullRenderer_DoRenderSample, .renderer_destroy = null_renderer_destroy, }; diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index a90e96c8f2a..ec40bc8db9c 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -105,7 +105,7 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa return S_OK; } -static HRESULT WINAPI VideoRenderer_CheckMediaType(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) +static HRESULT video_renderer_query_accept(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) { if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Video)) return S_FALSE; @@ -213,7 +213,7 @@ static RECT video_renderer_get_default_rect(struct video_window *iface) static const struct strmbase_renderer_ops renderer_ops = { - .pfnCheckMediaType = VideoRenderer_CheckMediaType, + .renderer_query_accept = video_renderer_query_accept, .pfnDoRenderSample = VideoRenderer_DoRenderSample, .renderer_init_stream = video_renderer_init_stream, .renderer_stop_stream = video_renderer_stop_stream, diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index b98e172e48e..9e8a037eca0 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -312,7 +312,7 @@ static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMedi return IVMRImagePresenter9_PresentImage(filter->presenter, filter->cookie, &info); } -static HRESULT WINAPI VMR9_CheckMediaType(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) +static HRESULT vmr_query_accept(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) { if (!IsEqualIID(&mt->majortype, &MEDIATYPE_Video) || !mt->pbFormat) return S_FALSE; @@ -637,7 +637,7 @@ static HRESULT vmr_pin_query_interface(struct strmbase_renderer *iface, REFIID i static const struct strmbase_renderer_ops renderer_ops = { - .pfnCheckMediaType = VMR9_CheckMediaType, + .renderer_query_accept = vmr_query_accept, .pfnDoRenderSample = VMR9_DoRenderSample, .renderer_init_stream = vmr_init_stream, .renderer_start_stream = vmr_start_stream, diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index c95fe63c3f9..7718232e97c 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -302,7 +302,7 @@ static const struct strmbase_filter_ops filter_ops = static HRESULT sink_query_accept(struct strmbase_pin *pin, const AM_MEDIA_TYPE *mt) { struct strmbase_renderer *filter = impl_from_IPin(&pin->IPin_iface); - return filter->pFuncsTable->pfnCheckMediaType(filter, mt); + return filter->pFuncsTable->renderer_query_accept(filter, mt); } static HRESULT sink_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) @@ -344,7 +344,7 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp TRACE("Format change.\n"); strmbase_dump_media_type(mt); - if (FAILED(filter->pFuncsTable->pfnCheckMediaType(filter, mt))) + if (FAILED(filter->pFuncsTable->renderer_query_accept(filter, mt))) return VFW_E_TYPE_NOT_ACCEPTED; DeleteMediaType(mt); } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 76caf103dee..dbb4a21c071 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -305,13 +305,12 @@ struct strmbase_renderer BOOL eos; }; -typedef HRESULT (WINAPI *BaseRenderer_CheckMediaType)(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt); typedef HRESULT (WINAPI *BaseRenderer_DoRenderSample)(struct strmbase_renderer *iface, IMediaSample *sample); typedef HRESULT (WINAPI *BaseRenderer_BreakConnect) (struct strmbase_renderer *iface); struct strmbase_renderer_ops { - BaseRenderer_CheckMediaType pfnCheckMediaType; + HRESULT (*renderer_query_accept)(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt); BaseRenderer_DoRenderSample pfnDoRenderSample; void (*renderer_init_stream)(struct strmbase_renderer *iface); void (*renderer_start_stream)(struct strmbase_renderer *iface);

1 0

Zebediah Figura : strmbase: Move run_event handling to strmbase.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 6ab9ad109699a42abd890b72a5f9d301d63f7e84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ab9ad109699a42abd890b72… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 10 19:23:36 2021 -0600 strmbase: Move run_event handling to strmbase. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/nullrenderer.c | 24 ------------------------ dlls/quartz/videorenderer.c | 20 -------------------- dlls/quartz/vmr9.c | 15 +-------------- dlls/strmbase/renderer.c | 12 ++++++++++++ 4 files changed, 13 insertions(+), 58 deletions(-) diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c index 85493da02f1..e703ea24305 100644 --- a/dlls/qedit/nullrenderer.c +++ b/dlls/qedit/nullrenderer.c @@ -38,16 +38,6 @@ static struct null_renderer *impl_from_strmbase_renderer(struct strmbase_rendere static HRESULT WINAPI NullRenderer_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *sample) { - struct null_renderer *filter = impl_from_strmbase_renderer(iface); - - if (filter->renderer.filter.state == State_Paused) - { - const HANDLE events[2] = {filter->renderer.run_event, filter->renderer.flush_event}; - - SetEvent(filter->renderer.state_event); - WaitForMultipleObjects(2, events, FALSE, INFINITE); - } - return S_OK; } @@ -65,24 +55,10 @@ static void null_renderer_destroy(struct strmbase_renderer *iface) free(filter); } -static void null_renderer_start_stream(struct strmbase_renderer *iface) -{ - struct null_renderer *filter = impl_from_strmbase_renderer(iface); - SetEvent(filter->renderer.run_event); -} - -static void null_renderer_stop_stream(struct strmbase_renderer *iface) -{ - struct null_renderer *filter = impl_from_strmbase_renderer(iface); - ResetEvent(filter->renderer.run_event); -} - static const struct strmbase_renderer_ops renderer_ops = { .pfnCheckMediaType = NullRenderer_CheckMediaType, .pfnDoRenderSample = NullRenderer_DoRenderSample, - .renderer_start_stream = null_renderer_start_stream, - .renderer_stop_stream = null_renderer_stop_stream, .renderer_destroy = null_renderer_destroy, }; diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 1da5ad02d7a..a90e96c8f2a 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -102,16 +102,6 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa (BITMAPINFO *)get_bitmap_header(&filter->renderer.sink.pin.mt), DIB_RGB_COLORS, SRCCOPY); ReleaseDC(filter->window.hwnd, dc); - if (filter->renderer.filter.state == State_Paused) - { - const HANDLE events[2] = {filter->renderer.run_event, filter->renderer.flush_event}; - - SetEvent(filter->renderer.state_event); - LeaveCriticalSection(&filter->renderer.filter.stream_cs); - WaitForMultipleObjects(2, events, FALSE, INFINITE); - EnterCriticalSection(&filter->renderer.filter.stream_cs); - } - return S_OK; } @@ -172,13 +162,6 @@ static HRESULT video_renderer_pin_query_interface(struct strmbase_renderer *ifac return S_OK; } -static void video_renderer_start_stream(struct strmbase_renderer *iface) -{ - struct video_renderer *filter = impl_from_strmbase_renderer(iface); - - SetEvent(filter->renderer.run_event); -} - static void video_renderer_stop_stream(struct strmbase_renderer *iface) { struct video_renderer *This = impl_from_strmbase_renderer(iface); @@ -188,8 +171,6 @@ static void video_renderer_stop_stream(struct strmbase_renderer *iface) if (This->window.AutoShow) /* Black it out */ RedrawWindow(This->window.hwnd, NULL, NULL, RDW_INVALIDATE | RDW_ERASE); - - ResetEvent(This->renderer.run_event); } static void video_renderer_init_stream(struct strmbase_renderer *iface) @@ -235,7 +216,6 @@ static const struct strmbase_renderer_ops renderer_ops = .pfnCheckMediaType = VideoRenderer_CheckMediaType, .pfnDoRenderSample = VideoRenderer_DoRenderSample, .renderer_init_stream = video_renderer_init_stream, - .renderer_start_stream = video_renderer_start_stream, .renderer_stop_stream = video_renderer_stop_stream, .renderer_destroy = video_renderer_destroy, .renderer_query_interface = video_renderer_query_interface, diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 7e0edc57f61..b98e172e48e 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -209,7 +209,6 @@ static inline struct quartz_vmr *impl_from_IBaseFilter(IBaseFilter *iface) static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *sample) { struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); - const HANDLE events[2] = {filter->renderer.run_event, filter->renderer.flush_event}; unsigned int data_size, width, depth, src_pitch; const BITMAPINFOHEADER *bitmap_header; REFERENCE_TIME start_time, end_time; @@ -310,17 +309,7 @@ static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMedi IDirect3DSurface9_UnlockRect(info.lpSurf); - hr = IVMRImagePresenter9_PresentImage(filter->presenter, filter->cookie, &info); - - if (filter->renderer.filter.state == State_Paused) - { - SetEvent(filter->renderer.state_event); - LeaveCriticalSection(&filter->renderer.filter.stream_cs); - WaitForMultipleObjects(2, events, FALSE, INFINITE); - EnterCriticalSection(&filter->renderer.filter.stream_cs); - } - - return hr; + return IVMRImagePresenter9_PresentImage(filter->presenter, filter->cookie, &info); } static HRESULT WINAPI VMR9_CheckMediaType(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) @@ -484,7 +473,6 @@ static void vmr_start_stream(struct strmbase_renderer *iface) struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); IVMRImagePresenter9_StartPresenting(filter->presenter, filter->cookie); - SetEvent(filter->renderer.run_event); } static void vmr_stop_stream(struct strmbase_renderer *iface) @@ -495,7 +483,6 @@ static void vmr_stop_stream(struct strmbase_renderer *iface) if (This->renderer.filter.state == State_Running) IVMRImagePresenter9_StopPresenting(This->presenter, This->cookie); - ResetEvent(This->renderer.run_event); } static HRESULT vmr_connect(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 0978f7305c8..c95fe63c3f9 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -245,6 +245,7 @@ static HRESULT renderer_start_stream(struct strmbase_filter *iface, REFERENCE_TI filter->stream_start = start; SetEvent(filter->state_event); + SetEvent(filter->run_event); if (filter->sink.pin.peer) filter->eos = FALSE; reset_qos(filter); @@ -258,6 +259,8 @@ static HRESULT renderer_stop_stream(struct strmbase_filter *iface) { struct strmbase_renderer *filter = impl_from_strmbase_filter(iface); + ResetEvent(filter->run_event); + if (filter->sink.pin.peer && filter->pFuncsTable->renderer_stop_stream) filter->pFuncsTable->renderer_stop_stream(filter); @@ -354,8 +357,17 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp if (state == State_Paused) { + HANDLE events[2] = {filter->run_event, filter->flush_event}; + filter->current_sample = sample; + hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); + + SetEvent(filter->state_event); + LeaveCriticalSection(&filter->filter.stream_cs); + WaitForMultipleObjects(2, events, FALSE, INFINITE); + EnterCriticalSection(&filter->filter.stream_cs); + filter->current_sample = NULL; }

1 0

Zebediah Figura : strmbase: Move run_event to the strmbase_renderer structure.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: 914ad66c52236c92676f4e5f720153d3822abcf7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=914ad66c52236c92676f4e5f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 10 19:23:35 2021 -0600 strmbase: Move run_event to the strmbase_renderer structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/nullrenderer.c | 9 +++------ dlls/quartz/videorenderer.c | 11 +++-------- dlls/quartz/vmr9.c | 11 +++-------- dlls/strmbase/renderer.c | 2 ++ include/wine/strmbase.h | 3 +++ 5 files changed, 14 insertions(+), 22 deletions(-) diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c index 97e3cdbb202..85493da02f1 100644 --- a/dlls/qedit/nullrenderer.c +++ b/dlls/qedit/nullrenderer.c @@ -29,7 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(qedit); struct null_renderer { struct strmbase_renderer renderer; - HANDLE run_event; }; static struct null_renderer *impl_from_strmbase_renderer(struct strmbase_renderer *iface) @@ -43,7 +42,7 @@ static HRESULT WINAPI NullRenderer_DoRenderSample(struct strmbase_renderer *ifac if (filter->renderer.filter.state == State_Paused) { - const HANDLE events[2] = {filter->run_event, filter->renderer.flush_event}; + const HANDLE events[2] = {filter->renderer.run_event, filter->renderer.flush_event}; SetEvent(filter->renderer.state_event); WaitForMultipleObjects(2, events, FALSE, INFINITE); @@ -62,7 +61,6 @@ static void null_renderer_destroy(struct strmbase_renderer *iface) { struct null_renderer *filter = impl_from_strmbase_renderer(iface); - CloseHandle(filter->run_event); strmbase_renderer_cleanup(&filter->renderer); free(filter); } @@ -70,13 +68,13 @@ static void null_renderer_destroy(struct strmbase_renderer *iface) static void null_renderer_start_stream(struct strmbase_renderer *iface) { struct null_renderer *filter = impl_from_strmbase_renderer(iface); - SetEvent(filter->run_event); + SetEvent(filter->renderer.run_event); } static void null_renderer_stop_stream(struct strmbase_renderer *iface) { struct null_renderer *filter = impl_from_strmbase_renderer(iface); - ResetEvent(filter->run_event); + ResetEvent(filter->renderer.run_event); } static const struct strmbase_renderer_ops renderer_ops = @@ -96,7 +94,6 @@ HRESULT null_renderer_create(IUnknown *outer, IUnknown **out) return E_OUTOFMEMORY; strmbase_renderer_init(&object->renderer, outer, &CLSID_NullRenderer, L"In", &renderer_ops); - object->run_event = CreateEventW(NULL, TRUE, FALSE, NULL); TRACE("Created null renderer %p.\n", object); *out = &object->renderer.filter.IUnknown_inner; diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index ed5774bf484..1da5ad02d7a 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -48,8 +48,6 @@ struct video_renderer LONG FullScreenMode; DWORD saved_style; - - HANDLE run_event; }; static inline struct video_renderer *impl_from_video_window(struct video_window *iface) @@ -106,7 +104,7 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa if (filter->renderer.filter.state == State_Paused) { - const HANDLE events[2] = {filter->run_event, filter->renderer.flush_event}; + const HANDLE events[2] = {filter->renderer.run_event, filter->renderer.flush_event}; SetEvent(filter->renderer.state_event); LeaveCriticalSection(&filter->renderer.filter.stream_cs); @@ -140,7 +138,6 @@ static void video_renderer_destroy(struct strmbase_renderer *iface) struct video_renderer *filter = impl_from_strmbase_renderer(iface); video_window_cleanup(&filter->window); - CloseHandle(filter->run_event); strmbase_renderer_cleanup(&filter->renderer); free(filter); @@ -179,7 +176,7 @@ static void video_renderer_start_stream(struct strmbase_renderer *iface) { struct video_renderer *filter = impl_from_strmbase_renderer(iface); - SetEvent(filter->run_event); + SetEvent(filter->renderer.run_event); } static void video_renderer_stop_stream(struct strmbase_renderer *iface) @@ -192,7 +189,7 @@ static void video_renderer_stop_stream(struct strmbase_renderer *iface) /* Black it out */ RedrawWindow(This->window.hwnd, NULL, NULL, RDW_INVALIDATE | RDW_ERASE); - ResetEvent(This->run_event); + ResetEvent(This->renderer.run_event); } static void video_renderer_init_stream(struct strmbase_renderer *iface) @@ -519,8 +516,6 @@ HRESULT video_renderer_create(IUnknown *outer, IUnknown **out) return hr; } - object->run_event = CreateEventW(NULL, TRUE, FALSE, NULL); - TRACE("Created video renderer %p.\n", object); *out = &object->renderer.filter.IUnknown_inner; return S_OK; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index c748e674081..7e0edc57f61 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -108,8 +108,6 @@ struct quartz_vmr LONG VideoWidth; LONG VideoHeight; VMR9AspectRatioMode aspect_mode; - - HANDLE run_event; }; static inline BOOL is_vmr9(const struct quartz_vmr *filter) @@ -211,7 +209,7 @@ static inline struct quartz_vmr *impl_from_IBaseFilter(IBaseFilter *iface) static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *sample) { struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); - const HANDLE events[2] = {filter->run_event, filter->renderer.flush_event}; + const HANDLE events[2] = {filter->renderer.run_event, filter->renderer.flush_event}; unsigned int data_size, width, depth, src_pitch; const BITMAPINFOHEADER *bitmap_header; REFERENCE_TIME start_time, end_time; @@ -486,7 +484,7 @@ static void vmr_start_stream(struct strmbase_renderer *iface) struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); IVMRImagePresenter9_StartPresenting(filter->presenter, filter->cookie); - SetEvent(filter->run_event); + SetEvent(filter->renderer.run_event); } static void vmr_stop_stream(struct strmbase_renderer *iface) @@ -497,7 +495,7 @@ static void vmr_stop_stream(struct strmbase_renderer *iface) if (This->renderer.filter.state == State_Running) IVMRImagePresenter9_StopPresenting(This->presenter, This->cookie); - ResetEvent(This->run_event); + ResetEvent(This->renderer.run_event); } static HRESULT vmr_connect(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) @@ -585,7 +583,6 @@ static void vmr_destroy(struct strmbase_renderer *iface) filter->allocator_d3d9_dev = NULL; } - CloseHandle(filter->run_event); FreeLibrary(filter->hD3d9); strmbase_renderer_cleanup(&filter->renderer); if (!filter->IVMRSurfaceAllocatorNotify9_refcount) @@ -2610,8 +2607,6 @@ static HRESULT vmr_create(IUnknown *outer, IUnknown **out, const CLSID *clsid) return hr; } - object->run_event = CreateEventW(NULL, TRUE, FALSE, NULL); - object->mixing_prefs = MixerPref9_NoDecimation | MixerPref9_ARAdjustXorY | MixerPref9_BiLinearFiltering | MixerPref9_RenderTargetRGB; diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index b384ea991d9..0978f7305c8 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -554,6 +554,7 @@ void strmbase_renderer_cleanup(struct strmbase_renderer *filter) CloseHandle(filter->state_event); CloseHandle(filter->advise_event); + CloseHandle(filter->run_event); CloseHandle(filter->flush_event); strmbase_filter_cleanup(&filter->filter); } @@ -573,5 +574,6 @@ void strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer, filter->state_event = CreateEventW(NULL, TRUE, TRUE, NULL); filter->advise_event = CreateEventW(NULL, FALSE, FALSE, NULL); + filter->run_event = CreateEventW(NULL, TRUE, FALSE, NULL); filter->flush_event = CreateEventW(NULL, TRUE, TRUE, NULL); } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index e902790ecb1..76caf103dee 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -286,6 +286,9 @@ struct strmbase_renderer /* Signaled when the sample presentation time occurs. The streaming thread * waits for this event in Receive() if applicable. */ HANDLE advise_event; + /* Signaled when the filter is running. The streaming thread waits for this + * event in Receive() while paused. */ + HANDLE run_event; /* Signaled when a flush or state change occurs, i.e. anything that needs * to immediately unblock the streaming thread. */ HANDLE flush_event;

1 0

Zebediah Figura : quartz: Move the current sample tracking back to strmbase.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: bcfa8f413b24579bda0538fe5e5119c257665d4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcfa8f413b24579bda0538fe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 10 19:23:34 2021 -0600 quartz: Move the current sample tracking back to strmbase. Only the video renderer uses this, but we'd like to deduplicate the wait-on-preroll behaviour. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 9 ++------- dlls/strmbase/renderer.c | 4 ++++ include/wine/strmbase.h | 2 ++ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index a925340a676..ed5774bf484 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -50,7 +50,6 @@ struct video_renderer DWORD saved_style; HANDLE run_event; - IMediaSample *current_sample; }; static inline struct video_renderer *impl_from_video_window(struct video_window *iface) @@ -109,14 +108,10 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa { const HANDLE events[2] = {filter->run_event, filter->renderer.flush_event}; - filter->current_sample = pSample; - SetEvent(filter->renderer.state_event); LeaveCriticalSection(&filter->renderer.filter.stream_cs); WaitForMultipleObjects(2, events, FALSE, INFINITE); EnterCriticalSection(&filter->renderer.filter.stream_cs); - - filter->current_sample = NULL; } return S_OK; @@ -276,7 +271,7 @@ static HRESULT video_renderer_get_current_image(struct video_window *iface, LONG return VFW_E_NOT_PAUSED; } - if (!filter->current_sample) + if (!filter->renderer.current_sample) { LeaveCriticalSection(&filter->renderer.filter.stream_cs); return E_UNEXPECTED; @@ -289,7 +284,7 @@ static HRESULT video_renderer_get_current_image(struct video_window *iface, LONG } memcpy(image, bih, sizeof(BITMAPINFOHEADER)); - IMediaSample_GetPointer(filter->current_sample, &sample_data); + IMediaSample_GetPointer(filter->renderer.current_sample, &sample_data); memcpy((char *)image + sizeof(BITMAPINFOHEADER), sample_data, image_size); LeaveCriticalSection(&filter->renderer.filter.stream_cs); diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 47017f5ced5..b384ea991d9 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -353,7 +353,11 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp } if (state == State_Paused) + { + filter->current_sample = sample; hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); + filter->current_sample = NULL; + } if (need_wait) { diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 4b5ecc86721..e902790ecb1 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -291,6 +291,8 @@ struct strmbase_renderer HANDLE flush_event; REFERENCE_TIME stream_start; + IMediaSample *current_sample; + IQualityControl *qc_sink; REFERENCE_TIME last_left, avg_duration, avg_pt; double avg_rate;

1 0

Brendan Shanks : winemac.drv: Fix crash when building against Metal-capable SDK but running on older OS X.
by Alexandre Julliard 11 Mar '21

11 Mar '21

Module: wine Branch: master Commit: d52c4eb00ca0a0374bef81a1d794026f41399b19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d52c4eb00ca0a0374bef81a1… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Mar 10 15:25:20 2021 -0800 winemac.drv: Fix crash when building against Metal-capable SDK but running on older OS X. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50790 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_display.m | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index 7cc6f981fee..05f1c75d53b 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -348,10 +348,15 @@ static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gp int ret = -1; NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + /* Test if Metal is available */ + if (&CGDirectDisplayCopyCurrentMetalDevice == NULL) + goto done; + device = [CGDirectDisplayCopyCurrentMetalDevice(display_id) autorelease]; if (device && [device respondsToSelector:@selector(registryID)]) ret = macdrv_get_gpu_info_from_registry_id(gpu, device.registryID); +done: [pool release]; return ret; }

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 March 2021