January 2019 - Wine-Commits

Francois Gouget : testbot/web: Mission descriptions depend on Step type.
by Alexandre Julliard Jan. 7, 2019

Jan. 7, 2019

Module: tools Branch: master Commit: 8adca346b0cbc90bb11539f0d46a53858b300183 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8adca346b0cbc90bb11539f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 7 12:04:06 2019 +0100 testbot/web: Mission descriptions depend on Step type. The VM type does not indicate if the Step will update and rebuild Wine or run WineTest. Using the Step type instead is more accurate. Using the Step type also simplifies GetTaskMissionDescription() a bit. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Missions.pm | 38 ++++++++++++++++++------------------- testbot/web/JobDetails.pl | 2 +- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/testbot/lib/WineTestBot/Missions.pm b/testbot/lib/WineTestBot/Missions.pm index 93cd787..65d8d82 100644 --- a/testbot/lib/WineTestBot/Missions.pm +++ b/testbot/lib/WineTestBot/Missions.pm @@ -104,7 +104,7 @@ sub GetMissionBaseName($) sub GetTaskMissionDescription($$) { - my ($TaskMission, $VMType) = @_; + my ($TaskMission, $StepType) = @_; my $Builds = $TaskMission->{Builds}; my $Description = @@ -117,29 +117,27 @@ sub GetTaskMissionDescription($$) $Builds->{wow32} ? "32 bit WoW" : "64 bit WoW"; - if ($Builds->{exe32} or $Builds->{exe64}) + my $Lang; + foreach my $Mission (@{$TaskMission->{Missions}}) { - $Description .= ($VMType eq "build") ? " build" : " executable"; - } - else - { - my $Lang; - foreach my $Mission (@{$TaskMission->{Missions}}) + if (!defined $Lang) { - if (!defined $Lang) - { - $Lang = $Mission->{lang} || ""; - } - elsif ($Lang ne ($Mission->{lang} || "")) - { - $Description .= " + Locales"; - $Lang = undef; - last; - } + $Lang = $Mission->{lang} || ""; + } + elsif ($Lang ne ($Mission->{lang} || "")) + { + $Description .= " + Locales"; + $Lang = undef; + last; } - $Description .= " ". LocaleName($Lang) if ($Lang); - $Description .= " tests"; } + $Description .= " ". LocaleName($Lang) if ($Lang); + + $Description .= + ($StepType eq "reconfig") ? " update" : + ($StepType eq "build") ? " build" : + ($StepType eq "suite") ? " WineTest" : + " tests"; return $Description; } diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 3e4f94d..8d87880 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -607,7 +607,7 @@ sub GenerateDataCell($$$$$) } else { - $Args .= "". $self->escapeHTML(GetTaskMissionDescription($Missions->[0], $StepTask->VM->Type)) .""; + $Args .= "". $self->escapeHTML(GetTaskMissionDescription($Missions->[0], $StepTask->Type)) .""; } } print "<td>$Args</td>\n";

1 0

Francois Gouget : testbot: Tweak the mission descriptions for WoW tests.
by Alexandre Julliard Jan. 7, 2019

Jan. 7, 2019

Module: tools Branch: master Commit: 2d9b03726782e7a490a66f371b82da17b97a3edc URL: https://source.winehq.org/git/tools.git/?a=commit;h=2d9b03726782e7a490a66f3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 7 12:03:59 2019 +0100 testbot: Tweak the mission descriptions for WoW tests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Missions.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/Missions.pm b/testbot/lib/WineTestBot/Missions.pm index 2662340..93cd787 100644 --- a/testbot/lib/WineTestBot/Missions.pm +++ b/testbot/lib/WineTestBot/Missions.pm @@ -111,6 +111,7 @@ sub GetTaskMissionDescription($$) ($Builds->{exe32} and $Builds->{exe64}) ? "32 & 64 bit" : $Builds->{exe32} ? "32 bit" : $Builds->{exe64} ? "64 bit" : + ($Builds->{wow64} and $Builds->{wow32} and !$Builds->{win32}) ? "32 & 64 bit WoW" : ($Builds->{wow64} and ($Builds->{win32} or $Builds->{wow32})) ? "32 & 64 bit" : $Builds->{win32} ? "32 bit" : $Builds->{wow32} ? "32 bit WoW" :

