September 2019 - Wine-commits

Akihiro Sagawa : msvcrt: Reimplement _mbsspnp using _mbsspn.
by Alexandre Julliard 02 Sep '19

02 Sep '19

Module: wine Branch: master Commit: ab525d3f6f813e23af8164ed2d6023f3eeb3e018 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab525d3f6f813e23af8164ed… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Sep 2 19:50:29 2019 +0200 msvcrt: Reimplement _mbsspnp using _mbsspn. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47693 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/mbcs.c | 47 +++++++++++++++------------------------------- dlls/msvcrt/tests/string.c | 4 ++-- 2 files changed, 17 insertions(+), 34 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index cc2a9f2..6f965f5 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2028,19 +2028,26 @@ int CDECL _mbsupr_s(unsigned char* s, MSVCRT_size_t len) MSVCRT_size_t CDECL _mbsspn(const unsigned char* string, const unsigned char* set) { const unsigned char *p, *q; - unsigned int pc, qc; for (p = string; *p; p++) { - pc = _mbsnextc(p); for (q = set; *q; q++) { - qc = _mbsnextc(q); - if (pc == qc) break; - if (qc > 255 && q[1]) q++; + if (_ismbblead(*q)) + { + if (p[0] == q[0] && p[1] == q[1]) + { + p++; + break; + } + q++; + } + else + { + if (p[0] == q[0]) break; + } } if (!*q) break; - if (pc > 255 && p[1]) p++; } return p - string; } @@ -2050,32 +2057,8 @@ MSVCRT_size_t CDECL _mbsspn(const unsigned char* string, const unsigned char* se */ unsigned char* CDECL _mbsspnp(const unsigned char* string, const unsigned char* set) { - const unsigned char *p, *q; - - for (p = string; *p; p++) - { - if (_ismbblead(*p)) - { - for (q = set; *q; q += 2) - { - if (!q[1]) - break; - if ((*p == *q) && (p[1] == q[1])) - break; - } - if (!q[0] || !q[1]) break; - } - else - { - for (q = set; *q; q++) - if (*p == *q) - break; - if (!*q) break; - } - } - if (*p == '\0') - return NULL; - return (unsigned char *)p; + string += _mbsspn( string, set ); + return *string ? (unsigned char*)string : NULL; } /********************************************************************* diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index ed459bc..b937f17 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -565,13 +565,13 @@ static void test_mbsspnp( void) _setmbcp( 932); ret=_mbsspnp( mbstr, mbset1); - todo_wine ok( ret==mbstr+8, "_mbsspnp returns %p should be %p\n", ret, mbstr+8); + ok( ret==mbstr+8, "_mbsspnp returns %p should be %p\n", ret, mbstr+8); ret=_mbsspnp( mbstr, mbset2); ok( ret==mbstr+1, "_mbsspnp returns %p should be %p\n", ret, mbstr+1); ret=_mbsspnp( mbstr+8, mbset1); ok( ret==mbstr+8, "_mbsspnp returns %p should be %p\n", ret, mbstr+8); ret=_mbsspnp( mbstr+8, mbset2); - todo_wine ok( ret==mbstr+10, "_mbsspnp returns %p should be %p\n", ret, mbstr+10); + ok( ret==mbstr+10, "_mbsspnp returns %p should be %p\n", ret, mbstr+10); _setmbcp( cp); }

1 0

Piotr Caban : msvcrt: Match broken multi-byte character with everything in _mbsspn.
by Alexandre Julliard 02 Sep '19

02 Sep '19

Module: wine Branch: master Commit: 702b1e29d51ba4a903d20df85e2254d444d43ce0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=702b1e29d51ba4a903d20df8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 2 19:50:37 2019 +0200 msvcrt: Match broken multi-byte character with everything in _mbsspn. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/mbcs.c | 3 +++ dlls/msvcrt/tests/string.c | 3 +++ dlls/ucrtbase/tests/string.c | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 6f965f5..fe47e55 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2035,6 +2035,9 @@ MSVCRT_size_t CDECL _mbsspn(const unsigned char* string, const unsigned char* se { if (_ismbblead(*q)) { + /* duplicate a bug in native implementation */ + if (!q[1]) break; + if (p[0] == q[0] && p[1] == q[1]) { p++; diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index b937f17..3ecafbd 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -519,6 +519,7 @@ static void test_mbsspn( void) unsigned char mbstr[]=" 2019\x94\x4e" "6\x8c\x8e" "29\x93\xfa"; unsigned char mbset1[]="0123456789 \x94\x4e"; unsigned char mbset2[]=" \x94\x4e\x8c\x8e"; + unsigned char mbset3[]="\x8e"; int ret, cp = _getmbcp(); ret=_mbsspn( str1, set); @@ -537,6 +538,8 @@ static void test_mbsspn( void) ok( ret==0, "_mbsspn returns %d should be 0\n", ret); ret=_mbsspn( mbstr+8, mbset2); ok( ret==2, "_mbsspn returns %d should be 2\n", ret); + ret=_mbsspn( mbstr, mbset3); + ok( ret==14, "_mbsspn returns %d should be 14\n", ret); _setmbcp( cp); } diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index e968431..e4146c6 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -80,6 +80,9 @@ static int (__cdecl *p__towupper_l)(wint_t, _locale_t); static char* (__cdecl *p_setlocale)(int, const char*); static _locale_t (__cdecl *p__create_locale)(int, const char*); static void (__cdecl *p__free_locale)(_locale_t); +static int (__cdecl *p__getmbcp)(void); +static int (__cdecl *p__setmbcp)(int); +static size_t (__cdecl *p__mbsspn)(const unsigned char*, const unsigned char*); static BOOL init(void) { @@ -104,6 +107,9 @@ static BOOL init(void) p_setlocale = (void*)GetProcAddress(module, "setlocale"); p__create_locale = (void*)GetProcAddress(module, "_create_locale"); p__free_locale = (void*)GetProcAddress(module, "_free_locale"); + p__getmbcp = (void*)GetProcAddress(module, "_getmbcp"); + p__setmbcp = (void*)GetProcAddress(module, "_setmbcp"); + p__mbsspn = (void*)GetProcAddress(module, "_mbsspn"); return TRUE; } @@ -339,6 +345,40 @@ static void test_C_locale(void) } } +static void test_mbsspn( void) +{ + unsigned char str1[] = "cabernet"; + unsigned char str2[] = "shiraz"; + unsigned char set[] = "abc"; + unsigned char empty[] = ""; + unsigned char mbstr[] = " 2019\x94\x4e" "6\x8c\x8e" "29\x93\xfa"; + unsigned char mbset1[] = "0123456789 \x94\x4e"; + unsigned char mbset2[] = " \x94\x4e\x8c\x8e"; + unsigned char mbset3[] = "\x8e"; + int ret, cp = p__getmbcp(); + + ret = p__mbsspn(str1, set); + ok(ret == 3, "_mbsspn returns %d should be 3\n", ret); + ret = p__mbsspn(str2, set); + ok(ret == 0, "_mbsspn returns %d should be 0\n", ret); + ret = p__mbsspn(str1, empty); + ok(ret == 0, "_mbsspn returns %d should be 0\n", ret); + + p__setmbcp(932); + ret = p__mbsspn(mbstr, mbset1); + ok(ret == 8, "_mbsspn returns %d should be 8\n", ret); + ret = p__mbsspn(mbstr, mbset2); + ok(ret == 1, "_mbsspn returns %d should be 1\n", ret); + ret = p__mbsspn(mbstr+8, mbset1); + ok(ret == 0, "_mbsspn returns %d should be 0\n", ret); + ret = p__mbsspn(mbstr+8, mbset2); + ok(ret == 2, "_mbsspn returns %d should be 2\n", ret); + ret = p__mbsspn(mbstr, mbset3); + ok(ret == 14, "_mbsspn returns %d should be 14\n", ret); + + p__setmbcp(cp); +} + START_TEST(string) { if (!init()) return; @@ -347,4 +387,5 @@ START_TEST(string) test__memicmp_l(); test___strncnt(); test_C_locale(); + test_mbsspn(); }

