October 2021 - Wine-Commits

Alexandre Julliard : wbemuuid: Move to the libs directory.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: cbf9a44ee4b990b7ebea9be6c6fec2589d76065a URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbf9a44ee4b990b7ebea9be6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 11 11:33:31 2021 +0200 wbemuuid: Move to the libs directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 2 +- {dlls => libs}/wbemuuid/Makefile.in | 0 {dlls => libs}/wbemuuid/wbemuuid.c | 0 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 8b50a693e73..fb8cd48920a 100755 --- a/configure +++ b/configure @@ -1662,7 +1662,6 @@ enable_vssapi enable_vulkan_1 enable_wbemdisp enable_wbemprox -enable_wbemuuid enable_wdscore enable_webservices enable_websocket @@ -1786,6 +1785,7 @@ enable_dxguid enable_mfuuid enable_strmiids enable_uuid +enable_wbemuuid enable_wine enable_loader enable_nls @@ -20757,7 +20757,6 @@ wine_fn_config_makefile dlls/wbemdisp enable_wbemdisp wine_fn_config_makefile dlls/wbemdisp/tests enable_tests wine_fn_config_makefile dlls/wbemprox enable_wbemprox wine_fn_config_makefile dlls/wbemprox/tests enable_tests -wine_fn_config_makefile dlls/wbemuuid enable_wbemuuid wine_fn_config_makefile dlls/wdscore enable_wdscore wine_fn_config_makefile dlls/webservices enable_webservices wine_fn_config_makefile dlls/webservices/tests enable_tests @@ -20922,6 +20921,7 @@ wine_fn_config_makefile libs/dxguid enable_dxguid wine_fn_config_makefile libs/mfuuid enable_mfuuid wine_fn_config_makefile libs/strmiids enable_strmiids wine_fn_config_makefile libs/uuid enable_uuid +wine_fn_config_makefile libs/wbemuuid enable_wbemuuid wine_fn_config_makefile libs/wine enable_wine wine_fn_config_makefile loader enable_loader wine_fn_config_makefile nls enable_nls diff --git a/configure.ac b/configure.ac index 8c35b36952b..5732f5aad70 100644 --- a/configure.ac +++ b/configure.ac @@ -3644,7 +3644,6 @@ WINE_CONFIG_MAKEFILE(dlls/wbemdisp) WINE_CONFIG_MAKEFILE(dlls/wbemdisp/tests) WINE_CONFIG_MAKEFILE(dlls/wbemprox) WINE_CONFIG_MAKEFILE(dlls/wbemprox/tests) -WINE_CONFIG_MAKEFILE(dlls/wbemuuid) WINE_CONFIG_MAKEFILE(dlls/wdscore) WINE_CONFIG_MAKEFILE(dlls/webservices) WINE_CONFIG_MAKEFILE(dlls/webservices/tests) @@ -3809,6 +3808,7 @@ WINE_CONFIG_MAKEFILE(libs/dxguid) WINE_CONFIG_MAKEFILE(libs/mfuuid) WINE_CONFIG_MAKEFILE(libs/strmiids) WINE_CONFIG_MAKEFILE(libs/uuid) +WINE_CONFIG_MAKEFILE(libs/wbemuuid) WINE_CONFIG_MAKEFILE(libs/wine) WINE_CONFIG_MAKEFILE(loader) WINE_CONFIG_MAKEFILE(nls) diff --git a/dlls/wbemuuid/Makefile.in b/libs/wbemuuid/Makefile.in similarity index 100% rename from dlls/wbemuuid/Makefile.in rename to libs/wbemuuid/Makefile.in diff --git a/dlls/wbemuuid/wbemuuid.c b/libs/wbemuuid/wbemuuid.c similarity index 100% rename from dlls/wbemuuid/wbemuuid.c rename to libs/wbemuuid/wbemuuid.c

1 0

