November 2020 - Wine-commits

Zebediah Figura : quartz/avidec: Don't copy the media time to the output sample.
by Alexandre Julliard 20 Nov '20

20 Nov '20

Module: wine Branch: master Commit: cd3b23c13ce98631432782942e633af441073e62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd3b23c13ce9863143278294… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 19 17:24:14 2020 -0600 quartz/avidec: Don't copy the media time to the output sample. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avidec.c | 5 ----- dlls/quartz/tests/avidec.c | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 4995276dbfc..77d2b5e2aa5 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -204,11 +204,6 @@ static HRESULT WINAPI avi_decompressor_sink_Receive(struct strmbase_sink *iface, else IMediaSample_SetTime(pOutSample, NULL, NULL); - if (IMediaSample_GetMediaTime(pSample, &tStart, &tStop) == S_OK) - IMediaSample_SetMediaTime(pOutSample, &tStart, &tStop); - else - IMediaSample_SetMediaTime(pOutSample, NULL, NULL); - hr = IMemInputPin_Receive(This->source.pMemInputPin, pOutSample); if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) ERR("Error sending sample (%x)\n", hr); diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index ac1e245c9e6..b9bca9b02ef 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -911,7 +911,7 @@ static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample } hr = IMediaSample_GetMediaTime(sample, &start, &stop); - todo_wine ok(hr == VFW_E_MEDIA_TIME_NOT_SET, "Got hr %#x.\n", hr); + ok(hr == VFW_E_MEDIA_TIME_NOT_SET, "Got hr %#x.\n", hr); hr = IMediaSample_IsDiscontinuity(sample); todo_wine_if (testmode == 5) ok(hr == (testmode == 4) ? S_OK : S_FALSE, "Got hr %#x.\n", hr); hr = IMediaSample_IsPreroll(sample);

1 0

Zebediah Figura : quartz/tests: Add some tests for streaming events on the AVI decoder.
by Alexandre Julliard 20 Nov '20

20 Nov '20

