July 2020 - Wine-Commits - list.winehq.org

Shawn M. Chapla : gdiplus: Use GenericFontFamilySansSerif when missing deserialized font family.
by Alexandre Julliard July 20, 2020

July 20, 2020

Module: wine Branch: master Commit: a9151e2e2bf113fb3ad9a0a27ee8302a0dc5b3a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9151e2e2bf113fb3ad9a0a2… Author: Shawn M. Chapla <schapla(a)codeweavers.com> Date: Fri Jul 17 20:50:51 2020 -0400 gdiplus: Use GenericFontFamilySansSerif when missing deserialized font family. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 7 ++++++- dlls/gdiplus/tests/metafile.c | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index cedffb23ca..d6bcbb5c12 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -2440,8 +2440,13 @@ static GpStatus METAFILE_PlaybackObject(GpMetafile *metafile, UINT flags, UINT d status = GdipCreateFontFamilyFromName(familyname, NULL, &family); GdipFree(familyname); + + /* If a font family cannot be created from family name, native + falls back to a sans serif font. */ if (status != Ok) - return InvalidParameter; + status = GdipGetGenericFontFamilySansSerif(&family); + if (status != Ok) + return status; status = GdipCreateFont(family, data->EmSize, data->FontStyleFlags, data->SizeUnit, (GpFont **)&object); GdipDeleteFontFamily(family); diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 9fa60098e6..8179e1a5fd 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -3060,8 +3060,8 @@ static void test_drawdriverstring(void) static const emfplus_record unknownfontdecode_records[] = { { EMR_HEADER }, { EmfPlusRecordTypeHeader }, - { EmfPlusRecordTypeObject, ObjectTypeFont << 8, 0, 1 }, - { EmfPlusRecordTypeDrawDriverString, 0x8000, 0, 1 }, + { EmfPlusRecordTypeObject, ObjectTypeFont << 8 }, + { EmfPlusRecordTypeDrawDriverString, 0x8000 }, { EmfPlusRecordTypeEndOfFile }, { EMR_EOF }, { 0 }

1 0

Zebediah Figura : ntdll/tests: Remove some unnecessary checks in test_query_logicalprocex().
by Alexandre Julliard July 20, 2020

July 20, 2020

Module: wine Branch: master Commit: 17785690c047d507d8031aced658b716969e8668 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17785690c047d507d8031ace… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 17 19:12:33 2020 -0500 ntdll/tests: Remove some unnecessary checks in test_query_logicalprocex(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 277 ++++++++++++++++++++++-------------------------- 1 file changed, 124 insertions(+), 153 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=17785690c047d507d803…

1 0

Alexandre Julliard : Wine release 5.13
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: website Branch: master Commit: 14bb02500b09e78e51359f2be65edf058d41458c URL: https://source.winehq.org/git/website.git/?a=commit;h=14bb02500b09e78e51359… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 17 23:31:02 2020 +0200 Wine release 5.13 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020071701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2020071701.xml b/news/en/2020071701.xml new file mode 100644 index 00000000..5cacdd6d --- /dev/null +++ b/news/en/2020071701.xml @@ -0,0 +1,16 @@ +<news> +<date>July 17, 2020</date> +<title>Wine 5.13 Released</title> +<body> + The Wine development release 5.13 is now available. + <a href="{$root}/announce/5.13">What's new</a> in this release: +<ul> + <li>Re-mapping of INI files to the registry.</li> + <li>System call thunks in NTDLL.</li> + <li>Reimplementation of floating point numbers printing.</li> + <li>Beginnings of a restructuration of the console support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.x/wine-5.13.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Piotr Caban : comctl32: Compute border size from client and window rectangles.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 659b0d7017cc899a4858cc5d3bd3c63befdc180d URL: https://source.winehq.org/git/wine.git/?a=commit;h=659b0d7017cc899a4858cc5d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 17 16:17:24 2020 +0200 comctl32: Compute border size from client and window rectangles. Fixes toolbar size when WS_EX_DLGMODALFRAME is used. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/toolbar.c | 26 ++++++++++++++++++++++---- dlls/comctl32/toolbar.c | 22 ++++++++++++---------- 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 3688394d71..f973d9cfff 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -434,18 +434,23 @@ static void basic_test(void) DestroyWindow(hToolbar); } -static void rebuild_toolbar(HWND *hToolbar) +static void rebuild_toolbar_ex(HWND *hToolbar, DWORD exstyle) { if (*hToolbar) DestroyWindow(*hToolbar); - *hToolbar = CreateWindowExA(0, TOOLBARCLASSNAMEA, NULL, WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, - hMainWnd, (HMENU)5, GetModuleHandleA(NULL), NULL); + *hToolbar = CreateWindowExA(exstyle, TOOLBARCLASSNAMEA, NULL, WS_CHILD | WS_VISIBLE, + 0, 0, 0, 0, hMainWnd, (HMENU)5, GetModuleHandleA(NULL), NULL); ok(*hToolbar != NULL, "Toolbar creation problem\n"); ok(SendMessageA(*hToolbar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0) == 0, "TB_BUTTONSTRUCTSIZE failed\n"); ok(SendMessageA(*hToolbar, TB_AUTOSIZE, 0, 0) == 0, "TB_AUTOSIZE failed\n"); ok(SendMessageA(*hToolbar, WM_SETFONT, (WPARAM)GetStockObject(SYSTEM_FONT), 0)==1, "WM_SETFONT\n"); } +static void rebuild_toolbar(HWND *hToolbar) +{ + rebuild_toolbar_ex(hToolbar, 0); +} + static void rebuild_toolbar_with_buttons(HWND *hToolbar) { TBBUTTON buttons[5]; @@ -1022,7 +1027,7 @@ static void tbsize_addbutton(tbsize_result_t *tbsr, int left, int top, int right static tbsize_result_t *tbsize_results; -#define tbsize_results_num 28 +#define tbsize_results_num 29 static void init_tbsize_results(void) { int fontheight = system_font_height(); @@ -1277,6 +1282,9 @@ static void init_tbsize_results(void) { tbsize_results[27] = init_tbsize_result(1, 0, 0, 672, 42, 67, 40); tbsize_addbutton(&tbsize_results[27], 0, 2, 40, 24); + + tbsize_results[28] = init_tbsize_result(1, 0, 0, 672, 42, 67, 40); + tbsize_addbutton(&tbsize_results[28], 0, 2, 23, 24); } static void free_tbsize_results(void) { @@ -1360,6 +1368,7 @@ static void test_sizes(void) int style; int i; int fontheight = system_font_height(); + RECT rect; init_tbsize_results(); @@ -1631,6 +1640,15 @@ static void test_sizes(void) SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0 ); check_sizes(); + /* Toolbar with borders around client area */ + rebuild_toolbar_ex(&hToolbar, WS_EX_DLGMODALFRAME); + SetWindowLongA(hToolbar, GWL_STYLE, CCS_NODIVIDER | GetWindowLongA(hToolbar, GWL_STYLE)); + SendMessageA(hToolbar, TB_ADDBUTTONSA, 1, (LPARAM)buttons1); + check_sizes(); + GetClientRect(hToolbar, &rect); + ok(rect.top == 0, "rect.top = %d\n", rect.top); + ok(rect.bottom == 26, "rect.bottom = %d\n", rect.bottom); + free_tbsize_results(); DestroyWindow(hToolbar); } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index b869cc4d7b..b2711a3eb8 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3069,7 +3069,7 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) if (!(infoPtr->dwStyle & CCS_NORESIZE)) { - RECT window_rect, parent_rect; + RECT window_rect, client_rect, parent_rect, border; UINT uPosFlags = SWP_NOZORDER | SWP_NOACTIVATE; HWND parent; INT x, y, cx, cy; @@ -3079,6 +3079,13 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) if (!parent || !infoPtr->bDoRedraw) return 0; + GetWindowRect(infoPtr->hwndSelf, &window_rect); + GetClientRect(infoPtr->hwndSelf, &client_rect); + border = window_rect; + MapWindowPoints(0, infoPtr->hwndSelf, (POINT *)&border, 2); + border.right -= border.left + client_rect.right - client_rect.left; + border.bottom -= border.top + client_rect.bottom - client_rect.top; + GetClientRect(parent, &parent_rect); x = parent_rect.left; @@ -3089,15 +3096,11 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) if ((infoPtr->dwStyle & CCS_BOTTOM) == CCS_NOMOVEY) { - GetWindowRect(infoPtr->hwndSelf, &window_rect); MapWindowPoints( 0, parent, (POINT *)&window_rect, 2 ); y = window_rect.top; } if ((infoPtr->dwStyle & CCS_BOTTOM) == CCS_BOTTOM) - { - GetWindowRect(infoPtr->hwndSelf, &window_rect); y = parent_rect.bottom - ( window_rect.bottom - window_rect.top); - } if (infoPtr->dwStyle & CCS_NOPARENTALIGN) uPosFlags |= SWP_NOMOVE; @@ -3105,11 +3108,10 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) if (!(infoPtr->dwStyle & CCS_NODIVIDER)) cy += GetSystemMetrics(SM_CYEDGE); - if (infoPtr->dwStyle & WS_BORDER) - { - cx += 2 * GetSystemMetrics(SM_CXBORDER); - cy += 2 * GetSystemMetrics(SM_CYBORDER); - } + x += border.left; + y += border.top; + cx += border.right; + cy += border.bottom; SetWindowPos(infoPtr->hwndSelf, NULL, x, y, cx, cy, uPosFlags); }

1 0

Alexandre Julliard : Release 5.13.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 536aec511612afd002808508d76bd5640f359f25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=536aec511612afd002808508… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 17 23:29:13 2020 +0200 Release 5.13. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .mailmap | 1 + ANNOUNCE | 952 ++++++++++++++++++++++++++++++++------------------------------ AUTHORS | 4 +- VERSION | 2 +- configure | 18 +- 5 files changed, 509 insertions(+), 468 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=536aec511612afd00280…

1 0

Zebediah Figura : quartz/dsoundrender: Do not send quality messages.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: f6f1983be8c332911bf45277650f9f401a56e7f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6f1983be8c332911bf45277… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 17 14:51:21 2020 -0500 quartz/dsoundrender: Do not send quality messages. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 18 +----------------- dlls/quartz/tests/dsoundrender.c | 8 ++++++++ 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 225c1e07b9..fba206ecb6 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -360,23 +360,7 @@ static HRESULT WINAPI DSoundRender_DoRenderSample(struct strmbase_renderer *ifac cbSrcStream = IMediaSample_GetActualDataLength(pSample); TRACE("Sample data ptr = %p, size = %d\n", pbSrcStream, cbSrcStream); - hr = DSoundRender_SendSampleData(This, tStart, tStop, pbSrcStream, cbSrcStream); - if (This->renderer.filter.state == State_Running && This->renderer.filter.clock && tStart >= 0) { - REFERENCE_TIME jitter, now = 0; - Quality q; - IReferenceClock_GetTime(This->renderer.filter.clock, &now); - jitter = now - This->renderer.stream_start - tStart; - if (jitter <= -DSoundRenderer_Max_Fill) - jitter += DSoundRenderer_Max_Fill; - else if (jitter < 0) - jitter = 0; - q.Type = (jitter > 0 ? Famine : Flood); - q.Proportion = 1000; - q.Late = jitter; - q.TimeStamp = tStart; - IQualityControl_Notify((IQualityControl *)This->renderer.qcimpl, &This->renderer.filter.IBaseFilter_iface, q); - } - return hr; + return DSoundRender_SendSampleData(This, tStart, tStop, pbSrcStream, cbSrcStream); } static HRESULT WINAPI DSoundRender_CheckMediaType(struct strmbase_renderer *iface, const AM_MEDIA_TYPE * pmt) diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index 35f935bcad..0e7fed4c25 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -613,6 +613,13 @@ static const struct strmbase_filter_ops testfilter_ops = .filter_destroy = testfilter_destroy, }; +static HRESULT testsource_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) +{ + todo_wine_if (IsEqualGUID(iid, &IID_IQualityControl)) + ok(!IsEqualGUID(iid, &IID_IQualityControl), "Unexpected query for IQualityControl.\n"); + return E_NOINTERFACE; +} + static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, IMemInputPin *peer, IMemAllocator **allocator) { @@ -621,6 +628,7 @@ static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, static const struct strmbase_source_ops testsource_ops = { + .base.pin_query_interface = testsource_query_interface, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = testsource_DecideAllocator, };

1 0

Jacek Caban : ntdll: Always use GNU _CI* functions implementation on clang.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 180f7cf412c486a4f2f769b44c0ccf1223226ee3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=180f7cf412c486a4f2f769b4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 17 16:10:50 2020 +0200 ntdll: Always use GNU _CI* functions implementation on clang. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 6960b52dcb..4b7bb2296d 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -158,7 +158,7 @@ double CDECL tan( double d ) return unix_funcs->tan( d ); } -#if defined(__GNUC__) && defined(__i386__) +#if (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) #define FPU_DOUBLE(var) double var; \ __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var) : ) @@ -220,7 +220,7 @@ LONGLONG CDECL _ftol(void) return (LONGLONG)x; } -#endif /* defined(__GNUC__) && defined(__i386__) */ +#endif /* (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) */ static void NTDLL_mergesort( void *arr, void *barr, size_t elemsize, int(__cdecl *compar)(const void *, const void *),

