January 2023 - Wine-Commits

Alex Henrie : msvcrt: Change return type of _ctime32_s and _ctime64_s to errno_t.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 261d7418a8a5d4809ad5033f10a3414f66b38beb URL: https://gitlab.winehq.org/wine/wine/-/commit/261d7418a8a5d4809ad5033f10a341… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jan 13 18:38:14 2023 -0700 msvcrt: Change return type of _ctime32_s and _ctime64_s to errno_t. --- dlls/msvcrt/time.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index fb91aa2b1ec..56b80e84105 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1715,7 +1715,7 @@ char * CDECL _ctime64(const __time64_t *time) /********************************************************************* * _ctime64_s (MSVCRT.@) */ -int CDECL _ctime64_s(char *res, size_t len, const __time64_t *time) +errno_t CDECL _ctime64_s(char *res, size_t len, const __time64_t *time) { struct tm *t; @@ -1744,7 +1744,7 @@ char * CDECL _ctime32(const __time32_t *time) /********************************************************************* * _ctime32_s (MSVCRT.@) */ -int CDECL _ctime32_s(char *res, size_t len, const __time32_t *time) +errno_t CDECL _ctime32_s(char *res, size_t len, const __time32_t *time) { struct tm *t;

1 0

Alex Henrie : include: Add localtime_s.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 88d6f8ac6c8e4303bbe0233b2109930a987bb03d URL: https://gitlab.winehq.org/wine/wine/-/commit/88d6f8ac6c8e4303bbe0233b210993… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jan 13 18:38:14 2023 -0700 include: Add localtime_s. Needed to compile Tera Term. --- include/msvcrt/time.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/msvcrt/time.h b/include/msvcrt/time.h index a6f80dfb56f..e1d914fea0d 100644 --- a/include/msvcrt/time.h +++ b/include/msvcrt/time.h @@ -97,6 +97,7 @@ static inline errno_t ctime_s(char *res, size_t len, const __time64_t *t) { retu static inline double difftime(time_t t1, time_t t2) { return _difftime64(t1, t2); } static inline struct tm* gmtime(const time_t *t) { return _gmtime64(t); } static inline struct tm* localtime(const time_t *t) { return _localtime64(t); } +static inline errno_t localtime_s(struct tm *res, const time_t *t) { return _localtime64_s(res, t); } static inline time_t mktime(struct tm *tm) { return _mktime64(tm); } static inline time_t time(time_t *t) { return _time64(t); } #elif defined(_UCRT) @@ -105,6 +106,7 @@ static inline errno_t ctime_s(char *res, size_t len, const __time32_t *t) { retu static inline double difftime(time_t t1, time_t t2) { return _difftime32(t1, t2); } static inline struct tm* gmtime(const time_t *t) { return _gmtime32(t); } static inline struct tm* localtime(const time_t *t) { return _localtime32(t); } +static inline errno_t localtime_s(struct tm *res, const time_t *t) { return _localtime32_s(res, t); } static inline time_t mktime(struct tm *tm) { return _mktime32(tm); } static inline time_t time(time_t *t) { return _time32(t); } #endif

1 0