1 0

Andrey Gusev : wininet/tests: Remove LPVOID cast.
by Alexandre Julliard 02 Sep '19

02 Sep '19

Module: wine Branch: master Commit: a1d966e49454dc3d3d24276d938b6218e117a440 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1d966e49454dc3d3d24276d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Sep 2 21:13:33 2019 +0300 wininet/tests: Remove LPVOID cast. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 6db33e4..cb96abe 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -5524,7 +5524,7 @@ static void test_http_connection(void) si.hEvent = CreateEventW(NULL, 0, 0, NULL); si.port = 7531; - hThread = CreateThread(NULL, 0, server_thread, (LPVOID) &si, 0, &id); + hThread = CreateThread(NULL, 0, server_thread, &si, 0, &id); ok( hThread != NULL, "create thread failed\n"); r = WaitForSingleObject(si.hEvent, 10000);

1 0

Andrey Gusev : winhttp/tests: Remove LPVOID casts.
by Alexandre Julliard 02 Sep '19

02 Sep '19

Module: wine Branch: master Commit: 69e5f90940bc2cb13fbc629a25f0fcd4b87333cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=69e5f90940bc2cb13fbc629a… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Sep 2 16:34:53 2019 +0300 winhttp/tests: Remove LPVOID casts. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/notification.c | 2 +- dlls/winhttp/tests/winhttp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 510d9e7..e2bbb71 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -1023,7 +1023,7 @@ START_TEST (notification) si.event = CreateEventW( NULL, 0, 0, NULL ); si.port = 7533; - thread = CreateThread( NULL, 0, server_thread, (LPVOID)&si, 0, NULL ); + thread = CreateThread( NULL, 0, server_thread, &si, 0, NULL ); ok(thread != NULL, "failed to create thread %u\n", GetLastError()); server_socket_available = CreateEventW( NULL, 0, 0, NULL ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index eb7c7b5..b005514 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -4842,7 +4842,7 @@ START_TEST (winhttp) si.event = CreateEventW(NULL, 0, 0, NULL); si.port = 7532; - thread = CreateThread(NULL, 0, server_thread, (LPVOID)&si, 0, NULL); + thread = CreateThread(NULL, 0, server_thread, &si, 0, NULL); ok(thread != NULL, "failed to create thread %u\n", GetLastError()); ret = WaitForSingleObject(si.event, 10000);

1 0

Michael Stefaniuc : strmbase: Don't cast from COM object to interface.
by Alexandre Julliard 02 Sep '19

02 Sep '19

Module: wine Branch: master Commit: 5f9d10561a61fd89bc1ca83176681756cd144a9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f9d10561a61fd89bc1ca831… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Sep 2 12:17:29 2019 +0200 strmbase: Don't cast from COM object to interface. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/transform.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index e03874b..fdecc8d 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -351,9 +351,9 @@ HRESULT strmbase_transform_create(LONG filter_size, IUnknown *outer, const CLSID return E_FAIL; } -HRESULT WINAPI TransformFilterImpl_Notify(TransformFilter *iface, IBaseFilter *sender, Quality qm) +HRESULT WINAPI TransformFilterImpl_Notify(TransformFilter *filter, IBaseFilter *sender, Quality qm) { - return QualityControlImpl_Notify((IQualityControl*)iface->qcimpl, sender, qm); + return QualityControlImpl_Notify(&filter->qcimpl->IQualityControl_iface, sender, qm); } static HRESULT WINAPI TransformFilter_InputPin_EndOfStream(IPin * iface)

1 0

Michael Stefaniuc : quartz: Don't cast from COM object to interface.
by Alexandre Julliard 02 Sep '19

02 Sep '19

Module: wine Branch: master Commit: c2aec6a0778fa2afc2b9b10719e570b21c1eba7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2aec6a0778fa2afc2b9b107… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Sep 2 12:18:35 2019 +0200 quartz: Don't cast from COM object to interface. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 6451f85..3478f95 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -394,7 +394,7 @@ static HRESULT WINAPI DSoundRender_DoRenderSample(BaseRenderer *iface, IMediaSam q.Proportion = 1000; q.Late = jitter; q.TimeStamp = tStart; - IQualityControl_Notify((IQualityControl *)This->renderer.qcimpl, (IBaseFilter*)This, q); + IQualityControl_Notify((IQualityControl *)This->renderer.qcimpl, &This->renderer.filter.IBaseFilter_iface, q); } return hr; }

1 0

Alexandre Julliard : configure: Don't link to libunwind if not necessary.
by Alexandre Julliard 02 Sep '19

02 Sep '19

Module: wine Branch: master Commit: 4b299b286d73648250fedd699f2ef98e73a5e1a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b299b286d73648250fedd69… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 2 20:44:56 2019 +0200 configure: Don't link to libunwind if not necessary. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 0377509..e374edf 100755 --- a/configure +++ b/configure @@ -14904,9 +14904,9 @@ rm -f core conftest.err conftest.$ac_objext \ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_have_libunwind_unw_getcontext" >&5 $as_echo "$wine_cv_have_libunwind_unw_getcontext" >&6; } - test "$wine_cv_have_libunwind_unw_getcontext" = yes || UNWIND_LIBS="" LIBS=$save_libs fi + test "$wine_cv_have_libunwind_unw_getcontext" = yes || UNWIND_LIBS="" if test "x$wine_cv_have_unw_getcontext$wine_cv_have_libunwind_unw_getcontext" != xnono then diff --git a/configure.ac b/configure.ac index d0af7ef..ff81a17 100644 --- a/configure.ac +++ b/configure.ac @@ -1697,9 +1697,9 @@ then [[unw_context_t context; unw_getcontext( &context );]])], [wine_cv_have_libunwind_unw_getcontext="yes"], [wine_cv_have_libunwind_unw_getcontext="no"])]) - test "$wine_cv_have_libunwind_unw_getcontext" = yes || UNWIND_LIBS="" LIBS=$save_libs fi + test "$wine_cv_have_libunwind_unw_getcontext" = yes || UNWIND_LIBS="" if test "x$wine_cv_have_unw_getcontext$wine_cv_have_libunwind_unw_getcontext" != xnono then AC_DEFINE(HAVE_LIBUNWIND,1,[Define to 1 if you have the `unwind' library (-lunwind).])

