April 2023 - Wine-commits - list.winehq.org

Rémi Bernon : imm32: Use INPUTCONTEXT directly in ImmSetConversionStatus.
by Alexandre Julliard 11 Apr '23

11 Apr '23

Module: wine Branch: master Commit: 1cd71e92be6ed57621ea545fcfbd46da7cfe7b58 URL: https://gitlab.winehq.org/wine/wine/-/commit/1cd71e92be6ed57621ea545fcfbd46… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 6 01:01:37 2023 +0200 imm32: Use INPUTCONTEXT directly in ImmSetConversionStatus. --- dlls/imm32/imm.c | 41 +++++++++++++++++++---------------------- dlls/imm32/tests/imm32.c | 1 - 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index b2dc58a95ab..d29684f34a2 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2635,37 +2635,34 @@ BOOL WINAPI ImmSetCompositionWindow( /*********************************************************************** * ImmSetConversionStatus (IMM32.@) */ -BOOL WINAPI ImmSetConversionStatus( - HIMC hIMC, DWORD fdwConversion, DWORD fdwSentence) +BOOL WINAPI ImmSetConversionStatus( HIMC himc, DWORD conversion, DWORD sentence ) { - DWORD oldConversion, oldSentence; - struct imc *data = get_imc_data( hIMC ); - - TRACE("%p %ld %ld\n", hIMC, fdwConversion, fdwSentence); + DWORD old_conversion, old_sentence; + INPUTCONTEXT *ctx; - if (!data) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } + TRACE( "himc %p, conversion %#lx, sentence %#lx\n", himc, conversion, sentence ); - if (NtUserQueryInputContext( hIMC, NtUserInputContextThreadId ) != GetCurrentThreadId()) return FALSE; + if (NtUserQueryInputContext( himc, NtUserInputContextThreadId ) != GetCurrentThreadId()) return FALSE; + if (!(ctx = ImmLockIMC( himc ))) return FALSE; - if ( fdwConversion != data->IMC.fdwConversion ) + if (conversion != ctx->fdwConversion) { - oldConversion = data->IMC.fdwConversion; - data->IMC.fdwConversion = fdwConversion; - ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, oldConversion, IMC_SETCONVERSIONMODE); - imc_notify_ime( data, IMN_SETCONVERSIONMODE, 0 ); + old_conversion = ctx->fdwConversion; + ctx->fdwConversion = conversion; + ImmNotifyIME( himc, NI_CONTEXTUPDATED, old_conversion, IMC_SETCONVERSIONMODE ); + SendMessageW( ctx->hWnd, WM_IME_NOTIFY, IMN_SETCONVERSIONMODE, 0 ); } - if ( fdwSentence != data->IMC.fdwSentence ) + + if (sentence != ctx->fdwSentence) { - oldSentence = data->IMC.fdwSentence; - data->IMC.fdwSentence = fdwSentence; - ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, oldSentence, IMC_SETSENTENCEMODE); - imc_notify_ime( data, IMN_SETSENTENCEMODE, 0 ); + old_sentence = ctx->fdwSentence; + ctx->fdwSentence = sentence; + ImmNotifyIME( himc, NI_CONTEXTUPDATED, old_sentence, IMC_SETSENTENCEMODE ); + SendMessageW( ctx->hWnd, WM_IME_NOTIFY, IMN_SETSENTENCEMODE, 0 ); } + ImmUnlockIMC( himc ); + return TRUE; } diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 8c6d441181b..bbfae7e65d1 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -4219,7 +4219,6 @@ static void test_ImmSetConversionStatus(void) .hkl = expect_ime, .himc = default_himc, .func = IME_NOTIFY, .notify = {.action = NI_CONTEXTUPDATED, .index = 0xdeadbeef, .value = IMC_SETCONVERSIONMODE}, }, - {.todo = TRUE}, /* spurious calls */ {0}, }; const struct ime_call set_conversion_status_2_seq[] =

1 0

Santino Mazza : mf/tests: Test media session error handling.
by Alexandre Julliard 11 Apr '23

11 Apr '23

