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

Mohamad Al-Jaf : shell32: Fix last parameter behavior in SHBindToFolderIDListParent().
by Alexandre Julliard April 26, 2023

April 26, 2023

Module: wine Branch: master Commit: 33598db74314b461adfe07a9ff28ad46470b1984 URL: https://gitlab.winehq.org/wine/wine/-/commit/33598db74314b461adfe07a9ff28ad… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Apr 24 20:43:14 2023 -0400 shell32: Fix last parameter behavior in SHBindToFolderIDListParent(). --- dlls/shell32/pidl.c | 7 ++++--- dlls/shell32/tests/shlfolder.c | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index a95e4c5f295..c9ff5acbfc5 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1304,12 +1304,13 @@ HRESULT WINAPI SHBindToFolderIDListParent(IShellFolder *psf, LPCITEMIDLIST pidl, TRACE_(shell)("%p,%p,%s\n", psf, pidl, debugstr_guid(riid)); pdump(pidl); + if (ppidlLast) + *ppidlLast = NULL; + if (!pidl || !ppv) return E_INVALIDARG; - + *ppv = NULL; - if (ppidlLast) - *ppidlLast = NULL; if (!psf) { diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 5a5eb9fead8..be22e577c8b 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -779,7 +779,7 @@ static void test_GetDisplayName(void) hr = SHBindToParent(NULL, &IID_IShellFolder, (void **)&psfPersonal, &pidlLast); ok (hr == E_INVALIDARG || broken(hr == E_OUTOFMEMORY) /* XP */, "SHBindToParent(NULL) should fail! hr = %08lx\n", hr); - todo_wine ok(pidlLast == NULL, "got %p\n", pidlLast); + ok(pidlLast == NULL, "got %p\n", pidlLast); /* But it succeeds with an empty PIDL. */ hr = SHBindToParent(pidlEmpty, &IID_IShellFolder, (void **)&psfPersonal, &pidlLast); @@ -5601,7 +5601,7 @@ static void test_SHBindToFolderIDListParent(void) pidl_last = (LPITEMIDLIST)0xdeadbeef; hr = pSHBindToFolderIDListParent(NULL, NULL, &IID_IShellFolder, (void **)&psf, &pidl_last); ok(hr == E_INVALIDARG, "got %#lx\n", hr); - todo_wine ok(pidl_last == NULL, "got %p\n", pidl_last); + ok(pidl_last == NULL, "got %p\n", pidl_last); } START_TEST(shlfolder)

1 0

Dmitry Timoshkov : shell32/tests: Add SHBindToFolderIDListParent() tests.
by Alexandre Julliard April 26, 2023

April 26, 2023