1 0

Gijs Vermeulen : qdvd: Add a stub IDvdControl2 interface.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: b9261c0f7822edc9d4284a35a518eb4811cb3b2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9261c0f7822edc9d4284a35… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Jul 17 21:50:20 2020 +0200 qdvd: Add a stub IDvdControl2 interface. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qdvd/navigator.c | 453 ++++++++++++++++++++++++++++++++++++++++++++ dlls/qdvd/tests/navigator.c | 2 +- 2 files changed, 454 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b9261c0f7822edc9d428…

1 0

Gijs Vermeulen : qdvd: Add a stub dvd navigator filter.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 36d5ec90572ec4691ade99b97600a1ab54b3c9b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36d5ec90572ec4691ade99b9… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Jul 17 21:50:19 2020 +0200 qdvd: Add a stub dvd navigator filter. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qdvd/Makefile.in | 3 +- dlls/qdvd/navigator.c | 67 ++++++++++++++++ dlls/qdvd/qdvd_classes.idl | 7 ++ dlls/qdvd/qdvd_main.c | 3 + dlls/qdvd/qdvd_private.h | 1 + dlls/qdvd/tests/Makefile.in | 3 +- dlls/qdvd/tests/navigator.c | 191 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 273 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=36d5ec90572ec4691ade…