Alexandre Julliard : uuid: Move to the libs directory.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: 4fa272b0031ade9d0c9bf6cba3df22053ad6e640 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fa272b0031ade9d0c9bf6cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 11 11:32:59 2021 +0200 uuid: Move to the libs directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 2 +- {dlls => libs}/uuid/Makefile.in | 0 {dlls => libs}/uuid/d2d.c | 0 {dlls => libs}/uuid/uuid.c | 0 5 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 4c61f110d90..8b50a693e73 100755 --- a/configure +++ b/configure @@ -1644,7 +1644,6 @@ enable_user32 enable_userenv enable_usp10 enable_utildll -enable_uuid enable_uxtheme enable_vbscript enable_vcomp @@ -1786,6 +1785,7 @@ enable_dxerr9 enable_dxguid enable_mfuuid enable_strmiids +enable_uuid enable_wine enable_loader enable_nls @@ -20721,7 +20721,6 @@ wine_fn_config_makefile dlls/userenv/tests enable_tests wine_fn_config_makefile dlls/usp10 enable_usp10 wine_fn_config_makefile dlls/usp10/tests enable_tests wine_fn_config_makefile dlls/utildll enable_utildll -wine_fn_config_makefile dlls/uuid enable_uuid wine_fn_config_makefile dlls/uxtheme enable_uxtheme wine_fn_config_makefile dlls/uxtheme/tests enable_tests wine_fn_config_makefile dlls/vbscript enable_vbscript @@ -20922,6 +20921,7 @@ wine_fn_config_makefile libs/dxerr9 enable_dxerr9 wine_fn_config_makefile libs/dxguid enable_dxguid wine_fn_config_makefile libs/mfuuid enable_mfuuid wine_fn_config_makefile libs/strmiids enable_strmiids +wine_fn_config_makefile libs/uuid enable_uuid wine_fn_config_makefile libs/wine enable_wine wine_fn_config_makefile loader enable_loader wine_fn_config_makefile nls enable_nls diff --git a/configure.ac b/configure.ac index b1852a98da8..8c35b36952b 100644 --- a/configure.ac +++ b/configure.ac @@ -3608,7 +3608,6 @@ WINE_CONFIG_MAKEFILE(dlls/userenv/tests) WINE_CONFIG_MAKEFILE(dlls/usp10) WINE_CONFIG_MAKEFILE(dlls/usp10/tests) WINE_CONFIG_MAKEFILE(dlls/utildll) -WINE_CONFIG_MAKEFILE(dlls/uuid) WINE_CONFIG_MAKEFILE(dlls/uxtheme) WINE_CONFIG_MAKEFILE(dlls/uxtheme/tests) WINE_CONFIG_MAKEFILE(dlls/vbscript) @@ -3809,6 +3808,7 @@ WINE_CONFIG_MAKEFILE(libs/dxerr9) WINE_CONFIG_MAKEFILE(libs/dxguid) WINE_CONFIG_MAKEFILE(libs/mfuuid) WINE_CONFIG_MAKEFILE(libs/strmiids) +WINE_CONFIG_MAKEFILE(libs/uuid) WINE_CONFIG_MAKEFILE(libs/wine) WINE_CONFIG_MAKEFILE(loader) WINE_CONFIG_MAKEFILE(nls) diff --git a/dlls/uuid/Makefile.in b/libs/uuid/Makefile.in similarity index 100% rename from dlls/uuid/Makefile.in rename to libs/uuid/Makefile.in diff --git a/dlls/uuid/d2d.c b/libs/uuid/d2d.c similarity index 100% rename from dlls/uuid/d2d.c rename to libs/uuid/d2d.c diff --git a/dlls/uuid/uuid.c b/libs/uuid/uuid.c similarity index 100% rename from dlls/uuid/uuid.c rename to libs/uuid/uuid.c

1 0