1 0

Francois Gouget : testbot/WineRunReconfig: Also retrieve the wine-parentsrc.txt file.
by Alexandre Julliard Jan. 7, 2019

Jan. 7, 2019

Module: tools Branch: master Commit: 5fc9ff7477b3eb3c2b14e35e79160ec21da4985d URL: https://source.winehq.org/git/tools.git/?a=commit;h=5fc9ff7477b3eb3c2b14e35… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 7 12:03:21 2019 +0100 testbot/WineRunReconfig: Also retrieve the wine-parentsrc.txt file. It is needed to properly handle patches to modules with the PARENTSRC setting. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 11f92c8..d7e72bf 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -433,14 +433,17 @@ if ($NewStatus eq "completed") } } - Debug(Elapsed($Start), " Retrieving the list of Wine files '$TaskDir/winefiles.txt'\n"); - if ($TA->GetFile("latest/winefiles.txt", "$TaskDir/winefiles.txt")) + foreach my $FileName ("winefiles.txt", "wine-parentsrc.txt") { - copy "$TaskDir/winefiles.txt", "$DataDir/latest/winefiles.txt"; - } - elsif (!defined $TAError) - { - $TAError = "An error occurred while retrieving the list of Wine files: ". $TA->GetLastError(); + Debug(Elapsed($Start), " Retrieving '$TaskDir/$FileName'\n"); + if ($TA->GetFile("latest/$FileName", "$TaskDir/$FileName")) + { + copy "$TaskDir/$FileName", "$DataDir/latest/$FileName"; + } + elsif (!defined $TAError) + { + $TAError = "An error occurred while retrieving '$TaskDir/$FileName': ". $TA->GetLastError(); + } } }

1 0

Alexandre Julliard : Wine release 4.0-rc5
by Alexandre Julliard Jan. 4, 2019

Jan. 4, 2019

Module: website Branch: master Commit: ecd345af5dc93b37ad0696cfd56ebd8f348ce764 URL: https://source.winehq.org/git/website.git/?a=commit;h=ecd345af5dc93b37ad069… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 4 19:03:06 2019 +0100 Wine release 4.0-rc5 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019010401.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2019010401.xml b/news/en/2019010401.xml new file mode 100644 index 0000000..3fa789c --- /dev/null +++ b/news/en/2019010401.xml @@ -0,0 +1,12 @@ +<news> +<date>January 4, 2019</date> +<title>Wine 4.0-rc5 Released</title> +<body> + The Wine development release 4.0-rc5 is now available. + <a href="{$root}/announce/4.0-rc5">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.0/wine-4.0-rc5.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Isira Seneviratne : po: Update Sinhala translation.
by Alexandre Julliard Jan. 4, 2019

Jan. 4, 2019

