January 2020 - Wine-commits

Chip Davis : msvcrt: Correct return value of ___mb_cur_max_l_func().
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: b6a6fd987a3046f02bd718df70ffe5b899baffb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6a6fd987a3046f02bd718df… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Sun Jan 26 20:15:16 2020 -0600 msvcrt: Correct return value of ___mb_cur_max_l_func(). Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr90/tests/msvcr90.c | 26 ++++++++++++++++++++++++++ dlls/msvcrt/mbcs.c | 4 ++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 9e7d280cf8..c8a49f2549 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -136,6 +136,9 @@ static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t, _locale_t); static int (__cdecl *p__vsnwprintf)(wchar_t *buffer,size_t count, const wchar_t *format, __ms_va_list valist); static size_t (__cdecl *p___strncnt)(const char *str, size_t count); static int (__cdecl *p_swscanf)(const wchar_t *str, const wchar_t* format, ...); +static int (__cdecl *p____mb_cur_max_l_func)(_locale_t locale); +static _locale_t (__cdecl *p__create_locale)(int, const char*); +static void (__cdecl *p__free_locale)(_locale_t); /* make sure we use the correct errno */ #undef errno @@ -402,6 +405,9 @@ static BOOL init(void) SET(p__vsnwprintf, "_vsnwprintf"); SET(p___strncnt, "__strncnt"); SET(p_swscanf, "swscanf"); + SET(p____mb_cur_max_l_func, "___mb_cur_max_l_func"); + SET(p__create_locale, "_create_locale"); + SET(p__free_locale, "_free_locale"); if (sizeof(void *) == 8) { @@ -1936,6 +1942,25 @@ static void test_swscanf(void) ok( ret == (short)WEOF, "ret = %d\n", ret ); } +static void test____mb_cur_max_l_func(void) +{ + int ret; + _locale_t l; + + ret = p____mb_cur_max_l_func(NULL); + ok( ret == 1, "MB_CUR_MAX_L(NULL) = %d\n", ret ); + + l = p__create_locale(LC_ALL, "chinese-traditional"); + if (!l) + { + skip("DBCS locale not available\n"); + return; + } + ret = p____mb_cur_max_l_func(l); + ok( ret == 2, "MB_CUR_MAX_L(cht) = %d\n", ret ); + p__free_locale(l); +} + START_TEST(msvcr90) { if(!init()) @@ -1975,4 +2000,5 @@ START_TEST(msvcr90) #endif test___strncnt(); test_swscanf(); + test____mb_cur_max_l_func(); } diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index a9dbcfff66..39f94b17a3 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -184,7 +184,7 @@ int CDECL MSVCRT____mb_cur_max_func(void) /********************************************************************* * ___mb_cur_max_l_func (MSVCR80.@) */ -int* CDECL ___mb_cur_max_l_func(MSVCRT__locale_t locale) +int CDECL ___mb_cur_max_l_func(MSVCRT__locale_t locale) { MSVCRT_pthreadlocinfo locinfo; @@ -193,7 +193,7 @@ int* CDECL ___mb_cur_max_l_func(MSVCRT__locale_t locale) else locinfo = locale->locinfo; - return &locinfo->mb_cur_max; + return locinfo->mb_cur_max; } #endif

1 0