Alexandre Julliard : dxguid: Move to the libs directory.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: 3f1e7ac5b6158c62f418a1f6d57633125f036184 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f1e7ac5b6158c62f418a1f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 11 11:31:34 2021 +0200 dxguid: Move to the libs directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 2 +- {dlls => libs}/dxguid/Makefile.in | 0 {dlls => libs}/dxguid/dx10guid.c | 0 {dlls => libs}/dxguid/dx8guid.c | 0 {dlls => libs}/dxguid/dx9guid.c | 0 {dlls => libs}/dxguid/dxguid.c | 0 7 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 72bde82e1a7..eb6fe85b0b3 100755 --- a/configure +++ b/configure @@ -1301,7 +1301,6 @@ enable_dwrite enable_dx8vb enable_dxdiagn enable_dxgi -enable_dxguid enable_dxtrans enable_dxva2 enable_esent @@ -1786,6 +1785,7 @@ enable_adsiid enable_dmoguids enable_dxerr8 enable_dxerr9 +enable_dxguid enable_wine enable_loader enable_nls @@ -20214,7 +20214,6 @@ wine_fn_config_makefile dlls/dxdiagn enable_dxdiagn wine_fn_config_makefile dlls/dxdiagn/tests enable_tests wine_fn_config_makefile dlls/dxgi enable_dxgi wine_fn_config_makefile dlls/dxgi/tests enable_tests -wine_fn_config_makefile dlls/dxguid enable_dxguid wine_fn_config_makefile dlls/dxtrans enable_dxtrans wine_fn_config_makefile dlls/dxva2 enable_dxva2 wine_fn_config_makefile dlls/dxva2/tests enable_tests @@ -20922,6 +20921,7 @@ wine_fn_config_makefile libs/adsiid enable_adsiid wine_fn_config_makefile libs/dmoguids enable_dmoguids wine_fn_config_makefile libs/dxerr8 enable_dxerr8 wine_fn_config_makefile libs/dxerr9 enable_dxerr9 +wine_fn_config_makefile libs/dxguid enable_dxguid wine_fn_config_makefile libs/wine enable_wine wine_fn_config_makefile loader enable_loader wine_fn_config_makefile nls enable_nls diff --git a/configure.ac b/configure.ac index 63c87ef51c8..e9286ef7674 100644 --- a/configure.ac +++ b/configure.ac @@ -3101,7 +3101,6 @@ WINE_CONFIG_MAKEFILE(dlls/dxdiagn) WINE_CONFIG_MAKEFILE(dlls/dxdiagn/tests) WINE_CONFIG_MAKEFILE(dlls/dxgi) WINE_CONFIG_MAKEFILE(dlls/dxgi/tests) -WINE_CONFIG_MAKEFILE(dlls/dxguid) WINE_CONFIG_MAKEFILE(dlls/dxtrans) WINE_CONFIG_MAKEFILE(dlls/dxva2) WINE_CONFIG_MAKEFILE(dlls/dxva2/tests) @@ -3809,6 +3808,7 @@ WINE_CONFIG_MAKEFILE(libs/adsiid) WINE_CONFIG_MAKEFILE(libs/dmoguids) WINE_CONFIG_MAKEFILE(libs/dxerr8) WINE_CONFIG_MAKEFILE(libs/dxerr9) +WINE_CONFIG_MAKEFILE(libs/dxguid) WINE_CONFIG_MAKEFILE(libs/wine) WINE_CONFIG_MAKEFILE(loader) WINE_CONFIG_MAKEFILE(nls) diff --git a/dlls/dxguid/Makefile.in b/libs/dxguid/Makefile.in similarity index 100% rename from dlls/dxguid/Makefile.in rename to libs/dxguid/Makefile.in diff --git a/dlls/dxguid/dx10guid.c b/libs/dxguid/dx10guid.c similarity index 100% rename from dlls/dxguid/dx10guid.c rename to libs/dxguid/dx10guid.c diff --git a/dlls/dxguid/dx8guid.c b/libs/dxguid/dx8guid.c similarity index 100% rename from dlls/dxguid/dx8guid.c rename to libs/dxguid/dx8guid.c diff --git a/dlls/dxguid/dx9guid.c b/libs/dxguid/dx9guid.c similarity index 100% rename from dlls/dxguid/dx9guid.c rename to libs/dxguid/dx9guid.c diff --git a/dlls/dxguid/dxguid.c b/libs/dxguid/dxguid.c similarity index 100% rename from dlls/dxguid/dxguid.c rename to libs/dxguid/dxguid.c

1 0

Alexandre Julliard : include: Don't define math functions or constants in wine/port.h.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: edba76c826a54b01c0fe033c797b33e0165539ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=edba76c826a54b01c0fe033c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 11 11:25:35 2021 +0200 include: Don't define math functions or constants in wine/port.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 1 + dlls/opengl32/wgl.c | 1 + dlls/windowscodecs/libtiff.c | 1 + dlls/winex11.drv/wintab.c | 1 + include/wine/port.h | 13 ------------- 5 files changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index dfc0d4c9a09..df309814c0c 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -30,6 +30,7 @@ #include <stdarg.h> #include <stdio.h> #include <signal.h> +#include <math.h> #ifdef HAVE_LINK_H # include <link.h> #endif diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index cf46c6dfa8a..e2b514ffca9 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -24,6 +24,7 @@ #include <stdarg.h> #include <stdlib.h> #include <string.h> +#include <math.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/windowscodecs/libtiff.c b/dlls/windowscodecs/libtiff.c index 1489fbe85fa..32d1f7bd8cb 100644 --- a/dlls/windowscodecs/libtiff.c +++ b/dlls/windowscodecs/libtiff.c @@ -25,6 +25,7 @@ #include "wine/port.h" #include <stdarg.h> +#include <math.h> #ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 5cfc2b3a38d..c141ae88e71 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -23,6 +23,7 @@ #include <stdlib.h> #include <stdarg.h> +#include <math.h> #include "windef.h" #include "winbase.h" diff --git a/include/wine/port.h b/include/wine/port.h index 795a61f741b..00d3a8b5e3c 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -30,7 +30,6 @@ #endif #include <fcntl.h> -#include <math.h> #include <sys/types.h> #include <sys/stat.h> #include <string.h> @@ -70,16 +69,4 @@ static inline int symlink(const char *from, const char *to) { errno = ENOSYS; re #endif /* _WIN32 */ -/**************************************************************** - * Constants - */ - -#ifndef M_PI -#define M_PI 3.14159265358979323846 -#endif - -#ifndef M_PI_2 -#define M_PI_2 1.570796326794896619 -#endif - #endif /* !defined(__WINE_WINE_PORT_H) */

