November 2020 - Wine-commits

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

16 Nov '20

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 16 Nov '20

16 Nov '20

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 16 Nov '20

16 Nov '20

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 16 Nov '20

16 Nov '20

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 16 Nov '20

16 Nov '20

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 16 Nov '20

16 Nov '20

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 : gdi32/uniscribe: Use wide-char string literals.
by Alexandre Julliard 16 Nov '20

16 Nov '20

Module: wine Branch: master Commit: 236fa496daf3ebcb43bc2c06bb62b1a048951feb URL: https://source.winehq.org/git/wine.git/?a=commit;h=236fa496daf3ebcb43bc2c06… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Nov 15 23:11:12 2020 +0100 gdi32/uniscribe: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/uniscribe/usp10.c | 259 ++++++++++++++----------------------------- 1 file changed, 86 insertions(+), 173 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=236fa496daf3ebcb43bc…

1 0

Michael Stefaniuc : mscms: Use wide-char string literals.
by Alexandre Julliard 16 Nov '20

16 Nov '20

Module: wine Branch: master Commit: e32d62df4385c69d0140bbbc586381d5d3bca93b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e32d62df4385c69d0140bbbc… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Nov 15 23:11:18 2020 +0100 mscms: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/profile.c | 8 +++----- dlls/mscms/tests/profile.c | 15 +++++---------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index bc7f200006b..26a2eacd597 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -615,7 +615,6 @@ BOOL WINAPI GetStandardColorSpaceProfileW( PCWSTR machine, DWORD id, PWSTR profi static BOOL header_from_file( LPCWSTR file, PPROFILEHEADER header ) { - static const WCHAR slash[] = {'\\',0}; BOOL ret; PROFILE profile; WCHAR path[MAX_PATH]; @@ -628,13 +627,13 @@ static BOOL header_from_file( LPCWSTR file, PPROFILEHEADER header ) WARN( "Can't retrieve color directory\n" ); return FALSE; } - if (size + sizeof(slash) + sizeof(WCHAR) * lstrlenW( file ) > sizeof(path)) + if (size + sizeof(L"\\") + sizeof(WCHAR) * lstrlenW( file ) > sizeof(path)) { WARN( "Filename too long\n" ); return FALSE; } - lstrcatW( path, slash ); + lstrcatW( path, L"\\" ); lstrcatW( path, file ); profile.dwType = PROFILE_FILENAME; @@ -1058,7 +1057,6 @@ BOOL WINAPI InstallColorProfileW( PCWSTR machine, PCWSTR profile ) { WCHAR dest[MAX_PATH], base[MAX_PATH]; DWORD size = sizeof(dest); - static const WCHAR slash[] = { '\\', 0 }; TRACE( "( %s )\n", debugstr_w(profile) ); @@ -1068,7 +1066,7 @@ BOOL WINAPI InstallColorProfileW( PCWSTR machine, PCWSTR profile ) basename( profile, base ); - lstrcatW( dest, slash ); + lstrcatW( dest, L"\\" ); lstrcatW( dest, base ); /* Is source equal to destination? */ diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 15a0533145d..063ea22420d 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -102,7 +102,7 @@ static BOOL init_function_ptrs( void ) } static const char machine[] = "dummy"; -static const WCHAR machineW[] = { 'd','u','m','m','y',0 }; +static const WCHAR machineW[] = L"dummy"; /* To do any real functionality testing with this suite you need a copy of * the freely distributable standard RGB color space profile. It comes @@ -119,12 +119,9 @@ static const char profile2[] = "\\spool\\drivers\\color\\srgb color space profile.icm"; static const WCHAR profile1W[] = -{ '\\','c','o','l','o','r','\\','s','r','g','b',' ','c','o','l','o','r',' ', - 's','p','a','c','e',' ','p','r','o','f','i','l','e','.','i','c','m',0 }; +L"\\color\\srgb color space profile.icm"; static const WCHAR profile2W[] = -{ '\\','s','p','o','o','l','\\','d','r','i','v','e','r','s','\\', - 'c','o','l','o','r','\\','s','r','g','b',' ','c','o','l','o','r',' ', - 's','p','a','c','e',' ','p','r','o','f','i','l','e','.','i','c','m',0 }; +L"\\spool\\drivers\\color\\srgb color space profile.icm"; static BOOL have_color_profile; @@ -832,7 +829,6 @@ static void test_InstallColorProfileW( WCHAR *standardprofileW, WCHAR *testprofi { WCHAR dest[MAX_PATH], base[MAX_PATH]; DWORD size = sizeof(dest); - WCHAR slash[] = { '\\', 0 }; HANDLE handle; SetLastError(0xdeadbeef); @@ -849,7 +845,7 @@ static void test_InstallColorProfileW( WCHAR *standardprofileW, WCHAR *testprofi MSCMS_basenameW( testprofileW, base ); - lstrcatW( dest, slash ); + lstrcatW( dest, L"\\" ); lstrcatW( dest, base ); /* Check if the profile is really there */ @@ -1210,7 +1206,6 @@ static void test_UninstallColorProfileW( WCHAR *testprofileW ) WCHAR dest[MAX_PATH], base[MAX_PATH]; char destA[MAX_PATH]; DWORD size = sizeof(dest); - WCHAR slash[] = { '\\', 0 }; HANDLE handle; int bytes_copied; @@ -1228,7 +1223,7 @@ static void test_UninstallColorProfileW( WCHAR *testprofileW ) MSCMS_basenameW( testprofileW, base ); - lstrcatW( dest, slash ); + lstrcatW( dest, L"\\" ); lstrcatW( dest, base ); ret = pUninstallColorProfileW( NULL, dest, TRUE );

1 0

Michael Stefaniuc : mscms/tests: Inline a simple string.
by Alexandre Julliard 16 Nov '20

16 Nov '20

Module: wine Branch: master Commit: d8b26261e95df69f7b677c415dd712d9bef37c1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8b26261e95df69f7b677c41… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Nov 15 23:11:19 2020 +0100 mscms/tests: Inline a simple string. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/tests/profile.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 063ea22420d..be4eaa66c00 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -772,7 +772,6 @@ static void test_InstallColorProfileA( char *standardprofile, char *testprofile { CHAR dest[MAX_PATH], base[MAX_PATH]; DWORD size = sizeof(dest); - CHAR slash[] = "\\"; HANDLE handle; SetLastError(0xdeadbeef); @@ -789,7 +788,7 @@ static void test_InstallColorProfileA( char *standardprofile, char *testprofile MSCMS_basenameA( testprofile, base ); - lstrcatA( dest, slash ); + lstrcatA( dest, "\\" ); lstrcatA( dest, base ); /* Check if the profile is really there */ @@ -1157,7 +1156,6 @@ static void test_UninstallColorProfileA( char *testprofile ) { CHAR dest[MAX_PATH], base[MAX_PATH]; DWORD size = sizeof(dest); - CHAR slash[] = "\\"; HANDLE handle; SetLastError(0xdeadbeef); @@ -1174,7 +1172,7 @@ static void test_UninstallColorProfileA( char *testprofile ) MSCMS_basenameA( testprofile, base ); - lstrcatA( dest, slash ); + lstrcatA( dest, "\\" ); lstrcatA( dest, base ); ret = pUninstallColorProfileA( NULL, dest, TRUE );

1 0

Michael Stefaniuc : hidclass.sys: Use wide-char string literals.
by Alexandre Julliard 16 Nov '20

16 Nov '20

Module: wine Branch: master Commit: f073d9a9d32a4e762ce4ece527195f1134a4e448 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f073d9a9d32a4e762ce4ece5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Nov 15 23:11:21 2020 +0100 hidclass.sys: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 8 ++------ dlls/hidclass.sys/pnp.c | 13 +++++-------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 0e905c8322f..fc1dfd07db1 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -38,9 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(hid); WINE_DECLARE_DEBUG_CHANNEL(hid_report); -static const WCHAR device_name_fmtW[] = {'\\','D','e','v','i','c','e', - '\\','H','I','D','#','%','p','&','%','p',0}; - NTSTATUS HID_CreateDevice(DEVICE_OBJECT *native_device, HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT **device) { WCHAR dev_name[255]; @@ -48,7 +45,7 @@ NTSTATUS HID_CreateDevice(DEVICE_OBJECT *native_device, HID_MINIDRIVER_REGISTRAT NTSTATUS status; BASE_DEVICE_EXTENSION *ext; - swprintf(dev_name, ARRAY_SIZE(dev_name), device_name_fmtW, driver->DriverObject, native_device); + swprintf(dev_name, ARRAY_SIZE(dev_name), L"\\Device\\HID#%p&%p", driver->DriverObject, native_device); RtlInitUnicodeString( &nameW, dev_name ); TRACE("Create base hid device %s\n", debugstr_w(dev_name)); @@ -76,7 +73,6 @@ NTSTATUS HID_CreateDevice(DEVICE_OBJECT *native_device, HID_MINIDRIVER_REGISTRAT NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) { - static const WCHAR backslashW[] = {'\\',0}; WCHAR device_instance_id[MAX_DEVICE_ID_LEN]; SP_DEVINFO_DATA Data; UNICODE_STRING nameW; @@ -91,7 +87,7 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) RtlInitUnicodeString( &nameW, ext->device_name); lstrcpyW(device_instance_id, ext->device_id); - lstrcatW(device_instance_id, backslashW); + lstrcatW(device_instance_id, L"\\"); lstrcatW(device_instance_id, ext->instance_id); devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_HIDCLASS, NULL); diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 1c130e8dd80..27de1e1b04b 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -30,9 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(hid); -static const WCHAR device_enumeratorW[] = {'H','I','D',0}; -static const WCHAR separator_W[] = {'\\',0}; - static NTSTATUS WINAPI internalComplete(DEVICE_OBJECT *deviceObject, IRP *irp, void *context) { @@ -193,8 +190,8 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) lstrcpyW(ext->instance_id, instance_id); - lstrcpyW(ext->device_id, device_enumeratorW); - lstrcatW(ext->device_id, separator_W); + lstrcpyW(ext->device_id, L"HID"); + lstrcatW(ext->device_id, L"\\"); lstrcatW(ext->device_id, wcschr(device_id, '\\') + 1); HID_LinkDevice(device); @@ -264,7 +261,7 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) /* Device instance ID */ lstrcpyW(ptr, ext->device_id); ptr += lstrlenW(ext->device_id); - lstrcpyW(ptr, separator_W); + lstrcpyW(ptr, L"\\"); ptr += 1; lstrcpyW(ptr, ext->instance_id); ptr += lstrlenW(ext->instance_id) + 1; @@ -272,8 +269,8 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) lstrcpyW(ptr, ext->device_id); ptr += lstrlenW(ext->device_id) + 1; /* Bus ID */ - lstrcpyW(ptr, device_enumeratorW); - ptr += lstrlenW(device_enumeratorW) + 1; + lstrcpyW(ptr, L"HID"); + ptr += lstrlenW(L"HID") + 1; *ptr = 0; irp->IoStatus.Information = (ULONG_PTR)id; rc = STATUS_SUCCESS;

1 0