Module: wine Branch: master Commit: 5956c995c3b45be193ed6c013ac41d65ede86334 URL: https://gitlab.winehq.org/wine/wine/-/commit/5956c995c3b45be193ed6c013ac41d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Nov 16 01:44:40 2022 -0500 shell32/tests: Add SHBindToFolderIDListParent() tests. --- dlls/shell32/tests/shlfolder.c | 53 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index dc0b6cb2ee2..0891b25dab4 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -60,6 +60,7 @@ static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static HRESULT (WINAPI *pSHCreateDefaultContextMenu)(const DEFCONTEXTMENU*,REFIID,void**); static BOOL (WINAPI *pSHGetPathFromIDListEx)(PCIDLIST_ABSOLUTE,WCHAR*,DWORD,GPFIDL_FLAGS); static HRESULT (WINAPI *pSHGetSetFolderCustomSettings)(LPSHFOLDERCUSTOMSETTINGS,PCWSTR,DWORD); +static HRESULT (WINAPI *pSHBindToFolderIDListParent)(IShellFolder*,LPCITEMIDLIST,REFIID,void **,LPCITEMIDLIST*); static WCHAR *make_wstr(const char *str) { @@ -120,6 +121,7 @@ static void init_function_pointers(void) hmod = GetModuleHandleA("shell32.dll"); #define MAKEFUNC(f) (p##f = (void*)GetProcAddress(hmod, #f)) + MAKEFUNC(SHBindToFolderIDListParent); MAKEFUNC(SHCreateItemFromIDList); MAKEFUNC(SHCreateItemFromParsingName); MAKEFUNC(SHCreateItemFromRelativeName); @@ -5550,6 +5552,56 @@ static void test_SHOpenFolderAndSelectItems(void) ILFree(folder); } +static void test_SHBindToFolderIDListParent(void) +{ + IShellFolder *psf_desktop; + LPITEMIDLIST pidl; + HRESULT hr; + WCHAR path[MAX_PATH]; + SHITEMID empty_item = { 0, { 0 } }; + LPITEMIDLIST pidl_empty = (LPITEMIDLIST)&empty_item; + LPCITEMIDLIST pidl_last; + IShellFolder *psf; + + if (!pSHBindToFolderIDListParent) + { + win_skip("SHBindToFolderIDListParent not available\n"); + return; + } + + GetTempPathW(ARRAY_SIZE(path), path); + SHGetDesktopFolder(&psf_desktop); + + hr = IShellFolder_ParseDisplayName(psf_desktop, NULL, NULL, path, NULL, &pidl, 0); + ok(hr == S_OK, "got %#lx\n", hr); + + pidl_last = NULL; + hr = pSHBindToFolderIDListParent(psf_desktop, pidl, &IID_IShellFolder, (void **)&psf, &pidl_last); + ok(hr == S_OK, "got %#lx\n", hr); + ok(pidl_last != NULL, "got %p\n", pidl_last); + IShellFolder_Release(psf); + + hr = pSHBindToFolderIDListParent(NULL, pidl_empty, &IID_IShellFolder, (void **)&psf, &pidl_last); + ok(hr == S_OK, "got %#lx\n", hr); + ok(pidl_last == pidl_empty, "got %p\n", pidl_last); + IShellFolder_Release(psf); + + hr = pSHBindToFolderIDListParent(NULL, pidl, &IID_IShellFolder, (void **)&psf, NULL); + ok(hr == S_OK, "got %#lx\n", hr); + IShellFolder_Release(psf); + + if (0) /* crashes under Windows */ + hr = pSHBindToFolderIDListParent(NULL, pidl, &IID_IShellFolder, NULL, NULL); + + ILFree(pidl); + IShellFolder_Release(psf_desktop); + + pidl_last = (LPITEMIDLIST)0xdeadbeef; + hr = pSHBindToFolderIDListParent(NULL, NULL, &IID_IShellFolder, (void **)&psf, &pidl_last); + ok(hr == E_INVALIDARG, "got %#lx\n", hr); + todo_wine ok(pidl_last == NULL, "got %p\n", pidl_last); +} + START_TEST(shlfolder) { init_function_pointers(); @@ -5557,6 +5609,7 @@ START_TEST(shlfolder) CO_E_NOTINITIALIZED for malformed directory names */ OleInitialize(NULL); + test_SHBindToFolderIDListParent(); test_ParseDisplayName(); test_SHParseDisplayName(); test_BindToObject();

1 0

Mohamad Al-Jaf : shell32: Implement SHBindToFolderIDListParent().
by Alexandre Julliard April 26, 2023

April 26, 2023