1 0

Alexandre Julliard : server: Add sys/types.h include in a few more files.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: 1381be977bf78f28d2f5e8688417042b91b34671 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1381be977bf78f28d2f5e868… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 11 11:43:27 2021 +0200 server: Add sys/types.h include in a few more files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/event.c | 1 + server/handle.c | 1 + server/mutex.c | 1 + server/named_pipe.c | 1 + server/object.c | 1 + server/registry.c | 1 + server/semaphore.c | 1 + server/token.c | 1 + server/winstation.c | 1 + 9 files changed, 9 insertions(+) diff --git a/server/event.c b/server/event.c index c7424dfe8ff..f1b79b1b35e 100644 --- a/server/event.c +++ b/server/event.c @@ -24,6 +24,7 @@ #include <stdio.h> #include <stdlib.h> #include <stdarg.h> +#include <sys/types.h> #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/server/handle.c b/server/handle.c index 6a5416bcb84..13e40770aea 100644 --- a/server/handle.c +++ b/server/handle.c @@ -26,6 +26,7 @@ #include <stdarg.h> #include <stdio.h> #include <stdlib.h> +#include <sys/types.h> #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/server/mutex.c b/server/mutex.c index 906e1c060e9..af0efe72132 100644 --- a/server/mutex.c +++ b/server/mutex.c @@ -24,6 +24,7 @@ #include <stdio.h> #include <stdlib.h> #include <stdarg.h> +#include <sys/types.h> #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/server/named_pipe.c b/server/named_pipe.c index 6964ab1b2ee..1bbf7f17a3a 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -27,6 +27,7 @@ #include <stdarg.h> #include <stdio.h> #include <stdlib.h> +#include <sys/types.h> #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/server/object.c b/server/object.c index e438a6d41ba..45ecbba3881 100644 --- a/server/object.c +++ b/server/object.c @@ -27,6 +27,7 @@ #include <string.h> #include <unistd.h> #include <stdarg.h> +#include <sys/types.h> #ifdef HAVE_VALGRIND_MEMCHECK_H #include <valgrind/memcheck.h> #endif diff --git a/server/registry.c b/server/registry.c index 4ba5c86ae58..b00abdbc004 100644 --- a/server/registry.c +++ b/server/registry.c @@ -34,6 +34,7 @@ #include <string.h> #include <stdlib.h> #include <sys/stat.h> +#include <sys/types.h> #include <unistd.h> #include "ntstatus.h" diff --git a/server/semaphore.c b/server/semaphore.c index 6a8b871940f..53b42a886df 100644 --- a/server/semaphore.c +++ b/server/semaphore.c @@ -24,6 +24,7 @@ #include <stdio.h> #include <stdlib.h> #include <stdarg.h> +#include <sys/types.h> #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/server/token.c b/server/token.c index 5d2fc9555a2..820a7a0e07d 100644 --- a/server/token.c +++ b/server/token.c @@ -26,6 +26,7 @@ #include <stdio.h> #include <stdlib.h> #include <stdarg.h> +#include <sys/types.h> #include <unistd.h> #include "ntstatus.h" diff --git a/server/winstation.c b/server/winstation.c index 6f2dfcf4e31..854affead77 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -22,6 +22,7 @@ #include <stdio.h> #include <stdarg.h> +#include <sys/types.h> #include "ntstatus.h" #define WIN32_NO_STATUS

1 0