Module: wine Branch: master Commit: 2580799e7068ff405ee55032dcdd8dcb941d604a URL: https://gitlab.winehq.org/wine/wine/-/commit/2580799e7068ff405ee55032dcdd8d… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Thu Mar 9 11:28:41 2023 -0300 mf/tests: Test media session error handling. Test error handling for mfsession_Start when a source fails at different stages. --- dlls/mf/tests/mf.c | 183 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 179 insertions(+), 4 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 59689652677..f3269eb7873 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -41,6 +41,39 @@ #include "initguid.h" #include "evr9.h" +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + expect_ ## func = TRUE + +#define CHECK_EXPECT2(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_EXPECT(func) \ + do { \ + CHECK_EXPECT2(func); \ + expect_ ## func = FALSE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +#define CHECK_NOT_CALLED(func) \ + do { \ + ok(!called_ ## func, "unexpected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +#define CLEAR_CALLED(func) \ + expect_ ## func = called_ ## func = FALSE + extern GUID DMOVideoFormat_RGB32; HRESULT (WINAPI *pMFCreateSampleCopierMFT)(IMFTransform **copier); @@ -237,10 +270,15 @@ static void init_sink_node(IMFStreamSink *stream_sink, MF_CONNECT_METHOD method, } } +DEFINE_EXPECT(test_source_BeginGetEvent); +DEFINE_EXPECT(test_source_QueueEvent); +DEFINE_EXPECT(test_source_Start); + struct test_source { IMFMediaSource IMFMediaSource_iface; LONG refcount; + HRESULT begin_get_event_res; IMFPresentationDescriptor *pd; }; @@ -295,8 +333,9 @@ static HRESULT WINAPI test_source_GetEvent(IMFMediaSource *iface, DWORD flags, I static HRESULT WINAPI test_source_BeginGetEvent(IMFMediaSource *iface, IMFAsyncCallback *callback, IUnknown *state) { - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + struct test_source *source = impl_from_IMFMediaSource(iface); + CHECK_EXPECT(test_source_BeginGetEvent); + return source->begin_get_event_res; } static HRESULT WINAPI test_source_EndGetEvent(IMFMediaSource *iface, IMFAsyncResult *result, IMFMediaEvent **event) @@ -308,7 +347,7 @@ static HRESULT WINAPI test_source_EndGetEvent(IMFMediaSource *iface, IMFAsyncRes static HRESULT WINAPI test_source_QueueEvent(IMFMediaSource *iface, MediaEventType event_type, REFGUID ext_type, HRESULT hr, const PROPVARIANT *value) { - ok(0, "Unexpected call.\n"); + CHECK_EXPECT(test_source_QueueEvent); return E_NOTIMPL; } @@ -327,7 +366,7 @@ static HRESULT WINAPI test_source_CreatePresentationDescriptor(IMFMediaSource *i static HRESULT WINAPI test_source_Start(IMFMediaSource *iface, IMFPresentationDescriptor *pd, const GUID *time_format, const PROPVARIANT *start_position) { - ok(0, "Unexpected call.\n"); + CHECK_EXPECT(test_source_Start); return E_NOTIMPL; } @@ -373,6 +412,7 @@ static IMFMediaSource *create_test_source(IMFPresentationDescriptor *pd) source = calloc(1, sizeof(*source)); source->IMFMediaSource_iface.lpVtbl = &test_source_vtbl; source->refcount = 1; + source->begin_get_event_res = E_NOTIMPL; IMFPresentationDescriptor_AddRef((source->pd = pd)); return &source->IMFMediaSource_iface; @@ -1915,6 +1955,41 @@ static HRESULT wait_media_event_(int line, IMFMediaSession *session, IMFAsyncCal return status; } +#define wait_media_event_until_blocking(a, b, c, d, e) wait_media_event_until_blocking_(__LINE__, a, b, c, d, e) +static HRESULT wait_media_event_until_blocking_(int line, IMFMediaSession *session, IMFAsyncCallback *callback, + MediaEventType expect_type, DWORD timeout, PROPVARIANT *value) +{ + struct test_callback *impl = impl_from_IMFAsyncCallback(callback); + MediaEventType type; + HRESULT hr, status; + DWORD ret; + GUID guid; + + do + { + hr = IMFMediaSession_BeginGetEvent(session, &impl->IMFAsyncCallback_iface, (IUnknown *)session); + ok_(__FILE__, line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ret = WaitForSingleObject(impl->event, timeout); + if (ret == WAIT_TIMEOUT) return WAIT_TIMEOUT; + hr = IMFMediaEvent_GetType(impl->media_event, &type); + ok_(__FILE__, line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); + } while (type != expect_type); + + ok_(__FILE__, line)(type == expect_type, "got type %lu\n", type); + + hr = IMFMediaEvent_GetExtendedType(impl->media_event, &guid); + ok_(__FILE__, line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok_(__FILE__, line)(IsEqualGUID(&guid, &GUID_NULL), "got extended type %s\n", debugstr_guid(&guid)); + + hr = IMFMediaEvent_GetValue(impl->media_event, value); + ok_(__FILE__, line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaEvent_GetStatus(impl->media_event, &status); + ok_(__FILE__, line)(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + return status; +} + static IMFMediaSource *create_media_source(const WCHAR *name, const WCHAR *mime) { IMFSourceResolver *resolver; @@ -1986,6 +2061,7 @@ static void test_media_session_events(void) struct test_stream_sink stream_sink = test_stream_sink; struct test_media_sink media_sink = test_media_sink; struct test_handler handler = test_handler; + struct test_source *source_impl; IMFAsyncCallback *callback, *callback2; IMFMediaType *input_type, *output_type; IMFTopologyNode *src_node, *sink_node; @@ -2364,6 +2440,105 @@ static void test_media_session_events(void) /* sometimes briefly leaking */ IMFMediaSession_Release(session); + + /* test IMFMediaSession_Start with source returning an error in BeginGetEvent */ + source_impl = impl_from_IMFMediaSource(source); + + hr = MFCreateMediaSession(NULL, &session); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaSession_SetTopology(session, 0, topology); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = wait_media_event(session, callback, MESessionTopologySet, 1000, &propvar); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(propvar.vt == VT_UNKNOWN, "got vt %u\n", propvar.vt); + ok(propvar.punkVal != (IUnknown *)topology, "got punkVal %p\n", propvar.punkVal); + PropVariantClear(&propvar); + + source_impl->begin_get_event_res = 0x80001234; + + SET_EXPECT(test_source_BeginGetEvent); + SET_EXPECT(test_source_QueueEvent); + SET_EXPECT(test_source_Start); + + propvar.vt = VT_EMPTY; + hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = wait_media_event_until_blocking(session, callback, MESessionStarted, 1000, &propvar); + todo_wine ok(hr == 0x80001234, "Unexpected hr %#lx.\n", hr); + ok(propvar.vt == VT_EMPTY, "got vt %u\n", propvar.vt); + ok(propvar.punkVal != (IUnknown *)topology, "got punkVal %p\n", propvar.punkVal); + PropVariantClear(&propvar); + + CHECK_CALLED(test_source_BeginGetEvent); + todo_wine { CHECK_NOT_CALLED(test_source_Start); } + + hr = IMFMediaSession_ClearTopologies(session); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaSession_Shutdown(session); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(media_sink.shutdown, "media sink didn't shutdown.\n"); + media_sink.shutdown = FALSE; + + source_impl->begin_get_event_res = E_NOTIMPL; + + CLEAR_CALLED(test_source_BeginGetEvent); + CLEAR_CALLED(test_source_QueueEvent); + CLEAR_CALLED(test_source_Start); + + /* sometimes briefly leaking */ + IMFMediaSession_Release(session); + + + /* test IMFMediaSession_Start when test source BeginGetEvent returns S_OK */ + hr = MFCreateMediaSession(NULL, &session); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaSession_SetTopology(session, 0, topology); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = wait_media_event(session, callback, MESessionTopologySet, 1000, &propvar); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(propvar.vt == VT_UNKNOWN, "got vt %u\n", propvar.vt); + ok(propvar.punkVal != (IUnknown *)topology, "got punkVal %p\n", propvar.punkVal); + PropVariantClear(&propvar); + + source_impl = impl_from_IMFMediaSource(source); + source_impl->begin_get_event_res = S_OK; + + SET_EXPECT(test_source_BeginGetEvent); + SET_EXPECT(test_source_QueueEvent); + SET_EXPECT(test_source_Start); + + propvar.vt = VT_EMPTY; + hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = wait_media_event_until_blocking(session, callback, MESessionStarted, 1000, &propvar); + todo_wine ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); + ok(propvar.vt == VT_EMPTY, "got vt %u\n", propvar.vt); + ok(propvar.punkVal != (IUnknown *)topology, "got punkVal %p\n", propvar.punkVal); + PropVariantClear(&propvar); + + CHECK_CALLED(test_source_BeginGetEvent); + CHECK_CALLED(test_source_Start); + + hr = IMFMediaSession_ClearTopologies(session); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaSession_Shutdown(session); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(media_sink.shutdown, "media sink didn't shutdown.\n"); + media_sink.shutdown = FALSE; + + source_impl->begin_get_event_res = E_NOTIMPL; + + CLEAR_CALLED(test_source_BeginGetEvent); + CLEAR_CALLED(test_source_QueueEvent); + CLEAR_CALLED(test_source_Start); + + /* sometimes briefly leaking */ + IMFMediaSession_Release(session); + IMFAsyncCallback_Release(callback); if (handler.current_type)