Alexandre Julliard : tools: Move signal masking to the common make_temp_file() helper.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 9f0ae8c992f85f6b67ea484c83ad5c3b28f91a41 URL: https://gitlab.winehq.org/wine/wine/-/commit/9f0ae8c992f85f6b67ea484c83ad5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 25 11:31:11 2023 +0100 tools: Move signal masking to the common make_temp_file() helper. --- configure | 47 ----------------------------------------------- configure.ac | 10 ---------- include/config.h.in | 6 ------ tools/tools.h | 13 +++++++++++++ tools/winegcc/winegcc.c | 41 ++++++++--------------------------------- 5 files changed, 21 insertions(+), 96 deletions(-) diff --git a/configure b/configure index 4c1b2f1da04..1e3ffabaebb 100755 --- a/configure +++ b/configure @@ -20077,17 +20077,6 @@ _ACEOF ;; esac -ac_fn_c_check_type "$LINENO" "sigset_t" "ac_cv_type_sigset_t" "#include <sys/types.h> -#include <signal.h> -" -if test "x$ac_cv_type_sigset_t" = xyes -then : - -printf "%s\n" "#define HAVE_SIGSET_T 1" >>confdefs.h - - -fi - ac_fn_c_check_type "$LINENO" "request_sense" "ac_cv_type_request_sense" "#include <linux/cdrom.h> " if test "x$ac_cv_type_request_sense" = xyes @@ -20129,42 +20118,6 @@ printf "%s\n" "#define HAVE_STRUCT_XINPGEN 1" >>confdefs.h fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sigaddset" >&5 -printf %s "checking for sigaddset... " >&6; } -if test ${wine_cv_have_sigaddset+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <signal.h> -int -main (void) -{ -sigset_t set; sigaddset(&set,SIGTERM); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - wine_cv_have_sigaddset=yes -else $as_nop - wine_cv_have_sigaddset=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wine_cv_have_sigaddset" >&5 -printf "%s\n" "$wine_cv_have_sigaddset" >&6; } -if test "$wine_cv_have_sigaddset" = "yes" -then - -printf "%s\n" "#define HAVE_SIGADDSET 1" >>confdefs.h - -fi - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we can use re-entrant gethostbyname_r Linux style" >&5 printf %s "checking whether we can use re-entrant gethostbyname_r Linux style... " >&6; } if test ${wine_cv_linux_gethostbyname_r_6+y} diff --git a/configure.ac b/configure.ac index 54f2b00fe76..c7217274b80 100644 --- a/configure.ac +++ b/configure.ac @@ -2058,8 +2058,6 @@ fi dnl **** Check for types **** AC_C_INLINE -AC_CHECK_TYPES([sigset_t],,,[#include <sys/types.h> -#include <signal.h>]) AC_CHECK_TYPES([request_sense],,,[#include <linux/cdrom.h>]) AC_CHECK_TYPES([struct xinpgen],,, @@ -2084,14 +2082,6 @@ AC_CHECK_TYPES([struct xinpgen],,, #include <netinet/in_pcb.h> #endif]) -AC_CACHE_CHECK([for sigaddset],wine_cv_have_sigaddset, - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <signal.h>]], [[sigset_t set; sigaddset(&set,SIGTERM);]])],[wine_cv_have_sigaddset=yes],[wine_cv_have_sigaddset=no])) -if test "$wine_cv_have_sigaddset" = "yes" -then - AC_DEFINE(HAVE_SIGADDSET, 1, [Define if sigaddset is supported]) -fi - - AC_CACHE_CHECK([whether we can use re-entrant gethostbyname_r Linux style], wine_cv_linux_gethostbyname_r_6, AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]],[[ diff --git a/include/config.h.in b/include/config.h.in index 0e43013a8ab..fe2fc36a914 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -375,18 +375,12 @@ /* Define to 1 if `interface_id' is a member of `sg_io_hdr_t'. */ #undef HAVE_SG_IO_HDR_T_INTERFACE_ID -/* Define if sigaddset is supported */ -#undef HAVE_SIGADDSET - /* Define to 1 if `si_fd' is a member of `siginfo_t'. */ #undef HAVE_SIGINFO_T_SI_FD /* Define to 1 if you have the `sigprocmask' function. */ #undef HAVE_SIGPROCMASK -/* Define to 1 if the system has the type `sigset_t'. */ -#undef HAVE_SIGSET_T - /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H diff --git a/tools/tools.h b/tools/tools.h index 4cadccb25b8..3c25bcc41a9 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -27,6 +27,7 @@ #include <string.h> #include <sys/types.h> #include <sys/stat.h> +#include <signal.h> #include <fcntl.h> #include <time.h> #include <errno.h> @@ -369,7 +370,19 @@ static inline char *make_temp_file( const char *prefix, const char *suffix ) fd = open( name, O_RDWR | O_CREAT | O_EXCL, 0600 ); if (fd >= 0) { +#ifdef HAVE_SIGPROCMASK /* block signals while manipulating the temp files list */ + sigset_t mask_set, old_set; + + sigemptyset( &mask_set ); + sigaddset( &mask_set, SIGHUP ); + sigaddset( &mask_set, SIGTERM ); + sigaddset( &mask_set, SIGINT ); + sigprocmask( SIG_BLOCK, &mask_set, &old_set ); strarray_add( &temp_files, name ); + sigprocmask( SIG_SETMASK, &old_set, NULL ); +#else + strarray_add( &temp_files, name ); +#endif close( fd ); return name; } diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index beef9dba1cc..2261eca6c1d 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -146,9 +146,6 @@ static const char *output_implib; static int keep_generated = 0; const char *temp_dir = NULL; struct strarray temp_files = { 0 }; -#ifdef HAVE_SIGSET_T -static sigset_t signal_mask; -#endif static const char *bindir; static const char *libdir; @@ -223,22 +220,6 @@ static void exit_on_signal( int sig ) exit(1); /* this will call the atexit functions */ } -static char* get_temp_file(const char* prefix, const char* suffix) -{ - char *tmp; - -#ifdef HAVE_SIGPROCMASK - sigset_t old_set; - /* block signals while manipulating the temp files list */ - sigprocmask( SIG_BLOCK, &signal_mask, &old_set ); -#endif - tmp = make_temp_file( prefix, suffix ); -#ifdef HAVE_SIGPROCMASK - sigprocmask( SIG_SETMASK, &old_set, NULL ); -#endif - return tmp; -} - static int is_pe_target( const struct options *opts ) { switch (opts->target.platform) @@ -348,9 +329,9 @@ static struct strarray get_translator(struct options *opts) static int try_link( struct strarray prefix, struct strarray link_tool, const char *cflags ) { - const char *in = get_temp_file( "try_link", ".c" ); - const char *out = get_temp_file( "try_link", ".out" ); - const char *err = get_temp_file( "try_link", ".err" ); + const char *in = make_temp_file( "try_link", ".c" ); + const char *out = make_temp_file( "try_link", ".out" ); + const char *err = make_temp_file( "try_link", ".err" ); struct strarray link = empty_strarray; int sout = -1, serr = -1; int ret; @@ -407,7 +388,7 @@ static struct strarray get_link_args( struct options *opts, const char *output_n case PLATFORM_SOLARIS: { - char *mapfile = get_temp_file( output_name, ".map" ); + char *mapfile = make_temp_file( output_name, ".map" ); const char *align = opts->section_align ? opts->section_align : "0x1000"; create_file( mapfile, 0644, "text = A%s;\ndata = A%s;\n", align, align ); @@ -820,7 +801,7 @@ static const char* compile_to_object(struct options* opts, const char* file, con /* make a copy so we don't change any of the initial stuff */ /* a shallow copy is exactly what we want in this case */ copts = *opts; - copts.output_name = get_temp_file(get_basename_noext(file), ".o"); + copts.output_name = make_temp_file(get_basename_noext(file), ".o"); copts.compile_only = 1; copts.files = empty_strarray; strarray_add(&copts.files, file); @@ -894,8 +875,8 @@ static char *find_static_lib( const char *dll ) static const char *find_libgcc(struct strarray prefix, struct strarray link_tool) { - const char *out = get_temp_file( "find_libgcc", ".out" ); - const char *err = get_temp_file( "find_libgcc", ".err" ); + const char *out = make_temp_file( "find_libgcc", ".out" ); + const char *err = make_temp_file( "find_libgcc", ".err" ); struct strarray link = empty_strarray; int sout = -1, serr = -1; char *libgcc, *p; @@ -984,7 +965,7 @@ static const char *build_spec_obj( struct options *opts, const char *spec_file, strarray_add( &spec_args, strmake( "--ld-cmd=%s", strarray_tostring( tool, " " ))); } - spec_o_name = get_temp_file(output_name, ".spec.o"); + spec_o_name = make_temp_file(output_name, ".spec.o"); if (!is_pe) { if (opts->pic) strarray_add(&spec_args, "-fPIC"); @@ -1512,12 +1493,6 @@ int main(int argc, char **argv) #endif signal( SIGTERM, exit_on_signal ); signal( SIGINT, exit_on_signal ); -#ifdef HAVE_SIGADDSET - sigemptyset( &signal_mask ); - sigaddset( &signal_mask, SIGHUP ); - sigaddset( &signal_mask, SIGTERM ); - sigaddset( &signal_mask, SIGINT ); -#endif init_argv0_dir( argv[0] ); /* setup tmp file removal at exit */

