- Wine-Commits - list.winehq.org

Bartosz Kosiorek : msvcrt: Add _mbsncmp_l implementation.
by Alexandre Julliard Nov. 10, 2023

Nov. 10, 2023

Module: wine Branch: master Commit: f73d74c6dfe57008972192772837f8bb6b744d3b URL: https://gitlab.winehq.org/wine/wine/-/commit/f73d74c6dfe57008972192772837f8… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Tue Nov 7 23:06:28 2023 +0100 msvcrt: Add _mbsncmp_l implementation. --- 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/mbcs.c | 63 +++++++++++++++++++++++++++++---------------- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 +-- 8 files changed, 49 insertions(+), 30 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index de6265dbeff..3c901f0345b 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1152,7 +1152,7 @@ @ cdecl _mbsnccnt(str long) @ cdecl _mbsnccnt_l(str long ptr) @ cdecl _mbsncmp(str str long) -@ stub _mbsncmp_l +@ cdecl _mbsncmp_l(str str long ptr) @ stub _mbsncoll(str str long) @ stub _mbsncoll_l @ cdecl _mbsncpy(ptr str long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 8db709f894f..b633d20e713 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1509,7 +1509,7 @@ @ cdecl _mbsnccnt(str long) @ cdecl _mbsnccnt_l(str long ptr) @ cdecl _mbsncmp(str str long) -@ stub _mbsncmp_l +@ cdecl _mbsncmp_l(str str long ptr) @ stub _mbsncoll(str str long) @ stub _mbsncoll_l @ cdecl _mbsncpy(ptr str long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 6aae69fdea4..a5fdb346323 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1520,7 +1520,7 @@ @ cdecl _mbsnccnt(str long) @ cdecl _mbsnccnt_l(str long ptr) @ cdecl _mbsncmp(str str long) -@ stub _mbsncmp_l +@ cdecl _mbsncmp_l(str str long ptr) @ stub _mbsncoll(str str long) @ stub _mbsncoll_l @ cdecl _mbsncpy(ptr str long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 509343870a4..d842d4362f1 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -824,7 +824,7 @@ @ cdecl _mbsnccnt(str long) @ cdecl _mbsnccnt_l(str long ptr) @ cdecl _mbsncmp(str str long) -@ stub _mbsncmp_l +@ cdecl _mbsncmp_l(str str long ptr) @ stub _mbsncoll(str str long) @ stub _mbsncoll_l @ cdecl _mbsncpy(ptr str long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 119aa34c55f..2334b07957a 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -802,7 +802,7 @@ @ cdecl _mbsnccnt(str long) @ cdecl _mbsnccnt_l(str long ptr) @ cdecl _mbsncmp(str str long) -@ stub _mbsncmp_l +@ cdecl _mbsncmp_l(str str long ptr) @ stub _mbsncoll(str str long) @ stub _mbsncoll_l @ cdecl _mbsncpy(ptr str long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index ba9e034cd0d..cb48fac6fb6 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1225,34 +1225,53 @@ int CDECL _mbsicmp(const unsigned char* str, const unsigned char* cmp) } /********************************************************************* - * _mbsncmp(MSVCRT.@) + * _mbsncmp_l(MSVCRT.@) */ -int CDECL _mbsncmp(const unsigned char* str, const unsigned char* cmp, size_t len) +int CDECL _mbsncmp_l(const unsigned char* str, const unsigned char* cmp, + size_t len, _locale_t locale) { - if(!len) - return 0; - - if(get_mbcinfo()->ismbcodepage) - { + pthreadmbcinfo mbcinfo; unsigned int strc, cmpc; - while(len--) + + if (!len) + return 0; + + if (locale) + mbcinfo = locale->mbcinfo; + else + mbcinfo = get_mbcinfo(); + + if (!mbcinfo->ismbcodepage) + return u_strncmp(str, cmp, len); /* ASCII CP */ + + if (!MSVCRT_CHECK_PMT(str && cmp)) + return _NLSCMPERROR; + + while (len--) { - int inc; - if(!*str) - return *cmp ? -1 : 0; - if(!*cmp) - return 1; - strc = _mbsnextc(str); - cmpc = _mbsnextc(cmp); - if(strc != cmpc) - return strc < cmpc ? -1 : 1; - inc=(strc > 255) ? 2 : 1; /* Equal, use same increment */ - str += inc; - cmp += inc; + int inc; + + if (!*str) + return *cmp ? -1 : 0; + if (!*cmp) + return 1; + strc = _mbsnextc_l(str, locale); + cmpc = _mbsnextc_l(cmp, locale); + if (strc != cmpc) + return strc < cmpc ? -1 : 1; + inc = (strc > 255) ? 2 : 1; /* Equal, use same increment */ + str += inc; + cmp += inc; } return 0; /* Matched len chars */ - } - return u_strncmp(str, cmp, len); /* ASCII CP */ +} + +/********************************************************************* + * _mbsncmp(MSVCRT.@) + */ +int CDECL _mbsncmp(const unsigned char* str, const unsigned char* cmp, size_t len) +{ + return _mbsncmp_l(str, cmp, len, NULL); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a40321b747a..b9947d4e885 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -773,7 +773,7 @@ @ cdecl _mbsnccnt(str long) @ cdecl _mbsnccnt_l(str long ptr) @ cdecl _mbsncmp(str str long) -# stub _mbsncmp_l(str str long ptr) +@ cdecl _mbsncmp_l(str str long ptr) @ stub _mbsncoll(str str long) # stub _mbsncoll_l(str str long ptr) @ cdecl _mbsncpy(ptr str long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 7e02dd203c6..e0174dd897c 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -668,7 +668,7 @@ @ cdecl _mbsnccnt(str long) @ cdecl _mbsnccnt_l(str long ptr) @ cdecl _mbsncmp(str str long) -@ stub _mbsncmp_l +@ cdecl _mbsncmp_l(str str long ptr) @ stub _mbsncoll(str str long) @ stub _mbsncoll_l @ cdecl _mbsncpy(ptr str long) @@ -1237,7 +1237,7 @@ @ cdecl _o__mbsnccnt(str long) _mbsnccnt @ cdecl _o__mbsnccnt_l(str long ptr) _mbsnccnt_l @ cdecl _o__mbsncmp(str str long) _mbsncmp -@ stub _o__mbsncmp_l +@ cdecl _o__mbsncmp_l(str str long ptr) _mbsncmp_l @ stub _o__mbsncoll @ stub _o__mbsncoll_l @ cdecl _o__mbsncpy(ptr str long) _mbsncpy

