January 2018 - Wine-commits

Alexandre Julliard : configure: Replace AC_HEADER_MAJOR macro to handle glibc 2.25 sys/types.h breakage.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 0bf52e10afdce41057272c458e0287de71a9111d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bf52e10afdce41057272c45… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 1 12:43:19 2017 +0100 configure: Replace AC_HEADER_MAJOR macro to handle glibc 2.25 sys/types.h breakage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4100c9210dba2ba280b08e474f67d139a4a6a571) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- aclocal.m4 | 16 ++++++++++++++++ configure | 36 ++---------------------------------- configure.ac | 2 +- 3 files changed, 19 insertions(+), 35 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index c65ebc4..6cfccbd 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -35,6 +35,22 @@ AS_VAR_IF([ac_cv_prog_$1],[], AC_CHECK_PROG([$1],[$2],[$2],[$3],[$4])])], [AS_VAR_COPY([$1],[ac_cv_prog_$1])])]) +dnl WINE_HEADER_MAJOR() +dnl +dnl Same as AC_HEADER_MAJOR but fixed to handle the glibc 2.25 sys/types.h breakage +dnl +AC_DEFUN([WINE_HEADER_MAJOR], +[AC_CHECK_HEADER(sys/mkdev.h, + [AC_DEFINE(MAJOR_IN_MKDEV, 1, + [Define to 1 if `major', `minor', and `makedev' are + declared in <mkdev.h>.])]) +if test $ac_cv_header_sys_mkdev_h = no; then + AC_CHECK_HEADER(sys/sysmacros.h, + [AC_DEFINE(MAJOR_IN_SYSMACROS, 1, + [Define to 1 if `major', `minor', and `makedev' + are declared in <sysmacros.h>.])]) +fi]) + dnl **** Initialize the programs used by other checks **** dnl dnl Usage: WINE_PATH_SONAME_TOOLS diff --git a/configure b/configure index 1c434a5..ff5bd2c 100755 --- a/configure +++ b/configure @@ -6935,35 +6935,6 @@ fi done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/types.h defines makedev" >&5 -$as_echo_n "checking whether sys/types.h defines makedev... " >&6; } -if ${ac_cv_header_sys_types_h_makedev+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <sys/types.h> -int -main () -{ -return makedev(0, 0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_header_sys_types_h_makedev=yes -else - ac_cv_header_sys_types_h_makedev=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_types_h_makedev" >&5 -$as_echo "$ac_cv_header_sys_types_h_makedev" >&6; } - -if test $ac_cv_header_sys_types_h_makedev = no; then ac_fn_c_check_header_mongrel "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default" if test "x$ac_cv_header_sys_mkdev_h" = xyes; then : @@ -6972,9 +6943,8 @@ $as_echo "#define MAJOR_IN_MKDEV 1" >>confdefs.h fi - - if test $ac_cv_header_sys_mkdev_h = no; then - ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default" +if test $ac_cv_header_sys_mkdev_h = no; then + ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default" if test "x$ac_cv_header_sys_sysmacros_h" = xyes; then : $as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h @@ -6982,9 +6952,7 @@ $as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h fi - fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5 $as_echo_n "checking whether stat file-mode macros are broken... " >&6; } if ${ac_cv_header_stat_broken+:} false; then : diff --git a/configure.ac b/configure.ac index e5376bf..67e0df6 100644 --- a/configure.ac +++ b/configure.ac @@ -515,7 +515,7 @@ AC_CHECK_HEADERS(\ valgrind/valgrind.h \ zlib.h ) -AC_HEADER_MAJOR() +WINE_HEADER_MAJOR() AC_HEADER_STAT() dnl **** Checks for headers that depend on other ones ****

1 0