1 0

Zebediah Figura : win32u: Make create_brush() hidden.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: ffe262b29b4617d24d4562f7efb32ecc39fb9c4a URL: https://gitlab.winehq.org/wine/wine/-/commit/ffe262b29b4617d24d4562f7efb32e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 18 19:44:36 2023 -0600 win32u: Make create_brush() hidden. --- dlls/win32u/ntgdi_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/ntgdi_private.h b/dlls/win32u/ntgdi_private.h index be3e4d8cd56..53674e0661a 100644 --- a/dlls/win32u/ntgdi_private.h +++ b/dlls/win32u/ntgdi_private.h @@ -152,7 +152,7 @@ extern DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src extern void get_mono_dc_colors( DC *dc, int color_table_size, BITMAPINFO *info, int count ) DECLSPEC_HIDDEN; /* brush.c */ -extern HBRUSH create_brush( const LOGBRUSH *brush ); +extern HBRUSH create_brush( const LOGBRUSH *brush ) DECLSPEC_HIDDEN; extern BOOL store_brush_pattern( LOGBRUSH *brush, struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern void free_brush_pattern( struct brush_pattern *pattern ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : tools: Add a common helper to get the argv0 directory.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: ecb651c01fa7d6b495b82ed516d5e86042f65121 URL: https://gitlab.winehq.org/wine/wine/-/commit/ecb651c01fa7d6b495b82ed516d5e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 25 11:14:36 2023 +0100 tools: Add a common helper to get the argv0 directory. --- tools/tools.h | 26 ++++++++++++++++++++++++++ tools/widl/widl.c | 25 +++++-------------------- tools/winegcc/winegcc.c | 20 +------------------- tools/wmc/wmc.c | 22 +++------------------- tools/wrc/wrc.c | 22 +++------------------- 5 files changed, 38 insertions(+), 77 deletions(-) diff --git a/tools/tools.h b/tools/tools.h index 456633e4277..4a886999e96 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -30,6 +30,9 @@ #include <fcntl.h> #include <time.h> #include <errno.h> +#ifdef HAVE_SYS_SYSCTL_H +# include <sys/sysctl.h> +#endif #ifdef _WIN32 # include <direct.h> @@ -603,6 +606,29 @@ static inline struct target init_argv0_target( const char *argv0 ) } +static inline char *get_argv0_dir( const char *argv0 ) +{ +#ifndef _WIN32 + char *dir = NULL; + +#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) + dir = realpath( "/proc/self/exe", NULL ); +#elif defined (__FreeBSD__) || defined(__DragonFly__) + static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; + size_t path_size = PATH_MAX; + char *path = xmalloc( path_size ); + if (!sysctl( pathname, ARRAY_SIZE(pathname), path, &path_size, NULL, 0 )) + dir = realpath( path, NULL ); + free( path ); +#endif + if (!dir && !(dir = realpath( argv0, NULL ))) return NULL; + return get_dirname( dir ); +#else + return get_dirname( argv0 ); +#endif +} + + /* output buffer management */ extern unsigned char *output_buffer; diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 8d07bf61dba..58ad87b44f0 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -31,9 +31,6 @@ #include <signal.h> #include <limits.h> #include <sys/types.h> -#ifdef HAVE_SYS_SYSCTL_H -# include <sys/sysctl.h> -#endif #include "widl.h" #include "utils.h" @@ -482,23 +479,11 @@ void write_id_data(const statement_list_t *stmts) static void init_argv0_dir( const char *argv0 ) { -#ifndef _WIN32 - char *dir = NULL; - -#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) - dir = realpath( "/proc/self/exe", NULL ); -#elif defined (__FreeBSD__) || defined(__DragonFly__) - static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; - size_t path_size = PATH_MAX; - char *path = xmalloc( path_size ); - if (!sysctl( pathname, ARRAY_SIZE(pathname), path, &path_size, NULL, 0 )) - dir = realpath( path, NULL ); - free( path ); -#endif - if (!dir && !(dir = realpath( argv0, NULL ))) return; - includedir = strmake( "%s/%s", get_dirname( dir ), BIN_TO_INCLUDEDIR ); - dlldir = strmake( "%s/%s", get_dirname( dir ), BIN_TO_DLLDIR ); -#endif + char *dir = get_argv0_dir( argv0 ); + + if (!dir) return; + includedir = strmake( "%s/%s", dir, BIN_TO_INCLUDEDIR ); + dlldir = strmake( "%s/%s", dir, BIN_TO_DLLDIR ); } static void option_callback( int optc, char *optarg ) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 3891974c6c1..a0947a6fa7c 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -98,9 +98,6 @@ #include <ctype.h> #include <limits.h> #include <sys/types.h> -#ifdef HAVE_SYS_SYSCTL_H -# include <sys/sysctl.h> -#endif #include "utils.h" @@ -646,24 +643,9 @@ static char *get_lib_dir( struct options *opts ) static void init_argv0_dir( const char *argv0 ) { -#ifndef _WIN32 - char *dir = NULL; - -#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) - dir = realpath( "/proc/self/exe", NULL ); -#elif defined (__FreeBSD__) || defined(__DragonFly__) - static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; - size_t path_size = PATH_MAX; - char *path = xmalloc( path_size ); - if (!sysctl( pathname, ARRAY_SIZE(pathname), path, &path_size, NULL, 0 )) - dir = realpath( path, NULL ); - free( path ); -#endif - if (!dir && !(dir = realpath( argv0, NULL ))) return; - bindir = get_dirname( dir ); + if (!(bindir = get_argv0_dir( argv0 ))) return; includedir = strmake( "%s/%s", bindir, BIN_TO_INCLUDEDIR ); libdir = strmake( "%s/%s", bindir, BIN_TO_LIBDIR ); -#endif } static void compile(struct options* opts, const char* lang) diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index 76251637a4b..c2cf754f590 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -26,9 +26,6 @@ #include <signal.h> #include <limits.h> #include <sys/types.h> -#ifdef HAVE_SYS_SYSCTL_H -# include <sys/sysctl.h> -#endif #include "wmc.h" #include "utils.h" @@ -149,24 +146,11 @@ static void exit_on_signal( int sig ) static void init_argv0_dir( const char *argv0 ) { -#ifndef _WIN32 - char *dir = NULL; - -#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) - dir = realpath( "/proc/self/exe", NULL ); -#elif defined (__FreeBSD__) || defined(__DragonFly__) - static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; - size_t path_size = PATH_MAX; - char *path = xmalloc( path_size ); - if (!sysctl( pathname, ARRAY_SIZE(pathname), path, &path_size, NULL, 0 )) - dir = realpath( path, NULL ); - free( path ); -#endif - if (!dir && !(dir = realpath( argv0, NULL ))) return; - dir = get_dirname( dir ); + char *dir = get_argv0_dir( argv0 ); + + if (!dir) return; if (strendswith( dir, "/tools/wmc" )) nlsdirs[0] = strmake( "%s/../../nls", dir ); else nlsdirs[0] = strmake( "%s/%s", dir, BIN_TO_NLSDIR ); -#endif } static void option_callback( int optc, char *optarg ) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index fc217afec6c..baf98c3c3bb 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -29,9 +29,6 @@ #include <signal.h> #include <limits.h> #include <sys/types.h> -#ifdef HAVE_SYS_SYSCTL_H -# include <sys/sysctl.h> -#endif #include "../tools.h" #include "wrc.h" @@ -294,25 +291,12 @@ static int load_file( const char *input_name, const char *output_name ) static void init_argv0_dir( const char *argv0 ) { -#ifndef _WIN32 - char *dir = NULL; - -#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) - dir = realpath( "/proc/self/exe", NULL ); -#elif defined (__FreeBSD__) || defined(__DragonFly__) - static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; - size_t path_size = PATH_MAX; - char *path = xmalloc( path_size ); - if (!sysctl( pathname, ARRAY_SIZE(pathname), path, &path_size, NULL, 0 )) - dir = realpath( path, NULL ); - free( path ); -#endif - if (!dir && !(dir = realpath( argv0, NULL ))) return; - dir = get_dirname( dir ); + char *dir = get_argv0_dir( argv0 ); + + if (!dir) return; includedir = strmake( "%s/%s", dir, BIN_TO_INCLUDEDIR ); if (strendswith( dir, "/tools/wrc" )) nlsdirs[0] = strmake( "%s/../../nls", dir ); else nlsdirs[0] = strmake( "%s/%s", dir, BIN_TO_NLSDIR ); -#endif } static void option_callback( int optc, char *optarg )

