October 2021 - Wine-commits

Alex Henrie : dhcpcsvc6: Add stub DLL.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: 5abee26b8a2849847c15a9d8f08fd9c90154f05a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5abee26b8a2849847c15a9d8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 11 00:16:53 2021 -0600 dhcpcsvc6: Add stub DLL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51863 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/dhcpcsvc6/Makefile.in | 3 +++ dlls/dhcpcsvc6/dhcpcsvc6.spec | 22 ++++++++++++++++++++++ 4 files changed, 28 insertions(+) diff --git a/configure b/configure index 959c08e5506..7f863aa38c0 100755 --- a/configure +++ b/configure @@ -1264,6 +1264,7 @@ enable_ddraw enable_ddrawex enable_devenum enable_dhcpcsvc +enable_dhcpcsvc6 enable_dhtmled_ocx enable_difxapi enable_dinput @@ -20151,6 +20152,7 @@ wine_fn_config_makefile dlls/devenum enable_devenum wine_fn_config_makefile dlls/devenum/tests enable_tests wine_fn_config_makefile dlls/dhcpcsvc enable_dhcpcsvc wine_fn_config_makefile dlls/dhcpcsvc/tests enable_tests +wine_fn_config_makefile dlls/dhcpcsvc6 enable_dhcpcsvc6 wine_fn_config_makefile dlls/dhtmled.ocx enable_dhtmled_ocx wine_fn_config_makefile dlls/difxapi enable_difxapi wine_fn_config_makefile dlls/dinput enable_dinput diff --git a/configure.ac b/configure.ac index 4eecb1f24f4..1821feefa49 100644 --- a/configure.ac +++ b/configure.ac @@ -3038,6 +3038,7 @@ WINE_CONFIG_MAKEFILE(dlls/devenum) WINE_CONFIG_MAKEFILE(dlls/devenum/tests) WINE_CONFIG_MAKEFILE(dlls/dhcpcsvc) WINE_CONFIG_MAKEFILE(dlls/dhcpcsvc/tests) +WINE_CONFIG_MAKEFILE(dlls/dhcpcsvc6) WINE_CONFIG_MAKEFILE(dlls/dhtmled.ocx) WINE_CONFIG_MAKEFILE(dlls/difxapi) WINE_CONFIG_MAKEFILE(dlls/dinput) diff --git a/dlls/dhcpcsvc6/Makefile.in b/dlls/dhcpcsvc6/Makefile.in new file mode 100644 index 00000000000..6b3e0d03000 --- /dev/null +++ b/dlls/dhcpcsvc6/Makefile.in @@ -0,0 +1,3 @@ +MODULE = dhcpcsvc6.dll + +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/dhcpcsvc6/dhcpcsvc6.spec b/dlls/dhcpcsvc6/dhcpcsvc6.spec new file mode 100644 index 00000000000..2ac66d9a34f --- /dev/null +++ b/dlls/dhcpcsvc6/dhcpcsvc6.spec @@ -0,0 +1,22 @@ +@ stub Dhcpv6AcquireParameters +@ stub Dhcpv6CApiCleanup +@ stub Dhcpv6CApiInitialize +@ stub Dhcpv6CancelOperation +@ stub Dhcpv6EnableDhcp +@ stub Dhcpv6EnableTracing +@ stub Dhcpv6FreeLeaseInfo +@ stub Dhcpv6FreeLeaseInfoArray +@ stub Dhcpv6GetTraceArray +@ stub Dhcpv6GetUserClasses +@ stub Dhcpv6IsEnabled +@ stub Dhcpv6QueryLeaseInfo +@ stub Dhcpv6QueryLeaseInfoArray +@ stub Dhcpv6ReleaseParameters +@ stub Dhcpv6ReleasePrefix +@ stub Dhcpv6ReleasePrefixEx +@ stub Dhcpv6RenewPrefix +@ stub Dhcpv6RenewPrefixEx +@ stub Dhcpv6RequestParams +@ stub Dhcpv6RequestPrefix +@ stub Dhcpv6RequestPrefixEx +@ stub Dhcpv6SetUserClass

1 0

Jan Sikorski : wined3d: Make wined3d_device_context procedures thread safe.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: 6d2d43bb057958890745b8ecc2811b24a28df8d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d2d43bb057958890745b8ec… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Thu Oct 7 12:57:25 2021 +0200 wined3d: Make wined3d_device_context procedures thread safe. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 13 ++++++ dlls/wined3d/device.c | 123 ++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 118 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6d2d43bb057958890745…

1 0