Austin English : announce: Move WineHQ URLs to https.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 29d3ef3626548db9c8a58c1063b8441523d5746e URL: https://source.winehq.org/git/wine.git/?a=commit;h=29d3ef3626548db9c8a58c10… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:56:51 2017 -0600 announce: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6c8f985b7694c99287b953a0a6f0e64b4c5dc79a) Conflicts: ANNOUNCE Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- ANNOUNCE | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 91bcdcb0..131a931 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -6,17 +6,17 @@ What's new in this release (see below for details): The source is available from the following locations: - http://dl.winehq.org/wine/source/2.0/wine-2.0.3.tar.xz + https://dl.winehq.org/wine/source/2.0/wine-2.0.3.tar.xz http://mirrors.ibiblio.org/wine/source/2.0/wine-2.0.3.tar.xz Binary packages for various distributions will be available from: - http://www.winehq.org/download + https://www.winehq.org/download -You will find documentation on http://www.winehq.org/documentation +You will find documentation on https://www.winehq.org/documentation You can also get the current source directly from the git -repository. Check http://www.winehq.org/git for details. +repository. Check https://www.winehq.org/git for details. Wine is available thanks to the work of many people. See the file AUTHORS in the distribution for the complete list.

1 0

Austin English : readme: Move WineHQ URLs to https.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 4e7369d49cdfc9e9c88e9f139a73990bc3ffafb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e7369d49cdfc9e9c88e9f13… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:56:52 2017 -0600 readme: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 92734380a5de8d4b3bf8f79888de6ed2777fde8d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- README | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/README b/README index 7e0f171..9761f66 100644 --- a/README +++ b/README @@ -29,7 +29,7 @@ Or run Wine directly from the build directory: Run programs as "wine program". For more information and problem resolution, read the rest of this file, the Wine man page, and -especially the wealth of information found at http://www.winehq.org. +especially the wealth of information found at https://www.winehq.org. 3. REQUIREMENTS @@ -48,7 +48,7 @@ support kernel threads may be supported in the future. FreeBSD info: Wine will generally not work properly on versions before FreeBSD 8.0. - See http://wiki.freebsd.org/Wine for more information. + See https://wiki.freebsd.org/Wine for more information. Solaris info: You will most likely need to build Wine with the GNU toolchain @@ -81,7 +81,7 @@ Basic requirements: Optional support libraries: Configure will display notices when optional libraries are not found - on your system. See http://wiki.winehq.org/Recommended_Packages for + on your system. See https://wiki.winehq.org/Recommended_Packages for hints about the packages you should install. On 64-bit platforms, you have to make sure to install the 32-bit versions of these libraries. @@ -115,7 +115,7 @@ first. Try either "dpkg -r wine" or "rpm -e wine" or "make uninstall" before installing. Once installed, you can run the "winecfg" configuration tool. See the -Support area at http://www.winehq.org/ for configuration hints. +Support area at https://www.winehq.org/ for configuration hints. 6. RUNNING PROGRAMS @@ -142,25 +142,25 @@ a bug. 7. GETTING MORE INFORMATION WWW: A great deal of information about Wine is available from WineHQ at - http://www.winehq.org/ : various Wine Guides, application database, + https://www.winehq.org/ : various Wine Guides, application database, bug tracking. This is probably the best starting point. -FAQ: The Wine FAQ is located at http://www.winehq.org/FAQ +FAQ: The Wine FAQ is located at https://www.winehq.org/FAQ -Wiki: The Wine Wiki is located at http://wiki.winehq.org +Wiki: The Wine Wiki is located at https://wiki.winehq.org Mailing lists: There are several mailing lists for Wine users and developers; - see http://www.winehq.org/forums for more information. + see https://www.winehq.org/forums for more information. -Bugs: Report bugs to Wine Bugzilla at http://bugs.winehq.org +Bugs: Report bugs to Wine Bugzilla at https://bugs.winehq.org Please search the bugzilla database to check whether your problem is already known or fixed before posting a bug report. IRC: Online help is available at channel #WineHQ on irc.freenode.net. Git: The current Wine development tree is available through Git. - Go to http://www.winehq.org/git for more information. + Go to https://www.winehq.org/git for more information. If you add something, or fix a bug, please send a patch (preferably using git-format-patch) to the wine-devel(a)winehq.org list for

1 0

