October 2018 - Wine-Commits

Józef Kucia : vkd3d-shader: Add asserts() to vkd3d_dxbc_compiler_emit_control_flow_instruction().
by Alexandre Julliard Oct. 26, 2018

Oct. 26, 2018

Module: vkd3d Branch: master Commit: b909a5fe0491b9221937ad214bda86ab4611634e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b909a5fe0491b9221937ad2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 26 15:06:52 2018 +0200 vkd3d-shader: Add asserts() to vkd3d_dxbc_compiler_emit_control_flow_instruction(). 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-shader/spirv.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f6e5746..f2ed8b8 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5287,6 +5287,8 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ { struct vkd3d_control_flow_info *breakable_cf_info; + assert(compiler->control_flow_depth); + if (!(breakable_cf_info = vkd3d_dxbc_compiler_find_innermost_breakable_cf_construct(compiler))) { FIXME("Unhandled break instruction.\n"); @@ -5311,6 +5313,8 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ { struct vkd3d_control_flow_info *loop_cf_info; + assert(compiler->control_flow_depth); + if (!(loop_cf_info = vkd3d_dxbc_compiler_find_innermost_loop(compiler))) { ERR("Invalid 'breakc' instruction outside loop.\n"); @@ -5327,6 +5331,8 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ { struct vkd3d_control_flow_info *loop_cf_info; + assert(compiler->control_flow_depth); + if (!(loop_cf_info = vkd3d_dxbc_compiler_find_innermost_loop(compiler))) { ERR("Invalid 'continue' instruction outside loop.\n");

1 0

Józef Kucia : vkd3d-shader: Propagate errors from vkd3d_dxbc_compiler_emit_control_flow_instruction() .
by Alexandre Julliard Oct. 26, 2018

Oct. 26, 2018

Module: vkd3d Branch: master Commit: bec3430d884761fec45359fe543bef3b479ebaec URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bec3430d884761fec45359f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 26 15:06:53 2018 +0200 vkd3d-shader: Propagate errors from vkd3d_dxbc_compiler_emit_control_flow_instruction(). 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/private/vkd3d_shader.h | 3 ++- libs/vkd3d-shader/spirv.c | 35 ++++++++++++++++++++------------ libs/vkd3d-shader/vkd3d_shader_main.c | 7 +++++-- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 4 files changed, 30 insertions(+), 17 deletions(-) diff --git a/include/private/vkd3d_shader.h b/include/private/vkd3d_shader.h index ac16358..b9472a2 100644 --- a/include/private/vkd3d_shader.h +++ b/include/private/vkd3d_shader.h @@ -34,7 +34,8 @@ enum vkd3d_result VKD3D_ERROR = -1, /* unspecified failure */ VKD3D_ERROR_OUT_OF_MEMORY = -2, VKD3D_ERROR_INVALID_ARGUMENT = -3, - VKD3D_ERROR_NOT_IMPLEMENTED = -4, + VKD3D_ERROR_INVALID_SHADER = -4, + VKD3D_ERROR_NOT_IMPLEMENTED = -5, VKD3D_FORCE_32_BIT_ENUM(VKD3D_RESULT), }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f2ed8b8..13631a0 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5079,7 +5079,7 @@ static struct vkd3d_control_flow_info *vkd3d_dxbc_compiler_find_innermost_breaka return NULL; } -static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_compiler *compiler, +static int vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { uint32_t loop_header_block_id, loop_body_block_id, continue_block_id; @@ -5095,7 +5095,7 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ { case VKD3DSIH_IF: if (!(cf_info = vkd3d_dxbc_compiler_push_control_flow_level(compiler))) - return; + return VKD3D_ERROR_OUT_OF_MEMORY; val_id = vkd3d_dxbc_compiler_emit_load_src(compiler, src, VKD3DSP_WRITEMASK_0); condition_id = vkd3d_dxbc_compiler_emit_int_to_bool(compiler, instruction->flags, 1, val_id); @@ -5149,7 +5149,7 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ case VKD3DSIH_LOOP: if (!(cf_info = vkd3d_dxbc_compiler_push_control_flow_level(compiler))) - return; + return VKD3D_ERROR_OUT_OF_MEMORY; loop_header_block_id = vkd3d_spirv_alloc_id(builder); loop_body_block_id = vkd3d_spirv_alloc_id(builder); @@ -5190,7 +5190,7 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ case VKD3DSIH_SWITCH: if (!(cf_info = vkd3d_dxbc_compiler_push_control_flow_level(compiler))) - return; + return VKD3D_ERROR_OUT_OF_MEMORY; merge_block_id = vkd3d_spirv_alloc_id(builder); @@ -5206,8 +5206,6 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ cf_info->u.switch_.case_blocks = NULL; cf_info->u.switch_.case_blocks_size = 0; cf_info->u.switch_.case_block_count = 0; - vkd3d_array_reserve((void **)&cf_info->u.switch_.case_blocks, &cf_info->u.switch_.case_blocks_size, - 10, sizeof(*cf_info->u.switch_.case_blocks)); cf_info->u.switch_.default_block_id = 0; cf_info->inside_block = false; cf_info->current_block = VKD3D_BLOCK_SWITCH; @@ -5215,6 +5213,11 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ vkd3d_spirv_build_op_name(builder, merge_block_id, "switch%u_merge", compiler->switch_id); ++compiler->switch_id; + + if (!vkd3d_array_reserve((void **)&cf_info->u.switch_.case_blocks, &cf_info->u.switch_.case_blocks_size, + 10, sizeof(*cf_info->u.switch_.case_blocks))) + return VKD3D_ERROR_OUT_OF_MEMORY; + break; case VKD3DSIH_ENDSWITCH: @@ -5252,7 +5255,7 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ if (!vkd3d_array_reserve((void **)&cf_info->u.switch_.case_blocks, &cf_info->u.switch_.case_blocks_size, 2 * (cf_info->u.switch_.case_block_count + 1), sizeof(*cf_info->u.switch_.case_blocks))) - return; + return VKD3D_ERROR_OUT_OF_MEMORY; label_id = vkd3d_spirv_alloc_id(builder); if (cf_info->inside_block) /* fall-through */ @@ -5292,7 +5295,7 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ if (!(breakable_cf_info = vkd3d_dxbc_compiler_find_innermost_breakable_cf_construct(compiler))) { FIXME("Unhandled break instruction.\n"); - return; + return VKD3D_ERROR_INVALID_SHADER; } if (breakable_cf_info->current_block == VKD3D_BLOCK_LOOP) @@ -5318,7 +5321,7 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ if (!(loop_cf_info = vkd3d_dxbc_compiler_find_innermost_loop(compiler))) { ERR("Invalid 'breakc' instruction outside loop.\n"); - return; + return VKD3D_ERROR_INVALID_SHADER; } merge_block_id = vkd3d_dxbc_compiler_emit_conditional_branch(compiler, @@ -5336,7 +5339,7 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ if (!(loop_cf_info = vkd3d_dxbc_compiler_find_innermost_loop(compiler))) { ERR("Invalid 'continue' instruction outside loop.\n"); - return; + return VKD3D_ERROR_INVALID_SHADER; } vkd3d_spirv_build_op_branch(builder, loop_cf_info->u.loop.continue_block_id); @@ -5352,7 +5355,7 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ if (!(loop_cf_info = vkd3d_dxbc_compiler_find_innermost_loop(compiler))) { ERR("Invalid 'continuec' instruction outside loop.\n"); - return; + return VKD3D_ERROR_INVALID_SHADER; } merge_block_id = vkd3d_dxbc_compiler_emit_conditional_branch(compiler, @@ -5380,6 +5383,8 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ ERR("Unexpected instruction %#x.\n", instruction->handler_idx); break; } + + return VKD3D_OK; } static void vkd3d_dxbc_compiler_emit_deriv_instruction(struct vkd3d_dxbc_compiler *compiler, @@ -6474,9 +6479,11 @@ static bool is_dcl_instruction(enum VKD3D_SHADER_INSTRUCTION_HANDLER handler_idx return VKD3DSIH_DCL <= handler_idx && handler_idx <= VKD3DSIH_DCL_VERTICES_OUT; } -void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, +int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { + int ret = VKD3D_OK; + if (!is_dcl_instruction(instruction->handler_idx) && !compiler->after_declarations_section) { compiler->after_declarations_section = true; @@ -6681,7 +6688,7 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler case VKD3DSIH_RETP: case VKD3DSIH_SWITCH: case VKD3DSIH_TEXKILL: - vkd3d_dxbc_compiler_emit_control_flow_instruction(compiler, instruction); + ret = vkd3d_dxbc_compiler_emit_control_flow_instruction(compiler, instruction); break; case VKD3DSIH_DSX: case VKD3DSIH_DSX_COARSE: @@ -6774,6 +6781,8 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler default: FIXME("Unhandled instruction %#x.\n", instruction->handler_idx); } + + return ret; } static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compiler *compiler, diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 348fa5d..71410f1 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -120,10 +120,13 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, return VKD3D_ERROR_INVALID_ARGUMENT; } - vkd3d_dxbc_compiler_handle_instruction(spirv_compiler, &instruction); + if ((ret = vkd3d_dxbc_compiler_handle_instruction(spirv_compiler, &instruction)) < 0) + break; } - ret = vkd3d_dxbc_compiler_generate_spirv(spirv_compiler, spirv); + if (ret >= 0) + ret = vkd3d_dxbc_compiler_generate_spirv(spirv_compiler, spirv); + vkd3d_dxbc_compiler_destroy(spirv_compiler); vkd3d_shader_parser_destroy(&parser); return ret; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index a2747ac..1d79c91 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -809,7 +809,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader const struct vkd3d_shader_interface *shader_interface, const struct vkd3d_shader_compile_arguments *compile_args, const struct vkd3d_shader_scan_info *scan_info) DECLSPEC_HIDDEN; -void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, +int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) DECLSPEC_HIDDEN; int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, struct vkd3d_shader_code *spirv) DECLSPEC_HIDDEN;

1 0

Józef Kucia : tests: Annotate another fall-through switch case (Coverity).
by Alexandre Julliard Oct. 26, 2018

Oct. 26, 2018

Module: vkd3d Branch: master Commit: 85521c2f8272ffb7c38d1644c0c3032cdc7ad36b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=85521c2f8272ffb7c38d164… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 26 15:06:51 2018 +0200 tests: Annotate another fall-through switch case (Coverity). 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index b9e4a70..49e7a78 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -15457,6 +15457,7 @@ static void test_uav_load(void) { default: trace("Unhandled format %#x.\n", test->uav_desc.Format); + /* fall-through */ case DXGI_FORMAT_R32_FLOAT: cpu_handle = rtv_float; break;

1 0

Józef Kucia : vkd3d: Accept 0xffffffff as cube count for SRVs.
by Alexandre Julliard Oct. 26, 2018

Oct. 26, 2018

Module: vkd3d Branch: master Commit: 090177b95f568b7301e108d6f46d8afa6856fac0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=090177b95f568b7301e108d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 26 15:06:55 2018 +0200 vkd3d: Accept 0xffffffff as cube count for SRVs. 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/resource.c | 4 +++- tests/d3d12.c | 18 +++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index cb1427f..f857de2 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1667,7 +1667,9 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, vkd3d_desc.miplevel_idx = desc->u.TextureCubeArray.MostDetailedMip; vkd3d_desc.miplevel_count = desc->u.TextureCubeArray.MipLevels; vkd3d_desc.layer_idx = desc->u.TextureCubeArray.First2DArrayFace; - vkd3d_desc.layer_count = 6 * desc->u.TextureCubeArray.NumCubes; + vkd3d_desc.layer_count = desc->u.TextureCubeArray.NumCubes; + if (vkd3d_desc.layer_count != VK_REMAINING_ARRAY_LAYERS) + vkd3d_desc.layer_count *= 6; if (desc->u.TextureCubeArray.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.TextureCubeArray.ResourceMinLODClamp); break; diff --git a/tests/d3d12.c b/tests/d3d12.c index 49e7a78..25c2fdf 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -10845,16 +10845,20 @@ static void test_cube_maps(void) const D3D12_SHADER_BYTECODE *ps; unsigned int miplevel_count; unsigned int array_size; + unsigned int cube_count; } ps_tests[] = { - {&ps_cube, 1, 6}, - {&ps_cube, 2, 6}, - {&ps_cube, 3, 6}, + {&ps_cube, 1, 6, 1}, + {&ps_cube, 2, 6, 1}, + {&ps_cube, 3, 6, 1}, + {&ps_cube, 3, 6, ~0u}, - {&ps_cube_array, 1, 12}, - {&ps_cube_array, 2, 12}, - {&ps_cube_array, 3, 12}, + {&ps_cube_array, 1, 12, 2}, + {&ps_cube_array, 1, 12, ~0u}, + {&ps_cube_array, 2, 12, 2}, + {&ps_cube_array, 3, 12, 2}, + {&ps_cube_array, 3, 12, ~0u}, }; memset(&desc, 0, sizeof(desc)); @@ -10913,7 +10917,7 @@ static void test_cube_maps(void) srv_desc.TextureCubeArray.MostDetailedMip = 0; srv_desc.TextureCubeArray.MipLevels = test->miplevel_count; srv_desc.TextureCubeArray.First2DArrayFace = 0; - srv_desc.TextureCubeArray.NumCubes = test->array_size / 6; + srv_desc.TextureCubeArray.NumCubes = test->cube_count; srv_desc.TextureCubeArray.ResourceMinLODClamp = 0.0f; } ID3D12Device_CreateShaderResourceView(context.device, texture, &srv_desc, cpu_handle);

1 0

Sebastian Lackner : server: Support FILE_SKIP_COMPLETION_PORT_ON_SUCCESS on client-side asyncs.
by Alexandre Julliard Oct. 25, 2018

Oct. 25, 2018

Module: wine Branch: master Commit: 18e074b0f30e8067c0901979308e961627b182a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18e074b0f30e8067c0901979… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 25 14:56:24 2018 +0200 server: Support FILE_SKIP_COMPLETION_PORT_ON_SUCCESS on client-side asyncs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38960 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 4 ---- dlls/ws2_32/socket.c | 15 ++++++++------- include/wine/server_protocol.h | 4 ++-- server/fd.c | 2 +- server/protocol.def | 1 + server/request.h | 1 + server/trace.c | 1 + 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index db077d6..a4ae64f 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3444,9 +3444,7 @@ static void test_file_completion_information(void) pov = (void *)0xdeadbeef; ret = GetQueuedCompletionStatus(port, &num_bytes, &key, &pov, 500); - todo_wine ok(!ret, "GetQueuedCompletionStatus succeeded\n"); - todo_wine ok(pov == NULL, "expected NULL, got %p\n", pov); } else @@ -3474,9 +3472,7 @@ static void test_file_completion_information(void) pov = (void *)0xdeadbeef; ret = GetQueuedCompletionStatus(port, &num_bytes, &key, &pov, 1000); - todo_wine ok(!ret, "GetQueuedCompletionStatus succeeded\n"); - todo_wine ok(pov == NULL, "expected NULL, got %p\n", pov); } else diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 164a48c..df068fe 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -642,7 +642,7 @@ static int ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, in int WSAIOCTL_GetInterfaceCount(void); int WSAIOCTL_GetInterfaceName(int intNumber, char *intName); -static void WS_AddCompletion( SOCKET sock, ULONG_PTR CompletionValue, NTSTATUS CompletionStatus, ULONG Information ); +static void WS_AddCompletion( SOCKET sock, ULONG_PTR CompletionValue, NTSTATUS CompletionStatus, ULONG Information, BOOL force ); #define MAP_OPTION(opt) { WS_##opt, opt } @@ -2459,7 +2459,7 @@ static NTSTATUS WS2_async_accept_recv( void *user, IO_STATUS_BLOCK *iosb, NTSTAT return status; if (wsa->cvalue) - WS_AddCompletion( HANDLE2SOCKET(wsa->listen_socket), wsa->cvalue, iosb->u.Status, iosb->Information ); + WS_AddCompletion( HANDLE2SOCKET(wsa->listen_socket), wsa->cvalue, iosb->u.Status, iosb->Information, TRUE ); release_async_io( &wsa->io ); return status; @@ -3591,7 +3591,7 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n { ov->Internal = _get_sock_error(s, FD_CONNECT_BIT); ov->InternalHigh = 0; - if (cvalue) WS_AddCompletion( s, cvalue, ov->Internal, ov->InternalHigh ); + if (cvalue) WS_AddCompletion( s, cvalue, ov->Internal, ov->InternalHigh, FALSE ); if (ov->hEvent) NtSetEvent( ov->hEvent, NULL ); status = STATUS_PENDING; } @@ -5082,7 +5082,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID overlapped->Internal = status; overlapped->InternalHigh = total; if (overlapped->hEvent) NtSetEvent( overlapped->hEvent, NULL ); - if (cvalue) WS_AddCompletion( HANDLE2SOCKET(s), cvalue, status, total ); + if (cvalue) WS_AddCompletion( HANDLE2SOCKET(s), cvalue, status, total, FALSE ); } if (!status) @@ -5477,7 +5477,7 @@ int WINAPI WSAPoll(WSAPOLLFD *wfds, ULONG count, int timeout) /* helper to send completion messages for client-only i/o operation case */ static void WS_AddCompletion( SOCKET sock, ULONG_PTR CompletionValue, NTSTATUS CompletionStatus, - ULONG Information ) + ULONG Information, BOOL async ) { SERVER_START_REQ( add_fd_completion ) { @@ -5485,6 +5485,7 @@ static void WS_AddCompletion( SOCKET sock, ULONG_PTR CompletionValue, NTSTATUS C req->cvalue = CompletionValue; req->status = CompletionStatus; req->information = Information; + req->async = async; wine_server_call( req ); } SERVER_END_REQ; @@ -5629,7 +5630,7 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, if (lpNumberOfBytesSent) *lpNumberOfBytesSent = n; if (!wsa->completion_func) { - if (cvalue) WS_AddCompletion( s, cvalue, STATUS_SUCCESS, n ); + if (cvalue) WS_AddCompletion( s, cvalue, STATUS_SUCCESS, n, FALSE ); if (lpOverlapped->hEvent) SetEvent( lpOverlapped->hEvent ); HeapFree( GetProcessHeap(), 0, wsa ); } @@ -8046,7 +8047,7 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, iosb->Information = n; if (!wsa->completion_func) { - if (cvalue) WS_AddCompletion( s, cvalue, STATUS_SUCCESS, n ); + if (cvalue) WS_AddCompletion( s, cvalue, STATUS_SUCCESS, n, FALSE ); if (lpOverlapped->hEvent) SetEvent( lpOverlapped->hEvent ); HeapFree( GetProcessHeap(), 0, wsa ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index d7e9119..0e85d1a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5373,7 +5373,7 @@ struct add_fd_completion_request apc_param_t cvalue; apc_param_t information; unsigned int status; - char __pad_36[4]; + int async; }; struct add_fd_completion_reply { @@ -6546,6 +6546,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 569 +#define SERVER_PROTOCOL_VERSION 570 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/fd.c b/server/fd.c index 06778fe..117fad8 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2611,7 +2611,7 @@ DECL_HANDLER(add_fd_completion) struct fd *fd = get_handle_fd_obj( current->process, req->handle, 0 ); if (fd) { - if (fd->completion) + if (fd->completion && (req->async || !(fd->comp_flags & FILE_SKIP_COMPLETION_PORT_ON_SUCCESS))) add_completion( fd->completion, fd->comp_key, req->cvalue, req->status, req->information ); release_object( fd ); } diff --git a/server/protocol.def b/server/protocol.def index 08fcf8c..6e02fbc 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3697,6 +3697,7 @@ struct handle_info apc_param_t cvalue; /* completion value */ apc_param_t information; /* IO_STATUS_BLOCK Information */ unsigned int status; /* completion status */ + int async; /* completion is an async result */ @END diff --git a/server/request.h b/server/request.h index e24f125..4610ca6 100644 --- a/server/request.h +++ b/server/request.h @@ -2331,6 +2331,7 @@ C_ASSERT( FIELD_OFFSET(struct add_fd_completion_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct add_fd_completion_request, cvalue) == 16 ); C_ASSERT( FIELD_OFFSET(struct add_fd_completion_request, information) == 24 ); C_ASSERT( FIELD_OFFSET(struct add_fd_completion_request, status) == 32 ); +C_ASSERT( FIELD_OFFSET(struct add_fd_completion_request, async) == 36 ); C_ASSERT( sizeof(struct add_fd_completion_request) == 40 ); C_ASSERT( FIELD_OFFSET(struct set_fd_completion_mode_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_fd_completion_mode_request, flags) == 16 ); diff --git a/server/trace.c b/server/trace.c index 39743d4..9a84067 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4387,6 +4387,7 @@ static void dump_add_fd_completion_request( const struct add_fd_completion_reque dump_uint64( ", cvalue=", &req->cvalue ); dump_uint64( ", information=", &req->information ); fprintf( stderr, ", status=%08x", req->status ); + fprintf( stderr, ", async=%d", req->async ); } static void dump_set_fd_completion_mode_request( const struct set_fd_completion_mode_request *req )

