December 2020 - Wine-Commits

Zebediah Figura : qedit/nullrenderer: Don't drop csRenderLock in NullRenderer_DoRenderSample().
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: 8a75411ec5349be62ff8c7abd8d7841a533e01ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a75411ec5349be62ff8c7ab… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 30 23:51:36 2020 -0600 qedit/nullrenderer: Don't drop csRenderLock in NullRenderer_DoRenderSample(). We don't grab stream_cs to change any variables checked here, except to reset flush_event, and that cannot result in a deadlock. The only possible deadlocks here are: (1) between this function and EndOfStream(), which is correct, as the two should presumably be serialized; (2) between this function and EndFlush(); however, in that case we expect BeginFlush() first, which will unblock the streaming thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/nullrenderer.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c index a8594eade8b..97e3cdbb202 100644 --- a/dlls/qedit/nullrenderer.c +++ b/dlls/qedit/nullrenderer.c @@ -46,9 +46,7 @@ static HRESULT WINAPI NullRenderer_DoRenderSample(struct strmbase_renderer *ifac const HANDLE events[2] = {filter->run_event, filter->renderer.flush_event}; SetEvent(filter->renderer.state_event); - LeaveCriticalSection(&filter->renderer.csRenderLock); WaitForMultipleObjects(2, events, FALSE, INFINITE); - EnterCriticalSection(&filter->renderer.csRenderLock); } return S_OK;

1 0