Module: wine Branch: master Commit: 48552496a4eff93c3830012a27295203abfff130 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48552496a4eff93c3830012a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 19 17:24:15 2020 -0600 quartz/tests: Add some tests for streaming events on the AVI decoder. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avidec.c | 120 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 117 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index b9bca9b02ef..71f974806ea 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -116,8 +116,9 @@ static LRESULT CALLBACK vfw_driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, BITMAPINFOHEADER *out = (BITMAPINFOHEADER *)lparam2; BITMAPINFOHEADER *in = (BITMAPINFOHEADER *)lparam1; - ok(!memcmp(in, &sink_bitmap_info, sizeof(BITMAPINFOHEADER)), - "Input types didn't match.\n"); + todo_wine_if (in->biSizeImage != sink_bitmap_info.biSizeImage) + ok(!memcmp(in, &sink_bitmap_info, sizeof(BITMAPINFOHEADER)), + "Input types didn't match.\n"); todo_wine ok(!memcmp(out, &source_bitmap_info, sizeof(BITMAPINFOHEADER)), "Output types didn't match.\n"); ok(!in_begin, "Got multiple ICM_DECOMPRESS_BEGIN messages.\n"); @@ -796,7 +797,7 @@ struct testfilter struct strmbase_source source; struct strmbase_sink sink; const AM_MEDIA_TYPE *mt; - unsigned int got_sample; + unsigned int got_sample, got_new_segment, got_eos, got_begin_flush, got_end_flush; }; static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -922,12 +923,48 @@ static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample return S_OK; } +static HRESULT testsink_new_segment(struct strmbase_sink *iface, + REFERENCE_TIME start, REFERENCE_TIME stop, double rate) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + ++filter->got_new_segment; + ok(start == 10000, "Got start %s.\n", wine_dbgstr_longlong(start)); + ok(stop == 20000, "Got stop %s.\n", wine_dbgstr_longlong(stop)); + ok(rate == 1.0, "Got rate %.16e.\n", rate); + return S_OK; +} + +static HRESULT testsink_eos(struct strmbase_sink *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + ++filter->got_eos; + return S_OK; +} + +static HRESULT testsink_begin_flush(struct strmbase_sink *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + ++filter->got_begin_flush; + return S_OK; +} + +static HRESULT testsink_end_flush(struct strmbase_sink *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + ++filter->got_end_flush; + return S_OK; +} + static const struct strmbase_sink_ops testsink_ops = { .base.pin_query_interface = testsink_query_interface, .base.pin_query_accept = testsink_query_accept, .base.pin_get_media_type = testsink_get_media_type, .pfnReceive = testsink_Receive, + .sink_new_segment = testsink_new_segment, + .sink_eos = testsink_eos, + .sink_begin_flush = testsink_begin_flush, + .sink_end_flush = testsink_end_flush, }; static void testfilter_init(struct testfilter *filter) @@ -1102,6 +1139,82 @@ static void test_sample_processing(IMediaControl *control, IMemInputPin *input, IMemAllocator_Release(allocator); } +static void test_streaming_events(IMediaControl *control, IPin *sink, + IMemInputPin *input, struct testfilter *testsink) +{ + IMemAllocator *allocator; + IMediaSample *sample; + HRESULT hr; + BYTE *data; + LONG i; + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemInputPin_GetAllocator(input, &allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemAllocator_Commit(allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaSample_GetPointer(sample, &data); + ok(hr == S_OK, "Got hr %#x.\n", hr); + for (i = 0; i < 200; ++i) + data[i] = i; + hr = IMediaSample_SetActualDataLength(sample, 200); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaSample_SetSyncPoint(sample, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(!testsink->got_new_segment, "Got %u calls to IPin::NewSegment().\n", testsink->got_new_segment); + hr = IPin_NewSegment(sink, 10000, 20000, 1.0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(testsink->got_new_segment == 1, "Got %u calls to IPin::NewSegment().\n", testsink->got_new_segment); + + ok(!testsink->got_eos, "Got %u calls to IPin::EndOfStream().\n", testsink->got_eos); + hr = IPin_EndOfStream(sink); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(!testsink->got_sample, "Got %u calls to Receive().\n", testsink->got_sample); + ok(testsink->got_eos == 1, "Got %u calls to IPin::EndOfStream().\n", testsink->got_eos); + testsink->got_eos = 0; + + hr = IPin_EndOfStream(sink); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(testsink->got_eos == 1, "Got %u calls to IPin::EndOfStream().\n", testsink->got_eos); + + testmode = 0; + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(testsink->got_sample == 1, "Got %u calls to Receive().\n", testsink->got_sample); + testsink->got_sample = 0; + + ok(!testsink->got_begin_flush, "Got %u calls to IPin::BeginFlush().\n", testsink->got_begin_flush); + hr = IPin_BeginFlush(sink); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(testsink->got_begin_flush == 1, "Got %u calls to IPin::BeginFlush().\n", testsink->got_begin_flush); + + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IPin_EndOfStream(sink); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + ok(!testsink->got_end_flush, "Got %u calls to IPin::EndFlush().\n", testsink->got_end_flush); + hr = IPin_EndFlush(sink); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(testsink->got_end_flush == 1, "Got %u calls to IPin::EndFlush().\n", testsink->got_end_flush); + + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(testsink->got_sample == 1, "Got %u calls to Receive().\n", testsink->got_sample); + testsink->got_sample = 0; + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMediaSample_Release(sample); + IMemAllocator_Release(allocator); +} + static void test_connect_pin(void) { VIDEOINFOHEADER req_format = @@ -1312,6 +1425,7 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#x.\n", hr); test_sample_processing(control, meminput, &testsink); + test_streaming_events(control, sink, meminput, &testsink); hr = IFilterGraph2_Disconnect(graph, source); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Alexandre Julliard : msvcrt/tests: Remove the headers test.
by Alexandre Julliard 20 Nov '20

20 Nov '20

Module: wine Branch: master Commit: 86b0a633c68dfceb884a74528c407ba359f10991 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86b0a633c68dfceb884a7452… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 20 10:12:15 2020 +0100 msvcrt/tests: Remove the headers test. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 18 -- dlls/msvcrt/tests/Makefile.in | 2 - dlls/msvcrt/tests/headers.c | 471 ------------------------------------------ include/msvcrt/eh.h | 2 +- 4 files changed, 1 insertion(+), 492 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=86b0a633c68dfceb884a…

1 0

Alexandre Julliard : msvcrt: Avoid msvcrt-specific types in the Unix library interface.
by Alexandre Julliard 20 Nov '20

20 Nov '20

Module: wine Branch: master Commit: 8ecd9afc89269c3506f30585b92bbcce52dee4ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ecd9afc89269c3506f30585… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 20 11:20:04 2020 +0100 msvcrt: Avoid msvcrt-specific types in the Unix library interface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/unixlib.c | 18 +++++++++--------- dlls/msvcrt/unixlib.h | 20 +++++++++----------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index b64355ebf16..3913d61048a 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -443,7 +443,7 @@ static double CDECL unix_jn(int n, double num) /********************************************************************* * ldexp */ -static double CDECL unix_ldexp(double num, MSVCRT_long exp) +static double CDECL unix_ldexp(double num, int exp) { return ldexp( num, exp ); } @@ -477,7 +477,7 @@ static float CDECL unix_lgammaf(float x) /********************************************************************* * llrint */ -static MSVCRT_longlong CDECL unix_llrint(double x) +static __int64 CDECL unix_llrint(double x) { return llrint(x); } @@ -485,7 +485,7 @@ static MSVCRT_longlong CDECL unix_llrint(double x) /********************************************************************* * llrintf */ -static MSVCRT_longlong CDECL unix_llrintf(float x) +static __int64 CDECL unix_llrintf(float x) { return llrintf(x); } @@ -589,7 +589,7 @@ static float CDECL unix_logbf( float x ) /********************************************************************* * lrint */ -static MSVCRT_long CDECL unix_lrint(double x) +static int CDECL unix_lrint(double x) { return lrint(x); } @@ -597,7 +597,7 @@ static MSVCRT_long CDECL unix_lrint(double x) /********************************************************************* * lrintf */ -static MSVCRT_long CDECL unix_lrintf(float x) +static int CDECL unix_lrintf(float x) { return lrintf(x); } @@ -795,7 +795,7 @@ static float CDECL unix_roundf(float x) /********************************************************************* * lround */ -static MSVCRT_long CDECL unix_lround(double x) +static int CDECL unix_lround(double x) { #ifdef HAVE_LROUND return lround(x); @@ -807,7 +807,7 @@ static MSVCRT_long CDECL unix_lround(double x) /********************************************************************* * lroundf */ -static MSVCRT_long CDECL unix_lroundf(float x) +static int CDECL unix_lroundf(float x) { #ifdef HAVE_LROUNDF return lroundf(x); @@ -819,7 +819,7 @@ static MSVCRT_long CDECL unix_lroundf(float x) /********************************************************************* * llround */ -static MSVCRT_longlong CDECL unix_llround(double x) +static __int64 CDECL unix_llround(double x) { #ifdef HAVE_LLROUND return llround(x); @@ -831,7 +831,7 @@ static MSVCRT_longlong CDECL unix_llround(double x) /********************************************************************* * llroundf */ -static MSVCRT_longlong CDECL unix_llroundf(float x) +static __int64 CDECL unix_llroundf(float x) { #ifdef HAVE_LLROUNDF return llroundf(x); diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index cfad08aee0b..b506151664f 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -21,8 +21,6 @@ #ifndef __UNIXLIB_H #define __UNIXLIB_H -#include "msvcrt.h" - struct unix_funcs { double (CDECL *acosh)(double x); @@ -62,13 +60,13 @@ struct unix_funcs double (CDECL *j0)(double num); double (CDECL *j1)(double num); double (CDECL *jn)(int n, double num); - double (CDECL *ldexp)(double x, MSVCRT_long exp); + double (CDECL *ldexp)(double x, int exp); double (CDECL *lgamma)(double x); float (CDECL *lgammaf)(float x); - MSVCRT_longlong (CDECL *llrint)(double x); - MSVCRT_longlong (CDECL *llrintf)(float x); - MSVCRT_longlong (CDECL *llround)(double x); - MSVCRT_longlong (CDECL *llroundf)(float x); + __int64 (CDECL *llrint)(double x); + __int64 (CDECL *llrintf)(float x); + __int64 (CDECL *llround)(double x); + __int64 (CDECL *llroundf)(float x); double (CDECL *log)(double x); float (CDECL *logf)(float x); double (CDECL *log10)(double x); @@ -79,10 +77,10 @@ struct unix_funcs float (CDECL *log2f)(float x); double (CDECL *logb)(double x); float (CDECL *logbf)(float x); - MSVCRT_long (CDECL *lrint)(double x); - MSVCRT_long (CDECL *lrintf)(float x); - MSVCRT_long (CDECL *lround)(double x); - MSVCRT_long (CDECL *lroundf)(float x); + int (CDECL *lrint)(double x); + int (CDECL *lrintf)(float x); + int (CDECL *lround)(double x); + int (CDECL *lroundf)(float x); double (CDECL *modf)(double x, double *iptr); float (CDECL *modff)(float x, float *iptr); double (CDECL *nearbyint)(double num);

1 0

Alexandre Julliard : msvcrt: Remove some duplicate definitions from msvcrt.h.
by Alexandre Julliard 20 Nov '20

20 Nov '20

Module: wine Branch: master Commit: 1f11f41f613264dd5b937d0df0a3ee746db0517c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f11f41f613264dd5b937d0d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 20 12:44:42 2020 +0100 msvcrt: Remove some duplicate definitions from msvcrt.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_arm.c | 5 +- dlls/msvcrt/except_arm64.c | 5 +- dlls/msvcrt/except_i386.c | 5 +- dlls/msvcrt/except_x86_64.c | 5 +- dlls/msvcrt/locale.c | 2 + dlls/msvcrt/math.c | 1 + dlls/msvcrt/mbcs.c | 1 + dlls/msvcrt/msvcrt.h | 268 +------------------------------------------- 8 files changed, 17 insertions(+), 275 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1f11f41f613264dd5b93…

1 0

Alexandre Julliard : msvcrt: Move the fenv_t definition to the public header.
by Alexandre Julliard 20 Nov '20

20 Nov '20

Module: wine Branch: master Commit: 34422eb56cad1ba799270bc6dd56f31bec86023a URL: https://source.winehq.org/git/wine.git/?a=commit;h=34422eb56cad1ba799270bc6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 20 12:51:23 2020 +0100 msvcrt: Move the fenv_t definition to the public header. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/tests/msvcr120.c | 16 +++------ dlls/msvcrt/math.c | 81 +++++++++++++++++++++--------------------- dlls/msvcrt/msvcrt.h | 6 ---- include/msvcrt/fenv.h | 16 +++++++++ 4 files changed, 62 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=34422eb56cad1ba79927…

1 0

Alexandre Julliard : msvcrt: Use the public standard type definitions where possible in msvcrt.h.
by Alexandre Julliard 20 Nov '20

20 Nov '20

Module: wine Branch: master Commit: 0edef50dfae4ec294a949654fa1e03700b954dcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=0edef50dfae4ec294a949654… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 20 12:35:52 2020 +0100 msvcrt: Use the public standard type definitions where possible in msvcrt.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/dir.c | 5 +- dlls/msvcrt/errno.c | 4 +- dlls/msvcrt/file.c | 8 +-- dlls/msvcrt/heap.c | 24 +++---- dlls/msvcrt/locale.c | 6 +- dlls/msvcrt/lock.c | 2 +- dlls/msvcrt/math.c | 20 +++--- dlls/msvcrt/misc.c | 2 +- dlls/msvcrt/msvcrt.h | 161 ++++++++++----------------------------------- dlls/msvcrt/scheduler.c | 4 +- dlls/msvcrt/thread.c | 8 +-- dlls/msvcrt/time.c | 30 +++++---- dlls/msvcrt/wcs.c | 4 +- include/msvcrt/sys/stat.h | 4 ++ include/msvcrt/sys/types.h | 4 ++ include/msvcrt/time.h | 2 +- 16 files changed, 104 insertions(+), 184 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0edef50dfae4ec294a94…

1 0

Rémi Bernon : gdi32: Ignore Type 1 fonts in fontconfig enumeration.
by Alexandre Julliard 20 Nov '20

20 Nov '20

Module: wine Branch: master Commit: 37c72ce2d6cdff13c521235cb961439565e543d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37c72ce2d6cdff13c521235c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 20 10:40:39 2020 +0000 gdi32: Ignore Type 1 fonts in fontconfig enumeration. Instead of loading the font with FreeType to discard it right away. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 61397e8b542..1722f0c746c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1393,9 +1393,9 @@ static void load_fontconfig_fonts(void) { FcPattern *pat; FcFontSet *fontset; - int i, len; + const char *format; + int i; char *file; - const char *ext; if (!fontconfig_enabled) return; @@ -1418,25 +1418,29 @@ static void load_fontconfig_fonts(void) pFcConfigSubstitute( NULL, fontset->fonts[i], FcMatchFont ); - /* We're just interested in OT/TT fonts for now, so this hack just - picks up the scalable fonts without extensions .pf[ab] to save time - loading every other font */ - if(pFcPatternGetBool(fontset->fonts[i], FC_SCALABLE, 0, &scalable) == FcResultMatch && !scalable) { TRACE("not scalable\n"); continue; } + if (pFcPatternGetString( fontset->fonts[i], FC_FONTFORMAT, 0, (FcChar8 **)&format ) != FcResultMatch) + { + TRACE( "ignoring unknown font format %s\n", debugstr_a(file) ); + continue; + } + + if (!strcmp( format, "Type 1" )) + { + TRACE( "ignoring Type 1 font %s\n", debugstr_a(file) ); + continue; + } + aa_flags = parse_aa_pattern( fontset->fonts[i] ); TRACE("fontconfig: %s aa %x\n", file, aa_flags); - len = strlen( file ); - if(len < 4) continue; - ext = &file[ len - 3 ]; - if(_strnicmp(ext, "pfa", -1) && _strnicmp(ext, "pfb", -1)) - AddFontToList(NULL, file, NULL, 0, - ADDFONT_EXTERNAL_FONT | ADDFONT_ADD_TO_CACHE | ADDFONT_AA_FLAGS(aa_flags) ); + AddFontToList( NULL, file, NULL, 0, + ADDFONT_EXTERNAL_FONT | ADDFONT_ADD_TO_CACHE | ADDFONT_AA_FLAGS(aa_flags) ); } pFcFontSetDestroy(fontset); pFcPatternDestroy(pat);

1 0

Rémi Bernon : gdi32: Move FreeType face creation to AddFaceToList.
by Alexandre Julliard 20 Nov '20

20 Nov '20

Module: wine Branch: master Commit: d05e2bcaf6e47d94ac0a441c8c97ccd84e1b85bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=d05e2bcaf6e47d94ac0a441c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 20 10:40:40 2020 +0000 gdi32: Move FreeType face creation to AddFaceToList. So we can use it to add individual fontconfig fonts without iterating all faces. And rename it to add_unix_face. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 127 ++++++++++++++++++++++++++------------------------ 1 file changed, 66 insertions(+), 61 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 1722f0c746c..45b5e94d341 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1002,50 +1002,6 @@ static inline void get_fontsig( FT_Face ft_face, FONTSIGNATURE *fs ) } } -static int AddFaceToList(FT_Face ft_face, const WCHAR *file, void *data_ptr, SIZE_T data_size, - FT_Long face_index, DWORD flags ) -{ - struct bitmap_font_size size; - FONTSIGNATURE fs; - int ret; - WCHAR *family_name = ft_face_get_family_name( ft_face, system_lcid ); - WCHAR *second_name = ft_face_get_family_name( ft_face, MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT) ); - WCHAR *style_name = ft_face_get_style_name( ft_face, system_lcid ); - WCHAR *full_name = ft_face_get_full_name( ft_face, system_lcid ); - - /* try to find another secondary name, preferring the lowest langids */ - if (!RtlCompareUnicodeStrings( family_name, lstrlenW(family_name), - second_name, lstrlenW(second_name), TRUE )) - { - RtlFreeHeap( GetProcessHeap(), 0, second_name ); - second_name = ft_face_get_family_name( ft_face, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL) ); - if (!RtlCompareUnicodeStrings( family_name, lstrlenW(family_name), - second_name, lstrlenW(second_name), TRUE )) - { - RtlFreeHeap( GetProcessHeap(), 0, second_name ); - second_name = NULL; - } - } - - get_fontsig( ft_face, &fs ); - if (!FT_IS_SCALABLE( ft_face )) get_bitmap_size( ft_face, &size ); - if (!HIWORD( flags )) flags |= ADDFONT_AA_FLAGS( default_aa_flags ); - - ret = callback_funcs->add_gdi_face( family_name, second_name, style_name, full_name, file, - data_ptr, data_size, face_index, fs, get_ntm_flags( ft_face ), - get_font_version( ft_face ), flags, - FT_IS_SCALABLE(ft_face) ? NULL : &size ); - - TRACE("fsCsb = %08x %08x/%08x %08x %08x %08x\n", - fs.fsCsb[0], fs.fsCsb[1], fs.fsUsb[0], fs.fsUsb[1], fs.fsUsb[2], fs.fsUsb[3]); - - RtlFreeHeap( GetProcessHeap(), 0, family_name ); - RtlFreeHeap( GetProcessHeap(), 0, second_name ); - RtlFreeHeap( GetProcessHeap(), 0, style_name ); - RtlFreeHeap( GetProcessHeap(), 0, full_name ); - return ret; -} - static FT_Face new_ft_face( const char *file, void *font_data_ptr, DWORD font_data_size, FT_Long face_index, BOOL allow_bitmap ) { @@ -1122,6 +1078,68 @@ fail: return NULL; } +static int add_unix_face( const char *unix_name, const WCHAR *file, void *data_ptr, SIZE_T data_size, + DWORD face_index, DWORD flags, DWORD *num_faces ) +{ + struct bitmap_font_size size; + FONTSIGNATURE fs; + FT_Face ft_face; + WCHAR *family_name, *second_name, *style_name, *full_name; + int ret; + + if (num_faces) *num_faces = 0; + + if (!(ft_face = new_ft_face( unix_name, data_ptr, data_size, face_index, flags & ADDFONT_ALLOW_BITMAP ))) + return 0; + + if (ft_face->family_name[0] == '.') /* Ignore fonts with names beginning with a dot */ + { + TRACE("Ignoring %s since its family name begins with a dot\n", debugstr_a(unix_name)); + pFT_Done_Face( ft_face ); + return 0; + } + + family_name = ft_face_get_family_name( ft_face, system_lcid ); + second_name = ft_face_get_family_name( ft_face, MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT) ); + style_name = ft_face_get_style_name( ft_face, system_lcid ); + full_name = ft_face_get_full_name( ft_face, system_lcid ); + + /* try to find another secondary name, preferring the lowest langids */ + if (!RtlCompareUnicodeStrings( family_name, lstrlenW(family_name), + second_name, lstrlenW(second_name), TRUE )) + { + RtlFreeHeap( GetProcessHeap(), 0, second_name ); + second_name = ft_face_get_family_name( ft_face, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL) ); + if (!RtlCompareUnicodeStrings( family_name, lstrlenW(family_name), + second_name, lstrlenW(second_name), TRUE )) + { + RtlFreeHeap( GetProcessHeap(), 0, second_name ); + second_name = NULL; + } + } + + get_fontsig( ft_face, &fs ); + if (!FT_IS_SCALABLE( ft_face )) get_bitmap_size( ft_face, &size ); + if (!HIWORD( flags )) flags |= ADDFONT_AA_FLAGS( default_aa_flags ); + + ret = callback_funcs->add_gdi_face( family_name, second_name, style_name, full_name, file, + data_ptr, data_size, face_index, fs, get_ntm_flags( ft_face ), + get_font_version( ft_face ), flags, + FT_IS_SCALABLE(ft_face) ? NULL : &size ); + + TRACE("fsCsb = %08x %08x/%08x %08x %08x %08x\n", + fs.fsCsb[0], fs.fsCsb[1], fs.fsUsb[0], fs.fsUsb[1], fs.fsUsb[2], fs.fsUsb[3]); + + RtlFreeHeap( GetProcessHeap(), 0, family_name ); + RtlFreeHeap( GetProcessHeap(), 0, second_name ); + RtlFreeHeap( GetProcessHeap(), 0, style_name ); + RtlFreeHeap( GetProcessHeap(), 0, full_name ); + + if (num_faces) *num_faces = ft_face->num_faces; + pFT_Done_Face( ft_face ); + return ret; +} + static WCHAR *get_dos_file_name( LPCSTR str ) { WCHAR *buffer; @@ -1176,8 +1194,7 @@ static char *get_unix_file_name( LPCWSTR dosW ) static INT AddFontToList(const WCHAR *dos_name, const char *unix_name, void *font_data_ptr, DWORD font_data_size, DWORD flags) { - FT_Face ft_face; - FT_Long face_index = 0, num_faces; + DWORD face_index = 0, num_faces; INT ret = 0; WCHAR *filename = NULL; @@ -1207,22 +1224,10 @@ static INT AddFontToList(const WCHAR *dos_name, const char *unix_name, void *fon if (!dos_name && unix_name) dos_name = filename = get_dos_file_name( unix_name ); - do { - ft_face = new_ft_face( unix_name, font_data_ptr, font_data_size, face_index, flags & ADDFONT_ALLOW_BITMAP ); - if (!ft_face) break; - - if(ft_face->family_name[0] == '.') /* Ignore fonts with names beginning with a dot */ - { - TRACE("Ignoring %s since its family name begins with a dot\n", debugstr_a(unix_name)); - pFT_Done_Face(ft_face); - break; - } - - ret += AddFaceToList(ft_face, dos_name, font_data_ptr, font_data_size, face_index, flags); + do + ret += add_unix_face( unix_name, dos_name, font_data_ptr, font_data_size, face_index, flags, &num_faces ); + while (num_faces > ++face_index); - num_faces = ft_face->num_faces; - pFT_Done_Face(ft_face); - } while(num_faces > ++face_index); RtlFreeHeap( GetProcessHeap(), 0, filename ); return ret; }

1 0

Zebediah Figura : qasf/tests: Test (dis)connecting while not stopped.
by Alexandre Julliard 19 Nov '20

19 Nov '20

Module: wine Branch: master Commit: 2945f4670747a688ebbc21114081b438e041e5bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2945f4670747a688ebbc2111… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 19 11:19:33 2020 -0600 qasf/tests: Test (dis)connecting while not stopped. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/tests/dmowrapper.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c index f76c0c3d9d5..bd87a3494b2 100644 --- a/dlls/qasf/tests/dmowrapper.c +++ b/dlls/qasf/tests/dmowrapper.c @@ -1445,6 +1445,8 @@ static void test_filter_state(IMediaControl *control) OAFilterState state; HRESULT hr; + got_Flush = 0; + hr = IMediaControl_GetState(control, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(state == State_Stopped, "Got state %u.\n", state); @@ -1782,6 +1784,13 @@ static void test_connect_pin(void) hr = IFilterGraph2_ConnectDirect(graph, &testsource.source.pin.IPin_iface, sink, &req_mt); ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_ConnectDirect(graph, &testsource.source.pin.IPin_iface, sink, &req_mt); + ok(hr == VFW_E_NOT_STOPPED, "Got hr %#x.\n", hr); + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!testdmo_input_mt_set, "Input type should not be set.\n"); req_mt.lSampleSize = 123; @@ -1800,6 +1809,13 @@ static void test_connect_pin(void) ok(testdmo_input_mt_set, "Input type should be set.\n"); ok(compare_media_types(&testdmo_input_mt, &req_mt), "Media types didn't match.\n"); + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, sink); + ok(hr == VFW_E_NOT_STOPPED, "Got hr %#x.\n", hr); + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + test_sink_allocator(meminput); /* Test source connection. */ @@ -1816,6 +1832,14 @@ static void test_connect_pin(void) /* Exact connection. */ req_mt = mt2; + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + ok(hr == VFW_E_NOT_STOPPED, "Got hr %#x.\n", hr); + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -1831,6 +1855,13 @@ static void test_connect_pin(void) ok(testdmo_output_mt_set, "Output type should be set.\n"); ok(compare_media_types(&testdmo_output_mt, &req_mt), "Media types didn't match.\n"); + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, source); + ok(hr == VFW_E_NOT_STOPPED, "Got hr %#x.\n", hr); + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + test_filter_state(control); test_sample_processing(control, meminput);

1 0