Alexandre Julliard : configure: Define _GNU_SOURCE in config.h.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: ea2c743668ce2ed0c5cefca6455d9ed0435b9630 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea2c743668ce2ed0c5cefca6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 11 11:22:53 2021 +0200 configure: Define _GNU_SOURCE in config.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 9 ++++++--- configure.ac | 9 ++++----- dlls/ntdll/unix/socket.c | 1 - dlls/winealsa.drv/mmdevdrv.c | 1 - include/config.h.in | 3 +++ include/wine/port.h | 3 --- server/thread.c | 1 - 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/configure b/configure index 9a492b7197e..9e369e943f9 100755 --- a/configure +++ b/configure @@ -9111,6 +9111,9 @@ fi ;; linux-android*) + +$as_echo "#define _GNU_SOURCE 1" >>confdefs.h + DLLFLAGS="$DLLFLAGS -fPIC" LDDLLFLAGS="-fPIC" LDEXECFLAGS="-Wl,-pie" @@ -9290,6 +9293,9 @@ fi ;; *) + +$as_echo "#define _GNU_SOURCE 1" >>confdefs.h + case $host_cpu in *i[3456789]86*) DLLFLAGS="$DLLFLAGS -fno-PIC" @@ -18424,7 +18430,6 @@ if ${wine_cv_have_sched_setaffinity+:} false; then : else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#define _GNU_SOURCE #include <sched.h> int main () @@ -19029,7 +19034,6 @@ fi ac_fn_c_check_member "$LINENO" "struct in6_pktinfo" "ipi6_addr" "ac_cv_member_struct_in6_pktinfo_ipi6_addr" "#ifdef HAVE_NETINET_IN_H -#define _GNU_SOURCE #include <netinet/in.h> #endif " @@ -19198,7 +19202,6 @@ if ${ac_cv_have_isfinite+:} false; then : else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#define _GNU_SOURCE #include <math.h> int main () diff --git a/configure.ac b/configure.ac index a157c948fec..7afe8285073 100644 --- a/configure.ac +++ b/configure.ac @@ -861,6 +861,7 @@ case $host_os in ;; linux-android*) + AC_DEFINE(_GNU_SOURCE,1,[Define to 1 to enable GNU extensions on Linux]) DLLFLAGS="$DLLFLAGS -fPIC" LDDLLFLAGS="-fPIC" LDEXECFLAGS="-Wl,-pie" @@ -884,6 +885,7 @@ case $host_os in ;; *) + AC_DEFINE(_GNU_SOURCE,1,[Define to 1 to enable GNU extensions on Linux]) case $host_cpu in *i[[3456789]]86*) DLLFLAGS="$DLLFLAGS -fno-PIC" @@ -2217,8 +2219,7 @@ WINE_NOTICE_WITH(ldap,[test "x$LDAP_LIBS" = "x"], AC_CACHE_CHECK([for sched_setaffinity],wine_cv_have_sched_setaffinity, AC_LINK_IFELSE([AC_LANG_PROGRAM( -[[#define _GNU_SOURCE -#include <sched.h>]], [[sched_setaffinity(0, 0, 0);]])],[wine_cv_have_sched_setaffinity=yes],[wine_cv_have_sched_setaffinity=no])) +[[#include <sched.h>]], [[sched_setaffinity(0, 0, 0);]])],[wine_cv_have_sched_setaffinity=yes],[wine_cv_have_sched_setaffinity=no])) if test "$wine_cv_have_sched_setaffinity" = "yes" then AC_DEFINE(HAVE_SCHED_SETAFFINITY, 1, [Define to 1 if you have the `sched_setaffinity' function.]) @@ -2438,7 +2439,6 @@ AC_CHECK_MEMBERS([struct icmpstat.icps_outhist],,, dnl Check for struct in6_pktinfo AC_CHECK_MEMBERS([struct in6_pktinfo.ipi6_addr],,, [#ifdef HAVE_NETINET_IN_H -#define _GNU_SOURCE #include <netinet/in.h> #endif]) @@ -2524,8 +2524,7 @@ dnl Check for isfinite ac_save_LIBS="$LIBS" LIBS="$LIBS -lm" AC_CACHE_CHECK([for isfinite], ac_cv_have_isfinite, - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define _GNU_SOURCE -#include <math.h>]], [[float f = 0.0; return isfinite(f)]])],[ac_cv_have_isfinite="yes"],[ac_cv_have_isfinite="no"])) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <math.h>]], [[float f = 0.0; return isfinite(f)]])],[ac_cv_have_isfinite="yes"],[ac_cv_have_isfinite="no"])) if test "$ac_cv_have_isfinite" = "yes" then AC_DEFINE(HAVE_ISFINITE, 1, [Define to 1 if you have the `isfinite' function.]) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 480d8b4f490..2e79b9baa0f 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -23,7 +23,6 @@ #endif #include "config.h" -#define _GNU_SOURCE /* for struct in6_pktinfo */ #include <errno.h> #include <sys/types.h> #include <unistd.h> diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 5f7d277ce9a..7f25cdcce1b 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -22,7 +22,6 @@ #include "config.h" #include <stdarg.h> -#define _GNU_SOURCE #include <stdio.h> #include <math.h> diff --git a/include/config.h.in b/include/config.h.in index e975ca8a55d..51fbd3c9cae 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1105,6 +1105,9 @@ /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS +/* Define to 1 to enable GNU extensions on Linux */ +#undef _GNU_SOURCE + /* Define for large files, on AIX-style hosts. */ #undef _LARGE_FILES diff --git a/include/wine/port.h b/include/wine/port.h index 410fa670757..d162c79d9f5 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -29,9 +29,6 @@ # error You must include port.h before all other headers #endif -#ifndef _GNU_SOURCE -# define _GNU_SOURCE /* for pread/pwrite, isfinite */ -#endif #include <fcntl.h> #include <math.h> #include <sys/types.h> diff --git a/server/thread.c b/server/thread.c index 90f3c5492f8..7118f29bf67 100644 --- a/server/thread.c +++ b/server/thread.c @@ -20,7 +20,6 @@ #include "config.h" -#define _GNU_SOURCE /* sched_affinity */ #include <assert.h> #include <errno.h> #include <fcntl.h>

