November 2018 - Wine-commits

Alex Henrie : shell32: Add run icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: ec79f437ffa3146e621cc23c3ffd7cd91733107b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec79f437ffa3146e621cc23c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 20 22:33:35 2018 -0600 shell32: Add run icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit df48fd9a27d43eeb1ceb036fae042bcff1afd1df) Signed-off-by: Michael Stefaniuc <mstefani(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 0bf8f9b..527ab84 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -432,6 +432,9 @@ IDI_SHELL_SEARCH ICON resources/search.ico /* @makedep: resources/help.ico */ IDI_SHELL_HELP ICON resources/help.ico +/* @makedep: resources/window.ico */ +IDI_SHELL_RUN ICON resources/window.ico + /* @makedep: resources/shortcut.ico */ IDI_SHELL_SHORTCUT ICON resources/shortcut.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index b3a0284..b31038c 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -189,6 +189,7 @@ #define IDI_SHELL_SETTINGS 22 #define IDI_SHELL_SEARCH 23 #define IDI_SHELL_HELP 24 +#define IDI_SHELL_RUN 25 #define IDI_SHELL_FOLDER_OPEN_LARGE 29 #define IDI_SHELL_SHORTCUT 30 #define IDI_SHELL_FOLDER_OPEN_SMALL 31

1 0

Alex Henrie : shell32: Add sleep icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 6a28e6e0ec3c25ef9e51886243e7c309bc67ce6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a28e6e0ec3c25ef9e518862… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 20 22:33:36 2018 -0600 shell32: Add sleep icon. Adapted from preferences-desktop-screensaver in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 09cca8fed75fae2dc8dd30e8b1ee5fdd429296d3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/sleep.ico | Bin 0 -> 65140 bytes dlls/shell32/resources/sleep.svg | 1594 ++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 1599 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6a28e6e0ec3c25ef9e51…

1 0

Alex Henrie : shell32: Add eject icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: bf8be4e9de864ebc2acdf59ed301e43273441c62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf8be4e9de864ebc2acdf59e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 21 20:37:43 2018 -0600 shell32: Add eject icon. Adapted from media-eject in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f9c7dbd55e265cab4ed0b207b1d8bac0f973b825) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/eject.ico | Bin 0 -> 41496 bytes dlls/shell32/resources/eject.svg | 596 +++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 601 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bf8be4e9de864ebc2acd…

1 0

Alex Henrie : shell32: Add shutdown icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: a6cdb9092dfc597983b0d40f8d9cdfd02d760c87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6cdb9092dfc597983b0d40f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 21 20:37:44 2018 -0600 shell32: Add shutdown icon. Adapted from system-shutdown in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 905685c383a49cfe9ef3f08a3a8492532fabbffb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/shut_down.ico | Bin 0 -> 38405 bytes dlls/shell32/resources/shut_down.svg | 883 +++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 888 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a6cdb9092dfc597983b0…

1 0

Alex Henrie : shell32: Add "trash full" icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 6e46fa137ddaccdee9eb74532e91e5eb17d135fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e46fa137ddaccdee9eb7453… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 21 20:37:45 2018 -0600 shell32: Add "trash full" icon. Adapted from user-trash-full in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8969e6f37f18407b0f2980b66695227212ee797f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/trash_full.ico | Bin 0 -> 73668 bytes dlls/shell32/resources/trash_full.svg | 1701 +++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 6 +- 4 files changed, 1705 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6e46fa137ddaccdee9eb…

1 0

Alex Henrie : shell32: Add modem folder icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 1a0ddf7cc75e29478f158685425d45a29f6c1b4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a0ddf7cc75e29478f158685… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 21 20:37:46 2018 -0600 shell32: Add modem folder icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 76e77535c2598fb1075c229489ce25ae1842a429) Signed-off-by: Michael Stefaniuc <mstefani(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 e2a75d0..1818030 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -450,6 +450,10 @@ IDI_SHELL_SHORTCUT ICON resources/shortcut.ico /* @makedep: resources/trash_full.ico */ IDI_SHELL_FULL_RECYCLE_BIN ICON resources/trash_full.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_MODEM_FOLDER ICON resources/folder.ico + /* @makedep: resources/desktop.ico */ IDI_SHELL_DESKTOP ICON resources/desktop.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 3318799..85f3d30 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -198,6 +198,7 @@ #define IDI_SHELL_FOLDER_OPEN_SMALL 31 #define IDI_SHELL_EMPTY_RECYCLE_BIN 32 #define IDI_SHELL_FULL_RECYCLE_BIN 33 +#define IDI_SHELL_MODEM_FOLDER 34 #define IDI_SHELL_DESKTOP 35 #define IDI_SHELL_CONTROL_PANEL 36 #define IDI_SHELL_PRINTERS_FOLDER 38

1 0

Józef Kucia : vkd3d: Disable depth/ stencil tests for DXGI_FORMAT_UNKNOWN.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: vkd3d Branch: master Commit: e91bfb882d523892e0191c9f3b3754ee31d475f7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e91bfb882d523892e0191c9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 28 18:51:18 2018 +0100 vkd3d: Disable depth/stencil tests for DXGI_FORMAT_UNKNOWN. Needs more tests. 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> --- libs/vkd3d/state.c | 7 ++++++- tests/d3d12.c | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 6f7373e..66da08a 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1948,8 +1948,13 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s rt_count = ARRAY_SIZE(graphics->attachments) - 1; } + if (desc->DSVFormat == DXGI_FORMAT_UNKNOWN + && (desc->DepthStencilState.DepthEnable || desc->DepthStencilState.StencilEnable)) + FIXME("DSV format is DXGI_FORMAT_UNKNOWN, disabling depth/stencil tests.\n"); + graphics->rt_idx = 0; - if (desc->DepthStencilState.DepthEnable || desc->DepthStencilState.StencilEnable) + if (desc->DSVFormat != DXGI_FORMAT_UNKNOWN + && (desc->DepthStencilState.DepthEnable || desc->DepthStencilState.StencilEnable)) { const D3D12_DEPTH_STENCIL_DESC *ds_desc = &desc->DepthStencilState; VkImageLayout depth_layout; diff --git a/tests/d3d12.c b/tests/d3d12.c index d037245..42fb24c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2734,6 +2734,17 @@ static void test_create_graphics_pipeline_state(void) &IID_ID3D12PipelineState, (void **)&pipeline_state); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + /* DSVFormat = DXGI_FORMAT_UNKNOWN */ + memset(blend, 0, sizeof(*blend)); + pso_desc.DSVFormat = DXGI_FORMAT_UNKNOWN; + pso_desc.DepthStencilState.DepthEnable = TRUE; + pso_desc.DepthStencilState.DepthWriteMask = D3D12_DEPTH_WRITE_MASK_ALL; + pso_desc.DepthStencilState.DepthFunc = D3D12_COMPARISON_FUNC_LESS; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID3D12PipelineState_Release(pipeline_state); + refcount = ID3D12RootSignature_Release(root_signature); ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); refcount = ID3D12Device_Release(device);