Alexandre Julliard : libport: Remove the isfinite/isinf/isnan function replacements.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: 2bc3c8463dbcb22c20b09ce19c677020c9e8e1e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bc3c8463dbcb22c20b09ce1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 10:41:24 2020 +0100 libport: Remove the isfinite/isinf/isnan function replacements. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 34 ++++++++++++++++++++++++++++++++++ include/wine/port.h | 39 --------------------------------------- libs/port/Makefile.in | 3 --- libs/port/isfinite.c | 38 -------------------------------------- libs/port/isinf.c | 38 -------------------------------------- libs/port/isnan.c | 38 -------------------------------------- 6 files changed, 34 insertions(+), 156 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a7baff857d0..52efe685d71 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -328,6 +328,40 @@ static inline GLenum wined3d_gl_min_mip_filter(enum wined3d_texture_filter_type return minMipLookup[min_filter].mip[mip_filter]; } +#ifdef HAVE_IEEEFP_H +#include <ieeefp.h> +#endif + +#if !defined(HAVE_ISFINITE) && !defined(isfinite) +static inline int isfinite(double x) { return finite(x); } +#endif + +#if !defined(HAVE_ISINF) && !defined(isinf) +static inline int isinf(double x) { return (!(finite(x) || isnand(x))); } +#endif + +#if !defined(HAVE_ISNAN) && !defined(isnan) +static inline int isnan(double x) { return isnand(x); } +#endif + +#ifndef INFINITY +static inline float __port_infinity(void) +{ + static const unsigned __inf_bytes = 0x7f800000; + return *(const float *)&__inf_bytes; +} +#define INFINITY __port_infinity() +#endif + +#ifndef NAN +static inline float __port_nan(void) +{ + static const unsigned __nan_bytes = 0x7fc00000; + return *(const float *)&__nan_bytes; +} +#define NAN __port_nan() +#endif + /* float_16_to_32() and float_32_to_16() (see implementation in * surface_base.c) convert 16 bit floats in the FLOAT16 data type * to standard C floats and vice versa. They do not depend on the encoding diff --git a/include/wine/port.h b/include/wine/port.h index 936f69d3bde..fec72120ec6 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -63,15 +63,6 @@ static inline const char *dlerror(void) { return "No dlopen support on Windows"; #ifdef _MSC_VER #define ftruncate chsize -#ifndef isfinite -# define isfinite(x) _finite(x) -#endif -#ifndef isinf -# define isinf(x) (!(_finite(x) || _isnan(x))) -#endif -#ifndef isnan -# define isnan(x) _isnan(x) -#endif #define popen _popen #define pclose _pclose /* The UCRT headers in the Windows SDK #error out if we #define snprintf. @@ -103,18 +94,6 @@ typedef int ssize_t; # endif #endif -#ifndef HAVE_ISFINITE -int isfinite(double x); -#endif - -#ifndef HAVE_ISINF -int isinf(double x); -#endif - -#ifndef HAVE_ISNAN -int isnan(double x); -#endif - /* Process creation flags */ #ifndef _P_WAIT # define _P_WAIT 0 @@ -191,24 +170,6 @@ extern int _spawnvp(int mode, const char *cmdname, const char * const argv[]); #define M_PI_2 1.570796326794896619 #endif -#ifndef INFINITY -static inline float __port_infinity(void) -{ - static const unsigned __inf_bytes = 0x7f800000; - return *(const float *)&__inf_bytes; -} -#define INFINITY __port_infinity() -#endif - -#ifndef NAN -static inline float __port_nan(void) -{ - static const unsigned __nan_bytes = 0x7fc00000; - return *(const float *)&__nan_bytes; -} -#define NAN __port_nan() -#endif - /**************************************************************** * Function definitions (only when using libwine_port) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 764a56f62ae..93b28e70879 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -2,9 +2,6 @@ STATICLIB = libwine_port.a C_SRCS = \ getopt.c \ - isfinite.c \ - isinf.c \ - isnan.c \ lstat.c \ mkstemps.c \ poll.c \ diff --git a/libs/port/isfinite.c b/libs/port/isfinite.c deleted file mode 100644 index b1ce304b2db..00000000000 --- a/libs/port/isfinite.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * isfinite function - * - * Copyright 2013 Francois Gouget - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" - -#if !defined(HAVE_ISFINITE) && !defined(isfinite) - -#ifdef HAVE_IEEEFP_H -#include <ieeefp.h> - -int isfinite(double x) -{ - return finite(x); -} - -#else -#error No isfinite() implementation available. -#endif - -#endif /* HAVE_ISFINITE */ diff --git a/libs/port/isinf.c b/libs/port/isinf.c deleted file mode 100644 index 89f62c90e61..00000000000 --- a/libs/port/isinf.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * isinf function - * - * Copyright 2008 Petr Sumbera - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" - -#if !defined(HAVE_ISINF) && !defined(isinf) - -#ifdef HAVE_IEEEFP_H -#include <ieeefp.h> - -int isinf(double x) -{ - return (!(finite(x) || isnand(x))); -} - -#else -#error No isinf() implementation available. -#endif - -#endif /* HAVE_ISINF */ diff --git a/libs/port/isnan.c b/libs/port/isnan.c deleted file mode 100644 index e98875c8ee1..00000000000 --- a/libs/port/isnan.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * isnan function - * - * Copyright 2008 Jacek Caban for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" - -#if !defined(HAVE_ISNAN) && !defined(isnan) - -#ifdef HAVE_IEEEFP_H -#include <ieeefp.h> - -int isnan(double x) -{ - return isnand(x); -} - -#else -#error No isnan() implementation available. -#endif - -#endif /* HAVE_ISNAN */

1 0