1 0

Bartosz Kosiorek : msvcrt: Add _mbspbrk_l implementation.
by Alexandre Julliard Nov. 10, 2023

Nov. 10, 2023

Module: wine Branch: master Commit: ec4a5f63e14f97eaa4ef67881ab41093feebec97 URL: https://gitlab.winehq.org/wine/wine/-/commit/ec4a5f63e14f97eaa4ef67881ab410… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Tue Nov 7 23:06:17 2023 +0100 msvcrt: Add _mbspbrk_l implementation. --- 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/mbcs.c | 39 ++++++++++++++++++++++++++++++++------- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 8 files changed, 40 insertions(+), 15 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 88558752607..5796f353d9c 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1174,7 +1174,7 @@ @ stub _mbsnset_s @ stub _mbsnset_s_l @ cdecl _mbspbrk(str str) -@ stub _mbspbrk_l +@ cdecl _mbspbrk_l(str str ptr) @ cdecl _mbsrchr(str long) @ cdecl _mbsrchr_l(str long ptr) @ cdecl _mbsrev(str) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 1937ffc9efb..cd54513a59e 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1531,7 +1531,7 @@ @ stub _mbsnset_s @ stub _mbsnset_s_l @ cdecl _mbspbrk(str str) -@ stub _mbspbrk_l +@ cdecl _mbspbrk_l(str str ptr) @ cdecl _mbsrchr(str long) @ cdecl _mbsrchr_l(str long ptr) @ cdecl _mbsrev(str) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 462a42b719b..1bb81f3f257 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1542,7 +1542,7 @@ @ stub _mbsnset_s @ stub _mbsnset_s_l @ cdecl _mbspbrk(str str) -@ stub _mbspbrk_l +@ cdecl _mbspbrk_l(str str ptr) @ cdecl _mbsrchr(str long) @ cdecl _mbsrchr_l(str long ptr) @ cdecl _mbsrev(str) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 822a43d5765..9dbe665cd02 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -846,7 +846,7 @@ @ stub _mbsnset_s @ stub _mbsnset_s_l @ cdecl _mbspbrk(str str) -@ stub _mbspbrk_l +@ cdecl _mbspbrk_l(str str ptr) @ cdecl _mbsrchr(str long) @ cdecl _mbsrchr_l(str long ptr) @ cdecl _mbsrev(str) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 32075829392..391be34a624 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -824,7 +824,7 @@ @ stub _mbsnset_s @ stub _mbsnset_s_l @ cdecl _mbspbrk(str str) -@ stub _mbspbrk_l +@ cdecl _mbspbrk_l(str str ptr) @ cdecl _mbsrchr(str long) @ cdecl _mbsrchr_l(str long ptr) @ cdecl _mbsrev(str) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 52b882a2fba..ba9e034cd0d 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -150,6 +150,11 @@ static inline unsigned char *u_strchr( const unsigned char *s, unsigned char x ) return (unsigned char*) strchr( (const char*)s, x ); } +static inline unsigned char* u_strpbrk(const unsigned char *str, const unsigned char *accept) +{ + return (unsigned char*)strpbrk((const char*)str, (const char*)accept); +} + static inline unsigned char *u_strrchr( const unsigned char *s, unsigned char x ) { return (unsigned char*) strrchr( (const char*)s, x ); @@ -2871,25 +2876,45 @@ unsigned char* CDECL _mbsrev(unsigned char* str) } /********************************************************************* - * _mbspbrk (MSVCRT.@) + * _mbspbrk_l (MSVCRT.@) */ -unsigned char* CDECL _mbspbrk(const unsigned char* str, const unsigned char* accept) +unsigned char* CDECL _mbspbrk_l(const unsigned char *str, + const unsigned char *accept, _locale_t locale) { const unsigned char* p; + pthreadmbcinfo mbcinfo; + + if (locale) + mbcinfo = locale->mbcinfo; + else + mbcinfo = get_mbcinfo(); + + if (!mbcinfo->ismbcodepage) + return u_strpbrk(str, accept); - while(*str) + if (!MSVCRT_CHECK_PMT(str && accept)) + return NULL; + + while (*str) { - for(p = accept; *p; p += (_ismbblead(*p)?2:1) ) + for (p = accept; *p; p += (_ismbblead_l(*p, locale) ? 2 : 1)) { if (*p == *str) - if( !_ismbblead(*p) || ( *(p+1) == *(str+1) ) ) - return (unsigned char*)str; + if (!_ismbblead_l(*p, locale) || p[1] == str[1]) + return (unsigned char*)str; } - str += (_ismbblead(*str)?2:1); + str += (_ismbblead_l(*str, locale) ? 2 : 1); } return NULL; } +/********************************************************************* + * _mbspbrk (MSVCRT.@) + */ +unsigned char* CDECL _mbspbrk(const unsigned char *str, const unsigned char *accept) +{ + return _mbspbrk_l(str, accept, NULL); +} /* * Functions depending on locale codepage diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 430e0f9d5af..a40321b747a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -795,7 +795,7 @@ # stub _mbsnset_s(ptr long long long) # stub _mbsnset_s_l(ptr long long long ptr) @ cdecl _mbspbrk(str str) -# stub _mbspbrk_l(str str ptr) +@ cdecl _mbspbrk_l(str str ptr) @ cdecl _mbsrchr(str long) @ cdecl _mbsrchr_l(str long ptr) @ cdecl _mbsrev(str) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 75f21a447c7..8b0420987de 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -690,7 +690,7 @@ @ stub _mbsnset_s @ stub _mbsnset_s_l @ cdecl _mbspbrk(str str) -@ stub _mbspbrk_l +@ cdecl _mbspbrk_l(str str ptr) @ cdecl _mbsrchr(str long) @ cdecl _mbsrchr_l(str long ptr) @ cdecl _mbsrev(str) @@ -1259,7 +1259,7 @@ @ stub _o__mbsnset_s @ stub _o__mbsnset_s_l @ cdecl _o__mbspbrk(str str) _mbspbrk -@ stub _o__mbspbrk_l +@ cdecl _o__mbspbrk_l(str str ptr) _mbspbrk_l @ cdecl _o__mbsrchr(str long) _mbsrchr @ cdecl _o__mbsrchr_l(str long ptr) _mbsrchr_l @ cdecl _o__mbsrev(str) _mbsrev