1 0

Alexandre Julliard : ntdll: Convert PE header to 64-bit when loading a 32-bit IL-only module.
by Alexandre Julliard Oct. 25, 2018

Oct. 25, 2018

Module: wine Branch: master Commit: 926dd780697852b375ec0a193c762e7723a3f5e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=926dd780697852b375ec0a19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 25 13:48:46 2018 +0200 ntdll: Convert PE header to 64-bit when loading a 32-bit IL-only module. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 51 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 31168c0..c5e8d0d 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1921,6 +1921,51 @@ static NTSTATUS perform_relocations( void *module, SIZE_T len ) return STATUS_SUCCESS; } +#ifdef _WIN64 +/* convert PE header to 64-bit when loading a 32-bit IL-only module into a 64-bit process */ +static BOOL convert_to_pe64( HMODULE module, const pe_image_info_t *info ) +{ + static const ULONG copy_dirs[] = { IMAGE_DIRECTORY_ENTRY_RESOURCE, + IMAGE_DIRECTORY_ENTRY_SECURITY, + IMAGE_DIRECTORY_ENTRY_BASERELOC, + IMAGE_DIRECTORY_ENTRY_DEBUG, + IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR }; + IMAGE_OPTIONAL_HEADER32 hdr32 = { IMAGE_NT_OPTIONAL_HDR32_MAGIC }; + IMAGE_OPTIONAL_HEADER64 hdr64 = { IMAGE_NT_OPTIONAL_HDR64_MAGIC }; + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( module ); + SIZE_T hdr_size = min( sizeof(hdr32), nt->FileHeader.SizeOfOptionalHeader ); + IMAGE_SECTION_HEADER *sec = (IMAGE_SECTION_HEADER *)((char *)&nt->OptionalHeader + hdr_size); + SIZE_T size = (char *)(nt + 1) + nt->FileHeader.NumberOfSections * sizeof(*sec) - (char *)module; + void *addr = module; + ULONG i, old_prot; + + TRACE( "%p\n", module ); + + if (size > info->header_size) return FALSE; + if (NtProtectVirtualMemory( NtCurrentProcess(), &addr, &size, PAGE_READWRITE, &old_prot )) + return FALSE; + + memcpy( &hdr32, &nt->OptionalHeader, hdr_size ); + memcpy( &hdr64, &hdr32, offsetof( IMAGE_OPTIONAL_HEADER64, SizeOfStackReserve )); + hdr64.Magic = IMAGE_NT_OPTIONAL_HDR64_MAGIC; + hdr64.AddressOfEntryPoint = 0; + hdr64.ImageBase = hdr32.ImageBase; + hdr64.SizeOfStackReserve = hdr32.SizeOfStackReserve; + hdr64.SizeOfStackCommit = hdr32.SizeOfStackCommit; + hdr64.SizeOfHeapReserve = hdr32.SizeOfHeapReserve; + hdr64.SizeOfHeapCommit = hdr32.SizeOfHeapCommit; + hdr64.LoaderFlags = hdr32.LoaderFlags; + hdr64.NumberOfRvaAndSizes = hdr32.NumberOfRvaAndSizes; + for (i = 0; i < ARRAY_SIZE( copy_dirs ); i++) + hdr64.DataDirectory[copy_dirs[i]] = hdr32.DataDirectory[copy_dirs[i]]; + + memmove( nt + 1, sec, nt->FileHeader.NumberOfSections * sizeof(*sec) ); + nt->FileHeader.SizeOfOptionalHeader = sizeof(hdr64); + nt->OptionalHeader = hdr64; + NtProtectVirtualMemory( NtCurrentProcess(), &addr, &size, old_prot, &old_prot ); + return TRUE; +} +#endif /* On WoW64 setups, an image mapping can also be created for the other 32/64 CPU */ /* but it cannot necessarily be loaded as a dll, so we need some additional checks */ @@ -1932,18 +1977,18 @@ static BOOL is_valid_binary( HMODULE module, const pe_image_info_t *info ) return info->machine == IMAGE_FILE_MACHINE_ARM || info->machine == IMAGE_FILE_MACHINE_THUMB || info->machine == IMAGE_FILE_MACHINE_ARMNT; -#elif defined(__x86_64__) || defined(__aarch64__) /* support 32-bit IL-only images on 64-bit */ - const IMAGE_COR20_HEADER *cor_header; - DWORD size; - +#elif defined(_WIN64) /* support 32-bit IL-only images on 64-bit */ #ifdef __x86_64__ if (info->machine == IMAGE_FILE_MACHINE_AMD64) return TRUE; #else if (info->machine == IMAGE_FILE_MACHINE_ARM64) return TRUE; #endif if (!info->contains_code) return TRUE; - cor_header = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR, &size ); - if (cor_header && (cor_header->Flags & COMIMAGE_FLAGS_ILONLY)) return TRUE; + if (info->image_flags & IMAGE_FLAGS_ComPlusNativeReady) + { + if (!convert_to_pe64( module, info )) return FALSE; + } + if (info->image_flags & IMAGE_FLAGS_ComPlusILOnly) return TRUE; return FALSE; #else return FALSE; /* no wow64 support on other platforms */

