November 2020 - Wine-Commits

Zebediah Figura : quartz/tests: Store a testfilter pointer inside the testpin structure.
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: 316396275cf9bfdf058f79d31039cccc74334354 URL: https://source.winehq.org/git/wine.git/?a=commit;h=316396275cf9bfdf058f79d3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Nov 15 11:04:35 2020 -0600 quartz/tests: Store a testfilter pointer inside the testpin structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 79 ++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 41 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index b0f287e7fe2..1821919a094 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -789,7 +789,7 @@ struct testpin IPin IPin_iface; LONG ref; PIN_DIRECTION dir; - IBaseFilter *filter; + struct testfilter *filter; IPin *peer; AM_MEDIA_TYPE *mt; WCHAR name[10]; @@ -806,6 +806,40 @@ struct testpin HRESULT QueryInternalConnections_hr; }; +struct testfilter +{ + IBaseFilter IBaseFilter_iface; + LONG ref; + IFilterGraph *graph; + WCHAR *name; + IReferenceClock *clock; + + IEnumPins IEnumPins_iface; + struct testpin *pins; + unsigned int pin_count, enum_idx; + + FILTER_STATE state; + REFERENCE_TIME start_time; + HRESULT state_hr, GetState_hr, seek_hr; + FILTER_STATE expect_stop_prev, expect_run_prev; + + IAMFilterMiscFlags IAMFilterMiscFlags_iface; + ULONG misc_flags; + + IMediaSeeking IMediaSeeking_iface; + LONG seeking_ref; + DWORD seek_caps; + BOOL support_testguid, support_media_time; + GUID time_format; + LONGLONG seek_duration, seek_current, seek_stop; + double seek_rate; + + IReferenceClock IReferenceClock_iface; + + IFileSourceFilter IFileSourceFilter_iface; + WCHAR filename[MAX_PATH]; +}; + static inline struct testpin *impl_from_IEnumMediaTypes(IEnumMediaTypes *iface) { return CONTAINING_RECORD(iface, struct testpin, IEnumMediaTypes_iface); @@ -954,8 +988,8 @@ static HRESULT WINAPI testpin_QueryPinInfo(IPin *iface, PIN_INFO *info) struct testpin *pin = impl_from_IPin(iface); if (winetest_debug > 1) trace("%p->QueryPinInfo()\n", pin); - info->pFilter = pin->filter; - IBaseFilter_AddRef(pin->filter); + info->pFilter = &pin->filter->IBaseFilter_iface; + IBaseFilter_AddRef(info->pFilter); info->dir = pin->dir; wcscpy(info->achName, pin->name); return S_OK; @@ -1158,40 +1192,6 @@ static void testsource_init(struct testpin *pin, const AM_MEDIA_TYPE *types, int pin->type_count = type_count; } -struct testfilter -{ - IBaseFilter IBaseFilter_iface; - LONG ref; - IFilterGraph *graph; - WCHAR *name; - IReferenceClock *clock; - - IEnumPins IEnumPins_iface; - struct testpin *pins; - unsigned int pin_count, enum_idx; - - FILTER_STATE state; - REFERENCE_TIME start_time; - HRESULT state_hr, GetState_hr, seek_hr; - FILTER_STATE expect_stop_prev, expect_run_prev; - - IAMFilterMiscFlags IAMFilterMiscFlags_iface; - ULONG misc_flags; - - IMediaSeeking IMediaSeeking_iface; - LONG seeking_ref; - DWORD seek_caps; - BOOL support_testguid, support_media_time; - GUID time_format; - LONGLONG seek_duration, seek_current, seek_stop; - double seek_rate; - - IReferenceClock IReferenceClock_iface; - - IFileSourceFilter IFileSourceFilter_iface; - WCHAR filename[MAX_PATH]; -}; - static inline struct testfilter *impl_from_IEnumPins(IEnumPins *iface) { return CONTAINING_RECORD(iface, struct testfilter, IEnumPins_iface); @@ -1842,7 +1842,7 @@ static void testfilter_init(struct testfilter *filter, struct testpin *pins, int filter->pins = pins; filter->pin_count = pin_count; for (i = 0; i < pin_count; i++) - pins[i].filter = &filter->IBaseFilter_iface; + pins[i].filter = filter; filter->state = State_Stopped; filter->expect_stop_prev = filter->expect_run_prev = State_Paused; @@ -3232,9 +3232,6 @@ static void test_filter_state(void) IFilterGraph2_QueryInterface(graph, &IID_IMediaFilter, (void **)&filter); IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); - source_pin.filter = &source.IBaseFilter_iface; - sink_pin.filter = &sink.IBaseFilter_iface; - IFilterGraph2_AddFilter(graph, &source.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, &sink.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, &dummy.IBaseFilter_iface, NULL);

1 0