Alexandre Julliard : configure: Remove some no longer needed configure checks.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: c8edeb132da3fb196d430f5ab5d09a9399605547 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8edeb132da3fb196d430f5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 10:23:42 2020 +0100 configure: Remove some no longer needed configure checks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 24 ------------------------ configure.ac | 16 ---------------- include/config.h.in | 33 --------------------------------- include/wine/port.h | 10 ---------- 4 files changed, 83 deletions(-) diff --git a/configure b/configure index 283cac2f979..9ee3ffdc947 100755 --- a/configure +++ b/configure @@ -7390,7 +7390,6 @@ for ac_header in \ Carbon/Carbon.h \ CommonCrypto/CommonCryptor.h \ CoreAudio/CoreAudio.h \ - CoreServices/CoreServices.h \ DiskArbitration/DiskArbitration.h \ EGL/egl.h \ IOKit/IOKitLib.h \ @@ -7422,7 +7421,6 @@ for ac_header in \ libproc.h \ link.h \ linux/cdrom.h \ - linux/compiler.h \ linux/filter.h \ linux/hdreg.h \ linux/hidraw.h \ @@ -7435,10 +7433,8 @@ for ac_header in \ linux/types.h \ linux/ucdrom.h \ lwp.h \ - mach-o/nlist.h \ mach-o/loader.h \ mach/mach.h \ - mach/machine.h \ machine/cpu.h \ machine/sysarch.h \ mntent.h \ @@ -7457,7 +7453,6 @@ for ac_header in \ scsi/scsi.h \ scsi/scsi_ioctl.h \ scsi/sg.h \ - stdbool.h \ stdint.h \ stropts.h \ sys/attr.h \ @@ -17775,16 +17770,12 @@ for ac_func in \ pread \ proc_pidinfo \ pwrite \ - readdir \ readlink \ sched_yield \ setproctitle \ setprogname \ - settimeofday \ sigprocmask \ - strtold \ symlink \ - sysinfo \ tcdrain \ thr_kill2 @@ -18093,7 +18084,6 @@ fi for ac_func in \ getaddrinfo \ getnameinfo \ - getnetbyname \ getservbyport \ do : @@ -18689,20 +18679,6 @@ $as_echo "#define HAVE_LINUX_22_JOYSTICK_API 1" >>confdefs.h fi fi -ac_fn_c_check_member "$LINENO" "struct dirent" "d_reclen" "ac_cv_member_struct_dirent_d_reclen" "#ifdef HAVE_DIRENT_H -#include <dirent.h> -#endif -" -if test "x$ac_cv_member_struct_dirent_d_reclen" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_DIRENT_D_RECLEN 1 -_ACEOF - - -fi - - ac_fn_c_check_member "$LINENO" "struct msghdr" "msg_accrights" "ac_cv_member_struct_msghdr_msg_accrights" "#include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> diff --git a/configure.ac b/configure.ac index 853f99e8b1c..92b555bb3b8 100644 --- a/configure.ac +++ b/configure.ac @@ -417,7 +417,6 @@ AC_CHECK_HEADERS(\ Carbon/Carbon.h \ CommonCrypto/CommonCryptor.h \ CoreAudio/CoreAudio.h \ - CoreServices/CoreServices.h \ DiskArbitration/DiskArbitration.h \ EGL/egl.h \ IOKit/IOKitLib.h \ @@ -449,7 +448,6 @@ AC_CHECK_HEADERS(\ libproc.h \ link.h \ linux/cdrom.h \ - linux/compiler.h \ linux/filter.h \ linux/hdreg.h \ linux/hidraw.h \ @@ -462,10 +460,8 @@ AC_CHECK_HEADERS(\ linux/types.h \ linux/ucdrom.h \ lwp.h \ - mach-o/nlist.h \ mach-o/loader.h \ mach/mach.h \ - mach/machine.h \ machine/cpu.h \ machine/sysarch.h \ mntent.h \ @@ -484,7 +480,6 @@ AC_CHECK_HEADERS(\ scsi/scsi.h \ scsi/scsi_ioctl.h \ scsi/sg.h \ - stdbool.h \ stdint.h \ stropts.h \ sys/attr.h \ @@ -2184,16 +2179,12 @@ AC_CHECK_FUNCS(\ pread \ proc_pidinfo \ pwrite \ - readdir \ readlink \ sched_yield \ setproctitle \ setprogname \ - settimeofday \ sigprocmask \ - strtold \ symlink \ - sysinfo \ tcdrain \ thr_kill2 ) @@ -2222,7 +2213,6 @@ dnl **** Check for functions which may rely on -lsocket on Solaris. AC_CHECK_FUNCS(\ getaddrinfo \ getnameinfo \ - getnetbyname \ getservbyport \ ) @@ -2395,12 +2385,6 @@ then fi fi -dnl Check for dirent.d_reclen -AC_CHECK_MEMBERS([struct dirent.d_reclen],,, -[#ifdef HAVE_DIRENT_H -#include <dirent.h> -#endif]) - dnl Check for socket structure members AC_CHECK_MEMBERS([struct msghdr.msg_accrights, struct sockaddr.sa_len, struct sockaddr_un.sun_len],,, [#include <sys/types.h> diff --git a/include/config.h.in b/include/config.h.in index 0bed21d9cea..c0d90c48677 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -85,9 +85,6 @@ /* Define to 1 if you have the <CoreAudio/CoreAudio.h> header file. */ #undef HAVE_COREAUDIO_COREAUDIO_H -/* Define to 1 if you have the <CoreServices/CoreServices.h> header file. */ -#undef HAVE_CORESERVICES_CORESERVICES_H - /* Define to 1 if you have the <cups/cups.h> header file. */ #undef HAVE_CUPS_CUPS_H @@ -219,9 +216,6 @@ /* Define to 1 if you have the `getnameinfo' function. */ #undef HAVE_GETNAMEINFO -/* Define to 1 if you have the `getnetbyname' function. */ -#undef HAVE_GETNETBYNAME - /* Define to 1 if you have the <getopt.h> header file. */ #undef HAVE_GETOPT_H @@ -417,9 +411,6 @@ /* Define to 1 if you have the <linux/cdrom.h> header file. */ #undef HAVE_LINUX_CDROM_H -/* Define to 1 if you have the <linux/compiler.h> header file. */ -#undef HAVE_LINUX_COMPILER_H - /* Define to 1 if you have the <linux/filter.h> header file. */ #undef HAVE_LINUX_FILTER_H @@ -519,18 +510,12 @@ /* Define to 1 if you have the `mach_continuous_time' function. */ #undef HAVE_MACH_CONTINUOUS_TIME -/* Define to 1 if you have the <mach/machine.h> header file. */ -#undef HAVE_MACH_MACHINE_H - /* Define to 1 if you have the <mach/mach.h> header file. */ #undef HAVE_MACH_MACH_H /* Define to 1 if you have the <mach-o/loader.h> header file. */ #undef HAVE_MACH_O_LOADER_H -/* Define to 1 if you have the <mach-o/nlist.h> header file. */ -#undef HAVE_MACH_O_NLIST_H - /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H @@ -690,9 +675,6 @@ /* Define to 1 if you have the <QuickTime/ImageCompression.h> header file. */ #undef HAVE_QUICKTIME_IMAGECOMPRESSION_H -/* Define to 1 if you have the `readdir' function. */ -#undef HAVE_READDIR - /* Define to 1 if you have the `readlink' function. */ #undef HAVE_READLINK @@ -768,9 +750,6 @@ /* Define to 1 if you have the `setprogname' function. */ #undef HAVE_SETPROGNAME -/* Define to 1 if you have the `settimeofday' function. */ -#undef HAVE_SETTIMEOFDAY - /* Define to 1 if `interface_id' is a member of `sg_io_hdr_t'. */ #undef HAVE_SG_IO_HDR_T_INTERFACE_ID @@ -789,9 +768,6 @@ /* Define to 1 if you have the `SSLCopyPeerCertificates' function. */ #undef HAVE_SSLCOPYPEERCERTIFICATES -/* Define to 1 if you have the <stdbool.h> header file. */ -#undef HAVE_STDBOOL_H - /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H @@ -807,12 +783,6 @@ /* Define to 1 if you have the <stropts.h> header file. */ #undef HAVE_STROPTS_H -/* Define to 1 if you have the `strtold' function. */ -#undef HAVE_STRTOLD - -/* Define to 1 if `d_reclen' is a member of `struct dirent'. */ -#undef HAVE_STRUCT_DIRENT_D_RECLEN - /* Define to 1 if `direction' is a member of `struct ff_effect'. */ #undef HAVE_STRUCT_FF_EFFECT_DIRECTION @@ -921,9 +891,6 @@ /* Define to 1 if you have the <syscall.h> header file. */ #undef HAVE_SYSCALL_H -/* Define to 1 if you have the `sysinfo' function. */ -#undef HAVE_SYSINFO - /* Define to 1 if you have the <SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h> header file. */ #undef HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H diff --git a/include/wine/port.h b/include/wine/port.h index fec72120ec6..b1354395ca9 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -62,7 +62,6 @@ static inline const char *dlerror(void) { return "No dlopen support on Windows"; #ifdef _MSC_VER -#define ftruncate chsize #define popen _popen #define pclose _pclose /* The UCRT headers in the Windows SDK #error out if we #define snprintf. @@ -77,7 +76,6 @@ static inline const char *dlerror(void) { return "No dlopen support on Windows"; #define strncasecmp _strnicmp #define strcasecmp _stricmp -typedef int mode_t; typedef long off_t; typedef int pid_t; typedef int ssize_t; @@ -124,10 +122,6 @@ extern int _spawnvp(int mode, const char *cmdname, const char * const argv[]); # define S_ISLNK(mod) (0) #endif -#ifndef S_ISSOCK -# define S_ISSOCK(mod) (0) -#endif - #ifndef S_ISDIR # define S_ISDIR(mod) (((mod) & _S_IFMT) == _S_IFDIR) #endif @@ -136,10 +130,6 @@ extern int _spawnvp(int mode, const char *cmdname, const char * const argv[]); # define S_ISCHR(mod) (((mod) & _S_IFMT) == _S_IFCHR) #endif -#ifndef S_ISFIFO -# define S_ISFIFO(mod) (((mod) & _S_IFMT) == _S_IFIFO) -#endif - #ifndef S_ISREG # define S_ISREG(mod) (((mod) & _S_IFMT) == _S_IFREG) #endif