Module: wine Branch: master Commit: c12ccd6f80344e22619d1f26566d3ccb755d7671 URL: https://gitlab.winehq.org/wine/wine/-/commit/c12ccd6f80344e22619d1f26566d3c… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Nov 16 01:43:37 2022 -0500 shell32: Implement SHBindToFolderIDListParent(). Called by IE11. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- dlls/shell32/pidl.c | 35 ++++++++++++++++++++++++----------- dlls/shell32/shell32.spec | 1 + include/shlobj.h | 3 +++ 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index f9c91a79132..a95e4c5f295 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1290,12 +1290,20 @@ BOOL WINAPI SHGetPathFromIDListEx(LPCITEMIDLIST pidl, WCHAR *path, DWORD path_si */ HRESULT WINAPI SHBindToParent(LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCITEMIDLIST *ppidlLast) { - IShellFolder * psfDesktop; - HRESULT hr=E_FAIL; + return SHBindToFolderIDListParent(NULL, pidl, riid, ppv, ppidlLast); +} + +/************************************************************************* + * SHBindToFolderIDListParent [SHELL32.@] + */ +HRESULT WINAPI SHBindToFolderIDListParent(IShellFolder *psf, LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCITEMIDLIST *ppidlLast) +{ + IShellFolder *psfDesktop = NULL; + HRESULT hr; - TRACE_(shell)("pidl=%p\n", pidl); + TRACE_(shell)("%p,%p,%s\n", psf, pidl, debugstr_guid(riid)); pdump(pidl); - + if (!pidl || !ppv) return E_INVALIDARG; @@ -1303,29 +1311,34 @@ HRESULT WINAPI SHBindToParent(LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCI if (ppidlLast) *ppidlLast = NULL; - hr = SHGetDesktopFolder(&psfDesktop); - if (FAILED(hr)) - return hr; + if (!psf) + { + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED(hr)) + return hr; + psf = psfDesktop; + } if (_ILIsPidlSimple(pidl)) { /* we are on desktop level */ - hr = IShellFolder_QueryInterface(psfDesktop, riid, ppv); + hr = IShellFolder_QueryInterface(psf, riid, ppv); } else { LPITEMIDLIST pidlParent = ILClone(pidl); ILRemoveLastID(pidlParent); - hr = IShellFolder_BindToObject(psfDesktop, pidlParent, NULL, riid, ppv); + hr = IShellFolder_BindToObject(psf, pidlParent, NULL, riid, ppv); SHFree (pidlParent); } - IShellFolder_Release(psfDesktop); + if (psfDesktop) + IShellFolder_Release(psfDesktop); if (SUCCEEDED(hr) && ppidlLast) *ppidlLast = ILFindLastID(pidl); - TRACE_(shell)("-- psf=%p pidl=%p ret=0x%08lx\n", *ppv, (ppidlLast)?*ppidlLast:NULL, hr); + TRACE_(shell)("-- ppv=%p pidl=%p ret=0x%08lx\n", *ppv, (ppidlLast)?*ppidlLast:NULL, hr); return hr; } diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 4a64b80ddd9..2c969869722 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -332,6 +332,7 @@ @ stdcall SHAddToRecentDocs (long ptr) @ stdcall SHAppBarMessage(long ptr) @ stdcall SHAssocEnumHandlers(wstr long ptr) +@ stdcall SHBindToFolderIDListParent(ptr ptr ptr ptr ptr) @ stdcall SHBindToObject(ptr ptr ptr ptr ptr) @ stdcall SHBindToParent(ptr ptr ptr ptr) @ stdcall SHBrowseForFolder(ptr) SHBrowseForFolderA diff --git a/include/shlobj.h b/include/shlobj.h index c7452cf5f0a..c00687e84d8 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1748,6 +1748,9 @@ WINSHELLAPI HRESULT WINAPI SHGetFolderPathW(HWND hwnd, int nFolder, HANDLE hToke */ WINSHELLAPI HRESULT WINAPI SHGetDesktopFolder(IShellFolder * *); +WINSHELLAPI HRESULT WINAPI SHBindToFolderIDListParent(IShellFolder *psf, LPCITEMIDLIST pidl, REFIID riid, + LPVOID *ppv, LPCITEMIDLIST *ppidlLast); + /**************************************************************************** * SHBindToParent API */

1 0

Nikolay Sivov : tests: Add a simple test for "discard".
by Alexandre Julliard April 26, 2023

April 26, 2023

