wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Alexandre Julliard : dxerr8: Move to the libs directory.
by Alexandre Julliard 11 Oct '21

11 Oct '21

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

Alexandre Julliard : dmoguids: Move to the libs directory.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: 7f38b342b0231f04910bb3003a575b7d7fc306b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f38b342b0231f04910bb300… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 11 11:30:09 2021 +0200 dmoguids: Move to the libs directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 2 +- {dlls => libs}/dmoguids/Makefile.in | 0 {dlls => libs}/dmoguids/dmoguids.c | 0 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index d036396635f..2438099dd8a 100755 --- a/configure +++ b/configure @@ -1274,7 +1274,6 @@ enable_dmband enable_dmcompos enable_dmime enable_dmloader -enable_dmoguids enable_dmscript enable_dmstyle enable_dmsynth @@ -1786,6 +1785,7 @@ enable_xpssvcs enable_fonts enable_include enable_adsiid +enable_dmoguids enable_wine enable_loader enable_nls @@ -20171,7 +20171,6 @@ wine_fn_config_makefile dlls/dmime enable_dmime wine_fn_config_makefile dlls/dmime/tests enable_tests wine_fn_config_makefile dlls/dmloader enable_dmloader wine_fn_config_makefile dlls/dmloader/tests enable_tests -wine_fn_config_makefile dlls/dmoguids enable_dmoguids wine_fn_config_makefile dlls/dmscript enable_dmscript wine_fn_config_makefile dlls/dmscript/tests enable_tests wine_fn_config_makefile dlls/dmstyle enable_dmstyle @@ -20922,6 +20921,7 @@ wine_fn_config_makefile dlls/xpssvcs enable_xpssvcs 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/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 c9f1179f53a..cfea04f82db 100644 --- a/configure.ac +++ b/configure.ac @@ -3058,7 +3058,6 @@ WINE_CONFIG_MAKEFILE(dlls/dmime) WINE_CONFIG_MAKEFILE(dlls/dmime/tests) WINE_CONFIG_MAKEFILE(dlls/dmloader) WINE_CONFIG_MAKEFILE(dlls/dmloader/tests) -WINE_CONFIG_MAKEFILE(dlls/dmoguids) WINE_CONFIG_MAKEFILE(dlls/dmscript) WINE_CONFIG_MAKEFILE(dlls/dmscript/tests) WINE_CONFIG_MAKEFILE(dlls/dmstyle) @@ -3809,6 +3808,7 @@ WINE_CONFIG_MAKEFILE(dlls/xpssvcs) WINE_CONFIG_MAKEFILE(fonts) WINE_CONFIG_MAKEFILE(include) WINE_CONFIG_MAKEFILE(libs/adsiid) +WINE_CONFIG_MAKEFILE(libs/dmoguids) WINE_CONFIG_MAKEFILE(libs/wine) WINE_CONFIG_MAKEFILE(loader) WINE_CONFIG_MAKEFILE(nls) diff --git a/dlls/dmoguids/Makefile.in b/libs/dmoguids/Makefile.in similarity index 100% rename from dlls/dmoguids/Makefile.in rename to libs/dmoguids/Makefile.in diff --git a/dlls/dmoguids/dmoguids.c b/libs/dmoguids/dmoguids.c similarity index 100% rename from dlls/dmoguids/dmoguids.c rename to libs/dmoguids/dmoguids.c

1 0

