October 2021 - Wine-commits

Alexandre Julliard : libport: Remove the lstat() implementation.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 6d2cf0230ef6f1ecf415c5f591f276798be3f80a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d2cf0230ef6f1ecf415c5f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 6 10:17:27 2021 +0200 libport: Remove the lstat() implementation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - include/config.h.in | 3 --- include/wine/port.h | 4 ---- libs/port/Makefile.in | 1 - libs/port/lstat.c | 29 ----------------------------- 6 files changed, 39 deletions(-) diff --git a/configure b/configure index 50c29234c80..3de53b0255b 100755 --- a/configure +++ b/configure @@ -17908,7 +17908,6 @@ for ac_func in \ getifaddrs \ getrandom \ kqueue \ - lstat \ mach_continuous_time \ pipe2 \ port_create \ diff --git a/configure.ac b/configure.ac index 42f97efb4a4..c0fa6ec37c8 100644 --- a/configure.ac +++ b/configure.ac @@ -2139,7 +2139,6 @@ AC_CHECK_FUNCS(\ getifaddrs \ getrandom \ kqueue \ - lstat \ mach_continuous_time \ pipe2 \ port_create \ diff --git a/include/config.h.in b/include/config.h.in index e27b23f658f..db58743fe46 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -348,9 +348,6 @@ /* Define to 1 if you have the <linux/videodev2.h> header file. */ #undef HAVE_LINUX_VIDEODEV2_H -/* Define to 1 if you have the `lstat' function. */ -#undef HAVE_LSTAT - /* Define to 1 if you have the <lwp.h> header file. */ #undef HAVE_LWP_H diff --git a/include/wine/port.h b/include/wine/port.h index 6e05d73d05a..f3b39582f9c 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -99,10 +99,6 @@ static inline const char *dlerror(void) { return "No dlopen support on Windows"; * Function definitions (only when using libwine_port) */ -#ifndef HAVE_LSTAT -int lstat(const char *file_name, struct stat *buf); -#endif /* HAVE_LSTAT */ - #ifndef HAVE_READLINK int readlink( const char *path, char *buf, size_t size ); #endif /* HAVE_READLINK */ diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 9b36c6c5a3b..392aa2ad713 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -1,6 +1,5 @@ STATICLIB = libwine_port.a C_SRCS = \ - lstat.c \ readlink.c \ symlink.c diff --git a/libs/port/lstat.c b/libs/port/lstat.c deleted file mode 100644 index 346b412a8b1..00000000000 --- a/libs/port/lstat.c +++ /dev/null @@ -1,29 +0,0 @@ -/* - * lstat function - * - * Copyright 1996 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" - -#ifndef HAVE_LSTAT -int lstat(const char *file_name, struct stat *buf) -{ - return stat( file_name, buf ); -} -#endif /* HAVE_LSTAT */

1 0

Alexandre Julliard : libport: Remove the readlink() implementation.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: ee213bcbeacae19e6e7cc3526312caee3c49a172 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee213bcbeacae19e6e7cc352… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 6 10:17:41 2021 +0200 libport: Remove the readlink() implementation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - include/config.h.in | 3 --- include/wine/port.h | 4 ---- libs/port/Makefile.in | 1 - libs/port/readlink.c | 32 -------------------------------- 6 files changed, 42 deletions(-) diff --git a/configure b/configure index 3de53b0255b..6ca64c1fcfd 100755 --- a/configure +++ b/configure @@ -17915,7 +17915,6 @@ for ac_func in \ posix_fallocate \ prctl \ proc_pidinfo \ - readlink \ sched_yield \ setproctitle \ setprogname \ diff --git a/configure.ac b/configure.ac index c0fa6ec37c8..d1f23bcc9e9 100644 --- a/configure.ac +++ b/configure.ac @@ -2146,7 +2146,6 @@ AC_CHECK_FUNCS(\ posix_fallocate \ prctl \ proc_pidinfo \ - readlink \ sched_yield \ setproctitle \ setprogname \ diff --git a/include/config.h.in b/include/config.h.in index db58743fe46..7d7393c19db 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -510,9 +510,6 @@ /* Define to 1 if you have the <QuickTime/ImageCompression.h> header file. */ #undef HAVE_QUICKTIME_IMAGECOMPRESSION_H -/* Define to 1 if you have the `readlink' function. */ -#undef HAVE_READLINK - /* Define to 1 if the system has the type `request_sense'. */ #undef HAVE_REQUEST_SENSE diff --git a/include/wine/port.h b/include/wine/port.h index f3b39582f9c..be8e5463a14 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -99,10 +99,6 @@ static inline const char *dlerror(void) { return "No dlopen support on Windows"; * Function definitions (only when using libwine_port) */ -#ifndef HAVE_READLINK -int readlink( const char *path, char *buf, size_t size ); -#endif /* HAVE_READLINK */ - #ifndef HAVE_SYMLINK int symlink(const char *from, const char *to); #endif diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 392aa2ad713..7daaa9c845d 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -1,5 +1,4 @@ STATICLIB = libwine_port.a C_SRCS = \ - readlink.c \ symlink.c diff --git a/libs/port/readlink.c b/libs/port/readlink.c deleted file mode 100644 index 24f7084c9a8..00000000000 --- a/libs/port/readlink.c +++ /dev/null @@ -1,32 +0,0 @@ -/* - * readlink function - * - * Copyright 2004 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" - -#include <errno.h> - -#ifndef HAVE_READLINK -int readlink( const char *path, char *buf, size_t size ) -{ - errno = -ENOSYS; - return -1; -} -#endif /* HAVE_READLINK */

1 0

Alexandre Julliard : libport: Remove the symlink() implementation.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: dd895f496ae1ff76f1726d5ce3b0bc0024a47f8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd895f496ae1ff76f1726d5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 6 10:17:54 2021 +0200 libport: Remove the symlink() implementation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - include/config.h.in | 3 --- include/wine/port.h | 11 ++--------- libs/port/Makefile.in | 3 --- libs/port/symlink.c | 38 -------------------------------------- 6 files changed, 2 insertions(+), 55 deletions(-) diff --git a/configure b/configure index 6ca64c1fcfd..f1d9aeb24ef 100755 --- a/configure +++ b/configure @@ -17919,7 +17919,6 @@ for ac_func in \ setproctitle \ setprogname \ sigprocmask \ - symlink \ sysinfo \ tcdrain \ thr_kill2 diff --git a/configure.ac b/configure.ac index d1f23bcc9e9..3fff076470e 100644 --- a/configure.ac +++ b/configure.ac @@ -2150,7 +2150,6 @@ AC_CHECK_FUNCS(\ setproctitle \ setprogname \ sigprocmask \ - symlink \ sysinfo \ tcdrain \ thr_kill2 diff --git a/include/config.h.in b/include/config.h.in index 7d7393c19db..fc3749895a3 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -687,9 +687,6 @@ /* Define to 1 if `_u._ext.nscount6' is a member of `struct __res_state'. */ #undef HAVE_STRUCT___RES_STATE__U__EXT_NSCOUNT6 -/* Define to 1 if you have the `symlink' function. */ -#undef HAVE_SYMLINK - /* Define to 1 if you have the <syscall.h> header file. */ #undef HAVE_SYSCALL_H diff --git a/include/wine/port.h b/include/wine/port.h index be8e5463a14..410fa670757 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -50,6 +50,7 @@ #if defined(_WIN32) && !defined(__CYGWIN__) #include <direct.h> +#include <errno.h> #include <io.h> #include <process.h> @@ -57,6 +58,7 @@ static inline void *dlopen(const char *name, int flags) { return NULL; } static inline void *dlsym(void *handle, const char *name) { return 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; } #ifdef _MSC_VER /* The UCRT headers in the Windows SDK #error out if we #define snprintf. @@ -94,13 +96,4 @@ static inline const char *dlerror(void) { return "No dlopen support on Windows"; #define M_PI_2 1.570796326794896619 #endif - -/**************************************************************** - * Function definitions (only when using libwine_port) - */ - -#ifndef HAVE_SYMLINK -int symlink(const char *from, const char *to); -#endif - #endif /* !defined(__WINE_WINE_PORT_H) */ diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 7daaa9c845d..670b272cbf1 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -1,4 +1 @@ STATICLIB = libwine_port.a - -C_SRCS = \ - symlink.c diff --git a/libs/port/symlink.c b/libs/port/symlink.c deleted file mode 100644 index efb44eca1d9..00000000000 --- a/libs/port/symlink.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * symlink function - * - * Copyright 2008 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" - -#include <errno.h> -#include <stdio.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif - -#ifndef HAVE_SYMLINK - -int symlink( const char *from, const char *to ) -{ - errno = ENOSYS; - return -1; -} - -#endif /* HAVE_SYMLINK */

1 0

Alexandre Julliard : makefiles: Remove libwine_port.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: c60d604544107eea9e4b28e3e60640b2c06a0eec URL: https://source.winehq.org/git/wine.git/?a=commit;h=c60d604544107eea9e4b28e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 6 10:19:24 2021 +0200 makefiles: Remove libwine_port. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 -- configure.ac | 1 - libs/port/Makefile.in | 1 - tools/makedep.c | 1 - 4 files changed, 5 deletions(-) diff --git a/configure b/configure index f1d9aeb24ef..d9ba80332bd 100755 --- a/configure +++ b/configure @@ -1786,7 +1786,6 @@ enable_xpsprint enable_xpssvcs enable_fonts enable_include -enable_port enable_wine enable_loader enable_nls @@ -21012,7 +21011,6 @@ 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/port enable_port 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 3fff076470e..4497e98e7bb 100644 --- a/configure.ac +++ b/configure.ac @@ -3842,7 +3842,6 @@ WINE_CONFIG_MAKEFILE(dlls/xpsprint) WINE_CONFIG_MAKEFILE(dlls/xpssvcs) WINE_CONFIG_MAKEFILE(fonts) WINE_CONFIG_MAKEFILE(include) -WINE_CONFIG_MAKEFILE(libs/port) WINE_CONFIG_MAKEFILE(libs/wine) WINE_CONFIG_MAKEFILE(loader) WINE_CONFIG_MAKEFILE(nls) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in deleted file mode 100644 index 670b272cbf1..00000000000 --- a/libs/port/Makefile.in +++ /dev/null @@ -1 +0,0 @@ -STATICLIB = libwine_port.a diff --git a/tools/makedep.c b/tools/makedep.c index 15939edfb78..88b179a9070 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2024,7 +2024,6 @@ static struct strarray add_unix_libraries( const struct makefile *make, struct s struct strarray all_libs = empty_strarray; unsigned int i, j; - strarray_add( &all_libs, "-lwine_port" ); if (make->native_unix_lib && strcmp( make->unixlib, "ntdll.so" )) strarray_add( &all_libs, "-lntdll" ); strarray_addall( &all_libs, get_expanded_make_var_array( make, "EXTRALIBS" )); strarray_addall( &all_libs, libs );

1 0

Alexandre Julliard : makefiles: Use the STATICLIB variable for static import libraries.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 518f9a12c18bd951bc71f3128e296841ede3774e URL: https://source.winehq.org/git/wine.git/?a=commit;h=518f9a12c18bd951bc71f312… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 6 10:20:26 2021 +0200 makefiles: Use the STATICLIB variable for static import libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsiid/Makefile.in | 2 +- dlls/dmoguids/Makefile.in | 2 +- dlls/dxerr8/Makefile.in | 2 +- dlls/dxerr9/Makefile.in | 2 +- dlls/dxguid/Makefile.in | 2 +- dlls/mfuuid/Makefile.in | 2 +- dlls/strmbase/Makefile.in | 2 +- dlls/strmiids/Makefile.in | 2 +- dlls/uuid/Makefile.in | 2 +- dlls/wbemuuid/Makefile.in | 2 +- dlls/winecrt0/Makefile.in | 2 +- dlls/wmcodecdspuuid/Makefile.in | 2 +- tools/make_makefiles | 16 +++++++--------- tools/makedep.c | 10 +++++----- 14 files changed, 24 insertions(+), 26 deletions(-) diff --git a/dlls/adsiid/Makefile.in b/dlls/adsiid/Makefile.in index d741ea55c7b..14a46b31108 100644 --- a/dlls/adsiid/Makefile.in +++ b/dlls/adsiid/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libadsiid.a +STATICLIB = libadsiid.a C_SRCS = \ adsiid.c diff --git a/dlls/dmoguids/Makefile.in b/dlls/dmoguids/Makefile.in index db38e5756a5..183a4359918 100644 --- a/dlls/dmoguids/Makefile.in +++ b/dlls/dmoguids/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libdmoguids.a +STATICLIB = libdmoguids.a C_SRCS = \ dmoguids.c diff --git a/dlls/dxerr8/Makefile.in b/dlls/dxerr8/Makefile.in index c056b1cd1af..04e9d382723 100644 --- a/dlls/dxerr8/Makefile.in +++ b/dlls/dxerr8/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libdxerr8.a +STATICLIB = libdxerr8.a C_SRCS = \ dxerr8.c diff --git a/dlls/dxerr9/Makefile.in b/dlls/dxerr9/Makefile.in index 04fac1fb3e0..1f3bdaed39f 100644 --- a/dlls/dxerr9/Makefile.in +++ b/dlls/dxerr9/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libdxerr9.a +STATICLIB = libdxerr9.a C_SRCS = \ dxerr9.c diff --git a/dlls/dxguid/Makefile.in b/dlls/dxguid/Makefile.in index 551bff93695..60f50bd2146 100644 --- a/dlls/dxguid/Makefile.in +++ b/dlls/dxguid/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libdxguid.a +STATICLIB = libdxguid.a C_SRCS = \ dx10guid.c \ diff --git a/dlls/mfuuid/Makefile.in b/dlls/mfuuid/Makefile.in index b42583bbb73..a17fead940c 100644 --- a/dlls/mfuuid/Makefile.in +++ b/dlls/mfuuid/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libmfuuid.a +STATICLIB = libmfuuid.a C_SRCS = \ mfplay.c \ diff --git a/dlls/strmbase/Makefile.in b/dlls/strmbase/Makefile.in index 0fef7b6ff03..077abc1da50 100644 --- a/dlls/strmbase/Makefile.in +++ b/dlls/strmbase/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libstrmbase.a +STATICLIB = libstrmbase.a C_SRCS = \ dispatch.c \ diff --git a/dlls/strmiids/Makefile.in b/dlls/strmiids/Makefile.in index 09edc7018fc..1b9bbd98fb6 100644 --- a/dlls/strmiids/Makefile.in +++ b/dlls/strmiids/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libstrmiids.a +STATICLIB = libstrmiids.a C_SRCS = \ evr.c \ diff --git a/dlls/uuid/Makefile.in b/dlls/uuid/Makefile.in index ba163e30ca2..2a27740d7ed 100644 --- a/dlls/uuid/Makefile.in +++ b/dlls/uuid/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libuuid.a +STATICLIB = libuuid.a C_SRCS = \ d2d.c \ diff --git a/dlls/wbemuuid/Makefile.in b/dlls/wbemuuid/Makefile.in index 449a0e68a87..87a07d463e1 100644 --- a/dlls/wbemuuid/Makefile.in +++ b/dlls/wbemuuid/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libwbemuuid.a +STATICLIB = libwbemuuid.a C_SRCS = \ wbemuuid.c diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index 45cff11233e..17da4da29c6 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libwinecrt0.a +STATICLIB = libwinecrt0.a C_SRCS = \ crt_dllmain.c \ diff --git a/dlls/wmcodecdspuuid/Makefile.in b/dlls/wmcodecdspuuid/Makefile.in index d8f5d024413..04b5a7a378f 100644 --- a/dlls/wmcodecdspuuid/Makefile.in +++ b/dlls/wmcodecdspuuid/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libwmcodecdspuuid.a +STATICLIB = libwmcodecdspuuid.a C_SRCS = \ wmcodecdspuuid.c diff --git a/tools/make_makefiles b/tools/make_makefiles index 3abba2da840..a316b42dd73 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -229,7 +229,7 @@ sub parse_makefile($) { die "Configure substitution is not allowed in $file" unless $file eq "Makefile"; } - if (/^\s*(MODULE|IMPORTLIB|TESTDLL|PARENTSRC|APPMODE|EXTRADLLFLAGS)\s*=\s*(.*)/) + if (/^\s*(MODULE|IMPORTLIB|TESTDLL|STATICLIB|PARENTSRC|EXTRADLLFLAGS)\s*=\s*(.*)/) { my $var = $1; $make{$var} = $2; @@ -433,17 +433,16 @@ sub update_makefiles(@) die "MODULE should not be defined in $file" if defined $make{"MODULE"}; die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; } - elsif (defined($make{"MODULE"}) && $make{"MODULE"} =~ /\.a$/) # import lib + elsif (defined($make{"STATICLIB"})) { - die "MODULE should not be defined as static lib in $file" unless $file =~ /^dlls\//; - die "APPMODE should not be defined in $file" if defined $make{"APPMODE"}; - die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; + die "MODULE should not be defined in $file" if defined $make{"MODULE"}; + die "invalid STATICLIB name" unless $make{"STATICLIB"} =~ /\.a$/; } elsif (defined($make{"MODULE"})) # dll or program { (my $name = $file) =~ s/^(dlls|programs)\/(.*)\/Makefile/$2/; my $dllflags = $make{"EXTRADLLFLAGS"} || ""; - if (defined $make{"APPMODE"}) { $dllflags .= " " . $make{"APPMODE"}; } + die "invalid MODULE name" if $make{"MODULE"} =~ /\.a$/; die "MODULE should not be defined in $file" unless $file =~ /^(dlls|programs)\//; die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; if ($file =~ /^programs\//) @@ -454,7 +453,6 @@ sub update_makefiles(@) } else { - die "APPMODE should not be defined in $file" if defined $make{"APPMODE"} ; die "EXTRADLLFLAGS should not contain -mconsole or -mwindows in $file" if $dllflags =~ /-m(console|windows)/; die "Invalid MODULE in $file" unless ($name =~ /\./ && $make{"MODULE"} eq $name) || $make{"MODULE"} eq "$name.dll"; } @@ -467,9 +465,9 @@ sub update_makefiles(@) } elsif ($file =~ /^tools.*\/Makefile$/) { - die "APPMODE should not be defined in $file" if defined $make{"APPMODE"}; - die "EXTRADLLFLAGS should not be defined in $file" if defined $make{"EXTRADLLFLAGS"}; + die "MODULE should not be defined in $file" if defined $make{"MODULE"}; die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; + die "EXTRADLLFLAGS should not be defined in $file" if defined $make{"EXTRADLLFLAGS"}; $args = ",,[test \"x\$enable_tools\" = xno]"; } push @lines, "WINE_CONFIG_MAKEFILE($dir$args)\n"; diff --git a/tools/makedep.c b/tools/makedep.c index 88b179a9070..bb2201dadb1 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2965,12 +2965,12 @@ static void output_source_default( struct makefile *make, struct incl_file *sour find_src_file( make, replace_extension( source->name, ".c", ".spec" ))); int need_cross = (crosstarget && !(source->file->flags & FLAG_C_UNIX) && - (make->is_cross || (make->module && make->staticlib) || + (make->is_cross || make->staticlib || (source->file->flags & FLAG_C_IMPLIB))); int need_obj = ((*dll_ext || !(source->file->flags & FLAG_C_UNIX)) && (!need_cross || (source->file->flags & FLAG_C_IMPLIB) || - (make->module && make->staticlib))); + make->staticlib)); if ((source->file->flags & FLAG_GENERATED) && (!make->testdll || !strendswith( source->filename, "testlist.c" ))) @@ -2988,11 +2988,11 @@ static void output_source_default( struct makefile *make, struct incl_file *sour output( "%s.o: %s\n", obj_dir_path( make, obj ), source->filename ); output( "\t%s$(CC) -c -o $@ %s", cmd_prefix( "CC" ), source->filename ); output_filenames( defines ); - if (make->sharedlib || (make->staticlib && !make->module) || (source->file->flags & FLAG_C_UNIX)) + if (make->sharedlib || (source->file->flags & FLAG_C_UNIX)) { output_filenames( unix_dllflags ); } - else if (make->module || make->staticlib || make->testdll) + else if (make->module || make->testdll) { output_filenames( dll_flags ); if (source->use_msvcrt) output_filenames( msvcrt_flags ); @@ -4084,7 +4084,7 @@ static void load_sources( struct makefile *make ) make->install_dev = get_expanded_make_var_array( make, "INSTALL_DEV" ); make->extra_targets = get_expanded_make_var_array( make, "EXTRA_TARGETS" ); - if (make->module && strendswith( make->module, ".a" )) make->staticlib = make->module; + if (make->staticlib) make->module = make->staticlib; make->disabled = make->obj_dir && strarray_exists( &disabled_dirs, make->obj_dir ); make->is_win16 = strarray_exists( &make->extradllflags, "-m16" );

1 0

Zhiyi Zhang : comctl32/rebar: Do not adjust non-client size when themed.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: a9165162dd6184840650711c13c0ddf06b520bfb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9165162dd6184840650711c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 6 15:48:00 2021 +0800 comctl32/rebar: Do not adjust non-client size when themed. Fix rebar test failures when theming is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/rebar.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index af35008b692..84390bd0b52 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -3207,19 +3207,13 @@ REBAR_MouseMove (REBAR_INFO *infoPtr, LPARAM lParam) static inline LRESULT REBAR_NCCalcSize (const REBAR_INFO *infoPtr, RECT *rect) { - HTHEME theme; - if (infoPtr->dwStyle & WS_BORDER) { rect->left = min(rect->left + GetSystemMetrics(SM_CXEDGE), rect->right); rect->right = max(rect->right - GetSystemMetrics(SM_CXEDGE), rect->left); rect->top = min(rect->top + GetSystemMetrics(SM_CYEDGE), rect->bottom); rect->bottom = max(rect->bottom - GetSystemMetrics(SM_CYEDGE), rect->top); } - else if ((theme = GetWindowTheme (infoPtr->hwndSelf))) - { - /* FIXME: should use GetThemeInt */ - rect->top = min(rect->top + 1, rect->bottom); - } + TRACE("new client=(%s)\n", wine_dbgstr_rect(rect)); return 0; }

1 0

Zhiyi Zhang : comctl32/rebar: Do not remove WS_BORDER when theming is on.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 106a5f43ec612b7d176513019ec1325e1c63b42c URL: https://source.winehq.org/git/wine.git/?a=commit;h=106a5f43ec612b7d17651301… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 6 15:48:07 2021 +0800 comctl32/rebar: Do not remove WS_BORDER when theming is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/rebar.c | 17 +++------------ dlls/comctl32/tests/rebar.c | 50 +++++++++++++++++++++++++++++++++++---------- 2 files changed, 42 insertions(+), 25 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 84390bd0b52..6a065514e60 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2930,14 +2930,9 @@ REBAR_Create (REBAR_INFO *infoPtr, LPCREATESTRUCTW cs) cs->x, cs->y, cs->cx, cs->cy); } - TRACE("created!\n"); - - if (OpenThemeData (infoPtr->hwndSelf, themeClass)) - { - /* native seems to clear WS_BORDER when themed */ - infoPtr->dwStyle &= ~WS_BORDER; - } + OpenThemeData(infoPtr->hwndSelf, themeClass); + TRACE("created!\n"); return 0; } @@ -3508,8 +3503,6 @@ REBAR_StyleChanged (REBAR_INFO *infoPtr, INT nType, const STYLESTRUCT *lpStyle) if (nType == GWL_STYLE) { infoPtr->orgStyle = infoPtr->dwStyle = lpStyle->styleNew; - if (GetWindowTheme (infoPtr->hwndSelf)) - infoPtr->dwStyle &= ~WS_BORDER; /* maybe it should be COMMON_STYLES like in toolbar */ if ((lpStyle->styleNew ^ lpStyle->styleOld) & CCS_VERT) REBAR_Layout(infoPtr); @@ -3522,11 +3515,7 @@ static LRESULT theme_changed (REBAR_INFO* infoPtr) { HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); CloseThemeData (theme); - theme = OpenThemeData (infoPtr->hwndSelf, themeClass); - /* WS_BORDER disappears when theming is enabled and reappears when - * disabled... */ - infoPtr->dwStyle &= ~WS_BORDER; - infoPtr->dwStyle |= theme ? 0 : (infoPtr->orgStyle & WS_BORDER); + OpenThemeData(infoPtr->hwndSelf, themeClass); return 0; } diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 21b655b197f..462782a1b11 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -77,11 +77,11 @@ static void init_system_font_height(void) { system_font_height = tm.tmHeight; } -static HWND create_rebar_control(void) +static HWND create_rebar_control(DWORD style) { HWND hwnd; - hwnd = CreateWindowA(REBARCLASSNAMEA, NULL, WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, + hwnd = CreateWindowA(REBARCLASSNAMEA, NULL, style | WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, hMainWnd, (HMENU)17, GetModuleHandleA(NULL), NULL); ok(hwnd != NULL, "Failed to create Rebar\n"); @@ -499,7 +499,7 @@ static void test_layout(void) rbsize_results_init(); - hRebar = create_rebar_control(); + hRebar = create_rebar_control(0); check_sizes(); rbi.cbSize = REBARBANDINFOA_V6_SIZE; rbi.fMask = RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_CHILD; @@ -559,7 +559,7 @@ static void test_layout(void) DestroyWindow(hRebar); - hRebar = create_rebar_control(); + hRebar = create_rebar_control(0); add_band_w(hRebar, "ABC", 70, 40, 100); add_band_w(hRebar, NULL, 40, 70, 100); add_band_w(hRebar, NULL, 170, 240, 100); @@ -602,7 +602,7 @@ static void test_layout(void) DestroyWindow(hRebar); /* VARHEIGHT resizing test on a horizontal rebar */ - hRebar = create_rebar_control(); + hRebar = create_rebar_control(0); SetWindowLongA(hRebar, GWL_STYLE, GetWindowLongA(hRebar, GWL_STYLE) | RBS_AUTOSIZE); check_sizes(); rbi.fMask = RBBIM_CHILD | RBBIM_CHILDSIZE | RBBIM_SIZE | RBBIM_STYLE; @@ -630,7 +630,7 @@ static void test_layout(void) DestroyWindow(hRebar); /* VARHEIGHT resizing on a vertical rebar */ - hRebar = create_rebar_control(); + hRebar = create_rebar_control(0); SetWindowLongA(hRebar, GWL_STYLE, GetWindowLongA(hRebar, GWL_STYLE) | CCS_VERT | RBS_AUTOSIZE); check_sizes(); rbi.fMask = RBBIM_CHILD | RBBIM_CHILDSIZE | RBBIM_SIZE | RBBIM_STYLE; @@ -661,7 +661,7 @@ static void test_layout(void) pImageList_Destroy(himl); /* One hidden band. */ - hRebar = create_rebar_control(); + hRebar = create_rebar_control(0); rbi.cbSize = REBARBANDINFOA_V6_SIZE; rbi.fMask = RBBIM_STYLE | RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_CHILD; @@ -966,7 +966,7 @@ static void test_bandinfo(void) CHAR szABCD[] = "ABCD"; HWND hRebar; - hRebar = create_rebar_control(); + hRebar = create_rebar_control(0); rb.cbSize = REBARBANDINFOA_V6_SIZE; rb.fMask = 0; if (!SendMessageA(hRebar, RB_INSERTBANDA, 0, (LPARAM)&rb)) @@ -1027,7 +1027,7 @@ static void test_colors(void) HWND hRebar; REBARBANDINFOA bi; - hRebar = create_rebar_control(); + hRebar = create_rebar_control(0); /* test default colors */ clr = SendMessageA(hRebar, RB_GETTEXTCOLOR, 0, 0); @@ -1106,7 +1106,7 @@ static void test_showband(void) REBARBANDINFOA rbi; BOOL ret; - hRebar = create_rebar_control(); + hRebar = create_rebar_control(0); /* no bands */ ret = SendMessageA(hRebar, RB_SHOWBAND, 0, TRUE); @@ -1135,7 +1135,7 @@ static void test_notification(void) MEASUREITEMSTRUCT mis; HWND rebar; - rebar = create_rebar_control(); + rebar = create_rebar_control(0); g_parent_measureitem = 0; SendMessageA(rebar, WM_MEASUREITEM, 0, (LPARAM)&mis); @@ -1144,6 +1144,33 @@ static void test_notification(void) DestroyWindow(rebar); } +static void test_style(void) +{ + STYLESTRUCT style_struct; + LONG style; + HWND hwnd; + RECT rect; + + /* WS_BORDER */ + hwnd = create_rebar_control(WS_BORDER); + ok(GetWindowLongW(hwnd, GWL_STYLE) & WS_BORDER, "Expected WS_BORDER.\n"); + + GetClientRect(hwnd, &rect); + SendMessageW(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect); + ok(GetWindowLongW(hwnd, GWL_STYLE) & WS_BORDER, "Expected WS_BORDER.\n"); + + SendMessageW(hwnd, WM_THEMECHANGED, 0, 0); + style = GetWindowLongW(hwnd, GWL_STYLE); + ok(style & WS_BORDER, "Expected WS_BORDER.\n"); + + style_struct.styleOld = style; + style_struct.styleNew = style | WS_DLGFRAME; + SendMessageW(hwnd, WM_STYLECHANGED, (WPARAM)GWL_STYLE, (LPARAM)&style_struct); + ok(GetWindowLongW(hwnd, GWL_STYLE) & WS_BORDER, "Expected WS_BORDER.\n"); + + DestroyWindow(hwnd); +} + static void init_functions(void) { HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); @@ -1176,6 +1203,7 @@ START_TEST(rebar) test_layout(); test_resize(); + test_style(); out: PostQuitMessage(0);

1 0

Zhiyi Zhang : comctl32/tests: Delete unused headers.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: f51a12f969796621b21d2982c8e1235a8cdcbff9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f51a12f969796621b21d2982… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 6 15:48:15 2021 +0800 comctl32/tests: Delete unused headers. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/rebar.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 462782a1b11..d0b201a8763 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -18,11 +18,9 @@ */ #include <assert.h> -#include <stdarg.h> #include <windows.h> #include <commctrl.h> -#include <uxtheme.h> #include "wine/heap.h" #include "wine/test.h"

1 0

Zhiyi Zhang : comctl32/status: Do not use theme metrics to compute height.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 8f6a4438b4d2b9d12c5eeccec9a136a80de0a8ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f6a4438b4d2b9d12c5eecce… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 6 15:48:24 2021 +0800 comctl32/status: Do not use theme metrics to compute height. Fix status test failures when theming is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/status.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 7bc9ec4386f..9078e4a70bc 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -102,7 +102,6 @@ static inline LPCSTR debugstr_t(LPCWSTR text, BOOL isW) static UINT STATUSBAR_ComputeHeight(STATUS_INFO *infoPtr) { - HTHEME theme; UINT height; TEXTMETRICW tm; int margin; @@ -111,21 +110,6 @@ STATUSBAR_ComputeHeight(STATUS_INFO *infoPtr) margin = (tm.tmInternalLeading ? tm.tmInternalLeading : 2); height = max(tm.tmHeight + margin + 2*GetSystemMetrics(SM_CYBORDER), infoPtr->minHeight) + infoPtr->verticalBorder; - if ((theme = GetWindowTheme(infoPtr->Self))) - { - /* Determine bar height from theme such that the content area is - * textHeight pixels large */ - HDC hdc = GetDC(infoPtr->Self); - RECT r; - - SetRect(&r, 0, 0, 0, max(infoPtr->minHeight, tm.tmHeight)); - if (SUCCEEDED(GetThemeBackgroundExtent(theme, hdc, SP_PANE, 0, &r, &r))) - { - height = r.bottom - r.top; - } - ReleaseDC(infoPtr->Self, hdc); - } - TRACE(" textHeight=%d+%d, final height=%d\n", tm.tmHeight, tm.tmInternalLeading, height); return height; }

1 0

Zhiyi Zhang : comctl32/tests: Fix a treeview test failure when theming is on.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 0f2f195831ce078034bf070032b69e998709d07f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f2f195831ce078034bf0700… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 6 15:48:33 2021 +0800 comctl32/tests: Fix a treeview test failure when theming is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 02d914c249c..0d245cf9d15 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -27,12 +27,17 @@ #include "winuser.h" #include "winnls.h" #include "winreg.h" -#include "commctrl.h" +#include "commctrl.h" +#include "uxtheme.h" +#include "vsstyle.h" #include "wine/test.h" #include "v6util.h" #include "msg.h" +static HTHEME (WINAPI *pGetWindowTheme)(HWND); +static BOOL (WINAPI *pIsThemeBackgroundPartiallyTransparent)(HTHEME, int, int); + static BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); static const char *TEST_CALLBACK_TEXT = "callback_text"; @@ -2121,6 +2126,8 @@ static void test_TVS_SINGLEEXPAND(void) static void test_WM_PAINT(void) { + BOOL is_glyph_transparent; + HTHEME htheme; HWND hTree; COLORREF clr; LONG ret; @@ -2144,7 +2151,11 @@ static void test_WM_PAINT(void) ok(ret == 0, "got %d\n", ret); clr = GetPixel(hdc, 1, 1); - ok(clr == RGB(255, 0, 0) || broken(clr == RGB(0, 0, 0)) /* win98 */, + htheme = pGetWindowTheme(hTree); + is_glyph_transparent = htheme && pIsThemeBackgroundPartiallyTransparent(htheme, TVP_GLYPH, 0); + ok(clr == RGB(255, 0, 0) || broken(clr == RGB(0, 0, 0)) /* win98 */ + /* When theming is on and treeview glyphs are transparent, parent window needs to be repainted */ + || (is_glyph_transparent && clr == GetSysColor(COLOR_WINDOW)), "got 0x%x\n", clr); ReleaseDC(hMainWnd, hdc); @@ -2945,9 +2956,13 @@ static void test_right_click(void) static void init_functions(void) { HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); + HMODULE hUxtheme = LoadLibraryA("uxtheme.dll"); + +#define X(module, f) p##f = (void*)GetProcAddress(module, #f); + X(hComCtl32, InitCommonControlsEx); -#define X(f) p##f = (void*)GetProcAddress(hComCtl32, #f); - X(InitCommonControlsEx); + X(hUxtheme, GetWindowTheme); + X(hUxtheme, IsThemeBackgroundPartiallyTransparent); #undef X }

1 0