1 0

Alexandre Julliard : makefiles: Support arch-specific IDL flags.
by Alexandre Julliard Nov. 10, 2023

Nov. 10, 2023

Module: wine Branch: master Commit: f8dde10ffd4cc59bfcaa59c93d3f2a74cd3d0d02 URL: https://gitlab.winehq.org/wine/wine/-/commit/f8dde10ffd4cc59bfcaa59c93d3f2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 10 11:06:26 2023 +0100 makefiles: Support arch-specific IDL flags. --- tools/makedep.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/makedep.c b/tools/makedep.c index e35de8a00f3..e9e4dbd35a6 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2867,6 +2867,7 @@ static void output_source_idl( struct makefile *make, struct incl_file *source, output_filenames( defines ); output_filenames( get_expanded_make_var_array( make, "EXTRAIDLFLAGS" )); output_filenames( get_expanded_file_local_var( make, obj, "EXTRAIDLFLAGS" )); + if (arch) output_filenames( get_expanded_arch_var_array( make, "EXTRAIDLFLAGS", arch )); output_filename( source->filename ); output( "\n" ); strarray_addall( &deps, arch_deps );

1 0

Alexandre Julliard : configure: Remove no longer used WINE_TRY_SHLIB_FLAGS macro.
by Alexandre Julliard Nov. 10, 2023