Alexandre Julliard : adsiid: Move to the libs directory.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: 58f267dd967cbf1571e15c70a80f9841a232eb8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=58f267dd967cbf1571e15c70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 11 11:29:36 2021 +0200 adsiid: Move to the libs directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 2 +- {dlls => libs}/adsiid/Makefile.in | 0 {dlls => libs}/adsiid/adsiid.c | 0 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index afe2653703c..d036396635f 100755 --- a/configure +++ b/configure @@ -912,7 +912,6 @@ enable_aclui enable_activeds_tlb enable_activeds enable_actxprxy -enable_adsiid enable_adsldp enable_adsldpc enable_advapi32 @@ -1786,6 +1785,7 @@ enable_xpsprint enable_xpssvcs enable_fonts enable_include +enable_adsiid enable_wine enable_loader enable_nls @@ -19737,7 +19737,6 @@ wine_fn_config_makefile dlls/activeds.tlb enable_activeds_tlb wine_fn_config_makefile dlls/activeds enable_activeds wine_fn_config_makefile dlls/activeds/tests enable_tests wine_fn_config_makefile dlls/actxprxy enable_actxprxy -wine_fn_config_makefile dlls/adsiid enable_adsiid wine_fn_config_makefile dlls/adsldp enable_adsldp wine_fn_config_makefile dlls/adsldp/tests enable_tests wine_fn_config_makefile dlls/adsldpc enable_adsldpc @@ -20922,6 +20921,7 @@ wine_fn_config_makefile dlls/xpsprint enable_xpsprint wine_fn_config_makefile dlls/xpssvcs enable_xpssvcs 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/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 fce0622acd0..c9f1179f53a 100644 --- a/configure.ac +++ b/configure.ac @@ -2624,7 +2624,6 @@ WINE_CONFIG_MAKEFILE(dlls/activeds.tlb) WINE_CONFIG_MAKEFILE(dlls/activeds) WINE_CONFIG_MAKEFILE(dlls/activeds/tests) WINE_CONFIG_MAKEFILE(dlls/actxprxy) -WINE_CONFIG_MAKEFILE(dlls/adsiid) WINE_CONFIG_MAKEFILE(dlls/adsldp) WINE_CONFIG_MAKEFILE(dlls/adsldp/tests) WINE_CONFIG_MAKEFILE(dlls/adsldpc) @@ -3809,6 +3808,7 @@ WINE_CONFIG_MAKEFILE(dlls/xpsprint) WINE_CONFIG_MAKEFILE(dlls/xpssvcs) WINE_CONFIG_MAKEFILE(fonts) WINE_CONFIG_MAKEFILE(include) +WINE_CONFIG_MAKEFILE(libs/adsiid) WINE_CONFIG_MAKEFILE(libs/wine) WINE_CONFIG_MAKEFILE(loader) WINE_CONFIG_MAKEFILE(nls) diff --git a/dlls/adsiid/Makefile.in b/libs/adsiid/Makefile.in similarity index 100% rename from dlls/adsiid/Makefile.in rename to libs/adsiid/Makefile.in diff --git a/dlls/adsiid/adsiid.c b/libs/adsiid/adsiid.c similarity index 100% rename from dlls/adsiid/adsiid.c rename to libs/adsiid/adsiid.c

1 0

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

11 Oct '21

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 : include: Don't define math functions or constants in wine/port.h.
by Alexandre Julliard 11 Oct '21