Austin English : configure: Move WineHQ URLs to https.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: d70ec0216cc95acb7094d3f2ada5e1132e364593 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d70ec0216cc95acb7094d3f2… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:56:53 2017 -0600 configure: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit cc597686c2b79cb1010003709ab5ed3d5a8b1257) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 6 +++--- configure.ac | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure index ff5bd2c..fd4e47c 100755 --- a/configure +++ b/configure @@ -583,7 +583,7 @@ PACKAGE_TARNAME='wine' PACKAGE_VERSION='2.0.3' PACKAGE_STRING='Wine 2.0.3' PACKAGE_BUGREPORT='wine-devel(a)winehq.org' -PACKAGE_URL='http://www.winehq.org' +PACKAGE_URL='https://www.winehq.org' ac_unique_file="server/atom.c" # Factoring default headers for most tests. @@ -2436,7 +2436,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. Report bugs to <wine-devel(a)winehq.org>. -Wine home page: <http://www.winehq.org>. +Wine home page: <https://www.winehq.org>. _ACEOF ac_status=$? fi @@ -19219,7 +19219,7 @@ Configuration commands: $config_commands Report bugs to <wine-devel(a)winehq.org>. -Wine home page: <http://www.winehq.org>." +Wine home page: <https://www.winehq.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 diff --git a/configure.ac b/configure.ac index 67e0df6..acf9349 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ m4_define(WINE_VERSION,regexp(m4_include(VERSION),[version $[-.0-9A-Za-z]+$],[ dnl autoconf versions before 2.62 don't handle source dir symlinks correctly AC_PREREQ(2.62) -AC_INIT([Wine],[WINE_VERSION],[wine-devel(a)winehq.org],[wine],[http://www.winehq.org]) +AC_INIT([Wine],[WINE_VERSION],[wine-devel(a)winehq.org],[wine],[https://www.winehq.org]) AC_CONFIG_SRCDIR(server/atom.c) AC_CONFIG_HEADERS(include/config.h) AC_CONFIG_AUX_DIR(tools) @@ -23,8 +23,8 @@ m4_ifdef([AS_VAR_IF],,[AC_DEFUN([AS_VAR_IF], AS_IF([test "x$as_val" = x""$2], [$3], [$4])])])])dnl dnl autoconf versions before 2.64 don't have AC_PACKAGE_URL m4_ifdef([AC_PACKAGE_URL],, - [AC_DEFINE([PACKAGE_URL], ["http://www.winehq.org"], [Define to the home page for this package.]) - AC_SUBST([PACKAGE_URL], ["http://www.winehq.org"])])dnl + [AC_DEFINE([PACKAGE_URL], ["https://www.winehq.org"], [Define to the home page for this package.]) + AC_SUBST([PACKAGE_URL], ["https://www.winehq.org"])])dnl dnl **** Command-line arguments ****

1 0