Module: vkd3d Branch: master Commit: 4fe4784e8ade50549ebf496639c47987b09c30b7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4fe4784e8ade50549ebf496639c47… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 20 22:29:26 2023 -0400 tests: Add a simple test for "discard". Signed-off-by: Ethan Lee <flibitijibibo(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Makefile.am | 1 + tests/hlsl-discard.shader_test | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/Makefile.am b/Makefile.am index 549354b4..3f1ec171 100644 --- a/Makefile.am +++ b/Makefile.am @@ -76,6 +76,7 @@ vkd3d_shader_tests = \ tests/hlsl-clamp.shader_test \ tests/hlsl-comma.shader_test \ tests/hlsl-cross.shader_test \ + tests/hlsl-discard.shader_test \ tests/hlsl-dot.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ diff --git a/tests/hlsl-discard.shader_test b/tests/hlsl-discard.shader_test new file mode 100644 index 00000000..f543f877 --- /dev/null +++ b/tests/hlsl-discard.shader_test @@ -0,0 +1,16 @@ +[pixel shader] +uniform float4 x; + +float4 main() : sv_target +{ + if (x.x == 9.0f) discard; + return x; +} + +[test] +uniform 0 float4 1 2 3 4 +draw quad +probe all rgba (1, 2, 3, 4) +uniform 0 float4 9 8 7 6 +draw quad +probe all rgba (1, 2, 3, 4)

1 0

Ethan Lee : tests: Remove rtv clears in Vulkan runner.
by Alexandre Julliard April 26, 2023

April 26, 2023

Module: vkd3d Branch: master Commit: e541e715329af6ea64a76a02b2c3248a808d4d3c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e541e715329af6ea64a76a02b2c32… Author: Ethan Lee <flibitijibibo(a)gmail.com> Date: Thu Apr 20 22:28:00 2023 -0400 tests: Remove rtv clears in Vulkan runner. Signed-off-by: Ethan Lee <flibitijibibo(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tests/shader_runner_vulkan.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index aca17a1a..c47dc19c 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -930,12 +930,10 @@ static bool vulkan_runner_draw(struct shader_runner *r, static const VkRect2D rt_rect = {.extent.width = RENDER_TARGET_WIDTH, .extent.height = RENDER_TARGET_HEIGHT}; VkRenderPassBeginInfo pass_begin_desc = {.sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO}; VkCommandBuffer cmd_buffer = runner->cmd_buffer; - VkClearAttachment clear_attachment; VkDescriptorSetLayout set_layout; VkPipelineLayout pipeline_layout; VkDevice device = runner->device; VkRenderPass render_pass; - VkClearRect clear_rect; VkPipeline pipeline; VkFramebuffer fb; bool ret = false; @@ -958,16 +956,6 @@ static bool vulkan_runner_draw(struct shader_runner *r, VK_CALL(vkCmdBeginRenderPass(cmd_buffer, &pass_begin_desc, VK_SUBPASS_CONTENTS_INLINE)); - clear_attachment.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; - clear_attachment.colorAttachment = 0; - memset(&clear_attachment.clearValue.color, 0, sizeof(clear_attachment.clearValue.color)); - - clear_rect.rect = rt_rect; - clear_rect.baseArrayLayer = 0; - clear_rect.layerCount = 1; - - VK_CALL(vkCmdClearAttachments(cmd_buffer, 1, &clear_attachment, 1, &clear_rect)); - VK_CALL(vkCmdBindPipeline(cmd_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline)); bind_resources(runner, VK_PIPELINE_BIND_POINT_GRAPHICS, set_layout, pipeline_layout);

1 0

Nikolay Sivov : tests: Remove rtv clears in d3d12 runner.
by Alexandre Julliard April 26, 2023

April 26, 2023

Module: vkd3d Branch: master Commit: c74d148cbe2c80e549ad40ff9e5b05197e6570d8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c74d148cbe2c80e549ad40ff9e5b0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 11 19:26:20 2023 +0200 tests: Remove rtv clears in d3d12 runner. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tests/shader_runner_d3d12.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 54d1c51a..7e9fed25 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -337,7 +337,6 @@ static bool d3d12_runner_draw(struct shader_runner *r, ID3D12CommandQueue *queue = test_context->queue; D3D12_INPUT_ELEMENT_DESC *input_element_descs; ID3D12Device *device = test_context->device; - static const float clear_color[4]; ID3D10Blob *vs_code, *ps_code; unsigned int uniform_index; unsigned int rtv_count = 0; @@ -424,8 +423,6 @@ static bool d3d12_runner_draw(struct shader_runner *r, { case RESOURCE_TYPE_RENDER_TARGET: rtvs[resource->r.slot] = get_cpu_rtv_handle(test_context, runner->rtv_heap, resource->r.slot); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, - rtvs[resource->r.slot], clear_color, 0, NULL); rtv_count = max(rtv_count, resource->r.slot + 1); break;

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Handle discard statement.
by Alexandre Julliard April 26, 2023

April 26, 2023

Module: vkd3d Branch: master Commit: 59c63ec5841dc01fac15dd2a0772b61f55b77a03 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/59c63ec5841dc01fac15dd2a0772b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 20 22:25:23 2023 -0400 vkd3d-shader/hlsl: Handle discard statement. Signed-off-by: Ethan Lee <flibitijibibo(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 14 ++++++++++++++ libs/vkd3d-shader/tpf.c | 16 ++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 194d21f4..2074f365 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4075,6 +4075,7 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type %type <list> conditional_expr %type <list> declaration %type <list> declaration_statement +%type <list> discard_statement %type <list> equality_expr %type <list> expr %type <list> expr_optional @@ -5322,6 +5323,7 @@ statement: declaration_statement | expr_statement | compound_statement + | discard_statement | jump_statement | selection_statement | loop_statement @@ -5341,6 +5343,18 @@ jump_statement: YYABORT; } +discard_statement: + KW_DISCARD ';' + { + struct hlsl_ir_node *discard; + + if (!($$ = make_empty_list(ctx))) + YYABORT; + if (!(discard = hlsl_new_jump(ctx, HLSL_IR_JUMP_DISCARD, &@1))) + return false; + list_add_tail($$, &discard->entry); + } + selection_statement: KW_IF '(' expr ')' if_body { diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index f15593b0..f3a15305 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -4327,6 +4327,22 @@ static void write_sm4_jump(struct hlsl_ctx *ctx, instr.opcode = VKD3D_SM4_OP_BREAK; break; + case HLSL_IR_JUMP_DISCARD: + { + struct sm4_register *reg = &instr.srcs[0].reg; + + instr.opcode = VKD3D_SM4_OP_DISCARD | VKD3D_SM4_CONDITIONAL_NZ; + + memset(&instr.srcs[0], 0, sizeof(*instr.srcs)); + instr.srcs[0].swizzle_type = VKD3D_SM4_SWIZZLE_NONE; + instr.src_count = 1; + reg->type = VKD3D_SM4_RT_IMMCONST; + reg->dim = VKD3D_SM4_DIMENSION_SCALAR; + reg->immconst_uint[0] = ~0u; + + break; + } + case HLSL_IR_JUMP_RETURN: vkd3d_unreachable();

1 0

Nikolay Sivov : vkd3d-shader/trace: Add separate id for discard.
by Alexandre Julliard April 26, 2023

April 26, 2023

Module: vkd3d Branch: master Commit: 6da7d16d4c131fc56fa8ac799a24c5f07c7dbaad URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6da7d16d4c131fc56fa8ac799a24c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 20 22:20:33 2023 -0400 vkd3d-shader/trace: Add separate id for discard. Signed-off-by: Ethan Lee <flibitijibibo(a)gmail.com> --- libs/vkd3d-shader/spirv.c | 2 ++ libs/vkd3d-shader/tpf.c | 2 +- libs/vkd3d-shader/trace.c | 3 ++- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ec4e1d1d..835e4acb 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -7774,6 +7774,7 @@ static int spirv_compiler_emit_control_flow_instruction(struct spirv_compiler *c spirv_compiler_emit_retc(compiler, instruction); break; + case VKD3DSIH_DISCARD: case VKD3DSIH_TEXKILL: spirv_compiler_emit_kill(compiler, instruction); break; @@ -9564,6 +9565,7 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_CONTINUE: case VKD3DSIH_CONTINUEP: case VKD3DSIH_DEFAULT: + case VKD3DSIH_DISCARD: case VKD3DSIH_ELSE: case VKD3DSIH_ENDIF: case VKD3DSIH_ENDLOOP: diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index e76cf8c9..f15593b0 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -1091,7 +1091,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = {VKD3D_SM4_OP_DEFAULT, VKD3DSIH_DEFAULT, "", ""}, {VKD3D_SM4_OP_DERIV_RTX, VKD3DSIH_DSX, "f", "f"}, {VKD3D_SM4_OP_DERIV_RTY, VKD3DSIH_DSY, "f", "f"}, - {VKD3D_SM4_OP_DISCARD, VKD3DSIH_TEXKILL, "", "u", + {VKD3D_SM4_OP_DISCARD, VKD3DSIH_DISCARD, "", "u", shader_sm4_read_conditional_op}, {VKD3D_SM4_OP_DIV, VKD3DSIH_DIV, "f", "ff"}, {VKD3D_SM4_OP_DP2, VKD3DSIH_DP2, "f", "ff"}, diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index d17a2819..9438bfac 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -109,6 +109,7 @@ static const char * const shader_opcode_names[] = [VKD3DSIH_DEQ ] = "deq", [VKD3DSIH_DFMA ] = "dfma", [VKD3DSIH_DGE ] = "dge", + [VKD3DSIH_DISCARD ] = "discard", [VKD3DSIH_DIV ] = "div", [VKD3DSIH_DLT ] = "dlt", [VKD3DSIH_DMAX ] = "dmax", @@ -1505,9 +1506,9 @@ static void shader_dump_instruction_flags(struct vkd3d_d3d_asm_compiler *compile { case VKD3DSIH_BREAKP: case VKD3DSIH_CONTINUEP: + case VKD3DSIH_DISCARD: case VKD3DSIH_IF: case VKD3DSIH_RETP: - case VKD3DSIH_TEXKILL: switch (ins->flags) { case VKD3D_SHADER_CONDITIONAL_OP_NZ: shader_addline(buffer, "_nz"); break; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 469139b5..c06cecb6 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -223,6 +223,7 @@ enum vkd3d_shader_opcode VKD3DSIH_DEQ, VKD3DSIH_DFMA, VKD3DSIH_DGE, + VKD3DSIH_DISCARD, VKD3DSIH_DIV, VKD3DSIH_DLT, VKD3DSIH_DMAX,

1 0

Gabriel Ivăncescu : mshtml: Pass actual node_ccp to ccref_decr for nodes.
by Alexandre Julliard April 25, 2023

April 25, 2023

Module: wine Branch: master Commit: 31e023fb1d985bcbfd7fb2bc1937d0a3b34e1541 URL: https://gitlab.winehq.org/wine/wine/-/commit/31e023fb1d985bcbfd7fb2bc1937d0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Apr 25 20:29:25 2023 +0300 mshtml: Pass actual node_ccp to ccref_decr for nodes. Avoids having to look it up again later during collection. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlnode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 5d70b09e234..02f3e2929b2 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -500,7 +500,7 @@ static ULONG WINAPI HTMLDOMNode_AddRef(IHTMLDOMNode *iface) static ULONG WINAPI HTMLDOMNode_Release(IHTMLDOMNode *iface) { HTMLDOMNode *This = impl_from_IHTMLDOMNode(iface); - LONG ref = ccref_decr(&This->ccref, (nsISupports*)&This->IHTMLDOMNode_iface, /*&node_ccp*/ NULL); + LONG ref = ccref_decr(&This->ccref, (nsISupports*)&This->IHTMLDOMNode_iface, &node_ccp); TRACE("(%p) ref=%ld\n", This, ref);

1 0

Gabriel Ivăncescu : mshtml/tests: Fix element leak in elem_fire_event.
by Alexandre Julliard April 25, 2023

April 25, 2023

Module: wine Branch: master Commit: a500bb72f05058c985511ff35f191565f45cd6c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/a500bb72f05058c985511ff35f1915… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Apr 25 20:29:26 2023 +0300 mshtml/tests: Fix element leak in elem_fire_event. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/events.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index ee15ada69ef..7f7515bbcef 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -383,6 +383,7 @@ static void _elem_fire_event(unsigned line, IUnknown *unk, const WCHAR *event, V str = SysAllocString(event); in_fire_event++; hres = IHTMLElement3_fireEvent(elem3, str, evobj, &b); + IHTMLElement3_Release(elem3); in_fire_event--; SysFreeString(str); ok_(__FILE__,line)(hres == S_OK, "fireEvent failed: %08lx\n", hres);

1 0