1 0

Alexandre Julliard : tools: Add a common helper to cleanup temp files.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: ca398e2762ec7b5395e912127eb751a6eea120da URL: https://gitlab.winehq.org/wine/wine/-/commit/ca398e2762ec7b5395e912127eb751… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 25 11:19:55 2023 +0100 tools: Add a common helper to cleanup temp files. --- tools/tools.h | 25 ++++++++++++++++++++----- tools/widl/parser.l | 28 ++++++++++------------------ tools/widl/widl.c | 30 +++++++++++------------------- tools/winebuild/build.h | 2 -- tools/winebuild/import.c | 6 +++--- tools/winebuild/main.c | 2 +- tools/winebuild/res32.c | 2 +- tools/winebuild/utils.c | 27 +++------------------------ tools/winegcc/winegcc.c | 16 +++------------- tools/wrc/wrc.c | 17 +++++------------ 10 files changed, 57 insertions(+), 98 deletions(-)

1 0

Rémi Bernon : hidp: Allow match all usages on specific functions only.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 36b2f6be52466fce3d495e280f392522529d2745 URL: https://gitlab.winehq.org/wine/wine/-/commit/36b2f6be52466fce3d495e280f3925… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 23 15:35:05 2023 +0100 hidp: Allow match all usages on specific functions only. --- dlls/dinput/tests/hid.c | 5 +++++ dlls/hid/hidp.c | 31 +++++++++++++++++-------------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index 5200892e95b..a5ede6ee29b 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -1841,6 +1841,11 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle ok( buffer[0] == (char)0xcd, "got report value %#x\n", buffer[0] ); ok( buffer[1] == (char)0xcd, "got report value %#x\n", buffer[1] ); + status = HidP_GetUsageValue( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, 0, &value, preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetUsageValue returned %#lx\n", status ); + status = HidP_GetUsageValue( HidP_Input, 0, 0, HID_USAGE_GENERIC_X, &value, preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetUsageValue returned %#lx\n", status ); + report[16] = 0xff; report[17] = 0xff; status = HidP_GetUsageValue( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_HATSWITCH, diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 83a4638b6ad..c24a98155b0 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -68,14 +68,17 @@ static NTSTATUS get_value_caps_range( struct hid_preparsed_data *preparsed, HIDP return HIDP_STATUS_SUCCESS; } +#define USAGE_MASK 0xffff +#define USAGE_ANY 0x10000 + struct caps_filter { BOOLEAN buttons; BOOLEAN values; BOOLEAN array; - USAGE usage_page; + DWORD usage_page; USHORT collection; - USAGE usage; + DWORD usage; UCHAR report_id; }; @@ -84,10 +87,10 @@ static BOOL match_value_caps( const struct hid_value_caps *caps, const struct ca if (!caps->usage_min && !caps->usage_max) return FALSE; if (filter->buttons && !(caps->flags & HID_VALUE_CAPS_IS_BUTTON)) return FALSE; if (filter->values && (caps->flags & HID_VALUE_CAPS_IS_BUTTON)) return FALSE; - if (filter->usage_page && filter->usage_page != caps->usage_page) return FALSE; + if (filter->usage_page != USAGE_ANY && (filter->usage_page & USAGE_MASK) != caps->usage_page) return FALSE; if (filter->collection && filter->collection != caps->link_collection) return FALSE; - if (!filter->usage) return TRUE; - return caps->usage_min <= filter->usage && caps->usage_max >= filter->usage; + if (filter->usage == USAGE_ANY) return TRUE; + return caps->usage_min <= (filter->usage & USAGE_MASK) && caps->usage_max >= (filter->usage & USAGE_MASK); } typedef NTSTATUS (*enum_value_caps_callback)( const struct hid_value_caps *caps, void *user ); @@ -384,7 +387,7 @@ NTSTATUS WINAPI HidP_GetUsages( HIDP_REPORT_TYPE report_type, USAGE usage_page, { struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)preparsed_data; struct get_usage_params params = {.usages = usages, .usages_end = usages + *usages_len, .report_buf = report_buf}; - struct caps_filter filter = {.buttons = TRUE, .usage_page = usage_page, .collection = collection}; + struct caps_filter filter = {.buttons = TRUE, .usage_page = usage_page, .collection = collection, .usage = USAGE_ANY}; NTSTATUS status; USHORT limit = -1; @@ -441,7 +444,7 @@ static NTSTATUS get_usage_list_length( const struct hid_value_caps *caps, void * ULONG WINAPI HidP_MaxUsageListLength( HIDP_REPORT_TYPE report_type, USAGE usage_page, PHIDP_PREPARSED_DATA preparsed_data ) { struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)preparsed_data; - struct caps_filter filter = {.buttons = TRUE, .usage_page = usage_page}; + struct caps_filter filter = {.buttons = TRUE, .usage_page = usage_page | USAGE_ANY, .usage = USAGE_ANY}; USHORT limit = -1; ULONG count = 0; @@ -590,7 +593,7 @@ NTSTATUS WINAPI HidP_SetUsages( HIDP_REPORT_TYPE report_type, USAGE usage_page, { struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)preparsed_data; struct set_usage_params params = {.report_buf = report_buf}; - struct caps_filter filter = {.buttons = TRUE, .usage_page = usage_page, .collection = collection}; + struct caps_filter filter = {.buttons = TRUE, .usage_page = usage_page, .collection = collection, .usage = USAGE_ANY}; NTSTATUS status; USHORT limit = 1; ULONG i, count = *usage_count; @@ -656,7 +659,7 @@ NTSTATUS WINAPI HidP_UnsetUsages( HIDP_REPORT_TYPE report_type, USAGE usage_page { struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)preparsed_data; struct unset_usage_params params = {.report_buf = report_buf, .found = FALSE}; - struct caps_filter filter = {.buttons = TRUE, .usage_page = usage_page, .collection = collection}; + struct caps_filter filter = {.buttons = TRUE, .usage_page = usage_page, .collection = collection, .usage = USAGE_ANY}; NTSTATUS status; USHORT limit = 1; ULONG i, count = *usage_count; @@ -739,7 +742,7 @@ NTSTATUS WINAPI HidP_GetSpecificButtonCaps( HIDP_REPORT_TYPE report_type, USAGE PHIDP_PREPARSED_DATA preparsed_data ) { struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)preparsed_data; - const struct caps_filter filter = {.buttons = TRUE, .usage_page = usage_page, .collection = collection, .usage = usage}; + const struct caps_filter filter = {.buttons = TRUE, .usage_page = usage_page | USAGE_ANY, .collection = collection, .usage = usage | USAGE_ANY}; TRACE( "report_type %d, usage_page %u, collection %u, usage %u, caps %p, caps_count %p, preparsed_data %p.\n", report_type, usage_page, collection, usage, caps, caps_count, preparsed_data ); @@ -806,7 +809,7 @@ NTSTATUS WINAPI HidP_GetSpecificValueCaps( HIDP_REPORT_TYPE report_type, USAGE u PHIDP_PREPARSED_DATA preparsed_data ) { struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)preparsed_data; - const struct caps_filter filter = {.values = TRUE, .usage_page = usage_page, .collection = collection, .usage = usage}; + const struct caps_filter filter = {.values = TRUE, .usage_page = usage_page | USAGE_ANY, .collection = collection, .usage = usage | USAGE_ANY}; TRACE( "report_type %d, usage_page %u, collection %u, usage %u, caps %p, caps_count %p, preparsed_data %p.\n", report_type, usage_page, collection, usage, caps, caps_count, preparsed_data ); @@ -869,7 +872,7 @@ NTSTATUS WINAPI HidP_GetUsagesEx( HIDP_REPORT_TYPE report_type, USHORT collectio { struct get_usage_and_page_params params = {.usages = usages, .usages_end = usages + *usages_len, .report_buf = report_buf}; struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)preparsed_data; - struct caps_filter filter = {.buttons = TRUE, .collection = collection}; + struct caps_filter filter = {.buttons = TRUE, .usage_page = USAGE_ANY, .collection = collection, .usage = USAGE_ANY}; NTSTATUS status; USHORT limit = -1; @@ -899,7 +902,7 @@ static NTSTATUS count_data( const struct hid_value_caps *caps, void *user ) ULONG WINAPI HidP_MaxDataListLength( HIDP_REPORT_TYPE report_type, PHIDP_PREPARSED_DATA preparsed_data ) { struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)preparsed_data; - struct caps_filter filter = {}; + struct caps_filter filter = {.usage_page = USAGE_ANY, .usage = USAGE_ANY}; USHORT limit = -1; ULONG count = 0; @@ -981,7 +984,7 @@ NTSTATUS WINAPI HidP_GetData( HIDP_REPORT_TYPE report_type, HIDP_DATA *data, ULO { struct find_all_data_params params = {.data = data, .data_end = data + *data_len, .report_buf = report_buf}; struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)preparsed_data; - struct caps_filter filter = {}; + struct caps_filter filter = {.usage_page = USAGE_ANY, .usage = USAGE_ANY}; NTSTATUS status; USHORT limit = -1;