Austin English : loader: Move WineHQ URLs to https.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 2b66a67c2aa585e555adf456e00ac5eb8dac390b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b66a67c2aa585e555adf456… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:56:57 2017 -0600 loader: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3bc68c24b972643aba2b96dcdcf97ea2f9fb82bd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.de.UTF-8.man.in | 16 ++++++++-------- loader/wine.fr.UTF-8.man.in | 8 ++++---- loader/wine.man.in | 8 ++++---- loader/wine.pl.UTF-8.man.in | 16 ++++++++-------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/loader/wine.de.UTF-8.man.in b/loader/wine.de.UTF-8.man.in index 25dff94..3933fea 100644 --- a/loader/wine.de.UTF-8.man.in +++ b/loader/wine.de.UTF-8.man.in @@ -279,36 +279,36 @@ im obersten Ordner der Quellcodedistribution. .SH FEHLER .PP Statusberichte für viele Anwendungen sind unter -.I http://appdb.winehq.org +.I https://appdb.winehq.org verfügbar. Bitte fügen Sie Anwendungen, die Sie mit Wine nutzen, der Liste hinzu, sofern noch kein Eintrag existiert. .PP Fehler können unter -.I http://bugs.winehq.org +.I https://bugs.winehq.org gemeldet werden. Wenn Sie einen Fehler melden möchten, lesen Sie bitte vorher -.I http://wiki.winehq.org/Bugs +.I https://wiki.winehq.org/Bugs im .B wine -Quellcode, um zu sehen, welche Informationen benötigt werden. .PP Probleme und Hinweise mit/zu dieser Manpage können auch auf -.I http://bugs.winehq.org +.I https://bugs.winehq.org gemeldet werden. .SH VERFÜGBARKEIT Die aktuellste öffentliche Wine-Version kann auf -.I http://www.winehq.org/download +.I https://www.winehq.org/download bezogen werden. .PP Ein Schnappschuss des Entwicklungscodes kann via GIT besorgt werden, siehe dazu .I -http://www.winehq.org/site/git +https://www.winehq.org/git .PP WineHQ, die Hauptseite der .B wine -Entwicklung, befindet sich auf -.IR http://www.winehq.org . +.IR https://www.winehq.org . Diese Website bietet viele Informationen und Ressourcen zu .BR wine . .PP @@ -317,7 +317,7 @@ Für nähere Informationen zur Entwicklung von können Sie sich als Abonnement bei der .B wine -Mailingliste auf -.I http://www.winehq.org/forums +.I https://www.winehq.org/forums eintragen. .SH "SIEHE AUCH" .BR wineserver (1),\ winedbg (1) diff --git a/loader/wine.fr.UTF-8.man.in b/loader/wine.fr.UTF-8.man.in index c2a2ae6..0016f16 100644 --- a/loader/wine.fr.UTF-8.man.in +++ b/loader/wine.fr.UTF-8.man.in @@ -273,25 +273,25 @@ licence se trouve dans le fichier .SH BUGS .PP Un rapport sur la compatibilité de nombreuses applications est disponible sur la -.UR http://appdb.winehq.org +.UR https://appdb.winehq.org .B base de données d'applications de Wine .UE . N'hésitez pas à y ajouter des entrées pour les applications que vous exécutez actuellement, si nécessaire. .PP Les bugs peuvent être signalés (en anglais) sur le -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B système de suivi des problèmes de Wine .UE . .SH DISPONIBILITÉ La version publique la plus récente de Wine est disponible sur WineHQ, le -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B quartier général du développement de Wine .UE . .SH "VOIR AUSSI" .BR wineserver (1), .BR winedbg (1), .br -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Documentation et support de Wine .UE . diff --git a/loader/wine.man.in b/loader/wine.man.in index 1439b3c..2fcce8b 100644 --- a/loader/wine.man.in +++ b/loader/wine.man.in @@ -273,27 +273,27 @@ in the top-level directory of the source distribution. .SH BUGS .PP A status report on many applications is available from the -.UR http://appdb.winehq.org +.UR https://appdb.winehq.org .B Wine Application Database .UE . Please add entries to this list for applications you currently run, if necessary. .PP Bugs can be reported on the -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B Wine bug tracker .UE . .SH AVAILABILITY The most recent public version of .B wine is available through WineHQ, the -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B Wine development headquarters .UE . .SH "SEE ALSO" .BR wineserver (1), .BR winedbg (1), .br -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Wine documentation and support .UE . diff --git a/loader/wine.pl.UTF-8.man.in b/loader/wine.pl.UTF-8.man.in index 1718d65..9f1f2cf 100644 --- a/loader/wine.pl.UTF-8.man.in +++ b/loader/wine.pl.UTF-8.man.in @@ -282,35 +282,35 @@ w głównym katalogu dystrybucyjnym źródła. .SH BŁĘDY .PP Raporty stanu działania programów są dostępne na stronie -.IR http://appdb.winehq.org . +.IR https://appdb.winehq.org . Jeżeli brakuje na liście aplikacji, której używasz, to nie wahaj się dodać jej samodzielnie. .PP Raporty błędów mogą być wysyłane do Wine Bugzilla -.I http://bugs.winehq.org +.I https://bugs.winehq.org Jeżeli chcesz zgłosić błąd zapoznaj się z -.I http://wiki.winehq.org/Bugs +.I https://wiki.winehq.org/Bugs w źródle .B wine , aby dowiedzieć się jakie informacje są niezbędne .PP Sugestie i problemy dotyczące tej instrukcji również przesyłaj do -.I http://bugs.winehq.org +.I https://bugs.winehq.org .SH DOSTĘPNOŚĆ Najaktualniejszą publiczną wersję .B wine można pobrać ze strony -.I http://www.winehq.org/download +.I https://www.winehq.org/download .PP Najaktualnieszy zrzut kodu można pobrać przez GIT. Aby dowiedzieć się jak to zrobić, odwiedź stronę .I -http://www.winehq.org/site/git +http://www.winehq.org/git .PP WineHQ, siedziba rozwoju .B wine , mieści się na stronie -.IR http://www.winehq.org . +.IR https://www.winehq.org . Strona ta zawiera wiele informacji o .BR wine . .PP @@ -319,7 +319,7 @@ Po dalsze informacje na temat rozwoju zapisz się na listę mailingową .B wine na stronie -.I http://www.winehq.org/forums +.I https://www.winehq.org/forums .SH "ZOBACZ TAKŻE" .BR wineserver (1),