1 0

Santino Mazza : mf/session: Handle errors when subscribing to source's events.
by Alexandre Julliard 11 Apr '23

11 Apr '23

Module: wine Branch: master Commit: 74b64eab2049c0c6de7dded39bf5ffcf8c921da2 URL: https://gitlab.winehq.org/wine/wine/-/commit/74b64eab2049c0c6de7dded39bf5ff… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Thu Mar 9 11:50:30 2023 -0300 mf/session: Handle errors when subscribing to source's events. --- dlls/mf/session.c | 18 +++++++++++------- dlls/mf/tests/mf.c | 4 ++-- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 85baf07d05a..bac4f23b9c6 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -866,13 +866,13 @@ static void session_command_complete_with_event(struct media_session *session, M session_command_complete(session); } -static void session_subscribe_sources(struct media_session *session) +static HRESULT session_subscribe_sources(struct media_session *session) { struct media_source *source; - HRESULT hr; + HRESULT hr = S_OK; if (session->presentation.flags & SESSION_FLAG_SOURCES_SUBSCRIBED) - return; + return hr; LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) { @@ -880,10 +880,12 @@ static void session_subscribe_sources(struct media_session *session) source->object))) { WARN("Failed to subscribe to source events, hr %#lx.\n", hr); + return hr; } } session->presentation.flags |= SESSION_FLAG_SOURCES_SUBSCRIBED; + return hr; } static void session_start(struct media_session *session, const GUID *time_format, const PROPVARIANT *start_position) @@ -909,7 +911,11 @@ static void session_start(struct media_session *session, const GUID *time_format session->presentation.start_position.vt = VT_EMPTY; PropVariantCopy(&session->presentation.start_position, start_position); - session_subscribe_sources(session); + if (FAILED(hr = session_subscribe_sources(session))) + { + session_command_complete_with_event(session, MESessionStarted, hr, NULL); + return; + } LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) { @@ -1308,10 +1314,8 @@ static void session_set_rate(struct media_session *session, BOOL thin, float rat if (SUCCEEDED(hr)) hr = IMFRateControl_GetRate(session->clock_rate_control, NULL, &clock_rate); - if (SUCCEEDED(hr) && (rate != clock_rate)) + if (SUCCEEDED(hr) && (rate != clock_rate) && SUCCEEDED(hr = session_subscribe_sources(session))) { - session_subscribe_sources(session); - LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) { if (SUCCEEDED(hr = MFGetService(source->object, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index f3269eb7873..610c2e3da35 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2465,13 +2465,13 @@ static void test_media_session_events(void) hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = wait_media_event_until_blocking(session, callback, MESessionStarted, 1000, &propvar); - todo_wine ok(hr == 0x80001234, "Unexpected hr %#lx.\n", hr); + ok(hr == 0x80001234, "Unexpected hr %#lx.\n", hr); ok(propvar.vt == VT_EMPTY, "got vt %u\n", propvar.vt); ok(propvar.punkVal != (IUnknown *)topology, "got punkVal %p\n", propvar.punkVal); PropVariantClear(&propvar); CHECK_CALLED(test_source_BeginGetEvent); - todo_wine { CHECK_NOT_CALLED(test_source_Start); } + CHECK_NOT_CALLED(test_source_Start); hr = IMFMediaSession_ClearTopologies(session); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