Nov. 10, 2023

Module: wine Branch: master Commit: 3e498080944f624453151baa99d8201a4df04fa0 URL: https://gitlab.winehq.org/wine/wine/-/commit/3e498080944f624453151baa99d820… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 10 12:51:54 2023 +0100 configure: Remove no longer used WINE_TRY_SHLIB_FLAGS macro. --- aclocal.m4 | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index f5c9c0e6c42..a9bfeccece2 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -261,20 +261,6 @@ LIBS=$ac_wine_check_headers_saved_libs]) AS_VAR_IF([ac_var],[yes],[$3],[$4])dnl AS_VAR_POPDEF([ac_var])]) -dnl **** Check if we can link an empty shared lib (no main) with special CFLAGS **** -dnl -dnl Usage: WINE_TRY_SHLIB_FLAGS(flags,[action-if-yes,[action-if-no]]) -dnl -AC_DEFUN([WINE_TRY_SHLIB_FLAGS], -[AS_VAR_PUSHDEF([ac_var], ac_cv_cflags_[[$1]])dnl -ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS $1" -AC_LINK_IFELSE([AC_LANG_SOURCE([[void myfunc() {}]])], - [AS_VAR_SET(ac_var,yes)], [AS_VAR_SET(ac_var,no)]) -CFLAGS=$ac_wine_try_cflags_saved -AS_VAR_IF([ac_var],[yes], [$2], [$3])dnl -AS_VAR_POPDEF([ac_var])]) - dnl **** Check whether we need to define a symbol on the compiler command line **** dnl dnl Usage: WINE_CHECK_DEFINE(name),[action-if-yes,[action-if-no]])

1 0

Alexandre Julliard : configure: Consistently use HOST_ARCH for platform checks.
by Alexandre Julliard Nov. 10, 2023

Nov. 10, 2023

Module: wine Branch: master Commit: da2ae5832c4f91c45dec91243010512f6ef3234b URL: https://gitlab.winehq.org/wine/wine/-/commit/da2ae5832c4f91c45dec9124301051… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 10 12:54:07 2023 +0100 configure: Consistently use HOST_ARCH for platform checks. --- aclocal.m4 | 9 +++---- configure | 77 ++++++++++++++++++++++++++++++------------------------------ configure.ac | 63 +++++++++++++++++++++++-------------------------- 3 files changed, 71 insertions(+), 78 deletions(-)

1 0

Alexandre Julliard : configure: Assume that pthread.h is present.
by Alexandre Julliard Nov. 10, 2023

Nov. 10, 2023