Jan Sikorski : wined3d: Do not call wined3d_device_destroy_default_samplers() in the CS thread.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: 33449ed625b93ed1507b2bdb98d57bf828adcbdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=33449ed625b93ed1507b2bdb… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Thu Oct 7 12:57:26 2021 +0200 wined3d: Do not call wined3d_device_destroy_default_samplers() in the CS thread. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/adapter_vk.c | 2 +- dlls/wined3d/device.c | 4 +--- dlls/wined3d/wined3d_private.h | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index bba728e2fb5..3a6ff54eec2 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4575,6 +4575,7 @@ static void adapter_gl_uninit_3d(struct wined3d_device *device) { TRACE("device %p.\n", device); + wined3d_device_destroy_default_samplers(device); wined3d_cs_destroy_object(device->cs, wined3d_device_delete_opengl_contexts_cs, device); wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); } diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 91a6b92b4aa..5667cd8d0d3 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -748,7 +748,6 @@ static void adapter_vk_uninit_3d_cs(void *object) device->shader_backend->shader_free_private(device, &context_vk->c); wined3d_device_vk_destroy_null_views(device_vk, context_vk); wined3d_device_vk_destroy_null_resources(device_vk, context_vk); - wined3d_device_destroy_default_samplers(device, &context_vk->c); } static void adapter_vk_uninit_3d(struct wined3d_device *device) @@ -761,6 +760,7 @@ static void adapter_vk_uninit_3d(struct wined3d_device *device) device_vk = wined3d_device_vk(device); context_vk = &device_vk->context_vk; + wined3d_device_destroy_default_samplers(device); wined3d_cs_destroy_object(device->cs, adapter_vk_uninit_3d_cs, device_vk); wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8020f7d0844..436c4dfe854 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -572,8 +572,7 @@ void wined3d_device_create_default_samplers(struct wined3d_device *device, struc } } -/* Context activation is done by the caller. */ -void wined3d_device_destroy_default_samplers(struct wined3d_device *device, struct wined3d_context *context) +void wined3d_device_destroy_default_samplers(struct wined3d_device *device) { wined3d_sampler_decref(device->default_sampler); device->default_sampler = NULL; @@ -982,7 +981,6 @@ void wined3d_device_delete_opengl_contexts_cs(void *object) device->blitter->ops->blitter_destroy(device->blitter, context); device->shader_backend->shader_free_private(device, context); wined3d_device_gl_destroy_dummy_textures(device_gl, context_gl); - wined3d_device_destroy_default_samplers(device, context); context_release(context); while (device->context_count) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0c169ec344b..657b6acee39 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3889,8 +3889,7 @@ void wined3d_device_create_default_samplers(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_device_create_primary_opengl_context_cs(void *object) DECLSPEC_HIDDEN; void wined3d_device_delete_opengl_contexts_cs(void *object) DECLSPEC_HIDDEN; -void wined3d_device_destroy_default_samplers(struct wined3d_device *device, - struct wined3d_context *context) DECLSPEC_HIDDEN; +void wined3d_device_destroy_default_samplers(struct wined3d_device *device) DECLSPEC_HIDDEN; HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined3d, unsigned int adapter_idx, enum wined3d_device_type device_type, HWND focus_window, unsigned int flags, BYTE surface_alignment, const enum wined3d_feature_level *levels, unsigned int level_count,

1 0

Jan Sikorski : wined3d: Use atomic instructions for resource view bind counts.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: dfeded6460ce067fe1c0540306c2964a170bed2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfeded6460ce067fe1c05403… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Thu Oct 7 12:57:27 2021 +0200 wined3d: Use atomic instructions for resource view bind counts. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 657b6acee39..56c90ba6606 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4157,8 +4157,8 @@ struct wined3d_resource struct list resource_list_entry; - uint32_t srv_bind_count_device; - uint32_t rtv_bind_count_device; + int32_t srv_bind_count_device; + int32_t rtv_bind_count_device; }; static inline ULONG wined3d_resource_incref(struct wined3d_resource *resource) @@ -6329,22 +6329,22 @@ static inline bool wined3d_rtv_all_subresources(const struct wined3d_rendertarge static inline void wined3d_srv_bind_count_inc(struct wined3d_shader_resource_view *srv) { - ++srv->resource->srv_bind_count_device; + InterlockedIncrement(&srv->resource->srv_bind_count_device); } static inline void wined3d_srv_bind_count_dec(struct wined3d_shader_resource_view *srv) { - --srv->resource->srv_bind_count_device; + InterlockedDecrement(&srv->resource->srv_bind_count_device); } static inline void wined3d_rtv_bind_count_inc(struct wined3d_rendertarget_view *rtv) { - ++rtv->resource->rtv_bind_count_device; + InterlockedIncrement(&rtv->resource->rtv_bind_count_device); } static inline void wined3d_rtv_bind_count_dec(struct wined3d_rendertarget_view *rtv) { - --rtv->resource->rtv_bind_count_device; + InterlockedDecrement(&rtv->resource->rtv_bind_count_device); } static inline bool wined3d_rtv_overlaps_srv(const struct wined3d_rendertarget_view *rtv,

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

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 : 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 : 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 : 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 : 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