1 0

Jacek Caban : ntdll/tests: Added more FILE_SKIP_COMPLETION_PORT_ON_SUCCESS tests.
by Alexandre Julliard Oct. 25, 2018

Oct. 25, 2018

Module: wine Branch: master Commit: 4be482bc825c419acd3b524b4825e03998040bd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4be482bc825c419acd3b524b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 25 14:55:57 2018 +0200 ntdll/tests: Added more FILE_SKIP_COMPLETION_PORT_ON_SUCCESS tests. Based on a patch by Sebastian Lackner. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 38 +++++++++++ dlls/ntdll/tests/pipe.c | 169 +++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 198 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4be482bc825c419acd3b…

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard Oct. 25, 2018

Oct. 25, 2018

Module: wine Branch: master Commit: f1ccd02608559b2c6009ea741a8583354c398875 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1ccd02608559b2c6009ea74… Author: Kim Malmo <berencamlost(a)msn.com> Date: Thu Oct 25 10:02:51 2018 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 7580e4e..b861c2b 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-10-07 20:50+0200\n" +"PO-Revision-Date: 2018-10-25 11:58+0200\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -308,25 +308,23 @@ msgstr "Avbryter..." #: browseui.rc:29 msgid "%1!u! %2 remaining" -msgstr "" +msgstr "%1!u! %2 gjenstår" #: browseui.rc:30 msgid "%1!u! %2 and %3!u! %4 remaining" -msgstr "" +msgstr "%1!u! %2 og %3!u! %4 gjenstår" #: browseui.rc:31 -#, fuzzy -#| msgid "&Seconds" msgid "seconds" -msgstr "&Sekunder" +msgstr "sekunder" #: browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "minutter" #: browseui.rc:33 msgid "hours" -msgstr "" +msgstr "timer" #: comctl32.rc:68 winefile.rc:157 msgid "Properties for %s"