1 0

Santino Mazza : mf/session: Handle error when a source fails to start.
by Alexandre Julliard 11 Apr '23

11 Apr '23

Module: wine Branch: master Commit: dd6b2f9ab5e65142882748f873a1c7c2ed10cb00 URL: https://gitlab.winehq.org/wine/wine/-/commit/dd6b2f9ab5e65142882748f873a1c7… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Fri Apr 7 14:07:26 2023 -0300 mf/session: Handle error when a source fails to start. --- dlls/mf/session.c | 4 ++++ dlls/mf/tests/mf.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index bac4f23b9c6..7d6a65d3f55 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -920,7 +920,11 @@ static void session_start(struct media_session *session, const GUID *time_format LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) { if (FAILED(hr = IMFMediaSource_Start(source->source, source->pd, &GUID_NULL, start_position))) + { WARN("Failed to start media source %p, hr %#lx.\n", source->source, hr); + session_command_complete_with_event(session, MESessionStarted, hr, NULL); + return; + } } session->state = SESSION_STATE_STARTING_SOURCES; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 610c2e3da35..e8d7252aa3f 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2514,7 +2514,7 @@ static void test_media_session_events(void) hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = wait_media_event_until_blocking(session, callback, MESessionStarted, 1000, &propvar); - todo_wine ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); + ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); ok(propvar.vt == VT_EMPTY, "got vt %u\n", propvar.vt); ok(propvar.punkVal != (IUnknown *)topology, "got punkVal %p\n", propvar.punkVal); PropVariantClear(&propvar);

1 0

Stefan Dösinger : include: X86 msvc has _InterlockedExchangePointer and _InterlockedCompareExchangePointer.
by Alexandre Julliard 11 Apr '23

11 Apr '23

Module: wine Branch: master Commit: 64eed89a537faaf57da3cad0cd4681b8e0128c13 URL: https://gitlab.winehq.org/wine/wine/-/commit/64eed89a537faaf57da3cad0cd4681… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 28 16:27:15 2023 +0300 include: X86 msvc has _InterlockedExchangePointer and _InterlockedCompareExchangePointer. I fixed this issue in ad05f33d67, but a40973f20 regressed this again. I was carrying a patch for quite a while, feeling dejavu. According to boost they are available since MSVC 2015. I don't have old versions of msvc hanging around, and we don't put much value in keeping old versions working, so just use them unconditionally. --- include/winnt.h | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index e15ac364ef2..15c254fbcff 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6541,8 +6541,10 @@ typedef enum _FIRMWARE_TYPE #pragma intrinsic(_InterlockedAnd) #pragma intrinsic(_InterlockedCompareExchange) #pragma intrinsic(_InterlockedCompareExchange64) +#pragma intrinsic(_InterlockedCompareExchangePointer) #pragma intrinsic(_InterlockedExchange) #pragma intrinsic(_InterlockedExchangeAdd) +#pragma intrinsic(_InterlockedExchangePointer) #pragma intrinsic(_InterlockedIncrement) #pragma intrinsic(_InterlockedIncrement16) #pragma intrinsic(_InterlockedDecrement) @@ -6556,10 +6558,12 @@ BOOLEAN _BitScanReverse(unsigned long*,unsigned long); long _InterlockedAnd(long volatile *,long); long _InterlockedCompareExchange(long volatile*,long,long); long long _InterlockedCompareExchange64(long long volatile*,long long,long long); +void * _InterlockedCompareExchangePointer(void *volatile*,void*,void*); long _InterlockedDecrement(long volatile*); short _InterlockedDecrement16(short volatile*); long _InterlockedExchange(long volatile*,long); long _InterlockedExchangeAdd(long volatile*,long); +void * _InterlockedExchangePointer(void *volatile*,void*); long _InterlockedIncrement(long volatile*); short _InterlockedIncrement16(short volatile*); long _InterlockedOr(long volatile *,long); @@ -6569,19 +6573,15 @@ DECLSPEC_NORETURN void __fastfail(unsigned int); #ifndef __i386__ #pragma intrinsic(_InterlockedAnd64) -#pragma intrinsic(_InterlockedCompareExchangePointer) #pragma intrinsic(_InterlockedDecrement64) #pragma intrinsic(_InterlockedExchangeAdd64) -#pragma intrinsic(_InterlockedExchangePointer) #pragma intrinsic(_InterlockedIncrement64) #pragma intrinsic(_InterlockedOr64) #pragma intrinsic(_InterlockedXor64) __int64 _InterlockedAnd64(__int64 volatile *, __int64); -void * _InterlockedCompareExchangePointer(void *volatile*,void*,void*); __int64 _InterlockedDecrement64(__int64 volatile *); __int64 _InterlockedExchangeAdd64(__int64 volatile *, __int64); -void * _InterlockedExchangePointer(void *volatile*,void*); __int64 _InterlockedIncrement64(__int64 volatile *); __int64 _InterlockedOr64(__int64 volatile *, __int64); __int64 _InterlockedXor64(__int64 volatile *, __int64); @@ -6595,11 +6595,6 @@ static FORCEINLINE __int64 InterlockedAnd64( __int64 volatile *dest, __int64 val return prev; } -static FORCEINLINE void * WINAPI InterlockedCompareExchangePointer( void *volatile *dest, void *xchg, void *compare ) -{ - return (void *)_InterlockedCompareExchange( (long volatile*)dest, (long)xchg, (long)compare ); -} - static FORCEINLINE __int64 InterlockedExchangeAdd64( __int64 volatile *dest, __int64 val ) { __int64 prev; @@ -6607,11 +6602,6 @@ static FORCEINLINE __int64 InterlockedExchangeAdd64( __int64 volatile *dest, __i return prev; } -static FORCEINLINE void * WINAPI InterlockedExchangePointer( void *volatile *dest, void *val ) -{ - return (void *)_InterlockedExchange( (long volatile*)dest, (long)val ); -} - static FORCEINLINE __int64 InterlockedIncrement64( __int64 volatile *dest ) { return InterlockedExchangeAdd64( dest, 1 ) + 1;