1 0

Józef Kucia : tests: Insert UAV barrier between ClearUAV() commands.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: vkd3d Branch: master Commit: 93d2bb2d5dd2077a02cd54c9ef21e2ade4add662 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=93d2bb2d5dd2077a02cd54c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 28 18:51:19 2018 +0100 tests: Insert UAV barrier between ClearUAV() commands. Fixes a bunch of test failures on RADV. 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> --- tests/d3d12.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 42fb24c..d108117 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3956,6 +3956,9 @@ static void test_clear_unordered_access_view(void) get_gpu_descriptor_handle(&context, gpu_heap, 1), get_cpu_descriptor_handle(&context, cpu_heap, 1), buffer, clear_value, 0, NULL); + + uav_barrier(command_list, buffer); + ID3D12GraphicsCommandList_ClearUnorderedAccessViewUint(command_list, get_gpu_descriptor_handle(&context, gpu_heap, 0), get_cpu_descriptor_handle(&context, cpu_heap, 0),

1 0

Józef Kucia : tests: Rename vkd3d_d3d12_test.h to d3d12_test_utils.h.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: vkd3d Branch: master Commit: 1822de82c19ef39e12815ee9e7be8cc8317cbae2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1822de82c19ef39e12815ee… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 28 18:51:20 2018 +0100 tests: Rename vkd3d_d3d12_test.h to d3d12_test_utils.h. 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> --- tests/d3d12.c | 2 +- tests/{vkd3d_d3d12_test.h => d3d12_test_utils.h} | 0 tests/vkd3d_api.c | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index d108117..f521766 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -55,7 +55,7 @@ typedef int HRESULT; # include "vkd3d_utils.h" #endif -#include "vkd3d_d3d12_test.h" +#include "d3d12_test_utils.h" struct vec2 { diff --git a/tests/vkd3d_d3d12_test.h b/tests/d3d12_test_utils.h similarity index 100% rename from tests/vkd3d_d3d12_test.h rename to tests/d3d12_test_utils.h diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index ff5704d..f84409b 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -22,7 +22,7 @@ #include "vkd3d_test.h" #include <vkd3d.h> -#include "vkd3d_d3d12_test.h" +#include "d3d12_test_utils.h" HRESULT WINAPI D3D12SerializeRootSignature(const D3D12_ROOT_SIGNATURE_DESC *root_signature_desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob)

1 0

Józef Kucia : vkd3d: Add FIXME() for invalid depth/ stencil formats.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: vkd3d Branch: master Commit: 09f667ce4eaea2bb8c5e6fa8a79553ba9cf2a6aa URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=09f667ce4eaea2bb8c5e6fa… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 28 18:51:22 2018 +0100 vkd3d: Add FIXME() for invalid depth/stencil formats. Needs more tests. 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> --- libs/vkd3d/state.c | 3 +++ tests/d3d12.c | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 66da08a..1fefb61 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1966,6 +1966,9 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s goto fail; } + if (!(format->vk_aspect_mask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT))) + FIXME("Format %#x is not depth/stencil format.\n", format->dxgi_format); + if ((ds_desc->DepthEnable && ds_desc->DepthWriteMask) || (ds_desc->StencilEnable && ds_desc->StencilWriteMask)) depth_layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; diff --git a/tests/d3d12.c b/tests/d3d12.c index f521766..e5a6249 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2745,6 +2745,14 @@ static void test_create_graphics_pipeline_state(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ID3D12PipelineState_Release(pipeline_state); + /* Invalid DSVFormat */ + pso_desc.DSVFormat = DXGI_FORMAT_R8G8B8A8_UNORM; + pso_desc.DepthStencilState.DepthEnable = TRUE; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID3D12PipelineState_Release(pipeline_state); + refcount = ID3D12RootSignature_Release(root_signature); ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); refcount = ID3D12Device_Release(device);

1 0