Jacek Caban : winegcc: Use Wine crt when linking to msvcrt.
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: 1867a411b0a874d2a9cadb391485fb29a3b99074 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1867a411b0a874d2a9cadb39… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 24 11:09:47 2020 +0100 winegcc: Use Wine crt when linking to msvcrt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 21853d6fb3..a335332225 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -437,8 +437,8 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) else strarray_add( flags, opts->gui_app ? "-mwindows" : "-mconsole" ); if (opts->unicode_app) strarray_add( flags, "-municode" ); - if (opts->nodefaultlibs || opts->wine_builtin) strarray_add( flags, "-nodefaultlibs" ); - if (opts->nostartfiles || opts->wine_builtin) strarray_add( flags, "-nostartfiles" ); + if (opts->nodefaultlibs || opts->use_msvcrt) strarray_add( flags, "-nodefaultlibs" ); + if (opts->nostartfiles || opts->use_msvcrt) strarray_add( flags, "-nostartfiles" ); if (opts->subsystem) strarray_add( flags, strmake("-Wl,--subsystem,%s", opts->subsystem )); strarray_add( flags, "-Wl,--nxcompat" ); @@ -1096,7 +1096,7 @@ static void build(struct options* opts) { if (opts->subsystem && !strcmp( opts->subsystem, "native" )) entry_point = opts->target_cpu == CPU_x86 ? "_DriverEntry(a)8" : "DriverEntry"; - else if(opts->wine_builtin && !opts->shared && !opts->win16_app) + else if(opts->use_msvcrt && !opts->shared && !opts->win16_app) { if (opts->unicode_app) entry_point = opts->target_cpu == CPU_x86 ? "_wmainCRTStartup" : "wmainCRTStartup"; @@ -1196,7 +1196,7 @@ static void build(struct options* opts) /* link everything together now */ link_args = get_link_args( opts, output_name ); - if ((opts->nodefaultlibs || opts->wine_builtin) && is_pe) + if ((opts->nodefaultlibs || opts->use_msvcrt) && is_pe) { libgcc = find_libgcc(opts->prefix, link_args); if (!libgcc) libgcc = "-lgcc";

1 0

Michael Stefaniuc : dmsynth: Avoid the LPDIRECTMUSICSYNTHSINK type.
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: d0887f554c2a73ba6612cbbcec08f5f364b0c64c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0887f554c2a73ba6612cbbc… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jan 26 21:51:34 2020 +0100 dmsynth: Avoid the LPDIRECTMUSICSYNTHSINK type. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/synthsink.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index 7d148b0e9f..46011eae27 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -33,7 +33,8 @@ static inline IDirectMusicSynthSinkImpl *impl_from_IDirectMusicSynthSink(IDirect } /* IDirectMusicSynthSinkImpl IUnknown part: */ -static HRESULT WINAPI IDirectMusicSynthSinkImpl_QueryInterface(LPDIRECTMUSICSYNTHSINK iface, REFIID riid, LPVOID *ret_iface) +static HRESULT WINAPI IDirectMusicSynthSinkImpl_QueryInterface(IDirectMusicSynthSink *iface, + REFIID riid, void **ret_iface) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); @@ -60,7 +61,7 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_QueryInterface(LPDIRECTMUSICSYNT return E_NOINTERFACE; } -static ULONG WINAPI IDirectMusicSynthSinkImpl_AddRef(LPDIRECTMUSICSYNTHSINK iface) +static ULONG WINAPI IDirectMusicSynthSinkImpl_AddRef(IDirectMusicSynthSink *iface) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); ULONG ref = InterlockedIncrement(&This->ref); @@ -70,7 +71,7 @@ static ULONG WINAPI IDirectMusicSynthSinkImpl_AddRef(LPDIRECTMUSICSYNTHSINK ifac return ref; } -static ULONG WINAPI IDirectMusicSynthSinkImpl_Release(LPDIRECTMUSICSYNTHSINK iface) +static ULONG WINAPI IDirectMusicSynthSinkImpl_Release(IDirectMusicSynthSink *iface) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); ULONG ref = InterlockedDecrement(&This->ref); @@ -88,7 +89,8 @@ static ULONG WINAPI IDirectMusicSynthSinkImpl_Release(LPDIRECTMUSICSYNTHSINK ifa } /* IDirectMusicSynthSinkImpl IDirectMusicSynthSink part: */ -static HRESULT WINAPI IDirectMusicSynthSinkImpl_Init(LPDIRECTMUSICSYNTHSINK iface, IDirectMusicSynth* synth) +static HRESULT WINAPI IDirectMusicSynthSinkImpl_Init(IDirectMusicSynthSink *iface, + IDirectMusicSynth *synth) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); @@ -97,7 +99,8 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_Init(LPDIRECTMUSICSYNTHSINK ifac return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetMasterClock(LPDIRECTMUSICSYNTHSINK iface, IReferenceClock* clock) +static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetMasterClock(IDirectMusicSynthSink *iface, + IReferenceClock *clock) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); @@ -106,7 +109,8 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetMasterClock(LPDIRECTMUSICSYNT return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_GetLatencyClock(LPDIRECTMUSICSYNTHSINK iface, IReferenceClock** clock) +static HRESULT WINAPI IDirectMusicSynthSinkImpl_GetLatencyClock(IDirectMusicSynthSink *iface, + IReferenceClock **clock) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); @@ -121,7 +125,8 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_GetLatencyClock(LPDIRECTMUSICSYN return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_Activate(LPDIRECTMUSICSYNTHSINK iface, BOOL enable) +static HRESULT WINAPI IDirectMusicSynthSinkImpl_Activate(IDirectMusicSynthSink *iface, + BOOL enable) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); @@ -130,7 +135,8 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_Activate(LPDIRECTMUSICSYNTHSINK return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_SampleToRefTime(LPDIRECTMUSICSYNTHSINK iface, LONGLONG sample_time, REFERENCE_TIME* ref_time) +static HRESULT WINAPI IDirectMusicSynthSinkImpl_SampleToRefTime(IDirectMusicSynthSink *iface, + LONGLONG sample_time, REFERENCE_TIME *ref_time) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); @@ -139,7 +145,8 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_SampleToRefTime(LPDIRECTMUSICSYN return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_RefTimeToSample(LPDIRECTMUSICSYNTHSINK iface, REFERENCE_TIME ref_time, LONGLONG* sample_time) +static HRESULT WINAPI IDirectMusicSynthSinkImpl_RefTimeToSample(IDirectMusicSynthSink *iface, + REFERENCE_TIME ref_time, LONGLONG *sample_time) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); @@ -148,7 +155,8 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_RefTimeToSample(LPDIRECTMUSICSYN return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetDirectSound(LPDIRECTMUSICSYNTHSINK iface, LPDIRECTSOUND dsound, LPDIRECTSOUNDBUFFER dsound_buffer) +static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetDirectSound(IDirectMusicSynthSink *iface, + IDirectSound *dsound, IDirectSoundBuffer *dsound_buffer) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); @@ -157,7 +165,8 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetDirectSound(LPDIRECTMUSICSYNT return S_OK; } -static HRESULT WINAPI IDirectMusicSynthSinkImpl_GetDesiredBufferSize(LPDIRECTMUSICSYNTHSINK iface, LPDWORD buffer_size_in_samples) +static HRESULT WINAPI IDirectMusicSynthSinkImpl_GetDesiredBufferSize(IDirectMusicSynthSink *iface, + DWORD *buffer_size_in_samples) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface);

