wine-commits November 2018

wine-commits@winehq.org

2 participants
951 discussions

Józef Kucia : vkd3d-shader: Implement shader visibility for UAV counters.
by Alexandre Julliard 15 Nov '18

15 Nov '18

Module: vkd3d Branch: master Commit: 7decb65f54246172da64e36ea81fb047d507c34c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7decb65f54246172da64e36… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 15 16:32:40 2018 +0100 vkd3d-shader: Implement shader visibility for UAV counters. 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> --- include/vkd3d_shader.h | 1 + libs/vkd3d-shader/spirv.c | 4 +++- libs/vkd3d/state.c | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index c0d1f65..7d9bf70 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -111,6 +111,7 @@ struct vkd3d_shader_combined_resource_sampler struct vkd3d_shader_uav_counter_binding { unsigned int register_index; /* u# */ + enum vkd3d_shader_visibility shader_visibility; struct vkd3d_shader_descriptor_binding binding; unsigned int offset; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 1655bf3..12fa300 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2086,10 +2086,12 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor { const struct vkd3d_shader_uav_counter_binding *current = &shader_interface->uav_counters[i]; + if (!vkd3d_dxbc_compiler_check_shader_visibility(compiler, current->shader_visibility)) + continue; + if (current->offset) FIXME("Atomic counter offsets are not supported yet.\n"); - /* FIXME: Implement shader visibility for UAV counters. */ if (current->register_index == reg_idx) return current->binding; } diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index bf4eee9..3ee602f 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1367,6 +1367,7 @@ static HRESULT d3d12_pipeline_state_init_compute_uav_counters(struct d3d12_pipel continue; state->uav_counters[j].register_index = i; + state->uav_counters[j].shader_visibility = VKD3D_SHADER_VISIBILITY_COMPUTE; state->uav_counters[j].binding.set = context.set_index; state->uav_counters[j].binding.binding = context.descriptor_binding;

1 0

Józef Kucia : tests: Add test for depth rendering without pixel shader.
by Alexandre Julliard 15 Nov '18

15 Nov '18

Module: vkd3d Branch: master Commit: 08ff23a0b12b35f64343bea1f3d2e5b45c398dfc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=08ff23a0b12b35f64343bea… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 15 16:32:39 2018 +0100 tests: Add test for depth rendering without pixel shader. 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 | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index e98dbfa..7fb0b41 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4792,6 +4792,105 @@ static void test_scissor(void) destroy_test_context(&context); } +static void test_draw_depth_no_ps(void) +{ + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_INPUT_LAYOUT_DESC input_layout; + struct depth_stencil_resource ds; + struct test_context_desc desc; + D3D12_VERTEX_BUFFER_VIEW vbv; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12Resource *vb; + HRESULT hr; + + static const D3D12_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + }; + static const struct + { + struct vec4 position; + } + quad[] = + { + {{-1.0f, -1.0f, 0.5f, 1.0f}}, + {{-1.0f, 1.0f, 0.5f, 1.0f}}, + {{ 1.0f, -1.0f, 0.5f, 1.0f}}, + {{ 1.0f, 1.0f, 0.5f, 1.0f}}, + }; + static const DWORD vs_code[] = + { +#if 0 + void main(float4 in_position : POSITION, out float4 out_position : SV_POSITION) + { + out_position = in_position; + } +#endif + 0x43425844, 0xa7a2f22d, 0x83ff2560, 0xe61638bd, 0x87e3ce90, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x0000003c, 0x00010040, + 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + + memset(&desc, 0, sizeof(desc)); + desc.no_render_target = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + vb = create_upload_buffer(context.device, sizeof(quad), quad); + + vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb); + vbv.StrideInBytes = sizeof(*quad); + vbv.SizeInBytes = sizeof(quad); + + init_depth_stencil(&ds, context.device, 640, 480, 1, DXGI_FORMAT_D32_FLOAT, 0, NULL); + set_viewport(&context.viewport, 0.0f, 0.0f, 640.0f, 480.0f, 0.0f, 1.0f); + set_rect(&context.scissor_rect, 0, 0, 640, 480); + + context.root_signature = create_empty_root_signature(context.device, + D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT); + input_layout.pInputElementDescs = layout_desc; + input_layout.NumElements = ARRAY_SIZE(layout_desc); + init_pipeline_state_desc(&pso_desc, context.root_signature, 0, &vs, NULL, &input_layout); + memset(&pso_desc.PS, 0, sizeof(pso_desc.PS)); + pso_desc.NumRenderTargets = 0; + pso_desc.DSVFormat = DXGI_FORMAT_D32_FLOAT; + pso_desc.DepthStencilState.DepthEnable = TRUE; + pso_desc.DepthStencilState.DepthWriteMask = D3D12_DEPTH_WRITE_MASK_ALL; + pso_desc.DepthStencilState.DepthFunc = D3D12_COMPARISON_FUNC_ALWAYS; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr); + + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, + D3D12_CLEAR_FLAG_DEPTH, 1.0f, 0, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 0, NULL, FALSE, &ds.dsv_handle); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + + transition_resource_state(command_list, ds.texture, + D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_float(ds.texture, 0, queue, command_list, 0.5f, 1); + + destroy_depth_stencil(&ds); + ID3D12Resource_Release(vb); + destroy_test_context(&context); +} + static void test_draw_depth_only(void) { D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; @@ -21533,6 +21632,7 @@ START_TEST(d3d12) run_test(test_fragment_coords); run_test(test_fractional_viewports); run_test(test_scissor); + run_test(test_draw_depth_no_ps); run_test(test_draw_depth_only); run_test(test_draw_uav_only); run_test(test_texture_resource_barriers);

1 0

Józef Kucia : vkd3d: Allow depth rendering without pixel shader.
by Alexandre Julliard 15 Nov '18

15 Nov '18

Module: vkd3d Branch: master Commit: a39d2aa3a850b237bbc23ff0b870ce11297f99d4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a39d2aa3a850b237bbc23ff… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 15 16:32:38 2018 +0100 vkd3d: Allow depth rendering without pixel shader. 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 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 35b9000..bf4eee9 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1893,6 +1893,17 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s HRESULT hr; int ret; + static const DWORD default_ps_code[] = + { +#if 0 + ps_4_0 + ret +#endif + 0x43425844, 0x19cbf606, 0x18f562b9, 0xdaeed4db, 0xc324aa46, 0x00000001, 0x00000060, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x52444853, 0x0000000c, 0x00000040, 0x00000003, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE default_ps = {default_ps_code, sizeof(default_ps_code)}; static const struct { enum VkShaderStageFlagBits stage; @@ -1984,6 +1995,15 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->attachment_references[0].attachment = 0; graphics->attachment_references[0].layout = depth_layout; ++graphics->rt_idx; + + if (!desc->PS.pShaderBytecode) + { + if (FAILED(hr = create_shader_stage(device, &graphics->stages[graphics->stage_count], + VK_SHADER_STAGE_FRAGMENT_BIT, &default_ps, NULL, NULL))) + goto fail; + + ++graphics->stage_count; + } } for (i = 0; i < rt_count; ++i)

1 0

Józef Kucia : vkd3d: Enable rasterization discard if possible.
by Alexandre Julliard 15 Nov '18

15 Nov '18

Module: vkd3d Branch: master Commit: fa0f6f584a30536c6b476387fe985a401a7071dc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fa0f6f584a30536c6b47638… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 15 16:32:37 2018 +0100 vkd3d: Enable rasterization discard if possible. 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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 3f3de4d..35b9000 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2235,6 +2235,8 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s } rs_desc_from_d3d12(&graphics->rs_desc, &desc->RasterizerState); + if (!graphics->attachment_count && !(desc->PS.pShaderBytecode && desc->PS.BytecodeLength)) + graphics->rs_desc.rasterizerDiscardEnable = VK_TRUE; graphics->ms_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO; graphics->ms_desc.pNext = NULL;

1 0

Michael Stefaniuc : kernel32: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: d9c7d4147b569553bc97ef57c6200002fe81565e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9c7d4147b569553bc97ef57… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 14 20:46:01 2018 +0100 kernel32: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 53b1b2d..abf33df 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2553,7 +2553,7 @@ static BOOL create_cmd_process( LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES if (!GetEnvironmentVariableW( comspecW, comspec, ARRAY_SIZE( comspec ))) { - GetSystemDirectoryW( comspec, (sizeof(comspec) - sizeof(cmdW))/sizeof(WCHAR) ); + GetSystemDirectoryW( comspec, ARRAY_SIZE( comspec ) - ARRAY_SIZE( cmdW )); strcatW( comspec, cmdW ); } if (!(newcmdline = HeapAlloc( GetProcessHeap(), 0,

1 0

André Hentschel : kernel32: Export RtlPcToFileHeader on ARM64.
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: 9f7692e2edc2face389f1cd26fdb5f705acaa6ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f7692e2edc2face389f1cd2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 14 19:09:23 2018 +0100 kernel32: Export RtlPcToFileHeader on ARM64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46144 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 5490b07..5c2e426 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1294,7 +1294,7 @@ @ cdecl -arch=x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr ptr) ntdll.RtlInstallFunctionTableCallback @ stdcall -arch=arm,x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory -@ stdcall -arch=x86_64,arm RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader +@ stdcall -arch=x86_64,arm,arm64 RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader @ stdcall -arch=arm -norelay RtlRaiseException(ptr) ntdll.RtlRaiseException @ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext @ stdcall RtlUnwind(ptr ptr ptr long) ntdll.RtlUnwind

1 0

Alexandre Julliard : Revert "makefiles: Only generate proxy code for the target architecture."
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: d076ff3c120319d5fc7bc9043095925d5244320c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d076ff3c120319d5fc7bc904… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 14 18:18:53 2018 +0100 Revert "makefiles: Only generate proxy code for the target architecture." This reverts commit ee206a37609f99e9dc024dbe19d4a9b842433813. It's the default widl behavior now. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 1 - configure | 11 ----------- configure.ac | 5 ----- tools/makedep.c | 3 --- 4 files changed, 20 deletions(-) diff --git a/Makefile.in b/Makefile.in index c1242af..6b65fdf 100644 --- a/Makefile.in +++ b/Makefile.in @@ -49,7 +49,6 @@ MSVCRTFLAGS = @BUILTINFLAG@ TARGETFLAGS = @TARGETFLAGS@ UNWINDFLAGS = @UNWINDFLAGS@ LDEXECFLAGS = @LDEXECFLAGS@ -WIDLFLAGS = @WIDLFLAGS@ LIBS = @LIBS@ BISON = @BISON@ FLEX = @FLEX@ diff --git a/configure b/configure index 92be309..dd45a4e 100755 --- a/configure +++ b/configure @@ -763,7 +763,6 @@ BISON FLEX TOOLSDIR wine64_disable -WIDLFLAGS TARGETFLAGS LD CPPBIN @@ -5513,8 +5512,6 @@ rm -f core conftest.err conftest.$ac_objext \ notice_platform="32-bit " TARGETFLAGS="-m32" - WIDLFLAGS="--win32" - PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib/pkgconfig} export PKG_CONFIG_PATH enable_win16=${enable_win16:-yes} @@ -5550,8 +5547,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext notice_platform="64-bit " TARGETFLAGS="-m64" - WIDLFLAGS="--win64" - fi ;; arm*) @@ -5620,8 +5615,6 @@ rm -f core conftest.err conftest.$ac_objext \ CFLAGS="$CFLAGS -marm -mfloat-abi=$float_abi" TARGETFLAGS="-marm -mfloat-abi=$float_abi" - WIDLFLAGS="--win32" - ;; aarch64*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports __builtin_ms_va_list" >&5 @@ -5646,13 +5639,9 @@ $as_echo "no" >&6; } as_fn_error $? "You need clang >= 5.0 to build Wine for arm64." "$LINENO" 5 fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - WIDLFLAGS="--win64" - ;; i[3456789]86*) enable_win16=${enable_win16:-yes} - WIDLFLAGS="--win32" - ;; esac diff --git a/configure.ac b/configure.ac index efec221..294fe4b 100644 --- a/configure.ac +++ b/configure.ac @@ -157,7 +157,6 @@ case $host in host_cpu="i386" notice_platform="32-bit " AC_SUBST(TARGETFLAGS,"-m32") - AC_SUBST(WIDLFLAGS,"--win32") PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib/pkgconfig} export PKG_CONFIG_PATH enable_win16=${enable_win16:-yes} @@ -175,7 +174,6 @@ case $host in host_cpu="x86_64" notice_platform="64-bit " AC_SUBST(TARGETFLAGS,"-m64") - AC_SUBST(WIDLFLAGS,"--win64") fi ;; arm*) @@ -207,7 +205,6 @@ case $host in esac CFLAGS="$CFLAGS -marm -mfloat-abi=$float_abi" AC_SUBST(TARGETFLAGS,"-marm -mfloat-abi=$float_abi") - AC_SUBST(WIDLFLAGS,"--win32") ;; aarch64*) AC_MSG_CHECKING([whether $CC supports __builtin_ms_va_list]) @@ -215,11 +212,9 @@ case $host in [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) AC_MSG_ERROR([You need clang >= 5.0 to build Wine for arm64.])]) - AC_SUBST(WIDLFLAGS,"--win64") ;; i[[3456789]]86*) enable_win16=${enable_win16:-yes} - AC_SUBST(WIDLFLAGS,"--win32") ;; esac diff --git a/tools/makedep.c b/tools/makedep.c index e3bb04a..21ae2f7 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -133,7 +133,6 @@ static struct strarray msvcrt_flags; static struct strarray extra_cflags; static struct strarray cpp_flags; static struct strarray unwind_flags; -static struct strarray widl_flags; static struct strarray libs; static struct strarray enable_tests; static struct strarray cmdline_vars; @@ -2642,7 +2641,6 @@ static void output_source_idl( struct makefile *make, struct incl_file *source, output_filenames_obj_dir( make, targets ); output( ": %s\n", tools_path( make, "widl" )); output( "\t%s -o $@", tools_path( make, "widl" ) ); - output_filenames( widl_flags ); output_filenames( target_flags ); output_filenames( make->include_args ); output_filenames( make->define_args ); @@ -4211,7 +4209,6 @@ int main( int argc, char *argv[] ) extra_cflags = get_expanded_make_var_array( top_makefile, "EXTRACFLAGS" ); cpp_flags = get_expanded_make_var_array( top_makefile, "CPPFLAGS" ); unwind_flags = get_expanded_make_var_array( top_makefile, "UNWINDFLAGS" ); - widl_flags = get_expanded_make_var_array( top_makefile, "WIDLFLAGS" ); libs = get_expanded_make_var_array( top_makefile, "LIBS" ); enable_tests = get_expanded_make_var_array( top_makefile, "ENABLE_TESTS" );

1 0

Alexandre Julliard : widl: Always generate files for the target platform only.
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: f67301e9ecaedc6920470782910f7df79cb68b19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f67301e9ecaedc6920470782… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 14 18:18:17 2018 +0100 widl: Always generate files for the target platform only. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/client.c | 22 +------------ tools/widl/proxy.c | 24 ++------------ tools/widl/register.c | 2 +- tools/widl/server.c | 22 +------------ tools/widl/typelib.c | 2 +- tools/widl/widl.c | 88 ++++++++++++++++++++++++++++++++----------------- tools/widl/widl.h | 9 +++-- tools/widl/widl.man.in | 10 ++---- tools/widl/widltypes.h | 1 - tools/widl/write_msft.c | 4 +-- 10 files changed, 75 insertions(+), 109 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f67301e9ecaedc692047…

1 0

Zebediah Figura : oleaut32/tests: Add some tests for marshalling of coclasses.
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: 2cba0ed944261577530826d5bfb707718fdaa999 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cba0ed944261577530826d5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 14 08:48:02 2018 -0600 oleaut32/tests: Add some tests for marshalling of coclasses. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 448 ++++++++++++++++++++++++++++++++++++--- dlls/oleaut32/tests/tmarshal.idl | 57 ++++- 2 files changed, 477 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2cba0ed9442615775308…

1 0

Zebediah Figura : oleaut32: Handle coclasses in ITypeInfo_Invoke().
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: 94f4b49d78f8b17bfd95826c653b7513dc1522b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94f4b49d78f8b17bfd95826c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 14 08:48:01 2018 -0600 oleaut32: Handle coclasses in ITypeInfo_Invoke(). Based on a patch by Sebastian Lackner. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39799 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 2 +- dlls/oleaut32/typelib.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 4049d19..e1564d5 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -2591,7 +2591,7 @@ static void test_typelibmarshal(void) dispparams.rgvarg = vararg; VariantInit(&varresult); hr = IDispatch_Invoke(pDispatch, DISPID_TM_COCLASS, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); - todo_wine ok_ole_success(hr, IDispatch_Invoke); + ok_ole_success(hr, IDispatch_Invoke); ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK, "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", excepinfo.wCode, excepinfo.scode); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 6474b51..f32bed3 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6572,6 +6572,7 @@ static HRESULT get_iface_guid(ITypeInfo *tinfo, HREFTYPE href, GUID *guid) ITypeInfo *tinfo2; TYPEATTR *tattr; HRESULT hres; + int flags, i; hres = ITypeInfo_GetRefTypeInfo(tinfo, href, &tinfo2); if(FAILED(hres)) @@ -6593,6 +6594,22 @@ static HRESULT get_iface_guid(ITypeInfo *tinfo, HREFTYPE href, GUID *guid) *guid = tattr->guid; break; + case TKIND_COCLASS: + for (i = 0; i < tattr->cImplTypes; i++) + { + ITypeInfo_GetImplTypeFlags(tinfo2, i, &flags); + if (flags & IMPLTYPEFLAG_FDEFAULT) + break; + } + + if (i == tattr->cImplTypes) + i = 0; + + hres = ITypeInfo_GetRefTypeOfImplType(tinfo2, i, &href); + if (SUCCEEDED(hres)) + hres = get_iface_guid(tinfo2, href, guid); + break; + default: ERR("Unexpected typekind %d\n", tattr->typekind); hres = E_UNEXPECTED;

1 0

← Newer
1
...
63
64
65
66
67
68
69
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2018