1 0

Rémi Bernon : windows.gaming.input: Fix magnitude sign for constant and ramp effects.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 4466e2c24c45ad483201562ebe37d1ffc0eb966d URL: https://gitlab.winehq.org/wine/wine/-/commit/4466e2c24c45ad483201562ebe37d1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 2 13:48:20 2023 +0100 windows.gaming.input: Fix magnitude sign for constant and ramp effects. The magnitude already carries the sign of X direction. Having a signed direction will inverse the effective direction. The Y and Z direction sign and magnitude seem to be ignored. --- dlls/dinput/tests/force_feedback.c | 18 ------------------ dlls/windows.gaming.input/force_feedback.c | 9 +++++++-- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index 6fdfa20c130..5ffc6a43471 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -5806,21 +5806,12 @@ static void test_windows_gaming_input(void) .report_len = 4, .report_buf = {9,0x01,0x18,0xfc}, }, - /* update effect (wine) */ - { - .code = IOCTL_HID_WRITE_REPORT, - .report_id = 3, - .report_len = 18, - .report_buf = {3,0x01,0x04,0x04,0x28,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x7f,0x99,0x00,0x00,0x00}, - .wine_only = TRUE, .todo = TRUE, - }, /* update effect */ { .code = IOCTL_HID_WRITE_REPORT, .report_id = 3, .report_len = 18, .report_buf = {3,0x01,0x04,0x04,0x28,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x7f,0x4e,0x01,0x00,0x00}, - .todo = TRUE, }, }; struct hid_expect expect_create_ramp[] = @@ -5915,21 +5906,12 @@ static void test_windows_gaming_input(void) .report_len = 6, .report_buf = {10,0x01,0x18,0xfc,0x60,0xf0}, }, - /* update effect (wine) */ - { - .code = IOCTL_HID_WRITE_REPORT, - .report_id = 3, - .report_len = 18, - .report_buf = {3,0x01,0x05,0x04,0x8f,0xe4,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x99,0x00,0x00,0x00}, - .wine_only = TRUE, .todo = TRUE, - }, /* update effect */ { .code = IOCTL_HID_WRITE_REPORT, .report_id = 3, .report_len = 18, .report_buf = {3,0x01,0x05,0x04,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x01,0x00,0x00}, - .todo = TRUE, }, }; struct hid_expect expect_effect_start = diff --git a/dlls/windows.gaming.input/force_feedback.c b/dlls/windows.gaming.input/force_feedback.c index 20b022ff317..cff3c184bf9 100644 --- a/dlls/windows.gaming.input/force_feedback.c +++ b/dlls/windows.gaming.input/force_feedback.c @@ -117,10 +117,12 @@ static int effect_reorient_direction( const WineForceFeedbackEffectParameters *p { case WineForceFeedbackEffectType_Constant: *direction = params->constant.direction; + sign = params->constant.direction.X < 0 ? -1 : +1; break; case WineForceFeedbackEffectType_Ramp: *direction = params->ramp.start_vector; + sign = params->ramp.start_vector.X < 0 ? -1 : +1; break; case WineForceFeedbackEffectType_Periodic_SineWave: @@ -152,6 +154,7 @@ static HRESULT WINAPI effect_impl_put_Parameters( IWineForceFeedbackEffectImpl * { struct effect *impl = impl_from_IWineForceFeedbackEffectImpl( iface ); Vector3 direction = {0}; + double magnitude = 0; DWORD count = 0; HRESULT hr; int sign; @@ -161,19 +164,21 @@ static HRESULT WINAPI effect_impl_put_Parameters( IWineForceFeedbackEffectImpl * EnterCriticalSection( &impl->cs ); sign = effect_reorient_direction( &params, &direction ); + /* Y and Z axes seems to be always ignored, is it really the case? */ + magnitude += direction.X * direction.X; switch (params.type) { case WineForceFeedbackEffectType_Constant: impl->repeat_count = params.constant.repeat_count; - impl->constant_force.lMagnitude = -sign * round( params.constant.gain * direction.X * 10000 ); + impl->constant_force.lMagnitude = sign * round( params.constant.gain * sqrt( magnitude ) * 10000 ); impl->params.dwDuration = min( max( params.constant.duration.Duration / 10, 0 ), INFINITE ); impl->params.dwStartDelay = min( max( params.constant.start_delay.Duration / 10, 0 ), INFINITE ); break; case WineForceFeedbackEffectType_Ramp: impl->repeat_count = params.ramp.repeat_count; - impl->ramp_force.lStart = -sign * round( params.ramp.gain * direction.X * 10000 ); + impl->ramp_force.lStart = sign * round( params.ramp.gain * sqrt( magnitude ) * 10000 ); impl->ramp_force.lEnd = round( params.ramp.gain * params.ramp.end_vector.X * 10000 ); impl->params.dwDuration = min( max( params.ramp.duration.Duration / 10, 0 ), INFINITE ); impl->params.dwStartDelay = min( max( params.ramp.start_delay.Duration / 10, 0 ), INFINITE );

