October 2018 - Wine-Devel - list.winehq.org

[PATCH 3/3] rpcrt4: Use the standard ARRAY_SIZE() macro
by Michael Stefaniuc Oct. 19, 2018

Oct. 19, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index ffe8b77cab..b98bf9e0ae 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -54,8 +54,6 @@ #define DEFAULT_NCACN_HTTP_TIMEOUT (60 * 1000) -#define ARRAYSIZE(a) (sizeof((a)) / sizeof((a)[0])) - WINE_DEFAULT_DEBUG_CHANNEL(rpc); static RpcConnection *rpcrt4_spawn_connection(RpcConnection *old_connection); @@ -2397,11 +2395,11 @@ static const struct } auth_schemes[] = { - { basicW, ARRAYSIZE(basicW) - 1, RPC_C_HTTP_AUTHN_SCHEME_BASIC }, - { ntlmW, ARRAYSIZE(ntlmW) - 1, RPC_C_HTTP_AUTHN_SCHEME_NTLM }, - { passportW, ARRAYSIZE(passportW) - 1, RPC_C_HTTP_AUTHN_SCHEME_PASSPORT }, - { digestW, ARRAYSIZE(digestW) - 1, RPC_C_HTTP_AUTHN_SCHEME_DIGEST }, - { negotiateW, ARRAYSIZE(negotiateW) - 1, RPC_C_HTTP_AUTHN_SCHEME_NEGOTIATE } + { basicW, ARRAY_SIZE(basicW) - 1, RPC_C_HTTP_AUTHN_SCHEME_BASIC }, + { ntlmW, ARRAY_SIZE(ntlmW) - 1, RPC_C_HTTP_AUTHN_SCHEME_NTLM }, + { passportW, ARRAY_SIZE(passportW) - 1, RPC_C_HTTP_AUTHN_SCHEME_PASSPORT }, + { digestW, ARRAY_SIZE(digestW) - 1, RPC_C_HTTP_AUTHN_SCHEME_DIGEST }, + { negotiateW, ARRAY_SIZE(negotiateW) - 1, RPC_C_HTTP_AUTHN_SCHEME_NEGOTIATE } }; static DWORD auth_scheme_from_header( const WCHAR *header ) @@ -3260,7 +3258,7 @@ static const struct protseq_ops protseq_list[] = const struct protseq_ops *rpcrt4_get_protseq_ops(const char *protseq) { unsigned int i; - for(i=0; i<ARRAYSIZE(protseq_list); i++) + for(i = 0; i < ARRAY_SIZE(protseq_list); i++) if (!strcmp(protseq_list[i].name, protseq)) return &protseq_list[i]; return NULL; @@ -3269,7 +3267,7 @@ const struct protseq_ops *rpcrt4_get_protseq_ops(const char *protseq) static const struct connection_ops *rpcrt4_get_conn_protseq_ops(const char *protseq) { unsigned int i; - for(i=0; i<ARRAYSIZE(conn_protseq_list); i++) + for(i = 0; i < ARRAY_SIZE(conn_protseq_list); i++) if (!strcmp(conn_protseq_list[i].name, protseq)) return &conn_protseq_list[i]; return NULL; @@ -3507,7 +3505,7 @@ RPC_STATUS RpcTransport_ParseTopOfTower(const unsigned char *tower_data, (floor4->count_lhs != sizeof(floor4->protid))) return EPT_S_NOT_REGISTERED; - for(i = 0; i < ARRAYSIZE(conn_protseq_list); i++) + for(i = 0; i < ARRAY_SIZE(conn_protseq_list); i++) if ((protocol_floor->protid == conn_protseq_list[i].epm_protocols[0]) && (floor4->protid == conn_protseq_list[i].epm_protocols[1])) { @@ -3613,12 +3611,12 @@ RPC_STATUS WINAPI RpcNetworkInqProtseqsW( RPC_PROTSEQ_VECTORW** protseqs ) TRACE("(%p)\n", protseqs); - *protseqs = HeapAlloc(GetProcessHeap(), 0, sizeof(RPC_PROTSEQ_VECTORW)+(sizeof(unsigned short*)*ARRAYSIZE(protseq_list))); + *protseqs = HeapAlloc(GetProcessHeap(), 0, sizeof(RPC_PROTSEQ_VECTORW)+(sizeof(unsigned short*)*ARRAY_SIZE(protseq_list))); if (!*protseqs) goto end; pvector = *protseqs; pvector->Count = 0; - for (i = 0; i < ARRAYSIZE(protseq_list); i++) + for (i = 0; i < ARRAY_SIZE(protseq_list); i++) { pvector->Protseq[i] = HeapAlloc(GetProcessHeap(), 0, (strlen(protseq_list[i].name)+1)*sizeof(unsigned short)); if (pvector->Protseq[i] == NULL) @@ -3646,12 +3644,12 @@ RPC_STATUS WINAPI RpcNetworkInqProtseqsA(RPC_PROTSEQ_VECTORA** protseqs) TRACE("(%p)\n", protseqs); - *protseqs = HeapAlloc(GetProcessHeap(), 0, sizeof(RPC_PROTSEQ_VECTORW)+(sizeof(unsigned char*)*ARRAYSIZE(protseq_list))); + *protseqs = HeapAlloc(GetProcessHeap(), 0, sizeof(RPC_PROTSEQ_VECTORW)+(sizeof(unsigned char*)*ARRAY_SIZE(protseq_list))); if (!*protseqs) goto end; pvector = *protseqs; pvector->Count = 0; - for (i = 0; i < ARRAYSIZE(protseq_list); i++) + for (i = 0; i < ARRAY_SIZE(protseq_list); i++) { pvector->Protseq[i] = HeapAlloc(GetProcessHeap(), 0, strlen(protseq_list[i].name)+1); if (pvector->Protseq[i] == NULL) -- 2.14.4

