April 2017 - Wine-Commits - list.winehq.org

Francois Gouget : readme: Note that Wine may also use Mac APIs.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 595ec50f5e696fb3db96b04d4939da4ac669f312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=595ec50f5e696fb3db96b04d4… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 24 03:42:27 2017 +0100 readme: Note that Wine may also use Mac APIs. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit aa2a90c4189c250ef168da033ca20cb7167aba5c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index b1ca54f..5cd2151 100644 --- a/README +++ b/README @@ -4,7 +4,7 @@ Wine is a program which allows running Microsoft Windows programs (including DOS, Windows 3.x, Win32, and Win64 executables) on Unix. It consists of a program loader which loads and executes a Microsoft Windows binary, and a library (called Winelib) that implements Windows -API calls using their Unix or X11 equivalents. The library may also +API calls using their Unix, X11 or Mac equivalents. The library may also be used for porting Windows code into native Unix executables. Wine is free software, released under the GNU LGPL; see the file

1 0

Tag wine-2.0.1 : Alexandre Julliard : Release 2.0.1
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: refs/tags/wine-2.0.1 Tag: 7be0d76a0b5631249caf6b65c468d3707bbd8cdb URL: http://source.winehq.org/git/wine.git/?a=tag;h=7be0d76a0b5631249caf6b65c468… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 20 19:32:33 2017 +0200 Release 2.0.1

1 0

Michael Stefaniuc : Release 2.0.1
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 476376e16873ba711be5525a28ad0c2f67bed43c URL: http://source.winehq.org/git/wine.git/?a=commit;h=476376e16873ba711be5525a2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Mar 27 23:56:06 2017 +0200 Release 2.0.1 Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 527 ++++++++++++++++++++++++-------------------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +-- 4 files changed, 221 insertions(+), 330 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=476376e16873ba711be55…

1 0

Can Taşan : wine.desktop: Add Turkish translation.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 484117da657d9db4fb8698f2d6de122c2a81b361 URL: http://source.winehq.org/git/wine.git/?a=commit;h=484117da657d9db4fb8698f2d… Author: Can Taşan <betax34(a)hotmail.com> Date: Fri Mar 24 21:14:20 2017 +0100 wine.desktop: Add Turkish translation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5c2d6211f6590d3856dc9188593b3d3597c8b441) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.desktop b/loader/wine.desktop index 04f7da8..36dd921 100644 --- a/loader/wine.desktop +++ b/loader/wine.desktop @@ -21,6 +21,7 @@ Name[nb]=Wine - for kjøring av Windows-programmer Name[nn]=Wine - for køyring av Windows-program Name[sr]=Wine - дизач Windows програма Name[sr(a)latin]=Wine - dizač Windows programa +Name[tr]=Wine - Windows programı yükleyicisi Name[hr]=Wine - dizač Windows programa Name[he]=Wine — מריץ תכניות Windows Name[ja]=Wine Windowsプログラムローダー

1 0

Francois Gouget : readme: Update and rewrap the French translation.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 211e2584d412c13ebb3a4389a9d66a4cdc698c56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=211e2584d412c13ebb3a4389a… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 24 03:43:37 2017 +0100 readme: Update and rewrap the French translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2c392176096ba9401093e362eaa20b0f288e6d5f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- documentation/README.fr | 165 +++++++++++++++++++++++++----------------------- 1 file changed, 87 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=211e2584d412c13ebb3a4…

1 0