1 0

Austin English : server: Move WineHQ URLs to https.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: a9949d007382fd13621c23d1882f9f9914efd398 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9949d007382fd13621c23d1… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:56:59 2017 -0600 server: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2723f70a4a5b298632953e3422a2fdb73a1fa332) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- server/wineserver.de.UTF-8.man.in | 4 ++-- server/wineserver.fr.UTF-8.man.in | 6 +++--- server/wineserver.man.in | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/server/wineserver.de.UTF-8.man.in b/server/wineserver.de.UTF-8.man.in index 26d0deb..df10c7a 100644 --- a/server/wineserver.de.UTF-8.man.in +++ b/server/wineserver.de.UTF-8.man.in @@ -98,13 +98,13 @@ ist Alexandre Julliard. Viele andere Personen haben neue Funktionen hinzugefügt und Fehler behoben. Details finden Sie in der Datei Changelog. .SH FEHLER Wenn Sie einen Fehler finden, melden Sie ihn bitte im -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B Wine Bugtracker .UE . .SH VERFÜGBARKEIT .B wineserver ist Teil der Wine-Distribution, verfügbar im WineHQ, dem -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B Hauptquartier der Wine-Entwicklung .UE . .SH "SIEHE AUCH" diff --git a/server/wineserver.fr.UTF-8.man.in b/server/wineserver.fr.UTF-8.man.in index 22893b2..a78fe84 100644 --- a/server/wineserver.fr.UTF-8.man.in +++ b/server/wineserver.fr.UTF-8.man.in @@ -98,18 +98,18 @@ est Alexandre Julliard. Beaucoup d'autres personnes ont contribué des nouvelles et des corrections de bugs. Pour une liste complète, consultez l'historique git. .SH BUGS Les bugs peuvent être signalés (en anglais) sur le -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B système de suivi des problèmes de Wine .UE . .SH DISPONIBILITÉ .B wineserver fait partie de la distribution de Wine, disponible depuis WineHQ, le -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B quartier général des développeurs de Wine .UE . .SH "VOIR AUSSI" .BR wine (1), .br -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Documentation et support de Wine .UE . diff --git a/server/wineserver.man.in b/server/wineserver.man.in index 82136a3..b10907b 100644 --- a/server/wineserver.man.in +++ b/server/wineserver.man.in @@ -98,19 +98,19 @@ is Alexandre Julliard. Many other people have contributed new features and bug fixes. For a complete list, see the git commit logs. .SH BUGS Bugs can be reported on the -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B Wine bug tracker .UE . .SH AVAILABILITY .B wineserver is part of the Wine distribution, which is available through WineHQ, the -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B Wine development headquarters .UE . .SH "SEE ALSO" .BR wine (1), .br -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Wine documentation and support .UE .

1 0

Austin English : widl: Move WineHQ URLs to https.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 4620802bdb9516bec716cde57b7b02dabe5060f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4620802bdb9516bec716cde5… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:57:01 2017 -0600 widl: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 500bcfb1c0229405d21346726f1e40f5988e5c8b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/widl/widl.man.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index 9259afd..d8b665e 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -135,7 +135,7 @@ Debug level \fIn\fR is a bitmask with the following meaning: * 0x20 Preprocessor yacc trace .SH BUGS Bugs can be reported on the -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B Wine bug tracker .UE . .SH AUTHORS @@ -148,10 +148,10 @@ Dan Hipschman. .B widl is part of the Wine distribution, which is available through WineHQ, the -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B Wine development headquarters .UE . .SH "SEE ALSO" -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Wine documentation and support .UE .

