August 2018 - Wine-commits - list.winehq.org

Francois Gouget : testbot/WineRunWineTest: Remove a redundant $TaskDir variable.
by Alexandre Julliard 31 Aug '18

31 Aug '18

Module: tools Branch: master Commit: 81a32c35181f4e0341f99ecc17c7e4ba675fb536 URL: https://source.winehq.org/git/tools.git/?a=commit;h=81a32c35181f4e0341f99ec… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 31 13:59:33 2018 +0200 testbot/WineRunWineTest: Remove a redundant $TaskDir variable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunWineTest.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 0363a26..e3b8b17 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -537,7 +537,6 @@ elsif (!defined $TAError) my $TimedOut; if ($Step->Type ne "build") { - my $TaskDir = $Task->CreateDir(); my $BuildList = $Task->CmdLineArg; $BuildList =~ s/ .*$//; foreach my $Build (split /,/, $BuildList)

1 0

Francois Gouget : testbot: Fail the task if the log contains perl errors or warnings.
by Alexandre Julliard 31 Aug '18

31 Aug '18

Module: tools Branch: master Commit: 095ed074ceddecb57bf3293c5f85bfffc065b637 URL: https://source.winehq.org/git/tools.git/?a=commit;h=095ed074ceddecb57bf3293… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 31 14:01:12 2018 +0200 testbot: Fail the task if the log contains perl errors or warnings. They indicate the script needs fixing and they may mask other issues. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 5120217..b0b8040 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -71,7 +71,11 @@ sub ParseTaskLog($) $Result = "badpatch"; last; # Should be the last and most specific message } - elsif ($Line =~ /^Task: /) + elsif ($Line =~ /^Task: / or + # Typical perl errors + $Line =~ /^Use of uninitialized value / or + $Line =~ /^Undefined subroutine / or + $Line =~ /^Global symbol /) { $Result = "failed"; } @@ -111,7 +115,9 @@ sub GetLogLineCategory($) $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or $Line =~ /^(?:Build|Reconfig|Task): (?!ok)/ or # Typical perl errors - $Line =~ /^Use of uninitialized value/) + $Line =~ /^Use of uninitialized value / or + $Line =~ /^Undefined subroutine / or + $Line =~ /^Global symbol /) { return "error"; }

1 0

Alex Henrie : shell32: Add removable disk icons.
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: wine Branch: master Commit: 8b59c7fc5afdaf3dcb57afb52b1a26da8680b8fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b59c7fc5afdaf3dcb57afb5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:48 2018 -0600 shell32: Add removable disk icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 7 +++++++ dlls/shell32/shresdef.h | 2 ++ 2 files changed, 9 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index e28d51c..73786ea 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -830,6 +830,13 @@ IDI_SHELL_DOWNLOAD ICON resources/blank.ico /* @makedep: resources/blank.ico */ IDI_SHELL_DOWNLOAD_EMBLEM ICON resources/blank.ico +/* @makedep: resources/disk_drive.ico */ +IDI_SHELL_REMOVABLE_DISK ICON resources/disk_drive.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/disk_drive.ico */ +IDI_SHELL_BAD_REMOVABLE_DISK ICON resources/disk_drive.ico + /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 6bf9b99..ba0c0fa 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -300,6 +300,8 @@ #define IDI_SHELL_ZIP_DRIVE 230 #define IDI_SHELL_DOWNLOAD 231 #define IDI_SHELL_DOWNLOAD_EMBLEM 232 +#define IDI_SHELL_REMOVABLE_DISK 233 +#define IDI_SHELL_BAD_REMOVABLE_DISK 234 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_MY_PICTURES 236 #define IDI_SHELL_MY_MUSIC 237

1 0

Alex Henrie : shell32: Add MSN icon.
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: wine Branch: master Commit: c0c9400e3ce8ba99ae666a066825a96d77e695f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0c9400e3ce8ba99ae666a06… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:49 2018 -0600 shell32: Add MSN icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 73786ea..136e7b2 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -852,6 +852,10 @@ IDI_SHELL_MY_MUSIC ICON resources/mydocs.ico /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_VIDEOS ICON resources/mydocs.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/internet.ico */ +IDI_SHELL_MSN ICON resources/internet.ico + /* @makedep: resources/rename.ico */ IDI_SHELL_RENAME ICON resources/rename.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index ba0c0fa..57cea04 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -306,6 +306,7 @@ #define IDI_SHELL_MY_PICTURES 236 #define IDI_SHELL_MY_MUSIC 237 #define IDI_SHELL_MY_VIDEOS 238 +#define IDI_SHELL_MSN 239 #define IDI_SHELL_RENAME 242 #define IDI_SHELL_COPY 243 #define IDI_SHELL_EMPTY_RECYCLE_BIN2 254

1 0

Alex Henrie : shell32: Add delete icon.
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: wine Branch: master Commit: 39012eac756911feaa7e97caac148cd9a960030f URL: https://source.winehq.org/git/wine.git/?a=commit;h=39012eac756911feaa7e97ca… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:50 2018 -0600 shell32: Add delete icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 3 +++ dlls/shell32/shresdef.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 136e7b2..df5d726 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -856,6 +856,9 @@ IDI_SHELL_MY_VIDEOS ICON resources/mydocs.ico /* @makedep: resources/internet.ico */ IDI_SHELL_MSN ICON resources/internet.ico +/* @makedep: resources/delete.ico */ +IDI_SHELL_DELETE ICON resources/delete.ico + /* @makedep: resources/rename.ico */ IDI_SHELL_RENAME ICON resources/rename.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 57cea04..3cf6772 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -307,6 +307,7 @@ #define IDI_SHELL_MY_MUSIC 237 #define IDI_SHELL_MY_VIDEOS 238 #define IDI_SHELL_MSN 239 +#define IDI_SHELL_DELETE 240 #define IDI_SHELL_RENAME 242 #define IDI_SHELL_COPY 243 #define IDI_SHELL_EMPTY_RECYCLE_BIN2 254