Module: wine Branch: master Commit: 97563ed65af8cd995c7a94c9de0e7bac8a9c6246 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97563ed65af8cd995c7a94c9… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Fri Jan 4 14:08:38 2019 +0530 po: Update Sinhala translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/si.po | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/po/si.po b/po/si.po index 60feedc..0707fb8 100644 --- a/po/si.po +++ b/po/si.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-12-27 10:39+0530\n" +"PO-Revision-Date: 2018-12-31 04:27+0530\n" "Last-Translator: Isira Seneviratne <isirasen96(a)gmail.com>\n" "Language-Team: Sinhala\n" "Language: si\n" @@ -199,11 +199,11 @@ msgstr "පිටපත" #: appwiz.rc:41 msgid "Installation programs" -msgstr "" +msgstr "ස්ථාපන මෘදුකාංග" #: appwiz.rc:42 msgid "Programs (*.exe)" -msgstr "" +msgstr "මෘදුකාංග (*.exe)" #: appwiz.rc:43 avifil32.rc:33 cryptui.rc:83 shell32.rc:199 notepad.rc:76 #: oleview.rc:103 progman.rc:82 regedit.rc:225 winedbg.rc:43 winhlp32.rc:90 @@ -701,7 +701,7 @@ msgstr "නම (&N):" #: comdlg32.rc:368 comdlg32.rc:406 msgid "Status:" -msgstr "" +msgstr "තත්ත්වය:" #: comdlg32.rc:370 comdlg32.rc:408 msgid "Type:" @@ -717,11 +717,11 @@ msgstr "" #: comdlg32.rc:377 msgid "Copies" -msgstr "" +msgstr "පිටපත්" #: comdlg32.rc:378 msgid "Number of &copies:" -msgstr "" +msgstr "පිටපත් නොම්බරය:" #: comdlg32.rc:380 msgid "C&ollate" @@ -15493,12 +15493,12 @@ msgstr "" #: wordpad.rc:284 msgctxt "accelerator Align Left" msgid "L" -msgstr "" +msgstr "L" #: wordpad.rc:285 msgctxt "accelerator Align Center" msgid "E" -msgstr "" +msgstr "E" #: wordpad.rc:286 msgctxt "accelerator Align Right" @@ -15508,22 +15508,22 @@ msgstr "R" #: wordpad.rc:293 msgctxt "accelerator Redo" msgid "Y" -msgstr "" +msgstr "Y" #: wordpad.rc:294 msgctxt "accelerator Bold" msgid "B" -msgstr "" +msgstr "B" #: wordpad.rc:295 msgctxt "accelerator Italic" msgid "I" -msgstr "" +msgstr "I" #: wordpad.rc:296 msgctxt "accelerator Underline" msgid "U" -msgstr "" +msgstr "U" #: wordpad.rc:147 msgid "All documents (*.*)" @@ -15531,11 +15531,11 @@ msgstr "" #: wordpad.rc:148 msgid "Text documents (*.txt)" -msgstr "" +msgstr "පෙළ ලියවිලි (*.txt)" #: wordpad.rc:149 msgid "Unicode text document (*.txt)" -msgstr "" +msgstr "Unicode පෙළ ලියවිල්ලක් (*.txt)" #: wordpad.rc:150 msgid "Rich text format (*.rtf)" @@ -15547,7 +15547,7 @@ msgstr "" #: wordpad.rc:152 msgid "Text document" -msgstr "" +msgstr "පෙළ ලියවිල්ලක්" #: wordpad.rc:153 msgid "Unicode text document"

1 0

Andrey Gusev : comctl32/tests: Remove redundant assignment.
by Alexandre Julliard Jan. 4, 2019

Jan. 4, 2019

Module: wine Branch: master Commit: 535ef08b6721797bbaba3d201da694237d3dac33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=535ef08b6721797bbaba3d20… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jan 4 16:57:29 2019 +0200 comctl32/tests: Remove redundant assignment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 3bb7902..86d0fab 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -918,7 +918,6 @@ static void check_ilhead_data(const ILHEAD *ilh, INT cx, INT cy, INT cur, INT ma } else { - grow = (WORD)(grow + 3) & ~3; ok(ilh->cMaxImage == max, "wrong cMaxImage %d (expected %d)\n", ilh->cMaxImage, max); ok(ilh->cGrow == grow_aligned, "Unexpected cGrow %d, expected %d\n", ilh->cGrow, grow_aligned); }

1 0

Huw Davies : shell32/tests: Move the cursor away from the dropdown listbox.
by Alexandre Julliard Jan. 4, 2019