1 0

Austin English : winegcc: Move WineHQ URLs to https.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: b1c4a2dce56a4bd4b1d822d303fdc9f4bb5beb1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1c4a2dce56a4bd4b1d822d3… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:57:04 2017 -0600 winegcc: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 159b6d928001f76380de412615956bc06ba23049) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/winegcc/winegcc.man.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winegcc/winegcc.man.in b/tools/winegcc/winegcc.man.in index b4fc12d..5bbb2fd 100644 --- a/tools/winegcc/winegcc.man.in +++ b/tools/winegcc/winegcc.man.in @@ -87,7 +87,7 @@ result, the -static, --static, and -Wl,-static options will generate an error. .PP Bugs can be reported on the -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B Wine bug tracker .UE . .SH AUTHORS @@ -97,7 +97,7 @@ was written by Dimitrie O. Paun. .B winegcc is part of the Wine distribution, which is available through WineHQ, the -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B Wine development headquarters .UE . .SH "SEE ALSO" @@ -106,6 +106,6 @@ the .BR wrc (1), .BR wine (1), .br -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Wine documentation and support .UE .

1 0

Piotr Caban : msvcr120: Add wctype implementation.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 76172bf91172ca59296c4b72ef478929a4d3547d URL: https://source.winehq.org/git/wine.git/?a=commit;h=76172bf91172ca59296c4b72… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 14 18:21:21 2017 +0200 msvcr120: Add wctype implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 42ccd8d9ecb386bb9da311c1faa5c14a12d26de3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-string-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120/tests/msvcr120.c | 32 ++++++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/ctype.c | 30 ++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 6 files changed, 66 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec index 0095feb..5e8e7b4 100644 --- a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec +++ b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec @@ -173,6 +173,6 @@ @ cdecl wcstok(wstr wstr) ucrtbase.wcstok @ cdecl wcstok_s(ptr wstr ptr) ucrtbase.wcstok_s @ cdecl wcsxfrm(ptr wstr long) ucrtbase.wcsxfrm -@ stub wctype +@ cdecl wctype(str) ucrtbase.wctype @ cdecl wmemcpy_s(ptr long ptr long) ucrtbase.wmemcpy_s @ cdecl wmemmove_s(ptr long ptr long) ucrtbase.wmemmove_s diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index a15db46..8bc3467 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2487,7 +2487,7 @@ @ cdecl wctomb(ptr long) MSVCRT_wctomb @ cdecl wctomb_s(ptr ptr long long) MSVCRT_wctomb_s @ stub wctrans -@ stub wctype +@ cdecl wctype(str) @ cdecl wmemcpy_s(ptr long ptr long) @ cdecl wmemmove_s(ptr long ptr long) @ varargs wprintf(wstr) MSVCRT_wprintf diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 13f3672..de0ccc4 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -182,6 +182,7 @@ static int (CDECL *p_fegetenv)(fenv_t*); static int (CDECL *p__clearfp)(void); static _locale_t (__cdecl *p_wcreate_locale)(int, const wchar_t *); static void (__cdecl *p_free_locale)(_locale_t); +static unsigned short (__cdecl *p_wctype)(const char*); /* make sure we use the correct errno */ #undef errno @@ -236,6 +237,7 @@ static BOOL init(void) p_errno = (void*)GetProcAddress(module, "_errno"); p_wcreate_locale = (void*)GetProcAddress(module, "_wcreate_locale"); p_free_locale = (void*)GetProcAddress(module, "_free_locale"); + SET(p_wctype, "wctype"); SET(p_fegetenv, "fegetenv"); SET(p__clearfp, "_clearfp"); if(sizeof(void*) == 8) { /* 64-bit initialization */ @@ -880,6 +882,35 @@ static void test__Condition_variable(void) CloseHandle(thread_initialized); } +static void test_wctype(void) +{ + static const struct { + const char *name; + unsigned short mask; + } properties[] = { + { "alnum", 0x107 }, + { "alpha", 0x103 }, + { "cntrl", 0x020 }, + { "digit", 0x004 }, + { "graph", 0x117 }, + { "lower", 0x002 }, + { "print", 0x157 }, + { "punct", 0x010 }, + { "space", 0x008 }, + { "upper", 0x001 }, + { "xdigit", 0x080 }, + { "ALNUM", 0x000 }, + { "Alnum", 0x000 }, + { "", 0x000 } + }; + int i, ret; + + for(i=0; i<sizeof(properties)/sizeof(properties[0]); i++) { + ret = p_wctype(properties[i].name); + ok(properties[i].mask == ret, "%d - Expected %x, got %x\n", i, properties[i].mask, ret); + } +} + START_TEST(msvcr120) { if (!init()) return; @@ -896,4 +927,5 @@ START_TEST(msvcr120) test_fegetenv(); test__wcreate_locale(); test__Condition_variable(); + test_wctype(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 1226fa5..4cf772d 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -2149,7 +2149,7 @@ @ cdecl wctomb(ptr long) msvcr120.wctomb @ cdecl wctomb_s(ptr ptr long long) msvcr120.wctomb_s @ stub wctrans -@ stub wctype +@ cdecl wctype(str) msvcr120.wctype @ cdecl wmemcpy_s(ptr long ptr long) msvcr120.wmemcpy_s @ cdecl wmemmove_s(ptr long ptr long) msvcr120.wmemmove_s @ varargs wprintf(wstr) msvcr120.wprintf diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 8b9d14c..a88df58 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -452,3 +452,33 @@ int CDECL MSVCRT__tolower(int c) { return c + 0x20; /* sic */ } + +/********************************************************************* + * wctype (MSVCR120.@) + */ +unsigned short __cdecl wctype(const char *property) +{ + static const struct { + const char *name; + unsigned short mask; + } properties[] = { + { "alnum", MSVCRT__DIGIT|MSVCRT__ALPHA }, + { "alpha", MSVCRT__ALPHA }, + { "cntrl", MSVCRT__CONTROL }, + { "digit", MSVCRT__DIGIT }, + { "graph", MSVCRT__DIGIT|MSVCRT__PUNCT|MSVCRT__ALPHA }, + { "lower", MSVCRT__LOWER }, + { "print", MSVCRT__DIGIT|MSVCRT__PUNCT|MSVCRT__BLANK|MSVCRT__ALPHA }, + { "punct", MSVCRT__PUNCT }, + { "space", MSVCRT__SPACE }, + { "upper", MSVCRT__UPPER }, + { "xdigit", MSVCRT__HEX } + }; + unsigned int i; + + for(i=0; i<sizeof(properties)/sizeof(properties[0]); i++) + if(!strcmp(property, properties[i].name)) + return properties[i].mask; + + return 0; +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index a6b2043..ee95ee4 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2594,6 +2594,6 @@ @ cdecl wctomb(ptr long) MSVCRT_wctomb @ cdecl wctomb_s(ptr ptr long long) MSVCRT_wctomb_s @ stub wctrans -@ stub wctype +@ cdecl wctype(str) @ cdecl wmemcpy_s(ptr long ptr long) @ cdecl wmemmove_s(ptr long ptr long)

