January 2018 - Wine-Commits

Austin English : readme: Clarify the wording a bit.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: 8af8cd9834850e7f614e03c6ede91d4b36690749 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8af8cd9834850e7f614e03c6… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Nov 1 13:24:51 2017 -0500 readme: Clarify the wording a bit. Pointed out by Jens Reyer. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 97dea5bd08af894463823fde64cbdf4619c5928c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- README | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README b/README index 4b76546..21dabed 100644 --- a/README +++ b/README @@ -19,11 +19,11 @@ run: ./configure make -Then either install wine: +Then either install Wine: make install -Or run it from the build directory: +Or run Wine directly from the build directory: ./wine notepad

1 0

Austin English : winegcc: Move WineHQ URLs to https.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

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

Austin English : loader: Move WineHQ URLs to https.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

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

Nikolay Sivov : readme: Update Russian translation.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: e5e481833a7cd23d4f0b227fb223ab58125f68ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5e481833a7cd23d4f0b227f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 1 18:08:18 2017 +0300 readme: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 37abc5cc893a2c2e15bf0f81186d73a4167a5fcc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- documentation/README.ru | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/documentation/README.ru b/documentation/README.ru index 4c327b3..5c068cc 100644 --- a/documentation/README.ru +++ b/documentation/README.ru @@ -71,17 +71,11 @@ Mac OS X: Вам также понадобятся flex версии 2.5.33 или более новой и bison. -Поддержка дополнительных библиотек: +Дополнительные библиотеки: Конфигурационный скрипт выведет список дополнительных библиотек, которые не были найдены в вашей системе. Ознакомьтесь с перечнем необходимых пакетов по адресу - http://wiki.winehq.org/Recommended_Packages. - - На 64-битных платформах вы должны убедиться, что у вас установлены 32-битные - версии этих библиотек при компилировании Wine в 32-битном режиме (является - режимом по умолчанию). За более подробной информацией обратитесь к - http://wiki.winehq.org/WineOn64bit. Если вам нужен чисто 64-битный - Wine (или смешанный 32/64-битный вариант), ознакомьтесь с - http://wiki.winehq.org/Wine64. + http://wiki.winehq.org/Recommended_Packages. При работе на 64-битных платформах + убедитесь, что у вас установлены 32-битные версии этих библиотек. 4. КОМПИЛЯЦИЯ

1 0

Austin English : readme: Move WineHQ URLs to https.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

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

Alexandre Julliard : configure: Replace AC_HEADER_MAJOR macro to handle glibc 2.25 sys/types.h breakage.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

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

Piotr Caban : vbscript: Don't leak IEnumVARIANT in interp_enumnext.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: 70210762960789c38618e1aea90eaf5438ce58fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=70210762960789c38618e1ae… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 8 18:11:56 2017 +0100 vbscript: Don't leak IEnumVARIANT in interp_enumnext. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f595523413240b34862438565bd43fcf1d1aec92) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/interp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 02180d9..74d54c1 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1192,7 +1192,7 @@ static HRESULT interp_enumnext(exec_ctx_t *ctx) if(do_continue) { ctx->instr++; }else { - stack_pop(ctx); + stack_popn(ctx, 1); instr_jmp(ctx, loop_end); } return S_OK;

1 0

Li Keqing : wined3d: Add Intel HD Graphics 5000 to the GPU list.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: 006897e965276308c9711169f3ab15f8892c4f1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=006897e965276308c9711169… Author: Li Keqing <auroracloud4096(a)gmail.com> Date: Wed Dec 6 01:40:26 2017 +0800 wined3d: Add Intel HD Graphics 5000 to the GPU list. Signed-off-by: Li Keqing <auroracloud4096(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2d5f962f986f49cb5c3ac5d3c1cc0a8d634eb648) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2dff531..abd98de 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1425,6 +1425,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_IVBS, "Intel(R) HD Graphics Family", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_HWD, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_HWM, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_HD5000, "Intel(R) HD Graphics 5000", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_I5100_1, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_I5100_2, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_I5100_3, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536}, @@ -2088,6 +2089,7 @@ cards_intel[] = /* Haswell */ {"Iris Pro 5200", CARD_INTEL_IP5200_1}, {"Iris 5100", CARD_INTEL_I5100_1}, + {"HD Graphics 5000", CARD_INTEL_HD5000}, /* MacOS */ {"Haswell Mobile", CARD_INTEL_HWM}, {"Iris OpenGL Engine", CARD_INTEL_HWM}, /* MacOS */ /* Ivybridge */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6a01715..df2d0a8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2073,6 +2073,7 @@ enum wined3d_pci_device CARD_INTEL_IVBS = 0x015a, CARD_INTEL_HWD = 0x0412, CARD_INTEL_HWM = 0x0416, + CARD_INTEL_HD5000 = 0x0a26, CARD_INTEL_I5100_1 = 0x0a22, CARD_INTEL_I5100_2 = 0x0a2a, CARD_INTEL_I5100_3 = 0x0a2b,