1 0

Rémi Bernon : windows.gaming.input: Introduce new effect_reorient_direction helper.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 9d06d700e85bde3e45001688b8299abc192cb1a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d06d700e85bde3e45001688b8299a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 2 13:48:20 2023 +0100 windows.gaming.input: Introduce new effect_reorient_direction helper. --- dlls/windows.gaming.input/force_feedback.c | 63 +++++++++++++++++++++++------- 1 file changed, 49 insertions(+), 14 deletions(-) diff --git a/dlls/windows.gaming.input/force_feedback.c b/dlls/windows.gaming.input/force_feedback.c index d404934c3a7..20b022ff317 100644 --- a/dlls/windows.gaming.input/force_feedback.c +++ b/dlls/windows.gaming.input/force_feedback.c @@ -109,37 +109,74 @@ static ULONG WINAPI effect_impl_Release( IWineForceFeedbackEffectImpl *iface ) return ref; } +static int effect_reorient_direction( const WineForceFeedbackEffectParameters *params, Vector3 *direction ) +{ + int sign = +1; + + switch (params->type) + { + case WineForceFeedbackEffectType_Constant: + *direction = params->constant.direction; + break; + + case WineForceFeedbackEffectType_Ramp: + *direction = params->ramp.start_vector; + break; + + case WineForceFeedbackEffectType_Periodic_SineWave: + case WineForceFeedbackEffectType_Periodic_TriangleWave: + case WineForceFeedbackEffectType_Periodic_SquareWave: + case WineForceFeedbackEffectType_Periodic_SawtoothWaveDown: + case WineForceFeedbackEffectType_Periodic_SawtoothWaveUp: + *direction = params->periodic.direction; + break; + + case WineForceFeedbackEffectType_Condition_Spring: + case WineForceFeedbackEffectType_Condition_Damper: + case WineForceFeedbackEffectType_Condition_Inertia: + case WineForceFeedbackEffectType_Condition_Friction: + *direction = params->condition.direction; + sign = -1; + break; + } + + direction->X *= -sign; + direction->Y *= -sign; + direction->Z *= -sign; + + return sign; +} + static HRESULT WINAPI effect_impl_put_Parameters( IWineForceFeedbackEffectImpl *iface, WineForceFeedbackEffectParameters params, WineForceFeedbackEffectEnvelope *envelope ) { struct effect *impl = impl_from_IWineForceFeedbackEffectImpl( iface ); + Vector3 direction = {0}; DWORD count = 0; HRESULT hr; + int sign; TRACE( "iface %p, params %p, envelope %p.\n", iface, &params, envelope ); EnterCriticalSection( &impl->cs ); + + sign = effect_reorient_direction( &params, &direction ); + switch (params.type) { case WineForceFeedbackEffectType_Constant: impl->repeat_count = params.constant.repeat_count; - impl->constant_force.lMagnitude = round( params.constant.gain * params.constant.direction.X * 10000 ); + impl->constant_force.lMagnitude = -sign * round( params.constant.gain * direction.X * 10000 ); impl->params.dwDuration = min( max( params.constant.duration.Duration / 10, 0 ), INFINITE ); impl->params.dwStartDelay = min( max( params.constant.start_delay.Duration / 10, 0 ), INFINITE ); - if (impl->axes[count] == DIJOFS_X) impl->directions[count++] = round( -params.constant.direction.X * 10000 ); - if (impl->axes[count] == DIJOFS_Y) impl->directions[count++] = round( -params.constant.direction.Y * 10000 ); - if (impl->axes[count] == DIJOFS_Z) impl->directions[count++] = round( -params.constant.direction.Z * 10000 ); break; case WineForceFeedbackEffectType_Ramp: impl->repeat_count = params.ramp.repeat_count; - impl->ramp_force.lStart = round( params.ramp.gain * params.ramp.start_vector.X * 10000 ); + impl->ramp_force.lStart = -sign * round( params.ramp.gain * direction.X * 10000 ); impl->ramp_force.lEnd = round( params.ramp.gain * params.ramp.end_vector.X * 10000 ); impl->params.dwDuration = min( max( params.ramp.duration.Duration / 10, 0 ), INFINITE ); impl->params.dwStartDelay = min( max( params.ramp.start_delay.Duration / 10, 0 ), INFINITE ); - if (impl->axes[count] == DIJOFS_X) impl->directions[count++] = round( -params.ramp.start_vector.X * 10000 ); - if (impl->axes[count] == DIJOFS_Y) impl->directions[count++] = round( -params.ramp.start_vector.Y * 10000 ); - if (impl->axes[count] == DIJOFS_Z) impl->directions[count++] = round( -params.ramp.start_vector.Z * 10000 ); break; case WineForceFeedbackEffectType_Periodic_SineWave: @@ -154,9 +191,6 @@ static HRESULT WINAPI effect_impl_put_Parameters( IWineForceFeedbackEffectImpl * impl->periodic.lOffset = round( params.periodic.bias * 10000 ); impl->params.dwDuration = min( max( params.periodic.duration.Duration / 10, 0 ), INFINITE ); impl->params.dwStartDelay = min( max( params.periodic.start_delay.Duration / 10, 0 ), INFINITE ); - if (impl->axes[count] == DIJOFS_X) impl->directions[count++] = round( -params.periodic.direction.X * 10000 ); - if (impl->axes[count] == DIJOFS_Y) impl->directions[count++] = round( -params.periodic.direction.Y * 10000 ); - if (impl->axes[count] == DIJOFS_Z) impl->directions[count++] = round( -params.periodic.direction.Z * 10000 ); break; case WineForceFeedbackEffectType_Condition_Spring: @@ -172,12 +206,13 @@ static HRESULT WINAPI effect_impl_put_Parameters( IWineForceFeedbackEffectImpl * impl->condition.lOffset = round( params.condition.bias * 10000 ); impl->params.dwDuration = -1; impl->params.dwStartDelay = 0; - if (impl->axes[count] == DIJOFS_X) impl->directions[count++] = round( params.condition.direction.X * 10000 ); - if (impl->axes[count] == DIJOFS_Y) impl->directions[count++] = round( params.condition.direction.Y * 10000 ); - if (impl->axes[count] == DIJOFS_Z) impl->directions[count++] = round( params.condition.direction.Z * 10000 ); break; } + if (impl->axes[count] == DIJOFS_X) impl->directions[count++] = round( direction.X * 10000 ); + if (impl->axes[count] == DIJOFS_Y) impl->directions[count++] = round( direction.Y * 10000 ); + if (impl->axes[count] == DIJOFS_Z) impl->directions[count++] = round( direction.Z * 10000 ); + if (!envelope) impl->params.lpEnvelope = NULL; else {

1 0

Zebediah Figura : win32u: Make the global "caret" structure static.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 035ac4df7af40282829d8a3be8faf59810328c95 URL: https://gitlab.winehq.org/wine/wine/-/commit/035ac4df7af40282829d8a3be8faf5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 18 19:43:45 2023 -0600 win32u: Make the global "caret" structure static. --- dlls/win32u/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index fd16d03f733..5656d5eb28f 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -1780,7 +1780,7 @@ BOOL set_foreground_window( HWND hwnd, BOOL mouse ) return ret; } -struct +static struct { HBITMAP bitmap; unsigned int timeout;

1 0