1 0

Naveen Narayanan : libwine: Only link libi386 with the libraries that need it.
by Alexandre Julliard 02 Sep '19

02 Sep '19

Module: wine Branch: master Commit: 624bcd314c3047bcfddd0db144cbaa32df1f9c0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=624bcd314c3047bcfddd0db1… Author: Naveen Narayanan <zerous(a)nocebo.space> Date: Mon Sep 2 04:16:28 2019 +0200 libwine: Only link libi386 with the libraries that need it. In particular it does not make sense to link executables and dlls built with MinGW with it. Signed-off-by: Francois Gouget <fgouget(a)icodeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 10 ++++------ configure.ac | 2 +- include/config.h.in | 3 --- libs/wine/Makefile.in | 3 ++- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/configure b/configure index e374edf..a52e346 100755 --- a/configure +++ b/configure @@ -752,6 +752,7 @@ LDRPATH_INSTALL DLLFLAGS CPP OPENGL_LIBS +I386_LIBS ICOTOOL CONVERT RSVG @@ -6857,11 +6858,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_i386_i386_set_ldt" >&5 $as_echo "$ac_cv_lib_i386_i386_set_ldt" >&6; } if test "x$ac_cv_lib_i386_i386_set_ldt" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBI386 1 -_ACEOF - - LIBS="-li386 $LIBS" + I386_LIBS="-li386" fi @@ -19770,7 +19767,8 @@ ac_config_commands="$ac_config_commands include/stamp-h" $as_echo_n "creating Makefile rules..." >&6 -ALL_VARS_RULES="OPENGL_LIBS = $OPENGL_LIBS +ALL_VARS_RULES="I386_LIBS = $I386_LIBS +OPENGL_LIBS = $OPENGL_LIBS COREFOUNDATION_LIBS = $COREFOUNDATION_LIBS IOKIT_LIBS = $IOKIT_LIBS FORCEFEEDBACK_LIBS = $FORCEFEEDBACK_LIBS diff --git a/configure.ac b/configure.ac index ff81a17..1592812 100644 --- a/configure.ac +++ b/configure.ac @@ -409,7 +409,7 @@ WINE_WARNING_WITH(gettext,[test "$MSGFMT" = false], dnl **** Check for some libraries **** dnl Check for -li386 for NetBSD and OpenBSD -AC_CHECK_LIB(i386,i386_set_ldt) +AC_CHECK_LIB(i386,i386_set_ldt,[AC_SUBST(I386_LIBS, "-li386")]) AC_SUBST(OPENGL_LIBS,"") diff --git a/include/config.h.in b/include/config.h.in index 791e3a6..924e11e 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -398,9 +398,6 @@ /* Define to 1 if you have the `gettextpo' library (-lgettextpo). */ #undef HAVE_LIBGETTEXTPO -/* Define to 1 if you have the `i386' library (-li386). */ -#undef HAVE_LIBI386 - /* Define to 1 if you have the `kstat' library (-lkstat). */ #undef HAVE_LIBKSTAT diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 789d09a..f7dd34b 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -1,4 +1,5 @@ -EXTRALIBS = $(DL_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) +EXTRALIBS = $(DL_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(I386_LIBS) + C_SRCS = \ config.c \

1 0

Alistair Leslie-Hughes : dsound: Trace all DSBCAPS values.
by Alexandre Julliard 02 Sep '19

02 Sep '19

Module: wine Branch: master Commit: 3ca3a06c988a0b1e4a2d4c95055b6b9dbae0d4c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ca3a06c988a0b1e4a2d4c95… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Sep 1 23:18:58 2019 +0000 dsound: Trace all DSBCAPS values. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 2fbb3ce..f3030d6 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -105,10 +105,12 @@ static void _dump_DSBCAPS(DWORD xmask) { FE(DSBCAPS_CTRLPAN) FE(DSBCAPS_CTRLVOLUME) FE(DSBCAPS_CTRLPOSITIONNOTIFY) + FE(DSBCAPS_CTRLFX) FE(DSBCAPS_STICKYFOCUS) FE(DSBCAPS_GLOBALFOCUS) FE(DSBCAPS_GETCURRENTPOSITION2) FE(DSBCAPS_MUTE3DATMAXDISTANCE) + FE(DSBCAPS_LOCDEFER) #undef FE }; unsigned int i;

1 0