1 0

Michael Stefaniuc : include: Use the ARRAY_SIZE() macro in debug.h.
by Alexandre Julliard Oct. 25, 2018

Oct. 25, 2018

Module: wine Branch: master Commit: af3992374e530a037e650b45194f933c5406038f URL: https://source.winehq.org/git/wine.git/?a=commit;h=af3992374e530a037e650b45… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 25 15:47:28 2018 +0200 include: Use the ARRAY_SIZE() macro in debug.h. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/debug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index fb0d6bb..066873a 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -254,7 +254,7 @@ static inline const char *wine_dbgstr_vt( VARTYPE vt ) if (vt & ~VT_TYPEMASK) return wine_dbg_sprintf( "%s%s", wine_dbgstr_vt(vt&VT_TYPEMASK), variant_flags[vt>>12] ); - if (vt < sizeof(variant_types)/sizeof(*variant_types)) + if (vt < ARRAY_SIZE(variant_types)) return variant_types[vt]; if (vt == VT_BSTR_BLOB)

1 0

Dmitry Timoshkov : crypt32: Forward CryptDecodeObject to CryptDecodeObjectEx.
by Alexandre Julliard Oct. 25, 2018

Oct. 25, 2018

Module: wine Branch: master Commit: 98fad7df790f2164236306cae99bcd3b44d8963d URL: https://source.winehq.org/git/wine.git/?a=commit;h=98fad7df790f2164236306ca… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Oct 25 14:50:28 2018 +0300 crypt32: Forward CryptDecodeObject to CryptDecodeObjectEx. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/decode.c | 44 ++------------------------------------------ 1 file changed, 2 insertions(+), 42 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index b177872..06d456a 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -6276,48 +6276,8 @@ BOOL WINAPI CryptDecodeObject(DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo) { - BOOL ret = FALSE; - CryptDecodeObjectFunc pCryptDecodeObject = NULL; - CryptDecodeObjectExFunc pCryptDecodeObjectEx = NULL; - HCRYPTOIDFUNCADDR hFunc = NULL; - - TRACE_(crypt)("(0x%08x, %s, %p, %d, 0x%08x, %p, %p)\n", dwCertEncodingType, - debugstr_a(lpszStructType), pbEncoded, cbEncoded, dwFlags, - pvStructInfo, pcbStructInfo); - - if (!pvStructInfo && !pcbStructInfo) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - if (cbEncoded > MAX_ENCODED_LEN) - { - SetLastError(CRYPT_E_ASN1_LARGE); - return FALSE; - } - - if (!(pCryptDecodeObjectEx = CRYPT_GetBuiltinDecoder(dwCertEncodingType, - lpszStructType))) - { - TRACE_(crypt)("OID %s not found or unimplemented, looking for DLL\n", - debugstr_a(lpszStructType)); - pCryptDecodeObject = CRYPT_LoadDecoderFunc(dwCertEncodingType, - lpszStructType, &hFunc); - if (!pCryptDecodeObject) - pCryptDecodeObjectEx = CRYPT_LoadDecoderExFunc(dwCertEncodingType, - lpszStructType, &hFunc); - } - if (pCryptDecodeObject) - ret = pCryptDecodeObject(dwCertEncodingType, lpszStructType, - pbEncoded, cbEncoded, dwFlags, pvStructInfo, pcbStructInfo); - else if (pCryptDecodeObjectEx) - ret = pCryptDecodeObjectEx(dwCertEncodingType, lpszStructType, - pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, - pvStructInfo, pcbStructInfo); - if (hFunc) - CryptFreeOIDFunctionAddress(hFunc, 0); - TRACE_(crypt)("returning %d\n", ret); - return ret; + return CryptDecodeObjectEx(dwCertEncodingType, lpszStructType, + pbEncoded, cbEncoded, dwFlags, NULL, pvStructInfo, pcbStructInfo); } BOOL WINAPI CryptDecodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType,

1 0