11 Oct '21

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 : configure: Assume that dlfcn.h is available on Unix.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: 2afb4fd044cb7844d7561dd353edd0297b535fc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2afb4fd044cb7844d7561dd3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 11 11:25:10 2021 +0200 configure: Assume that dlfcn.h is available on Unix. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - include/config.h.in | 3 --- include/wine/port.h | 21 +++++---------------- 4 files changed, 5 insertions(+), 21 deletions(-) diff --git a/configure b/configure index 9e369e943f9..afe2653703c 100755 --- a/configure +++ b/configure @@ -7476,7 +7476,6 @@ for ac_header in \ asm/types.h \ asm/user.h \ dirent.h \ - dlfcn.h \ elf.h \ float.h \ gettext-po.h \ diff --git a/configure.ac b/configure.ac index 7afe8285073..fce0622acd0 100644 --- a/configure.ac +++ b/configure.ac @@ -447,7 +447,6 @@ AC_CHECK_HEADERS(\ asm/types.h \ asm/user.h \ dirent.h \ - dlfcn.h \ elf.h \ float.h \ gettext-po.h \ diff --git a/include/config.h.in b/include/config.h.in index 51fbd3c9cae..d616fb69a0d 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -59,9 +59,6 @@ file. */ #undef HAVE_DISKARBITRATION_DISKARBITRATION_H -/* Define to 1 if you have the <dlfcn.h> header file. */ -#undef HAVE_DLFCN_H - /* Define to 1 if you have the `dlinfo' function. */ #undef HAVE_DLINFO diff --git a/include/wine/port.h b/include/wine/port.h index d162c79d9f5..795a61f741b 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -46,13 +46,10 @@ #if defined(_WIN32) && !defined(__CYGWIN__) -#include <direct.h> #include <errno.h> -#include <io.h> -#include <process.h> -static inline void *dlopen(const char *name, int flags) { return NULL; } -static inline void *dlsym(void *handle, const char *name) { return NULL; } +#define dlopen(name,flags) NULL +#define dlsym(handle,name) NULL static inline int dlclose(void *handle) { return 0; } static inline const char *dlerror(void) { return "No dlopen support on Windows"; } static inline int symlink(const char *from, const char *to) { errno = ENOSYS; return -1; } @@ -67,19 +64,11 @@ static inline int symlink(const char *from, const char *to) { errno = ENOSYS; re #endif #endif -#endif /* _WIN32 */ - -/**************************************************************** - * Macro definitions - */ +#else -#ifdef HAVE_DLFCN_H #include <dlfcn.h> -#else -#define RTLD_LAZY 0x001 -#define RTLD_NOW 0x002 -#define RTLD_GLOBAL 0x100 -#endif + +#endif /* _WIN32 */ /**************************************************************** * Constants

1 0

Alexandre Julliard : configure: Define _GNU_SOURCE in config.h.
by Alexandre Julliard 11 Oct '21

11 Oct '21

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

Rémi Bernon : dinput: Use msvcrt memory allocation functions.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: f5b32121b1b4480ffab50b040d42998253b7e21c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5b32121b1b4480ffab50b04… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 11 10:11:00 2021 +0200 dinput: Use msvcrt memory allocation functions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 42 +++++++++++++++------------- dlls/dinput/config.c | 12 ++++---- dlls/dinput/device.c | 69 +++++++++++++++++++++------------------------- dlls/dinput/dinput_main.c | 17 +++++------- dlls/dinput/joystick_hid.c | 39 +++++++++++++------------- dlls/dinput/keyboard.c | 8 +++--- dlls/dinput/mouse.c | 8 +++--- 7 files changed, 95 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f5b32121b1b4480ffab5…

1 0

Rémi Bernon : dinput: Use wide char string literals.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: 87c7f1bdcee82389224b6ec5196c9bea20879b20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87c7f1bdcee82389224b6ec5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 11 10:10:59 2021 +0200 dinput: Use wide char string literals. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/config.c | 3 +-- dlls/dinput/device.c | 12 +++--------- dlls/dinput/dinput_main.c | 12 +++++------- dlls/dinput/joystick_hid.c | 6 ++---- dlls/dinput/mouse.c | 21 +++++++-------------- 5 files changed, 18 insertions(+), 36 deletions(-) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index 0b76b8e077c..01a92e54bd4 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -132,8 +132,7 @@ static int lv_get_item_data(HWND dialog, int index) static void lv_set_action(HWND dialog, int item, int action, LPDIACTIONFORMATW lpdiaf) { - static const WCHAR no_action[] = {'-','\0'}; - const WCHAR *action_text = no_action; + const WCHAR *action_text = L"-"; LVITEMW lvItem; if (item < 0) return; diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index a8ba16afe59..8af593c6ff5 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -686,11 +686,7 @@ static DWORD semantic_to_obj_id(IDirectInputDeviceImpl* This, DWORD dwSemantic) */ static HKEY get_mapping_key(const WCHAR *device, const WCHAR *username, const WCHAR *guid) { - static const WCHAR subkey[] = { - 'S','o','f','t','w','a','r','e','\\', - 'W','i','n','e','\\', - 'D','i','r','e','c','t','I','n','p','u','t','\\', - 'M','a','p','p','i','n','g','s','\\','%','s','\\','%','s','\\','%','s','\0'}; + static const WCHAR *subkey = L"Software\\Wine\\DirectInput\\Mappings\\%s\\%s\\%s"; HKEY hkey; WCHAR *keyname; @@ -733,13 +729,12 @@ static HRESULT save_mapping_settings(IDirectInputDevice8W *iface, LPDIACTIONFORM */ for (i = 0; i < lpdiaf->dwNumActions; i++) { - static const WCHAR format[] = {'%','x','\0'}; WCHAR label[9]; if (IsEqualGUID(&didev.guidInstance, &lpdiaf->rgoAction[i].guidInstance) && lpdiaf->rgoAction[i].dwHow != DIAH_UNMAPPED) { - swprintf( label, 9, format, lpdiaf->rgoAction[i].dwSemantic ); + swprintf( label, 9, L"%x", lpdiaf->rgoAction[i].dwSemantic ); RegSetValueExW( hkey, label, 0, REG_DWORD, (const BYTE *)&lpdiaf->rgoAction[i].dwObjID, sizeof(DWORD) ); } @@ -775,11 +770,10 @@ static BOOL load_mapping_settings(IDirectInputDeviceImpl *This, LPDIACTIONFORMAT /* Try to read each action in the DIACTIONFORMAT from registry */ for (i = 0; i < lpdiaf->dwNumActions; i++) { - static const WCHAR format[] = {'%','x','\0'}; DWORD id, size = sizeof(DWORD); WCHAR label[9]; - swprintf( label, 9, format, lpdiaf->rgoAction[i].dwSemantic ); + swprintf( label, 9, L"%x", lpdiaf->rgoAction[i].dwSemantic ); if (!RegQueryValueExW(hkey, label, 0, NULL, (LPBYTE) &id, &size)) { diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 06eef8aa168..a01a6adfad5 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -83,7 +83,6 @@ static const struct dinput_device *dinput_devices[] = HINSTANCE DINPUT_instance; -static const WCHAR di_em_win_w[] = {'D','I','E','m','W','i','n',0}; static HWND di_em_win; static BOOL check_hook_thread(void); @@ -498,7 +497,7 @@ static void register_di_em_win_class(void) class.cbSize = sizeof(class); class.lpfnWndProc = di_em_win_wndproc; class.hInstance = DINPUT_instance; - class.lpszClassName = di_em_win_w; + class.lpszClassName = L"DIEmWin"; if (!RegisterClassExW( &class ) && GetLastError() != ERROR_CLASS_ALREADY_EXISTS) WARN( "Unable to register message window class\n" ); @@ -506,7 +505,7 @@ static void register_di_em_win_class(void) static void unregister_di_em_win_class(void) { - if (!UnregisterClassW( di_em_win_w, NULL ) && GetLastError() != ERROR_CLASS_DOES_NOT_EXIST) + if (!UnregisterClassW( L"DIEmWin", NULL ) && GetLastError() != ERROR_CLASS_DOES_NOT_EXIST) WARN( "Unable to unregister message window class\n" ); } @@ -611,7 +610,7 @@ static HRESULT WINAPI IDirectInputWImpl_GetDeviceStatus( IDirectInput7W *iface, static HRESULT WINAPI IDirectInputWImpl_RunControlPanel( IDirectInput7W *iface, HWND hwndOwner, DWORD dwFlags ) { IDirectInputImpl *This = impl_from_IDirectInput7W( iface ); - WCHAR control_exeW[] = {'c','o','n','t','r','o','l','.','e','x','e',0}; + WCHAR control_exe[] = {L"control.exe"}; STARTUPINFOW si = {0}; PROCESS_INFORMATION pi; @@ -626,7 +625,7 @@ static HRESULT WINAPI IDirectInputWImpl_RunControlPanel( IDirectInput7W *iface, if (!This->initialized) return DIERR_NOTINITIALIZED; - if (!CreateProcessW(NULL, control_exeW, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi)) + if (!CreateProcessW( NULL, control_exe, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi )) return HRESULT_FROM_WIN32(GetLastError()); return DI_OK; @@ -1294,8 +1293,7 @@ static DWORD WINAPI hook_thread_proc(void *param) DWORD ret; MSG msg; - di_em_win = CreateWindowW( di_em_win_w, di_em_win_w, 0, 0, 0, 0, 0, - HWND_MESSAGE, 0, DINPUT_instance, NULL ); + di_em_win = CreateWindowW( L"DIEmWin", L"DIEmWin", 0, 0, 0, 0, 0, HWND_MESSAGE, 0, DINPUT_instance, NULL ); /* Force creation of the message queue */ PeekMessageW( &msg, 0, 0, 0, PM_NOREMOVE ); diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index c6345baf53d..2280dc15040 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1812,8 +1812,6 @@ static HRESULT hid_joystick_device_open( int index, DIDEVICEINSTANCEW *filter, W HANDLE *device, PHIDP_PREPARSED_DATA *preparsed, HIDD_ATTRIBUTES *attrs, HIDP_CAPS *caps, DWORD version ) { - static const WCHAR ig_w[] = {'&','I','G','_',0}; - static const WCHAR xi_w[] = {'&','X','I','_',0}; char buffer[sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + MAX_PATH * sizeof(WCHAR)]; SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail = (void *)buffer; SP_DEVICE_INTERFACE_DATA iface = {.cbSize = sizeof(iface)}; @@ -1856,9 +1854,9 @@ static HRESULT hid_joystick_device_open( int index, DIDEVICEINSTANCEW *filter, W if (override) { if (!SetupDiGetDeviceInstanceIdW( set, &devinfo, device_id, MAX_PATH, NULL ) || - !(tmp = wcsstr( device_id, ig_w ))) + !(tmp = wcsstr( device_id, L"&IG_" ))) goto next; - memcpy( tmp, xi_w, sizeof(xi_w) - sizeof(WCHAR) ); + memcpy( tmp, L"&XI_", sizeof(L"&XI_") - sizeof(WCHAR) ); if (!SetupDiOpenDeviceInfoW( xi_set, device_id, NULL, 0, &devinfo )) goto next; if (!SetupDiEnumDeviceInterfaces( xi_set, &devinfo, &GUID_DEVINTERFACE_WINEXINPUT, 0, &iface )) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 34710c5cdb0..c9301bb5146 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -136,9 +136,6 @@ static HRESULT mousedev_enum_device(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEIN static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysMouseImpl **out ) { - static const WCHAR mouse_wrap_override_w[] = {'M','o','u','s','e','W','a','r','p','O','v','e','r','r','i','d','e',0}; - static const WCHAR disable_w[] = {'d','i','s','a','b','l','e',0}; - static const WCHAR force_w[] = {'f','o','r','c','e',0}; SysMouseImpl* newDevice; LPDIDATAFORMAT df = NULL; unsigned i; @@ -154,10 +151,10 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysMouseIm newDevice->base.dwCoopLevel = DISCL_NONEXCLUSIVE | DISCL_BACKGROUND; get_app_key(&hkey, &appkey); - if (!get_config_key(hkey, appkey, mouse_wrap_override_w, buffer, sizeof(buffer))) + if (!get_config_key( hkey, appkey, L"MouseWarpOverride", buffer, sizeof(buffer) )) { - if (!wcsnicmp( buffer, disable_w, -1 )) newDevice->warp_override = WARP_DISABLE; - else if (!wcsnicmp( buffer, force_w, -1 )) newDevice->warp_override = WARP_FORCE_ON; + if (!wcsnicmp( buffer, L"disable", -1 )) newDevice->warp_override = WARP_DISABLE; + else if (!wcsnicmp( buffer, L"force", -1 )) newDevice->warp_override = WARP_FORCE_ON; } if (appkey) RegCloseKey(appkey); if (hkey) RegCloseKey(hkey); @@ -687,23 +684,19 @@ static HRESULT WINAPI SysMouseWImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W iface, static HRESULT WINAPI SysMouseWImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface, LPDIDEVICEOBJECTINSTANCEW pdidoi, DWORD dwObj, DWORD dwHow) { - static const WCHAR x_axisW[] = {'X','-','A','x','i','s',0}; - static const WCHAR y_axisW[] = {'Y','-','A','x','i','s',0}; - static const WCHAR wheelW[] = {'W','h','e','e','l',0}; - static const WCHAR buttonW[] = {'B','u','t','t','o','n',' ','%','d',0}; HRESULT res; res = IDirectInputDevice2WImpl_GetObjectInfo(iface, pdidoi, dwObj, dwHow); if (res != DI_OK) return res; if (IsEqualGUID( &pdidoi->guidType, &GUID_XAxis )) - wcscpy( pdidoi->tszName, x_axisW ); + wcscpy( pdidoi->tszName, L"X-Axis" ); else if (IsEqualGUID( &pdidoi->guidType, &GUID_YAxis )) - wcscpy( pdidoi->tszName, y_axisW ); + wcscpy( pdidoi->tszName, L"Y-Axis" ); else if (IsEqualGUID( &pdidoi->guidType, &GUID_ZAxis )) - wcscpy( pdidoi->tszName, wheelW ); + wcscpy( pdidoi->tszName, L"Wheel" ); else if (pdidoi->dwType & DIDFT_BUTTON) - swprintf( pdidoi->tszName, MAX_PATH, buttonW, DIDFT_GETINSTANCE( pdidoi->dwType ) - 3 ); + swprintf( pdidoi->tszName, MAX_PATH, L"Button %d", DIDFT_GETINSTANCE( pdidoi->dwType ) - 3 ); if(pdidoi->dwType & DIDFT_AXIS) pdidoi->dwFlags |= DIDOI_ASPECTPOSITION;

1 0

Rémi Bernon : dinput: Build with msvcrt.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: e4f6ec7d3d033089e02f75924d9f86f1ef14958a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4f6ec7d3d033089e02f7592… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 11 10:10:58 2021 +0200 dinput: Build with msvcrt. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/Makefile.in | 2 -- dlls/dinput/config.c | 10 +++++----- dlls/dinput/device.c | 23 ++++++++++++----------- dlls/dinput/dinput_main.c | 12 ++++++------ dlls/dinput/joystick_hid.c | 3 +-- dlls/dinput/keyboard.c | 4 ---- dlls/dinput/mouse.c | 21 +++++++++------------ dlls/dinput8/Makefile.in | 2 -- 8 files changed, 33 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e4f6ec7d3d033089e02f…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2021