1 0

Zebediah Figura : strmbase: Get rid of the QualityControlImpl typedef.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: a881a730b0624637814a419e30215dde94b7a81d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a881a730b0624637814a419e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 17 14:51:22 2020 -0500 strmbase: Get rid of the QualityControlImpl typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/qualitycontrol.c | 32 ++++++++++++++++---------------- dlls/strmbase/strmbase_private.h | 17 +++++++++-------- include/wine/strmbase.h | 2 +- 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index 763108d46a..918757caa8 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -27,10 +27,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase_qc); -HRESULT QualityControlImpl_Create(struct strmbase_pin *pin, QualityControlImpl **ppv) +HRESULT QualityControlImpl_Create(struct strmbase_pin *pin, struct strmbase_qc **ppv) { - QualityControlImpl *This; - *ppv = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(QualityControlImpl)); + struct strmbase_qc *This; + *ppv = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(struct strmbase_qc)); if (!*ppv) return E_OUTOFMEMORY; This = *ppv; @@ -41,37 +41,37 @@ HRESULT QualityControlImpl_Create(struct strmbase_pin *pin, QualityControlImpl * return S_OK; } -void QualityControlImpl_Destroy(QualityControlImpl *This) +void QualityControlImpl_Destroy(struct strmbase_qc *This) { HeapFree(GetProcessHeap(),0,This); } -static inline QualityControlImpl *impl_from_IQualityControl(IQualityControl *iface) +static inline struct strmbase_qc *impl_from_IQualityControl(IQualityControl *iface) { - return CONTAINING_RECORD(iface, QualityControlImpl, IQualityControl_iface); + return CONTAINING_RECORD(iface, struct strmbase_qc, IQualityControl_iface); } HRESULT WINAPI QualityControlImpl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv) { - QualityControlImpl *This = impl_from_IQualityControl(iface); + struct strmbase_qc *This = impl_from_IQualityControl(iface); return IBaseFilter_QueryInterface(&This->pin->filter->IBaseFilter_iface, riid, ppv); } ULONG WINAPI QualityControlImpl_AddRef(IQualityControl *iface) { - QualityControlImpl *This = impl_from_IQualityControl(iface); + struct strmbase_qc *This = impl_from_IQualityControl(iface); return IBaseFilter_AddRef(&This->pin->filter->IBaseFilter_iface); } ULONG WINAPI QualityControlImpl_Release(IQualityControl *iface) { - QualityControlImpl *This = impl_from_IQualityControl(iface); + struct strmbase_qc *This = impl_from_IQualityControl(iface); return IBaseFilter_Release(&This->pin->filter->IBaseFilter_iface); } HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) { - QualityControlImpl *This = impl_from_IQualityControl(iface); + struct strmbase_qc *This = impl_from_IQualityControl(iface); HRESULT hr = S_FALSE; TRACE("iface %p, sender %p, type %#x, proportion %u, late %s, timestamp %s.\n", @@ -96,7 +96,7 @@ HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *se HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityControl *tonotify) { - QualityControlImpl *This = impl_from_IQualityControl(iface); + struct strmbase_qc *This = impl_from_IQualityControl(iface); TRACE("%p %p\n", This, tonotify); This->tonotify = tonotify; return S_OK; @@ -114,7 +114,7 @@ HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityContro #define UPDATE_RUNNING_AVG_P(avg,val) DO_RUNNING_AVG(avg,val,16) #define UPDATE_RUNNING_AVG_N(avg,val) DO_RUNNING_AVG(avg,val,4) -void QualityControlRender_Start(QualityControlImpl *This, REFERENCE_TIME tStart) +void QualityControlRender_Start(struct strmbase_qc *This, REFERENCE_TIME tStart) { This->avg_render = This->last_in_time = This->last_left = This->avg_duration = This->avg_pt = -1; This->clockstart = tStart; @@ -124,7 +124,7 @@ void QualityControlRender_Start(QualityControlImpl *This, REFERENCE_TIME tStart) This->qos_handled = TRUE; /* Lie that will be corrected on first adjustment */ } -static BOOL QualityControlRender_IsLate(QualityControlImpl *This, REFERENCE_TIME jitter, +static BOOL QualityControlRender_IsLate(struct strmbase_qc *This, REFERENCE_TIME jitter, REFERENCE_TIME start, REFERENCE_TIME stop) { REFERENCE_TIME max_lateness = 200000; @@ -153,7 +153,7 @@ static BOOL QualityControlRender_IsLate(QualityControlImpl *This, REFERENCE_TIME return FALSE; } -void QualityControlRender_DoQOS(QualityControlImpl *priv) +void QualityControlRender_DoQOS(struct strmbase_qc *priv) { REFERENCE_TIME start, stop, jitter, pt, entered, left, duration; double rate; @@ -266,7 +266,7 @@ void QualityControlRender_DoQOS(QualityControlImpl *priv) } -void QualityControlRender_BeginRender(QualityControlImpl *This, REFERENCE_TIME start, REFERENCE_TIME stop) +void QualityControlRender_BeginRender(struct strmbase_qc *This, REFERENCE_TIME start, REFERENCE_TIME stop) { This->start = -1; @@ -299,7 +299,7 @@ void QualityControlRender_BeginRender(QualityControlImpl *This, REFERENCE_TIME s TRACE("Starting at %s.\n", debugstr_time(This->start)); } -void QualityControlRender_EndRender(QualityControlImpl *This) +void QualityControlRender_EndRender(struct strmbase_qc *This) { REFERENCE_TIME elapsed; diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h index 0a23592bd2..8df1cac71e 100644 --- a/dlls/strmbase/strmbase_private.h +++ b/dlls/strmbase/strmbase_private.h @@ -54,7 +54,8 @@ static inline const char *debugstr_time(REFERENCE_TIME time) } /* Quality Control */ -typedef struct QualityControlImpl { +struct strmbase_qc +{ IQualityControl IQualityControl_iface; struct strmbase_pin *pin; IQualityControl *tonotify; @@ -65,20 +66,20 @@ typedef struct QualityControlImpl { double avg_rate; LONG64 rendered, dropped; BOOL qos_handled, is_dropped; -} QualityControlImpl; +}; -HRESULT QualityControlImpl_Create(struct strmbase_pin *pin, QualityControlImpl **out); -void QualityControlImpl_Destroy(QualityControlImpl *This); +HRESULT QualityControlImpl_Create(struct strmbase_pin *pin, struct strmbase_qc **out); +void QualityControlImpl_Destroy(struct strmbase_qc *qc); HRESULT WINAPI QualityControlImpl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv); ULONG WINAPI QualityControlImpl_AddRef(IQualityControl *iface); ULONG WINAPI QualityControlImpl_Release(IQualityControl *iface); HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm); HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityControl *tonotify); -void QualityControlRender_Start(QualityControlImpl *This, REFERENCE_TIME tStart); -void QualityControlRender_DoQOS(QualityControlImpl *priv); -void QualityControlRender_BeginRender(QualityControlImpl *This, REFERENCE_TIME start, REFERENCE_TIME stop); -void QualityControlRender_EndRender(QualityControlImpl *This); +void QualityControlRender_Start(struct strmbase_qc *This, REFERENCE_TIME tStart); +void QualityControlRender_DoQOS(struct strmbase_qc *priv); +void QualityControlRender_BeginRender(struct strmbase_qc *This, REFERENCE_TIME start, REFERENCE_TIME stop); +void QualityControlRender_EndRender(struct strmbase_qc *This); void strmbase_passthrough_update_time(struct strmbase_passthrough *passthrough, REFERENCE_TIME time); void strmbase_passthrough_invalidate_time(struct strmbase_passthrough *passthrough); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 02a5469de1..b0fa68ecf1 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -291,7 +291,7 @@ struct strmbase_renderer REFERENCE_TIME stream_start; IQualityControl *pQSink; - struct QualityControlImpl *qcimpl; + struct strmbase_qc *qcimpl; const struct strmbase_renderer_ops *pFuncsTable;

1 0