1 0

[PATCH 2/3] rpcrt4: Use the ARRAY_SIZE() macro
by Michael Stefaniuc Oct. 19, 2018

Oct. 19, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/rpcrt4/cpsf.c | 2 +- dlls/rpcrt4/rpc_epmap.c | 4 ++-- dlls/rpcrt4/rpc_message.c | 6 +++--- dlls/rpcrt4/rpc_transport.c | 21 +++++++++++---------- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/rpcrt4/cpsf.c b/dlls/rpcrt4/cpsf.c index 9375c40fa4..e92d226498 100644 --- a/dlls/rpcrt4/cpsf.c +++ b/dlls/rpcrt4/cpsf.c @@ -279,7 +279,7 @@ HRESULT WINAPI NdrDllRegisterProxy(HMODULE hDll, /* register clsid to point to module */ strcpyW( keyname, clsidW ); strcatW( keyname, clsid ); - len = GetModuleFileNameW(hDll, module, sizeof(module)/sizeof(WCHAR)); + len = GetModuleFileNameW(hDll, module, ARRAY_SIZE(module)); if (len && len < sizeof(module)) { TRACE("registering CLSID %s => %s\n", debugstr_w(clsid), debugstr_w(module)); if (RegCreateKeyW(HKEY_CLASSES_ROOT, keyname, &key) == ERROR_SUCCESS) { diff --git a/dlls/rpcrt4/rpc_epmap.c b/dlls/rpcrt4/rpc_epmap.c index 1380bf3428..803c9f851b 100644 --- a/dlls/rpcrt4/rpc_epmap.c +++ b/dlls/rpcrt4/rpc_epmap.c @@ -148,7 +148,7 @@ static RPC_STATUS get_epm_handle_client(RPC_BINDING_HANDLE handle, RPC_BINDING_H if (bind->server) return RPC_S_INVALID_BINDING; - for (i = 0; i < sizeof(epm_endpoints)/sizeof(epm_endpoints[0]); i++) + for (i = 0; i < ARRAY_SIZE(epm_endpoints); i++) if (!strcmp(bind->Protseq, epm_endpoints[i].protseq)) pszEndpoint = epm_endpoints[i].endpoint; @@ -469,7 +469,7 @@ RPC_STATUS WINAPI RpcEpResolveBinding( RPC_BINDING_HANDLE Binding, RPC_IF_HANDLE { __TRY { - ept_map(handle, &uuid, tower, &entry_handle, sizeof(towers)/sizeof(towers[0]), &num_towers, towers, &status2); + ept_map(handle, &uuid, tower, &entry_handle, ARRAY_SIZE(towers), &num_towers, towers, &status2); /* FIXME: translate status2? */ } __EXCEPT(rpc_filter) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 3eea88a714..59cd438a26 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -63,8 +63,8 @@ DWORD RPCRT4_GetHeaderSize(const RpcPktHdr *Header) 0, 0, sizeof(Header->auth3), 0, 0, 0, sizeof(Header->http) }; ULONG ret = 0; - - if (Header->common.ptype < sizeof(header_sizes) / sizeof(header_sizes[0])) { + + if (Header->common.ptype < ARRAY_SIZE(header_sizes)) { ret = header_sizes[Header->common.ptype]; if (ret == 0) FIXME("unhandled packet type %u\n", Header->common.ptype); @@ -691,7 +691,7 @@ RPC_STATUS RPCRT4_default_secure_packet(RpcConnection *Connection, SECURITY_STATUS sec_status; message.ulVersion = SECBUFFER_VERSION; - message.cBuffers = sizeof(buffers)/sizeof(buffers[0]); + message.cBuffers = ARRAY_SIZE(buffers); message.pBuffers = buffers; buffers[0].cbBuffer = hdr_size; diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 26641fd274..ffe8b77cab 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1919,9 +1919,9 @@ static RPC_STATUS rpcrt4_http_internet_connect(RpcConnection_http *httpc) static const WCHAR wszRpcProxy[] = {'R','p','c','P','r','o','x','y','=',0}; static const WCHAR wszHttpProxy[] = {'H','t','t','p','P','r','o','x','y','=',0}; - if (!strncmpiW(option, wszRpcProxy, sizeof(wszRpcProxy)/sizeof(wszRpcProxy[0])-1)) + if (!strncmpiW(option, wszRpcProxy, ARRAY_SIZE(wszRpcProxy)-1)) { - const WCHAR *value_start = option + sizeof(wszRpcProxy)/sizeof(wszRpcProxy[0])-1; + const WCHAR *value_start = option + ARRAY_SIZE(wszRpcProxy)-1; const WCHAR *value_end; const WCHAR *p; @@ -1938,9 +1938,9 @@ static RPC_STATUS rpcrt4_http_internet_connect(RpcConnection_http *httpc) TRACE("RpcProxy value is %s\n", debugstr_wn(value_start, value_end-value_start)); servername = RPCRT4_strndupW(value_start, value_end-value_start); } - else if (!strncmpiW(option, wszHttpProxy, sizeof(wszHttpProxy)/sizeof(wszHttpProxy[0])-1)) + else if (!strncmpiW(option, wszHttpProxy, ARRAY_SIZE(wszHttpProxy)-1)) { - const WCHAR *value_start = option + sizeof(wszHttpProxy)/sizeof(wszHttpProxy[0])-1; + const WCHAR *value_start = option + ARRAY_SIZE(wszHttpProxy)-1; const WCHAR *value_end; value_end = strchrW(option, ','); @@ -2068,7 +2068,7 @@ static RPC_STATUS insert_content_length_header(HINTERNET request, DWORD len) { static const WCHAR fmtW[] = {'C','o','n','t','e','n','t','-','L','e','n','g','t','h',':',' ','%','u','\r','\n',0}; - WCHAR header[sizeof(fmtW) / sizeof(fmtW[0]) + 10]; + WCHAR header[ARRAY_SIZE(fmtW) + 10]; sprintfW(header, fmtW, len); if ((HttpAddRequestHeadersW(request, header, -1, HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD))) return RPC_S_OK; @@ -2581,7 +2581,7 @@ static RPC_STATUS insert_authorization_header(HINTERNET request, ULONG scheme, c static const WCHAR basicW[] = {'B','a','s','i','c',' '}; static const WCHAR negotiateW[] = {'N','e','g','o','t','i','a','t','e',' '}; static const WCHAR ntlmW[] = {'N','T','L','M',' '}; - int scheme_len, auth_len = sizeof(authW) / sizeof(authW[0]), len = ((data_len + 2) * 4) / 3; + int scheme_len, auth_len = ARRAY_SIZE(authW), len = ((data_len + 2) * 4) / 3; const WCHAR *scheme_str; WCHAR *header, *ptr; RPC_STATUS status = RPC_S_SERVER_UNAVAILABLE; @@ -2590,15 +2590,15 @@ static RPC_STATUS insert_authorization_header(HINTERNET request, ULONG scheme, c { case RPC_C_HTTP_AUTHN_SCHEME_BASIC: scheme_str = basicW; - scheme_len = sizeof(basicW) / sizeof(basicW[0]); + scheme_len = ARRAY_SIZE(basicW); break; case RPC_C_HTTP_AUTHN_SCHEME_NEGOTIATE: scheme_str = negotiateW; - scheme_len = sizeof(negotiateW) / sizeof(negotiateW[0]); + scheme_len = ARRAY_SIZE(negotiateW); break; case RPC_C_HTTP_AUTHN_SCHEME_NTLM: scheme_str = ntlmW; - scheme_len = sizeof(ntlmW) / sizeof(ntlmW[0]); + scheme_len = ARRAY_SIZE(ntlmW); break; default: ERR("unknown scheme %u\n", scheme); @@ -2779,7 +2779,8 @@ static RPC_STATUS rpcrt4_ncacn_http_open(RpcConnection* Connection) if (!url) return RPC_S_OUT_OF_MEMORY; memcpy(url, wszRpcProxyPrefix, sizeof(wszRpcProxyPrefix)); - MultiByteToWideChar(CP_ACP, 0, Connection->NetworkAddr, -1, url+sizeof(wszRpcProxyPrefix)/sizeof(wszRpcProxyPrefix[0])-1, strlen(Connection->NetworkAddr)+1); + MultiByteToWideChar(CP_ACP, 0, Connection->NetworkAddr, -1, url+ARRAY_SIZE(wszRpcProxyPrefix)-1, + strlen(Connection->NetworkAddr)+1); strcatW(url, wszColon); MultiByteToWideChar(CP_ACP, 0, Connection->Endpoint, -1, url+strlenW(url), strlen(Connection->Endpoint)+1); -- 2.14.4

1 0

[PATCH 1/3] rpcrt4: Avoid a variable holding an ARRAY_SIZE result
by Michael Stefaniuc Oct. 19, 2018

Oct. 19, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 4fd091ce6a..26641fd274 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2403,12 +2403,11 @@ auth_schemes[] = { digestW, ARRAYSIZE(digestW) - 1, RPC_C_HTTP_AUTHN_SCHEME_DIGEST }, { negotiateW, ARRAYSIZE(negotiateW) - 1, RPC_C_HTTP_AUTHN_SCHEME_NEGOTIATE } }; -static const unsigned int num_auth_schemes = sizeof(auth_schemes)/sizeof(auth_schemes[0]); static DWORD auth_scheme_from_header( const WCHAR *header ) { unsigned int i; - for (i = 0; i < num_auth_schemes; i++) + for (i = 0; i < ARRAY_SIZE(auth_schemes); i++) { if (!strncmpiW( header, auth_schemes[i].str, auth_schemes[i].len ) && (header[auth_schemes[i].len] == ' ' || !header[auth_schemes[i].len])) return auth_schemes[i].scheme; -- 2.14.4

1 0

[PATCH vkd3d 3/4] vkd3d-shader: Implement conservative depth output.
by Józef Kucia Oct. 19, 2018

Oct. 19, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 2 ++ libs/vkd3d-shader/spirv.c | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 5daf07a65f00..eb1729c9bcf2 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1567,6 +1567,8 @@ static bool shader_sm4_is_scalar_register(const struct vkd3d_shader_register *re switch (reg->type) { case VKD3DSPR_DEPTHOUT: + case VKD3DSPR_DEPTHOUTGE: + case VKD3DSPR_DEPTHOUTLE: case VKD3DSPR_GSINSTID: case VKD3DSPR_LOCALTHREADINDEX: case VKD3DSPR_OUTPOINTID: diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f1eea02027e7..63ef7c2a807b 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2246,6 +2246,8 @@ static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buf snprintf(buffer, buffer_size, "o%u", idx); break; case VKD3DSPR_DEPTHOUT: + case VKD3DSPR_DEPTHOUTGE: + case VKD3DSPR_DEPTHOUTLE: snprintf(buffer, buffer_size, "oDepth"); break; case VKD3DSPR_TESSCOORD: @@ -2470,6 +2472,8 @@ static uint32_t vkd3d_dxbc_compiler_get_register_id(struct vkd3d_dxbc_compiler * case VKD3DSPR_OUTPUT: case VKD3DSPR_COLOROUT: case VKD3DSPR_DEPTHOUT: + case VKD3DSPR_DEPTHOUTGE: + case VKD3DSPR_DEPTHOUTLE: case VKD3DSPR_CONSTBUFFER: case VKD3DSPR_IMMCONSTBUFFER: case VKD3DSPR_SAMPLER: @@ -3056,8 +3060,26 @@ vkd3d_register_builtins[] = {VKD3DSPR_TESSCOORD, {VKD3D_TYPE_FLOAT, 3, SpvBuiltInTessCoord}}, {VKD3DSPR_DEPTHOUT, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInFragDepth}}, + {VKD3DSPR_DEPTHOUTGE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInFragDepth}}, + {VKD3DSPR_DEPTHOUTLE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInFragDepth}}, }; +static void vkd3d_dxbc_compiler_emit_register_execution_mode(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_register *reg) +{ + switch (reg->type) + { + case VKD3DSPR_DEPTHOUTGE: + vkd3d_dxbc_compiler_emit_execution_mode(compiler, SpvExecutionModeDepthGreater, NULL, 0); + break; + case VKD3DSPR_DEPTHOUTLE: + vkd3d_dxbc_compiler_emit_execution_mode(compiler, SpvExecutionModeDepthLess, NULL, 0); + break; + default: + return; + } +} + static const struct vkd3d_spirv_builtin *get_spirv_builtin_for_sysval( const struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_input_sysval_semantic sysval) { @@ -3458,6 +3480,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler if (builtin) { vkd3d_dxbc_compiler_decorate_builtin(compiler, id, builtin->spirv_builtin); + vkd3d_dxbc_compiler_emit_register_execution_mode(compiler, &dst->reg); if (component_idx) FIXME("Unhandled component index %u.\n", component_idx); } -- 2.18.1

2 1

[PATCH vkd3d 4/4] vkd3d-shader: Simplify DepthReplacing execution mode handling.
by Józef Kucia Oct. 19, 2018

Oct. 19, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 63ef7c2a807b..8508741652ff 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -248,14 +248,6 @@ struct vkd3d_spirv_builder struct vkd3d_spirv_stream execution_mode_stream; /* execution mode instructions */ - union - { - struct - { - bool depth_replacing; - } fragment; - } u; - struct vkd3d_spirv_stream original_function_stream; struct vkd3d_spirv_stream insertion_stream; size_t insertion_location; @@ -332,13 +324,6 @@ static void vkd3d_spirv_set_execution_model(struct vkd3d_spirv_builder *builder, } } -static void vkd3d_spirv_enable_depth_replacing(struct vkd3d_spirv_builder *builder) -{ - assert(builder->execution_model == SpvExecutionModelFragment); - - builder->u.fragment.depth_replacing = true; -} - static uint32_t vkd3d_spirv_opcode_word(SpvOp op, unsigned int word_count) { assert(!(op & ~SpvOpCodeMask)); @@ -1568,24 +1553,6 @@ static void vkd3d_spirv_builder_free(struct vkd3d_spirv_builder *builder) vkd3d_free(builder->iface); } -static void vkd3d_spirv_build_additional_execution_modes(struct vkd3d_spirv_builder *builder, - struct vkd3d_spirv_stream *stream) -{ - const uint32_t function_id = builder->main_function_id; - - switch (builder->execution_model) - { - case SpvExecutionModelFragment: - if (builder->u.fragment.depth_replacing) - vkd3d_spirv_build_op_execution_mode(stream, function_id, - SpvExecutionModeDepthReplacing, NULL, 0); - break; - - default: - break; - } -} - static bool vkd3d_spirv_compile_module(struct vkd3d_spirv_builder *builder, struct vkd3d_shader_code *spirv) { @@ -1627,7 +1594,6 @@ static bool vkd3d_spirv_compile_module(struct vkd3d_spirv_builder *builder, /* execution mode declarations */ vkd3d_spirv_stream_append(&stream, &builder->execution_mode_stream); - vkd3d_spirv_build_additional_execution_modes(builder, &stream); vkd3d_spirv_stream_append(&stream, &builder->debug_stream); vkd3d_spirv_stream_append(&stream, &builder->annotation_stream); @@ -2922,7 +2888,7 @@ static void vkd3d_dxbc_compiler_decorate_builtin(struct vkd3d_dxbc_compiler *com builtin = SpvBuiltInFragCoord; break; case SpvBuiltInFragDepth: - vkd3d_spirv_enable_depth_replacing(builder); + vkd3d_dxbc_compiler_emit_execution_mode(compiler, SpvExecutionModeDepthReplacing, NULL, 0); break; case SpvBuiltInLayer: vkd3d_spirv_enable_capability(builder, SpvCapabilityGeometry); -- 2.18.1

2 1

[PATCH vkd3d 1/4] vkd3d: Avoid heap memory allocations while updating descriptor tables.
by Józef Kucia Oct. 19, 2018

Oct. 19, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index e17fca979a9d..d8a65622507d 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2084,13 +2084,13 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list VkPipelineBindPoint bind_point, unsigned int index, D3D12_GPU_DESCRIPTOR_HANDLE base_descriptor) { struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; + struct VkWriteDescriptorSet descriptor_writes[24], *current_descriptor_write; const struct d3d12_root_signature *root_signature = bindings->root_signature; - struct VkWriteDescriptorSet *descriptor_writes, *current_descriptor_write; const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; - struct VkDescriptorImageInfo *image_infos, *current_image_info; + struct VkDescriptorImageInfo image_infos[24], *current_image_info; const struct d3d12_root_descriptor_table *descriptor_table; const struct d3d12_root_descriptor_table_range *range; - struct d3d12_device *device = list->device; + VkDevice vk_device = list->device->vk_device; unsigned int i, j, descriptor_count; struct d3d12_desc *descriptor; @@ -2110,14 +2110,6 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list return; } - if (!(descriptor_writes = vkd3d_calloc(descriptor_count, sizeof(*descriptor_writes)))) - return; - if (!(image_infos = vkd3d_calloc(descriptor_count, sizeof(*image_infos)))) - { - vkd3d_free(descriptor_writes); - return; - } - descriptor_count = 0; current_descriptor_write = descriptor_writes; current_image_info = image_infos; @@ -2153,13 +2145,18 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list ++descriptor_count; ++current_descriptor_write; ++current_image_info; + + if (descriptor_count == ARRAY_SIZE(descriptor_writes)) + { + VK_CALL(vkUpdateDescriptorSets(vk_device, descriptor_count, descriptor_writes, 0, NULL)); + descriptor_count = 0; + current_descriptor_write = descriptor_writes; + current_image_info = image_infos; + } } } - VK_CALL(vkUpdateDescriptorSets(device->vk_device, descriptor_count, descriptor_writes, 0, NULL)); - - vkd3d_free(descriptor_writes); - vkd3d_free(image_infos); + VK_CALL(vkUpdateDescriptorSets(vk_device, descriptor_count, descriptor_writes, 0, NULL)); } static bool vk_write_descriptor_set_from_root_descriptor(VkWriteDescriptorSet *vk_descriptor_write, -- 2.18.1

2 1

[PATCH vkd3d 2/4] vkd3d-shader: Translate bufinfo instructions.
by Józef Kucia Oct. 19, 2018

Oct. 19, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 50 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index bb70dd5935a4..f1eea02027e7 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1263,6 +1263,13 @@ static uint32_t vkd3d_spirv_build_op_and(struct vkd3d_spirv_builder *builder, SpvOpBitwiseAnd, result_type, operand0, operand1); } +static uint32_t vkd3d_spirv_build_op_shift_left_logical(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t base, uint32_t shift) +{ + return vkd3d_spirv_build_op_tr2(builder, &builder->function_stream, + SpvOpShiftLeftLogical, result_type, base, shift); +} + static uint32_t vkd3d_spirv_build_op_shift_right_logical(struct vkd3d_spirv_builder *builder, uint32_t result_type, uint32_t base, uint32_t shift) { @@ -6123,6 +6130,46 @@ static void vkd3d_dxbc_compiler_emit_atomic_instruction(struct vkd3d_dxbc_compil vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, result_id); } +static void vkd3d_dxbc_compiler_emit_bufinfo(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_dst_param *dst = instruction->dst; + const struct vkd3d_shader_src_param *src = instruction->src; + uint32_t type_id, val_id, stride_id; + struct vkd3d_shader_image image; + uint32_t constituents[2]; + unsigned int write_mask; + + vkd3d_spirv_enable_capability(builder, SpvCapabilityImageQuery); + + vkd3d_dxbc_compiler_prepare_image(compiler, &image, &src->reg, VKD3D_IMAGE_FLAG_NONE); + + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); + val_id = vkd3d_spirv_build_op_image_query_size(builder, type_id, image.image_id); + write_mask = VKD3DSP_WRITEMASK_0; + + if (image.structure_stride) + { + stride_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, image.structure_stride); + constituents[0] = vkd3d_spirv_build_op_udiv(builder, type_id, val_id, stride_id); + constituents[1] = stride_id; + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, ARRAY_SIZE(constituents)); + val_id = vkd3d_spirv_build_op_composite_construct(builder, + type_id, constituents, ARRAY_SIZE(constituents)); + write_mask |= VKD3DSP_WRITEMASK_1; + } + else if (image.raw) + { + val_id = vkd3d_spirv_build_op_shift_left_logical(builder, type_id, + val_id, vkd3d_dxbc_compiler_get_constant_uint(compiler, 2)); + } + + val_id = vkd3d_dxbc_compiler_emit_swizzle_ext(compiler, + val_id, write_mask, VKD3D_TYPE_UINT, src->swizzle, dst->write_mask); + vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); +} + static void vkd3d_dxbc_compiler_emit_resinfo(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { @@ -6567,6 +6614,9 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler case VKD3DSIH_IMM_ATOMIC_XOR: vkd3d_dxbc_compiler_emit_atomic_instruction(compiler, instruction); break; + case VKD3DSIH_BUFINFO: + vkd3d_dxbc_compiler_emit_bufinfo(compiler, instruction); + break; case VKD3DSIH_RESINFO: vkd3d_dxbc_compiler_emit_resinfo(compiler, instruction); break; -- 2.18.1

2 1

[PATCH 1/4] d3drm/tests: Add tests for IDirect3DRMTexture*::InitFromFile.
by Aaryaman Vasishta Oct. 18, 2018

Oct. 18, 2018

--- dlls/d3drm/tests/d3drm.c | 79 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 73 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index f78e098fec..4ed90ca682 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -5572,6 +5572,7 @@ static void test_load_texture(void) char *filename; HRESULT hr; BOOL ret; + ULONG ref1, ref2; int i; static const struct @@ -5595,6 +5596,7 @@ static void test_load_texture(void) ok(SUCCEEDED(hr), "Failed to get IDirect3DRM2 interface, hr %#x.\n", hr); hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3); ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3 interface, hr %#x.\n", hr); + ref1 = get_refcount((IUnknown *)d3drm1); for (i = 0; i < ARRAY_SIZE(tests); ++i) { @@ -5602,24 +5604,74 @@ static void test_load_texture(void) hr = IDirect3DRM_LoadTexture(d3drm1, filename, &texture1); ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr); + ref2 = get_refcount((IUnknown *)d3drm1); + todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + + hr = IDirect3DRMTexture_InitFromFile(texture1, filename); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + /* InitFromFile seems to AddRef IDirect3DRM even if it fails. */ + if (FAILED(hr)) + IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture_GetImage(texture1); - todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); if (d3drm_img) - test_bitmap_data(i * 4, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized); + test_bitmap_data(i * 7, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized); + IDirect3DRMTexture_Release(texture1); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture, (void **)&texture1); + ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr); + hr = IDirect3DRMTexture_InitFromFile(texture1, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture_InitFromFile(texture1, ""); + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture_InitFromFile(texture1, filename); + ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#x.\n", i, hr); + d3drm_img = IDirect3DRMTexture_GetImage(texture1); + ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + test_bitmap_data(i * 7 + 1, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture_Release(texture1); hr = IDirect3DRM2_LoadTexture(d3drm2, filename, &texture2); ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr); + ref2 = get_refcount((IUnknown *)d3drm1); + todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + + hr = IDirect3DRMTexture2_InitFromFile(texture2, filename); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + if (FAILED(hr)) + IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture2_GetImage(texture2); - todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); if (d3drm_img) - test_bitmap_data(i * 4 + 1, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); + test_bitmap_data(i * 7 + 2, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); + IDirect3DRMTexture2_Release(texture2); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2, (void **)&texture2); + ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr); + hr = IDirect3DRMTexture2_InitFromFile(texture2, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture2_InitFromFile(texture2, ""); + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture2_InitFromFile(texture2, filename); + ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#x.\n", i, hr); + d3drm_img = IDirect3DRMTexture2_GetImage(texture2); + ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + test_bitmap_data(i * 7 + 3, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture2_Release(texture2); hr = IDirect3DRM3_LoadTexture(d3drm3, filename, &texture3); ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr); + ref2 = get_refcount((IUnknown *)d3drm1); + todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + + hr = IDirect3DRMTexture3_InitFromFile(texture3, filename); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + if (FAILED(hr)) + IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture3_GetImage(texture3); - todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); if (d3drm_img) test_bitmap_data(i * 4 + 2, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); /* Test whether querying a version 1 texture from version 3 causes a @@ -5627,11 +5679,26 @@ static void test_load_texture(void) hr = IDirect3DRMTexture3_QueryInterface(texture3, &IID_IDirect3DRMTexture, (void **)&texture1); ok(SUCCEEDED(hr), "Failed to get IDirect3DRMTexture interface, hr %#x.\n", hr); d3drm_img = IDirect3DRMTexture_GetImage(texture1); - todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); if (d3drm_img) test_bitmap_data(i * 4 + 3, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture_Release(texture1); IDirect3DRMTexture3_Release(texture3); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + + hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture3, (void **)&texture3); + ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr); + hr = IDirect3DRMTexture3_InitFromFile(texture3, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture3_InitFromFile(texture3, ""); + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture3_InitFromFile(texture3, filename); + ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#x.\n", i, hr); + d3drm_img = IDirect3DRMTexture3_GetImage(texture3); + ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + test_bitmap_data(i * 7 + 6, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); + IDirect3DRMTexture3_Release(texture3); ret = DeleteFileA(filename); ok(ret, "Test %u: Failed to delete bitmap \"%s\".\n", i, filename); -- 2.17.1

2 5

[PATCH] gdiplus: Implement GdipScalePenTransform().
by Nikolay Sivov Oct. 18, 2018

Oct. 18, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdiplus/pen.c | 7 +--- dlls/gdiplus/tests/pen.c | 75 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index b86808b87e..1f18f3f5a3 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -470,17 +470,12 @@ GpStatus WINGDIPAPI GdipTranslatePenTransform(GpPen *pen, REAL dx, REAL dy, GpMa GpStatus WINGDIPAPI GdipScalePenTransform(GpPen *pen, REAL sx, REAL sy, GpMatrixOrder order) { - static int calls; - TRACE("(%p,%0.2f,%0.2f,%u)\n", pen, sx, sy, order); if(!pen) return InvalidParameter; - if(!(calls++)) - FIXME("(%p, %.2f, %.2f, %d) stub\n", pen, sx, sy, order); - - return NotImplemented; + return GdipScaleMatrix(&pen->transform, sx, sy, order); } GpStatus WINGDIPAPI GdipRotatePenTransform(GpPen *pen, REAL angle, GpMatrixOrder order) diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index be3d76d655..6f69c3b8b4 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -389,6 +389,22 @@ todo_wine { GdipDeletePen(pen); } +static void get_pen_transform(GpPen *pen, REAL *values) +{ + GpMatrix *matrix; + GpStatus status; + + status = GdipCreateMatrix(&matrix); + expect(Ok, status); + + status = GdipGetPenTransform(pen, matrix); + expect(Ok, status); + status = GdipGetMatrixElements(matrix, values); + expect(Ok, status); + + GdipDeleteMatrix(matrix); +} + static void test_transform(void) { GpStatus status; @@ -478,6 +494,65 @@ static void test_transform(void) expectf(0.0, values[4]); expectf(0.0, values[5]); + /* Scale */ + status = GdipScalePenTransform(NULL, 1.0, 1.0, MatrixOrderPrepend); + expect(InvalidParameter, status); + + status = GdipScalePenTransform(pen, 1.0, 1.0, MatrixOrderPrepend); + expect(Ok, status); + + get_pen_transform(pen, values); + expectf(1.0, values[0]); + expectf(0.0, values[1]); + expectf(0.0, values[2]); + expectf(1.0, values[3]); + expectf(0.0, values[4]); + expectf(0.0, values[5]); + + status = GdipScalePenTransform(pen, 2.0, -10.0, MatrixOrderPrepend); + expect(Ok, status); + + get_pen_transform(pen, values); + expectf(2.0, values[0]); + expectf(0.0, values[1]); + expectf(0.0, values[2]); + expectf(-10.0, values[3]); + expectf(0.0, values[4]); + expectf(0.0, values[5]); + + status = GdipScalePenTransform(pen, 2.0, -10.0, MatrixOrderAppend); + expect(Ok, status); + + get_pen_transform(pen, values); + expectf(4.0, values[0]); + expectf(0.0, values[1]); + expectf(0.0, values[2]); + expectf(100.0, values[3]); + expectf(0.0, values[4]); + expectf(0.0, values[5]); + + status = GdipTranslatePenTransform(pen, 1.0, -2.0, MatrixOrderAppend); + expect(Ok, status); + + get_pen_transform(pen, values); + expectf(4.0, values[0]); + expectf(0.0, values[1]); + expectf(0.0, values[2]); + expectf(100.0, values[3]); + expectf(1.0, values[4]); + expectf(-2.0, values[5]); + + status = GdipScalePenTransform(pen, 2.0, -10.0, MatrixOrderPrepend); + expect(Ok, status); + + get_pen_transform(pen, values); + expectf(8.0, values[0]); + expectf(0.0, values[1]); + expectf(0.0, values[2]); + expectf(-1000.0, values[3]); + expectf(1.0, values[4]); + expectf(-2.0, values[5]); + GdipDeletePen(pen); GdipDeleteMatrix(matrix); -- 2.19.1

2 1

[PATCH] browseui: Implement PROGDLG_AUTOTIME flag for IProgressDialog.
by Alistair Leslie-Hughes Oct. 18, 2018

Oct. 18, 2018

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/browseui/browseui.rc | 5 +++ dlls/browseui/progressdlg.c | 65 ++++++++++++++++++++++++++++++++++--- dlls/browseui/resids.h | 5 +++ 3 files changed, 70 insertions(+), 5 deletions(-) diff --git a/dlls/browseui/browseui.rc b/dlls/browseui/browseui.rc index 4c612e93e3..6a152d7bcf 100644 --- a/dlls/browseui/browseui.rc +++ b/dlls/browseui/browseui.rc @@ -25,6 +25,11 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE { IDS_CANCELLING "Canceling..." + IDS_REMAINING1 "%u %s remaining" + IDS_REMAINING2 "%u %s and %u %s remaining" + IDS_SECONDS "seconds" + IDS_MINUTES "minutes" + IDS_HOURS "hours" } IDD_PROGRESS_DLG DIALOG 0, 0, 260, 85 diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 2355b0cfa0..88c629099a 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -74,6 +74,9 @@ typedef struct tagProgressDialog { ULONGLONG ullCompleted; ULONGLONG ullTotal; HWND hwndDisabledParent; /* For modal dialog: the parent that need to be re-enabled when the dialog ends */ + ULONGLONG startTime; + LPWSTR remainingMsg[2]; + LPWSTR timeMsg[3]; } ProgressDialog; static inline ProgressDialog *impl_from_IProgressDialog(IProgressDialog *iface) @@ -158,6 +161,22 @@ static void update_dialog(ProgressDialog *This, DWORD dwUpdate) } } +static void load_time_strings(ProgressDialog *This) +{ + int i; + + for (i = 0; i < 2; i++) + { + if (!This->remainingMsg[i]) + This->remainingMsg[i] = load_string(BROWSEUI_hinstance, IDS_REMAINING1 + i); + } + for (i = 0; i < 3; i++) + { + if (!This->timeMsg[i]) + This->timeMsg[i] = load_string(BROWSEUI_hinstance, IDS_SECONDS + i); + } +} + static void end_dialog(ProgressDialog *This) { SendMessageW(This->hwnd, WM_DLG_DESTROY, 0, 0); @@ -260,14 +279,18 @@ static DWORD WINAPI dialog_thread(LPVOID lpParameter) static void ProgressDialog_Destructor(ProgressDialog *This) { + int i; TRACE("destroying %p\n", This); if (This->hwnd) end_dialog(This); - heap_free(This->lines[0]); - heap_free(This->lines[1]); - heap_free(This->lines[2]); + for (i = 0; i < 3; i++) + heap_free(This->lines[i]); heap_free(This->cancelMsg); heap_free(This->title); + for (i = 0; i < 2; i++) + heap_free(This->remainingMsg[i]); + for (i = 0; i < 3; i++) + heap_free(This->timeMsg[i]); This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); heap_free(This); @@ -329,8 +352,6 @@ static HRESULT WINAPI ProgressDialog_StartProgressDialog(IProgressDialog *iface, TRACE("(%p, %p, %x, %p)\n", iface, punkEnableModeless, dwFlags, reserved); if (punkEnableModeless || reserved) FIXME("Reserved parameters not null (%p, %p)\n", punkEnableModeless, reserved); - if (dwFlags & PROGDLG_AUTOTIME) - FIXME("Flags PROGDLG_AUTOTIME not supported\n"); if (dwFlags & PROGDLG_NOTIME) FIXME("Flags PROGDLG_NOTIME not supported\n"); @@ -365,6 +386,10 @@ static HRESULT WINAPI ProgressDialog_StartProgressDialog(IProgressDialog *iface, This->hwndDisabledParent = hwndDisable; } + if (dwFlags & PROGDLG_AUTOTIME) + load_time_strings(This); + + This->startTime = GetTickCount64(); LeaveCriticalSection(&This->cs); return S_OK; @@ -422,6 +447,34 @@ static BOOL WINAPI ProgressDialog_HasUserCancelled(IProgressDialog *iface) return This->isCancelled; } +static void update_time_remaining(ProgressDialog *This, ULONGLONG ullCompleted, ULONGLONG ullTotal) +{ + unsigned int remaining, remainder = 0; + ULONGLONG elapsed; + WCHAR line[128]; + int i; + + if (!This->startTime || !ullCompleted || !ullTotal) + return; + + elapsed = GetTickCount64() - This->startTime; + remaining = (elapsed * ullTotal / ullCompleted - elapsed) / 1000; + + for (i = 0; remaining >= 60 && i < 2; i++) + { + remainder = remaining % 60; + remaining /= 60; + } + + if (i > 0 && remaining < 2 && remainder != 0) + wsprintfW(line, This->remainingMsg[1], remaining, This->timeMsg[i], remainder, This->timeMsg[i-1]); + else + wsprintfW(line, This->remainingMsg[0], remaining, This->timeMsg[i]); + + set_buffer(&This->lines[2], line); + This->dwUpdate |= UPDATE_LINE3; +} + static HRESULT WINAPI ProgressDialog_SetProgress64(IProgressDialog *iface, ULONGLONG ullCompleted, ULONGLONG ullTotal) { ProgressDialog *This = impl_from_IProgressDialog(iface); @@ -434,6 +487,8 @@ static HRESULT WINAPI ProgressDialog_SetProgress64(IProgressDialog *iface, ULONG This->ullCompleted = ullCompleted; This->dwUpdate |= UPDATE_PROGRESS; hwnd = This->hwnd; + if (This->dwFlags & PROGDLG_AUTOTIME) + update_time_remaining(This, ullCompleted, ullTotal); LeaveCriticalSection(&This->cs); if (hwnd) diff --git a/dlls/browseui/resids.h b/dlls/browseui/resids.h index cd44a8ebd9..865cdd1a5e 100644 --- a/dlls/browseui/resids.h +++ b/dlls/browseui/resids.h @@ -21,6 +21,11 @@ #include "commctrl.h" #define IDS_CANCELLING 16 +#define IDS_REMAINING1 17 +#define IDS_REMAINING2 18 +#define IDS_SECONDS 19 +#define IDS_MINUTES 20 +#define IDS_HOURS 21 #define IDC_ANIMATION 100 #define IDC_PROGRESS_BAR 102 -- 2.19.1

2 1