Jan. 4, 2019

Module: wine Branch: master Commit: 9d42c40aa315eaff1ee63c53b2217d86e7e82577 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d42c40aa315eaff1ee63c53… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jan 4 11:03:44 2019 +0000 shell32/tests: Move the cursor away from the dropdown listbox. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46275 Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/autocomplete.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index 0da164b..4f81214 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -799,6 +799,8 @@ START_TEST(autocomplete) HRESULT r; MSG msg; IAutoComplete* ac; + RECT win_rect; + POINT orig_pos; r = CoInitialize(NULL); ok(r == S_OK, "CoInitialize failed (0x%08x). Tests aborted.\n", r); @@ -809,6 +811,11 @@ START_TEST(autocomplete) ok(hMainWnd != NULL, "Failed to create parent window. Tests aborted.\n"); if (!hMainWnd) return; + /* Move the cursor away from the dropdown listbox */ + GetWindowRect(hMainWnd, &win_rect); + GetCursorPos(&orig_pos); + SetCursorPos(win_rect.left, win_rect.top); + test_invalid_init(); ac = test_init(); if (!ac) @@ -826,6 +833,7 @@ START_TEST(autocomplete) IAutoComplete_Release(ac); cleanup: + SetCursorPos(orig_pos.x, orig_pos.y); DestroyWindow(hEdit); DestroyWindow(hMainWnd);

1 0

Tag wine-4.0-rc5 : Alexandre Julliard : Release 4.0-rc5
by Alexandre Julliard Jan. 4, 2019

Jan. 4, 2019

Module: wine Branch: refs/tags/wine-4.0-rc5 Tag: 3aa88b10398dfecef12fa19604805ccea77dcf6e URL: https://source.winehq.org/git/wine.git/?a=tag;h=3aa88b10398dfecef12fa196048… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 4 19:01:08 2019 +0100 Release 4.0-rc5

1 0

Alexandre Julliard : Release 4.0-rc5.
by Alexandre Julliard Jan. 4, 2019

Jan. 4, 2019