1 0

Alexandre Julliard : msvcrt: Use the remainder()/remainderf() implementation from the bundled musl library.
by Alexandre Julliard 11 Apr '23

11 Apr '23

Module: wine Branch: master Commit: 3b1e2a7bfdb82c2e41cc96df4bb6ce5e1670b90e URL: https://gitlab.winehq.org/wine/wine/-/commit/3b1e2a7bfdb82c2e41cc96df4bb6ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 15:38:53 2023 +0200 msvcrt: Use the remainder()/remainderf() implementation from the bundled musl library. --- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcrt/math.c | 24 +++++++++++------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 618fc3acbba..d4757be4a6f 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2325,9 +2325,9 @@ @ cdecl rand() @ cdecl rand_s(ptr) @ cdecl realloc(ptr long) -@ cdecl remainder(double double) -@ cdecl remainderf(float float) -@ cdecl remainderl(double double) remainder +@ cdecl remainder(double double) MSVCRT_remainder +@ cdecl remainderf(float float) MSVCRT_remainderf +@ cdecl remainderl(double double) MSVCRT_remainder @ cdecl remove(str) @ cdecl remquo(double double ptr) @ cdecl remquof(float float ptr) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 2acfe23278d..5146ac43644 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3350,36 +3350,34 @@ float CDECL _scalbf(float num, __msvcrt_long power) return ldexp(num, power); } -#if _MSVCR_VER>=120 +#if _MSVCR_VER == 120 /* other versions call remainder() directly */ /********************************************************************* * remainder (MSVCR120.@) - * - * Copied from musl: src/math/remainder.c */ -double CDECL remainder(double x, double y) +double CDECL MSVCRT_remainder(double x, double y) { - int q; -#if _MSVCR_VER == 120 && defined(__x86_64__) +#ifdef __x86_64__ if (isnan(x) || isnan(y)) *_errno() = EDOM; #endif - return remquo(x, y, &q); + return remainder(x, y); } /********************************************************************* * remainderf (MSVCR120.@) - * - * Copied from musl: src/math/remainderf.c */ -float CDECL remainderf(float x, float y) +float CDECL MSVCRT_remainderf(float x, float y) { - int q; -#if _MSVCR_VER == 120 && defined(__x86_64__) +#ifdef __x86_64__ if (isnan(x) || isnan(y)) *_errno() = EDOM; #endif - return remquof(x, y, &q); + return remainderf(x, y); } +#endif /* _MSVCR_VER == 120 */ + +#if _MSVCR_VER>=120 + /********************************************************************* * _except1 (MSVCR120.@) * TODO:

1 0

Alexandre Julliard : msvcrt: Use the erf()/erfc()/erff()/erfcf() implementation from the bundled musl library.
by Alexandre Julliard 11 Apr '23

11 Apr '23

Module: wine Branch: master Commit: bfc3a2bdb3d189ca9221943aa606d66e692c4f89 URL: https://gitlab.winehq.org/wine/wine/-/commit/bfc3a2bdb3d189ca9221943aa606d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 30 18:00:27 2023 +0200 msvcrt: Use the erf()/erfc()/erff()/erfcf() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 369 ---------------------------------------------- libs/musl/src/math/erf.c | 5 +- libs/musl/src/math/erff.c | 5 +- 3 files changed, 8 insertions(+), 371 deletions(-)

1 0

Alexandre Julliard : msvcrt: Use the sqrtf() implementation from the bundled musl library.
by Alexandre Julliard 11 Apr '23

11 Apr '23