Nikolay Sivov : readme: Update Russian translation.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 81540196bf1bcd2d2f26a85c2b14fa96feed7cc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81540196bf1bcd2d2f26a85c2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 24 09:08:25 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 159d3642e147694c3596d96a0646249e2146a2c6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- documentation/README.ru | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/documentation/README.ru b/documentation/README.ru index c228fc6..616737e 100644 --- a/documentation/README.ru +++ b/documentation/README.ru @@ -13,11 +13,10 @@ GNU LGPL, файл LICENSE содержит информацию по лицен 2. БЫСТРЫЙ СТАРТ -Каждый раз, когда вы компилируете исходный код, рекомендуется использовать -Wine Installer для компоновки и установки Wine. В каталоге, содержащем -исходный код Wine (в нём находится этот файл), введите: +В каталоге, содержащем исходный код Wine, выполните: -./tools/wineinstall +./configure +make Запустите программу с помощью команды «wine имя_программы». Источники дополнительной информации перечислены в конце этого файла. Ознакомьтесь с @@ -47,7 +46,7 @@ Solaris: Лучше всего компоновать Wine инструментами GNU (gcc, gas, и т.д.). Внимание: установка gas *НЕ* гарантирует что gcc будет его использовать. Необходимо перекомпилировать gcc после - установки gas или создать ссылку на cc, как и на ld в инструментах gnu. (?) + установки gas или создать ссылку на cc, как и на ld в инструментах gnu. NetBSD: Убедитесь что, параметры USER_LDT, SYSVSHM, SYSVSEM и SYSVMSG @@ -70,7 +69,7 @@ Mac OS X: Разумеется, вам необходим «make» (лучше всего использовать GNU make). - Вам также понадобятся flex (версии 2.5 или старше) и bison. + Вам также понадобятся flex версии 2.5.33 или более новой и bison. Поддержка дополнительных библиотек: Конфигурационный скрипт выведет список дополнительных библиотек, которые не были @@ -86,30 +85,20 @@ Mac OS X: 4. КОМПИЛЯЦИЯ -Если вы не хотите использовать wineinstall, введите следующие команды -для компоновки Wine: +Для компиляции, выполните: ./configure -make depend make -Это скомпонует программу «wine», библиотеки и бинарные файлы, +В результате вы получите программу «wine», библиотеки и бинарные файлы, необходимые для работы Wine. -Программа «wine» будет загружать и выполнять программы Windows. +Программа «wine» нужна для загрузки и выполнения программ Windows. Библиотека «libwine» («Winelib») может быть использована для компилирования и компоновки исходного кода Windows под Unix. Для вывода конфигурационных настроек введите ./configure --help. -Для обновления до нового релиза используя патч, сначала перейдите в -корневой каталог релиза (он содержит README файл). -Затем введите «make clean» и пропачьте релиз: - - bunzip2 -c patch-file | patch -p1 - -где «patch-file» - имя файла с патчем (что-то вроде -wine-1.0.x.diff.bz2). Затем введите «./configure», и после этого -«make depend && make». +За дополнительной информацией обратитесь к https://wiki.winehq.org/Building_Wine 5. УСТАНОВКА @@ -169,8 +158,9 @@ IRC: Онлайн помощь доступна на канале #WineHQ на Git: Текущие разработки Wine доступны через Git. Смотрите http://www.winehq.org/site/git для дополнительной информации. -Если вы что-то добавили или исправили ошибку, пришлите патч (в формате 'diff -u') -на wine-patches(a)winehq.org для его включения в следующий релиз. +Если вы что-то добавили или исправили ошибку, пожалуйста отправьте патч +(предпочтительно сгенерированный с помощью git-format-patch) на wine-patches(a)winehq.org +для его включения в следующий релиз. -- Alexandre Julliard

1 0