Module: wine Branch: master Commit: c33f3506232df851e275e903c29817539ee167fb URL: https://gitlab.winehq.org/wine/wine/-/commit/c33f3506232df851e275e903c29817… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 10 20:52:04 2023 +0100 configure: Assume that pthread.h is present. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 20 +++++++------------- configure.ac | 15 ++++----------- include/config.h.in | 3 --- 3 files changed, 11 insertions(+), 27 deletions(-) diff --git a/configure b/configure index f15c3e46d31..8bb34b7e2ce 100755 --- a/configure +++ b/configure @@ -4382,7 +4382,7 @@ fi # Check whether --with-pthread was given. if test ${with_pthread+y} then : - withval=$with_pthread; if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi + withval=$with_pthread; fi @@ -8082,12 +8082,6 @@ if test "x$ac_cv_header_port_h" = xyes then : printf "%s\n" "#define HAVE_PORT_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default" -if test "x$ac_cv_header_pthread_h" = xyes -then : - printf "%s\n" "#define HAVE_PTHREAD_H 1" >>confdefs.h - fi ac_fn_c_check_header_compile "$LINENO" "pwd.h" "ac_cv_header_pwd_h" "$ac_includes_default" if test "x$ac_cv_header_pwd_h" = xyes @@ -9059,9 +9053,7 @@ then : fi -ac_fn_c_check_header_compile "$LINENO" "pthread_np.h" "ac_cv_header_pthread_np_h" "#ifdef HAVE_PTHREAD_H -#include <pthread.h> -#endif +ac_fn_c_check_header_compile "$LINENO" "pthread_np.h" "ac_cv_header_pthread_np_h" "#include <pthread.h> " if test "x$ac_cv_header_pthread_np_h" = xyes then : @@ -13437,9 +13429,11 @@ printf "%s\n" "$as_me:${as_lineno-$LINENO}: zydis libs: $ZYDIS_PE_LIBS" >&5 -if test "$ac_cv_header_pthread_h" = "yes" -then - ac_fn_c_check_func "$LINENO" "pthread_create" "ac_cv_func_pthread_create" +if test "x$with_pthread" = xno +then : + +else $as_nop + ac_fn_c_check_func "$LINENO" "pthread_create" "ac_cv_func_pthread_create" if test "x$ac_cv_func_pthread_create" = xyes then : diff --git a/configure.ac b/configure.ac index 5e1c65ab059..d32b672099d 100644 --- a/configure.ac +++ b/configure.ac @@ -51,8 +51,7 @@ AC_ARG_WITH(oss, AS_HELP_STRING([--without-oss],[do not use the OSS sound AC_ARG_WITH(pcap, AS_HELP_STRING([--without-pcap],[do not use the Packet Capture library]), [if test "x$withval" = "xno"; then ac_cv_header_pcap_pcap_h=no; fi]) AC_ARG_WITH(pcsclite, AS_HELP_STRING([--without-pcsclite],[do not use PCSC lite])) -AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthread library]), - [if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi]) +AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthread library])) AC_ARG_WITH(pulse, AS_HELP_STRING([--without-pulse],[do not use PulseAudio sound support])) AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)])) AC_ARG_WITH(sdl, AS_HELP_STRING([--without-sdl],[do not use SDL])) @@ -438,7 +437,6 @@ AC_CHECK_HEADERS(\ netinet/tcp_fsm.h \ pcap/pcap.h \ port.h \ - pthread.h \ pwd.h \ sched.h \ scsi/scsi.h \ @@ -597,10 +595,7 @@ AC_CHECK_HEADERS([sys/thr.h],,, #include <sys/ucontext.h> #endif]) -AC_CHECK_HEADERS([pthread_np.h],,, -[#ifdef HAVE_PTHREAD_H -#include <pthread.h> -#endif]) +AC_CHECK_HEADERS([pthread_np.h],,,[#include <pthread.h>]) AC_CHECK_HEADERS([linux/videodev2.h],,, [#include <sys/time.h> @@ -1175,10 +1170,8 @@ WINE_EXTLIB_FLAGS(ZYDIS, zydis, zydis, "-I\$(top_srcdir)/libs/zydis/include") dnl **** Check for pthread **** -if test "$ac_cv_header_pthread_h" = "yes" -then - AC_CHECK_FUNC(pthread_create,,[AC_CHECK_LIB(pthread,pthread_create,[AC_SUBST(PTHREAD_LIBS,"-lpthread")])]) -fi +AS_VAR_IF([with_pthread],[no],[], + [AC_CHECK_FUNC(pthread_create,,[AC_CHECK_LIB(pthread,pthread_create,[AC_SUBST(PTHREAD_LIBS,"-lpthread")])])]) WINE_ERROR_WITH(pthread,[test "x$ac_cv_func_pthread_create" != xyes -a "x$PTHREAD_LIBS" = x], [pthread ${notice_platform}development files not found. Wine cannot support threads without libpthread.]) diff --git a/include/config.h.in b/include/config.h.in index fa234a82f84..157bf572df5 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -318,9 +318,6 @@ /* Define to 1 if you have the `pthread_getthreadid_np' function. */ #undef HAVE_PTHREAD_GETTHREADID_NP -/* Define to 1 if you have the <pthread.h> header file. */ -#undef HAVE_PTHREAD_H - /* Define to 1 if you have the <pthread_np.h> header file. */ #undef HAVE_PTHREAD_NP_H