Module: wine Branch: master Commit: 20c53e72c9f1e8c3290d9026ddfc884c5c5c1b98 URL: https://gitlab.winehq.org/wine/wine/-/commit/20c53e72c9f1e8c3290d9026ddfc88… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 13:44:42 2023 +0200 msvcrt: Use the sqrtf() implementation from the bundled musl library. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/math.c | 62 +++------------------------------------------ dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 +-- libs/musl/src/math/sqrtf.c | 2 +- 9 files changed, 12 insertions(+), 68 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 6ef7befa344..3c969c9d307 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1791,7 +1791,7 @@ @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) @ cdecl sqrt(double) -@ cdecl -arch=!i386 sqrtf(float) +@ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) @ varargs sscanf_s(str str) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index bd44b4476cd..a071b0ead42 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2149,7 +2149,7 @@ @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) @ cdecl sqrt(double) -@ cdecl -arch=!i386 sqrtf(float) +@ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) @ varargs sscanf_s(str str) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index d4757be4a6f..3a502f9a8fe 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2360,7 +2360,7 @@ @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) @ cdecl sqrt(double) -@ cdecl -arch=!i386 sqrtf(float) +@ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) @ varargs sscanf_s(str str) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index a1273d7d995..2c3faa2233e 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1472,7 +1472,7 @@ @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) @ cdecl sqrt(double) -@ cdecl -arch=!i386 sqrtf(float) +@ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) @ varargs sscanf_s(str str) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index e199475aa30..11fa5fc1f61 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1444,7 +1444,7 @@ @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) @ cdecl sqrt(double) -@ cdecl -arch=!i386 sqrtf(float) +@ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) @ varargs sscanf_s(str str) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index f2d39076fd3..9d020e1f20d 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -288,6 +288,7 @@ float CDECL MSVCRT_atanf( float x ) } #endif +#ifdef __x86_64__ static BOOL sqrtf_validate( float *x ) { short c = _fdclass(*x); @@ -303,7 +304,6 @@ static BOOL sqrtf_validate( float *x ) return TRUE; } -#if defined(__x86_64__) || defined(__i386__) float CDECL sse2_sqrtf(float); __ASM_GLOBAL_FUNC( sse2_sqrtf, "sqrtss %xmm0, %xmm0\n\t" @@ -312,10 +312,8 @@ __ASM_GLOBAL_FUNC( sse2_sqrtf, /********************************************************************* * sqrtf (MSVCRT.@) - * - * Copied from musl: src/math/sqrtf.c */ -float CDECL sqrtf( float x ) +float CDECL MSVCRT_sqrtf( float x ) { #ifdef __x86_64__ if (!sqrtf_validate(&x)) @@ -323,61 +321,7 @@ float CDECL sqrtf( float x ) return sse2_sqrtf(x); #else - static const float tiny = 1.0e-30; - - float z; - int ix,s,q,m,t,i; - unsigned int r; - - ix = *(int*)&x; - - if (!sqrtf_validate(&x)) - return x; - - /* normalize x */ - m = ix >> 23; - if (m == 0) { /* subnormal x */ - for (i = 0; (ix & 0x00800000) == 0; i++) - ix <<= 1; - m -= i - 1; - } - m -= 127; /* unbias exponent */ - ix = (ix & 0x007fffff) | 0x00800000; - if (m & 1) /* odd m, double x to make it even */ - ix += ix; - m >>= 1; /* m = [m/2] */ - - /* generate sqrt(x) bit by bit */ - ix += ix; - q = s = 0; /* q = sqrt(x) */ - r = 0x01000000; /* r = moving bit from right to left */ - - while (r != 0) { - t = s + r; - if (t <= ix) { - s = t + r; - ix -= t; - q += r; - } - ix += ix; - r >>= 1; - } - - /* use floating add to find out rounding direction */ - if (ix != 0) { - z = 1.0f - tiny; /* raise inexact flag */ - if (z >= 1.0f) { - z = 1.0f + tiny; - if (z > 1.0f) - q += 2; - else - q += q & 1; - } - } - ix = (q >> 1) + 0x3f000000; - r = ix + ((unsigned int)m << 23); - z = *(float*)&r; - return z; + return sqrtf( x ); #endif } diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 3566e1e4728..7e0d3d62ba4 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1423,7 +1423,7 @@ @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) @ cdecl sqrt(double) -@ cdecl -arch=!i386 sqrtf(float) +@ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) @ varargs sscanf_s(str str) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 258a1aa945a..7394e3cc5d0 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1779,7 +1779,7 @@ @ cdecl _o_sinh(double) sinh @ cdecl -arch=!i386 _o_sinhf(float) sinhf @ cdecl _o_sqrt(double) sqrt -@ cdecl -arch=!i386 _o_sqrtf(float) sqrtf +@ cdecl -arch=!i386 _o_sqrtf(float) MSVCRT_sqrtf @ cdecl _o_srand(long) srand @ cdecl _o_strcat_s(str long str) strcat_s @ cdecl _o_strcoll(str str) strcoll @@ -2495,7 +2495,7 @@ @ cdecl sinh(double) @ cdecl -arch=!i386 sinhf(float) @ cdecl sqrt(double) -@ cdecl -arch=!i386 sqrtf(float) +@ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ cdecl strcat(str str) @ cdecl strcat_s(str long str) diff --git a/libs/musl/src/math/sqrtf.c b/libs/musl/src/math/sqrtf.c index d22a2a26141..45559f0bb66 100644 --- a/libs/musl/src/math/sqrtf.c +++ b/libs/musl/src/math/sqrtf.c @@ -24,7 +24,7 @@ float __cdecl sqrtf(float x) if (ix == 0x7f800000) return x; if (ix > 0x7f800000) - return __math_invalidf(x); + return math_error(_DOMAIN, "sqrtf", x, 0, (x - x) / (x - x)); /* x is subnormal, normalize it. */ ix = asuint(x * 0x1p23f); ix -= 23 << 23;

1 0

Alexandre Julliard : msvcrt: Use the sqrt() implementation from the bundled musl library.
by Alexandre Julliard 11 Apr '23

11 Apr '23