1 0

Michael Stefaniuc : dmsynth: Avoid the LPDIRECTMUSICSYNTH8 type.
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: e4e507a16c3b7ec3900e40ad04e1dd5ac20a3db8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4e507a16c3b7ec3900e40ad… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jan 26 21:51:35 2020 +0100 dmsynth: Avoid the LPDIRECTMUSICSYNTH8 type. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/synth.c | 73 +++++++++++++++++++++++++++++++++------------------- 1 file changed, 47 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e4e507a16c3b7ec3900e…

1 0

Michael Stefaniuc : dmcompos: Partially implement Chord Map track GetParam/SetParam methods.
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: 9bc84396dea8af2ac05e8c36cedc146bae3b4b8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bc84396dea8af2ac05e8c36… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jan 26 21:51:36 2020 +0100 dmcompos: Partially implement Chord Map track GetParam/SetParam methods. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmcompos/chordmaptrack.c | 38 ++++++++++++++++++++++++++++---------- dlls/dmcompos/tests/dmcompos.c | 6 ++---- 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/dlls/dmcompos/chordmaptrack.c b/dlls/dmcompos/chordmaptrack.c index b60b06768b..cf4f825986 100644 --- a/dlls/dmcompos/chordmaptrack.c +++ b/dlls/dmcompos/chordmaptrack.c @@ -117,20 +117,38 @@ static HRESULT WINAPI chordmap_track_Play(IDirectMusicTrack8 *iface, void *pStat return S_OK; } -static HRESULT WINAPI chordmap_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) +static HRESULT WINAPI chordmap_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, MUSIC_TIME *next, void *param) { - IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); + + if (!type) + return E_POINTER; + if (!IsEqualGUID(type, &GUID_IDirectMusicChordMap)) + return DMUS_E_GET_UNSUPPORTED; + + FIXME("GUID_IDirectMusicChordMap not handled yet\n"); + + return S_OK; } -static HRESULT WINAPI chordmap_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, void *pParam) +static HRESULT WINAPI chordmap_track_SetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, void *param) { - IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam); - return S_OK; + IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + + if (!type) + return E_POINTER; + if (!IsEqualGUID(type, &GUID_IDirectMusicChordMap)) + return DMUS_E_SET_UNSUPPORTED; + + FIXME("GUID_IDirectMusicChordMap not handled yet\n"); + + return S_OK; } static HRESULT WINAPI chordmap_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index f041d0ac34..d4dbd2206c 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -321,12 +321,10 @@ static void test_chordmaptrack(void) ok(hr == S_OK, "IDirectMusicTrack8_EndPlay failed: %08x\n", hr); hr = IDirectMusicTrack8_Play(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); ok(hr == S_OK, "IDirectMusicTrack8_Play failed: %08x\n", hr); - todo_wine { hr = IDirectMusicTrack8_GetParam(dmt8, NULL, 0, NULL, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); - } hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); @@ -348,11 +346,11 @@ static void test_chordmaptrack(void) "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", unsupported[i].name, hr); hr = IDirectMusicTrack8_GetParam(dmt8, unsupported[i].type, 0, NULL, &chordmap); - todo_wine ok(hr == DMUS_E_GET_UNSUPPORTED, + ok(hr == DMUS_E_GET_UNSUPPORTED, "GetParam(%s) failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", unsupported[i].name, hr); hr = IDirectMusicTrack8_SetParam(dmt8, unsupported[i].type, 0, chordmap); - todo_wine ok(hr == DMUS_E_SET_UNSUPPORTED, + ok(hr == DMUS_E_SET_UNSUPPORTED, "SetParam(%s) failed: %08x, expected DMUS_E_SET_UNSUPPORTED\n", unsupported[i].name, hr); }

1 0

Zebediah Figura : winegstreamer: Support converting color spaces within the splitter filter.
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: f5a1e2bd87754a2822f2eb0e84291d787936d115 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5a1e2bd87754a2822f2eb0e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 24 19:55:09 2020 -0600 winegstreamer: Support converting color spaces within the splitter filter. The idea being firstly that it's more efficient to handle this all within one GStreamer pipeline, especially since we may need to be converting color spaces anyway (for videoflip), and secondly that this renders obsolete the color space converter transform filters in gsttffilter.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 238 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 219 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f5a1e2bd87754a2822f2…

1 0

Zebediah Figura : winegstreamer: Get rid of the YUV-to-(A)RGB converters.
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: 841502993f6f9b133dbf4a17e58f243fb878708d URL: https://source.winehq.org/git/wine.git/?a=commit;h=841502993f6f9b133dbf4a17… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 24 19:55:10 2020 -0600 winegstreamer: Get rid of the YUV-to-(A)RGB converters. This is handled by the splitter filter now. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_guids.h | 2 - dlls/winegstreamer/gst_private.h | 2 - dlls/winegstreamer/gsttffilter.c | 217 --------------------------------------- dlls/winegstreamer/main.c | 52 ---------- 4 files changed, 273 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=841502993f6f9b133dbf…

1 0

Jacek Caban : msvcrt: Provide exp2f in importlib.
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: df5b1f8350cd574da1234937ba6d0e41853e9b29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df5b1f8350cd574da1234937… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 24 11:08:15 2020 +0100 msvcrt: Provide exp2f in importlib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/mathf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msvcrt/mathf.c b/dlls/msvcrt/mathf.c index 4aff6d7008..c2db0c54c3 100644 --- a/dlls/msvcrt/mathf.c +++ b/dlls/msvcrt/mathf.c @@ -40,4 +40,5 @@ float ceilf(float x) { return ceil(x); } #if _MSVCR_VER < 120 double exp2(double x) { return pow(2.0, x); } +float exp2f(float x) { return powf(2.0f, x); } #endif

1 0

Alexandre Julliard : sfnt2fon: Directly store the codepage tables for the few encodings we need.
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: 62069b4ee82a516cd09afabb85c8a7a91d8b007d URL: https://source.winehq.org/git/wine.git/?a=commit;h=62069b4ee82a516cd09afabb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 26 15:51:17 2020 +0100 sfnt2fon: Directly store the codepage tables for the few encodings we need. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/sfnt2fon/sfnt2fon.c | 230 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 200 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=62069b4ee82a516cd09a…

1 0

Zebediah Figura : http.sys: Translate WSAEADDRINUSE to STATUS_SHARING_VIOLATION.
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: 533acfb1f62233f875461c6527500b5a1165121e URL: https://source.winehq.org/git/wine.git/?a=commit;h=533acfb1f62233f875461c65… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 24 13:55:37 2020 -0600 http.sys: Translate WSAEADDRINUSE to STATUS_SHARING_VIOLATION. Fixes intermittent failures on the Debian 10 testbot. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 7 ++++++- dlls/httpapi/tests/httpapi.c | 6 ++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 91d81400e6..4259ca618f 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -1104,10 +1104,15 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) addr.sin_addr.S_un.S_addr = INADDR_ANY; if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) == -1) { - ERR("Failed to bind socket, error %u.\n", WSAGetLastError()); LeaveCriticalSection(&http_cs); closesocket(s); heap_free(url); + if (WSAGetLastError() == WSAEADDRINUSE) + { + WARN("Address %s is already in use.\n", debugstr_a(params->url)); + return STATUS_SHARING_VIOLATION; + } + ERR("Failed to bind socket, error %u.\n", WSAGetLastError()); return STATUS_UNSUCCESSFUL; } diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index ee585948ab..a52a3f6c34 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -113,8 +113,9 @@ static unsigned short add_url_v1(HANDLE queue) for (port = 50000; port < 51000; ++port) { swprintf(url, ARRAY_SIZE(url), L"http://localhost:%u/", port); - if ((ret = HttpAddUrl(queue, url, NULL)) != ERROR_SHARING_VIOLATION) + if (!(ret = HttpAddUrl(queue, url, NULL))) return port; + ok(ret == ERROR_SHARING_VIOLATION, "Failed to add %s, error %u.\n", debugstr_w(url), ret); } ok(0, "Failed to add url %s, error %u.\n", debugstr_w(url), ret); return 0; @@ -129,8 +130,9 @@ static ULONG add_url_v2(HTTP_URL_GROUP_ID group) for (port = 50010; port < 51000; ++port) { swprintf(url, ARRAY_SIZE(url), L"http://localhost:%u/", port); - if ((ret = pHttpAddUrlToUrlGroup(group, url, 0xdeadbeef, 0)) != ERROR_SHARING_VIOLATION) + if (!(ret = pHttpAddUrlToUrlGroup(group, url, 0xdeadbeef, 0))) return port; + ok(ret == ERROR_SHARING_VIOLATION, "Failed to add %s, error %u.\n", debugstr_w(url), ret); } ok(0, "Failed to add url %s, error %u.\n", debugstr_w(url), ret); return 0;

1 0