1 0

Nikolay Sivov : msvcr120: Added vsscanf() and vswscanf().
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 6cb9ade3bf816724dff2a8c2781d77642f7ba75b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cb9ade3bf816724dff2a8c2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Sep 23 20:16:45 2017 +0300 msvcr120: Added vsscanf() and vswscanf(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1b2554c2c3cf06cd89cf54014153d61c59feb816) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120/tests/msvcr120.c | 26 ++++++++++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcrt/scanf.c | 20 ++++++++++++++++++++ 4 files changed, 50 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 8bc3467..fc3e06c 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2436,10 +2436,10 @@ @ stub vscanf_s @ cdecl vsprintf(ptr str ptr) MSVCRT_vsprintf @ cdecl vsprintf_s(ptr long str ptr) MSVCRT_vsprintf_s -@ stub vsscanf +@ cdecl vsscanf(ptr str ptr) MSVCRT_vsscanf @ stub vsscanf_s @ cdecl vswprintf_s(ptr long wstr ptr) MSVCRT_vswprintf_s -@ stub vswscanf +@ cdecl vswscanf(ptr wstr ptr) MSVCRT_vswscanf @ stub vswscanf_s @ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf @ cdecl vwprintf_s(wstr ptr) MSVCRT_vwprintf_s diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index de0ccc4..7a6e696 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -183,6 +183,7 @@ static int (CDECL *p__clearfp)(void); static _locale_t (__cdecl *p_wcreate_locale)(int, const wchar_t *); static void (__cdecl *p_free_locale)(_locale_t); static unsigned short (__cdecl *p_wctype)(const char*); +static int (__cdecl *p_vsscanf)(const char*, const char *, __ms_va_list valist); /* make sure we use the correct errno */ #undef errno @@ -240,6 +241,7 @@ static BOOL init(void) SET(p_wctype, "wctype"); SET(p_fegetenv, "fegetenv"); SET(p__clearfp, "_clearfp"); + SET(p_vsscanf, "vsscanf"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_critical_section_ctor, "??0critical_section(a)Concurrency@@QEAA(a)XZ"); @@ -911,6 +913,29 @@ static void test_wctype(void) } } +static int __cdecl _vsscanf_wrapper(const char *buffer, const char *format, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, format); + ret = p_vsscanf(buffer, format, valist); + __ms_va_end(valist); + return ret; +} + +static void test_vsscanf(void) +{ + static const char *fmt = "%d"; + char buff[16]; + int ret, v; + + v = 0; + strcpy(buff, "10"); + ret = _vsscanf_wrapper(buff, fmt, &v); + ok(ret == 1, "Unexpected ret %d.\n", ret); + ok(v == 10, "got %d.\n", v); +} + START_TEST(msvcr120) { if (!init()) return; @@ -928,4 +953,5 @@ START_TEST(msvcr120) test__wcreate_locale(); test__Condition_variable(); test_wctype(); + test_vsscanf(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 4cf772d..fde270e 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -2098,10 +2098,10 @@ @ stub vscanf_s @ cdecl vsprintf(ptr str ptr) msvcr120.vsprintf @ cdecl vsprintf_s(ptr long str ptr) msvcr120.vsprintf_s -@ stub vsscanf +@ cdecl vsscanf(ptr str ptr) msvcr120.vsscanf @ stub vsscanf_s @ cdecl vswprintf_s(ptr long wstr ptr) msvcr120.vswprintf_s -@ stub vswscanf +@ cdecl vswscanf(ptr wstr ptr) msvcr120.vswscanf @ stub vswscanf_s @ cdecl vwprintf(wstr ptr) msvcr120.vwprintf @ cdecl vwprintf_s(wstr ptr) msvcr120.vwprintf_s diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index fd776a6..63ff8b1 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -795,3 +795,23 @@ int CDECL MSVCRT__snwscanf_s_l(MSVCRT_wchar_t *input, MSVCRT_size_t length, __ms_va_end(valist); return res; } + +/********************************************************************* + * vsscanf (MSVCRT120.@) + */ +int CDECL MSVCRT_vsscanf(const char *buffer, const char *format, __ms_va_list valist) +{ + if (!MSVCRT_CHECK_PMT(buffer != NULL && format != NULL)) return -1; + + return MSVCRT_vsscanf_l(buffer, format, NULL, valist); +} + +/********************************************************************* + * vswscanf (MSVCRT120.@) + */ +int CDECL MSVCRT_vswscanf(const MSVCRT_wchar_t *buffer, const MSVCRT_wchar_t *format, __ms_va_list valist) +{ + if (!MSVCRT_CHECK_PMT(buffer != NULL && format != NULL)) return -1; + + return MSVCRT_vswscanf_l(buffer, format, NULL, valist); +}

1 0