Module: wine Branch: master Commit: 75eb9877688b074642457caa2ccc959ea2d30d47 URL: https://gitlab.winehq.org/wine/wine/-/commit/75eb9877688b074642457caa2ccc95… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 13:53:09 2023 +0200 msvcrt: Use the sqrt() implementation from the bundled musl library. --- dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/math.c | 107 +++----------------------------------------- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 +- libs/musl/src/math/sqrt.c | 2 +- 13 files changed, 18 insertions(+), 115 deletions(-) diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec index 98d729b9eb1..c9aa44fcf91 100644 --- a/dlls/crtdll/crtdll.spec +++ b/dlls/crtdll/crtdll.spec @@ -468,7 +468,7 @@ @ cdecl sin(double) @ cdecl sinh(double) @ varargs sprintf(ptr str) -@ cdecl sqrt(double) +@ cdecl sqrt(double) MSVCRT_sqrt @ cdecl srand(long) @ varargs sscanf(str str) @ cdecl strcat(str str) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 3c969c9d307..3ebbe6cef16 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1790,7 +1790,7 @@ @ cdecl -arch=!i386 sinhf(float) @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) -@ cdecl sqrt(double) +@ cdecl sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index a071b0ead42..1032c9e4c7a 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2148,7 +2148,7 @@ @ cdecl -arch=!i386 sinhf(float) @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) -@ cdecl sqrt(double) +@ cdecl sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 3a502f9a8fe..ca11ea4b49d 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2359,7 +2359,7 @@ @ cdecl -arch=!i386 sinhf(float) @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) -@ cdecl sqrt(double) +@ cdecl sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index fe281841198..253df1cdbd8 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -816,7 +816,7 @@ @ cdecl sin(double) @ cdecl sinh(double) @ varargs sprintf(ptr str) -@ cdecl sqrt(double) +@ cdecl sqrt(double) MSVCRT_sqrt @ cdecl srand(long) @ varargs sscanf(str str) @ cdecl strcat(str str) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index ed9de904884..5f3bf499ad4 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -811,7 +811,7 @@ @ cdecl sin(double) @ cdecl sinh(double) @ varargs sprintf(ptr str) -@ cdecl sqrt(double) +@ cdecl sqrt(double) MSVCRT_sqrt @ cdecl srand(long) @ varargs sscanf(str str) @ cdecl strcat(str str) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 2c3faa2233e..9b040615693 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1471,7 +1471,7 @@ @ cdecl -arch=!i386 sinhf(float) @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) -@ cdecl sqrt(double) +@ cdecl sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 11fa5fc1f61..e9043c8c926 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1443,7 +1443,7 @@ @ cdecl -arch=!i386 sinhf(float) @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) -@ cdecl sqrt(double) +@ cdecl sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 9d020e1f20d..7fc9c44dbf5 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -77,12 +77,14 @@ void msvcrt_init_math( void *module ) #endif } +#if defined(__i386__) || defined(__x86_64__) static inline double ret_nan( BOOL update_sw ) { double x = 1.0; if (!update_sw) return -NAN; return (x - x) / (x - x); } +#endif #define SET_X87_CW(MASK) \ "subl $4, %esp\n\t" \ @@ -408,6 +410,7 @@ double CDECL MSVCRT_exp( double x ) } #endif +#if defined(__x86_64__) || defined(__i386__) static BOOL sqrt_validate( double *x, BOOL update_sw ) { short c = _dclass(*x); @@ -433,7 +436,6 @@ static BOOL sqrt_validate( double *x, BOOL update_sw ) return TRUE; } -#if defined(__x86_64__) || defined(__i386__) double CDECL sse2_sqrt(double); __ASM_GLOBAL_FUNC( sse2_sqrt, "sqrtsd %xmm0, %xmm0\n\t" @@ -452,10 +454,8 @@ __ASM_GLOBAL_FUNC( x87_sqrt, /********************************************************************* * sqrt (MSVCRT.@) - * - * Copied from musl: src/math/sqrt.c */ -double CDECL sqrt( double x ) +double CDECL MSVCRT_sqrt( double x ) { #ifdef __x86_64__ if (!sqrt_validate(&x, TRUE)) @@ -468,104 +468,7 @@ double CDECL sqrt( double x ) return x87_sqrt(x); #else - static const double tiny = 1.0e-300; - - double z; - int sign = 0x80000000; - int ix0,s0,q,m,t,i; - unsigned int r,t1,s1,ix1,q1; - ULONGLONG ix; - - if (!sqrt_validate(&x, TRUE)) - return x; - - ix = *(ULONGLONG*)&x; - ix0 = ix >> 32; - ix1 = ix; - - /* normalize x */ - m = ix0 >> 20; - if (m == 0) { /* subnormal x */ - while (ix0 == 0) { - m -= 21; - ix0 |= (ix1 >> 11); - ix1 <<= 21; - } - for (i=0; (ix0 & 0x00100000) == 0; i++) - ix0 <<= 1; - m -= i - 1; - ix0 |= ix1 >> (32 - i); - ix1 <<= i; - } - m -= 1023; /* unbias exponent */ - ix0 = (ix0 & 0x000fffff) | 0x00100000; - if (m & 1) { /* odd m, double x to make it even */ - ix0 += ix0 + ((ix1 & sign) >> 31); - ix1 += ix1; - } - m >>= 1; /* m = [m/2] */ - - /* generate sqrt(x) bit by bit */ - ix0 += ix0 + ((ix1 & sign) >> 31); - ix1 += ix1; - q = q1 = s0 = s1 = 0; /* [q,q1] = sqrt(x) */ - r = 0x00200000; /* r = moving bit from right to left */ - - while (r != 0) { - t = s0 + r; - if (t <= ix0) { - s0 = t + r; - ix0 -= t; - q += r; - } - ix0 += ix0 + ((ix1 & sign) >> 31); - ix1 += ix1; - r >>= 1; - } - - r = sign; - while (r != 0) { - t1 = s1 + r; - t = s0; - if (t < ix0 || (t == ix0 && t1 <= ix1)) { - s1 = t1 + r; - if ((t1&sign) == sign && (s1 & sign) == 0) - s0++; - ix0 -= t; - if (ix1 < t1) - ix0--; - ix1 -= t1; - q1 += r; - } - ix0 += ix0 + ((ix1 & sign) >> 31); - ix1 += ix1; - r >>= 1; - } - - /* use floating add to find out rounding direction */ - if ((ix0 | ix1) != 0) { - z = 1.0 - tiny; /* raise inexact flag */ - if (z >= 1.0) { - z = 1.0 + tiny; - if (q1 == (unsigned int)0xffffffff) { - q1 = 0; - q++; - } else if (z > 1.0) { - if (q1 == (unsigned int)0xfffffffe) - q++; - q1 += 2; - } else - q1 += q1 & 1; - } - } - ix0 = (q >> 1) + 0x3fe00000; - ix1 = q1 >> 1; - if (q & 1) - ix1 |= sign; - ix = ix0 + ((unsigned int)m << 20); - ix <<= 32; - ix |= ix1; - return *(double*)&ix; + return sqrt( x ); #endif } diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 7e0d3d62ba4..22da5acfcce 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1422,7 +1422,7 @@ @ cdecl -arch=!i386 sinhf(float) @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) -@ cdecl sqrt(double) +@ cdecl sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index e1f9e0a6cf3..2ab89d244cc 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -769,7 +769,7 @@ @ cdecl sin(double) @ cdecl sinh(double) @ varargs sprintf(ptr str) -@ cdecl sqrt(double) +@ cdecl sqrt(double) MSVCRT_sqrt @ cdecl srand(long) @ varargs sscanf(str str) @ cdecl strcat(str str) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 7394e3cc5d0..cad6cf1c381 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1778,7 +1778,7 @@ @ cdecl -arch=!i386 _o_sinf(float) sinf @ cdecl _o_sinh(double) sinh @ cdecl -arch=!i386 _o_sinhf(float) sinhf -@ cdecl _o_sqrt(double) sqrt +@ cdecl _o_sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 _o_sqrtf(float) MSVCRT_sqrtf @ cdecl _o_srand(long) srand @ cdecl _o_strcat_s(str long str) strcat_s @@ -2494,7 +2494,7 @@ @ cdecl -arch=!i386 sinf(float) @ cdecl sinh(double) @ cdecl -arch=!i386 sinhf(float) -@ cdecl sqrt(double) +@ cdecl sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ cdecl strcat(str str) diff --git a/libs/musl/src/math/sqrt.c b/libs/musl/src/math/sqrt.c index f0185ec855e..beee70a42b3 100644 --- a/libs/musl/src/math/sqrt.c +++ b/libs/musl/src/math/sqrt.c @@ -35,7 +35,7 @@ double __cdecl sqrt(double x) if (ix == 0x7ff0000000000000) return x; if (ix > 0x7ff0000000000000) - return __math_invalid(x); + return math_error(_DOMAIN, "sqrt", x, 0, (x - x) / (x - x)); /* x is subnormal, normalize it. */ ix = asuint64(x * 0x1p52); top = ix >> 52;