1 0

Alexandre Julliard : dxerr8: Move to the libs directory.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: cc2e4d3d1ff233e7b26dceb9b3caf9ca90001915 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc2e4d3d1ff233e7b26dceb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 11 11:30:42 2021 +0200 dxerr8: Move to the libs directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 2 +- {dlls => libs}/dxerr8/Makefile.in | 0 {dlls => libs}/dxerr8/dxerr8.c | 0 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 2438099dd8a..98285fc0753 100755 --- a/configure +++ b/configure @@ -1300,7 +1300,6 @@ enable_dwmapi enable_dwrite enable_dx8vb enable_dxdiagn -enable_dxerr8 enable_dxerr9 enable_dxgi enable_dxguid @@ -1786,6 +1785,7 @@ enable_fonts enable_include enable_adsiid enable_dmoguids +enable_dxerr8 enable_wine enable_loader enable_nls @@ -20212,7 +20212,6 @@ wine_fn_config_makefile dlls/dwrite/tests enable_tests wine_fn_config_makefile dlls/dx8vb enable_dx8vb wine_fn_config_makefile dlls/dxdiagn enable_dxdiagn wine_fn_config_makefile dlls/dxdiagn/tests enable_tests -wine_fn_config_makefile dlls/dxerr8 enable_dxerr8 wine_fn_config_makefile dlls/dxerr9 enable_dxerr9 wine_fn_config_makefile dlls/dxgi enable_dxgi wine_fn_config_makefile dlls/dxgi/tests enable_tests @@ -20922,6 +20921,7 @@ wine_fn_config_makefile fonts enable_fonts wine_fn_config_makefile include enable_include wine_fn_config_makefile libs/adsiid enable_adsiid wine_fn_config_makefile libs/dmoguids enable_dmoguids +wine_fn_config_makefile libs/dxerr8 enable_dxerr8 wine_fn_config_makefile libs/wine enable_wine wine_fn_config_makefile loader enable_loader wine_fn_config_makefile nls enable_nls diff --git a/configure.ac b/configure.ac index cfea04f82db..eb4a19fbb30 100644 --- a/configure.ac +++ b/configure.ac @@ -3099,7 +3099,6 @@ WINE_CONFIG_MAKEFILE(dlls/dwrite/tests) WINE_CONFIG_MAKEFILE(dlls/dx8vb) WINE_CONFIG_MAKEFILE(dlls/dxdiagn) WINE_CONFIG_MAKEFILE(dlls/dxdiagn/tests) -WINE_CONFIG_MAKEFILE(dlls/dxerr8) WINE_CONFIG_MAKEFILE(dlls/dxerr9) WINE_CONFIG_MAKEFILE(dlls/dxgi) WINE_CONFIG_MAKEFILE(dlls/dxgi/tests) @@ -3809,6 +3808,7 @@ WINE_CONFIG_MAKEFILE(fonts) WINE_CONFIG_MAKEFILE(include) WINE_CONFIG_MAKEFILE(libs/adsiid) WINE_CONFIG_MAKEFILE(libs/dmoguids) +WINE_CONFIG_MAKEFILE(libs/dxerr8) WINE_CONFIG_MAKEFILE(libs/wine) WINE_CONFIG_MAKEFILE(loader) WINE_CONFIG_MAKEFILE(nls) diff --git a/dlls/dxerr8/Makefile.in b/libs/dxerr8/Makefile.in similarity index 100% rename from dlls/dxerr8/Makefile.in rename to libs/dxerr8/Makefile.in diff --git a/dlls/dxerr8/dxerr8.c b/libs/dxerr8/dxerr8.c similarity index 100% rename from dlls/dxerr8/dxerr8.c rename to libs/dxerr8/dxerr8.c