Zebediah Figura : quartz/tests: Add more tests for interaction between pin connection and graph state.
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: be1ccdf73f3c1aa2e99add09a6e298e772a8aa6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=be1ccdf73f3c1aa2e99add09… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Nov 15 11:04:36 2020 -0600 quartz/tests: Add more tests for interaction between pin connection and graph state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 48 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 1821919a094..7b2aa25a932 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -801,6 +801,8 @@ struct testpin AM_MEDIA_TYPE *request_mt, *accept_mt; const struct testpin *require_connected_pin; + BOOL require_stopped_disconnect; + HRESULT Connect_hr; HRESULT EnumMediaTypes_hr; HRESULT QueryInternalConnections_hr; @@ -958,6 +960,9 @@ static HRESULT WINAPI testpin_Disconnect(IPin *iface) if (!pin->peer) return S_FALSE; + if (pin->require_stopped_disconnect && pin->filter->state != State_Stopped) + return VFW_E_NOT_STOPPED; + IPin_Release(pin->peer); pin->peer = NULL; return S_OK; @@ -2885,6 +2890,7 @@ static void test_connect_direct(void) struct testfilter source, sink, parser1, parser2; IFilterGraph2 *graph = create_graph(); + IMediaControl *control; AM_MEDIA_TYPE mt; HRESULT hr; @@ -2905,6 +2911,12 @@ static void test_connect_direct(void) hr = IFilterGraph2_AddFilter(graph, &sink.IBaseFilter_iface, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* The filter graph does not prevent connection while it is running; only + * individual filters do. */ + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); @@ -2999,6 +3011,14 @@ todo_wine /* Test Reconnect[Ex](). */ + hr = IFilterGraph2_Reconnect(graph, &source_pin.IPin_iface); + todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Reconnect(graph, &sink_pin.IPin_iface); + todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Reconnect(graph, &source_pin.IPin_iface); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); hr = IFilterGraph2_Reconnect(graph, &sink_pin.IPin_iface); @@ -3097,17 +3117,35 @@ todo_wine ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); - /* Or when the graph is destroyed. */ + /* If the filter cannot be disconnected, then RemoveFilter() fails. */ + hr = IFilterGraph2_AddFilter(graph, &source.IBaseFilter_iface, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, NULL); + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + sink_pin.peer = &source_pin.IPin_iface; + IPin_AddRef(sink_pin.peer); + hr = IMediaControl_Pause(control); ok(hr == S_OK, "Got hr %#x.\n", hr); + + source_pin.require_stopped_disconnect = TRUE; + hr = IFilterGraph2_RemoveFilter(graph, &source.IBaseFilter_iface); + todo_wine ok(hr == VFW_E_NOT_STOPPED, "Got hr %#x.\n", hr); ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); - ok(!source_pin.mt, "Got mt %p.\n", source_pin.mt); ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); - IPin_AddRef(sink_pin.peer = &source_pin.IPin_iface); + sink_pin.peer = &source_pin.IPin_iface; + IPin_AddRef(sink_pin.peer); + source_pin.require_stopped_disconnect = FALSE; + sink_pin.require_stopped_disconnect = TRUE; + hr = IFilterGraph2_RemoveFilter(graph, &source.IBaseFilter_iface); + todo_wine ok(hr == VFW_E_NOT_STOPPED, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(sink_pin.peer == &source_pin.IPin_iface, "Got peer %p.\n", sink_pin.peer); + + /* Filters are stopped, and pins disconnected, when the graph is destroyed. */ + + IMediaControl_Release(control); hr = IFilterGraph2_Release(graph); ok(!hr, "Got outstanding refcount %d.\n", hr); ok(source.ref == 1, "Got outstanding refcount %d.\n", source.ref);

1 0

Zebediah Figura : quartz: Immediately return failure from IFilterGraph::RemoveFilter() if IPin::Disconnect() fails.
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: bd1174e1255f339f13da3fb19f412e7aa43c9ea4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd1174e1255f339f13da3fb1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Nov 15 11:04:37 2020 -0600 quartz: Immediately return failure from IFilterGraph::RemoveFilter() if IPin::Disconnect() fails. Do not try to stop the filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 44 +++++++++++++++++++---------------------- dlls/quartz/tests/filtergraph.c | 4 ++-- 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 872b355cd35..b3aebabbdad 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -704,14 +704,11 @@ static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, IBaseFilte TRACE("(%p/%p)->(%p)\n", This, iface, pFilter); - /* FIXME: check graph is stopped */ - LIST_FOR_EACH_ENTRY(entry, &This->filters, struct filter, entry) { if (entry->filter == pFilter) { IEnumPins *penumpins = NULL; - FILTER_STATE state; if (This->defaultclock && This->refClockProvider == pFilter) { @@ -726,31 +723,30 @@ static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, IBaseFilte IPin *ppin; while(IEnumPins_Next(penumpins, 1, &ppin, NULL) == S_OK) { - IPin *victim = NULL; - HRESULT h; - IPin_ConnectedTo(ppin, &victim); - if (victim) + IPin *peer = NULL; + HRESULT hr; + + IPin_ConnectedTo(ppin, &peer); + if (peer) { - h = IPin_Disconnect(victim); - TRACE("Disconnect other side: %08x\n", h); - if (h == VFW_E_NOT_STOPPED) + if (FAILED(hr = IPin_Disconnect(peer))) { - PIN_INFO pinfo; - IPin_QueryPinInfo(victim, &pinfo); - - IBaseFilter_GetState(pinfo.pFilter, 0, &state); - if (state == State_Running) - IBaseFilter_Pause(pinfo.pFilter); - IBaseFilter_Stop(pinfo.pFilter); - IBaseFilter_Release(pinfo.pFilter); - h = IPin_Disconnect(victim); - TRACE("Disconnect retry: %08x\n", h); + WARN("Failed to disconnect peer %p, hr %#x.\n", peer, hr); + IPin_Release(peer); + IPin_Release(ppin); + IEnumPins_Release(penumpins); + return hr; } - IPin_Release(victim); - } - h = IPin_Disconnect(ppin); - TRACE("Disconnect 2: %08x\n", h); + IPin_Release(peer); + if (FAILED(hr = IPin_Disconnect(ppin))) + { + WARN("Failed to disconnect pin %p, hr %#x.\n", ppin, hr); + IPin_Release(ppin); + IEnumPins_Release(penumpins); + return hr; + } + } IPin_Release(ppin); } IEnumPins_Release(penumpins); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 7b2aa25a932..e7ee4e5c446 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3130,7 +3130,7 @@ todo_wine source_pin.require_stopped_disconnect = TRUE; hr = IFilterGraph2_RemoveFilter(graph, &source.IBaseFilter_iface); - todo_wine ok(hr == VFW_E_NOT_STOPPED, "Got hr %#x.\n", hr); + ok(hr == VFW_E_NOT_STOPPED, "Got hr %#x.\n", hr); ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); @@ -3139,7 +3139,7 @@ todo_wine source_pin.require_stopped_disconnect = FALSE; sink_pin.require_stopped_disconnect = TRUE; hr = IFilterGraph2_RemoveFilter(graph, &source.IBaseFilter_iface); - todo_wine ok(hr == VFW_E_NOT_STOPPED, "Got hr %#x.\n", hr); + ok(hr == VFW_E_NOT_STOPPED, "Got hr %#x.\n", hr); ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); ok(sink_pin.peer == &source_pin.IPin_iface, "Got peer %p.\n", sink_pin.peer);

1 0

Zebediah Figura : makefiles: Disable implicit rules.
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: 52dc0ccf6debccc0dbab273d39605bb7aeeeb456 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52dc0ccf6debccc0dbab273d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Nov 15 11:12:43 2020 -0600 makefiles: Disable implicit rules. This improves the time of a full-tree build with no out-of-date objects from ~3.7s to ~0.7s on one of my development machines. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/makedep.c b/tools/makedep.c index 90a21ef825c..8812be4e40c 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -4076,6 +4076,9 @@ static void output_dependencies( struct makefile *make ) } else output_stub_makefile( make ); + /* disable implicit rules */ + output( ".SUFFIXES:\n" ); + fclose( output_file ); output_file = NULL; rename_temp_file( output_file_name );