1 0

Alexandre Julliard : widl: Make the alignment option generic instead of win32/win64-specific.
by Alexandre Julliard Nov. 10, 2023

Nov. 10, 2023

Module: wine Branch: master Commit: a426b6b4a93dbe0869a83bd5c8d94cc95e1daebe URL: https://gitlab.winehq.org/wine/wine/-/commit/a426b6b4a93dbe0869a83bd5c8d94c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 10 11:06:38 2023 +0100 widl: Make the alignment option generic instead of win32/win64-specific. Support both --align and --packing for compatibility with midl. --- dlls/msdaps/Makefile.in | 5 +++-- tools/widl/typegen.c | 1 - tools/widl/widl.c | 27 ++++++++++----------------- tools/widl/widl.h | 3 +-- tools/widl/widl.man.in | 2 ++ 5 files changed, 16 insertions(+), 22 deletions(-) diff --git a/dlls/msdaps/Makefile.in b/dlls/msdaps/Makefile.in index 1a974266d11..bf1e5c8b3b4 100644 --- a/dlls/msdaps/Makefile.in +++ b/dlls/msdaps/Makefile.in @@ -1,6 +1,5 @@ MODULE = msdaps.dll IMPORTS = uuid oleaut32 ole32 rpcrt4 advapi32 -EXTRAIDLFLAGS = --win32-align=2 SOURCES = \ main.c \ @@ -9,4 +8,6 @@ SOURCES = \ row_server.idl \ usrmarshal.c -dlldata_EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer -DENTRY_PREFIX=msdaps_ +dlldata_EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer -DENTRY_PREFIX=msdaps_ +i386_EXTRAIDLFLAGS = --packing=2 +arm_EXTRAIDLFLAGS = --packing=2 diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index b3373ded11d..23db6555e9d 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -234,7 +234,6 @@ static unsigned char get_basic_fc_signed(const type_t *type) static inline unsigned int clamp_align(unsigned int align) { - unsigned int packing = (pointer_size == 4) ? win32_packing : win64_packing; if(align > packing) align = packing; return align; } diff --git a/tools/widl/widl.c b/tools/widl/widl.c index e37160e3869..9d3ea0c36bf 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -41,6 +41,7 @@ static const char usage[] = "Usage: widl [options...] infile.idl\n" " or: widl [options...] --dlldata-only name1 [name2...]\n" " --acf=file Use ACF file\n" +" --align=n Set structure packing to 'n'\n" " -app_config Ignored, present for midl compatibility\n" " -b arch Set the target architecture\n" " -c Generate client stub\n" @@ -61,6 +62,7 @@ static const char usage[] = " -o, --output=NAME Set the output file name\n" " -Otype Type of stubs to generate (-Os, -Oi, -Oif)\n" " -p Generate proxy\n" +" --packing=n Set structure packing to 'n'\n" " --prefix-all=p Prefix names of client stubs / server functions with 'p'\n" " --prefix-client=p Prefix names of client stubs with 'p'\n" " --prefix-server=p Prefix names of server functions with 'p'\n" @@ -73,8 +75,6 @@ static const char usage[] = " -V Print version and exit\n" " -W Enable pedantic warnings\n" " --win32, --win64 Set the target architecture (Win32 or Win64)\n" -" --win32-align n Set win32 structure alignment to 'n'\n" -" --win64-align n Set win64 structure alignment to 'n'\n" " --winrt Enable Windows Runtime mode\n" "Debug level 'n' is a bitmask with following meaning:\n" " * 0x01 Tell which resource is parsed (verbose mode)\n" @@ -106,8 +106,6 @@ int do_idfile = 0; int do_dlldata = 0; static int no_preprocess = 0; int old_names = 0; -int win32_packing = 8; -int win64_packing = 8; int winrt_mode = 0; int use_abi_namespace = 0; static int stdinc = 1; @@ -142,6 +140,7 @@ static const char *sysroot = ""; static FILE *idfile; +unsigned int packing = 8; unsigned int pointer_size = 0; time_t now; @@ -154,6 +153,7 @@ enum { DLLDATA_ONLY_OPTION, LOCAL_STUBS_OPTION, NOSTDINC_OPTION, + PACKING_OPTION, PREFIX_ALL_OPTION, PREFIX_CLIENT_OPTION, PREFIX_SERVER_OPTION, @@ -164,14 +164,13 @@ enum { SYSROOT_OPTION, WIN32_OPTION, WIN64_OPTION, - WIN32_ALIGN_OPTION, - WIN64_ALIGN_OPTION }; static const char short_options[] = "b:cC:d:D:EhH:I:L:m:No:O:pP:rsS:tT:uU:VW"; static const struct long_option long_options[] = { { "acf", 1, ACF_OPTION }, + { "align", 1, PACKING_OPTION }, { "app_config", 0, APP_CONFIG_OPTION }, { "dlldata", 1, DLLDATA_OPTION }, { "dlldata-only", 0, DLLDATA_ONLY_OPTION }, @@ -181,6 +180,7 @@ static const struct long_option long_options[] = { { "ns_prefix", 0, RT_NS_PREFIX }, { "oldnames", 0, OLDNAMES_OPTION }, { "output", 0, 'o' }, + { "packing", 1, PACKING_OPTION }, { "prefix-all", 1, PREFIX_ALL_OPTION }, { "prefix-client", 1, PREFIX_CLIENT_OPTION }, { "prefix-server", 1, PREFIX_SERVER_OPTION }, @@ -190,8 +190,6 @@ static const struct long_option long_options[] = { { "winrt", 0, RT_OPTION }, { "win32", 0, WIN32_OPTION }, { "win64", 0, WIN64_OPTION }, - { "win32-align", 1, WIN32_ALIGN_OPTION }, - { "win64-align", 1, WIN64_ALIGN_OPTION }, { NULL } }; @@ -532,15 +530,10 @@ static void option_callback( int optc, char *optarg ) case WIN64_OPTION: pointer_size = 8; break; - case WIN32_ALIGN_OPTION: - win32_packing = strtol(optarg, NULL, 0); - if(win32_packing != 2 && win32_packing != 4 && win32_packing != 8) - error("Packing must be one of 2, 4 or 8\n"); - break; - case WIN64_ALIGN_OPTION: - win64_packing = strtol(optarg, NULL, 0); - if(win64_packing != 2 && win64_packing != 4 && win64_packing != 8) - error("Packing must be one of 2, 4 or 8\n"); + case PACKING_OPTION: + packing = strtol(optarg, NULL, 0); + if(packing != 2 && packing != 4 && packing != 8) + error("Structure packing must be one of 2, 4 or 8\n"); break; case ACF_OPTION: acf_name = xstrdup(optarg); diff --git a/tools/widl/widl.h b/tools/widl/widl.h index 7595cfe7311..15ac74bf310 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -46,8 +46,6 @@ extern int do_regscript; extern int do_idfile; extern int do_dlldata; extern int old_names; -extern int win32_packing; -extern int win64_packing; extern int winrt_mode; extern int use_abi_namespace; @@ -69,6 +67,7 @@ extern char *regscript_name; extern char *regscript_token; extern const char *prefix_client; extern const char *prefix_server; +extern unsigned int packing; extern unsigned int pointer_size; extern time_t now; diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index 858b04a38e8..8c5442b621d 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -67,6 +67,8 @@ option can be specified multiple times. Generate a UUID file. The default output filename is \fIinfile\fB_i.c\fR. .PP .B Proxy/stub generation options: +.IP "\fB--align=\fIn\fB, --packing=\fIn\fR" +Set the structure packing to \fIn\fR. Supported values are 2, 4, and 8. .IP "\fB-c\fR" Generate a client stub file. The default output filename is \fIinfile\fB_c.c\fR. .IP "\fB-Os\fR"