1 0

Rémi Bernon : dinput: Move PIDVID internal guid to device.c.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: 7011685e1e705eacae8d46dd0ddec651cf140da3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7011685e1e705eacae8d46dd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 11 10:10:56 2021 +0200 dinput: Move PIDVID internal guid to device.c. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 9 +++++++++ dlls/dinput/device_private.h | 2 +- dlls/dinput/joystick.c | 8 -------- dlls/dinput/joystick_hid.c | 6 +++--- dlls/dinput/joystick_linux.c | 2 +- dlls/dinput/joystick_linuxinput.c | 2 +- dlls/dinput/joystick_osx.c | 6 +++--- 7 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 61f6effad19..484fe904c2e 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -36,6 +36,9 @@ #include "winuser.h" #include "winerror.h" #include "dinput.h" +#include "dinputd.h" + +#include "initguid.h" #include "device_private.h" #include "dinput_private.h" @@ -43,6 +46,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); +/* Windows uses this GUID for guidProduct on non-keyboard/mouse devices. + * Data1 contains the device VID (low word) and PID (high word). + * Data4 ends with the ASCII bytes "PIDVID". + */ +DEFINE_GUID( dinput_pidvid_guid, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 'P', 'I', 'D', 'V', 'I', 'D' ); + static inline IDirectInputDeviceImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W *iface) { return CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface); diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 8aced6d84dd..2b939fd5a0c 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -128,7 +128,7 @@ typedef struct LPDIRECTINPUTEFFECT ref; } effect_list_item; -extern const GUID DInput_PIDVID_Product_GUID DECLSPEC_HIDDEN; +extern const GUID dinput_pidvid_guid DECLSPEC_HIDDEN; /* Various debug tools */ extern void _dump_DIPROPHEADER(LPCDIPROPHEADER diph) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 979d5a5c7f2..afebaa022b7 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -52,14 +52,6 @@ static const WORD PID_XBOX_CONTROLLERS[] = { 0x0719, /* Xbox 360 Wireless Adapter */ }; -/* Windows uses this GUID for guidProduct on non-keyboard/mouse devices. - * Data1 contains the device VID (low word) and PID (high word). - * Data4 ends with the ASCII bytes "PIDVID". - */ -const GUID DInput_PIDVID_Product_GUID = { /* device_pidvid-0000-0000-0000-504944564944 */ - 0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44} -}; - static inline JoystickGenericImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W *iface) { return CONTAINING_RECORD(CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface), JoystickGenericImpl, base); diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 728b98591d2..63193554405 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1737,7 +1737,7 @@ static BOOL hid_joystick_device_try_open( UINT32 handle, const WCHAR *path, HAND instance->guidInstance = hid_joystick_guid; instance->guidInstance.Data1 ^= handle; - instance->guidProduct = DInput_PIDVID_Product_GUID; + instance->guidProduct = dinput_pidvid_guid; instance->guidProduct.Data1 = MAKELONG( attrs->VendorID, attrs->ProductID ); instance->guidFFDriver = GUID_NULL; instance->wUsagePage = caps->UsagePage; @@ -2258,9 +2258,9 @@ static HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID TRACE( "dinput %p, guid %s, out %p\n", dinput, debugstr_guid( guid ), out ); *out = NULL; - instance.guidProduct.Data1 = DInput_PIDVID_Product_GUID.Data1; + instance.guidProduct.Data1 = dinput_pidvid_guid.Data1; instance.guidInstance.Data1 = hid_joystick_guid.Data1; - if (IsEqualGUID( &DInput_PIDVID_Product_GUID, &instance.guidProduct )) + if (IsEqualGUID( &dinput_pidvid_guid, &instance.guidProduct )) instance.guidProduct = *guid; else if (IsEqualGUID( &hid_joystick_guid, &instance.guidInstance )) instance.guidInstance = *guid; diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 5b54e352c20..decd69b1e7e 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -315,7 +315,7 @@ static INT find_joystick_devices(void) else { /* Concatenate product_id with vendor_id to mimic Windows behaviour */ - joydev.guid_product = DInput_PIDVID_Product_GUID; + joydev.guid_product = dinput_pidvid_guid; joydev.guid_product.Data1 = MAKELONG(joydev.vendor_id, joydev.product_id); } diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 949fd1da081..c7f4cc486fd 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -320,7 +320,7 @@ static void find_joydevs(void) joydev.bus_type = device_id.bustype; /* Concatenate product_id with vendor_id to mimic Windows behaviour */ - joydev.guid_product = DInput_PIDVID_Product_GUID; + joydev.guid_product = dinput_pidvid_guid; joydev.guid_product.Data1 = MAKELONG(joydev.vendor_id, joydev.product_id); } diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 9ee45e8a445..5796daf8e11 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -1058,7 +1058,7 @@ static HRESULT joydev_enum_device(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINST /* Return joystick */ lpddi->guidInstance = DInput_Wine_OsX_Joystick_GUID; lpddi->guidInstance.Data3 = id; - lpddi->guidProduct = DInput_PIDVID_Product_GUID; + lpddi->guidProduct = dinput_pidvid_guid; lpddi->guidProduct.Data1 = make_vid_pid(device); lpddi->dwDevType = get_device_type(version, is_joystick); lpddi->dwDevType |= DIDEVTYPE_HID; @@ -1131,7 +1131,7 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, JoystickIm newDevice->generic.guidInstance = DInput_Wine_OsX_Joystick_GUID; newDevice->generic.guidInstance.Data3 = index; - newDevice->generic.guidProduct = DInput_PIDVID_Product_GUID; + newDevice->generic.guidProduct = dinput_pidvid_guid; newDevice->generic.guidProduct.Data1 = make_vid_pid(device); newDevice->generic.joy_polldev = poll_osx_device_state; @@ -1309,7 +1309,7 @@ static unsigned short get_joystick_index(REFGUID guid) if(IsEqualGUID(&wine_joystick, &dev_guid)) return guid->Data3; prod_guid.Data1 = 0; - if(IsEqualGUID(&DInput_PIDVID_Product_GUID, &prod_guid)) + if(IsEqualGUID(&dinput_pidvid_guid, &prod_guid)) { joystick_devices_count = find_joystick_devices(); for(i = 0; i < joystick_devices_count; i++)