1 0

Alexandre Julliard : msvcrt: Use the _dclass()/_fdclass() implementation from the bundled musl library.
by Alexandre Julliard 11 Apr '23

11 Apr '23

Module: wine Branch: master Commit: d70a652da8b67ae78e4cac7b5731fd4806074fcf URL: https://gitlab.winehq.org/wine/wine/-/commit/d70a652da8b67ae78e4cac7b5731fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 14:08:41 2023 +0200 msvcrt: Use the _dclass()/_fdclass() implementation from the bundled musl library. --- dlls/msvcrt/math.c | 34 ++++------------------------------ 1 file changed, 4 insertions(+), 30 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 7fc9c44dbf5..a4d53934c04 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -207,36 +207,6 @@ float CDECL _chgsignf( float num ) #endif -/********************************************************************* - * _fdclass (MSVCR120.@) - * - * Copied from musl: src/math/__fpclassifyf.c - */ -short CDECL _fdclass(float x) -{ - union { float f; UINT32 i; } u = { x }; - int e = u.i >> 23 & 0xff; - - if (!e) return u.i << 1 ? FP_SUBNORMAL : FP_ZERO; - if (e == 0xff) return u.i << 9 ? FP_NAN : FP_INFINITE; - return FP_NORMAL; -} - -/********************************************************************* - * _dclass (MSVCR120.@) - * - * Copied from musl: src/math/__fpclassify.c - */ -short CDECL _dclass(double x) -{ - union { double f; UINT64 i; } u = { x }; - int e = u.i >> 52 & 0x7ff; - - if (!e) return u.i << 1 ? FP_SUBNORMAL : FP_ZERO; - if (e == 0x7ff) return (u.i << 12) ? FP_NAN : FP_INFINITE; - return FP_NORMAL; -} - #ifndef __i386__ /********************************************************************* @@ -291,6 +261,8 @@ float CDECL MSVCRT_atanf( float x ) #endif #ifdef __x86_64__ +extern short CDECL _fdclass(float x); + static BOOL sqrtf_validate( float *x ) { short c = _fdclass(*x); @@ -411,6 +383,8 @@ double CDECL MSVCRT_exp( double x ) #endif #if defined(__x86_64__) || defined(__i386__) +extern short CDECL _dclass(double x); + static BOOL sqrt_validate( double *x, BOOL update_sw ) { short c = _dclass(*x);

1 0