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

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

Aug. 31, 2018

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 Aug. 31, 2018

Aug. 31, 2018

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 MSN icon.
by Alexandre Julliard Aug. 30, 2018

Aug. 30, 2018

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

Józef Kucia : wined3d: Use get_format_internal() in apply_format_fixups().
by Alexandre Julliard Aug. 30, 2018

Aug. 30, 2018

Module: wine Branch: master Commit: a301ba64d52e7e26c6e4d4cb1f7ffaed71490398 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a301ba64d52e7e26c6e4d4cb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 30 14:54:50 2018 +0200 wined3d: Use get_format_internal() in apply_format_fixups(). 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/wined3d/utils.c | 198 +++++++++++++++++++++++++-------------------------- 1 file changed, 99 insertions(+), 99 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a301ba64d52e7e26c6e4…

1 0

Józef Kucia : wined3d: Use get_format_internal() in init_format_filter_info().
by Alexandre Julliard Aug. 30, 2018

Aug. 30, 2018

Module: wine Branch: master Commit: 6edf38c205a6f5db369bf24a7edd4623ee6e32f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6edf38c205a6f5db369bf24a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 30 14:54:51 2018 +0200 wined3d: Use get_format_internal() in init_format_filter_info(). 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/wined3d/utils.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5720cab..d75cbc1 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3330,7 +3330,7 @@ static void init_format_filter_info(struct wined3d_adapter *adapter, { enum wined3d_pci_vendor vendor = adapter->driver_info.vendor; struct wined3d_format *format; - unsigned int fmt_idx, i; + unsigned int i; static const enum wined3d_format_id fmts16[] = { WINED3DFMT_R16_FLOAT, @@ -3339,8 +3339,8 @@ static void init_format_filter_info(struct wined3d_adapter *adapter, }; BOOL filtered; + /* This was already handled by init_format_texture_info(). */ if (gl_info->supported[ARB_INTERNALFORMAT_QUERY2]) - /* This was already handled by init_format_texture_info(). */ return; if (wined3d_settings.offscreen_rendering_mode != ORM_FBO @@ -3367,8 +3367,8 @@ static void init_format_filter_info(struct wined3d_adapter *adapter, { for (i = 0; i < ARRAY_SIZE(fmts16); ++i) { - fmt_idx = get_format_idx(fmts16[i]); - format_set_flag(&adapter->formats[fmt_idx], WINED3DFMT_FLAG_FILTERING); + format = get_format_internal(adapter, fmts16[i]); + format_set_flag(format, WINED3DFMT_FLAG_FILTERING); } } return; @@ -3376,19 +3376,19 @@ static void init_format_filter_info(struct wined3d_adapter *adapter, for (i = 0; i < ARRAY_SIZE(fmts16); ++i) { - fmt_idx = get_format_idx(fmts16[i]); - format = &adapter->formats[fmt_idx]; - if (!format->glInternal) continue; /* Not supported by GL */ + format = get_format_internal(adapter, fmts16[i]); + if (!format->glInternal) + continue; /* Not supported by GL */ - filtered = check_filter(gl_info, adapter->formats[fmt_idx].glInternal); + filtered = check_filter(gl_info, format->glInternal); if (filtered) { - TRACE("Format %s supports filtering\n", debug_d3dformat(fmts16[i])); + TRACE("Format %s supports filtering.\n", debug_d3dformat(format->id)); format_set_flag(format, WINED3DFMT_FLAG_FILTERING); } else { - TRACE("Format %s does not support filtering\n", debug_d3dformat(fmts16[i])); + TRACE("Format %s does not support filtering.\n", debug_d3dformat(format->id)); } } }

1 0

Józef Kucia : dxgi: Return actual swap effect for D3D11 swapchains.
by Alexandre Julliard Aug. 30, 2018

Aug. 30, 2018

Module: wine Branch: master Commit: 25c3d9938a8acdb10ad537c7559cd112e654ea66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25c3d9938a8acdb10ad537c7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 30 13:50:26 2018 +0200 dxgi: Return actual swap effect for D3D11 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 | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 6eda235..f8e4f80 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -37,6 +37,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi); WINE_DECLARE_DEBUG_CHANNEL(winediag); +static DXGI_SWAP_EFFECT dxgi_swap_effect_from_wined3d(enum wined3d_swap_effect swap_effect) +{ + switch (swap_effect) + { + case WINED3D_SWAP_EFFECT_DISCARD: + return DXGI_SWAP_EFFECT_DISCARD; + case WINED3D_SWAP_EFFECT_SEQUENTIAL: + return DXGI_SWAP_EFFECT_SEQUENTIAL; + case WINED3D_SWAP_EFFECT_FLIP_DISCARD: + return DXGI_SWAP_EFFECT_FLIP_DISCARD; + case WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL: + return DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL; + default: + FIXME("Invalid swap effect %#x.\n", swap_effect); + return DXGI_SWAP_EFFECT_DISCARD; + } +} + static inline struct d3d11_swapchain *d3d11_swapchain_from_IDXGISwapChain1(IDXGISwapChain1 *iface) { return CONTAINING_RECORD(iface, struct d3d11_swapchain, IDXGISwapChain1_iface); @@ -297,7 +315,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetDesc(IDXGISwapChain1 *iface, wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc); wined3d_mutex_unlock(); - FIXME("Ignoring ScanlineOrdering, Scaling and SwapEffect.\n"); + FIXME("Ignoring ScanlineOrdering and Scaling.\n"); desc->BufferDesc.Width = wined3d_desc.backbuffer_width; desc->BufferDesc.Height = wined3d_desc.backbuffer_height; @@ -312,7 +330,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetDesc(IDXGISwapChain1 *iface, desc->BufferCount = wined3d_desc.backbuffer_count; desc->OutputWindow = wined3d_desc.device_window; desc->Windowed = wined3d_desc.windowed; - desc->SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + desc->SwapEffect = dxgi_swap_effect_from_wined3d(wined3d_desc.swap_effect); desc->Flags = dxgi_swapchain_flags_from_wined3d(wined3d_desc.flags); return S_OK; @@ -457,7 +475,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetDesc1(IDXGISwapChain1 *iface wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc); wined3d_mutex_unlock(); - FIXME("Ignoring Stereo, Scaling, SwapEffect and AlphaMode.\n"); + FIXME("Ignoring Stereo, Scaling and AlphaMode.\n"); desc->Width = wined3d_desc.backbuffer_width; desc->Height = wined3d_desc.backbuffer_height; @@ -468,7 +486,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetDesc1(IDXGISwapChain1 *iface desc->BufferUsage = dxgi_usage_from_wined3d_usage(wined3d_desc.backbuffer_usage); desc->BufferCount = wined3d_desc.backbuffer_count; desc->Scaling = DXGI_SCALING_STRETCH; - desc->SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + desc->SwapEffect = dxgi_swap_effect_from_wined3d(wined3d_desc.swap_effect); desc->AlphaMode = DXGI_ALPHA_MODE_IGNORE; desc->Flags = dxgi_swapchain_flags_from_wined3d(wined3d_desc.flags);

1 0

Józef Kucia : d3d12/tests: Add test for DXGI_FORMAT_R10G10B10A2_UNORM swapchain.
by Alexandre Julliard Aug. 30, 2018

Aug. 30, 2018

Module: wine Branch: master Commit: be3b3ad3ad117a5a4d23dcdc508a21e19d774c44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be3b3ad3ad117a5a4d23dcdc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 30 13:50:25 2018 +0200 d3d12/tests: Add test for DXGI_FORMAT_R10G10B10A2_UNORM swapchain. 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/d3d12/tests/d3d12.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 2e2e69b..7b610c0 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -47,6 +47,7 @@ static unsigned int format_size(DXGI_FORMAT format) case DXGI_FORMAT_R8G8B8A8_UNORM: case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB: case DXGI_FORMAT_B8G8R8A8_UNORM: + case DXGI_FORMAT_R10G10B10A2_UNORM: return 4; default: trace("Unhandled format %#x.\n", format); @@ -832,10 +833,12 @@ static void test_swapchain_draw(void) } tests[] = { - {DXGI_FORMAT_B8G8R8A8_UNORM, {1.0f, 0.0f, 0.0f, 1.0f}, 0xffff0000}, - {DXGI_FORMAT_B8G8R8A8_UNORM, {0.0f, 1.0f, 0.0f, 1.0f}, 0xff00ff00}, - {DXGI_FORMAT_R8G8B8A8_UNORM, {1.0f, 0.0f, 0.0f, 1.0f}, 0xff0000ff}, - {DXGI_FORMAT_R8G8B8A8_UNORM, {0.0f, 1.0f, 0.0f, 1.0f}, 0xff00ff00}, + {DXGI_FORMAT_B8G8R8A8_UNORM, {1.0f, 0.0f, 0.0f, 1.0f}, 0xffff0000}, + {DXGI_FORMAT_B8G8R8A8_UNORM, {0.0f, 1.0f, 0.0f, 1.0f}, 0xff00ff00}, + {DXGI_FORMAT_R8G8B8A8_UNORM, {1.0f, 0.0f, 0.0f, 1.0f}, 0xff0000ff}, + {DXGI_FORMAT_R8G8B8A8_UNORM, {0.0f, 1.0f, 0.0f, 1.0f}, 0xff00ff00}, + {DXGI_FORMAT_R10G10B10A2_UNORM, {1.0f, 0.0f, 0.0f, 1.0f}, 0xc00003ff}, + {DXGI_FORMAT_R10G10B10A2_UNORM, {0.0f, 1.0f, 0.0f, 1.0f}, 0xc00ffc00}, }; desc.no_pipeline = TRUE;

1 0

Alex Henrie : shell32: Add move icon.
by Alexandre Julliard Aug. 30, 2018

Aug. 30, 2018

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 print icon.
by Alexandre Julliard Aug. 30, 2018

Aug. 30, 2018

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 delete icon.
by Alexandre Julliard Aug. 30, 2018

Aug. 30, 2018

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