1 0

Rémi Bernon : dinput: Remove legacy joystick backends.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: adfee25b45af8160848f94fdb24279d63d5f91f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adfee25b45af8160848f94fd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 11 10:10:57 2021 +0200 dinput: Remove legacy joystick backends. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 - configure.ac | 1 - dlls/dinput/Makefile.in | 6 - dlls/dinput/device.c | 34 +- dlls/dinput/device_private.h | 27 - dlls/dinput/dinput_main.c | 3 - dlls/dinput/dinput_private.h | 3 - dlls/dinput/effect_linuxinput.c | 906 -------------------- dlls/dinput/joystick.c | 962 --------------------- dlls/dinput/joystick_hid.c | 8 +- dlls/dinput/joystick_linux.c | 831 ------------------ dlls/dinput/joystick_linuxinput.c | 1276 --------------------------- dlls/dinput/joystick_osx.c | 1704 ------------------------------------- dlls/dinput/joystick_private.h | 91 -- dlls/dinput8/Makefile.in | 6 - 15 files changed, 6 insertions(+), 5856 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=adfee25b45af8160848f…

1 0

Huw Davies : maintainers: Update GDI files.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: 7d4d3944d66e326444b3a8d42972bf0bd68e0f59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d4d3944d66e326444b3a8d4… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 11 09:41:21 2021 +0100 maintainers: Update GDI files. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 18478a8871f..5bf636cfd34 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -129,6 +129,26 @@ F: dlls/mscoree/ GDI M: Huw Davies <huw(a)codeweavers.com> F: dlls/gdi32/ +F: dlls/win32u/bitblt.c +F: dlls/win32u/bitmap.c +F: dlls/win32u/brush.c +F: dlls/win32u/clipping.c +F: dlls/win32u/dc.c +F: dlls/win32u/dib.c +F: dlls/win32u/dibdrv/ +F: dlls/win32u/driver.c +F: dlls/win32u/emfdrv.c +F: dlls/win32u/font.c +F: dlls/win32u/freetype.c +F: dlls/win32u/gdiobj.c +F: dlls/win32u/mapping.c +F: dlls/win32u/opentype.c +F: dlls/win32u/painting.c +F: dlls/win32u/palette.c +F: dlls/win32u/path.c +F: dlls/win32u/pen.c +F: dlls/win32u/printdrv.c +F: dlls/win32u/region.c GDIPlus M: Esme Povirk <vincent(a)codeweavers.com>

1 0