1 0

Alexandre Julliard : libport: Remove the statvfs() function replacements.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: d9a58b6013e4c8af22de0c2a494441068cbee8ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9a58b6013e4c8af22de0c2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 10:18:13 2020 +0100 libport: Remove the statvfs() function replacements. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 171 -------------------------------------------------- configure.ac | 27 -------- include/config.h.in | 36 ----------- include/wine/port.h | 39 ------------ libs/port/Makefile.in | 2 - libs/port/fstatvfs.c | 96 ---------------------------- libs/port/statvfs.c | 96 ---------------------------- 7 files changed, 467 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d9a58b6013e4c8af22de…

1 0

Alexandre Julliard : libport: Remove the rint() function replacements.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: 335b05ac90cd2349b99e7547acd7c1df89650c57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=335b05ac90cd2349b99e7547… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 10:15:49 2020 +0100 libport: Remove the rint() function replacements. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/unixlib.c | 24 +++++++++++++++++++ include/wine/port.h | 24 ------------------- libs/port/Makefile.in | 1 - libs/port/rint.c | 66 --------------------------------------------------- 4 files changed, 24 insertions(+), 91 deletions(-) diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 3913d61048a..b08663f387a 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -479,7 +479,11 @@ static float CDECL unix_lgammaf(float x) */ static __int64 CDECL unix_llrint(double x) { +#ifdef HAVE_LLRINT return llrint(x); +#else + return x >= 0 ? floor(x + 0.5) : ceil(x - 0.5); +#endif } /********************************************************************* @@ -487,7 +491,11 @@ static __int64 CDECL unix_llrint(double x) */ static __int64 CDECL unix_llrintf(float x) { +#ifdef HAVE_LLRINTF return llrintf(x); +#else + return x >= 0 ? floorf(x + 0.5) : ceilf(x - 0.5); +#endif } /********************************************************************* @@ -591,7 +599,11 @@ static float CDECL unix_logbf( float x ) */ static int CDECL unix_lrint(double x) { +#ifdef HAVE_LRINT return lrint(x); +#else + return x >= 0 ? floor(x + 0.5) : ceil(x - 0.5); +#endif } /********************************************************************* @@ -599,7 +611,11 @@ static int CDECL unix_lrint(double x) */ static int CDECL unix_lrintf(float x) { +#ifdef HAVE_LRINTF return lrintf(x); +#else + return x >= 0 ? floorf(x + 0.5) : ceilf(x - 0.5); +#endif } /********************************************************************* @@ -757,7 +773,11 @@ static float CDECL unix_remquof(float x, float y, int *quo) */ static double CDECL unix_rint(double x) { +#ifdef HAVE_RINT return rint(x); +#else + return x >= 0 ? floor(x + 0.5) : ceil(x - 0.5); +#endif } /********************************************************************* @@ -765,7 +785,11 @@ static double CDECL unix_rint(double x) */ static float CDECL unix_rintf(float x) { +#ifdef HAVE_RINTF return rintf(x); +#else + return x >= 0 ? floorf(x + 0.5) : ceilf(x - 0.5); +#endif } /********************************************************************* diff --git a/include/wine/port.h b/include/wine/port.h index 928730a41d7..993cf483c15 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -278,22 +278,6 @@ extern int getopt_long_only (int ___argc, char *const *___argv, int ffs( int x ); #endif -#ifndef HAVE_LLRINT -__int64 llrint(double x); -#endif - -#ifndef HAVE_LLRINTF -__int64 llrintf(float x); -#endif - -#ifndef HAVE_LRINT -long lrint(double x); -#endif - -#ifndef HAVE_LRINTF -long lrintf(float x); -#endif - #ifndef HAVE_LSTAT int lstat(const char *file_name, struct stat *buf); #endif /* HAVE_LSTAT */ @@ -326,14 +310,6 @@ ssize_t pwrite( int fd, const void *buf, size_t count, off_t offset ); int readlink( const char *path, char *buf, size_t size ); #endif /* HAVE_READLINK */ -#ifndef HAVE_RINT -double rint(double x); -#endif - -#ifndef HAVE_RINTF -float rintf(float x); -#endif - #ifndef HAVE_STATVFS int statvfs( const char *path, struct statvfs *buf ); #endif diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 51cfdb4df54..435598c2856 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -13,7 +13,6 @@ C_SRCS = \ pread.c \ pwrite.c \ readlink.c \ - rint.c \ spawn.c \ statvfs.c \ strnlen.c \ diff --git a/libs/port/rint.c b/libs/port/rint.c deleted file mode 100644 index 2c0d22294c2..00000000000 --- a/libs/port/rint.c +++ /dev/null @@ -1,66 +0,0 @@ -/* - * rint family - * - * Copyright 2017 Alex Henrie - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" - -#include <math.h> - -#ifndef HAVE_RINT -double rint(double x) -{ - return x >= 0 ? floor(x + 0.5) : ceil(x - 0.5); -} -#endif - -#ifndef HAVE_RINTF -float rintf(float x) -{ - return rint(x); -} -#endif - -#ifndef HAVE_LRINT -long lrint(double x) -{ - return x >= 0 ? floor(x + 0.5) : ceil(x - 0.5); -} -#endif - -#ifndef HAVE_LRINTF -long lrintf(float x) -{ - return lrint(x); -} -#endif - -#ifndef HAVE_LLRINT -__int64 llrint(double x) -{ - return x >= 0 ? floor(x + 0.5) : ceil(x - 0.5); -} -#endif - -#ifndef HAVE_LLRINTF -__int64 llrintf(float x) -{ - return llrint(x); -} -#endif

1 0

Zebediah Figura : quartz/dsoundrender: Don't drop stream_cs in DSoundRender_SendSampleData().
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: cf366488f6076859fdbd75a3570711ea51c0cc21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf366488f6076859fdbd75a3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 30 23:51:34 2020 -0600 quartz/dsoundrender: Don't drop stream_cs in DSoundRender_SendSampleData(). We don't grab stream_cs to change any variables checked here, except to reset flush_event, and that cannot result in a deadlock. The only possible deadlocks here are: (1) between this function and EndOfStream(), which is correct, as the two should presumably be serialized; (2) between this function and EndFlush(); however, in that case we expect BeginFlush() first, which will unblock the streaming thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 98ff21c0da1..099af2c4e21 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -257,9 +257,7 @@ static HRESULT DSoundRender_SendSampleData(struct dsound_render *This, hr = S_FALSE; if (hr != S_OK) { - LeaveCriticalSection(&This->stream_cs); ret = WaitForSingleObject(This->flush_event, 10); - EnterCriticalSection(&This->stream_cs); if (This->sink.flushing || This->filter.state == State_Stopped) return This->filter.state == State_Paused ? S_OK : VFW_E_WRONG_STATE; if (ret != WAIT_TIMEOUT)

1 0

Zebediah Figura : quartz/dsoundrender: Remove the unused "in_loop" field.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: 3933ceca582ecc84f6bb92eb397a8eb8a0d1834a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3933ceca582ecc84f6bb92eb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 30 23:51:32 2020 -0600 quartz/dsoundrender: Remove the unused "in_loop" field. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 1c6b28512b0..788643af372 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -63,7 +63,6 @@ struct dsound_render IDirectSound8 *dsound; LPDIRECTSOUNDBUFFER dsbuffer; DWORD buf_size; - DWORD in_loop; DWORD last_playpos, writepos; REFERENCE_TIME play_time; @@ -237,11 +236,9 @@ static HRESULT DSoundRender_HandleEndOfStream(struct dsound_render *This) if (pos1 == pos2) break; - This->in_loop = 1; LeaveCriticalSection(&This->stream_cs); WaitForSingleObject(This->flush_event, 10); EnterCriticalSection(&This->stream_cs); - This->in_loop = 0; } return S_OK; @@ -262,11 +259,9 @@ static HRESULT DSoundRender_SendSampleData(struct dsound_render *This, hr = S_FALSE; if (hr != S_OK) { - This->in_loop = 1; LeaveCriticalSection(&This->stream_cs); ret = WaitForSingleObject(This->flush_event, 10); EnterCriticalSection(&This->stream_cs); - This->in_loop = 0; if (This->sink.flushing || This->filter.state == State_Stopped) return This->filter.state == State_Paused ? S_OK : VFW_E_WRONG_STATE; if (ret != WAIT_TIMEOUT)

1 0

Michael Stefaniuc : sti: Use wide-char string literals.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: bfab815a60a25ce01537d3c7957b991882f12e90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfab815a60a25ce01537d3c7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Dec 1 00:58:25 2020 +0100 sti: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sti/sti.c | 17 ++++------------- dlls/sti/tests/sti.c | 2 +- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/sti/sti.c b/dlls/sti/sti.c index 962371f92d2..0bb60382979 100644 --- a/dlls/sti/sti.c +++ b/dlls/sti/sti.c @@ -32,14 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(sti); -static const WCHAR registeredAppsLaunchPath[] = { - 'S','O','F','T','W','A','R','E','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'S','t','i','l','l','I','m','a','g','e','\\', - 'R','e','g','i','s','t','e','r','e','d',' ','A','p','p','l','i','c','a','t','i','o','n','s',0 -}; +static const WCHAR registeredAppsLaunchPath[] = + L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\StillImage\\Registered Applications"; typedef struct _stillimage { @@ -134,10 +128,7 @@ static HRESULT WINAPI stillimagew_GetSTILaunchInformation(IStillImageW *iface, L static HRESULT WINAPI stillimagew_RegisterLaunchApplication(IStillImageW *iface, LPWSTR pwszAppName, LPWSTR pwszCommandLine) { - static const WCHAR format[] = {'%','s',' ','%','s',0}; - static const WCHAR commandLineSuffix[] = { - '/','S','t','i','D','e','v','i','c','e',':','%','1',' ', - '/','S','t','i','E','v','e','n','t',':','%','2',0}; + static const WCHAR commandLineSuffix[] = L"/StiDevice:%1 /StiEvent:%2"; HKEY registeredAppsKey = NULL; DWORD ret; HRESULT hr = S_OK; @@ -152,7 +143,7 @@ static HRESULT WINAPI stillimagew_RegisterLaunchApplication(IStillImageW *iface, WCHAR *value = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (value) { - swprintf(value, len, format, pwszCommandLine, commandLineSuffix); + swprintf(value, len, L"%s %s", pwszCommandLine, commandLineSuffix); ret = RegSetValueExW(registeredAppsKey, pwszAppName, 0, REG_SZ, (BYTE*)value, (lstrlenW(value)+1)*sizeof(WCHAR)); if (ret != ERROR_SUCCESS) diff --git a/dlls/sti/tests/sti.c b/dlls/sti/tests/sti.c index bd8b7b6b171..a87ab9fe47e 100644 --- a/dlls/sti/tests/sti.c +++ b/dlls/sti/tests/sti.c @@ -230,7 +230,7 @@ static void test_stillimage_aggregation(void) static void test_launch_app_registry(void) { - static WCHAR appName[] = {'w','i','n','e','s','t','i','t','e','s','t','a','p','p',0}; + static WCHAR appName[] = L"winestitestapp"; IStillImageW *pStiW = NULL; HRESULT hr;

1 0

Zebediah Figura : strmbase: Don't drop csRenderLock in BaseRenderer_Receive().
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: 6f05c692107b35681944d6ef5c6cf7c1c057a97d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f05c692107b35681944d6ef… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 30 23:51:35 2020 -0600 strmbase: Don't drop csRenderLock in BaseRenderer_Receive(). We don't grab stream_cs to change any variables checked here, except to reset flush_event, and that cannot result in a deadlock. The only possible deadlocks here are: (1) between this function and EndOfStream(), which is correct, as the two should presumably be serialized; (2) between this function and EndFlush(); however, in that case we expect BeginFlush() first, which will unblock the streaming thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index dde56b7a346..24d209703ca 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -224,18 +224,15 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp IReferenceClock_AdviseTime(filter->filter.clock, filter->stream_start, start, (HEVENT)filter->advise_event, &cookie); - LeaveCriticalSection(&filter->csRenderLock); - ret = WaitForMultipleObjects(2, handles, FALSE, INFINITE); IReferenceClock_Unadvise(filter->filter.clock, cookie); if (ret == 1) { + LeaveCriticalSection(&filter->csRenderLock); TRACE("Flush signaled; discarding current sample.\n"); return S_OK; } - - EnterCriticalSection(&filter->csRenderLock); } }

1 0

Michael Stefaniuc : dmusic: Sync up the dmobject.[ch] files.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: 9f9fce44fcc07ecc44a8330181bf223a9a046387 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f9fce44fcc07ecc44a83301… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 30 21:41:01 2020 +0100 dmusic: Sync up the dmobject.[ch] files. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/dmobject.c | 111 ++++++++++++++++++++++++++++++++++++++++++++--- dlls/dmband/dmobject.h | 8 +++- dlls/dmcompos/dmobject.c | 111 ++++++++++++++++++++++++++++++++++++++++++++--- dlls/dmcompos/dmobject.h | 8 +++- dlls/dmloader/dmobject.c | 111 ++++++++++++++++++++++++++++++++++++++++++++--- dlls/dmloader/dmobject.h | 8 +++- dlls/dmscript/dmobject.c | 111 ++++++++++++++++++++++++++++++++++++++++++++--- dlls/dmscript/dmobject.h | 8 +++- dlls/dmstyle/dmobject.c | 111 ++++++++++++++++++++++++++++++++++++++++++++--- dlls/dmstyle/dmobject.h | 8 +++- dlls/dmusic/dmobject.c | 111 ++++++++++++++++++++++++++++++++++++++++++++--- dlls/dmusic/dmobject.h | 8 +++- dlls/dswave/dmobject.c | 111 ++++++++++++++++++++++++++++++++++++++++++++--- dlls/dswave/dmobject.h | 8 +++- 14 files changed, 791 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9f9fce44fcc07ecc44a8…

1 0