Module: wine Branch: master Commit: 54e4d51fdbda08333012040c0683394853a097e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54e4d51fdbda08333012040c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 4 19:01:08 2019 +0100 Release 4.0-rc5. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 93 +++++++++++++++++++++++++++++++-------------------------------- VERSION | 2 +- configure | 18 ++++++------- 3 files changed, 55 insertions(+), 58 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index f07e6f6..f091b6f 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,12 +1,12 @@ -The Wine development release 4.0-rc4 is now available. +The Wine development release 4.0-rc5 is now available. What's new in this release (see below for details): - Bug fixes only, we are in code freeze. The source is available from the following locations: - https://dl.winehq.org/wine/source/4.0/wine-4.0-rc4.tar.xz - http://mirrors.ibiblio.org/wine/source/4.0/wine-4.0-rc4.tar.xz + https://dl.winehq.org/wine/source/4.0/wine-4.0-rc5.tar.xz + http://mirrors.ibiblio.org/wine/source/4.0/wine-4.0-rc5.tar.xz Binary packages for various distributions will be available from: @@ -22,65 +22,62 @@ AUTHORS in the distribution for the complete list. ---------------------------------------------------------------- -Bugs fixed in 4.0-rc4 (total 10): - - 35603 Wine64 build produces extra warning in setupapi comparing to Wine32 build - 40884 Lord of the Rings Online crashes instantly or hangs on start with OSSv4. - 42719 Natsuiro Asagao Residence (demo): complains about timezone settings. - 45805 IoCreateDriver failed to insert driver L"\\Driver\\WineHID" in tree - 46194 Windows PowerShell Core 6.2 Preview 2 for ARM64 crashes due to decoding of instruction from incorrect PC (write watch access causes SIGSEGV) - 46244 incorrect font rendering in WinOmega splash screen - 46296 Wine 4.0-rc1 does not compile with fontconfig 2.6.0 or 2.8.0 - 46329 world of tanks hangs in hangar with winsock error - 46362 Natsuiro Asagao Residence (demo) fails to start - 46364 Gecko and Mono packages doesn't save in the target folder +Bugs fixed in 4.0-rc5 (total 14): + + 32218 LTSpice: Objects not resized when the window is resized + 32221 LTspice: component drawing issues when moving + 33719 comctl32:propsheet custom window proc test failure + 34334 MetaTester 5 never sends or receives data + 38721 Resident Evil 5 Gold Edition (Steam) fails to run + 39959 Growtopia v2.20->v2.14 fails (was v2.11 fails) to run with unhandled exception on x86-64 (2.09 & 2.13 did run ok) + 44485 Delphi 7 debugger generates new exceptions by itself + 45719 comctl32:treeview test_right_click depends on mouse pointer position + 45917 battle.net launcher and mouse position on high DPI monitor + 45984 Skyrim Special Edition does not get past loading screen on high core count or high memory systems + 46266 tzres is constantly being loaded/unloaded when TimeZone information is queried. + 46328 Installer for Tanglet 1.5.3 crashes at target directory selection + 46352 TreePad X Enterprise 12GB (single user) v7.17.0: Generates Error on Startup + 46353 TreePad X Enterprise 12GB (single user) v7.17.0: Horizontal Ruler/Scale Is Different on Startup and Margins Are Different on Open Database ---------------------------------------------------------------- -Changes since 4.0-rc3: +Changes since 4.0-rc4: -Alexander Coffin (1): - cmd/tests: Add some tests for "choice". +Alexandre Julliard (3): + user32: Also ignore dynamic DPI awareness changes when DPI scaling is disabled. + ntdll: Also store FPU registers in RtlRaiseException(). + msi: Return an error code instead of a button id in msi_change_media(). -Alexandre Julliard (4): - include: Add more language codes. - wrc: Support more languages. - wmc: Support more languages. - user32: Clear %edi register when calling window procedure. +Andrey Gusev (1): + comctl32/tests: Remove redundant assignment. -André Hentschel (2): - shlwapi: Remove dead code (coverity). - ntdll: Use correct PC for instruction decoding on ARM64. +Daniel Ansorregui (1): + d3d9/tests: Fix a typo in an undef. -Dmitry Timoshkov (1): - kernel32: CreateDirectory shouldn't return ERROR_ACCESS_DENIED for the root of the drive. +Denil Verghese (1): + po: Update Malayalam translation. -Isira Seneviratne (2): - po: Add Sinhala translation. - po: Update Sinhala translation. +Henri Verbeet (1): + wined3d: Recognise virgl. -Józef Kucia (3): - d3d9: Fix Reset() with system memory buffers. - d3d8: Fix Reset() with system memory buffers. - wined3d: Handle unmappable buffers in wined3d_device_process_vertices() gracefully. +Huw D. M. Davies (2): + comctl32/tests: Move the cursor over the treeview to avoid random mouse move messages. + shell32/tests: Move the cursor away from the dropdown listbox. -Mingcong Bai (1): - po: Update Simplified Chinese translation. +Isira Seneviratne (1): + po: Update Sinhala translation. -Nikolay Sivov (1): - gdi32: Fix fontconfig objects leak (Valgrind). +Ken Thomases (1): + winemac: Fix implementation of the AllowVerticalSync registry setting. -Sebastian Lackner (2): - urlmon/tests: Add test for opening cache file with DELETE access. - appwiz.cpl: Copy addons to cache instead of moving. +Lauri Kenttä (1): + po: Update Finnish translation. -Sven Baars (2): - wsdapi/tests: Fix a memory leak (Valgrind). - quartz: Fix some memory leaks (Valgrind). +Paul Gofman (1): + user32/tests: Add some tests for implicit stretch mode in CopyImage(). -Zebediah Figura (2): - ntoskrnl.exe: Avoid loading a driver multiple times in ZwLoadDriver(). - ntoskrnl.exe: Handle already-loaded drivers in handle_bus_relations(). +Zhiyi Zhang (1): + riched20: Fix a use after free. -- Alexandre Julliard diff --git a/VERSION b/VERSION index 0baf4d9..e9160c7c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Wine version 4.0-rc4 +Wine version 4.0-rc5 diff --git a/configure b/configure index 6026c2e..dd613fe 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Wine 4.0-rc4. +# Generated by GNU Autoconf 2.69 for Wine 4.0-rc5. # # Report bugs to <wine-devel(a)winehq.org>. # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Wine' PACKAGE_TARNAME='wine' -PACKAGE_VERSION='4.0-rc4' -PACKAGE_STRING='Wine 4.0-rc4' +PACKAGE_VERSION='4.0-rc5' +PACKAGE_STRING='Wine 4.0-rc5' PACKAGE_BUGREPORT='wine-devel(a)winehq.org' PACKAGE_URL='https://www.winehq.org' @@ -2390,7 +2390,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Wine 4.0-rc4 to adapt to many kinds of systems. +\`configure' configures Wine 4.0-rc5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2460,7 +2460,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Wine 4.0-rc4:";; + short | recursive ) echo "Configuration of Wine 4.0-rc5:";; esac cat <<\_ACEOF @@ -2692,7 +2692,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Wine configure 4.0-rc4 +Wine configure 4.0-rc5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3376,7 +3376,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Wine $as_me 4.0-rc4, which was +It was created by Wine $as_me 4.0-rc5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -20870,7 +20870,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Wine $as_me 4.0-rc4, which was +This file was extended by Wine $as_me 4.0-rc5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20941,7 +20941,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Wine config.status 4.0-rc4 +Wine config.status 4.0-rc5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\"

1 0

Henri Verbeet : wined3d: Recognise virgl.
by Alexandre Julliard Jan. 4, 2019

Jan. 4, 2019

Module: wine Branch: master Commit: 86c773fc66021b9de0dd816ce368bc879e0df1e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86c773fc66021b9de0dd816c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 4 18:48:02 2019 +0330 wined3d: Recognise virgl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 14 ++++++++++++++ dlls/wined3d/directx.c | 6 ++++++ dlls/wined3d/wined3d_private.h | 4 ++++ 3 files changed, 24 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 2a3514a..af0db3e 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1192,6 +1192,7 @@ static enum wined3d_gl_vendor wined3d_guess_gl_vendor(const struct wined3d_gl_in || strstr(gl_vendor_string, "DRI R300 Project") || strstr(gl_vendor_string, "Tungsten Graphics, Inc") || strstr(gl_vendor_string, "VMware, Inc.") + || strstr(gl_vendor_string, "Red Hat") || strstr(gl_vendor_string, "Intel") || strstr(gl_renderer, "Mesa") || strstr(gl_renderer, "Gallium") @@ -1232,6 +1233,10 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s || strstr(gl_vendor_string, "Intel Inc.")) return HW_VENDOR_INTEL; + if (strstr(gl_vendor_string, "Red Hat") + || strstr(gl_renderer, "virgl")) + return HW_VENDOR_REDHAT; + if (strstr(gl_renderer, "SVGA3D")) return HW_VENDOR_VMWARE; @@ -1790,6 +1795,10 @@ cards_nvidia_mesa[] = {"nv04", CARD_NVIDIA_RIVA_TNT}, {"nv03", CARD_NVIDIA_RIVA_128}, }, +cards_redhat[] = +{ + {"virgl", CARD_REDHAT_VIRGL}, +}, cards_vmware[] = { {"SVGA3D", CARD_VMWARE_SVGA3D}, @@ -1814,6 +1823,10 @@ nvidia_gl_vendor_table[] = {GL_VENDOR_MESA, "Mesa Nouveau driver", cards_nvidia_mesa, ARRAY_SIZE(cards_nvidia_mesa)}, {GL_VENDOR_NVIDIA, "NVIDIA binary driver", cards_nvidia_binary, ARRAY_SIZE(cards_nvidia_binary)}, }, +redhat_gl_vendor_table[] = +{ + {GL_VENDOR_MESA, "Red Hat driver", cards_redhat, ARRAY_SIZE(cards_redhat)}, +}, vmware_gl_vendor_table[] = { {GL_VENDOR_MESA, "VMware driver", cards_vmware, ARRAY_SIZE(cards_vmware)}, @@ -1860,6 +1873,7 @@ card_vendor_table[] = { {HW_VENDOR_AMD, "AMD", amd_gl_vendor_table, ARRAY_SIZE(amd_gl_vendor_table)}, {HW_VENDOR_NVIDIA, "NVIDIA", nvidia_gl_vendor_table, ARRAY_SIZE(nvidia_gl_vendor_table)}, + {HW_VENDOR_REDHAT, "Red Hat",redhat_gl_vendor_table, ARRAY_SIZE(redhat_gl_vendor_table)}, {HW_VENDOR_VMWARE, "VMware", vmware_gl_vendor_table, ARRAY_SIZE(vmware_gl_vendor_table)}, {HW_VENDOR_INTEL, "Intel", intel_gl_vendor_table, ARRAY_SIZE(intel_gl_vendor_table)}, }; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 544c76e..75622be 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -187,6 +187,9 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_NVIDIA_GEFORCE6, DRIVER_MODEL_NT6X, "nvd3dum.dll", 18, 13, 783}, {DRIVER_NVIDIA_GEFORCE8, DRIVER_MODEL_NT6X, "nvd3dum.dll", 18, 13, 4052}, + /* Red Hat */ + {DRIVER_REDHAT_VIRGL, DRIVER_MODEL_GENERIC, "virgl.dll", 0, 0, 0}, + /* VMware */ {DRIVER_VMWARE, DRIVER_MODEL_NT5X, "vm3dum.dll", 14, 1, 1134}, @@ -376,6 +379,9 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_480, "Radeon (TM) RX 480 Graphics", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA, "Radeon RX Vega", DRIVER_AMD_RX, 8192}, + /* Red Hat */ + {HW_VENDOR_REDHAT, CARD_REDHAT_VIRGL, "Red Hat VirtIO GPU", DRIVER_REDHAT_VIRGL, 1024}, + /* VMware */ {HW_VENDOR_VMWARE, CARD_VMWARE_SVGA3D, "VMware SVGA 3D (Microsoft Corporation - WDDM)", DRIVER_VMWARE, 1024}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6e39db4..0df3f2a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2252,6 +2252,7 @@ enum wined3d_pci_vendor HW_VENDOR_AMD = 0x1002, HW_VENDOR_NVIDIA = 0x10de, HW_VENDOR_VMWARE = 0x15ad, + HW_VENDOR_REDHAT = 0x1af4, HW_VENDOR_INTEL = 0x8086, }; @@ -2435,6 +2436,8 @@ enum wined3d_pci_device CARD_NVIDIA_TITANX_PASCAL = 0x1b00, CARD_NVIDIA_TITANV = 0x1d81, + CARD_REDHAT_VIRGL = 0x1010, + CARD_VMWARE_SVGA3D = 0x0405, CARD_INTEL_830M = 0x3577, @@ -2623,6 +2626,7 @@ enum wined3d_display_driver DRIVER_NVIDIA_GEFORCEFX, DRIVER_NVIDIA_GEFORCE6, DRIVER_NVIDIA_GEFORCE8, + DRIVER_REDHAT_VIRGL, DRIVER_VMWARE, DRIVER_WINE, DRIVER_UNKNOWN,

1 0