1 0

Alexandre Julliard : msvcrt: Reimplement _dclass() using musl code.
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: 23008a0f27e9ba28f0e4b19be8f3175875f72d82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23008a0f27e9ba28f0e4b19b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 16 12:09:43 2020 +0100 msvcrt: Reimplement _dclass() using musl code. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index a9cf224575a..f113943c392 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3678,35 +3678,32 @@ LDOUBLE CDECL MSVCR120_truncl(LDOUBLE x) /********************************************************************* * _dclass (MSVCR120.@) + * + * Copied from musl: src/math/__fpclassify.c */ short CDECL MSVCR120__dclass(double x) { - switch (MSVCRT__fpclass(x)) { - case MSVCRT__FPCLASS_QNAN: - case MSVCRT__FPCLASS_SNAN: - return MSVCRT_FP_NAN; - case MSVCRT__FPCLASS_NINF: - case MSVCRT__FPCLASS_PINF: - return MSVCRT_FP_INFINITE; - case MSVCRT__FPCLASS_ND: - case MSVCRT__FPCLASS_PD: - return MSVCRT_FP_SUBNORMAL; - case MSVCRT__FPCLASS_NN: - case MSVCRT__FPCLASS_PN: - default: - return MSVCRT_FP_NORMAL; - case MSVCRT__FPCLASS_NZ: - case MSVCRT__FPCLASS_PZ: - return MSVCRT_FP_ZERO; - } + union { double f; UINT64 i; } u = { x }; + int e = u.i >> 52 & 0x7ff; + + if (!e) return u.i << 1 ? MSVCRT_FP_SUBNORMAL : MSVCRT_FP_ZERO; + if (e == 0x7ff) return (u.i << 12) ? MSVCRT_FP_NAN : MSVCRT_FP_INFINITE; + return MSVCRT_FP_NORMAL; } /********************************************************************* * _fdclass (MSVCR120.@) + * + * Copied from musl: src/math/__fpclassifyf.c */ short CDECL MSVCR120__fdclass(float x) { - return MSVCR120__dclass(x); + union { float f; UINT32 i; } u = { x }; + int e = u.i >> 23 & 0xff; + + if (!e) return u.i << 1 ? MSVCRT_FP_SUBNORMAL : MSVCRT_FP_ZERO; + if (e == 0xff) return u.i << 9 ? MSVCRT_FP_NAN : MSVCRT_FP_INFINITE; + return MSVCRT_FP_NORMAL; } /********************************************************************* @@ -3730,7 +3727,7 @@ short CDECL MSVCR120__dtest(double *x) */ short CDECL MSVCR120__fdtest(float *x) { - return MSVCR120__dclass(*x); + return MSVCR120__fdclass(*x); } /*********************************************************************

1 0

Alexandre Julliard : msvcrt: Reimplement _fpclass().
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: fd51f229f68ac17670aaa525cb4f6acc01807346 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd51f229f68ac17670aaa525… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 16 12:10:53 2020 +0100 msvcrt: Reimplement _fpclass(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - .../api-ms-win-crt-math-l1-1-0.spec | 2 +- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/math.c | 66 ++++++++++++---------- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 +- include/config.h.in | 3 - 14 files changed, 48 insertions(+), 45 deletions(-) diff --git a/configure b/configure index 42c9090c912..e6409e264f9 100755 --- a/configure +++ b/configure @@ -17728,7 +17728,6 @@ for ac_func in \ finitef \ fnmatch \ fork \ - fpclass \ fstatfs \ fstatvfs \ futimens \ diff --git a/configure.ac b/configure.ac index 9103484d597..f70329b41ae 100644 --- a/configure.ac +++ b/configure.ac @@ -2167,7 +2167,6 @@ AC_CHECK_FUNCS(\ finitef \ fnmatch \ fork \ - fpclass \ fstatfs \ fstatvfs \ futimens \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 579b97fee34..5f0cce6f05d 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -79,7 +79,7 @@ @ cdecl _finite(double) ucrtbase._finite @ cdecl -arch=!i386 _finitef(float) ucrtbase._finitef @ cdecl _fpclass(double) ucrtbase._fpclass -@ stub _fpclassf +@ cdecl -arch=!i386 _fpclassf(float) ucrtbase._fpclassf @ cdecl -arch=i386 -ret64 _ftol() ucrtbase._ftol @ cdecl -arch=win64 _get_FMA3_enable() ucrtbase._get_FMA3_enable @ cdecl _hypot(double double) ucrtbase._hypot diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 6fcbab0f108..2a912bba7bf 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -282,7 +282,7 @@ @ cdecl _o__findnext64i32(long ptr) ucrtbase._o__findnext64i32 @ cdecl _o__flushall() ucrtbase._o__flushall @ cdecl _o__fpclass(double) ucrtbase._o__fpclass -@ stub _o__fpclassf +@ cdecl -arch=!i386 _o__fpclassf(float) ucrtbase._o__fpclassf @ cdecl _o__fputc_nolock(long ptr) ucrtbase._o__fputc_nolock @ cdecl _o__fputchar(long) ucrtbase._o__fputchar @ cdecl _o__fputwc_nolock(long ptr) ucrtbase._o__fputwc_nolock diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 780c86ee715..fc15a97cfd8 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -824,7 +824,7 @@ @ cdecl _flushall() MSVCRT__flushall @ extern _fmode MSVCRT__fmode @ cdecl _fpclass(double) MSVCRT__fpclass -# stub -arch=x86_64 _fpclassf +@ cdecl -arch=!i386 _fpclassf(float) MSVCRT__fpclassf @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr) @ cdecl _fpreset() @ stub _fprintf_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 54196f63690..ff3b4a4dd0b 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1171,7 +1171,7 @@ @ cdecl _flushall() MSVCRT__flushall @ extern _fmode MSVCRT__fmode @ cdecl _fpclass(double) MSVCRT__fpclass -# stub -arch=x86_64 _fpclassf +@ cdecl -arch=!i386 _fpclassf(float) MSVCRT__fpclassf @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr) @ cdecl _fpreset() @ stub _fprintf_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index f1e6fe210a7..08c817d8133 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1171,7 +1171,7 @@ @ cdecl _flushall() MSVCRT__flushall @ extern _fmode MSVCRT__fmode @ cdecl _fpclass(double) MSVCRT__fpclass -# stub -arch=x86_64 _fpclassf +@ cdecl -arch=!i386 _fpclassf(float) MSVCRT__fpclassf @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr) @ cdecl _fpreset() @ stub _fprintf_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 87a55210951..f74140c2311 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1099,7 +1099,7 @@ @ cdecl _flushall() msvcr120._flushall @ extern _fmode msvcr120._fmode @ cdecl _fpclass(double) msvcr120._fpclass -# stub -arch=x86_64 _fpclassf +@ cdecl -arch=!i386 _fpclassf(float) msvcr120._fpclassf @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr) msvcr120._fpieee_flt @ cdecl _fpreset() msvcr120._fpreset @ stub _fprintf_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 97e30c5563f..5f68ef2ec9b 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -490,7 +490,7 @@ @ cdecl _flushall() MSVCRT__flushall @ extern _fmode MSVCRT__fmode @ cdecl _fpclass(double) MSVCRT__fpclass -# stub -arch=x86_64 _fpclassf +@ cdecl -arch=!i386 _fpclassf(float) MSVCRT__fpclassf @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr) @ cdecl _fpreset() @ stub _fprintf_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 5ea0226b3ba..c1cae65c933 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -473,7 +473,7 @@ @ cdecl _flushall() MSVCRT__flushall @ extern _fmode MSVCRT__fmode @ cdecl _fpclass(double) MSVCRT__fpclass -# stub -arch=win64 _fpclassf(float) +@ cdecl -arch=!i386 _fpclassf(float) MSVCRT__fpclassf @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr) @ cdecl _fpreset() @ stub _fprintf_l diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index f113943c392..aa0c6f2f3de 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -208,6 +208,28 @@ float CDECL MSVCRT__logbf( float num ) #ifndef __i386__ +/********************************************************************* + * _fpclassf (MSVCRT.@) + */ +int CDECL MSVCRT__fpclassf( float num ) +{ + union { float f; UINT32 i; } u = { num }; + int e = u.i >> 23 & 0xff; + int s = u.i >> 31; + + switch (e) + { + case 0: + if (u.i << 1) return s ? MSVCRT__FPCLASS_ND : MSVCRT__FPCLASS_PD; + return s ? MSVCRT__FPCLASS_NZ : MSVCRT__FPCLASS_PZ; + case 0xff: + if (u.i << 9) return ((u.i >> 22) & 1) ? MSVCRT__FPCLASS_QNAN : MSVCRT__FPCLASS_SNAN; + return s ? MSVCRT__FPCLASS_NINF : MSVCRT__FPCLASS_PINF; + default: + return s ? MSVCRT__FPCLASS_NN : MSVCRT__FPCLASS_PN; + } +} + /********************************************************************* * _finitef (MSVCRT.@) */ @@ -1391,35 +1413,21 @@ __ASM_GLOBAL_FUNC(MSVCRT__ftol, */ int CDECL MSVCRT__fpclass(double num) { -#if defined(HAVE_FPCLASS) || defined(fpclass) - switch (fpclass( num )) - { - case FP_SNAN: return MSVCRT__FPCLASS_SNAN; - case FP_QNAN: return MSVCRT__FPCLASS_QNAN; - case FP_NINF: return MSVCRT__FPCLASS_NINF; - case FP_PINF: return MSVCRT__FPCLASS_PINF; - case FP_NDENORM: return MSVCRT__FPCLASS_ND; - case FP_PDENORM: return MSVCRT__FPCLASS_PD; - case FP_NZERO: return MSVCRT__FPCLASS_NZ; - case FP_PZERO: return MSVCRT__FPCLASS_PZ; - case FP_NNORM: return MSVCRT__FPCLASS_NN; - case FP_PNORM: return MSVCRT__FPCLASS_PN; - default: return MSVCRT__FPCLASS_PN; - } -#elif defined (fpclassify) - switch (fpclassify( num )) - { - case FP_NAN: return MSVCRT__FPCLASS_QNAN; - case FP_INFINITE: return signbit(num) ? MSVCRT__FPCLASS_NINF : MSVCRT__FPCLASS_PINF; - case FP_SUBNORMAL: return signbit(num) ?MSVCRT__FPCLASS_ND : MSVCRT__FPCLASS_PD; - case FP_ZERO: return signbit(num) ? MSVCRT__FPCLASS_NZ : MSVCRT__FPCLASS_PZ; - } - return signbit(num) ? MSVCRT__FPCLASS_NN : MSVCRT__FPCLASS_PN; -#else - if (!isfinite(num)) - return MSVCRT__FPCLASS_QNAN; - return num == 0.0 ? MSVCRT__FPCLASS_PZ : (num < 0 ? MSVCRT__FPCLASS_NN : MSVCRT__FPCLASS_PN); -#endif + union { double f; UINT64 i; } u = { num }; + int e = u.i >> 52 & 0x7ff; + int s = u.i >> 63; + + switch (e) + { + case 0: + if (u.i << 1) return s ? MSVCRT__FPCLASS_ND : MSVCRT__FPCLASS_PD; + return s ? MSVCRT__FPCLASS_NZ : MSVCRT__FPCLASS_PZ; + case 0x7ff: + if (u.i << 12) return ((u.i >> 51) & 1) ? MSVCRT__FPCLASS_QNAN : MSVCRT__FPCLASS_SNAN; + return s ? MSVCRT__FPCLASS_NINF : MSVCRT__FPCLASS_PINF; + default: + return s ? MSVCRT__FPCLASS_NN : MSVCRT__FPCLASS_PN; + } } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index f6eead8a518..cdf8859e1dd 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -456,7 +456,7 @@ @ cdecl _flushall() MSVCRT__flushall @ extern _fmode MSVCRT__fmode @ cdecl _fpclass(double) MSVCRT__fpclass -# stub -arch=win64 _fpclassf(float) +@ cdecl -arch=!i386 _fpclassf(float) MSVCRT__fpclassf @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr) @ cdecl _fpreset() # stub _fprintf_l(ptr str ptr) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 5f65b97a981..23e7824fe36 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -324,7 +324,7 @@ @ cdecl -arch=!i386 _finitef(float) MSVCRT__finitef @ cdecl _flushall() MSVCRT__flushall @ cdecl _fpclass(double) MSVCRT__fpclass -@ stub _fpclassf +@ cdecl -arch=!i386 _fpclassf(float) MSVCRT__fpclassf @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr) @ cdecl _fpreset() @ cdecl _fputc_nolock(long ptr) MSVCRT__fputc_nolock @@ -946,7 +946,7 @@ @ cdecl _o__findnext64i32(long ptr) MSVCRT__findnext64i32 @ cdecl _o__flushall() MSVCRT__flushall @ cdecl _o__fpclass(double) MSVCRT__fpclass -@ stub _o__fpclassf +@ cdecl -arch=!i386 _o__fpclassf(float) MSVCRT__fpclassf @ cdecl _o__fputc_nolock(long ptr) MSVCRT__fputc_nolock @ cdecl _o__fputchar(long) MSVCRT__fputchar @ cdecl _o__fputwc_nolock(long ptr) MSVCRT__fputwc_nolock diff --git a/include/config.h.in b/include/config.h.in index f2dfe2c9fa3..241fa7ede38 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -192,9 +192,6 @@ /* Define to 1 if you have the `fork' function. */ #undef HAVE_FORK -/* Define to 1 if you have the `fpclass' function. */ -#undef HAVE_FPCLASS - /* Define if FreeType 2 is installed */ #undef HAVE_FREETYPE

1 0

Michael Stefaniuc : inetcpl.cpl: Use wide-char string literals.
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: a65616cf1fcf404090199b82e6d01e0f08e0d4ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=a65616cf1fcf404090199b82… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Nov 15 23:11:23 2020 +0100 inetcpl.cpl: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcpl.cpl/connections.c | 37 ++++++++++++++----------------------- dlls/inetcpl.cpl/general.c | 19 +++++++------------ 2 files changed, 21 insertions(+), 35 deletions(-) diff --git a/dlls/inetcpl.cpl/connections.c b/dlls/inetcpl.cpl/connections.c index 04e26ead6a7..4327c33b420 100644 --- a/dlls/inetcpl.cpl/connections.c +++ b/dlls/inetcpl.cpl/connections.c @@ -31,16 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); -static const WCHAR auto_config_url[] = {'A','u','t','o','C','o','n','f','i','g','U','R','L',0}; -static const WCHAR internet_settings[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s',0}; -static const WCHAR proxy_enable[] = {'P','r','o','x','y','E','n','a','b','l','e',0}; -static const WCHAR proxy_server[] = {'P','r','o','x','y','S','e','r','v','e','r',0}; -static const WCHAR connections[] = {'C','o','n','n','e','c','t','i','o','n','s',0}; -static const WCHAR default_connection_settings[] = {'D','e','f','a','u','l','t', - 'C','o','n','n','e','c','t','i','o','n','S','e','t','t','i','n','g','s',0}; +static const WCHAR internet_settings[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings"; static BOOL initdialog_done; @@ -71,7 +62,7 @@ static DWORD create_connection_settings(BOOL manual_proxy, const WCHAR *proxy_se DWORD pac_url_len; size += sizeof(DWORD); - if(proxy_server) + if(L"ProxyServer") { proxy_server_len = WideCharToMultiByte(CP_UTF8, 0, proxy_server, -1, NULL, 0, NULL, NULL); @@ -139,26 +130,26 @@ static void connections_on_initdialog(HWND hwnd) return; size = sizeof(enabled); - res = RegQueryValueExW(hkey, proxy_enable, NULL, &type, (BYTE*)&enabled, &size); + res = RegQueryValueExW(hkey, L"ProxyEnable", NULL, &type, (BYTE*)&enabled, &size); if(res || type != REG_DWORD) enabled = 0; size = sizeof(address); - res = RegQueryValueExW(hkey, proxy_server, NULL, &type, (BYTE*)address, &size); + res = RegQueryValueExW(hkey, L"ProxyServer", NULL, &type, (BYTE*)address, &size); if(res || type != REG_SZ) address[0] = 0; size = sizeof(pac_url); - res = RegQueryValueExW(hkey, auto_config_url, NULL, &type, (BYTE*)pac_url, &size); + res = RegQueryValueExW(hkey, L"AutoConfigURL", NULL, &type, (BYTE*)pac_url, &size); if(res || type != REG_SZ) pac_url[0] = 0; - res = RegOpenKeyW(hkey, connections, &con); + res = RegOpenKeyW(hkey, L"Connections", &con); RegCloseKey(hkey); if(!res) { connection_settings *settings = NULL; size = 0; - while((res = RegQueryValueExW(con, default_connection_settings, NULL, &type, + while((res = RegQueryValueExW(con, L"DefaultConnectionSettings", NULL, &type, (BYTE*)settings, &size)) == ERROR_MORE_DATA || !settings) { connection_settings *new_settings = heap_realloc(settings, size); @@ -264,7 +255,7 @@ static INT_PTR connections_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam) return FALSE; use_proxy = IsDlgButtonChecked(hwnd, IDC_USE_PROXY_SERVER); - res = RegSetValueExW(hkey, proxy_enable, 0, REG_DWORD, + res = RegSetValueExW(hkey, L"ProxyEnable", 0, REG_DWORD, (BYTE*)&use_proxy, sizeof(use_proxy)); if(res) { @@ -286,12 +277,12 @@ static INT_PTR connections_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam) proxy[proxy_len] = 0; } - res = RegSetValueExW(hkey, proxy_server, 0, REG_SZ, + res = RegSetValueExW(hkey, L"ProxyServer", 0, REG_SZ, (BYTE*)proxy, (proxy_len+port_len)*sizeof(WCHAR)); } else { - res = RegDeleteValueW(hkey, proxy_server); + res = RegDeleteValueW(hkey, L"ProxyServer"); if(res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } @@ -308,12 +299,12 @@ static INT_PTR connections_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam) if(!pac_script_len) use_pac_script = FALSE; if(use_pac_script) { - res = RegSetValueExW(hkey, auto_config_url, 0, REG_SZ, + res = RegSetValueExW(hkey, L"AutoConfigURL", 0, REG_SZ, (BYTE*)pac_script, pac_script_len*sizeof(WCHAR)); } else { - res = RegDeleteValueW(hkey, auto_config_url); + res = RegDeleteValueW(hkey, L"AutoConfigURL"); if(res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } @@ -326,7 +317,7 @@ static INT_PTR connections_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam) use_wpad = IsDlgButtonChecked(hwnd, IDC_USE_WPAD); - res = RegCreateKeyExW(hkey, connections, 0, NULL, 0, KEY_WRITE, NULL, &con, NULL); + res = RegCreateKeyExW(hkey, L"Connections", 0, NULL, 0, KEY_WRITE, NULL, &con, NULL); RegCloseKey(hkey); if(res) return FALSE; @@ -339,7 +330,7 @@ static INT_PTR connections_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam) return FALSE; } - res = RegSetValueExW(con, default_connection_settings, 0, REG_BINARY, + res = RegSetValueExW(con, L"DefaultConnectionSettings", 0, REG_BINARY, (BYTE*)default_connection, size); heap_free(default_connection); RegCloseKey(con); diff --git a/dlls/inetcpl.cpl/general.c b/dlls/inetcpl.cpl/general.c index b9fbf1eb0ae..53e2d1d4fca 100644 --- a/dlls/inetcpl.cpl/general.c +++ b/dlls/inetcpl.cpl/general.c @@ -33,14 +33,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); - -static const WCHAR about_blank[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; -static const WCHAR start_page[] = {'S','t','a','r','t',' ','P','a','g','e',0}; -static const WCHAR default_page[] = {'D','e','f','a','u','l','t','_','P','a','g','e','_','U','R','L',0}; -static const WCHAR reg_ie_main[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'I','n','t','e','r','n','e','t',' ','E','x','p','l','o','r','e','r','\\', - 'M','a','i','n',0}; +static const WCHAR reg_ie_main[] = L"Software\\Microsoft\\Internet Explorer\\Main"; /* list of unimplemented buttons */ static DWORD disabled_general_buttons[] = {IDC_HOME_CURRENT, @@ -188,13 +181,14 @@ static INT_PTR general_on_command(HWND hwnd, WPARAM wparam) break; case MAKEWPARAM(IDC_HOME_BLANK, BN_CLICKED): - SetDlgItemTextW(hwnd, IDC_HOME_EDIT, about_blank); + SetDlgItemTextW(hwnd, IDC_HOME_EDIT, L"about:blank"); break; case MAKEWPARAM(IDC_HOME_DEFAULT, BN_CLICKED): len = sizeof(buffer); type = REG_SZ; - res = SHRegGetUSValueW(reg_ie_main, default_page, &type, buffer, &len, FALSE, (LPBYTE) about_blank, sizeof(about_blank)); + res = SHRegGetUSValueW(reg_ie_main, L"Default_Page_URL", &type, buffer, &len, FALSE, + (BYTE *)L"about:blank", sizeof(L"about:blank")); if (!res && (type == REG_SZ)) SetDlgItemTextW(hwnd, IDC_HOME_EDIT, buffer); break; @@ -235,7 +229,8 @@ static VOID general_on_initdialog(HWND hwnd) *buffer = 0; len = sizeof(buffer); type = REG_SZ; - res = SHRegGetUSValueW(reg_ie_main, start_page, &type, buffer, &len, FALSE, (LPBYTE) about_blank, sizeof(about_blank)); + res = SHRegGetUSValueW(reg_ie_main, L"Start Page", &type, buffer, &len, FALSE, + (BYTE *)L"about:blank", sizeof(L"about:blank")); if (!res && (type == REG_SZ)) { @@ -281,7 +276,7 @@ static INT_PTR general_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam) res = RegOpenKeyW(HKEY_CURRENT_USER, reg_ie_main, &hkey); if (!res) { - res = RegSetValueExW(hkey, start_page, 0, REG_SZ, (const BYTE *)parsed, + res = RegSetValueExW(hkey, L"Start Page", 0, REG_SZ, (const BYTE *)parsed, (lstrlenW(parsed) + 1) * sizeof(WCHAR)); RegCloseKey(hkey); return !res;

1 0

Zebediah Figura : quartz/tests: Test adding and removing filters while the graph is running.
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: 57eddc004b3337382f5dacd0b6cae8ac4295bfae URL: https://source.winehq.org/git/wine.git/?a=commit;h=57eddc004b3337382f5dacd0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Nov 15 11:04:33 2020 -0600 quartz/tests: Test adding and removing filters while the graph is running. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 4d2a3195b6d..2e1a8b7ad66 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3708,6 +3708,35 @@ todo_wine hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* Add and remove a filter while the graph is running. */ + + hr = IFilterGraph2_AddFilter(graph, &dummy.IBaseFilter_iface, L"dummy"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dummy.state == State_Stopped, "Got state %#x.\n", dummy.state); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + check_filter_state(graph, State_Paused); + ok(dummy.state == State_Paused, "Got state %#x.\n", dummy.state); + + hr = IFilterGraph2_RemoveFilter(graph, &dummy.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(dummy.state == State_Paused, "Got state %#x.\n", dummy.state); + + hr = IFilterGraph2_AddFilter(graph, &dummy.IBaseFilter_iface, L"dummy"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(dummy.state == State_Paused, "Got state %#x.\n", dummy.state); + + if (dummy.state == State_Stopped) + dummy.expect_stop_prev = State_Stopped; + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + check_filter_state(graph, State_Stopped); + + hr = IFilterGraph2_RemoveFilter(graph, &dummy.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dummy.state == State_Stopped, "Got state %#x.\n", dummy.state); + /* Destroying the graph while it's running stops all filters. */ hr = IMediaControl_Run(control);

1 0

Zhiyi Zhang : winex11.drv: Adjust the priority of NoRes display settings handler to 1.
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: c4a15755de71e184b6f04d6c20388fea309fde1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4a15755de71e184b6f04d6c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Nov 16 15:17:02 2020 +0800 winex11.drv: Adjust the priority of NoRes display settings handler to 1. A display settings handler with a priority of 0 can not be properly registered due to how X11DRV_Settings_SetHandler() is implemented. Fix a regression introduced by 9c99d9bceba34559a32f1e5906a6fcbcf91b0004. Spotted by Torge Matthies. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50135 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/settings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 0fa5bcf6294..9a43231f34d 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -168,7 +168,7 @@ void X11DRV_Settings_Init(void) depths = screen_bpp == 32 ? depths_32 : depths_24; nores_handler.name = "NoRes"; - nores_handler.priority = 0; + nores_handler.priority = 1; nores_handler.get_id = nores_get_id; nores_handler.get_modes = nores_get_modes; nores_handler.free_modes = nores_free_modes;

1 0

Anton Baskanov : amstream/tests: Add comments to AMDirectDrawStream::CompletionStatus tests.
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: a68f2bd7b4631bce8795d78fe74c6b621de451b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a68f2bd7b4631bce8795d78f… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Nov 12 01:45:53 2020 +0700 amstream/tests: Add comments to AMDirectDrawStream::CompletionStatus tests. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index da5ef8f56a1..6b1a9e4575f 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -7951,12 +7951,14 @@ static void test_ddrawstreamsample_completion_status(void) hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &stream_sample2); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* Initial status is S_OK. */ hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, 0, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, COMPSTAT_WAIT, INFINITE); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* Update changes the status to MS_S_PENDING. */ hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); @@ -7966,6 +7968,7 @@ static void test_ddrawstreamsample_completion_status(void) hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, COMPSTAT_WAIT, 100); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + /* Each Receive call changes the status of one queued sample to S_OK in the same order Update was called. */ hr = IDirectDrawStreamSample_Update(stream_sample2, SSUPDATE_ASYNC, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); @@ -7996,6 +7999,7 @@ static void test_ddrawstreamsample_completion_status(void) hr = IDirectDrawStreamSample_CompletionStatus(stream_sample2, 0, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* COMPSTAT_NOUPDATEOK removes the sample from the queue and changes the status to MS_S_NOUPDATE. */ hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); @@ -8020,6 +8024,7 @@ static void test_ddrawstreamsample_completion_status(void) hr = IDirectDrawStreamSample_CompletionStatus(stream_sample2, 0, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* COMPSTAT_ABORT removes the sample from the queue and changes the status to MS_S_NOUPDATE. */ hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); @@ -8044,18 +8049,21 @@ static void test_ddrawstreamsample_completion_status(void) hr = IDirectDrawStreamSample_CompletionStatus(stream_sample2, 0, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* COMPSTAT_WAIT has no effect when combined with COMPSTAT_NOUPDATEOK. */ hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, COMPSTAT_NOUPDATEOK | COMPSTAT_WAIT, INFINITE); ok(hr == MS_S_NOUPDATE, "Got hr %#x.\n", hr); + /* COMPSTAT_WAIT has no effect when combined with COMPSTAT_ABORT. */ hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, COMPSTAT_ABORT | COMPSTAT_WAIT, INFINITE); ok(hr == MS_S_NOUPDATE, "Got hr %#x.\n", hr); + /* EndOfStream changes the status of the queued samples to MS_S_ENDOFSTREAM. */ hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); @@ -8068,6 +8076,7 @@ static void test_ddrawstreamsample_completion_status(void) hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, COMPSTAT_WAIT, INFINITE); ok(hr == MS_S_ENDOFSTREAM, "Got hr %#x.\n", hr); + /* Update after EndOfStream changes the status to MS_S_ENDOFSTREAM. */ hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC, NULL, NULL, 0); ok(hr == MS_S_ENDOFSTREAM, "Got hr %#x.\n", hr); @@ -8082,18 +8091,22 @@ static void test_ddrawstreamsample_completion_status(void) hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* Continuous update can be canceled by COMPSTAT_NOUPDATEOK. */ hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC | SSUPDATE_CONTINUOUS, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, COMPSTAT_NOUPDATEOK, 0); ok(hr == MS_S_NOUPDATE, "Got hr %#x.\n", hr); + /* Continuous update can be canceled by COMPSTAT_ABORT. */ hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC | SSUPDATE_CONTINUOUS, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, COMPSTAT_ABORT, 0); ok(hr == MS_S_NOUPDATE, "Got hr %#x.\n", hr); + /* If a sample is in countinuous update mode, when Receive is called it's status remains MS_S_PENDING + * and the sample is moved to the end of the queue. */ hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC | SSUPDATE_CONTINUOUS, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); @@ -8136,6 +8149,7 @@ static void test_ddrawstreamsample_completion_status(void) hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, COMPSTAT_NOUPDATEOK, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* In continuous update mode, flushing does not affect the status. */ hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC | SSUPDATE_CONTINUOUS, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); @@ -8151,6 +8165,7 @@ static void test_ddrawstreamsample_completion_status(void) hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, 0, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + /* In continuous update mode, stopping and running the stream does not affect the status. */ hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -8163,6 +8178,7 @@ static void test_ddrawstreamsample_completion_status(void) hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, 0, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + /* In continuous update mode, EndOfStream changes the status to MS_S_ENDOFSTREAM. */ hr = IPin_EndOfStream(pin); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -8174,6 +8190,7 @@ static void test_ddrawstreamsample_completion_status(void) hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* COMPSTAT_WAIT resets the sample to the non-continuous update mode. */ hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC | SSUPDATE_CONTINUOUS, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); @@ -8189,6 +8206,7 @@ static void test_ddrawstreamsample_completion_status(void) hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, 0, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* In continuous update mode, CompletionStatus with COMPSTAT_WAIT returns when Receive is called. */ hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC | SSUPDATE_CONTINUOUS, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); @@ -8216,6 +8234,7 @@ static void test_ddrawstreamsample_completion_status(void) hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* CompletionStatus with COMPSTAT_WAIT returns when Receive is called. */ hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); @@ -8235,6 +8254,7 @@ static void test_ddrawstreamsample_completion_status(void) ok(!WaitForSingleObject(thread, 2000), "Wait timed out.\n"); CloseHandle(thread); + /* CompletionStatus with COMPSTAT_WAIT returns when EndOfStream is called. */ hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); @@ -8256,6 +8276,7 @@ static void test_ddrawstreamsample_completion_status(void) hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* Stopping and running the stream does not affect the status and does not remove the sample from the queue. */ hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); @@ -8277,6 +8298,7 @@ static void test_ddrawstreamsample_completion_status(void) hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, 0, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* When the stream is stopped Update does not change the status. */ hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0