1 0

Lauri Kenttä : readme: Update Finnish translation.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: 11f816f70261334bf0ec044a2f3a71c105423587 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11f816f70261334bf0ec044a… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sun Oct 29 12:48:22 2017 +0200 readme: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 40156f3d0b5c76c6404193cec5b27f55edf6198e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- documentation/README.fi | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/documentation/README.fi b/documentation/README.fi index 5038c6e..ae167ee 100644 --- a/documentation/README.fi +++ b/documentation/README.fi @@ -18,6 +18,14 @@ Aja Winen lähdekoodin juurihakemistossa seuraavat komennot: ./configure make +Sitten joko asenna Wine: + +make install + +Tai aja se käännöshakemistosta: + +./wine notepad + Ohjelmat ajetaan komennolla "wine ohjelma". Lisätietoja sekä apua ongelmien ratkaisemiseen on jäljempänä tässä tiedostossa, Winen man-sivuilla sekä ennen kaikkea Internetissä osoitteessa http://www.winehq.org/.

1 0

Akihiro Sagawa : readme: Update Japanese translation.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: 4b2e3c24c2cb06fab706e71af04e8b0dc25ae719 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b2e3c24c2cb06fab706e71a… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Oct 1 21:23:11 2017 +0900 readme: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a71888cd43f71469eeeb65afef883eaf8955223c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- documentation/README.ja | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/documentation/README.ja b/documentation/README.ja index eec6f71..ae21f73 100644 --- a/documentation/README.ja +++ b/documentation/README.ja @@ -13,12 +13,11 @@ Wineはフリーソフトウェアで、GNU LGPLのもとでリリースされ 2. クイックスタート -ソースからコンパイルするときにはいつでも、Wineをビルドしインストールするのに -Wine Installerを使うことが推奨されます。（このファイル[訳注: README.jaではなく -READMEというファイル]を含む）Wineソースのトップレベルディレクトリから、 -以下を実行してください: +Wineソースのトップレベルディレクトリ（このファイル[訳注:README.jaではなく +READMEというファイル]を含むディレクトリ）から、以下を実行してください: -./tools/wineinstall +./configure +make "wine program"のようにプログラムを実行してください。更なる情報や問題解決については、このファイルの残りの部分、Wineのmanページや、 @@ -78,18 +77,14 @@ Mac OS X情報: オプションのサポートライブラリ: configureはオプションのライブラリがシステム上に見つからなかったときに通知を表示します。インストールすべきパッケージについてのヒントについては - http://wiki.winehq.org/Recommended_Packagesを参照してください。 + http://wiki.winehq.org/Recommended_Packagesを参照してください。64ビットプ + ラットフォームでは、これらライブラリの32ビットバージョンをインストールした + ことをよく確認してください。 - 64ビットプラットフォームでは、Wineを32ビットでコンパイルした場合（デフォル - ト）、これらライブラリの32ビットバージョンをインストールしたことをよく確認 - してください。詳細はhttp://wiki.winehq.org/WineOn64bitを参照してください。 - 真の64ビットWine（または32ビットと64ビットが混在したWine配置）を必要とする - 場合は、詳細についてhttp://wiki.winehq.org/Wine64を参照してください。 4. コンパイル -wineinstallを使わないことを選択した場合、Wineをビルドするには以下のコマンドを -実行してください: +Wineをビルドするには以下のコマンドを実行してください: ./configure make @@ -101,6 +96,9 @@ make コンパイル設定オプションを見るには、./configure --helpを行なってください。 +更なる情報はhttps://wiki.winehq.org/Building_Wineを参照してください。 + + 5. 設定いったんWineが正しくビルドされると、"make install"を行なえます。

1 0