1 0

Alex Henrie : nsi: Use CRT allocation functions.
by Alexandre Julliard Nov. 10, 2023

Nov. 10, 2023

Module: wine Branch: master Commit: 5847aab99efe5b410d6779623aee51087d5e193f URL: https://gitlab.winehq.org/wine/wine/-/commit/5847aab99efe5b410d6779623aee51… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 9 07:40:21 2023 -0700 nsi: Use CRT allocation functions. --- dlls/nsi/nsi.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index 5dc54d0035f..c5f481efb48 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -174,7 +174,7 @@ DWORD WINAPI NsiEnumerateObjectsAllParametersEx( struct nsi_enumerate_all_ex *pa out_size = sizeof(DWORD) + (params->key_size + params->rw_size + params->dynamic_size + params->static_size) * params->count; - out = heap_alloc( out_size ); + out = malloc( out_size ); if (!out) return ERROR_OUTOFMEMORY; in.module = *params->module; @@ -202,7 +202,7 @@ DWORD WINAPI NsiEnumerateObjectsAllParametersEx( struct nsi_enumerate_all_ex *pa if (params->static_size) memcpy( params->static_data, ptr, params->static_size * params->count ); } - heap_free( out ); + free( out ); return err; } @@ -254,8 +254,8 @@ DWORD WINAPI NsiGetAllParametersEx( struct nsi_get_all_parameters_ex *params ) if (device == INVALID_HANDLE_VALUE) return GetLastError(); - in = heap_alloc( in_size ); - out = heap_alloc( out_size ); + in = malloc( in_size ); + out = malloc( out_size ); if (!in || !out) { err = ERROR_OUTOFMEMORY; @@ -284,8 +284,8 @@ DWORD WINAPI NsiGetAllParametersEx( struct nsi_get_all_parameters_ex *params ) } err: - heap_free( out ); - heap_free( in ); + free( out ); + free( in ); return err; } @@ -321,7 +321,7 @@ DWORD WINAPI NsiGetParameterEx( struct nsi_get_parameter_ex *params ) if (device == INVALID_HANDLE_VALUE) return GetLastError(); - in = heap_alloc( in_size ); + in = malloc( in_size ); if (!in) return ERROR_OUTOFMEMORY; in->module = *params->module; in->first_arg = params->first_arg; @@ -334,7 +334,7 @@ DWORD WINAPI NsiGetParameterEx( struct nsi_get_parameter_ex *params ) if (!DeviceIoControl( device, IOCTL_NSIPROXY_WINE_GET_PARAMETER, in, in_size, params->data, params->data_size, &received, NULL )) err = GetLastError(); - heap_free( in ); + free( in ); return err; }