1 0

Alex Henrie : shell32: Add move icon.
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: wine Branch: master Commit: ddaf6bb13710c13fe1037126e73773c91894dea6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddaf6bb13710c13fe1037126… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:51 2018 -0600 shell32: Add move icon. Adapted from mail-forward.svg in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/move.ico | Bin 0 -> 39515 bytes dlls/shell32/resources/move.svg | 513 ++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 518 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ddaf6bb13710c13fe103…

1 0

Alex Henrie : shell32: Add upload icon.
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: wine Branch: master Commit: d721c454e66d28429acbcfb231d70f035347b3c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d721c454e66d28429acbcfb2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:52 2018 -0600 shell32: Add upload icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index e4df5c5..f630a73 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -868,6 +868,10 @@ IDI_SHELL_RENAME ICON resources/rename.ico /* @makedep: resources/copy.ico */ IDI_SHELL_COPY ICON resources/copy.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/internet.ico */ +IDI_SHELL_UPLOAD ICON resources/internet.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_EMPTY_RECYCLE_BIN2 ICON resources/trash_file.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index e443c2e..248e5b5 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -311,6 +311,7 @@ #define IDI_SHELL_MOVE 241 #define IDI_SHELL_RENAME 242 #define IDI_SHELL_COPY 243 +#define IDI_SHELL_UPLOAD 244 #define IDI_SHELL_EMPTY_RECYCLE_BIN2 254 #define IDI_SHELL_NEW_NETWORK_FOLDER 258 #define IDI_SHELL_WRITE_DISC 260

1 0

Alex Henrie : shell32: Add print icon.
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: wine Branch: master Commit: 2e703dbc7a70f123cb4987648fc38d8d22c5b892 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e703dbc7a70f123cb498764… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:53 2018 -0600 shell32: Add print icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 3 +++ dlls/shell32/shresdef.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index f630a73..7ce3a43 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -872,6 +872,9 @@ IDI_SHELL_COPY ICON resources/copy.ico /* @makedep: resources/internet.ico */ IDI_SHELL_UPLOAD ICON resources/internet.ico +/* @makedep: resources/printer.ico */ +IDI_SHELL_PRINT ICON resources/printer.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_EMPTY_RECYCLE_BIN2 ICON resources/trash_file.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 248e5b5..bb97c19 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -312,6 +312,7 @@ #define IDI_SHELL_RENAME 242 #define IDI_SHELL_COPY 243 #define IDI_SHELL_UPLOAD 244 +#define IDI_SHELL_PRINT 245 #define IDI_SHELL_EMPTY_RECYCLE_BIN2 254 #define IDI_SHELL_NEW_NETWORK_FOLDER 258 #define IDI_SHELL_WRITE_DISC 260

1 0

Alex Henrie : shell32: Add play icon.
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: wine Branch: master Commit: 4213781ae0f8b45c7ef01e8f4c28a47d8c348e3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4213781ae0f8b45c7ef01e8f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:54 2018 -0600 shell32: Add play icon. Adapted from media-playback-start in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/play.ico | Bin 0 -> 37047 bytes dlls/shell32/resources/play.svg | 454 ++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 459 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4213781ae0f8b45c7ef0…

1 0

Józef Kucia : dxgi: Add support for DXGI_FORMAT_R10G10B10A2_UNORM D3D12 swapchains.
by Alexandre Julliard 30 Aug '18

30 Aug '18

Module: wine Branch: master Commit: 8c6e8d6c82c6bfa71ca6abcaeac97f2a261f9b38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c6e8d6c82c6bfa71ca6abca… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 30 13:50:24 2018 +0200 dxgi: Add support for DXGI_FORMAT_R10G10B10A2_UNORM D3D12 swapchains. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index b285f3d..6eda235 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -917,6 +917,7 @@ static DXGI_FORMAT dxgi_format_from_vk_format(VkFormat vk_format) case VK_FORMAT_B8G8R8A8_UNORM: return DXGI_FORMAT_B8G8R8A8_UNORM; case VK_FORMAT_R8G8B8A8_SRGB: return DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; case VK_FORMAT_R8G8B8A8_UNORM: return DXGI_FORMAT_R8G8B8A8_UNORM; + case VK_FORMAT_A2B10G10R10_UNORM_PACK32: return DXGI_FORMAT_R10G10B10A2_UNORM; default: WARN("Unhandled format %#x.\n", vk_format); return DXGI_FORMAT_UNKNOWN; @@ -929,6 +930,7 @@ static VkFormat get_swapchain_fallback_format(VkFormat vk_format) { case VK_FORMAT_R8G8B8A8_SRGB: return VK_FORMAT_B8G8R8A8_SRGB; case VK_FORMAT_R8G8B8A8_UNORM: return VK_FORMAT_B8G8R8A8_UNORM; + case VK_FORMAT_A2B10G10R10_UNORM_PACK32: return VK_FORMAT_B8G8R8A8_UNORM; default: WARN("Unhandled format %#x.\n", vk_format); return VK_FORMAT_UNDEFINED;

1 0