Gerald Pfeifer : winedump: Increase buffer size and potential string length inoutput_spec_symbol.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 2ad97820b77ff25cb4967a8ece93176865de5335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ad97820b77ff25cb4967a8ec… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jan 21 17:26:42 2017 +0100 winedump: Increase buffer size and potential string length inoutput_spec_symbol. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3d258b0fd7df2744c35a9b7ee5d8653fb6653aa2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/winedump/output.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winedump/output.c b/tools/winedump/output.c index 6c2bfae..bbbb1ac 100644 --- a/tools/winedump/output.c +++ b/tools/winedump/output.c @@ -62,13 +62,13 @@ void output_spec_preamble (void) */ void output_spec_symbol (const parsed_symbol *sym) { - char ord_spec[16]; + char ord_spec[20]; assert (specfile); assert (sym && sym->symbol); if (sym->ordinal >= 0) - snprintf(ord_spec, 8, "%d", sym->ordinal); + snprintf(ord_spec, 12, "%d", sym->ordinal); else { ord_spec[0] = '@';

1 0

Francois Gouget : readme: Adjust a couple of section separators.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 20b6d64276134bac4dad5ce3e44c730334778f80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20b6d64276134bac4dad5ce3e… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 24 03:42:38 2017 +0100 readme: Adjust a couple of section separators. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a924b9e1f74cc84b1fc12201b9999ab5044dad0a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- README | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README b/README index 5cd2151..5423e7b 100644 --- a/README +++ b/README @@ -82,6 +82,7 @@ Optional support libraries: 64-bit Wine (or a mixed 32-bit and 64-bit Wine setup), see http://wiki.winehq.org/Wine64 for details. + 4. COMPILATION To build Wine, do: @@ -98,6 +99,7 @@ To see compile configuration options, do ./configure --help. For more information, see https://wiki.winehq.org/Building_Wine + 5. SETUP Once Wine has been built correctly, you can do "make install"; this

1 0

Alexandre Julliard : make_announce: Update version number parsing for the new versioning scheme.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 4cd22c2cba1118a9b9fbd84d855e02be0e5342e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cd22c2cba1118a9b9fbd84d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 31 14:56:07 2017 +0100 make_announce: Update version number parsing for the new versioning scheme. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9629bb6ad2136593ac6c5026a57614640be41453) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/make_announce | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/tools/make_announce b/tools/make_announce index c65f900..83d869a 100755 --- a/tools/make_announce +++ b/tools/make_announce @@ -109,7 +109,7 @@ my $old = get_current_version(); my $new = $ARGV[0]; unless ($new) { - if ($old =~ /^([0-9]+)\.([0-9]+)$/) { $new = "$1.$2.1"; } + if ($old =~ /^([0-9]+)\.([0-9]+)$/) { $new = "$1." . ($2 + 1); } elsif ($old =~ /^([0-9]+)\.([0-9]+)\.([0-9]+)$/) { $new = "$1.$2." . ($3 + 1); } elsif ($old =~ /^([0-9]+)\.([0-9]+)-rc([0-9]+)$/) { $new = "$1.$2-rc" . ($3 + 1); } else { die "unknown version format $old"; } @@ -117,8 +117,12 @@ unless ($new) print "Updating files for release $new\n"; -(my $reldir = $new) =~ s/^([0-9]+\.[0-9]+).*/$1/; -my $is_stable = ($new =~ /^([0-9]+)\.([0-9]+)\.([0-9]+)$/) && !($2 % 2); # stable releases have an even minor number +my $reldir = $new; +if ($reldir =~ /^([0-9]+\.0)/) { $reldir = $1; } +elsif ($reldir =~ /^([0-9]+)\./) { $reldir = "$1.x"; } +else { die "unknown version format $reldir"; } + +my $is_stable = ($new =~ /^([0-9]+)\.0\.([0-9]+)$/); # stable releases have a 0 minor number my $filter = "product=Wine&resolution=FIXED&" . ($is_stable ? "target_milestone=$reldir.x" : "bug_status=RESOLVED"); my %bugs = get_bugs( $filter ); @@ -128,11 +132,16 @@ my %authors = get_authors(); open ANNOUNCE, "<ANNOUNCE" or die "cannot open ANNOUNCE"; open NEW, ">ANNOUNCE.new" or die "cannot create ANNOUNCE.new"; + +# replace version number in first line +$_ = <ANNOUNCE>; +s/(([0-9]+)\.)+[0-9]+(-rc[0-9]+)?/$new/; +print NEW $_; + while (<ANNOUNCE>) { last if /^------------------/; - s!http://mirrors.ibiblio.org/wine/source/.*!http://mirrors.ibiblio.org/wine…!; - s!http://dl.winehq.org/wine/source/.*!http://dl.winehq.org/wine/source/$rel…!; + s!(https?://.*/wine/source/).*\.tar!$1$reldir/wine-$new.tar!; print NEW $_; }

1 0

Bruno Jesus : wined3d: Recognize GeForce 940M.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 60c228d79960478b1ed72a44e3d7374efa21f9c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60c228d79960478b1ed72a44e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Mar 13 11:09:28 2017 -0300 wined3d: Recognize GeForce 940M. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 992dcc4db520e83750a06e72588303b46840ab1e) 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 f0f1bfb..7954248 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1320,6 +1320,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX870M, "NVIDIA GeForce GTX 870M", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX880M, "NVIDIA GeForce GTX 880M", DRIVER_NVIDIA_GEFORCE8, 4096}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_940M, "NVIDIA GeForce 940M", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX960, "NVIDIA GeForce GTX 960", DRIVER_NVIDIA_GEFORCE8, 4096}, @@ -1828,6 +1829,7 @@ cards_nvidia_binary[] = {"GTX 960", CARD_NVIDIA_GEFORCE_GTX960}, /* GeForce 900 - midend high */ {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ + {"GeForce 940M", CARD_NVIDIA_GEFORCE_940M}, /* GeForce 900 - midend mobile */ {"GTX 880M", CARD_NVIDIA_GEFORCE_GTX880M}, /* GeForce 800 - mobile */ {"GTX 870M", CARD_NVIDIA_GEFORCE_GTX870M}, /* GeForce 800 - mobile */ {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 983d9f1..2fb410b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2019,6 +2019,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ CARD_NVIDIA_GEFORCE_GTX870M = 0x1199, CARD_NVIDIA_GEFORCE_GTX880M = 0x1198, + CARD_NVIDIA_GEFORCE_940M = 0x1347, CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a, CARD_NVIDIA_GEFORCE_GTX960 = 0x1401,

1 0