1 0

Conor McCarthy : vkd3d-shader/spirv: Introduce orderedness to comparison instructions.
by Alexandre Julliard Nov. 10, 2023

Nov. 10, 2023

Module: vkd3d Branch: master Commit: 22960753e94967888bada0d7e7731295b3823acd URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/22960753e94967888bada0d7e7731… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Jun 3 00:31:59 2023 +1000 vkd3d-shader/spirv: Introduce orderedness to comparison instructions. --- libs/vkd3d-shader/d3d_asm.c | 16 ++++++++++------ libs/vkd3d-shader/dxil.c | 24 ++++++++++++------------ libs/vkd3d-shader/spirv.c | 32 ++++++++++++++++++++------------ libs/vkd3d-shader/tpf.c | 12 ++++++------ libs/vkd3d-shader/vkd3d_shader_private.h | 16 ++++++++++------ 5 files changed, 58 insertions(+), 42 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement the DXIL CMP2 instruction.
by Alexandre Julliard Nov. 10, 2023

Nov. 10, 2023

Module: vkd3d Branch: master Commit: d3b90cc8770416f08087cfe27889efe683c54feb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d3b90cc8770416f08087cfe27889e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Nov 7 14:01:39 2023 +1000 vkd3d-shader/dxil: Implement the DXIL CMP2 instruction. --- libs/vkd3d-shader/dxil.c | 170 +++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 2 + tests/hlsl/all.shader_test | 14 +-- tests/hlsl/any.shader_test | 36 +++---- tests/hlsl/bool-cast.shader_test | 4 +- tests/hlsl/cast-to-float.shader_test | 2 +- tests/hlsl/cast-to-half.shader_test | 2 +- tests/hlsl/cast-to-int.shader_test | 2 +- tests/hlsl/cast-to-uint.shader_test | 2 +- tests/hlsl/sign.shader_test | 20 ++-- 10 files changed, 213 insertions(+), 41 deletions(-)

1 0