- wine-devel - winehq.org

[PATCH] d3d10: Forward d3d10_shader_reflection_GetInputParameterDesc() to d3dcompiler implementation.
by Nikolay Sivov 08 Feb '19

08 Feb '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/d3d10_main.c | 22 --------------- dlls/d3d10/d3d10_private.h | 8 ------ dlls/d3d10/shader.c | 55 +++++++++++++++++++++++++++++++++----- 3 files changed, 49 insertions(+), 36 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 4d3ed1244e..813be8fbdc 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -293,25 +293,3 @@ const char * WINAPI D3D10GetPixelShaderProfile(ID3D10Device *device) return "ps_4_0"; } - -HRESULT WINAPI D3D10ReflectShader(const void *data, SIZE_T data_size, ID3D10ShaderReflection **reflector) -{ - struct d3d10_shader_reflection *object; - - FIXME("data %p, data_size %lu, reflector %p stub!\n", data, data_size, reflector); - - if (!(object = heap_alloc_zero(sizeof(*object)))) - { - ERR("Failed to allocate D3D10 shader reflection object memory\n"); - return E_OUTOFMEMORY; - } - - object->ID3D10ShaderReflection_iface.lpVtbl = &d3d10_shader_reflection_vtbl; - object->refcount = 1; - - *reflector = &object->ID3D10ShaderReflection_iface; - - TRACE("Created ID3D10ShaderReflection %p\n", object); - - return S_OK; -} diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index e785b8b869..f40b9e238c 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -253,14 +253,6 @@ struct d3d10_effect struct d3d10_effect_technique *techniques; }; -/* ID3D10ShaderReflection */ -extern const struct ID3D10ShaderReflectionVtbl d3d10_shader_reflection_vtbl DECLSPEC_HIDDEN; -struct d3d10_shader_reflection -{ - ID3D10ShaderReflection ID3D10ShaderReflection_iface; - LONG refcount; -}; - HRESULT d3d10_effect_parse(struct d3d10_effect *This, const void *data, SIZE_T data_size) DECLSPEC_HIDDEN; /* D3D10Core */ diff --git a/dlls/d3d10/shader.c b/dlls/d3d10/shader.c index c97d8dfdf0..48aa9f3a35 100644 --- a/dlls/d3d10/shader.c +++ b/dlls/d3d10/shader.c @@ -25,6 +25,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); +struct d3d10_shader_reflection +{ + ID3D10ShaderReflection ID3D10ShaderReflection_iface; + LONG refcount; + + ID3D11ShaderReflection *reflector; +}; + /* IUnknown methods */ static inline struct d3d10_shader_reflection *impl_from_ID3D10ShaderReflection(ID3D10ShaderReflection *iface) @@ -62,13 +70,16 @@ static ULONG STDMETHODCALLTYPE d3d10_shader_reflection_AddRef(ID3D10ShaderReflec static ULONG STDMETHODCALLTYPE d3d10_shader_reflection_Release(ID3D10ShaderReflection *iface) { - struct d3d10_shader_reflection *This = impl_from_ID3D10ShaderReflection(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); + struct d3d10_shader_reflection *reflector = impl_from_ID3D10ShaderReflection(iface); + ULONG refcount = InterlockedDecrement(&reflector->refcount); - TRACE("%p decreasing refcount to %u\n", This, refcount); + TRACE("%p decreasing refcount to %u\n", reflector, refcount); if (!refcount) - heap_free(This); + { + reflector->reflector->lpVtbl->Release(reflector->reflector); + heap_free(reflector); + } return refcount; } @@ -109,9 +120,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetResourceBindingDesc( static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetInputParameterDesc( ID3D10ShaderReflection *iface, UINT index, D3D10_SIGNATURE_PARAMETER_DESC *desc) { - FIXME("iface %p, index %u, desc %p stub!\n", iface, index, desc); + struct d3d10_shader_reflection *reflector = impl_from_ID3D10ShaderReflection(iface); - return E_NOTIMPL; + TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); + + return reflector->reflector->lpVtbl->GetInputParameterDesc(reflector->reflector, index, + (D3D11_SIGNATURE_PARAMETER_DESC *)desc); } static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetOutputParameterDesc( @@ -137,6 +151,35 @@ const struct ID3D10ShaderReflectionVtbl d3d10_shader_reflection_vtbl = d3d10_shader_reflection_GetOutputParameterDesc, }; +HRESULT WINAPI D3D10ReflectShader(const void *data, SIZE_T data_size, ID3D10ShaderReflection **reflector) +{ + struct d3d10_shader_reflection *object; + HRESULT hr; + + TRACE("data %p, data_size %lu, reflector %p.\n", data, data_size, reflector); + + if (!(object = heap_alloc_zero(sizeof(*object)))) + { + ERR("Failed to allocate D3D10 shader reflection object memory\n"); + return E_OUTOFMEMORY; + } + + if (FAILED(hr = D3DReflect(data, data_size, &IID_ID3D11ShaderReflection, (void **)&object->reflector))) + { + heap_free(object); + return hr; + } + + object->ID3D10ShaderReflection_iface.lpVtbl = &d3d10_shader_reflection_vtbl; + object->refcount = 1; + + *reflector = &object->ID3D10ShaderReflection_iface; + + TRACE("Created ID3D10ShaderReflection %p\n", object); + + return S_OK; +} + HRESULT WINAPI D3D10CompileShader(const char *data, SIZE_T data_size, const char *filename, const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *entrypoint, const char *profile, UINT flags, ID3D10Blob **shader, ID3D10Blob **error_messages) -- 2.20.1

2 1

[PATCH 1/2] wined3d: Return 1 for stream frequency if the value was not set.
by Paul Gofman 08 Feb '19

08 Feb '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39080 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e31ecc32e2..990b29bd73 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1477,7 +1477,7 @@ HRESULT CDECL wined3d_device_get_stream_source_freq(const struct wined3d_device TRACE("device %p, stream_idx %u, divider %p.\n", device, stream_idx, divider); stream = &device->state.streams[stream_idx]; - *divider = stream->flags | stream->frequency; + *divider = stream->flags | (stream->frequency || stream->flags ? stream->frequency : 1); TRACE("Returning %#x.\n", *divider); -- 2.20.1

2 2

[PATCH vkd3d 4/5] vkd3d-shader: Factor out vkd3d_symbol_set_register_info().
by Józef Kucia 08 Feb '19

08 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 98 ++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 59 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9d1dad019b1b..2c7519d6a89f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1824,6 +1824,19 @@ static void vkd3d_symbol_make_register(struct vkd3d_symbol *symbol, symbol->key.reg.idx = reg->idx[0].offset; } +static void vkd3d_symbol_set_register_info(struct vkd3d_symbol *symbol, + uint32_t val_id, SpvStorageClass storage_class, + enum vkd3d_component_type component_type, DWORD write_mask) +{ + symbol->id = val_id; + symbol->info.reg.storage_class = storage_class; + symbol->info.reg.member_idx = 0; + symbol->info.reg.component_type = component_type; + symbol->info.reg.write_mask = write_mask; + symbol->info.reg.structure_stride = 0; + symbol->info.reg.is_aggregate = false; +} + static void vkd3d_symbol_make_resource(struct vkd3d_symbol *symbol, const struct vkd3d_shader_register *reg) { @@ -2489,9 +2502,9 @@ static bool vkd3d_dxbc_compiler_get_register_info(const struct vkd3d_dxbc_compil assert(reg->idx[0].offset < compiler->temp_count); register_info->id = compiler->temp_id + reg->idx[0].offset; register_info->storage_class = SpvStorageClassFunction; + register_info->member_idx = 0; register_info->component_type = VKD3D_TYPE_FLOAT; register_info->write_mask = VKD3DSP_WRITEMASK_ALL; - register_info->member_idx = 0; register_info->structure_stride = 0; register_info->is_aggregate = false; return true; @@ -2508,10 +2521,10 @@ static bool vkd3d_dxbc_compiler_get_register_info(const struct vkd3d_dxbc_compil symbol = RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry); register_info->id = symbol->id; register_info->storage_class = symbol->info.reg.storage_class; + register_info->member_idx = symbol->info.reg.member_idx; register_info->component_type = symbol->info.reg.component_type; register_info->write_mask = symbol->info.reg.write_mask; register_info->structure_stride = symbol->info.reg.structure_stride; - register_info->member_idx = symbol->info.reg.member_idx; register_info->is_aggregate = symbol->info.reg.is_aggregate; return true; @@ -3486,12 +3499,9 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi } if (!entry) { - reg_symbol.id = var_id; - reg_symbol.info.reg.storage_class = storage_class; - reg_symbol.info.reg.component_type = use_private_var ? VKD3D_TYPE_FLOAT : component_type; - reg_symbol.info.reg.write_mask = use_private_var - ? vkd3d_write_mask_from_component_count(component_count) : signature_element->mask & 0xff; - reg_symbol.info.reg.is_aggregate = false; + vkd3d_symbol_set_register_info(&reg_symbol, var_id, storage_class, + use_private_var ? VKD3D_TYPE_FLOAT : component_type, + use_private_var ? vkd3d_write_mask_from_component_count(component_count) : signature_element->mask & 0xff); vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); @@ -3558,11 +3568,8 @@ static void vkd3d_dxbc_compiler_emit_input_register(struct vkd3d_dxbc_compiler * input_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, SpvStorageClassInput, 0); vkd3d_symbol_make_register(&reg_symbol, reg); - reg_symbol.id = input_id; - reg_symbol.info.reg.storage_class = SpvStorageClassInput; - reg_symbol.info.reg.member_idx = 0; - reg_symbol.info.reg.component_type = builtin->component_type; - reg_symbol.info.reg.write_mask = vkd3d_write_mask_from_component_count(builtin->component_count); + vkd3d_symbol_set_register_info(&reg_symbol, input_id, SpvStorageClassInput, + builtin->component_type, vkd3d_write_mask_from_component_count(builtin->component_count)); reg_symbol.info.reg.is_aggregate = builtin->is_spirv_array; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); vkd3d_dxbc_compiler_emit_register_debug_name(builder, input_id, reg); @@ -3588,12 +3595,9 @@ static void vkd3d_dxbc_compiler_emit_shader_phase_input(struct vkd3d_dxbc_compil } vkd3d_symbol_make_register(&reg_symbol, reg); - reg_symbol.id = val_id; - reg_symbol.info.reg.storage_class = SpvStorageClassMax; /* Intermediate value */ - reg_symbol.info.reg.member_idx = 0; - reg_symbol.info.reg.component_type = VKD3D_TYPE_UINT; - reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_0; - reg_symbol.info.reg.is_aggregate = false; + vkd3d_symbol_set_register_info(&reg_symbol, val_id, + SpvStorageClassMax /* Intermediate value */, + VKD3D_TYPE_UINT, VKD3DSP_WRITEMASK_0); vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); vkd3d_dxbc_compiler_emit_register_debug_name(builder, val_id, reg); } @@ -3727,11 +3731,8 @@ static void vkd3d_dxbc_compiler_emit_output_register(struct vkd3d_dxbc_compiler output_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, SpvStorageClassOutput, 0); vkd3d_symbol_make_register(&reg_symbol, reg); - reg_symbol.id = output_id; - reg_symbol.info.reg.storage_class = SpvStorageClassOutput; - reg_symbol.info.reg.member_idx = 0; - reg_symbol.info.reg.component_type = builtin->component_type; - reg_symbol.info.reg.write_mask = vkd3d_write_mask_from_component_count(builtin->component_count); + vkd3d_symbol_set_register_info(&reg_symbol, output_id, SpvStorageClassOutput, + builtin->component_type, vkd3d_write_mask_from_component_count(builtin->component_count)); reg_symbol.info.reg.is_aggregate = builtin->is_spirv_array; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); vkd3d_dxbc_compiler_emit_register_debug_name(builder, output_id, reg); @@ -3835,11 +3836,8 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler storage_class, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); if (!entry) { - reg_symbol.id = var_id; - reg_symbol.info.reg.storage_class = storage_class; - reg_symbol.info.reg.component_type = use_private_variable ? VKD3D_TYPE_FLOAT : component_type; - reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; - reg_symbol.info.reg.is_aggregate = false; + vkd3d_symbol_set_register_info(&reg_symbol, var_id, storage_class, + use_private_variable ? VKD3D_TYPE_FLOAT : component_type, VKD3DSP_WRITEMASK_ALL); vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); @@ -4044,11 +4042,8 @@ static void vkd3d_dxbc_compiler_emit_dcl_indexable_temp(struct vkd3d_dxbc_compil vkd3d_spirv_end_function_stream_insertion(builder); vkd3d_symbol_make_register(&reg_symbol, &reg); - reg_symbol.id = id; - reg_symbol.info.reg.storage_class = SpvStorageClassFunction; - reg_symbol.info.reg.component_type = VKD3D_TYPE_FLOAT; - reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; - reg_symbol.info.reg.is_aggregate = false; + vkd3d_symbol_set_register_info(&reg_symbol, id, + SpvStorageClassFunction, VKD3D_TYPE_FLOAT, VKD3DSP_WRITEMASK_ALL); vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); } @@ -4112,12 +4107,9 @@ static void vkd3d_dxbc_compiler_emit_push_constant_buffers(struct vkd3d_dxbc_com vkd3d_spirv_build_op_member_name(builder, struct_id, j, "cb%u", reg_idx); vkd3d_symbol_make_register(&reg_symbol, &cb->reg); - reg_symbol.id = var_id; - reg_symbol.info.reg.storage_class = storage_class; + vkd3d_symbol_set_register_info(&reg_symbol, var_id, + storage_class, VKD3D_TYPE_FLOAT, VKD3DSP_WRITEMASK_ALL); reg_symbol.info.reg.member_idx = j; - reg_symbol.info.reg.component_type = VKD3D_TYPE_FLOAT; - reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; - reg_symbol.info.reg.is_aggregate = false; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); ++j; @@ -4175,12 +4167,8 @@ static void vkd3d_dxbc_compiler_emit_dcl_constant_buffer(struct vkd3d_dxbc_compi vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); vkd3d_symbol_make_register(&reg_symbol, reg); - reg_symbol.id = var_id; - reg_symbol.info.reg.storage_class = storage_class; - reg_symbol.info.reg.member_idx = 0; - reg_symbol.info.reg.component_type = VKD3D_TYPE_FLOAT; - reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; - reg_symbol.info.reg.is_aggregate = false; + vkd3d_symbol_set_register_info(&reg_symbol, var_id, + storage_class, VKD3D_TYPE_FLOAT, VKD3DSP_WRITEMASK_ALL); vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); } @@ -4212,11 +4200,8 @@ static void vkd3d_dxbc_compiler_emit_dcl_immediate_constant_buffer(struct vkd3d_ memset(&reg, 0, sizeof(reg)); reg.type = VKD3DSPR_IMMCONSTBUFFER; vkd3d_symbol_make_register(&reg_symbol, &reg); - reg_symbol.id = icb_id; - reg_symbol.info.reg.storage_class = SpvStorageClassPrivate; - reg_symbol.info.reg.component_type = VKD3D_TYPE_FLOAT; - reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; - reg_symbol.info.reg.is_aggregate = false; + vkd3d_symbol_set_register_info(&reg_symbol, icb_id, + SpvStorageClassPrivate, VKD3D_TYPE_FLOAT, VKD3DSP_WRITEMASK_ALL); vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); } @@ -4243,9 +4228,8 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); vkd3d_symbol_make_register(&reg_symbol, reg); - reg_symbol.id = var_id; - reg_symbol.info.reg.storage_class = storage_class; - reg_symbol.info.reg.is_aggregate = false; + vkd3d_symbol_set_register_info(&reg_symbol, var_id, + storage_class, VKD3D_TYPE_FLOAT, VKD3DSP_WRITEMASK_ALL); vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); } @@ -4549,13 +4533,9 @@ static void vkd3d_dxbc_compiler_emit_workgroup_memory(struct vkd3d_dxbc_compiler vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); vkd3d_symbol_make_register(&reg_symbol, reg); - reg_symbol.id = var_id; - reg_symbol.info.reg.storage_class = storage_class; - reg_symbol.info.reg.member_idx = 0; - reg_symbol.info.reg.component_type = VKD3D_TYPE_UINT; - reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_0; + vkd3d_symbol_set_register_info(&reg_symbol, var_id, + storage_class, VKD3D_TYPE_UINT, VKD3DSP_WRITEMASK_0); reg_symbol.info.reg.structure_stride = structure_stride; - reg_symbol.info.reg.is_aggregate = false; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); } -- 2.19.2

2 1

[PATCH vkd3d 3/5] vkd3d-shader: Factor out vkd3d_dxbc_compiler_emit_builtin().
by Józef Kucia 08 Feb '19

08 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 66 ++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 3db8e3db07dc..9d1dad019b1b 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3370,6 +3370,24 @@ static void vkd3d_dxbc_compiler_decorate_xfb_output(struct vkd3d_dxbc_compiler * vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationOffset, offset); } +static uint32_t vkd3d_dxbc_compiler_emit_builtin_variable(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_spirv_builtin *builtin, SpvStorageClass storage_class, unsigned int array_size) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t id; + + if (!array_size && builtin->is_spirv_array) + array_size = 1; + + id = vkd3d_dxbc_compiler_emit_array_variable(compiler, + &builder->global_stream, storage_class, + builtin->component_type, builtin->component_count, array_size); + vkd3d_spirv_add_iface_variable(builder, id); + vkd3d_dxbc_compiler_decorate_builtin(compiler, id, builtin->spirv_builtin); + + return id; +} + static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_dst_param *dst, enum vkd3d_shader_input_sysval_semantic sysval) { @@ -3439,15 +3457,16 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi } storage_class = SpvStorageClassInput; - input_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, - storage_class, component_type, input_component_count, array_size); - vkd3d_spirv_add_iface_variable(builder, input_id); + if (builtin) { - vkd3d_dxbc_compiler_decorate_builtin(compiler, input_id, builtin->spirv_builtin); + input_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, storage_class, array_size); } else { + input_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, + storage_class, component_type, input_component_count, array_size); + vkd3d_spirv_add_iface_variable(builder, input_id); vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationLocation, reg_idx); if (component_idx) vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationComponent, component_idx); @@ -3524,7 +3543,6 @@ static void vkd3d_dxbc_compiler_emit_input_register(struct vkd3d_dxbc_compiler * const struct vkd3d_shader_register *reg = &dst->reg; const struct vkd3d_spirv_builtin *builtin; struct vkd3d_symbol reg_symbol; - unsigned int array_size; uint32_t input_id; assert(!reg->idx[0].rel_addr); @@ -3537,12 +3555,7 @@ static void vkd3d_dxbc_compiler_emit_input_register(struct vkd3d_dxbc_compiler * return; } - array_size = builtin->is_spirv_array ? 1 : 0; - input_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, - &builder->global_stream, SpvStorageClassInput, - builtin->component_type, builtin->component_count, array_size); - vkd3d_spirv_add_iface_variable(builder, input_id); - vkd3d_dxbc_compiler_decorate_builtin(compiler, input_id, builtin->spirv_builtin); + input_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, SpvStorageClassInput, 0); vkd3d_symbol_make_register(&reg_symbol, reg); reg_symbol.id = input_id; @@ -3630,7 +3643,6 @@ static void calculate_clip_or_cull_distance_mask(const struct vkd3d_shader_signa static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_compiler *compiler) { const struct vkd3d_shader_signature *output_signature = compiler->output_signature; - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t clip_distance_mask = 0, clip_distance_id = 0; uint32_t cull_distance_mask = 0, cull_distance_id = 0; const struct vkd3d_spirv_builtin *builtin; @@ -3659,20 +3671,16 @@ static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_ { count = vkd3d_popcount(clip_distance_mask); builtin = get_spirv_builtin_for_sysval(compiler, VKD3D_SIV_CLIP_DISTANCE); - clip_distance_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, - SpvStorageClassOutput, builtin->component_type, builtin->component_count, count); - vkd3d_spirv_add_iface_variable(builder, clip_distance_id); - vkd3d_dxbc_compiler_decorate_builtin(compiler, clip_distance_id, builtin->spirv_builtin); + clip_distance_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, + builtin, SpvStorageClassOutput, count); } if (cull_distance_mask) { count = vkd3d_popcount(cull_distance_mask); builtin = get_spirv_builtin_for_sysval(compiler, VKD3D_SIV_CULL_DISTANCE); - cull_distance_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, - SpvStorageClassOutput, builtin->component_type, builtin->component_count, count); - vkd3d_spirv_add_iface_variable(builder, cull_distance_id); - vkd3d_dxbc_compiler_decorate_builtin(compiler, cull_distance_id, builtin->spirv_builtin); + cull_distance_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, + builtin, SpvStorageClassOutput, count); } for (i = 0; i < output_signature->element_count; ++i) @@ -3704,7 +3712,6 @@ static void vkd3d_dxbc_compiler_emit_output_register(struct vkd3d_dxbc_compiler const struct vkd3d_shader_register *reg = &dst->reg; const struct vkd3d_spirv_builtin *builtin; struct vkd3d_symbol reg_symbol; - unsigned int array_size; uint32_t output_id; assert(!reg->idx[0].rel_addr); @@ -3717,12 +3724,7 @@ static void vkd3d_dxbc_compiler_emit_output_register(struct vkd3d_dxbc_compiler return; } - array_size = builtin->is_spirv_array ? 1 : 0; - output_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, - &builder->global_stream, SpvStorageClassOutput, - builtin->component_type, builtin->component_count, array_size); - vkd3d_spirv_add_iface_variable(builder, output_id); - vkd3d_dxbc_compiler_decorate_builtin(compiler, output_id, builtin->spirv_builtin); + output_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, SpvStorageClassOutput, 0); vkd3d_symbol_make_register(&reg_symbol, reg); reg_symbol.id = output_id; @@ -3783,19 +3785,19 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler } else { - id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, - storage_class, component_type, output_component_count); - vkd3d_spirv_add_iface_variable(builder, id); - if (builtin) { - vkd3d_dxbc_compiler_decorate_builtin(compiler, id, builtin->spirv_builtin); + id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, storage_class, 0); vkd3d_dxbc_compiler_emit_register_execution_mode(compiler, &dst->reg); if (component_idx) FIXME("Unhandled component index %u.\n", component_idx); } else { + id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, + storage_class, component_type, output_component_count); + vkd3d_spirv_add_iface_variable(builder, id); + if (is_dual_source_blending(compiler) && reg->idx[0].offset < 2) { vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationLocation, 0); -- 2.19.2

2 1

[PATCH vkd3d 2/5] vkd3d-shader: Get sysval semantic from shader signature for inputs.
by Józef Kucia 08 Feb '19

08 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> In domain shaders, inputs are declared with dcl_input without semantic. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_shader.h | 1 + libs/vkd3d-shader/spirv.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index e803237c1f29..679abfee4061 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -424,6 +424,7 @@ enum vkd3d_component_type enum vkd3d_sysval_semantic { + VKD3D_SV_NONE = 0, VKD3D_SV_POSITION = 1, VKD3D_SV_CLIP_DISTANCE = 2, VKD3D_SV_CULL_DISTANCE = 3, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 8f9fff7f89ca..3db8e3db07dc 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -129,6 +129,20 @@ static const void *vkd3d_find_struct_(const struct vkd3d_struct *chain, return NULL; } +static enum vkd3d_shader_input_sysval_semantic vkd3d_siv_from_sysval(enum vkd3d_sysval_semantic sysval) +{ + switch (sysval) + { + case VKD3D_SV_NONE: + return VKD3D_SIV_NONE; + case VKD3D_SV_POSITION: + return VKD3D_SIV_POSITION; + default: + FIXME("Unhandled sysval %#x.\n", sysval); + return VKD3D_SIV_NONE; + } +} + #define VKD3D_SPIRV_VERSION 0x00010000 #define VKD3D_SPIRV_GENERATOR_ID 18 #define VKD3D_SPIRV_GENERATOR_VERSION 1 @@ -3396,6 +3410,9 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi return 0; } + if (!sysval && signature_element->sysval_semantic) + sysval = vkd3d_siv_from_sysval(signature_element->sysval_semantic); + builtin = get_spirv_builtin_for_sysval(compiler, sysval); component_idx = vkd3d_write_mask_get_component_idx(dst->write_mask); -- 2.19.2

2 1

[PATCH vkd3d 5/5] vkd3d-shader: Add initial support for built-in patch constants.
by Józef Kucia 08 Feb '19

08 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- This code will likely be refactored slightly in the final version. --- libs/vkd3d-shader/spirv.c | 97 +++++++++++++++++++++++++++++++++------ 1 file changed, 84 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 2c7519d6a89f..07cb5fec080e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1941,6 +1941,12 @@ struct vkd3d_shader_phase size_t function_location; }; +struct vkd3d_hull_shader_variables +{ + uint32_t tess_level_outer_id; + uint32_t tess_level_inner_id; +}; + struct vkd3d_dxbc_compiler { struct vkd3d_spirv_builder spirv_builder; @@ -1950,6 +1956,7 @@ struct vkd3d_dxbc_compiler struct rb_tree symbol_table; uint32_t temp_id; unsigned int temp_count; + struct vkd3d_hull_shader_variables hs; enum vkd3d_shader_type shader_type; @@ -3154,7 +3161,8 @@ struct vkd3d_spirv_builtin unsigned int component_count; SpvBuiltIn spirv_builtin; vkd3d_spirv_builtin_fixup_pfn fixup_pfn; - bool is_spirv_array; + unsigned int spirv_array_size; + unsigned int member_idx; }; /* @@ -3183,8 +3191,23 @@ vkd3d_system_value_builtins[] = {VKD3D_SIV_SAMPLE_INDEX, {VKD3D_TYPE_UINT, 1, SpvBuiltInSampleId}}, - {VKD3D_SIV_CLIP_DISTANCE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInClipDistance, NULL, true}}, - {VKD3D_SIV_CULL_DISTANCE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInCullDistance, NULL, true}}, + {VKD3D_SIV_CLIP_DISTANCE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInClipDistance, NULL, 1}}, + {VKD3D_SIV_CULL_DISTANCE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInCullDistance, NULL, 1}}, + + {VKD3D_SIV_QUAD_U0_TESS_FACTOR, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInTessLevelOuter, NULL, 4, 0}}, + {VKD3D_SIV_QUAD_V0_TESS_FACTOR, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInTessLevelOuter, NULL, 4, 1}}, + {VKD3D_SIV_QUAD_U1_TESS_FACTOR, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInTessLevelOuter, NULL, 4, 2}}, + {VKD3D_SIV_QUAD_V1_TESS_FACTOR, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInTessLevelOuter, NULL, 4, 3}}, + {VKD3D_SIV_QUAD_U_INNER_TESS_FACTOR, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInTessLevelInner, NULL, 2, 0}}, + {VKD3D_SIV_QUAD_V_INNER_TESS_FACTOR, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInTessLevelInner, NULL, 2, 1}}, + + {VKD3D_SIV_TRIANGLE_U_TESS_FACTOR, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInTessLevelOuter, NULL, 4, 0}}, + {VKD3D_SIV_TRIANGLE_V_TESS_FACTOR, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInTessLevelOuter, NULL, 4, 1}}, + {VKD3D_SIV_TRIANGLE_W_TESS_FACTOR, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInTessLevelOuter, NULL, 4, 2}}, + {VKD3D_SIV_TRIANGLE_INNER_TESS_FACTOR, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInTessLevelInner, NULL, 2, 0}}, + + {VKD3D_SIV_LINE_DETAIL_TESS_FACTOR, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInTessLevelOuter, NULL, 4, 0}}, + {VKD3D_SIV_LINE_DENSITY_TESS_FACTOR, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInTessLevelOuter, NULL, 4, 1}}, }; static const struct vkd3d_spirv_builtin vkd3d_pixel_shader_position_builtin = { @@ -3207,8 +3230,8 @@ vkd3d_register_builtins[] = {VKD3DSPR_TESSCOORD, {VKD3D_TYPE_FLOAT, 3, SpvBuiltInTessCoord}}, - {VKD3DSPR_COVERAGE, {VKD3D_TYPE_UINT, 1, SpvBuiltInSampleMask, NULL, true}}, - {VKD3DSPR_SAMPLEMASK, {VKD3D_TYPE_UINT, 1, SpvBuiltInSampleMask, NULL, true}}, + {VKD3DSPR_COVERAGE, {VKD3D_TYPE_UINT, 1, SpvBuiltInSampleMask, NULL, 1}}, + {VKD3DSPR_SAMPLEMASK, {VKD3D_TYPE_UINT, 1, SpvBuiltInSampleMask, NULL, 1}}, {VKD3DSPR_DEPTHOUT, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInFragDepth}}, {VKD3DSPR_DEPTHOUTGE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInFragDepth}}, @@ -3389,8 +3412,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_builtin_variable(struct vkd3d_dxbc_comp struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t id; - if (!array_size && builtin->is_spirv_array) - array_size = 1; + array_size = max(array_size, builtin->spirv_array_size); id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, storage_class, @@ -3570,7 +3592,7 @@ static void vkd3d_dxbc_compiler_emit_input_register(struct vkd3d_dxbc_compiler * vkd3d_symbol_make_register(&reg_symbol, reg); vkd3d_symbol_set_register_info(&reg_symbol, input_id, SpvStorageClassInput, builtin->component_type, vkd3d_write_mask_from_component_count(builtin->component_count)); - reg_symbol.info.reg.is_aggregate = builtin->is_spirv_array; + reg_symbol.info.reg.is_aggregate = builtin->spirv_array_size; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); vkd3d_dxbc_compiler_emit_register_debug_name(builder, input_id, reg); } @@ -3733,7 +3755,7 @@ static void vkd3d_dxbc_compiler_emit_output_register(struct vkd3d_dxbc_compiler vkd3d_symbol_make_register(&reg_symbol, reg); vkd3d_symbol_set_register_info(&reg_symbol, output_id, SpvStorageClassOutput, builtin->component_type, vkd3d_write_mask_from_component_count(builtin->component_count)); - reg_symbol.info.reg.is_aggregate = builtin->is_spirv_array; + reg_symbol.info.reg.is_aggregate = builtin->spirv_array_size; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); vkd3d_dxbc_compiler_emit_register_debug_name(builder, output_id, reg); } @@ -3769,7 +3791,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler if (builtin) { component_type = builtin->component_type; - if (!builtin->is_spirv_array) + if (!builtin->spirv_array_size) output_component_count = builtin->component_count; } else @@ -3821,7 +3843,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler use_private_variable = component_count != VKD3D_VEC4_SIZE || get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_NO_SWIZZLE - || (builtin && builtin->is_spirv_array); + || (builtin && builtin->spirv_array_size); if (use_private_variable) storage_class = SpvStorageClassPrivate; @@ -3852,6 +3874,46 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler } } +static void vkd3d_dxbc_compiler_emit_shader_phase_output(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_phase *phase, const struct vkd3d_shader_dst_param *dst, + enum vkd3d_shader_input_sysval_semantic sysval) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_register *reg = &dst->reg; + const struct vkd3d_spirv_builtin *builtin; + struct vkd3d_symbol reg_symbol; + uint32_t *variable_id; + + variable_id = NULL; + if ((builtin = get_spirv_builtin_for_sysval(compiler, sysval))) + { + if (builtin->spirv_builtin == SpvBuiltInTessLevelOuter) + variable_id = &compiler->hs.tess_level_outer_id; + else if (builtin->spirv_builtin == SpvBuiltInTessLevelInner) + variable_id = &compiler->hs.tess_level_inner_id; + } + + if (!variable_id) + { + FIXME("Unhandled shader phase output register %#x, sysval %#x.\n", reg->type, sysval); + return; + } + + if (!*variable_id) + { + *variable_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, SpvStorageClassOutput, 0); + if (phase->type == VKD3DSIH_HS_FORK_PHASE || phase->type == VKD3DSIH_HS_JOIN_PHASE) + vkd3d_spirv_build_op_decorate(builder, *variable_id, SpvDecorationPatch, NULL, 0); + } + + vkd3d_symbol_make_register(&reg_symbol, reg); + vkd3d_symbol_set_register_info(&reg_symbol, *variable_id, SpvStorageClassOutput, + builtin->component_type, vkd3d_write_mask_from_component_count(builtin->component_count)); + reg_symbol.info.reg.member_idx = builtin->member_idx; + reg_symbol.info.reg.is_aggregate = builtin->spirv_array_size; + vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); +} + static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_compiler *compiler) { const struct vkd3d_shader_transform_feedback_info *xfb_info = compiler->xfb_info; @@ -4639,8 +4701,17 @@ static void vkd3d_dxbc_compiler_emit_dcl_output(struct vkd3d_dxbc_compiler *comp static void vkd3d_dxbc_compiler_emit_dcl_output_siv(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { - vkd3d_dxbc_compiler_emit_output(compiler, &instruction->declaration.register_semantic.reg, - instruction->declaration.register_semantic.sysval_semantic); + enum vkd3d_shader_input_sysval_semantic sysval; + const struct vkd3d_shader_dst_param *dst; + const struct vkd3d_shader_phase *phase; + + dst = &instruction->declaration.register_semantic.reg; + sysval = instruction->declaration.register_semantic.sysval_semantic; + + if ((phase = vkd3d_dxbc_compiler_get_current_shader_phase(compiler))) + vkd3d_dxbc_compiler_emit_shader_phase_output(compiler, phase, dst, sysval); + else + vkd3d_dxbc_compiler_emit_output(compiler, dst, sysval); } static void vkd3d_dxbc_compiler_emit_dcl_stream(struct vkd3d_dxbc_compiler *compiler, -- 2.19.2

2 1

[PATCH vkd3d 1/5] vkd3d-shader: Rename scan instruction function to vkd3d_shader_scan_instruction().
by Józef Kucia 08 Feb '19

08 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 770281ca5ae8..6e6880c689b4 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -246,7 +246,7 @@ static void vkd3d_shader_scan_sampler_declaration(struct vkd3d_shader_scan_info } } -static void vkd3d_shader_scan_handle_instruction(struct vkd3d_shader_scan_info *scan_info, +static void vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_info *scan_info, const struct vkd3d_shader_instruction *instruction) { unsigned int i; @@ -312,7 +312,7 @@ int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, return VKD3D_ERROR_INVALID_ARGUMENT; } - vkd3d_shader_scan_handle_instruction(scan_info, &instruction); + vkd3d_shader_scan_instruction(scan_info, &instruction); } vkd3d_shader_parser_destroy(&parser); -- 2.19.2

2 1

[PATCH] gdi32/dibdrv: Clip segment points to dib rect in wide_line_segment().
by Sergio Gómez Del Real 08 Feb '19

08 Feb '19

--- dlls/gdi32/dibdrv/objects.c | 43 ++++++++++++++++++++++++++++--------- dlls/gdi32/gdi_private.h | 8 +++++++ 2 files changed, 41 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index f95475a662..26710dd1aa 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1334,15 +1334,21 @@ static void add_join( dibdrv_physdev *pdev, HRGN region, HRGN round_cap, const P { HRGN join; POINT pts[4]; + RECT rect; switch (pdev->pen_join) { default: FIXME( "Unknown line join %x\n", pdev->pen_join ); /* fall through */ case PS_JOIN_ROUND: - OffsetRgn( round_cap, pt->x, pt->y ); - CombineRgn( region, region, round_cap, RGN_OR ); - OffsetRgn( round_cap, -pt->x, -pt->y ); + GetRgnBox( round_cap, &rect ); + offset_rect( &rect, pt->x, pt->y ); + if (clip_rect_to_dib( &pdev->dib, &rect )) + { + OffsetRgn( round_cap, pt->x, pt->y ); + CombineRgn( region, region, round_cap, RGN_OR ); + OffsetRgn( round_cap, -pt->x, -pt->y ); + } return; case PS_JOIN_MITER: @@ -1358,7 +1364,9 @@ static void add_join( dibdrv_physdev *pdev, HRGN region, HRGN round_cap, const P break; } - CombineRgn( region, region, join, RGN_OR ); + GetRgnBox( join, &rect ); + if (clip_rect_to_dib( &pdev->dib, &rect )) + CombineRgn( region, region, join, RGN_OR ); DeleteObject( join ); return; } @@ -1367,7 +1375,7 @@ static BOOL wide_line_segment( dibdrv_physdev *pdev, HRGN total, const POINT *pt_1, const POINT *pt_2, int dx, int dy, BOOL need_cap_1, BOOL need_cap_2, struct face *face_1, struct face *face_2 ) { - RECT rect; + RECT rect, clip_rect; BOOL sq_cap_1 = need_cap_1 && (pdev->pen_endcap == PS_ENDCAP_SQUARE); BOOL sq_cap_2 = need_cap_2 && (pdev->pen_endcap == PS_ENDCAP_SQUARE); @@ -1381,7 +1389,9 @@ static BOOL wide_line_segment( dibdrv_physdev *pdev, HRGN total, rect.bottom = rect.top + pdev->pen_width; if ((sq_cap_1 && dx > 0) || (sq_cap_2 && dx < 0)) rect.left -= pdev->pen_width / 2; if ((sq_cap_2 && dx > 0) || (sq_cap_1 && dx < 0)) rect.right += pdev->pen_width / 2; - add_rect_to_region( total, &rect ); + clip_rect = rect; + if (clip_rect_to_dib( &pdev->dib, &clip_rect )) + add_rect_to_region( total, &clip_rect ); if (dx > 0) { face_1->start.x = face_1->end.x = rect.left; @@ -1405,7 +1415,9 @@ static BOOL wide_line_segment( dibdrv_physdev *pdev, HRGN total, rect.right = rect.left + pdev->pen_width; if ((sq_cap_1 && dy > 0) || (sq_cap_2 && dy < 0)) rect.top -= pdev->pen_width / 2; if ((sq_cap_2 && dy > 0) || (sq_cap_1 && dy < 0)) rect.bottom += pdev->pen_width / 2; - add_rect_to_region( total, &rect ); + clip_rect = rect; + if (clip_rect_to_dib( &pdev->dib, &clip_rect )) + add_rect_to_region( total, &clip_rect ); if (dy > 0) { face_1->start.x = face_2->end.x = rect.left; @@ -1475,9 +1487,20 @@ static BOOL wide_line_segment( dibdrv_physdev *pdev, HRGN total, seg_pts[3].y += wide_half.x; } - segment = CreatePolygonRgn( seg_pts, 4, ALTERNATE ); - CombineRgn( total, total, segment, RGN_OR ); - DeleteObject( segment ); + if (dx > 0 && dy > 0) + set_rect( &clip_rect, seg_pts[0].x, seg_pts[1].y, seg_pts[2].x, seg_pts[3].y ); + else if (dx > 0 && dy < 0) + set_rect( &clip_rect, seg_pts[1].x, seg_pts[2].y, seg_pts[3].x, seg_pts[0].y ); + else if (dx < 0 && dy > 0) + set_rect( &clip_rect, seg_pts[3].x, seg_pts[0].y, seg_pts[1].x, seg_pts[2].y ); + else + set_rect( &clip_rect, seg_pts[2].x, seg_pts[3].y, seg_pts[0].x, seg_pts[1].y ); + if (clip_rect_to_dib( &pdev->dib, &clip_rect )) + { + segment = CreatePolygonRgn( seg_pts, 4, ALTERNATE ); + CombineRgn( total, total, segment, RGN_OR ); + DeleteObject( segment ); + } face_1->start = seg_pts[0]; face_1->end = seg_pts[1]; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 920cd1e7bf..01473dd7e2 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -521,6 +521,14 @@ static inline void offset_rect( RECT *rect, int offset_x, int offset_y ) rect->bottom += offset_y; } +static inline void set_rect( RECT *rect, int left, int top, int right, int bottom ) +{ + rect->left = left; + rect->top = top; + rect->right = right; + rect->bottom = bottom; +} + static inline void order_rect( RECT *rect ) { if (rect->left > rect->right) -- 2.17.1

1 0

[PATCH 4/6] libport: Add support for compatibility decomposition.
by Huw Davies 08 Feb '19

08 Feb '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/kernel32/tests/locale.c | 12 +- libs/port/decompose.c | 1308 +++++++++++++++++++++++++++++++++- tools/make_unicode | 150 +++- 3 files changed, 1452 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 851da7febf..1e25122c23 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -5703,16 +5703,16 @@ static void test_NormalizeString(void) { part0_str10, { part0_str10, part0_nfd10, part0_str10, part0_nfd10 }, { 1, 0, 1, 0 } }, { part0_str11, { part0_str11, part0_nfd11, part0_str11, part0_nfd11 }, { 1, 0, 1, 0 } }, { part0_str12, { part0_nfc12, part0_nfd12, part0_nfc12, part0_nfd12 }, { 1, 0, 1, 0 } }, - { part1_str1, { part1_str1, part1_str1, part1_nfkc1, part1_nfkc1 }, { 1, 0, 1, 1 } }, - { part1_str2, { part1_str2, part1_str2, part1_nfkc2, part1_nfkc2 }, { 1, 0, 1, 1 } }, + { part1_str1, { part1_str1, part1_str1, part1_nfkc1, part1_nfkc1 }, { 1, 0, 1, 0 } }, + { part1_str2, { part1_str2, part1_str2, part1_nfkc2, part1_nfkc2 }, { 1, 0, 1, 0 } }, { part1_str3, { part1_str3, part1_nfd3, part1_str3, part1_nfd3 }, { 1, 0, 1, 0 } }, - { part1_str4, { part1_str4, part1_str4, part1_nfkc4, part1_nfkc4 }, { 1, 0, 1, 1 } }, + { part1_str4, { part1_str4, part1_str4, part1_nfkc4, part1_nfkc4 }, { 1, 0, 1, 0 } }, { part1_str5, { part1_str5, part1_nfd5, part1_str5, part1_nfd5 }, { 1, 0, 1, 0 } }, { part1_str6, { part1_str6, part1_nfd6, part1_str6, part1_nfd6 }, { 1, 0, 1, 0 } }, - { part1_str7, { part1_str7, part1_str7, part1_nfkc7, part1_nfkc7 }, { 1, 0, 1, 1 } }, + { part1_str7, { part1_str7, part1_str7, part1_nfkc7, part1_nfkc7 }, { 1, 0, 1, 0 } }, { part1_str8, { part1_str8, part1_nfd8, part1_str8, part1_nfd8 }, { 1, 0, 1, 0 } }, - { part1_str9, { part1_str9, part1_str9, part1_nfkc9, part1_nfkc9 }, { 1, 0, 1, 1 } }, - { part1_str10, { part1_str10, part1_str10, part1_nfkc10, part1_nfkc10 }, { 1, 0, 1, 1 } }, + { part1_str9, { part1_str9, part1_str9, part1_nfkc9, part1_nfkc9 }, { 1, 0, 1, 0 } }, + { part1_str10, { part1_str10, part1_str10, part1_nfkc10, part1_nfkc10 }, { 1, 0, 1, 0 } }, { 0 } }; const struct test_data_normal *ptest = test_arr; diff --git a/libs/port/decompose.c b/libs/port/decompose.c index c7568a01ea..c46906921a 100644 --- a/libs/port/decompose.c +++ b/libs/port/decompose.c @@ -747,15 +747,1311 @@ static const WCHAR table[4704] = 0x05d1, 0x05bf, 0x05db, 0x05bf, 0x05e4, 0x05bf, 0x0000, 0x0000 }; +static const WCHAR compatmap_table[8152] = +{ + /* index */ + 0x0110, 0x0120, 0x0130, 0x0140, 0x0100, 0x0150, 0x0160, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0170, 0x0180, + 0x0190, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x01a0, 0x01b0, 0x01c0, + 0x01d0, 0x01e0, 0x01f0, 0x0100, 0x0200, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0210, 0x0100, 0x0220, 0x0230, 0x0240, 0x0250, + 0x0260, 0x0270, 0x0280, 0x0290, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x02a0, 0x02b0, + 0x0100, 0x0100, 0x0100, 0x02c0, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x02d0, 0x02e0, 0x02f0, 0x0300, 0x0310, + /* null sub-index */ + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + /* sub-index 00 */ + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0330, 0x0340, 0x0320, 0x0320, 0x0320, 0x0320, + /* sub-index 01 */ + 0x0320, 0x0320, 0x0320, 0x0350, 0x0360, 0x0320, 0x0320, 0x0370, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0380, 0x0320, 0x0320, 0x0390, + /* sub-index 02 */ + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x03a0, 0x0320, 0x03b0, 0x03c0, 0x0320, + /* sub-index 03 */ + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x03d0, + 0x03e0, 0x0320, 0x0320, 0x0320, 0x0320, 0x03f0, 0x0320, 0x0400, + /* sub-index 05 */ + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0410, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + /* sub-index 06 */ + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0420, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + /* sub-index 0e */ + 0x0320, 0x0320, 0x0320, 0x0430, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0440, 0x0320, 0x0450, 0x0320, 0x0320, + /* sub-index 0f */ + 0x0460, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0470, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + /* sub-index 10 */ + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0480, + /* sub-index 1d */ + 0x0320, 0x0320, 0x0490, 0x04a0, 0x04b0, 0x04c0, 0x04d0, 0x04e0, + 0x0320, 0x04f0, 0x0500, 0x0510, 0x0320, 0x0320, 0x0320, 0x0320, + /* sub-index 1e */ + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0520, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + /* sub-index 1f */ + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0530, 0x0540, 0x0320, 0x0320, 0x0550, + /* sub-index 20 */ + 0x0560, 0x0570, 0x0580, 0x0590, 0x05a0, 0x05b0, 0x0320, 0x05c0, + 0x05d0, 0x05e0, 0x05f0, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + /* sub-index 21 */ + 0x0600, 0x0610, 0x0620, 0x0630, 0x0640, 0x0650, 0x0660, 0x0670, + 0x0680, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + /* sub-index 22 */ + 0x0320, 0x0320, 0x0690, 0x06a0, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + /* sub-index 24 */ + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x06b0, 0x06c0, + 0x06d0, 0x06e0, 0x06f0, 0x0700, 0x0710, 0x0720, 0x0730, 0x0320, + /* sub-index 2a */ + 0x0740, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0750, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + /* sub-index 2c */ + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0760, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + /* sub-index 2d */ + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0770, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + /* sub-index 2e */ + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0780, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0790, + /* sub-index 2f */ + 0x07a0, 0x07b0, 0x07c0, 0x07d0, 0x07e0, 0x07f0, 0x0800, 0x0810, + 0x0820, 0x0830, 0x0840, 0x0850, 0x0860, 0x0870, 0x0320, 0x0320, + /* sub-index 30 */ + 0x0880, 0x0320, 0x0320, 0x0890, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x08a0, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x08b0, + /* sub-index 31 */ + 0x0320, 0x0320, 0x0320, 0x08c0, 0x08d0, 0x08e0, 0x08f0, 0x0900, + 0x0910, 0x0920, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + /* sub-index 32 */ + 0x0930, 0x0940, 0x0950, 0x0960, 0x0970, 0x0980, 0x0990, 0x09a0, + 0x09b0, 0x09c0, 0x09d0, 0x09e0, 0x09f0, 0x0a00, 0x0a10, 0x0a20, + /* sub-index 33 */ + 0x0a30, 0x0a40, 0x0a50, 0x0a60, 0x0a70, 0x0a80, 0x0a90, 0x0aa0, + 0x0ab0, 0x0ac0, 0x0ad0, 0x0ae0, 0x0af0, 0x0b00, 0x0b10, 0x0b20, + /* sub-index a6 */ + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0b30, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + /* sub-index a7 */ + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0b40, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0b50, + /* sub-index ab */ + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0b60, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + /* sub-index fb */ + 0x0b70, 0x0b80, 0x0b90, 0x0320, 0x0ba0, 0x0bb0, 0x0bc0, 0x0bd0, + 0x0be0, 0x0bf0, 0x0c00, 0x0c10, 0x0320, 0x0c20, 0x0c30, 0x0c40, + /* sub-index fc */ + 0x0c50, 0x0c60, 0x0c70, 0x0c80, 0x0c90, 0x0ca0, 0x0cb0, 0x0cc0, + 0x0cd0, 0x0ce0, 0x0cf0, 0x0d00, 0x0d10, 0x0d20, 0x0d30, 0x0d40, + /* sub-index fd */ + 0x0d50, 0x0d60, 0x0d70, 0x0d80, 0x0320, 0x0d90, 0x0da0, 0x0db0, + 0x0dc0, 0x0dd0, 0x0de0, 0x0df0, 0x0e00, 0x0320, 0x0320, 0x0e10, + /* sub-index fe */ + 0x0320, 0x0e20, 0x0320, 0x0e30, 0x0e40, 0x0e50, 0x0e60, 0x0e70, + 0x0e80, 0x0e90, 0x0ea0, 0x0eb0, 0x0ec0, 0x0ed0, 0x0ee0, 0x0ef0, + /* sub-index ff */ + 0x0f00, 0x0f10, 0x0f20, 0x0f30, 0x0f40, 0x0f50, 0x0f60, 0x0f70, + 0x0f80, 0x0f90, 0x0fa0, 0x0fb0, 0x0fc0, 0x0fd0, 0x0fe0, 0x0320, + /* null offsets */ + 0x0ff1, 0x0ff1, 0x0ff1, 0x0ff1, 0x0ff1, 0x0ff1, 0x0ff1, 0x0ff1, + 0x0ff1, 0x0ff1, 0x0ff1, 0x0ff1, 0x0ff1, 0x0ff1, 0x0ff1, 0x0ff1, + /* offsets 0x00a0 .. 0x00af */ + 0x0ff1, 0x0ff2, 0x0ff2, 0x0ff2, 0x0ff2, 0x0ff2, 0x0ff2, 0x0ff2, + 0x0ff2, 0x0ff4, 0x0ff4, 0x0ff5, 0x0ff5, 0x0ff5, 0x0ff5, 0x0ff5, + /* offsets 0x00b0 .. 0x00bf */ + 0x0ff7, 0x0ff7, 0x0ff7, 0x0ff8, 0x0ff9, 0x0ffb, 0x0ffc, 0x0ffc, + 0x0ffc, 0x0ffe, 0x0fff, 0x1000, 0x1000, 0x1003, 0x1006, 0x1009, + /* offsets 0x0130 .. 0x013f */ + 0x1009, 0x1009, 0x1009, 0x100b, 0x100d, 0x100d, 0x100d, 0x100d, + 0x100d, 0x100d, 0x100d, 0x100d, 0x100d, 0x100d, 0x100d, 0x100d, + /* offsets 0x0140 .. 0x014f */ + 0x100f, 0x1011, 0x1011, 0x1011, 0x1011, 0x1011, 0x1011, 0x1011, + 0x1011, 0x1011, 0x1013, 0x1013, 0x1013, 0x1013, 0x1013, 0x1013, + /* offsets 0x0170 .. 0x017f */ + 0x1013, 0x1013, 0x1013, 0x1013, 0x1013, 0x1013, 0x1013, 0x1013, + 0x1013, 0x1013, 0x1013, 0x1013, 0x1013, 0x1013, 0x1013, 0x1013, + /* offsets 0x01c0 .. 0x01cf */ + 0x1014, 0x1014, 0x1014, 0x1014, 0x1014, 0x1016, 0x1018, 0x101a, + 0x101c, 0x101e, 0x1020, 0x1022, 0x1024, 0x1026, 0x1026, 0x1026, + /* offsets 0x01f0 .. 0x01ff */ + 0x1026, 0x1026, 0x1028, 0x102a, 0x102c, 0x102c, 0x102c, 0x102c, + 0x102c, 0x102c, 0x102c, 0x102c, 0x102c, 0x102c, 0x102c, 0x102c, + /* offsets 0x02b0 .. 0x02bf */ + 0x102c, 0x102d, 0x102e, 0x102f, 0x1030, 0x1031, 0x1032, 0x1033, + 0x1034, 0x1035, 0x1035, 0x1035, 0x1035, 0x1035, 0x1035, 0x1035, + /* offsets 0x02d0 .. 0x02df */ + 0x1035, 0x1035, 0x1035, 0x1035, 0x1035, 0x1035, 0x1035, 0x1035, + 0x1035, 0x1037, 0x1039, 0x103b, 0x103d, 0x103f, 0x1041, 0x1041, + /* offsets 0x02e0 .. 0x02ef */ + 0x1041, 0x1042, 0x1043, 0x1044, 0x1045, 0x1046, 0x1046, 0x1046, + 0x1046, 0x1046, 0x1046, 0x1046, 0x1046, 0x1046, 0x1046, 0x1046, + /* offsets 0x0370 .. 0x037f */ + 0x1046, 0x1046, 0x1046, 0x1046, 0x1046, 0x1046, 0x1046, 0x1046, + 0x1046, 0x1046, 0x1046, 0x1048, 0x1048, 0x1048, 0x1048, 0x1048, + /* offsets 0x0380 .. 0x038f */ + 0x1048, 0x1048, 0x1048, 0x1048, 0x1048, 0x104a, 0x104a, 0x104a, + 0x104a, 0x104a, 0x104a, 0x104a, 0x104a, 0x104a, 0x104a, 0x104a, + /* offsets 0x03d0 .. 0x03df */ + 0x104a, 0x104b, 0x104c, 0x104d, 0x104d, 0x104d, 0x104e, 0x104f, + 0x104f, 0x104f, 0x104f, 0x104f, 0x104f, 0x104f, 0x104f, 0x104f, + /* offsets 0x03f0 .. 0x03ff */ + 0x104f, 0x1050, 0x1051, 0x1052, 0x1052, 0x1053, 0x1054, 0x1054, + 0x1054, 0x1054, 0x1055, 0x1055, 0x1055, 0x1055, 0x1055, 0x1055, + /* offsets 0x0580 .. 0x058f */ + 0x1055, 0x1055, 0x1055, 0x1055, 0x1055, 0x1055, 0x1055, 0x1055, + 0x1057, 0x1057, 0x1057, 0x1057, 0x1057, 0x1057, 0x1057, 0x1057, + /* offsets 0x0670 .. 0x067f */ + 0x1057, 0x1057, 0x1057, 0x1057, 0x1057, 0x1057, 0x1059, 0x105b, + 0x105d, 0x105f, 0x105f, 0x105f, 0x105f, 0x105f, 0x105f, 0x105f, + /* offsets 0x0e30 .. 0x0e3f */ + 0x105f, 0x105f, 0x105f, 0x105f, 0x1061, 0x1061, 0x1061, 0x1061, + 0x1061, 0x1061, 0x1061, 0x1061, 0x1061, 0x1061, 0x1061, 0x1061, + /* offsets 0x0eb0 .. 0x0ebf */ + 0x1061, 0x1061, 0x1061, 0x1061, 0x1063, 0x1063, 0x1063, 0x1063, + 0x1063, 0x1063, 0x1063, 0x1063, 0x1063, 0x1063, 0x1063, 0x1063, + /* offsets 0x0ed0 .. 0x0edf */ + 0x1063, 0x1063, 0x1063, 0x1063, 0x1063, 0x1063, 0x1063, 0x1063, + 0x1063, 0x1063, 0x1063, 0x1063, 0x1063, 0x1065, 0x1067, 0x1067, + /* offsets 0x0f00 .. 0x0f0f */ + 0x1067, 0x1067, 0x1067, 0x1067, 0x1067, 0x1067, 0x1067, 0x1067, + 0x1067, 0x1067, 0x1067, 0x1067, 0x1067, 0x1068, 0x1068, 0x1068, + /* offsets 0x0f70 .. 0x0f7f */ + 0x1068, 0x1068, 0x1068, 0x1068, 0x1068, 0x1068, 0x1068, 0x1068, + 0x106a, 0x106a, 0x106c, 0x106c, 0x106c, 0x106c, 0x106c, 0x106c, + /* offsets 0x10f0 .. 0x10ff */ + 0x106c, 0x106c, 0x106c, 0x106c, 0x106c, 0x106c, 0x106c, 0x106c, + 0x106c, 0x106c, 0x106c, 0x106c, 0x106c, 0x106d, 0x106d, 0x106d, + /* offsets 0x1d20 .. 0x1d2f */ + 0x106d, 0x106d, 0x106d, 0x106d, 0x106d, 0x106d, 0x106d, 0x106d, + 0x106d, 0x106d, 0x106d, 0x106d, 0x106d, 0x106e, 0x106f, 0x1070, + /* offsets 0x1d30 .. 0x1d3f */ + 0x1070, 0x1071, 0x1072, 0x1073, 0x1074, 0x1075, 0x1076, 0x1077, + 0x1078, 0x1079, 0x107a, 0x107b, 0x107b, 0x107c, 0x107d, 0x107e, + /* offsets 0x1d40 .. 0x1d4f */ + 0x107f, 0x1080, 0x1081, 0x1082, 0x1083, 0x1084, 0x1085, 0x1086, + 0x1087, 0x1088, 0x1089, 0x108a, 0x108b, 0x108c, 0x108d, 0x108d, + /* offsets 0x1d50 .. 0x1d5f */ + 0x108e, 0x108f, 0x1090, 0x1091, 0x1092, 0x1093, 0x1094, 0x1095, + 0x1096, 0x1097, 0x1098, 0x1099, 0x109a, 0x109b, 0x109c, 0x109d, + /* offsets 0x1d60 .. 0x1d6f */ + 0x109e, 0x109f, 0x10a0, 0x10a1, 0x10a2, 0x10a3, 0x10a4, 0x10a5, + 0x10a6, 0x10a7, 0x10a8, 0x10a9, 0x10a9, 0x10a9, 0x10a9, 0x10a9, + /* offsets 0x1d70 .. 0x1d7f */ + 0x10a9, 0x10a9, 0x10a9, 0x10a9, 0x10a9, 0x10a9, 0x10a9, 0x10a9, + 0x10a9, 0x10aa, 0x10aa, 0x10aa, 0x10aa, 0x10aa, 0x10aa, 0x10aa, + /* offsets 0x1d90 .. 0x1d9f */ + 0x10aa, 0x10aa, 0x10aa, 0x10aa, 0x10aa, 0x10aa, 0x10aa, 0x10aa, + 0x10aa, 0x10aa, 0x10aa, 0x10aa, 0x10ab, 0x10ac, 0x10ad, 0x10ae, + /* offsets 0x1da0 .. 0x1daf */ + 0x10af, 0x10b0, 0x10b1, 0x10b2, 0x10b3, 0x10b4, 0x10b5, 0x10b6, + 0x10b7, 0x10b8, 0x10b9, 0x10ba, 0x10bb, 0x10bc, 0x10bd, 0x10be, + /* offsets 0x1db0 .. 0x1dbf */ + 0x10bf, 0x10c0, 0x10c1, 0x10c2, 0x10c3, 0x10c4, 0x10c5, 0x10c6, + 0x10c7, 0x10c8, 0x10c9, 0x10ca, 0x10cb, 0x10cc, 0x10cd, 0x10ce, + /* offsets 0x1e90 .. 0x1e9f */ + 0x10cf, 0x10cf, 0x10cf, 0x10cf, 0x10cf, 0x10cf, 0x10cf, 0x10cf, + 0x10cf, 0x10cf, 0x10cf, 0x10d1, 0x10d1, 0x10d1, 0x10d1, 0x10d1, + /* offsets 0x1fb0 .. 0x1fbf */ + 0x10d1, 0x10d1, 0x10d1, 0x10d1, 0x10d1, 0x10d1, 0x10d1, 0x10d1, + 0x10d1, 0x10d1, 0x10d1, 0x10d1, 0x10d1, 0x10d1, 0x10d3, 0x10d3, + /* offsets 0x1fc0 .. 0x1fcf */ + 0x10d5, 0x10d7, 0x10d7, 0x10d7, 0x10d7, 0x10d7, 0x10d7, 0x10d7, + 0x10d7, 0x10d7, 0x10d7, 0x10d7, 0x10d7, 0x10d7, 0x10d7, 0x10d7, + /* offsets 0x1ff0 .. 0x1fff */ + 0x10d7, 0x10d7, 0x10d7, 0x10d7, 0x10d7, 0x10d7, 0x10d7, 0x10d7, + 0x10d7, 0x10d7, 0x10d7, 0x10d7, 0x10d7, 0x10d7, 0x10d7, 0x10d9, + /* offsets 0x2000 .. 0x200f */ + 0x10d9, 0x10d9, 0x10d9, 0x10da, 0x10db, 0x10dc, 0x10dd, 0x10de, + 0x10df, 0x10e0, 0x10e1, 0x10e2, 0x10e2, 0x10e2, 0x10e2, 0x10e2, + /* offsets 0x2010 .. 0x201f */ + 0x10e2, 0x10e2, 0x10e3, 0x10e3, 0x10e3, 0x10e3, 0x10e3, 0x10e3, + 0x10e5, 0x10e5, 0x10e5, 0x10e5, 0x10e5, 0x10e5, 0x10e5, 0x10e5, + /* offsets 0x2020 .. 0x202f */ + 0x10e5, 0x10e5, 0x10e5, 0x10e5, 0x10e5, 0x10e6, 0x10e8, 0x10eb, + 0x10eb, 0x10eb, 0x10eb, 0x10eb, 0x10eb, 0x10eb, 0x10eb, 0x10eb, + /* offsets 0x2030 .. 0x203f */ + 0x10ec, 0x10ec, 0x10ec, 0x10ec, 0x10ee, 0x10f1, 0x10f1, 0x10f3, + 0x10f6, 0x10f6, 0x10f6, 0x10f6, 0x10f6, 0x10f8, 0x10f8, 0x10fa, + /* offsets 0x2040 .. 0x204f */ + 0x10fa, 0x10fa, 0x10fa, 0x10fa, 0x10fa, 0x10fa, 0x10fa, 0x10fa, + 0x10fc, 0x10fe, 0x1100, 0x1100, 0x1100, 0x1100, 0x1100, 0x1100, + /* offsets 0x2050 .. 0x205f */ + 0x1100, 0x1100, 0x1100, 0x1100, 0x1100, 0x1100, 0x1100, 0x1100, + 0x1104, 0x1104, 0x1104, 0x1104, 0x1104, 0x1104, 0x1104, 0x1104, + /* offsets 0x2070 .. 0x207f */ + 0x1105, 0x1106, 0x1107, 0x1107, 0x1107, 0x1108, 0x1109, 0x110a, + 0x110b, 0x110c, 0x110d, 0x110e, 0x110f, 0x1110, 0x1111, 0x1112, + /* offsets 0x2080 .. 0x208f */ + 0x1113, 0x1114, 0x1115, 0x1116, 0x1117, 0x1118, 0x1119, 0x111a, + 0x111b, 0x111c, 0x111d, 0x111e, 0x111f, 0x1120, 0x1121, 0x1122, + /* offsets 0x2090 .. 0x209f */ + 0x1122, 0x1123, 0x1124, 0x1125, 0x1126, 0x1127, 0x1128, 0x1129, + 0x112a, 0x112b, 0x112c, 0x112d, 0x112e, 0x112f, 0x112f, 0x112f, + /* offsets 0x20a0 .. 0x20af */ + 0x112f, 0x112f, 0x112f, 0x112f, 0x112f, 0x112f, 0x112f, 0x112f, + 0x112f, 0x1131, 0x1131, 0x1131, 0x1131, 0x1131, 0x1131, 0x1131, + /* offsets 0x2100 .. 0x210f */ + 0x1131, 0x1134, 0x1137, 0x1138, 0x113a, 0x113a, 0x113d, 0x1140, + 0x1141, 0x1141, 0x1143, 0x1144, 0x1145, 0x1146, 0x1147, 0x1148, + /* offsets 0x2110 .. 0x211f */ + 0x1149, 0x114a, 0x114b, 0x114c, 0x114d, 0x114d, 0x114e, 0x1150, + 0x1150, 0x1150, 0x1151, 0x1152, 0x1153, 0x1154, 0x1155, 0x1155, + /* offsets 0x2120 .. 0x212f */ + 0x1155, 0x1157, 0x115a, 0x115c, 0x115c, 0x115d, 0x115d, 0x115d, + 0x115d, 0x115e, 0x115e, 0x115e, 0x115e, 0x115f, 0x1160, 0x1160, + /* offsets 0x2130 .. 0x213f */ + 0x1161, 0x1162, 0x1163, 0x1163, 0x1164, 0x1165, 0x1166, 0x1167, + 0x1168, 0x1169, 0x116a, 0x116a, 0x116d, 0x116e, 0x116f, 0x1170, + /* offsets 0x2140 .. 0x214f */ + 0x1171, 0x1172, 0x1172, 0x1172, 0x1172, 0x1172, 0x1173, 0x1174, + 0x1175, 0x1176, 0x1177, 0x1177, 0x1177, 0x1177, 0x1177, 0x1177, + /* offsets 0x2150 .. 0x215f */ + 0x1177, 0x117a, 0x117d, 0x1181, 0x1184, 0x1187, 0x118a, 0x118d, + 0x1190, 0x1193, 0x1196, 0x1199, 0x119c, 0x119f, 0x11a2, 0x11a5, + /* offsets 0x2160 .. 0x216f */ + 0x11a7, 0x11a8, 0x11aa, 0x11ad, 0x11af, 0x11b0, 0x11b2, 0x11b5, + 0x11b9, 0x11bb, 0x11bc, 0x11be, 0x11c1, 0x11c2, 0x11c3, 0x11c4, + /* offsets 0x2170 .. 0x217f */ + 0x11c5, 0x11c6, 0x11c8, 0x11cb, 0x11cd, 0x11ce, 0x11d0, 0x11d3, + 0x11d7, 0x11d9, 0x11da, 0x11dc, 0x11df, 0x11e0, 0x11e1, 0x11e2, + /* offsets 0x2180 .. 0x218f */ + 0x11e3, 0x11e3, 0x11e3, 0x11e3, 0x11e3, 0x11e3, 0x11e3, 0x11e3, + 0x11e3, 0x11e3, 0x11e6, 0x11e6, 0x11e6, 0x11e6, 0x11e6, 0x11e6, + /* offsets 0x2220 .. 0x222f */ + 0x11e6, 0x11e6, 0x11e6, 0x11e6, 0x11e6, 0x11e6, 0x11e6, 0x11e6, + 0x11e6, 0x11e6, 0x11e6, 0x11e6, 0x11e6, 0x11e8, 0x11eb, 0x11eb, + /* offsets 0x2230 .. 0x223f */ + 0x11ed, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, + 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, 0x11f0, + /* offsets 0x2460 .. 0x246f */ + 0x11f0, 0x11f1, 0x11f2, 0x11f3, 0x11f4, 0x11f5, 0x11f6, 0x11f7, + 0x11f8, 0x11f9, 0x11fb, 0x11fd, 0x11ff, 0x1201, 0x1203, 0x1205, + /* offsets 0x2470 .. 0x247f */ + 0x1207, 0x1209, 0x120b, 0x120d, 0x120f, 0x1212, 0x1215, 0x1218, + 0x121b, 0x121e, 0x1221, 0x1224, 0x1227, 0x122a, 0x122e, 0x1232, + /* offsets 0x2480 .. 0x248f */ + 0x1236, 0x123a, 0x123e, 0x1242, 0x1246, 0x124a, 0x124e, 0x1252, + 0x1256, 0x1258, 0x125a, 0x125c, 0x125e, 0x1260, 0x1262, 0x1264, + /* offsets 0x2490 .. 0x249f */ + 0x1266, 0x1268, 0x126b, 0x126e, 0x1271, 0x1274, 0x1277, 0x127a, + 0x127d, 0x1280, 0x1283, 0x1286, 0x1289, 0x128c, 0x128f, 0x1292, + /* offsets 0x24a0 .. 0x24af */ + 0x1295, 0x1298, 0x129b, 0x129e, 0x12a1, 0x12a4, 0x12a7, 0x12aa, + 0x12ad, 0x12b0, 0x12b3, 0x12b6, 0x12b9, 0x12bc, 0x12bf, 0x12c2, + /* offsets 0x24b0 .. 0x24bf */ + 0x12c5, 0x12c8, 0x12cb, 0x12ce, 0x12d1, 0x12d4, 0x12d7, 0x12d8, + 0x12d9, 0x12da, 0x12db, 0x12dc, 0x12dd, 0x12de, 0x12df, 0x12e0, + /* offsets 0x24c0 .. 0x24cf */ + 0x12e1, 0x12e2, 0x12e3, 0x12e4, 0x12e5, 0x12e6, 0x12e7, 0x12e8, + 0x12e9, 0x12ea, 0x12eb, 0x12ec, 0x12ed, 0x12ee, 0x12ef, 0x12f0, + /* offsets 0x24d0 .. 0x24df */ + 0x12f1, 0x12f2, 0x12f3, 0x12f4, 0x12f5, 0x12f6, 0x12f7, 0x12f8, + 0x12f9, 0x12fa, 0x12fb, 0x12fc, 0x12fd, 0x12fe, 0x12ff, 0x1300, + /* offsets 0x24e0 .. 0x24ef */ + 0x1301, 0x1302, 0x1303, 0x1304, 0x1305, 0x1306, 0x1307, 0x1308, + 0x1309, 0x130a, 0x130b, 0x130c, 0x130c, 0x130c, 0x130c, 0x130c, + /* offsets 0x2a00 .. 0x2a0f */ + 0x130c, 0x130c, 0x130c, 0x130c, 0x130c, 0x130c, 0x130c, 0x130c, + 0x130c, 0x130c, 0x130c, 0x130c, 0x130c, 0x1310, 0x1310, 0x1310, + /* offsets 0x2a70 .. 0x2a7f */ + 0x1310, 0x1310, 0x1310, 0x1310, 0x1310, 0x1313, 0x1315, 0x1318, + 0x1318, 0x1318, 0x1318, 0x1318, 0x1318, 0x1318, 0x1318, 0x1318, + /* offsets 0x2c70 .. 0x2c7f */ + 0x1318, 0x1318, 0x1318, 0x1318, 0x1318, 0x1318, 0x1318, 0x1318, + 0x1318, 0x1318, 0x1318, 0x1318, 0x1318, 0x1319, 0x131a, 0x131a, + /* offsets 0x2d60 .. 0x2d6f */ + 0x131a, 0x131a, 0x131a, 0x131a, 0x131a, 0x131a, 0x131a, 0x131a, + 0x131a, 0x131a, 0x131a, 0x131a, 0x131a, 0x131a, 0x131a, 0x131a, + /* offsets 0x2e90 .. 0x2e9f */ + 0x131b, 0x131b, 0x131b, 0x131b, 0x131b, 0x131b, 0x131b, 0x131b, + 0x131b, 0x131b, 0x131b, 0x131b, 0x131b, 0x131b, 0x131b, 0x131b, + /* offsets 0x2ef0 .. 0x2eff */ + 0x131c, 0x131c, 0x131c, 0x131c, 0x131d, 0x131d, 0x131d, 0x131d, + 0x131d, 0x131d, 0x131d, 0x131d, 0x131d, 0x131d, 0x131d, 0x131d, + /* offsets 0x2f00 .. 0x2f0f */ + 0x131d, 0x131e, 0x131f, 0x1320, 0x1321, 0x1322, 0x1323, 0x1324, + 0x1325, 0x1326, 0x1327, 0x1328, 0x1329, 0x132a, 0x132b, 0x132c, + /* offsets 0x2f10 .. 0x2f1f */ + 0x132d, 0x132e, 0x132f, 0x1330, 0x1331, 0x1332, 0x1333, 0x1334, + 0x1335, 0x1336, 0x1337, 0x1338, 0x1339, 0x133a, 0x133b, 0x133c, + /* offsets 0x2f20 .. 0x2f2f */ + 0x133d, 0x133e, 0x133f, 0x1340, 0x1341, 0x1342, 0x1343, 0x1344, + 0x1345, 0x1346, 0x1347, 0x1348, 0x1349, 0x134a, 0x134b, 0x134c, + /* offsets 0x2f30 .. 0x2f3f */ + 0x134d, 0x134e, 0x134f, 0x1350, 0x1351, 0x1352, 0x1353, 0x1354, + 0x1355, 0x1356, 0x1357, 0x1358, 0x1359, 0x135a, 0x135b, 0x135c, + /* offsets 0x2f40 .. 0x2f4f */ + 0x135d, 0x135e, 0x135f, 0x1360, 0x1361, 0x1362, 0x1363, 0x1364, + 0x1365, 0x1366, 0x1367, 0x1368, 0x1369, 0x136a, 0x136b, 0x136c, + /* offsets 0x2f50 .. 0x2f5f */ + 0x136d, 0x136e, 0x136f, 0x1370, 0x1371, 0x1372, 0x1373, 0x1374, + 0x1375, 0x1376, 0x1377, 0x1378, 0x1379, 0x137a, 0x137b, 0x137c, + /* offsets 0x2f60 .. 0x2f6f */ + 0x137d, 0x137e, 0x137f, 0x1380, 0x1381, 0x1382, 0x1383, 0x1384, + 0x1385, 0x1386, 0x1387, 0x1388, 0x1389, 0x138a, 0x138b, 0x138c, + /* offsets 0x2f70 .. 0x2f7f */ + 0x138d, 0x138e, 0x138f, 0x1390, 0x1391, 0x1392, 0x1393, 0x1394, + 0x1395, 0x1396, 0x1397, 0x1398, 0x1399, 0x139a, 0x139b, 0x139c, + /* offsets 0x2f80 .. 0x2f8f */ + 0x139d, 0x139e, 0x139f, 0x13a0, 0x13a1, 0x13a2, 0x13a3, 0x13a4, + 0x13a5, 0x13a6, 0x13a7, 0x13a8, 0x13a9, 0x13aa, 0x13ab, 0x13ac, + /* offsets 0x2f90 .. 0x2f9f */ + 0x13ad, 0x13ae, 0x13af, 0x13b0, 0x13b1, 0x13b2, 0x13b3, 0x13b4, + 0x13b5, 0x13b6, 0x13b7, 0x13b8, 0x13b9, 0x13ba, 0x13bb, 0x13bc, + /* offsets 0x2fa0 .. 0x2faf */ + 0x13bd, 0x13be, 0x13bf, 0x13c0, 0x13c1, 0x13c2, 0x13c3, 0x13c4, + 0x13c5, 0x13c6, 0x13c7, 0x13c8, 0x13c9, 0x13ca, 0x13cb, 0x13cc, + /* offsets 0x2fb0 .. 0x2fbf */ + 0x13cd, 0x13ce, 0x13cf, 0x13d0, 0x13d1, 0x13d2, 0x13d3, 0x13d4, + 0x13d5, 0x13d6, 0x13d7, 0x13d8, 0x13d9, 0x13da, 0x13db, 0x13dc, + /* offsets 0x2fc0 .. 0x2fcf */ + 0x13dd, 0x13de, 0x13df, 0x13e0, 0x13e1, 0x13e2, 0x13e3, 0x13e4, + 0x13e5, 0x13e6, 0x13e7, 0x13e8, 0x13e9, 0x13ea, 0x13eb, 0x13ec, + /* offsets 0x2fd0 .. 0x2fdf */ + 0x13ed, 0x13ee, 0x13ef, 0x13f0, 0x13f1, 0x13f2, 0x13f3, 0x13f3, + 0x13f3, 0x13f3, 0x13f3, 0x13f3, 0x13f3, 0x13f3, 0x13f3, 0x13f3, + /* offsets 0x3000 .. 0x300f */ + 0x13f3, 0x13f4, 0x13f4, 0x13f4, 0x13f4, 0x13f4, 0x13f4, 0x13f4, + 0x13f4, 0x13f4, 0x13f4, 0x13f4, 0x13f4, 0x13f4, 0x13f4, 0x13f4, + /* offsets 0x3030 .. 0x303f */ + 0x13f4, 0x13f4, 0x13f4, 0x13f4, 0x13f4, 0x13f4, 0x13f4, 0x13f5, + 0x13f5, 0x13f6, 0x13f7, 0x13f8, 0x13f8, 0x13f8, 0x13f8, 0x13f8, + /* offsets 0x3090 .. 0x309f */ + 0x13f8, 0x13f8, 0x13f8, 0x13f8, 0x13f8, 0x13f8, 0x13f8, 0x13f8, + 0x13f8, 0x13f8, 0x13f8, 0x13f8, 0x13fa, 0x13fc, 0x13fc, 0x13fc, + /* offsets 0x30f0 .. 0x30ff */ + 0x13fe, 0x13fe, 0x13fe, 0x13fe, 0x13fe, 0x13fe, 0x13fe, 0x13fe, + 0x13fe, 0x13fe, 0x13fe, 0x13fe, 0x13fe, 0x13fe, 0x13fe, 0x13fe, + /* offsets 0x3130 .. 0x313f */ + 0x1400, 0x1400, 0x1401, 0x1402, 0x1403, 0x1404, 0x1405, 0x1406, + 0x1407, 0x1408, 0x1409, 0x140a, 0x140b, 0x140c, 0x140d, 0x140e, + /* offsets 0x3140 .. 0x314f */ + 0x140f, 0x1410, 0x1411, 0x1412, 0x1413, 0x1414, 0x1415, 0x1416, + 0x1417, 0x1418, 0x1419, 0x141a, 0x141b, 0x141c, 0x141d, 0x141e, + /* offsets 0x3150 .. 0x315f */ + 0x141f, 0x1420, 0x1421, 0x1422, 0x1423, 0x1424, 0x1425, 0x1426, + 0x1427, 0x1428, 0x1429, 0x142a, 0x142b, 0x142c, 0x142d, 0x142e, + /* offsets 0x3160 .. 0x316f */ + 0x142f, 0x1430, 0x1431, 0x1432, 0x1433, 0x1434, 0x1435, 0x1436, + 0x1437, 0x1438, 0x1439, 0x143a, 0x143b, 0x143c, 0x143d, 0x143e, + /* offsets 0x3170 .. 0x317f */ + 0x143f, 0x1440, 0x1441, 0x1442, 0x1443, 0x1444, 0x1445, 0x1446, + 0x1447, 0x1448, 0x1449, 0x144a, 0x144b, 0x144c, 0x144d, 0x144e, + /* offsets 0x3180 .. 0x318f */ + 0x144f, 0x1450, 0x1451, 0x1452, 0x1453, 0x1454, 0x1455, 0x1456, + 0x1457, 0x1458, 0x1459, 0x145a, 0x145b, 0x145c, 0x145d, 0x145e, + /* offsets 0x3190 .. 0x319f */ + 0x145e, 0x145e, 0x145e, 0x145f, 0x1460, 0x1461, 0x1462, 0x1463, + 0x1464, 0x1465, 0x1466, 0x1467, 0x1468, 0x1469, 0x146a, 0x146b, + /* offsets 0x3200 .. 0x320f */ + 0x146c, 0x146f, 0x1472, 0x1475, 0x1478, 0x147b, 0x147e, 0x1481, + 0x1484, 0x1487, 0x148a, 0x148d, 0x1490, 0x1493, 0x1496, 0x149a, + /* offsets 0x3210 .. 0x321f */ + 0x149e, 0x14a2, 0x14a6, 0x14aa, 0x14ae, 0x14b2, 0x14b6, 0x14ba, + 0x14be, 0x14c2, 0x14c6, 0x14ca, 0x14ce, 0x14d2, 0x14d9, 0x14df, + /* offsets 0x3220 .. 0x322f */ + 0x14df, 0x14e2, 0x14e5, 0x14e8, 0x14eb, 0x14ee, 0x14f1, 0x14f4, + 0x14f7, 0x14fa, 0x14fd, 0x1500, 0x1503, 0x1506, 0x1509, 0x150c, + /* offsets 0x3230 .. 0x323f */ + 0x150f, 0x1512, 0x1515, 0x1518, 0x151b, 0x151e, 0x1521, 0x1524, + 0x1527, 0x152a, 0x152d, 0x1530, 0x1533, 0x1536, 0x1539, 0x153c, + /* offsets 0x3240 .. 0x324f */ + 0x153f, 0x1542, 0x1545, 0x1548, 0x154b, 0x154c, 0x154d, 0x154e, + 0x154f, 0x154f, 0x154f, 0x154f, 0x154f, 0x154f, 0x154f, 0x154f, + /* offsets 0x3250 .. 0x325f */ + 0x154f, 0x1552, 0x1554, 0x1556, 0x1558, 0x155a, 0x155c, 0x155e, + 0x1560, 0x1562, 0x1564, 0x1566, 0x1568, 0x156a, 0x156c, 0x156e, + /* offsets 0x3260 .. 0x326f */ + 0x1570, 0x1571, 0x1572, 0x1573, 0x1574, 0x1575, 0x1576, 0x1577, + 0x1578, 0x1579, 0x157a, 0x157b, 0x157c, 0x157d, 0x157e, 0x1580, + /* offsets 0x3270 .. 0x327f */ + 0x1582, 0x1584, 0x1586, 0x1588, 0x158a, 0x158c, 0x158e, 0x1590, + 0x1592, 0x1594, 0x1596, 0x1598, 0x159a, 0x159f, 0x15a3, 0x15a5, + /* offsets 0x3280 .. 0x328f */ + 0x15a5, 0x15a6, 0x15a7, 0x15a8, 0x15a9, 0x15aa, 0x15ab, 0x15ac, + 0x15ad, 0x15ae, 0x15af, 0x15b0, 0x15b1, 0x15b2, 0x15b3, 0x15b4, + /* offsets 0x3290 .. 0x329f */ + 0x15b5, 0x15b6, 0x15b7, 0x15b8, 0x15b9, 0x15ba, 0x15bb, 0x15bc, + 0x15bd, 0x15be, 0x15bf, 0x15c0, 0x15c1, 0x15c2, 0x15c3, 0x15c4, + /* offsets 0x32a0 .. 0x32af */ + 0x15c5, 0x15c6, 0x15c7, 0x15c8, 0x15c9, 0x15ca, 0x15cb, 0x15cc, + 0x15cd, 0x15ce, 0x15cf, 0x15d0, 0x15d1, 0x15d2, 0x15d3, 0x15d4, + /* offsets 0x32b0 .. 0x32bf */ + 0x15d5, 0x15d6, 0x15d8, 0x15da, 0x15dc, 0x15de, 0x15e0, 0x15e2, + 0x15e4, 0x15e6, 0x15e8, 0x15ea, 0x15ec, 0x15ee, 0x15f0, 0x15f2, + /* offsets 0x32c0 .. 0x32cf */ + 0x15f4, 0x15f6, 0x15f8, 0x15fa, 0x15fc, 0x15fe, 0x1600, 0x1602, + 0x1604, 0x1606, 0x1609, 0x160c, 0x160f, 0x1611, 0x1614, 0x1616, + /* offsets 0x32d0 .. 0x32df */ + 0x1619, 0x161a, 0x161b, 0x161c, 0x161d, 0x161e, 0x161f, 0x1620, + 0x1621, 0x1622, 0x1623, 0x1624, 0x1625, 0x1626, 0x1627, 0x1628, + /* offsets 0x32e0 .. 0x32ef */ + 0x1629, 0x162a, 0x162b, 0x162c, 0x162d, 0x162e, 0x162f, 0x1630, + 0x1631, 0x1632, 0x1633, 0x1634, 0x1635, 0x1636, 0x1637, 0x1638, + /* offsets 0x32f0 .. 0x32ff */ + 0x1639, 0x163a, 0x163b, 0x163c, 0x163d, 0x163e, 0x163f, 0x1640, + 0x1641, 0x1642, 0x1643, 0x1644, 0x1645, 0x1646, 0x1647, 0x1648, + /* offsets 0x3300 .. 0x330f */ + 0x1648, 0x164c, 0x1650, 0x1654, 0x1657, 0x165b, 0x165e, 0x1661, + 0x1666, 0x166a, 0x166d, 0x1670, 0x1673, 0x1677, 0x167b, 0x167e, + /* offsets 0x3310 .. 0x331f */ + 0x1681, 0x1683, 0x1686, 0x168a, 0x168e, 0x1690, 0x1695, 0x169b, + 0x16a0, 0x16a3, 0x16a8, 0x16ad, 0x16b1, 0x16b4, 0x16b7, 0x16ba, + /* offsets 0x3320 .. 0x332f */ + 0x16be, 0x16c3, 0x16c7, 0x16ca, 0x16cd, 0x16d0, 0x16d2, 0x16d4, + 0x16d6, 0x16d8, 0x16db, 0x16de, 0x16e3, 0x16e6, 0x16ea, 0x16ef, + /* offsets 0x3330 .. 0x333f */ + 0x16f2, 0x16f4, 0x16f6, 0x16fb, 0x16ff, 0x1704, 0x1707, 0x170c, + 0x170e, 0x1711, 0x1714, 0x1717, 0x171a, 0x171d, 0x1721, 0x1724, + /* offsets 0x3340 .. 0x334f */ + 0x1726, 0x1729, 0x172c, 0x172f, 0x1733, 0x1736, 0x1739, 0x173c, + 0x1741, 0x1745, 0x1747, 0x174c, 0x174e, 0x1752, 0x1756, 0x1759, + /* offsets 0x3350 .. 0x335f */ + 0x175c, 0x175f, 0x1763, 0x1765, 0x1768, 0x176c, 0x176e, 0x1773, + 0x1776, 0x1778, 0x177a, 0x177c, 0x177e, 0x1780, 0x1782, 0x1784, + /* offsets 0x3360 .. 0x336f */ + 0x1786, 0x1788, 0x178a, 0x178d, 0x1790, 0x1793, 0x1796, 0x1799, + 0x179c, 0x179f, 0x17a2, 0x17a5, 0x17a8, 0x17ab, 0x17ae, 0x17b1, + /* offsets 0x3370 .. 0x337f */ + 0x17b4, 0x17b7, 0x17ba, 0x17bc, 0x17be, 0x17c1, 0x17c3, 0x17c5, + 0x17c7, 0x17ca, 0x17cd, 0x17cf, 0x17d1, 0x17d3, 0x17d5, 0x17d7, + /* offsets 0x3380 .. 0x338f */ + 0x17db, 0x17dd, 0x17df, 0x17e1, 0x17e3, 0x17e5, 0x17e7, 0x17e9, + 0x17eb, 0x17ee, 0x17f2, 0x17f4, 0x17f6, 0x17f8, 0x17fa, 0x17fc, + /* offsets 0x3390 .. 0x339f */ + 0x17fe, 0x1800, 0x1803, 0x1806, 0x1809, 0x180c, 0x180e, 0x1810, + 0x1812, 0x1814, 0x1816, 0x1818, 0x181a, 0x181c, 0x181e, 0x1820, + /* offsets 0x33a0 .. 0x33af */ + 0x1823, 0x1826, 0x1828, 0x182b, 0x182e, 0x1831, 0x1833, 0x1836, + 0x1839, 0x183d, 0x183f, 0x1842, 0x1845, 0x1848, 0x184b, 0x1850, + /* offsets 0x33b0 .. 0x33bf */ + 0x1856, 0x1858, 0x185a, 0x185c, 0x185e, 0x1860, 0x1862, 0x1864, + 0x1866, 0x1868, 0x186a, 0x186c, 0x186e, 0x1870, 0x1872, 0x1874, + /* offsets 0x33c0 .. 0x33cf */ + 0x1876, 0x1878, 0x187a, 0x187e, 0x1880, 0x1882, 0x1884, 0x1888, + 0x188b, 0x188d, 0x188f, 0x1891, 0x1893, 0x1895, 0x1897, 0x1899, + /* offsets 0x33d0 .. 0x33df */ + 0x189b, 0x189d, 0x189f, 0x18a2, 0x18a4, 0x18a6, 0x18a9, 0x18ac, + 0x18ae, 0x18b2, 0x18b5, 0x18b7, 0x18b9, 0x18bb, 0x18bd, 0x18c0, + /* offsets 0x33e0 .. 0x33ef */ + 0x18c3, 0x18c5, 0x18c7, 0x18c9, 0x18cb, 0x18cd, 0x18cf, 0x18d1, + 0x18d3, 0x18d5, 0x18d8, 0x18db, 0x18de, 0x18e1, 0x18e4, 0x18e7, + /* offsets 0x33f0 .. 0x33ff */ + 0x18ea, 0x18ed, 0x18f0, 0x18f3, 0x18f6, 0x18f9, 0x18fc, 0x18ff, + 0x1902, 0x1905, 0x1908, 0x190b, 0x190e, 0x1911, 0x1914, 0x1917, + /* offsets 0xa690 .. 0xa69f */ + 0x191a, 0x191a, 0x191a, 0x191a, 0x191a, 0x191a, 0x191a, 0x191a, + 0x191a, 0x191a, 0x191a, 0x191a, 0x191a, 0x191b, 0x191c, 0x191c, + /* offsets 0xa770 .. 0xa77f */ + 0x191c, 0x191d, 0x191d, 0x191d, 0x191d, 0x191d, 0x191d, 0x191d, + 0x191d, 0x191d, 0x191d, 0x191d, 0x191d, 0x191d, 0x191d, 0x191d, + /* offsets 0xa7f0 .. 0xa7ff */ + 0x191d, 0x191d, 0x191d, 0x191d, 0x191d, 0x191d, 0x191d, 0x191d, + 0x191d, 0x191e, 0x191f, 0x191f, 0x191f, 0x191f, 0x191f, 0x191f, + /* offsets 0xab50 .. 0xab5f */ + 0x191f, 0x191f, 0x191f, 0x191f, 0x191f, 0x191f, 0x191f, 0x191f, + 0x191f, 0x191f, 0x191f, 0x191f, 0x191f, 0x1920, 0x1921, 0x1922, + /* offsets 0xfb00 .. 0xfb0f */ + 0x1923, 0x1925, 0x1927, 0x1929, 0x192c, 0x192f, 0x1931, 0x1933, + 0x1933, 0x1933, 0x1933, 0x1933, 0x1933, 0x1933, 0x1933, 0x1933, + /* offsets 0xfb10 .. 0xfb1f */ + 0x1933, 0x1933, 0x1933, 0x1933, 0x1935, 0x1937, 0x1939, 0x193b, + 0x193d, 0x193d, 0x193d, 0x193d, 0x193d, 0x193d, 0x193d, 0x193d, + /* offsets 0xfb20 .. 0xfb2f */ + 0x193d, 0x193e, 0x193f, 0x1940, 0x1941, 0x1942, 0x1943, 0x1944, + 0x1945, 0x1946, 0x1947, 0x1947, 0x1947, 0x1947, 0x1947, 0x1947, + /* offsets 0xfb40 .. 0xfb4f */ + 0x1947, 0x1947, 0x1947, 0x1947, 0x1947, 0x1947, 0x1947, 0x1947, + 0x1947, 0x1947, 0x1947, 0x1947, 0x1947, 0x1947, 0x1947, 0x1947, + /* offsets 0xfb50 .. 0xfb5f */ + 0x1949, 0x194a, 0x194b, 0x194c, 0x194d, 0x194e, 0x194f, 0x1950, + 0x1951, 0x1952, 0x1953, 0x1954, 0x1955, 0x1956, 0x1957, 0x1958, + /* offsets 0xfb60 .. 0xfb6f */ + 0x1959, 0x195a, 0x195b, 0x195c, 0x195d, 0x195e, 0x195f, 0x1960, + 0x1961, 0x1962, 0x1963, 0x1964, 0x1965, 0x1966, 0x1967, 0x1968, + /* offsets 0xfb70 .. 0xfb7f */ + 0x1969, 0x196a, 0x196b, 0x196c, 0x196d, 0x196e, 0x196f, 0x1970, + 0x1971, 0x1972, 0x1973, 0x1974, 0x1975, 0x1976, 0x1977, 0x1978, + /* offsets 0xfb80 .. 0xfb8f */ + 0x1979, 0x197a, 0x197b, 0x197c, 0x197d, 0x197e, 0x197f, 0x1980, + 0x1981, 0x1982, 0x1983, 0x1984, 0x1985, 0x1986, 0x1987, 0x1988, + /* offsets 0xfb90 .. 0xfb9f */ + 0x1989, 0x198a, 0x198b, 0x198c, 0x198d, 0x198e, 0x198f, 0x1990, + 0x1991, 0x1992, 0x1993, 0x1994, 0x1995, 0x1996, 0x1997, 0x1998, + /* offsets 0xfba0 .. 0xfbaf */ + 0x1999, 0x199a, 0x199b, 0x199c, 0x199d, 0x199e, 0x199f, 0x19a0, + 0x19a1, 0x19a2, 0x19a3, 0x19a4, 0x19a5, 0x19a6, 0x19a7, 0x19a8, + /* offsets 0xfbb0 .. 0xfbbf */ + 0x19a9, 0x19aa, 0x19ab, 0x19ab, 0x19ab, 0x19ab, 0x19ab, 0x19ab, + 0x19ab, 0x19ab, 0x19ab, 0x19ab, 0x19ab, 0x19ab, 0x19ab, 0x19ab, + /* offsets 0xfbd0 .. 0xfbdf */ + 0x19ab, 0x19ab, 0x19ab, 0x19ab, 0x19ac, 0x19ad, 0x19ae, 0x19af, + 0x19b0, 0x19b1, 0x19b2, 0x19b3, 0x19b4, 0x19b5, 0x19b6, 0x19b7, + /* offsets 0xfbe0 .. 0xfbef */ + 0x19b8, 0x19b9, 0x19ba, 0x19bb, 0x19bc, 0x19bd, 0x19be, 0x19bf, + 0x19c0, 0x19c1, 0x19c2, 0x19c4, 0x19c6, 0x19c8, 0x19ca, 0x19cc, + /* offsets 0xfbf0 .. 0xfbff */ + 0x19ce, 0x19d0, 0x19d2, 0x19d4, 0x19d6, 0x19d8, 0x19da, 0x19dc, + 0x19de, 0x19e0, 0x19e2, 0x19e4, 0x19e6, 0x19e7, 0x19e8, 0x19e9, + /* offsets 0xfc00 .. 0xfc0f */ + 0x19ea, 0x19ec, 0x19ee, 0x19f0, 0x19f2, 0x19f4, 0x19f6, 0x19f8, + 0x19fa, 0x19fc, 0x19fe, 0x1a00, 0x1a02, 0x1a04, 0x1a06, 0x1a08, + /* offsets 0xfc10 .. 0xfc1f */ + 0x1a0a, 0x1a0c, 0x1a0e, 0x1a10, 0x1a12, 0x1a14, 0x1a16, 0x1a18, + 0x1a1a, 0x1a1c, 0x1a1e, 0x1a20, 0x1a22, 0x1a24, 0x1a26, 0x1a28, + /* offsets 0xfc20 .. 0xfc2f */ + 0x1a2a, 0x1a2c, 0x1a2e, 0x1a30, 0x1a32, 0x1a34, 0x1a36, 0x1a38, + 0x1a3a, 0x1a3c, 0x1a3e, 0x1a40, 0x1a42, 0x1a44, 0x1a46, 0x1a48, + /* offsets 0xfc30 .. 0xfc3f */ + 0x1a4a, 0x1a4c, 0x1a4e, 0x1a50, 0x1a52, 0x1a54, 0x1a56, 0x1a58, + 0x1a5a, 0x1a5c, 0x1a5e, 0x1a60, 0x1a62, 0x1a64, 0x1a66, 0x1a68, + /* offsets 0xfc40 .. 0xfc4f */ + 0x1a6a, 0x1a6c, 0x1a6e, 0x1a70, 0x1a72, 0x1a74, 0x1a76, 0x1a78, + 0x1a7a, 0x1a7c, 0x1a7e, 0x1a80, 0x1a82, 0x1a84, 0x1a86, 0x1a88, + /* offsets 0xfc50 .. 0xfc5f */ + 0x1a8a, 0x1a8c, 0x1a8e, 0x1a90, 0x1a92, 0x1a94, 0x1a96, 0x1a98, + 0x1a9a, 0x1a9c, 0x1a9e, 0x1aa0, 0x1aa2, 0x1aa4, 0x1aa6, 0x1aa9, + /* offsets 0xfc60 .. 0xfc6f */ + 0x1aac, 0x1aaf, 0x1ab2, 0x1ab5, 0x1ab8, 0x1aba, 0x1abc, 0x1abe, + 0x1ac0, 0x1ac2, 0x1ac4, 0x1ac6, 0x1ac8, 0x1aca, 0x1acc, 0x1ace, + /* offsets 0xfc70 .. 0xfc7f */ + 0x1ad0, 0x1ad2, 0x1ad4, 0x1ad6, 0x1ad8, 0x1ada, 0x1adc, 0x1ade, + 0x1ae0, 0x1ae2, 0x1ae4, 0x1ae6, 0x1ae8, 0x1aea, 0x1aec, 0x1aee, + /* offsets 0xfc80 .. 0xfc8f */ + 0x1af0, 0x1af2, 0x1af4, 0x1af6, 0x1af8, 0x1afa, 0x1afc, 0x1afe, + 0x1b00, 0x1b02, 0x1b04, 0x1b06, 0x1b08, 0x1b0a, 0x1b0c, 0x1b0e, + /* offsets 0xfc90 .. 0xfc9f */ + 0x1b10, 0x1b12, 0x1b14, 0x1b16, 0x1b18, 0x1b1a, 0x1b1c, 0x1b1e, + 0x1b20, 0x1b22, 0x1b24, 0x1b26, 0x1b28, 0x1b2a, 0x1b2c, 0x1b2e, + /* offsets 0xfca0 .. 0xfcaf */ + 0x1b30, 0x1b32, 0x1b34, 0x1b36, 0x1b38, 0x1b3a, 0x1b3c, 0x1b3e, + 0x1b40, 0x1b42, 0x1b44, 0x1b46, 0x1b48, 0x1b4a, 0x1b4c, 0x1b4e, + /* offsets 0xfcb0 .. 0xfcbf */ + 0x1b50, 0x1b52, 0x1b54, 0x1b56, 0x1b58, 0x1b5a, 0x1b5c, 0x1b5e, + 0x1b60, 0x1b62, 0x1b64, 0x1b66, 0x1b68, 0x1b6a, 0x1b6c, 0x1b6e, + /* offsets 0xfcc0 .. 0xfccf */ + 0x1b70, 0x1b72, 0x1b74, 0x1b76, 0x1b78, 0x1b7a, 0x1b7c, 0x1b7e, + 0x1b80, 0x1b82, 0x1b84, 0x1b86, 0x1b88, 0x1b8a, 0x1b8c, 0x1b8e, + /* offsets 0xfcd0 .. 0xfcdf */ + 0x1b90, 0x1b92, 0x1b94, 0x1b96, 0x1b98, 0x1b9a, 0x1b9c, 0x1b9e, + 0x1ba0, 0x1ba2, 0x1ba4, 0x1ba6, 0x1ba8, 0x1baa, 0x1bac, 0x1bae, + /* offsets 0xfce0 .. 0xfcef */ + 0x1bb0, 0x1bb2, 0x1bb4, 0x1bb6, 0x1bb8, 0x1bba, 0x1bbc, 0x1bbe, + 0x1bc0, 0x1bc2, 0x1bc4, 0x1bc6, 0x1bc8, 0x1bca, 0x1bcc, 0x1bce, + /* offsets 0xfcf0 .. 0xfcff */ + 0x1bd0, 0x1bd2, 0x1bd4, 0x1bd7, 0x1bda, 0x1bdd, 0x1bdf, 0x1be1, + 0x1be3, 0x1be5, 0x1be7, 0x1be9, 0x1beb, 0x1bed, 0x1bef, 0x1bf1, + /* offsets 0xfd00 .. 0xfd0f */ + 0x1bf3, 0x1bf5, 0x1bf7, 0x1bf9, 0x1bfb, 0x1bfd, 0x1bff, 0x1c01, + 0x1c03, 0x1c05, 0x1c07, 0x1c09, 0x1c0b, 0x1c0d, 0x1c0f, 0x1c11, + /* offsets 0xfd10 .. 0xfd1f */ + 0x1c13, 0x1c15, 0x1c17, 0x1c19, 0x1c1b, 0x1c1d, 0x1c1f, 0x1c21, + 0x1c23, 0x1c25, 0x1c27, 0x1c29, 0x1c2b, 0x1c2d, 0x1c2f, 0x1c31, + /* offsets 0xfd20 .. 0xfd2f */ + 0x1c33, 0x1c35, 0x1c37, 0x1c39, 0x1c3b, 0x1c3d, 0x1c3f, 0x1c41, + 0x1c43, 0x1c45, 0x1c47, 0x1c49, 0x1c4b, 0x1c4d, 0x1c4f, 0x1c51, + /* offsets 0xfd30 .. 0xfd3f */ + 0x1c53, 0x1c55, 0x1c57, 0x1c59, 0x1c5b, 0x1c5d, 0x1c5f, 0x1c61, + 0x1c63, 0x1c65, 0x1c67, 0x1c69, 0x1c6b, 0x1c6d, 0x1c6f, 0x1c6f, + /* offsets 0xfd50 .. 0xfd5f */ + 0x1c6f, 0x1c72, 0x1c75, 0x1c78, 0x1c7b, 0x1c7e, 0x1c81, 0x1c84, + 0x1c87, 0x1c8a, 0x1c8d, 0x1c90, 0x1c93, 0x1c96, 0x1c99, 0x1c9c, + /* offsets 0xfd60 .. 0xfd6f */ + 0x1c9f, 0x1ca2, 0x1ca5, 0x1ca8, 0x1cab, 0x1cae, 0x1cb1, 0x1cb4, + 0x1cb7, 0x1cba, 0x1cbd, 0x1cc0, 0x1cc3, 0x1cc6, 0x1cc9, 0x1ccc, + /* offsets 0xfd70 .. 0xfd7f */ + 0x1ccf, 0x1cd2, 0x1cd5, 0x1cd8, 0x1cdb, 0x1cde, 0x1ce1, 0x1ce4, + 0x1ce7, 0x1cea, 0x1ced, 0x1cf0, 0x1cf3, 0x1cf6, 0x1cf9, 0x1cfc, + /* offsets 0xfd80 .. 0xfd8f */ + 0x1cff, 0x1d02, 0x1d05, 0x1d08, 0x1d0b, 0x1d0e, 0x1d11, 0x1d14, + 0x1d17, 0x1d1a, 0x1d1d, 0x1d20, 0x1d23, 0x1d26, 0x1d29, 0x1d2c, + /* offsets 0xfd90 .. 0xfd9f */ + 0x1d2f, 0x1d2f, 0x1d2f, 0x1d32, 0x1d35, 0x1d38, 0x1d3b, 0x1d3e, + 0x1d41, 0x1d44, 0x1d47, 0x1d4a, 0x1d4d, 0x1d50, 0x1d53, 0x1d56, + /* offsets 0xfda0 .. 0xfdaf */ + 0x1d59, 0x1d5c, 0x1d5f, 0x1d62, 0x1d65, 0x1d68, 0x1d6b, 0x1d6e, + 0x1d71, 0x1d74, 0x1d77, 0x1d7a, 0x1d7d, 0x1d80, 0x1d83, 0x1d86, + /* offsets 0xfdb0 .. 0xfdbf */ + 0x1d89, 0x1d8c, 0x1d8f, 0x1d92, 0x1d95, 0x1d98, 0x1d9b, 0x1d9e, + 0x1da1, 0x1da4, 0x1da7, 0x1daa, 0x1dad, 0x1db0, 0x1db3, 0x1db6, + /* offsets 0xfdc0 .. 0xfdcf */ + 0x1db9, 0x1dbc, 0x1dbf, 0x1dc2, 0x1dc5, 0x1dc8, 0x1dcb, 0x1dce, + 0x1dd1, 0x1dd1, 0x1dd1, 0x1dd1, 0x1dd1, 0x1dd1, 0x1dd1, 0x1dd1, + /* offsets 0xfdf0 .. 0xfdff */ + 0x1dd1, 0x1dd4, 0x1dd7, 0x1ddb, 0x1ddf, 0x1de3, 0x1de7, 0x1deb, + 0x1def, 0x1df3, 0x1df6, 0x1e08, 0x1e10, 0x1e14, 0x1e14, 0x1e14, + /* offsets 0xfe10 .. 0xfe1f */ + 0x1e14, 0x1e15, 0x1e16, 0x1e17, 0x1e18, 0x1e19, 0x1e1a, 0x1e1b, + 0x1e1c, 0x1e1d, 0x1e1e, 0x1e1e, 0x1e1e, 0x1e1e, 0x1e1e, 0x1e1e, + /* offsets 0xfe30 .. 0xfe3f */ + 0x1e1e, 0x1e1f, 0x1e20, 0x1e21, 0x1e22, 0x1e23, 0x1e24, 0x1e25, + 0x1e26, 0x1e27, 0x1e28, 0x1e29, 0x1e2a, 0x1e2b, 0x1e2c, 0x1e2d, + /* offsets 0xfe40 .. 0xfe4f */ + 0x1e2e, 0x1e2f, 0x1e30, 0x1e31, 0x1e32, 0x1e33, 0x1e33, 0x1e33, + 0x1e34, 0x1e35, 0x1e36, 0x1e37, 0x1e38, 0x1e39, 0x1e3a, 0x1e3b, + /* offsets 0xfe50 .. 0xfe5f */ + 0x1e3c, 0x1e3d, 0x1e3e, 0x1e3f, 0x1e3f, 0x1e40, 0x1e41, 0x1e42, + 0x1e43, 0x1e44, 0x1e45, 0x1e46, 0x1e47, 0x1e48, 0x1e49, 0x1e4a, + /* offsets 0xfe60 .. 0xfe6f */ + 0x1e4b, 0x1e4c, 0x1e4d, 0x1e4e, 0x1e4f, 0x1e50, 0x1e51, 0x1e52, + 0x1e52, 0x1e53, 0x1e54, 0x1e55, 0x1e56, 0x1e56, 0x1e56, 0x1e56, + /* offsets 0xfe70 .. 0xfe7f */ + 0x1e56, 0x1e58, 0x1e5a, 0x1e5c, 0x1e5c, 0x1e5e, 0x1e5e, 0x1e60, + 0x1e62, 0x1e64, 0x1e66, 0x1e68, 0x1e6a, 0x1e6c, 0x1e6e, 0x1e70, + /* offsets 0xfe80 .. 0xfe8f */ + 0x1e72, 0x1e73, 0x1e74, 0x1e75, 0x1e76, 0x1e77, 0x1e78, 0x1e79, + 0x1e7a, 0x1e7b, 0x1e7c, 0x1e7d, 0x1e7e, 0x1e7f, 0x1e80, 0x1e81, + /* offsets 0xfe90 .. 0xfe9f */ + 0x1e82, 0x1e83, 0x1e84, 0x1e85, 0x1e86, 0x1e87, 0x1e88, 0x1e89, + 0x1e8a, 0x1e8b, 0x1e8c, 0x1e8d, 0x1e8e, 0x1e8f, 0x1e90, 0x1e91, + /* offsets 0xfea0 .. 0xfeaf */ + 0x1e92, 0x1e93, 0x1e94, 0x1e95, 0x1e96, 0x1e97, 0x1e98, 0x1e99, + 0x1e9a, 0x1e9b, 0x1e9c, 0x1e9d, 0x1e9e, 0x1e9f, 0x1ea0, 0x1ea1, + /* offsets 0xfeb0 .. 0xfebf */ + 0x1ea2, 0x1ea3, 0x1ea4, 0x1ea5, 0x1ea6, 0x1ea7, 0x1ea8, 0x1ea9, + 0x1eaa, 0x1eab, 0x1eac, 0x1ead, 0x1eae, 0x1eaf, 0x1eb0, 0x1eb1, + /* offsets 0xfec0 .. 0xfecf */ + 0x1eb2, 0x1eb3, 0x1eb4, 0x1eb5, 0x1eb6, 0x1eb7, 0x1eb8, 0x1eb9, + 0x1eba, 0x1ebb, 0x1ebc, 0x1ebd, 0x1ebe, 0x1ebf, 0x1ec0, 0x1ec1, + /* offsets 0xfed0 .. 0xfedf */ + 0x1ec2, 0x1ec3, 0x1ec4, 0x1ec5, 0x1ec6, 0x1ec7, 0x1ec8, 0x1ec9, + 0x1eca, 0x1ecb, 0x1ecc, 0x1ecd, 0x1ece, 0x1ecf, 0x1ed0, 0x1ed1, + /* offsets 0xfee0 .. 0xfeef */ + 0x1ed2, 0x1ed3, 0x1ed4, 0x1ed5, 0x1ed6, 0x1ed7, 0x1ed8, 0x1ed9, + 0x1eda, 0x1edb, 0x1edc, 0x1edd, 0x1ede, 0x1edf, 0x1ee0, 0x1ee1, + /* offsets 0xfef0 .. 0xfeff */ + 0x1ee2, 0x1ee3, 0x1ee4, 0x1ee5, 0x1ee6, 0x1ee7, 0x1ee9, 0x1eeb, + 0x1eed, 0x1eef, 0x1ef1, 0x1ef3, 0x1ef5, 0x1ef7, 0x1ef7, 0x1ef7, + /* offsets 0xff00 .. 0xff0f */ + 0x1ef7, 0x1ef7, 0x1ef8, 0x1ef9, 0x1efa, 0x1efb, 0x1efc, 0x1efd, + 0x1efe, 0x1eff, 0x1f00, 0x1f01, 0x1f02, 0x1f03, 0x1f04, 0x1f05, + /* offsets 0xff10 .. 0xff1f */ + 0x1f06, 0x1f07, 0x1f08, 0x1f09, 0x1f0a, 0x1f0b, 0x1f0c, 0x1f0d, + 0x1f0e, 0x1f0f, 0x1f10, 0x1f11, 0x1f12, 0x1f13, 0x1f14, 0x1f15, + /* offsets 0xff20 .. 0xff2f */ + 0x1f16, 0x1f17, 0x1f18, 0x1f19, 0x1f1a, 0x1f1b, 0x1f1c, 0x1f1d, + 0x1f1e, 0x1f1f, 0x1f20, 0x1f21, 0x1f22, 0x1f23, 0x1f24, 0x1f25, + /* offsets 0xff30 .. 0xff3f */ + 0x1f26, 0x1f27, 0x1f28, 0x1f29, 0x1f2a, 0x1f2b, 0x1f2c, 0x1f2d, + 0x1f2e, 0x1f2f, 0x1f30, 0x1f31, 0x1f32, 0x1f33, 0x1f34, 0x1f35, + /* offsets 0xff40 .. 0xff4f */ + 0x1f36, 0x1f37, 0x1f38, 0x1f39, 0x1f3a, 0x1f3b, 0x1f3c, 0x1f3d, + 0x1f3e, 0x1f3f, 0x1f40, 0x1f41, 0x1f42, 0x1f43, 0x1f44, 0x1f45, + /* offsets 0xff50 .. 0xff5f */ + 0x1f46, 0x1f47, 0x1f48, 0x1f49, 0x1f4a, 0x1f4b, 0x1f4c, 0x1f4d, + 0x1f4e, 0x1f4f, 0x1f50, 0x1f51, 0x1f52, 0x1f53, 0x1f54, 0x1f55, + /* offsets 0xff60 .. 0xff6f */ + 0x1f56, 0x1f57, 0x1f58, 0x1f59, 0x1f5a, 0x1f5b, 0x1f5c, 0x1f5d, + 0x1f5e, 0x1f5f, 0x1f60, 0x1f61, 0x1f62, 0x1f63, 0x1f64, 0x1f65, + /* offsets 0xff70 .. 0xff7f */ + 0x1f66, 0x1f67, 0x1f68, 0x1f69, 0x1f6a, 0x1f6b, 0x1f6c, 0x1f6d, + 0x1f6e, 0x1f6f, 0x1f70, 0x1f71, 0x1f72, 0x1f73, 0x1f74, 0x1f75, + /* offsets 0xff80 .. 0xff8f */ + 0x1f76, 0x1f77, 0x1f78, 0x1f79, 0x1f7a, 0x1f7b, 0x1f7c, 0x1f7d, + 0x1f7e, 0x1f7f, 0x1f80, 0x1f81, 0x1f82, 0x1f83, 0x1f84, 0x1f85, + /* offsets 0xff90 .. 0xff9f */ + 0x1f86, 0x1f87, 0x1f88, 0x1f89, 0x1f8a, 0x1f8b, 0x1f8c, 0x1f8d, + 0x1f8e, 0x1f8f, 0x1f90, 0x1f91, 0x1f92, 0x1f93, 0x1f94, 0x1f95, + /* offsets 0xffa0 .. 0xffaf */ + 0x1f96, 0x1f97, 0x1f98, 0x1f99, 0x1f9a, 0x1f9b, 0x1f9c, 0x1f9d, + 0x1f9e, 0x1f9f, 0x1fa0, 0x1fa1, 0x1fa2, 0x1fa3, 0x1fa4, 0x1fa5, + /* offsets 0xffb0 .. 0xffbf */ + 0x1fa6, 0x1fa7, 0x1fa8, 0x1fa9, 0x1faa, 0x1fab, 0x1fac, 0x1fad, + 0x1fae, 0x1faf, 0x1fb0, 0x1fb1, 0x1fb2, 0x1fb3, 0x1fb4, 0x1fb5, + /* offsets 0xffc0 .. 0xffcf */ + 0x1fb5, 0x1fb5, 0x1fb5, 0x1fb6, 0x1fb7, 0x1fb8, 0x1fb9, 0x1fba, + 0x1fbb, 0x1fbb, 0x1fbb, 0x1fbc, 0x1fbd, 0x1fbe, 0x1fbf, 0x1fc0, + /* offsets 0xffd0 .. 0xffdf */ + 0x1fc1, 0x1fc1, 0x1fc1, 0x1fc2, 0x1fc3, 0x1fc4, 0x1fc5, 0x1fc6, + 0x1fc7, 0x1fc7, 0x1fc7, 0x1fc8, 0x1fc9, 0x1fca, 0x1fca, 0x1fca, + /* offsets 0xffe0 .. 0xffef */ + 0x1fca, 0x1fcb, 0x1fcc, 0x1fcd, 0x1fce, 0x1fcf, 0x1fd0, 0x1fd1, + 0x1fd1, 0x1fd2, 0x1fd3, 0x1fd4, 0x1fd5, 0x1fd6, 0x1fd7, 0x1fd8, + /* offset sentinel */ + 0x1fd8, + /* data */ + 0x0020, 0x0020, 0x0308, 0x0061, 0x0020, 0x0304, 0x0032, 0x0033, + 0x0020, 0x0301, 0x03bc, 0x0020, 0x0327, 0x0031, 0x006f, 0x0031, + 0x2044, 0x0034, 0x0031, 0x2044, 0x0032, 0x0033, 0x2044, 0x0034, + 0x0049, 0x004a, 0x0069, 0x006a, 0x004c, 0x00b7, 0x006c, 0x00b7, + 0x02bc, 0x006e, 0x0073, 0x0044, 0x017d, 0x0044, 0x017e, 0x0064, + 0x017e, 0x004c, 0x004a, 0x004c, 0x006a, 0x006c, 0x006a, 0x004e, + 0x004a, 0x004e, 0x006a, 0x006e, 0x006a, 0x0044, 0x005a, 0x0044, + 0x007a, 0x0064, 0x007a, 0x0068, 0x0266, 0x006a, 0x0072, 0x0279, + 0x027b, 0x0281, 0x0077, 0x0079, 0x0020, 0x0306, 0x0020, 0x0307, + 0x0020, 0x030a, 0x0020, 0x0328, 0x0020, 0x0303, 0x0020, 0x030b, + 0x0263, 0x006c, 0x0073, 0x0078, 0x0295, 0x0020, 0x0345, 0x0020, + 0x0301, 0x03b2, 0x03b8, 0x03a5, 0x03c6, 0x03c0, 0x03ba, 0x03c1, + 0x03c2, 0x0398, 0x03b5, 0x03a3, 0x0565, 0x0582, 0x0627, 0x0674, + 0x0648, 0x0674, 0x06c7, 0x0674, 0x064a, 0x0674, 0x0e4d, 0x0e32, + 0x0ecd, 0x0eb2, 0x0eab, 0x0e99, 0x0eab, 0x0ea1, 0x0f0b, 0x0fb2, + 0x0f81, 0x0fb3, 0x0f81, 0x10dc, 0x0041, 0x00c6, 0x0042, 0x0044, + 0x0045, 0x018e, 0x0047, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, + 0x004d, 0x004e, 0x004f, 0x0222, 0x0050, 0x0052, 0x0054, 0x0055, + 0x0057, 0x0061, 0x0250, 0x0251, 0x1d02, 0x0062, 0x0064, 0x0065, + 0x0259, 0x025b, 0x025c, 0x0067, 0x006b, 0x006d, 0x014b, 0x006f, + 0x0254, 0x1d16, 0x1d17, 0x0070, 0x0074, 0x0075, 0x1d1d, 0x026f, + 0x0076, 0x1d25, 0x03b2, 0x03b3, 0x03b4, 0x03c6, 0x03c7, 0x0069, + 0x0072, 0x0075, 0x0076, 0x03b2, 0x03b3, 0x03c1, 0x03c6, 0x03c7, + 0x043d, 0x0252, 0x0063, 0x0255, 0x00f0, 0x025c, 0x0066, 0x025f, + 0x0261, 0x0265, 0x0268, 0x0269, 0x026a, 0x1d7b, 0x029d, 0x026d, + 0x1d85, 0x029f, 0x0271, 0x0270, 0x0272, 0x0273, 0x0274, 0x0275, + 0x0278, 0x0282, 0x0283, 0x01ab, 0x0289, 0x028a, 0x1d1c, 0x028b, + 0x028c, 0x007a, 0x0290, 0x0291, 0x0292, 0x03b8, 0x0061, 0x02be, + 0x0020, 0x0313, 0x0020, 0x0313, 0x0020, 0x0342, 0x0020, 0x0314, + 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, + 0x0020, 0x2010, 0x0020, 0x0333, 0x002e, 0x002e, 0x002e, 0x002e, + 0x002e, 0x002e, 0x0020, 0x2032, 0x2032, 0x2032, 0x2032, 0x2032, + 0x2035, 0x2035, 0x2035, 0x2035, 0x2035, 0x0021, 0x0021, 0x0020, + 0x0305, 0x003f, 0x003f, 0x003f, 0x0021, 0x0021, 0x003f, 0x2032, + 0x2032, 0x2032, 0x2032, 0x0020, 0x0030, 0x0069, 0x0034, 0x0035, + 0x0036, 0x0037, 0x0038, 0x0039, 0x002b, 0x2212, 0x003d, 0x0028, + 0x0029, 0x006e, 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, + 0x0036, 0x0037, 0x0038, 0x0039, 0x002b, 0x2212, 0x003d, 0x0028, + 0x0029, 0x0061, 0x0065, 0x006f, 0x0078, 0x0259, 0x0068, 0x006b, + 0x006c, 0x006d, 0x006e, 0x0070, 0x0073, 0x0074, 0x0052, 0x0073, + 0x0061, 0x002f, 0x0063, 0x0061, 0x002f, 0x0073, 0x0043, 0x00b0, + 0x0043, 0x0063, 0x002f, 0x006f, 0x0063, 0x002f, 0x0075, 0x0190, + 0x00b0, 0x0046, 0x0067, 0x0048, 0x0048, 0x0048, 0x0068, 0x0127, + 0x0049, 0x0049, 0x004c, 0x006c, 0x004e, 0x004e, 0x006f, 0x0050, + 0x0051, 0x0052, 0x0052, 0x0052, 0x0053, 0x004d, 0x0054, 0x0045, + 0x004c, 0x0054, 0x004d, 0x005a, 0x005a, 0x0042, 0x0043, 0x0065, + 0x0045, 0x0046, 0x004d, 0x006f, 0x05d0, 0x05d1, 0x05d2, 0x05d3, + 0x0069, 0x0046, 0x0041, 0x0058, 0x03c0, 0x03b3, 0x0393, 0x03a0, + 0x2211, 0x0044, 0x0064, 0x0065, 0x0069, 0x006a, 0x0031, 0x2044, + 0x0037, 0x0031, 0x2044, 0x0039, 0x0031, 0x2044, 0x0031, 0x0030, + 0x0031, 0x2044, 0x0033, 0x0032, 0x2044, 0x0033, 0x0031, 0x2044, + 0x0035, 0x0032, 0x2044, 0x0035, 0x0033, 0x2044, 0x0035, 0x0034, + 0x2044, 0x0035, 0x0031, 0x2044, 0x0036, 0x0035, 0x2044, 0x0036, + 0x0031, 0x2044, 0x0038, 0x0033, 0x2044, 0x0038, 0x0035, 0x2044, + 0x0038, 0x0037, 0x2044, 0x0038, 0x0031, 0x2044, 0x0049, 0x0049, + 0x0049, 0x0049, 0x0049, 0x0049, 0x0049, 0x0056, 0x0056, 0x0056, + 0x0049, 0x0056, 0x0049, 0x0049, 0x0056, 0x0049, 0x0049, 0x0049, + 0x0049, 0x0058, 0x0058, 0x0058, 0x0049, 0x0058, 0x0049, 0x0049, + 0x004c, 0x0043, 0x0044, 0x004d, 0x0069, 0x0069, 0x0069, 0x0069, + 0x0069, 0x0069, 0x0069, 0x0076, 0x0076, 0x0076, 0x0069, 0x0076, + 0x0069, 0x0069, 0x0076, 0x0069, 0x0069, 0x0069, 0x0069, 0x0078, + 0x0078, 0x0078, 0x0069, 0x0078, 0x0069, 0x0069, 0x006c, 0x0063, + 0x0064, 0x006d, 0x0030, 0x2044, 0x0033, 0x222b, 0x222b, 0x222b, + 0x222b, 0x222b, 0x222e, 0x222e, 0x222e, 0x222e, 0x222e, 0x0031, + 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, + 0x0031, 0x0030, 0x0031, 0x0031, 0x0031, 0x0032, 0x0031, 0x0033, + 0x0031, 0x0034, 0x0031, 0x0035, 0x0031, 0x0036, 0x0031, 0x0037, + 0x0031, 0x0038, 0x0031, 0x0039, 0x0032, 0x0030, 0x0028, 0x0031, + 0x0029, 0x0028, 0x0032, 0x0029, 0x0028, 0x0033, 0x0029, 0x0028, + 0x0034, 0x0029, 0x0028, 0x0035, 0x0029, 0x0028, 0x0036, 0x0029, + 0x0028, 0x0037, 0x0029, 0x0028, 0x0038, 0x0029, 0x0028, 0x0039, + 0x0029, 0x0028, 0x0031, 0x0030, 0x0029, 0x0028, 0x0031, 0x0031, + 0x0029, 0x0028, 0x0031, 0x0032, 0x0029, 0x0028, 0x0031, 0x0033, + 0x0029, 0x0028, 0x0031, 0x0034, 0x0029, 0x0028, 0x0031, 0x0035, + 0x0029, 0x0028, 0x0031, 0x0036, 0x0029, 0x0028, 0x0031, 0x0037, + 0x0029, 0x0028, 0x0031, 0x0038, 0x0029, 0x0028, 0x0031, 0x0039, + 0x0029, 0x0028, 0x0032, 0x0030, 0x0029, 0x0031, 0x002e, 0x0032, + 0x002e, 0x0033, 0x002e, 0x0034, 0x002e, 0x0035, 0x002e, 0x0036, + 0x002e, 0x0037, 0x002e, 0x0038, 0x002e, 0x0039, 0x002e, 0x0031, + 0x0030, 0x002e, 0x0031, 0x0031, 0x002e, 0x0031, 0x0032, 0x002e, + 0x0031, 0x0033, 0x002e, 0x0031, 0x0034, 0x002e, 0x0031, 0x0035, + 0x002e, 0x0031, 0x0036, 0x002e, 0x0031, 0x0037, 0x002e, 0x0031, + 0x0038, 0x002e, 0x0031, 0x0039, 0x002e, 0x0032, 0x0030, 0x002e, + 0x0028, 0x0061, 0x0029, 0x0028, 0x0062, 0x0029, 0x0028, 0x0063, + 0x0029, 0x0028, 0x0064, 0x0029, 0x0028, 0x0065, 0x0029, 0x0028, + 0x0066, 0x0029, 0x0028, 0x0067, 0x0029, 0x0028, 0x0068, 0x0029, + 0x0028, 0x0069, 0x0029, 0x0028, 0x006a, 0x0029, 0x0028, 0x006b, + 0x0029, 0x0028, 0x006c, 0x0029, 0x0028, 0x006d, 0x0029, 0x0028, + 0x006e, 0x0029, 0x0028, 0x006f, 0x0029, 0x0028, 0x0070, 0x0029, + 0x0028, 0x0071, 0x0029, 0x0028, 0x0072, 0x0029, 0x0028, 0x0073, + 0x0029, 0x0028, 0x0074, 0x0029, 0x0028, 0x0075, 0x0029, 0x0028, + 0x0076, 0x0029, 0x0028, 0x0077, 0x0029, 0x0028, 0x0078, 0x0029, + 0x0028, 0x0079, 0x0029, 0x0028, 0x007a, 0x0029, 0x0041, 0x0042, + 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004a, + 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 0x0050, 0x0051, 0x0052, + 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, + 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, + 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 0x0070, + 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, + 0x0079, 0x007a, 0x0030, 0x222b, 0x222b, 0x222b, 0x222b, 0x003a, + 0x003a, 0x003d, 0x003d, 0x003d, 0x003d, 0x003d, 0x003d, 0x006a, + 0x0056, 0x2d61, 0x6bcd, 0x9f9f, 0x4e00, 0x4e28, 0x4e36, 0x4e3f, + 0x4e59, 0x4e85, 0x4e8c, 0x4ea0, 0x4eba, 0x513f, 0x5165, 0x516b, + 0x5182, 0x5196, 0x51ab, 0x51e0, 0x51f5, 0x5200, 0x529b, 0x52f9, + 0x5315, 0x531a, 0x5338, 0x5341, 0x535c, 0x5369, 0x5382, 0x53b6, + 0x53c8, 0x53e3, 0x56d7, 0x571f, 0x58eb, 0x5902, 0x590a, 0x5915, + 0x5927, 0x5973, 0x5b50, 0x5b80, 0x5bf8, 0x5c0f, 0x5c22, 0x5c38, + 0x5c6e, 0x5c71, 0x5ddb, 0x5de5, 0x5df1, 0x5dfe, 0x5e72, 0x5e7a, + 0x5e7f, 0x5ef4, 0x5efe, 0x5f0b, 0x5f13, 0x5f50, 0x5f61, 0x5f73, + 0x5fc3, 0x6208, 0x6236, 0x624b, 0x652f, 0x6534, 0x6587, 0x6597, + 0x65a4, 0x65b9, 0x65e0, 0x65e5, 0x66f0, 0x6708, 0x6728, 0x6b20, + 0x6b62, 0x6b79, 0x6bb3, 0x6bcb, 0x6bd4, 0x6bdb, 0x6c0f, 0x6c14, + 0x6c34, 0x706b, 0x722a, 0x7236, 0x723b, 0x723f, 0x7247, 0x7259, + 0x725b, 0x72ac, 0x7384, 0x7389, 0x74dc, 0x74e6, 0x7518, 0x751f, + 0x7528, 0x7530, 0x758b, 0x7592, 0x7676, 0x767d, 0x76ae, 0x76bf, + 0x76ee, 0x77db, 0x77e2, 0x77f3, 0x793a, 0x79b8, 0x79be, 0x7a74, + 0x7acb, 0x7af9, 0x7c73, 0x7cf8, 0x7f36, 0x7f51, 0x7f8a, 0x7fbd, + 0x8001, 0x800c, 0x8012, 0x8033, 0x807f, 0x8089, 0x81e3, 0x81ea, + 0x81f3, 0x81fc, 0x820c, 0x821b, 0x821f, 0x826e, 0x8272, 0x8278, + 0x864d, 0x866b, 0x8840, 0x884c, 0x8863, 0x897e, 0x898b, 0x89d2, + 0x8a00, 0x8c37, 0x8c46, 0x8c55, 0x8c78, 0x8c9d, 0x8d64, 0x8d70, + 0x8db3, 0x8eab, 0x8eca, 0x8f9b, 0x8fb0, 0x8fb5, 0x9091, 0x9149, + 0x91c6, 0x91cc, 0x91d1, 0x9577, 0x9580, 0x961c, 0x96b6, 0x96b9, + 0x96e8, 0x9751, 0x975e, 0x9762, 0x9769, 0x97cb, 0x97ed, 0x97f3, + 0x9801, 0x98a8, 0x98db, 0x98df, 0x9996, 0x9999, 0x99ac, 0x9aa8, + 0x9ad8, 0x9adf, 0x9b25, 0x9b2f, 0x9b32, 0x9b3c, 0x9b5a, 0x9ce5, + 0x9e75, 0x9e7f, 0x9ea5, 0x9ebb, 0x9ec3, 0x9ecd, 0x9ed1, 0x9ef9, + 0x9efd, 0x9f0e, 0x9f13, 0x9f20, 0x9f3b, 0x9f4a, 0x9f52, 0x9f8d, + 0x9f9c, 0x9fa0, 0x0020, 0x3012, 0x5341, 0x5344, 0x5345, 0x0020, + 0x3099, 0x0020, 0x309a, 0x3088, 0x308a, 0x30b3, 0x30c8, 0x1100, + 0x1101, 0x11aa, 0x1102, 0x11ac, 0x11ad, 0x1103, 0x1104, 0x1105, + 0x11b0, 0x11b1, 0x11b2, 0x11b3, 0x11b4, 0x11b5, 0x111a, 0x1106, + 0x1107, 0x1108, 0x1121, 0x1109, 0x110a, 0x110b, 0x110c, 0x110d, + 0x110e, 0x110f, 0x1110, 0x1111, 0x1112, 0x1161, 0x1162, 0x1163, + 0x1164, 0x1165, 0x1166, 0x1167, 0x1168, 0x1169, 0x116a, 0x116b, + 0x116c, 0x116d, 0x116e, 0x116f, 0x1170, 0x1171, 0x1172, 0x1173, + 0x1174, 0x1175, 0x1160, 0x1114, 0x1115, 0x11c7, 0x11c8, 0x11cc, + 0x11ce, 0x11d3, 0x11d7, 0x11d9, 0x111c, 0x11dd, 0x11df, 0x111d, + 0x111e, 0x1120, 0x1122, 0x1123, 0x1127, 0x1129, 0x112b, 0x112c, + 0x112d, 0x112e, 0x112f, 0x1132, 0x1136, 0x1140, 0x1147, 0x114c, + 0x11f1, 0x11f2, 0x1157, 0x1158, 0x1159, 0x1184, 0x1185, 0x1188, + 0x1191, 0x1192, 0x1194, 0x119e, 0x11a1, 0x4e00, 0x4e8c, 0x4e09, + 0x56db, 0x4e0a, 0x4e2d, 0x4e0b, 0x7532, 0x4e59, 0x4e19, 0x4e01, + 0x5929, 0x5730, 0x4eba, 0x0028, 0x1100, 0x0029, 0x0028, 0x1102, + 0x0029, 0x0028, 0x1103, 0x0029, 0x0028, 0x1105, 0x0029, 0x0028, + 0x1106, 0x0029, 0x0028, 0x1107, 0x0029, 0x0028, 0x1109, 0x0029, + 0x0028, 0x110b, 0x0029, 0x0028, 0x110c, 0x0029, 0x0028, 0x110e, + 0x0029, 0x0028, 0x110f, 0x0029, 0x0028, 0x1110, 0x0029, 0x0028, + 0x1111, 0x0029, 0x0028, 0x1112, 0x0029, 0x0028, 0x1100, 0x1161, + 0x0029, 0x0028, 0x1102, 0x1161, 0x0029, 0x0028, 0x1103, 0x1161, + 0x0029, 0x0028, 0x1105, 0x1161, 0x0029, 0x0028, 0x1106, 0x1161, + 0x0029, 0x0028, 0x1107, 0x1161, 0x0029, 0x0028, 0x1109, 0x1161, + 0x0029, 0x0028, 0x110b, 0x1161, 0x0029, 0x0028, 0x110c, 0x1161, + 0x0029, 0x0028, 0x110e, 0x1161, 0x0029, 0x0028, 0x110f, 0x1161, + 0x0029, 0x0028, 0x1110, 0x1161, 0x0029, 0x0028, 0x1111, 0x1161, + 0x0029, 0x0028, 0x1112, 0x1161, 0x0029, 0x0028, 0x110c, 0x116e, + 0x0029, 0x0028, 0x110b, 0x1169, 0x110c, 0x1165, 0x11ab, 0x0029, + 0x0028, 0x110b, 0x1169, 0x1112, 0x116e, 0x0029, 0x0028, 0x4e00, + 0x0029, 0x0028, 0x4e8c, 0x0029, 0x0028, 0x4e09, 0x0029, 0x0028, + 0x56db, 0x0029, 0x0028, 0x4e94, 0x0029, 0x0028, 0x516d, 0x0029, + 0x0028, 0x4e03, 0x0029, 0x0028, 0x516b, 0x0029, 0x0028, 0x4e5d, + 0x0029, 0x0028, 0x5341, 0x0029, 0x0028, 0x6708, 0x0029, 0x0028, + 0x706b, 0x0029, 0x0028, 0x6c34, 0x0029, 0x0028, 0x6728, 0x0029, + 0x0028, 0x91d1, 0x0029, 0x0028, 0x571f, 0x0029, 0x0028, 0x65e5, + 0x0029, 0x0028, 0x682a, 0x0029, 0x0028, 0x6709, 0x0029, 0x0028, + 0x793e, 0x0029, 0x0028, 0x540d, 0x0029, 0x0028, 0x7279, 0x0029, + 0x0028, 0x8ca1, 0x0029, 0x0028, 0x795d, 0x0029, 0x0028, 0x52b4, + 0x0029, 0x0028, 0x4ee3, 0x0029, 0x0028, 0x547c, 0x0029, 0x0028, + 0x5b66, 0x0029, 0x0028, 0x76e3, 0x0029, 0x0028, 0x4f01, 0x0029, + 0x0028, 0x8cc7, 0x0029, 0x0028, 0x5354, 0x0029, 0x0028, 0x796d, + 0x0029, 0x0028, 0x4f11, 0x0029, 0x0028, 0x81ea, 0x0029, 0x0028, + 0x81f3, 0x0029, 0x554f, 0x5e7c, 0x6587, 0x7b8f, 0x0050, 0x0054, + 0x0045, 0x0032, 0x0031, 0x0032, 0x0032, 0x0032, 0x0033, 0x0032, + 0x0034, 0x0032, 0x0035, 0x0032, 0x0036, 0x0032, 0x0037, 0x0032, + 0x0038, 0x0032, 0x0039, 0x0033, 0x0030, 0x0033, 0x0031, 0x0033, + 0x0032, 0x0033, 0x0033, 0x0033, 0x0034, 0x0033, 0x0035, 0x1100, + 0x1102, 0x1103, 0x1105, 0x1106, 0x1107, 0x1109, 0x110b, 0x110c, + 0x110e, 0x110f, 0x1110, 0x1111, 0x1112, 0x1100, 0x1161, 0x1102, + 0x1161, 0x1103, 0x1161, 0x1105, 0x1161, 0x1106, 0x1161, 0x1107, + 0x1161, 0x1109, 0x1161, 0x110b, 0x1161, 0x110c, 0x1161, 0x110e, + 0x1161, 0x110f, 0x1161, 0x1110, 0x1161, 0x1111, 0x1161, 0x1112, + 0x1161, 0x110e, 0x1161, 0x11b7, 0x1100, 0x1169, 0x110c, 0x116e, + 0x110b, 0x1174, 0x110b, 0x116e, 0x4e00, 0x4e8c, 0x4e09, 0x56db, + 0x4e94, 0x516d, 0x4e03, 0x516b, 0x4e5d, 0x5341, 0x6708, 0x706b, + 0x6c34, 0x6728, 0x91d1, 0x571f, 0x65e5, 0x682a, 0x6709, 0x793e, + 0x540d, 0x7279, 0x8ca1, 0x795d, 0x52b4, 0x79d8, 0x7537, 0x5973, + 0x9069, 0x512a, 0x5370, 0x6ce8, 0x9805, 0x4f11, 0x5199, 0x6b63, + 0x4e0a, 0x4e2d, 0x4e0b, 0x5de6, 0x53f3, 0x533b, 0x5b97, 0x5b66, + 0x76e3, 0x4f01, 0x8cc7, 0x5354, 0x591c, 0x0033, 0x0036, 0x0033, + 0x0037, 0x0033, 0x0038, 0x0033, 0x0039, 0x0034, 0x0030, 0x0034, + 0x0031, 0x0034, 0x0032, 0x0034, 0x0033, 0x0034, 0x0034, 0x0034, + 0x0035, 0x0034, 0x0036, 0x0034, 0x0037, 0x0034, 0x0038, 0x0034, + 0x0039, 0x0035, 0x0030, 0x0031, 0x6708, 0x0032, 0x6708, 0x0033, + 0x6708, 0x0034, 0x6708, 0x0035, 0x6708, 0x0036, 0x6708, 0x0037, + 0x6708, 0x0038, 0x6708, 0x0039, 0x6708, 0x0031, 0x0030, 0x6708, + 0x0031, 0x0031, 0x6708, 0x0031, 0x0032, 0x6708, 0x0048, 0x0067, + 0x0065, 0x0072, 0x0067, 0x0065, 0x0056, 0x004c, 0x0054, 0x0044, + 0x30a2, 0x30a4, 0x30a6, 0x30a8, 0x30aa, 0x30ab, 0x30ad, 0x30af, + 0x30b1, 0x30b3, 0x30b5, 0x30b7, 0x30b9, 0x30bb, 0x30bd, 0x30bf, + 0x30c1, 0x30c4, 0x30c6, 0x30c8, 0x30ca, 0x30cb, 0x30cc, 0x30cd, + 0x30ce, 0x30cf, 0x30d2, 0x30d5, 0x30d8, 0x30db, 0x30de, 0x30df, + 0x30e0, 0x30e1, 0x30e2, 0x30e4, 0x30e6, 0x30e8, 0x30e9, 0x30ea, + 0x30eb, 0x30ec, 0x30ed, 0x30ef, 0x30f0, 0x30f1, 0x30f2, 0x30a2, + 0x30d1, 0x30fc, 0x30c8, 0x30a2, 0x30eb, 0x30d5, 0x30a1, 0x30a2, + 0x30f3, 0x30da, 0x30a2, 0x30a2, 0x30fc, 0x30eb, 0x30a4, 0x30cb, + 0x30f3, 0x30b0, 0x30a4, 0x30f3, 0x30c1, 0x30a6, 0x30a9, 0x30f3, + 0x30a8, 0x30b9, 0x30af, 0x30fc, 0x30c9, 0x30a8, 0x30fc, 0x30ab, + 0x30fc, 0x30aa, 0x30f3, 0x30b9, 0x30aa, 0x30fc, 0x30e0, 0x30ab, + 0x30a4, 0x30ea, 0x30ab, 0x30e9, 0x30c3, 0x30c8, 0x30ab, 0x30ed, + 0x30ea, 0x30fc, 0x30ac, 0x30ed, 0x30f3, 0x30ac, 0x30f3, 0x30de, + 0x30ae, 0x30ac, 0x30ae, 0x30cb, 0x30fc, 0x30ad, 0x30e5, 0x30ea, + 0x30fc, 0x30ae, 0x30eb, 0x30c0, 0x30fc, 0x30ad, 0x30ed, 0x30ad, + 0x30ed, 0x30b0, 0x30e9, 0x30e0, 0x30ad, 0x30ed, 0x30e1, 0x30fc, + 0x30c8, 0x30eb, 0x30ad, 0x30ed, 0x30ef, 0x30c3, 0x30c8, 0x30b0, + 0x30e9, 0x30e0, 0x30b0, 0x30e9, 0x30e0, 0x30c8, 0x30f3, 0x30af, + 0x30eb, 0x30bc, 0x30a4, 0x30ed, 0x30af, 0x30ed, 0x30fc, 0x30cd, + 0x30b1, 0x30fc, 0x30b9, 0x30b3, 0x30eb, 0x30ca, 0x30b3, 0x30fc, + 0x30dd, 0x30b5, 0x30a4, 0x30af, 0x30eb, 0x30b5, 0x30f3, 0x30c1, + 0x30fc, 0x30e0, 0x30b7, 0x30ea, 0x30f3, 0x30b0, 0x30bb, 0x30f3, + 0x30c1, 0x30bb, 0x30f3, 0x30c8, 0x30c0, 0x30fc, 0x30b9, 0x30c7, + 0x30b7, 0x30c9, 0x30eb, 0x30c8, 0x30f3, 0x30ca, 0x30ce, 0x30ce, + 0x30c3, 0x30c8, 0x30cf, 0x30a4, 0x30c4, 0x30d1, 0x30fc, 0x30bb, + 0x30f3, 0x30c8, 0x30d1, 0x30fc, 0x30c4, 0x30d0, 0x30fc, 0x30ec, + 0x30eb, 0x30d4, 0x30a2, 0x30b9, 0x30c8, 0x30eb, 0x30d4, 0x30af, + 0x30eb, 0x30d4, 0x30b3, 0x30d3, 0x30eb, 0x30d5, 0x30a1, 0x30e9, + 0x30c3, 0x30c9, 0x30d5, 0x30a3, 0x30fc, 0x30c8, 0x30d6, 0x30c3, + 0x30b7, 0x30a7, 0x30eb, 0x30d5, 0x30e9, 0x30f3, 0x30d8, 0x30af, + 0x30bf, 0x30fc, 0x30eb, 0x30da, 0x30bd, 0x30da, 0x30cb, 0x30d2, + 0x30d8, 0x30eb, 0x30c4, 0x30da, 0x30f3, 0x30b9, 0x30da, 0x30fc, + 0x30b8, 0x30d9, 0x30fc, 0x30bf, 0x30dd, 0x30a4, 0x30f3, 0x30c8, + 0x30dc, 0x30eb, 0x30c8, 0x30db, 0x30f3, 0x30dd, 0x30f3, 0x30c9, + 0x30db, 0x30fc, 0x30eb, 0x30db, 0x30fc, 0x30f3, 0x30de, 0x30a4, + 0x30af, 0x30ed, 0x30de, 0x30a4, 0x30eb, 0x30de, 0x30c3, 0x30cf, + 0x30de, 0x30eb, 0x30af, 0x30de, 0x30f3, 0x30b7, 0x30e7, 0x30f3, + 0x30df, 0x30af, 0x30ed, 0x30f3, 0x30df, 0x30ea, 0x30df, 0x30ea, + 0x30d0, 0x30fc, 0x30eb, 0x30e1, 0x30ac, 0x30e1, 0x30ac, 0x30c8, + 0x30f3, 0x30e1, 0x30fc, 0x30c8, 0x30eb, 0x30e4, 0x30fc, 0x30c9, + 0x30e4, 0x30fc, 0x30eb, 0x30e6, 0x30a2, 0x30f3, 0x30ea, 0x30c3, + 0x30c8, 0x30eb, 0x30ea, 0x30e9, 0x30eb, 0x30d4, 0x30fc, 0x30eb, + 0x30fc, 0x30d6, 0x30eb, 0x30ec, 0x30e0, 0x30ec, 0x30f3, 0x30c8, + 0x30b2, 0x30f3, 0x30ef, 0x30c3, 0x30c8, 0x0030, 0x70b9, 0x0031, + 0x70b9, 0x0032, 0x70b9, 0x0033, 0x70b9, 0x0034, 0x70b9, 0x0035, + 0x70b9, 0x0036, 0x70b9, 0x0037, 0x70b9, 0x0038, 0x70b9, 0x0039, + 0x70b9, 0x0031, 0x0030, 0x70b9, 0x0031, 0x0031, 0x70b9, 0x0031, + 0x0032, 0x70b9, 0x0031, 0x0033, 0x70b9, 0x0031, 0x0034, 0x70b9, + 0x0031, 0x0035, 0x70b9, 0x0031, 0x0036, 0x70b9, 0x0031, 0x0037, + 0x70b9, 0x0031, 0x0038, 0x70b9, 0x0031, 0x0039, 0x70b9, 0x0032, + 0x0030, 0x70b9, 0x0032, 0x0031, 0x70b9, 0x0032, 0x0032, 0x70b9, + 0x0032, 0x0033, 0x70b9, 0x0032, 0x0034, 0x70b9, 0x0068, 0x0050, + 0x0061, 0x0064, 0x0061, 0x0041, 0x0055, 0x0062, 0x0061, 0x0072, + 0x006f, 0x0056, 0x0070, 0x0063, 0x0064, 0x006d, 0x0064, 0x006d, + 0x00b2, 0x0064, 0x006d, 0x00b3, 0x0049, 0x0055, 0x5e73, 0x6210, + 0x662d, 0x548c, 0x5927, 0x6b63, 0x660e, 0x6cbb, 0x682a, 0x5f0f, + 0x4f1a, 0x793e, 0x0070, 0x0041, 0x006e, 0x0041, 0x03bc, 0x0041, + 0x006d, 0x0041, 0x006b, 0x0041, 0x004b, 0x0042, 0x004d, 0x0042, + 0x0047, 0x0042, 0x0063, 0x0061, 0x006c, 0x006b, 0x0063, 0x0061, + 0x006c, 0x0070, 0x0046, 0x006e, 0x0046, 0x03bc, 0x0046, 0x03bc, + 0x0067, 0x006d, 0x0067, 0x006b, 0x0067, 0x0048, 0x007a, 0x006b, + 0x0048, 0x007a, 0x004d, 0x0048, 0x007a, 0x0047, 0x0048, 0x007a, + 0x0054, 0x0048, 0x007a, 0x03bc, 0x2113, 0x006d, 0x2113, 0x0064, + 0x2113, 0x006b, 0x2113, 0x0066, 0x006d, 0x006e, 0x006d, 0x03bc, + 0x006d, 0x006d, 0x006d, 0x0063, 0x006d, 0x006b, 0x006d, 0x006d, + 0x006d, 0x00b2, 0x0063, 0x006d, 0x00b2, 0x006d, 0x00b2, 0x006b, + 0x006d, 0x00b2, 0x006d, 0x006d, 0x00b3, 0x0063, 0x006d, 0x00b3, + 0x006d, 0x00b3, 0x006b, 0x006d, 0x00b3, 0x006d, 0x2215, 0x0073, + 0x006d, 0x2215, 0x0073, 0x00b2, 0x0050, 0x0061, 0x006b, 0x0050, + 0x0061, 0x004d, 0x0050, 0x0061, 0x0047, 0x0050, 0x0061, 0x0072, + 0x0061, 0x0064, 0x0072, 0x0061, 0x0064, 0x2215, 0x0073, 0x0072, + 0x0061, 0x0064, 0x2215, 0x0073, 0x00b2, 0x0070, 0x0073, 0x006e, + 0x0073, 0x03bc, 0x0073, 0x006d, 0x0073, 0x0070, 0x0056, 0x006e, + 0x0056, 0x03bc, 0x0056, 0x006d, 0x0056, 0x006b, 0x0056, 0x004d, + 0x0056, 0x0070, 0x0057, 0x006e, 0x0057, 0x03bc, 0x0057, 0x006d, + 0x0057, 0x006b, 0x0057, 0x004d, 0x0057, 0x006b, 0x03a9, 0x004d, + 0x03a9, 0x0061, 0x002e, 0x006d, 0x002e, 0x0042, 0x0071, 0x0063, + 0x0063, 0x0063, 0x0064, 0x0043, 0x2215, 0x006b, 0x0067, 0x0043, + 0x006f, 0x002e, 0x0064, 0x0042, 0x0047, 0x0079, 0x0068, 0x0061, + 0x0048, 0x0050, 0x0069, 0x006e, 0x004b, 0x004b, 0x004b, 0x004d, + 0x006b, 0x0074, 0x006c, 0x006d, 0x006c, 0x006e, 0x006c, 0x006f, + 0x0067, 0x006c, 0x0078, 0x006d, 0x0062, 0x006d, 0x0069, 0x006c, + 0x006d, 0x006f, 0x006c, 0x0050, 0x0048, 0x0070, 0x002e, 0x006d, + 0x002e, 0x0050, 0x0050, 0x004d, 0x0050, 0x0052, 0x0073, 0x0072, + 0x0053, 0x0076, 0x0057, 0x0062, 0x0056, 0x2215, 0x006d, 0x0041, + 0x2215, 0x006d, 0x0031, 0x65e5, 0x0032, 0x65e5, 0x0033, 0x65e5, + 0x0034, 0x65e5, 0x0035, 0x65e5, 0x0036, 0x65e5, 0x0037, 0x65e5, + 0x0038, 0x65e5, 0x0039, 0x65e5, 0x0031, 0x0030, 0x65e5, 0x0031, + 0x0031, 0x65e5, 0x0031, 0x0032, 0x65e5, 0x0031, 0x0033, 0x65e5, + 0x0031, 0x0034, 0x65e5, 0x0031, 0x0035, 0x65e5, 0x0031, 0x0036, + 0x65e5, 0x0031, 0x0037, 0x65e5, 0x0031, 0x0038, 0x65e5, 0x0031, + 0x0039, 0x65e5, 0x0032, 0x0030, 0x65e5, 0x0032, 0x0031, 0x65e5, + 0x0032, 0x0032, 0x65e5, 0x0032, 0x0033, 0x65e5, 0x0032, 0x0034, + 0x65e5, 0x0032, 0x0035, 0x65e5, 0x0032, 0x0036, 0x65e5, 0x0032, + 0x0037, 0x65e5, 0x0032, 0x0038, 0x65e5, 0x0032, 0x0039, 0x65e5, + 0x0033, 0x0030, 0x65e5, 0x0033, 0x0031, 0x65e5, 0x0067, 0x0061, + 0x006c, 0x044a, 0x044c, 0xa76f, 0x0126, 0x0153, 0xa727, 0xab37, + 0x026b, 0xab52, 0x0066, 0x0066, 0x0066, 0x0069, 0x0066, 0x006c, + 0x0066, 0x0066, 0x0069, 0x0066, 0x0066, 0x006c, 0x017f, 0x0074, + 0x0073, 0x0074, 0x0574, 0x0576, 0x0574, 0x0565, 0x0574, 0x056b, + 0x057e, 0x0576, 0x0574, 0x056d, 0x05e2, 0x05d0, 0x05d3, 0x05d4, + 0x05db, 0x05dc, 0x05dd, 0x05e8, 0x05ea, 0x002b, 0x05d0, 0x05dc, + 0x0671, 0x0671, 0x067b, 0x067b, 0x067b, 0x067b, 0x067e, 0x067e, + 0x067e, 0x067e, 0x0680, 0x0680, 0x0680, 0x0680, 0x067a, 0x067a, + 0x067a, 0x067a, 0x067f, 0x067f, 0x067f, 0x067f, 0x0679, 0x0679, + 0x0679, 0x0679, 0x06a4, 0x06a4, 0x06a4, 0x06a4, 0x06a6, 0x06a6, + 0x06a6, 0x06a6, 0x0684, 0x0684, 0x0684, 0x0684, 0x0683, 0x0683, + 0x0683, 0x0683, 0x0686, 0x0686, 0x0686, 0x0686, 0x0687, 0x0687, + 0x0687, 0x0687, 0x068d, 0x068d, 0x068c, 0x068c, 0x068e, 0x068e, + 0x0688, 0x0688, 0x0698, 0x0698, 0x0691, 0x0691, 0x06a9, 0x06a9, + 0x06a9, 0x06a9, 0x06af, 0x06af, 0x06af, 0x06af, 0x06b3, 0x06b3, + 0x06b3, 0x06b3, 0x06b1, 0x06b1, 0x06b1, 0x06b1, 0x06ba, 0x06ba, + 0x06bb, 0x06bb, 0x06bb, 0x06bb, 0x06c0, 0x06c0, 0x06c1, 0x06c1, + 0x06c1, 0x06c1, 0x06be, 0x06be, 0x06be, 0x06be, 0x06d2, 0x06d2, + 0x06d3, 0x06d3, 0x06ad, 0x06ad, 0x06ad, 0x06ad, 0x06c7, 0x06c7, + 0x06c6, 0x06c6, 0x06c8, 0x06c8, 0x0677, 0x06cb, 0x06cb, 0x06c5, + 0x06c5, 0x06c9, 0x06c9, 0x06d0, 0x06d0, 0x06d0, 0x06d0, 0x0649, + 0x0649, 0x0626, 0x0627, 0x0626, 0x0627, 0x0626, 0x06d5, 0x0626, + 0x06d5, 0x0626, 0x0648, 0x0626, 0x0648, 0x0626, 0x06c7, 0x0626, + 0x06c7, 0x0626, 0x06c6, 0x0626, 0x06c6, 0x0626, 0x06c8, 0x0626, + 0x06c8, 0x0626, 0x06d0, 0x0626, 0x06d0, 0x0626, 0x06d0, 0x0626, + 0x0649, 0x0626, 0x0649, 0x0626, 0x0649, 0x06cc, 0x06cc, 0x06cc, + 0x06cc, 0x0626, 0x062c, 0x0626, 0x062d, 0x0626, 0x0645, 0x0626, + 0x0649, 0x0626, 0x064a, 0x0628, 0x062c, 0x0628, 0x062d, 0x0628, + 0x062e, 0x0628, 0x0645, 0x0628, 0x0649, 0x0628, 0x064a, 0x062a, + 0x062c, 0x062a, 0x062d, 0x062a, 0x062e, 0x062a, 0x0645, 0x062a, + 0x0649, 0x062a, 0x064a, 0x062b, 0x062c, 0x062b, 0x0645, 0x062b, + 0x0649, 0x062b, 0x064a, 0x062c, 0x062d, 0x062c, 0x0645, 0x062d, + 0x062c, 0x062d, 0x0645, 0x062e, 0x062c, 0x062e, 0x062d, 0x062e, + 0x0645, 0x0633, 0x062c, 0x0633, 0x062d, 0x0633, 0x062e, 0x0633, + 0x0645, 0x0635, 0x062d, 0x0635, 0x0645, 0x0636, 0x062c, 0x0636, + 0x062d, 0x0636, 0x062e, 0x0636, 0x0645, 0x0637, 0x062d, 0x0637, + 0x0645, 0x0638, 0x0645, 0x0639, 0x062c, 0x0639, 0x0645, 0x063a, + 0x062c, 0x063a, 0x0645, 0x0641, 0x062c, 0x0641, 0x062d, 0x0641, + 0x062e, 0x0641, 0x0645, 0x0641, 0x0649, 0x0641, 0x064a, 0x0642, + 0x062d, 0x0642, 0x0645, 0x0642, 0x0649, 0x0642, 0x064a, 0x0643, + 0x0627, 0x0643, 0x062c, 0x0643, 0x062d, 0x0643, 0x062e, 0x0643, + 0x0644, 0x0643, 0x0645, 0x0643, 0x0649, 0x0643, 0x064a, 0x0644, + 0x062c, 0x0644, 0x062d, 0x0644, 0x062e, 0x0644, 0x0645, 0x0644, + 0x0649, 0x0644, 0x064a, 0x0645, 0x062c, 0x0645, 0x062d, 0x0645, + 0x062e, 0x0645, 0x0645, 0x0645, 0x0649, 0x0645, 0x064a, 0x0646, + 0x062c, 0x0646, 0x062d, 0x0646, 0x062e, 0x0646, 0x0645, 0x0646, + 0x0649, 0x0646, 0x064a, 0x0647, 0x062c, 0x0647, 0x0645, 0x0647, + 0x0649, 0x0647, 0x064a, 0x064a, 0x062c, 0x064a, 0x062d, 0x064a, + 0x062e, 0x064a, 0x0645, 0x064a, 0x0649, 0x064a, 0x064a, 0x0630, + 0x0670, 0x0631, 0x0670, 0x0649, 0x0670, 0x0020, 0x064c, 0x0651, + 0x0020, 0x064d, 0x0651, 0x0020, 0x064e, 0x0651, 0x0020, 0x064f, + 0x0651, 0x0020, 0x0650, 0x0651, 0x0020, 0x0651, 0x0670, 0x0626, + 0x0631, 0x0626, 0x0632, 0x0626, 0x0645, 0x0626, 0x0646, 0x0626, + 0x0649, 0x0626, 0x064a, 0x0628, 0x0631, 0x0628, 0x0632, 0x0628, + 0x0645, 0x0628, 0x0646, 0x0628, 0x0649, 0x0628, 0x064a, 0x062a, + 0x0631, 0x062a, 0x0632, 0x062a, 0x0645, 0x062a, 0x0646, 0x062a, + 0x0649, 0x062a, 0x064a, 0x062b, 0x0631, 0x062b, 0x0632, 0x062b, + 0x0645, 0x062b, 0x0646, 0x062b, 0x0649, 0x062b, 0x064a, 0x0641, + 0x0649, 0x0641, 0x064a, 0x0642, 0x0649, 0x0642, 0x064a, 0x0643, + 0x0627, 0x0643, 0x0644, 0x0643, 0x0645, 0x0643, 0x0649, 0x0643, + 0x064a, 0x0644, 0x0645, 0x0644, 0x0649, 0x0644, 0x064a, 0x0645, + 0x0627, 0x0645, 0x0645, 0x0646, 0x0631, 0x0646, 0x0632, 0x0646, + 0x0645, 0x0646, 0x0646, 0x0646, 0x0649, 0x0646, 0x064a, 0x0649, + 0x0670, 0x064a, 0x0631, 0x064a, 0x0632, 0x064a, 0x0645, 0x064a, + 0x0646, 0x064a, 0x0649, 0x064a, 0x064a, 0x0626, 0x062c, 0x0626, + 0x062d, 0x0626, 0x062e, 0x0626, 0x0645, 0x0626, 0x0647, 0x0628, + 0x062c, 0x0628, 0x062d, 0x0628, 0x062e, 0x0628, 0x0645, 0x0628, + 0x0647, 0x062a, 0x062c, 0x062a, 0x062d, 0x062a, 0x062e, 0x062a, + 0x0645, 0x062a, 0x0647, 0x062b, 0x0645, 0x062c, 0x062d, 0x062c, + 0x0645, 0x062d, 0x062c, 0x062d, 0x0645, 0x062e, 0x062c, 0x062e, + 0x0645, 0x0633, 0x062c, 0x0633, 0x062d, 0x0633, 0x062e, 0x0633, + 0x0645, 0x0635, 0x062d, 0x0635, 0x062e, 0x0635, 0x0645, 0x0636, + 0x062c, 0x0636, 0x062d, 0x0636, 0x062e, 0x0636, 0x0645, 0x0637, + 0x062d, 0x0638, 0x0645, 0x0639, 0x062c, 0x0639, 0x0645, 0x063a, + 0x062c, 0x063a, 0x0645, 0x0641, 0x062c, 0x0641, 0x062d, 0x0641, + 0x062e, 0x0641, 0x0645, 0x0642, 0x062d, 0x0642, 0x0645, 0x0643, + 0x062c, 0x0643, 0x062d, 0x0643, 0x062e, 0x0643, 0x0644, 0x0643, + 0x0645, 0x0644, 0x062c, 0x0644, 0x062d, 0x0644, 0x062e, 0x0644, + 0x0645, 0x0644, 0x0647, 0x0645, 0x062c, 0x0645, 0x062d, 0x0645, + 0x062e, 0x0645, 0x0645, 0x0646, 0x062c, 0x0646, 0x062d, 0x0646, + 0x062e, 0x0646, 0x0645, 0x0646, 0x0647, 0x0647, 0x062c, 0x0647, + 0x0645, 0x0647, 0x0670, 0x064a, 0x062c, 0x064a, 0x062d, 0x064a, + 0x062e, 0x064a, 0x0645, 0x064a, 0x0647, 0x0626, 0x0645, 0x0626, + 0x0647, 0x0628, 0x0645, 0x0628, 0x0647, 0x062a, 0x0645, 0x062a, + 0x0647, 0x062b, 0x0645, 0x062b, 0x0647, 0x0633, 0x0645, 0x0633, + 0x0647, 0x0634, 0x0645, 0x0634, 0x0647, 0x0643, 0x0644, 0x0643, + 0x0645, 0x0644, 0x0645, 0x0646, 0x0645, 0x0646, 0x0647, 0x064a, + 0x0645, 0x064a, 0x0647, 0x0640, 0x064e, 0x0651, 0x0640, 0x064f, + 0x0651, 0x0640, 0x0650, 0x0651, 0x0637, 0x0649, 0x0637, 0x064a, + 0x0639, 0x0649, 0x0639, 0x064a, 0x063a, 0x0649, 0x063a, 0x064a, + 0x0633, 0x0649, 0x0633, 0x064a, 0x0634, 0x0649, 0x0634, 0x064a, + 0x062d, 0x0649, 0x062d, 0x064a, 0x062c, 0x0649, 0x062c, 0x064a, + 0x062e, 0x0649, 0x062e, 0x064a, 0x0635, 0x0649, 0x0635, 0x064a, + 0x0636, 0x0649, 0x0636, 0x064a, 0x0634, 0x062c, 0x0634, 0x062d, + 0x0634, 0x062e, 0x0634, 0x0645, 0x0634, 0x0631, 0x0633, 0x0631, + 0x0635, 0x0631, 0x0636, 0x0631, 0x0637, 0x0649, 0x0637, 0x064a, + 0x0639, 0x0649, 0x0639, 0x064a, 0x063a, 0x0649, 0x063a, 0x064a, + 0x0633, 0x0649, 0x0633, 0x064a, 0x0634, 0x0649, 0x0634, 0x064a, + 0x062d, 0x0649, 0x062d, 0x064a, 0x062c, 0x0649, 0x062c, 0x064a, + 0x062e, 0x0649, 0x062e, 0x064a, 0x0635, 0x0649, 0x0635, 0x064a, + 0x0636, 0x0649, 0x0636, 0x064a, 0x0634, 0x062c, 0x0634, 0x062d, + 0x0634, 0x062e, 0x0634, 0x0645, 0x0634, 0x0631, 0x0633, 0x0631, + 0x0635, 0x0631, 0x0636, 0x0631, 0x0634, 0x062c, 0x0634, 0x062d, + 0x0634, 0x062e, 0x0634, 0x0645, 0x0633, 0x0647, 0x0634, 0x0647, + 0x0637, 0x0645, 0x0633, 0x062c, 0x0633, 0x062d, 0x0633, 0x062e, + 0x0634, 0x062c, 0x0634, 0x062d, 0x0634, 0x062e, 0x0637, 0x0645, + 0x0638, 0x0645, 0x0627, 0x064b, 0x0627, 0x064b, 0x062a, 0x062c, + 0x0645, 0x062a, 0x062d, 0x062c, 0x062a, 0x062d, 0x062c, 0x062a, + 0x062d, 0x0645, 0x062a, 0x062e, 0x0645, 0x062a, 0x0645, 0x062c, + 0x062a, 0x0645, 0x062d, 0x062a, 0x0645, 0x062e, 0x062c, 0x0645, + 0x062d, 0x062c, 0x0645, 0x062d, 0x062d, 0x0645, 0x064a, 0x062d, + 0x0645, 0x0649, 0x0633, 0x062d, 0x062c, 0x0633, 0x062c, 0x062d, + 0x0633, 0x062c, 0x0649, 0x0633, 0x0645, 0x062d, 0x0633, 0x0645, + 0x062d, 0x0633, 0x0645, 0x062c, 0x0633, 0x0645, 0x0645, 0x0633, + 0x0645, 0x0645, 0x0635, 0x062d, 0x062d, 0x0635, 0x062d, 0x062d, + 0x0635, 0x0645, 0x0645, 0x0634, 0x062d, 0x0645, 0x0634, 0x062d, + 0x0645, 0x0634, 0x062c, 0x064a, 0x0634, 0x0645, 0x062e, 0x0634, + 0x0645, 0x062e, 0x0634, 0x0645, 0x0645, 0x0634, 0x0645, 0x0645, + 0x0636, 0x062d, 0x0649, 0x0636, 0x062e, 0x0645, 0x0636, 0x062e, + 0x0645, 0x0637, 0x0645, 0x062d, 0x0637, 0x0645, 0x062d, 0x0637, + 0x0645, 0x0645, 0x0637, 0x0645, 0x064a, 0x0639, 0x062c, 0x0645, + 0x0639, 0x0645, 0x0645, 0x0639, 0x0645, 0x0645, 0x0639, 0x0645, + 0x0649, 0x063a, 0x0645, 0x0645, 0x063a, 0x0645, 0x064a, 0x063a, + 0x0645, 0x0649, 0x0641, 0x062e, 0x0645, 0x0641, 0x062e, 0x0645, + 0x0642, 0x0645, 0x062d, 0x0642, 0x0645, 0x0645, 0x0644, 0x062d, + 0x0645, 0x0644, 0x062d, 0x064a, 0x0644, 0x062d, 0x0649, 0x0644, + 0x062c, 0x062c, 0x0644, 0x062c, 0x062c, 0x0644, 0x062e, 0x0645, + 0x0644, 0x062e, 0x0645, 0x0644, 0x0645, 0x062d, 0x0644, 0x0645, + 0x062d, 0x0645, 0x062d, 0x062c, 0x0645, 0x062d, 0x0645, 0x0645, + 0x062d, 0x064a, 0x0645, 0x062c, 0x062d, 0x0645, 0x062c, 0x0645, + 0x0645, 0x062e, 0x062c, 0x0645, 0x062e, 0x0645, 0x0645, 0x062c, + 0x062e, 0x0647, 0x0645, 0x062c, 0x0647, 0x0645, 0x0645, 0x0646, + 0x062d, 0x0645, 0x0646, 0x062d, 0x0649, 0x0646, 0x062c, 0x0645, + 0x0646, 0x062c, 0x0645, 0x0646, 0x062c, 0x0649, 0x0646, 0x0645, + 0x064a, 0x0646, 0x0645, 0x0649, 0x064a, 0x0645, 0x0645, 0x064a, + 0x0645, 0x0645, 0x0628, 0x062e, 0x064a, 0x062a, 0x062c, 0x064a, + 0x062a, 0x062c, 0x0649, 0x062a, 0x062e, 0x064a, 0x062a, 0x062e, + 0x0649, 0x062a, 0x0645, 0x064a, 0x062a, 0x0645, 0x0649, 0x062c, + 0x0645, 0x064a, 0x062c, 0x062d, 0x0649, 0x062c, 0x0645, 0x0649, + 0x0633, 0x062e, 0x0649, 0x0635, 0x062d, 0x064a, 0x0634, 0x062d, + 0x064a, 0x0636, 0x062d, 0x064a, 0x0644, 0x062c, 0x064a, 0x0644, + 0x0645, 0x064a, 0x064a, 0x062d, 0x064a, 0x064a, 0x062c, 0x064a, + 0x064a, 0x0645, 0x064a, 0x0645, 0x0645, 0x064a, 0x0642, 0x0645, + 0x064a, 0x0646, 0x062d, 0x064a, 0x0642, 0x0645, 0x062d, 0x0644, + 0x062d, 0x0645, 0x0639, 0x0645, 0x064a, 0x0643, 0x0645, 0x064a, + 0x0646, 0x062c, 0x062d, 0x0645, 0x062e, 0x064a, 0x0644, 0x062c, + 0x0645, 0x0643, 0x0645, 0x0645, 0x0644, 0x062c, 0x0645, 0x0646, + 0x062c, 0x062d, 0x062c, 0x062d, 0x064a, 0x062d, 0x062c, 0x064a, + 0x0645, 0x062c, 0x064a, 0x0641, 0x0645, 0x064a, 0x0628, 0x062d, + 0x064a, 0x0643, 0x0645, 0x0645, 0x0639, 0x062c, 0x0645, 0x0635, + 0x0645, 0x0645, 0x0633, 0x062e, 0x064a, 0x0646, 0x062c, 0x064a, + 0x0635, 0x0644, 0x06d2, 0x0642, 0x0644, 0x06d2, 0x0627, 0x0644, + 0x0644, 0x0647, 0x0627, 0x0643, 0x0628, 0x0631, 0x0645, 0x062d, + 0x0645, 0x062f, 0x0635, 0x0644, 0x0639, 0x0645, 0x0631, 0x0633, + 0x0648, 0x0644, 0x0639, 0x0644, 0x064a, 0x0647, 0x0648, 0x0633, + 0x0644, 0x0645, 0x0635, 0x0644, 0x0649, 0x0635, 0x0644, 0x0649, + 0x0020, 0x0627, 0x0644, 0x0644, 0x0647, 0x0020, 0x0639, 0x0644, + 0x064a, 0x0647, 0x0020, 0x0648, 0x0633, 0x0644, 0x0645, 0x062c, + 0x0644, 0x0020, 0x062c, 0x0644, 0x0627, 0x0644, 0x0647, 0x0631, + 0x06cc, 0x0627, 0x0644, 0x002c, 0x3001, 0x3002, 0x003a, 0x003b, + 0x0021, 0x003f, 0x3016, 0x3017, 0x2026, 0x2025, 0x2014, 0x2013, + 0x005f, 0x005f, 0x0028, 0x0029, 0x007b, 0x007d, 0x3014, 0x3015, + 0x3010, 0x3011, 0x300a, 0x300b, 0x3008, 0x3009, 0x300c, 0x300d, + 0x300e, 0x300f, 0x005b, 0x005d, 0x203e, 0x203e, 0x203e, 0x203e, + 0x005f, 0x005f, 0x005f, 0x002c, 0x3001, 0x002e, 0x003b, 0x003a, + 0x003f, 0x0021, 0x2014, 0x0028, 0x0029, 0x007b, 0x007d, 0x3014, + 0x3015, 0x0023, 0x0026, 0x002a, 0x002b, 0x002d, 0x003c, 0x003e, + 0x003d, 0x005c, 0x0024, 0x0025, 0x0040, 0x0020, 0x064b, 0x0640, + 0x064b, 0x0020, 0x064c, 0x0020, 0x064d, 0x0020, 0x064e, 0x0640, + 0x064e, 0x0020, 0x064f, 0x0640, 0x064f, 0x0020, 0x0650, 0x0640, + 0x0650, 0x0020, 0x0651, 0x0640, 0x0651, 0x0020, 0x0652, 0x0640, + 0x0652, 0x0621, 0x0622, 0x0622, 0x0623, 0x0623, 0x0624, 0x0624, + 0x0625, 0x0625, 0x0626, 0x0626, 0x0626, 0x0626, 0x0627, 0x0627, + 0x0628, 0x0628, 0x0628, 0x0628, 0x0629, 0x0629, 0x062a, 0x062a, + 0x062a, 0x062a, 0x062b, 0x062b, 0x062b, 0x062b, 0x062c, 0x062c, + 0x062c, 0x062c, 0x062d, 0x062d, 0x062d, 0x062d, 0x062e, 0x062e, + 0x062e, 0x062e, 0x062f, 0x062f, 0x0630, 0x0630, 0x0631, 0x0631, + 0x0632, 0x0632, 0x0633, 0x0633, 0x0633, 0x0633, 0x0634, 0x0634, + 0x0634, 0x0634, 0x0635, 0x0635, 0x0635, 0x0635, 0x0636, 0x0636, + 0x0636, 0x0636, 0x0637, 0x0637, 0x0637, 0x0637, 0x0638, 0x0638, + 0x0638, 0x0638, 0x0639, 0x0639, 0x0639, 0x0639, 0x063a, 0x063a, + 0x063a, 0x063a, 0x0641, 0x0641, 0x0641, 0x0641, 0x0642, 0x0642, + 0x0642, 0x0642, 0x0643, 0x0643, 0x0643, 0x0643, 0x0644, 0x0644, + 0x0644, 0x0644, 0x0645, 0x0645, 0x0645, 0x0645, 0x0646, 0x0646, + 0x0646, 0x0646, 0x0647, 0x0647, 0x0647, 0x0647, 0x0648, 0x0648, + 0x0649, 0x0649, 0x064a, 0x064a, 0x064a, 0x064a, 0x0644, 0x0622, + 0x0644, 0x0622, 0x0644, 0x0623, 0x0644, 0x0623, 0x0644, 0x0625, + 0x0644, 0x0625, 0x0644, 0x0627, 0x0644, 0x0627, 0x0021, 0x0022, + 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, + 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 0x0030, 0x0031, 0x0032, + 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003a, + 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 0x0040, 0x0041, 0x0042, + 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004a, + 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 0x0050, 0x0051, 0x0052, + 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, + 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, 0x0060, 0x0061, 0x0062, + 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, + 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 0x0070, 0x0071, 0x0072, + 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, + 0x007b, 0x007c, 0x007d, 0x007e, 0x2985, 0x2986, 0x3002, 0x300c, + 0x300d, 0x3001, 0x30fb, 0x30f2, 0x30a1, 0x30a3, 0x30a5, 0x30a7, + 0x30a9, 0x30e3, 0x30e5, 0x30e7, 0x30c3, 0x30fc, 0x30a2, 0x30a4, + 0x30a6, 0x30a8, 0x30aa, 0x30ab, 0x30ad, 0x30af, 0x30b1, 0x30b3, + 0x30b5, 0x30b7, 0x30b9, 0x30bb, 0x30bd, 0x30bf, 0x30c1, 0x30c4, + 0x30c6, 0x30c8, 0x30ca, 0x30cb, 0x30cc, 0x30cd, 0x30ce, 0x30cf, + 0x30d2, 0x30d5, 0x30d8, 0x30db, 0x30de, 0x30df, 0x30e0, 0x30e1, + 0x30e2, 0x30e4, 0x30e6, 0x30e8, 0x30e9, 0x30ea, 0x30eb, 0x30ec, + 0x30ed, 0x30ef, 0x30f3, 0x3099, 0x309a, 0x3164, 0x3131, 0x3132, + 0x3133, 0x3134, 0x3135, 0x3136, 0x3137, 0x3138, 0x3139, 0x313a, + 0x313b, 0x313c, 0x313d, 0x313e, 0x313f, 0x3140, 0x3141, 0x3142, + 0x3143, 0x3144, 0x3145, 0x3146, 0x3147, 0x3148, 0x3149, 0x314a, + 0x314b, 0x314c, 0x314d, 0x314e, 0x314f, 0x3150, 0x3151, 0x3152, + 0x3153, 0x3154, 0x3155, 0x3156, 0x3157, 0x3158, 0x3159, 0x315a, + 0x315b, 0x315c, 0x315d, 0x315e, 0x315f, 0x3160, 0x3161, 0x3162, + 0x3163, 0x00a2, 0x00a3, 0x00ac, 0x00af, 0x00a6, 0x00a5, 0x20a9, + 0x2502, 0x2190, 0x2191, 0x2192, 0x2193, 0x25a0, 0x25cb +}; + +static const WCHAR *get_compatmap_entry( WCHAR ch, unsigned int *len ) +{ + unsigned short offset_offs = compatmap_table[compatmap_table[ch >> 8] + ((ch >> 4) & 0xf)] + (ch & 0xf); + unsigned short start = compatmap_table[offset_offs]; + unsigned short end = compatmap_table[offset_offs + 1]; + + if (end > start) + { + *len = end - start; + return compatmap_table + start; + } + + return NULL; +} + unsigned int DECLSPEC_HIDDEN wine_decompose( int flags, WCHAR ch, WCHAR *dst, unsigned int dstlen ) { - const WCHAR *ptr = table + table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + 2 * (ch & 0xf); - unsigned int res; + const WCHAR *ptr = NULL; + unsigned int res, len, dst_pos = 0; *dst = ch; + + if (flags & WINE_DECOMPOSE_COMPAT) + ptr = get_compatmap_entry( ch, &len ); + + if (!ptr) + { + ptr = table + table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + 2 * (ch & 0xf); + len = 2; + } + if (!*ptr) return 1; - if (dstlen <= 1) return 0; - /* apply the decomposition recursively to the first char */ - if ((res = wine_decompose( flags, *ptr, dst, dstlen-1 ))) dst[res++] = ptr[1]; - return res; + if (dstlen < len) return 0; + /* apply the decomposition recursively */ + while (len--) + { + if (!(res = wine_decompose( flags, *ptr++, dst + dst_pos, dstlen - dst_pos - len ))) return 0; + dst_pos += res; + } + + return dst_pos; } diff --git a/tools/make_unicode b/tools/make_unicode index f0056d09f3..3a9fefe474 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -361,6 +361,7 @@ my @direction_table = (); my @decomp_table = (); my @compose_table = (); my @combining_class_table = (); +my @full_compatmap_table = (); my $default_char; my $default_wchar; @@ -477,6 +478,16 @@ sub READ_DEFAULTS($) next if $decomp eq ""; # no decomposition, skip it + if ($decomp =~ /^<([a-zA-Z]+)>\s+([0-9a-fA-F]+)/) + { + my @seq = (); + for my $ch (split /\s+/, (split /\s+/, $decomp, 2)[1]) + { + push @seq, (hex $ch); + } + $full_compatmap_table[$src] = \@seq; + } + if ($decomp =~ /^<([a-zA-Z]+)>\s+([0-9a-fA-F]+)$/) { # decomposition of the form "<foo> 1234" -> use char if type is known @@ -2269,6 +2280,100 @@ EOF save_file($filename); } +sub dump_full_compat_table() +{ + # first determine all the 16-char subsets that contain something + + my @filled = (0) x 4096; + my $pos = 16; # for the null subset + my $data_total = 0; + for (my $i = 0; $i < 65536; $i++) + { + next unless defined $full_compatmap_table[$i]; + if ($filled[$i >> 4] == 0) + { + $filled[$i >> 4] = $pos; + $pos += 16; + } + $data_total += $#{$full_compatmap_table[$i]} + 1; + } + my $total = $pos; + + # now count the 256-char subsets that contain something + + my @filled_idx = (256) x 256; + $pos = 256 + 16; + for (my $i = 0; $i < 4096; $i++) + { + next unless $filled[$i]; + $filled_idx[$i >> 4] = $pos; + $pos += 16; + $i |= 15; + } + my $null_offset = $pos; # null mapping + $total += $pos + 1; # add the offset sentinel + + # add the index offsets to the subsets positions + + for (my $i = 0; $i < 4096; $i++) + { + next unless $filled[$i]; + $filled[$i] += $null_offset; + } + + # dump the main index + + printf OUTPUT "static const WCHAR compatmap_table[%d] =\n", $total + $data_total; + printf OUTPUT "{\n /* index */\n"; + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @filled_idx ); + printf OUTPUT ",\n /* null sub-index */\n%s", DUMP_ARRAY( "0x%04x", 0, ($null_offset) x 16 ); + + # dump the second-level indexes + + for (my $i = 0; $i < 256; $i++) + { + next unless ($filled_idx[$i] > 256); + my @table = @filled[($i<<4)..($i<<4)+15]; + for (my $j = 0; $j < 16; $j++) { $table[$j] ||= $null_offset; } + printf OUTPUT ",\n /* sub-index %02x */\n", $i; + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @table ); + } + + # dump the 16-char offsets + + printf OUTPUT ",\n /* null offsets */\n"; + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, ($total) x (16) ); + + $pos = $total; + + my @data; + for (my $i = 0; $i < 4096; $i++) + { + next unless $filled[$i]; + my @table = (0) x (16); + for (my $j = 0; $j < 16; $j++) + { + $table[$j] = $pos; + if (defined $full_compatmap_table[($i<<4) + $j]) + { + $pos += $#{$full_compatmap_table[($i<<4) + $j]} + 1; + push @data, @{$full_compatmap_table[($i<<4) + $j]}; + } + } + printf OUTPUT ",\n /* offsets 0x%03x0 .. 0x%03xf */\n", $i, $i; + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @table ); + } + + my @sentinel = $pos; + printf OUTPUT ",\n /* offset sentinel */\n"; + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @sentinel ); + + printf OUTPUT ",\n /* data */\n"; + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @data ); + + printf OUTPUT "\n};\n\n"; +} + ################################################################ # dump the char decomposition table sub dump_decompose_table($) @@ -2357,18 +2462,51 @@ sub dump_decompose_table($) } printf OUTPUT "\n};\n\n"; + + dump_full_compat_table(); + print OUTPUT <<"EOF"; +static const WCHAR *get_compatmap_entry( WCHAR ch, unsigned int *len ) +{ + unsigned short offset_offs = compatmap_table[compatmap_table[ch >> 8] + ((ch >> 4) & 0xf)] + (ch & 0xf); + unsigned short start = compatmap_table[offset_offs]; + unsigned short end = compatmap_table[offset_offs + 1]; + + if (end > start) + { + *len = end - start; + return compatmap_table + start; + } + + return NULL; +} + unsigned int DECLSPEC_HIDDEN wine_decompose( int flags, WCHAR ch, WCHAR *dst, unsigned int dstlen ) { - const WCHAR *ptr = table + table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + 2 * (ch & 0xf); - unsigned int res; + const WCHAR *ptr = NULL; + unsigned int res, len, dst_pos = 0; *dst = ch; + + if (flags & WINE_DECOMPOSE_COMPAT) + ptr = get_compatmap_entry( ch, &len ); + + if (!ptr) + { + ptr = table + table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + 2 * (ch & 0xf); + len = 2; + } + if (!*ptr) return 1; - if (dstlen <= 1) return 0; - /* apply the decomposition recursively to the first char */ - if ((res = wine_decompose( flags, *ptr, dst, dstlen-1 ))) dst[res++] = ptr[1]; - return res; + if (dstlen < len) return 0; + /* apply the decomposition recursively */ + while (len--) + { + if (!(res = wine_decompose( flags, *ptr++, dst + dst_pos, dstlen - dst_pos - len ))) return 0; + dst_pos += res; + } + + return dst_pos; } EOF close OUTPUT; -- 2.18.0

2 1

[PATCH v3] secur32: Fix compile error on older gnutls.
by Alistair Leslie-Hughes 08 Feb '19

08 Feb '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/secur32/schannel_gnutls.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index ddb10aca8c..ea116e81da 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -51,6 +51,13 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); /* Not present in gnutls version < 2.9.10. */ static int (*pgnutls_cipher_get_block_size)(gnutls_cipher_algorithm_t); +/* Not present in gnutls version < 3.3.0. */ +static int (*pgnutls_privkey_import_rsa_raw)(gnutls_privkey_t, const gnutls_datum_t *, + const gnutls_datum_t *, const gnutls_datum_t *, + const gnutls_datum_t *, const gnutls_datum_t *, + const gnutls_datum_t *, const gnutls_datum_t *, + const gnutls_datum_t *); + /* Not present in gnutls version < 3.4.0. */ static int (*pgnutls_privkey_export_x509)(gnutls_privkey_t, gnutls_x509_privkey_t *); @@ -79,7 +86,6 @@ MAKE_FUNCPTR(gnutls_perror); MAKE_FUNCPTR(gnutls_protocol_get_version); MAKE_FUNCPTR(gnutls_priority_set_direct); MAKE_FUNCPTR(gnutls_privkey_deinit); -MAKE_FUNCPTR(gnutls_privkey_import_rsa_raw); MAKE_FUNCPTR(gnutls_privkey_init); MAKE_FUNCPTR(gnutls_record_get_max_size); MAKE_FUNCPTR(gnutls_record_recv); @@ -138,6 +144,16 @@ static int compat_gnutls_privkey_export_x509(gnutls_privkey_t privkey, gnutls_x5 return GNUTLS_E_UNKNOWN_PK_ALGORITHM; } +static int compat_gnutls_privkey_import_rsa_raw(gnutls_privkey_t key, const gnutls_datum_t *p1, + const gnutls_datum_t *p2, const gnutls_datum_t *p3, + const gnutls_datum_t *p4, const gnutls_datum_t *p5, + const gnutls_datum_t *p6, const gnutls_datum_t *p7, + const gnutls_datum_t *p8) +{ + FIXME("\n"); + return GNUTLS_E_UNKNOWN_PK_ALGORITHM; +} + static ssize_t schan_pull_adapter(gnutls_transport_ptr_t transport, void *buff, size_t buff_len) { @@ -897,7 +913,6 @@ BOOL schan_imp_init(void) LOAD_FUNCPTR(gnutls_protocol_get_version) LOAD_FUNCPTR(gnutls_priority_set_direct) LOAD_FUNCPTR(gnutls_privkey_deinit) - LOAD_FUNCPTR(gnutls_privkey_import_rsa_raw) LOAD_FUNCPTR(gnutls_privkey_init) LOAD_FUNCPTR(gnutls_record_get_max_size); LOAD_FUNCPTR(gnutls_record_recv); @@ -924,6 +939,11 @@ BOOL schan_imp_init(void) WARN("gnutls_privkey_export_x509 not found\n"); pgnutls_privkey_export_x509 = compat_gnutls_privkey_export_x509; } + if (!(pgnutls_privkey_import_rsa_raw = wine_dlsym(libgnutls_handle, "gnutls_privkey_import_rsa_raw", NULL, 0))) + { + WARN("gnutls_privkey_import_rsa_raw not found\n"); + pgnutls_privkey_import_rsa_raw = compat_gnutls_privkey_import_rsa_raw; + } ret = pgnutls_global_init(); if (ret != GNUTLS_E_SUCCESS) -- 2.20.1

1 0

[PATCH 6/6] kernel32: Implement canonical composing.
by Huw Davies 08 Feb '19

08 Feb '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/kernel32/locale.c | 4 ++-- dlls/kernel32/tests/locale.c | 44 ++++++++++++++++++------------------ include/wine/unicode.h | 1 + libs/port/normalize.c | 35 ++++++++++++++++++++++++++++ 4 files changed, 60 insertions(+), 24 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index f2455bd72e..9f539ddd53 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -5407,8 +5407,8 @@ INT WINAPI NormalizeString(NORM_FORM form, const WCHAR *src, INT src_len, WCHAR if (compose) { - FIXME("Composing not yet implemented\n"); - res = 0; + res = wine_compose_string( buf, res ); + if (dst_len >= res) memcpy( dst, buf, res * sizeof(WCHAR) ); } done: diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index d877c65ec6..0c05311a20 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -5697,28 +5697,28 @@ static void test_NormalizeString(void) }; static const struct test_data_normal test_arr[] = { - { part0_str1, { part0_str1, part0_nfd1, part0_str1, part0_nfd1 }, { 1, 0, 1, 0 } }, - { part0_str2, { part0_nfc2, part0_str2, part0_nfc2, part0_str2 }, { 1, 0, 1, 0 } }, - { part0_str3, { part0_nfc3, part0_str3, part0_nfc3, part0_str3 }, { 1, 0, 1, 0 } }, - { part0_str4, { part0_nfc4, part0_str4, part0_nfc4, part0_str4 }, { 1, 0, 1, 0 } }, - { part0_str5, { part0_nfc5, part0_nfc5, part0_nfc5, part0_nfc5 }, { 1, 0, 1, 0 } }, - { part0_str6, { part0_nfc6, part0_nfc6, part0_nfc6, part0_nfc6 }, { 1, 0, 1, 0 } }, - { part0_str8, { part0_str8, part0_nfd8, part0_str8, part0_nfd8 }, { 1, 0, 1, 0 } }, - { part0_str9, { part0_nfc9, part0_nfd9, part0_nfc9, part0_nfd9 }, { 1, 0, 1, 0 } }, - { part0_str10, { part0_str10, part0_nfd10, part0_str10, part0_nfd10 }, { 1, 0, 1, 0 } }, - { part0_str11, { part0_str11, part0_nfd11, part0_str11, part0_nfd11 }, { 1, 0, 1, 0 } }, - { part0_str12, { part0_nfc12, part0_nfd12, part0_nfc12, part0_nfd12 }, { 1, 0, 1, 0 } }, - { part1_str1, { part1_str1, part1_str1, part1_nfkc1, part1_nfkc1 }, { 1, 0, 1, 0 } }, - { part1_str2, { part1_str2, part1_str2, part1_nfkc2, part1_nfkc2 }, { 1, 0, 1, 0 } }, - { part1_str3, { part1_str3, part1_nfd3, part1_str3, part1_nfd3 }, { 1, 0, 1, 0 } }, - { part1_str4, { part1_str4, part1_str4, part1_nfkc4, part1_nfkc4 }, { 1, 0, 1, 0 } }, - { part1_str5, { part1_str5, part1_nfd5, part1_str5, part1_nfd5 }, { 1, 0, 1, 0 } }, - { part1_str6, { part1_str6, part1_nfd6, part1_str6, part1_nfd6 }, { 1, 0, 1, 0 } }, - { part1_str7, { part1_str7, part1_str7, part1_nfkc7, part1_nfkc7 }, { 1, 0, 1, 0 } }, - { part1_str8, { part1_str8, part1_nfd8, part1_str8, part1_nfd8 }, { 1, 0, 1, 0 } }, - { part1_str9, { part1_str9, part1_str9, part1_nfkc9, part1_nfkc9 }, { 1, 0, 1, 0 } }, - { part1_str10, { part1_str10, part1_str10, part1_nfkc10, part1_nfkc10 }, { 1, 0, 1, 0 } }, - { part1_str11, { part1_nfc11, part1_nfd11, part1_nfc11, part1_nfd11 }, { 1, 0, 1, 0 } }, + { part0_str1, { part0_str1, part0_nfd1, part0_str1, part0_nfd1 } }, + { part0_str2, { part0_nfc2, part0_str2, part0_nfc2, part0_str2 } }, + { part0_str3, { part0_nfc3, part0_str3, part0_nfc3, part0_str3 } }, + { part0_str4, { part0_nfc4, part0_str4, part0_nfc4, part0_str4 } }, + { part0_str5, { part0_nfc5, part0_nfc5, part0_nfc5, part0_nfc5 } }, + { part0_str6, { part0_nfc6, part0_nfc6, part0_nfc6, part0_nfc6 } }, + { part0_str8, { part0_str8, part0_nfd8, part0_str8, part0_nfd8 } }, + { part0_str9, { part0_nfc9, part0_nfd9, part0_nfc9, part0_nfd9 } }, + { part0_str10, { part0_str10, part0_nfd10, part0_str10, part0_nfd10 } }, + { part0_str11, { part0_str11, part0_nfd11, part0_str11, part0_nfd11 } }, + { part0_str12, { part0_nfc12, part0_nfd12, part0_nfc12, part0_nfd12 } }, + { part1_str1, { part1_str1, part1_str1, part1_nfkc1, part1_nfkc1 } }, + { part1_str2, { part1_str2, part1_str2, part1_nfkc2, part1_nfkc2 } }, + { part1_str3, { part1_str3, part1_nfd3, part1_str3, part1_nfd3 } }, + { part1_str4, { part1_str4, part1_str4, part1_nfkc4, part1_nfkc4 } }, + { part1_str5, { part1_str5, part1_nfd5, part1_str5, part1_nfd5 } }, + { part1_str6, { part1_str6, part1_nfd6, part1_str6, part1_nfd6 } }, + { part1_str7, { part1_str7, part1_str7, part1_nfkc7, part1_nfkc7 } }, + { part1_str8, { part1_str8, part1_nfd8, part1_str8, part1_nfd8 } }, + { part1_str9, { part1_str9, part1_str9, part1_nfkc9, part1_nfkc9 } }, + { part1_str10, { part1_str10, part1_str10, part1_nfkc10, part1_nfkc10 } }, + { part1_str11, { part1_nfc11, part1_nfd11, part1_nfc11, part1_nfd11 } }, { 0 } }; const struct test_data_normal *ptest = test_arr; diff --git a/include/wine/unicode.h b/include/wine/unicode.h index 2c21cdfe48..a4b483a0e9 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -101,6 +101,7 @@ extern int wine_compare_string( int flags, const WCHAR *str1, int len1, const WC extern int wine_get_sortkey( int flags, const WCHAR *src, int srclen, char *dst, int dstlen ); extern int wine_fold_string( int flags, const WCHAR *src, int srclen , WCHAR *dst, int dstlen ); +extern unsigned int wine_compose_string( WCHAR *str, unsigned int len ); extern unsigned int wine_decompose_string( int flags, const WCHAR *src, unsigned int srclen, WCHAR *dst, unsigned int dstlen ); #define WINE_DECOMPOSE_COMPAT 1 #define WINE_DECOMPOSE_REORDER 2 diff --git a/libs/port/normalize.c b/libs/port/normalize.c index 8363eee98e..954a33cfdf 100644 --- a/libs/port/normalize.c +++ b/libs/port/normalize.c @@ -20,6 +20,7 @@ #include "wine/unicode.h" +extern WCHAR wine_compose( const WCHAR *str ) DECLSPEC_HIDDEN; extern unsigned int wine_decompose( int flags, WCHAR ch, WCHAR *dst, unsigned int dstlen ) DECLSPEC_HIDDEN; extern const unsigned short combining_class_table[] DECLSPEC_HIDDEN; @@ -104,3 +105,37 @@ unsigned int wine_decompose_string( int flags, const WCHAR *src, unsigned int sr if (flags & WINE_DECOMPOSE_REORDER) canonical_order_string( dst, dst_pos ); return dst_pos; } + +static BOOL is_blocked( WCHAR *starter, WCHAR *ptr ) +{ + if (ptr == starter + 1) return FALSE; + /* Because the string is already canonically ordered, the chars are blocked + only if the previous char's combining class is equal to the test char. */ + if (get_combining_class( *(ptr - 1) ) == get_combining_class( *ptr )) return TRUE; + return FALSE; +} + +unsigned int wine_compose_string( WCHAR *str, unsigned int len ) +{ + unsigned int i, last_starter = len; + WCHAR pair[2], comp; + + for (i = 0; i < len; i++) + { + pair[1] = str[i]; + if (last_starter == len || is_blocked( str + last_starter, str + i ) || !(comp = wine_compose( pair ))) + { + if (is_starter( str[i] )) + { + last_starter = i; + pair[0] = str[i]; + } + continue; + } + str[last_starter] = pair[0] = comp; + len--; + memmove( str + i, str + i + 1, (len - i) * sizeof(WCHAR) ); + i = last_starter; + } + return len; +} -- 2.18.0

1 0

[PATCH 5/6] libport: Add support for singleton decomposition.
by Huw Davies 08 Feb '19

08 Feb '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/kernel32/tests/locale.c | 6 + libs/port/decompose.c | 314 +++++++++++++++++++++++++++-------- tools/make_unicode | 18 +- 3 files changed, 267 insertions(+), 71 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 1e25122c23..d877c65ec6 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -5685,6 +5685,11 @@ static void test_NormalizeString(void) static const WCHAR part1_str10[] = {0x309B,0}; static const WCHAR part1_nfkc10[] = {0x20,0x3099,0}; + /* ANGSTROM SIGN */ + static const WCHAR part1_str11[] = {0x212B,0}; + static const WCHAR part1_nfc11[] = {0xC5,0}; + static const WCHAR part1_nfd11[] = {'A',0x030A,0}; + struct test_data_normal { const WCHAR *str; const WCHAR *expected[4]; @@ -5713,6 +5718,7 @@ static void test_NormalizeString(void) { part1_str8, { part1_str8, part1_nfd8, part1_str8, part1_nfd8 }, { 1, 0, 1, 0 } }, { part1_str9, { part1_str9, part1_str9, part1_nfkc9, part1_nfkc9 }, { 1, 0, 1, 0 } }, { part1_str10, { part1_str10, part1_str10, part1_nfkc10, part1_nfkc10 }, { 1, 0, 1, 0 } }, + { part1_str11, { part1_nfc11, part1_nfd11, part1_nfc11, part1_nfd11 }, { 1, 0, 1, 0 } }, { 0 } }; const struct test_data_normal *ptest = test_arr; diff --git a/libs/port/decompose.c b/libs/port/decompose.c index c46906921a..e8305d938b 100644 --- a/libs/port/decompose.c +++ b/libs/port/decompose.c @@ -4,16 +4,16 @@ #include "wine/unicode.h" -static const WCHAR table[4704] = +static const WCHAR table[5856] = { /* index */ 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0100, 0x0160, 0x0100, 0x0100, 0x0170, 0x0180, 0x0190, 0x01a0, 0x01b0, 0x0100, 0x01c0, 0x01d0, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x01e0, 0x0100, 0x0100, 0x01f0, 0x0200, - 0x0100, 0x0210, 0x0220, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0230, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0240, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0210, 0x0220, 0x0230, 0x0240, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0250, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0260, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, @@ -38,73 +38,85 @@ static const WCHAR table[4704] = 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0250, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0270, 0x0280, 0x0290, 0x0100, 0x0100, 0x0100, 0x0100, /* null sub-index */ - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, + 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, + 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, /* sub-index 00 */ - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0280, 0x02a0, 0x02c0, 0x02e0, + 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, + 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02c0, 0x02e0, 0x0300, 0x0320, /* sub-index 01 */ - 0x0300, 0x0320, 0x0340, 0x0360, 0x0380, 0x03a0, 0x03c0, 0x03e0, - 0x0260, 0x0260, 0x0400, 0x0420, 0x0440, 0x0460, 0x0480, 0x04a0, + 0x0340, 0x0360, 0x0380, 0x03a0, 0x03c0, 0x03e0, 0x0400, 0x0420, + 0x02a0, 0x02a0, 0x0440, 0x0460, 0x0480, 0x04a0, 0x04c0, 0x04e0, /* sub-index 02 */ - 0x04c0, 0x04e0, 0x0500, 0x0520, 0x0260, 0x0260, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, + 0x0500, 0x0520, 0x0540, 0x0560, 0x02a0, 0x02a0, 0x02a0, 0x02a0, + 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, /* sub-index 03 */ - 0x0260, 0x0260, 0x0260, 0x0260, 0x0540, 0x0260, 0x0260, 0x0260, - 0x0560, 0x0580, 0x05a0, 0x05c0, 0x05e0, 0x0600, 0x0260, 0x0260, + 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x0580, 0x02a0, 0x02a0, 0x05a0, + 0x05c0, 0x05e0, 0x0600, 0x0620, 0x0640, 0x0660, 0x02a0, 0x02a0, /* sub-index 04 */ - 0x0620, 0x0640, 0x0260, 0x0660, 0x0260, 0x0680, 0x0260, 0x06a0, - 0x0260, 0x0260, 0x0260, 0x0260, 0x06c0, 0x06e0, 0x0700, 0x0720, + 0x0680, 0x06a0, 0x02a0, 0x06c0, 0x02a0, 0x06e0, 0x02a0, 0x0700, + 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x0720, 0x0740, 0x0760, 0x0780, /* sub-index 06 */ - 0x0260, 0x0260, 0x0740, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0760, 0x0780, 0x0260, 0x0260, + 0x02a0, 0x02a0, 0x07a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, + 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x07c0, 0x07e0, 0x02a0, 0x02a0, /* sub-index 09 */ - 0x0260, 0x0260, 0x07a0, 0x07c0, 0x0260, 0x07e0, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0800, 0x0820, 0x0260, 0x0260, + 0x02a0, 0x02a0, 0x0800, 0x0820, 0x02a0, 0x0840, 0x02a0, 0x02a0, + 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x0860, 0x0880, 0x02a0, 0x02a0, /* sub-index 0a */ - 0x0260, 0x0260, 0x0260, 0x0840, 0x0260, 0x0860, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, + 0x02a0, 0x02a0, 0x02a0, 0x08a0, 0x02a0, 0x08c0, 0x02a0, 0x02a0, + 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, /* sub-index 0b */ - 0x0260, 0x0260, 0x0260, 0x0260, 0x0880, 0x08a0, 0x0260, 0x0260, - 0x0260, 0x08c0, 0x0260, 0x0260, 0x08e0, 0x0260, 0x0260, 0x0260, + 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x08e0, 0x0900, 0x02a0, 0x02a0, + 0x02a0, 0x0920, 0x02a0, 0x02a0, 0x0940, 0x02a0, 0x02a0, 0x02a0, /* sub-index 0c */ - 0x0260, 0x0260, 0x0260, 0x0260, 0x0900, 0x0260, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0920, 0x0260, 0x0260, 0x0260, + 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x0960, 0x02a0, 0x02a0, 0x02a0, + 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x0980, 0x02a0, 0x02a0, 0x02a0, /* sub-index 0d */ - 0x0260, 0x0260, 0x0260, 0x0260, 0x0940, 0x0260, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0960, 0x0260, 0x0260, + 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x09a0, 0x02a0, 0x02a0, 0x02a0, + 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x09c0, 0x02a0, 0x02a0, /* sub-index 0f */ - 0x0260, 0x0260, 0x0260, 0x0260, 0x0980, 0x09a0, 0x09c0, 0x09e0, - 0x0a00, 0x0a20, 0x0a40, 0x0a60, 0x0260, 0x0260, 0x0260, 0x0260, + 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x09e0, 0x0a00, 0x0a20, 0x0a40, + 0x0a60, 0x0a80, 0x0aa0, 0x0ac0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, /* sub-index 10 */ - 0x0260, 0x0260, 0x0a80, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, + 0x02a0, 0x02a0, 0x0ae0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, + 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, /* sub-index 1b */ - 0x0aa0, 0x0ac0, 0x0260, 0x0ae0, 0x0b00, 0x0260, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, + 0x0b00, 0x0b20, 0x02a0, 0x0b40, 0x0b60, 0x02a0, 0x02a0, 0x02a0, + 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, /* sub-index 1e */ - 0x0b20, 0x0b40, 0x0b60, 0x0b80, 0x0ba0, 0x0bc0, 0x0be0, 0x0c00, - 0x0c20, 0x0c40, 0x0c60, 0x0c80, 0x0ca0, 0x0cc0, 0x0ce0, 0x0d00, + 0x0b80, 0x0ba0, 0x0bc0, 0x0be0, 0x0c00, 0x0c20, 0x0c40, 0x0c60, + 0x0c80, 0x0ca0, 0x0cc0, 0x0ce0, 0x0d00, 0x0d20, 0x0d40, 0x0d60, /* sub-index 1f */ - 0x0d20, 0x0d40, 0x0d60, 0x0d80, 0x0da0, 0x0dc0, 0x0de0, 0x0e00, - 0x0e20, 0x0e40, 0x0e60, 0x0e80, 0x0ea0, 0x0ec0, 0x0ee0, 0x0f00, + 0x0d80, 0x0da0, 0x0dc0, 0x0de0, 0x0e00, 0x0e20, 0x0e40, 0x0e60, + 0x0e80, 0x0ea0, 0x0ec0, 0x0ee0, 0x0f00, 0x0f20, 0x0f40, 0x0f60, + /* sub-index 20 */ + 0x0f80, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, + 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, /* sub-index 21 */ - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, - 0x0260, 0x0f20, 0x0f40, 0x0260, 0x0f60, 0x0260, 0x0260, 0x0260, + 0x02a0, 0x02a0, 0x0fa0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, + 0x02a0, 0x0fc0, 0x0fe0, 0x02a0, 0x1000, 0x02a0, 0x02a0, 0x02a0, /* sub-index 22 */ - 0x0f80, 0x0260, 0x0fa0, 0x0260, 0x0fc0, 0x0260, 0x0fe0, 0x1000, - 0x1020, 0x0260, 0x1040, 0x0260, 0x0260, 0x0260, 0x1060, 0x0260, + 0x1020, 0x02a0, 0x1040, 0x02a0, 0x1060, 0x02a0, 0x1080, 0x10a0, + 0x10c0, 0x02a0, 0x10e0, 0x02a0, 0x02a0, 0x02a0, 0x1100, 0x02a0, + /* sub-index 23 */ + 0x02a0, 0x02a0, 0x1120, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, + 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, /* sub-index 2a */ - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x1080, 0x0260, 0x0260, + 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, + 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x1140, 0x02a0, 0x02a0, /* sub-index 30 */ - 0x0260, 0x0260, 0x0260, 0x0260, 0x10a0, 0x10c0, 0x10e0, 0x1100, - 0x0260, 0x1120, 0x1140, 0x1160, 0x1180, 0x11a0, 0x0260, 0x11c0, + 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x1160, 0x1180, 0x11a0, 0x11c0, + 0x02a0, 0x11e0, 0x1200, 0x1220, 0x1240, 0x1260, 0x02a0, 0x1280, + /* sub-index f9 */ + 0x12a0, 0x12c0, 0x12e0, 0x1300, 0x1320, 0x1340, 0x1360, 0x1380, + 0x13a0, 0x13c0, 0x13e0, 0x1400, 0x1420, 0x1440, 0x1460, 0x1480, + /* sub-index fa */ + 0x14a0, 0x14c0, 0x14e0, 0x1500, 0x1520, 0x1540, 0x1560, 0x1580, + 0x15a0, 0x15c0, 0x15e0, 0x1600, 0x1620, 0x1640, 0x02a0, 0x02a0, /* sub-index fb */ - 0x0260, 0x11e0, 0x1200, 0x1220, 0x1240, 0x0260, 0x0260, 0x0260, - 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, 0x0260, + 0x02a0, 0x1660, 0x1680, 0x16a0, 0x16c0, 0x02a0, 0x02a0, 0x02a0, + 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, 0x02a0, /* null mapping */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -221,13 +233,18 @@ static const WCHAR table[4704] = 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0340 .. 0x034f */ - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0300, 0x0000, 0x0301, 0x0000, 0x0000, 0x0000, 0x0313, 0x0000, 0x0308, 0x0301, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x0370 .. 0x037f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x02b9, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x003b, 0x0000, 0x0000, 0x0000, /* 0x0380 .. 0x038f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x00a8, 0x0301, 0x0391, 0x0301, 0x0000, 0x0000, + 0x0000, 0x0000, 0x00a8, 0x0301, 0x0391, 0x0301, 0x00b7, 0x0000, 0x0395, 0x0301, 0x0397, 0x0301, 0x0399, 0x0301, 0x0000, 0x0000, 0x039f, 0x0301, 0x0000, 0x0000, 0x03a5, 0x0301, 0x03a9, 0x0301, /* 0x0390 .. 0x039f */ @@ -571,10 +588,10 @@ static const WCHAR table[4704] = 0x03a9, 0x0313, 0x03a9, 0x0314, 0x1f68, 0x0300, 0x1f69, 0x0300, 0x1f68, 0x0301, 0x1f69, 0x0301, 0x1f68, 0x0342, 0x1f69, 0x0342, /* 0x1f70 .. 0x1f7f */ - 0x03b1, 0x0300, 0x0000, 0x0000, 0x03b5, 0x0300, 0x0000, 0x0000, - 0x03b7, 0x0300, 0x0000, 0x0000, 0x03b9, 0x0300, 0x0000, 0x0000, - 0x03bf, 0x0300, 0x0000, 0x0000, 0x03c5, 0x0300, 0x0000, 0x0000, - 0x03c9, 0x0300, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x03b1, 0x0300, 0x03ac, 0x0000, 0x03b5, 0x0300, 0x03ad, 0x0000, + 0x03b7, 0x0300, 0x03ae, 0x0000, 0x03b9, 0x0300, 0x03af, 0x0000, + 0x03bf, 0x0300, 0x03cc, 0x0000, 0x03c5, 0x0300, 0x03cd, 0x0000, + 0x03c9, 0x0300, 0x03ce, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x1f80 .. 0x1f8f */ 0x1f00, 0x0345, 0x1f01, 0x0345, 0x1f02, 0x0345, 0x1f03, 0x0345, 0x1f04, 0x0345, 0x1f05, 0x0345, 0x1f06, 0x0345, 0x1f07, 0x0345, @@ -593,28 +610,38 @@ static const WCHAR table[4704] = /* 0x1fb0 .. 0x1fbf */ 0x03b1, 0x0306, 0x03b1, 0x0304, 0x1f70, 0x0345, 0x03b1, 0x0345, 0x03ac, 0x0345, 0x0000, 0x0000, 0x03b1, 0x0342, 0x1fb6, 0x0345, - 0x0391, 0x0306, 0x0391, 0x0304, 0x0391, 0x0300, 0x0000, 0x0000, - 0x0391, 0x0345, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0391, 0x0306, 0x0391, 0x0304, 0x0391, 0x0300, 0x0386, 0x0000, + 0x0391, 0x0345, 0x0000, 0x0000, 0x03b9, 0x0000, 0x0000, 0x0000, /* 0x1fc0 .. 0x1fcf */ 0x0000, 0x0000, 0x00a8, 0x0342, 0x1f74, 0x0345, 0x03b7, 0x0345, 0x03ae, 0x0345, 0x0000, 0x0000, 0x03b7, 0x0342, 0x1fc6, 0x0345, - 0x0395, 0x0300, 0x0000, 0x0000, 0x0397, 0x0300, 0x0000, 0x0000, + 0x0395, 0x0300, 0x0388, 0x0000, 0x0397, 0x0300, 0x0389, 0x0000, 0x0397, 0x0345, 0x1fbf, 0x0300, 0x1fbf, 0x0301, 0x1fbf, 0x0342, /* 0x1fd0 .. 0x1fdf */ - 0x03b9, 0x0306, 0x03b9, 0x0304, 0x03ca, 0x0300, 0x0000, 0x0000, + 0x03b9, 0x0306, 0x03b9, 0x0304, 0x03ca, 0x0300, 0x0390, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x03b9, 0x0342, 0x03ca, 0x0342, - 0x0399, 0x0306, 0x0399, 0x0304, 0x0399, 0x0300, 0x0000, 0x0000, + 0x0399, 0x0306, 0x0399, 0x0304, 0x0399, 0x0300, 0x038a, 0x0000, 0x0000, 0x0000, 0x1ffe, 0x0300, 0x1ffe, 0x0301, 0x1ffe, 0x0342, /* 0x1fe0 .. 0x1fef */ - 0x03c5, 0x0306, 0x03c5, 0x0304, 0x03cb, 0x0300, 0x0000, 0x0000, + 0x03c5, 0x0306, 0x03c5, 0x0304, 0x03cb, 0x0300, 0x03b0, 0x0000, 0x03c1, 0x0313, 0x03c1, 0x0314, 0x03c5, 0x0342, 0x03cb, 0x0342, - 0x03a5, 0x0306, 0x03a5, 0x0304, 0x03a5, 0x0300, 0x0000, 0x0000, - 0x03a1, 0x0314, 0x00a8, 0x0300, 0x0000, 0x0000, 0x0000, 0x0000, + 0x03a5, 0x0306, 0x03a5, 0x0304, 0x03a5, 0x0300, 0x038e, 0x0000, + 0x03a1, 0x0314, 0x00a8, 0x0300, 0x0385, 0x0000, 0x0060, 0x0000, /* 0x1ff0 .. 0x1fff */ 0x0000, 0x0000, 0x0000, 0x0000, 0x1f7c, 0x0345, 0x03c9, 0x0345, 0x03ce, 0x0345, 0x0000, 0x0000, 0x03c9, 0x0342, 0x1ff6, 0x0345, - 0x039f, 0x0300, 0x0000, 0x0000, 0x03a9, 0x0300, 0x0000, 0x0000, - 0x03a9, 0x0345, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x039f, 0x0300, 0x038c, 0x0000, 0x03a9, 0x0300, 0x038f, 0x0000, + 0x03a9, 0x0345, 0x00b4, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x2000 .. 0x200f */ + 0x2002, 0x0000, 0x2003, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x2120 .. 0x212f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x03a9, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x004b, 0x0000, 0x00c5, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x2190 .. 0x219f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -670,6 +697,11 @@ static const WCHAR table[4704] = 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x22b2, 0x0338, 0x22b3, 0x0338, 0x22b4, 0x0338, 0x22b5, 0x0338, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x2320 .. 0x232f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x3008, 0x0000, 0x3009, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x2ad0 .. 0x2adf */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -725,6 +757,156 @@ static const WCHAR table[4704] = 0x30a6, 0x3099, 0x0000, 0x0000, 0x0000, 0x0000, 0x30ef, 0x3099, 0x30f0, 0x3099, 0x30f1, 0x3099, 0x30f2, 0x3099, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x30fd, 0x3099, 0x0000, 0x0000, + /* 0xf900 .. 0xf90f */ + 0x8c48, 0x0000, 0x66f4, 0x0000, 0x8eca, 0x0000, 0x8cc8, 0x0000, + 0x6ed1, 0x0000, 0x4e32, 0x0000, 0x53e5, 0x0000, 0x9f9c, 0x0000, + 0x9f9c, 0x0000, 0x5951, 0x0000, 0x91d1, 0x0000, 0x5587, 0x0000, + 0x5948, 0x0000, 0x61f6, 0x0000, 0x7669, 0x0000, 0x7f85, 0x0000, + /* 0xf910 .. 0xf91f */ + 0x863f, 0x0000, 0x87ba, 0x0000, 0x88f8, 0x0000, 0x908f, 0x0000, + 0x6a02, 0x0000, 0x6d1b, 0x0000, 0x70d9, 0x0000, 0x73de, 0x0000, + 0x843d, 0x0000, 0x916a, 0x0000, 0x99f1, 0x0000, 0x4e82, 0x0000, + 0x5375, 0x0000, 0x6b04, 0x0000, 0x721b, 0x0000, 0x862d, 0x0000, + /* 0xf920 .. 0xf92f */ + 0x9e1e, 0x0000, 0x5d50, 0x0000, 0x6feb, 0x0000, 0x85cd, 0x0000, + 0x8964, 0x0000, 0x62c9, 0x0000, 0x81d8, 0x0000, 0x881f, 0x0000, + 0x5eca, 0x0000, 0x6717, 0x0000, 0x6d6a, 0x0000, 0x72fc, 0x0000, + 0x90ce, 0x0000, 0x4f86, 0x0000, 0x51b7, 0x0000, 0x52de, 0x0000, + /* 0xf930 .. 0xf93f */ + 0x64c4, 0x0000, 0x6ad3, 0x0000, 0x7210, 0x0000, 0x76e7, 0x0000, + 0x8001, 0x0000, 0x8606, 0x0000, 0x865c, 0x0000, 0x8def, 0x0000, + 0x9732, 0x0000, 0x9b6f, 0x0000, 0x9dfa, 0x0000, 0x788c, 0x0000, + 0x797f, 0x0000, 0x7da0, 0x0000, 0x83c9, 0x0000, 0x9304, 0x0000, + /* 0xf940 .. 0xf94f */ + 0x9e7f, 0x0000, 0x8ad6, 0x0000, 0x58df, 0x0000, 0x5f04, 0x0000, + 0x7c60, 0x0000, 0x807e, 0x0000, 0x7262, 0x0000, 0x78ca, 0x0000, + 0x8cc2, 0x0000, 0x96f7, 0x0000, 0x58d8, 0x0000, 0x5c62, 0x0000, + 0x6a13, 0x0000, 0x6dda, 0x0000, 0x6f0f, 0x0000, 0x7d2f, 0x0000, + /* 0xf950 .. 0xf95f */ + 0x7e37, 0x0000, 0x964b, 0x0000, 0x52d2, 0x0000, 0x808b, 0x0000, + 0x51dc, 0x0000, 0x51cc, 0x0000, 0x7a1c, 0x0000, 0x7dbe, 0x0000, + 0x83f1, 0x0000, 0x9675, 0x0000, 0x8b80, 0x0000, 0x62cf, 0x0000, + 0x6a02, 0x0000, 0x8afe, 0x0000, 0x4e39, 0x0000, 0x5be7, 0x0000, + /* 0xf960 .. 0xf96f */ + 0x6012, 0x0000, 0x7387, 0x0000, 0x7570, 0x0000, 0x5317, 0x0000, + 0x78fb, 0x0000, 0x4fbf, 0x0000, 0x5fa9, 0x0000, 0x4e0d, 0x0000, + 0x6ccc, 0x0000, 0x6578, 0x0000, 0x7d22, 0x0000, 0x53c3, 0x0000, + 0x585e, 0x0000, 0x7701, 0x0000, 0x8449, 0x0000, 0x8aaa, 0x0000, + /* 0xf970 .. 0xf97f */ + 0x6bba, 0x0000, 0x8fb0, 0x0000, 0x6c88, 0x0000, 0x62fe, 0x0000, + 0x82e5, 0x0000, 0x63a0, 0x0000, 0x7565, 0x0000, 0x4eae, 0x0000, + 0x5169, 0x0000, 0x51c9, 0x0000, 0x6881, 0x0000, 0x7ce7, 0x0000, + 0x826f, 0x0000, 0x8ad2, 0x0000, 0x91cf, 0x0000, 0x52f5, 0x0000, + /* 0xf980 .. 0xf98f */ + 0x5442, 0x0000, 0x5973, 0x0000, 0x5eec, 0x0000, 0x65c5, 0x0000, + 0x6ffe, 0x0000, 0x792a, 0x0000, 0x95ad, 0x0000, 0x9a6a, 0x0000, + 0x9e97, 0x0000, 0x9ece, 0x0000, 0x529b, 0x0000, 0x66c6, 0x0000, + 0x6b77, 0x0000, 0x8f62, 0x0000, 0x5e74, 0x0000, 0x6190, 0x0000, + /* 0xf990 .. 0xf99f */ + 0x6200, 0x0000, 0x649a, 0x0000, 0x6f23, 0x0000, 0x7149, 0x0000, + 0x7489, 0x0000, 0x79ca, 0x0000, 0x7df4, 0x0000, 0x806f, 0x0000, + 0x8f26, 0x0000, 0x84ee, 0x0000, 0x9023, 0x0000, 0x934a, 0x0000, + 0x5217, 0x0000, 0x52a3, 0x0000, 0x54bd, 0x0000, 0x70c8, 0x0000, + /* 0xf9a0 .. 0xf9af */ + 0x88c2, 0x0000, 0x8aaa, 0x0000, 0x5ec9, 0x0000, 0x5ff5, 0x0000, + 0x637b, 0x0000, 0x6bae, 0x0000, 0x7c3e, 0x0000, 0x7375, 0x0000, + 0x4ee4, 0x0000, 0x56f9, 0x0000, 0x5be7, 0x0000, 0x5dba, 0x0000, + 0x601c, 0x0000, 0x73b2, 0x0000, 0x7469, 0x0000, 0x7f9a, 0x0000, + /* 0xf9b0 .. 0xf9bf */ + 0x8046, 0x0000, 0x9234, 0x0000, 0x96f6, 0x0000, 0x9748, 0x0000, + 0x9818, 0x0000, 0x4f8b, 0x0000, 0x79ae, 0x0000, 0x91b4, 0x0000, + 0x96b8, 0x0000, 0x60e1, 0x0000, 0x4e86, 0x0000, 0x50da, 0x0000, + 0x5bee, 0x0000, 0x5c3f, 0x0000, 0x6599, 0x0000, 0x6a02, 0x0000, + /* 0xf9c0 .. 0xf9cf */ + 0x71ce, 0x0000, 0x7642, 0x0000, 0x84fc, 0x0000, 0x907c, 0x0000, + 0x9f8d, 0x0000, 0x6688, 0x0000, 0x962e, 0x0000, 0x5289, 0x0000, + 0x677b, 0x0000, 0x67f3, 0x0000, 0x6d41, 0x0000, 0x6e9c, 0x0000, + 0x7409, 0x0000, 0x7559, 0x0000, 0x786b, 0x0000, 0x7d10, 0x0000, + /* 0xf9d0 .. 0xf9df */ + 0x985e, 0x0000, 0x516d, 0x0000, 0x622e, 0x0000, 0x9678, 0x0000, + 0x502b, 0x0000, 0x5d19, 0x0000, 0x6dea, 0x0000, 0x8f2a, 0x0000, + 0x5f8b, 0x0000, 0x6144, 0x0000, 0x6817, 0x0000, 0x7387, 0x0000, + 0x9686, 0x0000, 0x5229, 0x0000, 0x540f, 0x0000, 0x5c65, 0x0000, + /* 0xf9e0 .. 0xf9ef */ + 0x6613, 0x0000, 0x674e, 0x0000, 0x68a8, 0x0000, 0x6ce5, 0x0000, + 0x7406, 0x0000, 0x75e2, 0x0000, 0x7f79, 0x0000, 0x88cf, 0x0000, + 0x88e1, 0x0000, 0x91cc, 0x0000, 0x96e2, 0x0000, 0x533f, 0x0000, + 0x6eba, 0x0000, 0x541d, 0x0000, 0x71d0, 0x0000, 0x7498, 0x0000, + /* 0xf9f0 .. 0xf9ff */ + 0x85fa, 0x0000, 0x96a3, 0x0000, 0x9c57, 0x0000, 0x9e9f, 0x0000, + 0x6797, 0x0000, 0x6dcb, 0x0000, 0x81e8, 0x0000, 0x7acb, 0x0000, + 0x7b20, 0x0000, 0x7c92, 0x0000, 0x72c0, 0x0000, 0x7099, 0x0000, + 0x8b58, 0x0000, 0x4ec0, 0x0000, 0x8336, 0x0000, 0x523a, 0x0000, + /* 0xfa00 .. 0xfa0f */ + 0x5207, 0x0000, 0x5ea6, 0x0000, 0x62d3, 0x0000, 0x7cd6, 0x0000, + 0x5b85, 0x0000, 0x6d1e, 0x0000, 0x66b4, 0x0000, 0x8f3b, 0x0000, + 0x884c, 0x0000, 0x964d, 0x0000, 0x898b, 0x0000, 0x5ed3, 0x0000, + 0x5140, 0x0000, 0x55c0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xfa10 .. 0xfa1f */ + 0x585a, 0x0000, 0x0000, 0x0000, 0x6674, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x51de, 0x0000, 0x732a, 0x0000, 0x76ca, 0x0000, + 0x793c, 0x0000, 0x795e, 0x0000, 0x7965, 0x0000, 0x798f, 0x0000, + 0x9756, 0x0000, 0x7cbe, 0x0000, 0x7fbd, 0x0000, 0x0000, 0x0000, + /* 0xfa20 .. 0xfa2f */ + 0x8612, 0x0000, 0x0000, 0x0000, 0x8af8, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x9038, 0x0000, 0x90fd, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x98ef, 0x0000, 0x98fc, 0x0000, + 0x9928, 0x0000, 0x9db4, 0x0000, 0x90de, 0x0000, 0x96b7, 0x0000, + /* 0xfa30 .. 0xfa3f */ + 0x4fae, 0x0000, 0x50e7, 0x0000, 0x514d, 0x0000, 0x52c9, 0x0000, + 0x52e4, 0x0000, 0x5351, 0x0000, 0x559d, 0x0000, 0x5606, 0x0000, + 0x5668, 0x0000, 0x5840, 0x0000, 0x58a8, 0x0000, 0x5c64, 0x0000, + 0x5c6e, 0x0000, 0x6094, 0x0000, 0x6168, 0x0000, 0x618e, 0x0000, + /* 0xfa40 .. 0xfa4f */ + 0x61f2, 0x0000, 0x654f, 0x0000, 0x65e2, 0x0000, 0x6691, 0x0000, + 0x6885, 0x0000, 0x6d77, 0x0000, 0x6e1a, 0x0000, 0x6f22, 0x0000, + 0x716e, 0x0000, 0x722b, 0x0000, 0x7422, 0x0000, 0x7891, 0x0000, + 0x793e, 0x0000, 0x7949, 0x0000, 0x7948, 0x0000, 0x7950, 0x0000, + /* 0xfa50 .. 0xfa5f */ + 0x7956, 0x0000, 0x795d, 0x0000, 0x798d, 0x0000, 0x798e, 0x0000, + 0x7a40, 0x0000, 0x7a81, 0x0000, 0x7bc0, 0x0000, 0x7df4, 0x0000, + 0x7e09, 0x0000, 0x7e41, 0x0000, 0x7f72, 0x0000, 0x8005, 0x0000, + 0x81ed, 0x0000, 0x8279, 0x0000, 0x8279, 0x0000, 0x8457, 0x0000, + /* 0xfa60 .. 0xfa6f */ + 0x8910, 0x0000, 0x8996, 0x0000, 0x8b01, 0x0000, 0x8b39, 0x0000, + 0x8cd3, 0x0000, 0x8d08, 0x0000, 0x8fb6, 0x0000, 0x9038, 0x0000, + 0x96e3, 0x0000, 0x97ff, 0x0000, 0x983b, 0x0000, 0x6075, 0x0000, + 0x0000, 0x0000, 0x8218, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xfa70 .. 0xfa7f */ + 0x4e26, 0x0000, 0x51b5, 0x0000, 0x5168, 0x0000, 0x4f80, 0x0000, + 0x5145, 0x0000, 0x5180, 0x0000, 0x52c7, 0x0000, 0x52fa, 0x0000, + 0x559d, 0x0000, 0x5555, 0x0000, 0x5599, 0x0000, 0x55e2, 0x0000, + 0x585a, 0x0000, 0x58b3, 0x0000, 0x5944, 0x0000, 0x5954, 0x0000, + /* 0xfa80 .. 0xfa8f */ + 0x5a62, 0x0000, 0x5b28, 0x0000, 0x5ed2, 0x0000, 0x5ed9, 0x0000, + 0x5f69, 0x0000, 0x5fad, 0x0000, 0x60d8, 0x0000, 0x614e, 0x0000, + 0x6108, 0x0000, 0x618e, 0x0000, 0x6160, 0x0000, 0x61f2, 0x0000, + 0x6234, 0x0000, 0x63c4, 0x0000, 0x641c, 0x0000, 0x6452, 0x0000, + /* 0xfa90 .. 0xfa9f */ + 0x6556, 0x0000, 0x6674, 0x0000, 0x6717, 0x0000, 0x671b, 0x0000, + 0x6756, 0x0000, 0x6b79, 0x0000, 0x6bba, 0x0000, 0x6d41, 0x0000, + 0x6edb, 0x0000, 0x6ecb, 0x0000, 0x6f22, 0x0000, 0x701e, 0x0000, + 0x716e, 0x0000, 0x77a7, 0x0000, 0x7235, 0x0000, 0x72af, 0x0000, + /* 0xfaa0 .. 0xfaaf */ + 0x732a, 0x0000, 0x7471, 0x0000, 0x7506, 0x0000, 0x753b, 0x0000, + 0x761d, 0x0000, 0x761f, 0x0000, 0x76ca, 0x0000, 0x76db, 0x0000, + 0x76f4, 0x0000, 0x774a, 0x0000, 0x7740, 0x0000, 0x78cc, 0x0000, + 0x7ab1, 0x0000, 0x7bc0, 0x0000, 0x7c7b, 0x0000, 0x7d5b, 0x0000, + /* 0xfab0 .. 0xfabf */ + 0x7df4, 0x0000, 0x7f3e, 0x0000, 0x8005, 0x0000, 0x8352, 0x0000, + 0x83ef, 0x0000, 0x8779, 0x0000, 0x8941, 0x0000, 0x8986, 0x0000, + 0x8996, 0x0000, 0x8abf, 0x0000, 0x8af8, 0x0000, 0x8acb, 0x0000, + 0x8b01, 0x0000, 0x8afe, 0x0000, 0x8aed, 0x0000, 0x8b39, 0x0000, + /* 0xfac0 .. 0xfacf */ + 0x8b8a, 0x0000, 0x8d08, 0x0000, 0x8f38, 0x0000, 0x9072, 0x0000, + 0x9199, 0x0000, 0x9276, 0x0000, 0x967c, 0x0000, 0x96e3, 0x0000, + 0x9756, 0x0000, 0x97db, 0x0000, 0x97ff, 0x0000, 0x980b, 0x0000, + 0x983b, 0x0000, 0x9b12, 0x0000, 0x9f9c, 0x0000, 0x0000, 0x0000, + /* 0xfad0 .. 0xfadf */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x3b9d, 0x0000, 0x4018, 0x0000, + 0x4039, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x9f43, 0x0000, 0x9f8e, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0xfb10 .. 0xfb1f */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -2041,7 +2223,7 @@ unsigned int DECLSPEC_HIDDEN wine_decompose( int flags, WCHAR ch, WCHAR *dst, un if (!ptr) { ptr = table + table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + 2 * (ch & 0xf); - len = 2; + len = ptr[1] ? 2 : 1; } if (!*ptr) return 1; diff --git a/tools/make_unicode b/tools/make_unicode index 3a9fefe474..dbf640abe7 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -528,11 +528,19 @@ sub READ_DEFAULTS($) $decomp_table[$src] = [ hex $1, hex $2 ]; push @compose_table, [ hex $1, hex $2, $src ]; } - elsif ($decomp =~ /^(<[a-z]+>\s)*([0-9a-fA-F]+)$/ && - (($src >= 0xf900 && $src < 0xfb00) || ($src >= 0xfe30 && $src < 0xfffd))) + elsif ($decomp =~ /^([0-9a-fA-F]+)$/) { - # Single char decomposition in the compatibility range - $compatmap_table[$src] = hex $2; + # Single char decomposition + if (hex $1 < 65536) + { + $decomp_table[$src] = [ hex $1, 0 ]; + } + + if (($src >= 0xf900 && $src < 0xfb00) || ($src >= 0xfe30 && $src < 0xfffd)) + { + # Single char decomposition in the compatibility range + $compatmap_table[$src] = hex $1; + } } } else @@ -2494,7 +2502,7 @@ unsigned int DECLSPEC_HIDDEN wine_decompose( int flags, WCHAR ch, WCHAR *dst, un if (!ptr) { ptr = table + table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + 2 * (ch & 0xf); - len = 2; + len = ptr[1] ? 2 : 1; } if (!*ptr) return 1; -- 2.18.0

1 0

[PATCH 3/6] kernel32: Implement canonical reordering.
by Huw Davies 08 Feb '19

08 Feb '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/kernel32/locale.c | 1 + dlls/kernel32/tests/locale.c | 6 +- libs/port/Makefile.in | 1 + libs/port/combclass.c | 288 +++++++++++++++++++++++++++++++++++ libs/port/normalize.c | 68 +++++++++ tools/make_unicode | 24 +++ 6 files changed, 385 insertions(+), 3 deletions(-) create mode 100644 libs/port/combclass.c diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index a4e5ef5a38..f2455bd72e 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -5374,6 +5374,7 @@ INT WINAPI NormalizeString(NORM_FORM form, const WCHAR *src, INT src_len, WCHAR if (form == NormalizationKC || form == NormalizationKD) flags |= WINE_DECOMPOSE_COMPAT; if (form == NormalizationC || form == NormalizationKC) compose = 1; + if (compose || dst_len) flags |= WINE_DECOMPOSE_REORDER; if (!compose && dst_len) { diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 0fa6aeb7b4..851da7febf 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -5696,10 +5696,10 @@ static void test_NormalizeString(void) { part0_str2, { part0_nfc2, part0_str2, part0_nfc2, part0_str2 }, { 1, 0, 1, 0 } }, { part0_str3, { part0_nfc3, part0_str3, part0_nfc3, part0_str3 }, { 1, 0, 1, 0 } }, { part0_str4, { part0_nfc4, part0_str4, part0_nfc4, part0_str4 }, { 1, 0, 1, 0 } }, - { part0_str5, { part0_nfc5, part0_nfc5, part0_nfc5, part0_nfc5 }, { 1, 1, 1, 1 } }, - { part0_str6, { part0_nfc6, part0_nfc6, part0_nfc6, part0_nfc6 }, { 1, 1, 1, 1 } }, + { part0_str5, { part0_nfc5, part0_nfc5, part0_nfc5, part0_nfc5 }, { 1, 0, 1, 0 } }, + { part0_str6, { part0_nfc6, part0_nfc6, part0_nfc6, part0_nfc6 }, { 1, 0, 1, 0 } }, { part0_str8, { part0_str8, part0_nfd8, part0_str8, part0_nfd8 }, { 1, 0, 1, 0 } }, - { part0_str9, { part0_nfc9, part0_nfd9, part0_nfc9, part0_nfd9 }, { 1, 1, 1, 1 } }, + { part0_str9, { part0_nfc9, part0_nfd9, part0_nfc9, part0_nfd9 }, { 1, 0, 1, 0 } }, { part0_str10, { part0_str10, part0_nfd10, part0_str10, part0_nfd10 }, { 1, 0, 1, 0 } }, { part0_str11, { part0_str11, part0_nfd11, part0_str11, part0_nfd11 }, { 1, 0, 1, 0 } }, { part0_str12, { part0_nfc12, part0_nfd12, part0_nfc12, part0_nfd12 }, { 1, 0, 1, 0 } }, diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 1c753fd893..8d16741534 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -73,6 +73,7 @@ C_SRCS = \ c_936.c \ c_949.c \ c_950.c \ + combclass.c \ compose.c \ cpsymbol.c \ cptable.c \ diff --git a/libs/port/combclass.c b/libs/port/combclass.c new file mode 100644 index 0000000000..1567812c33 --- /dev/null +++ b/libs/port/combclass.c @@ -0,0 +1,288 @@ +/* Unicode Combining Classes */ +/* generated from http://www.unicode.org/Public/11.0.0/ucd/UnicodeData.txt */ +/* DO NOT EDIT!! */ + +#include "wine/unicode.h" + +const unsigned short DECLSPEC_HIDDEN combining_class_table[2208] = +{ + /* level 1 offsets */ + 0x0100, 0x0100, 0x0100, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, + 0x0160, 0x0170, 0x0180, 0x0190, 0x01a0, 0x01b0, 0x01c0, 0x01d0, + 0x01e0, 0x0100, 0x0100, 0x01f0, 0x0100, 0x0100, 0x0100, 0x0200, + 0x0210, 0x0220, 0x0230, 0x0240, 0x0250, 0x0260, 0x0100, 0x0100, + 0x0270, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0280, 0x0290, 0x0100, 0x0100, + 0x02a0, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x02b0, 0x0100, + 0x02c0, 0x02d0, 0x02e0, 0x02f0, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0300, 0x0100, 0x0100, 0x0310, 0x0100, + /* level 2 offsets */ + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0330, 0x0340, 0x0350, 0x0360, 0x0370, 0x0380, 0x0390, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + 0x03a0, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x03b0, 0x03c0, 0x03d0, 0x03e0, 0x0320, 0x0320, 0x0320, + 0x0320, 0x03f0, 0x0320, 0x0320, 0x0400, 0x0410, 0x0320, 0x0420, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0430, 0x0440, 0x0320, + 0x0320, 0x0450, 0x0320, 0x0460, 0x0470, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0480, 0x0490, + 0x0320, 0x04a0, 0x04b0, 0x0320, 0x0320, 0x04c0, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x04d0, 0x04e0, 0x04f0, + 0x0320, 0x0320, 0x0320, 0x0500, 0x0510, 0x0520, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0500, 0x0510, 0x0320, 0x0320, 0x0530, + 0x0320, 0x0320, 0x0320, 0x0500, 0x0510, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0500, 0x0510, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0500, 0x0510, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0510, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0510, 0x0540, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0500, 0x0510, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0550, 0x0510, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0560, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0570, 0x0580, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0590, 0x05a0, 0x0320, 0x0320, 0x0320, + 0x0320, 0x05b0, 0x0320, 0x05c0, 0x0320, 0x0320, 0x0320, 0x05d0, + 0x05e0, 0x0320, 0x0320, 0x0320, 0x05f0, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0600, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0610, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0620, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0630, 0x0320, 0x0630, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0640, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0650, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0660, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0670, 0x0320, 0x0320, 0x0320, 0x0320, 0x0680, 0x0690, + 0x0320, 0x0320, 0x0320, 0x06a0, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x06b0, 0x0630, 0x0320, 0x06c0, 0x06d0, + 0x0320, 0x0320, 0x06e0, 0x0320, 0x0320, 0x0320, 0x06f0, 0x0700, + 0x0320, 0x0320, 0x0320, 0x0710, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0720, 0x0730, 0x0740, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0750, 0x0760, 0x0330, 0x0770, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0780, 0x0790, 0x07a0, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x07b0, 0x07c0, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x07d0, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0330, 0x0330, + 0x0320, 0x0320, 0x07e0, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x07f0, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x07b0, 0x0800, + 0x0320, 0x0810, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x07c0, + 0x0820, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0630, 0x0320, 0x0330, 0x07c0, + 0x0320, 0x0320, 0x0830, 0x0320, 0x0320, 0x0840, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0850, 0x0680, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0860, 0x0870, 0x0320, 0x0320, 0x0820, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0510, 0x0320, + 0x0320, 0x0880, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0890, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, 0x0320, + /* values */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, + 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, + 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e8, 0x00dc, 0x00dc, + 0x00dc, 0x00dc, 0x00e8, 0x00d8, 0x00dc, 0x00dc, 0x00dc, 0x00dc, + 0x00dc, 0x00ca, 0x00ca, 0x00dc, 0x00dc, 0x00dc, 0x00dc, 0x00ca, + 0x00ca, 0x00dc, 0x00dc, 0x00dc, 0x00dc, 0x00dc, 0x00dc, 0x00dc, + 0x00dc, 0x00dc, 0x00dc, 0x00dc, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x00dc, 0x00dc, 0x00dc, 0x00dc, 0x00e6, 0x00e6, 0x00e6, + 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00f0, 0x00e6, 0x00dc, + 0x00dc, 0x00dc, 0x00e6, 0x00e6, 0x00e6, 0x00dc, 0x00dc, 0x0000, + 0x00e6, 0x00e6, 0x00e6, 0x00dc, 0x00dc, 0x00dc, 0x00dc, 0x00e6, + 0x00e8, 0x00dc, 0x00dc, 0x00e6, 0x00e9, 0x00ea, 0x00ea, 0x00e9, + 0x00ea, 0x00ea, 0x00e9, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, + 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, + 0x0000, 0x0000, 0x0000, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x00dc, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00dc, 0x00e6, + 0x00e6, 0x00e6, 0x00de, 0x00dc, 0x00e6, 0x00e6, 0x00e6, 0x00e6, + 0x00e6, 0x00e6, 0x00dc, 0x00dc, 0x00dc, 0x00dc, 0x00dc, 0x00dc, + 0x00e6, 0x00e6, 0x00dc, 0x00e6, 0x00e6, 0x00de, 0x00e4, 0x00e6, + 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 0x0010, 0x0011, + 0x0012, 0x0013, 0x0013, 0x0014, 0x0015, 0x0016, 0x0000, 0x0017, + 0x0000, 0x0018, 0x0019, 0x0000, 0x00e6, 0x00dc, 0x0000, 0x0012, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, + 0x001e, 0x001f, 0x0020, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f, + 0x0020, 0x0021, 0x0022, 0x00e6, 0x00e6, 0x00dc, 0x00dc, 0x00e6, + 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00dc, 0x00e6, 0x00e6, 0x00dc, + 0x0023, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00e6, 0x00e6, + 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x0000, 0x0000, 0x00e6, + 0x00e6, 0x00e6, 0x00e6, 0x00dc, 0x00e6, 0x0000, 0x0000, 0x00e6, + 0x00e6, 0x0000, 0x00dc, 0x00e6, 0x00e6, 0x00dc, 0x0000, 0x0000, + 0x0000, 0x0024, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x00e6, 0x00dc, 0x00e6, 0x00e6, 0x00dc, 0x00e6, 0x00e6, 0x00dc, + 0x00dc, 0x00dc, 0x00e6, 0x00dc, 0x00dc, 0x00e6, 0x00dc, 0x00e6, + 0x00e6, 0x00e6, 0x00dc, 0x00e6, 0x00dc, 0x00e6, 0x00dc, 0x00e6, + 0x00dc, 0x00e6, 0x00e6, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, + 0x00e6, 0x00e6, 0x00dc, 0x00e6, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00dc, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00e6, 0x00e6, + 0x00e6, 0x00e6, 0x0000, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, + 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x0000, 0x00e6, 0x00e6, 0x00e6, + 0x0000, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x00dc, 0x00dc, 0x00dc, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x00dc, 0x00e6, 0x00e6, 0x00e6, 0x00e6, + 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, + 0x00e6, 0x00e6, 0x0000, 0x00dc, 0x00e6, 0x00e6, 0x00dc, 0x00e6, + 0x00e6, 0x00dc, 0x00e6, 0x00e6, 0x00e6, 0x00dc, 0x00dc, 0x00dc, + 0x001b, 0x001c, 0x001d, 0x00e6, 0x00e6, 0x00e6, 0x00dc, 0x00e6, + 0x00e6, 0x00dc, 0x00dc, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0007, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0009, 0x0000, 0x0000, + 0x0000, 0x00e6, 0x00dc, 0x00e6, 0x00e6, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00e6, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0054, 0x005b, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0009, 0x0009, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0009, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0067, 0x0067, 0x0009, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x006b, 0x006b, 0x006b, 0x006b, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0076, 0x0076, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x007a, 0x007a, 0x007a, 0x007a, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x00dc, 0x00dc, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00dc, 0x0000, 0x00dc, + 0x0000, 0x00d8, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0081, 0x0082, 0x0000, 0x0084, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0082, 0x0082, 0x0082, 0x0082, 0x0000, 0x0000, + 0x0082, 0x0000, 0x00e6, 0x00e6, 0x0009, 0x0000, 0x00e6, 0x00e6, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00dc, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0007, + 0x0000, 0x0009, 0x0009, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00dc, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00e6, 0x00e6, 0x00e6, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0009, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0009, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00e6, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x00e4, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x00de, 0x00e6, 0x00dc, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00e6, + 0x00dc, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0009, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00e6, 0x00e6, 0x00e6, + 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x0000, 0x0000, 0x00dc, + 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00dc, 0x00dc, 0x00dc, + 0x00dc, 0x00dc, 0x00dc, 0x00e6, 0x00e6, 0x00dc, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0007, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x00e6, 0x00dc, 0x00e6, 0x00e6, 0x00e6, + 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0009, 0x0009, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0007, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0009, 0x0009, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0007, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x00e6, 0x00e6, 0x00e6, 0x0000, 0x0001, 0x00dc, 0x00dc, 0x00dc, + 0x00dc, 0x00dc, 0x00e6, 0x00e6, 0x00dc, 0x00dc, 0x00dc, 0x00dc, + 0x00e6, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x00dc, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x00e6, 0x0000, 0x0000, 0x0000, + 0x00e6, 0x00e6, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x00e6, 0x00e6, 0x00dc, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, + 0x00e6, 0x00e6, 0x00dc, 0x00e6, 0x00e6, 0x00ea, 0x00d6, 0x00dc, + 0x00ca, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, + 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, + 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e8, 0x00e4, + 0x00e4, 0x00dc, 0x0000, 0x00e6, 0x00e9, 0x00dc, 0x00e6, 0x00dc, + 0x00e6, 0x00e6, 0x0001, 0x0001, 0x00e6, 0x00e6, 0x00e6, 0x00e6, + 0x0001, 0x0001, 0x0001, 0x00e6, 0x00e6, 0x0000, 0x0000, 0x0000, + 0x0000, 0x00e6, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x00e6, + 0x00dc, 0x00e6, 0x0001, 0x0001, 0x00dc, 0x00dc, 0x00dc, 0x00dc, + 0x00e6, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00e6, + 0x00e6, 0x00e6, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0009, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x00da, 0x00e4, 0x00e8, 0x00de, 0x00e0, 0x00e0, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0008, 0x0008, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x00e6, 0x00e6, 0x00e6, 0x00e6, + 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00e6, 0x00e6, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0009, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x00dc, 0x00dc, 0x00dc, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0009, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0007, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x00e6, 0x0000, 0x00e6, 0x00e6, 0x00dc, 0x0000, 0x0000, 0x00e6, + 0x00e6, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00e6, 0x00e6, + 0x0000, 0x00e6, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x001a, 0x0000, + 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00e6, 0x00dc, + 0x00dc, 0x00dc, 0x00dc, 0x00dc, 0x00dc, 0x00dc, 0x00e6, 0x00e6 +}; diff --git a/libs/port/normalize.c b/libs/port/normalize.c index ba6e39fe0e..8363eee98e 100644 --- a/libs/port/normalize.c +++ b/libs/port/normalize.c @@ -21,6 +21,72 @@ #include "wine/unicode.h" extern unsigned int wine_decompose( int flags, WCHAR ch, WCHAR *dst, unsigned int dstlen ) DECLSPEC_HIDDEN; +extern const unsigned short combining_class_table[] DECLSPEC_HIDDEN; + +static BYTE get_combining_class( WCHAR c ) +{ + return combining_class_table[combining_class_table[combining_class_table[c >> 8] + ((c >> 4) & 0xf)] + (c & 0xf)]; +} + +static BOOL is_starter( WCHAR c ) +{ + return !get_combining_class( c ); +} + +static BOOL reorderable_pair( WCHAR c1, WCHAR c2 ) +{ + BYTE ccc1, ccc2; + + /* reorderable if ccc1 > ccc2 > 0 */ + ccc1 = get_combining_class( c1 ); + if (ccc1 < 2) return FALSE; + ccc2 = get_combining_class( c2 ); + return ccc2 && (ccc1 > ccc2); +} + +static void canonical_order_substring( WCHAR *str, unsigned int len ) +{ + unsigned int i; + BOOL swapped; + + do + { + swapped = FALSE; + for (i = 0; i < len - 1; i++) + { + if (reorderable_pair( str[i], str[i + 1] )) + { + WCHAR tmp = str[i]; + str[i] = str[i + 1]; + str[i + 1] = tmp; + swapped = TRUE; + } + } + } while (swapped); +} + +/**************************************************************************** + * canonical_order_string + * + * Reorder the string into canonical order - D108/D109. + * + * Starters (chars with combining class == 0) don't move, so look for continuous + * substrings of non-starters and only reorder those. + */ +static void canonical_order_string( WCHAR *str, unsigned int len ) +{ + unsigned int i, next = 0; + + for (i = 1; i <= len; i++) + { + if (i == len || is_starter( str[i] )) + { + if (i > next + 1) /* at least two successive non-starters */ + canonical_order_substring( str + next, i - next ); + next = i + 1; + } + } +} unsigned int wine_decompose_string( int flags, const WCHAR *src, unsigned int src_len, WCHAR *dst, unsigned int dst_len ) @@ -34,5 +100,7 @@ unsigned int wine_decompose_string( int flags, const WCHAR *src, unsigned int sr if (decomp_len == 0) return 0; dst_pos += decomp_len; } + + if (flags & WINE_DECOMPOSE_REORDER) canonical_order_string( dst, dst_pos ); return dst_pos; } diff --git a/tools/make_unicode b/tools/make_unicode index 1533c46cea..f0056d09f3 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -360,6 +360,7 @@ my @joining_table = (); my @direction_table = (); my @decomp_table = (); my @compose_table = (); +my @combining_class_table = (); my $default_char; my $default_wchar; @@ -457,6 +458,10 @@ sub READ_DEFAULTS($) { $digitmap_table[$src] = ord $dig; } + if ($comb ne "") + { + $combining_class_table[$src] = $comb; + } # copy the category and direction for everything between First/Last pairs if ($name =~ /, First>/) { $start = $src; } @@ -2370,6 +2375,24 @@ EOF save_file($filename); } +################################################################ +# dump the combining class table +sub dump_combining_class($) +{ + my $filename = shift; + + open OUTPUT,">$filename.new" or die "Cannot create $filename"; + print "Building $filename\n"; + print OUTPUT "/* Unicode Combining Classes */\n"; + print OUTPUT "/* generated from $UNIDATA/UnicodeData.txt */\n"; + print OUTPUT "/* DO NOT EDIT!! */\n\n"; + print OUTPUT "#include \"wine/unicode.h\"\n\n"; + + dump_two_level_mapping( "combining_class_table", 0, @combining_class_table ); + close OUTPUT; + save_file($filename); +} + ################################################################ # output a codepage definition file from the global tables sub output_codepage_file($$$$) @@ -2604,6 +2627,7 @@ dump_compose_table( "libs/port/compose.c" ); dump_decompose_table( "libs/port/decompose.c" ); DUMP_CTYPE_TABLES( "libs/wine/wctype.c" ); dump_digit_folding( "libs/port/digitmap.c" ); +dump_combining_class( "libs/port/combclass.c" ); dump_mirroring( "dlls/usp10/mirror.c" ); dump_mirroring( "dlls/dwrite/mirror.c" ); dump_bracket( "dlls/usp10/bracket.c" ); -- 2.18.0

1 0

[PATCH 2/6] kernel32: Initial support for canonical decomposition in NormalizeString().
by Huw Davies 08 Feb '19

08 Feb '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/kernel32/locale.c | 56 ++++++++++++++++++++++++++++++++---- dlls/kernel32/tests/locale.c | 42 +++++++++++++-------------- include/wine/unicode.h | 4 +++ libs/port/Makefile.in | 1 + libs/port/decompose.c | 4 +-- libs/port/mbtowc.c | 10 +++---- libs/port/normalize.c | 38 ++++++++++++++++++++++++ libs/wine/sortkey.c | 2 +- tools/make_unicode | 4 +-- 9 files changed, 124 insertions(+), 37 deletions(-) create mode 100644 libs/port/normalize.c diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index e62b849d09..a4e5ef5a38 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -48,6 +48,7 @@ #include "winerror.h" #include "winver.h" #include "kernel_private.h" +#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(nls); @@ -5361,12 +5362,57 @@ INT WINAPI GetUserDefaultLocaleName(LPWSTR localename, int buffersize) /****************************************************************************** * NormalizeString (KERNEL32.@) */ -INT WINAPI NormalizeString(NORM_FORM NormForm, LPCWSTR lpSrcString, INT cwSrcLength, - LPWSTR lpDstString, INT cwDstLength) +INT WINAPI NormalizeString(NORM_FORM form, const WCHAR *src, INT src_len, WCHAR *dst, INT dst_len) { - FIXME("%x %p %d %p %d\n", NormForm, lpSrcString, cwSrcLength, lpDstString, cwDstLength); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + int flags = 0, compose = 0; + unsigned int res, buf_len; + WCHAR *buf = NULL; + + TRACE("%x %s %d %p %d\n", form, debugstr_wn(src, src_len), src_len, dst, dst_len); + + if (src_len == -1) src_len = strlenW(src) + 1; + + if (form == NormalizationKC || form == NormalizationKD) flags |= WINE_DECOMPOSE_COMPAT; + if (form == NormalizationC || form == NormalizationKC) compose = 1; + + if (!compose && dst_len) + { + res = wine_decompose_string( flags, src, src_len, dst, dst_len ); + if (!res) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + goto done; + } + buf = dst; + } + else + { + buf_len = src_len * 4; + do + { + WCHAR *old_buf = buf; + + buf = heap_realloc( buf, buf_len ); + if (!buf) + { + heap_free( old_buf ); + SetLastError( ERROR_OUTOFMEMORY ); + return 0; + } + res = wine_decompose_string( flags, src, src_len, buf, buf_len ); + buf_len *= 2; + } while (!res); + } + + if (compose) + { + FIXME("Composing not yet implemented\n"); + res = 0; + } + +done: + if (buf != dst) heap_free( buf ); + return res; } /****************************************************************************** diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index d93fdb224e..0fa6aeb7b4 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -5692,27 +5692,27 @@ static void test_NormalizeString(void) }; static const struct test_data_normal test_arr[] = { - { part0_str1, { part0_str1, part0_nfd1, part0_str1, part0_nfd1 }, { 1, 1, 1, 1 } }, - { part0_str2, { part0_nfc2, part0_str2, part0_nfc2, part0_str2 }, { 1, 1, 1, 1 } }, - { part0_str3, { part0_nfc3, part0_str3, part0_nfc3, part0_str3 }, { 1, 1, 1, 1 } }, - { part0_str4, { part0_nfc4, part0_str4, part0_nfc4, part0_str4 }, { 1, 1, 1, 1 } }, + { part0_str1, { part0_str1, part0_nfd1, part0_str1, part0_nfd1 }, { 1, 0, 1, 0 } }, + { part0_str2, { part0_nfc2, part0_str2, part0_nfc2, part0_str2 }, { 1, 0, 1, 0 } }, + { part0_str3, { part0_nfc3, part0_str3, part0_nfc3, part0_str3 }, { 1, 0, 1, 0 } }, + { part0_str4, { part0_nfc4, part0_str4, part0_nfc4, part0_str4 }, { 1, 0, 1, 0 } }, { part0_str5, { part0_nfc5, part0_nfc5, part0_nfc5, part0_nfc5 }, { 1, 1, 1, 1 } }, { part0_str6, { part0_nfc6, part0_nfc6, part0_nfc6, part0_nfc6 }, { 1, 1, 1, 1 } }, - { part0_str8, { part0_str8, part0_nfd8, part0_str8, part0_nfd8 }, { 1, 1, 1, 1 } }, + { part0_str8, { part0_str8, part0_nfd8, part0_str8, part0_nfd8 }, { 1, 0, 1, 0 } }, { part0_str9, { part0_nfc9, part0_nfd9, part0_nfc9, part0_nfd9 }, { 1, 1, 1, 1 } }, - { part0_str10, { part0_str10, part0_nfd10, part0_str10, part0_nfd10 }, { 1, 1, 1, 1 } }, - { part0_str11, { part0_str11, part0_nfd11, part0_str11, part0_nfd11 }, { 1, 1, 1, 1 } }, - { part0_str12, { part0_nfc12, part0_nfd12, part0_nfc12, part0_nfd12 }, { 1, 1, 1, 1 } }, - { part1_str1, { part1_str1, part1_str1, part1_nfkc1, part1_nfkc1 }, { 1, 1, 1, 1 } }, - { part1_str2, { part1_str2, part1_str2, part1_nfkc2, part1_nfkc2 }, { 1, 1, 1, 1 } }, - { part1_str3, { part1_str3, part1_nfd3, part1_str3, part1_nfd3 }, { 1, 1, 1, 1 } }, - { part1_str4, { part1_str4, part1_str4, part1_nfkc4, part1_nfkc4 }, { 1, 1, 1, 1 } }, - { part1_str5, { part1_str5, part1_nfd5, part1_str5, part1_nfd5 }, { 1, 1, 1, 1 } }, - { part1_str6, { part1_str6, part1_nfd6, part1_str6, part1_nfd6 }, { 1, 1, 1, 1 } }, - { part1_str7, { part1_str7, part1_str7, part1_nfkc7, part1_nfkc7 }, { 1, 1, 1, 1 } }, - { part1_str8, { part1_str8, part1_nfd8, part1_str8, part1_nfd8 }, { 1, 1, 1, 1 } }, - { part1_str9, { part1_str9, part1_str9, part1_nfkc9, part1_nfkc9 }, { 1, 1, 1, 1 } }, - { part1_str10, { part1_str10, part1_str10, part1_nfkc10, part1_nfkc10 }, { 1, 1, 1, 1 } }, + { part0_str10, { part0_str10, part0_nfd10, part0_str10, part0_nfd10 }, { 1, 0, 1, 0 } }, + { part0_str11, { part0_str11, part0_nfd11, part0_str11, part0_nfd11 }, { 1, 0, 1, 0 } }, + { part0_str12, { part0_nfc12, part0_nfd12, part0_nfc12, part0_nfd12 }, { 1, 0, 1, 0 } }, + { part1_str1, { part1_str1, part1_str1, part1_nfkc1, part1_nfkc1 }, { 1, 0, 1, 1 } }, + { part1_str2, { part1_str2, part1_str2, part1_nfkc2, part1_nfkc2 }, { 1, 0, 1, 1 } }, + { part1_str3, { part1_str3, part1_nfd3, part1_str3, part1_nfd3 }, { 1, 0, 1, 0 } }, + { part1_str4, { part1_str4, part1_str4, part1_nfkc4, part1_nfkc4 }, { 1, 0, 1, 1 } }, + { part1_str5, { part1_str5, part1_nfd5, part1_str5, part1_nfd5 }, { 1, 0, 1, 0 } }, + { part1_str6, { part1_str6, part1_nfd6, part1_str6, part1_nfd6 }, { 1, 0, 1, 0 } }, + { part1_str7, { part1_str7, part1_str7, part1_nfkc7, part1_nfkc7 }, { 1, 0, 1, 1 } }, + { part1_str8, { part1_str8, part1_nfd8, part1_str8, part1_nfd8 }, { 1, 0, 1, 0 } }, + { part1_str9, { part1_str9, part1_str9, part1_nfkc9, part1_nfkc9 }, { 1, 0, 1, 1 } }, + { part1_str10, { part1_str10, part1_str10, part1_nfkc10, part1_nfkc10 }, { 1, 0, 1, 1 } }, { 0 } }; const struct test_data_normal *ptest = test_arr; @@ -5726,10 +5726,8 @@ static void test_NormalizeString(void) return; } - todo_wine { - dstlen = pNormalizeString( NormalizationD, ptest->str, -1, dst, 1 ); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Should have failed with ERROR_INSUFFICIENT_BUFFER\n"); - } + dstlen = pNormalizeString( NormalizationD, ptest->str, -1, dst, 1 ); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Should have failed with ERROR_INSUFFICIENT_BUFFER\n"); /* * For each string, first test passing -1 as srclen to NormalizeString, diff --git a/include/wine/unicode.h b/include/wine/unicode.h index 35c61666d2..2c21cdfe48 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -101,6 +101,10 @@ extern int wine_compare_string( int flags, const WCHAR *str1, int len1, const WC extern int wine_get_sortkey( int flags, const WCHAR *src, int srclen, char *dst, int dstlen ); extern int wine_fold_string( int flags, const WCHAR *src, int srclen , WCHAR *dst, int dstlen ); +extern unsigned int wine_decompose_string( int flags, const WCHAR *src, unsigned int srclen, WCHAR *dst, unsigned int dstlen ); +#define WINE_DECOMPOSE_COMPAT 1 +#define WINE_DECOMPOSE_REORDER 2 + extern int strcmpiW( const WCHAR *str1, const WCHAR *str2 ); extern int strncmpiW( const WCHAR *str1, const WCHAR *str2, int n ); extern int memicmpW( const WCHAR *str1, const WCHAR *str2, int n ); diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index c87b99de6d..1c753fd893 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -92,6 +92,7 @@ C_SRCS = \ memcpy_unaligned.c \ memmove.c \ mkstemps.c \ + normalize.c \ poll.c \ pread.c \ pwrite.c \ diff --git a/libs/port/decompose.c b/libs/port/decompose.c index 5e6b2214ec..c7568a01ea 100644 --- a/libs/port/decompose.c +++ b/libs/port/decompose.c @@ -747,7 +747,7 @@ static const WCHAR table[4704] = 0x05d1, 0x05bf, 0x05db, 0x05bf, 0x05e4, 0x05bf, 0x0000, 0x0000 }; -unsigned int DECLSPEC_HIDDEN wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ) +unsigned int DECLSPEC_HIDDEN wine_decompose( int flags, WCHAR ch, WCHAR *dst, unsigned int dstlen ) { const WCHAR *ptr = table + table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + 2 * (ch & 0xf); unsigned int res; @@ -756,6 +756,6 @@ unsigned int DECLSPEC_HIDDEN wine_decompose( WCHAR ch, WCHAR *dst, unsigned int if (!*ptr) return 1; if (dstlen <= 1) return 0; /* apply the decomposition recursively to the first char */ - if ((res = wine_decompose( *ptr, dst, dstlen-1 ))) dst[res++] = ptr[1]; + if ((res = wine_decompose( flags, *ptr, dst, dstlen-1 ))) dst[res++] = ptr[1]; return res; } diff --git a/libs/port/mbtowc.c b/libs/port/mbtowc.c index f5d0059e15..471b87be6c 100644 --- a/libs/port/mbtowc.c +++ b/libs/port/mbtowc.c @@ -22,7 +22,7 @@ #include "wine/unicode.h" -extern unsigned int wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ) DECLSPEC_HIDDEN; +extern unsigned int wine_decompose( int flags, WCHAR ch, WCHAR *dst, unsigned int dstlen ) DECLSPEC_HIDDEN; /* check the code whether it is in Unicode Private Use Area (PUA). */ /* MB_ERR_INVALID_CHARS raises an error converting from 1-byte character to PUA. */ @@ -125,13 +125,13 @@ static int mbstowcs_sbcs_decompose( const struct sbcs_table *table, int flags, { WCHAR dummy[4]; /* no decomposition is larger than 4 chars */ for (len = 0; srclen; srclen--, src++) - len += wine_decompose( cp2uni[*src], dummy, 4 ); + len += wine_decompose( 0, cp2uni[*src], dummy, 4 ); return len; } for (len = dstlen; srclen && len; srclen--, src++) { - unsigned int res = wine_decompose( cp2uni[*src], dst, len ); + unsigned int res = wine_decompose( 0, cp2uni[*src], dst, len ); if (!res) break; len -= res; dst += res; @@ -237,7 +237,7 @@ static int mbstowcs_dbcs_decompose( const struct dbcs_table *table, ch = cp2uni[(off << 8) + *src]; } else ch = cp2uni[*src]; - len += wine_decompose( ch, dummy, 4 ); + len += wine_decompose( 0, ch, dummy, 4 ); } return len; } @@ -252,7 +252,7 @@ static int mbstowcs_dbcs_decompose( const struct dbcs_table *table, ch = cp2uni[(off << 8) + *src]; } else ch = cp2uni[*src]; - if (!(res = wine_decompose( ch, dst, len ))) break; + if (!(res = wine_decompose( 0, ch, dst, len ))) break; dst += res; len -= res; } diff --git a/libs/port/normalize.c b/libs/port/normalize.c new file mode 100644 index 0000000000..ba6e39fe0e --- /dev/null +++ b/libs/port/normalize.c @@ -0,0 +1,38 @@ +/* + * Unicode normalization functions + * + * Copyright 2019 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/unicode.h" + +extern unsigned int wine_decompose( int flags, WCHAR ch, WCHAR *dst, unsigned int dstlen ) DECLSPEC_HIDDEN; + +unsigned int wine_decompose_string( int flags, const WCHAR *src, unsigned int src_len, + WCHAR *dst, unsigned int dst_len ) +{ + unsigned int src_pos, dst_pos = 0, decomp_len; + + for (src_pos = 0; src_pos < src_len; src_pos++) + { + if (dst_pos == dst_len) return 0; + decomp_len = wine_decompose( flags, src[src_pos], dst + dst_pos, dst_len - dst_pos ); + if (decomp_len == 0) return 0; + dst_pos += decomp_len; + } + return dst_pos; +} diff --git a/libs/wine/sortkey.c b/libs/wine/sortkey.c index 634e910d4c..ef4488908b 100644 --- a/libs/wine/sortkey.c +++ b/libs/wine/sortkey.c @@ -19,7 +19,7 @@ */ #include "wine/unicode.h" -extern unsigned int wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ); +extern unsigned int wine_decompose( int flags, WCHAR ch, WCHAR *dst, unsigned int dstlen ); extern const unsigned int collation_table[]; /* diff --git a/tools/make_unicode b/tools/make_unicode index 56d1905656..1533c46cea 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -2353,7 +2353,7 @@ sub dump_decompose_table($) printf OUTPUT "\n};\n\n"; print OUTPUT <<"EOF"; -unsigned int DECLSPEC_HIDDEN wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ) +unsigned int DECLSPEC_HIDDEN wine_decompose( int flags, WCHAR ch, WCHAR *dst, unsigned int dstlen ) { const WCHAR *ptr = table + table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + 2 * (ch & 0xf); unsigned int res; @@ -2362,7 +2362,7 @@ unsigned int DECLSPEC_HIDDEN wine_decompose( WCHAR ch, WCHAR *dst, unsigned int if (!*ptr) return 1; if (dstlen <= 1) return 0; /* apply the decomposition recursively to the first char */ - if ((res = wine_decompose( *ptr, dst, dstlen-1 ))) dst[res++] = ptr[1]; + if ((res = wine_decompose( flags, *ptr, dst, dstlen-1 ))) dst[res++] = ptr[1]; return res; } EOF -- 2.18.0

1 0

[PATCH 1/6] kernel32/tests: Move the tests to a per-test todo.
by Huw Davies 08 Feb '19

08 Feb '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/kernel32/tests/locale.c | 86 +++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 41 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 3357d0db9e..d93fdb224e 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -5688,30 +5688,31 @@ static void test_NormalizeString(void) struct test_data_normal { const WCHAR *str; const WCHAR *expected[4]; + BOOL todo[4]; }; static const struct test_data_normal test_arr[] = { - { part0_str1, { part0_str1, part0_nfd1, part0_str1, part0_nfd1 } }, - { part0_str2, { part0_nfc2, part0_str2, part0_nfc2, part0_str2 } }, - { part0_str3, { part0_nfc3, part0_str3, part0_nfc3, part0_str3 } }, - { part0_str4, { part0_nfc4, part0_str4, part0_nfc4, part0_str4 } }, - { part0_str5, { part0_nfc5, part0_nfc5, part0_nfc5, part0_nfc5 } }, - { part0_str6, { part0_nfc6, part0_nfc6, part0_nfc6, part0_nfc6 } }, - { part0_str8, { part0_str8, part0_nfd8, part0_str8, part0_nfd8 } }, - { part0_str9, { part0_nfc9, part0_nfd9, part0_nfc9, part0_nfd9 } }, - { part0_str10, { part0_str10, part0_nfd10, part0_str10, part0_nfd10 } }, - { part0_str11, { part0_str11, part0_nfd11, part0_str11, part0_nfd11 } }, - { part0_str12, { part0_nfc12, part0_nfd12, part0_nfc12, part0_nfd12 } }, - { part1_str1, { part1_str1, part1_str1, part1_nfkc1, part1_nfkc1 } }, - { part1_str2, { part1_str2, part1_str2, part1_nfkc2, part1_nfkc2 } }, - { part1_str3, { part1_str3, part1_nfd3, part1_str3, part1_nfd3 } }, - { part1_str4, { part1_str4, part1_str4, part1_nfkc4, part1_nfkc4 } }, - { part1_str5, { part1_str5, part1_nfd5, part1_str5, part1_nfd5 } }, - { part1_str6, { part1_str6, part1_nfd6, part1_str6, part1_nfd6 } }, - { part1_str7, { part1_str7, part1_str7, part1_nfkc7, part1_nfkc7 } }, - { part1_str8, { part1_str8, part1_nfd8, part1_str8, part1_nfd8 } }, - { part1_str9, { part1_str9, part1_str9, part1_nfkc9, part1_nfkc9 } }, - { part1_str10, { part1_str10, part1_str10, part1_nfkc10, part1_nfkc10 } }, + { part0_str1, { part0_str1, part0_nfd1, part0_str1, part0_nfd1 }, { 1, 1, 1, 1 } }, + { part0_str2, { part0_nfc2, part0_str2, part0_nfc2, part0_str2 }, { 1, 1, 1, 1 } }, + { part0_str3, { part0_nfc3, part0_str3, part0_nfc3, part0_str3 }, { 1, 1, 1, 1 } }, + { part0_str4, { part0_nfc4, part0_str4, part0_nfc4, part0_str4 }, { 1, 1, 1, 1 } }, + { part0_str5, { part0_nfc5, part0_nfc5, part0_nfc5, part0_nfc5 }, { 1, 1, 1, 1 } }, + { part0_str6, { part0_nfc6, part0_nfc6, part0_nfc6, part0_nfc6 }, { 1, 1, 1, 1 } }, + { part0_str8, { part0_str8, part0_nfd8, part0_str8, part0_nfd8 }, { 1, 1, 1, 1 } }, + { part0_str9, { part0_nfc9, part0_nfd9, part0_nfc9, part0_nfd9 }, { 1, 1, 1, 1 } }, + { part0_str10, { part0_str10, part0_nfd10, part0_str10, part0_nfd10 }, { 1, 1, 1, 1 } }, + { part0_str11, { part0_str11, part0_nfd11, part0_str11, part0_nfd11 }, { 1, 1, 1, 1 } }, + { part0_str12, { part0_nfc12, part0_nfd12, part0_nfc12, part0_nfd12 }, { 1, 1, 1, 1 } }, + { part1_str1, { part1_str1, part1_str1, part1_nfkc1, part1_nfkc1 }, { 1, 1, 1, 1 } }, + { part1_str2, { part1_str2, part1_str2, part1_nfkc2, part1_nfkc2 }, { 1, 1, 1, 1 } }, + { part1_str3, { part1_str3, part1_nfd3, part1_str3, part1_nfd3 }, { 1, 1, 1, 1 } }, + { part1_str4, { part1_str4, part1_str4, part1_nfkc4, part1_nfkc4 }, { 1, 1, 1, 1 } }, + { part1_str5, { part1_str5, part1_nfd5, part1_str5, part1_nfd5 }, { 1, 1, 1, 1 } }, + { part1_str6, { part1_str6, part1_nfd6, part1_str6, part1_nfd6 }, { 1, 1, 1, 1 } }, + { part1_str7, { part1_str7, part1_str7, part1_nfkc7, part1_nfkc7 }, { 1, 1, 1, 1 } }, + { part1_str8, { part1_str8, part1_nfd8, part1_str8, part1_nfd8 }, { 1, 1, 1, 1 } }, + { part1_str9, { part1_str9, part1_str9, part1_nfkc9, part1_nfkc9 }, { 1, 1, 1, 1 } }, + { part1_str10, { part1_str10, part1_str10, part1_nfkc10, part1_nfkc10 }, { 1, 1, 1, 1 } }, { 0 } }; const struct test_data_normal *ptest = test_arr; @@ -5742,26 +5743,29 @@ static void test_NormalizeString(void) for (i = 0; i < 4; i++) { - todo_wine { - dstlen = pNormalizeString( norm_forms[i], ptest->str, -1, NULL, 0 ); - if (dstlen) - { - dstlen = pNormalizeString( norm_forms[i], ptest->str, -1, dst, dstlen ); - ok(dstlen == strlenW( ptest->expected[i] )+1, "Copied length differed: was %d, should be %d\n", - dstlen, strlenW( ptest->expected[i] )+1); - str_cmp = strncmpW( ptest->expected[i], dst, dstlen+1 ); - ok( str_cmp == 0, "test failed: returned value was %d\n", str_cmp ); - } - - dstlen = pNormalizeString( norm_forms[i], ptest->str, strlenW(ptest->str), NULL, 0 ); - if (dstlen) - { - dstlen = pNormalizeString( norm_forms[i], ptest->str, strlenW(ptest->str), dst, dstlen ); - ok(dstlen == strlenW( ptest->expected[i] ), "Copied length differed: was %d, should be %d\n", - dstlen, strlenW( ptest->expected[i] )); - str_cmp = strncmpW( ptest->expected[i], dst, dstlen ); - ok( str_cmp == 0, "test failed: returned value was %d\n", str_cmp ); - } + dstlen = pNormalizeString( norm_forms[i], ptest->str, -1, NULL, 0 ); + if (dstlen) + { + dstlen = pNormalizeString( norm_forms[i], ptest->str, -1, dst, dstlen ); + ok(dstlen == strlenW( dst )+1, "%s:%d: Copied length differed: was %d, should be %d\n", + wine_dbgstr_w(ptest->str), i, dstlen, strlenW( dst )+1); + str_cmp = strncmpW( ptest->expected[i], dst, dstlen+1 ); +todo_wine_if(ptest->todo[i]) + ok( str_cmp == 0, "%s:%d: string incorrect got %s expect %s\n", wine_dbgstr_w(ptest->str), i, + wine_dbgstr_w(dst), wine_dbgstr_w(ptest->expected[i]) ); + } + + dstlen = pNormalizeString( norm_forms[i], ptest->str, strlenW(ptest->str), NULL, 0 ); + if (dstlen) + { + memset(dst, 0, sizeof(dst)); + dstlen = pNormalizeString( norm_forms[i], ptest->str, strlenW(ptest->str), dst, dstlen ); + ok(dstlen == strlenW( dst ), "%s:%d: Copied length differed: was %d, should be %d\n", + wine_dbgstr_w(ptest->str), i, dstlen, strlenW( dst )); + str_cmp = strncmpW( ptest->expected[i], dst, dstlen ); +todo_wine_if(ptest->todo[i]) + ok( str_cmp == 0, "%s:%d: string incorrect got %s expect %s\n", wine_dbgstr_w(ptest->str), i, + wine_dbgstr_w(dst), wine_dbgstr_w(ptest->expected[i]) ); } } ptest++; -- 2.18.0

1 0

[PATCH v2] secur32: Fix compile error on older gnutls.
by Alistair Leslie-Hughes 08 Feb '19

08 Feb '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/secur32/schannel_gnutls.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index ddb10ac..d14e6f3 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -54,6 +54,12 @@ static int (*pgnutls_cipher_get_block_size)(gnutls_cipher_algorithm_t); /* Not present in gnutls version < 3.4.0. */ static int (*pgnutls_privkey_export_x509)(gnutls_privkey_t, gnutls_x509_privkey_t *); +static int (*pgnutls_privkey_import_rsa_raw)(gnutls_privkey_t, const gnutls_datum_t *, + const gnutls_datum_t *, const gnutls_datum_t *, + const gnutls_datum_t *, const gnutls_datum_t *, + const gnutls_datum_t *, const gnutls_datum_t *, + const gnutls_datum_t *); + static void *libgnutls_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(gnutls_alert_get); @@ -79,7 +85,6 @@ MAKE_FUNCPTR(gnutls_perror); MAKE_FUNCPTR(gnutls_protocol_get_version); MAKE_FUNCPTR(gnutls_priority_set_direct); MAKE_FUNCPTR(gnutls_privkey_deinit); -MAKE_FUNCPTR(gnutls_privkey_import_rsa_raw); MAKE_FUNCPTR(gnutls_privkey_init); MAKE_FUNCPTR(gnutls_record_get_max_size); MAKE_FUNCPTR(gnutls_record_recv); @@ -138,6 +143,16 @@ static int compat_gnutls_privkey_export_x509(gnutls_privkey_t privkey, gnutls_x5 return GNUTLS_E_UNKNOWN_PK_ALGORITHM; } +static int compat_gnutls_privkey_import_rsa_raw(gnutls_privkey_t key, const gnutls_datum_t *p1, + const gnutls_datum_t *p2, const gnutls_datum_t *p3, + const gnutls_datum_t *p4, const gnutls_datum_t *p5, + const gnutls_datum_t *p6, const gnutls_datum_t *p7, + const gnutls_datum_t *p8) +{ + FIXME("\n"); + return GNUTLS_E_UNKNOWN_PK_ALGORITHM; +} + static ssize_t schan_pull_adapter(gnutls_transport_ptr_t transport, void *buff, size_t buff_len) { @@ -897,7 +912,6 @@ BOOL schan_imp_init(void) LOAD_FUNCPTR(gnutls_protocol_get_version) LOAD_FUNCPTR(gnutls_priority_set_direct) LOAD_FUNCPTR(gnutls_privkey_deinit) - LOAD_FUNCPTR(gnutls_privkey_import_rsa_raw) LOAD_FUNCPTR(gnutls_privkey_init) LOAD_FUNCPTR(gnutls_record_get_max_size); LOAD_FUNCPTR(gnutls_record_recv); @@ -924,6 +938,11 @@ BOOL schan_imp_init(void) WARN("gnutls_privkey_export_x509 not found\n"); pgnutls_privkey_export_x509 = compat_gnutls_privkey_export_x509; } + if (!(pgnutls_privkey_import_rsa_raw = wine_dlsym(libgnutls_handle, "gnutls_privkey_import_rsa_raw", NULL, 0))) + { + WARN("gnutls_privkey_import_rsa_raw not found\n"); + pgnutls_privkey_import_rsa_raw = compat_gnutls_privkey_import_rsa_raw; + } ret = pgnutls_global_init(); if (ret != GNUTLS_E_SUCCESS) -- 1.9.1

2 3

[PATCH] wininet: Trace modifiers in hexadecimal in HttpAddRequestHeaders.
by Hans Leidekker 08 Feb '19

08 Feb '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wininet/http.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 4122067e41..54bb569eb9 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1335,7 +1335,7 @@ BOOL WINAPI HttpAddRequestHeadersW(HINTERNET hHttpRequest, http_request_t *request; DWORD res = ERROR_INTERNET_INCORRECT_HANDLE_TYPE; - TRACE("%p, %s, %i, %i\n", hHttpRequest, debugstr_wn(lpszHeader, dwHeaderLength), dwHeaderLength, dwModifier); + TRACE("%p, %s, %u, %08x\n", hHttpRequest, debugstr_wn(lpszHeader, dwHeaderLength), dwHeaderLength, dwModifier); if (!lpszHeader) return TRUE; @@ -1367,7 +1367,7 @@ BOOL WINAPI HttpAddRequestHeadersA(HINTERNET hHttpRequest, WCHAR *headers = NULL; BOOL r; - TRACE("%p, %s, %i, %i\n", hHttpRequest, debugstr_an(lpszHeader, dwHeaderLength), dwHeaderLength, dwModifier); + TRACE("%p, %s, %u, %08x\n", hHttpRequest, debugstr_an(lpszHeader, dwHeaderLength), dwHeaderLength, dwModifier); if(lpszHeader) headers = heap_strndupAtoW(lpszHeader, dwHeaderLength, &dwHeaderLength); -- 2.20.1

1 0

[PATCH v4 1/4] gdi32: Add helper functions to cache the glyph metrics.
by Byeongsik Jeon 08 Feb '19

08 Feb '19

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- dlls/gdi32/freetype.c | 77 ++++++++++++++++++++++++++++--------------- 1 file changed, 50 insertions(+), 27 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b21365d61e..f4cb5d5c27 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4697,6 +4697,52 @@ static void free_font(GdiFont *font) HeapFree(GetProcessHeap(), 0, font); } +/* TODO: GGO format support */ +static BOOL get_cached_metrics( GdiFont *font, UINT index, GLYPHMETRICS *gm, ABC *abc ) +{ + UINT block = index / GM_BLOCK_SIZE; + UINT entry = index % GM_BLOCK_SIZE; + + if (block < font->gmsize && font->gm[block] && font->gm[block][entry].init) + { + *gm = font->gm[block][entry].gm; + *abc = font->gm[block][entry].abc; + + TRACE( "cached gm: %u, %u, %s, %d, %d abc: %d, %u, %d\n", + gm->gmBlackBoxX, gm->gmBlackBoxY, wine_dbgstr_point( &gm->gmptGlyphOrigin ), + gm->gmCellIncX, gm->gmCellIncY, abc->abcA, abc->abcB, abc->abcC ); + return TRUE; + } + + return FALSE; +} + +static void set_cached_metrics( GdiFont *font, UINT index, const GLYPHMETRICS *gm, const ABC *abc ) +{ + UINT block = index / GM_BLOCK_SIZE; + UINT entry = index % GM_BLOCK_SIZE; + + if (block >= font->gmsize) + { + GM **ptr = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, + font->gm, (block + 1) * sizeof(GM *) ); + if (!ptr) return; + + font->gmsize = block + 1; + font->gm = ptr; + } + + if (!font->gm[block]) + { + font->gm[block] = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(GM) * GM_BLOCK_SIZE ); + if (!font->gm[block]) return; + } + + font->gm[block][entry].gm = *gm; + font->gm[block][entry].abc = *abc; + font->gm[block][entry].init = TRUE; +} static DWORD get_font_data( GdiFont *font, DWORD table, DWORD offset, LPVOID buf, DWORD cbData) { @@ -7063,7 +7109,6 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, BOOL needsTransform = FALSE; BOOL tategaki = (font->name[0] == '@'); BOOL vertical_metrics; - UINT original_index; TRACE("%p, %04x, %08x, %p, %08x, %p, %p\n", font, glyph, format, lpgm, buflen, buf, lpmat); @@ -7080,7 +7125,6 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, TRACE("translate glyph index %04x -> %04x\n", glyph, glyph_index); } else glyph_index = glyph; - original_index = glyph_index; format &= ~GGO_GLYPH_INDEX; /* TODO: Window also turns off tategaki for glyphs passed in by index if their unicode code points fall outside of the range that is @@ -7089,32 +7133,15 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, BOOL vert; get_glyph_index_linked(incoming_font, glyph, &font, &glyph_index, &vert); ft_face = font->ft_face; - original_index = glyph_index; if (!vert && tategaki) tategaki = check_unicode_tategaki(glyph); } format &= ~GGO_UNHINTED; - if(original_index >= font->gmsize * GM_BLOCK_SIZE) { - font->gmsize = (original_index / GM_BLOCK_SIZE + 1); - font->gm = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, font->gm, - font->gmsize * sizeof(GM*)); - } else { - if (format == GGO_METRICS && font->gm[original_index / GM_BLOCK_SIZE] != NULL && - FONT_GM(font,original_index)->init && is_identity_MAT2(lpmat)) - { - *lpgm = FONT_GM(font,original_index)->gm; - *abc = FONT_GM(font,original_index)->abc; - TRACE("cached: %u,%u,%s,%d,%d\n", lpgm->gmBlackBoxX, lpgm->gmBlackBoxY, - wine_dbgstr_point(&lpgm->gmptGlyphOrigin), - lpgm->gmCellIncX, lpgm->gmCellIncY); - return 1; /* FIXME */ - } - } - - if (!font->gm[original_index / GM_BLOCK_SIZE]) - font->gm[original_index / GM_BLOCK_SIZE] = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, sizeof(GM) * GM_BLOCK_SIZE); + if (format == GGO_METRICS && is_identity_MAT2(lpmat) && + get_cached_metrics( font, glyph_index, lpgm, abc )) + return 1; /* FIXME */ needsTransform = get_transform_matrices( font, tategaki, lpmat, matrices ); @@ -7254,11 +7281,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if ((format == GGO_METRICS || format == GGO_BITMAP || format == WINE_GGO_GRAY16_BITMAP) && is_identity_MAT2(lpmat)) /* don't cache custom transforms */ - { - FONT_GM(font,original_index)->gm = gm; - FONT_GM(font,original_index)->abc = *abc; - FONT_GM(font,original_index)->init = TRUE; - } + set_cached_metrics( font, glyph_index, &gm, abc ); if(format == GGO_METRICS) { -- 2.20.1

2 7

[PATCH 1/2] dwrite: Fix positions in outline mode.
by Nikolay Sivov 08 Feb '19

08 Feb '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/dwrite_private.h | 5 +-- dlls/dwrite/freetype.c | 61 +++++++++++++++++++++--------------- 2 files changed, 38 insertions(+), 28 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 0451a7e3f0..e2aa2131a1 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -320,8 +320,9 @@ extern void release_freetype(void) DECLSPEC_HIDDEN; extern HRESULT freetype_get_design_glyph_metrics(IDWriteFontFace4*,UINT16,UINT16,DWRITE_GLYPH_METRICS*) DECLSPEC_HIDDEN; extern void freetype_notify_cacheremove(IDWriteFontFace4*) DECLSPEC_HIDDEN; extern BOOL freetype_is_monospaced(IDWriteFontFace4*) DECLSPEC_HIDDEN; -extern HRESULT freetype_get_glyphrun_outline(IDWriteFontFace4*,FLOAT,UINT16 const*,FLOAT const*, DWRITE_GLYPH_OFFSET const*, - UINT32,BOOL,IDWriteGeometrySink*) DECLSPEC_HIDDEN; +extern HRESULT freetype_get_glyphrun_outline(IDWriteFontFace4 *fontface, float emsize, UINT16 const *glyphs, + float const *advances, DWRITE_GLYPH_OFFSET const *offsets, unsigned int count, BOOL is_rtl, + IDWriteGeometrySink *sink) DECLSPEC_HIDDEN; extern UINT16 freetype_get_glyphcount(IDWriteFontFace4*) DECLSPEC_HIDDEN; extern void freetype_get_glyphs(IDWriteFontFace4*,INT,UINT32 const*,UINT32,UINT16*) DECLSPEC_HIDDEN; extern BOOL freetype_has_kerning_pairs(IDWriteFontFace4*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index d3036537f0..29acb5e0de 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -438,7 +438,7 @@ static int decompose_cubic_to(const FT_Vector *control1, const FT_Vector *contro return 0; } -static void decompose_outline(FT_Outline *outline, FLOAT xoffset, FLOAT yoffset, IDWriteGeometrySink *sink) +static void decompose_outline(FT_Outline *outline, D2D1_POINT_2F offset, IDWriteGeometrySink *sink) { static const FT_Outline_Funcs decompose_funcs = { decompose_move_to, @@ -451,8 +451,8 @@ static void decompose_outline(FT_Outline *outline, FLOAT xoffset, FLOAT yoffset, struct decompose_context context; context.sink = sink; - context.xoffset = xoffset; - context.yoffset = yoffset; + context.xoffset = offset.x; + context.yoffset = offset.y; context.figure_started = FALSE; context.move_to = FALSE; context.origin.x = 0; @@ -485,8 +485,9 @@ static void embolden_glyph(FT_Glyph glyph, FLOAT emsize) embolden_glyph_outline(&outline_glyph->outline, emsize); } -HRESULT freetype_get_glyphrun_outline(IDWriteFontFace4 *fontface, FLOAT emSize, UINT16 const *glyphs, - FLOAT const *advances, DWRITE_GLYPH_OFFSET const *offsets, UINT32 count, BOOL is_rtl, IDWriteGeometrySink *sink) +HRESULT freetype_get_glyphrun_outline(IDWriteFontFace4 *fontface, float emSize, UINT16 const *glyphs, + float const *advances, DWRITE_GLYPH_OFFSET const *offsets, unsigned int count, BOOL is_rtl, + IDWriteGeometrySink *sink) { FTC_ScalerRec scaler; USHORT simulations; @@ -509,14 +510,19 @@ HRESULT freetype_get_glyphrun_outline(IDWriteFontFace4 *fontface, FLOAT emSize, EnterCriticalSection(&freetype_cs); if (pFTC_Manager_LookupSize(cache_manager, &scaler, &size) == 0) { - FLOAT advance = 0.0f; - UINT32 g; - - for (g = 0; g < count; g++) { - if (pFT_Load_Glyph(size->face, glyphs[g], FT_LOAD_NO_BITMAP) == 0) { + float rtl_factor = is_rtl ? -1.0f : 1.0f; + D2D1_POINT_2F origin; + unsigned int i; + + origin.x = origin.y = 0.0f; + for (i = 0; i < count; ++i) + { + if (pFT_Load_Glyph(size->face, glyphs[i], FT_LOAD_NO_BITMAP) == 0) + { FLOAT ft_advance = size->face->glyph->metrics.horiAdvance >> 6; FT_Outline *outline = &size->face->glyph->outline; - FLOAT xoffset = 0.0f, yoffset = 0.0f; + D2D1_POINT_2F glyph_origin; + float advance; FT_Matrix m; if (simulations & DWRITE_FONT_SIMULATIONS_BOLD) @@ -529,23 +535,25 @@ HRESULT freetype_get_glyphrun_outline(IDWriteFontFace4 *fontface, FLOAT emSize, pFT_Outline_Transform(outline, &m); + if (advances) + advance = rtl_factor * advances[i]; + else + advance = rtl_factor * ft_advance; + + glyph_origin = origin; + if (is_rtl) + glyph_origin.x += advance; + /* glyph offsets act as current glyph adjustment */ - if (offsets) { - xoffset += is_rtl ? -offsets[g].advanceOffset : offsets[g].advanceOffset; - yoffset -= offsets[g].ascenderOffset; + if (offsets) + { + glyph_origin.x += rtl_factor * offsets[i].advanceOffset; + glyph_origin.y -= offsets[i].ascenderOffset; } - if (g == 0 && is_rtl) - advance = advances ? -advances[g] : -ft_advance; - - xoffset += advance; - decompose_outline(outline, xoffset, yoffset, sink); + decompose_outline(outline, glyph_origin, sink); - /* update advance to next glyph */ - if (advances) - advance += is_rtl ? -advances[g] : advances[g]; - else - advance += is_rtl ? -ft_advance : ft_advance; + origin.x += advance; } } } @@ -959,8 +967,9 @@ BOOL freetype_is_monospaced(IDWriteFontFace4 *fontface) return FALSE; } -HRESULT freetype_get_glyphrun_outline(IDWriteFontFace4 *fontface, FLOAT emSize, UINT16 const *glyphs, FLOAT const *advances, - DWRITE_GLYPH_OFFSET const *offsets, UINT32 count, BOOL is_rtl, IDWriteGeometrySink *sink) +HRESULT freetype_get_glyphrun_outline(IDWriteFontFace4 *fontface, float emSize, UINT16 const *glyphs, + float const *advances, DWRITE_GLYPH_OFFSET const *offsets, unsigned int count, BOOL is_rtl, + IDWriteGeometrySink *sink) { return E_NOTIMPL; } -- 2.20.1

1 1

[PATCH 2/2] secur32: Fix default return flags for schannel contexts.
by Hans Leidekker 08 Feb '19

08 Feb '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/schannel.c | 10 +--------- dlls/secur32/tests/schannel.c | 5 +++-- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 5caaece8a5..8063fd4d6b 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -915,17 +915,9 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( pInput->pBuffers[1].cbBuffer = pInput->pBuffers[0].cbBuffer-ctx->transport.in.offset; } - *pfContextAttr = 0; - if (ctx->req_ctx_attr & ISC_REQ_REPLAY_DETECT) - *pfContextAttr |= ISC_RET_REPLAY_DETECT; - if (ctx->req_ctx_attr & ISC_REQ_SEQUENCE_DETECT) - *pfContextAttr |= ISC_RET_SEQUENCE_DETECT; - if (ctx->req_ctx_attr & ISC_REQ_CONFIDENTIALITY) - *pfContextAttr |= ISC_RET_CONFIDENTIALITY; + *pfContextAttr = ISC_RET_REPLAY_DETECT | ISC_RET_SEQUENCE_DETECT | ISC_RET_CONFIDENTIALITY | ISC_RET_STREAM; if (ctx->req_ctx_attr & ISC_REQ_ALLOCATE_MEMORY) *pfContextAttr |= ISC_RET_ALLOCATED_MEMORY; - if (ctx->req_ctx_attr & ISC_REQ_STREAM) - *pfContextAttr |= ISC_RET_STREAM; if (ctx->req_ctx_attr & ISC_REQ_USE_SUPPLIED_CREDS) *pfContextAttr |= ISC_RET_USED_SUPPLIED_CREDS; diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 6ae76eab1a..426bf66014 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -860,7 +860,7 @@ todo_wine buf->BufferType = SECBUFFER_TOKEN; status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", - ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM|ISC_REQ_USE_SUPPLIED_CREDS, + ISC_REQ_USE_SUPPLIED_CREDS, 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); buffers[1].pBuffers[0].cbBuffer = buf_size; } @@ -871,7 +871,8 @@ todo_wine skip("Handshake failed\n"); return; } - ok(attrs & (ISC_RET_CONFIDENTIALITY|ISC_RET_STREAM|ISC_RET_USED_SUPPLIED_CREDS), "got %08x\n", attrs); + ok(attrs == (ISC_RET_REPLAY_DETECT|ISC_RET_SEQUENCE_DETECT|ISC_RET_CONFIDENTIALITY|ISC_RET_STREAM|ISC_RET_USED_SUPPLIED_CREDS), + "got %08x\n", attrs); status = QueryCredentialsAttributesA(&cred_handle, SECPKG_CRED_ATTR_NAMES, &names); ok(status == SEC_E_NO_CREDENTIALS || status == SEC_E_UNSUPPORTED_FUNCTION /* before Vista */, "expected SEC_E_NO_CREDENTIALS, got %08x\n", status); -- 2.11.0

1 0

[PATCH 1/2] secur32: Return ISC_RET_USED_SUPPLIED_CREDS for schannel contexts if the feature was requested.
by Hans Leidekker 08 Feb '19

08 Feb '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46127 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/schannel.c | 2 ++ dlls/secur32/tests/schannel.c | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 2dbf8b1806..5caaece8a5 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -926,6 +926,8 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( *pfContextAttr |= ISC_RET_ALLOCATED_MEMORY; if (ctx->req_ctx_attr & ISC_REQ_STREAM) *pfContextAttr |= ISC_RET_STREAM; + if (ctx->req_ctx_attr & ISC_REQ_USE_SUPPLIED_CREDS) + *pfContextAttr |= ISC_RET_USED_SUPPLIED_CREDS; return ret; } diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index ebdfcb61a1..6ae76eab1a 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -843,7 +843,7 @@ todo_wine buffers[1].pBuffers[0].cbBuffer = ret; status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", - ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, + ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM|ISC_REQ_USE_SUPPLIED_CREDS, 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); buffers[1].pBuffers[0].cbBuffer = buf_size; while (status == SEC_I_CONTINUE_NEEDED) @@ -860,7 +860,7 @@ todo_wine buf->BufferType = SECBUFFER_TOKEN; status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", - ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, + ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM|ISC_REQ_USE_SUPPLIED_CREDS, 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); buffers[1].pBuffers[0].cbBuffer = buf_size; } @@ -871,6 +871,7 @@ todo_wine skip("Handshake failed\n"); return; } + ok(attrs & (ISC_RET_CONFIDENTIALITY|ISC_RET_STREAM|ISC_RET_USED_SUPPLIED_CREDS), "got %08x\n", attrs); status = QueryCredentialsAttributesA(&cred_handle, SECPKG_CRED_ATTR_NAMES, &names); ok(status == SEC_E_NO_CREDENTIALS || status == SEC_E_UNSUPPORTED_FUNCTION /* before Vista */, "expected SEC_E_NO_CREDENTIALS, got %08x\n", status); -- 2.11.0

1 0

[PATCH v2] po: Update Sinhala translation.
by Isira Seneviratne 08 Feb '19

08 Feb '19

1 0

[PATCH] secur32: Fix compile error on older gnutls.
by Alistair Leslie-Hughes 08 Feb '19

08 Feb '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/secur32/schannel_gnutls.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index ddb10ac..48d4284 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -54,6 +54,12 @@ static int (*pgnutls_cipher_get_block_size)(gnutls_cipher_algorithm_t); /* Not present in gnutls version < 3.4.0. */ static int (*pgnutls_privkey_export_x509)(gnutls_privkey_t, gnutls_x509_privkey_t *); +static int gnutls_privkey_import_rsa_raw(gnutls_privkey_t, const gnutls_datum_t *, + const gnutls_datum_t *, const gnutls_datum_t *, + const gnutls_datum_t *, const gnutls_datum_t *, + const gnutls_datum_t *, const gnutls_datum_t *, + const gnutls_datum_t *); + static void *libgnutls_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(gnutls_alert_get); -- 1.9.1

2 1

[PATCH 2/2] ddraw/tests: Port test_alphatest() from d3d9.
by Henri Verbeet 08 Feb '19

08 Feb '19

From: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 170 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 127 ++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 118 ++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 111 ++++++++++++++++++++++++++++++ 4 files changed, 526 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 1f7e2ce04e7..680738eb47c 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12124,6 +12124,175 @@ static void test_gdi_surface(void) DestroyWindow(window); } +static void test_alphatest(void) +{ +#define ALPHATEST_PASSED 0x0000ff00 +#define ALPHATEST_FAILED 0x00ff0000 + D3DRECT rect_full = {{0}, {0}, {640}, {480}}; + IDirect3DExecuteBuffer *execute_buffer; + IDirect3DMaterial *blue, *failed; + D3DEXECUTEBUFFERDESC exec_desc; + IDirect3DViewport *viewport; + IDirect3DDevice *device; + IDirectDrawSurface *rt; + IDirectDraw *ddraw; + UINT inst_length; + unsigned int i; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; + void *ptr; + + static const struct + { + D3DCMPFUNC func; + D3DCOLOR color_less; + D3DCOLOR color_equal; + D3DCOLOR color_greater; + } + test_data[] = + { + {D3DCMP_NEVER, ALPHATEST_FAILED, ALPHATEST_FAILED, ALPHATEST_FAILED}, + {D3DCMP_LESS, ALPHATEST_PASSED, ALPHATEST_FAILED, ALPHATEST_FAILED}, + {D3DCMP_EQUAL, ALPHATEST_FAILED, ALPHATEST_PASSED, ALPHATEST_FAILED}, + {D3DCMP_LESSEQUAL, ALPHATEST_PASSED, ALPHATEST_PASSED, ALPHATEST_FAILED}, + {D3DCMP_GREATER, ALPHATEST_FAILED, ALPHATEST_FAILED, ALPHATEST_PASSED}, + {D3DCMP_NOTEQUAL, ALPHATEST_PASSED, ALPHATEST_FAILED, ALPHATEST_PASSED}, + {D3DCMP_GREATEREQUAL, ALPHATEST_FAILED, ALPHATEST_PASSED, ALPHATEST_PASSED}, + {D3DCMP_ALWAYS, ALPHATEST_PASSED, ALPHATEST_PASSED, ALPHATEST_PASSED}, + }; + static D3DLVERTEX quad[] = + { + {{-1.0f}, {-1.0f}, {0.1f}, 0, {ALPHATEST_PASSED | 0x80000000}}, + {{-1.0f}, { 1.0f}, {0.1f}, 0, {ALPHATEST_PASSED | 0x80000000}}, + {{ 1.0f}, {-1.0f}, {0.1f}, 0, {ALPHATEST_PASSED | 0x80000000}}, + {{ 1.0f}, { 1.0f}, {0.1f}, 0, {ALPHATEST_PASSED | 0x80000000}}, + }; + + window = create_window(); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device.\n"); + IDirectDraw_Release(ddraw); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void **)&rt); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + blue = create_diffuse_material(device, 0.0f, 0.0f, 1.0f, 1.0f); + failed = create_diffuse_material(device, 1.0f, 0.0f, 0.0f, 1.0f); + + viewport = create_viewport(device, 0, 0, 640, 480); + + viewport_set_background(device, viewport, blue); + hr = IDirect3DViewport_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + memset(&exec_desc, 0, sizeof(exec_desc)); + exec_desc.dwSize = sizeof(exec_desc); + exec_desc.dwFlags = D3DDEB_BUFSIZE | D3DDEB_CAPS; + exec_desc.dwBufferSize = 1024; + exec_desc.dwCaps = D3DDEBCAPS_SYSTEMMEMORY; + + hr = IDirect3DDevice_CreateExecuteBuffer(device, &exec_desc, &execute_buffer, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DExecuteBuffer_Lock(execute_buffer, &exec_desc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + ptr = exec_desc.lpData; + emit_set_rs(&ptr, D3DRENDERSTATE_LIGHTING, FALSE); + emit_set_rs(&ptr, D3DRENDERSTATE_ZENABLE, FALSE); + emit_set_rs(&ptr, D3DRENDERSTATE_ALPHATESTENABLE, TRUE); + emit_end(&ptr); + inst_length = (BYTE *)ptr - (BYTE *)exec_desc.lpData; + + hr = IDirect3DExecuteBuffer_Unlock(execute_buffer); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + set_execute_data(execute_buffer, 0, 0, inst_length); + hr = IDirect3DDevice_Execute(device, execute_buffer, viewport, D3DEXECUTE_CLIPPED); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + viewport_set_background(device, viewport, failed); + for (i = 0; i < ARRAY_SIZE(test_data); ++i) + { + hr = IDirect3DExecuteBuffer_Lock(execute_buffer, &exec_desc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + memcpy(exec_desc.lpData, quad, sizeof(quad)); + ptr = ((BYTE *)exec_desc.lpData) + sizeof(quad); + emit_set_rs(&ptr, D3DRENDERSTATE_ALPHAFUNC, test_data[i].func); + emit_set_rs(&ptr, D3DRENDERSTATE_ALPHAREF, 0x70); + emit_process_vertices(&ptr, D3DPROCESSVERTICES_TRANSFORM, 0, ARRAY_SIZE(quad)); + emit_tquad(&ptr, 0); + emit_end(&ptr); + inst_length = (BYTE *)ptr - (BYTE *)exec_desc.lpData; + inst_length -= sizeof(quad); + + hr = IDirect3DExecuteBuffer_Unlock(execute_buffer); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DViewport_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + set_execute_data(execute_buffer, ARRAY_SIZE(quad), sizeof(quad), inst_length); + hr = IDirect3DDevice_Execute(device, execute_buffer, viewport, D3DEXECUTE_CLIPPED); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, test_data[i].color_greater, 0), + "Alphatest failed, color 0x%08x, expected 0x%08x, alpha > ref, func %u.\n", + color, test_data[i].color_greater, test_data[i].func); + + hr = IDirect3DExecuteBuffer_Lock(execute_buffer, &exec_desc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + memcpy(exec_desc.lpData, quad, sizeof(quad)); + ptr = ((BYTE *)exec_desc.lpData) + sizeof(quad); + emit_set_rs(&ptr, D3DRENDERSTATE_ALPHAREF, 0xff70); + emit_process_vertices(&ptr, D3DPROCESSVERTICES_TRANSFORM, 0, ARRAY_SIZE(quad)); + emit_tquad(&ptr, 0); + emit_end(&ptr); + inst_length = (BYTE *)ptr - (BYTE *)exec_desc.lpData; + inst_length -= sizeof(quad); + + hr = IDirect3DExecuteBuffer_Unlock(execute_buffer); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DViewport_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + set_execute_data(execute_buffer, ARRAY_SIZE(quad), sizeof(quad), inst_length); + hr = IDirect3DDevice_Execute(device, execute_buffer, viewport, D3DEXECUTE_CLIPPED); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, test_data[i].color_greater, 0), + "Alphatest failed, color 0x%08x, expected 0x%08x, alpha > ref, func %u.\n", + color, test_data[i].color_greater, test_data[i].func); + } + + IDirect3DExecuteBuffer_Release(execute_buffer); + destroy_viewport(device, viewport); + destroy_material(failed); + destroy_material(blue); + IDirectDrawSurface_Release(rt); + refcount = IDirect3DDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDirectDraw_Release(ddraw); + ok(!refcount, "DirectDraw has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; @@ -12231,4 +12400,5 @@ START_TEST(ddraw1) test_find_device(); test_killfocus(); test_gdi_surface(); + test_alphatest(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 842870d7d78..3dda289ad1f 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13425,6 +13425,132 @@ static void test_gdi_surface(void) DestroyWindow(window); } +static void test_alphatest(void) +{ +#define ALPHATEST_PASSED 0x0000ff00 +#define ALPHATEST_FAILED 0x00ff0000 + D3DRECT rect_full = {{0}, {0}, {640}, {480}}; + IDirect3DMaterial2 *blue, *failed; + IDirect3DViewport2 *viewport; + IDirect3DDevice2 *device; + IDirectDrawSurface *rt; + IDirectDraw2 *ddraw; + unsigned int i; + D3DCOLOR color; + ULONG refcount; + HWND window; + DWORD value; + HRESULT hr; + + static const struct + { + D3DCMPFUNC func; + D3DCOLOR color_less; + D3DCOLOR color_equal; + D3DCOLOR color_greater; + } + test_data[] = + { + {D3DCMP_NEVER, ALPHATEST_FAILED, ALPHATEST_FAILED, ALPHATEST_FAILED}, + {D3DCMP_LESS, ALPHATEST_PASSED, ALPHATEST_FAILED, ALPHATEST_FAILED}, + {D3DCMP_EQUAL, ALPHATEST_FAILED, ALPHATEST_PASSED, ALPHATEST_FAILED}, + {D3DCMP_LESSEQUAL, ALPHATEST_PASSED, ALPHATEST_PASSED, ALPHATEST_FAILED}, + {D3DCMP_GREATER, ALPHATEST_FAILED, ALPHATEST_FAILED, ALPHATEST_PASSED}, + {D3DCMP_NOTEQUAL, ALPHATEST_PASSED, ALPHATEST_FAILED, ALPHATEST_PASSED}, + {D3DCMP_GREATEREQUAL, ALPHATEST_FAILED, ALPHATEST_PASSED, ALPHATEST_PASSED}, + {D3DCMP_ALWAYS, ALPHATEST_PASSED, ALPHATEST_PASSED, ALPHATEST_PASSED}, + }; + static D3DLVERTEX quad[] = + { + {{-1.0f}, {-1.0f}, {0.1f}, 0, {ALPHATEST_PASSED | 0x80000000}}, + {{-1.0f}, { 1.0f}, {0.1f}, 0, {ALPHATEST_PASSED | 0x80000000}}, + {{ 1.0f}, {-1.0f}, {0.1f}, 0, {ALPHATEST_PASSED | 0x80000000}}, + {{ 1.0f}, { 1.0f}, {0.1f}, 0, {ALPHATEST_PASSED | 0x80000000}}, + }; + + window = create_window(); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device.\n"); + IDirectDraw2_Release(ddraw); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice2_GetRenderTarget(device, &rt); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + blue = create_diffuse_material(device, 0.0f, 0.0f, 1.0f, 1.0f); + failed = create_diffuse_material(device, 1.0f, 0.0f, 0.0f, 1.0f); + + viewport = create_viewport(device, 0, 0, 640, 480); + hr = IDirect3DDevice2_SetCurrentViewport(device, viewport); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + viewport_set_background(device, viewport, blue); + hr = IDirect3DViewport2_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_ZENABLE, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_ALPHATESTENABLE, TRUE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + viewport_set_background(device, viewport, failed); + for (i = 0; i < ARRAY_SIZE(test_data); ++i) + { + hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_ALPHAFUNC, test_data[i].func); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DViewport2_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_ALPHAREF, 0x70); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice2_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, + D3DVT_LVERTEX, quad, ARRAY_SIZE(quad), 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice2_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, test_data[i].color_greater, 0), + "Alphatest failed, color 0x%08x, expected 0x%08x, alpha > ref, func %u.\n", + color, test_data[i].color_greater, test_data[i].func); + + hr = IDirect3DViewport2_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_ALPHAREF, 0xff70); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice2_GetRenderState(device, D3DRENDERSTATE_ALPHAREF, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == 0xff70, "Got unexpected value %#x.\n", value); + hr = IDirect3DDevice2_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, + D3DVT_LVERTEX, quad, ARRAY_SIZE(quad), 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice2_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, test_data[i].color_greater, 0), + "Alphatest failed, color 0x%08x, expected 0x%08x, alpha > ref, func %u.\n", + color, test_data[i].color_greater, test_data[i].func); + } + + destroy_viewport(device, viewport); + destroy_material(failed); + destroy_material(blue); + IDirectDrawSurface_Release(rt); + refcount = IDirect3DDevice2_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDirectDraw2_Release(ddraw); + ok(!refcount, "DirectDraw has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw2) { DDDEVICEIDENTIFIER identifier; @@ -13540,4 +13666,5 @@ START_TEST(ddraw2) test_find_device(); test_killfocus(); test_gdi_surface(); + test_alphatest(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index bb4d63a928d..bed5acdb135 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -15680,6 +15680,123 @@ static void test_gdi_surface(void) DestroyWindow(window); } +static void test_alphatest(void) +{ +#define ALPHATEST_PASSED 0x0000ff00 +#define ALPHATEST_FAILED 0x00ff0000 + D3DRECT rect_full = {{0}, {0}, {640}, {480}}; + IDirect3DViewport3 *viewport; + IDirect3DDevice3 *device; + IDirectDrawSurface4 *rt; + unsigned int i; + D3DCOLOR color; + ULONG refcount; + HWND window; + DWORD value; + HRESULT hr; + + static const struct + { + D3DCMPFUNC func; + D3DCOLOR color_less; + D3DCOLOR color_equal; + D3DCOLOR color_greater; + } + test_data[] = + { + {D3DCMP_NEVER, ALPHATEST_FAILED, ALPHATEST_FAILED, ALPHATEST_FAILED}, + {D3DCMP_LESS, ALPHATEST_PASSED, ALPHATEST_FAILED, ALPHATEST_FAILED}, + {D3DCMP_EQUAL, ALPHATEST_FAILED, ALPHATEST_PASSED, ALPHATEST_FAILED}, + {D3DCMP_LESSEQUAL, ALPHATEST_PASSED, ALPHATEST_PASSED, ALPHATEST_FAILED}, + {D3DCMP_GREATER, ALPHATEST_FAILED, ALPHATEST_FAILED, ALPHATEST_PASSED}, + {D3DCMP_NOTEQUAL, ALPHATEST_PASSED, ALPHATEST_FAILED, ALPHATEST_PASSED}, + {D3DCMP_GREATEREQUAL, ALPHATEST_FAILED, ALPHATEST_PASSED, ALPHATEST_PASSED}, + {D3DCMP_ALWAYS, ALPHATEST_PASSED, ALPHATEST_PASSED, ALPHATEST_PASSED}, + }; + static struct + { + struct vec3 position; + DWORD diffuse; + } + quad[] = + { + {{-1.0f, -1.0f, 0.1f}, ALPHATEST_PASSED | 0x80000000}, + {{-1.0f, 1.0f, 0.1f}, ALPHATEST_PASSED | 0x80000000}, + {{ 1.0f, -1.0f, 0.1f}, ALPHATEST_PASSED | 0x80000000}, + {{ 1.0f, 1.0f, 0.1f}, ALPHATEST_PASSED | 0x80000000}, + }; + + window = create_window(); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device.\n"); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice3_GetRenderTarget(device, &rt); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + viewport = create_viewport(device, 0, 0, 640, 480); + hr = IDirect3DDevice3_SetCurrentViewport(device, viewport); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DViewport3_Clear2(viewport, 1, &rect_full, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_ZENABLE, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_ALPHATESTENABLE, TRUE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(test_data); ++i) + { + hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_ALPHAFUNC, test_data[i].func); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DViewport3_Clear2(viewport, 1, &rect_full, D3DCLEAR_TARGET, ALPHATEST_FAILED, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_ALPHAREF, 0x70); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, + D3DFVF_XYZ | D3DFVF_DIFFUSE, quad, ARRAY_SIZE(quad), 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, test_data[i].color_greater, 0), + "Alphatest failed, color 0x%08x, expected 0x%08x, alpha > ref, func %u.\n", + color, test_data[i].color_greater, test_data[i].func); + + hr = IDirect3DViewport3_Clear2(viewport, 1, &rect_full, D3DCLEAR_TARGET, ALPHATEST_FAILED, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_ALPHAREF, 0xff70); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_GetRenderState(device, D3DRENDERSTATE_ALPHAREF, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == 0xff70, "Got unexpected value %#x.\n", value); + hr = IDirect3DDevice3_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, + D3DFVF_XYZ | D3DFVF_DIFFUSE, quad, ARRAY_SIZE(quad), 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, test_data[i].color_greater, 0), + "Alphatest failed, color 0x%08x, expected 0x%08x, alpha > ref, func %u.\n", + color, test_data[i].color_greater, test_data[i].func); + } + + destroy_viewport(device, viewport); + IDirectDrawSurface4_Release(rt); + refcount = IDirect3DDevice3_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; @@ -15810,4 +15927,5 @@ START_TEST(ddraw4) test_killfocus(); test_sysmem_draw(); test_gdi_surface(); + test_alphatest(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index a0637917708..c3ffa45de62 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15489,6 +15489,116 @@ static void test_multiply_transform(void) DestroyWindow(window); } +static void test_alphatest(void) +{ +#define ALPHATEST_PASSED 0x0000ff00 +#define ALPHATEST_FAILED 0x00ff0000 + IDirect3DDevice7 *device; + IDirectDrawSurface7 *rt; + unsigned int i; + D3DCOLOR color; + ULONG refcount; + HWND window; + DWORD value; + HRESULT hr; + + static const struct + { + D3DCMPFUNC func; + D3DCOLOR color_less; + D3DCOLOR color_equal; + D3DCOLOR color_greater; + } + test_data[] = + { + {D3DCMP_NEVER, ALPHATEST_FAILED, ALPHATEST_FAILED, ALPHATEST_FAILED}, + {D3DCMP_LESS, ALPHATEST_PASSED, ALPHATEST_FAILED, ALPHATEST_FAILED}, + {D3DCMP_EQUAL, ALPHATEST_FAILED, ALPHATEST_PASSED, ALPHATEST_FAILED}, + {D3DCMP_LESSEQUAL, ALPHATEST_PASSED, ALPHATEST_PASSED, ALPHATEST_FAILED}, + {D3DCMP_GREATER, ALPHATEST_FAILED, ALPHATEST_FAILED, ALPHATEST_PASSED}, + {D3DCMP_NOTEQUAL, ALPHATEST_PASSED, ALPHATEST_FAILED, ALPHATEST_PASSED}, + {D3DCMP_GREATEREQUAL, ALPHATEST_FAILED, ALPHATEST_PASSED, ALPHATEST_PASSED}, + {D3DCMP_ALWAYS, ALPHATEST_PASSED, ALPHATEST_PASSED, ALPHATEST_PASSED}, + }; + static struct + { + struct vec3 position; + DWORD diffuse; + } + quad[] = + { + {{-1.0f, -1.0f, 0.1f}, ALPHATEST_PASSED | 0x80000000}, + {{-1.0f, 1.0f, 0.1f}, ALPHATEST_PASSED | 0x80000000}, + {{ 1.0f, -1.0f, 0.1f}, ALPHATEST_PASSED | 0x80000000}, + {{ 1.0f, 1.0f, 0.1f}, ALPHATEST_PASSED | 0x80000000}, + }; + + window = create_window(); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device.\n"); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice7_GetRenderTarget(device, &rt); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZENABLE, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ALPHATESTENABLE, TRUE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(test_data); ++i) + { + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ALPHAFUNC, test_data[i].func); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, ALPHATEST_FAILED, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ALPHAREF, 0x70); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, + D3DFVF_XYZ | D3DFVF_DIFFUSE, quad, ARRAY_SIZE(quad), 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, test_data[i].color_greater, 0), + "Alphatest failed, color 0x%08x, expected 0x%08x, alpha > ref, func %u.\n", + color, test_data[i].color_greater, test_data[i].func); + + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, ALPHATEST_FAILED, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ALPHAREF, 0xff70); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_ALPHAREF, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == 0xff70, "Got unexpected value %#x.\n", value); + hr = IDirect3DDevice7_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, + D3DFVF_XYZ | D3DFVF_DIFFUSE, quad, ARRAY_SIZE(quad), 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, test_data[i].color_greater, 0), + "Alphatest failed, color 0x%08x, expected 0x%08x, alpha > ref, func %u.\n", + color, test_data[i].color_greater, test_data[i].func); + } + + IDirectDrawSurface7_Release(rt); + refcount = IDirect3DDevice7_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -15631,4 +15741,5 @@ START_TEST(ddraw7) test_sysmem_draw(); test_gdi_surface(); test_multiply_transform(); + test_alphatest(); } -- 2.11.0

2 1

[PATCH 1/2] d3d8: Improve ValidateVertexShader().
by Henri Verbeet 07 Feb '19

07 Feb '19

Based largely on a patch by Sebastian Lackner. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- ValidatePixelShader() and Direct3DShaderValidatorCreate9() are left as an exercise. dlls/d3d8/d3d8_main.c | 64 +++++++++++++++++------------- dlls/d3d8/tests/device.c | 100 +++++++++++++++++++++++++++++++++++------------ 2 files changed, 113 insertions(+), 51 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 5fbd1652857..17f35c90894 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -57,40 +57,50 @@ IDirect3D8 * WINAPI DECLSPEC_HOTPATCH Direct3DCreate8(UINT sdk_version) return &object->IDirect3D8_iface; } -/*********************************************************************** - * ValidateVertexShader (D3D8.@) - * - * I've seen reserved1 and reserved2 always passed as 0's - * boolean seems always passed as 0 or 1, but other values work as well... - * toto result? - */ -HRESULT WINAPI ValidateVertexShader(DWORD* vertexshader, DWORD* reserved1, DWORD* reserved2, BOOL boolean, DWORD* toto) +/* FIXME: We should probably use libvkd3d-shader for validation. */ +HRESULT WINAPI ValidateVertexShader(const DWORD *vs_code, const DWORD *declaration, + const D3DCAPS8 *caps, BOOL return_error, char **errors) { - HRESULT ret; - static BOOL warned; + const char *message = ""; + SIZE_T message_size; + HRESULT hr = E_FAIL; - if (TRACE_ON(d3d8) || !warned) { - FIXME("(%p %p %p %d %p): stub\n", vertexshader, reserved1, reserved2, boolean, toto); - warned = TRUE; - } - - if (!vertexshader) - return E_FAIL; + TRACE("vs_code %p, declaration %p, caps %p, return_error %#x, errors %p.\n", + vs_code, declaration, caps, return_error, errors); - if (reserved1 || reserved2) - return E_FAIL; + if (!vs_code) + { + message = "Invalid code pointer.\n"; + goto done; + } - switch(*vertexshader) { - case 0xFFFE0101: - case 0xFFFE0100: - ret=S_OK; + switch (*vs_code) + { + case D3DVS_VERSION(1, 1): + case D3DVS_VERSION(1, 0): break; + default: - WARN("Invalid shader version token %#x.\n", *vertexshader); - ret=E_FAIL; - } + message = "Unsupported shader version.\n"; + goto done; + } - return ret; + if (caps && *vs_code > caps->VertexShaderVersion) + { + message = "Shader version not supported by caps.\n"; + goto done; + } + + hr = S_OK; + +done: + if (!return_error) + message = ""; + message_size = strlen(message) + 1; + if (errors && (*errors = heap_alloc(message_size))) + memcpy(*errors, message, message_size); + + return hr; } /*********************************************************************** diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b57be7ad127..315640d3b37 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -27,6 +27,7 @@ #include <initguid.h> #include <d3d8.h> #include "wine/test.h" +#include "wine/heap.h" struct vec3 { @@ -51,7 +52,7 @@ struct device_desc static DEVMODEW registry_mode; -static HRESULT (WINAPI *ValidateVertexShader)(DWORD *, DWORD *, DWORD *, int, DWORD *); +static HRESULT (WINAPI *ValidateVertexShader)(const DWORD *, const DWORD *, const D3DCAPS8 *, BOOL, char **); static HRESULT (WINAPI *ValidatePixelShader)(DWORD *, DWORD *, int, DWORD *); static BOOL (WINAPI *pGetCursorInfo)(PCURSORINFO); @@ -4365,7 +4366,7 @@ static void test_set_rt_vp_scissor(void) static void test_validate_vs(void) { - static DWORD vs[] = + static DWORD vs_code[] = { 0xfffe0101, /* vs_1_1 */ 0x00000009, 0xc0010000, 0x90e40000, 0xa0e40000, /* dp4 oPos.x, v0, c0 */ @@ -4374,40 +4375,91 @@ static void test_validate_vs(void) 0x00000009, 0xc0080000, 0x90e40000, 0xa0e40003, /* dp4 oPos.w, v0, c3 */ 0x0000ffff, /* end */ }; + D3DCAPS8 caps; + char *errors; HRESULT hr; - hr = ValidateVertexShader(0, 0, 0, 0, 0); + static DWORD declaration_valid1[] = + { + D3DVSD_STREAM(0), + D3DVSD_REG(D3DVSDE_POSITION, D3DVSDT_FLOAT4), + D3DVSD_END() + }; + static DWORD declaration_valid2[] = + { + D3DVSD_STREAM(0), + D3DVSD_REG(D3DVSDE_POSITION, D3DVSDT_FLOAT2), + D3DVSD_END() + }; + static DWORD declaration_invalid[] = + { + D3DVSD_STREAM(0), + D3DVSD_REG(D3DVSDE_NORMAL, D3DVSDT_FLOAT4), + D3DVSD_END() + }; + + hr = ValidateVertexShader(NULL, NULL, NULL, FALSE, NULL); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - hr = ValidateVertexShader(0, 0, 0, 1, 0); + hr = ValidateVertexShader(NULL, NULL, NULL, TRUE, NULL); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - hr = ValidateVertexShader(vs, 0, 0, 0, 0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ValidateVertexShader(NULL, NULL, NULL, FALSE, &errors); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!*errors, "Got unexpected string \"%s\".\n", errors); + heap_free(errors); + hr = ValidateVertexShader(NULL, NULL, NULL, TRUE, &errors); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!!*errors, "Got unexpected empty string.\n"); + heap_free(errors); - hr = ValidateVertexShader(vs, 0, 0, 1, 0); + hr = ValidateVertexShader(vs_code, NULL, NULL, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - /* Seems to do some version checking. */ - *vs = 0xfffe0100; /* vs_1_0 */ - hr = ValidateVertexShader(vs, 0, 0, 0, 0); + hr = ValidateVertexShader(vs_code, NULL, NULL, TRUE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ValidateVertexShader(vs_code, NULL, NULL, TRUE, &errors); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!*errors, "Got unexpected string \"%s\".\n", errors); + heap_free(errors); - *vs = 0xfffe0102; /* bogus version */ - hr = ValidateVertexShader(vs, 0, 0, 1, 0); - ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - /* I've seen that applications always pass the 2nd and 3rd parameter as 0. - * Simple test with non-zero parameters. */ - *vs = 0xfffe0101; /* vs_1_1 */ - hr = ValidateVertexShader(vs, vs, 0, 1, 0); - ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = ValidateVertexShader(vs_code, declaration_valid1, NULL, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ValidateVertexShader(vs_code, declaration_valid2, NULL, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ValidateVertexShader(vs_code, declaration_invalid, NULL, FALSE, NULL); + todo_wine ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - hr = ValidateVertexShader(vs, 0, vs, 1, 0); + memset(&caps, 0, sizeof(caps)); + caps.VertexShaderVersion = D3DVS_VERSION(1, 1); + caps.MaxVertexShaderConst = 4; + hr = ValidateVertexShader(vs_code, NULL, &caps, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + caps.VertexShaderVersion = D3DVS_VERSION(1, 0); + hr = ValidateVertexShader(vs_code, NULL, &caps, FALSE, NULL); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - /* I've seen the 4th parameter always passed as either 0 or 1, but passing - * other values doesn't seem to hurt. */ - hr = ValidateVertexShader(vs, 0, 0, 12345, 0); + caps.VertexShaderVersion = D3DVS_VERSION(1, 2); + hr = ValidateVertexShader(vs_code, NULL, &caps, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - /* What is the 5th parameter? The following seems to work ok. */ - hr = ValidateVertexShader(vs, 0, 0, 1, vs); + caps.VertexShaderVersion = D3DVS_VERSION(8, 8); + hr = ValidateVertexShader(vs_code, NULL, &caps, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + caps.VertexShaderVersion = D3DVS_VERSION(1, 1); + caps.MaxVertexShaderConst = 3; + hr = ValidateVertexShader(vs_code, NULL, &caps, FALSE, NULL); + todo_wine ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + + *vs_code = D3DVS_VERSION(1, 0); + hr = ValidateVertexShader(vs_code, NULL, NULL, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + *vs_code = D3DVS_VERSION(1, 2); + hr = ValidateVertexShader(vs_code, NULL, NULL, TRUE, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = ValidateVertexShader(vs_code, NULL, NULL, FALSE, &errors); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!*errors, "Got unexpected string \"%s\".\n", errors); + heap_free(errors); + hr = ValidateVertexShader(vs_code, NULL, NULL, TRUE, &errors); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!!*errors, "Got unexpected empty string.\n"); + heap_free(errors); } static void test_validate_ps(void) -- 2.11.0

2 1

[PATCH] odbc32: Print the debug strings and not the pointers
by Michael Stefaniuc 07 Feb '19

07 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/odbc32/proxyodbc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index d4949b5fd2..041d4dbf01 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -951,7 +951,7 @@ SQLRETURN WINAPI ODBC32_SQLConnect(SQLHDBC ConnectionHandle, SQLCHAR *ServerName { SQLRETURN ret; - TRACE("(ConnectionHandle %p, ServerName %s, NameLength1 %d, UserName %s, NameLength2 %d, Authentication %p," + TRACE("(ConnectionHandle %p, ServerName %s, NameLength1 %d, UserName %s, NameLength2 %d, Authentication %s," " NameLength3 %d)\n", ConnectionHandle, debugstr_an((const char *)ServerName, NameLength1), NameLength1, debugstr_an((const char *)UserName, NameLength2), NameLength2, @@ -2328,7 +2328,7 @@ SQLRETURN WINAPI ODBC32_SQLConnectW(SQLHDBC ConnectionHandle, WCHAR *ServerName, { SQLRETURN ret; - TRACE("(ConnectionHandle %p, ServerName %s, NameLength1 %d, UserName %s, NameLength2 %d, Authentication %p," + TRACE("(ConnectionHandle %p, ServerName %s, NameLength1 %d, UserName %s, NameLength2 %d, Authentication %s," " NameLength3 %d)\n", ConnectionHandle, debugstr_wn(ServerName, NameLength1), NameLength1, debugstr_wn(UserName, NameLength2), NameLength2, debugstr_wn(Authentication, NameLength3), NameLength3); -- 2.20.1

1 0

[PATCH v6 3/3] sxs: Implement SxsLookupClrGuid and add tests
by Fabian Maurer 07 Feb '19

07 Feb '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43270 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/sxs/sxs.c | 148 ++++++++++++++++++ dlls/sxs/sxs.spec | 1 + dlls/sxs/tests/Makefile.in | 8 +- dlls/sxs/tests/comtest_dll.manifest | 16 ++ dlls/sxs/tests/comtest_exe.manifest | 11 ++ dlls/sxs/tests/interfaces.idl | 33 ++++ dlls/sxs/tests/resource.rc | 27 ++++ dlls/sxs/tests/sxs.c | 223 ++++++++++++++++++++++++++++ 8 files changed, 465 insertions(+), 2 deletions(-) create mode 100644 dlls/sxs/tests/comtest_dll.manifest create mode 100644 dlls/sxs/tests/comtest_exe.manifest create mode 100644 dlls/sxs/tests/interfaces.idl create mode 100644 dlls/sxs/tests/resource.rc create mode 100644 dlls/sxs/tests/sxs.c diff --git a/dlls/sxs/sxs.c b/dlls/sxs/sxs.c index 06e6672dbf..7eec772de1 100644 --- a/dlls/sxs/sxs.c +++ b/dlls/sxs/sxs.c @@ -23,6 +23,10 @@ #include "windef.h" #include "winbase.h" +#include "wine/heap.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(sxs); /*********************************************************************** * DllMain (SXS.@) @@ -40,3 +44,147 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } return TRUE; } + +typedef struct _SXS_GUID_INFORMATION_CLR +{ + DWORD cbSize; + DWORD dwFlags; + PCWSTR pcwszRuntimeVersion; + PCWSTR pcwszTypeName; + PCWSTR pcwszAssemblyIdentity; +} SXS_GUID_INFORMATION_CLR, *PSXS_GUID_INFORMATION_CLR; + +#define SXS_GUID_INFORMATION_CLR_FLAG_IS_SURROGATE 0x1 +#define SXS_GUID_INFORMATION_CLR_FLAG_IS_CLASS 0x2 + +#define SXS_LOOKUP_CLR_GUID_USE_ACTCTX 0x00000001 +#define SXS_LOOKUP_CLR_GUID_FIND_SURROGATE 0x00010000 +#define SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS 0x00020000 + +struct comclassredirect_data +{ + ULONG size; + BYTE res; + BYTE miscmask; + BYTE res1[2]; + DWORD model; + GUID clsid; + GUID alias; + GUID clsid2; + GUID tlbid; + ULONG name_len; + ULONG name_offset; + ULONG progid_len; + ULONG progid_offset; + ULONG clrdata_len; + ULONG clrdata_offset; + DWORD miscstatus; + DWORD miscstatuscontent; + DWORD miscstatusthumbnail; + DWORD miscstatusicon; + DWORD miscstatusdocprint; +}; + +struct clrclass_data +{ + ULONG size; + DWORD res[2]; + ULONG module_len; + ULONG module_offset; + ULONG name_len; + ULONG name_offset; + ULONG version_len; + ULONG version_offset; + DWORD res2[2]; +}; + +BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buffer, SIZE_T buffer_len, SIZE_T *buffer_len_required) +{ + ACTCTX_SECTION_KEYED_DATA guid_info = { sizeof(ACTCTX_SECTION_KEYED_DATA) }; + ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION *assembly_info; + SIZE_T bytes_assembly_info; + struct comclassredirect_data *redirect_data; + struct clrclass_data *class_data; + int len_version = 0, len_name, len_identity; + const void *ptr_name, *ptr_version, *ptr_identity; + SXS_GUID_INFORMATION_CLR *ret = buffer; + char *ret_strings; + + TRACE("(%x, %s, %p, %p, %08lx, %p): stub\n", flags, wine_dbgstr_guid(clsid), actctx, buffer, buffer_len, buffer_len_required); + + if (flags & (~SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS)) + FIXME("Ignored flags: %x\n", flags & (~SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS)); + + if (!FindActCtxSectionGuid(FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, 0, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, clsid, &guid_info)) + { + SetLastError(ERROR_NOT_FOUND); + return FALSE; + } + + QueryActCtxW(0, guid_info.hActCtx, &guid_info.ulAssemblyRosterIndex, + AssemblyDetailedInformationInActivationContext, NULL, 0, &bytes_assembly_info); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + ERR("QueryActCtxW failed: %d!\n", GetLastError()); + ReleaseActCtx(guid_info.hActCtx); + return FALSE; + } + assembly_info = heap_alloc(bytes_assembly_info); + if(!QueryActCtxW(0, guid_info.hActCtx, &guid_info.ulAssemblyRosterIndex, + AssemblyDetailedInformationInActivationContext, assembly_info, bytes_assembly_info, &bytes_assembly_info)) + { + ERR("QueryActCtxW failed: %d!\n", GetLastError()); + heap_free(assembly_info); + ReleaseActCtx(guid_info.hActCtx); + return FALSE; + } + + redirect_data = guid_info.lpData; + class_data = (void *)((char*)redirect_data + redirect_data->clrdata_offset); + + ptr_identity = assembly_info->lpAssemblyEncodedAssemblyIdentity; + ptr_name = (char *)class_data + class_data->name_offset; + ptr_version = (char *)class_data + class_data->version_offset; + + len_identity = assembly_info->ulEncodedAssemblyIdentityLength + sizeof(WCHAR); + len_name = class_data->name_len + sizeof(WCHAR); + if (class_data->version_len > 0) + len_version = class_data->version_len + sizeof(WCHAR); + + *buffer_len_required = sizeof(SXS_GUID_INFORMATION_CLR) + len_identity + len_version + len_name; + if (!buffer || buffer_len < *buffer_len_required) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + heap_free(assembly_info); + ReleaseActCtx(guid_info.hActCtx); + return FALSE; + } + + ret->cbSize = sizeof(SXS_GUID_INFORMATION_CLR); + ret->dwFlags = SXS_GUID_INFORMATION_CLR_FLAG_IS_CLASS; + + /* Copy strings into buffer */ + ret_strings = (char *)ret + sizeof(SXS_GUID_INFORMATION_CLR); + + memcpy(ret_strings, ptr_identity, len_identity); + ret->pcwszAssemblyIdentity = (WCHAR *)ret_strings; + ret_strings += len_identity; + + memcpy(ret_strings, ptr_name, len_name); + ret->pcwszTypeName = (WCHAR *)ret_strings; + ret_strings += len_name; + + if (len_version > 0) + { + memcpy(ret_strings, ptr_version, len_version); + ret->pcwszRuntimeVersion = (WCHAR *)ret_strings; + } + else + ret->pcwszRuntimeVersion = NULL; + + SetLastError(0); + + ReleaseActCtx(guid_info.hActCtx); + heap_free(assembly_info); + return TRUE; +} diff --git a/dlls/sxs/sxs.spec b/dlls/sxs/sxs.spec index 2a27313427..138d68f7d7 100644 --- a/dlls/sxs/sxs.spec +++ b/dlls/sxs/sxs.spec @@ -1,2 +1,3 @@ @ stdcall CreateAssemblyCache(ptr long) @ stdcall CreateAssemblyNameObject(ptr wstr long ptr) +@ stdcall SxsLookupClrGuid(long ptr ptr ptr long ptr) diff --git a/dlls/sxs/tests/Makefile.in b/dlls/sxs/tests/Makefile.in index 34609a14ae..46b5485d29 100644 --- a/dlls/sxs/tests/Makefile.in +++ b/dlls/sxs/tests/Makefile.in @@ -1,6 +1,10 @@ TESTDLL = sxs.dll -IMPORTS = sxs +IMPORTS = sxs shlwapi C_SRCS = \ cache.c \ - name.c + name.c \ + sxs.c + +RC_SRCS = resource.rc +IDL_SRCS = interfaces.idl \ No newline at end of file diff --git a/dlls/sxs/tests/comtest_dll.manifest b/dlls/sxs/tests/comtest_dll.manifest new file mode 100644 index 0000000000..ef6924de9e --- /dev/null +++ b/dlls/sxs/tests/comtest_dll.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + name="comtest" + version="1.0.0.0" + type="win32" + /> + <clrClass + clsid="{2e106e50-e7a4-4489-8538-83643f100fdc}" + threadingModel="Both" + name="DLL.Test" + runtimeVersion="v4.0.0.0"> + </clrClass> + <file name="comtest.dll"> + </file> +</assembly> diff --git a/dlls/sxs/tests/comtest_exe.manifest b/dlls/sxs/tests/comtest_exe.manifest new file mode 100644 index 0000000000..bc9ce4c045 --- /dev/null +++ b/dlls/sxs/tests/comtest_exe.manifest @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <dependency> + <dependentAssembly> + <assemblyIdentity + name="comtest" + version="1.0.0.0" + type="win32"/> + </dependentAssembly> + </dependency> +</assembly> diff --git a/dlls/sxs/tests/interfaces.idl b/dlls/sxs/tests/interfaces.idl new file mode 100644 index 0000000000..9e64988197 --- /dev/null +++ b/dlls/sxs/tests/interfaces.idl @@ -0,0 +1,33 @@ +/* + * Copyright 2018 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "unknwn.idl" + +[ + object, + uuid(1dbc4491-080d-45c5-a15d-1e3c4610bdd9), + local +] +interface ITest : IUnknown { + HRESULT Func([in, out] int *i); +}; + +[ + uuid(2e106e50-e7a4-4489-8538-83643f100fdc), +] +coclass Test { interface ITest; }; diff --git a/dlls/sxs/tests/resource.rc b/dlls/sxs/tests/resource.rc new file mode 100644 index 0000000000..dd2c25bf37 --- /dev/null +++ b/dlls/sxs/tests/resource.rc @@ -0,0 +1,27 @@ +/* + * Resources for sxs test suite. + * + * Copyright 2018 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" + +/* @makedep: comtest_exe.manifest */ +comtest_exe.manifest RCDATA comtest_exe.manifest + +/* @makedep: comtest_dll.manifest */ +comtest_dll.manifest RCDATA comtest_dll.manifest diff --git a/dlls/sxs/tests/sxs.c b/dlls/sxs/tests/sxs.c new file mode 100644 index 0000000000..d92bfb65c1 --- /dev/null +++ b/dlls/sxs/tests/sxs.c @@ -0,0 +1,223 @@ +/* + * Copyright 2018 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> + +#define COBJMACROS + +#include <windows.h> +#include <winsxs.h> +#include <corerror.h> +#include "shlwapi.h" + +#include "wine/test.h" +#include "wine/heap.h" + +#include "initguid.h" +#include "interfaces.h" + +BOOL (WINAPI *pSxsLookupClrGuid)(DWORD flags, GUID *clsid, HANDLE actctx, void *buffer, SIZE_T buffer_len, SIZE_T *buffer_len_required); + +#define SXS_LOOKUP_CLR_GUID_USE_ACTCTX 0x00000001 +#define SXS_LOOKUP_CLR_GUID_FIND_SURROGATE 0x00010000 +#define SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS 0x00020000 +#define SXS_LOOKUP_CLR_GUID_FIND_ANY (SXS_LOOKUP_CLR_GUID_FIND_SURROGATE | SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS) + +#define SXS_GUID_INFORMATION_CLR_FLAG_IS_SURROGATE 0x00000001 +#define SXS_GUID_INFORMATION_CLR_FLAG_IS_CLASS 0x00000002 + +typedef struct _SXS_GUID_INFORMATION_CLR +{ + DWORD cbSize; + DWORD dwFlags; + PCWSTR pcwszRuntimeVersion; + PCWSTR pcwszTypeName; + PCWSTR pcwszAssemblyIdentity; +} SXS_GUID_INFORMATION_CLR; + +static BOOL write_resource_file(const char *path_tmp, const char *name_res, const char *name_file, char *path_file) +{ + HRSRC rsrc; + void *rsrc_data; + DWORD rsrc_size; + BOOL ret; + HANDLE hfile; + + rsrc = FindResourceA(GetModuleHandleA(NULL), name_res, (LPCSTR)RT_RCDATA); + if (!rsrc) return FALSE; + + rsrc_data = LockResource(LoadResource(GetModuleHandleA(NULL), rsrc)); + if (!rsrc_data) return FALSE; + + rsrc_size = SizeofResource(GetModuleHandleA(NULL), rsrc); + if (!rsrc_size) return FALSE; + + strcpy(path_file, path_tmp); + PathAppendA(path_file, name_file); + hfile = CreateFileA(path_file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); + if (hfile == INVALID_HANDLE_VALUE) return FALSE; + + ret = WriteFile(hfile, rsrc_data, rsrc_size, &rsrc_size, NULL); + + CloseHandle(hfile); + return ret; +} + +static void run_test(void) +{ + SIZE_T buffer_size; + BOOL ret; + SXS_GUID_INFORMATION_CLR *info; + WCHAR expected_type_name[] = {'D','L','L','.','T','e','s','t',0}; + WCHAR expected_runtime_version[] = {'v','4','.','0','.','0','.','0',0}; + WCHAR expected_assembly_identity[] = {'c','o','m','t','e','s','t',',','t','y','p','e','=','"','w','i','n','3','2','"',',','v','e','r','s','i','o','n','=','"','1','.','0','.','0','.','0','"',0}; + + ret = pSxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS, (GUID*)&CLSID_Test, NULL, NULL, 0, &buffer_size); + ok(ret == FALSE, "Got %d\n", ret); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got %d\n", GetLastError()); + + info = heap_alloc(buffer_size); + ret = pSxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS, (GUID*)&CLSID_Test, NULL, info, buffer_size, &buffer_size); + ok(ret == TRUE, "Got %d\n", ret); + ok(GetLastError() == 0, "Got %d\n", GetLastError()); + + ok(info->dwFlags == SXS_GUID_INFORMATION_CLR_FLAG_IS_CLASS, "Got %d\n", info->dwFlags); + ok(lstrcmpW(info->pcwszTypeName, expected_type_name) == 0, "Got %s\n", wine_dbgstr_w(info->pcwszTypeName)); + ok(lstrcmpW(info->pcwszAssemblyIdentity, expected_assembly_identity) == 0, "Got %s\n", wine_dbgstr_w(info->pcwszAssemblyIdentity)); + ok(lstrcmpW(info->pcwszRuntimeVersion, expected_runtime_version) == 0, "Got %s\n", wine_dbgstr_w(info->pcwszRuntimeVersion)); + + heap_free(info); +} + +static void prepare_and_run_test(void) +{ + char path_tmp[MAX_PATH] = {0}; + char path_manifest_dll[MAX_PATH] = {0}; + char path_manifest_exe[MAX_PATH] = {0}; + BOOL success; + ACTCTXA context = {0}; + ULONG_PTR cookie; + HANDLE handle_context = 0; + + GetTempPathA(MAX_PATH, path_tmp); + + if (!write_resource_file(path_tmp, "comtest_exe.manifest", "exe.manifest", path_manifest_exe)) + { + ok(0, "Failed to create file for testing\n"); + goto cleanup; + } + + if (!write_resource_file(path_tmp, "comtest_dll.manifest", "comtest.manifest", path_manifest_dll)) + { + ok(0, "Failed to create file for testing\n"); + goto cleanup; + } + + context.cbSize = sizeof(ACTCTXA); + context.lpSource = path_manifest_exe; + context.lpAssemblyDirectory = path_tmp; + context.dwFlags = ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID; + + handle_context = CreateActCtxA(&context); + ok(handle_context != NULL && handle_context != INVALID_HANDLE_VALUE, "CreateActCtxA failed: %d\n", GetLastError()); + + if (handle_context == NULL || handle_context == INVALID_HANDLE_VALUE) + { + ok(0, "Failed to create activation context\n"); + goto cleanup; + } + + success = ActivateActCtx(handle_context, &cookie); + ok(success, "ActivateActCtx failed: %d\n", GetLastError()); + + run_test(); + +cleanup: + if (handle_context != NULL && handle_context != INVALID_HANDLE_VALUE) + { + success = DeactivateActCtx(0, cookie); + ok(success, "DeactivateActCtx failed: %d\n", GetLastError()); + ReleaseActCtx(handle_context); + } + if (*path_manifest_exe) + { + success = DeleteFileA(path_manifest_exe); + ok(success, "DeleteFileA failed: %d\n", GetLastError()); + } + if(*path_manifest_dll) + { + success = DeleteFileA(path_manifest_dll); + ok(success, "DeleteFileA failed: %d\n", GetLastError()); + } +} + +static void run_child_process(void) +{ + char cmdline[MAX_PATH]; + char exe[MAX_PATH]; + char **argv; + PROCESS_INFORMATION pi; + STARTUPINFOA si = { 0 }; + BOOL ret; + + winetest_get_mainargs(&argv); + + if (strstr(argv[0], ".exe")) + sprintf(exe, "%s", argv[0]); + else + sprintf(exe, "%s.exe", argv[0]); + sprintf(cmdline, "\"%s\" %s %s", argv[0], argv[1], "subtest"); + + si.cb = sizeof(si); + ret = CreateProcessA(exe, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "Could not create process: %u\n", GetLastError()); + + winetest_wait_child_process(pi.hProcess); + + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); +} + +static void test_SxsLookupClrGuid(void) +{ + SIZE_T buffer_size; + BOOL ret; + + ret = pSxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS, (GUID*)&CLSID_Test, NULL, NULL, 0, &buffer_size); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + ok(GetLastError() == ERROR_NOT_FOUND, "Expected ERROR_NOT_FOUND, got %d\n", GetLastError()); + + run_child_process(); +} + +START_TEST(sxs) +{ + int argc; + char **argv; + + pSxsLookupClrGuid = (void *)GetProcAddress(LoadLibraryA("sxs.dll"), "SxsLookupClrGuid"); + + argc = winetest_get_mainargs(&argv); + if (argc > 2) + { + prepare_and_run_test(); + return; + } + + test_SxsLookupClrGuid(); +} -- 2.18.0

1 0

[PATCH] winemac: Fix failure to render OpenGL on macOS 10.14 (Mojave).
by Ken Thomases 07 Feb '19

07 Feb '19

For programs linked against the macOS 10.14 SDK, Mojave makes all view hierarchies layer-backed. For views to which OpenGL contexts have been attached this caused a regression where they sometimes failed to render and just remain black. Updating the OpenGL context after the framework has assigned a layer to our view works around the problem. Thanks to Elviss Strazdins on Stack Overflow for the solution <https://stackoverflow.com/a/52938517/1312143>. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- dlls/winemac.drv/cocoa_window.m | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index e405cda..f43b26b 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -747,6 +747,12 @@ - (void) willRemoveSubview:(NSView*)subview [super willRemoveSubview:subview]; } + - (void) setLayer:(CALayer*)newLayer + { + [super setLayer:newLayer]; + [self updateGLContexts]; + } + /* * ---------- NSTextInputClient methods ---------- */ -- 2.10.2

1 0

[PATCH] ntdll: Reimplement condition variables on top of RtlWaitOnAddress().
by Zebediah Figura 07 Feb '19

07 Feb '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46208 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/sync.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 851356182e..693013f5a3 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1909,8 +1909,8 @@ void WINAPI RtlInitializeConditionVariable( RTL_CONDITION_VARIABLE *variable ) */ void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) { - if (interlocked_dec_if_nonzero( (int *)&variable->Ptr )) - NtReleaseKeyedEvent( 0, &variable->Ptr, FALSE, NULL ); + interlocked_xchg_add( (int *)&variable->Ptr, 1 ); + RtlWakeAddressSingle( variable ); } /*********************************************************************** @@ -1920,9 +1920,8 @@ void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) */ void WINAPI RtlWakeAllConditionVariable( RTL_CONDITION_VARIABLE *variable ) { - int val = interlocked_xchg( (int *)&variable->Ptr, 0 ); - while (val-- > 0) - NtReleaseKeyedEvent( 0, &variable->Ptr, FALSE, NULL ); + interlocked_xchg_add( (int *)&variable->Ptr, 1 ); + RtlWakeAddressAll( variable ); } /*********************************************************************** @@ -1944,17 +1943,14 @@ NTSTATUS WINAPI RtlSleepConditionVariableCS( RTL_CONDITION_VARIABLE *variable, R const LARGE_INTEGER *timeout ) { NTSTATUS status; - interlocked_xchg_add( (int *)&variable->Ptr, 1 ); + int val = *(int *)&variable->Ptr; + RtlLeaveCriticalSection( crit ); - status = NtWaitForKeyedEvent( 0, &variable->Ptr, FALSE, timeout ); - if (status != STATUS_SUCCESS) - { - if (!interlocked_dec_if_nonzero( (int *)&variable->Ptr )) - status = NtWaitForKeyedEvent( 0, &variable->Ptr, FALSE, NULL ); - } + status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); RtlEnterCriticalSection( crit ); + return status; } @@ -1981,19 +1977,14 @@ NTSTATUS WINAPI RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, const LARGE_INTEGER *timeout, ULONG flags ) { NTSTATUS status; - interlocked_xchg_add( (int *)&variable->Ptr, 1 ); + int val = *(int *)&variable->Ptr; if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) RtlReleaseSRWLockShared( lock ); else RtlReleaseSRWLockExclusive( lock ); - status = NtWaitForKeyedEvent( 0, &variable->Ptr, FALSE, timeout ); - if (status != STATUS_SUCCESS) - { - if (!interlocked_dec_if_nonzero( (int *)&variable->Ptr )) - status = NtWaitForKeyedEvent( 0, &variable->Ptr, FALSE, NULL ); - } + status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) RtlAcquireSRWLockShared( lock ); -- 2.20.1

1 0

[PATCH v2 1/2] comsvcs/tests: Add tests for implicit MTA creation in RegisterDispenser().
by Zebediah Figura 07 Feb '19

07 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: Add a short Sleep() to avoid test failures. dlls/comsvcs/tests/dispenser.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/comsvcs/tests/dispenser.c b/dlls/comsvcs/tests/dispenser.c index 187800ec6a..6fae802ef0 100644 --- a/dlls/comsvcs/tests/dispenser.c +++ b/dlls/comsvcs/tests/dispenser.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "ole2.h" #include "comsvcs.h" +#include "msxml.h" #include "wine/test.h" @@ -141,6 +142,17 @@ static const struct IDispenserDriverVtbl driver_vtbl = static IDispenserDriver DispenserDriver = { &driver_vtbl }; +static DWORD WINAPI com_thread(void *arg) +{ + IUnknown *unk; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + if (hr == S_OK) IUnknown_Release(unk); + + return hr; +} + static void create_dispenser(void) { static const WCHAR pool0[] = {'S','C','.','P','o','o','l',' ','0',' ','0',0}; @@ -149,7 +161,9 @@ static void create_dispenser(void) HRESULT hr; IDispenserManager *dispenser = NULL; IHolder *holder1 = NULL, *holder2 = NULL, *holder3 = NULL; + HANDLE thread; RESID resid; + DWORD ret; BSTR str; hr = CoCreateInstance( &CLSID_DispenserManager, NULL, CLSCTX_ALL, &IID_IDispenserManager, (void**)&dispenser); @@ -160,9 +174,23 @@ static void create_dispenser(void) return; } + thread = CreateThread(NULL, 0, com_thread, NULL, 0, NULL); + ok(!WaitForSingleObject(thread, 1000), "wait failed\n"); + GetExitCodeThread(thread, &ret); + ok(ret == CO_E_NOTINITIALIZED, "got unexpected hr %#x\n", ret); + hr = IDispenserManager_RegisterDispenser(dispenser, &DispenserDriver, pool0, &holder1); ok(hr == S_OK, "got 0x%08x\n", hr); + /* The above call creates an MTA thread, but we need to wait for it to + * actually initialize. */ + Sleep(200); + thread = CreateThread(NULL, 0, com_thread, NULL, 0, NULL); + ok(!WaitForSingleObject(thread, 1000), "wait failed\n"); + GetExitCodeThread(thread, &ret); +todo_wine + ok(ret == S_OK, "got unexpected hr %#x\n", ret); + hr = IDispenserManager_RegisterDispenser(dispenser, &DispenserDriver, pool0, &holder2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(holder1 != holder2, "same holder object returned\n"); -- 2.20.1

1 1

[PATCH] mshtml: Add style.borderCollapse property implementation.
by Jacek Caban 07 Feb '19

07 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 27 +++++++++++++++++++-------- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 16 ++++++++++++++++ 3 files changed, 36 insertions(+), 8 deletions(-)

1 0

[PATCH 1/2] comsvcs/tests: Add tests for implicit MTA creation in RegisterDispenser().
by Zebediah Figura 07 Feb '19

07 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/comsvcs/tests/dispenser.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/comsvcs/tests/dispenser.c b/dlls/comsvcs/tests/dispenser.c index 187800ec6a..c6d85ead14 100644 --- a/dlls/comsvcs/tests/dispenser.c +++ b/dlls/comsvcs/tests/dispenser.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "ole2.h" #include "comsvcs.h" +#include "msxml.h" #include "wine/test.h" @@ -141,6 +142,17 @@ static const struct IDispenserDriverVtbl driver_vtbl = static IDispenserDriver DispenserDriver = { &driver_vtbl }; +static DWORD WINAPI com_thread(void *arg) +{ + IUnknown *unk; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + if (hr == S_OK) IUnknown_Release(unk); + + return hr; +} + static void create_dispenser(void) { static const WCHAR pool0[] = {'S','C','.','P','o','o','l',' ','0',' ','0',0}; @@ -149,7 +161,9 @@ static void create_dispenser(void) HRESULT hr; IDispenserManager *dispenser = NULL; IHolder *holder1 = NULL, *holder2 = NULL, *holder3 = NULL; + HANDLE thread; RESID resid; + DWORD ret; BSTR str; hr = CoCreateInstance( &CLSID_DispenserManager, NULL, CLSCTX_ALL, &IID_IDispenserManager, (void**)&dispenser); @@ -160,9 +174,20 @@ static void create_dispenser(void) return; } + thread = CreateThread(NULL, 0, com_thread, NULL, 0, NULL); + ok(!WaitForSingleObject(thread, 1000), "wait failed\n"); + GetExitCodeThread(thread, &ret); + ok(ret == CO_E_NOTINITIALIZED, "got unexpected hr %#x\n", ret); + hr = IDispenserManager_RegisterDispenser(dispenser, &DispenserDriver, pool0, &holder1); ok(hr == S_OK, "got 0x%08x\n", hr); + thread = CreateThread(NULL, 0, com_thread, NULL, 0, NULL); + ok(!WaitForSingleObject(thread, 1000), "wait failed\n"); + GetExitCodeThread(thread, &ret); +todo_wine + ok(ret == S_OK, "got unexpected hr %#x\n", ret); + hr = IDispenserManager_RegisterDispenser(dispenser, &DispenserDriver, pool0, &holder2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(holder1 != holder2, "same holder object returned\n"); -- 2.20.1

2 2

[PATCH v2 1/5] comctl32/listbox: Check for out of bounds using the index when painting the item
by Gabriel Ivăncescu 07 Feb '19

07 Feb '19

Needed for LBS_NODATA. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/listbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index cb645b4..9e6d8ea 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -508,7 +508,7 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, RECT r; HRGN hrgn; - if (!item) + if (index >= descr->nb_items) { if (action == ODA_FOCUS) DrawFocusRect( hdc, rect ); -- 2.19.1

2 9

[PATCH 1/4] wined3d: Store the index buffer in the wined3d_stateblock_state structure.
by Zebediah Figura 07 Feb '19

07 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 32 +++++++++++++++--------- dlls/wined3d/stateblock.c | 45 ++++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 4 +++ 3 files changed, 54 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bce2a3519d..e7ad5441eb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1865,24 +1865,32 @@ void CDECL wined3d_device_set_index_buffer(struct wined3d_device *device, TRACE("device %p, buffer %p, format %s, offset %u.\n", device, buffer, debug_d3dformat(format_id), offset); - prev_buffer = device->update_state->index_buffer; - prev_format = device->update_state->index_format; - prev_offset = device->update_state->index_offset; + prev_buffer = device->state.index_buffer; + prev_format = device->state.index_format; + prev_offset = device->state.index_offset; - device->update_state->index_buffer = buffer; - device->update_state->index_format = format_id; - device->update_state->index_offset = offset; + if (buffer) + wined3d_buffer_incref(buffer); + if (device->update_stateblock_state->index_buffer) + wined3d_buffer_decref(device->update_stateblock_state->index_buffer); + device->update_stateblock_state->index_buffer = buffer; + device->update_stateblock_state->index_format = format_id; if (device->recording) + { device->recording->changed.indices = TRUE; + return; + } if (prev_buffer == buffer && prev_format == format_id && prev_offset == offset) return; if (buffer) wined3d_buffer_incref(buffer); - if (!device->recording) - wined3d_cs_emit_set_index_buffer(device->cs, buffer, format_id, offset); + device->state.index_buffer = buffer; + device->state.index_format = format_id; + device->state.index_offset = offset; + wined3d_cs_emit_set_index_buffer(device->cs, buffer, format_id, offset); if (prev_buffer) wined3d_buffer_decref(prev_buffer); } @@ -1902,7 +1910,9 @@ void CDECL wined3d_device_set_base_vertex_index(struct wined3d_device *device, I { TRACE("device %p, base_index %d.\n", device, base_index); - device->update_state->base_vertex_index = base_index; + device->update_stateblock_state->base_vertex_index = base_index; + if (!device->recording) + device->state.base_vertex_index = base_index; } INT CDECL wined3d_device_get_base_vertex_index(const struct wined3d_device *device) @@ -5219,11 +5229,11 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso device->state.index_buffer = NULL; } - if (device->recording && &device->update_state->index_buffer->resource == resource) + if (device->recording && &device->update_stateblock_state->index_buffer->resource == resource) { ERR("Buffer resource %p is still in use by stateblock %p as index buffer.\n", resource, device->recording); - device->update_state->index_buffer = NULL; + device->update_stateblock_state->index_buffer = NULL; } break; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 037357c975..4b76b38326 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -524,9 +524,16 @@ void state_unbind_resources(struct wined3d_state *state) void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) { struct wined3d_texture *texture; + struct wined3d_buffer *buffer; struct wined3d_shader *shader; unsigned int i; + if ((buffer = state->index_buffer)) + { + state->index_buffer = NULL; + wined3d_buffer_decref(buffer); + } + if ((shader = state->vs)) { state->vs = NULL; @@ -791,22 +798,20 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) } if (stateblock->changed.indices - && ((stateblock->state.index_buffer != src_state->index_buffer) - || (stateblock->state.base_vertex_index != src_state->base_vertex_index) - || (stateblock->state.index_format != src_state->index_format) - || (stateblock->state.index_offset != src_state->index_offset))) + && ((stateblock->stateblock_state.index_buffer != state->index_buffer) + || (stateblock->stateblock_state.base_vertex_index != state->base_vertex_index) + || (stateblock->stateblock_state.index_format != state->index_format))) { TRACE("Updating index buffer to %p, base vertex index to %d.\n", - src_state->index_buffer, src_state->base_vertex_index); + state->index_buffer, state->base_vertex_index); - if (src_state->index_buffer) - wined3d_buffer_incref(src_state->index_buffer); - if (stateblock->state.index_buffer) - wined3d_buffer_decref(stateblock->state.index_buffer); - stateblock->state.index_buffer = src_state->index_buffer; - stateblock->state.base_vertex_index = src_state->base_vertex_index; - stateblock->state.index_format = src_state->index_format; - stateblock->state.index_offset = src_state->index_offset; + if (state->index_buffer) + wined3d_buffer_incref(state->index_buffer); + if (stateblock->stateblock_state.index_buffer) + wined3d_buffer_decref(stateblock->stateblock_state.index_buffer); + stateblock->stateblock_state.index_buffer = state->index_buffer; + stateblock->stateblock_state.base_vertex_index = state->base_vertex_index; + stateblock->stateblock_state.index_format = state->index_format; } if (stateblock->changed.vertexDecl && stateblock->state.vertex_declaration != src_state->vertex_declaration) @@ -1106,9 +1111,17 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) if (stateblock->changed.indices) { - wined3d_device_set_index_buffer(device, stateblock->state.index_buffer, - stateblock->state.index_format, stateblock->state.index_offset); - wined3d_device_set_base_vertex_index(device, stateblock->state.base_vertex_index); + if (stateblock->stateblock_state.index_buffer) + wined3d_buffer_incref(stateblock->stateblock_state.index_buffer); + if (state->index_buffer) + wined3d_buffer_decref(state->index_buffer); + state->index_buffer = stateblock->stateblock_state.index_buffer; + state->index_format = stateblock->stateblock_state.index_format; + state->base_vertex_index = stateblock->stateblock_state.base_vertex_index; + + wined3d_device_set_index_buffer(device, stateblock->stateblock_state.index_buffer, + stateblock->stateblock_state.index_format, 0); + wined3d_device_set_base_vertex_index(device, stateblock->stateblock_state.base_vertex_index); } if (stateblock->changed.vertexDecl && stateblock->state.vertex_declaration) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index df116cef1c..87e0b23596 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2967,6 +2967,10 @@ struct wined3d_dummy_textures struct wined3d_stateblock_state { + struct wined3d_buffer *index_buffer; + enum wined3d_format_id index_format; + int base_vertex_index; + struct wined3d_shader *vs; struct wined3d_vec4 vs_consts_f[WINED3D_MAX_VS_CONSTS_F]; struct wined3d_ivec4 vs_consts_i[WINED3D_MAX_CONSTS_I]; -- 2.20.1

2 7

[PATCH 1/2] wined3d: Ignore multisample quality for MULTISAMPLE_NONE in context_find_fbo_entry().
by Paul Gofman 07 Feb '19

07 Feb '19

Fixes 1 of 2 issues discussed in https://bugs.winehq.org/show_bug.cgi?id=39080. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/wined3d/context.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 37203738fe..c7eb7849fc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -599,7 +599,8 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, depth_stencil = &ds_null; } else if (ds_texture->resource.multisample_type != rt_texture->resource.multisample_type - || ds_texture->resource.multisample_quality != rt_texture->resource.multisample_quality) + || (ds_texture->resource.multisample_type + && ds_texture->resource.multisample_quality != rt_texture->resource.multisample_quality)) { WARN("Color multisample type %u and quality %u, depth stencil has %u and %u, disabling ds buffer.\n", rt_texture->resource.multisample_type, rt_texture->resource.multisample_quality, -- 2.20.1

2 3

[PATCH v3 1/5] gdi32: Add a helper function to get the transform matrices.
by Byeongsik Jeon 07 Feb '19

07 Feb '19

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- v3: Huw's comments are applied. Thank you. 'Vertical' transform position issue: Vertical transform must be separated from the rotation transform and applied before the scale transform. This is an issue at lfWidth != 0. I'll post related patch later. [v2 PATCH 4/7] is included in this patch. [v2 PATCH 7/7] has been cancelled. It's not an improvement. dlls/gdi32/freetype.c | 284 +++++++++++++++++++++--------------------- 1 file changed, 144 insertions(+), 140 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index de62425173..c1a3a548eb 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -241,6 +241,14 @@ MAKE_FUNCPTR(FcPatternGetString); #define WINE_FONT_DIR "fonts" #endif +/* get_glyph_outline() glyph transform matrices index */ +enum +{ + matrix_hori, + matrix_vert, + matrix_unrotated +}; + /* This is basically a copy of FT_Bitmap_Size with an extra element added */ typedef struct { FT_Short height; @@ -6588,6 +6596,111 @@ static inline FT_Vector normalize_vector(FT_Vector *vec) return out; } +static BOOL get_transform_matrices( GdiFont *font, BOOL vertical, const MAT2 *user_transform, + FT_Matrix matrices[3] ) +{ + static const FT_Matrix identity_mat = { (1 << 16), 0, 0, (1 << 16) }; + BOOL needs_transform = FALSE; + double width_ratio; + int i; + + matrices[matrix_unrotated] = identity_mat; + + /* Scaling factor */ + if (font->aveWidth) + { + TEXTMETRICW tm; + get_text_metrics( font, &tm ); + + width_ratio = (double)font->aveWidth; + width_ratio /= (double)font->potm->otmTextMetrics.tmAveCharWidth; + } + else + width_ratio = font->scale_y; + + /* Scaling transform */ + if (width_ratio != 1.0 || font->scale_y != 1.0) + { + FT_Matrix scale_mat; + scale_mat.xx = FT_FixedFromFloat( width_ratio ); + scale_mat.xy = 0; + scale_mat.yx = 0; + scale_mat.yy = FT_FixedFromFloat( font->scale_y ); + + pFT_Matrix_Multiply( &scale_mat, &matrices[matrix_unrotated] ); + needs_transform = TRUE; + } + + /* Slant transform */ + if (font->fake_italic) + { + FT_Matrix slant_mat; + slant_mat.xx = (1 << 16); + slant_mat.xy = (1 << 16) >> 2; + slant_mat.yx = 0; + slant_mat.yy = (1 << 16); + + pFT_Matrix_Multiply( &slant_mat, &matrices[matrix_unrotated] ); + needs_transform = TRUE; + } + + /* Rotation transform */ + matrices[matrix_hori] = matrices[matrix_unrotated]; + if (font->orientation % 3600) + { + FT_Matrix rotation_mat; + FT_Vector angle; + + pFT_Vector_Unit( &angle, MulDiv( 1 << 16, font->orientation, 10 ) ); + rotation_mat.xx = angle.x; + rotation_mat.xy = -angle.y; + rotation_mat.yx = angle.y; + rotation_mat.yy = angle.x; + pFT_Matrix_Multiply( &rotation_mat, &matrices[matrix_hori] ); + needs_transform = TRUE; + } + + /* Vertical transform */ + matrices[matrix_vert] = matrices[matrix_hori]; + if (vertical) + { + FT_Matrix vertical_mat = { 0, -(1 << 16), 1 << 16, 0 }; /* 90 degrees rotation */ + + pFT_Matrix_Multiply( &vertical_mat, &matrices[matrix_vert] ); + needs_transform = TRUE; + } + + /* World transform */ + if (!is_identity_FMAT2( &font->font_desc.matrix )) + { + FT_Matrix world_mat; + world_mat.xx = FT_FixedFromFloat( font->font_desc.matrix.eM11 ); + world_mat.xy = -FT_FixedFromFloat( font->font_desc.matrix.eM21 ); + world_mat.yx = -FT_FixedFromFloat( font->font_desc.matrix.eM12 ); + world_mat.yy = FT_FixedFromFloat( font->font_desc.matrix.eM22 ); + + for (i = 0; i < 3; i++) + pFT_Matrix_Multiply( &world_mat, &matrices[i] ); + needs_transform = TRUE; + } + + /* Extra transformation specified by caller */ + if (!is_identity_MAT2( user_transform )) + { + FT_Matrix user_mat; + user_mat.xx = FT_FixedFromFIXED( user_transform->eM11 ); + user_mat.xy = FT_FixedFromFIXED( user_transform->eM21 ); + user_mat.yx = FT_FixedFromFIXED( user_transform->eM12 ); + user_mat.yy = FT_FixedFromFIXED( user_transform->eM22 ); + + for (i = 0; i < 3; i++) + pFT_Matrix_Multiply( &user_mat, &matrices[i] ); + needs_transform = TRUE; + } + + return needs_transform; +} + static BOOL get_bold_glyph_outline(FT_GlyphSlot glyph, LONG ppem, FT_Glyph_Metrics *metrics) { FT_Error err; @@ -6629,7 +6742,7 @@ static inline BYTE get_max_level( UINT format ) extern const unsigned short vertical_orientation_table[] DECLSPEC_HIDDEN; -static BOOL check_unicode_tategaki(WCHAR uchar) +static BOOL check_unicode_vertical_orientation( WCHAR uchar ) { unsigned short orientation = vertical_orientation_table[vertical_orientation_table[vertical_orientation_table[uchar >> 8]+((uchar >> 4) & 0x0f)]+ (uchar & 0xf)]; @@ -6934,7 +7047,6 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, LPGLYPHMETRICS lpgm, ABC *abc, DWORD buflen, LPVOID buf, const MAT2* lpmat) { - static const FT_Matrix identityMat = {(1 << 16), 0, 0, (1 << 16)}; GLYPHMETRICS gm; FT_Face ft_face = incoming_font->ft_face; GdiFont *font = incoming_font; @@ -6946,14 +7058,10 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, INT left, right, top = 0, bottom = 0; FT_Vector adv; INT origin_x = 0, origin_y = 0; - FT_Angle angle = 0; FT_Int load_flags = get_load_flags(format); - double widthRatio = 1.0; - FT_Matrix transMat = identityMat; - FT_Matrix transMatUnrotated; - FT_Matrix transMatTategaki; - BOOL needsTransform = FALSE; - BOOL tategaki = (font->name[0] == '@'); + FT_Matrix matrices[3]; + BOOL needs_transform = FALSE; + BOOL vertical = (font->name[0] == '@'); BOOL vertical_metrics; UINT original_index; @@ -6974,7 +7082,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, glyph_index = glyph; original_index = glyph_index; format &= ~GGO_GLYPH_INDEX; - /* TODO: Window also turns off tategaki for glyphs passed in by index + /* TODO: Window also turns off vertical for glyphs passed in by index if their unicode code points fall outside of the range that is rotated. */ } else { @@ -6982,8 +7090,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, get_glyph_index_linked(incoming_font, glyph, &font, &glyph_index, &vert); ft_face = font->ft_face; original_index = glyph_index; - if (!vert && tategaki) - tategaki = check_unicode_tategaki(glyph); + if (!vert && vertical) + vertical = check_unicode_vertical_orientation( glyph ); } format &= ~GGO_UNHINTED; @@ -7008,121 +7116,15 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if (!font->gm[original_index / GM_BLOCK_SIZE]) font->gm[original_index / GM_BLOCK_SIZE] = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, sizeof(GM) * GM_BLOCK_SIZE); - /* Scaling factor */ - if (font->aveWidth) - { - TEXTMETRICW tm; - - get_text_metrics(font, &tm); - - widthRatio = (double)font->aveWidth; - widthRatio /= (double)font->potm->otmTextMetrics.tmAveCharWidth; - } - else - widthRatio = font->scale_y; - - /* Scaling transform */ - if (widthRatio != 1.0 || font->scale_y != 1.0) - { - FT_Matrix scaleMat; - scaleMat.xx = FT_FixedFromFloat(widthRatio); - scaleMat.xy = 0; - scaleMat.yx = 0; - scaleMat.yy = FT_FixedFromFloat(font->scale_y); - - pFT_Matrix_Multiply(&scaleMat, &transMat); - needsTransform = TRUE; - } - - /* Slant transform */ - if (font->fake_italic) { - FT_Matrix slantMat; - - slantMat.xx = (1 << 16); - slantMat.xy = ((1 << 16) >> 2); - slantMat.yx = 0; - slantMat.yy = (1 << 16); - pFT_Matrix_Multiply(&slantMat, &transMat); - needsTransform = TRUE; - } - - /* Rotation transform */ - transMatUnrotated = transMat; - transMatTategaki = transMat; - if(font->orientation || tategaki) { - FT_Matrix rotationMat; - FT_Matrix taterotationMat; - FT_Vector vecAngle; - - double orient = font->orientation / 10.0; - double tate_orient = 0.f; - - if (tategaki) - tate_orient = ((font->orientation+900)%3600)/10.0; - else - tate_orient = font->orientation/10.0; - - if (orient) - { - angle = FT_FixedFromFloat(orient); - pFT_Vector_Unit(&vecAngle, angle); - rotationMat.xx = vecAngle.x; - rotationMat.xy = -vecAngle.y; - rotationMat.yx = -rotationMat.xy; - rotationMat.yy = rotationMat.xx; - - pFT_Matrix_Multiply(&rotationMat, &transMat); - } - - if (tate_orient) - { - angle = FT_FixedFromFloat(tate_orient); - pFT_Vector_Unit(&vecAngle, angle); - taterotationMat.xx = vecAngle.x; - taterotationMat.xy = -vecAngle.y; - taterotationMat.yx = -taterotationMat.xy; - taterotationMat.yy = taterotationMat.xx; - pFT_Matrix_Multiply(&taterotationMat, &transMatTategaki); - } - - needsTransform = TRUE; - } - - /* World transform */ - if (!is_identity_FMAT2(&font->font_desc.matrix)) - { - FT_Matrix worldMat; - worldMat.xx = FT_FixedFromFloat(font->font_desc.matrix.eM11); - worldMat.xy = -FT_FixedFromFloat(font->font_desc.matrix.eM21); - worldMat.yx = -FT_FixedFromFloat(font->font_desc.matrix.eM12); - worldMat.yy = FT_FixedFromFloat(font->font_desc.matrix.eM22); - pFT_Matrix_Multiply(&worldMat, &transMat); - pFT_Matrix_Multiply(&worldMat, &transMatUnrotated); - pFT_Matrix_Multiply(&worldMat, &transMatTategaki); - needsTransform = TRUE; - } - - /* Extra transformation specified by caller */ - if (!is_identity_MAT2(lpmat)) - { - FT_Matrix extraMat; - extraMat.xx = FT_FixedFromFIXED(lpmat->eM11); - extraMat.xy = FT_FixedFromFIXED(lpmat->eM21); - extraMat.yx = FT_FixedFromFIXED(lpmat->eM12); - extraMat.yy = FT_FixedFromFIXED(lpmat->eM22); - pFT_Matrix_Multiply(&extraMat, &transMat); - pFT_Matrix_Multiply(&extraMat, &transMatUnrotated); - pFT_Matrix_Multiply(&extraMat, &transMatTategaki); - needsTransform = TRUE; - } + needs_transform = get_transform_matrices( font, vertical, lpmat, matrices ); - vertical_metrics = (tategaki && FT_HAS_VERTICAL(ft_face)); + vertical_metrics = (vertical && FT_HAS_VERTICAL(ft_face)); /* there is a freetype bug where vertical metrics are only properly scaled and correct in 2.4.0 or greater */ if ((vertical_metrics) && (FT_Version.major < 2 || (FT_Version.major == 2 && FT_Version.minor < 4))) vertical_metrics = FALSE; - if (needsTransform || format != GGO_BITMAP) load_flags |= FT_LOAD_NO_BITMAP; + if (needs_transform || format != GGO_BITMAP) load_flags |= FT_LOAD_NO_BITMAP; if (vertical_metrics) load_flags |= FT_LOAD_VERTICAL_LAYOUT; err = pFT_Load_Glyph(ft_face, glyph_index, load_flags); @@ -7153,7 +7155,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, /* metrics.width = min( metrics.width, ptm->tmMaxCharWidth << 6 ); */ } - if(!needsTransform) { + if (!needs_transform) { left = (INT)(metrics.horiBearingX) & -64; right = (INT)((metrics.horiBearingX + metrics.width) + 63) & -64; top = (metrics.horiBearingY + 63) & -64; @@ -7177,7 +7179,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, vec.x = metrics.horiBearingX + xc * metrics.width; vec.y = metrics.horiBearingY - yc * metrics.height; TRACE("Vec %ld,%ld\n", vec.x, vec.y); - pFT_Vector_Transform(&vec, &transMatTategaki); + pFT_Vector_Transform( &vec, &matrices[matrix_vert] ); if(xc == 0 && yc == 0) { left = right = vec.x; top = bottom = vec.y; @@ -7194,7 +7196,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, bottom = bottom & -64; top = (top + 63) & -64; - if (tategaki && (font->potm || get_outline_text_metrics(font))) + if (vertical && (font->potm || get_outline_text_metrics(font))) { if (vertical_metrics) lsb = metrics.horiBearingY + metrics.vertBearingY; @@ -7203,7 +7205,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, vec.x = lsb; vec.y = font->potm->otmDescent << 6; TRACE ("Vec %ld,%ld\n", vec.x>>6, vec.y>>6); - pFT_Vector_Transform(&vec, &transMat); + pFT_Vector_Transform( &vec, &matrices[matrix_hori] ); origin_x = (vec.x + left) & -64; origin_y = (vec.y + top + 63) & -64; lsb -= metrics.horiBearingY; @@ -7216,24 +7218,26 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, } TRACE("transformed box: (%d,%d - %d,%d)\n", left, top, right, bottom); - adv = get_advance_metric(incoming_font, font, &metrics, &transMat, vertical_metrics); + adv = get_advance_metric( incoming_font, font, &metrics, &matrices[matrix_hori], + vertical_metrics); gm.gmCellIncX = adv.x >> 6; gm.gmCellIncY = adv.y >> 6; - adv = get_advance_metric(incoming_font, font, &metrics, &transMatUnrotated, vertical_metrics); + adv = get_advance_metric( incoming_font, font, &metrics, &matrices[matrix_unrotated], + vertical_metrics); adv.x = pFT_Vector_Length(&adv); adv.y = 0; vec.x = lsb; vec.y = 0; - pFT_Vector_Transform(&vec, &transMatUnrotated); + pFT_Vector_Transform( &vec, &matrices[matrix_unrotated] ); if(lsb > 0) abc->abcA = pFT_Vector_Length(&vec) >> 6; else abc->abcA = -((pFT_Vector_Length(&vec) + 63) >> 6); /* We use lsb again to avoid rounding errors */ - vec.x = lsb + (tategaki ? metrics.height : metrics.width); + vec.x = lsb + (vertical ? metrics.height : metrics.width); vec.y = 0; - pFT_Vector_Transform(&vec, &transMatUnrotated); + pFT_Vector_Transform( &vec, &matrices[matrix_unrotated] ); abc->abcB = ((pFT_Vector_Length(&vec) + 63) >> 6) - abc->abcA; } @@ -7312,8 +7316,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, ft_bitmap.pixel_mode = ft_pixel_mode_mono; ft_bitmap.buffer = buf; - if(needsTransform) - pFT_Outline_Transform(&ft_face->glyph->outline, &transMatTategaki); + if (needs_transform) + pFT_Outline_Transform( &ft_face->glyph->outline, &matrices[matrix_vert] ); pFT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom ); @@ -7373,8 +7377,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, ft_bitmap.pixel_mode = ft_pixel_mode_grays; ft_bitmap.buffer = buf; - if(needsTransform) - pFT_Outline_Transform(&ft_face->glyph->outline, &transMatTategaki); + if (needs_transform) + pFT_Outline_Transform( &ft_face->glyph->outline, &matrices[matrix_vert] ); pFT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom ); @@ -7488,8 +7492,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, memset(buf, 0, buflen); dst = buf; - if ( needsTransform ) - pFT_Outline_Transform (&ft_face->glyph->outline, &transMatTategaki); + if (needs_transform) + pFT_Outline_Transform( &ft_face->glyph->outline, &matrices[matrix_vert] ); #ifdef FT_LCD_FILTER_H if ( pFT_Library_SetLcdFilter ) @@ -7574,8 +7578,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if(buflen == 0) buf = NULL; - if (needsTransform && buf) - pFT_Outline_Transform(outline, &transMatTategaki); + if (needs_transform && buf) + pFT_Outline_Transform( outline, &matrices[matrix_vert] ); needed = get_native_glyph_outline(outline, buflen, NULL); @@ -7592,8 +7596,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, FT_Outline *outline = &ft_face->glyph->outline; if(buflen == 0) buf = NULL; - if (needsTransform && buf) - pFT_Outline_Transform(outline, &transMat); + if (needs_transform && buf) + pFT_Outline_Transform( outline, &matrices[matrix_vert] ); needed = get_bezier_glyph_outline(outline, buflen, NULL); -- 2.20.1

2 6

[PATCH 2/2] gdi32: Add a helper function to get the transform matrices.
by Huw Davies 07 Feb '19

07 Feb '19

From: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 250 +++++++++++++++++++++--------------------- 1 file changed, 126 insertions(+), 124 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 22dfe87501..b21365d61e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6588,6 +6588,119 @@ static inline FT_Vector normalize_vector(FT_Vector *vec) return out; } +/* get_glyph_outline() glyph transform matrices index */ +enum matrices_index +{ + matrix_hori, + matrix_vert, + matrix_unrotated +}; + +static BOOL get_transform_matrices( GdiFont *font, BOOL vertical, const MAT2 *user_transform, + FT_Matrix matrices[3] ) +{ + static const FT_Matrix identity_mat = { (1 << 16), 0, 0, (1 << 16) }; + BOOL needs_transform = FALSE; + double width_ratio; + int i; + + matrices[matrix_unrotated] = identity_mat; + + /* Scaling factor */ + if (font->aveWidth) + { + TEXTMETRICW tm; + get_text_metrics( font, &tm ); + + width_ratio = (double)font->aveWidth; + width_ratio /= (double)font->potm->otmTextMetrics.tmAveCharWidth; + } + else + width_ratio = font->scale_y; + + /* Scaling transform */ + if (width_ratio != 1.0 || font->scale_y != 1.0) + { + FT_Matrix scale_mat; + scale_mat.xx = FT_FixedFromFloat( width_ratio ); + scale_mat.xy = 0; + scale_mat.yx = 0; + scale_mat.yy = FT_FixedFromFloat( font->scale_y ); + + pFT_Matrix_Multiply( &scale_mat, &matrices[matrix_unrotated] ); + needs_transform = TRUE; + } + + /* Slant transform */ + if (font->fake_italic) + { + FT_Matrix slant_mat; + slant_mat.xx = (1 << 16); + slant_mat.xy = (1 << 16) >> 2; + slant_mat.yx = 0; + slant_mat.yy = (1 << 16); + + pFT_Matrix_Multiply( &slant_mat, &matrices[matrix_unrotated] ); + needs_transform = TRUE; + } + + /* Rotation transform */ + matrices[matrix_hori] = matrices[matrix_unrotated]; + if (font->orientation % 3600) + { + FT_Matrix rotation_mat; + FT_Vector angle; + + pFT_Vector_Unit( &angle, MulDiv( 1 << 16, font->orientation, 10 ) ); + rotation_mat.xx = angle.x; + rotation_mat.xy = -angle.y; + rotation_mat.yx = angle.y; + rotation_mat.yy = angle.x; + pFT_Matrix_Multiply( &rotation_mat, &matrices[matrix_hori] ); + needs_transform = TRUE; + } + + /* Vertical transform */ + matrices[matrix_vert] = matrices[matrix_hori]; + if (vertical) + { + FT_Matrix vertical_mat = { 0, -(1 << 16), 1 << 16, 0 }; /* 90 degrees rotation */ + + pFT_Matrix_Multiply( &vertical_mat, &matrices[matrix_vert] ); + needs_transform = TRUE; + } + + /* World transform */ + if (!is_identity_FMAT2( &font->font_desc.matrix )) + { + FT_Matrix world_mat; + world_mat.xx = FT_FixedFromFloat( font->font_desc.matrix.eM11 ); + world_mat.xy = -FT_FixedFromFloat( font->font_desc.matrix.eM21 ); + world_mat.yx = -FT_FixedFromFloat( font->font_desc.matrix.eM12 ); + world_mat.yy = FT_FixedFromFloat( font->font_desc.matrix.eM22 ); + + for (i = 0; i < 3; i++) + pFT_Matrix_Multiply( &world_mat, &matrices[i] ); + needs_transform = TRUE; + } + + /* Extra transformation specified by caller */ + if (!is_identity_MAT2( user_transform )) + { + FT_Matrix user_mat; + user_mat.xx = FT_FixedFromFIXED( user_transform->eM11 ); + user_mat.xy = FT_FixedFromFIXED( user_transform->eM21 ); + user_mat.yx = FT_FixedFromFIXED( user_transform->eM12 ); + user_mat.yy = FT_FixedFromFIXED( user_transform->eM22 ); + + for (i = 0; i < 3; i++) + pFT_Matrix_Multiply( &user_mat, &matrices[i] ); + needs_transform = TRUE; + } + + return needs_transform; +} + static BOOL get_bold_glyph_outline(FT_GlyphSlot glyph, LONG ppem, FT_Glyph_Metrics *metrics) { FT_Error err; @@ -6934,7 +7047,6 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, LPGLYPHMETRICS lpgm, ABC *abc, DWORD buflen, LPVOID buf, const MAT2* lpmat) { - static const FT_Matrix identityMat = {(1 << 16), 0, 0, (1 << 16)}; GLYPHMETRICS gm; FT_Face ft_face = incoming_font->ft_face; GdiFont *font = incoming_font; @@ -6946,12 +7058,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, INT left, right, top = 0, bottom = 0; FT_Vector adv; INT origin_x = 0, origin_y = 0; - FT_Angle angle = 0; FT_Int load_flags = get_load_flags(format); - double widthRatio = 1.0; - FT_Matrix transMat = identityMat; - FT_Matrix transMatUnrotated; - FT_Matrix transMatTategaki; + FT_Matrix matrices[3]; BOOL needsTransform = FALSE; BOOL tategaki = (font->name[0] == '@'); BOOL vertical_metrics; @@ -7008,113 +7116,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if (!font->gm[original_index / GM_BLOCK_SIZE]) font->gm[original_index / GM_BLOCK_SIZE] = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, sizeof(GM) * GM_BLOCK_SIZE); - /* Scaling factor */ - if (font->aveWidth) - { - TEXTMETRICW tm; - - get_text_metrics(font, &tm); - - widthRatio = (double)font->aveWidth; - widthRatio /= (double)font->potm->otmTextMetrics.tmAveCharWidth; - } - else - widthRatio = font->scale_y; - - /* Scaling transform */ - if (widthRatio != 1.0 || font->scale_y != 1.0) - { - FT_Matrix scaleMat; - scaleMat.xx = FT_FixedFromFloat(widthRatio); - scaleMat.xy = 0; - scaleMat.yx = 0; - scaleMat.yy = FT_FixedFromFloat(font->scale_y); - - pFT_Matrix_Multiply(&scaleMat, &transMat); - needsTransform = TRUE; - } - - /* Slant transform */ - if (font->fake_italic) { - FT_Matrix slantMat; - - slantMat.xx = (1 << 16); - slantMat.xy = ((1 << 16) >> 2); - slantMat.yx = 0; - slantMat.yy = (1 << 16); - pFT_Matrix_Multiply(&slantMat, &transMat); - needsTransform = TRUE; - } - - /* Rotation transform */ - transMatUnrotated = transMat; - transMatTategaki = transMat; - if(font->orientation || tategaki) { - FT_Matrix rotationMat; - FT_Matrix taterotationMat; - FT_Vector vecAngle; - - double orient = font->orientation / 10.0; - double tate_orient = 0.f; - - if (tategaki) - tate_orient = ((font->orientation+900)%3600)/10.0; - else - tate_orient = font->orientation/10.0; - - if (orient) - { - angle = FT_FixedFromFloat(orient); - pFT_Vector_Unit(&vecAngle, angle); - rotationMat.xx = vecAngle.x; - rotationMat.xy = -vecAngle.y; - rotationMat.yx = -rotationMat.xy; - rotationMat.yy = rotationMat.xx; - - pFT_Matrix_Multiply(&rotationMat, &transMat); - } - - if (tate_orient) - { - angle = FT_FixedFromFloat(tate_orient); - pFT_Vector_Unit(&vecAngle, angle); - taterotationMat.xx = vecAngle.x; - taterotationMat.xy = -vecAngle.y; - taterotationMat.yx = -taterotationMat.xy; - taterotationMat.yy = taterotationMat.xx; - pFT_Matrix_Multiply(&taterotationMat, &transMatTategaki); - } - - needsTransform = TRUE; - } - - /* World transform */ - if (!is_identity_FMAT2(&font->font_desc.matrix)) - { - FT_Matrix worldMat; - worldMat.xx = FT_FixedFromFloat(font->font_desc.matrix.eM11); - worldMat.xy = -FT_FixedFromFloat(font->font_desc.matrix.eM21); - worldMat.yx = -FT_FixedFromFloat(font->font_desc.matrix.eM12); - worldMat.yy = FT_FixedFromFloat(font->font_desc.matrix.eM22); - pFT_Matrix_Multiply(&worldMat, &transMat); - pFT_Matrix_Multiply(&worldMat, &transMatUnrotated); - pFT_Matrix_Multiply(&worldMat, &transMatTategaki); - needsTransform = TRUE; - } - - /* Extra transformation specified by caller */ - if (!is_identity_MAT2(lpmat)) - { - FT_Matrix extraMat; - extraMat.xx = FT_FixedFromFIXED(lpmat->eM11); - extraMat.xy = FT_FixedFromFIXED(lpmat->eM21); - extraMat.yx = FT_FixedFromFIXED(lpmat->eM12); - extraMat.yy = FT_FixedFromFIXED(lpmat->eM22); - pFT_Matrix_Multiply(&extraMat, &transMat); - pFT_Matrix_Multiply(&extraMat, &transMatUnrotated); - pFT_Matrix_Multiply(&extraMat, &transMatTategaki); - needsTransform = TRUE; - } + needsTransform = get_transform_matrices( font, tategaki, lpmat, matrices ); vertical_metrics = (tategaki && FT_HAS_VERTICAL(ft_face)); /* there is a freetype bug where vertical metrics are only @@ -7177,7 +7179,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, vec.x = metrics.horiBearingX + xc * metrics.width; vec.y = metrics.horiBearingY - yc * metrics.height; TRACE("Vec %ld,%ld\n", vec.x, vec.y); - pFT_Vector_Transform(&vec, &transMatTategaki); + pFT_Vector_Transform( &vec, &matrices[matrix_vert] ); if(xc == 0 && yc == 0) { left = right = vec.x; top = bottom = vec.y; @@ -7203,7 +7205,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, vec.x = lsb; vec.y = font->potm->otmDescent << 6; TRACE ("Vec %ld,%ld\n", vec.x>>6, vec.y>>6); - pFT_Vector_Transform(&vec, &transMat); + pFT_Vector_Transform( &vec, &matrices[matrix_hori] ); origin_x = (vec.x + left) & -64; origin_y = (vec.y + top + 63) & -64; lsb -= metrics.horiBearingY; @@ -7216,24 +7218,24 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, } TRACE("transformed box: (%d,%d - %d,%d)\n", left, top, right, bottom); - adv = get_advance_metric(incoming_font, font, &metrics, &transMat, vertical_metrics); + adv = get_advance_metric(incoming_font, font, &metrics, &matrices[matrix_hori], vertical_metrics); gm.gmCellIncX = adv.x >> 6; gm.gmCellIncY = adv.y >> 6; - adv = get_advance_metric(incoming_font, font, &metrics, &transMatUnrotated, vertical_metrics); + adv = get_advance_metric(incoming_font, font, &metrics, &matrices[matrix_unrotated], vertical_metrics); adv.x = pFT_Vector_Length(&adv); adv.y = 0; vec.x = lsb; vec.y = 0; - pFT_Vector_Transform(&vec, &transMatUnrotated); + pFT_Vector_Transform( &vec, &matrices[matrix_unrotated] ); if(lsb > 0) abc->abcA = pFT_Vector_Length(&vec) >> 6; else abc->abcA = -((pFT_Vector_Length(&vec) + 63) >> 6); /* We use lsb again to avoid rounding errors */ vec.x = lsb + (tategaki ? metrics.height : metrics.width); vec.y = 0; - pFT_Vector_Transform(&vec, &transMatUnrotated); + pFT_Vector_Transform( &vec, &matrices[matrix_unrotated] ); abc->abcB = ((pFT_Vector_Length(&vec) + 63) >> 6) - abc->abcA; } @@ -7313,7 +7315,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, ft_bitmap.buffer = buf; if(needsTransform) - pFT_Outline_Transform(&ft_face->glyph->outline, &transMatTategaki); + pFT_Outline_Transform( &ft_face->glyph->outline, &matrices[matrix_vert] ); pFT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom ); @@ -7374,7 +7376,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, ft_bitmap.buffer = buf; if(needsTransform) - pFT_Outline_Transform(&ft_face->glyph->outline, &transMatTategaki); + pFT_Outline_Transform( &ft_face->glyph->outline, &matrices[matrix_vert] ); pFT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom ); @@ -7489,7 +7491,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, dst = buf; if ( needsTransform ) - pFT_Outline_Transform (&ft_face->glyph->outline, &transMatTategaki); + pFT_Outline_Transform( &ft_face->glyph->outline, &matrices[matrix_vert] ); #ifdef FT_LCD_FILTER_H if ( pFT_Library_SetLcdFilter ) @@ -7575,7 +7577,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if(buflen == 0) buf = NULL; if (needsTransform && buf) - pFT_Outline_Transform(outline, &transMatTategaki); + pFT_Outline_Transform( outline, &matrices[matrix_vert] ); needed = get_native_glyph_outline(outline, buflen, NULL); @@ -7593,7 +7595,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if(buflen == 0) buf = NULL; if (needsTransform && buf) - pFT_Outline_Transform(outline, &transMatTategaki); + pFT_Outline_Transform( outline, &matrices[matrix_vert] ); needed = get_bezier_glyph_outline(outline, buflen, NULL); -- 2.18.0

1 0

[PATCH 1/2] gdi32: Fix vertical rotation.
by Huw Davies 07 Feb '19

07 Feb '19

From: Byeongsik Jeon <bsjeon(a)hanmail.net> Missed from cf891b04a087bcbc713e704c1adbf6b88243e996 Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index de62425173..22dfe87501 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7593,7 +7593,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if(buflen == 0) buf = NULL; if (needsTransform && buf) - pFT_Outline_Transform(outline, &transMat); + pFT_Outline_Transform(outline, &transMatTategaki); needed = get_bezier_glyph_outline(outline, buflen, NULL); -- 2.18.0

1 0

Sinhala NLS file
by Isira Seneviratne 07 Feb '19

07 Feb '19

Hi, Shouldn't there be a NLS file for the Sinhala language in dlls/kernel32/nls? I checked and couldn't find it. Thank you. Isira

1 0

[PATCH vkd3d 6/6] vkd3d-shader: Unset r# registers state while leaving current shader phase.
by Józef Kucia 07 Feb '19

07 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 3a80925a0e8b..8f9fff7f89ca 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3980,6 +3980,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_temps(struct vkd3d_dxbc_compiler *compi function_location = vkd3d_dxbc_compiler_get_current_function_location(compiler); vkd3d_spirv_begin_function_stream_insertion(builder, function_location); + assert(!compiler->temp_count); compiler->temp_count = instruction->declaration.count; for (i = 0; i < compiler->temp_count; ++i) { @@ -4810,15 +4811,24 @@ static void vkd3d_dxbc_compiler_emit_dcl_thread_group(struct vkd3d_dxbc_compiler SpvExecutionModeLocalSize, local_size, ARRAY_SIZE(local_size)); } +static void vkd3d_dxbc_compiler_leave_shader_phase(struct vkd3d_dxbc_compiler *compiler) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + + vkd3d_spirv_build_op_function_end(builder); + + compiler->temp_id = 0; + compiler->temp_count = 0; +} + static void vkd3d_dxbc_compiler_enter_shader_phase(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; struct vkd3d_shader_phase *phase; unsigned int idx; if ((idx = compiler->shader_phase_count)) - vkd3d_spirv_build_op_function_end(builder); + vkd3d_dxbc_compiler_leave_shader_phase(compiler); if (!vkd3d_array_reserve((void **)&compiler->shader_phases, &compiler->shader_phases_size, compiler->shader_phase_count + 1, sizeof(*compiler->shader_phases))) -- 2.19.2

2 1

[PATCH vkd3d 4/6] vkd3d-shader: Add support for instanced join phases.
by Józef Kucia 07 Feb '19

07 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index da9d162cbb69..d6d487b51ecf 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2323,6 +2323,9 @@ static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buf case VKD3DSPR_FORKINSTID: snprintf(buffer, buffer_size, "vForkInstanceId"); break; + case VKD3DSPR_JOININSTID: + snprintf(buffer, buffer_size, "vJoinInstanceId"); + break; case VKD3DSPR_TESSCOORD: snprintf(buffer, buffer_size, "vDomainLocation"); break; @@ -3546,6 +3549,7 @@ static void vkd3d_dxbc_compiler_emit_shader_phase_input(struct vkd3d_dxbc_compil switch (reg->type) { case VKD3DSPR_FORKINSTID: + case VKD3DSPR_JOININSTID: val_id = phase->instance_id; break; default: @@ -4829,16 +4833,16 @@ static void vkd3d_dxbc_compiler_enter_shader_phase(struct vkd3d_dxbc_compiler *c phase->function_location = 0; } -static int vkd3d_dxbc_compiler_emit_hs_fork_phase_instance_count(struct vkd3d_dxbc_compiler *compiler, +static int vkd3d_dxbc_compiler_emit_shader_phase_instance_count(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { struct vkd3d_shader_phase *phase = &compiler->shader_phases[compiler->shader_phase_count - 1]; if (!compiler->shader_phase_count - || phase->type != VKD3DSIH_HS_FORK_PHASE + || (phase->type != VKD3DSIH_HS_FORK_PHASE && phase->type != VKD3DSIH_HS_JOIN_PHASE) || phase->function_id) { - WARN("Unexpected dcl_hs_fork_phase_instance_count instruction.\n"); + WARN("Unexpected dcl_hs_{fork,join}_phase_instance_count instruction.\n"); return VKD3D_ERROR_INVALID_SHADER; } @@ -7170,7 +7174,8 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, vkd3d_dxbc_compiler_emit_dcl_thread_group(compiler, instruction); break; case VKD3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT: - ret = vkd3d_dxbc_compiler_emit_hs_fork_phase_instance_count(compiler, instruction); + case VKD3DSIH_DCL_HS_JOIN_PHASE_INSTANCE_COUNT: + ret = vkd3d_dxbc_compiler_emit_shader_phase_instance_count(compiler, instruction); break; case VKD3DSIH_HS_CONTROL_POINT_PHASE: case VKD3DSIH_HS_FORK_PHASE: -- 2.19.2

2 1

[PATCH vkd3d 5/6] vkd3d-shader: Implement hull shader barriers.
by Józef Kucia 07 Feb '19

07 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_shader.h | 1 + libs/vkd3d-shader/spirv.c | 72 ++++++++++++++++++++------- libs/vkd3d-shader/vkd3d_shader_main.c | 22 +++++++- 3 files changed, 75 insertions(+), 20 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index fe6f6e9c43c2..e803237c1f29 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -404,6 +404,7 @@ struct vkd3d_shader_scan_info unsigned int uav_read_mask; /* VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS */ unsigned int uav_counter_mask; /* VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS */ unsigned int sampler_comparison_mode_mask; /* 16 */ + bool use_vocp; }; int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d6d487b51ecf..3a80925a0e8b 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4853,10 +4853,52 @@ static int vkd3d_dxbc_compiler_emit_shader_phase_instance_count(struct vkd3d_dxb return VKD3D_OK; } +static const struct vkd3d_shader_phase *vkd3d_dxbc_compiler_get_control_point_phase( + struct vkd3d_dxbc_compiler *compiler) +{ + const struct vkd3d_shader_phase *phase; + + if (compiler->shader_phase_count < 1) + return NULL; + + phase = &compiler->shader_phases[0]; + if (phase->type == VKD3DSIH_HS_CONTROL_POINT_PHASE) + return phase; + + return NULL; +} + +static void vkd3d_dxbc_compiler_emit_barrier(struct vkd3d_dxbc_compiler *compiler, + SpvScope execution_scope, SpvScope memory_scope, SpvMemorySemanticsMask semantics) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t execution_id, memory_id, semantics_id; + + memory_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, memory_scope); + semantics_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, semantics); + + if (execution_scope != SpvScopeMax) + { + execution_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, execution_scope); + vkd3d_spirv_build_op_control_barrier(builder, execution_id, memory_id, semantics_id); + } + else + { + vkd3d_spirv_build_op_memory_barrier(builder, memory_id, semantics_id); + } +} + +static void vkd3d_dxbc_compiler_emit_hull_shader_barrier(struct vkd3d_dxbc_compiler *compiler) +{ + vkd3d_dxbc_compiler_emit_barrier(compiler, + SpvScopeWorkgroup, SpvScopeInvocation, SpvMemorySemanticsMaskNone); +} + static void vkd3d_dxbc_compiler_emit_hull_shader_main(struct vkd3d_dxbc_compiler *compiler) { + const struct vkd3d_shader_scan_info *scan_info = compiler->scan_info; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - const struct vkd3d_shader_phase *phase; + const struct vkd3d_shader_phase *control_point_phase, *phase; uint32_t phase_instance_id; unsigned int i, j; uint32_t void_id; @@ -4864,9 +4906,18 @@ static void vkd3d_dxbc_compiler_emit_hull_shader_main(struct vkd3d_dxbc_compiler vkd3d_spirv_builder_begin_main_function(builder); void_id = vkd3d_spirv_get_op_type_void(builder); + + if ((control_point_phase = vkd3d_dxbc_compiler_get_control_point_phase(compiler))) + vkd3d_spirv_build_op_function_call(builder, void_id, control_point_phase->function_id, NULL, 0); + + if (scan_info->use_vocp) + vkd3d_dxbc_compiler_emit_hull_shader_barrier(compiler); + for (i = 0; i < compiler->shader_phase_count; ++i) { phase = &compiler->shader_phases[i]; + if (phase->type == VKD3DSIH_HS_CONTROL_POINT_PHASE) + continue; if (phase->instance_count) { @@ -6968,14 +7019,10 @@ static void vkd3d_dxbc_compiler_emit_sample_info(struct vkd3d_dxbc_compiler *com static void vkd3d_dxbc_compiler_emit_sync(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t execution_id, memory_id, semantics_id; + unsigned int memory_semantics = SpvMemorySemanticsAcquireReleaseMask; unsigned int flags = instruction->flags; SpvScope execution_scope = SpvScopeMax; SpvScope memory_scope = SpvScopeDevice; - unsigned int memory_semantics; - - memory_semantics = SpvMemorySemanticsAcquireReleaseMask; if (flags & VKD3DSSF_GROUP_SHARED_MEMORY) { @@ -7003,18 +7050,7 @@ static void vkd3d_dxbc_compiler_emit_sync(struct vkd3d_dxbc_compiler *compiler, | SpvMemorySemanticsImageMemoryMask; } - memory_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, memory_scope); - semantics_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, memory_semantics); - if (execution_scope != SpvScopeMax) - { - execution_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, execution_scope); - vkd3d_spirv_build_op_control_barrier(builder, - execution_id, memory_id, semantics_id); - } - else - { - vkd3d_spirv_build_op_memory_barrier(builder, memory_id, semantics_id); - } + vkd3d_dxbc_compiler_emit_barrier(compiler, execution_scope, memory_scope, memory_semantics); } static void vkd3d_dxbc_compiler_emit_emit_stream(struct vkd3d_dxbc_compiler *compiler, diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 2bfdad0641cc..770281ca5ae8 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -226,6 +226,15 @@ static void vkd3d_shader_scan_record_uav_counter(struct vkd3d_shader_scan_info * scan_info->uav_counter_mask |= 1u << reg->idx[0].offset; } +static void vkd3d_shader_scan_input_declaration(struct vkd3d_shader_scan_info *scan_info, + const struct vkd3d_shader_instruction *instruction) +{ + const struct vkd3d_shader_dst_param *dst = &instruction->declaration.dst; + + if (dst->reg.type == VKD3DSPR_OUTCONTROLPOINT) + scan_info->use_vocp = true; +} + static void vkd3d_shader_scan_sampler_declaration(struct vkd3d_shader_scan_info *scan_info, const struct vkd3d_shader_instruction *instruction) { @@ -242,8 +251,17 @@ static void vkd3d_shader_scan_handle_instruction(struct vkd3d_shader_scan_info * { unsigned int i; - if (instruction->handler_idx == VKD3DSIH_DCL_SAMPLER) - vkd3d_shader_scan_sampler_declaration(scan_info, instruction); + switch (instruction->handler_idx) + { + case VKD3DSIH_DCL_INPUT: + vkd3d_shader_scan_input_declaration(scan_info, instruction); + break; + case VKD3DSIH_DCL_SAMPLER: + vkd3d_shader_scan_sampler_declaration(scan_info, instruction); + break; + default: + break; + } if (vkd3d_shader_instruction_is_uav_read(instruction)) { -- 2.19.2

2 1

[PATCH vkd3d 3/6] vkd3d-shader: Translate vForkInstanceId registers.
by Józef Kucia 07 Feb '19

07 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 56 ++++++++++++++++++++++++++++++++++----- 1 file changed, 50 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f14306e689c5..da9d162cbb69 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2320,6 +2320,9 @@ static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buf case VKD3DSPR_DEPTHOUTLE: snprintf(buffer, buffer_size, "oDepth"); break; + case VKD3DSPR_FORKINSTID: + snprintf(buffer, buffer_size, "vForkInstanceId"); + break; case VKD3DSPR_TESSCOORD: snprintf(buffer, buffer_size, "vDomainLocation"); break; @@ -2756,12 +2759,21 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_reg(struct vkd3d_dxbc_compiler *co } vkd3d_dxbc_compiler_emit_dereference_register(compiler, reg, &reg_info); - if (component_count == 1) + /* Intermediate value (no storage class). */ + if (reg_info.storage_class == SpvStorageClassMax) + { + val_id = reg_info.id; + } + else if (component_count == 1) + { return vkd3d_dxbc_compiler_emit_load_scalar(compiler, reg, swizzle, write_mask, &reg_info); - - type_id = vkd3d_spirv_get_type_id(builder, - reg_info.component_type, vkd3d_write_mask_component_count(reg_info.write_mask)); - val_id = vkd3d_spirv_build_op_load(builder, type_id, reg_info.id, SpvMemoryAccessMaskNone); + } + else + { + type_id = vkd3d_spirv_get_type_id(builder, + reg_info.component_type, vkd3d_write_mask_component_count(reg_info.write_mask)); + val_id = vkd3d_spirv_build_op_load(builder, type_id, reg_info.id, SpvMemoryAccessMaskNone); + } val_id = vkd3d_dxbc_compiler_emit_swizzle_ext(compiler, val_id, reg_info.write_mask, reg_info.component_type, swizzle, write_mask); @@ -3523,6 +3535,35 @@ static void vkd3d_dxbc_compiler_emit_input_register(struct vkd3d_dxbc_compiler * vkd3d_dxbc_compiler_emit_register_debug_name(builder, input_id, reg); } +static void vkd3d_dxbc_compiler_emit_shader_phase_input(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_phase *phase, const struct vkd3d_shader_dst_param *dst) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_register *reg = &dst->reg; + struct vkd3d_symbol reg_symbol; + uint32_t val_id; + + switch (reg->type) + { + case VKD3DSPR_FORKINSTID: + val_id = phase->instance_id; + break; + default: + FIXME("Unhandled shader phase input register %#x.\n", reg->type); + return; + } + + vkd3d_symbol_make_register(&reg_symbol, reg); + reg_symbol.id = val_id; + reg_symbol.info.reg.storage_class = SpvStorageClassMax; /* Intermediate value */ + reg_symbol.info.reg.member_idx = 0; + reg_symbol.info.reg.component_type = VKD3D_TYPE_UINT; + reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_0; + reg_symbol.info.reg.is_aggregate = false; + vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); + vkd3d_dxbc_compiler_emit_register_debug_name(builder, val_id, reg); +} + static unsigned int vkd3d_dxbc_compiler_get_output_variable_index( struct vkd3d_dxbc_compiler *compiler, unsigned int register_idx) { @@ -4515,8 +4556,11 @@ static void vkd3d_dxbc_compiler_emit_dcl_input(struct vkd3d_dxbc_compiler *compi const struct vkd3d_shader_instruction *instruction) { const struct vkd3d_shader_dst_param *dst = &instruction->declaration.dst; + const struct vkd3d_shader_phase *phase; - if (vkd3d_shader_register_is_input(&dst->reg)) + if ((phase = vkd3d_dxbc_compiler_get_current_shader_phase(compiler))) + vkd3d_dxbc_compiler_emit_shader_phase_input(compiler, phase, dst); + else if (vkd3d_shader_register_is_input(&dst->reg)) vkd3d_dxbc_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE); else vkd3d_dxbc_compiler_emit_input_register(compiler, dst); -- 2.19.2

2 1

[PATCH vkd3d 2/6] vkd3d-shader: Add support for instanced fork phases.
by Józef Kucia 07 Feb '19

07 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 62 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 58 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e1ea236136a4..f14306e689c5 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1910,6 +1910,7 @@ struct vkd3d_shader_phase unsigned int idx; unsigned int instance_count; uint32_t function_id; + uint32_t instance_id; size_t function_location; }; @@ -3836,16 +3837,31 @@ static void vkd3d_dxbc_compiler_begin_shader_phase(struct vkd3d_dxbc_compiler *c { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t void_id, function_type_id; + unsigned int param_count; + uint32_t param_type_id; const char *name; + if (phase->instance_count) + { + param_type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); + param_count = 1; + } + else + { + param_count = 0; + } + phase->function_id = vkd3d_spirv_alloc_id(builder); void_id = vkd3d_spirv_get_op_type_void(builder); - function_type_id = vkd3d_spirv_get_op_type_function(builder, void_id, NULL, 0); + function_type_id = vkd3d_spirv_get_op_type_function(builder, void_id, &param_type_id, param_count); vkd3d_spirv_build_op_function(builder, void_id, phase->function_id, SpvFunctionControlMaskNone, function_type_id); - vkd3d_spirv_build_op_label(builder, vkd3d_spirv_alloc_id(builder)); + if (phase->instance_count) + phase->instance_id = vkd3d_spirv_build_op_function_parameter(builder, param_type_id); + + vkd3d_spirv_build_op_label(builder, vkd3d_spirv_alloc_id(builder)); phase->function_location = vkd3d_spirv_stream_current_location(&builder->function_stream); switch (phase->type) @@ -4765,15 +4781,37 @@ static void vkd3d_dxbc_compiler_enter_shader_phase(struct vkd3d_dxbc_compiler *c phase->idx = idx; phase->instance_count = 0; phase->function_id = 0; + phase->instance_id = 0; phase->function_location = 0; } +static int vkd3d_dxbc_compiler_emit_hs_fork_phase_instance_count(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + struct vkd3d_shader_phase *phase = &compiler->shader_phases[compiler->shader_phase_count - 1]; + + if (!compiler->shader_phase_count + || phase->type != VKD3DSIH_HS_FORK_PHASE + || phase->function_id) + { + WARN("Unexpected dcl_hs_fork_phase_instance_count instruction.\n"); + return VKD3D_ERROR_INVALID_SHADER; + } + + phase->instance_count = instruction->declaration.count; + + vkd3d_dxbc_compiler_begin_shader_phase(compiler, phase); + + return VKD3D_OK; +} + static void vkd3d_dxbc_compiler_emit_hull_shader_main(struct vkd3d_dxbc_compiler *compiler) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_phase *phase; + uint32_t phase_instance_id; + unsigned int i, j; uint32_t void_id; - unsigned int i; vkd3d_spirv_builder_begin_main_function(builder); @@ -4781,7 +4819,20 @@ static void vkd3d_dxbc_compiler_emit_hull_shader_main(struct vkd3d_dxbc_compiler for (i = 0; i < compiler->shader_phase_count; ++i) { phase = &compiler->shader_phases[i]; - vkd3d_spirv_build_op_function_call(builder, void_id, phase->function_id, NULL, 0); + + if (phase->instance_count) + { + for (j = 0; j < phase->instance_count; ++j) + { + phase_instance_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, j); + vkd3d_spirv_build_op_function_call(builder, + void_id, phase->function_id, &phase_instance_id, 1); + } + } + else + { + vkd3d_spirv_build_op_function_call(builder, void_id, phase->function_id, NULL, 0); + } } vkd3d_spirv_build_op_return(builder); @@ -7074,6 +7125,9 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_DCL_THREAD_GROUP: vkd3d_dxbc_compiler_emit_dcl_thread_group(compiler, instruction); break; + case VKD3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT: + ret = vkd3d_dxbc_compiler_emit_hs_fork_phase_instance_count(compiler, instruction); + break; case VKD3DSIH_HS_CONTROL_POINT_PHASE: case VKD3DSIH_HS_FORK_PHASE: case VKD3DSIH_HS_JOIN_PHASE: -- 2.19.2

2 1

[PATCH vkd3d 1/6] vkd3d-shader: Delay generating functions for shader phases.
by Józef Kucia 07 Feb '19

07 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Mainly in order to wait for dcl_hs_{fork,join}_phase_instance_count. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 86 +++++++++++++++++++++++---------------- 1 file changed, 51 insertions(+), 35 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 8efb38530ce9..e1ea236136a4 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1907,6 +1907,8 @@ struct vkd3d_push_constant_buffer_binding struct vkd3d_shader_phase { enum VKD3D_SHADER_INSTRUCTION_HANDLER type; + unsigned int idx; + unsigned int instance_count; uint32_t function_id; size_t function_location; }; @@ -3829,16 +3831,56 @@ static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_comp vkd3d_dxbc_compiler_emit_shader_signature_outputs(compiler); } +static void vkd3d_dxbc_compiler_begin_shader_phase(struct vkd3d_dxbc_compiler *compiler, + struct vkd3d_shader_phase *phase) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t void_id, function_type_id; + const char *name; + + phase->function_id = vkd3d_spirv_alloc_id(builder); + + void_id = vkd3d_spirv_get_op_type_void(builder); + function_type_id = vkd3d_spirv_get_op_type_function(builder, void_id, NULL, 0); + vkd3d_spirv_build_op_function(builder, void_id, phase->function_id, + SpvFunctionControlMaskNone, function_type_id); + vkd3d_spirv_build_op_label(builder, vkd3d_spirv_alloc_id(builder)); + + phase->function_location = vkd3d_spirv_stream_current_location(&builder->function_stream); + + switch (phase->type) + { + case VKD3DSIH_HS_CONTROL_POINT_PHASE: + name = "control"; + break; + case VKD3DSIH_HS_FORK_PHASE: + name = "fork"; + break; + case VKD3DSIH_HS_JOIN_PHASE: + name = "join"; + break; + default: + ERR("Invalid phase type %#x.\n", phase->type); + return; + } + vkd3d_spirv_build_op_name(builder, phase->function_id, "%s%u", name, phase->idx); +} + static const struct vkd3d_shader_phase *vkd3d_dxbc_compiler_get_current_shader_phase( - const struct vkd3d_dxbc_compiler *compiler) + struct vkd3d_dxbc_compiler *compiler) { + struct vkd3d_shader_phase *phase; + if (!compiler->shader_phase_count) return NULL; - return &compiler->shader_phases[compiler->shader_phase_count - 1]; + phase = &compiler->shader_phases[compiler->shader_phase_count - 1]; + if (!phase->function_id) + vkd3d_dxbc_compiler_begin_shader_phase(compiler, phase); + return phase; } -static size_t vkd3d_dxbc_compiler_get_current_function_location(const struct vkd3d_dxbc_compiler *compiler) +static size_t vkd3d_dxbc_compiler_get_current_function_location(struct vkd3d_dxbc_compiler *compiler) { const struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_phase *phase; @@ -4708,14 +4750,10 @@ static void vkd3d_dxbc_compiler_enter_shader_phase(struct vkd3d_dxbc_compiler *c const struct vkd3d_shader_instruction *instruction) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t void_id, function_type_id; struct vkd3d_shader_phase *phase; - const char *name; - unsigned int id; - - id = compiler->shader_phase_count; + unsigned int idx; - if (id) + if ((idx = compiler->shader_phase_count)) vkd3d_spirv_build_op_function_end(builder); if (!vkd3d_array_reserve((void **)&compiler->shader_phases, &compiler->shader_phases_size, @@ -4724,32 +4762,10 @@ static void vkd3d_dxbc_compiler_enter_shader_phase(struct vkd3d_dxbc_compiler *c phase = &compiler->shader_phases[compiler->shader_phase_count++]; phase->type = instruction->handler_idx; - phase->function_id = vkd3d_spirv_alloc_id(builder); - - void_id = vkd3d_spirv_get_op_type_void(builder); - function_type_id = vkd3d_spirv_get_op_type_function(builder, void_id, NULL, 0); - vkd3d_spirv_build_op_function(builder, void_id, phase->function_id, - SpvFunctionControlMaskNone, function_type_id); - vkd3d_spirv_build_op_label(builder, vkd3d_spirv_alloc_id(builder)); - - phase->function_location = vkd3d_spirv_stream_current_location(&builder->function_stream); - - switch (instruction->handler_idx) - { - case VKD3DSIH_HS_CONTROL_POINT_PHASE: - name = "control"; - break; - case VKD3DSIH_HS_FORK_PHASE: - name = "fork"; - break; - case VKD3DSIH_HS_JOIN_PHASE: - name = "join"; - break; - default: - ERR("Invalid shader phase %#x.\n", instruction->handler_idx); - return; - } - vkd3d_spirv_build_op_name(builder, phase->function_id, "%s%u", name, id); + phase->idx = idx; + phase->instance_count = 0; + phase->function_id = 0; + phase->function_location = 0; } static void vkd3d_dxbc_compiler_emit_hull_shader_main(struct vkd3d_dxbc_compiler *compiler) -- 2.19.2

2 1

ole32/clipboard.c
by Dawser Stevens 07 Feb '19

07 Feb '19

Hi, I have been debugging an issue regarding the clipboard, and I would be thankful if anyone could confirm what I suspect. When an application requests data from the clipboard in some specific format, the data may come from the ole clipboard or the general one (user32<->wineserver). If the piece of data comes from the general clipboard through `wineserver`, the ole clipboard still considers the format as needing to be "TYMED" (ole32/clipboard.c:get_priv_data(): call get_tymed_from_nonole_cf(cf)). Most formats available in the general clipboard are not included in the switch statement, which makes them unavailable. However, the full data is transferred by `wineserver`, so if the default in `get_tymed_from_nonole_cf` were TYMED_HGLOBAL, the ole clipboard would duplicate the transferred data with a global handle, and applications could use those formats that have been put there. Is there a reason why TYMED_HGLOBAL is not the default for unrecognized formats? I am still learning the code, but in my limited testing I have still not seen failures when I make it so. Thank you.

1 0

[PATCH v5 3/3] mfplat: Implement IMFByteStream::{Read,Write}.
by Jactry Zeng 07 Feb '19

07 Feb '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 25 +++++++++++++++++++++---- dlls/mfplat/tests/mfplat.c | 26 +++++++++++++------------- 2 files changed, 34 insertions(+), 17 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 4f42fc0939..898634f153 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -981,10 +981,23 @@ static HRESULT WINAPI mfbytestream_IsEndOfStream(IMFByteStream *iface, BOOL *end static HRESULT WINAPI mfbytestream_Read(IMFByteStream *iface, BYTE *data, ULONG count, ULONG *byte_read) { mfbytestream *This = impl_from_IMFByteStream(iface); + STATSTG statstg; + QWORD length; + HRESULT hr; - FIXME("%p, %p, %u, %p\n", This, data, count, byte_read); + TRACE("(%p)->(%p, %u, %p)\n", This, data, count, byte_read); - return E_NOTIMPL; + memset(&statstg, 0, sizeof(statstg)); + hr = IStream_Stat(This->stream, &statstg, STATFLAG_NONAME); + if(FAILED(hr)) + return hr; + if((statstg.grfMode & 0xf) == STGM_WRITE) + return E_ACCESSDENIED; + + IMFByteStream_GetLength(iface, &length); + if(count > length) + count = length; + return IStream_Read(This->stream, data, count, byte_read); } static HRESULT WINAPI mfbytestream_BeginRead(IMFByteStream *iface, BYTE *data, ULONG count, @@ -1009,10 +1022,14 @@ static HRESULT WINAPI mfbytestream_EndRead(IMFByteStream *iface, IMFAsyncResult static HRESULT WINAPI mfbytestream_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written) { mfbytestream *This = impl_from_IMFByteStream(iface); + HRESULT hr; - FIXME("%p, %p, %u, %p\n", This, data, count, written); + TRACE("(%p)->(%p, %u, %p)\n", This, data, count, written); - return E_NOTIMPL; + hr = IStream_Write(This->stream, data, count, written); + if(hr == STG_E_ACCESSDENIED) + return E_ACCESSDENIED; + return hr; } static HRESULT WINAPI mfbytestream_BeginWrite(IMFByteStream *iface, const BYTE *data, ULONG count, diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index dabc5f7301..53c96ea3e3 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -797,13 +797,13 @@ static void test_bytestream_from_file(void) CHECK_BS_LEN(bytestream, sizeof(asf_header)); read = 0; hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); - todo_wine ok(hr == S_OK, "IMFByteStream_Read failed: 0x%08x.\n", hr); - todo_wine ok(read == sizeof(asf_header), "got wrong read length: %d.\n", read); - todo_wine ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + ok(hr == S_OK, "IMFByteStream_Read failed: 0x%08x.\n", hr); + ok(read == sizeof(asf_header), "got wrong read length: %d.\n", read); + ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); memset(buffer, 0, sizeof(buffer)); hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); - todo_wine ok(hr == E_ACCESSDENIED, "IMFByteStream_Write should fail: 0x%08x.\n", hr); + ok(hr == E_ACCESSDENIED, "IMFByteStream_Write should fail: 0x%08x.\n", hr); hr = IMFByteStream_SetLength(bytestream, 200); ok(hr == E_FAIL, "IMFByteStream_SetLength should fail: 0x%08x.\n", hr); todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); @@ -814,12 +814,12 @@ static void test_bytestream_from_file(void) MF_FILEFLAGS_NONE, asffile, &bytestream); ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); - todo_wine ok(hr == E_ACCESSDENIED, "IMFByteStream_Read should fail: 0x%08x.\n", hr); + ok(hr == E_ACCESSDENIED, "IMFByteStream_Read should fail: 0x%08x.\n", hr); todo_wine CHECK_BS_POS(bytestream, 0); written = 0xdeadbeef; hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); - todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); - todo_wine ok(written == sizeof(asf_header), "got wrong written length: %d.\n", written); + ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + ok(written == sizeof(asf_header), "got wrong written length: %d.\n", written); CHECK_BS_LEN(bytestream, sizeof(asf_header)); todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); @@ -846,8 +846,8 @@ static void test_bytestream_from_file(void) CHECK_BS_LEN(bytestream, sizeof(asf_header) + 2); written = 0xdeadbeef; hr = IMFByteStream_Write(bytestream, test_data, sizeof(test_data), &written); - todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); - todo_wine ok(written == sizeof(test_data), "got wrong written length: %d.\n", written); + ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + ok(written == sizeof(test_data), "got wrong written length: %d.\n", written); CHECK_BS_LEN(bytestream, sizeof(asf_header) + 2); todo_wine CHECK_BS_POS(bytestream, sizeof(test_data)); IMFByteStream_Release(bytestream); @@ -904,8 +904,8 @@ static void test_bytestream_from_stream(void) CHECK_BS_LEN(bytestream, sizeof(asf_header)); hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); todo_wine ok(hr == S_FALSE, "IMFByteStream_Read returned: 0x%08x.\n", hr); - todo_wine ok(read == sizeof(asf_header), "got wrong read length: %d.\n", read); - todo_wine ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + ok(read == sizeof(asf_header), "got wrong read length: %d.\n", read); + ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); memset(buffer, 0, sizeof(buffer)); todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); @@ -928,8 +928,8 @@ static void test_bytestream_from_stream(void) todo_wine CHECK_BS_POS(bytestream, 0); written = 0xdeadbeef; hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); - todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); - todo_wine ok(written == sizeof(asf_header), "got wrong written length: %d.\n", written); + ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + ok(written == sizeof(asf_header), "got wrong written length: %d.\n", written); CHECK_BS_LEN(bytestream, sizeof(asf_header)); todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); -- 2.20.1

1 0

[PATCH v5 2/3] mfplat: Implement IMFByteStream::{GetLength,SetLength}.
by Jactry Zeng 07 Feb '19

07 Feb '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 19 +++- dlls/mfplat/tests/Makefile.in | 2 +- dlls/mfplat/tests/mfplat.c | 194 +++++++++++++++++++++++++++++++++- 3 files changed, 208 insertions(+), 7 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 8aab65c28d..4f42fc0939 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -922,19 +922,30 @@ static HRESULT WINAPI mfbytestream_GetCapabilities(IMFByteStream *iface, DWORD * static HRESULT WINAPI mfbytestream_GetLength(IMFByteStream *iface, QWORD *length) { mfbytestream *This = impl_from_IMFByteStream(iface); + HRESULT hr; + STATSTG statstg; - FIXME("%p, %p\n", This, length); + TRACE("(%p)->(%p)\n", This, length); - return E_NOTIMPL; + memset(&statstg, 0, sizeof(statstg)); + + hr = IStream_Stat(This->stream, &statstg, STATFLAG_NONAME); + + if (SUCCEEDED(hr)) + *length = statstg.cbSize.QuadPart; + + return hr; } static HRESULT WINAPI mfbytestream_SetLength(IMFByteStream *iface, QWORD length) { mfbytestream *This = impl_from_IMFByteStream(iface); + ULARGE_INTEGER size; - FIXME("%p, %s\n", This, wine_dbgstr_longlong(length)); + TRACE("(%p)->(%s)\n", This, wine_dbgstr_longlong(length)); - return E_NOTIMPL; + size.QuadPart = length; + return IStream_SetSize(This->stream, size); } static HRESULT WINAPI mfbytestream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) diff --git a/dlls/mfplat/tests/Makefile.in b/dlls/mfplat/tests/Makefile.in index 07cf328ad2..f7f09aa33e 100644 --- a/dlls/mfplat/tests/Makefile.in +++ b/dlls/mfplat/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mfplat.dll -IMPORTS = ole32 mfplat +IMPORTS = ole32 mfplat shlwapi C_SRCS = \ mfplat.c diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index a4f11da36e..dabc5f7301 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -33,6 +33,7 @@ #include "mfidl.h" #include "mferror.h" #include "mfreadwrite.h" +#include "shlwapi.h" #include "wine/test.h" @@ -52,6 +53,9 @@ DEFINE_GUID(DUMMY_CLSID, 0x12345678,0x1234,0x1234,0x12,0x13,0x14,0x15,0x16,0x17, DEFINE_GUID(DUMMY_GUID1, 0x12345678,0x1234,0x1234,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21); DEFINE_GUID(DUMMY_GUID2, 0x12345678,0x1234,0x1234,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22); +static const byte asf_header[] = {0x30,0x26,0xb2,0x75,0x8e,0x66,0xcf,0x11, + 0xa6,0xd9,0x00,0xaa,0x00,0x62,0xce,0x6c}; + static const WCHAR mp4file[] = {'t','e','s','t','.','m','p','4',0}; #define CHECK_REF(obj,ref) _check_ref((IUnknown*)obj, ref, __LINE__) @@ -638,7 +642,7 @@ static void test_MFCreateFile(void) hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_APPEND_IF_EXIST, MF_FILEFLAGS_ALLOW_WRITE_SHARING, filename, &bytestream); ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); - todo_wine CHECK_BS_LEN(bytestream, file_size); + CHECK_BS_LEN(bytestream, file_size); todo_wine CHECK_BS_POS(bytestream, 0); IMFByteStream_Release(bytestream); CHECK_FILE_SIZE(filename, file_size); @@ -653,7 +657,7 @@ static void test_MFCreateFile(void) hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_RESET_IF_EXIST, MF_FILEFLAGS_NONE, filename, &bytestream); ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); - todo_wine CHECK_BS_LEN(bytestream, 0); + CHECK_BS_LEN(bytestream, 0); todo_wine CHECK_BS_POS(bytestream, 0); IMFByteStream_Release(bytestream); CHECK_FILE_SIZE(filename, 0); @@ -766,6 +770,190 @@ static void test_MFSample(void) IMFSample_Release(sample); } +static void test_bytestream_from_file(void) +{ + IMFByteStream *bytestream; + HRESULT hr; + HANDLE file; + static WCHAR asffile[] = {'t','e','s','t','.','a','s','f',0}; + byte buffer[1024] = {0}; + byte test_data[] = {0x1,0x2,0x3,0x4}; + ULONG written, read; + QWORD length; + + file = CreateFileW(asffile, GENERIC_READ|GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "File creation failed: 0x%08x.\n", GetLastError()); + WriteFile(file, asf_header, sizeof(asf_header), &written, NULL); + CloseHandle(file); + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "MFStartup failed: 0x%08x.\n", hr); + + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, + MF_FILEFLAGS_NONE, asffile, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + read = 0; + hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); + todo_wine ok(hr == S_OK, "IMFByteStream_Read failed: 0x%08x.\n", hr); + todo_wine ok(read == sizeof(asf_header), "got wrong read length: %d.\n", read); + todo_wine ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + memset(buffer, 0, sizeof(buffer)); + hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); + todo_wine ok(hr == E_ACCESSDENIED, "IMFByteStream_Write should fail: 0x%08x.\n", hr); + hr = IMFByteStream_SetLength(bytestream, 200); + ok(hr == E_FAIL, "IMFByteStream_SetLength should fail: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + IMFByteStream_Release(bytestream); + + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, + MF_FILEFLAGS_NONE, asffile, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); + todo_wine ok(hr == E_ACCESSDENIED, "IMFByteStream_Read should fail: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + written = 0xdeadbeef; + hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); + todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + todo_wine ok(written == sizeof(asf_header), "got wrong written length: %d.\n", written); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + + hr = IMFByteStream_SetLength(bytestream, sizeof(asf_header) + 2); + ok(hr == S_OK, "IMFByteStream_SetLength failed: 0x%08x.\n", hr); + length = 0xdeadbeef; + hr = IMFByteStream_GetLength(bytestream, &length); + ok(hr == S_OK, "IMFByteStream_GetLength failed: 0x%08x.\n", hr); + ok(length == sizeof(asf_header) || length == (sizeof(asf_header) + 2) /* xp */, + "got wrong length: %s.\n", wine_dbgstr_longlong(length)); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + IMFByteStream_Release(bytestream); + file = CreateFileW(asffile, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ReadFile(file, buffer, sizeof(buffer), &read, NULL); + ok(read == sizeof(asf_header) + 2, "got wrong read length: %d.\n", read); + ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + memset(buffer, 0, sizeof(buffer)); + CloseHandle(file); + + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_APPEND_IF_EXIST, + MF_FILEFLAGS_NONE, asffile, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_LEN(bytestream, sizeof(asf_header) + 2); + written = 0xdeadbeef; + hr = IMFByteStream_Write(bytestream, test_data, sizeof(test_data), &written); + todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + todo_wine ok(written == sizeof(test_data), "got wrong written length: %d.\n", written); + CHECK_BS_LEN(bytestream, sizeof(asf_header) + 2); + todo_wine CHECK_BS_POS(bytestream, sizeof(test_data)); + IMFByteStream_Release(bytestream); + + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_RESET_IF_EXIST, + MF_FILEFLAGS_NONE, asffile, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_LEN(bytestream, 0); + hr = IMFByteStream_SetLength(bytestream, 2000); + ok(hr == S_OK, "IMFByteStream_SetLength failed: 0x%08x.\n", hr); + length = 0xdeadbeef; + hr = IMFByteStream_GetLength(bytestream, &length); + ok(hr == S_OK, "IMFByteStream_GetLength failed: 0x%08x.\n", hr); + ok(length == 0 || length == 2000 /* xp */, "got wrong length: %s.\n", wine_dbgstr_longlong(length)); + todo_wine CHECK_BS_POS(bytestream, 0); + IMFByteStream_Release(bytestream); + + MFShutdown(); + DeleteFileW(asffile); +} + +static void test_bytestream_from_stream(void) +{ + IMFByteStream *bytestream; + IStream *stream; + HRESULT hr; + HANDLE file; + static WCHAR asffile[] = {'t','e','s','t','.','a','s','f',0}; + byte buffer[1024] = {0}; + ULONG written, read; + QWORD length; + + if(!pMFCreateMFByteStreamOnStream) + { + win_skip("MFCreateMFByteStreamOnStream() not found\n"); + return; + } + + file = CreateFileW(asffile, GENERIC_READ|GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "File creation failed: 0x%08x.\n", GetLastError()); + WriteFile(file, asf_header, sizeof(asf_header), &written, NULL); + CloseHandle(file); + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "MFStartup failed: 0x%08x.\n", hr); + + hr = SHCreateStreamOnFileW(asffile, STGM_READ|STGM_FAILIFTHERE|STGM_SHARE_DENY_WRITE, &stream); + ok(hr == S_OK, "SHCreateStreamOnFileEx failed: 0x%08x.\n", hr); + hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); + ok(hr == S_OK, "MFCreateMFByteStreamOnStream failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); + todo_wine ok(hr == S_FALSE, "IMFByteStream_Read returned: 0x%08x.\n", hr); + todo_wine ok(read == sizeof(asf_header), "got wrong read length: %d.\n", read); + todo_wine ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + memset(buffer, 0, sizeof(buffer)); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + hr = IMFByteStream_SetLength(bytestream, 200); + ok(hr == E_FAIL || hr == S_OK, "IMFByteStream_SetLength should fail: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + IMFByteStream_Release(bytestream); + IStream_Release(stream); + + hr = SHCreateStreamOnFileW(asffile, STGM_WRITE|STGM_FAILIFTHERE|STGM_SHARE_DENY_WRITE, &stream); + ok(hr == S_OK, "SHCreateStreamOnFileEx failed: 0x%08x.\n", hr); + hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); + ok(hr == S_OK, "MFCreateMFByteStreamOnStream failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); + todo_wine ok(hr == S_FALSE, "IMFByteStream_Read should fail: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + written = 0xdeadbeef; + hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); + todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + todo_wine ok(written == sizeof(asf_header), "got wrong written length: %d.\n", written); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + + hr = IMFByteStream_SetLength(bytestream, sizeof(asf_header) + 2); + ok(hr == S_OK, "IMFByteStream_SetLength failed: 0x%08x.\n", hr); + length = 0xdeadbeef; + hr = IMFByteStream_GetLength(bytestream, &length); + ok(hr == S_OK, "IMFByteStream_GetLength failed: 0x%08x.\n", hr); + ok(length == sizeof(asf_header) || length == (sizeof(asf_header) + 2) /* xp */, + "got wrong length: %s.\n", wine_dbgstr_longlong(length)); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + IMFByteStream_Release(bytestream); + IStream_Release(stream); + file = CreateFileW(asffile, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ReadFile(file, buffer, sizeof(buffer), &read, NULL); + ok(read == sizeof(asf_header) + 2, "got wrong read length: %d.\n", read); + ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + memset(buffer, 0, sizeof(buffer)); + CloseHandle(file); + + MFShutdown(); + DeleteFileW(asffile); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -781,6 +969,8 @@ START_TEST(mfplat) test_MFCreateMFByteStreamOnStream(); test_MFCreateMemoryBuffer(); test_source_resolver(); + test_bytestream_from_file(); + test_bytestream_from_stream(); CoUninitialize(); } -- 2.20.1

1 0

[PATCH v5 1/3] mfplat: Implement MFCreateFile().
by Jactry Zeng 07 Feb '19

07 Feb '19

Superseded patch 157922 to 157924. ChangeLog: v5: - Fix crash when calling MFCreateMFByteStreamOnStream() on Windows. Thanks Alistair for pointing out! v4: - Fix test failure on Windows XP and Vista. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/Makefile.in | 2 +- dlls/mfplat/main.c | 69 +++++++++++++++----------- dlls/mfplat/tests/mfplat.c | 99 +++++++++++++++++++++++++++++++++----- 3 files changed, 127 insertions(+), 43 deletions(-) diff --git a/dlls/mfplat/Makefile.in b/dlls/mfplat/Makefile.in index 76843f5f25..5d9c8eb4c6 100644 --- a/dlls/mfplat/Makefile.in +++ b/dlls/mfplat/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfplat.dll IMPORTLIB = mfplat -IMPORTS = advapi32 ole32 +IMPORTS = advapi32 ole32 shlwapi C_SRCS = \ main.c diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c7c346512f..8aab65c28d 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -31,6 +31,7 @@ #include "mfapi.h" #include "mfidl.h" #include "mferror.h" +#include "shlwapi.h" #include "wine/heap.h" #include "wine/debug.h" @@ -849,6 +850,7 @@ typedef struct _mfbytestream { mfattributes attributes; IMFByteStream IMFByteStream_iface; + IStream *stream; } mfbytestream; static inline mfbytestream *impl_from_IMFByteStream(IMFByteStream *iface) @@ -901,6 +903,7 @@ static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) if (!ref) { + IStream_Release(This->stream); HeapFree(GetProcessHeap(), 0, This); } @@ -1144,6 +1147,8 @@ HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **byt init_attribute_object(&object->attributes, 0); object->IMFByteStream_iface.lpVtbl = &mfbytestream_vtbl; object->attributes.IMFAttributes_iface.lpVtbl = &mfbytestream_attributes_vtbl; + object->stream = stream; + IStream_AddRef(object->stream); *bytestream = &object->IMFByteStream_iface; @@ -1154,60 +1159,65 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open LPCWSTR url, IMFByteStream **bytestream) { mfbytestream *object; - DWORD fileaccessmode = 0; - DWORD filesharemode = FILE_SHARE_READ; - DWORD filecreation_disposition = 0; - DWORD fileattributes = 0; - HANDLE file; + DWORD mode = STGM_SHARE_DENY_WRITE; + DWORD attributes = FILE_ATTRIBUTE_NORMAL; + BOOL create = FALSE, reset = FALSE; + IStream *stream = NULL; + HRESULT hres; - FIXME("(%d, %d, %d, %s, %p): stub\n", accessmode, openmode, flags, debugstr_w(url), bytestream); + TRACE("(%d, %d, %d, %s, %p)\n", accessmode, openmode, flags, debugstr_w(url), bytestream); switch (accessmode) { case MF_ACCESSMODE_READ: - fileaccessmode = GENERIC_READ; + mode |= STGM_READ; break; case MF_ACCESSMODE_WRITE: - fileaccessmode = GENERIC_WRITE; + mode |= STGM_WRITE; break; case MF_ACCESSMODE_READWRITE: - fileaccessmode = GENERIC_READ | GENERIC_WRITE; + mode |= STGM_READWRITE; break; } switch (openmode) { - case MF_OPENMODE_FAIL_IF_NOT_EXIST: - filecreation_disposition = OPEN_EXISTING; - break; - case MF_OPENMODE_FAIL_IF_EXIST: - filecreation_disposition = CREATE_NEW; - break; case MF_OPENMODE_RESET_IF_EXIST: - filecreation_disposition = TRUNCATE_EXISTING; + if (accessmode == MF_ACCESSMODE_READ) + return E_INVALIDARG; + reset = TRUE; + mode |= STGM_FAILIFTHERE; break; case MF_OPENMODE_APPEND_IF_EXIST: - filecreation_disposition = OPEN_ALWAYS; - fileaccessmode |= FILE_APPEND_DATA; + if (GetFileAttributesW(url) == INVALID_FILE_ATTRIBUTES) + create = TRUE; + case MF_OPENMODE_FAIL_IF_NOT_EXIST: + mode |= STGM_FAILIFTHERE; + break; + case MF_OPENMODE_FAIL_IF_EXIST: + mode |= STGM_FAILIFTHERE; + create = TRUE; break; case MF_OPENMODE_DELETE_IF_EXIST: - filecreation_disposition = CREATE_ALWAYS; + mode |= STGM_CREATE; break; } if (flags & MF_FILEFLAGS_NOBUFFERING) - fileattributes |= FILE_FLAG_NO_BUFFERING; - - /* Open HANDLE to file */ - file = CreateFileW(url, fileaccessmode, filesharemode, NULL, - filecreation_disposition, fileattributes, 0); - - if(file == INVALID_HANDLE_VALUE) - return HRESULT_FROM_WIN32(GetLastError()); + attributes |= FILE_FLAG_NO_BUFFERING; + if ((flags & MF_FILEFLAGS_ALLOW_WRITE_SHARING) && (accessmode == MF_ACCESSMODE_READ)) + mode &= ~STGM_SHARE_DENY_WRITE; - /* Close the file again, since we don't do anything with it yet */ - CloseHandle(file); + hres = SHCreateStreamOnFileEx(url, mode, attributes, create, NULL, &stream); + if(FAILED(hres)) + return hres; + if (reset) + { + ULARGE_INTEGER zero; + zero.QuadPart = 0; + IStream_SetSize(stream, zero); + } object = heap_alloc( sizeof(*object) ); if(!object) return E_OUTOFMEMORY; @@ -1215,6 +1225,7 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open init_attribute_object(&object->attributes, 0); object->IMFByteStream_iface.lpVtbl = &mfbytestream_vtbl; object->attributes.IMFAttributes_iface.lpVtbl = &mfbytestream_attributes_vtbl; + object->stream = stream; *bytestream = &object->IMFByteStream_iface; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 3fa59f4816..a4f11da36e 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -54,6 +54,48 @@ DEFINE_GUID(DUMMY_GUID2, 0x12345678,0x1234,0x1234,0x22,0x22,0x22,0x22,0x22,0x22, static const WCHAR mp4file[] = {'t','e','s','t','.','m','p','4',0}; +#define CHECK_REF(obj,ref) _check_ref((IUnknown*)obj, ref, __LINE__) +static void _check_ref(IUnknown* obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); +} + +#define CHECK_BS_POS(obj,pos) _check_bs_pos(obj, pos, __LINE__) +static void _check_bs_pos(IMFByteStream* obj, QWORD pos, int line) +{ + QWORD position = 0xdeadbeef; + HRESULT hr; + hr = IMFByteStream_GetCurrentPosition(obj, &position); + ok_(__FILE__,line)(hr == S_OK, "IMFByteStream_GetCurrentPosition failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(position == pos, "got wrong position: %s.\n", + wine_dbgstr_longlong(position)); +} + +#define CHECK_BS_LEN(obj,len) _check_bs_len(obj, len, __LINE__) +static void _check_bs_len(IMFByteStream* obj, QWORD len, int line) +{ + QWORD length = 0xdeadbeef; + HRESULT hr; + hr = IMFByteStream_GetLength(obj, &length); + ok_(__FILE__,line)(hr == S_OK, "IMFByteStream_GetLength failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(length == len, "got wrong length: %s.\n", + wine_dbgstr_longlong(length)); +} + +#define CHECK_FILE_SIZE(filename,exp_size) _check_file_size(filename, exp_size, __LINE__) +static void _check_file_size(const WCHAR *filename, LONG exp_size, int line) +{ + HANDLE handle; + DWORD file_size = 0xdeadbeef; + handle = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + file_size = GetFileSize(handle, NULL); + ok_(__FILE__,line)(file_size == exp_size, "got wrong file size: %d.\n", file_size); + CloseHandle(handle); +} + static WCHAR *load_resource(const WCHAR *name) { static WCHAR pathW[MAX_PATH]; @@ -450,8 +492,10 @@ static void test_MFCreateMFByteStreamOnStream(void) hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_REF(stream, 1); hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_REF(stream, 2); hr = IMFByteStream_QueryInterface(bytestream, &IID_IUnknown, (void **)&unknown); @@ -509,7 +553,8 @@ static void test_MFCreateFile(void) IMFAttributes *attributes = NULL; HRESULT hr; WCHAR *filename; - + LONG file_size; + HANDLE handle; static const WCHAR newfilename[] = {'n','e','w','.','m','p','4',0}; filename = load_resource(mp4file); @@ -534,13 +579,11 @@ static void test_MFCreateFile(void) hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); hr = MFCreateFile(MF_ACCESSMODE_READWRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); IMFByteStream_Release(bytestream); @@ -558,18 +601,15 @@ static void test_MFCreateFile(void) hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, newfilename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, newfilename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_ALLOW_WRITE_SHARING, newfilename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); IMFByteStream_Release(bytestream); @@ -580,10 +620,43 @@ static void test_MFCreateFile(void) /* Opening the file again fails even though MF_FILEFLAGS_ALLOW_WRITE_SHARING is set. */ hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_ALLOW_WRITE_SHARING, newfilename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, + MF_FILEFLAGS_ALLOW_WRITE_SHARING, newfilename, &bytestream2); + ok(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION) /* xp and vista */, + "MFCreateFile failed: 0x%08x.\n", hr); + if(hr == S_OK) + IMFByteStream_Release(bytestream2); + IMFByteStream_Release(bytestream); + + /* test MF_OPENMODE_APPEND_IF_EXIST */ + handle = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ok(handle != INVALID_HANDLE_VALUE, "File creation failed: 0x%08x.\n", GetLastError()); + file_size = GetFileSize(handle, NULL); + CloseHandle(handle); + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_APPEND_IF_EXIST, + MF_FILEFLAGS_ALLOW_WRITE_SHARING, filename, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_LEN(bytestream, file_size); + todo_wine CHECK_BS_POS(bytestream, 0); + IMFByteStream_Release(bytestream); + CHECK_FILE_SIZE(filename, file_size); + + /* test MF_OPENMODE_RESET_IF_EXIST with read-only mode */ + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_RESET_IF_EXIST, + MF_FILEFLAGS_ALLOW_WRITE_SHARING, filename, &bytestream); + ok(hr == E_INVALIDARG, "MFCreateFile should fail: 0x%08x.\n", hr); + CHECK_FILE_SIZE(filename, file_size); + + /* test MF_OPENMODE_RESET_IF_EXIST */ + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_RESET_IF_EXIST, + MF_FILEFLAGS_NONE, filename, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_LEN(bytestream, 0); + todo_wine CHECK_BS_POS(bytestream, 0); IMFByteStream_Release(bytestream); + CHECK_FILE_SIZE(filename, 0); MFShutdown(); -- 2.20.1

1 0

[PATCH] crypt32/tests: Show that PFXImportCertStore doesn't set CERT_KEY_PROV_INFO_PROP_ID.
by Hans Leidekker 07 Feb '19

07 Feb '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/crypt32/tests/store.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index f3fb420140..b8d0ad6666 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -3286,6 +3286,7 @@ static void test_PFXImportCertStore(void) CRYPT_DATA_BLOB pfx; const CERT_CONTEXT *cert; CERT_KEY_CONTEXT key; + CRYPT_KEY_PROV_INFO keyprov; CERT_INFO *info; DWORD count, size; BOOL ret; @@ -3323,6 +3324,11 @@ static void test_PFXImportCertStore(void) ok( key.hCryptProv, "hCryptProv not set\n" ); ok( key.dwKeySpec == AT_KEYEXCHANGE, "got %u\n", key.dwKeySpec ); + size = sizeof(keyprov); + SetLastError( 0xdeadbeef ); + ret = CertGetCertificateContextProperty( cert, CERT_KEY_PROV_INFO_PROP_ID, &keyprov, &size ); + ok( !ret && GetLastError() == CRYPT_E_NOT_FOUND, "got %08x\n", GetLastError() ); + CertCloseStore( store, 0 ); } -- 2.20.1

1 0

[PATCH] view: Move open dialog filter string to resource file and add extensions
by Isira Seneviratne 07 Feb '19

07 Feb '19

1 0

[PATCH v2 1/7] gdi32: Add a helper function to get the transform matrices.
by Byeongsik Jeon 07 Feb '19

07 Feb '19

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- Each helper function can be further refactored, but at this point, it has kept the existing code. In my personal git branch, I am modifying other issues, and these structural change seems appropriate. I will send patches that actually fix metric problems separately. dlls/gdi32/freetype.c | 234 ++++++++++++++++++++++-------------------- 1 file changed, 125 insertions(+), 109 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index c38108eece..a522bcaba6 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6588,6 +6588,129 @@ static inline FT_Vector normalize_vector(FT_Vector *vec) return out; } +static BOOL get_transform_matrix( GdiFont *font, BOOL tategaki, const MAT2 *lpmat, + FT_Matrix *transMat, FT_Matrix *transMatTategaki, + FT_Matrix *transMatUnrotated ) +{ + double widthRatio; + BOOL needsTransform = FALSE; + + /* Scaling factor */ + if (font->aveWidth) + { + TEXTMETRICW tm; + get_text_metrics( font, &tm ); + + widthRatio = (double)font->aveWidth; + widthRatio /= (double)font->potm->otmTextMetrics.tmAveCharWidth; + } + else + widthRatio = font->scale_y; + + /* Scaling transform */ + if (widthRatio != 1.0 || font->scale_y != 1.0) + { + FT_Matrix scaleMat; + scaleMat.xx = FT_FixedFromFloat( widthRatio ); + scaleMat.xy = 0; + scaleMat.yx = 0; + scaleMat.yy = FT_FixedFromFloat( font->scale_y ); + + pFT_Matrix_Multiply( &scaleMat, transMat ); + needsTransform = TRUE; + } + + /* Slant transform */ + if (font->fake_italic) + { + FT_Matrix slantMat; + slantMat.xx = (1 << 16); + slantMat.xy = (1 << 16) >> 2; + slantMat.yx = 0; + slantMat.yy = (1 << 16); + + pFT_Matrix_Multiply( &slantMat, transMat ); + needsTransform = TRUE; + } + + /* Rotation transform */ + *transMatUnrotated = *transMat; + *transMatTategaki = *transMat; + if (font->orientation || tategaki) + { + FT_Matrix rotationMat; + FT_Matrix taterotationMat; + FT_Vector vecAngle; + FT_Angle angle; + + double orient = font->orientation / 10.0; + double tate_orient = 0.f; + + if (tategaki) + tate_orient = ((font->orientation + 900) % 3600) / 10.0; + else + tate_orient = font->orientation / 10.0; + + if (orient) + { + angle = FT_FixedFromFloat( orient ); + pFT_Vector_Unit( &vecAngle, angle ); + rotationMat.xx = vecAngle.x; + rotationMat.xy = -vecAngle.y; + rotationMat.yx = -rotationMat.xy; + rotationMat.yy = rotationMat.xx; + + pFT_Matrix_Multiply( &rotationMat, transMat ); + } + + if (tate_orient) + { + angle = FT_FixedFromFloat( tate_orient ); + pFT_Vector_Unit( &vecAngle, angle ); + taterotationMat.xx = vecAngle.x; + taterotationMat.xy = -vecAngle.y; + taterotationMat.yx = -taterotationMat.xy; + taterotationMat.yy = taterotationMat.xx; + + pFT_Matrix_Multiply( &taterotationMat, transMatTategaki ); + } + + needsTransform = TRUE; + } + + /* World transform */ + if (!is_identity_FMAT2( &font->font_desc.matrix )) + { + FT_Matrix worldMat; + worldMat.xx = FT_FixedFromFloat( font->font_desc.matrix.eM11 ); + worldMat.xy = -FT_FixedFromFloat( font->font_desc.matrix.eM21 ); + worldMat.yx = -FT_FixedFromFloat( font->font_desc.matrix.eM12 ); + worldMat.yy = FT_FixedFromFloat( font->font_desc.matrix.eM22 ); + + pFT_Matrix_Multiply( &worldMat, transMat ); + pFT_Matrix_Multiply( &worldMat, transMatUnrotated ); + pFT_Matrix_Multiply( &worldMat, transMatTategaki ); + needsTransform = TRUE; + } + + /* Extra transformation specified by caller */ + if (!is_identity_MAT2( lpmat )) + { + FT_Matrix extraMat; + extraMat.xx = FT_FixedFromFIXED( lpmat->eM11 ); + extraMat.xy = FT_FixedFromFIXED( lpmat->eM21 ); + extraMat.yx = FT_FixedFromFIXED( lpmat->eM12 ); + extraMat.yy = FT_FixedFromFIXED( lpmat->eM22 ); + + pFT_Matrix_Multiply( &extraMat, transMat ); + pFT_Matrix_Multiply( &extraMat, transMatUnrotated ); + pFT_Matrix_Multiply( &extraMat, transMatTategaki ); + needsTransform = TRUE; + } + + return needsTransform; +} + static BOOL get_bold_glyph_outline(FT_GlyphSlot glyph, LONG ppem, FT_Glyph_Metrics *metrics) { FT_Error err; @@ -6946,9 +7069,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, INT left, right, top = 0, bottom = 0; FT_Vector adv; INT origin_x = 0, origin_y = 0; - FT_Angle angle = 0; FT_Int load_flags = get_load_flags(format); - double widthRatio = 1.0; FT_Matrix transMat = identityMat; FT_Matrix transMatUnrotated; FT_Matrix transMatTategaki; @@ -7008,113 +7129,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if (!font->gm[original_index / GM_BLOCK_SIZE]) font->gm[original_index / GM_BLOCK_SIZE] = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, sizeof(GM) * GM_BLOCK_SIZE); - /* Scaling factor */ - if (font->aveWidth) - { - TEXTMETRICW tm; - - get_text_metrics(font, &tm); - - widthRatio = (double)font->aveWidth; - widthRatio /= (double)font->potm->otmTextMetrics.tmAveCharWidth; - } - else - widthRatio = font->scale_y; - - /* Scaling transform */ - if (widthRatio != 1.0 || font->scale_y != 1.0) - { - FT_Matrix scaleMat; - scaleMat.xx = FT_FixedFromFloat(widthRatio); - scaleMat.xy = 0; - scaleMat.yx = 0; - scaleMat.yy = FT_FixedFromFloat(font->scale_y); - - pFT_Matrix_Multiply(&scaleMat, &transMat); - needsTransform = TRUE; - } - - /* Slant transform */ - if (font->fake_italic) { - FT_Matrix slantMat; - - slantMat.xx = (1 << 16); - slantMat.xy = ((1 << 16) >> 2); - slantMat.yx = 0; - slantMat.yy = (1 << 16); - pFT_Matrix_Multiply(&slantMat, &transMat); - needsTransform = TRUE; - } - - /* Rotation transform */ - transMatUnrotated = transMat; - transMatTategaki = transMat; - if(font->orientation || tategaki) { - FT_Matrix rotationMat; - FT_Matrix taterotationMat; - FT_Vector vecAngle; - - double orient = font->orientation / 10.0; - double tate_orient = 0.f; - - if (tategaki) - tate_orient = ((font->orientation+900)%3600)/10.0; - else - tate_orient = font->orientation/10.0; - - if (orient) - { - angle = FT_FixedFromFloat(orient); - pFT_Vector_Unit(&vecAngle, angle); - rotationMat.xx = vecAngle.x; - rotationMat.xy = -vecAngle.y; - rotationMat.yx = -rotationMat.xy; - rotationMat.yy = rotationMat.xx; - - pFT_Matrix_Multiply(&rotationMat, &transMat); - } - - if (tate_orient) - { - angle = FT_FixedFromFloat(tate_orient); - pFT_Vector_Unit(&vecAngle, angle); - taterotationMat.xx = vecAngle.x; - taterotationMat.xy = -vecAngle.y; - taterotationMat.yx = -taterotationMat.xy; - taterotationMat.yy = taterotationMat.xx; - pFT_Matrix_Multiply(&taterotationMat, &transMatTategaki); - } - - needsTransform = TRUE; - } - - /* World transform */ - if (!is_identity_FMAT2(&font->font_desc.matrix)) - { - FT_Matrix worldMat; - worldMat.xx = FT_FixedFromFloat(font->font_desc.matrix.eM11); - worldMat.xy = -FT_FixedFromFloat(font->font_desc.matrix.eM21); - worldMat.yx = -FT_FixedFromFloat(font->font_desc.matrix.eM12); - worldMat.yy = FT_FixedFromFloat(font->font_desc.matrix.eM22); - pFT_Matrix_Multiply(&worldMat, &transMat); - pFT_Matrix_Multiply(&worldMat, &transMatUnrotated); - pFT_Matrix_Multiply(&worldMat, &transMatTategaki); - needsTransform = TRUE; - } - - /* Extra transformation specified by caller */ - if (!is_identity_MAT2(lpmat)) - { - FT_Matrix extraMat; - extraMat.xx = FT_FixedFromFIXED(lpmat->eM11); - extraMat.xy = FT_FixedFromFIXED(lpmat->eM21); - extraMat.yx = FT_FixedFromFIXED(lpmat->eM12); - extraMat.yy = FT_FixedFromFIXED(lpmat->eM22); - pFT_Matrix_Multiply(&extraMat, &transMat); - pFT_Matrix_Multiply(&extraMat, &transMatUnrotated); - pFT_Matrix_Multiply(&extraMat, &transMatTategaki); - needsTransform = TRUE; - } + needsTransform = get_transform_matrix( font, tategaki, lpmat, + &transMat, &transMatTategaki, &transMatUnrotated ); vertical_metrics = (tategaki && FT_HAS_VERTICAL(ft_face)); /* there is a freetype bug where vertical metrics are only -- 2.20.1

3 15

[PATCH] view: Add metafile extensions to the filter string.
by Isira Seneviratne 07 Feb '19

07 Feb '19

2 1

[PATCH v2] po: Update French translation.
by Isira Seneviratne 07 Feb '19

07 Feb '19

1 0

[PATCH 1/5] comctl32/listbox: Check for out of bounds index using an unsigned index
by Gabriel Ivăncescu 07 Feb '19

07 Feb '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/listbox.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index cb645b4..71f1c05 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -489,7 +489,7 @@ static INT LISTBOX_GetItemFromPoint( const LB_DESCR *descr, INT x, INT y ) * Paint an item. */ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, - INT index, UINT action, BOOL ignoreFocus ) + UINT index, UINT action, BOOL ignoreFocus ) { BOOL selected = FALSE, focused; LB_ITEMDATA *item = NULL; @@ -508,7 +508,7 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, RECT r; HRGN hrgn; - if (!item) + if (index >= descr->nb_items) { if (action == ODA_FOCUS) DrawFocusRect( hdc, rect ); -- 2.19.1

2 16

[PATCH resend] ole32/tests: Test PropVariantCopy() with VT_UNKNOWN.
by Jactry Zeng 07 Feb '19

07 Feb '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/ole32/tests/propvariant.c | 58 ++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 97c4eec4ca..8c9f79e8d6 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include "windows.h" #include "wtypes.h" #include "ddeml.h" @@ -298,10 +300,55 @@ static void test_validtypes(void) } } +struct unk_impl +{ + IUnknown IUnknown_iface; + LONG ref; +}; + +static inline struct unk_impl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct unk_impl, IUnknown_iface); +} + +static HRESULT WINAPI unk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + if(winetest_debug > 1) + trace("Call to unk_QueryInterface()\n"); + *ppv = &This->IUnknown_iface; + IUnknown_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI unk_AddRef(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + if(winetest_debug > 1) + trace("Call to unk_AddRef()\n"); + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI unk_Release(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + if(winetest_debug > 1) + trace("Call to unk_Release()\n"); + return InterlockedDecrement(&This->ref); +} + +static const IUnknownVtbl unk_vtbl = +{ + unk_QueryInterface, + unk_AddRef, + unk_Release +}; + static void test_copy(void) { static char szTestString[] = "Test String"; static WCHAR wszTestString[] = {'T','e','s','t',' ','S','t','r','i','n','g',0}; + struct unk_impl unk_obj = {{&unk_vtbl}, 1}; PROPVARIANT propvarSrc; PROPVARIANT propvarDst; HRESULT hr; @@ -334,6 +381,17 @@ static void test_copy(void) hr = PropVariantClear(&propvarDst); ok(hr == S_OK, "PropVariantClear(...VT_LPSTR...) failed\n"); memset(&propvarSrc, 0, sizeof(propvarSrc)); + + propvarSrc.vt = VT_UNKNOWN; + U(propvarSrc).punkVal = &unk_obj.IUnknown_iface; + hr = PropVariantCopy(&propvarDst, &propvarSrc); + ok(hr == S_OK, "PropVariantCopy(...VT_UNKNOWN...) failed: 0x%08x.\n", hr); + ok(U(propvarDst).punkVal == &unk_obj.IUnknown_iface, "Got wrong IUnknown pointer\n"); + ok(unk_obj.ref == 2, "got wrong refcount: %d.\n", unk_obj.ref); + hr = PropVariantClear(&propvarDst); + ok(hr == S_OK, "PropVariantClear(...VT_UNKNOWN...) failed: 0x%08x.\n", hr); + ok(unk_obj.ref == 1, "got wrong refcount: %d.\n", unk_obj.ref); + memset(&propvarSrc, 0, sizeof(propvarSrc)); } struct _PMemoryAllocator_vtable { -- 2.20.1

2 1

[PATCH] secur32: Add support for client certificate authentication.
by Hans Leidekker 07 Feb '19

07 Feb '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/schannel.c | 92 ++++++------- dlls/secur32/schannel_gnutls.c | 303 ++++++++++++++++++++++++++++++++++++++++- dlls/secur32/schannel_macosx.c | 4 +- dlls/secur32/secur32_priv.h | 2 +- 4 files changed, 345 insertions(+), 56 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 792d7804b3..8063fd4d6b 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -338,26 +338,26 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryCredentialsAttributesW( return ret; } -static SECURITY_STATUS schan_CheckCreds(const SCHANNEL_CRED *schanCred) +static SECURITY_STATUS get_cert(const SCHANNEL_CRED *cred, CERT_CONTEXT const **cert) { - SECURITY_STATUS st; + SECURITY_STATUS status; DWORD i; - TRACE("dwVersion = %d\n", schanCred->dwVersion); - TRACE("cCreds = %d\n", schanCred->cCreds); - TRACE("hRootStore = %p\n", schanCred->hRootStore); - TRACE("cMappers = %d\n", schanCred->cMappers); - TRACE("cSupportedAlgs = %d:\n", schanCred->cSupportedAlgs); - for (i = 0; i < schanCred->cSupportedAlgs; i++) - TRACE("%08x\n", schanCred->palgSupportedAlgs[i]); - TRACE("grbitEnabledProtocols = %08x\n", schanCred->grbitEnabledProtocols); - TRACE("dwMinimumCipherStrength = %d\n", schanCred->dwMinimumCipherStrength); - TRACE("dwMaximumCipherStrength = %d\n", schanCred->dwMaximumCipherStrength); - TRACE("dwSessionLifespan = %d\n", schanCred->dwSessionLifespan); - TRACE("dwFlags = %08x\n", schanCred->dwFlags); - TRACE("dwCredFormat = %d\n", schanCred->dwCredFormat); - - switch (schanCred->dwVersion) + TRACE("dwVersion = %u\n", cred->dwVersion); + TRACE("cCreds = %u\n", cred->cCreds); + TRACE("paCred = %p\n", cred->paCred); + TRACE("hRootStore = %p\n", cred->hRootStore); + TRACE("cMappers = %u\n", cred->cMappers); + TRACE("cSupportedAlgs = %u:\n", cred->cSupportedAlgs); + for (i = 0; i < cred->cSupportedAlgs; i++) TRACE("%08x\n", cred->palgSupportedAlgs[i]); + TRACE("grbitEnabledProtocols = %08x\n", cred->grbitEnabledProtocols); + TRACE("dwMinimumCipherStrength = %u\n", cred->dwMinimumCipherStrength); + TRACE("dwMaximumCipherStrength = %u\n", cred->dwMaximumCipherStrength); + TRACE("dwSessionLifespan = %u\n", cred->dwSessionLifespan); + TRACE("dwFlags = %08x\n", cred->dwFlags); + TRACE("dwCredFormat = %u\n", cred->dwCredFormat); + + switch (cred->dwVersion) { case SCH_CRED_V3: case SCHANNEL_CRED_VERSION: @@ -366,29 +366,24 @@ static SECURITY_STATUS schan_CheckCreds(const SCHANNEL_CRED *schanCred) return SEC_E_INTERNAL_ERROR; } - if (schanCred->cCreds == 0) - st = SEC_E_NO_CREDENTIALS; - else if (schanCred->cCreds > 1) - st = SEC_E_UNKNOWN_CREDENTIALS; + if (!cred->cCreds) status = SEC_E_NO_CREDENTIALS; + else if (cred->cCreds > 1) status = SEC_E_UNKNOWN_CREDENTIALS; else { - DWORD keySpec; - HCRYPTPROV csp; - BOOL ret, freeCSP; - - ret = CryptAcquireCertificatePrivateKey(schanCred->paCred[0], - 0, /* FIXME: what flags to use? */ NULL, - &csp, &keySpec, &freeCSP); - if (ret) + DWORD spec; + HCRYPTPROV prov; + BOOL free; + + if (CryptAcquireCertificatePrivateKey(cred->paCred[0], CRYPT_ACQUIRE_CACHE_FLAG, NULL, &prov, &spec, &free)) { - st = SEC_E_OK; - if (freeCSP) - CryptReleaseContext(csp, 0); + if (free) CryptReleaseContext(prov, 0); + *cert = cred->paCred[0]; + status = SEC_E_OK; } - else - st = SEC_E_UNKNOWN_CREDENTIALS; + else status = SEC_E_UNKNOWN_CREDENTIALS; } - return st; + + return status; } static SECURITY_STATUS schan_AcquireClientCredentials(const SCHANNEL_CRED *schanCred, @@ -397,17 +392,18 @@ static SECURITY_STATUS schan_AcquireClientCredentials(const SCHANNEL_CRED *schan struct schan_credentials *creds; unsigned enabled_protocols; ULONG_PTR handle; - SECURITY_STATUS st = SEC_E_OK; + SECURITY_STATUS status = SEC_E_OK; + const CERT_CONTEXT *cert = NULL; TRACE("schanCred %p, phCredential %p, ptsExpiry %p\n", schanCred, phCredential, ptsExpiry); if (schanCred) { - st = schan_CheckCreds(schanCred); - if (st != SEC_E_OK && st != SEC_E_NO_CREDENTIALS) - return st; + status = get_cert(schanCred, &cert); + if (status != SEC_E_OK && status != SEC_E_NO_CREDENTIALS) + return status; - st = SEC_E_OK; + status = SEC_E_OK; } read_config(); @@ -420,9 +416,6 @@ static SECURITY_STATUS schan_AcquireClientCredentials(const SCHANNEL_CRED *schan return SEC_E_NO_AUTHENTICATING_AUTHORITY; } - /* For now, the only thing I'm interested in is the direction of the - * connection, so just store it. - */ creds = heap_alloc(sizeof(*creds)); if (!creds) return SEC_E_INSUFFICIENT_MEMORY; @@ -430,7 +423,7 @@ static SECURITY_STATUS schan_AcquireClientCredentials(const SCHANNEL_CRED *schan if (handle == SCHAN_INVALID_HANDLE) goto fail; creds->credential_use = SECPKG_CRED_OUTBOUND; - if (!schan_imp_allocate_certificate_credentials(creds)) + if (!schan_imp_allocate_certificate_credentials(creds, cert)) { schan_free_handle(handle, SCHAN_HANDLE_CRED); goto fail; @@ -447,7 +440,7 @@ static SECURITY_STATUS schan_AcquireClientCredentials(const SCHANNEL_CRED *schan ptsExpiry->HighPart = 0; } - return st; + return status; fail: heap_free(creds); @@ -457,14 +450,15 @@ fail: static SECURITY_STATUS schan_AcquireServerCredentials(const SCHANNEL_CRED *schanCred, PCredHandle phCredential, PTimeStamp ptsExpiry) { - SECURITY_STATUS st; + SECURITY_STATUS status; + const CERT_CONTEXT *cert = NULL; TRACE("schanCred %p, phCredential %p, ptsExpiry %p\n", schanCred, phCredential, ptsExpiry); if (!schanCred) return SEC_E_NO_CREDENTIALS; - st = schan_CheckCreds(schanCred); - if (st == SEC_E_OK) + status = get_cert(schanCred, &cert); + if (status == SEC_E_OK) { ULONG_PTR handle; struct schan_credentials *creds; @@ -485,7 +479,7 @@ static SECURITY_STATUS schan_AcquireServerCredentials(const SCHANNEL_CRED *schan /* FIXME: get expiry from cert */ } - return st; + return status; } static SECURITY_STATUS schan_AcquireCredentialsHandle(ULONG fCredentialUse, diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index cb90d1c40d..ddb10aca8c 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -24,18 +24,24 @@ #include <stdarg.h> #include <stdio.h> +#include <assert.h> #ifdef SONAME_LIBGNUTLS #include <gnutls/gnutls.h> #include <gnutls/crypto.h> +#include <gnutls/abstract.h> #endif #include "windef.h" #include "winbase.h" #include "sspi.h" #include "schannel.h" +#include "lmcons.h" +#include "winreg.h" #include "secur32_priv.h" + #include "wine/debug.h" #include "wine/library.h" +#include "wine/unicode.h" #if defined(SONAME_LIBGNUTLS) && !defined(HAVE_SECURITY_SECURITY_H) @@ -43,7 +49,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(secur32); WINE_DECLARE_DEBUG_CHANNEL(winediag); /* Not present in gnutls version < 2.9.10. */ -static int (*pgnutls_cipher_get_block_size)(gnutls_cipher_algorithm_t algorithm); +static int (*pgnutls_cipher_get_block_size)(gnutls_cipher_algorithm_t); + +/* Not present in gnutls version < 3.4.0. */ +static int (*pgnutls_privkey_export_x509)(gnutls_privkey_t, gnutls_x509_privkey_t *); static void *libgnutls_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -52,6 +61,7 @@ MAKE_FUNCPTR(gnutls_alert_get_name); MAKE_FUNCPTR(gnutls_certificate_allocate_credentials); MAKE_FUNCPTR(gnutls_certificate_free_credentials); MAKE_FUNCPTR(gnutls_certificate_get_peers); +MAKE_FUNCPTR(gnutls_certificate_set_x509_key); MAKE_FUNCPTR(gnutls_cipher_get); MAKE_FUNCPTR(gnutls_cipher_get_key_size); MAKE_FUNCPTR(gnutls_credentials_set); @@ -68,6 +78,9 @@ MAKE_FUNCPTR(gnutls_mac_get_key_size); MAKE_FUNCPTR(gnutls_perror); MAKE_FUNCPTR(gnutls_protocol_get_version); MAKE_FUNCPTR(gnutls_priority_set_direct); +MAKE_FUNCPTR(gnutls_privkey_deinit); +MAKE_FUNCPTR(gnutls_privkey_import_rsa_raw); +MAKE_FUNCPTR(gnutls_privkey_init); MAKE_FUNCPTR(gnutls_record_get_max_size); MAKE_FUNCPTR(gnutls_record_recv); MAKE_FUNCPTR(gnutls_record_send); @@ -77,6 +90,10 @@ MAKE_FUNCPTR(gnutls_transport_set_errno); MAKE_FUNCPTR(gnutls_transport_set_ptr); MAKE_FUNCPTR(gnutls_transport_set_pull_function); MAKE_FUNCPTR(gnutls_transport_set_push_function); +MAKE_FUNCPTR(gnutls_x509_crt_deinit); +MAKE_FUNCPTR(gnutls_x509_crt_import); +MAKE_FUNCPTR(gnutls_x509_crt_init); +MAKE_FUNCPTR(gnutls_x509_privkey_deinit); #undef MAKE_FUNCPTR #if GNUTLS_VERSION_MAJOR < 3 @@ -115,6 +132,12 @@ static int compat_cipher_get_block_size(gnutls_cipher_algorithm_t cipher) } } +static int compat_gnutls_privkey_export_x509(gnutls_privkey_t privkey, gnutls_x509_privkey_t *key) +{ + FIXME("\n"); + return GNUTLS_E_UNKNOWN_PK_ALGORITHM; +} + static ssize_t schan_pull_adapter(gnutls_transport_ptr_t transport, void *buff, size_t buff_len) { @@ -556,12 +579,271 @@ again: return SEC_E_OK; } -BOOL schan_imp_allocate_certificate_credentials(schan_credentials *c) +static WCHAR *get_key_container_path(const CERT_CONTEXT *ctx) +{ + static const WCHAR rsabaseW[] = + {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\','C','r','y','p','t','o','\\','R','S','A','\\',0}; + DWORD size; + CERT_KEY_CONTEXT keyctx; + CRYPT_KEY_PROV_INFO *prov; + WCHAR username[UNLEN + 1], *ret = NULL; + DWORD len = ARRAY_SIZE(username); + + size = sizeof(keyctx); + if (CertGetCertificateContextProperty(ctx, CERT_KEY_CONTEXT_PROP_ID, &keyctx, &size)) + { + char *str; + if (!CryptGetProvParam(keyctx.hCryptProv, PP_CONTAINER, NULL, &size, 0)) return NULL; + if (!(str = heap_alloc(size))) return NULL; + if (!CryptGetProvParam(keyctx.hCryptProv, PP_CONTAINER, (BYTE *)str, &size, 0)) return NULL; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + if (!(ret = heap_alloc(sizeof(rsabaseW) + len * sizeof(WCHAR)))) + { + heap_free(str); + return NULL; + } + strcpyW(ret, rsabaseW); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret + strlenW(ret), len); + heap_free(str); + } + else + { + size = 0; + if (!CertGetCertificateContextProperty(ctx, CERT_KEY_PROV_INFO_PROP_ID, NULL, &size)) return NULL; + if (!(prov = heap_alloc(size))) return NULL; + if (!CertGetCertificateContextProperty(ctx, CERT_KEY_PROV_INFO_PROP_ID, prov, &size)) + { + heap_free(prov); + return NULL; + } + if (!(ret = heap_alloc(sizeof(rsabaseW) + strlenW(prov->pwszContainerName) * sizeof(WCHAR)))) + { + heap_free(prov); + return NULL; + } + strcpyW(ret, rsabaseW); + strcatW(ret, prov->pwszContainerName); + heap_free(prov); + } + + if (!ret && GetUserNameW(username, &len) && (ret = heap_alloc(sizeof(rsabaseW) + len * sizeof(WCHAR)))) + { + strcpyW(ret, rsabaseW); + strcatW(ret, username); + } + + return ret; +} + +#define MAX_LEAD_BYTES 8 +static BYTE *get_key_blob(const CERT_CONTEXT *ctx, ULONG *size) +{ + static const WCHAR keyexchangeW[] = + {'K','e','y','E','x','c','h','a','n','g','e','K','e','y','P','a','i','r',0}; + static const WCHAR signatureW[] = + {'S','i','g','n','a','t','u','r','e','K','e','y','P','a','i','r',0}; + BYTE *buf, *ret = NULL; + DATA_BLOB blob_in, blob_out; + DWORD spec = 0, type, len; + WCHAR *path; + HKEY hkey; + + if (!(path = get_key_container_path(ctx))) return NULL; + if (RegOpenKeyExW(HKEY_CURRENT_USER, path, 0, KEY_READ, &hkey)) + { + heap_free(path); + return NULL; + } + + if (!RegQueryValueExW(hkey, keyexchangeW, 0, &type, NULL, &len)) spec = AT_KEYEXCHANGE; + else if (!RegQueryValueExW(hkey, signatureW, 0, &type, NULL, &len)) spec = AT_SIGNATURE; + else + { + RegCloseKey(hkey); + return NULL; + } + + if (!(buf = heap_alloc(len + MAX_LEAD_BYTES))) + { + RegCloseKey(hkey); + return NULL; + } + + if (!RegQueryValueExW(hkey, (spec == AT_KEYEXCHANGE) ? keyexchangeW : signatureW, 0, &type, buf, &len)) + { + blob_in.pbData = buf; + blob_in.cbData = len; + if (CryptUnprotectData(&blob_in, NULL, NULL, NULL, NULL, 0, &blob_out)) + { + assert(blob_in.cbData >= blob_out.cbData); + memcpy(buf, blob_out.pbData, blob_out.cbData); + LocalFree(blob_out.pbData); + *size = blob_out.cbData + MAX_LEAD_BYTES; + ret = buf; + } + } + else heap_free(buf); + + RegCloseKey(hkey); + heap_free(path); + return ret; +} + +static inline void reverse_bytes(BYTE *buf, ULONG len) { - int ret = pgnutls_certificate_allocate_credentials((gnutls_certificate_credentials_t*)&c->credentials); + BYTE tmp; + ULONG i; + for (i = 0; i < len / 2; i++) + { + tmp = buf[i]; + buf[i] = buf[len - i - 1]; + buf[len - i - 1] = tmp; + } +} + +static ULONG set_component(gnutls_datum_t *comp, BYTE *data, ULONG len, ULONG *buflen) +{ + comp->data = data; + comp->size = len; + reverse_bytes(comp->data, comp->size); + if (comp->data[0] & 0x80) /* add leading 0 byte if most significant bit is set */ + { + memmove(comp->data + 1, comp->data, *buflen); + comp->data[0] = 0; + comp->size++; + } + *buflen -= comp->size; + return comp->size; +} + +static gnutls_x509_privkey_t get_x509_key(const CERT_CONTEXT *ctx) +{ + gnutls_privkey_t key = NULL; + gnutls_x509_privkey_t x509key = NULL; + gnutls_datum_t m, e, d, p, q, u, e1, e2; + BYTE *ptr, *buffer; + RSAPUBKEY *rsakey; + DWORD size; + int ret; + + if (!(buffer = get_key_blob(ctx, &size))) return NULL; + if (size < sizeof(BLOBHEADER)) goto done; + + rsakey = (RSAPUBKEY *)(buffer + sizeof(BLOBHEADER)); + TRACE("RSA key bitlen %u pubexp %u\n", rsakey->bitlen, rsakey->pubexp); + + size -= sizeof(BLOBHEADER) + FIELD_OFFSET(RSAPUBKEY, pubexp); + set_component(&e, (BYTE *)&rsakey->pubexp, sizeof(rsakey->pubexp), &size); + + ptr = (BYTE *)(rsakey + 1); + ptr += set_component(&m, ptr, rsakey->bitlen / 8, &size); + ptr += set_component(&p, ptr, rsakey->bitlen / 16, &size); + ptr += set_component(&q, ptr, rsakey->bitlen / 16, &size); + ptr += set_component(&e1, ptr, rsakey->bitlen / 16, &size); + ptr += set_component(&e2, ptr, rsakey->bitlen / 16, &size); + ptr += set_component(&u, ptr, rsakey->bitlen / 16, &size); + ptr += set_component(&d, ptr, rsakey->bitlen / 8, &size); + + if ((ret = pgnutls_privkey_init(&key)) < 0) + { + pgnutls_perror(ret); + goto done; + } + + if ((ret = pgnutls_privkey_import_rsa_raw(key, &m, &e, &d, &p, &q, &u, &e1, &e2)) < 0) + { + pgnutls_perror(ret); + goto done; + } + + if ((ret = pgnutls_privkey_export_x509(key, &x509key)) < 0) + { + pgnutls_perror(ret); + } + +done: + heap_free(buffer); + pgnutls_privkey_deinit(key); + return x509key; +} + +static gnutls_x509_crt_t get_x509_crt(const CERT_CONTEXT *ctx) +{ + gnutls_datum_t data; + gnutls_x509_crt_t crt; + int ret; + + if (!ctx) return FALSE; + if (ctx->dwCertEncodingType != X509_ASN_ENCODING) + { + FIXME("encoding type %u not supported\n", ctx->dwCertEncodingType); + return NULL; + } + + if ((ret = pgnutls_x509_crt_init(&crt)) < 0) + { + pgnutls_perror(ret); + return NULL; + } + + data.data = ctx->pbCertEncoded; + data.size = ctx->cbCertEncoded; + if ((ret = pgnutls_x509_crt_import(crt, &data, GNUTLS_X509_FMT_DER)) < 0) + { + pgnutls_perror(ret); + pgnutls_x509_crt_deinit(crt); + return NULL; + } + + return crt; +} + +BOOL schan_imp_allocate_certificate_credentials(schan_credentials *c, const CERT_CONTEXT *ctx) +{ + gnutls_certificate_credentials_t creds; + gnutls_x509_crt_t crt; + gnutls_x509_privkey_t key; + int ret; + + ret = pgnutls_certificate_allocate_credentials(&creds); + if (ret != GNUTLS_E_SUCCESS) + { + pgnutls_perror(ret); + return FALSE; + } + + if (!ctx) + { + c->credentials = creds; + return TRUE; + } + + if (!(crt = get_x509_crt(ctx))) + { + pgnutls_certificate_free_credentials(creds); + return FALSE; + } + + if (!(key = get_x509_key(ctx))) + { + pgnutls_x509_crt_deinit(crt); + pgnutls_certificate_free_credentials(creds); + return FALSE; + } + + ret = pgnutls_certificate_set_x509_key(creds, &crt, 1, key); + pgnutls_x509_privkey_deinit(key); + pgnutls_x509_crt_deinit(crt); if (ret != GNUTLS_E_SUCCESS) + { pgnutls_perror(ret); - return (ret == GNUTLS_E_SUCCESS); + pgnutls_certificate_free_credentials(creds); + return FALSE; + } + + c->credentials = creds; + return TRUE; } void schan_imp_free_certificate_credentials(schan_credentials *c) @@ -597,6 +879,7 @@ BOOL schan_imp_init(void) LOAD_FUNCPTR(gnutls_certificate_allocate_credentials) LOAD_FUNCPTR(gnutls_certificate_free_credentials) LOAD_FUNCPTR(gnutls_certificate_get_peers) + LOAD_FUNCPTR(gnutls_certificate_set_x509_key) LOAD_FUNCPTR(gnutls_cipher_get) LOAD_FUNCPTR(gnutls_cipher_get_key_size) LOAD_FUNCPTR(gnutls_credentials_set) @@ -613,6 +896,9 @@ BOOL schan_imp_init(void) LOAD_FUNCPTR(gnutls_perror) LOAD_FUNCPTR(gnutls_protocol_get_version) LOAD_FUNCPTR(gnutls_priority_set_direct) + LOAD_FUNCPTR(gnutls_privkey_deinit) + LOAD_FUNCPTR(gnutls_privkey_import_rsa_raw) + LOAD_FUNCPTR(gnutls_privkey_init) LOAD_FUNCPTR(gnutls_record_get_max_size); LOAD_FUNCPTR(gnutls_record_recv); LOAD_FUNCPTR(gnutls_record_send); @@ -622,6 +908,10 @@ BOOL schan_imp_init(void) LOAD_FUNCPTR(gnutls_transport_set_ptr) LOAD_FUNCPTR(gnutls_transport_set_pull_function) LOAD_FUNCPTR(gnutls_transport_set_push_function) + LOAD_FUNCPTR(gnutls_x509_crt_deinit) + LOAD_FUNCPTR(gnutls_x509_crt_import) + LOAD_FUNCPTR(gnutls_x509_crt_init) + LOAD_FUNCPTR(gnutls_x509_privkey_deinit) #undef LOAD_FUNCPTR if (!(pgnutls_cipher_get_block_size = wine_dlsym(libgnutls_handle, "gnutls_cipher_get_block_size", NULL, 0))) @@ -629,6 +919,11 @@ BOOL schan_imp_init(void) WARN("gnutls_cipher_get_block_size not found\n"); pgnutls_cipher_get_block_size = compat_cipher_get_block_size; } + if (!(pgnutls_privkey_export_x509 = wine_dlsym(libgnutls_handle, "gnutls_privkey_export_x509", NULL, 0))) + { + WARN("gnutls_privkey_export_x509 not found\n"); + pgnutls_privkey_export_x509 = compat_gnutls_privkey_export_x509; + } ret = pgnutls_global_init(); if (ret != GNUTLS_E_SUCCESS) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 29d2f65172..981e4fb5ad 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -1185,9 +1185,9 @@ SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer, return SEC_E_OK; } -BOOL schan_imp_allocate_certificate_credentials(schan_credentials *c) +BOOL schan_imp_allocate_certificate_credentials(schan_credentials *c, const CERT_CONTEXT *cert) { - /* The certificate is never really used for anything. */ + if (cert) FIXME("no support for certificate credentials on this platform\n"); c->credentials = NULL; return TRUE; } diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 4566fe2446..a62d6cb2df 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -247,7 +247,7 @@ extern SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buf SIZE_T *length) DECLSPEC_HIDDEN; extern SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer, SIZE_T *length) DECLSPEC_HIDDEN; -extern BOOL schan_imp_allocate_certificate_credentials(schan_credentials*) DECLSPEC_HIDDEN; +extern BOOL schan_imp_allocate_certificate_credentials(schan_credentials *, const CERT_CONTEXT *) DECLSPEC_HIDDEN; extern void schan_imp_free_certificate_credentials(schan_credentials*) DECLSPEC_HIDDEN; extern DWORD schan_imp_enabled_protocols(void) DECLSPEC_HIDDEN; extern BOOL schan_imp_init(void) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH v4 3/3] mfplat: Implement IMFByteStream::{Read,Write}.
by Jactry Zeng 07 Feb '19

07 Feb '19

Superseded patch 157911. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 25 +++++++++++++++++++++---- dlls/mfplat/tests/mfplat.c | 26 +++++++++++++------------- 2 files changed, 34 insertions(+), 17 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 4f42fc0939..898634f153 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -981,10 +981,23 @@ static HRESULT WINAPI mfbytestream_IsEndOfStream(IMFByteStream *iface, BOOL *end static HRESULT WINAPI mfbytestream_Read(IMFByteStream *iface, BYTE *data, ULONG count, ULONG *byte_read) { mfbytestream *This = impl_from_IMFByteStream(iface); + STATSTG statstg; + QWORD length; + HRESULT hr; - FIXME("%p, %p, %u, %p\n", This, data, count, byte_read); + TRACE("(%p)->(%p, %u, %p)\n", This, data, count, byte_read); - return E_NOTIMPL; + memset(&statstg, 0, sizeof(statstg)); + hr = IStream_Stat(This->stream, &statstg, STATFLAG_NONAME); + if(FAILED(hr)) + return hr; + if((statstg.grfMode & 0xf) == STGM_WRITE) + return E_ACCESSDENIED; + + IMFByteStream_GetLength(iface, &length); + if(count > length) + count = length; + return IStream_Read(This->stream, data, count, byte_read); } static HRESULT WINAPI mfbytestream_BeginRead(IMFByteStream *iface, BYTE *data, ULONG count, @@ -1009,10 +1022,14 @@ static HRESULT WINAPI mfbytestream_EndRead(IMFByteStream *iface, IMFAsyncResult static HRESULT WINAPI mfbytestream_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written) { mfbytestream *This = impl_from_IMFByteStream(iface); + HRESULT hr; - FIXME("%p, %p, %u, %p\n", This, data, count, written); + TRACE("(%p)->(%p, %u, %p)\n", This, data, count, written); - return E_NOTIMPL; + hr = IStream_Write(This->stream, data, count, written); + if(hr == STG_E_ACCESSDENIED) + return E_ACCESSDENIED; + return hr; } static HRESULT WINAPI mfbytestream_BeginWrite(IMFByteStream *iface, const BYTE *data, ULONG count, diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 9d081c12c4..ac2eaa5b75 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -797,13 +797,13 @@ static void test_bytestream_from_file(void) CHECK_BS_LEN(bytestream, sizeof(asf_header)); read = 0; hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); - todo_wine ok(hr == S_OK, "IMFByteStream_Read failed: 0x%08x.\n", hr); - todo_wine ok(read == sizeof(asf_header), "got wrong read length: %d.\n", read); - todo_wine ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + ok(hr == S_OK, "IMFByteStream_Read failed: 0x%08x.\n", hr); + ok(read == sizeof(asf_header), "got wrong read length: %d.\n", read); + ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); memset(buffer, 0, sizeof(buffer)); hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); - todo_wine ok(hr == E_ACCESSDENIED, "IMFByteStream_Write should fail: 0x%08x.\n", hr); + ok(hr == E_ACCESSDENIED, "IMFByteStream_Write should fail: 0x%08x.\n", hr); hr = IMFByteStream_SetLength(bytestream, 200); ok(hr == E_FAIL, "IMFByteStream_SetLength should fail: 0x%08x.\n", hr); todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); @@ -814,12 +814,12 @@ static void test_bytestream_from_file(void) MF_FILEFLAGS_NONE, asffile, &bytestream); ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); - todo_wine ok(hr == E_ACCESSDENIED, "IMFByteStream_Read should fail: 0x%08x.\n", hr); + ok(hr == E_ACCESSDENIED, "IMFByteStream_Read should fail: 0x%08x.\n", hr); todo_wine CHECK_BS_POS(bytestream, 0); written = 0xdeadbeef; hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); - todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); - todo_wine ok(written == sizeof(asf_header), "got wrong written length: %d.\n", written); + ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + ok(written == sizeof(asf_header), "got wrong written length: %d.\n", written); CHECK_BS_LEN(bytestream, sizeof(asf_header)); todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); @@ -846,8 +846,8 @@ static void test_bytestream_from_file(void) CHECK_BS_LEN(bytestream, sizeof(asf_header) + 2); written = 0xdeadbeef; hr = IMFByteStream_Write(bytestream, test_data, sizeof(test_data), &written); - todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); - todo_wine ok(written == sizeof(test_data), "got wrong written length: %d.\n", written); + ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + ok(written == sizeof(test_data), "got wrong written length: %d.\n", written); CHECK_BS_LEN(bytestream, sizeof(asf_header) + 2); todo_wine CHECK_BS_POS(bytestream, sizeof(test_data)); IMFByteStream_Release(bytestream); @@ -898,8 +898,8 @@ static void test_bytestream_from_stream(void) CHECK_BS_LEN(bytestream, sizeof(asf_header)); hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); todo_wine ok(hr == S_FALSE, "IMFByteStream_Read returned: 0x%08x.\n", hr); - todo_wine ok(read == sizeof(asf_header), "got wrong read length: %d.\n", read); - todo_wine ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + ok(read == sizeof(asf_header), "got wrong read length: %d.\n", read); + ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); memset(buffer, 0, sizeof(buffer)); todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); @@ -922,8 +922,8 @@ static void test_bytestream_from_stream(void) todo_wine CHECK_BS_POS(bytestream, 0); written = 0xdeadbeef; hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); - todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); - todo_wine ok(written == sizeof(asf_header), "got wrong written length: %d.\n", written); + ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + ok(written == sizeof(asf_header), "got wrong written length: %d.\n", written); CHECK_BS_LEN(bytestream, sizeof(asf_header)); todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); -- 2.20.1

2 1

[PATCH v4 2/3] mfplat: Implement IMFByteStream::{GetLength,SetLength}.
by Jactry Zeng 07 Feb '19

07 Feb '19

Superseded patch 157910. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 19 +++- dlls/mfplat/tests/Makefile.in | 2 +- dlls/mfplat/tests/mfplat.c | 188 +++++++++++++++++++++++++++++++++- 3 files changed, 202 insertions(+), 7 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 8aab65c28d..4f42fc0939 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -922,19 +922,30 @@ static HRESULT WINAPI mfbytestream_GetCapabilities(IMFByteStream *iface, DWORD * static HRESULT WINAPI mfbytestream_GetLength(IMFByteStream *iface, QWORD *length) { mfbytestream *This = impl_from_IMFByteStream(iface); + HRESULT hr; + STATSTG statstg; - FIXME("%p, %p\n", This, length); + TRACE("(%p)->(%p)\n", This, length); - return E_NOTIMPL; + memset(&statstg, 0, sizeof(statstg)); + + hr = IStream_Stat(This->stream, &statstg, STATFLAG_NONAME); + + if (SUCCEEDED(hr)) + *length = statstg.cbSize.QuadPart; + + return hr; } static HRESULT WINAPI mfbytestream_SetLength(IMFByteStream *iface, QWORD length) { mfbytestream *This = impl_from_IMFByteStream(iface); + ULARGE_INTEGER size; - FIXME("%p, %s\n", This, wine_dbgstr_longlong(length)); + TRACE("(%p)->(%s)\n", This, wine_dbgstr_longlong(length)); - return E_NOTIMPL; + size.QuadPart = length; + return IStream_SetSize(This->stream, size); } static HRESULT WINAPI mfbytestream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) diff --git a/dlls/mfplat/tests/Makefile.in b/dlls/mfplat/tests/Makefile.in index 07cf328ad2..f7f09aa33e 100644 --- a/dlls/mfplat/tests/Makefile.in +++ b/dlls/mfplat/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mfplat.dll -IMPORTS = ole32 mfplat +IMPORTS = ole32 mfplat shlwapi C_SRCS = \ mfplat.c diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index a4f11da36e..9d081c12c4 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -33,6 +33,7 @@ #include "mfidl.h" #include "mferror.h" #include "mfreadwrite.h" +#include "shlwapi.h" #include "wine/test.h" @@ -52,6 +53,9 @@ DEFINE_GUID(DUMMY_CLSID, 0x12345678,0x1234,0x1234,0x12,0x13,0x14,0x15,0x16,0x17, DEFINE_GUID(DUMMY_GUID1, 0x12345678,0x1234,0x1234,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21); DEFINE_GUID(DUMMY_GUID2, 0x12345678,0x1234,0x1234,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22); +static const byte asf_header[] = {0x30,0x26,0xb2,0x75,0x8e,0x66,0xcf,0x11, + 0xa6,0xd9,0x00,0xaa,0x00,0x62,0xce,0x6c}; + static const WCHAR mp4file[] = {'t','e','s','t','.','m','p','4',0}; #define CHECK_REF(obj,ref) _check_ref((IUnknown*)obj, ref, __LINE__) @@ -638,7 +642,7 @@ static void test_MFCreateFile(void) hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_APPEND_IF_EXIST, MF_FILEFLAGS_ALLOW_WRITE_SHARING, filename, &bytestream); ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); - todo_wine CHECK_BS_LEN(bytestream, file_size); + CHECK_BS_LEN(bytestream, file_size); todo_wine CHECK_BS_POS(bytestream, 0); IMFByteStream_Release(bytestream); CHECK_FILE_SIZE(filename, file_size); @@ -653,7 +657,7 @@ static void test_MFCreateFile(void) hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_RESET_IF_EXIST, MF_FILEFLAGS_NONE, filename, &bytestream); ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); - todo_wine CHECK_BS_LEN(bytestream, 0); + CHECK_BS_LEN(bytestream, 0); todo_wine CHECK_BS_POS(bytestream, 0); IMFByteStream_Release(bytestream); CHECK_FILE_SIZE(filename, 0); @@ -766,6 +770,184 @@ static void test_MFSample(void) IMFSample_Release(sample); } +static void test_bytestream_from_file(void) +{ + IMFByteStream *bytestream; + HRESULT hr; + HANDLE file; + static WCHAR asffile[] = {'t','e','s','t','.','a','s','f',0}; + byte buffer[1024] = {0}; + byte test_data[] = {0x1,0x2,0x3,0x4}; + ULONG written, read; + QWORD length; + + file = CreateFileW(asffile, GENERIC_READ|GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "File creation failed: 0x%08x.\n", GetLastError()); + WriteFile(file, asf_header, sizeof(asf_header), &written, NULL); + CloseHandle(file); + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "MFStartup failed: 0x%08x.\n", hr); + + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, + MF_FILEFLAGS_NONE, asffile, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + read = 0; + hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); + todo_wine ok(hr == S_OK, "IMFByteStream_Read failed: 0x%08x.\n", hr); + todo_wine ok(read == sizeof(asf_header), "got wrong read length: %d.\n", read); + todo_wine ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + memset(buffer, 0, sizeof(buffer)); + hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); + todo_wine ok(hr == E_ACCESSDENIED, "IMFByteStream_Write should fail: 0x%08x.\n", hr); + hr = IMFByteStream_SetLength(bytestream, 200); + ok(hr == E_FAIL, "IMFByteStream_SetLength should fail: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + IMFByteStream_Release(bytestream); + + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, + MF_FILEFLAGS_NONE, asffile, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); + todo_wine ok(hr == E_ACCESSDENIED, "IMFByteStream_Read should fail: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + written = 0xdeadbeef; + hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); + todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + todo_wine ok(written == sizeof(asf_header), "got wrong written length: %d.\n", written); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + + hr = IMFByteStream_SetLength(bytestream, sizeof(asf_header) + 2); + ok(hr == S_OK, "IMFByteStream_SetLength failed: 0x%08x.\n", hr); + length = 0xdeadbeef; + hr = IMFByteStream_GetLength(bytestream, &length); + ok(hr == S_OK, "IMFByteStream_GetLength failed: 0x%08x.\n", hr); + ok(length == sizeof(asf_header) || length == (sizeof(asf_header) + 2) /* xp */, + "got wrong length: %s.\n", wine_dbgstr_longlong(length)); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + IMFByteStream_Release(bytestream); + file = CreateFileW(asffile, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ReadFile(file, buffer, sizeof(buffer), &read, NULL); + ok(read == sizeof(asf_header) + 2, "got wrong read length: %d.\n", read); + ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + memset(buffer, 0, sizeof(buffer)); + CloseHandle(file); + + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_APPEND_IF_EXIST, + MF_FILEFLAGS_NONE, asffile, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_LEN(bytestream, sizeof(asf_header) + 2); + written = 0xdeadbeef; + hr = IMFByteStream_Write(bytestream, test_data, sizeof(test_data), &written); + todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + todo_wine ok(written == sizeof(test_data), "got wrong written length: %d.\n", written); + CHECK_BS_LEN(bytestream, sizeof(asf_header) + 2); + todo_wine CHECK_BS_POS(bytestream, sizeof(test_data)); + IMFByteStream_Release(bytestream); + + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_RESET_IF_EXIST, + MF_FILEFLAGS_NONE, asffile, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_LEN(bytestream, 0); + hr = IMFByteStream_SetLength(bytestream, 2000); + ok(hr == S_OK, "IMFByteStream_SetLength failed: 0x%08x.\n", hr); + length = 0xdeadbeef; + hr = IMFByteStream_GetLength(bytestream, &length); + ok(hr == S_OK, "IMFByteStream_GetLength failed: 0x%08x.\n", hr); + ok(length == 0 || length == 2000 /* xp */, "got wrong length: %s.\n", wine_dbgstr_longlong(length)); + todo_wine CHECK_BS_POS(bytestream, 0); + IMFByteStream_Release(bytestream); + + MFShutdown(); + DeleteFileW(asffile); +} + +static void test_bytestream_from_stream(void) +{ + IMFByteStream *bytestream; + IStream *stream; + HRESULT hr; + HANDLE file; + static WCHAR asffile[] = {'t','e','s','t','.','a','s','f',0}; + byte buffer[1024] = {0}; + ULONG written, read; + QWORD length; + + file = CreateFileW(asffile, GENERIC_READ|GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "File creation failed: 0x%08x.\n", GetLastError()); + WriteFile(file, asf_header, sizeof(asf_header), &written, NULL); + CloseHandle(file); + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "MFStartup failed: 0x%08x.\n", hr); + + hr = SHCreateStreamOnFileW(asffile, STGM_READ|STGM_FAILIFTHERE|STGM_SHARE_DENY_WRITE, &stream); + ok(hr == S_OK, "SHCreateStreamOnFileEx failed: 0x%08x.\n", hr); + hr = MFCreateMFByteStreamOnStream(stream, &bytestream); + ok(hr == S_OK, "MFCreateMFByteStreamOnStream failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); + todo_wine ok(hr == S_FALSE, "IMFByteStream_Read returned: 0x%08x.\n", hr); + todo_wine ok(read == sizeof(asf_header), "got wrong read length: %d.\n", read); + todo_wine ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + memset(buffer, 0, sizeof(buffer)); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + hr = IMFByteStream_SetLength(bytestream, 200); + ok(hr == E_FAIL || hr == S_OK, "IMFByteStream_SetLength should fail: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + IMFByteStream_Release(bytestream); + IStream_Release(stream); + + hr = SHCreateStreamOnFileW(asffile, STGM_WRITE|STGM_FAILIFTHERE|STGM_SHARE_DENY_WRITE, &stream); + ok(hr == S_OK, "SHCreateStreamOnFileEx failed: 0x%08x.\n", hr); + hr = MFCreateMFByteStreamOnStream(stream, &bytestream); + ok(hr == S_OK, "MFCreateMFByteStreamOnStream failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); + todo_wine ok(hr == S_FALSE, "IMFByteStream_Read should fail: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + written = 0xdeadbeef; + hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); + todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + todo_wine ok(written == sizeof(asf_header), "got wrong written length: %d.\n", written); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + + hr = IMFByteStream_SetLength(bytestream, sizeof(asf_header) + 2); + ok(hr == S_OK, "IMFByteStream_SetLength failed: 0x%08x.\n", hr); + length = 0xdeadbeef; + hr = IMFByteStream_GetLength(bytestream, &length); + ok(hr == S_OK, "IMFByteStream_GetLength failed: 0x%08x.\n", hr); + ok(length == sizeof(asf_header) || length == (sizeof(asf_header) + 2) /* xp */, + "got wrong length: %s.\n", wine_dbgstr_longlong(length)); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + IMFByteStream_Release(bytestream); + IStream_Release(stream); + file = CreateFileW(asffile, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ReadFile(file, buffer, sizeof(buffer), &read, NULL); + ok(read == sizeof(asf_header) + 2, "got wrong read length: %d.\n", read); + ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + memset(buffer, 0, sizeof(buffer)); + CloseHandle(file); + + MFShutdown(); + DeleteFileW(asffile); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -781,6 +963,8 @@ START_TEST(mfplat) test_MFCreateMFByteStreamOnStream(); test_MFCreateMemoryBuffer(); test_source_resolver(); + test_bytestream_from_file(); + test_bytestream_from_stream(); CoUninitialize(); } -- 2.20.1

2 1

[PATCH v4 1/3] mfplat: Implement MFCreateFile().
by Jactry Zeng 07 Feb '19

07 Feb '19

Superseded patch 157909. ChangeLog: v4: - Fix test failure on Windows XP and Vista. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/Makefile.in | 2 +- dlls/mfplat/main.c | 69 +++++++++++++++----------- dlls/mfplat/tests/mfplat.c | 99 +++++++++++++++++++++++++++++++++----- 3 files changed, 127 insertions(+), 43 deletions(-) diff --git a/dlls/mfplat/Makefile.in b/dlls/mfplat/Makefile.in index 76843f5f25..5d9c8eb4c6 100644 --- a/dlls/mfplat/Makefile.in +++ b/dlls/mfplat/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfplat.dll IMPORTLIB = mfplat -IMPORTS = advapi32 ole32 +IMPORTS = advapi32 ole32 shlwapi C_SRCS = \ main.c diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c7c346512f..8aab65c28d 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -31,6 +31,7 @@ #include "mfapi.h" #include "mfidl.h" #include "mferror.h" +#include "shlwapi.h" #include "wine/heap.h" #include "wine/debug.h" @@ -849,6 +850,7 @@ typedef struct _mfbytestream { mfattributes attributes; IMFByteStream IMFByteStream_iface; + IStream *stream; } mfbytestream; static inline mfbytestream *impl_from_IMFByteStream(IMFByteStream *iface) @@ -901,6 +903,7 @@ static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) if (!ref) { + IStream_Release(This->stream); HeapFree(GetProcessHeap(), 0, This); } @@ -1144,6 +1147,8 @@ HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **byt init_attribute_object(&object->attributes, 0); object->IMFByteStream_iface.lpVtbl = &mfbytestream_vtbl; object->attributes.IMFAttributes_iface.lpVtbl = &mfbytestream_attributes_vtbl; + object->stream = stream; + IStream_AddRef(object->stream); *bytestream = &object->IMFByteStream_iface; @@ -1154,60 +1159,65 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open LPCWSTR url, IMFByteStream **bytestream) { mfbytestream *object; - DWORD fileaccessmode = 0; - DWORD filesharemode = FILE_SHARE_READ; - DWORD filecreation_disposition = 0; - DWORD fileattributes = 0; - HANDLE file; + DWORD mode = STGM_SHARE_DENY_WRITE; + DWORD attributes = FILE_ATTRIBUTE_NORMAL; + BOOL create = FALSE, reset = FALSE; + IStream *stream = NULL; + HRESULT hres; - FIXME("(%d, %d, %d, %s, %p): stub\n", accessmode, openmode, flags, debugstr_w(url), bytestream); + TRACE("(%d, %d, %d, %s, %p)\n", accessmode, openmode, flags, debugstr_w(url), bytestream); switch (accessmode) { case MF_ACCESSMODE_READ: - fileaccessmode = GENERIC_READ; + mode |= STGM_READ; break; case MF_ACCESSMODE_WRITE: - fileaccessmode = GENERIC_WRITE; + mode |= STGM_WRITE; break; case MF_ACCESSMODE_READWRITE: - fileaccessmode = GENERIC_READ | GENERIC_WRITE; + mode |= STGM_READWRITE; break; } switch (openmode) { - case MF_OPENMODE_FAIL_IF_NOT_EXIST: - filecreation_disposition = OPEN_EXISTING; - break; - case MF_OPENMODE_FAIL_IF_EXIST: - filecreation_disposition = CREATE_NEW; - break; case MF_OPENMODE_RESET_IF_EXIST: - filecreation_disposition = TRUNCATE_EXISTING; + if (accessmode == MF_ACCESSMODE_READ) + return E_INVALIDARG; + reset = TRUE; + mode |= STGM_FAILIFTHERE; break; case MF_OPENMODE_APPEND_IF_EXIST: - filecreation_disposition = OPEN_ALWAYS; - fileaccessmode |= FILE_APPEND_DATA; + if (GetFileAttributesW(url) == INVALID_FILE_ATTRIBUTES) + create = TRUE; + case MF_OPENMODE_FAIL_IF_NOT_EXIST: + mode |= STGM_FAILIFTHERE; + break; + case MF_OPENMODE_FAIL_IF_EXIST: + mode |= STGM_FAILIFTHERE; + create = TRUE; break; case MF_OPENMODE_DELETE_IF_EXIST: - filecreation_disposition = CREATE_ALWAYS; + mode |= STGM_CREATE; break; } if (flags & MF_FILEFLAGS_NOBUFFERING) - fileattributes |= FILE_FLAG_NO_BUFFERING; - - /* Open HANDLE to file */ - file = CreateFileW(url, fileaccessmode, filesharemode, NULL, - filecreation_disposition, fileattributes, 0); - - if(file == INVALID_HANDLE_VALUE) - return HRESULT_FROM_WIN32(GetLastError()); + attributes |= FILE_FLAG_NO_BUFFERING; + if ((flags & MF_FILEFLAGS_ALLOW_WRITE_SHARING) && (accessmode == MF_ACCESSMODE_READ)) + mode &= ~STGM_SHARE_DENY_WRITE; - /* Close the file again, since we don't do anything with it yet */ - CloseHandle(file); + hres = SHCreateStreamOnFileEx(url, mode, attributes, create, NULL, &stream); + if(FAILED(hres)) + return hres; + if (reset) + { + ULARGE_INTEGER zero; + zero.QuadPart = 0; + IStream_SetSize(stream, zero); + } object = heap_alloc( sizeof(*object) ); if(!object) return E_OUTOFMEMORY; @@ -1215,6 +1225,7 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open init_attribute_object(&object->attributes, 0); object->IMFByteStream_iface.lpVtbl = &mfbytestream_vtbl; object->attributes.IMFAttributes_iface.lpVtbl = &mfbytestream_attributes_vtbl; + object->stream = stream; *bytestream = &object->IMFByteStream_iface; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 3fa59f4816..a4f11da36e 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -54,6 +54,48 @@ DEFINE_GUID(DUMMY_GUID2, 0x12345678,0x1234,0x1234,0x22,0x22,0x22,0x22,0x22,0x22, static const WCHAR mp4file[] = {'t','e','s','t','.','m','p','4',0}; +#define CHECK_REF(obj,ref) _check_ref((IUnknown*)obj, ref, __LINE__) +static void _check_ref(IUnknown* obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); +} + +#define CHECK_BS_POS(obj,pos) _check_bs_pos(obj, pos, __LINE__) +static void _check_bs_pos(IMFByteStream* obj, QWORD pos, int line) +{ + QWORD position = 0xdeadbeef; + HRESULT hr; + hr = IMFByteStream_GetCurrentPosition(obj, &position); + ok_(__FILE__,line)(hr == S_OK, "IMFByteStream_GetCurrentPosition failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(position == pos, "got wrong position: %s.\n", + wine_dbgstr_longlong(position)); +} + +#define CHECK_BS_LEN(obj,len) _check_bs_len(obj, len, __LINE__) +static void _check_bs_len(IMFByteStream* obj, QWORD len, int line) +{ + QWORD length = 0xdeadbeef; + HRESULT hr; + hr = IMFByteStream_GetLength(obj, &length); + ok_(__FILE__,line)(hr == S_OK, "IMFByteStream_GetLength failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(length == len, "got wrong length: %s.\n", + wine_dbgstr_longlong(length)); +} + +#define CHECK_FILE_SIZE(filename,exp_size) _check_file_size(filename, exp_size, __LINE__) +static void _check_file_size(const WCHAR *filename, LONG exp_size, int line) +{ + HANDLE handle; + DWORD file_size = 0xdeadbeef; + handle = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + file_size = GetFileSize(handle, NULL); + ok_(__FILE__,line)(file_size == exp_size, "got wrong file size: %d.\n", file_size); + CloseHandle(handle); +} + static WCHAR *load_resource(const WCHAR *name) { static WCHAR pathW[MAX_PATH]; @@ -450,8 +492,10 @@ static void test_MFCreateMFByteStreamOnStream(void) hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_REF(stream, 1); hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_REF(stream, 2); hr = IMFByteStream_QueryInterface(bytestream, &IID_IUnknown, (void **)&unknown); @@ -509,7 +553,8 @@ static void test_MFCreateFile(void) IMFAttributes *attributes = NULL; HRESULT hr; WCHAR *filename; - + LONG file_size; + HANDLE handle; static const WCHAR newfilename[] = {'n','e','w','.','m','p','4',0}; filename = load_resource(mp4file); @@ -534,13 +579,11 @@ static void test_MFCreateFile(void) hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); hr = MFCreateFile(MF_ACCESSMODE_READWRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); IMFByteStream_Release(bytestream); @@ -558,18 +601,15 @@ static void test_MFCreateFile(void) hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, newfilename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, newfilename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_ALLOW_WRITE_SHARING, newfilename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); IMFByteStream_Release(bytestream); @@ -580,10 +620,43 @@ static void test_MFCreateFile(void) /* Opening the file again fails even though MF_FILEFLAGS_ALLOW_WRITE_SHARING is set. */ hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_ALLOW_WRITE_SHARING, newfilename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, + MF_FILEFLAGS_ALLOW_WRITE_SHARING, newfilename, &bytestream2); + ok(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION) /* xp and vista */, + "MFCreateFile failed: 0x%08x.\n", hr); + if(hr == S_OK) + IMFByteStream_Release(bytestream2); + IMFByteStream_Release(bytestream); + + /* test MF_OPENMODE_APPEND_IF_EXIST */ + handle = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ok(handle != INVALID_HANDLE_VALUE, "File creation failed: 0x%08x.\n", GetLastError()); + file_size = GetFileSize(handle, NULL); + CloseHandle(handle); + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_APPEND_IF_EXIST, + MF_FILEFLAGS_ALLOW_WRITE_SHARING, filename, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_LEN(bytestream, file_size); + todo_wine CHECK_BS_POS(bytestream, 0); + IMFByteStream_Release(bytestream); + CHECK_FILE_SIZE(filename, file_size); + + /* test MF_OPENMODE_RESET_IF_EXIST with read-only mode */ + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_RESET_IF_EXIST, + MF_FILEFLAGS_ALLOW_WRITE_SHARING, filename, &bytestream); + ok(hr == E_INVALIDARG, "MFCreateFile should fail: 0x%08x.\n", hr); + CHECK_FILE_SIZE(filename, file_size); + + /* test MF_OPENMODE_RESET_IF_EXIST */ + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_RESET_IF_EXIST, + MF_FILEFLAGS_NONE, filename, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_LEN(bytestream, 0); + todo_wine CHECK_BS_POS(bytestream, 0); IMFByteStream_Release(bytestream); + CHECK_FILE_SIZE(filename, 0); MFShutdown(); -- 2.20.1

1 0

[PATCH 3/3] propsys: Implement PropVariantToDouble().
by Jactry Zeng 07 Feb '19

07 Feb '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 18 ++++++++++++ dlls/propsys/tests/propsys.c | 57 ++++++++++++++++++++++++++++++++++++ include/propvarutil.h | 1 + 4 files changed, 77 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 19c5a24c92..9193f3664d 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -112,7 +112,7 @@ @ stub PropVariantToBooleanVectorAlloc @ stub PropVariantToBooleanWithDefault @ stub PropVariantToBuffer -@ stub PropVariantToDouble +@ stdcall PropVariantToDouble(ptr ptr) @ stub PropVariantToDoubleVector @ stub PropVariantToDoubleVectorAlloc @ stub PropVariantToDoubleWithDefault diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index ae96e4ee69..0edf4621b3 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -129,6 +129,12 @@ static HRESULT PROPVAR_ConvertNumber(REFPROPVARIANT pv, int dest_bits, src_signed = *res < 0; break; } + case VT_R8: + { + src_signed = TRUE; + *res = pv->u.dblVal; + break; + } default: FIXME("unhandled vt %d\n", pv->vt); return E_NOTIMPL; @@ -155,6 +161,18 @@ static HRESULT PROPVAR_ConvertNumber(REFPROPVARIANT pv, int dest_bits, return S_OK; } +HRESULT WINAPI PropVariantToDouble(REFPROPVARIANT propvarIn, double *ret) +{ + LONGLONG res; + HRESULT hr; + + TRACE("(%p, %p)\n", propvarIn, ret); + + hr = PROPVAR_ConvertNumber(propvarIn, 64, TRUE, &res); + if (SUCCEEDED(hr)) *ret = (double)res; + return hr; +} + HRESULT WINAPI PropVariantToInt16(REFPROPVARIANT propvarIn, SHORT *ret) { LONGLONG res; diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 34c51b382b..a9c0a7730b 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -1248,6 +1248,62 @@ static void test_InitPropVariantFromCLSID(void) PropVariantClear(&propvar); } +static void test_PropVariantToDouble(void) +{ + PROPVARIANT propvar; + double value; + HRESULT hr; + + PropVariantInit(&propvar); + propvar.vt = VT_R8; + propvar.u.dblVal = 15.0; + hr = PropVariantToDouble(&propvar, &value); + ok(hr == S_OK, "PropVariantToDouble failed: 0x%08x.\n", hr); + ok(value == 15.0, "Unexpected value: %f.\n", value); + + PropVariantClear(&propvar); + propvar.vt = VT_I4; + propvar.u.lVal = 123; + hr = PropVariantToDouble(&propvar, &value); + ok(hr == S_OK, "PropVariantToDouble failed: 0x%08x.\n", hr); + ok(value == 123.0, "Unexpected value: %f.\n", value); + + PropVariantClear(&propvar); + propvar.vt = VT_I4; + propvar.u.lVal = -256; + hr = PropVariantToDouble(&propvar, &value); + ok(hr == S_OK, "PropVariantToDouble failed: 0x%08x.\n", hr); + ok(value == -256, "Unexpected value: %f\n", value); + + PropVariantClear(&propvar); + propvar.vt = VT_I8; + propvar.u.lVal = 65536; + hr = PropVariantToDouble(&propvar, &value); + ok(hr == S_OK, "PropVariantToDouble failed: 0x%08x.\n", hr); + ok(value == 65536.0, "Unexpected value: %f.\n", value); + + PropVariantClear(&propvar); + propvar.vt = VT_I8; + propvar.u.lVal = -321; + hr = PropVariantToDouble(&propvar, &value); + ok(hr == S_OK, "PropVariantToDouble failed: 0x%08x.\n", hr); + ok(value == 4294966975.0, "Unexpected value: %f.\n", value); + + PropVariantClear(&propvar); + propvar.vt = VT_UI4; + propvar.u.ulVal = 6; + hr = PropVariantToDouble(&propvar, &value); + ok(hr == S_OK, "PropVariantToDouble failed: 0x%08x.\n", hr); + ok(value == 6.0, "Unexpected value: %f.\n", value); + + PropVariantClear(&propvar); + propvar.vt = VT_UI8; + propvar.u.uhVal.QuadPart = 8; + hr = PropVariantToDouble(&propvar, &value); + ok(hr == S_OK, "PropVariantToDouble failed: 0x%08x.\n", hr); + ok(value == 8.0, "Unexpected value: %f.\n", value); +} + START_TEST(propsys) { test_PSStringFromPropertyKey(); @@ -1263,4 +1319,5 @@ START_TEST(propsys) test_PropVariantToBoolean(); test_PropVariantToStringWithDefault(); test_InitPropVariantFromCLSID(); + test_PropVariantToDouble(); } diff --git a/include/propvarutil.h b/include/propvarutil.h index 0285cafbb4..80f081cbc3 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -71,6 +71,7 @@ HRESULT WINAPI VariantToGUID(const VARIANT *pvar, GUID *guid); INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2, PROPVAR_COMPARE_UNIT uint, PROPVAR_COMPARE_FLAGS flags); +HRESULT WINAPI PropVariantToDouble(REFPROPVARIANT propvarIn, double *ret); HRESULT WINAPI PropVariantToInt16(REFPROPVARIANT propvarIn, SHORT *ret); HRESULT WINAPI PropVariantToInt32(REFPROPVARIANT propvarIn, LONG *ret); HRESULT WINAPI PropVariantToInt64(REFPROPVARIANT propvarIn, LONGLONG *ret); -- 2.20.1

1 0

[PATCH 2/3] propsys/tests: Add tests of IPropertyStore interface.
by Jactry Zeng 07 Feb '19

07 Feb '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/propsys/tests/propstore.c | 60 ++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/propsys/tests/propstore.c b/dlls/propsys/tests/propstore.c index 132f5ff0f5..5aeb562cf2 100644 --- a/dlls/propsys/tests/propstore.c +++ b/dlls/propsys/tests/propstore.c @@ -34,6 +34,7 @@ #include "initguid.h" DEFINE_GUID(PKEY_WineTest, 0x7b317433, 0xdfa3, 0x4c44, 0xad, 0x3e, 0x2f, 0x80, 0x4b, 0x90, 0xdb, 0xf4); +DEFINE_GUID(DUMMY_GUID1, 0x12345678, 0x1234,0x1234, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19); #define EXPECT_REF(obj,ref) _expect_ref((IUnknown *)obj, ref, __LINE__) static void _expect_ref(IUnknown *obj, ULONG ref, int line) @@ -302,6 +303,64 @@ static void test_PSCreateMemoryPropertyStore(void) IPropertyStoreCache_Release(propstorecache); } +static void test_propertystore(void) +{ + IPropertyStore *propstore; + HRESULT hr; + PROPVARIANT propvar, ret_propvar; + PROPERTYKEY propkey; + DWORD count = 0; + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStore, (void **)&propstore); + ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + ok(propstore != NULL, "got %p.\n", propstore); + + hr = IPropertyStore_GetCount(propstore, &count); + ok(hr == S_OK, "IPropertyStore_GetCount failed: 0x%08x.\n", hr); + ok(!count, "got wrong property count: %d, expected 0.\n", count); + + PropVariantInit(&propvar); + propvar.vt = VT_I4; + U(propvar).lVal = 123; + propkey.fmtid = DUMMY_GUID1; + propkey.pid = PID_FIRST_USABLE; + hr = IPropertyStore_SetValue(propstore, &propkey, &propvar); + ok(hr == S_OK, "IPropertyStore_SetValue failed: 0x%08x.\n", hr); + hr = IPropertyStore_Commit(propstore); + ok(hr == S_OK, "IPropertyStore_Commit failed: 0x%08x.\n", hr); + hr = IPropertyStore_GetCount(propstore, &count); + ok(hr == S_OK, "IPropertyStore_GetCount failed: 0x%08x.\n", hr); + ok(count == 1, "got wrong property count: %d, expected 1.\n", count); + PropVariantInit(&ret_propvar); + ret_propvar.vt = VT_I4; + hr = IPropertyStore_GetValue(propstore, &propkey, &ret_propvar); + ok(hr == S_OK, "IPropertyStore_GetValue failed: 0x%08x.\n", hr); + ok(ret_propvar.vt == VT_I4, "got wrong property type: %x.\n", ret_propvar.vt); + ok(U(ret_propvar).lVal == 123, "got wrong value: %d, expected 123.\n", U(ret_propvar).lVal); + PropVariantClear(&propvar); + PropVariantClear(&ret_propvar); + + PropVariantInit(&propvar); + propkey.fmtid = DUMMY_GUID1; + propkey.pid = PID_FIRST_USABLE; + hr = IPropertyStore_SetValue(propstore, &propkey, &propvar); + ok(hr == S_OK, "IPropertyStore_SetValue failed: 0x%08x.\n", hr); + hr = IPropertyStore_Commit(propstore); + ok(hr == S_OK, "IPropertyStore_Commit failed: 0x%08x.\n", hr); + hr = IPropertyStore_GetCount(propstore, &count); + ok(hr == S_OK, "IPropertyStore_GetCount failed: 0x%08x.\n", hr); + ok(count == 1, "got wrong property count: %d, expected 1.\n", count); + PropVariantInit(&ret_propvar); + hr = IPropertyStore_GetValue(propstore, &propkey, &ret_propvar); + ok(hr == S_OK, "IPropertyStore_GetValue failed: 0x%08x.\n", hr); + ok(ret_propvar.vt == VT_EMPTY, "got wrong property type: %x.\n", ret_propvar.vt); + ok(!U(ret_propvar).lVal, "got wrong value: %d, expected 0.\n", U(ret_propvar).lVal); + PropVariantClear(&propvar); + PropVariantClear(&ret_propvar); + + IPropertyStore_Release(propstore); +} + START_TEST(propstore) { CoInitialize(NULL); @@ -309,6 +368,7 @@ START_TEST(propstore) test_inmemorystore(); test_persistserialized(); test_PSCreateMemoryPropertyStore(); + test_propertystore(); CoUninitialize(); } -- 2.20.1

1 0

[PATCH 1/3] propsys: Implement PSCreateMemoryPropertyStore().
by Jactry Zeng 07 Feb '19

07 Feb '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propsys_main.c | 7 +++++ dlls/propsys/tests/propstore.c | 54 ++++++++++++++++++++++++++++++++++ include/propsys.idl | 1 + 4 files changed, 63 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index bbc71654a8..19c5a24c92 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -65,7 +65,7 @@ @ stub PSCoerceToCanonicalValue @ stub PSCreateAdapterFromPropertyStore @ stub PSCreateDelayedMultiplexPropertyStore -@ stub PSCreateMemoryPropertyStore +@ stdcall PSCreateMemoryPropertyStore(ptr ptr) @ stub PSCreateMultiplexPropertyStore @ stub PSCreatePropertyChangeArray @ stub PSCreatePropertyStoreFromObject diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 1dbaee433f..65d157d0cc 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -509,3 +509,10 @@ HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR pszString, PROPERTYKEY *pkey) return S_OK; } + +HRESULT WINAPI PSCreateMemoryPropertyStore(REFIID riid, void **ppv) +{ + TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); + + return PropertyStore_CreateInstance(NULL, riid, ppv); +} diff --git a/dlls/propsys/tests/propstore.c b/dlls/propsys/tests/propstore.c index 3fe8613a8b..132f5ff0f5 100644 --- a/dlls/propsys/tests/propstore.c +++ b/dlls/propsys/tests/propstore.c @@ -35,6 +35,15 @@ DEFINE_GUID(PKEY_WineTest, 0x7b317433, 0xdfa3, 0x4c44, 0xad, 0x3e, 0x2f, 0x80, 0x4b, 0x90, 0xdb, 0xf4); +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown *)obj, ref, __LINE__) +static void _expect_ref(IUnknown *obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); +} + static void test_inmemorystore(void) { IPropertyStoreCache *propcache; @@ -249,12 +258,57 @@ static void test_persistserialized(void) IPersistSerializedPropStorage_Release(serialized); } +static void test_PSCreateMemoryPropertyStore(void) +{ + IPropertyStore *propstore, *propstore1; + IPersistSerializedPropStorage *serialized; + IPropertyStoreCache *propstorecache; + HRESULT hr; + + /* PSCreateMemoryPropertyStore(&IID_IPropertyStore, NULL); crashes */ + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStore, (void **)&propstore); + ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + ok(propstore != NULL, "got %p.\n", propstore); + EXPECT_REF(propstore, 1); + + hr = PSCreateMemoryPropertyStore(&IID_IPersistSerializedPropStorage, (void **)&serialized); + todo_wine ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + todo_wine ok(serialized != NULL, "got %p.\n", serialized); + EXPECT_REF(propstore, 1); + if(serialized) + { + EXPECT_REF(serialized, 1); + IPersistSerializedPropStorage_Release(serialized); + } + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStoreCache, (void **)&propstorecache); + ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + ok(propstorecache != NULL, "got %p.\n", propstore); + ok(propstorecache != (IPropertyStoreCache *)propstore, "pointer are equal: %p, %p.\n", propstorecache, propstore); + EXPECT_REF(propstore, 1); + EXPECT_REF(propstorecache, 1); + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStore, (void **)&propstore1); + ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + ok(propstore1 != NULL, "got %p.\n", propstore); + ok(propstore1 != propstore, "pointer are equal: %p, %p.\n", propstore1, propstore); + EXPECT_REF(propstore, 1); + EXPECT_REF(propstore1, 1); + EXPECT_REF(propstorecache, 1); + + IPropertyStore_Release(propstore1); + IPropertyStore_Release(propstore); + IPropertyStoreCache_Release(propstorecache); +} + START_TEST(propstore) { CoInitialize(NULL); test_inmemorystore(); test_persistserialized(); + test_PSCreateMemoryPropertyStore(); CoUninitialize(); } diff --git a/include/propsys.idl b/include/propsys.idl index 04d3fbf8a1..bdd67fa6a5 100644 --- a/include/propsys.idl +++ b/include/propsys.idl @@ -799,6 +799,7 @@ cpp_quote("#define PKEY_PIDSTR_MAX 10") cpp_quote("#define GUIDSTRING_MAX 39") cpp_quote("#define PKEYSTR_MAX (GUIDSTRING_MAX + 1 + PKEY_PIDSTR_MAX)") +cpp_quote("HRESULT WINAPI PSCreateMemoryPropertyStore(REFIID,void **);") cpp_quote("HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY,LPWSTR,UINT);") cpp_quote("HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR,PROPERTYKEY*);") cpp_quote("HRESULT WINAPI PSGetPropertyDescription(REFPROPERTYKEY,REFIID,void **);") -- 2.20.1

1 0

[PATCH v3 3/3] mfplat: Implement IMFByteStream::{Read,Write}.
by Jactry Zeng 07 Feb '19

07 Feb '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 25 +++++++++++++++++++++---- dlls/mfplat/tests/mfplat.c | 26 +++++++++++++------------- 2 files changed, 34 insertions(+), 17 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 4f42fc0939..898634f153 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -981,10 +981,23 @@ static HRESULT WINAPI mfbytestream_IsEndOfStream(IMFByteStream *iface, BOOL *end static HRESULT WINAPI mfbytestream_Read(IMFByteStream *iface, BYTE *data, ULONG count, ULONG *byte_read) { mfbytestream *This = impl_from_IMFByteStream(iface); + STATSTG statstg; + QWORD length; + HRESULT hr; - FIXME("%p, %p, %u, %p\n", This, data, count, byte_read); + TRACE("(%p)->(%p, %u, %p)\n", This, data, count, byte_read); - return E_NOTIMPL; + memset(&statstg, 0, sizeof(statstg)); + hr = IStream_Stat(This->stream, &statstg, STATFLAG_NONAME); + if(FAILED(hr)) + return hr; + if((statstg.grfMode & 0xf) == STGM_WRITE) + return E_ACCESSDENIED; + + IMFByteStream_GetLength(iface, &length); + if(count > length) + count = length; + return IStream_Read(This->stream, data, count, byte_read); } static HRESULT WINAPI mfbytestream_BeginRead(IMFByteStream *iface, BYTE *data, ULONG count, @@ -1009,10 +1022,14 @@ static HRESULT WINAPI mfbytestream_EndRead(IMFByteStream *iface, IMFAsyncResult static HRESULT WINAPI mfbytestream_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written) { mfbytestream *This = impl_from_IMFByteStream(iface); + HRESULT hr; - FIXME("%p, %p, %u, %p\n", This, data, count, written); + TRACE("(%p)->(%p, %u, %p)\n", This, data, count, written); - return E_NOTIMPL; + hr = IStream_Write(This->stream, data, count, written); + if(hr == STG_E_ACCESSDENIED) + return E_ACCESSDENIED; + return hr; } static HRESULT WINAPI mfbytestream_BeginWrite(IMFByteStream *iface, const BYTE *data, ULONG count, diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f5fa2df179..92a6e66a50 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -795,13 +795,13 @@ static void test_bytestream_from_file(void) CHECK_BS_LEN(bytestream, sizeof(asf_header)); read = 0; hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); - todo_wine ok(hr == S_OK, "IMFByteStream_Read failed: 0x%08x.\n", hr); - todo_wine ok(read == sizeof(asf_header), "got wrong read length: %d.\n", read); - todo_wine ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + ok(hr == S_OK, "IMFByteStream_Read failed: 0x%08x.\n", hr); + ok(read == sizeof(asf_header), "got wrong read length: %d.\n", read); + ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); memset(buffer, 0, sizeof(buffer)); hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); - todo_wine ok(hr == E_ACCESSDENIED, "IMFByteStream_Write should fail: 0x%08x.\n", hr); + ok(hr == E_ACCESSDENIED, "IMFByteStream_Write should fail: 0x%08x.\n", hr); hr = IMFByteStream_SetLength(bytestream, 200); ok(hr == E_FAIL, "IMFByteStream_SetLength should fail: 0x%08x.\n", hr); todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); @@ -812,12 +812,12 @@ static void test_bytestream_from_file(void) MF_FILEFLAGS_NONE, asffile, &bytestream); ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); - todo_wine ok(hr == E_ACCESSDENIED, "IMFByteStream_Read should fail: 0x%08x.\n", hr); + ok(hr == E_ACCESSDENIED, "IMFByteStream_Read should fail: 0x%08x.\n", hr); todo_wine CHECK_BS_POS(bytestream, 0); written = 0xdeadbeef; hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); - todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); - todo_wine ok(written == sizeof(asf_header), "got wrong written length: %d.\n", written); + ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + ok(written == sizeof(asf_header), "got wrong written length: %d.\n", written); CHECK_BS_LEN(bytestream, sizeof(asf_header)); todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); @@ -844,8 +844,8 @@ static void test_bytestream_from_file(void) CHECK_BS_LEN(bytestream, sizeof(asf_header) + 2); written = 0xdeadbeef; hr = IMFByteStream_Write(bytestream, test_data, sizeof(test_data), &written); - todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); - todo_wine ok(written == sizeof(test_data), "got wrong written length: %d.\n", written); + ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + ok(written == sizeof(test_data), "got wrong written length: %d.\n", written); CHECK_BS_LEN(bytestream, sizeof(asf_header) + 2); todo_wine CHECK_BS_POS(bytestream, sizeof(test_data)); IMFByteStream_Release(bytestream); @@ -896,8 +896,8 @@ static void test_bytestream_from_stream(void) CHECK_BS_LEN(bytestream, sizeof(asf_header)); hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); todo_wine ok(hr == S_FALSE, "IMFByteStream_Read returned: 0x%08x.\n", hr); - todo_wine ok(read == sizeof(asf_header), "got wrong read length: %d.\n", read); - todo_wine ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + ok(read == sizeof(asf_header), "got wrong read length: %d.\n", read); + ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); memset(buffer, 0, sizeof(buffer)); todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); @@ -920,8 +920,8 @@ static void test_bytestream_from_stream(void) todo_wine CHECK_BS_POS(bytestream, 0); written = 0xdeadbeef; hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); - todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); - todo_wine ok(written == sizeof(asf_header), "got wrong written length: %d.\n", written); + ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + ok(written == sizeof(asf_header), "got wrong written length: %d.\n", written); CHECK_BS_LEN(bytestream, sizeof(asf_header)); todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); -- 2.20.1

2 1

[PATCH v3 2/3] mfplat: Implement IMFByteStream::{GetLength,SetLength}.
by Jactry Zeng 07 Feb '19

07 Feb '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 19 +++- dlls/mfplat/tests/Makefile.in | 2 +- dlls/mfplat/tests/mfplat.c | 188 +++++++++++++++++++++++++++++++++- 3 files changed, 202 insertions(+), 7 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 8aab65c28d..4f42fc0939 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -922,19 +922,30 @@ static HRESULT WINAPI mfbytestream_GetCapabilities(IMFByteStream *iface, DWORD * static HRESULT WINAPI mfbytestream_GetLength(IMFByteStream *iface, QWORD *length) { mfbytestream *This = impl_from_IMFByteStream(iface); + HRESULT hr; + STATSTG statstg; - FIXME("%p, %p\n", This, length); + TRACE("(%p)->(%p)\n", This, length); - return E_NOTIMPL; + memset(&statstg, 0, sizeof(statstg)); + + hr = IStream_Stat(This->stream, &statstg, STATFLAG_NONAME); + + if (SUCCEEDED(hr)) + *length = statstg.cbSize.QuadPart; + + return hr; } static HRESULT WINAPI mfbytestream_SetLength(IMFByteStream *iface, QWORD length) { mfbytestream *This = impl_from_IMFByteStream(iface); + ULARGE_INTEGER size; - FIXME("%p, %s\n", This, wine_dbgstr_longlong(length)); + TRACE("(%p)->(%s)\n", This, wine_dbgstr_longlong(length)); - return E_NOTIMPL; + size.QuadPart = length; + return IStream_SetSize(This->stream, size); } static HRESULT WINAPI mfbytestream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) diff --git a/dlls/mfplat/tests/Makefile.in b/dlls/mfplat/tests/Makefile.in index 07cf328ad2..f7f09aa33e 100644 --- a/dlls/mfplat/tests/Makefile.in +++ b/dlls/mfplat/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mfplat.dll -IMPORTS = ole32 mfplat +IMPORTS = ole32 mfplat shlwapi C_SRCS = \ mfplat.c diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 3ba73a507b..f5fa2df179 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -33,6 +33,7 @@ #include "mfidl.h" #include "mferror.h" #include "mfreadwrite.h" +#include "shlwapi.h" #include "wine/test.h" @@ -52,6 +53,9 @@ DEFINE_GUID(DUMMY_CLSID, 0x12345678,0x1234,0x1234,0x12,0x13,0x14,0x15,0x16,0x17, DEFINE_GUID(DUMMY_GUID1, 0x12345678,0x1234,0x1234,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21); DEFINE_GUID(DUMMY_GUID2, 0x12345678,0x1234,0x1234,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22); +static const byte asf_header[] = {0x30,0x26,0xb2,0x75,0x8e,0x66,0xcf,0x11, + 0xa6,0xd9,0x00,0xaa,0x00,0x62,0xce,0x6c}; + static const WCHAR mp4file[] = {'t','e','s','t','.','m','p','4',0}; #define CHECK_REF(obj,ref) _check_ref((IUnknown*)obj, ref, __LINE__) @@ -636,7 +640,7 @@ static void test_MFCreateFile(void) hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_APPEND_IF_EXIST, MF_FILEFLAGS_ALLOW_WRITE_SHARING, filename, &bytestream); ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); - todo_wine CHECK_BS_LEN(bytestream, file_size); + CHECK_BS_LEN(bytestream, file_size); todo_wine CHECK_BS_POS(bytestream, 0); IMFByteStream_Release(bytestream); CHECK_FILE_SIZE(filename, file_size); @@ -651,7 +655,7 @@ static void test_MFCreateFile(void) hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_RESET_IF_EXIST, MF_FILEFLAGS_NONE, filename, &bytestream); ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); - todo_wine CHECK_BS_LEN(bytestream, 0); + CHECK_BS_LEN(bytestream, 0); todo_wine CHECK_BS_POS(bytestream, 0); IMFByteStream_Release(bytestream); CHECK_FILE_SIZE(filename, 0); @@ -764,6 +768,184 @@ static void test_MFSample(void) IMFSample_Release(sample); } +static void test_bytestream_from_file(void) +{ + IMFByteStream *bytestream; + HRESULT hr; + HANDLE file; + static WCHAR asffile[] = {'t','e','s','t','.','a','s','f',0}; + byte buffer[1024] = {0}; + byte test_data[] = {0x1,0x2,0x3,0x4}; + ULONG written, read; + QWORD length; + + file = CreateFileW(asffile, GENERIC_READ|GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "File creation failed: 0x%08x.\n", GetLastError()); + WriteFile(file, asf_header, sizeof(asf_header), &written, NULL); + CloseHandle(file); + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "MFStartup failed: 0x%08x.\n", hr); + + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, + MF_FILEFLAGS_NONE, asffile, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + read = 0; + hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); + todo_wine ok(hr == S_OK, "IMFByteStream_Read failed: 0x%08x.\n", hr); + todo_wine ok(read == sizeof(asf_header), "got wrong read length: %d.\n", read); + todo_wine ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + memset(buffer, 0, sizeof(buffer)); + hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); + todo_wine ok(hr == E_ACCESSDENIED, "IMFByteStream_Write should fail: 0x%08x.\n", hr); + hr = IMFByteStream_SetLength(bytestream, 200); + ok(hr == E_FAIL, "IMFByteStream_SetLength should fail: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + IMFByteStream_Release(bytestream); + + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, + MF_FILEFLAGS_NONE, asffile, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); + todo_wine ok(hr == E_ACCESSDENIED, "IMFByteStream_Read should fail: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + written = 0xdeadbeef; + hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); + todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + todo_wine ok(written == sizeof(asf_header), "got wrong written length: %d.\n", written); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + + hr = IMFByteStream_SetLength(bytestream, sizeof(asf_header) + 2); + ok(hr == S_OK, "IMFByteStream_SetLength failed: 0x%08x.\n", hr); + length = 0xdeadbeef; + hr = IMFByteStream_GetLength(bytestream, &length); + ok(hr == S_OK, "IMFByteStream_GetLength failed: 0x%08x.\n", hr); + ok(length == sizeof(asf_header) || length == (sizeof(asf_header) + 2) /* xp */, + "got wrong length: %s.\n", wine_dbgstr_longlong(length)); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + IMFByteStream_Release(bytestream); + file = CreateFileW(asffile, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ReadFile(file, buffer, sizeof(buffer), &read, NULL); + ok(read == sizeof(asf_header) + 2, "got wrong read length: %d.\n", read); + ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + memset(buffer, 0, sizeof(buffer)); + CloseHandle(file); + + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_APPEND_IF_EXIST, + MF_FILEFLAGS_NONE, asffile, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_LEN(bytestream, sizeof(asf_header) + 2); + written = 0xdeadbeef; + hr = IMFByteStream_Write(bytestream, test_data, sizeof(test_data), &written); + todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + todo_wine ok(written == sizeof(test_data), "got wrong written length: %d.\n", written); + CHECK_BS_LEN(bytestream, sizeof(asf_header) + 2); + todo_wine CHECK_BS_POS(bytestream, sizeof(test_data)); + IMFByteStream_Release(bytestream); + + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_RESET_IF_EXIST, + MF_FILEFLAGS_NONE, asffile, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_LEN(bytestream, 0); + hr = IMFByteStream_SetLength(bytestream, 2000); + ok(hr == S_OK, "IMFByteStream_SetLength failed: 0x%08x.\n", hr); + length = 0xdeadbeef; + hr = IMFByteStream_GetLength(bytestream, &length); + ok(hr == S_OK, "IMFByteStream_GetLength failed: 0x%08x.\n", hr); + ok(length == 0 || length == 2000 /* xp */, "got wrong length: %s.\n", wine_dbgstr_longlong(length)); + todo_wine CHECK_BS_POS(bytestream, 0); + IMFByteStream_Release(bytestream); + + MFShutdown(); + DeleteFileW(asffile); +} + +static void test_bytestream_from_stream(void) +{ + IMFByteStream *bytestream; + IStream *stream; + HRESULT hr; + HANDLE file; + static WCHAR asffile[] = {'t','e','s','t','.','a','s','f',0}; + byte buffer[1024] = {0}; + ULONG written, read; + QWORD length; + + file = CreateFileW(asffile, GENERIC_READ|GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "File creation failed: 0x%08x.\n", GetLastError()); + WriteFile(file, asf_header, sizeof(asf_header), &written, NULL); + CloseHandle(file); + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "MFStartup failed: 0x%08x.\n", hr); + + hr = SHCreateStreamOnFileW(asffile, STGM_READ|STGM_FAILIFTHERE|STGM_SHARE_DENY_WRITE, &stream); + ok(hr == S_OK, "SHCreateStreamOnFileEx failed: 0x%08x.\n", hr); + hr = MFCreateMFByteStreamOnStream(stream, &bytestream); + ok(hr == S_OK, "MFCreateMFByteStreamOnStream failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); + todo_wine ok(hr == S_FALSE, "IMFByteStream_Read returned: 0x%08x.\n", hr); + todo_wine ok(read == sizeof(asf_header), "got wrong read length: %d.\n", read); + todo_wine ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + memset(buffer, 0, sizeof(buffer)); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + hr = IMFByteStream_SetLength(bytestream, 200); + ok(hr == E_FAIL || hr == S_OK, "IMFByteStream_SetLength should fail: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + IMFByteStream_Release(bytestream); + IStream_Release(stream); + + hr = SHCreateStreamOnFileW(asffile, STGM_WRITE|STGM_FAILIFTHERE|STGM_SHARE_DENY_WRITE, &stream); + ok(hr == S_OK, "SHCreateStreamOnFileEx failed: 0x%08x.\n", hr); + hr = MFCreateMFByteStreamOnStream(stream, &bytestream); + ok(hr == S_OK, "MFCreateMFByteStreamOnStream failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); + todo_wine ok(hr == S_FALSE, "IMFByteStream_Read should fail: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + written = 0xdeadbeef; + hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); + todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + todo_wine ok(written == sizeof(asf_header), "got wrong written length: %d.\n", written); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + + hr = IMFByteStream_SetLength(bytestream, sizeof(asf_header) + 2); + ok(hr == S_OK, "IMFByteStream_SetLength failed: 0x%08x.\n", hr); + length = 0xdeadbeef; + hr = IMFByteStream_GetLength(bytestream, &length); + ok(hr == S_OK, "IMFByteStream_GetLength failed: 0x%08x.\n", hr); + ok(length == sizeof(asf_header) || length == (sizeof(asf_header) + 2) /* xp */, + "got wrong length: %s.\n", wine_dbgstr_longlong(length)); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + IMFByteStream_Release(bytestream); + IStream_Release(stream); + file = CreateFileW(asffile, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ReadFile(file, buffer, sizeof(buffer), &read, NULL); + ok(read == sizeof(asf_header) + 2, "got wrong read length: %d.\n", read); + ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + memset(buffer, 0, sizeof(buffer)); + CloseHandle(file); + + MFShutdown(); + DeleteFileW(asffile); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -779,6 +961,8 @@ START_TEST(mfplat) test_MFCreateMFByteStreamOnStream(); test_MFCreateMemoryBuffer(); test_source_resolver(); + test_bytestream_from_file(); + test_bytestream_from_stream(); CoUninitialize(); } -- 2.20.1

2 1

[PATCH v2 2/2] po: Update French translation.
by Isira Seneviratne 07 Feb '19

07 Feb '19

1 0

[PATCH 2/2] po: Update French translation.
by Isira Seneviratne 07 Feb '19

07 Feb '19

1 0

[PATCH 1/2] po: Update Sinhala translation.
by Isira Seneviratne 07 Feb '19

07 Feb '19

1 0

[PATCH v3 1/3] mfplat: Implement MFCreateFile().
by Jactry Zeng 07 Feb '19

07 Feb '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/Makefile.in | 2 +- dlls/mfplat/main.c | 69 +++++++++++++++------------ dlls/mfplat/tests/mfplat.c | 97 +++++++++++++++++++++++++++++++++----- 3 files changed, 125 insertions(+), 43 deletions(-) diff --git a/dlls/mfplat/Makefile.in b/dlls/mfplat/Makefile.in index 76843f5f25..5d9c8eb4c6 100644 --- a/dlls/mfplat/Makefile.in +++ b/dlls/mfplat/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfplat.dll IMPORTLIB = mfplat -IMPORTS = advapi32 ole32 +IMPORTS = advapi32 ole32 shlwapi C_SRCS = \ main.c diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c7c346512f..8aab65c28d 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -31,6 +31,7 @@ #include "mfapi.h" #include "mfidl.h" #include "mferror.h" +#include "shlwapi.h" #include "wine/heap.h" #include "wine/debug.h" @@ -849,6 +850,7 @@ typedef struct _mfbytestream { mfattributes attributes; IMFByteStream IMFByteStream_iface; + IStream *stream; } mfbytestream; static inline mfbytestream *impl_from_IMFByteStream(IMFByteStream *iface) @@ -901,6 +903,7 @@ static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) if (!ref) { + IStream_Release(This->stream); HeapFree(GetProcessHeap(), 0, This); } @@ -1144,6 +1147,8 @@ HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **byt init_attribute_object(&object->attributes, 0); object->IMFByteStream_iface.lpVtbl = &mfbytestream_vtbl; object->attributes.IMFAttributes_iface.lpVtbl = &mfbytestream_attributes_vtbl; + object->stream = stream; + IStream_AddRef(object->stream); *bytestream = &object->IMFByteStream_iface; @@ -1154,60 +1159,65 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open LPCWSTR url, IMFByteStream **bytestream) { mfbytestream *object; - DWORD fileaccessmode = 0; - DWORD filesharemode = FILE_SHARE_READ; - DWORD filecreation_disposition = 0; - DWORD fileattributes = 0; - HANDLE file; + DWORD mode = STGM_SHARE_DENY_WRITE; + DWORD attributes = FILE_ATTRIBUTE_NORMAL; + BOOL create = FALSE, reset = FALSE; + IStream *stream = NULL; + HRESULT hres; - FIXME("(%d, %d, %d, %s, %p): stub\n", accessmode, openmode, flags, debugstr_w(url), bytestream); + TRACE("(%d, %d, %d, %s, %p)\n", accessmode, openmode, flags, debugstr_w(url), bytestream); switch (accessmode) { case MF_ACCESSMODE_READ: - fileaccessmode = GENERIC_READ; + mode |= STGM_READ; break; case MF_ACCESSMODE_WRITE: - fileaccessmode = GENERIC_WRITE; + mode |= STGM_WRITE; break; case MF_ACCESSMODE_READWRITE: - fileaccessmode = GENERIC_READ | GENERIC_WRITE; + mode |= STGM_READWRITE; break; } switch (openmode) { - case MF_OPENMODE_FAIL_IF_NOT_EXIST: - filecreation_disposition = OPEN_EXISTING; - break; - case MF_OPENMODE_FAIL_IF_EXIST: - filecreation_disposition = CREATE_NEW; - break; case MF_OPENMODE_RESET_IF_EXIST: - filecreation_disposition = TRUNCATE_EXISTING; + if (accessmode == MF_ACCESSMODE_READ) + return E_INVALIDARG; + reset = TRUE; + mode |= STGM_FAILIFTHERE; break; case MF_OPENMODE_APPEND_IF_EXIST: - filecreation_disposition = OPEN_ALWAYS; - fileaccessmode |= FILE_APPEND_DATA; + if (GetFileAttributesW(url) == INVALID_FILE_ATTRIBUTES) + create = TRUE; + case MF_OPENMODE_FAIL_IF_NOT_EXIST: + mode |= STGM_FAILIFTHERE; + break; + case MF_OPENMODE_FAIL_IF_EXIST: + mode |= STGM_FAILIFTHERE; + create = TRUE; break; case MF_OPENMODE_DELETE_IF_EXIST: - filecreation_disposition = CREATE_ALWAYS; + mode |= STGM_CREATE; break; } if (flags & MF_FILEFLAGS_NOBUFFERING) - fileattributes |= FILE_FLAG_NO_BUFFERING; - - /* Open HANDLE to file */ - file = CreateFileW(url, fileaccessmode, filesharemode, NULL, - filecreation_disposition, fileattributes, 0); - - if(file == INVALID_HANDLE_VALUE) - return HRESULT_FROM_WIN32(GetLastError()); + attributes |= FILE_FLAG_NO_BUFFERING; + if ((flags & MF_FILEFLAGS_ALLOW_WRITE_SHARING) && (accessmode == MF_ACCESSMODE_READ)) + mode &= ~STGM_SHARE_DENY_WRITE; - /* Close the file again, since we don't do anything with it yet */ - CloseHandle(file); + hres = SHCreateStreamOnFileEx(url, mode, attributes, create, NULL, &stream); + if(FAILED(hres)) + return hres; + if (reset) + { + ULARGE_INTEGER zero; + zero.QuadPart = 0; + IStream_SetSize(stream, zero); + } object = heap_alloc( sizeof(*object) ); if(!object) return E_OUTOFMEMORY; @@ -1215,6 +1225,7 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open init_attribute_object(&object->attributes, 0); object->IMFByteStream_iface.lpVtbl = &mfbytestream_vtbl; object->attributes.IMFAttributes_iface.lpVtbl = &mfbytestream_attributes_vtbl; + object->stream = stream; *bytestream = &object->IMFByteStream_iface; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 3fa59f4816..3ba73a507b 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -54,6 +54,48 @@ DEFINE_GUID(DUMMY_GUID2, 0x12345678,0x1234,0x1234,0x22,0x22,0x22,0x22,0x22,0x22, static const WCHAR mp4file[] = {'t','e','s','t','.','m','p','4',0}; +#define CHECK_REF(obj,ref) _check_ref((IUnknown*)obj, ref, __LINE__) +static void _check_ref(IUnknown* obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); +} + +#define CHECK_BS_POS(obj,pos) _check_bs_pos(obj, pos, __LINE__) +static void _check_bs_pos(IMFByteStream* obj, QWORD pos, int line) +{ + QWORD position = 0xdeadbeef; + HRESULT hr; + hr = IMFByteStream_GetCurrentPosition(obj, &position); + ok_(__FILE__,line)(hr == S_OK, "IMFByteStream_GetCurrentPosition failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(position == pos, "got wrong position: %s.\n", + wine_dbgstr_longlong(position)); +} + +#define CHECK_BS_LEN(obj,len) _check_bs_len(obj, len, __LINE__) +static void _check_bs_len(IMFByteStream* obj, QWORD len, int line) +{ + QWORD length = 0xdeadbeef; + HRESULT hr; + hr = IMFByteStream_GetLength(obj, &length); + ok_(__FILE__,line)(hr == S_OK, "IMFByteStream_GetLength failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(length == len, "got wrong length: %s.\n", + wine_dbgstr_longlong(length)); +} + +#define CHECK_FILE_SIZE(filename,exp_size) _check_file_size(filename, exp_size, __LINE__) +static void _check_file_size(const WCHAR *filename, LONG exp_size, int line) +{ + HANDLE handle; + DWORD file_size = 0xdeadbeef; + handle = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + file_size = GetFileSize(handle, NULL); + ok_(__FILE__,line)(file_size == exp_size, "got wrong file size: %d.\n", file_size); + CloseHandle(handle); +} + static WCHAR *load_resource(const WCHAR *name) { static WCHAR pathW[MAX_PATH]; @@ -450,8 +492,10 @@ static void test_MFCreateMFByteStreamOnStream(void) hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_REF(stream, 1); hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_REF(stream, 2); hr = IMFByteStream_QueryInterface(bytestream, &IID_IUnknown, (void **)&unknown); @@ -509,7 +553,8 @@ static void test_MFCreateFile(void) IMFAttributes *attributes = NULL; HRESULT hr; WCHAR *filename; - + LONG file_size; + HANDLE handle; static const WCHAR newfilename[] = {'n','e','w','.','m','p','4',0}; filename = load_resource(mp4file); @@ -534,13 +579,11 @@ static void test_MFCreateFile(void) hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); hr = MFCreateFile(MF_ACCESSMODE_READWRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); IMFByteStream_Release(bytestream); @@ -558,18 +601,15 @@ static void test_MFCreateFile(void) hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, newfilename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, newfilename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_ALLOW_WRITE_SHARING, newfilename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); IMFByteStream_Release(bytestream); @@ -580,10 +620,41 @@ static void test_MFCreateFile(void) /* Opening the file again fails even though MF_FILEFLAGS_ALLOW_WRITE_SHARING is set. */ hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_ALLOW_WRITE_SHARING, newfilename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); + + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, + MF_FILEFLAGS_ALLOW_WRITE_SHARING, newfilename, &bytestream2); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + IMFByteStream_Release(bytestream2); + IMFByteStream_Release(bytestream); + + /* test MF_OPENMODE_APPEND_IF_EXIST */ + handle = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ok(handle != INVALID_HANDLE_VALUE, "File creation failed: 0x%08x.\n", GetLastError()); + file_size = GetFileSize(handle, NULL); + CloseHandle(handle); + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_APPEND_IF_EXIST, + MF_FILEFLAGS_ALLOW_WRITE_SHARING, filename, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_LEN(bytestream, file_size); + todo_wine CHECK_BS_POS(bytestream, 0); + IMFByteStream_Release(bytestream); + CHECK_FILE_SIZE(filename, file_size); + + /* test MF_OPENMODE_RESET_IF_EXIST with read-only mode */ + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_RESET_IF_EXIST, + MF_FILEFLAGS_ALLOW_WRITE_SHARING, filename, &bytestream); + ok(hr == E_INVALIDARG, "MFCreateFile should fail: 0x%08x.\n", hr); + CHECK_FILE_SIZE(filename, file_size); + /* test MF_OPENMODE_RESET_IF_EXIST */ + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_RESET_IF_EXIST, + MF_FILEFLAGS_NONE, filename, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_LEN(bytestream, 0); + todo_wine CHECK_BS_POS(bytestream, 0); IMFByteStream_Release(bytestream); + CHECK_FILE_SIZE(filename, 0); MFShutdown(); -- 2.20.1

2 1

[PATCH v3] ddraw/tests: Port test_alphatest() from d3d9 for d3d7.
by Paul Gofman 07 Feb '19

07 Feb '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2: - move test to ddraw7.c; - reduce color compare tolerance to 0. v3: - fixed formatting issue ("for(..."). dlls/ddraw/tests/ddraw7.c | 111 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index a063791770..5d407fefdf 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15489,6 +15489,116 @@ static void test_multiply_transform(void) DestroyWindow(window); } +static void test_alphatest(void) +{ +#define ALPHATEST_PASSED 0x0000ff00 +#define ALPHATEST_FAILED 0x00ff0000 + IDirect3DDevice7 *device; + IDirectDrawSurface7 *rt; + unsigned int i; + D3DCOLOR color; + ULONG refcount; + HWND window; + DWORD value; + HRESULT hr; + + static const struct + { + D3DCMPFUNC func; + D3DCOLOR color_less; + D3DCOLOR color_equal; + D3DCOLOR color_greater; + } + test_data[] = + { + {D3DCMP_NEVER, ALPHATEST_FAILED, ALPHATEST_FAILED, ALPHATEST_FAILED}, + {D3DCMP_LESS, ALPHATEST_PASSED, ALPHATEST_FAILED, ALPHATEST_FAILED}, + {D3DCMP_EQUAL, ALPHATEST_FAILED, ALPHATEST_PASSED, ALPHATEST_FAILED}, + {D3DCMP_LESSEQUAL, ALPHATEST_PASSED, ALPHATEST_PASSED, ALPHATEST_FAILED}, + {D3DCMP_GREATER, ALPHATEST_FAILED, ALPHATEST_FAILED, ALPHATEST_PASSED}, + {D3DCMP_NOTEQUAL, ALPHATEST_PASSED, ALPHATEST_FAILED, ALPHATEST_PASSED}, + {D3DCMP_GREATEREQUAL, ALPHATEST_FAILED, ALPHATEST_PASSED, ALPHATEST_PASSED}, + {D3DCMP_ALWAYS, ALPHATEST_PASSED, ALPHATEST_PASSED, ALPHATEST_PASSED}, + }; + static struct + { + struct vec3 position; + DWORD diffuse; + } + quad[] = + { + {{-1.0f, -1.0f, 0.1f}, ALPHATEST_PASSED | 0x80000000}, + {{-1.0f, 1.0f, 0.1f}, ALPHATEST_PASSED | 0x80000000}, + {{ 1.0f, -1.0f, 0.1f}, ALPHATEST_PASSED | 0x80000000}, + {{ 1.0f, 1.0f, 0.1f}, ALPHATEST_PASSED | 0x80000000}, + }; + + window = create_window(); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create 3D device.\n"); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice7_GetRenderTarget(device, &rt); + ok(hr == D3D_OK, "IDirect3DDevice7_GetRenderTarget failed, hr %#x.\n", hr); + + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(hr == D3D_OK, "IDirect3DDevice7_Clear failed, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(hr == D3D_OK, "IDirect3DDevice7_SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZENABLE, FALSE); + ok(hr == D3D_OK, "IDirect3DDevice7_SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ALPHATESTENABLE, TRUE); + ok(hr == D3D_OK, "IDirect3DDevice7_SetRenderState failed, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(test_data); ++i) + { + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ALPHAFUNC, test_data[i].func); + ok(hr == D3D_OK, "IDirect3DDevice7_SetRenderState failed, hr %#x.\n", hr); + + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, ALPHATEST_FAILED, 0.0f, 0); + ok(hr == D3D_OK, "IDirect3DDevice7_Clear failed, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ALPHAREF, 0x70); + ok(hr == D3D_OK, "IDirect3DDevice7_SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice7_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice7_BeginScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, + D3DFVF_XYZ | D3DFVF_DIFFUSE, quad, ARRAY_SIZE(quad), 0); + ok(hr == D3D_OK, "IDirect3DDevice7_DrawPrimitive failed, hr %#x.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice7_EndScene failed, hr %#x.\n", hr); + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, test_data[i].color_greater, 0), + "Alphatest failed, color 0x%08x, expected 0x%08x, alpha > ref, func %u.\n", + color, test_data[i].color_greater, test_data[i].func); + + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, ALPHATEST_FAILED, 0.0f, 0); + ok(hr == D3D_OK, "IDirect3DDevice7_Clear failed, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ALPHAREF, 0xff70); + ok(hr == D3D_OK, "IDirect3DDevice7_SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_ALPHAREF, &value); + ok(hr == D3D_OK, "IDirect3DDevice7_GetRenderState failed, hr %#x.\n", hr); + ok(value == 0xff70, "Unexpected D3DRS_ALPHAREF value %#x.\n", value); + hr = IDirect3DDevice7_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice7_BeginScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, + D3DFVF_XYZ | D3DFVF_DIFFUSE, quad, ARRAY_SIZE(quad), 0); + ok(hr == D3D_OK, "IDirect3DDevice7_DrawPrimitive failed, hr %#x.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice7_EndScene failed, hr %#x.\n", hr); + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, test_data[i].color_greater, 0), + "Alphatest failed, color 0x%08x, expected 0x%08x, alpha > ref, func %u.\n", + color, test_data[i].color_greater, test_data[i].func); + } + + IDirectDrawSurface7_Release(rt); + refcount = IDirect3DDevice7_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -15631,4 +15741,5 @@ START_TEST(ddraw7) test_sysmem_draw(); test_gdi_surface(); test_multiply_transform(); + test_alphatest(); } -- 2.20.1

2 1

[PATCH] comdlg32: Improve Printer Setup dialog
by Alistair Leslie-Hughes 07 Feb '19

07 Feb '19

Reset the Tab order to be more like windows. Added Help Button. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/comdlg32/comdlg32.rc | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/comdlg32/comdlg32.rc b/dlls/comdlg32/comdlg32.rc index 7ba71a2..05b7c09 100644 --- a/dlls/comdlg32/comdlg32.rc +++ b/dlls/comdlg32/comdlg32.rc @@ -394,22 +394,18 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTE CAPTION "Print Setup" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK",IDOK,176,156,50,14,WS_GROUP - PUSHBUTTON "Cancel",IDCANCEL,230,156,50,14 -/* PUSHBUTTON "Network...", psh5, 284,156,48,14 */ - GROUPBOX "Printer", grp4, 8, 4, 272,84, WS_GROUP - PUSHBUTTON "&Properties", psh2, 212, 17, 60,14, WS_GROUP LTEXT "&Name:", stc6, 16, 20, 36,8 - COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + COMBOBOX cmb1, 60, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Properties", psh2, 212, 17, 60,14, WS_GROUP LTEXT "Status:", stc8, 16, 36, 47,10, SS_NOPREFIX - LTEXT "", stc12, 65, 36, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "", stc12, 60, 36, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Type:", stc7, 16, 48, 47,10, SS_NOPREFIX - LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "", stc11, 60, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Where:", stc10, 16, 60, 47,10, SS_NOPREFIX - LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "", stc14, 60, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Comment:", stc9, 16, 72, 47,10, SS_NOPREFIX - LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "", stc13, 60, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Paper", grp2, 8, 92, 164,56, WS_GROUP LTEXT "Si&ze:", stc2, 16,108, 36, 8 @@ -421,6 +417,11 @@ BEGIN ICON "", ico1, 195,112, 18,20, WS_GROUP CONTROL "P&ortrait", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 CONTROL "L&andscape", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + + DEFPUSHBUTTON "OK",IDOK,176,156,50,14,WS_GROUP + PUSHBUTTON "Cancel",IDCANCEL,230,156,50,14 + PUSHBUTTON "&Help",pshHelp,8,156,50,14, WS_TABSTOP +/* PUSHBUTTON "Network...", psh5, 65,156,50,14, WS_TABSTOP */ END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 -- 1.9.1

1 0

[PATCH] server: Print process id in debug traces.
by Jacek Caban 06 Feb '19

06 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- I find it useful for debugging. server/trace.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)

1 0

[PATCH 4/4] ntoskrnl.exe: Implement NtBuildNumber.
by Jacek Caban 06 Feb '19

06 Feb '19

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 ++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 13 +++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-)

1 0

[PATCH 3/4] ntoskrnl.exe/tests: Introduce get_proc_address helper.
by Jacek Caban 06 Feb '19

06 Feb '19

Based on patch by Michael Müller. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/tests/driver.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-)

1 0

[PATCH 2/4] ntoskrnl.exe: Add KeRevertToUserAffinityThread stub.
by Jacek Caban 06 Feb '19

06 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-)

1 0

[PATCH 1/4] ntoskrnl.exe: Set FileObject of IRP passed to driver callbacks.
by Jacek Caban 06 Feb '19

06 Feb '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=20083 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/tests/driver.c | 21 +++++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-)

1 0

[PATCH 3/3] d3d8/tests: Port test_alphatest() from d3d9.
by Henri Verbeet 06 Feb '19

06 Feb '19

From: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/tests/visual.c | 150 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 150 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 7399d270e8d..749062220d2 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -10739,6 +10739,155 @@ static void test_sysmem_draw(void) DestroyWindow(window); } +static void test_alphatest(void) +{ +#define ALPHATEST_PASSED 0x0000ff00 +#define ALPHATEST_FAILED 0x00ff0000 + IDirect3DDevice8 *device; + unsigned int i, j; + IDirect3D8 *d3d; + D3DCOLOR color; + ULONG refcount; + D3DCAPS8 caps; + DWORD value; + HWND window; + HRESULT hr; + DWORD ps; + + static const struct + { + D3DCMPFUNC func; + D3DCOLOR color_less; + D3DCOLOR color_equal; + D3DCOLOR color_greater; + } + test_data[] = + { + {D3DCMP_NEVER, ALPHATEST_FAILED, ALPHATEST_FAILED, ALPHATEST_FAILED}, + {D3DCMP_LESS, ALPHATEST_PASSED, ALPHATEST_FAILED, ALPHATEST_FAILED}, + {D3DCMP_EQUAL, ALPHATEST_FAILED, ALPHATEST_PASSED, ALPHATEST_FAILED}, + {D3DCMP_LESSEQUAL, ALPHATEST_PASSED, ALPHATEST_PASSED, ALPHATEST_FAILED}, + {D3DCMP_GREATER, ALPHATEST_FAILED, ALPHATEST_FAILED, ALPHATEST_PASSED}, + {D3DCMP_NOTEQUAL, ALPHATEST_PASSED, ALPHATEST_FAILED, ALPHATEST_PASSED}, + {D3DCMP_GREATEREQUAL, ALPHATEST_FAILED, ALPHATEST_PASSED, ALPHATEST_PASSED}, + {D3DCMP_ALWAYS, ALPHATEST_PASSED, ALPHATEST_PASSED, ALPHATEST_PASSED}, + }; + static const struct + { + struct vec3 position; + DWORD diffuse; + } + quad[] = + { + {{-1.0f, -1.0f, 0.1f}, ALPHATEST_PASSED | 0x80000000}, + {{-1.0f, 1.0f, 0.1f}, ALPHATEST_PASSED | 0x80000000}, + {{ 1.0f, -1.0f, 0.1f}, ALPHATEST_PASSED | 0x80000000}, + {{ 1.0f, 1.0f, 0.1f}, ALPHATEST_PASSED | 0x80000000}, + }; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Failed to disable lighting, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ALPHATESTENABLE, TRUE); + ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "IDirect3DDevice8_SetVertexShader failed, hr %#x.\n", hr); + + ps = 0; + for (j = 0; j < 2; ++j) + { + if (j == 1) + { + /* Try a pixel shader instead of fixed function. The wined3d code + * may emulate the alpha test either for performance reasons + * (floating point RTs) or to work around driver bugs (GeForce + * 7x00 cards on MacOS). There may be a different codepath for ffp + * and shader in this case, and the test should cover both. */ + static const DWORD shader_code[] = + { + 0xffff0101, /* ps_1_1 */ + 0x00000001, 0x800f0000, 0x90e40000, /* mov r0, v0 */ + 0x0000ffff /* end */ + }; + memset(&caps, 0, sizeof(caps)); + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "IDirect3DDevice8_GetDeviceCaps failed, hr %#x.\n", hr); + if (caps.PixelShaderVersion < D3DPS_VERSION(1, 1)) + break; + + hr = IDirect3DDevice8_CreatePixelShader(device, shader_code, &ps); + ok(hr == D3D_OK, "IDirect3DDevice8_CreatePixelShader failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetPixelShader(device, ps); + ok(hr == D3D_OK, "IDirect3DDevice8_SetPixelShader failed, hr %#x.\n", hr); + } + + for (i = 0; i < ARRAY_SIZE(test_data); ++i) + { + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ALPHAFUNC, test_data[i].func); + ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, ALPHATEST_FAILED, 0.0f, 0); + ok(hr == D3D_OK, "IDirect3DDevice8_Clear failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ALPHAREF, 0x70); + ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice8_BeginScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(hr == D3D_OK, "IDirect3DDevice8_DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice8_EndScene failed, hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, test_data[i].color_greater, 0), + "Alphatest failed, color 0x%08x, expected 0x%08x, alpha > ref, func %u.\n", + color, test_data[i].color_greater, test_data[i].func); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice8_Present failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, ALPHATEST_FAILED, 0.0f, 0); + ok(hr == D3D_OK, "IDirect3DDevice8_Clear failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ALPHAREF, 0xff70); + ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_GetRenderState(device, D3DRS_ALPHAREF, &value); + ok(hr == D3D_OK, "IDirect3DDevice8_GetRenderState failed, hr %#x.\n", hr); + ok(value == 0xff70, "Unexpected D3DRS_ALPHAREF value %#x.\n", value); + hr = IDirect3DDevice8_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice8_BeginScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(hr == D3D_OK, "IDirect3DDevice8_DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice8_EndScene failed, hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, test_data[i].color_greater, 0), + "Alphatest failed, color 0x%08x, expected 0x%08x, alpha > ref, func %u.\n", + color, test_data[i].color_greater, test_data[i].func); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice8_Present failed, hr %#x.\n", hr); + } + } + if (ps) + IDirect3DDevice8_DeletePixelShader(device, ps); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -10814,4 +10963,5 @@ START_TEST(visual) test_viewport(); test_color_vertex(); test_sysmem_draw(); + test_alphatest(); } -- 2.11.0

2 1

[PATCH 2/3] wined3d: Store the scissor rect in the wined3d_stateblock_state structure.
by Henri Verbeet 06 Feb '19

06 Feb '19

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 23 ++++++++++++----------- dlls/wined3d/stateblock.c | 19 ++++++++----------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 63398e50de7..02bc9096844 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2148,27 +2148,27 @@ void CDECL wined3d_device_set_scissor_rects(struct wined3d_device *device, unsig TRACE("%u: %s\n", i, wine_dbgstr_rect(&rects[i])); } + if (rect_count) + device->update_stateblock_state->scissor_rect = rects[0]; + if (device->recording) + { device->recording->changed.scissorRect = TRUE; + return; + } - if (device->update_state->scissor_rect_count == rect_count - && !memcmp(device->update_state->scissor_rects, rects, rect_count * sizeof(*rects))) + if (device->state.scissor_rect_count == rect_count + && !memcmp(device->state.scissor_rects, rects, rect_count * sizeof(*rects))) { TRACE("App is setting the old scissor rectangles over, nothing to do.\n"); return; } if (rect_count) - memcpy(device->update_state->scissor_rects, rects, rect_count * sizeof(*rects)); + memcpy(device->state.scissor_rects, rects, rect_count * sizeof(*rects)); else - memset(device->update_state->scissor_rects, 0, sizeof(device->update_state->scissor_rects)); - device->update_state->scissor_rect_count = rect_count; - - if (device->recording) - { - TRACE("Recording... not performing anything.\n"); - return; - } + memset(device->state.scissor_rects, 0, sizeof(device->state.scissor_rects)); + device->state.scissor_rect_count = rect_count; wined3d_cs_emit_set_scissor_rects(device->cs, rect_count, rects); } @@ -4531,6 +4531,7 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device SetRect(&state->scissor_rects[0], 0, 0, view->width, view->height); state->scissor_rect_count = 1; wined3d_cs_emit_set_scissor_rects(device->cs, 1, state->scissor_rects); + device->stateblock_state.scissor_rect = state->scissor_rects[0]; } prev = device->fb.render_targets[view_idx]; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 84f56c959ba..9c035e53e60 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -839,17 +839,11 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) } if (stateblock->changed.scissorRect - && (src_state->scissor_rect_count != stateblock->state.scissor_rect_count - || memcmp(src_state->scissor_rects, stateblock->state.scissor_rects, - src_state->scissor_rect_count * sizeof(*stateblock->state.scissor_rects)))) + && memcmp(&state->scissor_rect, &stateblock->stateblock_state.scissor_rect, sizeof(state->scissor_rect))) { - TRACE("Updating scissor rects.\n"); + TRACE("Updating scissor rect.\n"); - if ((stateblock->state.scissor_rect_count = src_state->scissor_rect_count)) - memcpy(stateblock->state.scissor_rects, src_state->scissor_rects, - src_state->scissor_rect_count * sizeof(*src_state->scissor_rects)); - else - SetRectEmpty(stateblock->state.scissor_rects); + stateblock->stateblock_state.scissor_rect = state->scissor_rect; } if (stateblock->changed.blend_state @@ -1134,8 +1128,11 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) } if (stateblock->changed.scissorRect) - wined3d_device_set_scissor_rects(device, stateblock->state.scissor_rect_count, - stateblock->state.scissor_rects); + { + state->scissor_rect = stateblock->stateblock_state.scissor_rect; + + wined3d_device_set_scissor_rects(device, 1, &stateblock->stateblock_state.scissor_rect); + } if (stateblock->changed.blend_state) wined3d_device_set_blend_state(device, stateblock->state.blend_state, &stateblock->state.blend_factor); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9dd880c7a8c..66a2ee4e418 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2990,6 +2990,7 @@ struct wined3d_stateblock_state struct wined3d_vec4 clip_planes[MAX_CLIP_DISTANCES]; struct wined3d_material material; struct wined3d_viewport viewport; + RECT scissor_rect; }; struct wined3d_device -- 2.11.0

2 1

[PATCH 1/3] wined3d: Store the viewport in the wined3d_stateblock_state structure.
by Henri Verbeet 06 Feb '19

06 Feb '19

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 12 ++++++++---- dlls/wined3d/stateblock.c | 19 ++++++++----------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d06ac9c5ee6..63398e50de7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1926,10 +1926,7 @@ void CDECL wined3d_device_set_viewports(struct wined3d_device *device, unsigned } if (viewport_count) - memcpy(device->update_state->viewports, viewports, viewport_count * sizeof(*viewports)); - else - memset(device->update_state->viewports, 0, sizeof(device->update_state->viewports)); - device->update_state->viewport_count = viewport_count; + device->update_stateblock_state->viewport = viewports[0]; /* Handle recording of state blocks */ if (device->recording) @@ -1939,6 +1936,12 @@ void CDECL wined3d_device_set_viewports(struct wined3d_device *device, unsigned return; } + if (viewport_count) + memcpy(device->state.viewports, viewports, viewport_count * sizeof(*viewports)); + else + memset(device->state.viewports, 0, sizeof(device->state.viewports)); + device->state.viewport_count = viewport_count; + wined3d_cs_emit_set_viewports(device->cs, viewport_count, viewports); } @@ -4523,6 +4526,7 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device state->viewports[0].max_z = 1.0f; state->viewport_count = 1; wined3d_cs_emit_set_viewports(device->cs, 1, state->viewports); + device->stateblock_state.viewport = state->viewports[0]; SetRect(&state->scissor_rects[0], 0, 0, view->width, view->height); state->scissor_rect_count = 1; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index cf4f7d1fc00..84f56c959ba 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -830,19 +830,12 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) stateblock->stateblock_state.material = state->material; } - assert(src_state->viewport_count <= 1); - if (stateblock->changed.viewport - && (src_state->viewport_count != stateblock->state.viewport_count - || memcmp(src_state->viewports, stateblock->state.viewports, - src_state->viewport_count * sizeof(*stateblock->state.viewports)))) + && memcmp(&state->viewport, &stateblock->stateblock_state.viewport, sizeof(state->viewport))) { - TRACE("Updating viewports.\n"); + TRACE("Updating viewport.\n"); - if ((stateblock->state.viewport_count = src_state->viewport_count)) - memcpy(stateblock->state.viewports, src_state->viewports, sizeof(src_state->viewports)); - else - memset(stateblock->state.viewports, 0, sizeof(*stateblock->state.viewports)); + stateblock->stateblock_state.viewport = state->viewport; } if (stateblock->changed.scissorRect @@ -1134,7 +1127,11 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) } if (stateblock->changed.viewport) - wined3d_device_set_viewports(device, stateblock->state.viewport_count, stateblock->state.viewports); + { + state->viewport = stateblock->stateblock_state.viewport; + + wined3d_device_set_viewports(device, 1, &stateblock->stateblock_state.viewport); + } if (stateblock->changed.scissorRect) wined3d_device_set_scissor_rects(device, stateblock->state.scissor_rect_count, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6091d211c13..9dd880c7a8c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2989,6 +2989,7 @@ struct wined3d_stateblock_state struct wined3d_matrix transforms[HIGHEST_TRANSFORMSTATE + 1]; struct wined3d_vec4 clip_planes[MAX_CLIP_DISTANCES]; struct wined3d_material material; + struct wined3d_viewport viewport; }; struct wined3d_device -- 2.11.0

2 1

[PATCH v2 1/5] wined3d: Store transforms in the wined3d_stateblock_state structure.
by Zebediah Figura 06 Feb '19

06 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 2 +- dlls/wined3d/stateblock.c | 19 ++++++++++++++++--- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 72e328f630..f23e76f37e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1495,11 +1495,11 @@ void CDECL wined3d_device_set_transform(struct wined3d_device *device, TRACE("%.8e %.8e %.8e %.8e\n", matrix->_41, matrix->_42, matrix->_43, matrix->_44); /* Handle recording of state blocks. */ + device->update_stateblock_state->transforms[d3dts] = *matrix; if (device->recording) { TRACE("Recording... not performing anything.\n"); device->recording->changed.transform[d3dts >> 5] |= 1u << (d3dts & 0x1f); - device->update_state->transforms[d3dts] = *matrix; return; } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index e6e68b428b..04a15dfbc1 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -787,7 +787,7 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) TRACE("Updating transform %#x.\n", transform); - stateblock->state.transforms[transform] = src_state->transforms[transform]; + stateblock->stateblock_state.transforms[transform] = state->transforms[transform]; } if (stateblock->changed.indices @@ -1110,8 +1110,10 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) /* Transform states. */ for (i = 0; i < stateblock->num_contained_transform_states; ++i) { - wined3d_device_set_transform(device, stateblock->contained_transform_states[i], - &stateblock->state.transforms[stateblock->contained_transform_states[i]]); + enum wined3d_transform_state transform = stateblock->contained_transform_states[i]; + + state->transforms[transform] = stateblock->stateblock_state.transforms[transform]; + wined3d_device_set_transform(device, transform, &stateblock->stateblock_state.transforms[transform]); } if (stateblock->changed.indices) @@ -1424,12 +1426,23 @@ void state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, static void stateblock_state_init_default(struct wined3d_stateblock_state *state, const struct wined3d_d3d_info *d3d_info) { + struct wined3d_matrix identity; unsigned int i; + get_identity_matrix(&identity); + + state->transforms[WINED3D_TS_PROJECTION] = identity; + state->transforms[WINED3D_TS_VIEW] = identity; + for (i = 0; i < 256; ++i) + { + state->transforms[WINED3D_TS_WORLD_MATRIX(i)] = identity; + } + init_default_render_states(state->rs, d3d_info); for (i = 0; i < MAX_TEXTURES; ++i) { + state->transforms[WINED3D_TS_TEXTURE0 + i] = identity; init_default_texture_state(i, state->texture_states[i]); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1a461c0dec..ee69549114 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2985,6 +2985,8 @@ struct wined3d_stateblock_state struct wined3d_texture *textures[MAX_COMBINED_SAMPLERS]; DWORD sampler_states[MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1]; DWORD texture_states[MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1]; + + struct wined3d_matrix transforms[HIGHEST_TRANSFORMSTATE + 1]; }; struct wined3d_device -- 2.20.1

2 7

[PATCH v2 1/3] d3d9: Keep track of D3DUSAGE_AUTOGENMIPMAP textures in the d3d9 device.
by Matteo Bruni 06 Feb '19

06 Feb '19

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Fix patch according to Józef's review. Supersedes patch 157672. dlls/d3d9/d3d9_private.h | 2 ++ dlls/d3d9/device.c | 23 +++++++++++++++++++++-- dlls/d3d9/stateblock.c | 16 +++++++++++++++- 3 files changed, 38 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 1032f8e8e9c..3fe0376e5c1 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -111,6 +111,8 @@ struct d3d9_device DWORD recording : 1; DWORD padding : 11; + DWORD auto_mipmaps; /* D3D9_MAX_TEXTURE_UNITS */ + unsigned int max_user_clip_planes; UINT implicit_swapchain_count; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 98ada03af8b..66bf69589ca 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1012,6 +1012,9 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, device->device_state = D3D9_DEVICE_STATE_OK; } + if (!device->d3d_parent->extended) + device->auto_mipmaps = 0; + rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, 0); device->render_targets[0] = wined3d_rendertarget_view_get_sub_resource_parent(rtv); for (i = 1; i < ARRAY_SIZE(device->render_targets); ++i) @@ -2456,6 +2459,19 @@ static HRESULT WINAPI d3d9_device_SetTexture(IDirect3DDevice9Ex *iface, DWORD st wined3d_mutex_lock(); hr = wined3d_device_set_texture(device->wined3d_device, stage, texture_impl ? texture_impl->wined3d_texture : NULL); + if (SUCCEEDED(hr) && !device->recording) + { + unsigned int i = stage < 16 || (stage >= D3DVERTEXTEXTURESAMPLER0 && stage <= D3DVERTEXTEXTURESAMPLER3) + ? stage < 16 ? stage : stage - D3DVERTEXTEXTURESAMPLER0 + 16 : ~0u; + + if (i < D3D9_MAX_TEXTURE_UNITS) + { + if (texture_impl && texture_impl->usage & D3DUSAGE_AUTOGENMIPMAP) + device->auto_mipmaps |= 1u << i; + else + device->auto_mipmaps &= ~(1u << i); + } + } wined3d_mutex_unlock(); return hr; @@ -2700,10 +2716,13 @@ static float WINAPI d3d9_device_GetNPatchMode(IDirect3DDevice9Ex *iface) static void d3d9_generate_auto_mipmaps(struct d3d9_device *device) { struct wined3d_texture *texture; - unsigned int i, stage; + unsigned int i, stage, map; - for (i = 0; i < D3D9_MAX_TEXTURE_UNITS; ++i) + map = device->auto_mipmaps; + while (map) { + i = wined3d_bit_scan(&map); + stage = i >= 16 ? i - 16 + D3DVERTEXTEXTURESAMPLER0 : i; if ((texture = wined3d_device_get_texture(device->wined3d_device, stage))) d3d9_texture_gen_auto_mipmap(wined3d_texture_get_parent(texture)); diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 8431ef77002..14f47d929bc 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -109,10 +109,12 @@ static HRESULT WINAPI d3d9_stateblock_Capture(IDirect3DStateBlock9 *iface) static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) { struct d3d9_stateblock *stateblock = impl_from_IDirect3DStateBlock9(iface); + struct wined3d_texture *wined3d_texture; + unsigned int i, offset, stride, stage; struct wined3d_buffer *wined3d_buffer; struct d3d9_vertexbuffer *buffer; - unsigned int i, offset, stride; enum wined3d_format_id format; + struct d3d9_texture *texture; struct d3d9_device *device; HRESULT hr; @@ -134,6 +136,18 @@ static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) } device->sysmem_ib = (wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &format, &offset)) && (buffer = wined3d_buffer_get_parent(wined3d_buffer)) && buffer->draw_buffer; + device->auto_mipmaps = 0; + for (i = 0; i < D3D9_MAX_TEXTURE_UNITS; ++i) + { + stage = i >= 16 ? i - 16 + D3DVERTEXTEXTURESAMPLER0 : i; + + if ((wined3d_texture = wined3d_device_get_texture(device->wined3d_device, stage)) + && (texture = wined3d_texture_get_parent(wined3d_texture)) + && texture->usage & D3DUSAGE_AUTOGENMIPMAP) + device->auto_mipmaps |= 1u << i; + else + device->auto_mipmaps &= ~(1u << i); + } wined3d_mutex_unlock(); return D3D_OK; -- 2.19.2

4 8

[PATCH] ws2_32: Use heap_realloc instead of HeapReAlloc to avoid an invalid realloc (Valgrind).
by Sven Baars 06 Feb '19

06 Feb '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- This supersedes 157850. dlls/ws2_32/socket.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 640726d01e..542dc9a7a8 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -158,6 +158,7 @@ #include "wine/debug.h" #include "wine/exception.h" #include "wine/unicode.h" +#include "wine/heap.h" #if defined(linux) && !defined(IP_UNICAST_IF) #define IP_UNICAST_IF 50 @@ -6272,8 +6273,7 @@ static struct WS_hostent* WS_get_local_ips( char *hostname ) return NULL; adapters = HeapAlloc(GetProcessHeap(), 0, adap_size); routes = HeapAlloc(GetProcessHeap(), 0, route_size); - route_addrs = HeapAlloc(GetProcessHeap(), 0, 0); /* HeapReAlloc doesn't work on NULL */ - if (adapters == NULL || routes == NULL || route_addrs == NULL) + if (adapters == NULL || routes == NULL) goto cleanup; /* Obtain the adapter list and the full routing table */ if (GetAdaptersInfo(adapters, &adap_size) != NO_ERROR) @@ -6306,7 +6306,7 @@ static struct WS_hostent* WS_get_local_ips( char *hostname ) } if (exists) continue; - route_addrs = HeapReAlloc(GetProcessHeap(), 0, route_addrs, (numroutes+1)*sizeof(struct route)); + route_addrs = heap_realloc(route_addrs, (numroutes+1)*sizeof(struct route)); if (route_addrs == NULL) goto cleanup; /* Memory allocation error, fail gracefully */ route_addrs[numroutes].interface = ifindex; -- 2.17.1

1 0

[PATCH vkd3d] tests: Add SetName() tests.
by Henri Verbeet 06 Feb '19

06 Feb '19

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- tests/d3d12.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 1b6b917..242b080 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2740,7 +2740,7 @@ static void test_create_fence(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } -static void test_private_data(void) +static void test_object_interface(void) { D3D12_DESCRIPTOR_HEAP_DESC descriptor_heap_desc; D3D12_QUERY_HEAP_DESC query_heap_desc; @@ -2763,6 +2763,8 @@ static void test_private_data(void) static const GUID test_guid2 = {0x2e5afac2, 0x87b5, 0x4c10, {0x9b, 0x4b, 0x89, 0xd7, 0xd1, 0x12, 0xe7, 0x2b}}; static const DWORD data[] = {1, 2, 3, 4}; + static const WCHAR deadbeefW[] = {'d', 'e', 'a', 'd', 'b', 'e', 'e', 'f', 0}; + static const WCHAR emptyW[] = {0}; static const GUID *tests[] = { &IID_ID3D12CommandAllocator, @@ -2994,6 +2996,15 @@ static void test_private_data(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); } + hr = ID3D12Object_SetName(object, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = ID3D12Object_SetName(object, emptyW); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID3D12Object_SetName(object, deadbeefW); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID3D12Object_Release(object); refcount = IUnknown_Release(test_object); @@ -24042,7 +24053,7 @@ START_TEST(d3d12) run_test(test_create_compute_pipeline_state); run_test(test_create_graphics_pipeline_state); run_test(test_create_fence); - run_test(test_private_data); + run_test(test_object_interface); run_test(test_multithread_private_data); run_test(test_reset_command_allocator); run_test(test_cpu_signal_fence); -- 2.11.0

1 0

[PATCH 3/3] ntoskrnl.exe: Implement ExDeleteNPagedLookasideList.
by Jacek Caban 06 Feb '19

06 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)

1 0

[PATCH 2/3] ntoskrnl.exe: Implement ExInitializeNPagedLookasideList.
by Jacek Caban 06 Feb '19

06 Feb '19

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 35 +++++++++---- dlls/ntoskrnl.exe/tests/driver.c | 30 +++++++++++ include/ddk/wdm.h | 89 ++++++++++++++++++++++++++++++-- include/winnt.h | 2 + 4 files changed, 144 insertions(+), 12 deletions(-)

1 0

[PATCH 1/3] ntoskrnl.exe: Add PsRevertToSelf stub.
by Jacek Caban 06 Feb '19

06 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntifs.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-)

1 0

[PATCH] hidclass.sys: Prevent buffer overrun
by Aric Stewart 06 Feb '19

06 Feb '19

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/hidclass.sys/descriptor.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

1 0

[PATCH vkd3d 5/7] vkd3d-shader: Generate functions for hull shader phases.
by Józef Kucia 06 Feb '19

06 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 105 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 100 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index c91ad6eff7df..67701ccf2241 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1560,8 +1560,6 @@ static uint32_t vkd3d_spirv_get_type_id(struct vkd3d_spirv_builder *builder, static void vkd3d_spirv_builder_init(struct vkd3d_spirv_builder *builder) { - uint32_t void_id, function_type_id; - vkd3d_spirv_stream_init(&builder->debug_stream); vkd3d_spirv_stream_init(&builder->annotation_stream); vkd3d_spirv_stream_init(&builder->global_stream); @@ -1575,12 +1573,19 @@ static void vkd3d_spirv_builder_init(struct vkd3d_spirv_builder *builder) rb_init(&builder->declarations, vkd3d_spirv_declaration_compare); + builder->main_function_id = vkd3d_spirv_alloc_id(builder); + vkd3d_spirv_build_op_name(builder, builder->main_function_id, "main"); +} + +static void vkd3d_spirv_builder_begin_main_function(struct vkd3d_spirv_builder *builder) +{ + uint32_t void_id, function_type_id; + void_id = vkd3d_spirv_get_op_type_void(builder); function_type_id = vkd3d_spirv_get_op_type_function(builder, void_id, NULL, 0); - builder->main_function_id = vkd3d_spirv_build_op_function(builder, void_id, - vkd3d_spirv_alloc_id(builder), SpvFunctionControlMaskNone, function_type_id); - vkd3d_spirv_build_op_name(builder, builder->main_function_id, "main"); + vkd3d_spirv_build_op_function(builder, void_id, + builder->main_function_id, SpvFunctionControlMaskNone, function_type_id); vkd3d_spirv_build_op_label(builder, vkd3d_spirv_alloc_id(builder)); builder->main_function_location = vkd3d_spirv_stream_current_location(&builder->function_stream); } @@ -1899,6 +1904,12 @@ struct vkd3d_push_constant_buffer_binding struct vkd3d_shader_push_constant_buffer pc; }; +struct vkd3d_shader_phase +{ + enum VKD3D_SHADER_INSTRUCTION_HANDLER type; + uint32_t function_id; +}; + struct vkd3d_dxbc_compiler { struct vkd3d_spirv_builder spirv_builder; @@ -1939,6 +1950,10 @@ struct vkd3d_dxbc_compiler uint32_t binding_idx; const struct vkd3d_shader_scan_info *scan_info; + + unsigned int shader_phase_count; + struct vkd3d_shader_phase *shader_phases; + size_t shader_phases_size; }; static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_compiler *compiler); @@ -3807,6 +3822,9 @@ static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_comp vkd3d_dxbc_compiler_emit_execution_mode(compiler, SpvExecutionModeXfb, NULL, 0); } + if (compiler->shader_type != VKD3D_SHADER_TYPE_HULL) + vkd3d_spirv_builder_begin_main_function(builder); + vkd3d_dxbc_compiler_emit_shader_signature_outputs(compiler); } @@ -4662,6 +4680,72 @@ static void vkd3d_dxbc_compiler_emit_dcl_thread_group(struct vkd3d_dxbc_compiler SpvExecutionModeLocalSize, local_size, ARRAY_SIZE(local_size)); } +static void vkd3d_dxbc_compiler_enter_shader_phase(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t void_id, function_type_id; + struct vkd3d_shader_phase *phase; + const char *name; + unsigned int id; + + id = compiler->shader_phase_count; + + if (id) + vkd3d_spirv_build_op_function_end(builder); + + if (!vkd3d_array_reserve((void **)&compiler->shader_phases, &compiler->shader_phases_size, + compiler->shader_phase_count + 1, sizeof(*compiler->shader_phases))) + return; + phase = &compiler->shader_phases[compiler->shader_phase_count++]; + + phase->type = instruction->handler_idx; + phase->function_id = vkd3d_spirv_alloc_id(builder); + + void_id = vkd3d_spirv_get_op_type_void(builder); + function_type_id = vkd3d_spirv_get_op_type_function(builder, void_id, NULL, 0); + vkd3d_spirv_build_op_function(builder, void_id, phase->function_id, + SpvFunctionControlMaskNone, function_type_id); + vkd3d_spirv_build_op_label(builder, vkd3d_spirv_alloc_id(builder)); + + switch (instruction->handler_idx) + { + case VKD3DSIH_HS_CONTROL_POINT_PHASE: + name = "control"; + break; + case VKD3DSIH_HS_FORK_PHASE: + name = "fork"; + break; + case VKD3DSIH_HS_JOIN_PHASE: + name = "join"; + break; + default: + ERR("Invalid shader phase %#x.\n", instruction->handler_idx); + return; + } + vkd3d_spirv_build_op_name(builder, phase->function_id, "%s%u", name, id); +} + +static void vkd3d_dxbc_compiler_emit_hull_shader_main(struct vkd3d_dxbc_compiler *compiler) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_phase *phase; + uint32_t void_id; + unsigned int i; + + vkd3d_spirv_builder_begin_main_function(builder); + + void_id = vkd3d_spirv_get_op_type_void(builder); + for (i = 0; i < compiler->shader_phase_count; ++i) + { + phase = &compiler->shader_phases[i]; + vkd3d_spirv_build_op_function_call(builder, void_id, phase->function_id, NULL, 0); + } + + vkd3d_spirv_build_op_return(builder); + vkd3d_spirv_build_op_function_end(builder); +} + static SpvOp vkd3d_dxbc_compiler_map_alu_instruction(const struct vkd3d_shader_instruction *instruction) { static const struct @@ -6944,6 +7028,11 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_DCL_THREAD_GROUP: vkd3d_dxbc_compiler_emit_dcl_thread_group(compiler, instruction); break; + case VKD3DSIH_HS_CONTROL_POINT_PHASE: + case VKD3DSIH_HS_FORK_PHASE: + case VKD3DSIH_HS_JOIN_PHASE: + vkd3d_dxbc_compiler_enter_shader_phase(compiler, instruction); + break; case VKD3DSIH_MOV: vkd3d_dxbc_compiler_emit_mov(compiler, instruction); break; @@ -7142,6 +7231,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_CUT_STREAM: vkd3d_dxbc_compiler_emit_cut_stream(compiler, instruction); break; + case VKD3DSIH_HS_DECLS: case VKD3DSIH_DCL_INPUT_CONTROL_POINT_COUNT: case VKD3DSIH_NOP: /* nothing to do */ @@ -7279,6 +7369,9 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, vkd3d_spirv_build_op_function_end(builder); + if (compiler->shader_type == VKD3D_SHADER_TYPE_HULL) + vkd3d_dxbc_compiler_emit_hull_shader_main(compiler); + if (compiler->epilogue_function_id) vkd3d_dxbc_compiler_emit_shader_epilogue_function(compiler); @@ -7310,5 +7403,7 @@ void vkd3d_dxbc_compiler_destroy(struct vkd3d_dxbc_compiler *compiler) rb_destroy(&compiler->symbol_table, vkd3d_symbol_free, NULL); + vkd3d_free(compiler->shader_phases); + vkd3d_free(compiler); } -- 2.19.2

3 3

[PATCH vkd3d 7/7] vkd3d-shader: Allocate temporary registers per shader phase.
by Józef Kucia 06 Feb '19

06 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 41 +++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ae0b1958995c..8efb38530ce9 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1908,6 +1908,7 @@ struct vkd3d_shader_phase { enum VKD3D_SHADER_INSTRUCTION_HANDLER type; uint32_t function_id; + size_t function_location; }; struct vkd3d_dxbc_compiler @@ -3828,6 +3829,26 @@ static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_comp vkd3d_dxbc_compiler_emit_shader_signature_outputs(compiler); } +static const struct vkd3d_shader_phase *vkd3d_dxbc_compiler_get_current_shader_phase( + const struct vkd3d_dxbc_compiler *compiler) +{ + if (!compiler->shader_phase_count) + return NULL; + + return &compiler->shader_phases[compiler->shader_phase_count - 1]; +} + +static size_t vkd3d_dxbc_compiler_get_current_function_location(const struct vkd3d_dxbc_compiler *compiler) +{ + const struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_phase *phase; + + if ((phase = vkd3d_dxbc_compiler_get_current_shader_phase(compiler))) + return phase->function_location; + + return builder->main_function_location; +} + static void vkd3d_dxbc_compiler_emit_dcl_global_flags(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { @@ -3849,12 +3870,13 @@ static void vkd3d_dxbc_compiler_emit_dcl_temps(struct vkd3d_dxbc_compiler *compi const struct vkd3d_shader_instruction *instruction) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + size_t function_location; unsigned int i; uint32_t id; - vkd3d_spirv_begin_function_stream_insertion(builder, builder->main_function_location); + function_location = vkd3d_dxbc_compiler_get_current_function_location(compiler); + vkd3d_spirv_begin_function_stream_insertion(builder, function_location); - assert(!compiler->temp_count); compiler->temp_count = instruction->declaration.count; for (i = 0; i < compiler->temp_count; ++i) { @@ -3877,6 +3899,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_indexable_temp(struct vkd3d_dxbc_compil struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; struct vkd3d_shader_register reg; struct vkd3d_symbol reg_symbol; + size_t function_location; uint32_t id; if (temp->component_count != 4) @@ -3887,7 +3910,8 @@ static void vkd3d_dxbc_compiler_emit_dcl_indexable_temp(struct vkd3d_dxbc_compil reg.idx[0].offset = temp->register_idx; reg.idx[1].offset = ~0u; - vkd3d_spirv_begin_function_stream_insertion(builder, builder->main_function_location); + function_location = vkd3d_dxbc_compiler_get_current_function_location(compiler); + vkd3d_spirv_begin_function_stream_insertion(builder, function_location); id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->function_stream, SpvStorageClassFunction, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE, temp->register_size); @@ -4708,6 +4732,8 @@ static void vkd3d_dxbc_compiler_enter_shader_phase(struct vkd3d_dxbc_compiler *c SpvFunctionControlMaskNone, function_type_id); vkd3d_spirv_build_op_label(builder, vkd3d_spirv_alloc_id(builder)); + phase->function_location = vkd3d_spirv_stream_current_location(&builder->function_stream); + switch (instruction->handler_idx) { case VKD3DSIH_HS_CONTROL_POINT_PHASE: @@ -4726,15 +4752,6 @@ static void vkd3d_dxbc_compiler_enter_shader_phase(struct vkd3d_dxbc_compiler *c vkd3d_spirv_build_op_name(builder, phase->function_id, "%s%u", name, id); } -static const struct vkd3d_shader_phase *vkd3d_dxbc_compiler_get_current_shader_phase( - const struct vkd3d_dxbc_compiler *compiler) -{ - if (!compiler->shader_phase_count) - return NULL; - - return &compiler->shader_phases[compiler->shader_phase_count - 1]; -} - static void vkd3d_dxbc_compiler_emit_hull_shader_main(struct vkd3d_dxbc_compiler *compiler) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; -- 2.19.2

2 1

[PATCH vkd3d 6/7] vkd3d-shader: Do not generate shader epilogue for fork and join shader phases.
by Józef Kucia 06 Feb '19

06 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 67701ccf2241..ae0b1958995c 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4726,6 +4726,15 @@ static void vkd3d_dxbc_compiler_enter_shader_phase(struct vkd3d_dxbc_compiler *c vkd3d_spirv_build_op_name(builder, phase->function_id, "%s%u", name, id); } +static const struct vkd3d_shader_phase *vkd3d_dxbc_compiler_get_current_shader_phase( + const struct vkd3d_dxbc_compiler *compiler) +{ + if (!compiler->shader_phase_count) + return NULL; + + return &compiler->shader_phases[compiler->shader_phase_count - 1]; +} + static void vkd3d_dxbc_compiler_emit_hull_shader_main(struct vkd3d_dxbc_compiler *compiler) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; @@ -5392,9 +5401,13 @@ static void vkd3d_dxbc_compiler_emit_return(struct vkd3d_dxbc_compiler *compiler const struct vkd3d_shader_instruction *instruction) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_phase *phase; - if (compiler->shader_type != VKD3D_SHADER_TYPE_GEOMETRY) + if (compiler->shader_type != VKD3D_SHADER_TYPE_GEOMETRY + && (!(phase = vkd3d_dxbc_compiler_get_current_shader_phase(compiler)) + || phase->type == VKD3DSIH_HS_CONTROL_POINT_PHASE)) vkd3d_dxbc_compiler_emit_shader_epilogue_invocation(compiler); + vkd3d_spirv_build_op_return(builder); } -- 2.19.2

2 1

[PATCH vkd3d 1/7] vkd3d: Set object names for Vulkan command pools.
by Józef Kucia 06 Feb '19

06 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 48aa37c81812..65eee1bb7d80 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1083,7 +1083,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_allocator_SetName(ID3D12CommandAl TRACE("iface %p, name %s.\n", iface, debugstr_w(name, allocator->device->wchar_size)); - return name ? S_OK : E_INVALIDARG; + return vkd3d_set_vk_object_name(allocator->device, (uint64_t)allocator->vk_command_pool, + VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_POOL_EXT, name); } static HRESULT STDMETHODCALLTYPE d3d12_command_allocator_GetDevice(ID3D12CommandAllocator *iface, -- 2.19.2

2 1

[PATCH vkd3d 3/7] vkd3d-shader: Add FIXME about error messages from vkd3d_shader_serialize_root_signature().
by Józef Kucia 06 Feb '19

06 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> We need to fix this before finalizing vkd3d-shader API. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_shader.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 67884254a88b..fe6f6e9c43c2 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -389,6 +389,7 @@ enum vkd3d_root_signature_version VKD3D_FORCE_32_BIT_ENUM(VKD3D_ROOT_SIGNATURE_VERSION), }; +/* FIXME: Add support for returning error messages (ID3DBlob). */ int vkd3d_shader_serialize_root_signature(const struct vkd3d_root_signature_desc *root_signature, enum vkd3d_root_signature_version version, struct vkd3d_shader_code *dxbc); -- 2.19.2

2 1

[PATCH vkd3d 4/7] vkd3d-shader: Introduce vkd3d_spirv_get_op_type_function().
by Józef Kucia 06 Feb '19

06 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0ece33c360a5..c91ad6eff7df 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -474,6 +474,12 @@ static uint32_t vkd3d_spirv_build_once1v(struct vkd3d_spirv_builder *builder, unsigned int i, param_idx = 0; struct rb_entry *entry; + if (operand_count >= ARRAY_SIZE(declaration.parameters)) + { + WARN("Unsupported parameter count %u (opcode %#x).\n", operand_count + 1, op); + return build_pfn(builder, operand0, operands, operand_count); + } + declaration.op = op; declaration.parameters[param_idx++] = operand0; for (i = 0; i < operand_count; ++i) @@ -986,12 +992,19 @@ static uint32_t vkd3d_spirv_get_op_type_sampled_image(struct vkd3d_spirv_builder } static uint32_t vkd3d_spirv_build_op_type_function(struct vkd3d_spirv_builder *builder, - uint32_t return_type, uint32_t *param_types, unsigned int param_count) + uint32_t return_type, const uint32_t *param_types, unsigned int param_count) { return vkd3d_spirv_build_op_r1v(builder, &builder->global_stream, SpvOpTypeFunction, return_type, param_types, param_count); } +static uint32_t vkd3d_spirv_get_op_type_function(struct vkd3d_spirv_builder *builder, + uint32_t return_type, const uint32_t *param_types, unsigned int param_count) +{ + return vkd3d_spirv_build_once1v(builder, SpvOpTypeFunction, return_type, + param_types, param_count, vkd3d_spirv_build_op_type_function); +} + static uint32_t vkd3d_spirv_build_op_type_pointer(struct vkd3d_spirv_builder *builder, uint32_t storage_class, uint32_t type_id) { @@ -1563,7 +1576,7 @@ static void vkd3d_spirv_builder_init(struct vkd3d_spirv_builder *builder) rb_init(&builder->declarations, vkd3d_spirv_declaration_compare); void_id = vkd3d_spirv_get_op_type_void(builder); - function_type_id = vkd3d_spirv_build_op_type_function(builder, void_id, NULL, 0); + function_type_id = vkd3d_spirv_get_op_type_function(builder, void_id, NULL, 0); builder->main_function_id = vkd3d_spirv_build_op_function(builder, void_id, vkd3d_spirv_alloc_id(builder), SpvFunctionControlMaskNone, function_type_id); @@ -7223,7 +7236,7 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_ if (compiler->private_output_variable[i]) param_type_id[count++] = ptr_type_id; } - function_type_id = vkd3d_spirv_build_op_type_function(builder, void_id, param_type_id, count); + function_type_id = vkd3d_spirv_get_op_type_function(builder, void_id, param_type_id, count); vkd3d_spirv_build_op_function(builder, void_id, function_id, SpvFunctionControlMaskNone, function_type_id); -- 2.19.2

2 1

[PATCH vkd3d 2/7] vkd3d: Avoid printing FIXME() about error blobs unnecessarily.
by Józef Kucia 06 Feb '19

06 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/vkd3d_main.c | 5 ++--- tests/d3d12.c | 6 ++++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index ba55056d11f7..c65a4abcac55 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -343,16 +343,15 @@ HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *root_sig } if (error_blob) - { - FIXME("Ignoring error blob %p.\n", error_blob); *error_blob = NULL; - } if ((ret = vkd3d_shader_serialize_root_signature( (const struct vkd3d_root_signature_desc *)root_signature_desc, (enum vkd3d_root_signature_version)version, &dxbc)) < 0) { WARN("Failed to serialize root signature, vkd3d result %d.\n", ret); + if (error_blob) + FIXME("Ignoring error blob %p.\n", error_blob); return hresult_from_vkd3d_result(ret); } diff --git a/tests/d3d12.c b/tests/d3d12.c index 1b6b91763269..a854bd6ca8c7 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9728,14 +9728,16 @@ static void test_root_signature_deserialization_(unsigned int line, const DWORD static void test_root_signature_serialization_(unsigned int line, const DWORD *code, size_t code_size, const D3D12_ROOT_SIGNATURE_DESC *desc) { + ID3DBlob *blob, *error_blob; DWORD *blob_buffer; size_t blob_size; - ID3DBlob *blob; unsigned int i; HRESULT hr; - hr = D3D12SerializeRootSignature(desc, D3D_ROOT_SIGNATURE_VERSION_1_0, &blob, NULL); + error_blob = (ID3DBlob *)0xdeadbeef; + hr = D3D12SerializeRootSignature(desc, D3D_ROOT_SIGNATURE_VERSION_1_0, &blob, &error_blob); ok_(line)(hr == S_OK, "Failed to serialize root signature, hr %#x.\n", hr); + ok_(line)(!error_blob, "Got unexpected error blob %p.\n", error_blob); blob_buffer = ID3D10Blob_GetBufferPointer(blob); blob_size = ID3D10Blob_GetBufferSize(blob); -- 2.19.2

2 1

[PATCH v2 1/2] d3d8/tests: Port test_alphatest() from d3d9.
by Paul Gofman 06 Feb '19

06 Feb '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2: - use create_device() for device creation; - fix formatting issue; - reduce color compare tolerance to 0. dlls/d3d8/tests/visual.c | 151 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 7399d270e8..a73799f37f 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -10739,6 +10739,156 @@ static void test_sysmem_draw(void) DestroyWindow(window); } +static void test_alphatest(void) +{ +#define ALPHATEST_PASSED 0x0000ff00 +#define ALPHATEST_FAILED 0x00ff0000 + IDirect3DDevice8 *device; + unsigned int i, j; + IDirect3D8 *d3d; + D3DCOLOR color; + ULONG refcount; + D3DCAPS8 caps; + DWORD value; + HWND window; + HRESULT hr; + DWORD ps; + + + static const struct + { + D3DCMPFUNC func; + D3DCOLOR color_less; + D3DCOLOR color_equal; + D3DCOLOR color_greater; + } + test_data[] = + { + {D3DCMP_NEVER, ALPHATEST_FAILED, ALPHATEST_FAILED, ALPHATEST_FAILED}, + {D3DCMP_LESS, ALPHATEST_PASSED, ALPHATEST_FAILED, ALPHATEST_FAILED}, + {D3DCMP_EQUAL, ALPHATEST_FAILED, ALPHATEST_PASSED, ALPHATEST_FAILED}, + {D3DCMP_LESSEQUAL, ALPHATEST_PASSED, ALPHATEST_PASSED, ALPHATEST_FAILED}, + {D3DCMP_GREATER, ALPHATEST_FAILED, ALPHATEST_FAILED, ALPHATEST_PASSED}, + {D3DCMP_NOTEQUAL, ALPHATEST_PASSED, ALPHATEST_FAILED, ALPHATEST_PASSED}, + {D3DCMP_GREATEREQUAL, ALPHATEST_FAILED, ALPHATEST_PASSED, ALPHATEST_PASSED}, + {D3DCMP_ALWAYS, ALPHATEST_PASSED, ALPHATEST_PASSED, ALPHATEST_PASSED}, + }; + static const struct + { + struct vec3 position; + DWORD diffuse; + } + quad[] = + { + {{-1.0f, -1.0f, 0.1f}, ALPHATEST_PASSED | 0x80000000}, + {{-1.0f, 1.0f, 0.1f}, ALPHATEST_PASSED | 0x80000000}, + {{ 1.0f, -1.0f, 0.1f}, ALPHATEST_PASSED | 0x80000000}, + {{ 1.0f, 1.0f, 0.1f}, ALPHATEST_PASSED | 0x80000000}, + }; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Failed to disable lighting, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ALPHATESTENABLE, TRUE); + ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "IDirect3DDevice8_SetVertexShader failed, hr %#x.\n", hr); + + ps = 0; + for (j = 0; j < 2; ++j) + { + if (j == 1) + { + /* Try a pixel shader instead of fixed function. The wined3d code + * may emulate the alpha test either for performance reasons + * (floating point RTs) or to work around driver bugs (GeForce + * 7x00 cards on MacOS). There may be a different codepath for ffp + * and shader in this case, and the test should cover both. */ + static const DWORD shader_code[] = + { + 0xffff0101, /* ps_1_1 */ + 0x00000001, 0x800f0000, 0x90e40000, /* mov r0, v0 */ + 0x0000ffff /* end */ + }; + memset(&caps, 0, sizeof(caps)); + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "IDirect3DDevice8_GetDeviceCaps failed, hr %#x.\n", hr); + if(caps.PixelShaderVersion < D3DPS_VERSION(1, 1)) + break; + + hr = IDirect3DDevice8_CreatePixelShader(device, shader_code, &ps); + ok(hr == D3D_OK, "IDirect3DDevice8_CreatePixelShader failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetPixelShader(device, ps); + ok(hr == D3D_OK, "IDirect3DDevice8_SetPixelShader failed, hr %#x.\n", hr); + } + + for(i = 0; i < ARRAY_SIZE(test_data); ++i) + { + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ALPHAFUNC, test_data[i].func); + ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, ALPHATEST_FAILED, 0.0f, 0); + ok(hr == D3D_OK, "IDirect3DDevice8_Clear failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ALPHAREF, 0x70); + ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice8_BeginScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(hr == D3D_OK, "IDirect3DDevice8_DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice8_EndScene failed, hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, test_data[i].color_greater, 0), + "Alphatest failed, color 0x%08x, expected 0x%08x, alpha > ref, func %u.\n", + color, test_data[i].color_greater, test_data[i].func); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice8_Present failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, ALPHATEST_FAILED, 0.0f, 0); + ok(hr == D3D_OK, "IDirect3DDevice8_Clear failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ALPHAREF, 0xff70); + ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_GetRenderState(device, D3DRS_ALPHAREF, &value); + ok(hr == D3D_OK, "IDirect3DDevice8_GetRenderState failed, hr %#x.\n", hr); + ok(value == 0xff70, "Unexpected D3DRS_ALPHAREF value %#x.\n", value); + hr = IDirect3DDevice8_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice8_BeginScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(hr == D3D_OK, "IDirect3DDevice8_DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice8_EndScene failed, hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, test_data[i].color_greater, 0), + "Alphatest failed, color 0x%08x, expected 0x%08x, alpha > ref, func %u.\n", + color, test_data[i].color_greater, test_data[i].func); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice8_Present failed, hr %#x.\n", hr); + } + } + if (ps) + IDirect3DDevice8_DeletePixelShader(device, ps); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -10814,4 +10964,5 @@ START_TEST(visual) test_viewport(); test_color_vertex(); test_sysmem_draw(); + test_alphatest(); } -- 2.20.1

2 2

[PATCH] shell32: Don't return a path from SHGetKnownFolderPath when it can not be created.
by Sven Baars 06 Feb '19

06 Feb '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/shell32/shellpath.c | 2 +- dlls/shell32/tests/shellpath.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index f08474b363..8c6e8a89b2 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4970,7 +4970,7 @@ HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE t if (!(flags & KF_FLAG_CREATE)) { hr = HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND); - goto done; + goto failed; } /* create directory/directories */ diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 38b56f01d3..f768f44c8b 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1875,7 +1875,10 @@ if (0) { /* crashes */ path = NULL; hr = pSHGetKnownFolderPath(folder_id, KF_FLAG_DEFAULT, NULL, &path); if (FAILED(hr)) + { + ok(path == NULL, "expected path == NULL\n"); continue; + } ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); ok(path != NULL, "expected path != NULL\n"); -- 2.17.1

2 6

[PATCH] riched20: Fix IRichEditOle COM aggregation (Valgrind).
by Sven Baars 06 Feb '19

06 Feb '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- This supersedes 157453. I hope Michael likes it better like this :) dlls/riched20/editor.c | 13 ++++++++----- dlls/riched20/editor.h | 1 - dlls/riched20/editstr.h | 2 +- dlls/riched20/richole.c | 8 +------- dlls/riched20/txtsrv.c | 5 +---- 5 files changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 2bb285866b..b7254d2a21 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1124,6 +1124,7 @@ static HRESULT insert_static_object(ME_TextEditor *editor, HENHMETAFILE hemf, HB LPOLECLIENTSITE lpClientSite = NULL; LPDATAOBJECT lpDataObject = NULL; LPOLECACHE lpOleCache = NULL; + LPRICHEDITOLE lpReOle = NULL; STGMEDIUM stgm; FORMATETC fm; CLSID clsid; @@ -1156,7 +1157,8 @@ static HRESULT insert_static_object(ME_TextEditor *editor, HENHMETAFILE hemf, HB } if (OleCreateDefaultHandler(&CLSID_NULL, NULL, &IID_IOleObject, (void**)&lpObject) == S_OK && - IRichEditOle_GetClientSite(editor->reOle, &lpClientSite) == S_OK && + IUnknown_QueryInterface(editor->reOle, &IID_IRichEditOle, (void**)&lpReOle) == S_OK && + IRichEditOle_GetClientSite(lpReOle, &lpClientSite) == S_OK && IOleObject_SetClientSite(lpObject, lpClientSite) == S_OK && IOleObject_GetUserClassID(lpObject, &clsid) == S_OK && IOleObject_QueryInterface(lpObject, &IID_IOleCache, (void**)&lpOleCache) == S_OK && @@ -1188,6 +1190,7 @@ static HRESULT insert_static_object(ME_TextEditor *editor, HENHMETAFILE hemf, HB if (lpStorage) IStorage_Release(lpStorage); if (lpDataObject) IDataObject_Release(lpDataObject); if (lpOleCache) IOleCache_Release(lpOleCache); + if (lpReOle) IRichEditOle_Release(lpReOle); return hr; } @@ -3215,7 +3218,7 @@ void ME_DestroyEditor(ME_TextEditor *editor) ITextHost_Release(editor->texthost); if (editor->reOle) { - IRichEditOle_Release(editor->reOle); + IUnknown_Release(editor->reOle); editor->reOle = NULL; } OleUninitialize(); @@ -4820,9 +4823,9 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if (!editor->reOle) if (!CreateIRichEditOle(NULL, editor, (LPVOID *)&editor->reOle)) return 0; - *(LPVOID *)lParam = editor->reOle; - IRichEditOle_AddRef(editor->reOle); - return 1; + if (IUnknown_QueryInterface(editor->reOle, &IID_IRichEditOle, (LPVOID *)lParam) == S_OK) + return 1; + return 0; } case EM_GETPASSWORDCHAR: { diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 2da7365a6e..2633fa8f1b 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -239,7 +239,6 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run* run, BOOL selected) DECLSPE void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) DECLSPEC_HIDDEN; void ME_CopyReObject(REOBJECT *dst, const REOBJECT *src, DWORD flags) DECLSPEC_HIDDEN; void ME_DeleteReObject(struct re_object *re_object) DECLSPEC_HIDDEN; -void ME_GetITextDocument2OldInterface(IRichEditOle *iface, LPVOID *ppvObj) DECLSPEC_HIDDEN; /* editor.c */ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 96c9a1f644..28be524806 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -385,7 +385,7 @@ typedef struct tagME_TextEditor { HWND hWnd, hwndParent; ITextHost *texthost; - IRichEditOle *reOle; + IUnknown *reOle; BOOL bEmulateVersion10; ME_TextBuffer *pBuffer; ME_Cursor *pCursors; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index dc1a3b8405..447e7d4599 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -5471,7 +5471,7 @@ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *p reo->outer_unk = outer_unk; else reo->outer_unk = &reo->IUnknown_inner; - *ppvObj = &reo->IRichEditOle_iface; + *ppvObj = &reo->IUnknown_inner; return 1; } @@ -5691,9 +5691,3 @@ void ME_CopyReObject(REOBJECT *dst, const REOBJECT *src, DWORD flags) IOleClientSite_AddRef(dst->polesite); } } - -void ME_GetITextDocument2OldInterface(IRichEditOle *iface, LPVOID *ppvObj) -{ - IRichEditOleImpl *This = impl_from_IRichEditOle(iface); - *ppvObj = &This->ITextDocument2Old_iface; -} diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 18c2ca9d69..639a94fbd0 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -83,10 +83,7 @@ static HRESULT WINAPI ITextServicesImpl_QueryInterface(IUnknown *iface, REFIID r if (!This->editor->reOle) if (!CreateIRichEditOle(This->outer_unk, This->editor, (void **)(&This->editor->reOle))) return E_OUTOFMEMORY; - if (IsEqualIID(riid, &IID_ITextDocument) || IsEqualIID(riid, &IID_ITextDocument2Old)) - ME_GetITextDocument2OldInterface(This->editor->reOle, ppv); - else - *ppv = This->editor->reOle; + return IUnknown_QueryInterface(This->editor->reOle, riid, ppv); } else { *ppv = NULL; FIXME("Unknown interface: %s\n", debugstr_guid(riid)); -- 2.17.1

2 1

[v2 PATCH] imm32: Automatically initialize COM on window activation.
by Nikolay Sivov 06 Feb '19

06 Feb '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/imm32/Makefile.in | 2 +- dlls/imm32/imm.c | 129 ++++++++++++++++++- dlls/imm32/imm32.spec | 1 + dlls/imm32/tests/imm32.c | 252 ++++++++++++++++++++++++++++++++++++- dlls/user32/focus.c | 2 + dlls/user32/misc.c | 2 + dlls/user32/user_private.h | 1 + 7 files changed, 386 insertions(+), 3 deletions(-) diff --git a/dlls/imm32/Makefile.in b/dlls/imm32/Makefile.in index b190888659..ad10fc2fa4 100644 --- a/dlls/imm32/Makefile.in +++ b/dlls/imm32/Makefile.in @@ -1,6 +1,6 @@ MODULE = imm32.dll IMPORTLIB = imm32 -IMPORTS = user32 gdi32 advapi32 +IMPORTS = user32 gdi32 advapi32 ole32 C_SRCS = \ imm.c diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 28eb00f355..129f7e8cb5 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include <stdarg.h> #include <stdio.h> @@ -32,6 +34,8 @@ #include "ddk/imm.h" #include "winnls.h" #include "winreg.h" +#include "initguid.h" +#include "objbase.h" #include "wine/list.h" #include "wine/unicode.h" @@ -95,8 +99,16 @@ typedef struct _tagIMMThreadData { HWND hwndDefault; BOOL disableIME; DWORD windowRefs; + IInitializeSpy IInitializeSpy_iface; + ULARGE_INTEGER spy_cookie; + BOOL apt_initialized; } IMMThreadData; +static inline IMMThreadData *impl_from_IInitializeSpy(IInitializeSpy *iface) +{ + return CONTAINING_RECORD(iface, IMMThreadData, IInitializeSpy_iface); +} + static struct list ImmHklList = LIST_INIT(ImmHklList); static struct list ImmThreadDataList = LIST_INIT(ImmThreadDataList); @@ -227,6 +239,88 @@ static DWORD convert_candidatelist_AtoW( return ret; } +static HRESULT WINAPI initializespy_QueryInterface(IInitializeSpy *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(&IID_IInitializeSpy, riid) || + IsEqualIID(&IID_IUnknown, riid)) + { + *obj = iface; + IInitializeSpy_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI initializespy_AddRef(IInitializeSpy *iface) +{ + return 2; +} + +static ULONG WINAPI initializespy_Release(IInitializeSpy *iface) +{ + return 1; +} + +static void imm_couninit_thread(IMMThreadData *thread_data) +{ + if (!thread_data->apt_initialized) + return; + + thread_data->apt_initialized = FALSE; + CoUninitialize(); +} + +static HRESULT WINAPI initializespy_PreInitialize(IInitializeSpy *iface, DWORD coinit, DWORD refs) +{ + IMMThreadData *thread_data = impl_from_IInitializeSpy(iface); + + /* Application requested initialization of different apartment type. */ + if (!(coinit & COINIT_APARTMENTTHREADED)) + imm_couninit_thread(thread_data); + + return S_OK; +} + +static HRESULT WINAPI initializespy_PostInitialize(IInitializeSpy *iface, HRESULT hr, DWORD coinit, DWORD refs) +{ + IMMThreadData *thread_data = impl_from_IInitializeSpy(iface); + + /* Explicit initialization call should return S_OK first time. */ + if (thread_data->apt_initialized && hr == S_FALSE && refs == 2) + hr = S_OK; + + return hr; +} + +static HRESULT WINAPI initializespy_PreUninitialize(IInitializeSpy *iface, DWORD refs) +{ + IMMThreadData *thread_data = impl_from_IInitializeSpy(iface); + + /* Account for explicit uninitialization calls. */ + if (thread_data->apt_initialized && refs == 1) + thread_data->apt_initialized = FALSE; + + return S_OK; +} + +static HRESULT WINAPI initializespy_PostUninitialize(IInitializeSpy *iface, DWORD refs) +{ + return S_OK; +} + +static const IInitializeSpyVtbl initializespyvtbl = +{ + initializespy_QueryInterface, + initializespy_AddRef, + initializespy_Release, + initializespy_PreInitialize, + initializespy_PostInitialize, + initializespy_PreUninitialize, + initializespy_PostUninitialize, +}; + static IMMThreadData *IMM_GetThreadData(HWND hwnd, DWORD thread) { IMMThreadData *data; @@ -253,6 +347,7 @@ static IMMThreadData *IMM_GetThreadData(HWND hwnd, DWORD thread) if (data->threadID == thread) return data; data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data)); + data->IInitializeSpy_iface.lpVtbl = &initializespyvtbl; data->threadID = thread; list_add_head(&ImmThreadDataList,&data->entry); TRACE("Thread Data Created (%x)\n",thread); @@ -281,6 +376,7 @@ static void IMM_FreeThreadData(void) list_remove(&data->entry); LeaveCriticalSection(&threaddata_cs); IMM_DestroyContext(data->defaultContext); + imm_couninit_thread(data); HeapFree(GetProcessHeap(),0,data); TRACE("Thread Data Destroyed\n"); return; @@ -1627,6 +1723,32 @@ static BOOL needs_ime_window(HWND hwnd) return TRUE; } +void WINAPI __wine_activate_window(HWND hwnd) +{ + IMMThreadData *thread_data; + + TRACE("(%p)\n", hwnd); + + if (!needs_ime_window(hwnd)) + return; + + thread_data = IMM_GetThreadData(hwnd, 0); + if (!thread_data) + return; + + if (thread_data->disableIME || disable_ime) + { + TRACE("IME for this thread is disabled\n"); + LeaveCriticalSection(&threaddata_cs); + return; + } + + if (!thread_data->apt_initialized) + thread_data->apt_initialized = SUCCEEDED(CoInitializeEx(NULL, COINIT_APARTMENTTHREADED)); + + LeaveCriticalSection(&threaddata_cs); +} + /*********************************************************************** * __wine_register_window (IMM32.@) */ @@ -1656,6 +1778,8 @@ BOOL WINAPI __wine_register_window(HWND hwnd) /* Create default IME window */ if (thread_data->windowRefs == 1) { + CoRegisterInitializeSpy(&thread_data->IInitializeSpy_iface, &thread_data->spy_cookie); + /* Do not create the window inside of a critical section */ LeaveCriticalSection(&threaddata_cs); new = CreateWindowExW( 0, szwIME, szwDefaultIME, @@ -1697,8 +1821,11 @@ void WINAPI __wine_unregister_window(HWND hwnd) thread_data->windowRefs, thread_data->hwndDefault); /* Destroy default IME window */ - if (thread_data->windowRefs == 0 && thread_data->hwndDefault) + if (thread_data->windowRefs == 0) { + CoRevokeInitializeSpy(thread_data->spy_cookie); + thread_data->spy_cookie.QuadPart = 0; + imm_couninit_thread(thread_data); to_destroy = thread_data->hwndDefault; thread_data->hwndDefault = NULL; } diff --git a/dlls/imm32/imm32.spec b/dlls/imm32/imm32.spec index 4197bb81e2..d9cdc794e9 100644 --- a/dlls/imm32/imm32.spec +++ b/dlls/imm32/imm32.spec @@ -117,3 +117,4 @@ @ stdcall __wine_get_ui_window(ptr) @ stdcall __wine_register_window(long) @ stdcall __wine_unregister_window(long) +@ stdcall __wine_activate_window(long) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index ee1aeb3965..0d1632aa2f 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include <stdio.h> #include "wine/test.h" @@ -25,10 +27,17 @@ #include "wingdi.h" #include "imm.h" #include "ddk/imm.h" +#include "initguid.h" +#include "objbase.h" +#include "urlmon.h" static BOOL (WINAPI *pImmAssociateContextEx)(HWND,HIMC,DWORD); static BOOL (WINAPI *pImmIsUIMessageA)(HWND,UINT,WPARAM,LPARAM); static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); +static HRESULT (WINAPI *pCoGetApartmentType)(APTTYPE *, APTTYPEQUALIFIER *); +static HRESULT (WINAPI *pCoInitializeEx)(void *, DWORD); +static void (WINAPI *pCoUninitialize)(void); +static HRESULT (WINAPI *pCoCreateInstance)(REFCLSID, IUnknown *, DWORD, REFIID, void **); /* * msgspy - record and analyse message traces sent to a certain window @@ -1990,7 +1999,247 @@ static void test_InvalidIMC(void) ok(ret == ERROR_INVALID_HANDLE, "wrong last error %08x!\n", ret); } -START_TEST(imm32) { +static LRESULT CALLBACK com_init_test_wndproc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return DefWindowProcA(hwnd, uMsg, wParam, lParam); +} + +#define COM_INIT_TEST_APTTYPE(apttype) com_init_test_apttype(apttype, __LINE__) +static void com_init_test_apttype(APTTYPE expected_type, unsigned int line) +{ + APTTYPEQUALIFIER apttypequal; + HRESULT hr, hr_expected; + APTTYPE apttype; + IUnknown *unk; + + if (expected_type == -1) + hr_expected = CO_E_NOTINITIALIZED; + else + hr_expected = S_OK; + + hr = pCoCreateInstance(&CLSID_InternetZoneManager, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + ok_(__FILE__, line)(hr == hr_expected, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); + + hr = pCoGetApartmentType(&apttype, &apttypequal); + ok_(__FILE__, line)(hr == (expected_type == -1 ? CO_E_NOTINITIALIZED : S_OK), + "Failed to get apartment type, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ok_(__FILE__, line)(apttype == expected_type && apttypequal == APTTYPEQUALIFIER_NONE, + "Unexpected apartment type %u/%u.\n", apttype, apttypequal); +} + +static HWND test_com_create_window(DWORD style) +{ + WNDCLASSA clsA; + HWND hwnd; + + clsA.style = 0; + clsA.lpfnWndProc = com_init_test_wndproc; + clsA.cbClsExtra = 0; + clsA.cbWndExtra = 0; + clsA.hInstance = GetModuleHandleA(NULL); + clsA.hIcon = 0; + clsA.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + clsA.hbrBackground = NULL; + clsA.lpszMenuName = NULL; + clsA.lpszClassName = "COMInitTest"; + + RegisterClassA(&clsA); + + hwnd = CreateWindowExA(0, "COMInitTest", "Test window", WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | + WS_MAXIMIZEBOX | style, 0, 0, 100, 100, GetDesktopWindow(), NULL, GetModuleHandleA(NULL), NULL); + ok(hwnd != NULL, "Failed to create a test window.\n"); + + return hwnd; +} + +static void test_com_init(const char *testname) +{ + WNDCLASSA clsA; + HMODULE hmod; + HRESULT hr; + HWND hwnd; + + clsA.style = 0; + clsA.lpfnWndProc = com_init_test_wndproc; + clsA.cbClsExtra = 0; + clsA.cbWndExtra = 0; + clsA.hInstance = GetModuleHandleA(NULL); + clsA.hIcon = 0; + clsA.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + clsA.hbrBackground = NULL; + clsA.lpszMenuName = NULL; + clsA.lpszClassName = "COMInitTest"; + + RegisterClassA(&clsA); + + hmod = LoadLibraryA("ole32.dll"); + + pCoGetApartmentType = (void *)GetProcAddress(hmod, "CoGetApartmentType"); + pCoInitializeEx = (void *)GetProcAddress(hmod, "CoInitializeEx"); + pCoUninitialize = (void *)GetProcAddress(hmod, "CoUninitialize"); + pCoCreateInstance = (void *)GetProcAddress(hmod, "CoCreateInstance"); + + if (!strcmp(testname, "visible")) + { + COM_INIT_TEST_APTTYPE(-1); + + hwnd = test_com_create_window(WS_VISIBLE); + + COM_INIT_TEST_APTTYPE(APTTYPE_MAINSTA); + + hr = pCoInitializeEx(NULL, COINIT_MULTITHREADED); + ok(hr == S_OK, "Failed to re-initialize, hr %#x.\n", hr); + + COM_INIT_TEST_APTTYPE(APTTYPE_MTA); + + pCoUninitialize(); + + COM_INIT_TEST_APTTYPE(-1); + + DestroyWindow(hwnd); + } + else if (!strcmp(testname, "invisible")) + { + COM_INIT_TEST_APTTYPE(-1); + + hwnd = test_com_create_window(0); + + COM_INIT_TEST_APTTYPE(-1); + + ShowWindow(hwnd, SW_SHOW); + + COM_INIT_TEST_APTTYPE(APTTYPE_MAINSTA); + + hr = pCoInitializeEx(NULL, COINIT_MULTITHREADED); + ok(hr == S_OK, "Failed to re-initialize, hr %#x.\n", hr); + + COM_INIT_TEST_APTTYPE(APTTYPE_MTA); + + pCoUninitialize(); + + COM_INIT_TEST_APTTYPE(-1); + + DestroyWindow(hwnd); + } + else if (!strcmp(testname, "imedisabled")) + { + COM_INIT_TEST_APTTYPE(-1); + + ImmDisableIME(-1); + + hwnd = test_com_create_window(WS_VISIBLE); + + COM_INIT_TEST_APTTYPE(-1); + + hr = pCoInitializeEx(NULL, COINIT_MULTITHREADED); + ok(hr == S_OK, "Failed to re-initialize, hr %#x.\n", hr); + + COM_INIT_TEST_APTTYPE(APTTYPE_MTA); + + pCoUninitialize(); + + COM_INIT_TEST_APTTYPE(-1); + + DestroyWindow(hwnd); + } + else if (!strcmp(testname, "sta")) + { + COM_INIT_TEST_APTTYPE(-1); + + hwnd = test_com_create_window(WS_VISIBLE); + + COM_INIT_TEST_APTTYPE(APTTYPE_MAINSTA); + + /* Initialize for STA explicitly, S_OK is forced, with incremented counter. */ + hr = pCoInitializeEx(0, COINIT_APARTMENTTHREADED); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + COM_INIT_TEST_APTTYPE(APTTYPE_MAINSTA); + + pCoUninitialize(); + + COM_INIT_TEST_APTTYPE(APTTYPE_MAINSTA); + + DestroyWindow(hwnd); + } + else if (!strcmp(testname, "uninit")) + { + COM_INIT_TEST_APTTYPE(-1); + + hwnd = test_com_create_window(WS_VISIBLE); + + COM_INIT_TEST_APTTYPE(APTTYPE_MAINSTA); + + pCoUninitialize(); + + COM_INIT_TEST_APTTYPE(-1); + + DestroyWindow(hwnd); + + hwnd = test_com_create_window(WS_VISIBLE); + + COM_INIT_TEST_APTTYPE(APTTYPE_MAINSTA); + + DestroyWindow(hwnd); + } + else + ok(0, "Unknown test name %s.\n", testname); +} + +static void test_com_initialization(void) +{ + char path_name[MAX_PATH]; + PROCESS_INFORMATION info; + STARTUPINFOA startup; + HMODULE hmod; + char **argv; + int i; + static const char *test_params[] = + { + "imedisabled", + "visible", + "invisible", + "sta", + "uninit", + }; + + hmod = LoadLibraryA("ole32.dll"); + pCoGetApartmentType = (void *)GetProcAddress(hmod, "CoGetApartmentType"); + FreeLibrary(hmod); + if (!pCoGetApartmentType) + { + win_skip("Skipping COM initialization tests on older system.\n"); + return; + } + + winetest_get_mainargs( &argv ); + for (i = 0; i < ARRAY_SIZE(test_params); ++i) + { + memset( &startup, 0, sizeof(startup) ); + startup.cb = sizeof( startup ); + sprintf( path_name, "%s imm32 %s", argv[0], test_params[i] ); + ok( CreateProcessA( NULL, path_name, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info ), + "CreateProcess failed.\n" ); + winetest_wait_child_process( info.hProcess ); + CloseHandle( info.hProcess ); + CloseHandle( info.hThread ); + } +} + +START_TEST(imm32) +{ + char **argv; + int argc = winetest_get_mainargs( &argv ); + + if (argc >= 3) + { + test_com_init( argv[2] ); + return; + } + if (init()) { test_ImmNotifyIME(); @@ -2017,6 +2266,7 @@ START_TEST(imm32) { if (pSendInput) test_ime_processkey(); else win_skip("SendInput is not available\n"); + test_com_initialization(); } cleanup(); } diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index f1c883167e..50b3323ae9 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -156,6 +156,8 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) (LPARAM)previous ); if (GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow()) PostMessageW( GetDesktopWindow(), WM_PARENTNOTIFY, WM_NCACTIVATE, (LPARAM)hwnd ); + + imm_activate_window( hwnd ); } /* now change focus if necessary */ diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index d28cd9fd05..cfaa1b94db 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -43,6 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); static HWND (WINAPI *imm_get_ui_window)(HKL); BOOL (WINAPI *imm_register_window)(HWND) = NULL; void (WINAPI *imm_unregister_window)(HWND) = NULL; +void (WINAPI *imm_activate_window)(HWND) = NULL; /* MSIME messages */ static UINT WM_MSIME_SERVICE; @@ -480,6 +481,7 @@ BOOL WINAPI User32InitializeImmEntryTable(DWORD magic) imm_get_ui_window = (void*)GetProcAddress(imm32, "__wine_get_ui_window"); imm_register_window = (void*)GetProcAddress(imm32, "__wine_register_window"); imm_unregister_window = (void*)GetProcAddress(imm32, "__wine_unregister_window"); + imm_activate_window = (void*)GetProcAddress(imm32, "__wine_activate_window"); if (!imm_get_ui_window) FIXME("native imm32.dll not supported\n"); return TRUE; diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 514cf6753f..b86831d7d9 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -197,6 +197,7 @@ C_ASSERT( sizeof(struct user_thread_info) <= sizeof(((TEB *)0)->Win32ClientInfo) extern INT global_key_state_counter DECLSPEC_HIDDEN; extern BOOL (WINAPI *imm_register_window)(HWND) DECLSPEC_HIDDEN; extern void (WINAPI *imm_unregister_window)(HWND) DECLSPEC_HIDDEN; +extern void (WINAPI *imm_activate_window)(HWND) DECLSPEC_HIDDEN; struct user_key_state_info { -- 2.20.1

4 5

[PATCH] riched20: Mask out extended flags introduced by CHARFORMAT2 when converting to CHARFORMAT.
by Sergio Gómez Del Real 06 Feb '19

06 Feb '19

Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/riched20/style.c | 4 ++++ dlls/riched20/tests/editor.c | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index c3f3fc3f9a..3b9d7717eb 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -85,6 +85,8 @@ BOOL cf2w_to_cfany(CHARFORMAT2W *to, const CHARFORMAT2W *from) CopyMemory(t, from, FIELD_OFFSET(CHARFORMATA, szFaceName)); WideCharToMultiByte(CP_ACP, 0, from->szFaceName, -1, t->szFaceName, sizeof(t->szFaceName), NULL, NULL); t->cbSize = sizeof(*t); /* it was overwritten by CopyMemory */ + t->dwMask &= CFM_ALL; + t->dwEffects &= CFM_EFFECTS; return TRUE; } if (to->cbSize == sizeof(CHARFORMATW)) @@ -92,6 +94,8 @@ BOOL cf2w_to_cfany(CHARFORMAT2W *to, const CHARFORMAT2W *from) CHARFORMATW *t = (CHARFORMATW *)to; CopyMemory(t, from, sizeof(*t)); t->cbSize = sizeof(*t); /* it was overwritten by CopyMemory */ + t->dwMask &= CFM_ALL; + t->dwEffects &= CFM_EFFECTS; return TRUE; } if (to->cbSize == sizeof(CHARFORMAT2A)) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 932c8a1d32..9349629601 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -751,6 +751,8 @@ static void test_EM_SETCHARFORMAT(void) HWND hwndRichEdit = new_richedit(NULL); CHARFORMAT2A cf2; CHARFORMAT2W cfW; + CHARFORMATA cf1a; + CHARFORMATW cf1w; int rc = 0; int tested_effects[] = { CFE_BOLD, @@ -1338,6 +1340,23 @@ static void test_EM_SETCHARFORMAT(void) ok(cf2.dwEffects & CFE_UNDERLINE, "got %08x\n", cf2.dwEffects); ok(cf2.bUnderlineType == CFU_UNDERLINEDOUBLE, "got %x\n", cf2.bUnderlineType); + /* Wine converts between CHARFORMAT(A/W) and CHARFORMAT2W internally. Test that. */ + memset(&cf1a, 0, sizeof(CHARFORMATA)); + memset(&cf1w, 0, sizeof(CHARFORMATW)); + cf1a.cbSize = sizeof(CHARFORMATA); + cf1w.cbSize = sizeof(CHARFORMATW); + cf1a.dwMask = cf1w.dwMask = CFM_ALL2; + cf1a.dwEffects = cf1w.dwEffects = CFM_EFFECTS2; + SendMessageA(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf1a); + SendMessageA(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf1a); + /* flags only valid for CHARFORMAT2 should be masked out */ + ok((cf1a.dwMask & (CFM_ALL2&~CFM_ALL)) == 0, "flags were not masked out\n"); + ok((cf1a.dwEffects & (CFM_EFFECTS2&~CFM_EFFECTS)) == 0, "flags were not masked out\n"); + SendMessageA(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf1w); + SendMessageA(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf1w); + ok((cf1w.dwMask & (CFM_ALL2&~CFM_ALL)) == 0, "flags were not masked out\n"); + ok((cf1w.dwEffects & (CFM_EFFECTS2&~CFM_EFFECTS)) == 0, "flags were not masked out\n"); + DestroyWindow(hwndRichEdit); } -- 2.17.1

2 1

[PATCH] riched20: Mask out extended flags introduced by CHARFORMAT2 when converting to CHARFORMAT.
by Huw Davies 06 Feb '19

06 Feb '19

From: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/style.c | 4 ++++ dlls/riched20/tests/editor.c | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index c3f3fc3f9a..3b9d7717eb 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -85,6 +85,8 @@ BOOL cf2w_to_cfany(CHARFORMAT2W *to, const CHARFORMAT2W *from) CopyMemory(t, from, FIELD_OFFSET(CHARFORMATA, szFaceName)); WideCharToMultiByte(CP_ACP, 0, from->szFaceName, -1, t->szFaceName, sizeof(t->szFaceName), NULL, NULL); t->cbSize = sizeof(*t); /* it was overwritten by CopyMemory */ + t->dwMask &= CFM_ALL; + t->dwEffects &= CFM_EFFECTS; return TRUE; } if (to->cbSize == sizeof(CHARFORMATW)) @@ -92,6 +94,8 @@ BOOL cf2w_to_cfany(CHARFORMAT2W *to, const CHARFORMAT2W *from) CHARFORMATW *t = (CHARFORMATW *)to; CopyMemory(t, from, sizeof(*t)); t->cbSize = sizeof(*t); /* it was overwritten by CopyMemory */ + t->dwMask &= CFM_ALL; + t->dwEffects &= CFM_EFFECTS; return TRUE; } if (to->cbSize == sizeof(CHARFORMAT2A)) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 932c8a1d32..ddb101810e 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -751,6 +751,8 @@ static void test_EM_SETCHARFORMAT(void) HWND hwndRichEdit = new_richedit(NULL); CHARFORMAT2A cf2; CHARFORMAT2W cfW; + CHARFORMATA cf1a; + CHARFORMATW cf1w; int rc = 0; int tested_effects[] = { CFE_BOLD, @@ -1338,6 +1340,23 @@ static void test_EM_SETCHARFORMAT(void) ok(cf2.dwEffects & CFE_UNDERLINE, "got %08x\n", cf2.dwEffects); ok(cf2.bUnderlineType == CFU_UNDERLINEDOUBLE, "got %x\n", cf2.bUnderlineType); + /* Check setting CFM_ALL2/CFM_EFFECTS2 in CHARFORMAT(A/W). */ + memset(&cf1a, 0, sizeof(CHARFORMATA)); + memset(&cf1w, 0, sizeof(CHARFORMATW)); + cf1a.cbSize = sizeof(CHARFORMATA); + cf1w.cbSize = sizeof(CHARFORMATW); + cf1a.dwMask = cf1w.dwMask = CFM_ALL2; + cf1a.dwEffects = cf1w.dwEffects = CFM_EFFECTS2; + SendMessageA(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf1a); + SendMessageA(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf1a); + /* flags only valid for CHARFORMAT2 should be masked out */ + ok((cf1a.dwMask & (CFM_ALL2 & ~CFM_ALL)) == 0, "flags were not masked out\n"); + ok((cf1a.dwEffects & (CFM_EFFECTS2 & ~CFM_EFFECTS)) == 0, "flags were not masked out\n"); + SendMessageA(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf1w); + SendMessageA(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf1w); + ok((cf1w.dwMask & (CFM_ALL2 & ~CFM_ALL)) == 0, "flags were not masked out\n"); + ok((cf1w.dwEffects & (CFM_EFFECTS2 & ~CFM_EFFECTS)) == 0, "flags were not masked out\n"); + DestroyWindow(hwndRichEdit); } -- 2.18.0

1 0

[PATCH] gdi32: Avoid TRUE : FALSE conditional expressions
by Michael Stefaniuc 06 Feb '19

06 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/freetype.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index c38108eece..de62425173 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -8217,14 +8217,14 @@ static BOOL load_child_font(GdiFont *font, CHILD_FONT *child) UINT penalty = 0, new_penalty = 0; BOOL bold, italic, bd, it; - italic = font->font_desc.lf.lfItalic ? TRUE : FALSE; - bold = font->font_desc.lf.lfWeight > FW_MEDIUM ? TRUE : FALSE; + italic = !!font->font_desc.lf.lfItalic; + bold = font->font_desc.lf.lfWeight > FW_MEDIUM; face_list = get_face_list_from_family( child->face->family ); LIST_FOR_EACH_ENTRY( child_face, face_list, Face, entry ) { - it = child_face->ntmFlags & NTM_ITALIC ? TRUE : FALSE; - bd = child_face->ntmFlags & NTM_BOLD ? TRUE : FALSE; + it = !!(child_face->ntmFlags & NTM_ITALIC); + bd = !!(child_face->ntmFlags & NTM_BOLD); new_penalty = ( it ^ italic ) + ( bd ^ bold ); if (!best_face || new_penalty < penalty) { -- 2.20.1

2 1

[PATCH] crypt32: CryptAcquireCertificatePrivateKey should look up certificate in the user's store if the provided certificate is not linked to a provider.
by Dmitry Timoshkov 06 Feb '19

06 Feb '19

Under Windows passing to CryptAcquireCertificatePrivateKey() a certificate retrieved from the key container using CryptGetKeyParam(KP_CERTIFICATE) + CertCreateCertificateContext() works although such a certificate doesn't have assigned properties at all. In order this to work Windows probably looks up an original certificate in the user's private store. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/cert.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index e1c7c54340..02693b96d0 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -886,6 +886,7 @@ BOOL WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT pCert, PCRYPT_KEY_PROV_INFO info = NULL; CERT_KEY_CONTEXT keyContext; DWORD size; + PCCERT_CONTEXT cert_in_store = NULL; TRACE("(%p, %08x, %p, %p, %p, %p)\n", pCert, dwFlags, pvReserved, phCryptProv, pdwKeySpec, pfCallerFreeProv); @@ -896,6 +897,34 @@ BOOL WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT pCert, ret = CertGetCertificateContextProperty(pCert, CERT_KEY_PROV_INFO_PROP_ID, 0, &size); + + if (!ret) + { + static const WCHAR myW[] = { 'M','y',0 }; + HCERTSTORE hstore; + + hstore = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, + CERT_SYSTEM_STORE_CURRENT_USER, myW); + if (hstore) + { + cert_in_store = CertFindCertificateInStore(hstore, pCert->dwCertEncodingType, 0, + CERT_FIND_EXISTING, pCert, NULL); + if (cert_in_store) + { + ret = CertGetCertificateContextProperty(cert_in_store, CERT_KEY_PROV_INFO_PROP_ID, 0, &size); + if (ret) + pCert = cert_in_store; + else + { + CertFreeCertificateContext(cert_in_store); + cert_in_store = NULL; + } + } + + CertCloseStore(hstore, 0); + } + } + if (ret) { info = HeapAlloc(GetProcessHeap(), 0, size); @@ -949,6 +978,8 @@ BOOL WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT pCert, } } HeapFree(GetProcessHeap(), 0, info); + if (cert_in_store) + CertFreeCertificateContext(cert_in_store); return ret; } -- 2.20.1

2 2

[PATCH] find: Implement non-flag functionality.
by Isira Seneviratne 06 Feb '19

06 Feb '19

1 0

[PATCH 1/5] wined3d: Store transforms in the wined3d_stateblock_state structure.
by Zebediah Figura 06 Feb '19

06 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 2 +- dlls/wined3d/stateblock.c | 19 ++++++++++++++++--- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 72e328f630..f23e76f37e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1495,11 +1495,11 @@ void CDECL wined3d_device_set_transform(struct wined3d_device *device, TRACE("%.8e %.8e %.8e %.8e\n", matrix->_41, matrix->_42, matrix->_43, matrix->_44); /* Handle recording of state blocks. */ + device->update_stateblock_state->transforms[d3dts] = *matrix; if (device->recording) { TRACE("Recording... not performing anything.\n"); device->recording->changed.transform[d3dts >> 5] |= 1u << (d3dts & 0x1f); - device->update_state->transforms[d3dts] = *matrix; return; } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index e6e68b428b..c1a5d02b78 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -787,7 +787,7 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) TRACE("Updating transform %#x.\n", transform); - stateblock->state.transforms[transform] = src_state->transforms[transform]; + stateblock->stateblock_state.transforms[transform] = state->transforms[transform]; } if (stateblock->changed.indices @@ -1110,8 +1110,10 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) /* Transform states. */ for (i = 0; i < stateblock->num_contained_transform_states; ++i) { - wined3d_device_set_transform(device, stateblock->contained_transform_states[i], - &stateblock->state.transforms[stateblock->contained_transform_states[i]]); + enum wined3d_transform_state transform = stateblock->contained_transform_states[i]; + + state->transforms[transform] = stateblock->stateblock_state.transforms[transform]; + wined3d_device_set_transform(device, transform, &stateblock->stateblock_state.transforms[transform]); } if (stateblock->changed.indices) @@ -1424,12 +1426,23 @@ void state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, static void stateblock_state_init_default(struct wined3d_stateblock_state *state, const struct wined3d_d3d_info *d3d_info) { + struct wind3d_matrix identity; unsigned int i; + get_identity_matrix(&identity); + + state->transforms[WINED3D_TS_PROJECTION] = identity; + state->transforms[WINED3D_TS_VIEW] = identity; + for (i = 0; i < 256; ++i) + { + state->transforms[WINED3D_TS_WORLD_MATRIX(i)] = identity; + } + init_default_render_states(state->rs, d3d_info); for (i = 0; i < MAX_TEXTURES; ++i) { + state->transforms[WINED3D_TS_TEXTURE0 + i] = identity; init_default_texture_state(i, state->texture_states[i]); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1a461c0dec..ee69549114 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2985,6 +2985,8 @@ struct wined3d_stateblock_state struct wined3d_texture *textures[MAX_COMBINED_SAMPLERS]; DWORD sampler_states[MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1]; DWORD texture_states[MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1]; + + struct wined3d_matrix transforms[HIGHEST_TRANSFORMSTATE + 1]; }; struct wined3d_device -- 2.20.1

2 9

Wine staging 4.1 release
by Alistair Leslie-Hughes 06 Feb '19

06 Feb '19

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * Rebased to current wine 4.1 (836 patches are applied to wine vanilla) * Reviewed and upstreamed patches. Upstreamed (Either directly from staging or fixed with a similar patch). * ddraw: Implement ddraw7_FlipToGDISurface. * msvcp140: Export _Equivalent and port tests. * wtsapi32: Improve WTSQueryUserToken stub. * d3dx9_36/tests: Fix D3DXMatrixTransformation when the scaling matrix is NULL. * api-ms-win-crt-private-l1-1-0: Update to 10.0.17134.12 * ucrtbase: Forward a few functions for dxil.dll and pkgmgr.exe * windowscodecs: Implement IWICPalette::InitializeFromBitmap. * gdiplus: Implement GdipInitializePalette. * gdiplus/tests: Add some tests for GdipInitializePalette. * windowscodecs: Add support for converting to 8bppIndexed format to IWICFormatConverter. Added: * [44850] iphlpapi: Add GetBestRoute2 stub. * [15934] mciavi32: Add Support for MCI_MCIAVI_PLAY_FULLSCREEN. * [46284] Add D3DXSHProjectCubeMap stub. * [39080] wined3d: Ignore multisample quality for MULTISAMPLE_NONE. * [39080] wined3d: Return stream frequency of 1 if it was not set. * [26445] urlmon: Use unescaped Urls for FTP actions * [46549] httpapi: Fake success from HttpCreateServerSession * [44948] kernel32: Implement CreateSymbolicLink * [46564] bcrypt: BCryptDestroySecret/BCryptSecretAgreement stubs. Updated: * bcrypt-BCryptGenerateKeyPair * kernel32-CreateSymbolicLink Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH v2 resend 1/2] kernelbase/tests: Relax tests for WaitOnAddress().
by Zebediah Figura 06 Feb '19

06 Feb '19

Application should be expected to handle spurious wakeups, which the following implementation will give in WakeByAddressSingle(). Avoid testing that WakeByAddressSingle() only wakes one thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernelbase/tests/sync.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/kernelbase/tests/sync.c b/dlls/kernelbase/tests/sync.c index 99cbbc43bc..7a335d1af8 100644 --- a/dlls/kernelbase/tests/sync.c +++ b/dlls/kernelbase/tests/sync.c @@ -31,19 +31,23 @@ static void (WINAPI *pWakeByAddressAll)(void *); static void (WINAPI *pWakeByAddressSingle)(void *); static LONG64 address; -static LONG64 compare; static DWORD WINAPI test_WaitOnAddress_func(void *arg) { BOOL ret = FALSE; - DWORD gle; - while (address == compare) + LONG64 compare; + + do { - SetLastError(0xdeadbeef); - ret = pWaitOnAddress(&address, &compare, sizeof(compare), INFINITE); - gle = GetLastError(); - ok(gle == 0xdeadbeef || broken(gle == ERROR_SUCCESS) /* Win 8 */, "got %d\n", gle); - } - ok(ret, "got %d\n", ret); + while (!(compare = address)) + { + SetLastError(0xdeadbeef); + ret = pWaitOnAddress(&address, &compare, sizeof(compare), INFINITE); + ok(ret, "wait failed\n"); + ok(GetLastError() == 0xdeadbeef || broken(GetLastError() == ERROR_SUCCESS) /* Win 8 */, + "got error %d\n", GetLastError()); + } + } while (InterlockedCompareExchange64(&address, compare - 1, compare) != compare); + return 0; } @@ -51,6 +55,7 @@ static void test_WaitOnAddress(void) { DWORD gle, val, nthreads; HANDLE threads[8]; + LONG64 compare; BOOL ret; int i; @@ -135,31 +140,28 @@ static void test_WaitOnAddress(void) /* WakeByAddressAll */ address = 0; - compare = 0; for (i = 0; i < ARRAY_SIZE(threads); i++) threads[i] = CreateThread(NULL, 0, test_WaitOnAddress_func, NULL, 0, NULL); Sleep(100); - address = ~0; + address = ARRAY_SIZE(threads); pWakeByAddressAll(&address); val = WaitForMultipleObjects(ARRAY_SIZE(threads), threads, TRUE, 5000); ok(val == WAIT_OBJECT_0, "got %d\n", val); for (i = 0; i < ARRAY_SIZE(threads); i++) CloseHandle(threads[i]); + ok(!address, "got unexpected value %s\n", wine_dbgstr_longlong(address)); /* WakeByAddressSingle */ address = 0; for (i = 0; i < ARRAY_SIZE(threads); i++) - threads[i] = CreateThread(NULL, 0, test_WaitOnAddress_func, NULL, 0, NULL); + threads[i] = CreateThread(NULL, 0, test_WaitOnAddress_func, NULL, 0, NULL); Sleep(100); - address = 1; nthreads = ARRAY_SIZE(threads); + address = ARRAY_SIZE(threads); while (nthreads) { - val = WaitForMultipleObjects(nthreads, threads, FALSE, 0); - ok(val == STATUS_TIMEOUT, "got %u\n", val); - pWakeByAddressSingle(&address); val = WaitForMultipleObjects(nthreads, threads, FALSE, 2000); ok(val < WAIT_OBJECT_0 + nthreads, "got %u\n", val); @@ -167,7 +169,7 @@ static void test_WaitOnAddress(void) memmove(&threads[val], &threads[val+1], (nthreads - val - 1) * sizeof(threads[0])); nthreads--; } - + ok(!address, "got unexpected value %s\n", wine_dbgstr_longlong(address)); } START_TEST(sync) -- 2.14.1

3 6

[PATCH v3 1/2] kernelbase/tests: Relax tests for WaitOnAddress().
by Zebediah Figura 06 Feb '19

06 Feb '19

Application should be expected to handle spurious wakeups, which the following implementation will give in WakeByAddressSingle(). Avoid testing that WakeByAddressSingle() only wakes one thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernelbase/tests/sync.c | 50 +++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/dlls/kernelbase/tests/sync.c b/dlls/kernelbase/tests/sync.c index 99cbbc43bc..eb1a20f11e 100644 --- a/dlls/kernelbase/tests/sync.c +++ b/dlls/kernelbase/tests/sync.c @@ -30,20 +30,24 @@ static BOOL (WINAPI *pWaitOnAddress)(volatile void *, void *, SIZE_T, DWORD); static void (WINAPI *pWakeByAddressAll)(void *); static void (WINAPI *pWakeByAddressSingle)(void *); -static LONG64 address; -static LONG64 compare; +static LONG address; static DWORD WINAPI test_WaitOnAddress_func(void *arg) { BOOL ret = FALSE; - DWORD gle; - while (address == compare) + LONG compare; + + do { - SetLastError(0xdeadbeef); - ret = pWaitOnAddress(&address, &compare, sizeof(compare), INFINITE); - gle = GetLastError(); - ok(gle == 0xdeadbeef || broken(gle == ERROR_SUCCESS) /* Win 8 */, "got %d\n", gle); - } - ok(ret, "got %d\n", ret); + while (!(compare = address)) + { + SetLastError(0xdeadbeef); + ret = pWaitOnAddress(&address, &compare, sizeof(compare), INFINITE); + ok(ret, "wait failed\n"); + ok(GetLastError() == 0xdeadbeef || broken(GetLastError() == ERROR_SUCCESS) /* Win 8 */, + "got error %d\n", GetLastError()); + } + } while (InterlockedCompareExchange(&address, compare - 1, compare) != compare); + return 0; } @@ -51,6 +55,7 @@ static void test_WaitOnAddress(void) { DWORD gle, val, nthreads; HANDLE threads[8]; + LONG compare; BOOL ret; int i; @@ -64,8 +69,8 @@ static void test_WaitOnAddress(void) compare = 0; if (0) /* crash on Windows */ { - ret = pWaitOnAddress(&address, NULL, 8, 0); - ret = pWaitOnAddress(NULL, &compare, 8, 0); + ret = pWaitOnAddress(&address, NULL, 4, 0); + ret = pWaitOnAddress(NULL, &compare, 4, 0); } /* invalid arguments */ @@ -111,15 +116,15 @@ static void test_WaitOnAddress(void) /* different address size */ address = 0; - compare = 0xffff0000; + compare = 0xff00; SetLastError(0xdeadbeef); - ret = pWaitOnAddress(&address, &compare, 4, 0); + ret = pWaitOnAddress(&address, &compare, 2, 0); gle = GetLastError(); ok(gle == 0xdeadbeef || broken(gle == ERROR_SUCCESS) /* Win 8 */, "got %d\n", gle); ok(ret, "got %d\n", ret); SetLastError(0xdeadbeef); - ret = pWaitOnAddress(&address, &compare, 2, 0); + ret = pWaitOnAddress(&address, &compare, 1, 0); gle = GetLastError(); ok(gle == ERROR_TIMEOUT, "got %d\n", gle); ok(!ret, "got %d\n", ret); @@ -128,38 +133,35 @@ static void test_WaitOnAddress(void) address = 0; compare = 1; SetLastError(0xdeadbeef); - ret = pWaitOnAddress(&address, &compare, 8, 0); + ret = pWaitOnAddress(&address, &compare, 4, 0); gle = GetLastError(); ok(gle == 0xdeadbeef || broken(gle == ERROR_SUCCESS) /* Win 8 */, "got %d\n", gle); ok(ret, "got %d\n", ret); /* WakeByAddressAll */ address = 0; - compare = 0; for (i = 0; i < ARRAY_SIZE(threads); i++) threads[i] = CreateThread(NULL, 0, test_WaitOnAddress_func, NULL, 0, NULL); Sleep(100); - address = ~0; + address = ARRAY_SIZE(threads); pWakeByAddressAll(&address); val = WaitForMultipleObjects(ARRAY_SIZE(threads), threads, TRUE, 5000); ok(val == WAIT_OBJECT_0, "got %d\n", val); for (i = 0; i < ARRAY_SIZE(threads); i++) CloseHandle(threads[i]); + ok(!address, "got unexpected value %s\n", wine_dbgstr_longlong(address)); /* WakeByAddressSingle */ address = 0; for (i = 0; i < ARRAY_SIZE(threads); i++) - threads[i] = CreateThread(NULL, 0, test_WaitOnAddress_func, NULL, 0, NULL); + threads[i] = CreateThread(NULL, 0, test_WaitOnAddress_func, NULL, 0, NULL); Sleep(100); - address = 1; nthreads = ARRAY_SIZE(threads); + address = ARRAY_SIZE(threads); while (nthreads) { - val = WaitForMultipleObjects(nthreads, threads, FALSE, 0); - ok(val == STATUS_TIMEOUT, "got %u\n", val); - pWakeByAddressSingle(&address); val = WaitForMultipleObjects(nthreads, threads, FALSE, 2000); ok(val < WAIT_OBJECT_0 + nthreads, "got %u\n", val); @@ -167,7 +169,7 @@ static void test_WaitOnAddress(void) memmove(&threads[val], &threads[val+1], (nthreads - val - 1) * sizeof(threads[0])); nthreads--; } - + ok(!address, "got unexpected value %s\n", wine_dbgstr_longlong(address)); } START_TEST(sync) -- 2.20.1

1 1

[PATCH v2] po: Update Sinhala translation.
by Isira Seneviratne 06 Feb '19

06 Feb '19

1 0

[PATCH] cryptui: Avoid calling strlen on a constant.
by Isira Seneviratne 06 Feb '19

06 Feb '19

4 5

[PATCH 3/3] odbc32: Improve tracing in the remaining functions.
by Hans Leidekker 05 Feb '19

05 Feb '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/odbc32/proxyodbc.c | 1835 +++++++++++++++++++++++++++-------------------- 1 file changed, 1051 insertions(+), 784 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index ab28506708..31c5f5e4c2 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -677,7 +677,6 @@ static BOOL ODBC_LoadDMFunctions(void) return TRUE; } - /************************************************************************* * SQLAllocConnect [ODBC32.001] */ @@ -725,32 +724,32 @@ SQLRETURN WINAPI ODBC32_SQLAllocEnv(SQLHENV *EnvironmentHandle) */ SQLRETURN WINAPI ODBC32_SQLAllocHandle(SQLSMALLINT HandleType, SQLHANDLE InputHandle, SQLHANDLE *OutputHandle) { - SQLRETURN ret; - TRACE("(Type %d, Handle %p)\n", HandleType, InputHandle); + SQLRETURN ret; - if (!pSQLAllocHandle) - { - if (nErrorType == ERROR_LIBRARY_NOT_FOUND) - WARN("ProxyODBC: Cannot load ODBC driver manager library.\n"); - - if (HandleType == SQL_HANDLE_ENV) - *OutputHandle = SQL_NULL_HENV; - else if (HandleType == SQL_HANDLE_DBC) - *OutputHandle = SQL_NULL_HDBC; - else if (HandleType == SQL_HANDLE_STMT) - *OutputHandle = SQL_NULL_HSTMT; - else if (HandleType == SQL_HANDLE_DESC) - *OutputHandle = SQL_NULL_HDESC; - - TRACE ("Not ready\n"); - return SQL_ERROR; - } + TRACE("(HandleType %d, InputHandle %p, OutputHandle %p)\n", HandleType, InputHandle, OutputHandle); - ret = pSQLAllocHandle(HandleType, InputHandle, OutputHandle); - TRACE("Returns %d, Handle %p\n", ret, *OutputHandle); - return ret; -} + if (!pSQLAllocHandle) + { + if (nErrorType == ERROR_LIBRARY_NOT_FOUND) + WARN("ProxyODBC: Cannot load ODBC driver manager library.\n"); + + if (HandleType == SQL_HANDLE_ENV) + *OutputHandle = SQL_NULL_HENV; + else if (HandleType == SQL_HANDLE_DBC) + *OutputHandle = SQL_NULL_HDBC; + else if (HandleType == SQL_HANDLE_STMT) + *OutputHandle = SQL_NULL_HSTMT; + else if (HandleType == SQL_HANDLE_DESC) + *OutputHandle = SQL_NULL_HDESC; + + TRACE ("Not ready\n"); + return SQL_ERROR; + } + ret = pSQLAllocHandle(HandleType, InputHandle, OutputHandle); + TRACE("Returning %d, Handle %p\n", ret, *OutputHandle); + return ret; +} /************************************************************************* * SQLAllocStmt [ODBC32.003] @@ -776,29 +775,32 @@ SQLRETURN WINAPI ODBC32_SQLAllocStmt(SQLHDBC ConnectionHandle, SQLHSTMT *Stateme /************************************************************************* * SQLAllocHandleStd [ODBC32.077] */ -SQLRETURN WINAPI ODBC32_SQLAllocHandleStd( SQLSMALLINT HandleType, - SQLHANDLE InputHandle, SQLHANDLE *OutputHandle) +SQLRETURN WINAPI ODBC32_SQLAllocHandleStd(SQLSMALLINT HandleType, SQLHANDLE InputHandle, SQLHANDLE *OutputHandle) { - TRACE("ProxyODBC: SQLAllocHandleStd.\n"); + SQLRETURN ret; - if (!pSQLAllocHandleStd) - { - if (nErrorType == ERROR_LIBRARY_NOT_FOUND) - WARN("ProxyODBC: Cannot load ODBC driver manager library.\n"); - - if (HandleType == SQL_HANDLE_ENV) - *OutputHandle = SQL_NULL_HENV; - else if (HandleType == SQL_HANDLE_DBC) - *OutputHandle = SQL_NULL_HDBC; - else if (HandleType == SQL_HANDLE_STMT) - *OutputHandle = SQL_NULL_HSTMT; - else if (HandleType == SQL_HANDLE_DESC) - *OutputHandle = SQL_NULL_HDESC; - - return SQL_ERROR; - } + TRACE("(HandleType %d, InputHandle %p, OutputHandle %p)\n", HandleType, InputHandle, OutputHandle); + + if (!pSQLAllocHandleStd) + { + if (nErrorType == ERROR_LIBRARY_NOT_FOUND) + WARN("ProxyODBC: Cannot load ODBC driver manager library.\n"); + + if (HandleType == SQL_HANDLE_ENV) + *OutputHandle = SQL_NULL_HENV; + else if (HandleType == SQL_HANDLE_DBC) + *OutputHandle = SQL_NULL_HDBC; + else if (HandleType == SQL_HANDLE_STMT) + *OutputHandle = SQL_NULL_HSTMT; + else if (HandleType == SQL_HANDLE_DESC) + *OutputHandle = SQL_NULL_HDESC; - return pSQLAllocHandleStd(HandleType, InputHandle, OutputHandle); + return SQL_ERROR; + } + + ret = pSQLAllocHandleStd(HandleType, InputHandle, OutputHandle); + TRACE ("Returning %d, OutputHandle %p\n", ret, *OutputHandle); + return ret; } static const char *debugstr_sqllen( SQLLEN len ) @@ -867,94 +869,116 @@ SQLRETURN WINAPI ODBC32_SQLBindParam(SQLHSTMT StatementHandle, SQLUSMALLINT Para */ SQLRETURN WINAPI ODBC32_SQLCancel(SQLHSTMT StatementHandle) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLCancel) return SQL_ERROR; - return pSQLCancel(StatementHandle); -} + TRACE("(StatementHandle %p)\n", StatementHandle); + + if (!pSQLCancel) return SQL_ERROR; + ret = pSQLCancel(StatementHandle); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLCloseCursor [ODBC32.026] */ SQLRETURN WINAPI ODBC32_SQLCloseCursor(SQLHSTMT StatementHandle) { - SQLRETURN ret; - TRACE("(Handle %p)\n", StatementHandle); + SQLRETURN ret; - if (!pSQLCloseCursor) return SQL_ERROR; + TRACE("(StatementHandle %p)\n", StatementHandle); - ret = pSQLCloseCursor(StatementHandle); - TRACE("Returns %d\n", ret); - return ret; -} + if (!pSQLCloseCursor) return SQL_ERROR; + ret = pSQLCloseCursor(StatementHandle); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLColAttribute [ODBC32.027] */ -SQLRETURN WINAPI ODBC32_SQLColAttribute (SQLHSTMT StatementHandle, - SQLUSMALLINT ColumnNumber, SQLUSMALLINT FieldIdentifier, - SQLPOINTER CharacterAttribute, SQLSMALLINT BufferLength, - SQLSMALLINT *StringLength, SQLLEN *NumericAttribute) +SQLRETURN WINAPI ODBC32_SQLColAttribute(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNumber, + SQLUSMALLINT FieldIdentifier, SQLPOINTER CharacterAttribute, + SQLSMALLINT BufferLength, SQLSMALLINT *StringLength, + SQLLEN *NumericAttribute) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLColAttribute) return SQL_ERROR; - return pSQLColAttribute(StatementHandle, ColumnNumber, FieldIdentifier, - CharacterAttribute, BufferLength, StringLength, NumericAttribute); -} + TRACE("(StatementHandle %p, ColumnNumber %d, FieldIdentifier %d, CharacterAttribute %p, BufferLength %d," + " StringLength %p, NumericAttribute %p)\n", StatementHandle, ColumnNumber, FieldIdentifier, + CharacterAttribute, BufferLength, StringLength, NumericAttribute); + if (!pSQLColAttribute) return SQL_ERROR; + + ret = pSQLColAttribute(StatementHandle, ColumnNumber, FieldIdentifier, CharacterAttribute, BufferLength, + StringLength, NumericAttribute); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLColumns [ODBC32.040] */ -SQLRETURN WINAPI ODBC32_SQLColumns(SQLHSTMT StatementHandle, - SQLCHAR *CatalogName, SQLSMALLINT NameLength1, - SQLCHAR *SchemaName, SQLSMALLINT NameLength2, - SQLCHAR *TableName, SQLSMALLINT NameLength3, - SQLCHAR *ColumnName, SQLSMALLINT NameLength4) +SQLRETURN WINAPI ODBC32_SQLColumns(SQLHSTMT StatementHandle, SQLCHAR *CatalogName, SQLSMALLINT NameLength1, + SQLCHAR *SchemaName, SQLSMALLINT NameLength2, SQLCHAR *TableName, + SQLSMALLINT NameLength3, SQLCHAR *ColumnName, SQLSMALLINT NameLength4) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLColumns) return SQL_ERROR; - return pSQLColumns(StatementHandle, CatalogName, NameLength1, - SchemaName, NameLength2, TableName, NameLength3, ColumnName, NameLength4); -} + TRACE("(StatementHandle %p, CatalogName %s, NameLength1 %d, SchemaName %s, NameLength2 %d, TableName %s," + " NameLength3 %d, ColumnName %s, NameLength4 %d)\n", StatementHandle, + debugstr_an((const char *)CatalogName, NameLength1), NameLength1, + debugstr_an((const char *)SchemaName, NameLength2), NameLength2, + debugstr_an((const char *)TableName, NameLength3), NameLength3, + debugstr_an((const char *)ColumnName, NameLength4), NameLength4); + + if (!pSQLColumns) return SQL_ERROR; + ret = pSQLColumns(StatementHandle, CatalogName, NameLength1, SchemaName, NameLength2, TableName, + NameLength3, ColumnName, NameLength4); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLConnect [ODBC32.007] */ -SQLRETURN WINAPI ODBC32_SQLConnect(SQLHDBC ConnectionHandle, - SQLCHAR *ServerName, SQLSMALLINT NameLength1, - SQLCHAR *UserName, SQLSMALLINT NameLength2, - SQLCHAR *Authentication, SQLSMALLINT NameLength3) +SQLRETURN WINAPI ODBC32_SQLConnect(SQLHDBC ConnectionHandle, SQLCHAR *ServerName, SQLSMALLINT NameLength1, + SQLCHAR *UserName, SQLSMALLINT NameLength2, SQLCHAR *Authentication, + SQLSMALLINT NameLength3) { - SQLRETURN ret; - TRACE("(Server=%.*s)\n",NameLength1, ServerName); + SQLRETURN ret; - if (!pSQLConnect) return SQL_ERROR; + TRACE("(ConnectionHandle %p, ServerName %s, NameLength1 %d, UserName %s, NameLength2 %d, Authentication %p," + " NameLength3 %d)\n", ConnectionHandle, + debugstr_an((const char *)ServerName, NameLength1), NameLength1, + debugstr_an((const char *)UserName, NameLength2), NameLength2, + debugstr_an((const char *)Authentication, NameLength3), NameLength3); - ret = pSQLConnect(ConnectionHandle, ServerName, NameLength1, - UserName, NameLength2, Authentication, NameLength3); + if (!pSQLConnect) return SQL_ERROR; - TRACE("Returns %d\n", ret); - return ret; + ret = pSQLConnect(ConnectionHandle, ServerName, NameLength1, UserName, NameLength2, Authentication, NameLength3); + TRACE("Returning %d\n", ret); + return ret; } - /************************************************************************* * SQLCopyDesc [ODBC32.028] */ SQLRETURN WINAPI ODBC32_SQLCopyDesc(SQLHDESC SourceDescHandle, SQLHDESC TargetDescHandle) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLCopyDesc) return SQL_ERROR; - return pSQLCopyDesc(SourceDescHandle, TargetDescHandle); -} + TRACE("(SourceDescHandle %p, TargetDescHandle %p)\n", SourceDescHandle, TargetDescHandle); + + if (!pSQLCopyDesc) return SQL_ERROR; + ret = pSQLCopyDesc(SourceDescHandle, TargetDescHandle); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLDataSources [ODBC32.057] @@ -986,30 +1010,30 @@ SQLRETURN WINAPI ODBC32_SQLDataSources(SQLHENV EnvironmentHandle, SQLUSMALLINT D return ret; } -SQLRETURN WINAPI ODBC32_SQLDataSourcesA(SQLHENV EnvironmentHandle, - SQLUSMALLINT Direction, SQLCHAR *ServerName, - SQLSMALLINT BufferLength1, SQLSMALLINT *NameLength1, - SQLCHAR *Description, SQLSMALLINT BufferLength2, - SQLSMALLINT *NameLength2) +SQLRETURN WINAPI ODBC32_SQLDataSourcesA(SQLHENV EnvironmentHandle, SQLUSMALLINT Direction, SQLCHAR *ServerName, + SQLSMALLINT BufferLength1, SQLSMALLINT *NameLength1, SQLCHAR *Description, + SQLSMALLINT BufferLength2, SQLSMALLINT *NameLength2) { SQLRETURN ret; - TRACE("EnvironmentHandle = %p\n", EnvironmentHandle); + TRACE("(EnvironmentHandle %p, Direction %d, ServerName %p, BufferLength1 %d, NameLength1 %p, Description %p," + " BufferLength2 %d, NameLength2 %p)\n", EnvironmentHandle, Direction, ServerName, BufferLength1, + NameLength1, Description, BufferLength2, NameLength2); if (!pSQLDataSourcesA) return SQL_ERROR; - ret = pSQLDataSourcesA(EnvironmentHandle, Direction, ServerName, - BufferLength1, NameLength1, Description, BufferLength2, NameLength2); + ret = pSQLDataSourcesA(EnvironmentHandle, Direction, ServerName, BufferLength1, NameLength1, Description, + BufferLength2, NameLength2); if (TRACE_ON(odbc)) { - TRACE("Returns %d \t", ret); - if (NameLength1 && *NameLength1 > 0) - TRACE("DataSource = %s,", ServerName); - if (NameLength2 && *NameLength2 > 0) - TRACE(" Description = %s", Description); + if (ServerName && NameLength1 && *NameLength1 > 0) + TRACE(" DataSource %s", debugstr_an((const char *)ServerName, *NameLength1)); + if (Description && NameLength2 && *NameLength2 > 0) + TRACE(" Description %s", debugstr_an((const char *)Description, *NameLength2)); TRACE("\n"); } + TRACE("Returning %d\n", ret); return ret; } @@ -1066,63 +1090,78 @@ SQLRETURN WINAPI ODBC32_SQLDisconnect(SQLHDBC ConnectionHandle) */ SQLRETURN WINAPI ODBC32_SQLEndTran(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLSMALLINT CompletionType) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLEndTran) return SQL_ERROR; - return pSQLEndTran(HandleType, Handle, CompletionType); -} + TRACE("(HandleType %d, Handle %p, CompletionType %d)\n", HandleType, Handle, CompletionType); + if (!pSQLEndTran) return SQL_ERROR; + + ret = pSQLEndTran(HandleType, Handle, CompletionType); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLError [ODBC32.010] */ -SQLRETURN WINAPI ODBC32_SQLError(SQLHENV EnvironmentHandle, - SQLHDBC ConnectionHandle, SQLHSTMT StatementHandle, - SQLCHAR *Sqlstate, SQLINTEGER *NativeError, - SQLCHAR *MessageText, SQLSMALLINT BufferLength, - SQLSMALLINT *TextLength) +SQLRETURN WINAPI ODBC32_SQLError(SQLHENV EnvironmentHandle, SQLHDBC ConnectionHandle, SQLHSTMT StatementHandle, + SQLCHAR *Sqlstate, SQLINTEGER *NativeError, SQLCHAR *MessageText, + SQLSMALLINT BufferLength, SQLSMALLINT *TextLength) { - SQLRETURN ret; + SQLRETURN ret; - TRACE("(EnvironmentHandle %p, ConnectionHandle %p, StatementHandle %p, BufferLength %d)\n", - EnvironmentHandle, ConnectionHandle, StatementHandle, BufferLength); + TRACE("(EnvironmentHandle %p, ConnectionHandle %p, StatementHandle %p, Sqlstate %p, NativeError %p," + " MessageText %p, BufferLength %d, TextLength %p)\n", EnvironmentHandle, ConnectionHandle, + StatementHandle, Sqlstate, NativeError, MessageText, BufferLength, TextLength); - if (!pSQLError) return SQL_ERROR; - ret = pSQLError(EnvironmentHandle, ConnectionHandle, StatementHandle, - Sqlstate, NativeError, MessageText, BufferLength, TextLength); - if (ret == SQL_SUCCESS) - TRACE("SQLState %s, Error %d, Text %s, Textlen %d\n", - debugstr_an((char *)Sqlstate, 5), *NativeError, - debugstr_an((char *)MessageText, *TextLength), *TextLength); - else - TRACE("Returns %d\n", ret); - return ret; -} + if (!pSQLError) return SQL_ERROR; + + ret = pSQLError(EnvironmentHandle, ConnectionHandle, StatementHandle, Sqlstate, NativeError, MessageText, + BufferLength, TextLength); + + if (ret == SQL_SUCCESS) + { + TRACE(" SQLState %s\n", debugstr_an((const char *)Sqlstate, 5)); + TRACE(" Error %d\n", *NativeError); + TRACE(" MessageText %s\n", debugstr_an((const char *)MessageText, *TextLength)); + } + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLExecDirect [ODBC32.011] */ SQLRETURN WINAPI ODBC32_SQLExecDirect(SQLHSTMT StatementHandle, SQLCHAR *StatementText, SQLINTEGER TextLength) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLExecDirect) return SQL_ERROR; - return pSQLExecDirect(StatementHandle, StatementText, TextLength); -} + TRACE("(StatementHandle %p, StatementText %s, TextLength %d)\n", StatementHandle, + debugstr_an((const char *)StatementText, TextLength), TextLength); + + if (!pSQLExecDirect) return SQL_ERROR; + ret = pSQLExecDirect(StatementHandle, StatementText, TextLength); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLExecute [ODBC32.012] */ SQLRETURN WINAPI ODBC32_SQLExecute(SQLHSTMT StatementHandle) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLExecute) return SQL_ERROR; - return pSQLExecute(StatementHandle); -} + TRACE("(StatementHandle %p)\n", StatementHandle); + + if (!pSQLExecute) return SQL_ERROR; + ret = pSQLExecute(StatementHandle); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLFetch [ODBC32.013] @@ -1145,12 +1184,17 @@ SQLRETURN WINAPI ODBC32_SQLFetch(SQLHSTMT StatementHandle) */ SQLRETURN WINAPI ODBC32_SQLFetchScroll(SQLHSTMT StatementHandle, SQLSMALLINT FetchOrientation, SQLLEN FetchOffset) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLFetchScroll) return SQL_ERROR; - return pSQLFetchScroll(StatementHandle, FetchOrientation, FetchOffset); -} + TRACE("(StatementHandle %p, FetchOrientation %d, FetchOffset %s)\n", StatementHandle, FetchOrientation, + debugstr_sqllen(FetchOffset)); + if (!pSQLFetchScroll) return SQL_ERROR; + + ret = pSQLFetchScroll(StatementHandle, FetchOrientation, FetchOffset); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLFreeConnect [ODBC32.014] @@ -1189,16 +1233,16 @@ SQLRETURN WINAPI ODBC32_SQLFreeEnv(SQLHENV EnvironmentHandle) */ SQLRETURN WINAPI ODBC32_SQLFreeHandle(SQLSMALLINT HandleType, SQLHANDLE Handle) { - SQLRETURN ret; - TRACE("(Type %d, Handle %p)\n", HandleType, Handle); + SQLRETURN ret; - if (!pSQLFreeHandle) return SQL_ERROR; + TRACE("(HandleType %d, Handle %p)\n", HandleType, Handle); - ret = pSQLFreeHandle(HandleType, Handle); - TRACE ("Returns %d\n", ret); - return ret; -} + if (!pSQLFreeHandle) return SQL_ERROR; + ret = pSQLFreeHandle(HandleType, Handle); + TRACE ("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLFreeStmt [ODBC32.016] @@ -1219,43 +1263,54 @@ SQLRETURN WINAPI ODBC32_SQLFreeStmt(SQLHSTMT StatementHandle, SQLUSMALLINT Optio /************************************************************************* * SQLGetConnectAttr [ODBC32.032] */ -SQLRETURN WINAPI ODBC32_SQLGetConnectAttr(SQLHDBC ConnectionHandle, - SQLINTEGER Attribute, SQLPOINTER Value, - SQLINTEGER BufferLength, SQLINTEGER *StringLength) +SQLRETURN WINAPI ODBC32_SQLGetConnectAttr(SQLHDBC ConnectionHandle, SQLINTEGER Attribute, SQLPOINTER Value, + SQLINTEGER BufferLength, SQLINTEGER *StringLength) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLGetConnectAttr) return SQL_ERROR; - return pSQLGetConnectAttr(ConnectionHandle, Attribute, Value, - BufferLength, StringLength); -} + TRACE("(ConnectionHandle %p, Attribute %d, Value %p, BufferLength %d, StringLength %p)\n", ConnectionHandle, + Attribute, Value, BufferLength, StringLength); + if (!pSQLGetConnectAttr) return SQL_ERROR; + + ret = pSQLGetConnectAttr(ConnectionHandle, Attribute, Value, BufferLength, StringLength); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLGetConnectOption [ODBC32.042] */ SQLRETURN WINAPI ODBC32_SQLGetConnectOption(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLPOINTER Value) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLGetConnectOption) return SQL_ERROR; - return pSQLGetConnectOption(ConnectionHandle, Option, Value); -} + TRACE("(ConnectionHandle %p, Option %d, Value %p)\n", ConnectionHandle, Option, Value); + if (!pSQLGetConnectOption) return SQL_ERROR; + + ret = pSQLGetConnectOption(ConnectionHandle, Option, Value); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLGetCursorName [ODBC32.017] */ -SQLRETURN WINAPI ODBC32_SQLGetCursorName(SQLHSTMT StatementHandle, - SQLCHAR *CursorName, SQLSMALLINT BufferLength, - SQLSMALLINT *NameLength) +SQLRETURN WINAPI ODBC32_SQLGetCursorName(SQLHSTMT StatementHandle, SQLCHAR *CursorName, SQLSMALLINT BufferLength, + SQLSMALLINT *NameLength) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLGetCursorName) return SQL_ERROR; - return pSQLGetCursorName(StatementHandle, CursorName, BufferLength, NameLength); -} + TRACE("(StatementHandle %p, CursorName %p, BufferLength %d, NameLength %p)\n", StatementHandle, CursorName, + BufferLength, NameLength); + + if (!pSQLGetCursorName) return SQL_ERROR; + ret = pSQLGetCursorName(StatementHandle, CursorName, BufferLength, NameLength); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLGetData [ODBC32.043] @@ -1278,68 +1333,81 @@ SQLRETURN WINAPI ODBC32_SQLGetData(SQLHSTMT StatementHandle, SQLUSMALLINT Column /************************************************************************* * SQLGetDescField [ODBC32.033] */ -SQLRETURN WINAPI ODBC32_SQLGetDescField(SQLHDESC DescriptorHandle, - SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier, - SQLPOINTER Value, SQLINTEGER BufferLength, - SQLINTEGER *StringLength) +SQLRETURN WINAPI ODBC32_SQLGetDescField(SQLHDESC DescriptorHandle, SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier, + SQLPOINTER Value, SQLINTEGER BufferLength, SQLINTEGER *StringLength) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLGetDescField) return SQL_ERROR; - return pSQLGetDescField(DescriptorHandle, RecNumber, FieldIdentifier, - Value, BufferLength, StringLength); -} + TRACE("(DescriptorHandle %p, RecNumber %d, FieldIdentifier %d, Value %p, BufferLength %d, StringLength %p)\n", + DescriptorHandle, RecNumber, FieldIdentifier, Value, BufferLength, StringLength); + if (!pSQLGetDescField) return SQL_ERROR; + + ret = pSQLGetDescField(DescriptorHandle, RecNumber, FieldIdentifier, Value, BufferLength, StringLength); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLGetDescRec [ODBC32.034] */ -SQLRETURN WINAPI ODBC32_SQLGetDescRec(SQLHDESC DescriptorHandle, - SQLSMALLINT RecNumber, SQLCHAR *Name, - SQLSMALLINT BufferLength, SQLSMALLINT *StringLength, - SQLSMALLINT *Type, SQLSMALLINT *SubType, - SQLLEN *Length, SQLSMALLINT *Precision, - SQLSMALLINT *Scale, SQLSMALLINT *Nullable) +SQLRETURN WINAPI ODBC32_SQLGetDescRec(SQLHDESC DescriptorHandle, SQLSMALLINT RecNumber, SQLCHAR *Name, + SQLSMALLINT BufferLength, SQLSMALLINT *StringLength, SQLSMALLINT *Type, + SQLSMALLINT *SubType, SQLLEN *Length, SQLSMALLINT *Precision, + SQLSMALLINT *Scale, SQLSMALLINT *Nullable) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLGetDescRec) return SQL_ERROR; - return pSQLGetDescRec(DescriptorHandle, RecNumber, Name, BufferLength, - StringLength, Type, SubType, Length, Precision, Scale, Nullable); -} + TRACE("(DescriptorHandle %p, RecNumber %d, Name %p, BufferLength %d, StringLength %p, Type %p, SubType %p," + " Length %p, Precision %p, Scale %p, Nullable %p)\n", DescriptorHandle, RecNumber, Name, BufferLength, + StringLength, Type, SubType, Length, Precision, Scale, Nullable); + if (!pSQLGetDescRec) return SQL_ERROR; + + ret = pSQLGetDescRec(DescriptorHandle, RecNumber, Name, BufferLength, StringLength, Type, SubType, Length, + Precision, Scale, Nullable); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLGetDiagField [ODBC32.035] */ -SQLRETURN WINAPI ODBC32_SQLGetDiagField(SQLSMALLINT HandleType, SQLHANDLE Handle, - SQLSMALLINT RecNumber, SQLSMALLINT DiagIdentifier, - SQLPOINTER DiagInfo, SQLSMALLINT BufferLength, - SQLSMALLINT *StringLength) +SQLRETURN WINAPI ODBC32_SQLGetDiagField(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLSMALLINT RecNumber, + SQLSMALLINT DiagIdentifier, SQLPOINTER DiagInfo, SQLSMALLINT BufferLength, + SQLSMALLINT *StringLength) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLGetDiagField) return SQL_ERROR; - return pSQLGetDiagField(HandleType, Handle, RecNumber, DiagIdentifier, - DiagInfo, BufferLength, StringLength); -} + TRACE("(HandleType %d, Handle %p, RecNumber %d, DiagIdentifier %d, DiagInfo %p, BufferLength %d," + " StringLength %p)\n", HandleType, Handle, RecNumber, DiagIdentifier, DiagInfo, BufferLength, StringLength); + if (!pSQLGetDiagField) return SQL_ERROR; + + ret = pSQLGetDiagField(HandleType, Handle, RecNumber, DiagIdentifier, DiagInfo, BufferLength, StringLength); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLGetDiagRec [ODBC32.036] */ -SQLRETURN WINAPI ODBC32_SQLGetDiagRec(SQLSMALLINT HandleType, SQLHANDLE Handle, - SQLSMALLINT RecNumber, SQLCHAR *Sqlstate, - SQLINTEGER *NativeError, SQLCHAR *MessageText, - SQLSMALLINT BufferLength, SQLSMALLINT *TextLength) +SQLRETURN WINAPI ODBC32_SQLGetDiagRec(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLSMALLINT RecNumber, + SQLCHAR *Sqlstate, SQLINTEGER *NativeError, SQLCHAR *MessageText, + SQLSMALLINT BufferLength, SQLSMALLINT *TextLength) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLGetDiagRec) return SQL_ERROR; - return pSQLGetDiagRec(HandleType, Handle, RecNumber, Sqlstate, NativeError, - MessageText, BufferLength, TextLength); -} + TRACE("(HandleType %d, Handle %p, RecNumber %d, Sqlstate %p, NativeError %p, MessageText %p, BufferLength %d," + " TextLength %p)\n", HandleType, Handle, RecNumber, Sqlstate, NativeError, MessageText, BufferLength, + TextLength); + if (!pSQLGetDiagRec) return SQL_ERROR; + + ret = pSQLGetDiagRec(HandleType, Handle, RecNumber, Sqlstate, NativeError, MessageText, BufferLength, TextLength); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLGetEnvAttr [ODBC32.037] @@ -1378,54 +1446,82 @@ SQLRETURN WINAPI ODBC32_SQLGetFunctions(SQLHDBC ConnectionHandle, SQLUSMALLINT F /************************************************************************* * SQLGetInfo [ODBC32.045] */ -SQLRETURN WINAPI ODBC32_SQLGetInfo(SQLHDBC ConnectionHandle, - SQLUSMALLINT InfoType, SQLPOINTER InfoValue, - SQLSMALLINT BufferLength, SQLSMALLINT *StringLength) +SQLRETURN WINAPI ODBC32_SQLGetInfo(SQLHDBC ConnectionHandle, SQLUSMALLINT InfoType, SQLPOINTER InfoValue, + SQLSMALLINT BufferLength, SQLSMALLINT *StringLength) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLGetInfo) return SQL_ERROR; - return pSQLGetInfo(ConnectionHandle, InfoType, InfoValue, BufferLength, StringLength); -} + TRACE("(ConnectionHandle, %p, InfoType %d, InfoValue %p, BufferLength %d, StringLength %p)\n", ConnectionHandle, + InfoType, InfoValue, BufferLength, StringLength); + if (!InfoValue) + { + WARN("Unexpected NULL InfoValue address\n"); + return SQL_ERROR; + } + + if (!pSQLGetInfo) return SQL_ERROR; + + ret = pSQLGetInfo(ConnectionHandle, InfoType, InfoValue, BufferLength, StringLength); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLGetStmtAttr [ODBC32.038] */ -SQLRETURN WINAPI ODBC32_SQLGetStmtAttr(SQLHSTMT StatementHandle, - SQLINTEGER Attribute, SQLPOINTER Value, - SQLINTEGER BufferLength, SQLINTEGER *StringLength) +SQLRETURN WINAPI ODBC32_SQLGetStmtAttr(SQLHSTMT StatementHandle, SQLINTEGER Attribute, SQLPOINTER Value, + SQLINTEGER BufferLength, SQLINTEGER *StringLength) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLGetStmtAttr) return SQL_ERROR; - return pSQLGetStmtAttr(StatementHandle, Attribute, Value, BufferLength, StringLength); -} + TRACE("(StatementHandle %p, Attribute %d, Value %p, BufferLength %d, StringLength %p)\n", StatementHandle, + Attribute, Value, BufferLength, StringLength); + if (!Value) + { + WARN("Unexpected NULL Value return address\n"); + return SQL_ERROR; + } + + if (!pSQLGetStmtAttr) return SQL_ERROR; + + ret = pSQLGetStmtAttr(StatementHandle, Attribute, Value, BufferLength, StringLength); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLGetStmtOption [ODBC32.046] */ SQLRETURN WINAPI ODBC32_SQLGetStmtOption(SQLHSTMT StatementHandle, SQLUSMALLINT Option, SQLPOINTER Value) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLGetStmtOption) return SQL_ERROR; - return pSQLGetStmtOption(StatementHandle, Option, Value); -} + TRACE("(StatementHandle %p, Option %d, Value %p)\n", StatementHandle, Option, Value); + if (!pSQLGetStmtOption) return SQL_ERROR; + + ret = pSQLGetStmtOption(StatementHandle, Option, Value); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLGetTypeInfo [ODBC32.047] */ SQLRETURN WINAPI ODBC32_SQLGetTypeInfo(SQLHSTMT StatementHandle, SQLSMALLINT DataType) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLGetTypeInfo) return SQL_ERROR; - return pSQLGetTypeInfo(StatementHandle, DataType); -} + TRACE("(StatementHandle %p, DataType %d)\n", StatementHandle, DataType); + if (!pSQLGetTypeInfo) return SQL_ERROR; + + ret = pSQLGetTypeInfo(StatementHandle, DataType); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLNumResultCols [ODBC32.018] @@ -1448,36 +1544,49 @@ SQLRETURN WINAPI ODBC32_SQLNumResultCols(SQLHSTMT StatementHandle, SQLSMALLINT * */ SQLRETURN WINAPI ODBC32_SQLParamData(SQLHSTMT StatementHandle, SQLPOINTER *Value) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLParamData) return SQL_ERROR; - return pSQLParamData(StatementHandle, Value); -} + TRACE("(StatementHandle %p, Value %p)\n", StatementHandle, Value); + + if (!pSQLParamData) return SQL_ERROR; + ret = pSQLParamData(StatementHandle, Value); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLPrepare [ODBC32.019] */ SQLRETURN WINAPI ODBC32_SQLPrepare(SQLHSTMT StatementHandle, SQLCHAR *StatementText, SQLINTEGER TextLength) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLPrepare) return SQL_ERROR; - return pSQLPrepare(StatementHandle, StatementText, TextLength); -} + TRACE("(StatementHandle %p, StatementText %s, TextLength %d)\n", StatementHandle, + debugstr_an((const char *)StatementText, TextLength), TextLength); + if (!pSQLPrepare) return SQL_ERROR; + + ret = pSQLPrepare(StatementHandle, StatementText, TextLength); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLPutData [ODBC32.049] */ SQLRETURN WINAPI ODBC32_SQLPutData(SQLHSTMT StatementHandle, SQLPOINTER Data, SQLLEN StrLen_or_Ind) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLPutData) return SQL_ERROR; - return pSQLPutData(StatementHandle, Data, StrLen_or_Ind); -} + TRACE("(StatementHandle %p, Data %p, StrLen_or_Ind %s)\n", StatementHandle, Data, debugstr_sqllen(StrLen_or_Ind)); + + if (!pSQLPutData) return SQL_ERROR; + ret = pSQLPutData(StatementHandle, Data, StrLen_or_Ind); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLRowCount [ODBC32.020] @@ -1499,71 +1608,92 @@ SQLRETURN WINAPI ODBC32_SQLRowCount(SQLHSTMT StatementHandle, SQLLEN *RowCount) /************************************************************************* * SQLSetConnectAttr [ODBC32.039] */ -SQLRETURN WINAPI ODBC32_SQLSetConnectAttr(SQLHDBC ConnectionHandle, SQLINTEGER Attribute, - SQLPOINTER Value, SQLINTEGER StringLength) +SQLRETURN WINAPI ODBC32_SQLSetConnectAttr(SQLHDBC ConnectionHandle, SQLINTEGER Attribute, SQLPOINTER Value, + SQLINTEGER StringLength) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLSetConnectAttr) return SQL_ERROR; - return pSQLSetConnectAttr(ConnectionHandle, Attribute, Value, StringLength); -} + TRACE("(ConnectionHandle %p, Attribute %d, Value %p, StringLength %d)\n", ConnectionHandle, Attribute, Value, + StringLength); + if (!pSQLSetConnectAttr) return SQL_ERROR; + + ret = pSQLSetConnectAttr(ConnectionHandle, Attribute, Value, StringLength); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLSetConnectOption [ODBC32.050] */ SQLRETURN WINAPI ODBC32_SQLSetConnectOption(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLULEN Value) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLSetConnectOption) return SQL_ERROR; - return pSQLSetConnectOption(ConnectionHandle, Option, Value); -} + TRACE("(ConnectionHandle %p, Option %d, Value %s)\n", ConnectionHandle, Option, debugstr_sqlulen(Value)); + if (!pSQLSetConnectOption) return SQL_ERROR; + + ret = pSQLSetConnectOption(ConnectionHandle, Option, Value); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLSetCursorName [ODBC32.021] */ SQLRETURN WINAPI ODBC32_SQLSetCursorName(SQLHSTMT StatementHandle, SQLCHAR *CursorName, SQLSMALLINT NameLength) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLSetCursorName) return SQL_ERROR; - return pSQLSetCursorName(StatementHandle, CursorName, NameLength); -} + TRACE("(StatementHandle %p, CursorName %s, NameLength %d)\n", StatementHandle, + debugstr_an((const char *)CursorName, NameLength), NameLength); + + if (!pSQLSetCursorName) return SQL_ERROR; + ret = pSQLSetCursorName(StatementHandle, CursorName, NameLength); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLSetDescField [ODBC32.073] */ -SQLRETURN WINAPI ODBC32_SQLSetDescField(SQLHDESC DescriptorHandle, - SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier, - SQLPOINTER Value, SQLINTEGER BufferLength) +SQLRETURN WINAPI ODBC32_SQLSetDescField(SQLHDESC DescriptorHandle, SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier, + SQLPOINTER Value, SQLINTEGER BufferLength) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLSetDescField) return SQL_ERROR; - return pSQLSetDescField(DescriptorHandle, RecNumber, FieldIdentifier, Value, BufferLength); -} + TRACE("(DescriptorHandle %p, RecNumber %d, FieldIdentifier %d, Value %p, BufferLength %d)\n", DescriptorHandle, + RecNumber, FieldIdentifier, Value, BufferLength); + + if (!pSQLSetDescField) return SQL_ERROR; + ret = pSQLSetDescField(DescriptorHandle, RecNumber, FieldIdentifier, Value, BufferLength); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLSetDescRec [ODBC32.074] */ -SQLRETURN WINAPI ODBC32_SQLSetDescRec(SQLHDESC DescriptorHandle, - SQLSMALLINT RecNumber, SQLSMALLINT Type, - SQLSMALLINT SubType, SQLLEN Length, - SQLSMALLINT Precision, SQLSMALLINT Scale, - SQLPOINTER Data, SQLLEN *StringLength, - SQLLEN *Indicator) +SQLRETURN WINAPI ODBC32_SQLSetDescRec(SQLHDESC DescriptorHandle, SQLSMALLINT RecNumber, SQLSMALLINT Type, + SQLSMALLINT SubType, SQLLEN Length, SQLSMALLINT Precision, SQLSMALLINT Scale, + SQLPOINTER Data, SQLLEN *StringLength, SQLLEN *Indicator) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLSetDescRec) return SQL_ERROR; - return pSQLSetDescRec(DescriptorHandle, RecNumber, Type, SubType, Length, - Precision, Scale, Data, StringLength, Indicator); -} + TRACE("(DescriptorHandle %p, RecNumber %d, Type %d, SubType %d, Length %s, Precision %d, Scale %d, Data %p," + " StringLength %p, Indicator %p)\n", DescriptorHandle, RecNumber, Type, SubType, debugstr_sqllen(Length), + Precision, Scale, Data, StringLength, Indicator); + + if (!pSQLSetDescRec) return SQL_ERROR; + ret = pSQLSetDescRec(DescriptorHandle, RecNumber, Type, SubType, Length, Precision, Scale, Data, + StringLength, Indicator); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLSetEnvAttr [ODBC32.075] @@ -1586,141 +1716,181 @@ SQLRETURN WINAPI ODBC32_SQLSetEnvAttr(SQLHENV EnvironmentHandle, SQLINTEGER Attr /************************************************************************* * SQLSetParam [ODBC32.022] */ -SQLRETURN WINAPI ODBC32_SQLSetParam(SQLHSTMT StatementHandle, - SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType, - SQLSMALLINT ParameterType, SQLULEN LengthPrecision, - SQLSMALLINT ParameterScale, SQLPOINTER ParameterValue, - SQLLEN *StrLen_or_Ind) +SQLRETURN WINAPI ODBC32_SQLSetParam(SQLHSTMT StatementHandle, SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType, + SQLSMALLINT ParameterType, SQLULEN LengthPrecision, SQLSMALLINT ParameterScale, + SQLPOINTER ParameterValue, SQLLEN *StrLen_or_Ind) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLSetParam) return SQL_ERROR; - return pSQLSetParam(StatementHandle, ParameterNumber, ValueType, ParameterType, LengthPrecision, - ParameterScale, ParameterValue, StrLen_or_Ind); -} + TRACE("(StatementHandle %p, ParameterNumber %d, ValueType %d, ParameterType %d, LengthPrecision %s," + " ParameterScale %d, ParameterValue %p, StrLen_or_Ind %p)\n", StatementHandle, ParameterNumber, ValueType, + ParameterType, debugstr_sqlulen(LengthPrecision), ParameterScale, ParameterValue, StrLen_or_Ind); + + if (!pSQLSetParam) return SQL_ERROR; + ret = pSQLSetParam(StatementHandle, ParameterNumber, ValueType, ParameterType, LengthPrecision, + ParameterScale, ParameterValue, StrLen_or_Ind); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLSetStmtAttr [ODBC32.076] */ -SQLRETURN WINAPI ODBC32_SQLSetStmtAttr(SQLHSTMT StatementHandle, - SQLINTEGER Attribute, SQLPOINTER Value, - SQLINTEGER StringLength) +SQLRETURN WINAPI ODBC32_SQLSetStmtAttr(SQLHSTMT StatementHandle, SQLINTEGER Attribute, SQLPOINTER Value, + SQLINTEGER StringLength) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLSetStmtAttr) return SQL_ERROR; - return pSQLSetStmtAttr(StatementHandle, Attribute, Value, StringLength); -} + TRACE("(StatementHandle %p, Attribute %d, Value %p, StringLength %d)\n", StatementHandle, Attribute, Value, + StringLength); + if (!pSQLSetStmtAttr) return SQL_ERROR; + + ret = pSQLSetStmtAttr(StatementHandle, Attribute, Value, StringLength); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLSetStmtOption [ODBC32.051] */ SQLRETURN WINAPI ODBC32_SQLSetStmtOption(SQLHSTMT StatementHandle, SQLUSMALLINT Option, SQLULEN Value) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLSetStmtOption) return SQL_ERROR; - return pSQLSetStmtOption(StatementHandle, Option, Value); -} + TRACE("(StatementHandle %p, Option %d, Value %s)\n", StatementHandle, Option, debugstr_sqlulen(Value)); + + if (!pSQLSetStmtOption) return SQL_ERROR; + ret = pSQLSetStmtOption(StatementHandle, Option, Value); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLSpecialColumns [ODBC32.052] */ -SQLRETURN WINAPI ODBC32_SQLSpecialColumns(SQLHSTMT StatementHandle, - SQLUSMALLINT IdentifierType, SQLCHAR *CatalogName, - SQLSMALLINT NameLength1, SQLCHAR *SchemaName, - SQLSMALLINT NameLength2, SQLCHAR *TableName, - SQLSMALLINT NameLength3, SQLUSMALLINT Scope, - SQLUSMALLINT Nullable) +SQLRETURN WINAPI ODBC32_SQLSpecialColumns(SQLHSTMT StatementHandle, SQLUSMALLINT IdentifierType, SQLCHAR *CatalogName, + SQLSMALLINT NameLength1, SQLCHAR *SchemaName, SQLSMALLINT NameLength2, + SQLCHAR *TableName, SQLSMALLINT NameLength3, SQLUSMALLINT Scope, + SQLUSMALLINT Nullable) { + SQLRETURN ret; - if (!pSQLSpecialColumns) return SQL_ERROR; - return pSQLSpecialColumns(StatementHandle, IdentifierType, CatalogName, NameLength1, SchemaName, - NameLength2, TableName, NameLength3, Scope, Nullable); -} + TRACE("(StatementHandle %p, IdentifierType %d, CatalogName %s, NameLength1 %d, SchemaName %s, NameLength2 %d," + " TableName %s, NameLength3 %d, Scope %d, Nullable %d)\n", StatementHandle, IdentifierType, + debugstr_an((const char *)CatalogName, NameLength1), NameLength1, + debugstr_an((const char *)SchemaName, NameLength2), NameLength2, + debugstr_an((const char *)TableName, NameLength3), NameLength3, Scope, Nullable); + if (!pSQLSpecialColumns) return SQL_ERROR; + + ret = pSQLSpecialColumns(StatementHandle, IdentifierType, CatalogName, NameLength1, SchemaName, + NameLength2, TableName, NameLength3, Scope, Nullable); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLStatistics [ODBC32.053] */ -SQLRETURN WINAPI ODBC32_SQLStatistics(SQLHSTMT StatementHandle, - SQLCHAR *CatalogName, SQLSMALLINT NameLength1, - SQLCHAR *SchemaName, SQLSMALLINT NameLength2, - SQLCHAR *TableName, SQLSMALLINT NameLength3, - SQLUSMALLINT Unique, SQLUSMALLINT Reserved) +SQLRETURN WINAPI ODBC32_SQLStatistics(SQLHSTMT StatementHandle, SQLCHAR *CatalogName, SQLSMALLINT NameLength1, + SQLCHAR *SchemaName, SQLSMALLINT NameLength2, SQLCHAR *TableName, + SQLSMALLINT NameLength3, SQLUSMALLINT Unique, SQLUSMALLINT Reserved) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLStatistics) return SQL_ERROR; - return pSQLStatistics(StatementHandle, CatalogName, NameLength1, SchemaName, NameLength2, - TableName, NameLength3, Unique, Reserved); -} + TRACE("(StatementHandle %p, CatalogName %s, NameLength1 %d SchemaName %s, NameLength2 %d, TableName %s" + " NameLength3 %d, Unique %d, Reserved %d)\n", StatementHandle, + debugstr_an((const char *)CatalogName, NameLength1), NameLength1, + debugstr_an((const char *)SchemaName, NameLength2), NameLength2, + debugstr_an((const char *)TableName, NameLength3), NameLength3, Unique, Reserved); + if (!pSQLStatistics) return SQL_ERROR; + + ret = pSQLStatistics(StatementHandle, CatalogName, NameLength1, SchemaName, NameLength2, TableName, + NameLength3, Unique, Reserved); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLTables [ODBC32.054] */ -SQLRETURN WINAPI ODBC32_SQLTables(SQLHSTMT StatementHandle, - SQLCHAR *CatalogName, SQLSMALLINT NameLength1, - SQLCHAR *SchemaName, SQLSMALLINT NameLength2, - SQLCHAR *TableName, SQLSMALLINT NameLength3, - SQLCHAR *TableType, SQLSMALLINT NameLength4) +SQLRETURN WINAPI ODBC32_SQLTables(SQLHSTMT StatementHandle, SQLCHAR *CatalogName, SQLSMALLINT NameLength1, + SQLCHAR *SchemaName, SQLSMALLINT NameLength2, SQLCHAR *TableName, + SQLSMALLINT NameLength3, SQLCHAR *TableType, SQLSMALLINT NameLength4) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLTables) return SQL_ERROR; - return pSQLTables(StatementHandle, CatalogName, NameLength1, - SchemaName, NameLength2, TableName, NameLength3, TableType, NameLength4); -} + TRACE("(StatementHandle %p, CatalogName %s, NameLength1 %d, SchemaName %s, NameLength2 %d, TableName %s," + " NameLength3 %d, TableType %s, NameLength4 %d)\n", StatementHandle, + debugstr_an((const char *)CatalogName, NameLength1), NameLength1, + debugstr_an((const char *)SchemaName, NameLength2), NameLength2, + debugstr_an((const char *)TableName, NameLength3), NameLength3, + debugstr_an((const char *)TableType, NameLength4), NameLength4); + + if (!pSQLTables) return SQL_ERROR; + ret = pSQLTables(StatementHandle, CatalogName, NameLength1, SchemaName, NameLength2, TableName, NameLength3, + TableType, NameLength4); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLTransact [ODBC32.023] */ -SQLRETURN WINAPI ODBC32_SQLTransact(SQLHENV EnvironmentHandle, SQLHDBC ConnectionHandle, - SQLUSMALLINT CompletionType) +SQLRETURN WINAPI ODBC32_SQLTransact(SQLHENV EnvironmentHandle, SQLHDBC ConnectionHandle, SQLUSMALLINT CompletionType) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLTransact) return SQL_ERROR; - return pSQLTransact(EnvironmentHandle, ConnectionHandle, CompletionType); -} + TRACE("(EnvironmentHandle %p, ConnectionHandle %p, CompletionType %d)\n", EnvironmentHandle, ConnectionHandle, + CompletionType); + + if (!pSQLTransact) return SQL_ERROR; + ret = pSQLTransact(EnvironmentHandle, ConnectionHandle, CompletionType); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLBrowseConnect [ODBC32.055] */ -SQLRETURN WINAPI ODBC32_SQLBrowseConnect( - SQLHDBC hdbc, - SQLCHAR *szConnStrIn, - SQLSMALLINT cbConnStrIn, - SQLCHAR *szConnStrOut, - SQLSMALLINT cbConnStrOutMax, - SQLSMALLINT *pcbConnStrOut) +SQLRETURN WINAPI ODBC32_SQLBrowseConnect(SQLHDBC hdbc, SQLCHAR *szConnStrIn, SQLSMALLINT cbConnStrIn, + SQLCHAR *szConnStrOut, SQLSMALLINT cbConnStrOutMax, + SQLSMALLINT *pcbConnStrOut) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLBrowseConnect) return SQL_ERROR; - return pSQLBrowseConnect(hdbc, szConnStrIn, cbConnStrIn, szConnStrOut, cbConnStrOutMax, pcbConnStrOut); -} + TRACE("(hdbc %p, szConnStrIn %s, cbConnStrIn %d, szConnStrOut %p, cbConnStrOutMax %d, pcbConnStrOut %p)\n", + hdbc, debugstr_an((const char *)szConnStrIn, cbConnStrIn), cbConnStrIn, szConnStrOut, cbConnStrOutMax, + pcbConnStrOut); + if (!pSQLBrowseConnect) return SQL_ERROR; + + ret = pSQLBrowseConnect(hdbc, szConnStrIn, cbConnStrIn, szConnStrOut, cbConnStrOutMax, pcbConnStrOut); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLBulkOperations [ODBC32.078] */ -SQLRETURN WINAPI ODBC32_SQLBulkOperations( - SQLHSTMT StatementHandle, - SQLSMALLINT Operation) +SQLRETURN WINAPI ODBC32_SQLBulkOperations(SQLHSTMT StatementHandle, SQLSMALLINT Operation) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLBulkOperations) return SQL_ERROR; - return pSQLBulkOperations(StatementHandle, Operation); -} + TRACE("(StatementHandle %p, Operation %d)\n", StatementHandle, Operation); + + if (!pSQLBulkOperations) return SQL_ERROR; + ret = pSQLBulkOperations(StatementHandle, Operation); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLColAttributes [ODBC32.006] @@ -1744,42 +1914,44 @@ SQLRETURN WINAPI ODBC32_SQLColAttributes(SQLHSTMT hstmt, SQLUSMALLINT icol, SQLU /************************************************************************* * SQLColumnPrivileges [ODBC32.056] */ -SQLRETURN WINAPI ODBC32_SQLColumnPrivileges( - SQLHSTMT hstmt, - SQLCHAR *szCatalogName, - SQLSMALLINT cbCatalogName, - SQLCHAR *szSchemaName, - SQLSMALLINT cbSchemaName, - SQLCHAR *szTableName, - SQLSMALLINT cbTableName, - SQLCHAR *szColumnName, - SQLSMALLINT cbColumnName) +SQLRETURN WINAPI ODBC32_SQLColumnPrivileges(SQLHSTMT hstmt, SQLCHAR *szCatalogName, SQLSMALLINT cbCatalogName, + SQLCHAR *szSchemaName, SQLSMALLINT cbSchemaName, SQLCHAR *szTableName, + SQLSMALLINT cbTableName, SQLCHAR *szColumnName, SQLSMALLINT cbColumnName) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLColumnPrivileges) return SQL_ERROR; - return pSQLColumnPrivileges(hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, - szTableName, cbTableName, szColumnName, cbColumnName); -} + TRACE("(hstmt %p, szCatalogName %s, cbCatalogName %d, szSchemaName %s, cbSchemaName %d, szTableName %s," + " cbTableName %d, szColumnName %s, cbColumnName %d)\n", hstmt, + debugstr_an((const char *)szCatalogName, cbCatalogName), cbCatalogName, + debugstr_an((const char *)szSchemaName, cbSchemaName), cbSchemaName, + debugstr_an((const char *)szTableName, cbTableName), cbTableName, + debugstr_an((const char *)szColumnName, cbColumnName), cbColumnName); + + if (!pSQLColumnPrivileges) return SQL_ERROR; + ret = pSQLColumnPrivileges(hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, + szTableName, cbTableName, szColumnName, cbColumnName); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLDescribeParam [ODBC32.058] */ -SQLRETURN WINAPI ODBC32_SQLDescribeParam( - SQLHSTMT hstmt, - SQLUSMALLINT ipar, - SQLSMALLINT *pfSqlType, - SQLULEN *pcbParamDef, - SQLSMALLINT *pibScale, - SQLSMALLINT *pfNullable) +SQLRETURN WINAPI ODBC32_SQLDescribeParam(SQLHSTMT hstmt, SQLUSMALLINT ipar, SQLSMALLINT *pfSqlType, + SQLULEN *pcbParamDef, SQLSMALLINT *pibScale, SQLSMALLINT *pfNullable) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLDescribeParam) return SQL_ERROR; - return pSQLDescribeParam(hstmt, ipar, pfSqlType, pcbParamDef, pibScale, pfNullable); -} + TRACE("(hstmt %p, ipar %d, pfSqlType %p, pcbParamDef %p, pibScale %p, pfNullable %p)\n", hstmt, ipar, + pfSqlType, pcbParamDef, pibScale, pfNullable); + if (!pSQLDescribeParam) return SQL_ERROR; + + ret = pSQLDescribeParam(hstmt, ipar, pfSqlType, pcbParamDef, pibScale, pfNullable); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLExtendedFetch [ODBC32.059] @@ -1802,30 +1974,33 @@ SQLRETURN WINAPI ODBC32_SQLExtendedFetch(SQLHSTMT hstmt, SQLUSMALLINT fFetchType /************************************************************************* * SQLForeignKeys [ODBC32.060] */ -SQLRETURN WINAPI ODBC32_SQLForeignKeys( - SQLHSTMT hstmt, - SQLCHAR *szPkCatalogName, - SQLSMALLINT cbPkCatalogName, - SQLCHAR *szPkSchemaName, - SQLSMALLINT cbPkSchemaName, - SQLCHAR *szPkTableName, - SQLSMALLINT cbPkTableName, - SQLCHAR *szFkCatalogName, - SQLSMALLINT cbFkCatalogName, - SQLCHAR *szFkSchemaName, - SQLSMALLINT cbFkSchemaName, - SQLCHAR *szFkTableName, - SQLSMALLINT cbFkTableName) +SQLRETURN WINAPI ODBC32_SQLForeignKeys(SQLHSTMT hstmt, SQLCHAR *szPkCatalogName, SQLSMALLINT cbPkCatalogName, + SQLCHAR *szPkSchemaName, SQLSMALLINT cbPkSchemaName, SQLCHAR *szPkTableName, + SQLSMALLINT cbPkTableName, SQLCHAR *szFkCatalogName, + SQLSMALLINT cbFkCatalogName, SQLCHAR *szFkSchemaName, + SQLSMALLINT cbFkSchemaName, SQLCHAR *szFkTableName, SQLSMALLINT cbFkTableName) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLForeignKeys) return SQL_ERROR; - return pSQLForeignKeys(hstmt, szPkCatalogName, cbPkCatalogName, szPkSchemaName, cbPkSchemaName, - szPkTableName, cbPkTableName, szFkCatalogName, cbFkCatalogName, - szFkSchemaName, cbFkSchemaName, szFkTableName, cbFkTableName); + TRACE("(hstmt %p, szPkCatalogName %s, cbPkCatalogName %d, szPkSchemaName %s, cbPkSchemaName %d," + " szPkTableName %s, cbPkTableName %d, szFkCatalogName %s, cbFkCatalogName %d, szFkSchemaName %s," + " cbFkSchemaName %d, szFkTableName %s, cbFkTableName %d)\n", hstmt, + debugstr_an((const char *)szPkCatalogName, cbPkCatalogName), cbPkCatalogName, + debugstr_an((const char *)szPkSchemaName, cbPkSchemaName), cbPkSchemaName, + debugstr_an((const char *)szPkTableName, cbPkTableName), cbPkTableName, + debugstr_an((const char *)szFkCatalogName, cbFkCatalogName), cbFkCatalogName, + debugstr_an((const char *)szFkSchemaName, cbFkSchemaName), cbFkSchemaName, + debugstr_an((const char *)szFkTableName, cbFkTableName), cbFkTableName); + + if (!pSQLForeignKeys) return SQL_ERROR; + + ret = pSQLForeignKeys(hstmt, szPkCatalogName, cbPkCatalogName, szPkSchemaName, cbPkSchemaName, szPkTableName, + cbPkTableName, szFkCatalogName, cbFkCatalogName, szFkSchemaName, cbFkSchemaName, + szFkTableName, cbFkTableName); + TRACE("Returning %d\n", ret); + return ret; } - /************************************************************************* * SQLMoreResults [ODBC32.061] */ @@ -1845,34 +2020,36 @@ SQLRETURN WINAPI ODBC32_SQLMoreResults(SQLHSTMT StatementHandle) /************************************************************************* * SQLNativeSql [ODBC32.062] */ -SQLRETURN WINAPI ODBC32_SQLNativeSql( - SQLHDBC hdbc, - SQLCHAR *szSqlStrIn, - SQLINTEGER cbSqlStrIn, - SQLCHAR *szSqlStr, - SQLINTEGER cbSqlStrMax, - SQLINTEGER *pcbSqlStr) +SQLRETURN WINAPI ODBC32_SQLNativeSql(SQLHDBC hdbc, SQLCHAR *szSqlStrIn, SQLINTEGER cbSqlStrIn, SQLCHAR *szSqlStr, + SQLINTEGER cbSqlStrMax, SQLINTEGER *pcbSqlStr) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLNativeSql) return SQL_ERROR; - return pSQLNativeSql(hdbc, szSqlStrIn, cbSqlStrIn, szSqlStr, cbSqlStrMax, pcbSqlStr); -} + TRACE("(hdbc %p, szSqlStrIn %s, cbSqlStrIn %d, szSqlStr %p, cbSqlStrMax %d, pcbSqlStr %p)\n", hdbc, + debugstr_an((const char *)szSqlStrIn, cbSqlStrIn), cbSqlStrIn, szSqlStr, cbSqlStrMax, pcbSqlStr); + if (!pSQLNativeSql) return SQL_ERROR; + + ret = pSQLNativeSql(hdbc, szSqlStrIn, cbSqlStrIn, szSqlStr, cbSqlStrMax, pcbSqlStr); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLNumParams [ODBC32.063] */ -SQLRETURN WINAPI ODBC32_SQLNumParams( - SQLHSTMT hstmt, - SQLSMALLINT *pcpar) +SQLRETURN WINAPI ODBC32_SQLNumParams(SQLHSTMT hstmt, SQLSMALLINT *pcpar) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLNumParams) return SQL_ERROR; - return pSQLNumParams(hstmt, pcpar); -} + TRACE("(hstmt %p, pcpar %p)\n", hstmt, pcpar); + + if (!pSQLNumParams) return SQL_ERROR; + ret = pSQLNumParams(hstmt, pcpar); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLParamOptions [ODBC32.064] @@ -1893,100 +2070,109 @@ SQLRETURN WINAPI ODBC32_SQLParamOptions(SQLHSTMT hstmt, SQLULEN crow, SQLULEN *p /************************************************************************* * SQLPrimaryKeys [ODBC32.065] */ -SQLRETURN WINAPI ODBC32_SQLPrimaryKeys( - SQLHSTMT hstmt, - SQLCHAR *szCatalogName, - SQLSMALLINT cbCatalogName, - SQLCHAR *szSchemaName, - SQLSMALLINT cbSchemaName, - SQLCHAR *szTableName, - SQLSMALLINT cbTableName) +SQLRETURN WINAPI ODBC32_SQLPrimaryKeys(SQLHSTMT hstmt, SQLCHAR *szCatalogName, SQLSMALLINT cbCatalogName, + SQLCHAR *szSchemaName, SQLSMALLINT cbSchemaName, SQLCHAR *szTableName, + SQLSMALLINT cbTableName) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLPrimaryKeys) return SQL_ERROR; - return pSQLPrimaryKeys(hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, - szTableName, cbTableName); -} + TRACE("(hstmt %p, szCatalogName %s, cbCatalogName %d, szSchemaName %s, cbSchemaName %d, szTableName %s," + " cbTableName %d)\n", hstmt, + debugstr_an((const char *)szCatalogName, cbCatalogName), cbCatalogName, + debugstr_an((const char *)szSchemaName, cbSchemaName), cbSchemaName, + debugstr_an((const char *)szTableName, cbTableName), cbTableName); + if (!pSQLPrimaryKeys) return SQL_ERROR; + + ret = pSQLPrimaryKeys(hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, szTableName, cbTableName); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLProcedureColumns [ODBC32.066] */ -SQLRETURN WINAPI ODBC32_SQLProcedureColumns( - SQLHSTMT hstmt, - SQLCHAR *szCatalogName, - SQLSMALLINT cbCatalogName, - SQLCHAR *szSchemaName, - SQLSMALLINT cbSchemaName, - SQLCHAR *szProcName, - SQLSMALLINT cbProcName, - SQLCHAR *szColumnName, - SQLSMALLINT cbColumnName) +SQLRETURN WINAPI ODBC32_SQLProcedureColumns(SQLHSTMT hstmt, SQLCHAR *szCatalogName, SQLSMALLINT cbCatalogName, + SQLCHAR *szSchemaName, SQLSMALLINT cbSchemaName, SQLCHAR *szProcName, + SQLSMALLINT cbProcName, SQLCHAR *szColumnName, SQLSMALLINT cbColumnName) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLProcedureColumns) return SQL_ERROR; - return pSQLProcedureColumns(hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, - szProcName, cbProcName, szColumnName, cbColumnName); -} + TRACE("(hstmt %p, szCatalogName %s, cbCatalogName %d, szSchemaName %s, cbSchemaName %d, szProcName %s," + " cbProcName %d, szColumnName %s, cbColumnName %d)\n", hstmt, + debugstr_an((const char *)szCatalogName, cbCatalogName), cbCatalogName, + debugstr_an((const char *)szSchemaName, cbSchemaName), cbSchemaName, + debugstr_an((const char *)szProcName, cbProcName), cbProcName, + debugstr_an((const char *)szColumnName, cbColumnName), cbColumnName); + + if (!pSQLProcedureColumns) return SQL_ERROR; + ret = pSQLProcedureColumns(hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, szProcName, + cbProcName, szColumnName, cbColumnName); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLProcedures [ODBC32.067] */ -SQLRETURN WINAPI ODBC32_SQLProcedures( - SQLHSTMT hstmt, - SQLCHAR *szCatalogName, - SQLSMALLINT cbCatalogName, - SQLCHAR *szSchemaName, - SQLSMALLINT cbSchemaName, - SQLCHAR *szProcName, - SQLSMALLINT cbProcName) +SQLRETURN WINAPI ODBC32_SQLProcedures(SQLHSTMT hstmt, SQLCHAR *szCatalogName, SQLSMALLINT cbCatalogName, + SQLCHAR *szSchemaName, SQLSMALLINT cbSchemaName, SQLCHAR *szProcName, + SQLSMALLINT cbProcName) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLProcedures) return SQL_ERROR; - return pSQLProcedures(hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, - szProcName, cbProcName); -} + TRACE("(hstmt %p, szCatalogName %s, cbCatalogName %d, szSchemaName %s, cbSchemaName %d, szProcName %s," + " cbProcName %d)\n", hstmt, + debugstr_an((const char *)szCatalogName, cbCatalogName), cbCatalogName, + debugstr_an((const char *)szSchemaName, cbSchemaName), cbSchemaName, + debugstr_an((const char *)szProcName, cbProcName), cbProcName); + if (!pSQLProcedures) return SQL_ERROR; + + ret = pSQLProcedures(hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, szProcName, cbProcName); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLSetPos [ODBC32.068] */ -SQLRETURN WINAPI ODBC32_SQLSetPos( - SQLHSTMT hstmt, - SQLSETPOSIROW irow, - SQLUSMALLINT fOption, - SQLUSMALLINT fLock) +SQLRETURN WINAPI ODBC32_SQLSetPos(SQLHSTMT hstmt, SQLSETPOSIROW irow, SQLUSMALLINT fOption, SQLUSMALLINT fLock) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLSetPos) return SQL_ERROR; - return pSQLSetPos(hstmt, irow, fOption, fLock); -} + TRACE("(hstmt %p, irow %s, fOption %d, fLock %d)\n", hstmt, debugstr_sqlulen(irow), fOption, fLock); + + if (!pSQLSetPos) return SQL_ERROR; + ret = pSQLSetPos(hstmt, irow, fOption, fLock); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLTablePrivileges [ODBC32.070] */ -SQLRETURN WINAPI ODBC32_SQLTablePrivileges( - SQLHSTMT hstmt, - SQLCHAR *szCatalogName, - SQLSMALLINT cbCatalogName, - SQLCHAR *szSchemaName, - SQLSMALLINT cbSchemaName, - SQLCHAR *szTableName, - SQLSMALLINT cbTableName) +SQLRETURN WINAPI ODBC32_SQLTablePrivileges(SQLHSTMT hstmt, SQLCHAR *szCatalogName, SQLSMALLINT cbCatalogName, + SQLCHAR *szSchemaName, SQLSMALLINT cbSchemaName, SQLCHAR *szTableName, + SQLSMALLINT cbTableName) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLTablePrivileges) return SQL_ERROR; - return pSQLTablePrivileges(hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, - szTableName, cbTableName); -} + TRACE("(hstmt %p, szCatalogName %s, cbCatalogName %d, szSchemaName %s, cbSchemaName %d, szTableName %s," + " cbTableName %d)\n", hstmt, + debugstr_an((const char *)szCatalogName, cbCatalogName), cbCatalogName, + debugstr_an((const char *)szSchemaName, cbSchemaName), cbSchemaName, + debugstr_an((const char *)szTableName, cbTableName), cbTableName); + if (!pSQLTablePrivileges) return SQL_ERROR; + + ret = pSQLTablePrivileges(hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, szTableName, + cbTableName); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLDrivers [ODBC32.071] @@ -2017,65 +2203,63 @@ SQLRETURN WINAPI ODBC32_SQLDrivers(SQLHENV EnvironmentHandle, SQLUSMALLINT fDire /************************************************************************* * SQLBindParameter [ODBC32.072] */ -SQLRETURN WINAPI ODBC32_SQLBindParameter( - SQLHSTMT hstmt, - SQLUSMALLINT ipar, - SQLSMALLINT fParamType, - SQLSMALLINT fCType, - SQLSMALLINT fSqlType, - SQLULEN cbColDef, - SQLSMALLINT ibScale, - SQLPOINTER rgbValue, - SQLLEN cbValueMax, - SQLLEN *pcbValue) +SQLRETURN WINAPI ODBC32_SQLBindParameter(SQLHSTMT hstmt, SQLUSMALLINT ipar, SQLSMALLINT fParamType, + SQLSMALLINT fCType, SQLSMALLINT fSqlType, SQLULEN cbColDef, + SQLSMALLINT ibScale, SQLPOINTER rgbValue, SQLLEN cbValueMax, + SQLLEN *pcbValue) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLBindParameter) return SQL_ERROR; - return pSQLBindParameter(hstmt, ipar, fParamType, fCType, fSqlType, cbColDef, ibScale, - rgbValue, cbValueMax, pcbValue); -} + TRACE("(hstmt %p, ipar %d, fParamType %d, fCType %d, fSqlType %d, cbColDef %s, ibScale %d, rgbValue %p," + " cbValueMax %d, pcbValue %p)\n", hstmt, ipar, fParamType, fCType, fSqlType, debugstr_sqlulen(cbColDef), + ibScale, rgbValue, cbValueMax, pcbValue); + + if (!pSQLBindParameter) return SQL_ERROR; + ret = pSQLBindParameter(hstmt, ipar, fParamType, fCType, fSqlType, cbColDef, ibScale, rgbValue, cbValueMax, + pcbValue); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLDriverConnect [ODBC32.041] */ -SQLRETURN WINAPI ODBC32_SQLDriverConnect( - SQLHDBC hdbc, - SQLHWND hwnd, - SQLCHAR *conn_str_in, - SQLSMALLINT len_conn_str_in, - SQLCHAR *conn_str_out, - SQLSMALLINT conn_str_out_max, - SQLSMALLINT *ptr_conn_str_out, - SQLUSMALLINT driver_completion ) +SQLRETURN WINAPI ODBC32_SQLDriverConnect(SQLHDBC hdbc, SQLHWND hwnd, SQLCHAR *ConnectionString, SQLSMALLINT Length, + SQLCHAR *conn_str_out, SQLSMALLINT conn_str_out_max, + SQLSMALLINT *ptr_conn_str_out, SQLUSMALLINT driver_completion) { - SQLRETURN ret; + SQLRETURN ret; - TRACE("(ConnectionString %s, Length %d)\n", - debugstr_a((char *)conn_str_in), len_conn_str_in); + TRACE("(hdbc %p, hwnd %p, ConnectionString %s, Length %d, conn_str_out %p, conn_str_out_max %d," + " ptr_conn_str_out %p, driver_completion %d)\n", hdbc, hwnd, + debugstr_an((const char *)ConnectionString, Length), Length, conn_str_out, conn_str_out_max, + ptr_conn_str_out, driver_completion); - if (!pSQLDriverConnect) return SQL_ERROR; - ret = pSQLDriverConnect(hdbc, hwnd, conn_str_in, len_conn_str_in, conn_str_out, - conn_str_out_max, ptr_conn_str_out, driver_completion); - TRACE("Returns %d\n", ret); - return ret; -} + if (!pSQLDriverConnect) return SQL_ERROR; + ret = pSQLDriverConnect(hdbc, hwnd, ConnectionString, Length, conn_str_out, conn_str_out_max, + ptr_conn_str_out, driver_completion); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLSetScrollOptions [ODBC32.069] */ -SQLRETURN WINAPI ODBC32_SQLSetScrollOptions( - SQLHSTMT statement_handle, - SQLUSMALLINT f_concurrency, - SQLLEN crow_keyset, - SQLUSMALLINT crow_rowset ) +SQLRETURN WINAPI ODBC32_SQLSetScrollOptions(SQLHSTMT statement_handle, SQLUSMALLINT f_concurrency, SQLLEN crow_keyset, + SQLUSMALLINT crow_rowset) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLSetScrollOptions) return SQL_ERROR; - return pSQLSetScrollOptions(statement_handle, f_concurrency, crow_keyset, crow_rowset); + TRACE("(statement_handle %p, f_concurrency %d, crow_keyset %s, crow_rowset %d)\n", statement_handle, + f_concurrency, debugstr_sqllen(crow_keyset), crow_rowset); + + if (!pSQLSetScrollOptions) return SQL_ERROR; + + ret = pSQLSetScrollOptions(statement_handle, f_concurrency, crow_keyset, crow_rowset); + TRACE("Returning %d\n", ret); + return ret; } static BOOL SQLColAttributes_KnownStringAttribute(SQLUSMALLINT fDescType) @@ -2111,55 +2295,48 @@ static BOOL SQLColAttributes_KnownStringAttribute(SQLUSMALLINT fDescType) /************************************************************************* * SQLColAttributesW [ODBC32.106] */ -SQLRETURN WINAPI ODBC32_SQLColAttributesW( - SQLHSTMT hstmt, - SQLUSMALLINT icol, - SQLUSMALLINT fDescType, - SQLPOINTER rgbDesc, - SQLSMALLINT cbDescMax, - SQLSMALLINT *pcbDesc, - SQLLEN *pfDesc) -{ - SQLRETURN iResult; - - TRACE("hstmt=%p icol=%d fDescType=%d rgbDesc=%p cbDescMax=%d pcbDesc=%p pfDesc=%p\n", - hstmt, icol, fDescType, rgbDesc, cbDescMax, pcbDesc, pfDesc); - - if (!pSQLColAttributesW) return SQL_ERROR; - - iResult = pSQLColAttributesW(hstmt, icol, fDescType, rgbDesc, cbDescMax, pcbDesc, pfDesc); - if (iResult == SQL_SUCCESS && rgbDesc != NULL && SQLColAttributes_KnownStringAttribute(fDescType)) { - /* - TRACE("Dumping values fetched via SQLColAttributesW:\n"); - TRACE(" Attribute name : %s\n", debugstr_w(rgbDesc)); - TRACE(" Declared length: %d\n", *pcbDesc); - */ - if (*pcbDesc != lstrlenW(rgbDesc) * 2) { - TRACE("CHEAT: resetting name length for ADO\n"); - *pcbDesc = lstrlenW(rgbDesc) * 2; - } - } - return iResult; +SQLRETURN WINAPI ODBC32_SQLColAttributesW(SQLHSTMT hstmt, SQLUSMALLINT icol, SQLUSMALLINT fDescType, + SQLPOINTER rgbDesc, SQLSMALLINT cbDescMax, SQLSMALLINT *pcbDesc, + SQLLEN *pfDesc) +{ + SQLRETURN ret; + + TRACE("(hstmt %p, icol %d, fDescType %d, rgbDesc %p, cbDescMax %d, pcbDesc %p, pfDesc %p)\n", hstmt, icol, + fDescType, rgbDesc, cbDescMax, pcbDesc, pfDesc); + + if (!pSQLColAttributesW) return SQL_ERROR; + + ret = pSQLColAttributesW(hstmt, icol, fDescType, rgbDesc, cbDescMax, pcbDesc, pfDesc); + + if (ret == SQL_SUCCESS && SQLColAttributes_KnownStringAttribute(fDescType) && rgbDesc && pcbDesc && + *pcbDesc != lstrlenW(rgbDesc) * 2) + { + TRACE("CHEAT: resetting name length for ADO\n"); + *pcbDesc = lstrlenW(rgbDesc) * 2; + } + + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* * SQLConnectW [ODBC32.107] */ -SQLRETURN WINAPI ODBC32_SQLConnectW(SQLHDBC ConnectionHandle, - WCHAR *ServerName, SQLSMALLINT NameLength1, - WCHAR *UserName, SQLSMALLINT NameLength2, - WCHAR *Authentication, SQLSMALLINT NameLength3) +SQLRETURN WINAPI ODBC32_SQLConnectW(SQLHDBC ConnectionHandle, WCHAR *ServerName, SQLSMALLINT NameLength1, + WCHAR *UserName, SQLSMALLINT NameLength2, WCHAR *Authentication, + SQLSMALLINT NameLength3) { - SQLRETURN ret; - TRACE("(Server=%.*s)\n",NameLength1+3, debugstr_w(ServerName)); + SQLRETURN ret; - if (!pSQLConnectW) return SQL_ERROR; + TRACE("(ConnectionHandle %p, ServerName %s, NameLength1 %d, UserName %s, NameLength2 %d, Authentication %p," + " NameLength3 %d)\n", ConnectionHandle, debugstr_wn(ServerName, NameLength1), NameLength1, + debugstr_wn(UserName, NameLength2), NameLength2, debugstr_wn(Authentication, NameLength3), NameLength3); - ret = pSQLConnectW(ConnectionHandle, ServerName, NameLength1, - UserName, NameLength2, Authentication, NameLength3); + if (!pSQLConnectW) return SQL_ERROR; - TRACE("Returns %d\n", ret); - return ret; + ret = pSQLConnectW(ConnectionHandle, ServerName, NameLength1, UserName, NameLength2, Authentication, NameLength3); + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* @@ -2197,17 +2374,30 @@ SQLRETURN WINAPI ODBC32_SQLDescribeColW(SQLHSTMT StatementHandle, SQLUSMALLINT C /************************************************************************* * SQLErrorW [ODBC32.110] */ -SQLRETURN WINAPI ODBC32_SQLErrorW(SQLHENV EnvironmentHandle, - SQLHDBC ConnectionHandle, SQLHSTMT StatementHandle, - WCHAR *Sqlstate, SQLINTEGER *NativeError, - WCHAR *MessageText, SQLSMALLINT BufferLength, - SQLSMALLINT *TextLength) +SQLRETURN WINAPI ODBC32_SQLErrorW(SQLHENV EnvironmentHandle, SQLHDBC ConnectionHandle, SQLHSTMT StatementHandle, + WCHAR *Sqlstate, SQLINTEGER *NativeError, WCHAR *MessageText, + SQLSMALLINT BufferLength, SQLSMALLINT *TextLength) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLErrorW) return SQL_ERROR; - return pSQLErrorW(EnvironmentHandle, ConnectionHandle, StatementHandle, - Sqlstate, NativeError, MessageText, BufferLength, TextLength); + TRACE("(EnvironmentHandle %p, ConnectionHandle %p, StatementHandle %p, Sqlstate %p, NativeError %p," + " MessageText %p, BufferLength %d, TextLength %p)\n", EnvironmentHandle, ConnectionHandle, + StatementHandle, Sqlstate, NativeError, MessageText, BufferLength, TextLength); + + if (!pSQLErrorW) return SQL_ERROR; + + ret = pSQLErrorW(EnvironmentHandle, ConnectionHandle, StatementHandle, Sqlstate, NativeError, MessageText, + BufferLength, TextLength); + + if (ret == SQL_SUCCESS) + { + TRACE(" SQLState %s\n", debugstr_wn(Sqlstate, 5)); + TRACE(" Error %d\n", *NativeError); + TRACE(" MessageText %s\n", debugstr_wn(MessageText, *TextLength)); + } + + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* @@ -2230,26 +2420,36 @@ SQLRETURN WINAPI ODBC32_SQLExecDirectW(SQLHSTMT StatementHandle, WCHAR *Statemen /************************************************************************* * SQLGetCursorNameW [ODBC32.117] */ -SQLRETURN WINAPI ODBC32_SQLGetCursorNameW(SQLHSTMT StatementHandle, - WCHAR *CursorName, SQLSMALLINT BufferLength, - SQLSMALLINT *NameLength) +SQLRETURN WINAPI ODBC32_SQLGetCursorNameW(SQLHSTMT StatementHandle, WCHAR *CursorName, SQLSMALLINT BufferLength, + SQLSMALLINT *NameLength) { - TRACE("\n"); + SQLRETURN ret; + + TRACE("(StatementHandle %p, CursorName %p, BufferLength %d, NameLength %p)\n", StatementHandle, CursorName, + BufferLength, NameLength); + + if (!pSQLGetCursorNameW) return SQL_ERROR; - if (!pSQLGetCursorNameW) return SQL_ERROR; - return pSQLGetCursorNameW(StatementHandle, CursorName, BufferLength, NameLength); + ret = pSQLGetCursorNameW(StatementHandle, CursorName, BufferLength, NameLength); + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* * SQLPrepareW [ODBC32.119] */ -SQLRETURN WINAPI ODBC32_SQLPrepareW(SQLHSTMT StatementHandle, - WCHAR *StatementText, SQLINTEGER TextLength) +SQLRETURN WINAPI ODBC32_SQLPrepareW(SQLHSTMT StatementHandle, WCHAR *StatementText, SQLINTEGER TextLength) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLPrepareW) return SQL_ERROR; - return pSQLPrepareW(StatementHandle, StatementText, TextLength); + TRACE("(StatementHandle %p, StatementText %s, TextLength %d)\n", StatementHandle, + debugstr_wn(StatementText, TextLength), TextLength); + + if (!pSQLPrepareW) return SQL_ERROR; + + ret = pSQLPrepareW(StatementHandle, StatementText, TextLength); + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* @@ -2257,42 +2457,46 @@ SQLRETURN WINAPI ODBC32_SQLPrepareW(SQLHSTMT StatementHandle, */ SQLRETURN WINAPI ODBC32_SQLSetCursorNameW(SQLHSTMT StatementHandle, WCHAR *CursorName, SQLSMALLINT NameLength) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLSetCursorNameW) return SQL_ERROR; - return pSQLSetCursorNameW(StatementHandle, CursorName, NameLength); + TRACE("(StatementHandle %p, CursorName %s, NameLength %d)\n", StatementHandle, + debugstr_wn(CursorName, NameLength), NameLength); + + if (!pSQLSetCursorNameW) return SQL_ERROR; + + ret = pSQLSetCursorNameW(StatementHandle, CursorName, NameLength); + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* * SQLColAttributeW [ODBC32.127] */ -SQLRETURN WINAPI ODBC32_SQLColAttributeW (SQLHSTMT StatementHandle, - SQLUSMALLINT ColumnNumber, SQLUSMALLINT FieldIdentifier, - SQLPOINTER CharacterAttribute, SQLSMALLINT BufferLength, - SQLSMALLINT *StringLength, SQLLEN *NumericAttribute) -{ - SQLRETURN iResult; - - TRACE("StatementHandle=%p ColumnNumber=%d FieldIdentifier=%d CharacterAttribute=%p BufferLength=%d StringLength=%p NumericAttribute=%p\n", - StatementHandle, ColumnNumber, FieldIdentifier, - CharacterAttribute, BufferLength, StringLength, NumericAttribute); - - if (!pSQLColAttributeW) return SQL_ERROR; - - iResult = pSQLColAttributeW(StatementHandle, ColumnNumber, FieldIdentifier, - CharacterAttribute, BufferLength, StringLength, NumericAttribute); - if (iResult == SQL_SUCCESS && CharacterAttribute != NULL && SQLColAttributes_KnownStringAttribute(FieldIdentifier)) { - /* - TRACE("Dumping values fetched via SQLColAttributeW:\n"); - TRACE(" Attribute name : %s\n", debugstr_w(rgbDesc)); - TRACE(" Declared length: %d\n", *pcbDesc); - */ - if (*StringLength != lstrlenW(CharacterAttribute) * 2) { - TRACE("CHEAT: resetting name length for ADO\n"); - *StringLength = lstrlenW(CharacterAttribute) * 2; - } - } - return iResult; +SQLRETURN WINAPI ODBC32_SQLColAttributeW(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNumber, + SQLUSMALLINT FieldIdentifier, SQLPOINTER CharacterAttribute, + SQLSMALLINT BufferLength, SQLSMALLINT *StringLength, + SQLLEN *NumericAttribute) +{ + SQLRETURN ret; + + TRACE("StatementHandle %p ColumnNumber %d FieldIdentifier %d CharacterAttribute %p BufferLength %d" + " StringLength %p NumericAttribute %p\n", StatementHandle, ColumnNumber, FieldIdentifier, + CharacterAttribute, BufferLength, StringLength, NumericAttribute); + + if (!pSQLColAttributeW) return SQL_ERROR; + + ret = pSQLColAttributeW(StatementHandle, ColumnNumber, FieldIdentifier, CharacterAttribute, BufferLength, + StringLength, NumericAttribute); + + if (ret == SQL_SUCCESS && CharacterAttribute != NULL && SQLColAttributes_KnownStringAttribute(FieldIdentifier) && + StringLength && *StringLength != lstrlenW(CharacterAttribute) * 2) + { + TRACE("CHEAT: resetting name length for ADO\n"); + *StringLength = lstrlenW(CharacterAttribute) * 2; + } + + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* @@ -2316,33 +2520,41 @@ SQLRETURN WINAPI ODBC32_SQLGetConnectAttrW(SQLHDBC ConnectionHandle, SQLINTEGER /************************************************************************* * SQLGetDescFieldW [ODBC32.133] */ -SQLRETURN WINAPI ODBC32_SQLGetDescFieldW(SQLHDESC DescriptorHandle, - SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier, - SQLPOINTER Value, SQLINTEGER BufferLength, - SQLINTEGER *StringLength) +SQLRETURN WINAPI ODBC32_SQLGetDescFieldW(SQLHDESC DescriptorHandle, SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier, + SQLPOINTER Value, SQLINTEGER BufferLength, SQLINTEGER *StringLength) { - TRACE("\n"); + SQLRETURN ret; + + TRACE("(DescriptorHandle %p, RecNumber %d, FieldIdentifier %d, Value %p, BufferLength %d, StringLength %p)\n", + DescriptorHandle, RecNumber, FieldIdentifier, Value, BufferLength, StringLength); - if (!pSQLGetDescFieldW) return SQL_ERROR; - return pSQLGetDescFieldW(DescriptorHandle, RecNumber, FieldIdentifier, - Value, BufferLength, StringLength); + if (!pSQLGetDescFieldW) return SQL_ERROR; + + ret = pSQLGetDescFieldW(DescriptorHandle, RecNumber, FieldIdentifier, Value, BufferLength, StringLength); + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* * SQLGetDescRecW [ODBC32.134] */ -SQLRETURN WINAPI ODBC32_SQLGetDescRecW(SQLHDESC DescriptorHandle, - SQLSMALLINT RecNumber, WCHAR *Name, - SQLSMALLINT BufferLength, SQLSMALLINT *StringLength, - SQLSMALLINT *Type, SQLSMALLINT *SubType, - SQLLEN *Length, SQLSMALLINT *Precision, - SQLSMALLINT *Scale, SQLSMALLINT *Nullable) +SQLRETURN WINAPI ODBC32_SQLGetDescRecW(SQLHDESC DescriptorHandle, SQLSMALLINT RecNumber, WCHAR *Name, + SQLSMALLINT BufferLength, SQLSMALLINT *StringLength, SQLSMALLINT *Type, + SQLSMALLINT *SubType, SQLLEN *Length, SQLSMALLINT *Precision, + SQLSMALLINT *Scale, SQLSMALLINT *Nullable) { - TRACE("\n"); + SQLRETURN ret; + + TRACE("(DescriptorHandle %p, RecNumber %d, Name %p, BufferLength %d, StringLength %p, Type %p, SubType %p," + " Length %p, Precision %p, Scale %p, Nullable %p)\n", DescriptorHandle, RecNumber, Name, BufferLength, + StringLength, Type, SubType, Length, Precision, Scale, Nullable); - if (!pSQLGetDescRecW) return SQL_ERROR; - return pSQLGetDescRecW(DescriptorHandle, RecNumber, Name, BufferLength, - StringLength, Type, SubType, Length, Precision, Scale, Nullable); + if (!pSQLGetDescRecW) return SQL_ERROR; + + ret = pSQLGetDescRecW(DescriptorHandle, RecNumber, Name, BufferLength, StringLength, Type, SubType, Length, + Precision, Scale, Nullable); + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* @@ -2367,16 +2579,21 @@ SQLRETURN WINAPI ODBC32_SQLGetDiagFieldW(SQLSMALLINT HandleType, SQLHANDLE Handl /************************************************************************* * SQLGetDiagRecW [ODBC32.136] */ -SQLRETURN WINAPI ODBC32_SQLGetDiagRecW(SQLSMALLINT HandleType, SQLHANDLE Handle, - SQLSMALLINT RecNumber, WCHAR *Sqlstate, - SQLINTEGER *NativeError, WCHAR *MessageText, - SQLSMALLINT BufferLength, SQLSMALLINT *TextLength) +SQLRETURN WINAPI ODBC32_SQLGetDiagRecW(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLSMALLINT RecNumber, + WCHAR *Sqlstate, SQLINTEGER *NativeError, WCHAR *MessageText, + SQLSMALLINT BufferLength, SQLSMALLINT *TextLength) { - TRACE("\n"); + SQLRETURN ret; + + TRACE("(HandleType %d, Handle %p, RecNumber %d, Sqlstate %p, NativeError %p, MessageText %p, BufferLength %d," + " TextLength %p)\n", HandleType, Handle, RecNumber, Sqlstate, NativeError, MessageText, BufferLength, + TextLength); - if (!pSQLGetDiagRecW) return SQL_ERROR; - return pSQLGetDiagRecW(HandleType, Handle, RecNumber, Sqlstate, NativeError, - MessageText, BufferLength, TextLength); + if (!pSQLGetDiagRecW) return SQL_ERROR; + + ret = pSQLGetDiagRecW(HandleType, Handle, RecNumber, Sqlstate, NativeError, MessageText, BufferLength, TextLength); + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* @@ -2424,17 +2641,23 @@ SQLRETURN WINAPI ODBC32_SQLSetConnectAttrW(SQLHDBC ConnectionHandle, SQLINTEGER /************************************************************************* * SQLColumnsW [ODBC32.140] */ -SQLRETURN WINAPI ODBC32_SQLColumnsW(SQLHSTMT StatementHandle, - WCHAR *CatalogName, SQLSMALLINT NameLength1, - WCHAR *SchemaName, SQLSMALLINT NameLength2, - WCHAR *TableName, SQLSMALLINT NameLength3, - WCHAR *ColumnName, SQLSMALLINT NameLength4) +SQLRETURN WINAPI ODBC32_SQLColumnsW(SQLHSTMT StatementHandle, WCHAR *CatalogName, SQLSMALLINT NameLength1, + WCHAR *SchemaName, SQLSMALLINT NameLength2, WCHAR *TableName, + SQLSMALLINT NameLength3, WCHAR *ColumnName, SQLSMALLINT NameLength4) { - TRACE("\n"); + SQLRETURN ret; + + TRACE("(StatementHandle %p, CatalogName %s, NameLength1 %d, SchemaName %s, NameLength2 %d, TableName %s," + " NameLength3 %d, ColumnName %s, NameLength4 %d)\n", StatementHandle, + debugstr_wn(CatalogName, NameLength1), NameLength1, debugstr_wn(SchemaName, NameLength2), NameLength2, + debugstr_wn(TableName, NameLength3), NameLength3, debugstr_wn(ColumnName, NameLength4), NameLength4); - if (!pSQLColumnsW) return SQL_ERROR; - return pSQLColumnsW(StatementHandle, CatalogName, NameLength1, - SchemaName, NameLength2, TableName, NameLength3, ColumnName, NameLength4); + if (!pSQLColumnsW) return SQL_ERROR; + + ret = pSQLColumnsW(StatementHandle, CatalogName, NameLength1, SchemaName, NameLength2, TableName, NameLength3, + ColumnName, NameLength4); + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* @@ -2464,10 +2687,15 @@ SQLRETURN WINAPI ODBC32_SQLDriverConnectW(SQLHDBC ConnectionHandle, SQLHWND Wind */ SQLRETURN WINAPI ODBC32_SQLGetConnectOptionW(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLPOINTER Value) { - TRACE("\n"); + SQLRETURN ret; + + TRACE("(ConnectionHandle %p, Option %d, Value %p)\n", ConnectionHandle, Option, Value); - if (!pSQLGetConnectOptionW) return SQL_ERROR; - return pSQLGetConnectOptionW(ConnectionHandle, Option, Value); + if (!pSQLGetConnectOptionW) return SQL_ERROR; + + ret = pSQLGetConnectOptionW(ConnectionHandle, Option, Value); + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* @@ -2499,10 +2727,15 @@ SQLRETURN WINAPI ODBC32_SQLGetInfoW(SQLHDBC ConnectionHandle, SQLUSMALLINT InfoT */ SQLRETURN WINAPI ODBC32_SQLGetTypeInfoW(SQLHSTMT StatementHandle, SQLSMALLINT DataType) { - TRACE("\n"); + SQLRETURN ret; + + TRACE("(StatementHandle %p, DataType %d)\n", StatementHandle, DataType); - if (!pSQLGetTypeInfoW) return SQL_ERROR; - return pSQLGetTypeInfoW(StatementHandle, DataType); + if (!pSQLGetTypeInfoW) return SQL_ERROR; + + ret = pSQLGetTypeInfoW(StatementHandle, DataType); + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* @@ -2510,25 +2743,38 @@ SQLRETURN WINAPI ODBC32_SQLGetTypeInfoW(SQLHSTMT StatementHandle, SQLSMALLINT Da */ SQLRETURN WINAPI ODBC32_SQLSetConnectOptionW(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLLEN Value) { - TRACE("\n"); + SQLRETURN ret; + + TRACE("(ConnectionHandle %p, Option %d, Value %s)\n", ConnectionHandle, Option, debugstr_sqllen(Value)); - if (!pSQLSetConnectOptionW) return SQL_ERROR; - return pSQLSetConnectOptionW(ConnectionHandle, Option, Value); + if (!pSQLSetConnectOptionW) return SQL_ERROR; + + ret = pSQLSetConnectOptionW(ConnectionHandle, Option, Value); + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* * SQLSpecialColumnsW [ODBC32.152] */ -SQLRETURN WINAPI ODBC32_SQLSpecialColumnsW(SQLHSTMT StatementHandle, - SQLUSMALLINT IdentifierType, SQLWCHAR *CatalogName, - SQLSMALLINT NameLength1, SQLWCHAR *SchemaName, - SQLSMALLINT NameLength2, SQLWCHAR *TableName, - SQLSMALLINT NameLength3, SQLUSMALLINT Scope, - SQLUSMALLINT Nullable) +SQLRETURN WINAPI ODBC32_SQLSpecialColumnsW(SQLHSTMT StatementHandle, SQLUSMALLINT IdentifierType, + SQLWCHAR *CatalogName, SQLSMALLINT NameLength1, SQLWCHAR *SchemaName, + SQLSMALLINT NameLength2, SQLWCHAR *TableName, SQLSMALLINT NameLength3, + SQLUSMALLINT Scope, SQLUSMALLINT Nullable) { - if (!pSQLSpecialColumnsW) return SQL_ERROR; - return pSQLSpecialColumnsW(StatementHandle, IdentifierType, CatalogName, NameLength1, SchemaName, - NameLength2, TableName, NameLength3, Scope, Nullable); + SQLRETURN ret; + + TRACE("(StatementHandle %p, IdentifierType %d, CatalogName %s, NameLength1 %d, SchemaName %s, NameLength2 %d," + " TableName %s, NameLength3 %d, Scope %d, Nullable %d)\n", StatementHandle, IdentifierType, + debugstr_wn(CatalogName, NameLength1), NameLength1, debugstr_wn(SchemaName, NameLength2), NameLength2, + debugstr_wn(TableName, NameLength3), NameLength3, Scope, Nullable); + + if (!pSQLSpecialColumnsW) return SQL_ERROR; + + ret = pSQLSpecialColumnsW(StatementHandle, IdentifierType, CatalogName, NameLength1, SchemaName, + NameLength2, TableName, NameLength3, Scope, Nullable); + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* @@ -2578,40 +2824,44 @@ SQLRETURN WINAPI ODBC32_SQLTablesW(SQLHSTMT StatementHandle, SQLWCHAR *CatalogNa /************************************************************************* * SQLBrowseConnectW [ODBC32.155] */ -SQLRETURN WINAPI ODBC32_SQLBrowseConnectW( - SQLHDBC hdbc, - SQLWCHAR *szConnStrIn, - SQLSMALLINT cbConnStrIn, - SQLWCHAR *szConnStrOut, - SQLSMALLINT cbConnStrOutMax, - SQLSMALLINT *pcbConnStrOut) +SQLRETURN WINAPI ODBC32_SQLBrowseConnectW(SQLHDBC hdbc, SQLWCHAR *szConnStrIn, SQLSMALLINT cbConnStrIn, + SQLWCHAR *szConnStrOut, SQLSMALLINT cbConnStrOutMax, + SQLSMALLINT *pcbConnStrOut) { - TRACE("\n"); + SQLRETURN ret; + + TRACE("(hdbc %p, szConnStrIn %s, cbConnStrIn %d, szConnStrOut %p, cbConnStrOutMax %d, pcbConnStrOut %p)\n", + hdbc, debugstr_wn(szConnStrIn, cbConnStrIn), cbConnStrIn, szConnStrOut, cbConnStrOutMax, pcbConnStrOut); + + if (!pSQLBrowseConnectW) return SQL_ERROR; - if (!pSQLBrowseConnectW) return SQL_ERROR; - return pSQLBrowseConnectW(hdbc, szConnStrIn, cbConnStrIn, szConnStrOut, - cbConnStrOutMax, pcbConnStrOut); + ret = pSQLBrowseConnectW(hdbc, szConnStrIn, cbConnStrIn, szConnStrOut, cbConnStrOutMax, pcbConnStrOut); + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* * SQLColumnPrivilegesW [ODBC32.156] */ -SQLRETURN WINAPI ODBC32_SQLColumnPrivilegesW( - SQLHSTMT hstmt, - SQLWCHAR *szCatalogName, - SQLSMALLINT cbCatalogName, - SQLWCHAR *szSchemaName, - SQLSMALLINT cbSchemaName, - SQLWCHAR *szTableName, - SQLSMALLINT cbTableName, - SQLWCHAR *szColumnName, - SQLSMALLINT cbColumnName) +SQLRETURN WINAPI ODBC32_SQLColumnPrivilegesW(SQLHSTMT hstmt, SQLWCHAR *szCatalogName, SQLSMALLINT cbCatalogName, + SQLWCHAR *szSchemaName, SQLSMALLINT cbSchemaName, SQLWCHAR *szTableName, + SQLSMALLINT cbTableName, SQLWCHAR *szColumnName, SQLSMALLINT cbColumnName) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLColumnPrivilegesW) return SQL_ERROR; - return pSQLColumnPrivilegesW(hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, - szTableName, cbTableName, szColumnName, cbColumnName); + TRACE("(hstmt %p, szCatalogName %s, cbCatalogName %d, szSchemaName %s, cbSchemaName %d, szTableName %s," + " cbTableName %d, szColumnName %s, cbColumnName %d)\n", hstmt, + debugstr_wn(szCatalogName, cbCatalogName), cbCatalogName, + debugstr_wn(szSchemaName, cbSchemaName), cbSchemaName, + debugstr_wn(szTableName, cbTableName), cbTableName, + debugstr_wn(szColumnName, cbColumnName), cbColumnName); + + if (!pSQLColumnPrivilegesW) return SQL_ERROR; + + ret = pSQLColumnPrivilegesW(hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, szTableName, + cbTableName, szColumnName, cbColumnName); + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* @@ -2648,150 +2898,162 @@ SQLRETURN WINAPI ODBC32_SQLDataSourcesW(SQLHENV EnvironmentHandle, SQLUSMALLINT /************************************************************************* * SQLForeignKeysW [ODBC32.160] */ -SQLRETURN WINAPI ODBC32_SQLForeignKeysW( - SQLHSTMT hstmt, - SQLWCHAR *szPkCatalogName, - SQLSMALLINT cbPkCatalogName, - SQLWCHAR *szPkSchemaName, - SQLSMALLINT cbPkSchemaName, - SQLWCHAR *szPkTableName, - SQLSMALLINT cbPkTableName, - SQLWCHAR *szFkCatalogName, - SQLSMALLINT cbFkCatalogName, - SQLWCHAR *szFkSchemaName, - SQLSMALLINT cbFkSchemaName, - SQLWCHAR *szFkTableName, - SQLSMALLINT cbFkTableName) +SQLRETURN WINAPI ODBC32_SQLForeignKeysW(SQLHSTMT hstmt, SQLWCHAR *szPkCatalogName, SQLSMALLINT cbPkCatalogName, + SQLWCHAR *szPkSchemaName, SQLSMALLINT cbPkSchemaName, SQLWCHAR *szPkTableName, + SQLSMALLINT cbPkTableName, SQLWCHAR *szFkCatalogName, + SQLSMALLINT cbFkCatalogName, SQLWCHAR *szFkSchemaName, + SQLSMALLINT cbFkSchemaName, SQLWCHAR *szFkTableName, SQLSMALLINT cbFkTableName) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLForeignKeysW) return SQL_ERROR; - return pSQLForeignKeysW(hstmt, szPkCatalogName, cbPkCatalogName, szPkSchemaName, cbPkSchemaName, - szPkTableName, cbPkTableName, szFkCatalogName, cbFkCatalogName, - szFkSchemaName, cbFkSchemaName, szFkTableName, cbFkTableName); + TRACE("(hstmt %p, szPkCatalogName %s, cbPkCatalogName %d, szPkSchemaName %s, cbPkSchemaName %d," + " szPkTableName %s, cbPkTableName %d, szFkCatalogName %s, cbFkCatalogName %d, szFkSchemaName %s," + " cbFkSchemaName %d, szFkTableName %s, cbFkTableName %d)\n", hstmt, + debugstr_wn(szPkCatalogName, cbPkCatalogName), cbPkCatalogName, + debugstr_wn(szPkSchemaName, cbPkSchemaName), cbPkSchemaName, + debugstr_wn(szPkTableName, cbPkTableName), cbPkTableName, + debugstr_wn(szFkCatalogName, cbFkCatalogName), cbFkCatalogName, + debugstr_wn(szFkSchemaName, cbFkSchemaName), cbFkSchemaName, + debugstr_wn(szFkTableName, cbFkTableName), cbFkTableName); + + if (!pSQLForeignKeysW) return SQL_ERROR; + + ret = pSQLForeignKeysW(hstmt, szPkCatalogName, cbPkCatalogName, szPkSchemaName, cbPkSchemaName, szPkTableName, + cbPkTableName, szFkCatalogName, cbFkCatalogName, szFkSchemaName, cbFkSchemaName, + szFkTableName, cbFkTableName); + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* * SQLNativeSqlW [ODBC32.162] */ -SQLRETURN WINAPI ODBC32_SQLNativeSqlW( - SQLHDBC hdbc, - SQLWCHAR *szSqlStrIn, - SQLINTEGER cbSqlStrIn, - SQLWCHAR *szSqlStr, - SQLINTEGER cbSqlStrMax, - SQLINTEGER *pcbSqlStr) +SQLRETURN WINAPI ODBC32_SQLNativeSqlW(SQLHDBC hdbc, SQLWCHAR *szSqlStrIn, SQLINTEGER cbSqlStrIn, SQLWCHAR *szSqlStr, + SQLINTEGER cbSqlStrMax, SQLINTEGER *pcbSqlStr) { - TRACE("\n"); + SQLRETURN ret; + + TRACE("(hdbc %p, szSqlStrIn %s, cbSqlStrIn %d, szSqlStr %p, cbSqlStrMax %d, pcbSqlStr %p)\n", hdbc, + debugstr_wn(szSqlStrIn, cbSqlStrIn), cbSqlStrIn, szSqlStr, cbSqlStrMax, pcbSqlStr); + + if (!pSQLNativeSqlW) return SQL_ERROR; - if (!pSQLNativeSqlW) return SQL_ERROR; - return pSQLNativeSqlW(hdbc, szSqlStrIn, cbSqlStrIn, szSqlStr, cbSqlStrMax, pcbSqlStr); + ret = pSQLNativeSqlW(hdbc, szSqlStrIn, cbSqlStrIn, szSqlStr, cbSqlStrMax, pcbSqlStr); + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* * SQLPrimaryKeysW [ODBC32.165] */ -SQLRETURN WINAPI ODBC32_SQLPrimaryKeysW( - SQLHSTMT hstmt, - SQLWCHAR *szCatalogName, - SQLSMALLINT cbCatalogName, - SQLWCHAR *szSchemaName, - SQLSMALLINT cbSchemaName, - SQLWCHAR *szTableName, - SQLSMALLINT cbTableName) +SQLRETURN WINAPI ODBC32_SQLPrimaryKeysW(SQLHSTMT hstmt, SQLWCHAR *szCatalogName, SQLSMALLINT cbCatalogName, + SQLWCHAR *szSchemaName, SQLSMALLINT cbSchemaName, SQLWCHAR *szTableName, + SQLSMALLINT cbTableName) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLPrimaryKeysW) return SQL_ERROR; - return pSQLPrimaryKeysW(hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, - szTableName, cbTableName); + TRACE("(hstmt %p, szCatalogName %s, cbCatalogName %d, szSchemaName %s, cbSchemaName %d, szTableName %s," + " cbTableName %d)\n", hstmt, + debugstr_wn(szCatalogName, cbCatalogName), cbCatalogName, + debugstr_wn(szSchemaName, cbSchemaName), cbSchemaName, + debugstr_wn(szTableName, cbTableName), cbTableName); + + if (!pSQLPrimaryKeysW) return SQL_ERROR; + + ret = pSQLPrimaryKeysW(hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, szTableName, cbTableName); + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* * SQLProcedureColumnsW [ODBC32.166] */ -SQLRETURN WINAPI ODBC32_SQLProcedureColumnsW( - SQLHSTMT hstmt, - SQLWCHAR *szCatalogName, - SQLSMALLINT cbCatalogName, - SQLWCHAR *szSchemaName, - SQLSMALLINT cbSchemaName, - SQLWCHAR *szProcName, - SQLSMALLINT cbProcName, - SQLWCHAR *szColumnName, - SQLSMALLINT cbColumnName) +SQLRETURN WINAPI ODBC32_SQLProcedureColumnsW(SQLHSTMT hstmt, SQLWCHAR *szCatalogName, SQLSMALLINT cbCatalogName, + SQLWCHAR *szSchemaName, SQLSMALLINT cbSchemaName, SQLWCHAR *szProcName, + SQLSMALLINT cbProcName, SQLWCHAR *szColumnName, SQLSMALLINT cbColumnName) { - TRACE("\n"); + SQLRETURN ret; + + TRACE("(hstmt %p, szCatalogName %s, cbCatalogName %d, szSchemaName %s, cbSchemaName %d, szProcName %s," + " cbProcName %d, szColumnName %s, cbColumnName %d)\n", hstmt, + debugstr_wn(szCatalogName, cbCatalogName), cbCatalogName, + debugstr_wn(szSchemaName, cbSchemaName), cbSchemaName, + debugstr_wn(szProcName, cbProcName), cbProcName, + debugstr_wn(szColumnName, cbColumnName), cbColumnName); + + if (!pSQLProcedureColumnsW) return SQL_ERROR; - if (!pSQLProcedureColumnsW) return SQL_ERROR; - return pSQLProcedureColumnsW(hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, - szProcName, cbProcName, szColumnName, cbColumnName); + ret = pSQLProcedureColumnsW(hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, szProcName, + cbProcName, szColumnName, cbColumnName); + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* * SQLProceduresW [ODBC32.167] */ -SQLRETURN WINAPI ODBC32_SQLProceduresW( - SQLHSTMT hstmt, - SQLWCHAR *szCatalogName, - SQLSMALLINT cbCatalogName, - SQLWCHAR *szSchemaName, - SQLSMALLINT cbSchemaName, - SQLWCHAR *szProcName, - SQLSMALLINT cbProcName) +SQLRETURN WINAPI ODBC32_SQLProceduresW(SQLHSTMT hstmt, SQLWCHAR *szCatalogName, SQLSMALLINT cbCatalogName, + SQLWCHAR *szSchemaName, SQLSMALLINT cbSchemaName, SQLWCHAR *szProcName, + SQLSMALLINT cbProcName) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLProceduresW) return SQL_ERROR; - return pSQLProceduresW(hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, - szProcName, cbProcName); + TRACE("(hstmt %p, szCatalogName %s, cbCatalogName %d, szSchemaName %s, cbSchemaName %d, szProcName %s," + " cbProcName %d)\n", hstmt, debugstr_wn(szCatalogName, cbCatalogName), cbCatalogName, + debugstr_wn(szSchemaName, cbSchemaName), cbSchemaName, debugstr_wn(szProcName, cbProcName), cbProcName); + + if (!pSQLProceduresW) return SQL_ERROR; + + ret = pSQLProceduresW(hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, szProcName, cbProcName); + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* * SQLTablePrivilegesW [ODBC32.170] */ -SQLRETURN WINAPI ODBC32_SQLTablePrivilegesW( - SQLHSTMT hstmt, - SQLWCHAR *szCatalogName, - SQLSMALLINT cbCatalogName, - SQLWCHAR *szSchemaName, - SQLSMALLINT cbSchemaName, - SQLWCHAR *szTableName, - SQLSMALLINT cbTableName) +SQLRETURN WINAPI ODBC32_SQLTablePrivilegesW(SQLHSTMT hstmt, SQLWCHAR *szCatalogName, SQLSMALLINT cbCatalogName, + SQLWCHAR *szSchemaName, SQLSMALLINT cbSchemaName, SQLWCHAR *szTableName, + SQLSMALLINT cbTableName) { - TRACE("\n"); + SQLRETURN ret; + + TRACE("(hstmt %p, szCatalogName %s, cbCatalogName %d, szSchemaName %s, cbSchemaName %d, szTableName %s," + " cbTableName %d)\n", hstmt, debugstr_wn(szCatalogName, cbCatalogName), cbCatalogName, + debugstr_wn(szSchemaName, cbSchemaName), cbSchemaName, debugstr_wn(szTableName, cbTableName), cbTableName); + + if (!pSQLTablePrivilegesW) return SQL_ERROR; - if (!pSQLTablePrivilegesW) return SQL_ERROR; - return pSQLTablePrivilegesW(hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, - szTableName, cbTableName); + ret = pSQLTablePrivilegesW(hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, szTableName, + cbTableName); + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* * SQLDriversW [ODBC32.171] */ -SQLRETURN WINAPI ODBC32_SQLDriversW( - SQLHENV henv, - SQLUSMALLINT fDirection, - SQLWCHAR *szDriverDesc, - SQLSMALLINT cbDriverDescMax, - SQLSMALLINT *pcbDriverDesc, - SQLWCHAR *szDriverAttributes, - SQLSMALLINT cbDriverAttrMax, - SQLSMALLINT *pcbDriverAttr) +SQLRETURN WINAPI ODBC32_SQLDriversW(SQLHENV EnvironmentHandle, SQLUSMALLINT fDirection, SQLWCHAR *szDriverDesc, + SQLSMALLINT cbDriverDescMax, SQLSMALLINT *pcbDriverDesc, + SQLWCHAR *szDriverAttributes, SQLSMALLINT cbDriverAttrMax, + SQLSMALLINT *pcbDriverAttr) { - SQLRETURN ret; + SQLRETURN ret; + + TRACE("(EnvironmentHandle %p, Direction %d, szDriverDesc %p, cbDriverDescMax %d, pcbDriverDesc %p," + " DriverAttributes %p, cbDriverAttrMax %d, pcbDriverAttr %p)\n", EnvironmentHandle, fDirection, + szDriverDesc, cbDriverDescMax, pcbDriverDesc, szDriverAttributes, cbDriverAttrMax, pcbDriverAttr); - TRACE("(Direction %d)\n", fDirection); + if (!pSQLDriversW) return SQL_ERROR; - if (!pSQLDriversW) return SQL_ERROR; - ret = pSQLDriversW(henv, fDirection, szDriverDesc, cbDriverDescMax, pcbDriverDesc, - szDriverAttributes, cbDriverAttrMax, pcbDriverAttr); + ret = pSQLDriversW(EnvironmentHandle, fDirection, szDriverDesc, cbDriverDescMax, pcbDriverDesc, + szDriverAttributes, cbDriverAttrMax, pcbDriverAttr); - if (ret == SQL_NO_DATA && fDirection == SQL_FETCH_FIRST) - ERR_(winediag)("No ODBC drivers could be found. " - "Check the settings for your libodbc provider.\n"); + if (ret == SQL_NO_DATA && fDirection == SQL_FETCH_FIRST) + ERR_(winediag)("No ODBC drivers could be found. Check the settings for your libodbc provider.\n"); - return ret; + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* @@ -2839,14 +3101,19 @@ SQLRETURN WINAPI ODBC32_SQLSetStmtAttrW(SQLHSTMT StatementHandle, SQLINTEGER Att /************************************************************************* * SQLGetDiagRecA [ODBC32.236] */ -SQLRETURN WINAPI ODBC32_SQLGetDiagRecA(SQLSMALLINT handle_type, SQLHANDLE handle, SQLSMALLINT record, - SQLCHAR *sql_state, SQLINTEGER *native_error, - SQLCHAR *error_msg, SQLSMALLINT error_msg_max, - SQLSMALLINT *error_msg_size) +SQLRETURN WINAPI ODBC32_SQLGetDiagRecA(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLSMALLINT RecNumber, + SQLCHAR *Sqlstate, SQLINTEGER *NativeError, SQLCHAR *MessageText, + SQLSMALLINT BufferLength, SQLSMALLINT *TextLength) { - TRACE("\n"); + SQLRETURN ret; + + TRACE("(HandleType %d, Handle %p, RecNumber %d, Sqlstate %p, NativeError %p, MessageText %p, BufferLength %d," + " TextLength %p)\n", HandleType, Handle, RecNumber, Sqlstate, NativeError, MessageText, BufferLength, + TextLength); if (!pSQLGetDiagRecA) return SQL_ERROR; - return pSQLGetDiagRecA(handle_type, handle, record, sql_state, native_error, error_msg, - error_msg_max, error_msg_size); + + ret = pSQLGetDiagRecA(HandleType, Handle, RecNumber, Sqlstate, NativeError, MessageText, BufferLength, TextLength); + TRACE("Returning %d\n", ret); + return ret; } -- 2.11.0

1 0

[PATCH 2/3] odbc32: Work around drivers that don't accept NULL name length in SQLDescribeCol.
by Hans Leidekker 05 Feb '19

05 Feb '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/odbc32/proxyodbc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 13546edb09..ab28506708 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -1020,6 +1020,7 @@ SQLRETURN WINAPI ODBC32_SQLDescribeCol(SQLHSTMT StatementHandle, SQLUSMALLINT Co SQLSMALLINT BufferLength, SQLSMALLINT *NameLength, SQLSMALLINT *DataType, SQLULEN *ColumnSize, SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable) { + SQLSMALLINT dummy; SQLRETURN ret; TRACE("(StatementHandle %p, ColumnNumber %d, ColumnName %p, BufferLength %d, NameLength %p, DataType %p," @@ -1027,6 +1028,7 @@ SQLRETURN WINAPI ODBC32_SQLDescribeCol(SQLHSTMT StatementHandle, SQLUSMALLINT Co BufferLength, NameLength, DataType, ColumnSize, DecimalDigits, Nullable); if (!pSQLDescribeCol) return SQL_ERROR; + if (!NameLength) NameLength = &dummy; /* workaround for drivers that don't accept NULL NameLength */ ret = pSQLDescribeCol(StatementHandle, ColumnNumber, ColumnName, BufferLength, NameLength, DataType, ColumnSize, DecimalDigits, Nullable); @@ -2167,6 +2169,7 @@ SQLRETURN WINAPI ODBC32_SQLDescribeColW(SQLHSTMT StatementHandle, SQLUSMALLINT C SQLSMALLINT BufferLength, SQLSMALLINT *NameLength, SQLSMALLINT *DataType, SQLULEN *ColumnSize, SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable) { + SQLSMALLINT dummy; SQLRETURN ret; TRACE("(StatementHandle %p, ColumnNumber %d, ColumnName %p, BufferLength %d, NameLength %p, DataType %p," @@ -2174,6 +2177,7 @@ SQLRETURN WINAPI ODBC32_SQLDescribeColW(SQLHSTMT StatementHandle, SQLUSMALLINT C BufferLength, NameLength, DataType, ColumnSize, DecimalDigits, Nullable); if (!pSQLDescribeColW) return SQL_ERROR; + if (!NameLength) NameLength = &dummy; /* workaround for drivers that don't accept NULL NameLength */ ret = pSQLDescribeColW(StatementHandle, ColumnNumber, ColumnName, BufferLength, NameLength, DataType, ColumnSize, DecimalDigits, Nullable); -- 2.11.0

1 0

[PATCH 1/3] odbc32: Improve tracing in a number of functions.
by Hans Leidekker 05 Feb '19

05 Feb '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/odbc32/proxyodbc.c | 833 +++++++++++++++++++++++++++--------------------- 1 file changed, 466 insertions(+), 367 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index eb12329b21..13546edb09 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -683,42 +683,42 @@ static BOOL ODBC_LoadDMFunctions(void) */ SQLRETURN WINAPI ODBC32_SQLAllocConnect(SQLHENV EnvironmentHandle, SQLHDBC *ConnectionHandle) { - SQLRETURN ret; - TRACE("(EnvironmentHandle %p)\n",EnvironmentHandle); + SQLRETURN ret; - if (!pSQLAllocConnect) - { - *ConnectionHandle = SQL_NULL_HDBC; - TRACE("Not ready\n"); - return SQL_ERROR; - } + TRACE("(EnvironmentHandle %p, ConnectionHandle %p)\n", EnvironmentHandle, ConnectionHandle); - ret = pSQLAllocConnect(EnvironmentHandle, ConnectionHandle); - TRACE("Returns %d, Handle %p\n", ret, *ConnectionHandle); - return ret; -} + if (!pSQLAllocConnect) + { + *ConnectionHandle = SQL_NULL_HDBC; + TRACE("Not ready\n"); + return SQL_ERROR; + } + ret = pSQLAllocConnect(EnvironmentHandle, ConnectionHandle); + TRACE("Returning %d, ConnectionHandle %p\n", ret, *ConnectionHandle); + return ret; +} /************************************************************************* * SQLAllocEnv [ODBC32.002] */ SQLRETURN WINAPI ODBC32_SQLAllocEnv(SQLHENV *EnvironmentHandle) { - SQLRETURN ret; - TRACE("\n"); + SQLRETURN ret; - if (!pSQLAllocEnv) - { - *EnvironmentHandle = SQL_NULL_HENV; - TRACE("Not ready\n"); - return SQL_ERROR; - } + TRACE("(EnvironmentHandle %p)\n", EnvironmentHandle); - ret = pSQLAllocEnv(EnvironmentHandle); - TRACE("Returns %d, EnvironmentHandle %p\n", ret, *EnvironmentHandle); - return ret; -} + if (!pSQLAllocEnv) + { + *EnvironmentHandle = SQL_NULL_HENV; + TRACE("Not ready\n"); + return SQL_ERROR; + } + ret = pSQLAllocEnv(EnvironmentHandle); + TRACE("Returning %d, EnvironmentHandle %p\n", ret, *EnvironmentHandle); + return ret; +} /************************************************************************* * SQLAllocHandle [ODBC32.024] @@ -757,23 +757,22 @@ SQLRETURN WINAPI ODBC32_SQLAllocHandle(SQLSMALLINT HandleType, SQLHANDLE InputHa */ SQLRETURN WINAPI ODBC32_SQLAllocStmt(SQLHDBC ConnectionHandle, SQLHSTMT *StatementHandle) { - SQLRETURN ret; + SQLRETURN ret; - TRACE("(Connection %p)\n", ConnectionHandle); + TRACE("(ConnectionHandle %p, StatementHandle %p)\n", ConnectionHandle, StatementHandle); - if (!pSQLAllocStmt) - { - *StatementHandle = SQL_NULL_HSTMT; - TRACE ("Not ready\n"); - return SQL_ERROR; - } + if (!pSQLAllocStmt) + { + *StatementHandle = SQL_NULL_HSTMT; + TRACE("Not ready\n"); + return SQL_ERROR; + } - ret = pSQLAllocStmt(ConnectionHandle, StatementHandle); - TRACE ("Returns %d, Handle %p\n", ret, *StatementHandle); - return ret; + ret = pSQLAllocStmt(ConnectionHandle, StatementHandle); + TRACE ("Returning %d, StatementHandle %p\n", ret, *StatementHandle); + return ret; } - /************************************************************************* * SQLAllocHandleStd [ODBC32.077] */ @@ -802,45 +801,66 @@ SQLRETURN WINAPI ODBC32_SQLAllocHandleStd( SQLSMALLINT HandleType, return pSQLAllocHandleStd(HandleType, InputHandle, OutputHandle); } +static const char *debugstr_sqllen( SQLLEN len ) +{ +#ifdef _WIN64 + return wine_dbg_sprintf( "%ld", len ); +#else + return wine_dbg_sprintf( "%d", len ); +#endif +} /************************************************************************* * SQLBindCol [ODBC32.004] */ -SQLRETURN WINAPI ODBC32_SQLBindCol(SQLHSTMT StatementHandle, - SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType, - SQLPOINTER TargetValue, SQLLEN BufferLength, - SQLLEN *StrLen_or_Ind) +SQLRETURN WINAPI ODBC32_SQLBindCol(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType, + SQLPOINTER TargetValue, SQLLEN BufferLength, SQLLEN *StrLen_or_Ind) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLBindCol) - { - TRACE ("Not ready\n"); - return SQL_ERROR; - } + TRACE("(StatementHandle %p, ColumnNumber %d, TargetType %d, TargetValue %p, BufferLength %s, StrLen_or_Ind %p)\n", + StatementHandle, ColumnNumber, TargetType, TargetValue, debugstr_sqllen(BufferLength), StrLen_or_Ind); + + if (!pSQLBindCol) + { + TRACE("Not ready\n"); + return SQL_ERROR; + } - return pSQLBindCol(StatementHandle, ColumnNumber, TargetType, - TargetValue, BufferLength, StrLen_or_Ind); + ret = pSQLBindCol(StatementHandle, ColumnNumber, TargetType, TargetValue, BufferLength, StrLen_or_Ind); + TRACE ("Returning %d\n", ret); + return ret; } +static const char *debugstr_sqlulen( SQLULEN len ) +{ +#ifdef _WIN64 + return wine_dbg_sprintf( "%lu", len ); +#else + return wine_dbg_sprintf( "%u", len ); +#endif +} /************************************************************************* * SQLBindParam [ODBC32.025] */ -SQLRETURN WINAPI ODBC32_SQLBindParam(SQLHSTMT StatementHandle, - SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType, - SQLSMALLINT ParameterType, SQLULEN LengthPrecision, - SQLSMALLINT ParameterScale, SQLPOINTER ParameterValue, - SQLLEN *StrLen_or_Ind) +SQLRETURN WINAPI ODBC32_SQLBindParam(SQLHSTMT StatementHandle, SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType, + SQLSMALLINT ParameterType, SQLULEN LengthPrecision, SQLSMALLINT ParameterScale, + SQLPOINTER ParameterValue, SQLLEN *StrLen_or_Ind) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLBindParam) return SQL_ERROR; - return pSQLBindParam(StatementHandle, ParameterNumber, ValueType, - ParameterType, LengthPrecision, ParameterScale, - ParameterValue, StrLen_or_Ind); -} + TRACE("(StatementHandle %p, ParameterNumber %d, ValueType %d, ParameterType %d, LengthPrecision %s," + " ParameterScale %d, ParameterValue %p, StrLen_or_Ind %p)\n", StatementHandle, ParameterNumber, ValueType, + ParameterType, debugstr_sqlulen(LengthPrecision), ParameterScale, ParameterValue, StrLen_or_Ind); + if (!pSQLBindParam) return SQL_ERROR; + + ret = pSQLBindParam(StatementHandle, ParameterNumber, ValueType, ParameterType, LengthPrecision, ParameterScale, + ParameterValue, StrLen_or_Ind); + TRACE ("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLCancel [ODBC32.005] @@ -939,32 +959,31 @@ SQLRETURN WINAPI ODBC32_SQLCopyDesc(SQLHDESC SourceDescHandle, SQLHDESC TargetDe /************************************************************************* * SQLDataSources [ODBC32.057] */ -SQLRETURN WINAPI ODBC32_SQLDataSources(SQLHENV EnvironmentHandle, - SQLUSMALLINT Direction, SQLCHAR *ServerName, - SQLSMALLINT BufferLength1, SQLSMALLINT *NameLength1, - SQLCHAR *Description, SQLSMALLINT BufferLength2, - SQLSMALLINT *NameLength2) +SQLRETURN WINAPI ODBC32_SQLDataSources(SQLHENV EnvironmentHandle, SQLUSMALLINT Direction, SQLCHAR *ServerName, + SQLSMALLINT BufferLength1, SQLSMALLINT *NameLength1, SQLCHAR *Description, + SQLSMALLINT BufferLength2, SQLSMALLINT *NameLength2) { - SQLRETURN ret; - - TRACE("(EnvironmentHandle %p)\n", EnvironmentHandle); + SQLRETURN ret; - if (!pSQLDataSources) return SQL_ERROR; + TRACE("(EnvironmentHandle %p, Direction %d, ServerName %p, BufferLength1 %d, NameLength1 %p, Description %p," + " BufferLength2 %d, NameLength2 %p)\n", EnvironmentHandle, Direction, ServerName, BufferLength1, + NameLength1, Description, BufferLength2, NameLength2); - ret = pSQLDataSources(EnvironmentHandle, Direction, ServerName, - BufferLength1, NameLength1, Description, BufferLength2, NameLength2); + if (!pSQLDataSources) return SQL_ERROR; - if (TRACE_ON(odbc)) - { - TRACE("Returns %d \t", ret); - if (NameLength1 && *NameLength1 > 0) - TRACE("DataSource = %s,", ServerName); - if (NameLength2 && *NameLength2 > 0) - TRACE(" Description = %s", Description); - TRACE("\n"); - } + ret = pSQLDataSources(EnvironmentHandle, Direction, ServerName, BufferLength1, NameLength1, Description, + BufferLength2, NameLength2); + if (ret >= 0 && TRACE_ON(odbc)) + { + if (ServerName && NameLength1 && *NameLength1 > 0) + TRACE(" DataSource %s", debugstr_an((const char *)ServerName, *NameLength1)); + if (Description && NameLength2 && *NameLength2 > 0) + TRACE(" Description %s", debugstr_an((const char *)Description, *NameLength2)); + TRACE("\n"); + } - return ret; + TRACE("Returning %d\n", ret); + return ret; } SQLRETURN WINAPI ODBC32_SQLDataSourcesA(SQLHENV EnvironmentHandle, @@ -997,35 +1016,48 @@ SQLRETURN WINAPI ODBC32_SQLDataSourcesA(SQLHENV EnvironmentHandle, /************************************************************************* * SQLDescribeCol [ODBC32.008] */ -SQLRETURN WINAPI ODBC32_SQLDescribeCol(SQLHSTMT StatementHandle, - SQLUSMALLINT ColumnNumber, SQLCHAR *ColumnName, - SQLSMALLINT BufferLength, SQLSMALLINT *NameLength, - SQLSMALLINT *DataType, SQLULEN *ColumnSize, - SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable) +SQLRETURN WINAPI ODBC32_SQLDescribeCol(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNumber, SQLCHAR *ColumnName, + SQLSMALLINT BufferLength, SQLSMALLINT *NameLength, SQLSMALLINT *DataType, + SQLULEN *ColumnSize, SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLDescribeCol) return SQL_ERROR; - return pSQLDescribeCol(StatementHandle, ColumnNumber, ColumnName, - BufferLength, NameLength, DataType, ColumnSize, DecimalDigits, Nullable); -} + TRACE("(StatementHandle %p, ColumnNumber %d, ColumnName %p, BufferLength %d, NameLength %p, DataType %p," + " ColumnSize %p, DecimalDigits %p, Nullable %p)\n", StatementHandle, ColumnNumber, ColumnName, + BufferLength, NameLength, DataType, ColumnSize, DecimalDigits, Nullable); + if (!pSQLDescribeCol) return SQL_ERROR; + + ret = pSQLDescribeCol(StatementHandle, ColumnNumber, ColumnName, BufferLength, NameLength, DataType, ColumnSize, + DecimalDigits, Nullable); + if (ret >= 0) + { + if (ColumnName && NameLength) TRACE(" ColumnName %s\n", debugstr_an((const char *)ColumnName, *NameLength)); + if (DataType) TRACE(" DataType %d\n", *DataType); + if (ColumnSize) TRACE(" ColumnSize %s\n", debugstr_sqlulen(*ColumnSize)); + if (DecimalDigits) TRACE(" DecimalDigits %d\n", *DecimalDigits); + if (Nullable) TRACE(" Nullable %d\n", *Nullable); + } + + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLDisconnect [ODBC32.009] */ SQLRETURN WINAPI ODBC32_SQLDisconnect(SQLHDBC ConnectionHandle) { - SQLRETURN ret; - TRACE("(Handle %p)\n", ConnectionHandle); + SQLRETURN ret; - if (!pSQLDisconnect) return SQL_ERROR; + TRACE("(ConnectionHandle %p)\n", ConnectionHandle); - ret = pSQLDisconnect(ConnectionHandle); - TRACE("Returns %d\n", ret); - return ret; -} + if (!pSQLDisconnect) return SQL_ERROR; + ret = pSQLDisconnect(ConnectionHandle); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLEndTran [ODBC32.029] @@ -1095,12 +1127,16 @@ SQLRETURN WINAPI ODBC32_SQLExecute(SQLHSTMT StatementHandle) */ SQLRETURN WINAPI ODBC32_SQLFetch(SQLHSTMT StatementHandle) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLFetch) return SQL_ERROR; - return pSQLFetch(StatementHandle); -} + TRACE("(StatementHandle %p)\n", StatementHandle); + if (!pSQLFetch) return SQL_ERROR; + + ret = pSQLFetch(StatementHandle); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLFetchScroll [ODBC32.030] @@ -1119,32 +1155,32 @@ SQLRETURN WINAPI ODBC32_SQLFetchScroll(SQLHSTMT StatementHandle, SQLSMALLINT Fet */ SQLRETURN WINAPI ODBC32_SQLFreeConnect(SQLHDBC ConnectionHandle) { - SQLRETURN ret; - TRACE("(Handle %p)\n", ConnectionHandle); + SQLRETURN ret; - if (!pSQLFreeConnect) return SQL_ERROR; + TRACE("(ConnectionHandle %p)\n", ConnectionHandle); - ret = pSQLFreeConnect(ConnectionHandle); - TRACE("Returns %d\n", ret); - return ret; -} + if (!pSQLFreeConnect) return SQL_ERROR; + ret = pSQLFreeConnect(ConnectionHandle); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLFreeEnv [ODBC32.015] */ SQLRETURN WINAPI ODBC32_SQLFreeEnv(SQLHENV EnvironmentHandle) { - SQLRETURN ret; - TRACE("(EnvironmentHandle %p)\n",EnvironmentHandle); + SQLRETURN ret; - if (!pSQLFreeEnv) return SQL_ERROR; + TRACE("(EnvironmentHandle %p)\n", EnvironmentHandle); - ret = pSQLFreeEnv(EnvironmentHandle); - TRACE("Returns %d\n", ret); - return ret; -} + if (!pSQLFreeEnv) return SQL_ERROR; + ret = pSQLFreeEnv(EnvironmentHandle); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLFreeHandle [ODBC32.031] @@ -1167,16 +1203,16 @@ SQLRETURN WINAPI ODBC32_SQLFreeHandle(SQLSMALLINT HandleType, SQLHANDLE Handle) */ SQLRETURN WINAPI ODBC32_SQLFreeStmt(SQLHSTMT StatementHandle, SQLUSMALLINT Option) { - SQLRETURN ret; - TRACE("(Handle %p, Option %d)\n", StatementHandle, Option); + SQLRETURN ret; - if (!pSQLFreeStmt) return SQL_ERROR; + TRACE("(StatementHandle %p, Option %d)\n", StatementHandle, Option); - ret = pSQLFreeStmt(StatementHandle, Option); - TRACE("Returns %d\n", ret); - return ret; -} + if (!pSQLFreeStmt) return SQL_ERROR; + ret = pSQLFreeStmt(StatementHandle, Option); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLGetConnectAttr [ODBC32.032] @@ -1222,18 +1258,20 @@ SQLRETURN WINAPI ODBC32_SQLGetCursorName(SQLHSTMT StatementHandle, /************************************************************************* * SQLGetData [ODBC32.043] */ -SQLRETURN WINAPI ODBC32_SQLGetData(SQLHSTMT StatementHandle, - SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType, - SQLPOINTER TargetValue, SQLLEN BufferLength, - SQLLEN *StrLen_or_Ind) +SQLRETURN WINAPI ODBC32_SQLGetData(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType, + SQLPOINTER TargetValue, SQLLEN BufferLength, SQLLEN *StrLen_or_Ind) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLGetData) return SQL_ERROR; - return pSQLGetData(StatementHandle, ColumnNumber, TargetType, - TargetValue, BufferLength, StrLen_or_Ind); -} + TRACE("(StatementHandle %p, ColumnNumber %d, TargetType %d, TargetValue %p, BufferLength %s, StrLen_or_Ind %p)\n", + StatementHandle, ColumnNumber, TargetType, TargetValue, debugstr_sqllen(BufferLength), StrLen_or_Ind); + if (!pSQLGetData) return SQL_ERROR; + + ret = pSQLGetData(StatementHandle, ColumnNumber, TargetType, TargetValue, BufferLength, StrLen_or_Ind); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLGetDescField [ODBC32.033] @@ -1304,28 +1342,36 @@ SQLRETURN WINAPI ODBC32_SQLGetDiagRec(SQLSMALLINT HandleType, SQLHANDLE Handle, /************************************************************************* * SQLGetEnvAttr [ODBC32.037] */ -SQLRETURN WINAPI ODBC32_SQLGetEnvAttr(SQLHENV EnvironmentHandle, - SQLINTEGER Attribute, SQLPOINTER Value, - SQLINTEGER BufferLength, SQLINTEGER *StringLength) +SQLRETURN WINAPI ODBC32_SQLGetEnvAttr(SQLHENV EnvironmentHandle, SQLINTEGER Attribute, SQLPOINTER Value, + SQLINTEGER BufferLength, SQLINTEGER *StringLength) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLGetEnvAttr) return SQL_ERROR; - return pSQLGetEnvAttr(EnvironmentHandle, Attribute, Value, BufferLength, StringLength); -} + TRACE("(EnvironmentHandle %p, Attribute %d, Value %p, BufferLength %d, StringLength %p)\n", + EnvironmentHandle, Attribute, Value, BufferLength, StringLength); + + if (!pSQLGetEnvAttr) return SQL_ERROR; + ret = pSQLGetEnvAttr(EnvironmentHandle, Attribute, Value, BufferLength, StringLength); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLGetFunctions [ODBC32.044] */ SQLRETURN WINAPI ODBC32_SQLGetFunctions(SQLHDBC ConnectionHandle, SQLUSMALLINT FunctionId, SQLUSMALLINT *Supported) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLGetFunctions) return SQL_ERROR; - return pSQLGetFunctions(ConnectionHandle, FunctionId, Supported); -} + TRACE("(ConnectionHandle %p, FunctionId %d, Supported %p)\n", ConnectionHandle, FunctionId, Supported); + if (!pSQLGetFunctions) return SQL_ERROR; + + ret = pSQLGetFunctions(ConnectionHandle, FunctionId, Supported); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLGetInfo [ODBC32.045] @@ -1384,12 +1430,16 @@ SQLRETURN WINAPI ODBC32_SQLGetTypeInfo(SQLHSTMT StatementHandle, SQLSMALLINT Dat */ SQLRETURN WINAPI ODBC32_SQLNumResultCols(SQLHSTMT StatementHandle, SQLSMALLINT *ColumnCount) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLNumResultCols) return SQL_ERROR; - return pSQLNumResultCols(StatementHandle, ColumnCount); -} + TRACE("(StatementHandle %p, ColumnCount %p)\n", StatementHandle, ColumnCount); + if (!pSQLNumResultCols) return SQL_ERROR; + + ret = pSQLNumResultCols(StatementHandle, ColumnCount); + TRACE("Returning %d ColumnCount %d\n", ret, *ColumnCount); + return ret; +} /************************************************************************* * SQLParamData [ODBC32.048] @@ -1432,12 +1482,17 @@ SQLRETURN WINAPI ODBC32_SQLPutData(SQLHSTMT StatementHandle, SQLPOINTER Data, SQ */ SQLRETURN WINAPI ODBC32_SQLRowCount(SQLHSTMT StatementHandle, SQLLEN *RowCount) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLRowCount) return SQL_ERROR; - return pSQLRowCount(StatementHandle, RowCount); -} + TRACE("(StatementHandle %p, RowCount %p)\n", StatementHandle, RowCount); + + if (!pSQLRowCount) return SQL_ERROR; + ret = pSQLRowCount(StatementHandle, RowCount); + if (ret == SQL_SUCCESS && RowCount) TRACE(" RowCount %s\n", debugstr_sqllen(*RowCount)); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLSetConnectAttr [ODBC32.039] @@ -1511,16 +1566,20 @@ SQLRETURN WINAPI ODBC32_SQLSetDescRec(SQLHDESC DescriptorHandle, /************************************************************************* * SQLSetEnvAttr [ODBC32.075] */ -SQLRETURN WINAPI ODBC32_SQLSetEnvAttr(SQLHENV EnvironmentHandle, - SQLINTEGER Attribute, SQLPOINTER Value, - SQLINTEGER StringLength) +SQLRETURN WINAPI ODBC32_SQLSetEnvAttr(SQLHENV EnvironmentHandle, SQLINTEGER Attribute, SQLPOINTER Value, + SQLINTEGER StringLength) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLSetEnvAttr) return SQL_ERROR; - return pSQLSetEnvAttr(EnvironmentHandle, Attribute, Value, StringLength); -} + TRACE("(EnvironmentHandle %p, Attribute %d, Value %p, StringLength %d)\n", EnvironmentHandle, Attribute, Value, + StringLength); + if (!pSQLSetEnvAttr) return SQL_ERROR; + + ret = pSQLSetEnvAttr(EnvironmentHandle, Attribute, Value, StringLength); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLSetParam [ODBC32.022] @@ -1664,21 +1723,21 @@ SQLRETURN WINAPI ODBC32_SQLBulkOperations( /************************************************************************* * SQLColAttributes [ODBC32.006] */ -SQLRETURN WINAPI ODBC32_SQLColAttributes( - SQLHSTMT hstmt, - SQLUSMALLINT icol, - SQLUSMALLINT fDescType, - SQLPOINTER rgbDesc, - SQLSMALLINT cbDescMax, - SQLSMALLINT *pcbDesc, - SQLLEN *pfDesc) +SQLRETURN WINAPI ODBC32_SQLColAttributes(SQLHSTMT hstmt, SQLUSMALLINT icol, SQLUSMALLINT fDescType, + SQLPOINTER rgbDesc, SQLSMALLINT cbDescMax, SQLSMALLINT *pcbDesc, + SQLLEN *pfDesc) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLColAttributes) return SQL_ERROR; - return pSQLColAttributes(hstmt, icol, fDescType, rgbDesc, cbDescMax, pcbDesc, pfDesc); -} + TRACE("(hstmt %p, icol %d, fDescType %d, rgbDesc %p, cbDescMax %d, pcbDesc %p, pfDesc %p)\n", hstmt, icol, + fDescType, rgbDesc, cbDescMax, pcbDesc, pfDesc); + if (!pSQLColAttributes) return SQL_ERROR; + + ret = pSQLColAttributes(hstmt, icol, fDescType, rgbDesc, cbDescMax, pcbDesc, pfDesc); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLColumnPrivileges [ODBC32.056] @@ -1723,19 +1782,20 @@ SQLRETURN WINAPI ODBC32_SQLDescribeParam( /************************************************************************* * SQLExtendedFetch [ODBC32.059] */ -SQLRETURN WINAPI ODBC32_SQLExtendedFetch( - SQLHSTMT hstmt, - SQLUSMALLINT fFetchType, - SQLLEN irow, - SQLULEN *pcrow, - SQLUSMALLINT *rgfRowStatus) +SQLRETURN WINAPI ODBC32_SQLExtendedFetch(SQLHSTMT hstmt, SQLUSMALLINT fFetchType, SQLLEN irow, SQLULEN *pcrow, + SQLUSMALLINT *rgfRowStatus) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLExtendedFetch) return SQL_ERROR; - return pSQLExtendedFetch(hstmt, fFetchType, irow, pcrow, rgfRowStatus); -} + TRACE("(hstmt %p, fFetchType %d, irow %s, pcrow %p, rgfRowStatus %p)\n", hstmt, fFetchType, debugstr_sqllen(irow), + pcrow, rgfRowStatus); + if (!pSQLExtendedFetch) return SQL_ERROR; + + ret = pSQLExtendedFetch(hstmt, fFetchType, irow, pcrow, rgfRowStatus); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLForeignKeys [ODBC32.060] @@ -1767,14 +1827,18 @@ SQLRETURN WINAPI ODBC32_SQLForeignKeys( /************************************************************************* * SQLMoreResults [ODBC32.061] */ -SQLRETURN WINAPI ODBC32_SQLMoreResults(SQLHSTMT hstmt) +SQLRETURN WINAPI ODBC32_SQLMoreResults(SQLHSTMT StatementHandle) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLMoreResults) return SQL_ERROR; - return pSQLMoreResults(hstmt); -} + TRACE("(%p)\n", StatementHandle); + if (!pSQLMoreResults) return SQL_ERROR; + + ret = pSQLMoreResults(StatementHandle); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLNativeSql [ODBC32.062] @@ -1811,17 +1875,18 @@ SQLRETURN WINAPI ODBC32_SQLNumParams( /************************************************************************* * SQLParamOptions [ODBC32.064] */ -SQLRETURN WINAPI ODBC32_SQLParamOptions( - SQLHSTMT hstmt, - SQLULEN crow, - SQLULEN *pirow) +SQLRETURN WINAPI ODBC32_SQLParamOptions(SQLHSTMT hstmt, SQLULEN crow, SQLULEN *pirow) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLParamOptions) return SQL_ERROR; - return pSQLParamOptions(hstmt, crow, pirow); -} + TRACE("(hstmt %p, crow %s, pirow %p)\n", hstmt, debugstr_sqlulen(crow), pirow); + if (!pSQLParamOptions) return SQL_ERROR; + + ret = pSQLParamOptions(hstmt, crow, pirow); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLPrimaryKeys [ODBC32.065] @@ -1924,31 +1989,28 @@ SQLRETURN WINAPI ODBC32_SQLTablePrivileges( /************************************************************************* * SQLDrivers [ODBC32.071] */ -SQLRETURN WINAPI ODBC32_SQLDrivers( - SQLHENV henv, - SQLUSMALLINT fDirection, - SQLCHAR *szDriverDesc, - SQLSMALLINT cbDriverDescMax, - SQLSMALLINT *pcbDriverDesc, - SQLCHAR *szDriverAttributes, - SQLSMALLINT cbDriverAttrMax, - SQLSMALLINT *pcbDriverAttr) +SQLRETURN WINAPI ODBC32_SQLDrivers(SQLHENV EnvironmentHandle, SQLUSMALLINT fDirection, SQLCHAR *szDriverDesc, + SQLSMALLINT cbDriverDescMax, SQLSMALLINT *pcbDriverDesc, + SQLCHAR *szDriverAttributes, SQLSMALLINT cbDriverAttrMax, + SQLSMALLINT *pcbDriverAttr) { - SQLRETURN ret; + SQLRETURN ret; - TRACE("(Direction %d)\n", fDirection); + TRACE("(EnvironmentHandle %p, Direction %d, szDriverDesc %p, cbDriverDescMax %d, pcbDriverDesc %p," + " DriverAttributes %p, cbDriverAttrMax %d, pcbDriverAttr %p)\n", EnvironmentHandle, fDirection, + szDriverDesc, cbDriverDescMax, pcbDriverDesc, szDriverAttributes, cbDriverAttrMax, pcbDriverAttr); - if (!pSQLDrivers) return SQL_ERROR; - ret = pSQLDrivers(henv, fDirection, szDriverDesc, cbDriverDescMax, pcbDriverDesc, - szDriverAttributes, cbDriverAttrMax, pcbDriverAttr); + if (!pSQLDrivers) return SQL_ERROR; - if (ret == SQL_NO_DATA && fDirection == SQL_FETCH_FIRST) - ERR_(winediag)("No ODBC drivers could be found. " - "Check the settings for your libodbc provider.\n"); + ret = pSQLDrivers(EnvironmentHandle, fDirection, szDriverDesc, cbDriverDescMax, pcbDriverDesc, + szDriverAttributes, cbDriverAttrMax, pcbDriverAttr); - return ret; -} + if (ret == SQL_NO_DATA && fDirection == SQL_FETCH_FIRST) + ERR_(winediag)("No ODBC drivers could be found. Check the settings for your libodbc provider.\n"); + TRACE("Returning %d\n", ret); + return ret; +} /************************************************************************* * SQLBindParameter [ODBC32.072] @@ -2101,30 +2163,31 @@ SQLRETURN WINAPI ODBC32_SQLConnectW(SQLHDBC ConnectionHandle, /************************************************************************* * SQLDescribeColW [ODBC32.108] */ -SQLRETURN WINAPI ODBC32_SQLDescribeColW(SQLHSTMT StatementHandle, - SQLUSMALLINT ColumnNumber, WCHAR *ColumnName, - SQLSMALLINT BufferLength, SQLSMALLINT *NameLength, - SQLSMALLINT *DataType, SQLULEN *ColumnSize, - SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable) +SQLRETURN WINAPI ODBC32_SQLDescribeColW(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNumber, WCHAR *ColumnName, + SQLSMALLINT BufferLength, SQLSMALLINT *NameLength, SQLSMALLINT *DataType, + SQLULEN *ColumnSize, SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable) { - SQLRETURN iResult; - TRACE("\n"); + SQLRETURN ret; - if (!pSQLDescribeColW) return SQL_ERROR; + TRACE("(StatementHandle %p, ColumnNumber %d, ColumnName %p, BufferLength %d, NameLength %p, DataType %p," + " ColumnSize %p, DecimalDigits %p, Nullable %p)\n", StatementHandle, ColumnNumber, ColumnName, + BufferLength, NameLength, DataType, ColumnSize, DecimalDigits, Nullable); - iResult = pSQLDescribeColW(StatementHandle, ColumnNumber, ColumnName, - BufferLength, NameLength, DataType, ColumnSize, - DecimalDigits, Nullable); - if (iResult >= 0) { - TRACE("Successfully recovered the following column information:\n"); - TRACE("\tRequested column index: %d\n", ColumnNumber); - TRACE("\tAvailable length for column name: %d\n", BufferLength); - if (NameLength != NULL) - TRACE("\tActual length for column name: %d\n", *NameLength); - else TRACE("\tActual length for column name: (null)\n"); - TRACE("\tReturned column name: %s\n", debugstr_w(ColumnName)); - } - return iResult; + if (!pSQLDescribeColW) return SQL_ERROR; + + ret = pSQLDescribeColW(StatementHandle, ColumnNumber, ColumnName, BufferLength, NameLength, DataType, ColumnSize, + DecimalDigits, Nullable); + if (ret >= 0) + { + if (ColumnName && NameLength) TRACE("ColumnName %s\n", debugstr_wn(ColumnName, *NameLength)); + if (DataType) TRACE("DataType %d\n", *DataType); + if (ColumnSize) TRACE("ColumnSize %s\n", debugstr_sqlulen(*ColumnSize)); + if (DecimalDigits) TRACE("DecimalDigits %d\n", *DecimalDigits); + if (Nullable) TRACE("Nullable %d\n", *Nullable); + } + + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* @@ -2146,13 +2209,18 @@ SQLRETURN WINAPI ODBC32_SQLErrorW(SQLHENV EnvironmentHandle, /************************************************************************* * SQLExecDirectW [ODBC32.111] */ -SQLRETURN WINAPI ODBC32_SQLExecDirectW(SQLHSTMT StatementHandle, - WCHAR *StatementText, SQLINTEGER TextLength) +SQLRETURN WINAPI ODBC32_SQLExecDirectW(SQLHSTMT StatementHandle, WCHAR *StatementText, SQLINTEGER TextLength) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLExecDirectW) return SQL_ERROR; - return pSQLExecDirectW(StatementHandle, StatementText, TextLength); + TRACE("(StatementHandle %p, StatementText %s, TextLength %d)\n", StatementHandle, + debugstr_wn(StatementText, TextLength), TextLength); + + if (!pSQLExecDirectW) return SQL_ERROR; + + ret = pSQLExecDirectW(StatementHandle, StatementText, TextLength); + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* @@ -2226,15 +2294,19 @@ SQLRETURN WINAPI ODBC32_SQLColAttributeW (SQLHSTMT StatementHandle, /************************************************************************* * SQLGetConnectAttrW [ODBC32.132] */ -SQLRETURN WINAPI ODBC32_SQLGetConnectAttrW(SQLHDBC ConnectionHandle, - SQLINTEGER Attribute, SQLPOINTER Value, - SQLINTEGER BufferLength, SQLINTEGER *StringLength) +SQLRETURN WINAPI ODBC32_SQLGetConnectAttrW(SQLHDBC ConnectionHandle, SQLINTEGER Attribute, SQLPOINTER Value, + SQLINTEGER BufferLength, SQLINTEGER *StringLength) { - TRACE("\n"); + SQLRETURN ret; + + TRACE("(ConnectionHandle %p, Attribute %d, Value %p, BufferLength %d, StringLength %p)\n", ConnectionHandle, + Attribute, Value, BufferLength, StringLength); - if (!pSQLGetConnectAttrW) return SQL_ERROR; - return pSQLGetConnectAttrW(ConnectionHandle, Attribute, Value, - BufferLength, StringLength); + if (!pSQLGetConnectAttrW) return SQL_ERROR; + + ret = pSQLGetConnectAttrW(ConnectionHandle, Attribute, Value, BufferLength, StringLength); + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* @@ -2272,16 +2344,20 @@ SQLRETURN WINAPI ODBC32_SQLGetDescRecW(SQLHDESC DescriptorHandle, /************************************************************************* * SQLGetDiagFieldW [ODBC32.135] */ -SQLRETURN WINAPI ODBC32_SQLGetDiagFieldW(SQLSMALLINT HandleType, SQLHANDLE Handle, - SQLSMALLINT RecNumber, SQLSMALLINT DiagIdentifier, - SQLPOINTER DiagInfo, SQLSMALLINT BufferLength, - SQLSMALLINT *StringLength) +SQLRETURN WINAPI ODBC32_SQLGetDiagFieldW(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLSMALLINT RecNumber, + SQLSMALLINT DiagIdentifier, SQLPOINTER DiagInfo, SQLSMALLINT BufferLength, + SQLSMALLINT *StringLength) { - TRACE("\n"); + SQLRETURN ret; - if (!pSQLGetDiagFieldW) return SQL_ERROR; - return pSQLGetDiagFieldW(HandleType, Handle, RecNumber, DiagIdentifier, - DiagInfo, BufferLength, StringLength); + TRACE("(HandleType %d, Handle %p, RecNumber %d, DiagIdentifier %d, DiagInfo %p, BufferLength %d," + " StringLength %p)\n", HandleType, Handle, RecNumber, DiagIdentifier, DiagInfo, BufferLength, StringLength); + + if (!pSQLGetDiagFieldW) return SQL_ERROR; + + ret = pSQLGetDiagFieldW(HandleType, Handle, RecNumber, DiagIdentifier, DiagInfo, BufferLength, StringLength); + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* @@ -2302,41 +2378,43 @@ SQLRETURN WINAPI ODBC32_SQLGetDiagRecW(SQLSMALLINT HandleType, SQLHANDLE Handle, /************************************************************************* * SQLGetStmtAttrW [ODBC32.138] */ -SQLRETURN WINAPI ODBC32_SQLGetStmtAttrW(SQLHSTMT StatementHandle, - SQLINTEGER Attribute, SQLPOINTER Value, - SQLINTEGER BufferLength, SQLINTEGER *StringLength) +SQLRETURN WINAPI ODBC32_SQLGetStmtAttrW(SQLHSTMT StatementHandle, SQLINTEGER Attribute, SQLPOINTER Value, + SQLINTEGER BufferLength, SQLINTEGER *StringLength) { - SQLRETURN iResult; + SQLRETURN ret; - TRACE("Attribute = (%02d) Value = %p BufferLength = (%d) StringLength = %p\n", - Attribute, Value, BufferLength, StringLength); + TRACE("(StatementHandle %p, Attribute %d, Value %p, BufferLength %d, StringLength %p)\n", StatementHandle, + Attribute, Value, BufferLength, StringLength); - if (Value == NULL) { - WARN("Unexpected NULL in Value return address\n"); - iResult = SQL_ERROR; -/* - } else if (StringLength == NULL) { - WARN("Unexpected NULL in StringLength return address\n"); - iResult = SQL_ERROR; -*/ - } else { - if (!pSQLGetStmtAttrW) return SQL_ERROR; - iResult = pSQLGetStmtAttrW(StatementHandle, Attribute, Value, BufferLength, StringLength); - TRACE("returning %d...\n", iResult); - } - return iResult; + if (!Value) + { + WARN("Unexpected NULL Value return address\n"); + return SQL_ERROR; + } + + if (!pSQLGetStmtAttrW) return SQL_ERROR; + + ret = pSQLGetStmtAttrW(StatementHandle, Attribute, Value, BufferLength, StringLength); + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* * SQLSetConnectAttrW [ODBC32.139] */ -SQLRETURN WINAPI ODBC32_SQLSetConnectAttrW(SQLHDBC ConnectionHandle, SQLINTEGER Attribute, - SQLPOINTER Value, SQLINTEGER StringLength) +SQLRETURN WINAPI ODBC32_SQLSetConnectAttrW(SQLHDBC ConnectionHandle, SQLINTEGER Attribute, SQLPOINTER Value, + SQLINTEGER StringLength) { - TRACE("\n"); + SQLRETURN ret; + + TRACE("(ConnectionHandle %p, Attribute %d, Value %p, StringLength %d)\n", ConnectionHandle, Attribute, Value, + StringLength); - if (!pSQLSetConnectAttrW) return SQL_ERROR; - return pSQLSetConnectAttrW(ConnectionHandle, Attribute, Value, StringLength); + if (!pSQLSetConnectAttrW) return SQL_ERROR; + + ret = pSQLSetConnectAttrW(ConnectionHandle, Attribute, Value, StringLength); + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* @@ -2358,22 +2436,23 @@ SQLRETURN WINAPI ODBC32_SQLColumnsW(SQLHSTMT StatementHandle, /************************************************************************* * SQLDriverConnectW [ODBC32.141] */ -SQLRETURN WINAPI ODBC32_SQLDriverConnectW( - SQLHDBC hdbc, - SQLHWND hwnd, - WCHAR *conn_str_in, - SQLSMALLINT len_conn_str_in, - WCHAR *conn_str_out, - SQLSMALLINT conn_str_out_max, - SQLSMALLINT *ptr_conn_str_out, - SQLUSMALLINT driver_completion ) +SQLRETURN WINAPI ODBC32_SQLDriverConnectW(SQLHDBC ConnectionHandle, SQLHWND WindowHandle, WCHAR *InConnectionString, + SQLSMALLINT Length, WCHAR *OutConnectionString, SQLSMALLINT BufferLength, + SQLSMALLINT *Length2, SQLUSMALLINT DriverCompletion) { - TRACE("(ConnectionString %s, Length %d)\n", - debugstr_w(conn_str_in), len_conn_str_in); + SQLRETURN ret; - if (!pSQLDriverConnectW) return SQL_ERROR; - return pSQLDriverConnectW(hdbc, hwnd, conn_str_in, len_conn_str_in, conn_str_out, - conn_str_out_max, ptr_conn_str_out, driver_completion); + TRACE("(ConnectionHandle %p, WindowHandle %p, InConnectionString %s, Length %d, OutConnectionString %p," + " BufferLength %d, Length2 %p, DriverCompletion %d)\n", ConnectionHandle, WindowHandle, + debugstr_wn(InConnectionString, Length), Length, OutConnectionString, BufferLength, Length2, + DriverCompletion); + + if (!pSQLDriverConnectW) return SQL_ERROR; + + ret = pSQLDriverConnectW(ConnectionHandle, WindowHandle, InConnectionString, Length, OutConnectionString, + BufferLength, Length2, DriverCompletion); + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* @@ -2390,22 +2469,25 @@ SQLRETURN WINAPI ODBC32_SQLGetConnectOptionW(SQLHDBC ConnectionHandle, SQLUSMALL /************************************************************************* * SQLGetInfoW [ODBC32.145] */ -SQLRETURN WINAPI ODBC32_SQLGetInfoW(SQLHDBC ConnectionHandle, - SQLUSMALLINT InfoType, SQLPOINTER InfoValue, - SQLSMALLINT BufferLength, SQLSMALLINT *StringLength) +SQLRETURN WINAPI ODBC32_SQLGetInfoW(SQLHDBC ConnectionHandle, SQLUSMALLINT InfoType, SQLPOINTER InfoValue, + SQLSMALLINT BufferLength, SQLSMALLINT *StringLength) { - SQLRETURN iResult; + SQLRETURN ret; - TRACE("InfoType = (%02u), InfoValue = %p, BufferLength = %d bytes\n", InfoType, InfoValue, BufferLength); - if (InfoValue == NULL) { - WARN("Unexpected NULL in InfoValue address\n"); - iResult = SQL_ERROR; - } else { - if (!pSQLGetInfoW) return SQL_ERROR; - iResult = pSQLGetInfoW(ConnectionHandle, InfoType, InfoValue, BufferLength, StringLength); - TRACE("returning %d...\n", iResult); - } - return iResult; + TRACE("(ConnectionHandle, %p, InfoType %d, InfoValue %p, BufferLength %d, StringLength %p)\n", ConnectionHandle, + InfoType, InfoValue, BufferLength, StringLength); + + if (!InfoValue) + { + WARN("Unexpected NULL InfoValue address\n"); + return SQL_ERROR; + } + + if (!pSQLGetInfoW) return SQL_ERROR; + + ret = pSQLGetInfoW(ConnectionHandle, InfoType, InfoValue, BufferLength, StringLength); + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* @@ -2448,33 +2530,45 @@ SQLRETURN WINAPI ODBC32_SQLSpecialColumnsW(SQLHSTMT StatementHandle, /************************************************************************* * SQLStatisticsW [ODBC32.153] */ -SQLRETURN WINAPI ODBC32_SQLStatisticsW(SQLHSTMT StatementHandle, - SQLWCHAR *CatalogName, SQLSMALLINT NameLength1, - SQLWCHAR *SchemaName, SQLSMALLINT NameLength2, - SQLWCHAR *TableName, SQLSMALLINT NameLength3, - SQLUSMALLINT Unique, SQLUSMALLINT Reserved) +SQLRETURN WINAPI ODBC32_SQLStatisticsW(SQLHSTMT StatementHandle, SQLWCHAR *CatalogName, SQLSMALLINT NameLength1, + SQLWCHAR *SchemaName, SQLSMALLINT NameLength2, SQLWCHAR *TableName, + SQLSMALLINT NameLength3, SQLUSMALLINT Unique, SQLUSMALLINT Reserved) { - TRACE("\n"); + SQLRETURN ret; + + TRACE("(StatementHandle %p, CatalogName %s, NameLength1 %d SchemaName %s, NameLength2 %d, TableName %s" + " NameLength3 %d, Unique %d, Reserved %d)\n", StatementHandle, + debugstr_wn(CatalogName, NameLength1), NameLength1, debugstr_wn(SchemaName, NameLength2), NameLength2, + debugstr_wn(TableName, NameLength3), NameLength3, Unique, Reserved); - if (!pSQLStatisticsW) return SQL_ERROR; - return pSQLStatisticsW(StatementHandle, CatalogName, NameLength1, SchemaName, NameLength2, - TableName, NameLength3, Unique, Reserved); + if (!pSQLStatisticsW) return SQL_ERROR; + + ret = pSQLStatisticsW(StatementHandle, CatalogName, NameLength1, SchemaName, NameLength2, TableName, + NameLength3, Unique, Reserved); + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* * SQLTablesW [ODBC32.154] */ -SQLRETURN WINAPI ODBC32_SQLTablesW(SQLHSTMT StatementHandle, - SQLWCHAR *CatalogName, SQLSMALLINT NameLength1, - SQLWCHAR *SchemaName, SQLSMALLINT NameLength2, - SQLWCHAR *TableName, SQLSMALLINT NameLength3, - SQLWCHAR *TableType, SQLSMALLINT NameLength4) +SQLRETURN WINAPI ODBC32_SQLTablesW(SQLHSTMT StatementHandle, SQLWCHAR *CatalogName, SQLSMALLINT NameLength1, + SQLWCHAR *SchemaName, SQLSMALLINT NameLength2, SQLWCHAR *TableName, + SQLSMALLINT NameLength3, SQLWCHAR *TableType, SQLSMALLINT NameLength4) { - TRACE("\n"); + SQLRETURN ret; + + TRACE("(StatementHandle %p, CatalogName %s, NameLength1 %d, SchemaName %s, NameLength2 %d, TableName %s," + " NameLength3 %d, TableType %s, NameLength4 %d)\n", StatementHandle, + debugstr_wn(CatalogName, NameLength1), NameLength1, debugstr_wn(SchemaName, NameLength2), NameLength2, + debugstr_wn(TableName, NameLength3), NameLength3, debugstr_wn(TableType, NameLength4), NameLength4); - if (!pSQLTablesW) return SQL_ERROR; - return pSQLTablesW(StatementHandle, CatalogName, NameLength1, - SchemaName, NameLength2, TableName, NameLength3, TableType, NameLength4); + if (!pSQLTablesW) return SQL_ERROR; + + ret = pSQLTablesW(StatementHandle, CatalogName, NameLength1, SchemaName, NameLength2, TableName, NameLength3, + TableType, NameLength4); + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* @@ -2519,32 +2613,32 @@ SQLRETURN WINAPI ODBC32_SQLColumnPrivilegesW( /************************************************************************* * SQLDataSourcesW [ODBC32.157] */ -SQLRETURN WINAPI ODBC32_SQLDataSourcesW(SQLHENV EnvironmentHandle, - SQLUSMALLINT Direction, WCHAR *ServerName, - SQLSMALLINT BufferLength1, SQLSMALLINT *NameLength1, - WCHAR *Description, SQLSMALLINT BufferLength2, - SQLSMALLINT *NameLength2) +SQLRETURN WINAPI ODBC32_SQLDataSourcesW(SQLHENV EnvironmentHandle, SQLUSMALLINT Direction, WCHAR *ServerName, + SQLSMALLINT BufferLength1, SQLSMALLINT *NameLength1, WCHAR *Description, + SQLSMALLINT BufferLength2, SQLSMALLINT *NameLength2) { - SQLRETURN ret; + SQLRETURN ret; - TRACE("EnvironmentHandle = %p\n", EnvironmentHandle); + TRACE("(EnvironmentHandle %p, Direction %d, ServerName %p, BufferLength1 %d, NameLength1 %p, Description %p," + " BufferLength2 %d, NameLength2 %p)\n", EnvironmentHandle, Direction, ServerName, BufferLength1, + NameLength1, Description, BufferLength2, NameLength2); - if (!pSQLDataSourcesW) return SQL_ERROR; + if (!pSQLDataSourcesW) return SQL_ERROR; - ret = pSQLDataSourcesW(EnvironmentHandle, Direction, ServerName, - BufferLength1, NameLength1, Description, BufferLength2, NameLength2); + ret = pSQLDataSourcesW(EnvironmentHandle, Direction, ServerName, BufferLength1, NameLength1, Description, + BufferLength2, NameLength2); - if (TRACE_ON(odbc)) - { - TRACE("Returns %d \t", ret); - if (*NameLength1 > 0) - TRACE("DataSource = %s,", debugstr_w(ServerName)); - if (*NameLength2 > 0) - TRACE(" Description = %s", debugstr_w(Description)); - TRACE("\n"); - } + if (ret >= 0 && TRACE_ON(odbc)) + { + if (ServerName && NameLength1 && *NameLength1 > 0) + TRACE(" DataSource %s", debugstr_wn(ServerName, *NameLength1)); + if (Description && NameLength2 && *NameLength2 > 0) + TRACE(" Description %s", debugstr_wn(Description, *NameLength2)); + TRACE("\n"); + } - return ret; + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* @@ -2699,36 +2793,43 @@ SQLRETURN WINAPI ODBC32_SQLDriversW( /************************************************************************* * SQLSetDescFieldW [ODBC32.173] */ -SQLRETURN WINAPI ODBC32_SQLSetDescFieldW(SQLHDESC DescriptorHandle, - SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier, - SQLPOINTER Value, SQLINTEGER BufferLength) +SQLRETURN WINAPI ODBC32_SQLSetDescFieldW(SQLHDESC DescriptorHandle, SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier, + SQLPOINTER Value, SQLINTEGER BufferLength) { - TRACE("\n"); + SQLRETURN ret; + + TRACE("(DescriptorHandle %p, RecNumber %d, FieldIdentifier %d, Value %p, BufferLength %d)\n", DescriptorHandle, + RecNumber, FieldIdentifier, Value, BufferLength); - if (!pSQLSetDescFieldW) return SQL_ERROR; - return pSQLSetDescFieldW(DescriptorHandle, RecNumber, FieldIdentifier, Value, BufferLength); + if (!pSQLSetDescFieldW) return SQL_ERROR; + + ret = pSQLSetDescFieldW(DescriptorHandle, RecNumber, FieldIdentifier, Value, BufferLength); + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* * SQLSetStmtAttrW [ODBC32.176] */ -SQLRETURN WINAPI ODBC32_SQLSetStmtAttrW(SQLHSTMT StatementHandle, - SQLINTEGER Attribute, SQLPOINTER Value, - SQLINTEGER StringLength) +SQLRETURN WINAPI ODBC32_SQLSetStmtAttrW(SQLHSTMT StatementHandle, SQLINTEGER Attribute, SQLPOINTER Value, + SQLINTEGER StringLength) { - SQLRETURN iResult; - TRACE("Attribute = (%02d) Value = %p StringLength = (%d)\n", - Attribute, Value, StringLength); - - if (!pSQLSetStmtAttrW) return SQL_ERROR; - iResult = pSQLSetStmtAttrW(StatementHandle, Attribute, Value, StringLength); - if (iResult == SQL_ERROR && (Attribute == SQL_ROWSET_SIZE || Attribute == SQL_ATTR_ROW_ARRAY_SIZE)) { - TRACE("CHEAT: returning SQL_SUCCESS to ADO...\n"); - iResult = SQL_SUCCESS; - } else { - TRACE("returning %d...\n", iResult); - } - return iResult; + SQLRETURN ret; + + TRACE("(StatementHandle %p, Attribute %d, Value %p, StringLength %d)\n", StatementHandle, Attribute, Value, + StringLength); + + if (!pSQLSetStmtAttrW) return SQL_ERROR; + + ret = pSQLSetStmtAttrW(StatementHandle, Attribute, Value, StringLength); + if (ret == SQL_ERROR && (Attribute == SQL_ROWSET_SIZE || Attribute == SQL_ATTR_ROW_ARRAY_SIZE)) + { + TRACE("CHEAT: returning SQL_SUCCESS to ADO\n"); + return SQL_SUCCESS; + } + + TRACE("Returning %d\n", ret); + return ret; } /************************************************************************* @@ -2745,5 +2846,3 @@ SQLRETURN WINAPI ODBC32_SQLGetDiagRecA(SQLSMALLINT handle_type, SQLHANDLE handle return pSQLGetDiagRecA(handle_type, handle, record, sql_state, native_error, error_msg, error_msg_max, error_msg_size); } - -/* End of file */ -- 2.11.0

1 0

[PATCH] dmime/tests: Test the return value of IDirectMusic_SetDirectSound()
by Michael Stefaniuc 05 Feb '19

05 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/tests/performance.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index 567de1e7f1..c2ca4cdf28 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -178,7 +178,7 @@ static HRESULT test_InitAudio(void) /* Provided dmusic initialized with SetDirectSound */ create_performance(&performance, &dmusic, &dsound, TRUE); - IDirectMusic_SetDirectSound(dmusic, dsound, NULL); + hr = IDirectMusic_SetDirectSound(dmusic, dsound, NULL); ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr); ref = get_refcount(dsound); ok(ref == 2, "dsound ref count got %d expected 2\n", ref); @@ -192,7 +192,7 @@ static HRESULT test_InitAudio(void) /* Provided dmusic and dsound, dmusic initialized with SetDirectSound */ create_performance(&performance, &dmusic, &dsound, TRUE); - IDirectMusic_SetDirectSound(dmusic, dsound, NULL); + hr = IDirectMusic_SetDirectSound(dmusic, dsound, NULL); ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr); ref = get_refcount(dsound); ok(ref == 2, "dsound ref count got %d expected 2\n", ref); -- 2.20.1

1 0

Testnet Downtime
by Jeremy Newman 05 Feb '19

05 Feb '19

We are performing upgrades to our infrastructure today. TestNet and the Test Bots will be going offline during this upgrade. The IP addresses and DNS will change as well after the upgrades are complete. -N

1 1

[PATCH] taskschd: Avoid TRUE : FALSE conditional expressions
by Michael Stefaniuc 05 Feb '19

05 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/taskschd/task.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 1306c8c8f9..54b678244b 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -239,7 +239,7 @@ static HRESULT WINAPI DailyTrigger_put_Enabled(IDailyTrigger *iface, VARIANT_BOO TRACE("(%p)->(%x)\n", This, enabled); - This->enabled = enabled ? TRUE : FALSE; + This->enabled = !!enabled; return S_OK; } @@ -939,7 +939,7 @@ static HRESULT WINAPI TaskSettings_put_AllowDemandStart(ITaskSettings *iface, VA TRACE("%p,%d\n", iface, allow); - taskset->allow_on_demand_start = allow ? TRUE : FALSE; + taskset->allow_on_demand_start = !!allow; return S_OK; } @@ -1045,7 +1045,7 @@ static HRESULT WINAPI TaskSettings_put_StopIfGoingOnBatteries(ITaskSettings *ifa TRACE("%p,%d\n", iface, stop); - taskset->stop_if_going_on_batteries = stop ? TRUE : FALSE; + taskset->stop_if_going_on_batteries = !!stop; return S_OK; } @@ -1069,7 +1069,7 @@ static HRESULT WINAPI TaskSettings_put_DisallowStartIfOnBatteries(ITaskSettings TRACE("%p,%d\n", iface, disallow); - taskset->disallow_start_if_on_batteries = disallow ? TRUE : FALSE; + taskset->disallow_start_if_on_batteries = !!disallow; return S_OK; } @@ -1093,7 +1093,7 @@ static HRESULT WINAPI TaskSettings_put_AllowHardTerminate(ITaskSettings *iface, TRACE("%p,%d\n", iface, allow); - taskset->allow_hard_terminate = allow ? TRUE : FALSE; + taskset->allow_hard_terminate = !!allow; return S_OK; } @@ -1117,7 +1117,7 @@ static HRESULT WINAPI TaskSettings_put_StartWhenAvailable(ITaskSettings *iface, TRACE("%p,%d\n", iface, start); - taskset->start_when_available = start ? TRUE : FALSE; + taskset->start_when_available = !!start; return S_OK; } @@ -1153,7 +1153,7 @@ static HRESULT WINAPI TaskSettings_put_RunOnlyIfNetworkAvailable(ITaskSettings * TRACE("%p,%d\n", iface, run); - taskset->run_only_if_network_available = run ? TRUE : FALSE; + taskset->run_only_if_network_available = !!run; return S_OK; } @@ -1211,7 +1211,7 @@ static HRESULT WINAPI TaskSettings_put_Enabled(ITaskSettings *iface, VARIANT_BOO TRACE("%p,%d\n", iface, enabled); - taskset->enabled = enabled ? TRUE : FALSE; + taskset->enabled = !!enabled; return S_OK; } @@ -1311,7 +1311,7 @@ static HRESULT WINAPI TaskSettings_put_Hidden(ITaskSettings *iface, VARIANT_BOOL TRACE("%p,%d\n", iface, hidden); - taskset->hidden = hidden ? TRUE : FALSE; + taskset->hidden = !!hidden; return S_OK; } @@ -1347,7 +1347,7 @@ static HRESULT WINAPI TaskSettings_put_RunOnlyIfIdle(ITaskSettings *iface, VARIA TRACE("%p,%d\n", iface, run); - taskset->run_only_if_idle = run ? TRUE : FALSE; + taskset->run_only_if_idle = !!run; return S_OK; } @@ -1371,7 +1371,7 @@ static HRESULT WINAPI TaskSettings_put_WakeToRun(ITaskSettings *iface, VARIANT_B TRACE("%p,%d\n", iface, wake); - taskset->wake_to_run = wake ? TRUE : FALSE; + taskset->wake_to_run = !!wake; return S_OK; } -- 2.20.1

2 2

[PATCH 1/4] wined3d: Use lower 8 bits only from _ALPHAREF state.
by Paul Gofman 05 Feb '19

05 Feb '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38138 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_private.h | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4dafb3442e..37ec7e9093 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5945,7 +5945,7 @@ static void alpha_test_arbfp(struct wined3d_context *context, const struct wined return; } - ref = ((float)state->render_states[WINED3D_RS_ALPHAREF]) / 255.0f; + ref = wined3d_alpha_ref(state); glParm = wined3d_gl_compare_func(state->render_states[WINED3D_RS_ALPHAFUNC]); if (glParm) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 714ab0249e..70b4458977 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2149,7 +2149,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context if (update_mask & WINED3D_SHADER_CONST_PS_ALPHA_TEST) { - float ref = state->render_states[WINED3D_RS_ALPHAREF] / 255.0f; + float ref = wined3d_alpha_ref(state); GL_EXTCALL(glUniform1f(prog->ps.alpha_test_ref_location, ref)); checkGLcall("alpha test emulation uniform"); @@ -12874,7 +12874,7 @@ static void glsl_fragment_pipe_alpha_test_func(struct wined3d_context *context, { const struct wined3d_gl_info *gl_info = context->gl_info; GLint func = wined3d_gl_compare_func(state->render_states[WINED3D_RS_ALPHAFUNC]); - float ref = state->render_states[WINED3D_RS_ALPHAREF] / 255.0f; + float ref = wined3d_alpha_ref(state); if (func) { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c62cd92c01..a80009ca5a 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -681,7 +681,7 @@ void state_alpha_test(struct wined3d_context *context, const struct wined3d_stat } else { - ref = ((float)state->render_states[WINED3D_RS_ALPHAREF]) / 255.0f; + ref = wined3d_alpha_ref(state); glParm = wined3d_gl_compare_func(state->render_states[WINED3D_RS_ALPHAFUNC]); } if (glParm) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 825843b0d3..200e36184f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3112,6 +3112,11 @@ static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD sta return context->isStateDirty[idx] & (1u << shift); } +static inline float wined3d_alpha_ref(const struct wined3d_state *state) +{ + return (state->render_states[WINED3D_RS_ALPHAREF] & 0xff) / 255.0f; +} + const char *wined3d_debug_resource_access(DWORD access) DECLSPEC_HIDDEN; const char *wined3d_debug_bind_flags(DWORD bind_flags) DECLSPEC_HIDDEN; const char *wined3d_debug_view_desc(const struct wined3d_view_desc *d, -- 2.20.1

3 8

[PATCH vkd3d 4/5] vkd3d-common: Fix vkd3d_strdup_{w16, w32}_utf8() functions.
by Józef Kucia 05 Feb '19

05 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-common/utf8.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-common/utf8.c b/libs/vkd3d-common/utf8.c index e48316daa2a3..8bf4eb05e4f7 100644 --- a/libs/vkd3d-common/utf8.c +++ b/libs/vkd3d-common/utf8.c @@ -107,8 +107,8 @@ static char *vkd3d_strdup_w16_utf8(const uint16_t *wstr) { const uint16_t *src = wstr; size_t dst_size = 0; + char *dst, *utf8; uint32_t c; - char *dst; while (*src) { @@ -121,14 +121,15 @@ static char *vkd3d_strdup_w16_utf8(const uint16_t *wstr) if (!(dst = vkd3d_malloc(dst_size))) return NULL; + utf8 = dst; src = wstr; while (*src) { if (!(c = vkd3d_utf16_read(&src))) continue; - vkd3d_utf8_append(&dst, c); + vkd3d_utf8_append(&utf8, c); } - *dst = 0; + *utf8 = 0; return dst; } @@ -137,7 +138,7 @@ static char *vkd3d_strdup_w32_utf8(const uint32_t *wstr) { const uint32_t *src = wstr; size_t dst_size = 0; - char *dst; + char *dst, *utf8; while (*src) dst_size += vkd3d_utf8_len(*src++); @@ -146,10 +147,11 @@ static char *vkd3d_strdup_w32_utf8(const uint32_t *wstr) if (!(dst = vkd3d_malloc(dst_size))) return NULL; + utf8 = dst; src = wstr; while (*src) - vkd3d_utf8_append(&dst, *src++); - *dst = 0; + vkd3d_utf8_append(&utf8, *src++); + *utf8 = 0; return dst; } -- 2.19.2

2 1

[PATCH vkd3d 5/5] vkd3d: Set object names for Vulkan compute pipelines.
by Józef Kucia 05 Feb '19

05 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index ba4c06b96a51..5c7d30393211 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1195,6 +1195,12 @@ static HRESULT STDMETHODCALLTYPE d3d12_pipeline_state_SetName(ID3D12PipelineStat TRACE("iface %p, name %s.\n", iface, debugstr_w(name, state->device->wchar_size)); + if (d3d12_pipeline_state_is_compute(state)) + { + return vkd3d_set_vk_object_name(state->device, (uint64_t)state->u.compute.vk_pipeline, + VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_EXT, name); + } + return name ? S_OK : E_INVALIDARG; } -- 2.19.2

2 1

[PATCH vkd3d 3/5] vkd3d: Compile pipelines with tessellation state create info.
by Józef Kucia 05 Feb '19

05 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 57 +------------------------- libs/vkd3d/state.c | 84 ++++++++++++++++++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 4 +- 3 files changed, 76 insertions(+), 69 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index d3377137438b..8aa552545fb9 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1765,7 +1765,7 @@ static void d3d12_command_list_reset_state(struct d3d12_command_list *list, ID3D12GraphicsCommandList *iface = &list->ID3D12GraphicsCommandList_iface; memset(list->strides, 0, sizeof(list->strides)); - list->primitive_topology = VK_PRIMITIVE_TOPOLOGY_POINT_LIST; + list->primitive_topology = D3D_PRIMITIVE_TOPOLOGY_POINTLIST; list->index_buffer_format = DXGI_FORMAT_UNKNOWN; @@ -2915,59 +2915,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveSubresource(ID3D12Graphi VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &vk_image_resolve)); } -static enum VkPrimitiveTopology vk_topology_from_d3d12_topology(D3D12_PRIMITIVE_TOPOLOGY topology) -{ - switch (topology) - { - case D3D_PRIMITIVE_TOPOLOGY_POINTLIST: - return VK_PRIMITIVE_TOPOLOGY_POINT_LIST; - case D3D_PRIMITIVE_TOPOLOGY_LINELIST: - return VK_PRIMITIVE_TOPOLOGY_LINE_LIST; - case D3D_PRIMITIVE_TOPOLOGY_LINESTRIP: - return VK_PRIMITIVE_TOPOLOGY_LINE_STRIP; - case D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST: - return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST; - case D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP: - return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP; - case D3D_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST: - case D3D_PRIMITIVE_TOPOLOGY_2_CONTROL_POINT_PATCHLIST: - case D3D_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST: - case D3D_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST: - case D3D_PRIMITIVE_TOPOLOGY_5_CONTROL_POINT_PATCHLIST: - case D3D_PRIMITIVE_TOPOLOGY_6_CONTROL_POINT_PATCHLIST: - case D3D_PRIMITIVE_TOPOLOGY_7_CONTROL_POINT_PATCHLIST: - case D3D_PRIMITIVE_TOPOLOGY_8_CONTROL_POINT_PATCHLIST: - case D3D_PRIMITIVE_TOPOLOGY_9_CONTROL_POINT_PATCHLIST: - case D3D_PRIMITIVE_TOPOLOGY_10_CONTROL_POINT_PATCHLIST: - case D3D_PRIMITIVE_TOPOLOGY_11_CONTROL_POINT_PATCHLIST: - case D3D_PRIMITIVE_TOPOLOGY_12_CONTROL_POINT_PATCHLIST: - case D3D_PRIMITIVE_TOPOLOGY_13_CONTROL_POINT_PATCHLIST: - case D3D_PRIMITIVE_TOPOLOGY_14_CONTROL_POINT_PATCHLIST: - case D3D_PRIMITIVE_TOPOLOGY_15_CONTROL_POINT_PATCHLIST: - case D3D_PRIMITIVE_TOPOLOGY_16_CONTROL_POINT_PATCHLIST: - case D3D_PRIMITIVE_TOPOLOGY_17_CONTROL_POINT_PATCHLIST: - case D3D_PRIMITIVE_TOPOLOGY_18_CONTROL_POINT_PATCHLIST: - case D3D_PRIMITIVE_TOPOLOGY_19_CONTROL_POINT_PATCHLIST: - case D3D_PRIMITIVE_TOPOLOGY_20_CONTROL_POINT_PATCHLIST: - case D3D_PRIMITIVE_TOPOLOGY_21_CONTROL_POINT_PATCHLIST: - case D3D_PRIMITIVE_TOPOLOGY_22_CONTROL_POINT_PATCHLIST: - case D3D_PRIMITIVE_TOPOLOGY_23_CONTROL_POINT_PATCHLIST: - case D3D_PRIMITIVE_TOPOLOGY_24_CONTROL_POINT_PATCHLIST: - case D3D_PRIMITIVE_TOPOLOGY_25_CONTROL_POINT_PATCHLIST: - case D3D_PRIMITIVE_TOPOLOGY_26_CONTROL_POINT_PATCHLIST: - case D3D_PRIMITIVE_TOPOLOGY_27_CONTROL_POINT_PATCHLIST: - case D3D_PRIMITIVE_TOPOLOGY_28_CONTROL_POINT_PATCHLIST: - case D3D_PRIMITIVE_TOPOLOGY_29_CONTROL_POINT_PATCHLIST: - case D3D_PRIMITIVE_TOPOLOGY_30_CONTROL_POINT_PATCHLIST: - case D3D_PRIMITIVE_TOPOLOGY_31_CONTROL_POINT_PATCHLIST: - case D3D_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST: - return VK_PRIMITIVE_TOPOLOGY_PATCH_LIST; - default: - FIXME("Unhandled primitive topology %#x.\n", topology); - return VK_PRIMITIVE_TOPOLOGY_POINT_LIST; - } -} - static void STDMETHODCALLTYPE d3d12_command_list_IASetPrimitiveTopology(ID3D12GraphicsCommandList *iface, D3D12_PRIMITIVE_TOPOLOGY topology) { @@ -2981,7 +2928,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetPrimitiveTopology(ID3D12Gr return; } - list->primitive_topology = vk_topology_from_d3d12_topology(topology); + list->primitive_topology = topology; d3d12_command_list_invalidate_current_pipeline(list); } diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 8aff2f2c03b2..ba4c06b96a51 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1055,7 +1055,7 @@ HRESULT d3d12_root_signature_create(struct d3d12_device *device, struct vkd3d_pipeline_key { - VkPrimitiveTopology topology; + D3D12_PRIMITIVE_TOPOLOGY topology; uint32_t strides[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; }; @@ -2428,6 +2428,59 @@ HRESULT d3d12_pipeline_state_create_graphics(struct d3d12_device *device, return S_OK; } +static enum VkPrimitiveTopology vk_topology_from_d3d12_topology(D3D12_PRIMITIVE_TOPOLOGY topology) +{ + switch (topology) + { + case D3D_PRIMITIVE_TOPOLOGY_POINTLIST: + return VK_PRIMITIVE_TOPOLOGY_POINT_LIST; + case D3D_PRIMITIVE_TOPOLOGY_LINELIST: + return VK_PRIMITIVE_TOPOLOGY_LINE_LIST; + case D3D_PRIMITIVE_TOPOLOGY_LINESTRIP: + return VK_PRIMITIVE_TOPOLOGY_LINE_STRIP; + case D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST: + return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST; + case D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP: + return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP; + case D3D_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_2_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_5_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_6_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_7_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_8_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_9_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_10_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_11_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_12_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_13_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_14_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_15_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_16_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_17_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_18_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_19_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_20_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_21_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_22_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_23_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_24_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_25_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_26_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_27_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_28_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_29_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_30_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_31_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST: + return VK_PRIMITIVE_TOPOLOGY_PATCH_LIST; + default: + FIXME("Unhandled primitive topology %#x.\n", topology); + return VK_PRIMITIVE_TOPOLOGY_POINT_LIST; + } +} + static VkPipeline d3d12_pipeline_state_find_compiled_pipeline(const struct d3d12_pipeline_state *state, const struct vkd3d_pipeline_key *key) { @@ -2496,17 +2549,18 @@ static bool d3d12_pipeline_state_put_pipeline_to_cache(struct d3d12_pipeline_sta } VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_state *state, - VkPrimitiveTopology topology, const uint32_t *strides) + D3D12_PRIMITIVE_TOPOLOGY topology, const uint32_t *strides) { - struct VkVertexInputBindingDescription bindings[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; + VkVertexInputBindingDescription bindings[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; const struct vkd3d_vk_device_procs *vk_procs = &state->device->vk_procs; struct d3d12_graphics_pipeline_state *graphics = &state->u.graphics; VkPipelineVertexInputDivisorStateCreateInfoEXT input_divisor_info; - struct VkPipelineVertexInputStateCreateInfo input_desc; - struct VkPipelineInputAssemblyStateCreateInfo ia_desc; - struct VkPipelineColorBlendStateCreateInfo blend_desc; - struct VkGraphicsPipelineCreateInfo pipeline_desc; + VkPipelineTessellationStateCreateInfo tessellation_info; + VkPipelineVertexInputStateCreateInfo input_desc; + VkPipelineInputAssemblyStateCreateInfo ia_desc; + VkPipelineColorBlendStateCreateInfo blend_desc; struct d3d12_device *device = state->device; + VkGraphicsPipelineCreateInfo pipeline_desc; struct vkd3d_pipeline_key pipeline_key; size_t binding_count = 0; VkPipeline vk_pipeline; @@ -2514,7 +2568,7 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta uint32_t mask; VkResult vr; - static const struct VkPipelineViewportStateCreateInfo vp_desc = + static const VkPipelineViewportStateCreateInfo vp_desc = { .sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO, .pNext = NULL, @@ -2524,14 +2578,14 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta .scissorCount = 1, .pScissors = NULL, }; - static const enum VkDynamicState dynamic_states[] = + static const VkDynamicState dynamic_states[] = { VK_DYNAMIC_STATE_VIEWPORT, VK_DYNAMIC_STATE_SCISSOR, VK_DYNAMIC_STATE_BLEND_CONSTANTS, VK_DYNAMIC_STATE_STENCIL_REFERENCE, }; - static const struct VkPipelineDynamicStateCreateInfo dynamic_desc = + static const VkPipelineDynamicStateCreateInfo dynamic_desc = { .sType = VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO, .pNext = NULL, @@ -2597,9 +2651,15 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta ia_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO; ia_desc.pNext = NULL; ia_desc.flags = 0; - ia_desc.topology = topology; + ia_desc.topology = vk_topology_from_d3d12_topology(topology); ia_desc.primitiveRestartEnable = !!graphics->index_buffer_strip_cut_value; + tessellation_info.sType = VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO; + tessellation_info.pNext = NULL; + tessellation_info.flags = 0; + tessellation_info.patchControlPoints + = max(topology - D3D_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST + 1, 1); + blend_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO; blend_desc.pNext = NULL; blend_desc.flags = 0; @@ -2619,7 +2679,7 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta pipeline_desc.pStages = graphics->stages; pipeline_desc.pVertexInputState = &input_desc; pipeline_desc.pInputAssemblyState = &ia_desc; - pipeline_desc.pTessellationState = NULL; + pipeline_desc.pTessellationState = &tessellation_info; pipeline_desc.pViewportState = &vp_desc; pipeline_desc.pRasterizationState = &graphics->rs_desc; pipeline_desc.pMultisampleState = &graphics->ms_desc; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 69e2cf7281e5..dee129e80e9e 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -674,7 +674,7 @@ HRESULT d3d12_pipeline_state_create_compute(struct d3d12_device *device, HRESULT d3d12_pipeline_state_create_graphics(struct d3d12_device *device, const D3D12_GRAPHICS_PIPELINE_STATE_DESC *desc, struct d3d12_pipeline_state **state) DECLSPEC_HIDDEN; VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_state *state, - VkPrimitiveTopology topology, const uint32_t *strides) DECLSPEC_HIDDEN; + D3D12_PRIMITIVE_TOPOLOGY topology, const uint32_t *strides) DECLSPEC_HIDDEN; bool d3d12_pipeline_state_is_render_pass_compatible(const struct d3d12_pipeline_state *state_a, const struct d3d12_pipeline_state *state_b) DECLSPEC_HIDDEN; struct d3d12_pipeline_state *unsafe_impl_from_ID3D12PipelineState(ID3D12PipelineState *iface) DECLSPEC_HIDDEN; @@ -786,7 +786,7 @@ struct d3d12_command_list VkCommandBuffer vk_command_buffer; uint32_t strides[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; - VkPrimitiveTopology primitive_topology; + D3D12_PRIMITIVE_TOPOLOGY primitive_topology; DXGI_FORMAT index_buffer_format; -- 2.19.2

2 1

[PATCH vkd3d 1/5] vkd3d-shader: Introduce vkd3d_spirv_build_op_access_chain1().
by Józef Kucia 05 Feb '19

05 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d0cbf56769b3..0ece33c360a5 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1082,6 +1082,12 @@ static uint32_t vkd3d_spirv_build_op_access_chain(struct vkd3d_spirv_builder *bu SpvOpAccessChain, result_type, base_id, indexes, index_count); } +static uint32_t vkd3d_spirv_build_op_access_chain1(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t base_id, uint32_t index) +{ + return vkd3d_spirv_build_op_access_chain(builder, result_type, base_id, &index, 1); +} + static uint32_t vkd3d_spirv_build_op_in_bounds_access_chain(struct vkd3d_spirv_builder *builder, uint32_t result_type, uint32_t base_id, uint32_t *indexes, uint32_t index_count) { @@ -6211,8 +6217,7 @@ static void vkd3d_dxbc_compiler_emit_ld_tgsm(struct vkd3d_dxbc_compiler *compile coordinate_id = vkd3d_spirv_build_op_iadd(builder, type_id, coordinate_id, vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx)); - ptr_id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, - reg_info.id, &coordinate_id, 1); + ptr_id = vkd3d_spirv_build_op_access_chain1(builder, ptr_type_id, reg_info.id, coordinate_id); constituents[j++] = vkd3d_spirv_build_op_load(builder, type_id, ptr_id, SpvMemoryAccessMaskNone); } assert(dst->reg.data_type == VKD3D_DATA_UINT); @@ -6312,8 +6317,7 @@ static void vkd3d_dxbc_compiler_emit_store_tgsm(struct vkd3d_dxbc_compiler *comp coordinate_id = vkd3d_spirv_build_op_iadd(builder, type_id, coordinate_id, vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx)); - ptr_id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, - reg_info.id, &coordinate_id, 1); + ptr_id = vkd3d_spirv_build_op_access_chain1(builder, ptr_type_id, reg_info.id, coordinate_id); vkd3d_spirv_build_op_store(builder, ptr_id, data_id, SpvMemoryAccessMaskNone); } } @@ -6536,8 +6540,7 @@ static void vkd3d_dxbc_compiler_emit_atomic_instruction(struct vkd3d_dxbc_compil { component_type = VKD3D_TYPE_UINT; ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info.storage_class, type_id); - pointer_id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, - reg_info.id, &coordinate_id, 1); + pointer_id = vkd3d_spirv_build_op_access_chain1(builder, ptr_type_id, reg_info.id, coordinate_id); } else { -- 2.19.2

2 1

[PATCH vkd3d 2/5] vkd3d: Add support for patch list primitive topology.
by Józef Kucia 05 Feb '19

05 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9af1ec9f4c2f..d3377137438b 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2929,6 +2929,39 @@ static enum VkPrimitiveTopology vk_topology_from_d3d12_topology(D3D12_PRIMITIVE_ return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST; case D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP: return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP; + case D3D_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_2_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_5_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_6_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_7_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_8_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_9_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_10_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_11_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_12_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_13_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_14_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_15_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_16_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_17_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_18_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_19_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_20_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_21_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_22_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_23_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_24_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_25_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_26_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_27_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_28_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_29_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_30_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_31_CONTROL_POINT_PATCHLIST: + case D3D_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST: + return VK_PRIMITIVE_TOPOLOGY_PATCH_LIST; default: FIXME("Unhandled primitive topology %#x.\n", topology); return VK_PRIMITIVE_TOPOLOGY_POINT_LIST; -- 2.19.2

2 1

[PATCH vkd3d v2 4/5] vkd3d: Implement d3d12_command_queue_SetName().
by Zhiyi Zhang 05 Feb '19

05 Feb '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- libs/vkd3d/command.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index dd0d564..f334f9e 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4549,10 +4549,21 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_SetPrivateDataInterface(ID3 static HRESULT STDMETHODCALLTYPE d3d12_command_queue_SetName(ID3D12CommandQueue *iface, const WCHAR *name) { struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface); + VkQueue vk_queue; + HRESULT hr; - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, command_queue->device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, command_queue->device->wchar_size)); - return E_NOTIMPL; + if (!(vk_queue = vkd3d_queue_acquire(command_queue->vkd3d_queue))) + { + ERR("Failed to acquire queue %p.\n", command_queue->vkd3d_queue); + return E_FAIL; + } + + hr = vkd3d_set_vk_object_name(command_queue->device, (uint64_t)(uintptr_t)vk_queue, + VK_DEBUG_REPORT_OBJECT_TYPE_QUEUE_EXT, name); + vkd3d_queue_release(command_queue->vkd3d_queue); + return hr; } static HRESULT STDMETHODCALLTYPE d3d12_command_queue_GetDevice(ID3D12CommandQueue *iface, -- 2.15.2 (Apple Git-101.1)

2 1

[PATCH vkd3d v2 3/5] vkd3d: Implement d3d12_command_allocator_SetName().
by Zhiyi Zhang 05 Feb '19

05 Feb '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- libs/vkd3d/command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index abee0e2..dd0d564 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1081,9 +1081,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_allocator_SetName(ID3D12CommandAl { struct d3d12_command_allocator *allocator = impl_from_ID3D12CommandAllocator(iface); - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, allocator->device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, allocator->device->wchar_size)); - return E_NOTIMPL; + return name ? S_OK : E_INVALIDARG; } static HRESULT STDMETHODCALLTYPE d3d12_command_allocator_GetDevice(ID3D12CommandAllocator *iface, -- 2.15.2 (Apple Git-101.1)

2 1

[PATCH vkd3d v2 2/5] vkd3d: Implement d3d12_command_list_SetName().
by Zhiyi Zhang 05 Feb '19

05 Feb '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- As Józef pointed out, there is the option of restoring the vulkan object names when command list gets reset. But then after I implemented it, it seems to much of a hassle. We need to store the name in unicode or utf8. Then we need a strdup for unicode or a new set vk object method for utf8 names. Finally we also need a synchronization primitive to protect the name from race conditions. So I decided not to use that approach. Same for command allocators. libs/vkd3d/command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9af1ec9..abee0e2 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1694,9 +1694,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_SetName(ID3D12GraphicsComman { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, list->device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, list->device->wchar_size)); - return E_NOTIMPL; + return name ? S_OK : E_INVALIDARG; } static HRESULT STDMETHODCALLTYPE d3d12_command_list_GetDevice(ID3D12GraphicsCommandList *iface, -- 2.15.2 (Apple Git-101.1)

2 1

[PATCH vkd3d v2 1/5] vkd3d: Implement d3d12_device_SetName().
by Zhiyi Zhang 05 Feb '19

05 Feb '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Supersede 157536~157541 libs/vkd3d/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 4b5f522..5265ec9 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1564,9 +1564,10 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_SetName(ID3D12Device *iface, const { struct d3d12_device *device = impl_from_ID3D12Device(iface); - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, device->wchar_size)); - return E_NOTIMPL; + return vkd3d_set_vk_object_name(device, (uint64_t)(uintptr_t)device->vk_device, + VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, name); } static UINT STDMETHODCALLTYPE d3d12_device_GetNodeCount(ID3D12Device *iface) -- 2.15.2 (Apple Git-101.1)

2 1

[PATCH v3 1/4] wined3d: Store texture states in the wined3d_stateblock_state structure.
by Zebediah Figura 05 Feb '19

05 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 9 ++++----- dlls/wined3d/stateblock.c | 22 ++++++++++++++++------ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dee99dcde2..8467acf361 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3431,7 +3431,6 @@ void CDECL wined3d_device_set_texture_stage_state(struct wined3d_device *device, UINT stage, enum wined3d_texture_stage_state state, DWORD value) { const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; - DWORD old_value; TRACE("device %p, stage %u, state %s, value %#x.\n", device, stage, debug_d3dtexturestate(state), value); @@ -3449,8 +3448,7 @@ void CDECL wined3d_device_set_texture_stage_state(struct wined3d_device *device, return; } - old_value = device->update_state->texture_states[stage][state]; - device->update_state->texture_states[stage][state] = value; + device->update_stateblock_state->texture_states[stage][state] = value; if (device->recording) { @@ -3459,13 +3457,14 @@ void CDECL wined3d_device_set_texture_stage_state(struct wined3d_device *device, return; } - /* Checked after the assignments to allow proper stateblock recording. */ - if (old_value == value) + if (value == device->state.texture_states[stage][state]) { TRACE("Application is setting the old value over, nothing to do.\n"); return; } + device->state.texture_states[stage][state] = value; + wined3d_cs_emit_set_texture_state(device->cs, stage, state, value); } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 8117652192..61de76403e 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -925,12 +925,13 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) for (i = 0; i < stateblock->num_contained_tss_states; ++i) { DWORD stage = stateblock->contained_tss_states[i].stage; - DWORD state = stateblock->contained_tss_states[i].state; + DWORD texture_state = stateblock->contained_tss_states[i].state; - TRACE("Updating texturestage state %u, %u to %#x (was %#x).\n", stage, state, - src_state->texture_states[stage][state], stateblock->state.texture_states[stage][state]); + TRACE("Updating texturestage state %u, %u to %#x (was %#x).\n", stage, texture_state, + state->texture_states[stage][texture_state], + stateblock->stateblock_state.texture_states[stage][texture_state]); - stateblock->state.texture_states[stage][state] = src_state->texture_states[stage][state]; + stateblock->stateblock_state.texture_states[stage][texture_state] = state->texture_states[stage][texture_state]; } /* Samplers */ @@ -1075,9 +1076,11 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) for (i = 0; i < stateblock->num_contained_tss_states; ++i) { DWORD stage = stateblock->contained_tss_states[i].stage; - DWORD state = stateblock->contained_tss_states[i].state; + DWORD texture_state = stateblock->contained_tss_states[i].state; - wined3d_device_set_texture_stage_state(device, stage, state, stateblock->state.texture_states[stage][state]); + state->texture_states[stage][texture_state] = stateblock->stateblock_state.texture_states[stage][texture_state]; + wined3d_device_set_texture_stage_state(device, stage, texture_state, + stateblock->stateblock_state.texture_states[stage][texture_state]); } /* Sampler states. */ @@ -1396,7 +1399,14 @@ void state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, static void stateblock_state_init_default(struct wined3d_stateblock_state *state, const struct wined3d_d3d_info *d3d_info) { + unsigned int i; + init_default_render_states(state->rs, d3d_info); + + for (i = 0; i < MAX_TEXTURES; ++i) + { + init_default_texture_state(i, state->texture_states[i]); + } } void wined3d_stateblock_state_init(struct wined3d_stateblock_state *state, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1e3ec28d6b..bfeb639ef3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2981,6 +2981,8 @@ struct wined3d_stateblock_state BOOL ps_consts_b[WINED3D_MAX_CONSTS_B]; DWORD rs[WINEHIGHEST_RENDER_STATE + 1]; + + DWORD texture_states[MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1]; }; struct wined3d_device -- 2.20.1

2 7

[PATCH] wined3d: Set the correct matrix in wined3d_device_multiply_transform().
by Zebediah Figura 05 Feb '19

05 Feb '19

Fixes a regression introduced by 7163fbba85b0f27f5bedb22291a6f53d2b507cdd. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46565 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 72e328f630..59d08480bb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1544,7 +1544,7 @@ void CDECL wined3d_device_multiply_transform(struct wined3d_device *device, * into the primary stateblock. */ mat = &device->state.transforms[state]; multiply_matrix(mat, mat, matrix); - wined3d_cs_emit_set_transform(device->cs, state, matrix); + wined3d_cs_emit_set_transform(device->cs, state, mat); } /* Note lights are real special cases. Although the device caps state only -- 2.20.1

2 1

[PATCH 1/6] d3d9: Refuse to create D3DUSAGE_WRITEONLY textures.
by Matteo Bruni 05 Feb '19

05 Feb '19

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3d9/tests/device.c | 15 +++++++++++++++ dlls/d3d9/texture.c | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 859ca472948..9064a6701af 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -8051,6 +8051,11 @@ static void test_lockrect_invalid(void) ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x, type %s.\n", hr, resources[r].name); IDirect3DTexture9_Release(texture); + + hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, D3DUSAGE_WRITEONLY, + D3DFMT_A8R8G8B8, resources[r].pool, &texture, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x for type %s.\n", + hr, resources[r].name); } if (cube_texture) { @@ -8090,6 +8095,11 @@ static void test_lockrect_invalid(void) ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x, type %s.\n", hr, resources[r].name); IDirect3DCubeTexture9_Release(cube_texture); + + hr = IDirect3DDevice9_CreateCubeTexture(device, 128, 1, D3DUSAGE_WRITEONLY, D3DFMT_A8R8G8B8, + resources[r].pool, &cube_texture, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x for type %s.\n", + hr, resources[r].name); } } @@ -10269,6 +10279,11 @@ static void test_lockbox_invalid(void) ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr); IDirect3DVolumeTexture9_Release(texture); + + hr = IDirect3DDevice9_CreateVolumeTexture(device, 4, 4, 2, 1, D3DUSAGE_WRITEONLY, + D3DFMT_A8R8G8B8, D3DPOOL_SCRATCH, &texture, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D9_Release(d3d); diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 8dc1ceea698..9f367096b71 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1330,6 +1330,11 @@ HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device, if (is_gdi_compat_wined3dformat(desc.format)) flags |= WINED3D_TEXTURE_CREATE_GET_DC; + if (usage & D3DUSAGE_WRITEONLY) + { + WARN("Texture can't be created with the D3DUSAGE_WRITEONLY flags, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } if (usage & D3DUSAGE_AUTOGENMIPMAP) { if (pool == D3DPOOL_SYSTEMMEM) @@ -1419,6 +1424,11 @@ HRESULT cubetexture_init(struct d3d9_texture *texture, struct d3d9_device *devic if (is_gdi_compat_wined3dformat(desc.format)) flags |= WINED3D_TEXTURE_CREATE_GET_DC; + if (usage & D3DUSAGE_WRITEONLY) + { + WARN("Texture can't be created with the D3DUSAGE_WRITEONLY flags, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } if (usage & D3DUSAGE_AUTOGENMIPMAP) { if (pool == D3DPOOL_SYSTEMMEM) @@ -1493,6 +1503,11 @@ HRESULT volumetexture_init(struct d3d9_texture *texture, struct d3d9_device *dev desc.depth = depth; desc.size = 0; + if (usage & D3DUSAGE_WRITEONLY) + { + WARN("Texture can't be created with the D3DUSAGE_WRITEONLY flags, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } if (usage & D3DUSAGE_AUTOGENMIPMAP) { WARN("D3DUSAGE_AUTOGENMIPMAP volume texture is not supported, returning D3DERR_INVALIDCALL.\n"); -- 2.19.2

4 15

[PATCH 2/4] windowscodecs: Fix behaviour of format converter for indexed formats when NULL or empty palette has been provided.
by Dmitry Timoshkov 05 Feb '19

05 Feb '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/converter.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 5288a32d13..83f1339d0c 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -1278,7 +1278,6 @@ static HRESULT copypixels_to_8bppIndexed(struct FormatConverter *This, const WIC hr = IWICPalette_GetColors(This->palette, 256, colors, &count); if (hr != S_OK) return hr; - if (!count) return WINCODEC_ERR_WRONGSTATE; srcstride = 3 * prc->Width; srcdatasize = srcstride * prc->Height; @@ -1447,7 +1446,18 @@ static HRESULT WINAPI FormatConverter_CopyPalette(IWICFormatConverter *iface, TRACE("(%p,%p)\n", iface, palette); if (!palette) return E_INVALIDARG; - if (!This->palette) return WINCODEC_ERR_WRONGSTATE; + if (!This->source) return WINCODEC_ERR_WRONGSTATE; + + if (!This->palette) + { + HRESULT hr; + UINT bpp; + + hr = get_pixelformat_bpp(This->dst_format->guid, &bpp); + if (hr != S_OK) return hr; + if (bpp <= 8) return WINCODEC_ERR_WRONGSTATE; + return IWICBitmapSource_CopyPalette(This->source, palette); + } return IWICPalette_InitializeFromPalette(palette, This->palette); } @@ -1478,7 +1488,7 @@ static HRESULT WINAPI FormatConverter_CopyPixels(IWICFormatConverter *iface, pbBuffer, This->src_format->format); } else - return WINCODEC_ERR_NOTINITIALIZED; + return WINCODEC_ERR_WRONGSTATE; } static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, @@ -1495,6 +1505,10 @@ static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, if (!palette) { + UINT bpp; + res = get_pixelformat_bpp(dstFormat, &bpp); + if (res != S_OK) return res; + res = PaletteImpl_Create(&palette); if (res != S_OK) return res; @@ -1503,20 +1517,19 @@ static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, case WICBitmapPaletteTypeCustom: IWICPalette_Release(palette); palette = NULL; - res = S_OK; + if (bpp <= 8) return E_INVALIDARG; break; case WICBitmapPaletteTypeMedianCut: { - UINT bpp; - res = get_pixelformat_bpp(dstFormat, &bpp); - if (res == S_OK && bpp <= 8) + if (bpp <= 8) res = IWICPalette_InitializeFromBitmap(palette, source, 1 << bpp, FALSE); break; } default: - res = IWICPalette_InitializePredefined(palette, palette_type, FALSE); + if (bpp <= 8) + res = IWICPalette_InitializePredefined(palette, palette_type, FALSE); break; } @@ -1576,6 +1589,9 @@ end: LeaveCriticalSection(&This->lock); + if (res != S_OK && palette) + IWICPalette_Release(palette); + return res; } -- 2.20.1

2 1

[PATCH 4/4] windowscodecs/tests: Add some tests for converting 24bppBGR to 8bppIndexed format.
by Dmitry Timoshkov 05 Feb '19

05 Feb '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tests/converter.c | 158 +++++++++++++++++++++++++++ 1 file changed, 158 insertions(+) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 481e5636b9..704ce20dcd 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -1571,6 +1571,163 @@ static const struct setting png_interlace_settings[] = { {NULL} }; +static void test_converter_8bppIndexed(void) +{ + HRESULT hr; + BitmapTestSrc *src_obj; + IWICFormatConverter *converter; + IWICPalette *palette; + UINT count, i; + BYTE buf[32 * 2 * 3]; /* enough to hold 32x2 24bppBGR data */ + + CreateTestBitmap(&testdata_24bppBGR, &src_obj); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + count = 0xdeadbeef; + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 0, "expected 0, got %u\n", count); + + /* NULL palette + Custom type */ + hr = IWICImagingFactory_CreateFormatConverter(factory, &converter); + ok(hr == S_OK, "CreateFormatConverter error %#x\n", hr); + hr = IWICFormatConverter_Initialize(converter, &src_obj->IWICBitmapSource_iface, + &GUID_WICPixelFormat24bppBGR, WICBitmapDitherTypeNone, + NULL, 0.0, WICBitmapPaletteTypeCustom); + ok(hr == S_OK, "Initialize error %#x\n", hr); + hr = IWICFormatConverter_CopyPalette(converter, palette); + ok(hr == 0xdeadbeef, "unexpected error %#x\n", hr); + hr = IWICFormatConverter_CopyPixels(converter, NULL, 32 * 3, sizeof(buf), buf); + ok(hr == S_OK, "CopyPixels error %#x\n", hr); + IWICFormatConverter_Release(converter); + + /* NULL palette + Custom type */ + hr = IWICImagingFactory_CreateFormatConverter(factory, &converter); + ok(hr == S_OK, "CreateFormatConverter error %#x\n", hr); + hr = IWICFormatConverter_Initialize(converter, &src_obj->IWICBitmapSource_iface, + &GUID_WICPixelFormat8bppIndexed, WICBitmapDitherTypeNone, + NULL, 0.0, WICBitmapPaletteTypeCustom); + ok(hr == E_INVALIDARG, "unexpected error %#x\n", hr); + hr = IWICFormatConverter_CopyPalette(converter, palette); + ok(hr == WINCODEC_ERR_WRONGSTATE, "unexpected error %#x\n", hr); + hr = IWICFormatConverter_CopyPixels(converter, NULL, 32, sizeof(buf), buf); + ok(hr == WINCODEC_ERR_WRONGSTATE, "unexpected error %#x\n", hr); + IWICFormatConverter_Release(converter); + + /* empty palette + Custom type */ + hr = IWICImagingFactory_CreateFormatConverter(factory, &converter); + ok(hr == S_OK, "CreateFormatConverter error %#x\n", hr); + hr = IWICFormatConverter_Initialize(converter, &src_obj->IWICBitmapSource_iface, + &GUID_WICPixelFormat8bppIndexed, WICBitmapDitherTypeNone, + palette, 0.0, WICBitmapPaletteTypeCustom); + ok(hr == S_OK, "Initialize error %#x\n", hr); + hr = IWICFormatConverter_CopyPalette(converter, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + count = 0xdeadbeef; + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 0, "expected 0, got %u\n", count); + memset(buf, 0xaa, sizeof(buf)); + hr = IWICFormatConverter_CopyPixels(converter, NULL, 32, sizeof(buf), buf); + ok(hr == S_OK, "CopyPixels error %#x\n", hr); + count = 0; + for (i = 0; i < 32 * 2; i++) + if (buf[i] != 0) count++; + ok(count == 0, "expected 0\n"); + IWICFormatConverter_Release(converter); + + /* NULL palette + Predefined type */ + hr = IWICImagingFactory_CreateFormatConverter(factory, &converter); + ok(hr == S_OK, "CreateFormatConverter error %#x\n", hr); + hr = IWICFormatConverter_Initialize(converter, &src_obj->IWICBitmapSource_iface, + &GUID_WICPixelFormat8bppIndexed, WICBitmapDitherTypeNone, + NULL, 0.0, WICBitmapPaletteTypeFixedGray16); + ok(hr == S_OK, "Initialize error %#x\n", hr); + hr = IWICFormatConverter_CopyPalette(converter, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + count = 0xdeadbeef; + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 16, "expected 16, got %u\n", count); + hr = IWICFormatConverter_CopyPixels(converter, NULL, 32, sizeof(buf), buf); + ok(hr == S_OK, "CopyPixels error %#x\n", hr); + count = 0; + for (i = 0; i < 32 * 2; i++) + if (buf[i] != 0) count++; + ok(count != 0, "expected != 0\n"); + IWICFormatConverter_Release(converter); + + /* not empty palette + Predefined type */ + hr = IWICImagingFactory_CreateFormatConverter(factory, &converter); + ok(hr == S_OK, "CreateFormatConverter error %#x\n", hr); + hr = IWICFormatConverter_Initialize(converter, &src_obj->IWICBitmapSource_iface, + &GUID_WICPixelFormat8bppIndexed, WICBitmapDitherTypeNone, + palette, 0.0, WICBitmapPaletteTypeFixedHalftone64); + ok(hr == S_OK, "Initialize error %#x\n", hr); + hr = IWICFormatConverter_CopyPalette(converter, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + count = 0xdeadbeef; + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 16, "expected 16, got %u\n", count); + hr = IWICFormatConverter_CopyPixels(converter, NULL, 32, sizeof(buf), buf); + ok(hr == S_OK, "CopyPixels error %#x\n", hr); + count = 0; + for (i = 0; i < 32 * 2; i++) + if (buf[i] != 0) count++; + ok(count != 0, "expected != 0\n"); + IWICFormatConverter_Release(converter); + + /* not empty palette + MedianCut type */ + hr = IWICImagingFactory_CreateFormatConverter(factory, &converter); + ok(hr == S_OK, "CreateFormatConverter error %#x\n", hr); + hr = IWICFormatConverter_Initialize(converter, &src_obj->IWICBitmapSource_iface, + &GUID_WICPixelFormat8bppIndexed, WICBitmapDitherTypeNone, + palette, 0.0, WICBitmapPaletteTypeMedianCut); + ok(hr == S_OK, "Initialize error %#x\n", hr); + hr = IWICFormatConverter_CopyPalette(converter, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + count = 0xdeadbeef; + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 16, "expected 16, got %u\n", count); + hr = IWICFormatConverter_CopyPixels(converter, NULL, 32, sizeof(buf), buf); + ok(hr == S_OK, "CopyPixels error %#x\n", hr); + count = 0; + for (i = 0; i < 32 * 2; i++) + if (buf[i] != 0) count++; + ok(count != 0, "expected != 0\n"); + IWICFormatConverter_Release(converter); + + /* NULL palette + MedianCut type */ + hr = IWICImagingFactory_CreateFormatConverter(factory, &converter); + ok(hr == S_OK, "CreateFormatConverter error %#x\n", hr); + hr = IWICFormatConverter_Initialize(converter, &src_obj->IWICBitmapSource_iface, + &GUID_WICPixelFormat8bppIndexed, WICBitmapDitherTypeNone, + NULL, 0.0, WICBitmapPaletteTypeMedianCut); + ok(hr == S_OK || broken(hr == E_INVALIDARG) /* XP */, "Initialize error %#x\n", hr); + if (hr == S_OK) + { + hr = IWICFormatConverter_CopyPalette(converter, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + count = 0xdeadbeef; + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 8, "expected 8, got %u\n", count); + hr = IWICFormatConverter_CopyPixels(converter, NULL, 32, sizeof(buf), buf); + ok(hr == S_OK, "CopyPixels error %#x\n", hr); + count = 0; + for (i = 0; i < 32 * 2; i++) + if (buf[i] != 0) count++; + ok(count != 0, "expected != 0\n"); + } + IWICFormatConverter_Release(converter); + + IWICPalette_Release(palette); + DeleteTestBitmap(src_obj); +} + START_TEST(converter) { HRESULT hr; @@ -1615,6 +1772,7 @@ START_TEST(converter) test_invalid_conversion(); test_default_converter(); + test_converter_8bppIndexed(); test_encoder(&testdata_BlackWhite, &CLSID_WICPngEncoder, &testdata_BlackWhite, &CLSID_WICPngDecoder, "PNG encoder BlackWhite"); -- 2.20.1

2 1

[PATCH 3/4] windowscodecs/tests: Add a bunch of new tests for indexed format conversions.
by Dmitry Timoshkov 05 Feb '19

05 Feb '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tests/converter.c | 274 ++++++++++++++++++++------- 1 file changed, 204 insertions(+), 70 deletions(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 37b60facaa..481e5636b9 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -118,9 +118,30 @@ static HRESULT WINAPI BitmapTestSrc_GetResolution(IWICBitmapSource *iface, } static HRESULT WINAPI BitmapTestSrc_CopyPalette(IWICBitmapSource *iface, - IWICPalette *pIPalette) + IWICPalette *palette) { - return E_NOTIMPL; + BitmapTestSrc *This = impl_from_IWICBitmapSource(iface); + + if (IsEqualGUID(This->data->format, &GUID_WICPixelFormat1bppIndexed) || + IsEqualGUID(This->data->format, &GUID_WICPixelFormat2bppIndexed) || + IsEqualGUID(This->data->format, &GUID_WICPixelFormat4bppIndexed) || + IsEqualGUID(This->data->format, &GUID_WICPixelFormat8bppIndexed)) + { + WICColor colors[8]; + + colors[0] = 0xff0000ff; + colors[1] = 0xff00ff00; + colors[2] = 0xffff0000; + colors[3] = 0xff000000; + colors[4] = 0xffffff00; + colors[5] = 0xffff00ff; + colors[6] = 0xff00ffff; + colors[7] = 0xffffffff; + return IWICPalette_InitializeCustom(palette, colors, 8); + } + + /* unique error marker */ + return 0xdeadbeef; } static HRESULT WINAPI BitmapTestSrc_CopyPixels(IWICBitmapSource *iface, @@ -252,6 +273,21 @@ static BOOL compare_bits(const struct bitmap_data *expect, UINT buffersize, cons break; } } + else if (IsEqualGUID(expect->format, &GUID_WICPixelFormat2bppIndexed) || + IsEqualGUID(expect->format, &GUID_WICPixelFormat4bppIndexed) || + IsEqualGUID(expect->format, &GUID_WICPixelFormat8bppIndexed)) + { + UINT i; + const BYTE *a=(const BYTE*)expect->bits, *b=(const BYTE*)converted_bits; + equal=TRUE; + + for (i=0; i<buffersize; i++) + if (a[i] != b[i]) + { + equal = FALSE; + break; + } + } else equal = (memcmp(expect->bits, converted_bits, buffersize) == 0); @@ -261,7 +297,19 @@ static BOOL compare_bits(const struct bitmap_data *expect, UINT buffersize, cons return equal; } -static void compare_bitmap_data(const struct bitmap_data *expect, IWICBitmapSource *source, const char *name) +static BOOL is_indexed_format(const GUID *format) +{ + if (IsEqualGUID(format, &GUID_WICPixelFormat1bppIndexed) || + IsEqualGUID(format, &GUID_WICPixelFormat2bppIndexed) || + IsEqualGUID(format, &GUID_WICPixelFormat4bppIndexed) || + IsEqualGUID(format, &GUID_WICPixelFormat8bppIndexed)) + return TRUE; + + return FALSE; +} + +static void compare_bitmap_data(const struct bitmap_data *src, const struct bitmap_data *expect, + IWICBitmapSource *source, const char *name) { BYTE *converted_bits; UINT width, height; @@ -294,15 +342,24 @@ static void compare_bitmap_data(const struct bitmap_data *expect, IWICBitmapSour buffersize = stride * expect->height; converted_bits = HeapAlloc(GetProcessHeap(), 0, buffersize); + memset(converted_bits, 0xaa, buffersize); hr = IWICBitmapSource_CopyPixels(source, &prc, stride, buffersize, converted_bits); ok(SUCCEEDED(hr), "CopyPixels(%s) failed, hr=%x\n", name, hr); - ok(compare_bits(expect, buffersize, converted_bits), "unexpected pixel data (%s)\n", name); + + /* The result of conversion of color to indexed formats depends on + * optimized palette generation implementation. We either need to + * assign our own palette, or just skip the comparison. + */ + if (!(!is_indexed_format(src->format) && is_indexed_format(expect->format))) + ok(compare_bits(expect, buffersize, converted_bits), "unexpected pixel data (%s)\n", name); /* Test with NULL rectangle - should copy the whole bitmap */ memset(converted_bits, 0xaa, buffersize); hr = IWICBitmapSource_CopyPixels(source, NULL, stride, buffersize, converted_bits); ok(SUCCEEDED(hr), "CopyPixels(%s,rc=NULL) failed, hr=%x\n", name, hr); - ok(compare_bits(expect, buffersize, converted_bits), "unexpected pixel data (%s)\n", name); + /* see comment above */ + if (!(!is_indexed_format(src->format) && is_indexed_format(expect->format))) + ok(compare_bits(expect, buffersize, converted_bits), "unexpected pixel data (%s)\n", name); HeapFree(GetProcessHeap(), 0, converted_bits); } @@ -318,78 +375,137 @@ static const struct bitmap_data testdata_1bppIndexed = { /* some encoders (like BMP) require data to be 4-bytes aligned */ static const BYTE bits_2bpp[] = { - 0x55,0x55,0x55,0x55, - 0xaa,0xaa,0xaa,0xaa}; + 0xdb,0xdb,0xdb,0xdb,0xdb,0xdb,0xdb,0xdb, + 0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24}; static const struct bitmap_data testdata_2bppIndexed = { - &GUID_WICPixelFormat2bppIndexed, 2, bits_2bpp, 16, 2, 96.0, 96.0}; + &GUID_WICPixelFormat2bppIndexed, 2, bits_2bpp, 32, 2, 96.0, 96.0}; /* some encoders (like BMP) require data to be 4-bytes aligned */ static const BYTE bits_4bpp[] = { - 0x55,0x55,0x55,0x55, - 0xaa,0xaa,0xaa,0xaa}; + 0x34,0x43,0x34,0x43,0x34,0x43,0x34,0x43,0x34,0x43,0x34,0x43,0x34,0x43,0x34,0x43, + 0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44,0x44}; + static const struct bitmap_data testdata_4bppIndexed = { - &GUID_WICPixelFormat4bppIndexed, 4, bits_4bpp, 8, 2, 96.0, 96.0}; + &GUID_WICPixelFormat4bppIndexed, 4, bits_4bpp, 32, 2, 96.0, 96.0}; + +static const BYTE bits_8bpp_BW[] = { + 0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1, + 1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0}; +static const struct bitmap_data testdata_8bppIndexed_BW = { + &GUID_WICPixelFormat8bppIndexed, 8, bits_8bpp_BW, 32, 2, 96.0, 96.0}; + +static const BYTE bits_8bpp_4colors[] = { + 0,1,2,0,0,1,2,0,0,1,2,0,0,1,2,0,0,1,2,0,0,1,2,0,0,1,2,0,0,1,2,0, + 3,2,1,3,3,2,1,3,3,2,1,3,3,2,1,3,3,2,1,3,3,2,1,3,3,2,1,3,3,2,1,3}; +static const struct bitmap_data testdata_8bppIndexed_4colors = { + &GUID_WICPixelFormat8bppIndexed, 8, bits_8bpp_4colors, 32, 2, 96.0, 96.0}; static const BYTE bits_8bpp[] = { - 0,1,2,3, - 4,5,6,7}; + 0,1,1,0,0,1,1,0,0,1,1,0,0,1,1,0,0,1,1,0,0,1,1,0,0,1,1,0,0,1,1,0, + 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1}; static const struct bitmap_data testdata_8bppIndexed = { - &GUID_WICPixelFormat8bppIndexed, 8, bits_8bpp, 4, 2, 96.0, 96.0}; + &GUID_WICPixelFormat8bppIndexed, 8, bits_8bpp, 32, 2, 96.0, 96.0}; static const BYTE bits_24bppBGR[] = { - 255,0,0, 0,255,0, 0,0,255, 0,0,0, - 0,255,255, 255,0,255, 255,255,0, 255,255,255}; + 255,0,0, 0,255,0, 0,0,255, 0,0,0, 255,0,0, 0,255,0, 0,0,255, 0,0,0, + 255,0,0, 0,255,0, 0,0,255, 0,0,0, 255,0,0, 0,255,0, 0,0,255, 0,0,0, + 255,0,0, 0,255,0, 0,0,255, 0,0,0, 255,0,0, 0,255,0, 0,0,255, 0,0,0, + 255,0,0, 0,255,0, 0,0,255, 0,0,0, 255,0,0, 0,255,0, 0,0,255, 0,0,0, + 0,255,255, 255,0,255, 255,255,0, 255,255,255, 0,255,255, 255,0,255, 255,255,0, 255,255,255, + 0,255,255, 255,0,255, 255,255,0, 255,255,255, 0,255,255, 255,0,255, 255,255,0, 255,255,255, + 0,255,255, 255,0,255, 255,255,0, 255,255,255, 0,255,255, 255,0,255, 255,255,0, 255,255,255, + 0,255,255, 255,0,255, 255,255,0, 255,255,255, 0,255,255, 255,0,255, 255,255,0, 255,255,255}; static const struct bitmap_data testdata_24bppBGR = { - &GUID_WICPixelFormat24bppBGR, 24, bits_24bppBGR, 4, 2, 96.0, 96.0}; + &GUID_WICPixelFormat24bppBGR, 24, bits_24bppBGR, 32, 2, 96.0, 96.0}; static const BYTE bits_24bppRGB[] = { - 0,0,255, 0,255,0, 255,0,0, 0,0,0, - 255,255,0, 255,0,255, 0,255,255, 255,255,255}; + 0,0,255, 0,255,0, 255,0,0, 0,0,0, 0,0,255, 0,255,0, 255,0,0, 0,0,0, + 0,0,255, 0,255,0, 255,0,0, 0,0,0, 0,0,255, 0,255,0, 255,0,0, 0,0,0, + 0,0,255, 0,255,0, 255,0,0, 0,0,0, 0,0,255, 0,255,0, 255,0,0, 0,0,0, + 0,0,255, 0,255,0, 255,0,0, 0,0,0, 0,0,255, 0,255,0, 255,0,0, 0,0,0, + 255,255,0, 255,0,255, 0,255,255, 255,255,255, 255,255,0, 255,0,255, 0,255,255, 255,255,255, + 255,255,0, 255,0,255, 0,255,255, 255,255,255, 255,255,0, 255,0,255, 0,255,255, 255,255,255, + 255,255,0, 255,0,255, 0,255,255, 255,255,255, 255,255,0, 255,0,255, 0,255,255, 255,255,255, + 255,255,0, 255,0,255, 0,255,255, 255,255,255, 255,255,0, 255,0,255, 0,255,255, 255,255,255 }; static const struct bitmap_data testdata_24bppRGB = { - &GUID_WICPixelFormat24bppRGB, 24, bits_24bppRGB, 4, 2, 96.0, 96.0}; + &GUID_WICPixelFormat24bppRGB, 24, bits_24bppRGB, 32, 2, 96.0, 96.0}; static const BYTE bits_32bppBGR[] = { - 255,0,0,80, 0,255,0,80, 0,0,255,80, 0,0,0,80, - 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80}; + 255,0,0,80, 0,255,0,80, 0,0,255,80, 0,0,0,80, 255,0,0,80, 0,255,0,80, 0,0,255,80, 0,0,0,80, + 255,0,0,80, 0,255,0,80, 0,0,255,80, 0,0,0,80, 255,0,0,80, 0,255,0,80, 0,0,255,80, 0,0,0,80, + 255,0,0,80, 0,255,0,80, 0,0,255,80, 0,0,0,80, 255,0,0,80, 0,255,0,80, 0,0,255,80, 0,0,0,80, + 255,0,0,80, 0,255,0,80, 0,0,255,80, 0,0,0,80, 255,0,0,80, 0,255,0,80, 0,0,255,80, 0,0,0,80, + 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80, 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80, + 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80, 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80, + 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80, 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80, + 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80, 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80}; static const struct bitmap_data testdata_32bppBGR = { - &GUID_WICPixelFormat32bppBGR, 32, bits_32bppBGR, 4, 2, 96.0, 96.0}; + &GUID_WICPixelFormat32bppBGR, 32, bits_32bppBGR, 32, 2, 96.0, 96.0}; static const BYTE bits_32bppBGRA[] = { - 255,0,0,255, 0,255,0,255, 0,0,255,255, 0,0,0,255, - 0,255,255,255, 255,0,255,255, 255,255,0,255, 255,255,255,255}; + 255,0,0,255, 0,255,0,255, 0,0,255,255, 0,0,0,255, 255,0,0,255, 0,255,0,255, 0,0,255,255, 0,0,0,255, + 255,0,0,255, 0,255,0,255, 0,0,255,255, 0,0,0,255, 255,0,0,255, 0,255,0,255, 0,0,255,255, 0,0,0,255, + 255,0,0,255, 0,255,0,255, 0,0,255,255, 0,0,0,255, 255,0,0,255, 0,255,0,255, 0,0,255,255, 0,0,0,255, + 255,0,0,255, 0,255,0,255, 0,0,255,255, 0,0,0,255, 255,0,0,255, 0,255,0,255, 0,0,255,255, 0,0,0,255, + 0,255,255,255, 255,0,255,255, 255,255,0,255, 255,255,255,255, 0,255,255,255, 255,0,255,255, 255,255,0,255, 255,255,255,255, + 0,255,255,255, 255,0,255,255, 255,255,0,255, 255,255,255,255, 0,255,255,255, 255,0,255,255, 255,255,0,255, 255,255,255,255, + 0,255,255,255, 255,0,255,255, 255,255,0,255, 255,255,255,255, 0,255,255,255, 255,0,255,255, 255,255,0,255, 255,255,255,255, + 0,255,255,255, 255,0,255,255, 255,255,0,255, 255,255,255,255, 0,255,255,255, 255,0,255,255, 255,255,0,255, 255,255,255,255}; static const struct bitmap_data testdata_32bppBGRA = { - &GUID_WICPixelFormat32bppBGRA, 32, bits_32bppBGRA, 4, 2, 96.0, 96.0}; + &GUID_WICPixelFormat32bppBGRA, 32, bits_32bppBGRA, 32, 2, 96.0, 96.0}; /* XP and 2003 use linear color conversion, later versions use sRGB gamma */ static const float bits_32bppGrayFloat_xp[] = { - 0.114000f,0.587000f,0.299000f,0.000000f, - 0.886000f,0.413000f,0.701000f,1.000000f}; + 0.114000f,0.587000f,0.299000f,0.000000f,0.114000f,0.587000f,0.299000f,0.000000f, + 0.114000f,0.587000f,0.299000f,0.000000f,0.114000f,0.587000f,0.299000f,0.000000f, + 0.114000f,0.587000f,0.299000f,0.000000f,0.114000f,0.587000f,0.299000f,0.000000f, + 0.114000f,0.587000f,0.299000f,0.000000f,0.114000f,0.587000f,0.299000f,0.000000f, + 0.886000f,0.413000f,0.701000f,1.000000f,0.886000f,0.413000f,0.701000f,1.000000f, + 0.886000f,0.413000f,0.701000f,1.000000f,0.886000f,0.413000f,0.701000f,1.000000f, + 0.886000f,0.413000f,0.701000f,1.000000f,0.886000f,0.413000f,0.701000f,1.000000f, + 0.886000f,0.413000f,0.701000f,1.000000f,0.886000f,0.413000f,0.701000f,1.000000f}; static const struct bitmap_data testdata_32bppGrayFloat_xp = { - &GUID_WICPixelFormat32bppGrayFloat, 32, (const BYTE *)bits_32bppGrayFloat_xp, 4, 2, 96.0, 96.0}; + &GUID_WICPixelFormat32bppGrayFloat, 32, (const BYTE *)bits_32bppGrayFloat_xp, 32, 2, 96.0, 96.0}; static const float bits_32bppGrayFloat[] = { - 0.072200f,0.715200f,0.212600f,0.000000f, - 0.927800f,0.284800f,0.787400f,1.000000f}; + 0.072200f,0.715200f,0.212600f,0.000000f,0.072200f,0.715200f,0.212600f,0.000000f, + 0.072200f,0.715200f,0.212600f,0.000000f,0.072200f,0.715200f,0.212600f,0.000000f, + 0.072200f,0.715200f,0.212600f,0.000000f,0.072200f,0.715200f,0.212600f,0.000000f, + 0.072200f,0.715200f,0.212600f,0.000000f,0.072200f,0.715200f,0.212600f,0.000000f, + 0.927800f,0.284800f,0.787400f,1.000000f,0.927800f,0.284800f,0.787400f,1.000000f, + 0.927800f,0.284800f,0.787400f,1.000000f,0.927800f,0.284800f,0.787400f,1.000000f, + 0.927800f,0.284800f,0.787400f,1.000000f,0.927800f,0.284800f,0.787400f,1.000000f, + 0.927800f,0.284800f,0.787400f,1.000000f,0.927800f,0.284800f,0.787400f,1.000000f}; static const struct bitmap_data testdata_32bppGrayFloat = { - &GUID_WICPixelFormat32bppGrayFloat, 32, (const BYTE *)bits_32bppGrayFloat, 4, 2, 96.0, 96.0, &testdata_32bppGrayFloat_xp}; + &GUID_WICPixelFormat32bppGrayFloat, 32, (const BYTE *)bits_32bppGrayFloat, 32, 2, 96.0, 96.0, &testdata_32bppGrayFloat_xp}; static const BYTE bits_8bppGray_xp[] = { - 29,150,76,0, - 226,105,179,255}; + 29,150,76,0,29,150,76,0,29,150,76,0,29,150,76,0, + 29,150,76,0,29,150,76,0,29,150,76,0,29,150,76,0, + 226,105,179,255,226,105,179,255,226,105,179,255,226,105,179,255, + 226,105,179,255,226,105,179,255,226,105,179,255,226,105,179,255}; static const struct bitmap_data testdata_8bppGray_xp = { - &GUID_WICPixelFormat8bppGray, 8, bits_8bppGray_xp, 4, 2, 96.0, 96.0}; + &GUID_WICPixelFormat8bppGray, 8, bits_8bppGray_xp, 32, 2, 96.0, 96.0}; static const BYTE bits_8bppGray[] = { - 76,220,127,0, - 247,145,230,255}; + 76,220,127,0,76,220,127,0,76,220,127,0,76,220,127,0, + 76,220,127,0,76,220,127,0,76,220,127,0,76,220,127,0, + 247,145,230,255,247,145,230,255,247,145,230,255,247,145,230,255, + 247,145,230,255,247,145,230,255,247,145,230,255,247,145,230,255}; static const struct bitmap_data testdata_8bppGray = { - &GUID_WICPixelFormat8bppGray, 8, bits_8bppGray, 4, 2, 96.0, 96.0, &testdata_8bppGray_xp}; + &GUID_WICPixelFormat8bppGray, 8, bits_8bppGray, 32, 2, 96.0, 96.0, &testdata_8bppGray_xp}; static const BYTE bits_24bppBGR_gray[] = { - 76,76,76, 220,220,220, 127,127,127, 0,0,0, - 247,247,247, 145,145,145, 230,230,230, 255,255,255}; + 76,76,76, 220,220,220, 127,127,127, 0,0,0, 76,76,76, 220,220,220, 127,127,127, 0,0,0, + 76,76,76, 220,220,220, 127,127,127, 0,0,0, 76,76,76, 220,220,220, 127,127,127, 0,0,0, + 76,76,76, 220,220,220, 127,127,127, 0,0,0, 76,76,76, 220,220,220, 127,127,127, 0,0,0, + 76,76,76, 220,220,220, 127,127,127, 0,0,0, 76,76,76, 220,220,220, 127,127,127, 0,0,0, + 247,247,247, 145,145,145, 230,230,230, 255,255,255, 247,247,247, 145,145,145, 230,230,230, 255,255,255, + 247,247,247, 145,145,145, 230,230,230, 255,255,255, 247,247,247, 145,145,145, 230,230,230, 255,255,255, + 247,247,247, 145,145,145, 230,230,230, 255,255,255, 247,247,247, 145,145,145, 230,230,230, 255,255,255, + 247,247,247, 145,145,145, 230,230,230, 255,255,255, 247,247,247, 145,145,145, 230,230,230, 255,255,255}; static const struct bitmap_data testdata_24bppBGR_gray = { - &GUID_WICPixelFormat24bppBGR, 24, bits_24bppBGR_gray, 4, 2, 96.0, 96.0}; + &GUID_WICPixelFormat24bppBGR, 24, bits_24bppBGR_gray, 32, 2, 96.0, 96.0}; static void test_conversion(const struct bitmap_data *src, const struct bitmap_data *dst, const char *name, BOOL todo) { @@ -401,11 +517,12 @@ static void test_conversion(const struct bitmap_data *src, const struct bitmap_d hr = WICConvertBitmapSource(dst->format, &src_obj->IWICBitmapSource_iface, &dst_bitmap); todo_wine_if (todo) - ok(SUCCEEDED(hr), "WICConvertBitmapSource(%s) failed, hr=%x\n", name, hr); + ok(hr == S_OK || + broken(hr == E_INVALIDARG) /* XP */, "WICConvertBitmapSource(%s) failed, hr=%x\n", name, hr); - if (SUCCEEDED(hr)) + if (hr == S_OK) { - compare_bitmap_data(dst, dst_bitmap, name); + compare_bitmap_data(src, dst, dst_bitmap, name); IWICBitmapSource_Release(dst_bitmap); } @@ -453,7 +570,7 @@ static void test_default_converter(void) ok(SUCCEEDED(hr), "Initialize returned %x\n", hr); if (SUCCEEDED(hr)) - compare_bitmap_data(&testdata_32bppBGR, (IWICBitmapSource*)converter, "default converter"); + compare_bitmap_data(&testdata_32bppBGRA, &testdata_32bppBGR, (IWICBitmapSource*)converter, "default converter"); IWICFormatConverter_Release(converter); } @@ -752,7 +869,7 @@ static void check_tiff_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat4bppIndexed)) { - ok(width == 8, "wrong width %u\n", width); + ok(width == 32, "wrong width %u\n", width); ok(height == 2, "wrong height %u\n", height); ok(bps == 4, "wrong bps %d\n", bps); @@ -762,7 +879,7 @@ static void check_tiff_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat8bppIndexed)) { - ok(width == 4, "wrong width %u\n", width); + ok(width == 32, "wrong width %u\n", width); ok(height == 2, "wrong height %u\n", height); ok(bps == 8, "wrong bps %d\n", bps); @@ -772,7 +889,7 @@ static void check_tiff_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat24bppBGR)) { - ok(width == 4, "wrong width %u\n", width); + ok(width == 32, "wrong width %u\n", width); ok(height == 2, "wrong height %u\n", height); ok(bps == 3, "wrong bps %d\n", bps); @@ -790,7 +907,6 @@ static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) BITMAPFILEHEADER bfh; BITMAPV5HEADER bih; - memset(&bfh, 0, sizeof(bfh)); hr = IStream_Read(stream, &bfh, sizeof(bfh), NULL); ok(hr == S_OK, "IStream_Read error %#x\n", hr); @@ -798,13 +914,12 @@ static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) ok(bfh.bfReserved1 == 0, "wrong bfReserved1 %02x\n", bfh.bfReserved1); ok(bfh.bfReserved2 == 0, "wrong bfReserved2 %02x\n", bfh.bfReserved2); - memset(&bih, 0, sizeof(bih)); hr = IStream_Read(stream, &bih, sizeof(bih), NULL); ok(hr == S_OK, "IStream_Read error %#x\n", hr); if (IsEqualGUID(format, &GUID_WICPixelFormat1bppIndexed)) { - ok(bfh.bfOffBits == 0x0436, "wrong bfOffBits %02x\n", bfh.bfOffBits); + ok(bfh.bfOffBits == 0x0436, "wrong bfOffBits %08x\n", bfh.bfOffBits); ok(bih.bV5Width == 32, "wrong width %u\n", bih.bV5Width); ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); @@ -816,9 +931,9 @@ static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat4bppIndexed)) { - ok(bfh.bfOffBits == 0x0436, "wrong bfOffBits %02x\n", bfh.bfOffBits); + ok(bfh.bfOffBits == 0x0436, "wrong bfOffBits %08x\n", bfh.bfOffBits); - ok(bih.bV5Width == 8, "wrong width %u\n", bih.bV5Width); + ok(bih.bV5Width == 32, "wrong width %u\n", bih.bV5Width); ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); ok(bih.bV5Planes == 1, "wrong Planes %d\n", bih.bV5Planes); @@ -828,9 +943,9 @@ static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat8bppIndexed)) { - ok(bfh.bfOffBits == 0x0436, "wrong bfOffBits %02x\n", bfh.bfOffBits); + ok(bfh.bfOffBits == 0x0436, "wrong bfOffBits %08x\n", bfh.bfOffBits); - ok(bih.bV5Width == 4, "wrong width %u\n", bih.bV5Width); + ok(bih.bV5Width == 32, "wrong width %u\n", bih.bV5Width); ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); ok(bih.bV5Planes == 1, "wrong Planes %d\n", bih.bV5Planes); @@ -840,9 +955,9 @@ static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat32bppBGR)) { - ok(bfh.bfOffBits == 0x0036, "wrong bfOffBits %02x\n", bfh.bfOffBits); + ok(bfh.bfOffBits == 0x0036, "wrong bfOffBits %08x\n", bfh.bfOffBits); - ok(bih.bV5Width == 4, "wrong width %u\n", bih.bV5Width); + ok(bih.bV5Width == 32, "wrong width %u\n", bih.bV5Width); ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); ok(bih.bV5Planes == 1, "wrong Planes %d\n", bih.bV5Planes); @@ -910,7 +1025,7 @@ static void check_png_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat2bppIndexed)) { - ok(be_uint(png.width) == 16, "wrong width %u\n", be_uint(png.width)); + ok(be_uint(png.width) == 32, "wrong width %u\n", be_uint(png.width)); ok(be_uint(png.height) == 2, "wrong height %u\n", be_uint(png.height)); ok(png.bit_depth == 2, "wrong bit_depth %d\n", png.bit_depth); @@ -921,7 +1036,7 @@ static void check_png_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat4bppIndexed)) { - ok(be_uint(png.width) == 8, "wrong width %u\n", be_uint(png.width)); + ok(be_uint(png.width) == 32, "wrong width %u\n", be_uint(png.width)); ok(be_uint(png.height) == 2, "wrong height %u\n", be_uint(png.height)); ok(png.bit_depth == 4, "wrong bit_depth %d\n", png.bit_depth); @@ -932,7 +1047,7 @@ static void check_png_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat8bppIndexed)) { - ok(be_uint(png.width) == 4, "wrong width %u\n", be_uint(png.width)); + ok(be_uint(png.width) == 32, "wrong width %u\n", be_uint(png.width)); ok(be_uint(png.height) == 2, "wrong height %u\n", be_uint(png.height)); ok(png.bit_depth == 8, "wrong bit_depth %d\n", png.bit_depth); @@ -943,7 +1058,7 @@ static void check_png_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat24bppBGR)) { - ok(be_uint(png.width) == 4, "wrong width %u\n", be_uint(png.width)); + ok(be_uint(png.width) == 32, "wrong width %u\n", be_uint(png.width)); ok(be_uint(png.height) == 2, "wrong height %u\n", be_uint(png.height)); ok(png.bit_depth == 8, "wrong bit_depth %d\n", png.bit_depth); @@ -1201,8 +1316,8 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls ok(SUCCEEDED(hr), "WriteSource(%dx%d) failed, hr=%x (%s)\n", rc->Width, rc->Height, hr, name); else ok(hr == S_OK || - (hr == E_NOTIMPL && IsEqualGUID(clsid_encoder, &CLSID_WICBmpEncoder) && srcs[i]->bpp == 2) || - (hr == E_NOTIMPL && IsEqualGUID(clsid_encoder, &CLSID_WICTiffEncoder) && srcs[i]->bpp == 2) || + (FAILED(hr) && IsEqualGUID(clsid_encoder, &CLSID_WICBmpEncoder) && srcs[i]->bpp == 2) /* XP */ || + (FAILED(hr) && IsEqualGUID(clsid_encoder, &CLSID_WICTiffEncoder) && srcs[i]->bpp == 2) /* XP */ || broken(hr == E_INVALIDARG && IsEqualGUID(clsid_encoder, &CLSID_WICBmpEncoder) && IsEqualGUID(srcs[i]->format, &GUID_WICPixelFormatBlackWhite)) /* XP */, "WriteSource(NULL) failed, hr=%x (%s)\n", hr, name); } @@ -1234,7 +1349,8 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls hr = IWICBitmapEncoder_Commit(encoder); ok(SUCCEEDED(hr), "Commit failed, hr=%x\n", hr); - check_bitmap_format(stream, clsid_encoder, dsts[0]->format); + if (IsEqualGUID(&pixelformat, dsts[0]->format)) + check_bitmap_format(stream, clsid_encoder, dsts[0]->format); } if (SUCCEEDED(hr)) @@ -1269,7 +1385,10 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls if (SUCCEEDED(hr)) { - compare_bitmap_data(dsts[i], (IWICBitmapSource*)framedecode, name); + hr = IWICBitmapFrameDecode_GetPixelFormat(framedecode, &pixelformat); + ok(hr == S_OK, "GetPixelFormat) failed, hr=%x (%s)\n", hr, name); + if (IsEqualGUID(&pixelformat, dsts[i]->format)) + compare_bitmap_data(srcs[i], dsts[i], (IWICBitmapSource*)framedecode, name); hr = IWICBitmapFrameDecode_CopyPalette(framedecode, frame_palette); if (winetest_debug > 1) @@ -1317,8 +1436,8 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls else if (IsEqualGUID(clsid_decoder, &CLSID_WICBmpDecoder) || IsEqualGUID(clsid_decoder, &CLSID_WICTiffDecoder)) { - if (IsEqualGUID(dsts[i]->format, &GUID_WICPixelFormatBlackWhite) || - IsEqualGUID(dsts[i]->format, &GUID_WICPixelFormat8bppIndexed)) + if (IsEqualGUID(&pixelformat, &GUID_WICPixelFormatBlackWhite) || + IsEqualGUID(&pixelformat, &GUID_WICPixelFormat8bppIndexed)) { ok(count == 256, "expected 256, got %u (%s)\n", count, name); @@ -1329,7 +1448,7 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls ok(colors[4] == 0xff555555, "got %08x (%s)\n", colors[4], name); ok(colors[5] == 0xff000000, "got %08x (%s)\n", colors[5], name); } - else if (IsEqualGUID(dsts[i]->format, &GUID_WICPixelFormat4bppIndexed)) + else if (IsEqualGUID(&pixelformat, &GUID_WICPixelFormat4bppIndexed)) { ok(count == 16, "expected 16, got %u (%s)\n", count, name); @@ -1419,7 +1538,7 @@ static void test_encoder_rects(void) rc.X = 0; rc.Y = 0; - rc.Width = 4; + rc.Width = 32; rc.Height = 2; test_multi_encoder(srcs, &CLSID_WICTiffEncoder, dsts, &CLSID_WICTiffDecoder, &rc, NULL, "test_encoder_rects full", NULL); @@ -1430,7 +1549,7 @@ static void test_encoder_rects(void) rc.Width = -1; test_multi_encoder(srcs, &CLSID_WICTiffEncoder, dsts, &CLSID_WICTiffDecoder, &rc, NULL, "test_encoder_rects width=-1", NULL); - rc.Width = 4; + rc.Width = 32; rc.Height = 0; test_multi_encoder(srcs, &CLSID_WICTiffEncoder, dsts, &CLSID_WICTiffDecoder, &rc, NULL, "test_encoder_rects height=0", NULL); @@ -1462,6 +1581,16 @@ START_TEST(converter) &IID_IWICImagingFactory, (void **)&factory); ok(hr == S_OK, "failed to create factory: %#x\n", hr); + test_conversion(&testdata_24bppRGB, &testdata_1bppIndexed, "24bppRGB -> 1bppIndexed", TRUE); + test_conversion(&testdata_24bppRGB, &testdata_2bppIndexed, "24bppRGB -> 2bppIndexed", TRUE); + test_conversion(&testdata_24bppRGB, &testdata_4bppIndexed, "24bppRGB -> 4bppIndexed", TRUE); + test_conversion(&testdata_24bppRGB, &testdata_8bppIndexed, "24bppRGB -> 8bppIndexed", FALSE); + + test_conversion(&testdata_BlackWhite, &testdata_8bppIndexed_BW, "BlackWhite -> 8bppIndexed", TRUE); + test_conversion(&testdata_1bppIndexed, &testdata_8bppIndexed_BW, "1bppIndexed -> 8bppIndexed", TRUE); + test_conversion(&testdata_2bppIndexed, &testdata_8bppIndexed_4colors, "2bppIndexed -> 8bppIndexed", TRUE); + test_conversion(&testdata_4bppIndexed, &testdata_8bppIndexed, "4bppIndexed -> 8bppIndexed", TRUE); + test_conversion(&testdata_32bppBGRA, &testdata_32bppBGR, "BGRA -> BGR", FALSE); test_conversion(&testdata_32bppBGR, &testdata_32bppBGRA, "BGR -> BGRA", FALSE); test_conversion(&testdata_32bppBGRA, &testdata_32bppBGRA, "BGRA -> BGRA", FALSE); @@ -1499,6 +1628,11 @@ START_TEST(converter) &testdata_8bppIndexed, &CLSID_WICPngDecoder, "PNG encoder 8bppIndexed"); test_encoder(&testdata_24bppBGR, &CLSID_WICPngEncoder, &testdata_24bppBGR, &CLSID_WICPngDecoder, "PNG encoder 24bppBGR"); +if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in Wine */ +{ + test_encoder(&testdata_32bppBGR, &CLSID_WICPngEncoder, + &testdata_24bppBGR, &CLSID_WICPngDecoder, "PNG encoder 32bppBGR"); +} test_encoder(&testdata_BlackWhite, &CLSID_WICBmpEncoder, &testdata_1bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder BlackWhite"); -- 2.20.1

2 1

[PATCH 1/4] windowscodecs: WICConvertBitmapSource should ask IWICFormatConverter::Initialize to use an optimized palette.
by Dmitry Timoshkov 05 Feb '19

05 Feb '19

This matches Windows' behaviour, and makes a simple test application that converts any WIC compatible RGB(A) source image to 8bppIndexed format work. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index d0c2c690ca..9bec30fcea 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -2523,7 +2523,7 @@ HRESULT WINAPI WICConvertBitmapSource(REFWICPixelFormatGUID dstFormat, IWICBitma if (SUCCEEDED(res) && canconvert) res = IWICFormatConverter_Initialize(converter, pISrc, dstFormat, WICBitmapDitherTypeNone, - NULL, 0.0, WICBitmapPaletteTypeCustom); + NULL, 0.0, WICBitmapPaletteTypeMedianCut); if (FAILED(res) || !canconvert) { -- 2.20.1

2 1

[PATCH v2] shcore: Don't return E_FAIL in IStream::SetSize() for read-only mode.
by Jactry Zeng 05 Feb '19

05 Feb '19

Superseded patch 157554. --- dlls/shcore/main.c | 15 +++++- dlls/shcore/tests/shcore.c | 119 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+), 2 deletions(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 973b7c7a03..fdf878ed2a 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -913,15 +913,26 @@ static HRESULT WINAPI filestream_Seek(IStream *iface, LARGE_INTEGER move, DWORD static HRESULT WINAPI filestream_SetSize(IStream *iface, ULARGE_INTEGER size) { struct shstream *stream = impl_from_IStream(iface); + LARGE_INTEGER origin, move; TRACE("(%p, %s)\n", stream, wine_dbgstr_longlong(size.QuadPart)); - if (!SetFilePointer(stream->u.file.handle, size.QuadPart, NULL, FILE_BEGIN)) + move.QuadPart = 0; + if (!SetFilePointerEx(stream->u.file.handle, move, &origin, FILE_CURRENT)) return E_FAIL; - if (!SetEndOfFile(stream->u.file.handle)) + move.QuadPart = size.QuadPart; + if (!SetFilePointerEx(stream->u.file.handle, move, NULL, FILE_BEGIN)) return E_FAIL; + if (stream->u.file.mode != STGM_READ) + { + if (!SetEndOfFile(stream->u.file.handle)) + return E_FAIL; + if (!SetFilePointerEx(stream->u.file.handle, origin, NULL, FILE_BEGIN)) + return E_FAIL; + } + return S_OK; } diff --git a/dlls/shcore/tests/shcore.c b/dlls/shcore/tests/shcore.c index 0738659f7c..2a8ebcc468 100644 --- a/dlls/shcore/tests/shcore.c +++ b/dlls/shcore/tests/shcore.c @@ -41,6 +41,8 @@ static LSTATUS (WINAPI *pSHRegGetValueA)(HKEY, const char *, const char *, SRRF, static DWORD (WINAPI *pSHQueryValueExA)(HKEY, const char *, DWORD *, DWORD *, void *buff, DWORD *buff_len); static DWORD (WINAPI *pSHRegGetPathA)(HKEY, const char *, const char *, char *, DWORD); static DWORD (WINAPI *pSHCopyKeyA)(HKEY, const char *, HKEY, DWORD); +static HRESULT (WINAPI *pSHCreateStreamOnFileA)(const char *path, DWORD mode, IStream **stream); +static HRESULT (WINAPI *pIStream_Size)(IStream *stream, ULARGE_INTEGER *size); /* Keys used for testing */ #define REG_TEST_KEY "Software\\Wine\\Test" @@ -73,6 +75,8 @@ static void init(HMODULE hshcore) X(SHQueryValueExA); X(SHRegGetPathA); X(SHCopyKeyA); + X(SHCreateStreamOnFileA); + X(IStream_Size); #undef X } @@ -671,6 +675,120 @@ static void test_SHCopyKey(void) delete_key( hkey, "Software\\Wine", "Test" ); } +#define CHECK_FILE_SIZE(filename,exp_size) _check_file_size(filename, exp_size, __LINE__) +static void _check_file_size(const CHAR *filename, LONG exp_size, int line) +{ + HANDLE handle; + DWORD file_size = 0xdeadbeef; + handle = CreateFileA(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + file_size = GetFileSize(handle, NULL); + ok_(__FILE__,line)(file_size == exp_size, "got wrong file size: %d.\n", file_size); + CloseHandle(handle); +} + +#define CHECK_STREAM_SIZE(obj,exp_size) _check_stream_size(obj, exp_size, __LINE__) +static void _check_stream_size(IStream *obj, LONG exp_size, int line) +{ + ULARGE_INTEGER stream_size; + STATSTG stat; + HRESULT hr; + stream_size.QuadPart = 0xdeadbeef; + hr = pIStream_Size(obj, &stream_size); + ok_(__FILE__,line)(hr == S_OK, "IStream_Size failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(stream_size.QuadPart == exp_size, "Size(): got wrong size of stream: %s.\n", + wine_dbgstr_longlong(stream_size.QuadPart)); + hr = IStream_Stat(obj, &stat, STATFLAG_NONAME); + ok_(__FILE__,line)(hr == S_OK, "IStream_Stat failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(stat.cbSize.QuadPart == exp_size, "Stat(): got wrong size of stream: %s.\n", + wine_dbgstr_longlong(stat.cbSize.QuadPart)); +} + +#define CHECK_STREAM_POS(obj,exp_pos) _check_stream_pos(obj, exp_pos, __LINE__) +static void _check_stream_pos(IStream *obj, LONG exp_pos, int line) +{ + LARGE_INTEGER move; + ULARGE_INTEGER pos; + HRESULT hr; + move.QuadPart = 0; + pos.QuadPart = 0xdeadbeef; + hr = IStream_Seek(obj, move, STREAM_SEEK_CUR, &pos); + ok_(__FILE__,line)(hr == S_OK, "IStream_Seek failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(pos.QuadPart == exp_pos, "got wrong position: %s.\n", + wine_dbgstr_longlong(pos.QuadPart)); +} + +static void test_stream_size(void) +{ + static const byte test_data[] = {0x1,0x2,0x3,0x4,0x5,0x6}; + static const CHAR filename[] = "test_file"; + IStream *stream, *stream2; + HANDLE handle; + DWORD written = 0; + ULARGE_INTEGER stream_size; + HRESULT hr; + + handle = CreateFileA(filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(handle != INVALID_HANDLE_VALUE, "File creation failed: 0x%08x.\n", GetLastError()); + WriteFile(handle, test_data, sizeof(test_data), &written, NULL); + ok(written == sizeof(test_data), "Failed to write data into file.\n"); + CloseHandle(handle); + + /* in read-only mode, SetSize() will success but it has no effect on Size() and the file */ + hr = pSHCreateStreamOnFileA(filename, STGM_FAILIFTHERE|STGM_READ, &stream); + ok(hr == S_OK, "SHCreateStreamOnFileA failed: 0x%08x.\n", hr); + CHECK_STREAM_SIZE(stream, sizeof(test_data)); + stream_size.QuadPart = 0; + hr = IStream_SetSize(stream, stream_size); + ok(hr == S_OK, "IStream_SetSize failed: 0x%08x.\n", hr); + CHECK_STREAM_SIZE(stream, sizeof(test_data)); + CHECK_STREAM_POS(stream, 0); + stream_size.QuadPart = 100; + hr = IStream_SetSize(stream, stream_size); + ok(hr == S_OK, "IStream_SetSize failed: 0x%08x.\n", hr); + CHECK_STREAM_SIZE(stream, sizeof(test_data)); + CHECK_STREAM_POS(stream, 100); + IStream_Release(stream); + CHECK_FILE_SIZE(filename, sizeof(test_data)); + + hr = pSHCreateStreamOnFileA(filename, STGM_FAILIFTHERE|STGM_WRITE, &stream); + ok(hr == S_OK, "SHCreateStreamOnFileA failed: 0x%08x.\n", hr); + hr = pSHCreateStreamOnFileA(filename, STGM_FAILIFTHERE|STGM_READ, &stream2); + ok(hr == S_OK, "SHCreateStreamOnFileA failed: 0x%08x.\n", hr); + CHECK_STREAM_SIZE(stream, sizeof(test_data)); + CHECK_STREAM_SIZE(stream2, sizeof(test_data)); + CHECK_STREAM_POS(stream, 0); + CHECK_STREAM_POS(stream2, 0); + + stream_size.QuadPart = 0; + hr = IStream_SetSize(stream, stream_size); + ok(hr == S_OK, "IStream_SetSize failed: 0x%08x.\n", hr); + CHECK_STREAM_SIZE(stream, 0); + CHECK_STREAM_SIZE(stream2, 0); + CHECK_STREAM_POS(stream, 0); + CHECK_STREAM_POS(stream2, 0); + + stream_size.QuadPart = 100; + hr = IStream_SetSize(stream, stream_size); + ok(hr == S_OK, "IStream_SetSize failed: 0x%08x.\n", hr); + CHECK_STREAM_SIZE(stream, 100); + CHECK_STREAM_SIZE(stream2, 100); + CHECK_STREAM_POS(stream, 0); + CHECK_STREAM_POS(stream2, 0); + + stream_size.QuadPart = 90; + hr = IStream_SetSize(stream2, stream_size); + ok(hr == S_OK, "IStream_SetSize failed: 0x%08x.\n", hr); + CHECK_STREAM_SIZE(stream, 100); + CHECK_STREAM_SIZE(stream2, 100); + CHECK_STREAM_POS(stream, 0); + CHECK_STREAM_POS(stream2, 90); + IStream_Release(stream); + IStream_Release(stream2); + CHECK_FILE_SIZE(filename, 100); + + DeleteFileA(filename); +} + START_TEST(shcore) { HMODULE hshcore = LoadLibraryA("shcore.dll"); @@ -695,4 +813,5 @@ START_TEST(shcore) test_SHQueryValueEx(); test_SHRegGetPath(); test_SHCopyKey(); + test_stream_size(); } -- 2.15.2 (Apple Git-101.1)

1 1

[PATCH v2 1/5] wined3d: Factor out init_default_texture_state().
by Zebediah Figura 05 Feb '19

05 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/stateblock.c | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 1c8e6aded4..8117652192 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1300,6 +1300,27 @@ static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], c rs[WINED3D_RS_BLENDOPALPHA] = WINED3D_BLEND_OP_ADD; } +static void init_default_texture_state(unsigned int i, DWORD stage[WINED3D_HIGHEST_TEXTURE_STATE + 1]) +{ + stage[WINED3D_TSS_COLOR_OP] = i ? WINED3D_TOP_DISABLE : WINED3D_TOP_MODULATE; + stage[WINED3D_TSS_COLOR_ARG1] = WINED3DTA_TEXTURE; + stage[WINED3D_TSS_COLOR_ARG2] = WINED3DTA_CURRENT; + stage[WINED3D_TSS_ALPHA_OP] = i ? WINED3D_TOP_DISABLE : WINED3D_TOP_SELECT_ARG1; + stage[WINED3D_TSS_ALPHA_ARG1] = WINED3DTA_TEXTURE; + stage[WINED3D_TSS_ALPHA_ARG2] = WINED3DTA_CURRENT; + stage[WINED3D_TSS_BUMPENV_MAT00] = 0; + stage[WINED3D_TSS_BUMPENV_MAT01] = 0; + stage[WINED3D_TSS_BUMPENV_MAT10] = 0; + stage[WINED3D_TSS_BUMPENV_MAT11] = 0; + stage[WINED3D_TSS_TEXCOORD_INDEX] = i; + stage[WINED3D_TSS_BUMPENV_LSCALE] = 0; + stage[WINED3D_TSS_BUMPENV_LOFFSET] = 0; + stage[WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS] = WINED3D_TTFF_DISABLE; + stage[WINED3D_TSS_COLOR_ARG0] = WINED3DTA_CURRENT; + stage[WINED3D_TSS_ALPHA_ARG0] = WINED3DTA_CURRENT; + stage[WINED3D_TSS_RESULT_ARG] = WINED3DTA_CURRENT; +} + static void state_init_default(struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info) { unsigned int i; @@ -1326,23 +1347,7 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d { TRACE("Setting up default texture states for texture Stage %u.\n", i); state->transforms[WINED3D_TS_TEXTURE0 + i] = identity; - state->texture_states[i][WINED3D_TSS_COLOR_OP] = i ? WINED3D_TOP_DISABLE : WINED3D_TOP_MODULATE; - state->texture_states[i][WINED3D_TSS_COLOR_ARG1] = WINED3DTA_TEXTURE; - state->texture_states[i][WINED3D_TSS_COLOR_ARG2] = WINED3DTA_CURRENT; - state->texture_states[i][WINED3D_TSS_ALPHA_OP] = i ? WINED3D_TOP_DISABLE : WINED3D_TOP_SELECT_ARG1; - state->texture_states[i][WINED3D_TSS_ALPHA_ARG1] = WINED3DTA_TEXTURE; - state->texture_states[i][WINED3D_TSS_ALPHA_ARG2] = WINED3DTA_CURRENT; - state->texture_states[i][WINED3D_TSS_BUMPENV_MAT00] = 0; - state->texture_states[i][WINED3D_TSS_BUMPENV_MAT01] = 0; - state->texture_states[i][WINED3D_TSS_BUMPENV_MAT10] = 0; - state->texture_states[i][WINED3D_TSS_BUMPENV_MAT11] = 0; - state->texture_states[i][WINED3D_TSS_TEXCOORD_INDEX] = i; - state->texture_states[i][WINED3D_TSS_BUMPENV_LSCALE] = 0; - state->texture_states[i][WINED3D_TSS_BUMPENV_LOFFSET] = 0; - state->texture_states[i][WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS] = WINED3D_TTFF_DISABLE; - state->texture_states[i][WINED3D_TSS_COLOR_ARG0] = WINED3DTA_CURRENT; - state->texture_states[i][WINED3D_TSS_ALPHA_ARG0] = WINED3DTA_CURRENT; - state->texture_states[i][WINED3D_TSS_RESULT_ARG] = WINED3DTA_CURRENT; + init_default_texture_state(i, state->texture_states[i]); } for (i = 0 ; i < MAX_COMBINED_SAMPLERS; ++i) -- 2.20.1

2 7

[PATCH v2] ping: Add tests.
by Isira Seneviratne 05 Feb '19

05 Feb '19

1 0

[PATCH] user32: Select more appropriate stretch mode for colored images interpolation.
by Paul Gofman 05 Feb '19

05 Feb '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46375 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/user32/cursoricon.c | 4 ++++ dlls/user32/tests/cursoricon.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 539fc7ca54..3214746664 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2976,6 +2976,8 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, } orig_bm = SelectObject(screen_mem_dc, hbitmap); + if (info->bmiHeader.biBitCount > 1) + SetStretchBltMode(screen_mem_dc, HALFTONE); StretchDIBits(screen_mem_dc, 0, 0, new_width, new_height, 0, 0, width, height, bits, fix_info, DIB_RGB_COLORS, SRCCOPY); SelectObject(screen_mem_dc, orig_bm); @@ -3217,6 +3219,8 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx, void * bits; dc = CreateCompatibleDC(NULL); + if (ds.dsBm.bmBitsPixel > 1) + SetStretchBltMode(dc, HALFTONE); bi->bmiHeader.biWidth = ds.dsBm.bmWidth; bi->bmiHeader.biHeight = ds.dsBm.bmHeight; diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 56621a661b..8ce1eb163e 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -2918,9 +2918,9 @@ static void test_Image_StretchMode(void) sizeof(colors_bits_1), FALSE}, {4, 4, 2, 2, 8, test_bits_8, expected_bits_8, sizeof(test_bits_8), sizeof(expected_bits_8), colors_bits_8, - sizeof(colors_bits_8), TRUE}, + sizeof(colors_bits_8), FALSE}, {4, 4, 2, 2, 16, (const unsigned char *)test_bits_16, (const unsigned char *)expected_bits_16, - sizeof(test_bits_16), sizeof(expected_bits_16), NULL, 0, TRUE}, + sizeof(test_bits_16), sizeof(expected_bits_16), NULL, 0, FALSE}, }; static const char filename[] = "test.bmp"; BITMAPINFO *bmi, *bmi_output; -- 2.20.1

2 1

[PATCH resend] user32/tests: Add more tests for SetWindowPos() on child window.
by Paul Gofman 05 Feb '19

05 Feb '19

Related to bug https://bugs.winehq.org/show_bug.cgi?id=20190. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/user32/tests/win.c | 67 ++++++++++++++++++++++++++++++++++------- 1 file changed, 56 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 94eff5ee4f..e55c1399a5 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2471,6 +2471,7 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) LONG_PTR old_proc; HWND hwnd_grandchild, hwnd_child, hwnd_child2; HWND hwnd_desktop; + RECT rc_expected; RECT rc1, rc2; BOOL ret; @@ -2554,11 +2555,59 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) /* Does not seem to do anything even without passing flags, still returns TRUE */ GetWindowRect(hwnd_child, &rc1); - ret = SetWindowPos(hwnd_child, hwnd2 , 1, 2, 3, 4, 0); - ok(ret, "Got %d\n", ret); + ret = SetWindowPos(hwnd_child, hwnd2, 1, 2, 3, 4, 0); + ok(ret, "Got %d.\n", ret); GetWindowRect(hwnd_child, &rc2); - ok(EqualRect(&rc1, &rc2), "%s != %s\n", wine_dbgstr_rect(&rc1), wine_dbgstr_rect(&rc2)); + ok(EqualRect(&rc1, &rc2), "%s != %s.\n", wine_dbgstr_rect(&rc1), wine_dbgstr_rect(&rc2)); + check_active_state(hwnd2, hwnd2, hwnd2); + + GetWindowRect(hwnd_child, &rc1); + ret = SetWindowPos(hwnd_child, HWND_NOTOPMOST, 1, 2, 3, 4, 0); + ok(ret, "Got %d.\n", ret); + GetWindowRect(hwnd_child, &rc2); + todo_wine ok(EqualRect(&rc1, &rc2), "%s != %s.\n", wine_dbgstr_rect(&rc1), wine_dbgstr_rect(&rc2)); + check_active_state(hwnd2, hwnd2, hwnd2); + SetWindowPos(hwnd_child, HWND_NOTOPMOST, 0, 0, rc1.right - rc1.left, rc1.bottom - rc1.top, 0); + + GetWindowRect(hwnd_child, &rc1); + ret = SetWindowPos(hwnd_child, HWND_TOPMOST, 1, 2, 3, 4, 0); + ok(ret, "Got %d.\n", ret); + GetWindowRect(hwnd_child, &rc2); + todo_wine ok(EqualRect(&rc1, &rc2), "%s != %s.\n", wine_dbgstr_rect(&rc1), wine_dbgstr_rect(&rc2)); + check_active_state(hwnd2, hwnd2, hwnd2); + SetWindowPos(hwnd_child, HWND_TOPMOST, 0, 0, rc1.right - rc1.left, rc1.bottom - rc1.top, 0); + + /* HWND_TOP / HWND_BOTTOM are different. */ + GetWindowRect(hwnd_child, &rc1); + rc_expected.left = rc1.left + 1; + rc_expected.top = rc1.top + 2; + rc_expected.right = rc1.left + 4; + rc_expected.bottom = rc1.top + 6; + ret = SetWindowPos(hwnd_child, HWND_TOP, 1, 2, 3, 4, 0); + ok(ret, "Got %d.\n", ret); + GetWindowRect(hwnd_child, &rc2); + ok(EqualRect(&rc_expected, &rc2), "%s != %s.\n", + wine_dbgstr_rect(&rc_expected), wine_dbgstr_rect(&rc2)); + check_active_state(hwnd2, hwnd2, hwnd2); + SetWindowPos(hwnd_child, HWND_TOP, 0, 0, rc1.right - rc1.left, rc1.bottom - rc1.top, 0); + + GetWindowRect(hwnd_child, &rc1); + ret = SetWindowPos(hwnd_child, HWND_BOTTOM, 1, 2, 3, 4, 0); + ok(ret, "Got %d.\n", ret); + GetWindowRect(hwnd_child, &rc2); + ok(EqualRect(&rc_expected, &rc2), "%s != %s.\n", + wine_dbgstr_rect(&rc_expected), wine_dbgstr_rect(&rc2)); check_active_state(hwnd2, hwnd2, hwnd2); + SetWindowPos(hwnd_child, HWND_BOTTOM, 0, 0, rc1.right - rc1.left, rc1.bottom - rc1.top, 0); + + GetWindowRect(hwnd_child, &rc1); + ret = SetWindowPos(hwnd_child, NULL, 1, 2, 3, 4, 0); + ok(ret, "Got %d.\n", ret); + GetWindowRect(hwnd_child, &rc2); + ok(EqualRect(&rc_expected, &rc2), "%s != %s.\n", + wine_dbgstr_rect(&rc_expected), wine_dbgstr_rect(&rc2)); + check_active_state(hwnd2, hwnd2, hwnd2); + SetWindowPos(hwnd_child, NULL, 0, 0, rc1.right - rc1.left, rc1.bottom - rc1.top, 0); /* Same thing the other way around. */ GetWindowRect(hwnd2, &rc1); @@ -2581,10 +2630,8 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) ret = SetWindowPos(hwnd_grandchild, hwnd_child2, 1, 2, 3, 4, SWP_NOZORDER); ok(ret, "Got %d\n", ret); GetWindowRect(hwnd_grandchild, &rc2); - ok((rc1.left+1) == rc2.left && (rc1.top+2) == rc2.top && - (rc1.left+4) == rc2.right && (rc1.top+6) == rc2.bottom, - "(%d,%d)-(%d,%d) != %s\n", rc1.left+1, rc1.top+2, rc1.left+4, rc1.top+6, - wine_dbgstr_rect(&rc2)); + ok(EqualRect(&rc_expected, &rc2), + "%s != %s.\n", wine_dbgstr_rect(&rc_expected), wine_dbgstr_rect(&rc2)); check_active_state(hwnd2, hwnd2, hwnd2); /* Given a sibling window, the window is properly resized. */ @@ -2592,10 +2639,8 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) ret = SetWindowPos(hwnd_child, hwnd_child2, 1, 2, 3, 4, 0); ok(ret, "Got %d\n", ret); GetWindowRect(hwnd_child, &rc2); - ok((rc1.left+1) == rc2.left && (rc1.top+2) == rc2.top && - (rc1.left+4) == rc2.right && (rc1.top+6) == rc2.bottom, - "(%d,%d)-(%d,%d) != %s\n", rc1.left+1, rc1.top+2, rc1.left+4, rc1.top+6, - wine_dbgstr_rect(&rc2)); + ok(EqualRect(&rc_expected, &rc2), + "%s != %s.\n", wine_dbgstr_rect(&rc_expected), wine_dbgstr_rect(&rc2)); check_active_state(hwnd2, hwnd2, hwnd2); /* Involving the desktop window changes things. */ -- 2.20.1

1 0

[PATCH] po: Update Sinhala translation.
by Isira Seneviratne 05 Feb '19

05 Feb '19

1 0

[PATCH 1/3] ntdll: Pass a WINE_MODREF * to is_dll_native_subsystem().
by Zebediah Figura 05 Feb '19

05 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/loader.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 35a474a93e..782e1d28af 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -821,10 +821,11 @@ static NTSTATUS create_module_activation_context( LDR_MODULE *module ) * Some dlls (corpol.dll from IE6 for instance) are incorrectly marked as native * while being perfectly normal DLLs. This heuristic should catch such breakages. */ -static BOOL is_dll_native_subsystem( HMODULE module, const IMAGE_NT_HEADERS *nt, LPCWSTR filename ) +static BOOL is_dll_native_subsystem( WINE_MODREF *wm ) { static const WCHAR ntdllW[] = {'n','t','d','l','l','.','d','l','l',0}; static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; + const IMAGE_NT_HEADERS *nt = RtlImageNtHeader( wm->ldr.BaseAddress ); const IMAGE_IMPORT_DESCRIPTOR *imports; DWORD i, size; WCHAR buffer[16]; @@ -832,18 +833,19 @@ static BOOL is_dll_native_subsystem( HMODULE module, const IMAGE_NT_HEADERS *nt, if (nt->OptionalHeader.Subsystem != IMAGE_SUBSYSTEM_NATIVE) return FALSE; if (nt->OptionalHeader.SectionAlignment < page_size) return TRUE; - if ((imports = RtlImageDirectoryEntryToData( module, TRUE, + if ((imports = RtlImageDirectoryEntryToData( wm->ldr.BaseAddress, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &size ))) { for (i = 0; imports[i].Name; i++) { - const char *name = get_rva( module, imports[i].Name ); + const char *name = get_rva( wm->ldr.BaseAddress, imports[i].Name ); DWORD len = strlen(name); if (len * sizeof(WCHAR) >= sizeof(buffer)) continue; ascii_to_unicode( buffer, name, len + 1 ); if (!strcmpiW( buffer, ntdllW ) || !strcmpiW( buffer, kernel32W )) { - TRACE( "%s imports %s, assuming not native\n", debugstr_w(filename), debugstr_w(buffer) ); + TRACE( "%s imports %s, assuming not native\n", + debugstr_us(&wm->ldr.BaseDllName), debugstr_w(buffer) ); return FALSE; } } @@ -1083,7 +1085,7 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename ) else p = wm->ldr.FullDllName.Buffer; RtlInitUnicodeString( &wm->ldr.BaseDllName, p ); - if (!(nt->FileHeader.Characteristics & IMAGE_FILE_DLL) || !is_dll_native_subsystem( hModule, nt, p )) + if (!(nt->FileHeader.Characteristics & IMAGE_FILE_DLL) || !is_dll_native_subsystem( wm )) { if (nt->FileHeader.Characteristics & IMAGE_FILE_DLL) wm->ldr.Flags |= LDR_IMAGE_IS_DLL; -- 2.20.1

2 3

[PATCH 1/2] dwrite: Implement mark-to-mark attachment, GPOS lookup 6.
by Nikolay Sivov 05 Feb '19

05 Feb '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/opentype.c | 89 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 92a5d40dfc..c74382bb62 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -681,6 +681,16 @@ struct ot_gpos_mark_to_base_format1 WORD base_array; }; +struct ot_gpos_mark_to_mark_format1 +{ + WORD format; + WORD mark1_coverage; + WORD mark2_coverage; + WORD mark_class_count; + WORD mark1_array; + WORD mark2_array; +}; + typedef struct { WORD SubstFormat; WORD Coverage; @@ -3503,6 +3513,85 @@ static BOOL opentype_layout_apply_gpos_mark_to_lig_attachment(const struct scrip static BOOL opentype_layout_apply_gpos_mark_to_mark_attachment(const struct scriptshaping_context *context, struct glyph_iterator *iter, const struct lookup *lookup) { + struct scriptshaping_cache *cache = context->cache; + unsigned int i; + WORD format; + + for (i = 0; i < lookup->subtable_count; ++i) + { + unsigned int subtable_offset = opentype_layout_get_gpos_subtable(cache, lookup->offset, i); + + format = table_read_be_word(&cache->gpos.table, subtable_offset); + + if (format == 1) + { + const struct ot_gpos_mark_to_mark_format1 *format1 = table_read_ensure(&cache->gpos.table, + subtable_offset, sizeof(*format1)); + unsigned int count, mark1_array_offset, mark2_array_offset, mark_class_count; + unsigned int mark1_index, mark2_index, mark2_anchor; + const struct ot_gpos_mark_array *mark1_array; + const struct ot_gpos_base_array *mark2_array; + float mark1_x, mark1_y, mark2_x, mark2_y; + struct glyph_iterator mark_iter; + + if (!format1) + continue; + + mark1_index = opentype_layout_is_glyph_covered(&cache->gpos.table, subtable_offset + + GET_BE_WORD(format1->mark1_coverage), context->u.pos.glyphs[iter->pos]); + + mark1_array_offset = subtable_offset + GET_BE_WORD(format1->mark1_array); + if (!(count = table_read_be_word(&cache->gpos.table, mark1_array_offset))) + continue; + + mark1_array = table_read_ensure(&cache->gpos.table, mark1_array_offset, + FIELD_OFFSET(struct ot_gpos_mark_array, records[count])); + if (!mark1_array) + continue; + + if (mark1_index == GLYPH_NOT_COVERED || mark1_index >= count) + continue; + + glyph_iterator_init(context, lookup->flags & ~LOOKUP_FLAG_IGNORE_MASK, iter->pos, 1, &mark_iter); + if (!glyph_iterator_prev(&mark_iter)) + continue; + + if (!context->u.pos.glyph_props[mark_iter.pos].isDiacritic) + continue; + + mark2_array_offset = subtable_offset + GET_BE_WORD(format1->mark2_array); + if (!(count = table_read_be_word(&cache->gpos.table, mark2_array_offset))) + continue; + + mark_class_count = GET_BE_WORD(format1->mark_class_count); + + mark2_array = table_read_ensure(&cache->gpos.table, mark2_array_offset, + FIELD_OFFSET(struct ot_gpos_base_array, offsets[count * mark_class_count])); + if (!mark2_array) + continue; + + mark2_index = opentype_layout_is_glyph_covered(&cache->gpos.table, subtable_offset + + GET_BE_WORD(format1->mark2_coverage), context->u.pos.glyphs[mark_iter.pos]); + + if (mark2_index == GLYPH_NOT_COVERED || mark2_index >= count) + continue; + + mark2_anchor = GET_BE_WORD(mark2_array->offsets[mark2_index * mark_class_count + + GET_BE_WORD(mark1_array->records[mark1_index].mark_class)]); + opentype_layout_gpos_get_anchor(context, mark1_array_offset + + GET_BE_WORD(mark1_array->records[mark1_index].mark_anchor), iter->pos, &mark1_x, &mark1_y); + opentype_layout_gpos_get_anchor(context, mark2_array_offset + mark2_anchor, mark_iter.pos, + &mark2_x, &mark2_y); + + context->offsets[iter->pos].advanceOffset = mark2_x - mark1_x; + context->offsets[iter->pos].ascenderOffset = mark2_y - mark1_y; + + break; + } + else + WARN("Unknown mark-to-mark format %u.\n", format); + } + return FALSE; } -- 2.20.1

1 1

[PATCH] webservices: Delete duplicated return value checks
by Michael Stefaniuc 05 Feb '19

05 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/webservices/tests/reader.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 2b0475fddf..afbc46b83e 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -5086,7 +5086,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_BOOL, "got %u\n", text_node->text->textType ); bool_text = (WS_XML_BOOL_TEXT *)text_node->text; ok( !bool_text->value, "got %d\n", bool_text->value ); @@ -5096,7 +5095,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_BOOL, "got %u\n", text_node->text->textType ); bool_text = (WS_XML_BOOL_TEXT *)text_node->text; ok( bool_text->value == TRUE, "got %d\n", bool_text->value ); @@ -5106,7 +5104,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_INT32, "got %u\n", text_node->text->textType ); int32_text = (WS_XML_INT32_TEXT *)text_node->text; ok( int32_text->value == -1, "got %d\n", int32_text->value ); @@ -5116,7 +5113,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_INT32, "got %u\n", text_node->text->textType ); int32_text = (WS_XML_INT32_TEXT *)text_node->text; ok( int32_text->value == -1, "got %d\n", int32_text->value ); @@ -5126,7 +5122,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_INT32, "got %u\n", text_node->text->textType ); int32_text = (WS_XML_INT32_TEXT *)text_node->text; ok( int32_text->value == -1, "got %d\n", int32_text->value ); @@ -5136,7 +5131,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_INT64, "got %u\n", text_node->text->textType ); int64_text = (WS_XML_INT64_TEXT *)text_node->text; ok( int64_text->value == -1, "got %s\n", wine_dbgstr_longlong(int64_text->value) ); @@ -5146,7 +5140,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_DOUBLE, "got %u\n", text_node->text->textType ); double_text = (WS_XML_DOUBLE_TEXT *)text_node->text; ok( !double_text->value, "got %s\n", wine_dbgstr_longlong(double_text->value) ); @@ -5156,7 +5149,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_DATETIME, "got %u\n", text_node->text->textType ); datetime_text = (WS_XML_DATETIME_TEXT *)text_node->text; ok( !datetime_text->value.ticks, "got %s\n", wine_dbgstr_longlong(datetime_text->value.ticks) ); @@ -5167,7 +5159,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text_node->text->textType ); utf8_text = (WS_XML_UTF8_TEXT *)text_node->text; ok( utf8_text->value.length == 1, "got %u\n", utf8_text->value.length ); @@ -5178,7 +5169,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text_node->text->textType ); utf8_text = (WS_XML_UTF8_TEXT *)text_node->text; ok( utf8_text->value.length == 1, "got %u\n", utf8_text->value.length ); @@ -5189,7 +5179,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text_node->text->textType ); utf8_text = (WS_XML_UTF8_TEXT *)text_node->text; ok( utf8_text->value.length == 1, "got %u\n", utf8_text->value.length ); @@ -5200,7 +5189,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_BASE64, "got %u\n", text_node->text->textType ); base64_text = (WS_XML_BASE64_TEXT *)text_node->text; ok( base64_text->length == 1, "got %u\n", base64_text->length ); @@ -5211,7 +5199,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_BASE64, "got %u\n", text_node->text->textType ); base64_text = (WS_XML_BASE64_TEXT *)text_node->text; ok( base64_text->length == 1, "got %u\n", base64_text->length ); @@ -5222,7 +5209,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_BASE64, "got %u\n", text_node->text->textType ); base64_text = (WS_XML_BASE64_TEXT *)text_node->text; ok( base64_text->length == 1, "got %u\n", base64_text->length ); @@ -5233,7 +5219,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text_node->text->textType ); utf8_text = (WS_XML_UTF8_TEXT *)text_node->text; ok( !utf8_text->value.length, "got %u\n", utf8_text->value.length ); @@ -5244,7 +5229,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text_node->text->textType ); utf8_text = (WS_XML_UTF8_TEXT *)text_node->text; ok( utf8_text->value.length == 2, "got %u\n", utf8_text->value.length ); @@ -5256,7 +5240,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_UNIQUE_ID, "got %u\n", text_node->text->textType ); unique_id_text = (WS_XML_UNIQUE_ID_TEXT *)text_node->text; ok( IsEqualGUID( &unique_id_text->value, &guid_null ), "wrong data\n" ); @@ -5266,7 +5249,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_GUID, "got %u\n", text_node->text->textType ); guid_text = (WS_XML_GUID_TEXT *)text_node->text; ok( IsEqualGUID( &guid_text->value, &guid_null ), "wrong data\n" ); @@ -5276,7 +5258,6 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); text_node = read_text_node( reader ); ok( text_node != NULL, "no text\n" ); - ok( hr == S_OK, "got %08x\n", hr ); ok( text_node->text->textType == WS_XML_TEXT_TYPE_UINT64, "got %u\n", text_node->text->textType ); uint64_text = (WS_XML_UINT64_TEXT *)text_node->text; ok( uint64_text->value == 1, "got %s\n", wine_dbgstr_longlong(uint64_text->value) ); -- 2.20.1

2 1

[PATCH] cryptdlg: Avoid calling strlen on constants.
by Isira Seneviratne 05 Feb '19

05 Feb '19

1 0

[PATCH] advapi32: Avoid calling strlen on constants
by Alex Henrie 05 Feb '19

05 Feb '19

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/advapi32/crypt.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index ab1e5982da..87aa8825d0 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -68,11 +68,11 @@ static inline PWSTR CRYPT_GetProvKeyName(PCWSTR pProvName) }; PWSTR keyname; - keyname = CRYPT_Alloc((strlenW(KEYSTR) + strlenW(pProvName) +1)*sizeof(WCHAR)); + keyname = CRYPT_Alloc((ARRAY_SIZE(KEYSTR) + strlenW(pProvName))*sizeof(WCHAR)); if (keyname) { strcpyW(keyname, KEYSTR); - strcpyW(keyname + strlenW(KEYSTR), pProvName); + strcpyW(keyname + ARRAY_SIZE(KEYSTR) - 1, pProvName); } else SetLastError(ERROR_NOT_ENOUGH_MEMORY); return keyname; @@ -94,14 +94,15 @@ static inline PWSTR CRYPT_GetTypeKeyName(DWORD dwType, BOOL user) 'C','r','y','p','t','o','g','r','a','p','h','y','\\', 'P','r','o','v','i','d','e','r',' ','T','y','p','e',' ','X','X','X',0 }; + SIZE_T keyname_size = user ? sizeof(USERSTR) : sizeof(MACHINESTR); PWSTR keyname; PWSTR ptr; - keyname = CRYPT_Alloc( ((user ? strlenW(USERSTR) : strlenW(MACHINESTR)) +1)*sizeof(WCHAR)); + keyname = CRYPT_Alloc(keyname_size); if (keyname) { user ? strcpyW(keyname, USERSTR) : strcpyW(keyname, MACHINESTR); - ptr = keyname + strlenW(keyname); + ptr = keyname + keyname_size/sizeof(WCHAR) - 1; *(--ptr) = (dwType % 10) + '0'; *(--ptr) = ((dwType / 10) % 10) + '0'; *(--ptr) = (dwType / 100) + '0'; @@ -312,7 +313,7 @@ static void CRYPT_CreateMachineGuid(void) uuid.Data4[6], uuid.Data4[7] ); RegSetValueExW(key, machineGuidW, 0, REG_SZ, (const BYTE *)buf, - (lstrlenW(buf)+1)*sizeof(WCHAR)); + sizeof(buf)); } } RegCloseKey(key); -- 2.20.1

1 4

[PATCH v2] d3dx9/tests: Actually test the return of the effect SetInt() call.
by Matteo Bruni 05 Feb '19

05 Feb '19

From: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Add one more missing ok() call. dlls/d3dx9_36/tests/effect.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 8f2f06b1de4..5efc93bbb19 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -7182,11 +7182,12 @@ static void test_effect_unsupported_shader(void) hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); ok(hr == D3D_OK, "Got result %#x.\n", hr); - effect->lpVtbl->SetInt(effect, "i", 1); + hr = effect->lpVtbl->SetInt(effect, "i", 1); ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); ok(hr == E_FAIL, "Got result %#x.\n", hr); - effect->lpVtbl->SetInt(effect, "i", 0); + hr = effect->lpVtbl->SetInt(effect, "i", 0); + ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); ok(hr == D3D_OK, "Got result %#x.\n", hr); @@ -7229,7 +7230,7 @@ static void test_effect_unsupported_shader(void) HeapFree(GetProcessHeap(), 0, byte_code); IDirect3DVertexShader9_Release(vshader); - effect->lpVtbl->SetInt(effect, "i", 1); + hr = effect->lpVtbl->SetInt(effect, "i", 1); ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = effect->lpVtbl->CommitChanges(effect); ok(hr == D3D_OK, "Got result %#x.\n", hr); @@ -7321,16 +7322,16 @@ static void test_effect_null_shader(void) hr = effect->lpVtbl->ValidateTechnique(effect, "tech0"); ok(hr == D3D_OK, "Got result %#x.\n", hr); - effect->lpVtbl->SetInt(effect, "i", 0); + hr = effect->lpVtbl->SetInt(effect, "i", 0); ok(hr == D3D_OK, "Failed to set parameter, hr %#x.\n", hr); hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); ok(hr == D3D_OK, "Got result %#x.\n", hr); - effect->lpVtbl->SetInt(effect, "i", 1); + hr = effect->lpVtbl->SetInt(effect, "i", 1); ok(hr == D3D_OK, "Failed to set parameter, hr %#x.\n", hr); hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); ok(hr == D3D_OK, "Got result %#x.\n", hr); - effect->lpVtbl->SetInt(effect, "i", 2); + hr = effect->lpVtbl->SetInt(effect, "i", 2); ok(hr == D3D_OK, "Failed to set parameter, hr %#x.\n", hr); hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); ok(hr == E_FAIL, "Got result %#x.\n", hr); @@ -7938,7 +7939,7 @@ static void test_effect_find_next_valid_technique(void) ok(hr == D3D_OK, "Got result %#x.\n", hr); ok(!strcmp(desc.Name, "tech0"), "Got unexpected technique %s.\n", desc.Name); - effect->lpVtbl->SetInt(effect, "i", 1); + hr = effect->lpVtbl->SetInt(effect, "i", 1); ok(hr == D3D_OK, "Got result %#x.\n", hr); tech = (D3DXHANDLE)0xdeadbeef; @@ -7951,7 +7952,8 @@ static void test_effect_find_next_valid_technique(void) hr = effect->lpVtbl->FindNextValidTechnique(effect, tech, &tech); ok(hr == S_FALSE, "Got result %#x.\n", hr); - effect->lpVtbl->SetInt(effect, "i", 0); + hr = effect->lpVtbl->SetInt(effect, "i", 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = effect->lpVtbl->FindNextValidTechnique(effect, tech, &tech); ok(hr == D3D_OK, "Got result %#x.\n", hr); -- 2.19.2

1 0

[PATCH] d3dx9/tests: Actually test the return of the effect SetInt() call
by Michael Stefaniuc 04 Feb '19

04 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 8f2f06b1de..d2031e365e 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -7182,11 +7182,12 @@ static void test_effect_unsupported_shader(void) hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); ok(hr == D3D_OK, "Got result %#x.\n", hr); - effect->lpVtbl->SetInt(effect, "i", 1); + hr = effect->lpVtbl->SetInt(effect, "i", 1); ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); ok(hr == E_FAIL, "Got result %#x.\n", hr); - effect->lpVtbl->SetInt(effect, "i", 0); + hr = effect->lpVtbl->SetInt(effect, "i", 0); + ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); ok(hr == D3D_OK, "Got result %#x.\n", hr); @@ -7229,7 +7230,7 @@ static void test_effect_unsupported_shader(void) HeapFree(GetProcessHeap(), 0, byte_code); IDirect3DVertexShader9_Release(vshader); - effect->lpVtbl->SetInt(effect, "i", 1); + hr = effect->lpVtbl->SetInt(effect, "i", 1); ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = effect->lpVtbl->CommitChanges(effect); ok(hr == D3D_OK, "Got result %#x.\n", hr); @@ -7321,16 +7322,16 @@ static void test_effect_null_shader(void) hr = effect->lpVtbl->ValidateTechnique(effect, "tech0"); ok(hr == D3D_OK, "Got result %#x.\n", hr); - effect->lpVtbl->SetInt(effect, "i", 0); + hr = effect->lpVtbl->SetInt(effect, "i", 0); ok(hr == D3D_OK, "Failed to set parameter, hr %#x.\n", hr); hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); ok(hr == D3D_OK, "Got result %#x.\n", hr); - effect->lpVtbl->SetInt(effect, "i", 1); + hr = effect->lpVtbl->SetInt(effect, "i", 1); ok(hr == D3D_OK, "Failed to set parameter, hr %#x.\n", hr); hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); ok(hr == D3D_OK, "Got result %#x.\n", hr); - effect->lpVtbl->SetInt(effect, "i", 2); + hr = effect->lpVtbl->SetInt(effect, "i", 2); ok(hr == D3D_OK, "Failed to set parameter, hr %#x.\n", hr); hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); ok(hr == E_FAIL, "Got result %#x.\n", hr); @@ -7938,7 +7939,7 @@ static void test_effect_find_next_valid_technique(void) ok(hr == D3D_OK, "Got result %#x.\n", hr); ok(!strcmp(desc.Name, "tech0"), "Got unexpected technique %s.\n", desc.Name); - effect->lpVtbl->SetInt(effect, "i", 1); + hr = effect->lpVtbl->SetInt(effect, "i", 1); ok(hr == D3D_OK, "Got result %#x.\n", hr); tech = (D3DXHANDLE)0xdeadbeef; @@ -7951,7 +7952,7 @@ static void test_effect_find_next_valid_technique(void) hr = effect->lpVtbl->FindNextValidTechnique(effect, tech, &tech); ok(hr == S_FALSE, "Got result %#x.\n", hr); - effect->lpVtbl->SetInt(effect, "i", 0); + hr = effect->lpVtbl->SetInt(effect, "i", 0); hr = effect->lpVtbl->FindNextValidTechnique(effect, tech, &tech); ok(hr == D3D_OK, "Got result %#x.\n", hr); -- 2.20.1

1 0

[PATCH] kernelbase: Avoid TRUE : FALSE conditional expressions
by Michael Stefaniuc 04 Feb '19

04 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernelbase/path.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index bcd129cce9..dfcc825838 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -421,7 +421,7 @@ HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extens next++; } - has_dot = extension[0] == '.' ? TRUE : FALSE; + has_dot = extension[0] == '.'; hr = PathCchFindExtension(path, size, &existing_extension); if (FAILED(hr)) return hr; @@ -863,5 +863,5 @@ BOOL WINAPI PathIsUNCEx(const WCHAR *path, const WCHAR **server) result = path + 2; if (server) *server = result; - return result ? TRUE : FALSE; + return !!result; } -- 2.20.1

1 0

[PATCH] shcore: Don't return E_FAIL in IStream::SetSize() for read-only mode.
by Jactry Zeng 04 Feb '19

04 Feb '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/shcore/main.c | 13 +++- dlls/shcore/tests/shcore.c | 119 +++++++++++++++++++++++++++++++++++++ 2 files changed, 129 insertions(+), 3 deletions(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 973b7c7a03..ffa16cd5a7 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -913,14 +913,21 @@ static HRESULT WINAPI filestream_Seek(IStream *iface, LARGE_INTEGER move, DWORD static HRESULT WINAPI filestream_SetSize(IStream *iface, ULARGE_INTEGER size) { struct shstream *stream = impl_from_IStream(iface); + DWORD origin; TRACE("(%p, %s)\n", stream, wine_dbgstr_longlong(size.QuadPart)); - if (!SetFilePointer(stream->u.file.handle, size.QuadPart, NULL, FILE_BEGIN)) + origin = SetFilePointer(stream->u.file.handle, 0, NULL, FILE_CURRENT); + if (SetFilePointer(stream->u.file.handle, size.QuadPart, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) return E_FAIL; - if (!SetEndOfFile(stream->u.file.handle)) - return E_FAIL; + if (stream->u.file.mode != STGM_READ) + { + if (!SetEndOfFile(stream->u.file.handle)) + return E_FAIL; + if (SetFilePointer(stream->u.file.handle, origin, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) + return E_FAIL; + } return S_OK; } diff --git a/dlls/shcore/tests/shcore.c b/dlls/shcore/tests/shcore.c index 0738659f7c..2a8ebcc468 100644 --- a/dlls/shcore/tests/shcore.c +++ b/dlls/shcore/tests/shcore.c @@ -41,6 +41,8 @@ static LSTATUS (WINAPI *pSHRegGetValueA)(HKEY, const char *, const char *, SRRF, static DWORD (WINAPI *pSHQueryValueExA)(HKEY, const char *, DWORD *, DWORD *, void *buff, DWORD *buff_len); static DWORD (WINAPI *pSHRegGetPathA)(HKEY, const char *, const char *, char *, DWORD); static DWORD (WINAPI *pSHCopyKeyA)(HKEY, const char *, HKEY, DWORD); +static HRESULT (WINAPI *pSHCreateStreamOnFileA)(const char *path, DWORD mode, IStream **stream); +static HRESULT (WINAPI *pIStream_Size)(IStream *stream, ULARGE_INTEGER *size); /* Keys used for testing */ #define REG_TEST_KEY "Software\\Wine\\Test" @@ -73,6 +75,8 @@ static void init(HMODULE hshcore) X(SHQueryValueExA); X(SHRegGetPathA); X(SHCopyKeyA); + X(SHCreateStreamOnFileA); + X(IStream_Size); #undef X } @@ -671,6 +675,120 @@ static void test_SHCopyKey(void) delete_key( hkey, "Software\\Wine", "Test" ); } +#define CHECK_FILE_SIZE(filename,exp_size) _check_file_size(filename, exp_size, __LINE__) +static void _check_file_size(const CHAR *filename, LONG exp_size, int line) +{ + HANDLE handle; + DWORD file_size = 0xdeadbeef; + handle = CreateFileA(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + file_size = GetFileSize(handle, NULL); + ok_(__FILE__,line)(file_size == exp_size, "got wrong file size: %d.\n", file_size); + CloseHandle(handle); +} + +#define CHECK_STREAM_SIZE(obj,exp_size) _check_stream_size(obj, exp_size, __LINE__) +static void _check_stream_size(IStream *obj, LONG exp_size, int line) +{ + ULARGE_INTEGER stream_size; + STATSTG stat; + HRESULT hr; + stream_size.QuadPart = 0xdeadbeef; + hr = pIStream_Size(obj, &stream_size); + ok_(__FILE__,line)(hr == S_OK, "IStream_Size failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(stream_size.QuadPart == exp_size, "Size(): got wrong size of stream: %s.\n", + wine_dbgstr_longlong(stream_size.QuadPart)); + hr = IStream_Stat(obj, &stat, STATFLAG_NONAME); + ok_(__FILE__,line)(hr == S_OK, "IStream_Stat failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(stat.cbSize.QuadPart == exp_size, "Stat(): got wrong size of stream: %s.\n", + wine_dbgstr_longlong(stat.cbSize.QuadPart)); +} + +#define CHECK_STREAM_POS(obj,exp_pos) _check_stream_pos(obj, exp_pos, __LINE__) +static void _check_stream_pos(IStream *obj, LONG exp_pos, int line) +{ + LARGE_INTEGER move; + ULARGE_INTEGER pos; + HRESULT hr; + move.QuadPart = 0; + pos.QuadPart = 0xdeadbeef; + hr = IStream_Seek(obj, move, STREAM_SEEK_CUR, &pos); + ok_(__FILE__,line)(hr == S_OK, "IStream_Seek failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(pos.QuadPart == exp_pos, "got wrong position: %s.\n", + wine_dbgstr_longlong(pos.QuadPart)); +} + +static void test_stream_size(void) +{ + static const byte test_data[] = {0x1,0x2,0x3,0x4,0x5,0x6}; + static const CHAR filename[] = "test_file"; + IStream *stream, *stream2; + HANDLE handle; + DWORD written = 0; + ULARGE_INTEGER stream_size; + HRESULT hr; + + handle = CreateFileA(filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(handle != INVALID_HANDLE_VALUE, "File creation failed: 0x%08x.\n", GetLastError()); + WriteFile(handle, test_data, sizeof(test_data), &written, NULL); + ok(written == sizeof(test_data), "Failed to write data into file.\n"); + CloseHandle(handle); + + /* in read-only mode, SetSize() will success but it has no effect on Size() and the file */ + hr = pSHCreateStreamOnFileA(filename, STGM_FAILIFTHERE|STGM_READ, &stream); + ok(hr == S_OK, "SHCreateStreamOnFileA failed: 0x%08x.\n", hr); + CHECK_STREAM_SIZE(stream, sizeof(test_data)); + stream_size.QuadPart = 0; + hr = IStream_SetSize(stream, stream_size); + ok(hr == S_OK, "IStream_SetSize failed: 0x%08x.\n", hr); + CHECK_STREAM_SIZE(stream, sizeof(test_data)); + CHECK_STREAM_POS(stream, 0); + stream_size.QuadPart = 100; + hr = IStream_SetSize(stream, stream_size); + ok(hr == S_OK, "IStream_SetSize failed: 0x%08x.\n", hr); + CHECK_STREAM_SIZE(stream, sizeof(test_data)); + CHECK_STREAM_POS(stream, 100); + IStream_Release(stream); + CHECK_FILE_SIZE(filename, sizeof(test_data)); + + hr = pSHCreateStreamOnFileA(filename, STGM_FAILIFTHERE|STGM_WRITE, &stream); + ok(hr == S_OK, "SHCreateStreamOnFileA failed: 0x%08x.\n", hr); + hr = pSHCreateStreamOnFileA(filename, STGM_FAILIFTHERE|STGM_READ, &stream2); + ok(hr == S_OK, "SHCreateStreamOnFileA failed: 0x%08x.\n", hr); + CHECK_STREAM_SIZE(stream, sizeof(test_data)); + CHECK_STREAM_SIZE(stream2, sizeof(test_data)); + CHECK_STREAM_POS(stream, 0); + CHECK_STREAM_POS(stream2, 0); + + stream_size.QuadPart = 0; + hr = IStream_SetSize(stream, stream_size); + ok(hr == S_OK, "IStream_SetSize failed: 0x%08x.\n", hr); + CHECK_STREAM_SIZE(stream, 0); + CHECK_STREAM_SIZE(stream2, 0); + CHECK_STREAM_POS(stream, 0); + CHECK_STREAM_POS(stream2, 0); + + stream_size.QuadPart = 100; + hr = IStream_SetSize(stream, stream_size); + ok(hr == S_OK, "IStream_SetSize failed: 0x%08x.\n", hr); + CHECK_STREAM_SIZE(stream, 100); + CHECK_STREAM_SIZE(stream2, 100); + CHECK_STREAM_POS(stream, 0); + CHECK_STREAM_POS(stream2, 0); + + stream_size.QuadPart = 90; + hr = IStream_SetSize(stream2, stream_size); + ok(hr == S_OK, "IStream_SetSize failed: 0x%08x.\n", hr); + CHECK_STREAM_SIZE(stream, 100); + CHECK_STREAM_SIZE(stream2, 100); + CHECK_STREAM_POS(stream, 0); + CHECK_STREAM_POS(stream2, 90); + IStream_Release(stream); + IStream_Release(stream2); + CHECK_FILE_SIZE(filename, 100); + + DeleteFileA(filename); +} + START_TEST(shcore) { HMODULE hshcore = LoadLibraryA("shcore.dll"); @@ -695,4 +813,5 @@ START_TEST(shcore) test_SHQueryValueEx(); test_SHRegGetPath(); test_SHCopyKey(); + test_stream_size(); } -- 2.20.1

2 1

[PATCH] ntoskrnl.exe: Properly export *SList functions on win64.
by Jacek Caban 04 Feb '19

04 Feb '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45820 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 57 -------------------------- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 11 +++-- dlls/ntoskrnl.exe/sync.c | 63 +++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 61 deletions(-)

2 1

[PATCH] ntoskrnl.exe: Properly export *SList functions on win64.
by Jacek Caban 04 Feb '19

04 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 57 -------------------------- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 11 +++-- dlls/ntoskrnl.exe/sync.c | 63 +++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 61 deletions(-)

2 1

[PATCH 1/6] comctl32/listbox: Handle Mouse Wheel scrolling for multi-column listboxes properly
by Gabriel Ivăncescu 04 Feb '19

04 Feb '19

Multi-column listboxes scroll horizontally, so each wheel tick must go an entire page at a time instead of an item at a time. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22253 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- These notes apply to all the patches in the series. Temporary variable has been used to get rid of many casts, as suggested. The calculation has been simplified to just integer arithmetic in all cases, since the division (the only operation with a fractional result) was immediately truncated to integer anyway. Note that the float doesn't help with overflow either. As you can see, it gets assigned to cLineScroll (which is integer) and then gets multiplied back by WHEEL_DELTA, so if the float were to help with overflow in the first place, it would overflow on the next line regardless. Anyway, overflow is probably impossible in practice since WHEEL_DELTA is just 120, but even if so, it was already overflowing with float, so there's no reason to have that cast... dlls/comctl32/listbox.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index cb645b4..9f56a2f 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2012,9 +2012,11 @@ static LRESULT LISTBOX_HandleHScroll( LB_DESCR *descr, WORD scrollReq, WORD pos static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta ) { - UINT pulScrollLines = 3; + INT pulScrollLines; + UINT tmp = 3; - SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); + SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &tmp, 0); + pulScrollLines = tmp; /* if scrolling changes direction, ignore left overs */ if ((delta < 0 && descr->wheel_remain < 0) || @@ -2025,10 +2027,21 @@ static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta ) if (descr->wheel_remain && pulScrollLines) { - int cLineScroll; - pulScrollLines = min((UINT) descr->page_size, pulScrollLines); - cLineScroll = pulScrollLines * (float)descr->wheel_remain / WHEEL_DELTA; - descr->wheel_remain -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + INT cLineScroll; + if (descr->style & LBS_MULTICOLUMN) + { + pulScrollLines = min((UINT)descr->width / descr->column_width, pulScrollLines); + pulScrollLines = max(1U, pulScrollLines); + cLineScroll = (pulScrollLines * descr->wheel_remain) / WHEEL_DELTA; + descr->wheel_remain -= (cLineScroll * WHEEL_DELTA) / pulScrollLines; + cLineScroll *= descr->page_size; + } + else + { + pulScrollLines = min((UINT)descr->page_size, pulScrollLines); + cLineScroll = (pulScrollLines * descr->wheel_remain) / WHEEL_DELTA; + descr->wheel_remain -= (cLineScroll * WHEEL_DELTA) / pulScrollLines; + } LISTBOX_SetTopItem( descr, descr->top_item - cLineScroll, TRUE ); } return 0; -- 2.19.1

2 6

[PATCH v3] ntdll: correct space/mark parity
by Julien D'ascenzio 04 Feb '19

04 Feb '19

When CMSPAR is define, the space and mark parity is reversed: The flag PARODD isn't set correctly Signed-off-by: Julien D'ascenzio <Julien.Dascenzio(a)paratronic.fr> --- dlls/ntdll/serial.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 29e9fafbca..830137c629 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -280,8 +280,8 @@ static NTSTATUS get_line_control(int fd, SERIAL_LINE_CONTROL* slc) case PARENB: slc->Parity = EVENPARITY; break; case PARENB|PARODD: slc->Parity = ODDPARITY; break; #ifdef CMSPAR - case PARENB|CMSPAR: slc->Parity = MARKPARITY; break; - case PARENB|PARODD|CMSPAR: slc->Parity = SPACEPARITY; break; + case PARENB|PARODD|CMSPAR: slc->Parity = MARKPARITY; break; + case PARENB|CMSPAR: slc->Parity = SPACEPARITY; break; #endif } switch (port.c_cflag & CSIZE) @@ -676,8 +676,8 @@ static NTSTATUS set_line_control(int fd, const SERIAL_LINE_CONTROL* slc) case EVENPARITY: port.c_cflag |= PARENB; break; #ifdef CMSPAR /* Linux defines mark/space (stick) parity */ - case MARKPARITY: port.c_cflag |= PARENB | CMSPAR; break; - case SPACEPARITY: port.c_cflag |= PARENB | PARODD | CMSPAR; break; + case MARKPARITY: port.c_cflag |= PARENB | PARODD | CMSPAR; break; + case SPACEPARITY: port.c_cflag |= PARENB | CMSPAR; break; #else /* try the POSIX way */ case MARKPARITY: -- 2.11.0

1 0

[PATCH v2] ntdll: correct space/mark parity
by Julien D'ascenzio 04 Feb '19

04 Feb '19

When CMSPAR is define, the space and mark parity is reversed: The flag PARODD isn't set correctly Signed-off-by: Julien D'Ascenzio <jdascenzio(a)paratronic.fr> --- dlls/ntdll/serial.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 29e9fafbca..b3404d4534 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -280,8 +280,8 @@ static NTSTATUS get_line_control(int fd, SERIAL_LINE_CONTROL* slc) case PARENB: slc->Parity = EVENPARITY; break; case PARENB|PARODD: slc->Parity = ODDPARITY; break; #ifdef CMSPAR - case PARENB|CMSPAR: slc->Parity = MARKPARITY; break; - case PARENB|PARODD|CMSPAR: slc->Parity = SPACEPARITY; break; + case PARENB|PARODD|CMSPAR: slc->Parity = MARKPARITY; break; + case PARENB|CMSPAR: slc->Parity = SPACEPARITY; break; #endif } switch (port.c_cflag & CSIZE) @@ -676,8 +676,8 @@ static NTSTATUS set_line_control(int fd, const SERIAL_LINE_CONTROL* slc) case EVENPARITY: port.c_cflag |= PARENB; break; #ifdef CMSPAR /* Linux defines mark/space (stick) parity */ - case MARKPARITY: port.c_cflag |= PARENB | CMSPAR; break; - case SPACEPARITY: port.c_cflag |= PARENB | PARODD | CMSPAR; break; + case MARKPARITY: port.c_cflag |= PARENB | PARODD | CMSPAR; break; + case SPACEPARITY: port.c_cflag |= PARENB | CMSPAR; break; #else /* try the POSIX way */ case MARKPARITY: -- 2.11.0

2 2

[PATCH v4] po: Update Sinhala translation.
by Isira Seneviratne 02 Feb '19

02 Feb '19

1 0

[PATCH v3] po: Update Sinhala translation.
by Isira Seneviratne 02 Feb '19

02 Feb '19

1 0

[PATCH] ntoskrnl.exe: Implement KeExpandKernelStackAndCallout and KeExpandKernelStackAndCalloutEx.
by Jacek Caban 01 Feb '19

01 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 19 +++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 + dlls/ntoskrnl.exe/tests/driver.c | 84 +++++++++++++++++++++++++++-- include/ddk/ntddk.h | 3 ++ 4 files changed, 105 insertions(+), 3 deletions(-)

2 1

[PATCH 2/2] windowscodecs: Add a NULL check to 8bpp gray converter.
by Dmitry Timoshkov 01 Feb '19

01 Feb '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/converter.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index d6b62a60bb..5288a32d13 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -1186,6 +1186,9 @@ static HRESULT copypixels_to_8bppGray(struct FormatConverter *This, const WICRec return hr; } + if (!prc) + return copypixels_to_24bppBGR(This, NULL, cbStride, cbBufferSize, pbBuffer, source_format); + srcstride = 3 * prc->Width; srcdatasize = srcstride * prc->Height; -- 2.20.1

2 1

[PATCH 1/2] windowscodecs: Add support for converting to 8bppIndexed format.
by Dmitry Timoshkov 01 Feb '19

01 Feb '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/converter.c | 163 +++++++++++++++++++++++++++++---- 1 file changed, 146 insertions(+), 17 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 6e7bb8e781..d6b62a60bb 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -76,7 +76,7 @@ typedef struct FormatConverter { const struct pixelformatinfo *dst_format, *src_format; WICBitmapDitherType dither; double alpha_threshold; - WICBitmapPaletteType palette_type; + IWICPalette *palette; CRITICAL_SECTION lock; /* must be held when initialized */ } FormatConverter; @@ -1219,11 +1219,99 @@ static HRESULT copypixels_to_8bppGray(struct FormatConverter *This, const WICRec return hr; } +static UINT rgb_to_palette_index(BYTE bgr[3], WICColor *colors, UINT count) +{ + UINT best_diff, best_index, i; + + best_diff = ~0; + best_index = 0; + + for (i = 0; i < count; i++) + { + BYTE pal_r, pal_g, pal_b; + UINT diff_r, diff_g, diff_b, diff; + + pal_r = colors[i] >> 16; + pal_g = colors[i] >> 8; + pal_b = colors[i]; + + diff_r = bgr[2] - pal_r; + diff_g = bgr[1] - pal_g; + diff_b = bgr[0] - pal_b; + + diff = diff_r * diff_r + diff_g * diff_g + diff_b * diff_b; + if (diff == 0) return i; + + if (diff < best_diff) + { + best_diff = diff; + best_index = i; + } + } + + return best_index; +} + +static HRESULT copypixels_to_8bppIndexed(struct FormatConverter *This, const WICRect *prc, + UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer, enum pixelformat source_format) +{ + HRESULT hr; + BYTE *srcdata; + WICColor colors[256]; + UINT srcstride, srcdatasize, count; + + if (source_format == format_8bppIndexed) + { + if (prc) + return IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); + + return S_OK; + } + + if (!prc) + return copypixels_to_24bppBGR(This, NULL, cbStride, cbBufferSize, pbBuffer, source_format); + + if (!This->palette) return WINCODEC_ERR_WRONGSTATE; + + hr = IWICPalette_GetColors(This->palette, 256, colors, &count); + if (hr != S_OK) return hr; + if (!count) return WINCODEC_ERR_WRONGSTATE; + + srcstride = 3 * prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + hr = copypixels_to_24bppBGR(This, prc, srcstride, srcdatasize, srcdata, source_format); + if (SUCCEEDED(hr) && prc) + { + INT x, y; + BYTE *src = srcdata, *dst = pbBuffer; + + for (y = 0; y < prc->Height; y++) + { + BYTE *bgr = src; + + for (x = 0; x < prc->Width; x++) + { + dst[x] = rgb_to_palette_index(bgr, colors, count); + bgr += 3; + } + src += srcstride; + dst += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + return hr; +} + static const struct pixelformatinfo supported_formats[] = { {format_1bppIndexed, &GUID_WICPixelFormat1bppIndexed, NULL}, {format_2bppIndexed, &GUID_WICPixelFormat2bppIndexed, NULL}, {format_4bppIndexed, &GUID_WICPixelFormat4bppIndexed, NULL}, - {format_8bppIndexed, &GUID_WICPixelFormat8bppIndexed, NULL}, + {format_8bppIndexed, &GUID_WICPixelFormat8bppIndexed, copypixels_to_8bppIndexed}, {format_BlackWhite, &GUID_WICPixelFormatBlackWhite, NULL}, {format_2bppGray, &GUID_WICPixelFormat2bppGray, NULL}, {format_4bppGray, &GUID_WICPixelFormat4bppGray, NULL}, @@ -1300,6 +1388,7 @@ static ULONG WINAPI FormatConverter_Release(IWICFormatConverter *iface) This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); if (This->source) IWICBitmapSource_Release(This->source); + if (This->palette) IWICPalette_Release(This->palette); HeapFree(GetProcessHeap(), 0, This); } @@ -1348,10 +1437,16 @@ static HRESULT WINAPI FormatConverter_GetResolution(IWICFormatConverter *iface, } static HRESULT WINAPI FormatConverter_CopyPalette(IWICFormatConverter *iface, - IWICPalette *pIPalette) + IWICPalette *palette) { - FIXME("(%p,%p): stub\n", iface, pIPalette); - return E_NOTIMPL; + FormatConverter *This = impl_from_IWICFormatConverter(iface); + + TRACE("(%p,%p)\n", iface, palette); + + if (!palette) return E_INVALIDARG; + if (!This->palette) return WINCODEC_ERR_WRONGSTATE; + + return IWICPalette_InitializeFromPalette(palette, This->palette); } static HRESULT WINAPI FormatConverter_CopyPixels(IWICFormatConverter *iface, @@ -1384,19 +1479,52 @@ static HRESULT WINAPI FormatConverter_CopyPixels(IWICFormatConverter *iface, } static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, - IWICBitmapSource *pISource, REFWICPixelFormatGUID dstFormat, WICBitmapDitherType dither, - IWICPalette *pIPalette, double alphaThresholdPercent, WICBitmapPaletteType paletteTranslate) + IWICBitmapSource *source, REFWICPixelFormatGUID dstFormat, WICBitmapDitherType dither, + IWICPalette *palette, double alpha_threshold, WICBitmapPaletteType palette_type) { FormatConverter *This = impl_from_IWICFormatConverter(iface); const struct pixelformatinfo *srcinfo, *dstinfo; - static INT fixme=0; GUID srcFormat; - HRESULT res=S_OK; + HRESULT res; + + TRACE("(%p,%p,%s,%u,%p,%0.3f,%u)\n", iface, source, debugstr_guid(dstFormat), + dither, palette, alpha_threshold, palette_type); + + if (!palette) + { + res = PaletteImpl_Create(&palette); + if (res != S_OK) return res; + + switch (palette_type) + { + case WICBitmapPaletteTypeCustom: + IWICPalette_Release(palette); + palette = NULL; + res = S_OK; + break; + + case WICBitmapPaletteTypeMedianCut: + { + UINT bpp; + res = get_pixelformat_bpp(dstFormat, &bpp); + if (res == S_OK && bpp <= 8) + res = IWICPalette_InitializeFromBitmap(palette, source, 1 << bpp, FALSE); + break; + } - TRACE("(%p,%p,%s,%u,%p,%0.1f,%u)\n", iface, pISource, debugstr_guid(dstFormat), - dither, pIPalette, alphaThresholdPercent, paletteTranslate); + default: + res = IWICPalette_InitializePredefined(palette, palette_type, FALSE); + break; + } - if (pIPalette && !fixme++) FIXME("ignoring palette\n"); + if (res != S_OK) + { + IWICPalette_Release(palette); + return res; + } + } + else + IWICPalette_AddRef(palette); EnterCriticalSection(&This->lock); @@ -1406,7 +1534,7 @@ static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, goto end; } - res = IWICBitmapSource_GetPixelFormat(pISource, &srcFormat); + res = IWICBitmapSource_GetPixelFormat(source, &srcFormat); if (FAILED(res)) goto end; srcinfo = get_formatinfo(&srcFormat); @@ -1427,13 +1555,13 @@ static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, if (dstinfo->copy_function) { - IWICBitmapSource_AddRef(pISource); + IWICBitmapSource_AddRef(source); This->src_format = srcinfo; This->dst_format = dstinfo; This->dither = dither; - This->alpha_threshold = alphaThresholdPercent; - This->palette_type = paletteTranslate; - This->source = pISource; + This->alpha_threshold = alpha_threshold; + This->palette = palette; + This->source = source; } else { @@ -1512,6 +1640,7 @@ HRESULT FormatConverter_CreateInstance(REFIID iid, void** ppv) This->IWICFormatConverter_iface.lpVtbl = &FormatConverter_Vtbl; This->ref = 1; This->source = NULL; + This->palette = NULL; InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": FormatConverter.lock"); -- 2.20.1

2 1

[PATCH v9] mscoree: Allow loading of registration free .NET COM objects
by Fabian Maurer 01 Feb '19

01 Feb '19

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/mscoree/corruntimehost.c | 237 +++++++++++++++++++++++++--------- dlls/mscoree/tests/comtest.c | 4 +- 2 files changed, 178 insertions(+), 63 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 5c4e7f1d6e..f6c77be4aa 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -29,6 +29,7 @@ #include "winreg.h" #include "ole2.h" #include "shellapi.h" +#include "shlwapi.h" #include "cor.h" #include "mscoree.h" @@ -40,6 +41,7 @@ #include "wine/debug.h" #include "wine/unicode.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); @@ -68,6 +70,43 @@ struct dll_fixup void *tokens; /* pointer into process heap */ }; +struct comclassredirect_data +{ + ULONG size; + BYTE res; + BYTE miscmask; + BYTE res1[2]; + DWORD model; + GUID clsid; + GUID alias; + GUID clsid2; + GUID tlbid; + ULONG name_len; + ULONG name_offset; + ULONG progid_len; + ULONG progid_offset; + ULONG clrdata_len; + ULONG clrdata_offset; + DWORD miscstatus; + DWORD miscstatuscontent; + DWORD miscstatusthumbnail; + DWORD miscstatusicon; + DWORD miscstatusdocprint; +}; + +struct clrclass_data +{ + ULONG size; + DWORD res[2]; + ULONG module_len; + ULONG module_offset; + ULONG name_len; + ULONG name_offset; + ULONG version_len; + ULONG version_offset; + DWORD res2[2]; +}; + static MonoDomain* domain_attach(MonoDomain *domain) { MonoDomain *prev_domain = mono_domain_get(); @@ -1606,6 +1645,75 @@ HRESULT RuntimeHost_GetInterface(RuntimeHost *This, REFCLSID clsid, REFIID riid, return CLASS_E_CLASSNOTAVAILABLE; } +static BOOL try_create_registration_free_com(REFIID clsid, WCHAR *classname, UINT classname_size, WCHAR *filename, UINT filename_size) +{ + ACTCTX_SECTION_KEYED_DATA guid_info = { sizeof(ACTCTX_SECTION_KEYED_DATA) }; + ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION *assembly_info = NULL; + SIZE_T bytes_assembly_info; + struct comclassredirect_data *redirect_data; + struct clrclass_data *class_data; + void *ptr_name; + const WCHAR *ptr_path_start, *ptr_path_end; + WCHAR path[MAX_PATH] = {0}; + WCHAR str_dll[] = {'.','d','l','l',0}; + BOOL ret = FALSE; + + if (!FindActCtxSectionGuid(FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, 0, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, clsid, &guid_info)) + { + DWORD error = GetLastError(); + if (error != ERROR_SXS_KEY_NOT_FOUND) + ERR("Failed to find guid: %d\n", error); + goto end; + } + + QueryActCtxW(0, guid_info.hActCtx, &guid_info.ulAssemblyRosterIndex, AssemblyDetailedInformationInActivationContext, NULL, 0, &bytes_assembly_info); + assembly_info = heap_alloc(bytes_assembly_info); + if (!QueryActCtxW(0, guid_info.hActCtx, &guid_info.ulAssemblyRosterIndex, + AssemblyDetailedInformationInActivationContext, assembly_info, bytes_assembly_info, &bytes_assembly_info)) + { + ERR("QueryActCtxW failed: %d!\n", GetLastError()); + goto end; + } + + redirect_data = guid_info.lpData; + class_data = (void *)((char *)redirect_data + redirect_data->clrdata_offset); + + ptr_name = (char *)class_data + class_data->name_offset; + if (lstrlenW(ptr_name) + 1 > classname_size) /* Include null-terminator */ + { + ERR("Buffer is too small\n"); + goto end; + } + strcpyW(classname, ptr_name); + + ptr_path_start = assembly_info->lpAssemblyEncodedAssemblyIdentity; + ptr_path_end = strchrW(ptr_path_start, ','); + memcpy(path, ptr_path_start, (char*)ptr_path_end - (char*)ptr_path_start); + + GetModuleFileNameW(NULL, filename, filename_size); + PathRemoveFileSpecW(filename); + + if (lstrlenW(filename) + lstrlenW(path) + ARRAY_SIZE(str_dll) + 1 > filename_size) /* Include blackslash */ + { + ERR("Buffer is too small\n"); + goto end; + } + + PathAppendW(filename, path); + strcatW(filename, str_dll); + + ret = TRUE; + +end: + if (assembly_info) + heap_free(assembly_info); + + if (guid_info.hActCtx) + ReleaseActCtx(guid_info.hActCtx); + + return ret; +} + #define CHARS_IN_GUID 39 HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) @@ -1640,75 +1748,82 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) TRACE("Registry key: %s\n", debugstr_w(path)); res = RegOpenKeyExW(HKEY_CLASSES_ROOT, path, 0, KEY_READ, &key); - if (res == ERROR_FILE_NOT_FOUND) - return CLASS_E_CLASSNOTAVAILABLE; - - res = RegGetValueW( key, NULL, wszClass, RRF_RT_REG_SZ, NULL, classname, &dwBufLen); - if(res != ERROR_SUCCESS) + if (res != ERROR_FILE_NOT_FOUND) { - WARN("Class value cannot be found.\n"); - hr = CLASS_E_CLASSNOTAVAILABLE; - goto cleanup; - } + res = RegGetValueW( key, NULL, wszClass, RRF_RT_REG_SZ, NULL, classname, &dwBufLen); + if(res != ERROR_SUCCESS) + { + WARN("Class value cannot be found.\n"); + hr = CLASS_E_CLASSNOTAVAILABLE; + goto cleanup; + } - TRACE("classname (%s)\n", debugstr_w(classname)); + TRACE("classname (%s)\n", debugstr_w(classname)); - dwBufLen = MAX_PATH + 8; - res = RegGetValueW( key, NULL, wszCodebase, RRF_RT_REG_SZ, NULL, codebase, &dwBufLen); - if(res == ERROR_SUCCESS) - { - /* Strip file:/// */ - if(strncmpW(codebase, wszFileSlash, strlenW(wszFileSlash)) == 0) - offset = strlenW(wszFileSlash); + dwBufLen = MAX_PATH + 8; + res = RegGetValueW( key, NULL, wszCodebase, RRF_RT_REG_SZ, NULL, codebase, &dwBufLen); + if(res == ERROR_SUCCESS) + { + /* Strip file:/// */ + if(strncmpW(codebase, wszFileSlash, strlenW(wszFileSlash)) == 0) + offset = strlenW(wszFileSlash); - strcpyW(filename, codebase + offset); + strcpyW(filename, codebase + offset); + } + else + { + WCHAR assemblyname[MAX_PATH + 8]; + + hr = CLASS_E_CLASSNOTAVAILABLE; + WARN("CodeBase value cannot be found, trying Assembly.\n"); + /* get the last subkey of InprocServer32 */ + res = RegQueryInfoKeyW(key, 0, 0, 0, &numKeys, 0, 0, 0, 0, 0, 0, 0); + if (res != ERROR_SUCCESS || numKeys == 0) + goto cleanup; + numKeys--; + keyLength = ARRAY_SIZE(subkeyName); + res = RegEnumKeyExW(key, numKeys, subkeyName, &keyLength, 0, 0, 0, 0); + if (res != ERROR_SUCCESS) + goto cleanup; + res = RegOpenKeyExW(key, subkeyName, 0, KEY_READ, &subkey); + if (res != ERROR_SUCCESS) + goto cleanup; + dwBufLen = MAX_PATH + 8; + res = RegGetValueW(subkey, NULL, wszAssembly, RRF_RT_REG_SZ, NULL, assemblyname, &dwBufLen); + RegCloseKey(subkey); + if (res != ERROR_SUCCESS) + goto cleanup; + + hr = get_file_from_strongname(assemblyname, filename, MAX_PATH); + if (FAILED(hr)) + { + /* + * The registry doesn't have a CodeBase entry and it's not in the GAC. + * + * Use the Assembly Key to retrieve the filename. + * Assembly : REG_SZ : AssemblyName, Version=X.X.X.X, Culture=neutral, PublicKeyToken=null + */ + WCHAR *ns; + + WARN("Attempt to load from the application directory.\n"); + GetModuleFileNameW(NULL, filename, MAX_PATH); + ns = strrchrW(filename, '\\'); + *(ns+1) = '\0'; + + ns = strchrW(assemblyname, ','); + *(ns) = '\0'; + strcatW(filename, assemblyname); + *(ns) = '.'; + strcatW(filename, wszDLL); + } + } } else { - WCHAR assemblyname[MAX_PATH + 8]; - - hr = CLASS_E_CLASSNOTAVAILABLE; - WARN("CodeBase value cannot be found, trying Assembly.\n"); - /* get the last subkey of InprocServer32 */ - res = RegQueryInfoKeyW(key, 0, 0, 0, &numKeys, 0, 0, 0, 0, 0, 0, 0); - if (res != ERROR_SUCCESS || numKeys == 0) - goto cleanup; - numKeys--; - keyLength = ARRAY_SIZE(subkeyName); - res = RegEnumKeyExW(key, numKeys, subkeyName, &keyLength, 0, 0, 0, 0); - if (res != ERROR_SUCCESS) - goto cleanup; - res = RegOpenKeyExW(key, subkeyName, 0, KEY_READ, &subkey); - if (res != ERROR_SUCCESS) - goto cleanup; - dwBufLen = MAX_PATH + 8; - res = RegGetValueW(subkey, NULL, wszAssembly, RRF_RT_REG_SZ, NULL, assemblyname, &dwBufLen); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) - goto cleanup; + if (!try_create_registration_free_com(riid, classname, ARRAY_SIZE(classname), filename, ARRAY_SIZE(filename))) + return CLASS_E_CLASSNOTAVAILABLE; - hr = get_file_from_strongname(assemblyname, filename, MAX_PATH); - if (FAILED(hr)) - { - /* - * The registry doesn't have a CodeBase entry and it's not in the GAC. - * - * Use the Assembly Key to retrieve the filename. - * Assembly : REG_SZ : AssemblyName, Version=X.X.X.X, Culture=neutral, PublicKeyToken=null - */ - WCHAR *ns; - - WARN("Attempt to load from the application directory.\n"); - GetModuleFileNameW(NULL, filename, MAX_PATH); - ns = strrchrW(filename, '\\'); - *(ns+1) = '\0'; - - ns = strchrW(assemblyname, ','); - *(ns) = '\0'; - strcatW(filename, assemblyname); - *(ns) = '.'; - strcatW(filename, wszDLL); - } + TRACE("classname (%s)\n", debugstr_w(classname)); } TRACE("filename (%s)\n", debugstr_w(filename)); diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c index eec5d9a857..4879e3b762 100644 --- a/dlls/mscoree/tests/comtest.c +++ b/dlls/mscoree/tests/comtest.c @@ -114,7 +114,7 @@ static void run_test(BOOL expect_success) HRESULT result_expected = expect_success ? S_OK : HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); hr = CoCreateInstance(&CLSID_Test, NULL, CLSCTX_INPROC_SERVER, &IID_ITest, (void**)&test); - todo_wine + todo_wine_if(!expect_success) ok(hr == result_expected, "Expected %x, got %x\n", result_expected, hr); if (hr == S_OK) @@ -135,7 +135,7 @@ static void run_test(BOOL expect_success) { ITest *test2 = NULL; hr = IClassFactory_CreateInstance(classFactory, NULL, &IID_ITest, (void **)&test2); - todo_wine + todo_wine_if(!expect_success) ok(hr == S_OK, "Got %x\n", hr); if (hr == S_OK) -- 2.20.1

3 2

[PATCH] crypt32: Add support for PFX objects in CryptQueryObject.
by Hans Leidekker 01 Feb '19

01 Feb '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/crypt32/object.c | 53 ++++++++++++++++++++++++++++++++++++-- dlls/crypt32/tests/store.c | 34 ++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index 3dc28af0e9..1993a0a879 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -696,6 +696,48 @@ static BOOL CRYPT_QueryEmbeddedMessageObject(DWORD dwObjectType, return ret; } +static BOOL CRYPT_QueryPFXObject(DWORD dwObjectType, const void *pvObject, + DWORD dwExpectedContentTypeFlags, DWORD dwExpectedFormatTypeFlags, + DWORD *pdwMsgAndCertEncodingType, DWORD *pdwContentType, DWORD *pdwFormatType, + HCERTSTORE *phCertStore, HCRYPTMSG *phMsg) +{ + CRYPT_DATA_BLOB blob = {0}, *ptr; + BOOL ret; + + TRACE("(%d, %p, %08x, %08x, %p, %p, %p, %p, %p)\n", dwObjectType, pvObject, + dwExpectedContentTypeFlags, dwExpectedFormatTypeFlags, + pdwMsgAndCertEncodingType, pdwContentType, pdwFormatType, phCertStore, + phMsg); + + switch (dwObjectType) + { + case CERT_QUERY_OBJECT_FILE: + if (!CRYPT_ReadBlobFromFile(pvObject, &blob)) return FALSE; + ptr = &blob; + break; + + case CERT_QUERY_OBJECT_BLOB: + ptr = (CRYPT_DATA_BLOB *)pvObject; + break; + + default: + return FALSE; + } + + ret = PFXIsPFXBlob(ptr); + if (ret) + { + if (pdwMsgAndCertEncodingType) *pdwMsgAndCertEncodingType = X509_ASN_ENCODING; + if (pdwContentType) *pdwContentType = CERT_QUERY_CONTENT_PFX; + if (pdwFormatType) *pdwFormatType = CERT_QUERY_FORMAT_BINARY; + if (phCertStore) *phCertStore = NULL; + if (phMsg) *phMsg = NULL; + } + + CryptMemFree(blob.pbData); + return ret; +} + BOOL WINAPI CryptQueryObject(DWORD dwObjectType, const void *pvObject, DWORD dwExpectedContentTypeFlags, DWORD dwExpectedFormatTypeFlags, DWORD dwFlags, DWORD *pdwMsgAndCertEncodingType, DWORD *pdwContentType, @@ -703,8 +745,7 @@ BOOL WINAPI CryptQueryObject(DWORD dwObjectType, const void *pvObject, const void **ppvContext) { static const DWORD unimplementedTypes = - CERT_QUERY_CONTENT_FLAG_PKCS10 | CERT_QUERY_CONTENT_FLAG_PFX | - CERT_QUERY_CONTENT_FLAG_CERT_PAIR; + CERT_QUERY_CONTENT_FLAG_PKCS10 | CERT_QUERY_CONTENT_FLAG_CERT_PAIR; BOOL ret = TRUE; TRACE("(%08x, %p, %08x, %08x, %08x, %p, %p, %p, %p, %p, %p)\n", @@ -779,6 +820,14 @@ BOOL WINAPI CryptQueryObject(DWORD dwObjectType, const void *pvObject, dwExpectedContentTypeFlags, pdwMsgAndCertEncodingType, pdwContentType, phCertStore, phMsg); } + if (!ret && + (dwExpectedContentTypeFlags & CERT_QUERY_CONTENT_FLAG_PFX)) + { + ret = CRYPT_QueryPFXObject(dwObjectType, pvObject, + dwExpectedContentTypeFlags, dwExpectedFormatTypeFlags, + pdwMsgAndCertEncodingType, pdwContentType, pdwFormatType, + phCertStore, phMsg); + } if (!ret) SetLastError(CRYPT_E_NO_MATCH); TRACE("returning %d\n", ret); diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index b13fee6cd1..f3fb420140 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -3326,6 +3326,39 @@ static void test_PFXImportCertStore(void) CertCloseStore( store, 0 ); } +static void test_CryptQueryObject(void) +{ + CRYPT_DATA_BLOB pfx; + DWORD encoding_type, content_type, format_type; + HCERTSTORE store; + HCRYPTMSG msg; + const void *ctx; + BOOL ret; + + SetLastError( 0xdeadbeef ); + ret = CryptQueryObject( CERT_QUERY_OBJECT_BLOB, NULL, CERT_QUERY_CONTENT_FLAG_ALL, + CERT_QUERY_FORMAT_FLAG_BINARY, 0, NULL, NULL, NULL, NULL, NULL, NULL ); + ok( !ret, "success\n" ); + ok( GetLastError() == E_INVALIDARG, "got %u\n", GetLastError() ); + + pfx.pbData = (BYTE *)pfxdata; + pfx.cbData = sizeof(pfxdata); + encoding_type = content_type = format_type = 0xdeadbeef; + store = (HCERTSTORE *)0xdeadbeef; + msg = (HCRYPTMSG *)0xdeadbeef; + ctx = (void *)0xdeadbeef; + ret = CryptQueryObject( CERT_QUERY_OBJECT_BLOB, &pfx, CERT_QUERY_CONTENT_FLAG_ALL, + CERT_QUERY_FORMAT_FLAG_BINARY, 0, &encoding_type, &content_type, &format_type, + &store, &msg, &ctx ); + ok( ret, "got %u\n", GetLastError() ); + ok( encoding_type == X509_ASN_ENCODING, "got %08x\n", encoding_type ); + ok( content_type == CERT_QUERY_CONTENT_PFX, "got %08x\n", content_type ); + ok( format_type == CERT_QUERY_FORMAT_BINARY, "got %08x\n", format_type ); + ok( store == NULL, "got %p\n", store ); + ok( msg == NULL, "got %p\n", msg ); + ok( ctx == NULL, "got %p\n", ctx ); +} + START_TEST(store) { /* various combinations of CertOpenStore */ @@ -3357,4 +3390,5 @@ START_TEST(store) test_I_UpdateStore(); test_PFXImportCertStore(); + test_CryptQueryObject(); } -- 2.20.1

2 2

[PATCH] d3dx11: Downgrade ERR() to WARN() in D3DX11CreateAsyncResourceLoader*().
by Matteo Bruni 01 Feb '19

01 Feb '19

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx11_43/async.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx11_43/async.c b/dlls/d3dx11_43/async.c index ece13e99c2d..f640b6c5766 100644 --- a/dlls/d3dx11_43/async.c +++ b/dlls/d3dx11_43/async.c @@ -348,7 +348,7 @@ HRESULT WINAPI D3DX11CreateAsyncResourceLoaderA(HMODULE module, const char *reso if (!(rsrc = FindResourceA(module, resource, (const char *)RT_RCDATA))) { - ERR("Failed to find resource.\n"); + WARN("Failed to find resource.\n"); HeapFree(GetProcessHeap(), 0, object); return D3DX11_ERR_INVALID_DATA; } @@ -380,7 +380,7 @@ HRESULT WINAPI D3DX11CreateAsyncResourceLoaderW(HMODULE module, const WCHAR *res if (!(rsrc = FindResourceW(module, resource, (const WCHAR *)RT_RCDATA))) { - ERR("Failed to find resource.\n"); + WARN("Failed to find resource.\n"); HeapFree(GetProcessHeap(), 0, object); return D3DX11_ERR_INVALID_DATA; } -- 2.19.2

1 0

[PATCH] d3dx11_42: Share source with d3dx11_43.
by Andrey Gusev 01 Feb '19

01 Feb '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/d3dx11_42/Makefile.in | 3 +- dlls/d3dx11_42/d3dx11_42.c | 55 -------------------------- dlls/d3dx11_42/d3dx11_42.spec | 20 +++++----- dlls/d3dx11_43/Makefile.in | 3 +- dlls/d3dx11_43/{d3dx11_43.c => main.c} | 12 +----- tools/make_specfiles | 4 -- 6 files changed, 16 insertions(+), 81 deletions(-) delete mode 100644 dlls/d3dx11_42/d3dx11_42.c rename dlls/d3dx11_43/{d3dx11_43.c => main.c} (84%) diff --git a/dlls/d3dx11_42/Makefile.in b/dlls/d3dx11_42/Makefile.in index d20f6600ec..4a8fd0baba 100644 --- a/dlls/d3dx11_42/Makefile.in +++ b/dlls/d3dx11_42/Makefile.in @@ -1,10 +1,11 @@ +EXTRADEFS = -DD3DX11_SDK_VERSION=42 MODULE = d3dx11_42.dll IMPORTS = d3dcompiler PARENTSRC = ../d3dx11_43 C_SRCS = \ async.c \ - d3dx11_42.c \ + main.c \ texture.c RC_SRCS = version.rc diff --git a/dlls/d3dx11_42/d3dx11_42.c b/dlls/d3dx11_42/d3dx11_42.c deleted file mode 100644 index 823ebf4727..0000000000 --- a/dlls/d3dx11_42/d3dx11_42.c +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2013 Detlef Riekenberg - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include "config.h" -#include "wine/port.h" -#include <stdarg.h> - -#define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "objbase.h" -#include "d3dx11.h" - -BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hdll); - } - - return TRUE; -} - -/*********************************************************************** - * D3DX11CheckVersion - * - * Checks whether we are compiling against the correct d3d and d3dx library. - */ -BOOL WINAPI D3DX11CheckVersion(UINT d3dsdkversion, UINT d3dxsdkversion) -{ - if ((d3dsdkversion == D3D11_SDK_VERSION) && (d3dxsdkversion == 42)) - return TRUE; - - return FALSE; -} diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec index cb1f7805ff..dde8821a30 100644 --- a/dlls/d3dx11_42/d3dx11_42.spec +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -6,30 +6,30 @@ @ stub D3DX11CompileFromResourceW @ stub D3DX11ComputeNormalMap @ stub D3DX11CreateAsyncCompilerProcessor -@ stdcall D3DX11CreateAsyncFileLoaderA(str ptr) d3dx11_43.D3DX11CreateAsyncFileLoaderA -@ stdcall D3DX11CreateAsyncFileLoaderW(wstr ptr) d3dx11_43.D3DX11CreateAsyncFileLoaderW -@ stdcall D3DX11CreateAsyncMemoryLoader(ptr long ptr) d3dx11_43.D3DX11CreateAsyncMemoryLoader -@ stdcall D3DX11CreateAsyncResourceLoaderA(long str ptr) d3dx11_43.D3DX11CreateAsyncResourceLoaderA -@ stdcall D3DX11CreateAsyncResourceLoaderW(long wstr ptr) d3dx11_43.D3DX11CreateAsyncResourceLoaderW +@ stdcall D3DX11CreateAsyncFileLoaderA(str ptr) +@ stdcall D3DX11CreateAsyncFileLoaderW(wstr ptr) +@ stdcall D3DX11CreateAsyncMemoryLoader(ptr long ptr) +@ stdcall D3DX11CreateAsyncResourceLoaderA(long str ptr) +@ stdcall D3DX11CreateAsyncResourceLoaderW(long wstr ptr) @ stub D3DX11CreateAsyncShaderPreprocessProcessor @ stub D3DX11CreateAsyncShaderResourceViewProcessor @ stub D3DX11CreateAsyncTextureInfoProcessor @ stub D3DX11CreateAsyncTextureProcessor @ stub D3DX11CreateShaderResourceViewFromFileA @ stub D3DX11CreateShaderResourceViewFromFileW -@ stdcall D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) d3dx11_43.D3DX11CreateShaderResourceViewFromMemory +@ stdcall D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateShaderResourceViewFromResourceA @ stub D3DX11CreateShaderResourceViewFromResourceW -@ stdcall D3DX11CreateTextureFromFileA(ptr str ptr ptr ptr ptr) d3dx11_43.D3DX11CreateTextureFromFileA -@ stdcall D3DX11CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr) d3dx11_43.D3DX11CreateTextureFromFileW +@ stdcall D3DX11CreateTextureFromFileA(ptr str ptr ptr ptr ptr) +@ stdcall D3DX11CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr) @ stdcall D3DX11CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateTextureFromResourceA @ stub D3DX11CreateTextureFromResourceW @ stub D3DX11CreateThreadPump -@ stdcall D3DX11FilterTexture(ptr ptr long long) d3dx11_43.D3DX11FilterTexture +@ stdcall D3DX11FilterTexture(ptr ptr long long) @ stub D3DX11GetImageInfoFromFileA @ stub D3DX11GetImageInfoFromFileW -@ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr) d3dx11_43.D3DX11GetImageInfoFromMemory +@ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr) @ stub D3DX11GetImageInfoFromResourceA @ stub D3DX11GetImageInfoFromResourceW @ stub D3DX11LoadTextureFromTexture diff --git a/dlls/d3dx11_43/Makefile.in b/dlls/d3dx11_43/Makefile.in index d5c5b45548..c64d03750b 100644 --- a/dlls/d3dx11_43/Makefile.in +++ b/dlls/d3dx11_43/Makefile.in @@ -1,10 +1,11 @@ +EXTRADEFS = -DD3DX11_SDK_VERSION=43 MODULE = d3dx11_43.dll IMPORTLIB = d3dx11 IMPORTS = d3dcompiler C_SRCS = \ async.c \ - d3dx11_43.c \ + main.c \ texture.c RC_SRCS = version.rc diff --git a/dlls/d3dx11_43/d3dx11_43.c b/dlls/d3dx11_43/main.c similarity index 84% rename from dlls/d3dx11_43/d3dx11_43.c rename to dlls/d3dx11_43/main.c index 4bf49986f5..b1bf969f18 100644 --- a/dlls/d3dx11_43/d3dx11_43.c +++ b/dlls/d3dx11_43/main.c @@ -48,17 +48,9 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) return TRUE; } -/*********************************************************************** - * D3DX11CheckVersion - * - * Checks whether we are compiling against the correct d3d and d3dx library. - */ -BOOL WINAPI D3DX11CheckVersion(UINT d3dsdkversion, UINT d3dxsdkversion) +BOOL WINAPI D3DX11CheckVersion(UINT d3d_sdk_ver, UINT d3dx_sdk_ver) { - if ((d3dsdkversion == D3D11_SDK_VERSION) && (d3dxsdkversion == 43)) - return TRUE; - - return FALSE; + return d3d_sdk_ver == D3D11_SDK_VERSION && d3dx_sdk_ver == D3DX11_SDK_VERSION; } HRESULT WINAPI D3DX11FilterTexture(ID3D11DeviceContext *context, ID3D11Resource *texture, UINT src_level, UINT filter) diff --git a/tools/make_specfiles b/tools/make_specfiles index edc317d71c..7666c3ceeb 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -91,10 +91,6 @@ my @dll_groups = "d3dx10_34", "d3dx10_33", ], - [ - "d3dx11_43", - "d3dx11_42", - ], [ "xinput1_3", "xinput1_4", -- 2.20.1

2 1

[PATCH 1/4] dwrite: Implement single adjustment, GPOS lookup 1.
by Nikolay Sivov 01 Feb '19

01 Feb '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 4 + dlls/dwrite/dwrite_private.h | 2 + dlls/dwrite/opentype.c | 305 +++++++++++++++++++++++++++++++++++ 3 files changed, 311 insertions(+) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 7f15c91279..1fc8f98d16 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1316,7 +1316,9 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphPlacements(IDWriteTextAnalyzer2 context.u.pos.glyphs = glyphs; context.u.pos.glyph_props = glyph_props; context.glyph_count = glyph_count; + context.emsize = emSize; context.advances = advances; + context.offsets = offsets; context.language_tag = get_opentype_language(locale); hr = shape_get_positions(&context, scriptprops->scripttags, scriptprops->ops->gpos_features); @@ -1378,7 +1380,9 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite context.u.pos.glyphs = glyphs; context.u.pos.glyph_props = glyph_props; context.glyph_count = glyph_count; + context.emsize = emSize * ppdip; context.advances = advances; + context.offsets = offsets; context.language_tag = get_opentype_language(locale); hr = shape_get_positions(&context, scriptprops->scripttags, scriptprops->ops->gpos_features); diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 5a6cd4b16b..355a826563 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -393,7 +393,9 @@ struct scriptshaping_context } u; unsigned int glyph_count; + float emsize; float *advances; + DWRITE_GLYPH_OFFSET *offsets; }; struct shaping_font_ops diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 8cc74638b0..8cc45e4c10 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -489,6 +489,18 @@ enum gpos_lookup_type GPOS_LOOKUP_EXTENSION_POSITION = 9, }; +enum gpos_value_format +{ + GPOS_VALUE_X_PLACEMENT = 0x1, + GPOS_VALUE_Y_PLACEMENT = 0x2, + GPOS_VALUE_X_ADVANCE = 0x4, + GPOS_VALUE_Y_ADVANCE = 0x8, + GPOS_VALUE_X_PLACEMENT_DEVICE = 0x10, + GPOS_VALUE_Y_PLACEMENT_DEVICE = 0x20, + GPOS_VALUE_X_ADVANCE_DEVICE = 0x40, + GPOS_VALUE_Y_ADVANCE_DEVICE = 0x80, +}; + enum OPENTYPE_PLATFORM_ID { OPENTYPE_PLATFORM_UNICODE = 0, @@ -526,6 +538,54 @@ struct ot_lookup_table WORD subtable[1]; }; +#define GLYPH_NOT_COVERED ((unsigned int)~0u) + +struct ot_coverage_format1 +{ + WORD format; + WORD glyph_count; + WORD glyphs[1]; +}; + +struct ot_coverage_range +{ + WORD start_glyph; + WORD end_glyph; + WORD startcoverage_index; +}; + +struct ot_coverage_format2 +{ + WORD format; + WORD range_count; + struct ot_coverage_range ranges[1]; +}; + +struct ot_gpos_device_table +{ + WORD start_size; + WORD end_size; + WORD format; + WORD values[1]; +}; + +struct ot_gpos_singlepos_format1 +{ + WORD format; + WORD coverage; + WORD value_format; + WORD value[1]; +}; + +struct ot_gpos_singlepos_format2 +{ + WORD format; + WORD coverage; + WORD value_format; + WORD value_count; + WORD values[1]; +}; + typedef struct { WORD SubstFormat; WORD Coverage; @@ -2635,6 +2695,201 @@ static unsigned int opentype_layout_get_glyph_class(const struct dwrite_fonttabl return glyph_class; } +struct coverage_compare_format1_context +{ + UINT16 glyph; + const UINT16 *table_base; + unsigned int *coverage_index; +}; + +static int coverage_compare_format1(const void *left, const void *right) +{ + const struct coverage_compare_format1_context *context = left; + UINT16 glyph = GET_BE_WORD(*(UINT16 *)right); + int ret; + + ret = context->glyph - glyph; + if (!ret) + *context->coverage_index = (UINT16 *)right - context->table_base; + + return ret; +} + +static int coverage_compare_format2(const void *g, const void *r) +{ + const struct ot_coverage_range *range = r; + UINT16 glyph = *(UINT16 *)g; + + if (glyph < GET_BE_WORD(range->start_glyph)) + return -1; + else if (glyph > GET_BE_WORD(range->end_glyph)) + return 1; + else + return 0; +} + +static unsigned int opentype_layout_is_glyph_covered(const struct dwrite_fonttable *table, DWORD coverage, + UINT16 glyph) +{ + WORD format = table_read_be_word(table, coverage), count; + + count = table_read_be_word(table, coverage + 2); + + if (format == 1) + { + const struct ot_coverage_format1 *format1 = table_read_ensure(table, coverage, + FIELD_OFFSET(struct ot_coverage_format1, glyphs[count])); + struct coverage_compare_format1_context context; + unsigned int coverage_index = GLYPH_NOT_COVERED; + + if (format1) + { + context.glyph = glyph; + context.table_base = format1->glyphs; + context.coverage_index = &coverage_index; + + bsearch(&context, format1->glyphs, count, sizeof(glyph), coverage_compare_format1); + } + + return coverage_index; + } + else if (format == 2) + { + const struct ot_coverage_format2 *format2 = table_read_ensure(table, coverage, + FIELD_OFFSET(struct ot_coverage_format2, ranges[count])); + if (format2) + { + const struct ot_coverage_range *range = bsearch(&glyph, format2->ranges, count, + sizeof(struct ot_coverage_range), coverage_compare_format2); + return range && glyph <= GET_BE_WORD(range->end_glyph) ? + GET_BE_WORD(range->startcoverage_index) + glyph - GET_BE_WORD(range->start_glyph) : + GLYPH_NOT_COVERED; + } + } + else + WARN("Unknown coverage format %u.\n", format); + + return -1; +} + +static inline unsigned int dwrite_popcount(unsigned int x) +{ +#ifdef HAVE___BUILTIN_POPCOUNT + return __builtin_popcount(x); +#else + x -= x >> 1 & 0x55555555; + x = (x & 0x33333333) + (x >> 2 & 0x33333333); + return ((x + (x >> 4)) & 0x0f0f0f0f) * 0x01010101 >> 24; +#endif +} + +static float opentype_scale_gpos_be_value(WORD value, float emsize, UINT16 upem) +{ + return (short)GET_BE_WORD(value) * emsize / upem; +} + +static int opentype_layout_gpos_get_dev_value(const struct scriptshaping_context *context, unsigned int offset) +{ + const struct scriptshaping_cache *cache = context->cache; + unsigned int start_size, end_size, format, value_word; + unsigned int index, ppem, mask; + int value; + + if (!offset) + return 0; + + start_size = table_read_be_word(&cache->gpos.table, offset); + end_size = table_read_be_word(&cache->gpos.table, offset + FIELD_OFFSET(struct ot_gpos_device_table, end_size)); + + ppem = context->emsize; + if (ppem < start_size || ppem > end_size) + return 0; + + format = table_read_be_word(&cache->gpos.table, offset + FIELD_OFFSET(struct ot_gpos_device_table, format)); + + if (format < 1 || format > 3) + return 0; + + index = ppem - start_size; + + value_word = table_read_be_word(&cache->gpos.table, offset + + FIELD_OFFSET(struct ot_gpos_device_table, values[index >> (4 - format)])); + mask = 0xffff >> (16 - (1 << format)); + + value = (value_word >> ((index % (4 - format)) * (1 << format))) & mask; + + if ((unsigned int)value >= ((mask + 1) >> 1)) + value -= mask + 1; + + return value; +} + +static void opentype_layout_apply_gpos_value(struct scriptshaping_context *context, unsigned int table_offset, + WORD value_format, const WORD *values, unsigned int glyph) +{ + const struct scriptshaping_cache *cache = context->cache; + DWRITE_GLYPH_OFFSET *offset = &context->offsets[glyph]; + float *advance = &context->advances[glyph]; + + if (!value_format) + return; + + if (value_format & GPOS_VALUE_X_PLACEMENT) + { + offset->advanceOffset += opentype_scale_gpos_be_value(*values, context->emsize, cache->upem); + values++; + } + if (value_format & GPOS_VALUE_Y_PLACEMENT) + { + offset->ascenderOffset += opentype_scale_gpos_be_value(*values, context->emsize, cache->upem); + values++; + } + if (value_format & GPOS_VALUE_X_ADVANCE) + { + *advance += opentype_scale_gpos_be_value(*values, context->emsize, cache->upem); + values++; + } + if (value_format & GPOS_VALUE_Y_ADVANCE) + { + values++; + } + if (value_format & GPOS_VALUE_X_PLACEMENT_DEVICE) + { + offset->advanceOffset += opentype_layout_gpos_get_dev_value(context, table_offset + GET_BE_WORD(*values)); + values++; + } + if (value_format & GPOS_VALUE_Y_PLACEMENT_DEVICE) + { + offset->ascenderOffset += opentype_layout_gpos_get_dev_value(context, table_offset + GET_BE_WORD(*values)); + values++; + } + if (value_format & GPOS_VALUE_X_ADVANCE_DEVICE) + { + *advance += opentype_layout_gpos_get_dev_value(context, table_offset + GET_BE_WORD(*values)); + values++; + } + if (value_format & GPOS_VALUE_Y_ADVANCE_DEVICE) + { + values++; + } +} + +static unsigned int opentype_layout_get_gpos_subtable(const struct scriptshaping_cache *cache, + unsigned int lookup_offset, unsigned int subtable) +{ + WORD lookup_type = table_read_be_word(&cache->gpos.table, lookup_offset); + unsigned int subtable_offset = table_read_be_word(&cache->gpos.table, lookup_offset + + FIELD_OFFSET(struct ot_lookup_table, subtable[subtable])); + if (lookup_type == GPOS_LOOKUP_EXTENSION_POSITION) + { + const struct ot_gpos_extensionpos_format1 *format1 = table_read_ensure(&cache->gpos.table, + lookup_offset + subtable_offset, sizeof(*format1)); + subtable_offset += GET_BE_DWORD(format1->extension_offset); + } + + return lookup_offset + subtable_offset; +} + struct lookup { unsigned int offset; @@ -2677,6 +2932,56 @@ static BOOL glyph_iterator_match(const struct glyph_iterator *iter) static BOOL opentype_layout_apply_gpos_single_adjustment(struct scriptshaping_context *context, struct glyph_iterator *iter, const struct lookup *lookup) { + struct scriptshaping_cache *cache = context->cache; + WORD format, value_format, value_len, coverage; + unsigned int i; + + for (i = 0; i < lookup->subtable_count; ++i) + { + unsigned int subtable_offset = opentype_layout_get_gpos_subtable(cache, lookup->offset, i); + unsigned int coverage_index; + + format = table_read_be_word(&cache->gpos.table, subtable_offset); + + coverage = table_read_be_word(&cache->gpos.table, subtable_offset + + FIELD_OFFSET(struct ot_gpos_singlepos_format1, coverage)); + value_format = table_read_be_word(&cache->gpos.table, subtable_offset + + FIELD_OFFSET(struct ot_gpos_singlepos_format1, value_format)); + value_len = dwrite_popcount(value_format); + + if (format == 1) + { + const struct ot_gpos_singlepos_format1 *format1 = table_read_ensure(&cache->gpos.table, subtable_offset, + FIELD_OFFSET(struct ot_gpos_singlepos_format1, value[value_len])); + + coverage_index = opentype_layout_is_glyph_covered(&cache->gpos.table, subtable_offset + coverage, + context->u.pos.glyphs[iter->pos]); + if (coverage_index == GLYPH_NOT_COVERED) + continue; + + opentype_layout_apply_gpos_value(context, subtable_offset, value_format, format1->value, iter->pos); + break; + } + else if (format == 2) + { + WORD value_count = table_read_be_word(&cache->gpos.table, subtable_offset + + FIELD_OFFSET(struct ot_gpos_singlepos_format2, value_count)); + const struct ot_gpos_singlepos_format2 *format2 = table_read_ensure(&cache->gpos.table, subtable_offset, + FIELD_OFFSET(struct ot_gpos_singlepos_format2, values) + value_count * value_len * sizeof(WORD)); + + coverage_index = opentype_layout_is_glyph_covered(&cache->gpos.table, subtable_offset + coverage, + context->u.pos.glyphs[iter->pos]); + if (coverage_index == GLYPH_NOT_COVERED || coverage_index >= value_count) + continue; + + opentype_layout_apply_gpos_value(context, subtable_offset, value_format, + &format2->values[coverage_index * value_len], iter->pos); + break; + } + else + WARN("Unknown single adjustment format %u.\n", format); + } + return FALSE; } -- 2.20.1

1 3

[PATCH] secur32: Ignore spurious callbacks on macOS.
by Hans Leidekker 01 Feb '19

01 Feb '19

For unknown reasons Mojave will sometimes call the schan_push_adapter callback during an SSLRead call. This confuses our code which is only prepared to handle schan_pull_adapter callbacks in this context. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/schannel_macosx.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index bd080dcb41..29d2f65172 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -181,10 +181,17 @@ enum { }; #endif +enum schan_mode { + schan_mode_NONE, + schan_mode_READ, + schan_mode_WRITE, + schan_mode_HANDSHAKE, +}; struct mac_session { SSLContextRef context; struct schan_transport *transport; + enum schan_mode mode; CRITICAL_SECTION cs; }; @@ -634,6 +641,12 @@ static OSStatus schan_pull_adapter(SSLConnectionRef transport, void *buff, TRACE("(%p/%p, %p, %p/%lu)\n", s, s->transport, buff, buff_len, *buff_len); + if (s->mode != schan_mode_READ && s->mode != schan_mode_HANDSHAKE) + { + WARN("called in mode %u\n", s->mode); + return noErr; + } + status = schan_pull(s->transport, buff, buff_len); if (status == 0) { @@ -693,6 +706,12 @@ static OSStatus schan_push_adapter(SSLConnectionRef transport, const void *buff, TRACE("(%p/%p, %p, %p/%lu)\n", s, s->transport, buff, buff_len, *buff_len); + if (s->mode != schan_mode_WRITE && s->mode != schan_mode_HANDSHAKE) + { + WARN("called in mode %u\n", s->mode); + return noErr; + } + status = schan_push(s->transport, buff, buff_len); if (status == 0) { @@ -787,6 +806,8 @@ BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cre goto fail; } + s->mode = schan_mode_NONE; + TRACE(" -> %p/%p\n", s, s->context); *session = (schan_imp_session)s; @@ -837,7 +858,10 @@ SECURITY_STATUS schan_imp_handshake(schan_imp_session session) TRACE("(%p/%p)\n", s, s->context); + s->mode = schan_mode_HANDSHAKE; status = SSLHandshake(s->context); + s->mode = schan_mode_NONE; + if (status == noErr) { TRACE("Handshake completed\n"); @@ -1096,8 +1120,13 @@ SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buffer, TRACE("(%p/%p, %p, %p/%lu)\n", s, s->context, buffer, length, *length); EnterCriticalSection(&s->cs); + s->mode = schan_mode_WRITE; + status = SSLWrite(s->context, buffer, *length, length); + + s->mode = schan_mode_NONE; LeaveCriticalSection(&s->cs); + if (status == noErr) TRACE("Wrote %lu bytes\n", *length); else if (status == errSSLWouldBlock) @@ -1128,8 +1157,13 @@ SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer, TRACE("(%p/%p, %p, %p/%lu)\n", s, s->context, buffer, length, *length); EnterCriticalSection(&s->cs); + s->mode = schan_mode_READ; + status = SSLRead(s->context, buffer, *length, length); + + s->mode = schan_mode_NONE; LeaveCriticalSection(&s->cs); + if (status == noErr || status == errSSLClosedGraceful) TRACE("Read %lu bytes\n", *length); else if (status == errSSLWouldBlock) -- 2.11.0

1 0

[PATCH] winhttp/tests: Add a couple of return value tests (Coverity).
by Nikolay Sivov 01 Feb '19

01 Feb '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/winhttp/tests/winhttp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 91a9d539aa..3a28acf913 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3206,6 +3206,7 @@ static void test_multiple_reads(int port) char *buf = HeapAlloc( GetProcessHeap(), 0, len + 1 ); ret = WinHttpReadData( req, buf, len, &bytes_read ); + ok(ret, "WinHttpReadData failed: %u.\n", GetLastError()); ok( len == bytes_read, "only got %u of %u available\n", bytes_read, len ); HeapFree( GetProcessHeap(), 0, buf ); @@ -4699,6 +4700,7 @@ static void test_chunked_read(void) char *buf = HeapAlloc( GetProcessHeap(), 0, len + 1 ); ret = WinHttpReadData( req, buf, len, &bytes_read ); + ok(ret, "WinHttpReadData failed: %u.\n", GetLastError()); buf[bytes_read] = 0; trace( "WinHttpReadData -> %d %u\n", ret, bytes_read ); -- 2.20.1

2 1

[PATCH v3] winetest: Add GUI to display results of individual tests.
by Isira Seneviratne 01 Feb '19

01 Feb '19

1 0

[PATCH vkd3d v2 5/5] tests: Add SetName() tests.
by Zhiyi Zhang 01 Feb '19

01 Feb '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- tests/d3d12.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 1b6b917..6afce71 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2740,7 +2740,7 @@ static void test_create_fence(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } -static void test_private_data(void) +static void test_ID3D12Object(void) { D3D12_DESCRIPTOR_HEAP_DESC descriptor_heap_desc; D3D12_QUERY_HEAP_DESC query_heap_desc; @@ -2763,6 +2763,8 @@ static void test_private_data(void) static const GUID test_guid2 = {0x2e5afac2, 0x87b5, 0x4c10, {0x9b, 0x4b, 0x89, 0xd7, 0xd1, 0x12, 0xe7, 0x2b}}; static const DWORD data[] = {1, 2, 3, 4}; + static const WCHAR deadbeefW[] = {'d', 'e', 'a', 'd', 'b', 'e', 'e', 'f', 0}; + static const WCHAR emptyW[] = {0}; static const GUID *tests[] = { &IID_ID3D12CommandAllocator, @@ -2994,6 +2996,15 @@ static void test_private_data(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); } + hr = ID3D12Object_SetName(object, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = ID3D12Object_SetName(object, emptyW); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID3D12Object_SetName(object, deadbeefW); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID3D12Object_Release(object); refcount = IUnknown_Release(test_object); @@ -24042,7 +24053,7 @@ START_TEST(d3d12) run_test(test_create_compute_pipeline_state); run_test(test_create_graphics_pipeline_state); run_test(test_create_fence); - run_test(test_private_data); + run_test(test_ID3D12Object); run_test(test_multithread_private_data); run_test(test_reset_command_allocator); run_test(test_cpu_signal_fence); -- 2.15.2 (Apple Git-101.1)

1 0

[PATCH v2] winetest: Add GUI to display results of individual tests.
by Isira Seneviratne 01 Feb '19

01 Feb '19

2 1

[PATCH v2 1/6] d3d9: Take usage flags into account when assigning map flags.
by Matteo Bruni 31 Jan '19

31 Jan '19

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Simplify, consider usage rather than access flags. dlls/d3d9/buffer.c | 18 ++++++++++++------ dlls/d3d9/d3d9_private.h | 5 +++-- dlls/d3d9/device.c | 6 +++--- dlls/d3d9/surface.c | 2 +- dlls/d3d9/volume.c | 2 +- 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index b6cd646dee2..83cf4010450 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -189,6 +189,7 @@ static HRESULT WINAPI d3d9_vertexbuffer_Lock(IDirect3DVertexBuffer9 *iface, UINT void **data, DWORD flags) { struct d3d9_vertexbuffer *buffer = impl_from_IDirect3DVertexBuffer9(iface); + struct wined3d_resource *wined3d_resource; struct wined3d_map_desc wined3d_map_desc; struct wined3d_box wined3d_box = {0}; HRESULT hr; @@ -199,8 +200,9 @@ static HRESULT WINAPI d3d9_vertexbuffer_Lock(IDirect3DVertexBuffer9 *iface, UINT wined3d_box.left = offset; wined3d_box.right = offset + size; wined3d_mutex_lock(); - hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), - 0, &wined3d_map_desc, &wined3d_box, wined3dmapflags_from_d3dmapflags(flags)); + wined3d_resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); + hr = wined3d_resource_map(wined3d_resource, 0, &wined3d_map_desc, &wined3d_box, + wined3dmapflags_from_d3dmapflags(flags, buffer->usage)); wined3d_mutex_unlock(); *data = wined3d_map_desc.data; @@ -236,7 +238,7 @@ static HRESULT WINAPI d3d9_vertexbuffer_GetDesc(IDirect3DVertexBuffer9 *iface, desc->Format = D3DFMT_VERTEXDATA; desc->Type = D3DRTYPE_VERTEXBUFFER; - desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage, wined3d_desc.bind_flags); + desc->Usage = buffer->usage; desc->Pool = d3dpool_from_wined3daccess(wined3d_desc.access, wined3d_desc.usage); desc->Size = wined3d_desc.size; desc->FVF = buffer->fvf; @@ -302,6 +304,7 @@ HRESULT vertexbuffer_init(struct d3d9_vertexbuffer *buffer, struct d3d9_device * buffer->IDirect3DVertexBuffer9_iface.lpVtbl = &d3d9_vertexbuffer_vtbl; buffer->fvf = fvf; + buffer->usage = usage; d3d9_resource_init(&buffer->resource); desc.byte_width = size; @@ -515,6 +518,7 @@ static HRESULT WINAPI d3d9_indexbuffer_Lock(IDirect3DIndexBuffer9 *iface, UINT offset, UINT size, void **data, DWORD flags) { struct d3d9_indexbuffer *buffer = impl_from_IDirect3DIndexBuffer9(iface); + struct wined3d_resource *wined3d_resource; struct wined3d_map_desc wined3d_map_desc; struct wined3d_box wined3d_box = {0}; HRESULT hr; @@ -525,8 +529,9 @@ static HRESULT WINAPI d3d9_indexbuffer_Lock(IDirect3DIndexBuffer9 *iface, wined3d_box.left = offset; wined3d_box.right = offset + size; wined3d_mutex_lock(); - hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), - 0, &wined3d_map_desc, &wined3d_box, wined3dmapflags_from_d3dmapflags(flags)); + wined3d_resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); + hr = wined3d_resource_map(wined3d_resource, 0, &wined3d_map_desc, &wined3d_box, + wined3dmapflags_from_d3dmapflags(flags, buffer->usage)); wined3d_mutex_unlock(); *data = wined3d_map_desc.data; @@ -561,7 +566,7 @@ static HRESULT WINAPI d3d9_indexbuffer_GetDesc(IDirect3DIndexBuffer9 *iface, D3D desc->Format = d3dformat_from_wined3dformat(buffer->format); desc->Type = D3DRTYPE_INDEXBUFFER; - desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage, wined3d_desc.bind_flags); + desc->Usage = buffer->usage; desc->Pool = d3dpool_from_wined3daccess(wined3d_desc.access, wined3d_desc.usage); desc->Size = wined3d_desc.size; @@ -637,6 +642,7 @@ HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *de buffer->IDirect3DIndexBuffer9_iface.lpVtbl = &d3d9_indexbuffer_vtbl; buffer->format = wined3dformat_from_d3dformat(format); + buffer->usage = usage; d3d9_resource_init(&buffer->resource); wined3d_mutex_lock(); diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index a4dc3abb7a6..e520b604e9a 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -54,7 +54,7 @@ HRESULT vdecl_convert_fvf(DWORD FVF, D3DVERTEXELEMENT9 **ppVertexElements) DECLS D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; BOOL is_gdi_compat_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_HIDDEN; -unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags) DECLSPEC_HIDDEN; +unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags, unsigned int usage) DECLSPEC_HIDDEN; void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *present_parameters, const struct wined3d_swapchain_desc *swapchain_desc, DWORD presentation_interval) DECLSPEC_HIDDEN; void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const struct wined3d_caps *wined3d_caps) DECLSPEC_HIDDEN; @@ -187,7 +187,7 @@ struct d3d9_vertexbuffer struct wined3d_buffer *wined3d_buffer; IDirect3DDevice9Ex *parent_device; struct wined3d_buffer *draw_buffer; - DWORD fvf; + DWORD fvf, usage; }; HRESULT vertexbuffer_init(struct d3d9_vertexbuffer *buffer, struct d3d9_device *device, @@ -202,6 +202,7 @@ struct d3d9_indexbuffer IDirect3DDevice9Ex *parent_device; struct wined3d_buffer *draw_buffer; enum wined3d_format_id format; + DWORD usage; }; HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *device, diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 83db304d6a4..49a86c0159a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -169,7 +169,7 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) } } -unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags) +unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags, unsigned int usage) { static const unsigned int handled = D3DLOCK_NOSYSLOCK | D3DLOCK_NOOVERWRITE @@ -179,12 +179,12 @@ unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags) unsigned int wined3d_flags; wined3d_flags = flags & handled; - if (!(flags & (D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD))) + if (~usage & D3DUSAGE_WRITEONLY && !(flags & (D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD))) wined3d_flags |= WINED3D_MAP_READ; if (!(flags & D3DLOCK_READONLY)) wined3d_flags |= WINED3D_MAP_WRITE; if (!(wined3d_flags & (WINED3D_MAP_READ | WINED3D_MAP_WRITE))) - wined3d_flags |= WINED3D_MAP_READ | WINED3D_MAP_WRITE; + wined3d_flags |= WINED3D_MAP_WRITE; flags &= ~(handled | D3DLOCK_READONLY); if (flags) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index ded7dc4f490..9aa2154a9c3 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -250,7 +250,7 @@ static HRESULT WINAPI d3d9_surface_LockRect(IDirect3DSurface9 *iface, wined3d_mutex_lock(); hr = wined3d_resource_map(wined3d_texture_get_resource(surface->wined3d_texture), surface->sub_resource_idx, - &map_desc, rect ? &box : NULL, wined3dmapflags_from_d3dmapflags(flags)); + &map_desc, rect ? &box : NULL, wined3dmapflags_from_d3dmapflags(flags, 0)); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 7bf12570a89..cdc4761963f 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -149,7 +149,7 @@ static HRESULT WINAPI d3d9_volume_LockBox(IDirect3DVolume9 *iface, wined3d_mutex_lock(); if (FAILED(hr = wined3d_resource_map(wined3d_texture_get_resource(volume->wined3d_texture), volume->sub_resource_idx, &map_desc, (const struct wined3d_box *)box, - wined3dmapflags_from_d3dmapflags(flags)))) + wined3dmapflags_from_d3dmapflags(flags, 0)))) map_desc.data = NULL; wined3d_mutex_unlock(); -- 2.19.2

5 16

[PATCH] d3d8: Fix building on Mac.
by Zhiyi Zhang 31 Jan '19

31 Jan '19

bool is a reserved word in c99. After b51bc84338455dca41c6704e3fee4cbda6b440e7, bool will be expanded to _Bool with Xcode headers. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/d3d8_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index a6c67008ed..5fbd165285 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -61,16 +61,16 @@ IDirect3D8 * WINAPI DECLSPEC_HOTPATCH Direct3DCreate8(UINT sdk_version) * ValidateVertexShader (D3D8.@) * * I've seen reserved1 and reserved2 always passed as 0's - * bool seems always passed as 0 or 1, but other values work as well... + * boolean seems always passed as 0 or 1, but other values work as well... * toto result? */ -HRESULT WINAPI ValidateVertexShader(DWORD* vertexshader, DWORD* reserved1, DWORD* reserved2, BOOL bool, DWORD* toto) +HRESULT WINAPI ValidateVertexShader(DWORD* vertexshader, DWORD* reserved1, DWORD* reserved2, BOOL boolean, DWORD* toto) { HRESULT ret; static BOOL warned; if (TRACE_ON(d3d8) || !warned) { - FIXME("(%p %p %p %d %p): stub\n", vertexshader, reserved1, reserved2, bool, toto); + FIXME("(%p %p %p %d %p): stub\n", vertexshader, reserved1, reserved2, boolean, toto); warned = TRUE; } @@ -99,13 +99,13 @@ HRESULT WINAPI ValidateVertexShader(DWORD* vertexshader, DWORD* reserved1, DWORD * PARAMS * toto result? */ -HRESULT WINAPI ValidatePixelShader(DWORD* pixelshader, DWORD* reserved1, BOOL bool, DWORD* toto) +HRESULT WINAPI ValidatePixelShader(DWORD* pixelshader, DWORD* reserved1, BOOL boolean, DWORD* toto) { HRESULT ret; static BOOL warned; if (TRACE_ON(d3d8) || !warned) { - FIXME("(%p %p %d %p): stub\n", pixelshader, reserved1, bool, toto); + FIXME("(%p %p %d %p): stub\n", pixelshader, reserved1, boolean, toto); warned = TRUE; } -- 2.15.2 (Apple Git-101.1)

4 3

[PATCH] uiautomationcore: Update spec file
by Alistair Leslie-Hughes 31 Jan '19

31 Jan '19

File version: 7.2.16299.15 (windows 10). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/uiautomationcore/uiautomationcore.spec | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index 48a06b2..28eefc9 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -6,6 +6,7 @@ @ stub ExpandCollapsePattern_Collapse @ stub ExpandCollapsePattern_Expand @ stub GridPattern_GetItem +#@ stub IgnoreLeaksInCurrentlyTrackedMemory @ stub InvokePattern_Invoke @ stub ItemContainerPattern_FindItemByProperty @ stub LegacyIAccessiblePattern_DoDefaultAction @@ -14,6 +15,7 @@ @ stub LegacyIAccessiblePattern_SetValue @ stub MultipleViewPattern_GetViewName @ stub MultipleViewPattern_SetCurrentView +#@ stub PostTestCheckForLeaks @ stub RangeValuePattern_SetValue @ stub ScrollItemPattern_ScrollIntoView @ stub ScrollPattern_Scroll @@ -53,6 +55,8 @@ @ stub TransformPattern_Rotate @ stub UiaAddEvent @ stdcall UiaClientsAreListening() +#@ stub UiaDisconnectAllProviders +#@ stub UiaDisconnectProvider @ stub UiaEventAddWindow @ stub UiaEventRemoveWindow @ stub UiaFind @@ -69,6 +73,7 @@ @ stub UiaHUiaNodeFromVariant @ stub UiaHasServerSideProvider @ stub UiaHostProviderFromHwnd +#@ stub UiaIAccessibleFromProvider @ stdcall UiaLookupId(long ptr) @ stub UiaNavigate @ stub UiaNodeFromFocus @@ -77,15 +82,21 @@ @ stub UiaNodeFromProvider @ stub UiaNodeRelease @ stub UiaPatternRelease +#@ stub UiaProviderForNonClient +#@ stub UiaProviderFromIAccessible @ stub UiaRaiseAsyncContentLoadedEvent @ stdcall UiaRaiseAutomationEvent(ptr long) @ stub UiaRaiseAutomationPropertyChangedEvent +#@ stub UiaRaiseChangesEvent +#@ stub UiaRaiseNotificationEvent @ stub UiaRaiseStructureChangedEvent +#@ stub UiaRaiseTextEditTextChangedEvent @ stub UiaRegisterProviderCallback @ stub UiaRemoveEvent @ stdcall UiaReturnRawElementProvider(long long long ptr) @ stub UiaSetFocus @ stub UiaTextRangeRelease +#@ stub UpdateErrorLoggingCallback @ stub ValuePattern_SetValue @ stub VirtualizedItemPattern_Realize @ stub WindowPattern_Close -- 1.9.1

1 0

[PATCH 1/2] libwine: On Mac, disable ASLR for Wine processes.
by Ken Thomases 31 Jan '19

31 Jan '19

ASLR can allow dyld to be loaded where it overlaps one of the regions that the preloader would like to reserve. That, in turn, can prevent Wine from using the shared user data region. With ASLR disabled, dyld will be loaded immediately after the preloader, which has a defined base address. This uses an Apple extension to posix_spawn() that allows it to replace the calling process's image, like a more featureful execve(). The flag to disable ASLR is technically private SPI, but has remained stable for many versions of the OS. And the Mac preloader is already stepping over that line. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- libs/wine/config.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libs/wine/config.c b/libs/wine/config.c index 083e263..b1f526c 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -33,6 +33,13 @@ #ifdef HAVE_PWD_H #include <pwd.h> #endif +#ifdef __APPLE__ +#include <crt_externs.h> +#include <spawn.h> +#ifndef _POSIX_SPAWN_DISABLE_ASLR +#define _POSIX_SPAWN_DISABLE_ASLR 0x0100 +#endif +#endif #include "wine/library.h" static const char server_config_dir[] = "/.wine"; /* config dir relative to $HOME */ @@ -558,6 +565,15 @@ static void preloader_exec( char **argv, int use_preloader ) new_argv = xmalloc( (last_arg - argv + 2) * sizeof(*argv) ); memcpy( new_argv + 1, argv, (last_arg - argv + 1) * sizeof(*argv) ); new_argv[0] = full_name; +#ifdef __APPLE__ + { + posix_spawnattr_t attr; + posix_spawnattr_init( &attr ); + posix_spawnattr_setflags( &attr, POSIX_SPAWN_SETEXEC | _POSIX_SPAWN_DISABLE_ASLR ); + posix_spawn( NULL, full_name, NULL, &attr, new_argv, *_NSGetEnviron() ); + posix_spawnattr_destroy( &attr ); + } +#endif execv( full_name, new_argv ); free( new_argv ); free( full_name ); -- 2.10.2

1 1

[PATCH v8] mscoree: Allow loading of registration free .NET COM objects
by Fabian Maurer 31 Jan '19

31 Jan '19

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- v8: In size calculation don't count null terminator twice --- dlls/mscoree/corruntimehost.c | 237 +++++++++++++++++++++++++--------- dlls/mscoree/tests/comtest.c | 4 +- 2 files changed, 178 insertions(+), 63 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 5c4e7f1d6e..57d12bab3b 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -29,6 +29,7 @@ #include "winreg.h" #include "ole2.h" #include "shellapi.h" +#include "shlwapi.h" #include "cor.h" #include "mscoree.h" @@ -40,6 +41,7 @@ #include "wine/debug.h" #include "wine/unicode.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); @@ -68,6 +70,43 @@ struct dll_fixup void *tokens; /* pointer into process heap */ }; +struct comclassredirect_data +{ + ULONG size; + BYTE res; + BYTE miscmask; + BYTE res1[2]; + DWORD model; + GUID clsid; + GUID alias; + GUID clsid2; + GUID tlbid; + ULONG name_len; + ULONG name_offset; + ULONG progid_len; + ULONG progid_offset; + ULONG clrdata_len; + ULONG clrdata_offset; + DWORD miscstatus; + DWORD miscstatuscontent; + DWORD miscstatusthumbnail; + DWORD miscstatusicon; + DWORD miscstatusdocprint; +}; + +struct clrclass_data +{ + ULONG size; + DWORD res[2]; + ULONG module_len; + ULONG module_offset; + ULONG name_len; + ULONG name_offset; + ULONG version_len; + ULONG version_offset; + DWORD res2[2]; +}; + static MonoDomain* domain_attach(MonoDomain *domain) { MonoDomain *prev_domain = mono_domain_get(); @@ -1606,6 +1645,75 @@ HRESULT RuntimeHost_GetInterface(RuntimeHost *This, REFCLSID clsid, REFIID riid, return CLASS_E_CLASSNOTAVAILABLE; } +static BOOL try_create_registration_free_com(REFIID clsid, WCHAR *classname, UINT classname_size, WCHAR *filename, UINT filename_size) +{ + ACTCTX_SECTION_KEYED_DATA guid_info = { sizeof(ACTCTX_SECTION_KEYED_DATA) }; + ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION *assembly_info = NULL; + SIZE_T bytes_assembly_info; + struct comclassredirect_data *redirect_data; + struct clrclass_data *class_data; + void *ptr_name; + const WCHAR *ptr_path_start, *ptr_path_end; + WCHAR path[MAX_PATH] = {0}; + WCHAR str_dll[] = {'.','d','l','l',0}; + BOOL ret = FALSE; + + if (!FindActCtxSectionGuid(FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, 0, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, clsid, &guid_info)) + { + DWORD error = GetLastError(); + if (error != ERROR_SXS_KEY_NOT_FOUND) + ERR("Failed to find guid: %d\n", error); + goto end; + } + + QueryActCtxW(0, guid_info.hActCtx, &guid_info.ulAssemblyRosterIndex, AssemblyDetailedInformationInActivationContext, NULL, 0, &bytes_assembly_info); + assembly_info = heap_alloc(bytes_assembly_info); + if (!QueryActCtxW(0, guid_info.hActCtx, &guid_info.ulAssemblyRosterIndex, + AssemblyDetailedInformationInActivationContext, assembly_info, bytes_assembly_info, &bytes_assembly_info)) + { + ERR("QueryActCtxW failed: %d!\n", GetLastError()); + goto end; + } + + redirect_data = guid_info.lpData; + class_data = (void *)((char *)redirect_data + redirect_data->clrdata_offset); + + ptr_name = (char *)class_data + class_data->name_offset; + if (lstrlenW(ptr_name) + 2 >= classname_size) /* Include null-terminator */ + { + ERR("Buffer is too small\n"); + goto end; + } + strcpyW(classname, ptr_name); + + ptr_path_start = assembly_info->lpAssemblyEncodedAssemblyIdentity; + ptr_path_end = strchrW(ptr_path_start, ','); + memcpy(path, ptr_path_start, (char*)ptr_path_end - (char*)ptr_path_start); + + GetModuleFileNameW(NULL, filename, filename_size); + PathRemoveFileSpecW(filename); + + if (lstrlenW(filename) + lstrlenW(path) + ARRAY_SIZE(str_dll) + 2 >= filename_size) /* Include blackslash */ + { + ERR("Buffer is too small\n"); + goto end; + } + + PathAppendW(filename, path); + strcatW(filename, str_dll); + + ret = TRUE; + +end: + if (assembly_info) + heap_free(assembly_info); + + if (guid_info.hActCtx) + ReleaseActCtx(guid_info.hActCtx); + + return ret; +} + #define CHARS_IN_GUID 39 HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) @@ -1640,75 +1748,82 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) TRACE("Registry key: %s\n", debugstr_w(path)); res = RegOpenKeyExW(HKEY_CLASSES_ROOT, path, 0, KEY_READ, &key); - if (res == ERROR_FILE_NOT_FOUND) - return CLASS_E_CLASSNOTAVAILABLE; - - res = RegGetValueW( key, NULL, wszClass, RRF_RT_REG_SZ, NULL, classname, &dwBufLen); - if(res != ERROR_SUCCESS) + if (res != ERROR_FILE_NOT_FOUND) { - WARN("Class value cannot be found.\n"); - hr = CLASS_E_CLASSNOTAVAILABLE; - goto cleanup; - } + res = RegGetValueW( key, NULL, wszClass, RRF_RT_REG_SZ, NULL, classname, &dwBufLen); + if(res != ERROR_SUCCESS) + { + WARN("Class value cannot be found.\n"); + hr = CLASS_E_CLASSNOTAVAILABLE; + goto cleanup; + } - TRACE("classname (%s)\n", debugstr_w(classname)); + TRACE("classname (%s)\n", debugstr_w(classname)); - dwBufLen = MAX_PATH + 8; - res = RegGetValueW( key, NULL, wszCodebase, RRF_RT_REG_SZ, NULL, codebase, &dwBufLen); - if(res == ERROR_SUCCESS) - { - /* Strip file:/// */ - if(strncmpW(codebase, wszFileSlash, strlenW(wszFileSlash)) == 0) - offset = strlenW(wszFileSlash); + dwBufLen = MAX_PATH + 8; + res = RegGetValueW( key, NULL, wszCodebase, RRF_RT_REG_SZ, NULL, codebase, &dwBufLen); + if(res == ERROR_SUCCESS) + { + /* Strip file:/// */ + if(strncmpW(codebase, wszFileSlash, strlenW(wszFileSlash)) == 0) + offset = strlenW(wszFileSlash); - strcpyW(filename, codebase + offset); + strcpyW(filename, codebase + offset); + } + else + { + WCHAR assemblyname[MAX_PATH + 8]; + + hr = CLASS_E_CLASSNOTAVAILABLE; + WARN("CodeBase value cannot be found, trying Assembly.\n"); + /* get the last subkey of InprocServer32 */ + res = RegQueryInfoKeyW(key, 0, 0, 0, &numKeys, 0, 0, 0, 0, 0, 0, 0); + if (res != ERROR_SUCCESS || numKeys == 0) + goto cleanup; + numKeys--; + keyLength = ARRAY_SIZE(subkeyName); + res = RegEnumKeyExW(key, numKeys, subkeyName, &keyLength, 0, 0, 0, 0); + if (res != ERROR_SUCCESS) + goto cleanup; + res = RegOpenKeyExW(key, subkeyName, 0, KEY_READ, &subkey); + if (res != ERROR_SUCCESS) + goto cleanup; + dwBufLen = MAX_PATH + 8; + res = RegGetValueW(subkey, NULL, wszAssembly, RRF_RT_REG_SZ, NULL, assemblyname, &dwBufLen); + RegCloseKey(subkey); + if (res != ERROR_SUCCESS) + goto cleanup; + + hr = get_file_from_strongname(assemblyname, filename, MAX_PATH); + if (FAILED(hr)) + { + /* + * The registry doesn't have a CodeBase entry and it's not in the GAC. + * + * Use the Assembly Key to retrieve the filename. + * Assembly : REG_SZ : AssemblyName, Version=X.X.X.X, Culture=neutral, PublicKeyToken=null + */ + WCHAR *ns; + + WARN("Attempt to load from the application directory.\n"); + GetModuleFileNameW(NULL, filename, MAX_PATH); + ns = strrchrW(filename, '\\'); + *(ns+1) = '\0'; + + ns = strchrW(assemblyname, ','); + *(ns) = '\0'; + strcatW(filename, assemblyname); + *(ns) = '.'; + strcatW(filename, wszDLL); + } + } } else { - WCHAR assemblyname[MAX_PATH + 8]; - - hr = CLASS_E_CLASSNOTAVAILABLE; - WARN("CodeBase value cannot be found, trying Assembly.\n"); - /* get the last subkey of InprocServer32 */ - res = RegQueryInfoKeyW(key, 0, 0, 0, &numKeys, 0, 0, 0, 0, 0, 0, 0); - if (res != ERROR_SUCCESS || numKeys == 0) - goto cleanup; - numKeys--; - keyLength = ARRAY_SIZE(subkeyName); - res = RegEnumKeyExW(key, numKeys, subkeyName, &keyLength, 0, 0, 0, 0); - if (res != ERROR_SUCCESS) - goto cleanup; - res = RegOpenKeyExW(key, subkeyName, 0, KEY_READ, &subkey); - if (res != ERROR_SUCCESS) - goto cleanup; - dwBufLen = MAX_PATH + 8; - res = RegGetValueW(subkey, NULL, wszAssembly, RRF_RT_REG_SZ, NULL, assemblyname, &dwBufLen); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) - goto cleanup; + if (!try_create_registration_free_com(riid, classname, ARRAY_SIZE(classname), filename, ARRAY_SIZE(filename))) + return CLASS_E_CLASSNOTAVAILABLE; - hr = get_file_from_strongname(assemblyname, filename, MAX_PATH); - if (FAILED(hr)) - { - /* - * The registry doesn't have a CodeBase entry and it's not in the GAC. - * - * Use the Assembly Key to retrieve the filename. - * Assembly : REG_SZ : AssemblyName, Version=X.X.X.X, Culture=neutral, PublicKeyToken=null - */ - WCHAR *ns; - - WARN("Attempt to load from the application directory.\n"); - GetModuleFileNameW(NULL, filename, MAX_PATH); - ns = strrchrW(filename, '\\'); - *(ns+1) = '\0'; - - ns = strchrW(assemblyname, ','); - *(ns) = '\0'; - strcatW(filename, assemblyname); - *(ns) = '.'; - strcatW(filename, wszDLL); - } + TRACE("classname (%s)\n", debugstr_w(classname)); } TRACE("filename (%s)\n", debugstr_w(filename)); diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c index eec5d9a857..4879e3b762 100644 --- a/dlls/mscoree/tests/comtest.c +++ b/dlls/mscoree/tests/comtest.c @@ -114,7 +114,7 @@ static void run_test(BOOL expect_success) HRESULT result_expected = expect_success ? S_OK : HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); hr = CoCreateInstance(&CLSID_Test, NULL, CLSCTX_INPROC_SERVER, &IID_ITest, (void**)&test); - todo_wine + todo_wine_if(!expect_success) ok(hr == result_expected, "Expected %x, got %x\n", result_expected, hr); if (hr == S_OK) @@ -135,7 +135,7 @@ static void run_test(BOOL expect_success) { ITest *test2 = NULL; hr = IClassFactory_CreateInstance(classFactory, NULL, &IID_ITest, (void **)&test2); - todo_wine + todo_wine_if(!expect_success) ok(hr == S_OK, "Got %x\n", hr); if (hr == S_OK) -- 2.20.1

2 5

Release 4.1
by Alexandre Julliard 31 Jan '19

31 Jan '19

Folks, Since I'm leaving for FOSDEM tomorrow, and since it's not quite two weeks since 4.0 was released, I'm planning to delay release 4.1 until Monday. See some of you in Brussels! -- Alexandre Julliard julliard(a)winehq.org

1 0

[PATCH] mshtml: Print the debug string and not the pointer to it
by Michael Stefaniuc 31 Jan '19

31 Jan '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/htmlevent.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index cab39d6f9d..9fa258c7c5 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2121,7 +2121,7 @@ static HRESULT WINAPI DOMCustomEvent_initCustomEvent(IDOMCustomEvent *iface, BST DOMCustomEvent *This = impl_from_IDOMCustomEvent(iface); HRESULT hres; - TRACE("(%p)->(%s %x %x %p)\n", This, debugstr_w(type), can_bubble, cancelable, debugstr_variant(detail)); + TRACE("(%p)->(%s %x %x %s)\n", This, debugstr_w(type), can_bubble, cancelable, debugstr_variant(detail)); hres = IDOMEvent_initEvent(&This->event.IDOMEvent_iface, type, can_bubble, cancelable); if(FAILED(hres)) -- 2.20.1

2 1

[PATCH] shell32: Avoid FALSE : TRUE conditional expressions
by Michael Stefaniuc 31 Jan '19

31 Jan '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/autocomplete.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 90036e73fb..36b0c5d7bc 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -508,14 +508,14 @@ static BOOL display_matching_strs(IAutoCompleteImpl *ac, WCHAR *text, UINT len, /* Return FALSE if we need to hide the listbox */ WCHAR **str = ac->enum_strs; UINT start, end; - if (!str) return (ac->options & ACO_AUTOSUGGEST) ? FALSE : TRUE; + if (!str) return !(ac->options & ACO_AUTOSUGGEST); /* Windows seems to disable autoappend if ACO_NOPREFIXFILTERING is set */ if (!(ac->options & ACO_NOPREFIXFILTERING) && len) { start = find_matching_enum_str(ac, 0, text, len, pfx_filter, -1); if (start == ~0) - return (ac->options & ACO_AUTOSUGGEST) ? FALSE : TRUE; + return !(ac->options & ACO_AUTOSUGGEST); if (flag == autoappend_flag_yes) autoappend_str(ac, text, len, filter_str_prefix(str[start], pfx_filter), hwnd); -- 2.20.1

1 0

[PATCH 3/4] gdiplus/tests: Add some tests for GdipInitializePalette.
by Dmitry Timoshkov 31 Jan '19

31 Jan '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdiplus/tests/image.c | 146 +++++++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 72a984a2ea..5aec1c283a 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -34,6 +34,8 @@ static GpStatus (WINAPI *pGdipBitmapGetHistogramSize)(HistogramFormat,UINT*); static GpStatus (WINAPI *pGdipBitmapGetHistogram)(GpBitmap*,HistogramFormat,UINT,UINT*,UINT*,UINT*,UINT*); static GpStatus (WINAPI *pGdipImageSetAbort)(GpImage*,GdiplusAbort*); +static GpStatus (WINGDIPAPI *pGdipInitializePalette)(ColorPalette*,PaletteType,INT,BOOL,GpBitmap*); + #define expect(expected, got) ok((got) == (expected), "Expected %d, got %d\n", (UINT)(expected), (UINT)(got)) #define expectf(expected, got) ok(fabs((expected) - (got)) < 0.0001, "Expected %f, got %f\n", (expected), (got)) @@ -5339,6 +5341,149 @@ static void test_GdipLoadImageFromStream(void) IStream_Release(stream); } +static BYTE *init_bitmap(UINT *width, UINT *height, UINT *stride) +{ + BYTE *src; + UINT i, j, scale; + + *width = 256; + *height = 256; + *stride = (*width * 3 + 3) & ~3; + trace("width %d, height %d, stride %d\n", *width, *height, *stride); + + src = HeapAlloc(GetProcessHeap(), 0, *stride * *height); + + scale = 256 / *width; + if (!scale) scale = 1; + + for (i = 0; i < *height; i++) + { + for (j = 0; j < *width; j++) + { + src[i * *stride + j*3 + 0] = scale * i; + src[i * *stride + j*3 + 1] = scale * (255 - (i+j)/2); + src[i * *stride + j*3 + 2] = scale * j; + } + } + + return src; +} + +static void test_GdipInitializePalette(void) +{ + GpStatus status; + BYTE *data; + GpBitmap *bitmap; + ColorPalette *palette; + UINT width, height, stride; + + pGdipInitializePalette = (void *)GetProcAddress(GetModuleHandleA("gdiplus.dll"), "GdipInitializePalette"); + if (!pGdipInitializePalette) + { + win_skip("GdipInitializePalette is not supported on this platform\n"); + return; + } + + data = init_bitmap(&width, &height, &stride); + + status = GdipCreateBitmapFromScan0(width, height, stride, PixelFormat24bppRGB, data, &bitmap); + expect(Ok, status); + + palette = GdipAlloc(sizeof(*palette) + sizeof(ARGB) * 255); + + palette->Flags = 0; + palette->Count = 15; + status = pGdipInitializePalette(palette, PaletteTypeOptimal, 16, FALSE, bitmap); + expect(GenericError, status); + + palette->Flags = 0; + palette->Count = 256; + status = pGdipInitializePalette(palette, PaletteTypeOptimal, 16, FALSE, NULL); + expect(InvalidParameter, status); + + memset(palette->Entries, 0x11, sizeof(ARGB) * 256); + palette->Flags = 0; + palette->Count = 256; + status = pGdipInitializePalette(palette, PaletteTypeCustom, 16, FALSE, NULL); + expect(Ok, status); + expect(0, palette->Flags); + expect(256, palette->Count); + expect(0x11111111, palette->Entries[0]); + expect(0x11111111, palette->Entries[128]); + expect(0x11111111, palette->Entries[255]); + + memset(palette->Entries, 0x11, sizeof(ARGB) * 256); + palette->Flags = 0; + palette->Count = 256; + status = pGdipInitializePalette(palette, PaletteTypeFixedBW, 0, FALSE, bitmap); + expect(Ok, status); +todo_wine + expect(0x200, palette->Flags); + expect(2, palette->Count); + expect(0xff000000, palette->Entries[0]); + expect(0xffffffff, palette->Entries[1]); + + memset(palette->Entries, 0x11, sizeof(ARGB) * 256); + palette->Flags = 0; + palette->Count = 256; + status = pGdipInitializePalette(palette, PaletteTypeFixedHalftone8, 1, FALSE, NULL); + expect(Ok, status); +todo_wine + expect(0x300, palette->Flags); + expect(16, palette->Count); + expect(0xff000000, palette->Entries[0]); + expect(0xffc0c0c0, palette->Entries[8]); + expect(0xff008080, palette->Entries[15]); + + memset(palette->Entries, 0x11, sizeof(ARGB) * 256); + palette->Flags = 0; + palette->Count = 256; + status = pGdipInitializePalette(palette, PaletteTypeFixedHalftone8, 1, FALSE, bitmap); + expect(Ok, status); +todo_wine + expect(0x300, palette->Flags); + expect(16, palette->Count); + expect(0xff000000, palette->Entries[0]); + expect(0xffc0c0c0, palette->Entries[8]); + expect(0xff008080, palette->Entries[15]); + + memset(palette->Entries, 0x11, sizeof(ARGB) * 256); + palette->Flags = 0; + palette->Count = 256; + status = pGdipInitializePalette(palette, PaletteTypeFixedHalftone252, 1, FALSE, bitmap); + expect(Ok, status); +todo_wine + expect(0x800, palette->Flags); + expect(252, palette->Count); + expect(0xff000000, palette->Entries[0]); + expect(0xff990066, palette->Entries[128]); + expect(0xffffffff, palette->Entries[251]); + + palette->Flags = 0; + palette->Count = 256; + status = pGdipInitializePalette(palette, PaletteTypeOptimal, 1, FALSE, bitmap); + expect(InvalidParameter, status); + + palette->Flags = 0; + palette->Count = 256; + status = pGdipInitializePalette(palette, PaletteTypeOptimal, 2, FALSE, bitmap); + expect(Ok, status); + expect(0, palette->Flags); + expect(2, palette->Count); + + palette->Flags = 0; + palette->Count = 256; + status = pGdipInitializePalette(palette, PaletteTypeOptimal, 16, FALSE, bitmap); + expect(Ok, status); + expect(0, palette->Flags); + expect(16, palette->Count); + + /* passing invalid enumeration palette type crashes under most Windows versions */ + + GdipFree(palette); + GdipDisposeImage((GpImage *)bitmap); +} + START_TEST(image) { HMODULE mod = GetModuleHandleA("gdiplus.dll"); @@ -5363,6 +5508,7 @@ START_TEST(image) pGdipBitmapGetHistogram = (void*)GetProcAddress(mod, "GdipBitmapGetHistogram"); pGdipImageSetAbort = (void*)GetProcAddress(mod, "GdipImageSetAbort"); + test_GdipInitializePalette(); test_png_color_formats(); test_supported_encoders(); test_CloneBitmapArea(); -- 2.20.1

2 1

[PATCH 2/4] gdiplus: Implement GdipInitializePalette.
by Dmitry Timoshkov 31 Jan '19

31 Jan '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 108 ++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 110 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index e0cf6d5d34..ed9d50c058 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -615,7 +615,7 @@ 615 stub GdipGetEffectParameterSize 616 stub GdipGetEffectParameters 617 stdcall GdipSetEffectParameters(ptr ptr long) -618 stub GdipInitializePalette +618 stdcall GdipInitializePalette(ptr long long long ptr) 619 stdcall GdipBitmapCreateApplyEffect(ptr long ptr ptr ptr ptr long ptr ptr) 620 stdcall GdipBitmapApplyEffect(ptr ptr ptr long ptr ptr) 621 stdcall GdipBitmapGetHistogram(ptr long long ptr ptr ptr ptr) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 8a136eff09..1966401507 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -5640,3 +5640,111 @@ GpStatus WINGDIPAPI GdipBitmapGetHistogramSize(HistogramFormat format, UINT *num *num_of_entries = 256; return Ok; } + +static GpStatus create_optimal_palette(ColorPalette *palette, INT desired, + BOOL transparent, GpBitmap *bitmap) +{ + GpStatus status; + BitmapData data; + HRESULT hr; + IWICImagingFactory *factory; + IWICPalette *wic_palette; + + if (!bitmap) return InvalidParameter; + if (palette->Count < desired) return GenericError; + + status = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead, PixelFormat24bppRGB, &data); + if (status != Ok) return status; + + hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory); + if (hr != S_OK) + { + GdipBitmapUnlockBits(bitmap, &data); + return hresult_to_status(hr); + } + + hr = IWICImagingFactory_CreatePalette(factory, &wic_palette); + if (hr == S_OK) + { + IWICBitmap *bitmap; + + /* PixelFormat24bppRGB actually stores the bitmap bits as BGR. */ + hr = IWICImagingFactory_CreateBitmapFromMemory(factory, data.Width, data.Height, + &GUID_WICPixelFormat24bppBGR, data.Stride, data.Stride * data.Width, data.Scan0, &bitmap); + if (hr == S_OK) + { + hr = IWICPalette_InitializeFromBitmap(wic_palette, (IWICBitmapSource *)bitmap, desired, transparent); + if (hr == S_OK) + { + palette->Flags = 0; + IWICPalette_GetColorCount(wic_palette, &palette->Count); + IWICPalette_GetColors(wic_palette, palette->Count, palette->Entries, &palette->Count); + } + + IWICBitmap_Release(bitmap); + } + + IWICPalette_Release(wic_palette); + } + + IWICImagingFactory_Release(factory); + GdipBitmapUnlockBits(bitmap, &data); + + return hresult_to_status(hr); +} + +/***************************************************************************** + * GdipInitializePalette [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipInitializePalette(ColorPalette *palette, + PaletteType type, INT desired, BOOL transparent, GpBitmap *bitmap) +{ + TRACE("(%p,%d,%d,%d,%p)\n", palette, type, desired, transparent, bitmap); + + if (!palette) return InvalidParameter; + + switch (type) + { + case PaletteTypeCustom: + return Ok; + + case PaletteTypeOptimal: + return create_optimal_palette(palette, desired, transparent, bitmap); + + /* WIC palette type enumeration matches these gdiplus enums */ + case PaletteTypeFixedBW: + case PaletteTypeFixedHalftone8: + case PaletteTypeFixedHalftone27: + case PaletteTypeFixedHalftone64: + case PaletteTypeFixedHalftone125: + case PaletteTypeFixedHalftone216: + case PaletteTypeFixedHalftone252: + case PaletteTypeFixedHalftone256: + { + ColorPalette *wic_palette; + GpStatus status = Ok; + + wic_palette = get_palette(NULL, type); + if (!wic_palette) return OutOfMemory; + + if (palette->Count >= wic_palette->Count) + { + palette->Flags = wic_palette->Flags; + palette->Count = wic_palette->Count; + memcpy(palette->Entries, wic_palette->Entries, wic_palette->Count * sizeof(wic_palette->Entries[0])); + } + else + status = GenericError; + + heap_free(wic_palette); + + return status; + } + + default: + FIXME("unknown palette type %d\n", type); + break; + } + + return InvalidParameter; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index ad944d6a34..57fa6c64f2 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -266,6 +266,7 @@ GpStatus WINGDIPAPI GdipGraphicsClear(GpGraphics*,ARGB); GpStatus WINGDIPAPI GdipGraphicsSetAbort(GpGraphics*,GdiplusAbort*); GpStatus WINGDIPAPI GdipGetVisibleClipBounds(GpGraphics*,GpRectF*); GpStatus WINGDIPAPI GdipGetVisibleClipBoundsI(GpGraphics*,GpRect*); +GpStatus WINGDIPAPI GdipInitializePalette(ColorPalette*,PaletteType,INT,BOOL,GpBitmap*); GpStatus WINGDIPAPI GdipIsClipEmpty(GpGraphics*, BOOL*); GpStatus WINGDIPAPI GdipIsVisiblePoint(GpGraphics*,REAL,REAL,BOOL*); GpStatus WINGDIPAPI GdipIsVisiblePointI(GpGraphics*,INT,INT,BOOL*); -- 2.20.1

2 1

[PATCH 1/4] windowscodecs: Implement IWICPalette::InitializeFromBitmap.
by Dmitry Timoshkov 31 Jan '19

31 Jan '19

Based on median cut implementation created by Sebastian Lackner. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/palette.c | 279 ++++++++++++++++++++++++++++- dlls/windowscodecs/tests/palette.c | 21 +-- 2 files changed, 275 insertions(+), 25 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 89ec9ead11..1c1e85834b 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -1,6 +1,7 @@ /* * Copyright 2009 Vincent Povirk for CodeWeavers - * Copyright 2012 Dmitry Timoshkov + * Copyright 2012,2016 Dmitry Timoshkov + * Copyright 2016 Sebastian Lackner * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -446,11 +447,279 @@ static HRESULT WINAPI PaletteImpl_InitializeCustom(IWICPalette *iface, return S_OK; } -static HRESULT WINAPI PaletteImpl_InitializeFromBitmap(IWICPalette *iface, - IWICBitmapSource *pISurface, UINT colorCount, BOOL fAddTransparentColor) +#define R_COUNT (1 << 5) +#define R_SHIFT (8 - 5) +#define R_SCALE 2 + +#define G_COUNT (1 << 6) +#define G_SHIFT (8 - 6) +#define G_SCALE 3 + +#define B_COUNT (1 << 5) +#define B_SHIFT (8 - 5) +#define B_SCALE 1 + +struct histogram +{ + unsigned int data[R_COUNT][G_COUNT][B_COUNT]; +}; + +struct box +{ + int r_min, r_max; + int g_min, g_max; + int b_min, b_max; + unsigned int count; + unsigned int score; +}; + +/* count nonzero elements in the histogram range [r_min, r_max] x [g_min, g_max] x [b_min, b_max] */ +static inline unsigned int histogram_count(struct histogram *h, int r_min, int r_max, + int g_min, int g_max, int b_min, int b_max) +{ + unsigned int count = 0; + int r, g, b; + for (r = r_min; r <= r_max; r++) + for (g = g_min; g <= g_max; g++) + for (b = b_min; b <= b_max; b++) + if (h->data[r][g][b] != 0) count++; + return count; +} + +/* compute weighted average color in the range [r_min, r_max] x [g_min, g_max] x [b_min, b_max] */ +static unsigned int histogram_color(struct histogram *h, int r_min, int r_max, + int g_min, int g_max, int b_min, int b_max) +{ + unsigned long long r_sum = 0, g_sum = 0, b_sum = 0; + unsigned int tmp, count = 0; + int r, g, b; + + for (r = r_min; r <= r_max; r++) + for (g = g_min; g <= g_max; g++) + for (b = b_min; b <= b_max; b++) + { + if (!(tmp = h->data[r][g][b])) continue; + r_sum += ((r << R_SHIFT) + ((1 << R_SHIFT) / 2)) * tmp; + g_sum += ((g << G_SHIFT) + ((1 << G_SHIFT) / 2)) * tmp; + b_sum += ((b << B_SHIFT) + ((1 << B_SHIFT) / 2)) * tmp; + count += tmp; + } + + return ((b_sum + (count / 2)) / count) | + ((g_sum + (count / 2)) / count) << 8 | + ((r_sum + (count / 2)) / count) << 16 | 0xff000000; +} + +/* same as histogram_count */ +static inline unsigned int box_count(struct histogram *h, struct box *b) +{ + return histogram_count(h, b->r_min, b->r_max, b->g_min, b->g_max, b->b_min, b->b_max); +} + +/* same as histogram_color */ +static inline unsigned int box_color(struct histogram *h, struct box *b) +{ + return histogram_color(h, b->r_min, b->r_max, b->g_min, b->g_max, b->b_min, b->b_max); +} + +/* compute score used to determine best split (also called "volume") */ +static inline unsigned int box_score(struct box *b) +{ + unsigned int tmp, sum = 0; + tmp = ((b->r_max - b->r_min) << R_SHIFT) * R_SCALE; sum += tmp * tmp; + tmp = ((b->g_max - b->g_min) << G_SHIFT) * G_SCALE; sum += tmp * tmp; + tmp = ((b->b_max - b->b_min) << B_SHIFT) * B_SCALE; sum += tmp * tmp; + return sum; +} + +/* attempt to shrink a box */ +static void shrink_box(struct histogram *h, struct box *b) +{ + int i; + for (i = b->r_min; i <= b->r_max; i++) + if (histogram_count(h, i, i, b->g_min, b->g_max, b->b_min, b->b_max)) { b->r_min = i; break; } + for (i = b->r_max; i >= b->r_min; i--) + if (histogram_count(h, i, i, b->g_min, b->g_max, b->b_min, b->b_max)) { b->r_max = i; break; } + for (i = b->g_min; i <= b->g_max; i++) + if (histogram_count(h, b->r_min, b->r_max, i, i, b->b_min, b->b_max)) { b->g_min = i; break; } + for (i = b->g_max; i >= b->g_min; i--) + if (histogram_count(h, b->r_min, b->r_max, i, i, b->b_min, b->b_max)) { b->g_max = i; break; } + for (i = b->b_min; i <= b->b_max; i++) + if (histogram_count(h, b->r_min, b->r_max, b->g_min, b->g_max, i, i)) { b->b_min = i; break; } + for (i = b->b_max; i >= b->b_min; i--) + if (histogram_count(h, b->r_min, b->r_max, b->g_min, b->g_max, i, i)) { b->b_max = i; break; } + b->count = box_count(h, b); + b->score = box_score(b); +} + +/* helper for split_box */ +static inline void set_avg(int *min, int *max) +{ + int avg = (*min + *max) / 2; + *min = avg + 1; + *max = avg; +} + +/* split a box based on the best axis */ +static void split_box(struct histogram *h, struct box *b1, struct box *b2) +{ + int r = ((b1->r_max - b1->r_min) << R_SHIFT) * R_SCALE; + int g = ((b1->g_max - b1->g_min) << G_SHIFT) * G_SCALE; + int b = ((b1->b_max - b1->b_min) << B_SHIFT) * B_SCALE; + + *b2 = *b1; + + if (r > g) + { + if (b > r) set_avg(&b1->b_min, &b2->b_max); + else set_avg(&b1->r_min, &b2->r_max); + } + else + { + if (b > g) set_avg(&b1->b_min, &b2->b_max); + else set_avg(&b1->g_min, &b2->g_max); + } + + shrink_box(h, b1); + shrink_box(h, b2); +} + +/* find box suitable for split based on count */ +static struct box *find_box_max_count(struct box *b, int count) +{ + struct box *best = NULL; + for (; count--; b++) + if (b->score && (!best || b->count > best->count)) best = b; + return best; +} + +/* find box suitable for split based on score */ +static struct box *find_box_max_score(struct box *b, int count) +{ + struct box *best = NULL; + for (; count--; b++) + if (b->score && (!best || b->score > best->score)) best = b; + return best; +} + +/* compute color map with at most 'desired' colors + * image must be in 24bpp BGR format and colors are returned in 0xAARRGGBB format */ +static int median_cut(unsigned char *image, unsigned int width, unsigned int height, + unsigned int stride, int desired, unsigned int *colors) +{ + struct box boxes[256]; + struct histogram *h; + unsigned int x, y; + unsigned char *p; + struct box *b1, *b2; + int numboxes, i; + + if (!(h = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*h)))) + return 0; + + for (y = 0; y < height; y++) + for (x = 0, p = image + y * stride; x < width; x++, p += 3) + h->data[p[2] >> R_SHIFT][p[1] >> G_SHIFT][p[0] >> B_SHIFT]++; + + numboxes = 1; + boxes[0].r_min = 0; boxes[0].r_max = R_COUNT - 1; + boxes[0].g_min = 0; boxes[0].g_max = G_COUNT - 1; + boxes[0].b_min = 0; boxes[0].b_max = B_COUNT - 1; + shrink_box(h, &boxes[0]); + + while (numboxes <= desired / 2) + { + if (!(b1 = find_box_max_count(boxes, numboxes))) break; + b2 = &boxes[numboxes++]; + split_box(h, b1, b2); + } + while (numboxes < desired) + { + if (!(b1 = find_box_max_score(boxes, numboxes))) break; + b2 = &boxes[numboxes++]; + split_box(h, b1, b2); + } + + for (i = 0; i < numboxes; i++) + colors[i] = box_color(h, &boxes[i]); + + HeapFree(GetProcessHeap(), 0, h); + return numboxes; +} + + +static HRESULT WINAPI PaletteImpl_InitializeFromBitmap(IWICPalette *palette, + IWICBitmapSource *source, UINT desired, BOOL add_transparent) { - FIXME("(%p,%p,%u,%i): stub\n", iface, pISurface, colorCount, fAddTransparentColor); - return E_NOTIMPL; + IWICImagingFactory *factory = NULL; + IWICBitmap *rgb24_bitmap = NULL; + IWICBitmapSource *rgb24_source; + IWICBitmapLock *lock = NULL; + WICPixelFormatGUID format; + HRESULT hr; + UINT width, height, stride, size, actual_number_of_colors; + BYTE *src; + WICColor colors[256]; + + TRACE("(%p,%p,%u,%d)\n", palette, source, desired, add_transparent); + + if (!source || desired < 2 || desired > 256) + return E_INVALIDARG; + + hr = IWICBitmapSource_GetPixelFormat(source, &format); + if (hr != S_OK) return hr; + + /* For interoperability with gdiplus where PixelFormat24bppRGB actully stored + * as BGR (and there is no a corresponding RGB format) we have to use 24bppBGR + * to avoid format conversions. + */ + if (!IsEqualGUID(&format, &GUID_WICPixelFormat24bppBGR)) + { + hr = WICConvertBitmapSource(&GUID_WICPixelFormat24bppBGR, source, &rgb24_source); + if (hr != S_OK) return hr; + } + else + rgb24_source = source; + + hr = ImagingFactory_CreateInstance(&IID_IWICImagingFactory, (void **)&factory); + if (hr != S_OK) goto fail; + + hr = IWICImagingFactory_CreateBitmapFromSource(factory, rgb24_source, WICBitmapCacheOnLoad, &rgb24_bitmap); + if (hr != S_OK) goto fail; + + hr = IWICBitmap_Lock(rgb24_bitmap, NULL, WICBitmapLockRead, &lock); + if (hr != S_OK) goto fail; + + IWICBitmapLock_GetSize(lock, &width, &height); + IWICBitmapLock_GetStride(lock, &stride); + IWICBitmapLock_GetDataPointer(lock, &size, &src); + + actual_number_of_colors = median_cut(src, width, height, stride, add_transparent ? desired - 1 : desired, colors); + TRACE("actual number of colors: %u\n", actual_number_of_colors); + + if (actual_number_of_colors) + { + if (add_transparent) colors[actual_number_of_colors++] = 0; + + hr = IWICPalette_InitializeCustom(palette, colors, actual_number_of_colors); + } + else + hr = E_OUTOFMEMORY; + +fail: + if (lock) + IWICBitmapLock_Release(lock); + + if (rgb24_bitmap) + IWICBitmap_Release(rgb24_bitmap); + + if (factory) + IWICImagingFactory_Release(factory); + + if (rgb24_source != source) + IWICBitmapSource_Release(rgb24_source); + + return hr; } static HRESULT WINAPI PaletteImpl_InitializeFromPalette(IWICPalette *iface, diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index 3b9f68535b..5bb25fa427 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -577,48 +577,34 @@ static void test_palette_from_bitmap(void) ok(hr == S_OK, "CreatePalette error %#x\n", hr); hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 0, FALSE); -todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 1, FALSE); -todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 257, FALSE); -todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = IWICPalette_InitializeFromBitmap(palette, NULL, 16, FALSE); -todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 2, FALSE); -todo_wine ok(hr == S_OK, "InitializeFromBitmap error %#x\n", hr); -if (hr == S_OK) -{ + count = 0; hr = IWICPalette_GetColorCount(palette, &count); ok(hr == S_OK, "GetColorCount error %#x\n", hr); ok(count == 2, "expected 2, got %u\n", count); -} hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 2, TRUE); -todo_wine ok(hr == S_OK, "InitializeFromBitmap error %#x\n", hr); -if (hr == S_OK) -{ count = 0; hr = IWICPalette_GetColorCount(palette, &count); ok(hr == S_OK, "GetColorCount error %#x\n", hr); ok(count == 2, "expected 2, got %u\n", count); -} /* without trasparent color */ hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 16, FALSE); -todo_wine ok(hr == S_OK, "InitializeFromBitmap error %#x\n", hr); -if (hr == S_OK) -{ type = -1; hr = IWICPalette_GetType(palette, &type); ok(hr == S_OK, "GetType error %#x\n", hr); @@ -632,14 +618,10 @@ if (hr == S_OK) ok(hr == S_OK, "GetColors error %#x\n", hr); ok(ret == count, "expected %u, got %u\n", count, ret); ok(color[count - 1] != 0, "expected !0, got %08x\n", color[count - 1]); -} /* with trasparent color */ hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 16, TRUE); -todo_wine ok(hr == S_OK, "InitializeFromBitmap error %#x\n", hr); -if (hr == S_OK) -{ type = -1; hr = IWICPalette_GetType(palette, &type); ok(hr == S_OK, "GetType error %#x\n", hr); @@ -653,7 +635,6 @@ if (hr == S_OK) ok(hr == S_OK, "GetColors error %#x\n", hr); ok(ret == count, "expected %u, got %u\n", count, ret); ok(color[count - 1] == 0, "expected 0, got %08x\n", color[count - 1]); -} IWICPalette_Release(palette); IWICBitmap_Release(bitmap); -- 2.20.1

2 1

[PATCH] windowscodecs: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 31 Jan '19

31 Jan '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/windowscodecs/tests/converter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 8e0fb7759b..37b60facaa 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -709,7 +709,7 @@ static void check_tiff_format(IStream *stream, const WICPixelFormatGUID *format) ok(hr == S_OK, "GetCount error %#x\n", hr); ok(count != 0, "wrong count %u\n", count); - for (i = 0; i < sizeof(tag)/sizeof(tag[0]); i++) + for (i = 0; i < ARRAY_SIZE(tag); i++) { PropVariantInit(&id); PropVariantInit(&value); -- 2.20.1

2 1

[PATCH] windowscodecs: Remove redundant NULL check before HeapFree()
by Michael Stefaniuc 31 Jan '19

31 Jan '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index faffeae6ae..db0fa9ed50 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -815,8 +815,7 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p end: LeaveCriticalSection(&This->lock); - if (row_pointers) - HeapFree(GetProcessHeap(), 0, row_pointers); + HeapFree(GetProcessHeap(), 0, row_pointers); return hr; } -- 2.20.1

2 1

[PATCH 4/4] windowscodecs: Add support for converting to 8bppIndexed format.
by Dmitry Timoshkov 31 Jan '19

31 Jan '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/converter.c | 160 +++++++++++++++++++++++++++++---- 1 file changed, 143 insertions(+), 17 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 6e7bb8e781..a6795fb706 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -76,7 +76,7 @@ typedef struct FormatConverter { const struct pixelformatinfo *dst_format, *src_format; WICBitmapDitherType dither; double alpha_threshold; - WICBitmapPaletteType palette_type; + IWICPalette *palette; CRITICAL_SECTION lock; /* must be held when initialized */ } FormatConverter; @@ -1219,11 +1219,96 @@ static HRESULT copypixels_to_8bppGray(struct FormatConverter *This, const WICRec return hr; } +static UINT rgb_to_palette_index(BYTE bgr[3], WICColor *colors, UINT count) +{ + UINT best_diff, best_index, i; + + best_diff = ~0; + best_index = 0; + + for (i = 0; i < count; i++) + { + BYTE pal_r, pal_g, pal_b; + UINT diff_r, diff_g, diff_b, diff; + + pal_r = colors[i] >> 16; + pal_g = colors[i] >> 8; + pal_b = colors[i]; + + diff_r = bgr[2] - pal_r; + diff_g = bgr[1] - pal_g; + diff_b = bgr[0] - pal_b; + + diff = diff_r * diff_r + diff_g * diff_g + diff_b * diff_b; + if (diff == 0) return i; + + if (diff < best_diff) + { + best_diff = diff; + best_index = i; + } + } + + return best_index; +} + +static HRESULT copypixels_to_8bppIndexed(struct FormatConverter *This, const WICRect *prc, + UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer, enum pixelformat source_format) +{ + HRESULT hr; + BYTE *srcdata; + WICColor colors[256]; + UINT srcstride, srcdatasize, count; + + if (source_format == format_8bppIndexed) + { + if (prc) + return IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); + + return S_OK; + } + + if (!This->palette) return WINCODEC_ERR_WRONGSTATE; + + hr = IWICPalette_GetColors(This->palette, 256, colors, &count); + if (hr != S_OK) return hr; + if (!count) return WINCODEC_ERR_WRONGSTATE; + + srcstride = 3 * prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + hr = copypixels_to_24bppBGR(This, prc, srcstride, srcdatasize, srcdata, source_format); + if (SUCCEEDED(hr) && prc) + { + INT x, y; + BYTE *src = srcdata, *dst = pbBuffer; + + for (y = 0; y < prc->Height; y++) + { + BYTE *bgr = src; + + for (x = 0; x < prc->Width; x++) + { + dst[x] = rgb_to_palette_index(bgr, colors, count); + bgr += 3; + } + src += srcstride; + dst += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + return hr; +} + static const struct pixelformatinfo supported_formats[] = { {format_1bppIndexed, &GUID_WICPixelFormat1bppIndexed, NULL}, {format_2bppIndexed, &GUID_WICPixelFormat2bppIndexed, NULL}, {format_4bppIndexed, &GUID_WICPixelFormat4bppIndexed, NULL}, - {format_8bppIndexed, &GUID_WICPixelFormat8bppIndexed, NULL}, + {format_8bppIndexed, &GUID_WICPixelFormat8bppIndexed, copypixels_to_8bppIndexed}, {format_BlackWhite, &GUID_WICPixelFormatBlackWhite, NULL}, {format_2bppGray, &GUID_WICPixelFormat2bppGray, NULL}, {format_4bppGray, &GUID_WICPixelFormat4bppGray, NULL}, @@ -1300,6 +1385,7 @@ static ULONG WINAPI FormatConverter_Release(IWICFormatConverter *iface) This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); if (This->source) IWICBitmapSource_Release(This->source); + if (This->palette) IWICPalette_Release(This->palette); HeapFree(GetProcessHeap(), 0, This); } @@ -1348,10 +1434,16 @@ static HRESULT WINAPI FormatConverter_GetResolution(IWICFormatConverter *iface, } static HRESULT WINAPI FormatConverter_CopyPalette(IWICFormatConverter *iface, - IWICPalette *pIPalette) + IWICPalette *palette) { - FIXME("(%p,%p): stub\n", iface, pIPalette); - return E_NOTIMPL; + FormatConverter *This = impl_from_IWICFormatConverter(iface); + + TRACE("(%p,%p)\n", iface, palette); + + if (!palette) return E_INVALIDARG; + if (!This->palette) return WINCODEC_ERR_WRONGSTATE; + + return IWICPalette_InitializeFromPalette(palette, This->palette); } static HRESULT WINAPI FormatConverter_CopyPixels(IWICFormatConverter *iface, @@ -1384,19 +1476,52 @@ static HRESULT WINAPI FormatConverter_CopyPixels(IWICFormatConverter *iface, } static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, - IWICBitmapSource *pISource, REFWICPixelFormatGUID dstFormat, WICBitmapDitherType dither, - IWICPalette *pIPalette, double alphaThresholdPercent, WICBitmapPaletteType paletteTranslate) + IWICBitmapSource *source, REFWICPixelFormatGUID dstFormat, WICBitmapDitherType dither, + IWICPalette *palette, double alpha_threshold, WICBitmapPaletteType palette_type) { FormatConverter *This = impl_from_IWICFormatConverter(iface); const struct pixelformatinfo *srcinfo, *dstinfo; - static INT fixme=0; GUID srcFormat; - HRESULT res=S_OK; + HRESULT res; + + TRACE("(%p,%p,%s,%u,%p,%0.3f,%u)\n", iface, source, debugstr_guid(dstFormat), + dither, palette, alpha_threshold, palette_type); + + if (!palette) + { + res = PaletteImpl_Create(&palette); + if (res != S_OK) return res; + + switch (palette_type) + { + case WICBitmapPaletteTypeCustom: + IWICPalette_Release(palette); + palette = NULL; + res = S_OK; + break; + + case WICBitmapPaletteTypeMedianCut: + { + UINT bpp; + res = get_pixelformat_bpp(dstFormat, &bpp); + if (res == S_OK && bpp <= 8) + res = IWICPalette_InitializeFromBitmap(palette, source, 1 << bpp, FALSE); + break; + } - TRACE("(%p,%p,%s,%u,%p,%0.1f,%u)\n", iface, pISource, debugstr_guid(dstFormat), - dither, pIPalette, alphaThresholdPercent, paletteTranslate); + default: + res = IWICPalette_InitializePredefined(palette, palette_type, FALSE); + break; + } - if (pIPalette && !fixme++) FIXME("ignoring palette\n"); + if (res != S_OK) + { + IWICPalette_Release(palette); + return res; + } + } + else + IWICPalette_AddRef(palette); EnterCriticalSection(&This->lock); @@ -1406,7 +1531,7 @@ static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, goto end; } - res = IWICBitmapSource_GetPixelFormat(pISource, &srcFormat); + res = IWICBitmapSource_GetPixelFormat(source, &srcFormat); if (FAILED(res)) goto end; srcinfo = get_formatinfo(&srcFormat); @@ -1427,13 +1552,13 @@ static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, if (dstinfo->copy_function) { - IWICBitmapSource_AddRef(pISource); + IWICBitmapSource_AddRef(source); This->src_format = srcinfo; This->dst_format = dstinfo; This->dither = dither; - This->alpha_threshold = alphaThresholdPercent; - This->palette_type = paletteTranslate; - This->source = pISource; + This->alpha_threshold = alpha_threshold; + This->palette = palette; + This->source = source; } else { @@ -1512,6 +1637,7 @@ HRESULT FormatConverter_CreateInstance(REFIID iid, void** ppv) This->IWICFormatConverter_iface.lpVtbl = &FormatConverter_Vtbl; This->ref = 1; This->source = NULL; + This->palette = NULL; InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": FormatConverter.lock"); -- 2.20.1

2 1

[PATCH 2/2] ntoskrnl.exe: Add KeEnterGuardedRegion and KeLeaveGuardedRegion stubs.
by Jacek Caban 31 Jan '19

31 Jan '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 16 ++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 ++ 2 files changed, 18 insertions(+)

1 0

[PATCH 1/2] ntoskrnl.exe: Add __C_specific_handler entry.
by Jacek Caban 31 Jan '19

31 Jan '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH] ddraw: Pass correct box when mapping system memory vertex buffers.
by Henri Verbeet 31 Jan '19

31 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> This fixes a regression introduced by commit 5a8e430b96ab429a85f82f26ba9d2de4729954c2. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46536 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 4b58b75f3c2..c9742b205d4 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4410,6 +4410,8 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, { TRACE("Drawing from D3DVBCAPS_SYSTEMMEMORY vertex buffer, forwarding to DrawIndexedPrimitive().\n"); wined3d_mutex_lock(); + wined3d_box.left = start_vertex * stride; + wined3d_box.right = wined3d_box.left + vertex_count * stride; wined3d_resource = wined3d_buffer_get_resource(vb_impl->wined3d_buffer); if (FAILED(hr = wined3d_resource_map(wined3d_resource, 0, &wined3d_map_desc, &wined3d_box, WINED3D_MAP_READ))) @@ -4417,8 +4419,8 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, wined3d_mutex_unlock(); return D3DERR_VERTEXBUFFERLOCKED; } - hr = d3d_device7_DrawIndexedPrimitive(iface, primitive_type, vb_impl->fvf, wined3d_map_desc.data, - start_vertex + vertex_count, indices, index_count, flags); + hr = d3d_device7_DrawIndexedPrimitive(iface, primitive_type, vb_impl->fvf, + wined3d_map_desc.data, vertex_count, indices, index_count, flags); wined3d_resource_unmap(wined3d_resource, 0); wined3d_mutex_unlock(); return hr; -- 2.11.0

2 1

[PATCH 1/5] d3d9: Don't allow map read access to D3DUSAGE_WRITEONLY buffers.
by Matteo Bruni 31 Jan '19

31 Jan '19

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3d9/buffer.c | 6 ++---- dlls/d3d9/d3d9_private.h | 26 +++++++++++++++++++------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 83cf4010450..dcd7e287264 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -310,8 +310,7 @@ HRESULT vertexbuffer_init(struct d3d9_vertexbuffer *buffer, struct d3d9_device * desc.byte_width = size; desc.usage = usage & WINED3DUSAGE_MASK; desc.bind_flags = 0; - desc.access = wined3daccess_from_d3dpool(pool, usage) - | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = wined3daccess_from_d3dpool(pool, usage) | map_access_from_usage(usage); desc.misc_flags = 0; desc.structure_byte_stride = 0; @@ -629,8 +628,7 @@ HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *de desc.byte_width = size; desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; desc.bind_flags = 0; - desc.access = wined3daccess_from_d3dpool(pool, usage) - | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = wined3daccess_from_d3dpool(pool, usage) | map_access_from_usage(usage); desc.misc_flags = 0; desc.structure_byte_stride = 0; diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index e520b604e9a..1032f8e8e9c 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -325,23 +325,35 @@ static inline D3DPOOL d3dpool_from_wined3daccess(unsigned int access, unsigned i } } +static inline unsigned int map_access_from_usage(unsigned int usage) +{ + if (usage & D3DUSAGE_WRITEONLY) + return WINED3D_RESOURCE_ACCESS_MAP_W; + return WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; +} + static inline unsigned int wined3daccess_from_d3dpool(D3DPOOL pool, unsigned int usage) { + unsigned int access; + switch (pool) { case D3DPOOL_DEFAULT: - if (usage & D3DUSAGE_DYNAMIC) - return WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; - return WINED3D_RESOURCE_ACCESS_GPU; + access = WINED3D_RESOURCE_ACCESS_GPU; + break; case D3DPOOL_MANAGED: - return WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU - | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU; + break; case D3DPOOL_SYSTEMMEM: case D3DPOOL_SCRATCH: - return WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + access = WINED3D_RESOURCE_ACCESS_CPU; + break; default: - return 0; + access = 0; } + if (pool != D3DPOOL_DEFAULT || usage & D3DUSAGE_DYNAMIC) + access |= map_access_from_usage(usage); + return access; } static inline unsigned int wined3d_bind_flags_from_d3d9_usage(DWORD usage) -- 2.19.2

3 14

[PATCH vkd3d 9/9] include: Avoid redefining ARRAY_SIZE().
by Józef Kucia 31 Jan '19

31 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> winnt.h from Wine defines ARRAY_SIZE() when __WINESRC__ is defined. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_common.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index d942acf2b74b..1129f1e3001a 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -22,7 +22,9 @@ #include "config.h" #include "vkd3d_windows.h" -#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x))) +#ifndef ARRAY_SIZE +# define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x))) +#endif #define DIV_ROUND_UP(a, b) ((a) % (b) == 0 ? (a) / (b) : (a) / (b) + 1) -- 2.19.2

2 1

[PATCH vkd3d 4/9] vkd3d-shader: Use VKD3D_SHADER_DEBUG instead of VKD3D_DEBUG.
by Józef Kucia 31 Jan '19

31 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 071880808755..2bfdad0641cc 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -20,7 +20,7 @@ #include <stdio.h> -VKD3D_DEBUG_ENV_NAME("VKD3D_DEBUG"); +VKD3D_DEBUG_ENV_NAME("VKD3D_SHADER_DEBUG"); STATIC_ASSERT(MEMBER_SIZE(struct vkd3d_shader_scan_info, uav_counter_mask) * CHAR_BIT >= VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS); STATIC_ASSERT(MEMBER_SIZE(struct vkd3d_shader_scan_info, uav_read_mask) * CHAR_BIT >= VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS); -- 2.19.2

2 1

[PATCH vkd3d 8/9] include: Include stdlib.h for malloc().
by Józef Kucia 31 Jan '19

31 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_memory.h | 1 + programs/vkd3d-compiler/main.c | 1 + 2 files changed, 2 insertions(+) diff --git a/include/private/vkd3d_memory.h b/include/private/vkd3d_memory.h index 4df92db146aa..df93abf5257f 100644 --- a/include/private/vkd3d_memory.h +++ b/include/private/vkd3d_memory.h @@ -21,6 +21,7 @@ #include <assert.h> #include <stdbool.h> +#include <stdlib.h> #include "vkd3d_debug.h" diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index b36343524cd2..047abcdc5797 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -19,6 +19,7 @@ #include <fcntl.h> #include <stdbool.h> #include <stdio.h> +#include <stdlib.h> #include <sys/stat.h> #include <unistd.h> -- 2.19.2

3 2

[PATCH vkd3d 7/9] include: Define __C89_NAMELESS early.
by Józef Kucia 31 Jan '19

31 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_windows.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/include/vkd3d_windows.h b/include/vkd3d_windows.h index 58432fb7ec70..7d63ead75132 100644 --- a/include/vkd3d_windows.h +++ b/include/vkd3d_windows.h @@ -20,6 +20,17 @@ #define __VKD3D_WINDOWS_H #ifndef _INC_WINDOWS +/* Nameless unions */ +#ifndef __C89_NAMELESS +# ifdef NONAMELESSUNION +# define __C89_NAMELESS +# define __C89_NAMELESSUNIONNAME u +# else +# define __C89_NAMELESS +# define __C89_NAMELESSUNIONNAME +# endif /* NONAMELESSUNION */ +#endif /* __C89_NAMELESS */ + #if !defined(_WIN32) || defined(__WIDL__) # if !defined(__WIDL__) && !defined(VKD3D_WIN32_WCHAR) @@ -223,17 +234,6 @@ typedef struct SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES; #endif /* _WIN32 */ -/* Nameless unions */ -#ifndef __C89_NAMELESS -# ifdef NONAMELESSUNION -# define __C89_NAMELESS -# define __C89_NAMELESSUNIONNAME u -# else -# define __C89_NAMELESS -# define __C89_NAMELESSUNIONNAME -# endif /* NONAMELESSUNION */ -#endif /* __C89_NAMELESS */ - /* Define DECLSPEC_HIDDEN */ #ifndef DECLSPEC_HIDDEN # if defined(__MINGW32__) -- 2.19.2

2 1

[PATCH vkd3d 6/9] build: Add option to disable tests.
by Józef Kucia 31 Jan '19

31 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Makefile.am | 4 +++- configure.ac | 10 ++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index e0b31a6d4c4f..3e9ddeaf555c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -137,12 +137,14 @@ vkd3d_compiler_SOURCES = programs/vkd3d-compiler/main.c vkd3d_compiler_LDADD = libvkd3d-shader.la LDADD = libvkd3d.la libvkd3d-utils.la -check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests) AM_DEFAULT_SOURCE_EXT = .c +if BUILD_TESTS +check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests) TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la +endif if BUILD_DEMOS DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @XCB_LIBS@ @VULKAN_LIBS@ diff --git a/configure.ac b/configure.ac index e539d9825a8f..37e1edd6e941 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,12 @@ AC_ARG_VAR([CROSSCC64], [64-bit Windows cross compiler]) AC_ARG_WITH([xcb], AS_HELP_STRING([--with-xcb], [Build with XCB library (default: test)])) AC_ARG_WITH([spirv-tools], AS_HELP_STRING([--with-spirv-tools], [Build with SPIRV-Tools library (default: disabled)])) -AC_ARG_ENABLE([demos], AS_HELP_STRING([--enable-demos], [Build demo programs (default: disabled)])) +AC_ARG_ENABLE([demos], + AS_HELP_STRING([--enable-demos], [Build demo programs (default: disabled)]),, + [enable_demos=no]) +AC_ARG_ENABLE([tests], + AS_HELP_STRING([--enable-tests], [Build tests (default: enabled)]),, + [enable_tests=yes]) AC_USE_SYSTEM_EXTENSIONS @@ -107,10 +112,10 @@ VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_ VKD3D_CHECK_PTHREAD_SETNAME_NP dnl Makefiles -AS_IF([test "x$enable_demos" != "xyes"], [enable_demos=no]) AS_IF([test "x$enable_demos" = "xyes" -a "x$HAVE_XCB" != "xyes"], [AC_MSG_ERROR([libxcb is required for demos.])]) AM_CONDITIONAL([BUILD_DEMOS], [test "x$enable_demos" = "xyes"]) +AM_CONDITIONAL([BUILD_TESTS], [test "x$enable_tests" != "xno"]) AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"]) AM_CONDITIONAL([HAVE_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"]) AM_CONDITIONAL([HAVE_CROSSTARGET64], [test "x$CROSSTARGET64" != "xno"]) @@ -129,6 +134,7 @@ AS_ECHO([" Have SPIRV-Tools: ${with_spirv_tools} Building demos: ${enable_demos} + Building tests: ${enable_tests} Building crosstests: ${HAVE_CROSSTEST}"]) AS_IF([test "x$CROSSTARGET32" != "xno"], [AS_ECHO([" Using 32-bit cross compiler: $CROSSCC32"])]) -- 2.19.2

3 2

[PATCH vkd3d 5/9] build: Build DLLs for Windows.
by Józef Kucia 31 Jan '19

31 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Initial patches for cross-compiling for Windows. --- Makefile.am | 7 ++++--- configure.ac | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 487d2ead982b..e0b31a6d4c4f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 AM_CFLAGS = @VKD3D_CFLAGS@ AM_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/dummy -I$(srcdir)/include/private +AM_LDFLAGS = -no-undefined widl_headers = \ include/vkd3d_d3d12.h \ @@ -79,7 +80,7 @@ libvkd3d_shader_la_SOURCES = \ libs/vkd3d-shader/vkd3d_shader_main.c \ libs/vkd3d-shader/vkd3d_shader_private.h libvkd3d_shader_la_CFLAGS = $(AM_CFLAGS) @SPIRV_TOOLS_CFLAGS@ -libvkd3d_shader_la_LDFLAGS = -version-info 1:0:0 +libvkd3d_shader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 libvkd3d_shader_la_LIBADD = libvkd3d-common.la @SPIRV_TOOLS_LIBS@ if HAVE_LD_VERSION_SCRIPT libvkd3d_shader_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-shader/vkd3d_shader.map @@ -104,7 +105,7 @@ libvkd3d_la_SOURCES = \ libs/vkd3d/vkd3d_private.h \ libs/vkd3d/vulkan_procs.h \ libs/vkd3d_version.c -libvkd3d_la_LDFLAGS = -version-info 2:0:1 +libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 2:0:1 libvkd3d_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la @DL_LIBS@ @PTHREAD_LIBS@ if HAVE_LD_VERSION_SCRIPT libvkd3d_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d/vkd3d.map @@ -114,7 +115,7 @@ libvkd3d_utils_la_SOURCES = \ libs/vkd3d-utils/vkd3d_utils.map \ libs/vkd3d-utils/vkd3d_utils_main.c \ libs/vkd3d-utils/vkd3d_utils_private.h -libvkd3d_utils_la_LDFLAGS = -version-info 1:1:0 +libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:1:0 libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d.la if HAVE_LD_VERSION_SCRIPT libvkd3d_utils_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-utils/vkd3d_utils.map diff --git a/configure.ac b/configure.ac index 6e5527952ba1..e539d9825a8f 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ AM_MAINTAINER_MODE([enable]) AM_SILENT_RULES([yes]) LT_PREREQ([2.4.2]) -LT_INIT +LT_INIT([win32-dll]) gl_LD_VERSION_SCRIPT -- 2.19.2

3 2

[PATCH vkd3d 2/9] vkd3d-shader: Move VKD3D_SHADER_DUMP_PATH implementation from libvkd3d.
by Józef Kucia 31 Jan '19

31 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/trace.c | 35 +++++------- libs/vkd3d-shader/vkd3d_shader_main.c | 44 +++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 2 + libs/vkd3d/state.c | 68 ------------------------ 4 files changed, 58 insertions(+), 91 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 8769513d2d1d..cb7452bdc2ab 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1238,44 +1238,32 @@ static void shader_dump_interpolation_mode(struct vkd3d_string_buffer *buffer, } } -static void shader_dump_version(struct vkd3d_string_buffer *buffer, - const struct vkd3d_shader_version *shader_version) +const char *shader_get_type_prefix(enum vkd3d_shader_type type) { - const char *prefix; - - switch (shader_version->type) + switch (type) { case VKD3D_SHADER_TYPE_VERTEX: - prefix = "vs"; - break; + return "vs"; case VKD3D_SHADER_TYPE_HULL: - prefix = "hs"; - break; + return "hs"; case VKD3D_SHADER_TYPE_DOMAIN: - prefix = "ds"; - break; + return "ds"; case VKD3D_SHADER_TYPE_GEOMETRY: - prefix = "gs"; - break; + return "gs"; case VKD3D_SHADER_TYPE_PIXEL: - prefix = "ps"; - break; + return "ps"; case VKD3D_SHADER_TYPE_COMPUTE: - prefix = "cs"; - break; + return "cs"; default: - FIXME("Unhandled shader type %#x.\n", shader_version->type); - prefix = "unknown"; - break; + FIXME("Unhandled shader type %#x.\n", type); + return "unknown"; } - - shader_addline(buffer, "%s_%u_%u\n", prefix, shader_version->major, shader_version->minor); } static void shader_dump_instruction_flags(struct vkd3d_string_buffer *buffer, @@ -1606,7 +1594,8 @@ void vkd3d_shader_trace(void *data) } shader_sm4_read_header(data, &ptr, &shader_version); - shader_dump_version(&buffer, &shader_version); + shader_addline(&buffer, "%s_%u_%u\n", + shader_get_type_prefix(shader_version.type), shader_version.major, shader_version.minor); while (!shader_sm4_is_end(data, &ptr)) { diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 73a9236799d0..dfd6b726d1d6 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -18,9 +18,51 @@ #include "vkd3d_shader_private.h" +#include <stdio.h> + STATIC_ASSERT(MEMBER_SIZE(struct vkd3d_shader_scan_info, uav_counter_mask) * CHAR_BIT >= VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS); STATIC_ASSERT(MEMBER_SIZE(struct vkd3d_shader_scan_info, uav_read_mask) * CHAR_BIT >= VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS); +static void vkd3d_shader_dump_blob(const char *path, const char *prefix, const void *data, size_t size) +{ + static int shader_id = 0; + char filename[1024]; + unsigned int id; + FILE *f; + + id = InterlockedIncrement(&shader_id) - 1; + + snprintf(filename, ARRAY_SIZE(filename), "%s/vkd3d-shader-%s-%u.dxbc", path, prefix, id); + if ((f = fopen(filename, "wb"))) + { + if (fwrite(data, 1, size, f) != size) + ERR("Failed to write shader to %s.\n", filename); + if (fclose(f)) + ERR("Failed to close stream %s.\n", filename); + } + else + { + ERR("Failed to open %s for dumping shader.\n", filename); + } +} + +static void vkd3d_shader_dump_shader(enum vkd3d_shader_type type, const struct vkd3d_shader_code *shader) +{ + static bool enabled = true; + const char *path; + + if (!enabled) + return; + + if (!(path = getenv("VKD3D_SHADER_DUMP_PATH"))) + { + enabled = false; + return; + } + + vkd3d_shader_dump_blob(path, shader_get_type_prefix(type), shader->code, shader->size); +} + struct vkd3d_shader_parser { struct vkd3d_shader_desc shader_desc; @@ -114,6 +156,8 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, if ((ret = vkd3d_shader_parser_init(&parser, dxbc)) < 0) return ret; + vkd3d_shader_dump_shader(parser.shader_version.type, dxbc); + if (TRACE_ON()) vkd3d_shader_trace(parser.data); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index e08f1f3caca7..ba5875cacaf4 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -791,6 +791,8 @@ static inline bool vkd3d_shader_register_is_output(const struct vkd3d_shader_reg void vkd3d_shader_trace(void *data) DECLSPEC_HIDDEN; +const char *shader_get_type_prefix(enum vkd3d_shader_type type) DECLSPEC_HIDDEN; + void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, const struct vkd3d_shader_signature *output_signature) DECLSPEC_HIDDEN; void shader_sm4_free(void *data) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 08f2f3cc2a36..90a15f45f4ba 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -19,8 +19,6 @@ #include "vkd3d_private.h" -#include <stdio.h> - /* ID3D12RootSignature */ static inline struct d3d12_root_signature *impl_from_ID3D12RootSignature(ID3D12RootSignature *iface) { @@ -1243,71 +1241,6 @@ struct d3d12_pipeline_state *unsafe_impl_from_ID3D12PipelineState(ID3D12Pipeline return impl_from_ID3D12PipelineState(iface); } -static void dump_shader(const char *path, const char *prefix, const void *data, size_t size) -{ - static int shader_id = 0; - char filename[1024]; - unsigned int id; - FILE *f; - - id = InterlockedIncrement(&shader_id) - 1; - - snprintf(filename, ARRAY_SIZE(filename), "%s/vkd3d-shader-%s-%u.dxbc", path, prefix, id); - if (!(f = fopen(filename, "wb"))) - { - ERR("Failed to open %s for dumping shader.\n", filename); - return; - } - - if (fwrite(data, 1, size, f) != size) - ERR("Failed to write shader to %s.\n", filename); - if (fclose(f)) - ERR("Failed to close stream %s.\n", filename); -} - -static void dump_shader_stage(VkShaderStageFlagBits stage, const void *data, size_t size) -{ - static bool enabled = true; - const char *prefix; - const char *path; - - if (!enabled) - return; - - if (!(path = getenv("VKD3D_SHADER_DUMP_PATH"))) - { - enabled = false; - return; - } - - switch (stage) - { - case VK_SHADER_STAGE_VERTEX_BIT: - prefix = "vs"; - break; - case VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT: - prefix = "hs"; - break; - case VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT: - prefix = "ds"; - break; - case VK_SHADER_STAGE_GEOMETRY_BIT: - prefix = "gs"; - break; - case VK_SHADER_STAGE_FRAGMENT_BIT: - prefix = "ps"; - break; - case VK_SHADER_STAGE_COMPUTE_BIT: - prefix = "cs"; - break; - default: - prefix = "unk"; - break; - } - - dump_shader(path, prefix, data, size); -} - static HRESULT create_shader_stage(struct d3d12_device *device, struct VkPipelineShaderStageCreateInfo *stage_desc, enum VkShaderStageFlagBits stage, const D3D12_SHADER_BYTECODE *code, const struct vkd3d_shader_interface_info *shader_interface, @@ -1331,7 +1264,6 @@ static HRESULT create_shader_stage(struct d3d12_device *device, shader_desc.pNext = NULL; shader_desc.flags = 0; - dump_shader_stage(stage, code->pShaderBytecode, code->BytecodeLength); if ((ret = vkd3d_shader_compile_dxbc(&dxbc, &spirv, 0, shader_interface, compile_args)) < 0) { WARN("Failed to compile shader, vkd3d result %d.\n", ret); -- 2.19.2

2 1

[PATCH vkd3d 3/9] vkd3d-common: Add support for naming debug environment variable.
by Józef Kucia 31 Jan '19

31 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_debug.h | 2 ++ libs/vkd3d-common/debug.c | 4 +++- libs/vkd3d-shader/vkd3d_shader_main.c | 2 ++ libs/vkd3d-utils/vkd3d_utils_main.c | 2 ++ libs/vkd3d/vkd3d_main.c | 2 ++ 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index e5e938dbb3f3..8b4c77db291d 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -57,6 +57,8 @@ const char *debugstr_w(const WCHAR *wstr, size_t wchar_size) DECLSPEC_HIDDEN; #define TRACE_ON() (vkd3d_dbg_get_level() == VKD3D_DBG_LEVEL_TRACE) +#define VKD3D_DEBUG_ENV_NAME(name) const char *vkd3d_dbg_env_name = name + static inline const char *debugstr_guid(const GUID *guid) { if (!guid) diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index b8380457058d..ee23ab0f49a8 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -28,6 +28,8 @@ #define VKD3D_DEBUG_BUFFER_COUNT 64 #define VKD3D_DEBUG_BUFFER_SIZE 512 +extern const char *vkd3d_dbg_env_name DECLSPEC_HIDDEN; + static const char *debug_level_names[] = { /* VKD3D_DBG_LEVEL_NONE */ "none", @@ -46,7 +48,7 @@ enum vkd3d_dbg_level vkd3d_dbg_get_level(void) if (level != ~0u) return level; - if (!(vkd3d_debug = getenv("VKD3D_DEBUG"))) + if (!(vkd3d_debug = getenv(vkd3d_dbg_env_name))) vkd3d_debug = ""; for (i = 0; i < ARRAY_SIZE(debug_level_names); ++i) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index dfd6b726d1d6..071880808755 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -20,6 +20,8 @@ #include <stdio.h> +VKD3D_DEBUG_ENV_NAME("VKD3D_DEBUG"); + STATIC_ASSERT(MEMBER_SIZE(struct vkd3d_shader_scan_info, uav_counter_mask) * CHAR_BIT >= VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS); STATIC_ASSERT(MEMBER_SIZE(struct vkd3d_shader_scan_info, uav_read_mask) * CHAR_BIT >= VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS); diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index fa6e5f8f1616..03f9f52261ad 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -18,6 +18,8 @@ #include "vkd3d_utils_private.h" +VKD3D_DEBUG_ENV_NAME("VKD3D_DEBUG"); + HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug) { FIXME("iid %s, debug %p stub!\n", debugstr_guid(iid), debug); diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 63dabda06395..ba55056d11f7 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -19,6 +19,8 @@ #define INITGUID #include "vkd3d_private.h" +VKD3D_DEBUG_ENV_NAME("VKD3D_DEBUG"); + HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, REFIID iid, void **device) { -- 2.19.2

2 1

[PATCH vkd3d 1/9] tests: Add tests for image memory allocation info with various miplevels.
by Józef Kucia 31 Jan '19

31 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 21214738c6fa..1b6b91763269 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -22850,16 +22850,20 @@ static void test_resource_allocation_info(void) unsigned int width; unsigned int height; unsigned int array_size; + unsigned int miplevels; DXGI_FORMAT format; } texture_tests[] = { - { 4, 4, 1, DXGI_FORMAT_R8_UINT}, - { 8, 8, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, - {16, 16, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, - {16, 16, 6, DXGI_FORMAT_R8G8B8A8_UNORM}, + { 4, 4, 1, 1, DXGI_FORMAT_R8_UINT}, + { 8, 8, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, + {16, 16, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, + {16, 16, 6, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, - {1024, 1024, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, + {1024, 1024, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, + {1024, 1024, 1, 2, DXGI_FORMAT_R8G8B8A8_UNORM}, + {1024, 1024, 1, 3, DXGI_FORMAT_R8G8B8A8_UNORM}, + {1024, 1024, 1, 0, DXGI_FORMAT_R8G8B8A8_UNORM}, }; if (!(device = create_device())) @@ -22902,7 +22906,6 @@ static void test_resource_allocation_info(void) } desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; - desc.MipLevels = 1; desc.SampleDesc.Count = 1; desc.SampleDesc.Quality = 0; desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; @@ -22913,6 +22916,7 @@ static void test_resource_allocation_info(void) desc.Width = texture_tests[i].width; desc.Height = texture_tests[i].height; desc.DepthOrArraySize = texture_tests[i].array_size; + desc.MipLevels = texture_tests[i].miplevels; desc.Format = texture_tests[i].format; desc.Alignment = 0; -- 2.19.2

2 1

[PATCH vkd3d v2 5/5] vkd3d: Implement d3d12_fence_SetName().
by Zhiyi Zhang 31 Jan '19

31 Jan '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- libs/vkd3d/command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 47c8854..9af1ec9 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -435,9 +435,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetName(ID3D12Fence *iface, const W { struct d3d12_fence *fence = impl_from_ID3D12Fence(iface); - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, fence->device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, fence->device->wchar_size)); - return E_NOTIMPL; + return name ? S_OK : E_INVALIDARG; } static HRESULT STDMETHODCALLTYPE d3d12_fence_GetDevice(ID3D12Fence *iface, -- 2.20.1

2 1

[PATCH vkd3d v2 4/5] vkd3d: Implement d3d12_command_signature_SetName().
by Zhiyi Zhang 31 Jan '19

31 Jan '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- libs/vkd3d/command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index fa5f8fb..47c8854 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4975,9 +4975,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_signature_SetName(ID3D12CommandSi { struct d3d12_command_signature *signature = impl_from_ID3D12CommandSignature(iface); - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, signature->device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, signature->device->wchar_size)); - return E_NOTIMPL; + return name ? S_OK : E_INVALIDARG; } static HRESULT STDMETHODCALLTYPE d3d12_command_signature_GetDevice(ID3D12CommandSignature *iface, -- 2.20.1

2 1

[PATCH vkd3d v2 3/5] vkd3d: Implement d3d12_root_signature_SetName().
by Zhiyi Zhang 31 Jan '19

31 Jan '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- libs/vkd3d/state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index c419997..75feacc 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -150,9 +150,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_root_signature_SetName(ID3D12RootSignatur { struct d3d12_root_signature *root_signature = impl_from_ID3D12RootSignature(iface); - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, root_signature->device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, root_signature->device->wchar_size)); - return E_NOTIMPL; + return name ? S_OK : E_INVALIDARG; } static HRESULT STDMETHODCALLTYPE d3d12_root_signature_GetDevice(ID3D12RootSignature *iface, -- 2.20.1

2 1

[PATCH vkd3d v2 2/5] vkd3d: Implement d3d12_pipeline_state_SetName().
by Zhiyi Zhang 31 Jan '19

31 Jan '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- libs/vkd3d/state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 08f2f3c..c419997 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1195,9 +1195,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_pipeline_state_SetName(ID3D12PipelineStat { struct d3d12_pipeline_state *state = impl_from_ID3D12PipelineState(iface); - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, state->device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, state->device->wchar_size)); - return E_NOTIMPL; + return name ? S_OK : E_INVALIDARG; } static HRESULT STDMETHODCALLTYPE d3d12_pipeline_state_GetDevice(ID3D12PipelineState *iface, -- 2.20.1

2 1

[PATCH vkd3d v2 1/5] vkd3d: Implement d3d12_descriptor_heap_SetName().
by Zhiyi Zhang 31 Jan '19

31 Jan '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Supersede 157123~157127,157532~157541 libs/vkd3d/resource.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index ced232d..34f558d 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2514,9 +2514,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_descriptor_heap_SetName(ID3D12DescriptorH { struct d3d12_descriptor_heap *heap = impl_from_ID3D12DescriptorHeap(iface); - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, heap->device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, heap->device->wchar_size)); - return E_NOTIMPL; + return name ? S_OK : E_INVALIDARG; } static HRESULT STDMETHODCALLTYPE d3d12_descriptor_heap_GetDevice(ID3D12DescriptorHeap *iface, -- 2.20.1

2 1

[PATCH] ntdll: correct space/mark parity
by Julien D'ascenzio 31 Jan '19

31 Jan '19

When CMSPAR is define, the space and mark parity is reversed: The flag PARODD isn't set correctly --- dlls/ntdll/serial.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 29e9fafbca..b3404d4534 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -280,8 +280,8 @@ static NTSTATUS get_line_control(int fd, SERIAL_LINE_CONTROL* slc) case PARENB: slc->Parity = EVENPARITY; break; case PARENB|PARODD: slc->Parity = ODDPARITY; break; #ifdef CMSPAR - case PARENB|CMSPAR: slc->Parity = MARKPARITY; break; - case PARENB|PARODD|CMSPAR: slc->Parity = SPACEPARITY; break; + case PARENB|PARODD|CMSPAR: slc->Parity = MARKPARITY; break; + case PARENB|CMSPAR: slc->Parity = SPACEPARITY; break; #endif } switch (port.c_cflag & CSIZE) @@ -676,8 +676,8 @@ static NTSTATUS set_line_control(int fd, const SERIAL_LINE_CONTROL* slc) case EVENPARITY: port.c_cflag |= PARENB; break; #ifdef CMSPAR /* Linux defines mark/space (stick) parity */ - case MARKPARITY: port.c_cflag |= PARENB | CMSPAR; break; - case SPACEPARITY: port.c_cflag |= PARENB | PARODD | CMSPAR; break; + case MARKPARITY: port.c_cflag |= PARENB | PARODD | CMSPAR; break; + case SPACEPARITY: port.c_cflag |= PARENB | CMSPAR; break; #else /* try the POSIX way */ case MARKPARITY: -- 2.11.0

1 0

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-devel