wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

Józef Kucia : wined3d: Implement SM5 gather4_c instruction.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: 6fec723c9da859e2ad4f7fa2e7264633740fdf9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fec723c9da859e2ad4f7fa2e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 11 13:30:32 2017 +0200 wined3d: Implement SM5 gather4_c instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 11 ++++++++--- dlls/wined3d/shader.c | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c617393..7cd1698 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5898,8 +5898,8 @@ static void shader_glsl_sample_c(const struct wined3d_shader_instruction *ins) struct glsl_src_param coord_param, compare_param; struct glsl_sample_function sample_function; const char *lod_param = NULL; + unsigned int coord_size; DWORD flags = 0; - UINT coord_size; if (ins->handler_idx == WINED3DSIH_SAMPLE_C_LZ) { @@ -5932,8 +5932,8 @@ static void shader_glsl_gather4(const struct wined3d_shader_instruction *ins) const struct wined3d_shader_resource_info *resource_info; unsigned int resource_idx, sampler_idx, sampler_bind_idx; struct wined3d_string_buffer *buffer = ins->ctx->buffer; + struct glsl_src_param coord_param, compare_param; unsigned int coord_size, offset_size; - struct glsl_src_param coord_param; char dst_swizzle[6]; BOOL has_offset; @@ -5966,6 +5966,11 @@ static void shader_glsl_gather4(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "textureGather%s(%s_sampler%u, %s", has_offset ? "Offset" : "", prefix, sampler_bind_idx, coord_param.param_str); + if (ins->handler_idx == WINED3DSIH_GATHER4_C) + { + shader_glsl_add_src_param(ins, &ins->src[3], WINED3DSP_WRITEMASK_0, &compare_param); + shader_addline(buffer, ", %s", compare_param.param_str); + } if (has_offset) { int offset_immdata[4] = {ins->texel_offset.u, ins->texel_offset.v, ins->texel_offset.w}; @@ -10040,7 +10045,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_FTOI */ shader_glsl_to_int, /* WINED3DSIH_FTOU */ shader_glsl_to_uint, /* WINED3DSIH_GATHER4 */ shader_glsl_gather4, - /* WINED3DSIH_GATHER4_C */ NULL, + /* WINED3DSIH_GATHER4_C */ shader_glsl_gather4, /* WINED3DSIH_GE */ shader_glsl_relop, /* WINED3DSIH_HS_CONTROL_POINT_PHASE */ NULL, /* WINED3DSIH_HS_DECLS */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f44ce28..acf914b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1449,6 +1449,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st --cur_loop_depth; } else if (ins.handler_idx == WINED3DSIH_GATHER4 + || ins.handler_idx == WINED3DSIH_GATHER4_C || ins.handler_idx == WINED3DSIH_SAMPLE || ins.handler_idx == WINED3DSIH_SAMPLE_B || ins.handler_idx == WINED3DSIH_SAMPLE_C

1 0

Józef Kucia : wined3d: Implement SM4.1 gather4 instruction.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: 2fad01e59d3c7ca43b7ded35dc2c18b0a57e2a86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fad01e59d3c7ca43b7ded35d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 11 13:30:31 2017 +0200 wined3d: Implement SM4.1 gather4 instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 76 +++++++++++++++++++++++++++++++++++++++++----- dlls/wined3d/shader.c | 3 +- 2 files changed, 70 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 348de8f..c617393 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3434,6 +3434,18 @@ static BOOL shader_glsl_has_core_grad(const struct wined3d_gl_info *gl_info, return shader_glsl_get_version(gl_info, version) >= 130 || gl_info->supported[EXT_GPU_SHADER4]; } +static void shader_glsl_get_coord_size(enum wined3d_shader_resource_type resource_type, + unsigned int *coord_size, unsigned int *deriv_size) +{ + const BOOL is_array = resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY + || resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY; + + *coord_size = resource_type_info[resource_type].coord_size; + *deriv_size = *coord_size; + if (is_array) + --(*deriv_size); +} + static void shader_glsl_get_sample_function(const struct wined3d_shader_context *ctx, DWORD resource_idx, DWORD sampler_idx, DWORD flags, struct glsl_sample_function *sample_function) { @@ -3450,7 +3462,6 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context BOOL offset = flags & WINED3D_GLSL_SAMPLE_OFFSET; const char *base = "texture", *type_part = "", *suffix = ""; unsigned int coord_size, deriv_size; - BOOL array; sample_function->data_type = ctx->reg_maps->resource_info[resource_idx].data_type; @@ -3459,8 +3470,6 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context ERR("Unexpected resource type %#x.\n", resource_type); resource_type = WINED3D_SHADER_RESOURCE_TEXTURE_2D; } - array = resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY - || resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY; /* Note that there's no such thing as a projected cube texture. */ if (resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_CUBE) @@ -3500,12 +3509,9 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context string_buffer_sprintf(sample_function->name, "%s%s%s%s%s%s", base, type_part, projected ? "Proj" : "", lod ? "Lod" : grad ? "Grad" : "", offset ? "Offset" : "", suffix); - coord_size = resource_type_info[resource_type].coord_size; - deriv_size = coord_size; + shader_glsl_get_coord_size(resource_type, &coord_size, &deriv_size); if (shadow) ++coord_size; - if (array) - --deriv_size; sample_function->offset_size = offset ? deriv_size : 0; sample_function->coord_mask = (1u << coord_size) - 1; sample_function->deriv_mask = (1u << deriv_size) - 1; @@ -5918,6 +5924,58 @@ static void shader_glsl_sample_c(const struct wined3d_shader_instruction *ins) shader_glsl_release_sample_function(ins->ctx, &sample_function); } +static void shader_glsl_gather4(const struct wined3d_shader_instruction *ins) +{ + const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; + const char *prefix = shader_glsl_get_prefix(reg_maps->shader_version.type); + const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + const struct wined3d_shader_resource_info *resource_info; + unsigned int resource_idx, sampler_idx, sampler_bind_idx; + struct wined3d_string_buffer *buffer = ins->ctx->buffer; + unsigned int coord_size, offset_size; + struct glsl_src_param coord_param; + char dst_swizzle[6]; + BOOL has_offset; + + if (!gl_info->supported[ARB_TEXTURE_GATHER]) + { + FIXME("OpenGL implementation does not support textureGather.\n"); + return; + } + + has_offset = wined3d_shader_instruction_has_texel_offset(ins); + + resource_idx = ins->src[1].reg.idx[0].offset; + sampler_idx = ins->src[2].reg.idx[0].offset; + sampler_bind_idx = shader_glsl_find_sampler(&reg_maps->sampler_map, resource_idx, sampler_idx); + + if (!(resource_info = shader_glsl_get_resource_info(ins, &ins->src[1].reg))) + return; + + if (resource_info->type >= ARRAY_SIZE(resource_type_info)) + { + ERR("Unexpected resource type %#x.\n", resource_info->type); + return; + } + shader_glsl_get_coord_size(resource_info->type, &coord_size, &offset_size); + + shader_glsl_swizzle_to_str(ins->src[1].swizzle, FALSE, ins->dst[0].write_mask, dst_swizzle); + shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0], resource_info->data_type); + + shader_glsl_add_src_param(ins, &ins->src[0], (1u << coord_size) - 1, &coord_param); + + shader_addline(buffer, "textureGather%s(%s_sampler%u, %s", + has_offset ? "Offset" : "", prefix, sampler_bind_idx, coord_param.param_str); + if (has_offset) + { + int offset_immdata[4] = {ins->texel_offset.u, ins->texel_offset.v, ins->texel_offset.w}; + shader_addline(buffer, ", "); + shader_glsl_append_imm_ivec(buffer, offset_immdata, offset_size); + } + + shader_addline(buffer, ")%s);\n", dst_swizzle); +} + static void shader_glsl_texcoord(const struct wined3d_shader_instruction *ins) { /* FIXME: Make this work for more than just 2D textures */ @@ -7004,6 +7062,8 @@ static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer, shader_addline(buffer, "#extension GL_ARB_shading_language_packing : enable\n"); if (gl_info->supported[ARB_TEXTURE_CUBE_MAP_ARRAY]) shader_addline(buffer, "#extension GL_ARB_texture_cube_map_array : enable\n"); + if (gl_info->supported[ARB_TEXTURE_GATHER]) + shader_addline(buffer, "#extension GL_ARB_texture_gather : enable\n"); if (gl_info->supported[ARB_TEXTURE_QUERY_LEVELS]) shader_addline(buffer, "#extension GL_ARB_texture_query_levels : enable\n"); if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) @@ -9979,7 +10039,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_FRC */ shader_glsl_map2gl, /* WINED3DSIH_FTOI */ shader_glsl_to_int, /* WINED3DSIH_FTOU */ shader_glsl_to_uint, - /* WINED3DSIH_GATHER4 */ NULL, + /* WINED3DSIH_GATHER4 */ shader_glsl_gather4, /* WINED3DSIH_GATHER4_C */ NULL, /* WINED3DSIH_GE */ shader_glsl_relop, /* WINED3DSIH_HS_CONTROL_POINT_PHASE */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 3783006..f44ce28 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1448,7 +1448,8 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st { --cur_loop_depth; } - else if (ins.handler_idx == WINED3DSIH_SAMPLE + else if (ins.handler_idx == WINED3DSIH_GATHER4 + || ins.handler_idx == WINED3DSIH_SAMPLE || ins.handler_idx == WINED3DSIH_SAMPLE_B || ins.handler_idx == WINED3DSIH_SAMPLE_C || ins.handler_idx == WINED3DSIH_SAMPLE_C_LZ

1 0

Józef Kucia : wined3d: Add ARB_texture_gather extension.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: ec5cb71bd908839f19c4716e13ab442f4b847050 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec5cb71bd908839f19c4716e1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 11 13:30:30 2017 +0200 wined3d: Add ARB_texture_gather extension. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/glsl_shader.c | 3 ++- dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f434157..0aaa35e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -172,6 +172,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_texture_env_combine", ARB_TEXTURE_ENV_COMBINE }, {"GL_ARB_texture_env_dot3", ARB_TEXTURE_ENV_DOT3 }, {"GL_ARB_texture_float", ARB_TEXTURE_FLOAT }, + {"GL_ARB_texture_gather", ARB_TEXTURE_GATHER }, {"GL_ARB_texture_mirrored_repeat", ARB_TEXTURE_MIRRORED_REPEAT }, {"GL_ARB_texture_mirror_clamp_to_edge", ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE}, {"GL_ARB_texture_non_power_of_two", ARB_TEXTURE_NON_POWER_OF_TWO }, @@ -3828,6 +3829,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_GPU_SHADER5, MAKEDWORD_VERSION(4, 0)}, {ARB_TEXTURE_CUBE_MAP_ARRAY, MAKEDWORD_VERSION(4, 0)}, + {ARB_TEXTURE_GATHER, MAKEDWORD_VERSION(4, 0)}, {ARB_TRANSFORM_FEEDBACK2, MAKEDWORD_VERSION(4, 0)}, {ARB_TRANSFORM_FEEDBACK3, MAKEDWORD_VERSION(4, 0)}, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1130b20..348de8f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9788,7 +9788,7 @@ static void shader_glsl_init_context_state(struct wined3d_context *context) static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct shader_caps *caps) { - UINT shader_model; + unsigned int shader_model; /* FIXME: Check for the specific extensions required for SM5 support * (ARB_compute_shader, ARB_tessellation_shader, ARB_gpu_shader5, ...) as @@ -9802,6 +9802,7 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s && gl_info->supported[ARB_SHADER_IMAGE_LOAD_STORE] && gl_info->supported[ARB_SHADER_IMAGE_SIZE] && gl_info->supported[ARB_SHADING_LANGUAGE_PACKING] + && gl_info->supported[ARB_TEXTURE_GATHER] && gl_info->supported[ARB_TRANSFORM_FEEDBACK3]) shader_model = 5; else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) && gl_info->supported[WINED3D_GL_VERSION_3_2] diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 4960fc7..2d1c606 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -105,6 +105,7 @@ enum wined3d_gl_extension ARB_TEXTURE_ENV_COMBINE, ARB_TEXTURE_ENV_DOT3, ARB_TEXTURE_FLOAT, + ARB_TEXTURE_GATHER, ARB_TEXTURE_MIRRORED_REPEAT, ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE, ARB_TEXTURE_NON_POWER_OF_TWO,

1 0

Alistair Leslie-Hughes : wmvcore/tests: Add initial tests.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: 4ff2e36b59e0091d74f60d405a84fbc3e3dc8e0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ff2e36b59e0091d74f60d405… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 30 22:07:06 2017 +0000 wmvcore/tests: Add initial tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +- configure.ac | 3 +- dlls/wmvcore/Makefile.in | 1 + dlls/wmvcore/tests/Makefile.in | 5 ++ dlls/wmvcore/tests/wmvcore.c | 142 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 152 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 34a84ca..93fd7e5 100755 --- a/configure +++ b/configure @@ -18483,7 +18483,8 @@ wine_fn_config_dll wmiutils enable_wmiutils clean wine_fn_config_test dlls/wmiutils/tests wmiutils_test wine_fn_config_dll wmp enable_wmp clean wine_fn_config_test dlls/wmp/tests wmp_test -wine_fn_config_dll wmvcore enable_wmvcore +wine_fn_config_dll wmvcore enable_wmvcore implib +wine_fn_config_test dlls/wmvcore/tests wmvcore_test wine_fn_config_dll wnaspi32 enable_wnaspi32 implib wine_fn_config_dll wow32 enable_win16 implib wine_fn_config_dll wpc enable_wpc clean diff --git a/configure.ac b/configure.ac index fa27a6c..b231fe9 100644 --- a/configure.ac +++ b/configure.ac @@ -3517,7 +3517,8 @@ WINE_CONFIG_DLL(wmiutils,,[clean]) WINE_CONFIG_TEST(dlls/wmiutils/tests) WINE_CONFIG_DLL(wmp,,[clean]) WINE_CONFIG_TEST(dlls/wmp/tests) -WINE_CONFIG_DLL(wmvcore) +WINE_CONFIG_DLL(wmvcore,,[implib]) +WINE_CONFIG_TEST(dlls/wmvcore/tests) WINE_CONFIG_DLL(wnaspi32,,[implib]) WINE_CONFIG_DLL(wow32,enable_win16,[implib]) WINE_CONFIG_DLL(wpc,,[clean]) diff --git a/dlls/wmvcore/Makefile.in b/dlls/wmvcore/Makefile.in index ba3539b..0ee6f97 100644 --- a/dlls/wmvcore/Makefile.in +++ b/dlls/wmvcore/Makefile.in @@ -1,4 +1,5 @@ MODULE = wmvcore.dll +IMPORTLIB = wmvcore IMPORTS = kernel32 C_SRCS = \ diff --git a/dlls/wmvcore/tests/Makefile.in b/dlls/wmvcore/tests/Makefile.in new file mode 100644 index 0000000..8054ddd --- /dev/null +++ b/dlls/wmvcore/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = wmvcore.dll +IMPORTS = ole32 wmvcore + +C_SRCS = \ + wmvcore.c diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c new file mode 100644 index 0000000..ef77aff --- /dev/null +++ b/dlls/wmvcore/tests/wmvcore.c @@ -0,0 +1,142 @@ +/* + * Copyright 2017 Alistair Leslie-Hughes + * + * 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 + */ +#define COBJMACROS +#define WIN32_LEAN_AND_MEAN +#include "initguid.h" +#include "wmsdkidl.h" + +#include "wine/test.h" + +static void test_wmwriter_interfaces(void) +{ + HRESULT hr; + IWMWriter *writer; + IWMHeaderInfo *header; + IWMHeaderInfo2 *header2; + IWMHeaderInfo3 *header3; + + hr = WMCreateWriter( NULL, &writer ); + ok(hr == S_OK, "WMCreateWriter failed 0x%08x\n", hr); + if(FAILED(hr)) + { + win_skip("Failed to create IWMWriter\n"); + return; + } + + hr = IWMWriter_QueryInterface(writer, &IID_IWMHeaderInfo, (void **)&header); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMWriter_QueryInterface(writer, &IID_IWMHeaderInfo2, (void **)&header2); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMWriter_QueryInterface(writer, &IID_IWMHeaderInfo3, (void **)&header3); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + if(header) + IWMHeaderInfo_Release(header); + if(header2) + IWMHeaderInfo2_Release(header2); + if(header3) + IWMHeaderInfo3_Release(header3); + IWMWriter_Release(writer); +} + +static void test_wmreader_interfaces(void) +{ + HRESULT hr; + IWMReader *reader; + IWMReaderAdvanced *advanced; + IWMReaderAdvanced2 *advanced2; + IWMHeaderInfo *header; + IWMHeaderInfo2 *header2; + IWMHeaderInfo3 *header3; + IWMProfile *profile; + + hr = WMCreateReader( NULL, 0, &reader ); + ok(hr == S_OK, "WMCreateReader failed 0x%08x\n", hr); + if(FAILED(hr)) + { + win_skip("Failed to create IWMReader\n"); + return; + } + + hr = IWMReader_QueryInterface(reader, &IID_IWMReaderAdvanced, (void **)&advanced); + ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMReaderAdvanced2, (void **)&advanced2); + ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMHeaderInfo, (void **)&header); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMHeaderInfo2, (void **)&header2); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMHeaderInfo3, (void **)&header3); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMReader_QueryInterface(reader, &IID_IWMProfile, (void **)&profile); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + if(advanced) + IWMReaderAdvanced_Release(advanced); + if(advanced2) + IWMReaderAdvanced2_Release(advanced2); + if(profile) + IWMProfile_Release(profile); + if(header) + IWMHeaderInfo_Release(header); + if(header2) + IWMHeaderInfo2_Release(header2); + if(header3) + IWMHeaderInfo3_Release(header3); + + IWMReader_Release(reader); +} + +void test_profile_manager_interfaces(void) +{ + HRESULT hr; + IWMProfileManager *profile; + + hr = WMCreateProfileManager(&profile); + ok(hr == S_OK, "WMCreateProfileManager failed 0x%08x\n", hr); + if(FAILED(hr)) + { + win_skip("Failed to create IWMProfileManager\n"); + return; + } + + IWMProfileManager_Release(profile); +} + +START_TEST(wmvcore) +{ + HRESULT hr; + + hr = CoInitialize(0); + ok(hr == S_OK, "failed to init com\n"); + if(hr != S_OK) + return; + + test_wmreader_interfaces(); + test_wmwriter_interfaces(); + test_profile_manager_interfaces(); + + CoUninitialize(); +}

1 0

Alistair Leslie-Hughes : include: Add interfaces IWMHeaderInfo/2/3.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: fbe53db498f256b9001cbee0b21a94b28a58123a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbe53db498f256b9001cbee0b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 30 22:06:53 2017 +0000 include: Add interfaces IWMHeaderInfo/2/3. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmsdkidl.idl | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 158 insertions(+) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 0606be1..5ce849f 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -183,6 +183,13 @@ typedef enum tagWMT_OFFSET_FORMAT WMT_OFFSET_FORMAT_100NS_APPROXIMATE } WMT_OFFSET_FORMAT; +typedef enum WMT_CODEC_INFO_TYPE +{ + WMT_CODECINFO_AUDIO = 0, + WMT_CODECINFO_VIDEO = 1, + WMT_CODECINFO_UNKNOWN = 0xFFFFFFFF, +} WMT_CODEC_INFO_TYPE; + typedef LPCWSTR LPCWSTR_WMSDK_TYPE_SAFE; [ @@ -1016,6 +1023,157 @@ interface IWMWriterAdvanced3 : IWMWriterAdvanced2 HRESULT SetNonBlocking(); } +[ + object, + uuid(96406bda-2b2b-11d3-b36b-00c04f6108ff), + pointer_default(unique), + local +] +interface IWMHeaderInfo : IUnknown +{ + HRESULT GetAttributeCount( + [in] WORD stream_num, + [out] WORD *attributes ); + + HRESULT GetAttributeByIndex( + [in] WORD index, + [in, out] WORD *stream_num, + [out, size_is( *name_len )] WCHAR *name, + [in, out] WORD *name_len, + [out] WMT_ATTR_DATATYPE *type, + [out, size_is( *length )] BYTE *value, + [in, out] WORD *length ); + + HRESULT GetAttributeByName( + [in, out] WORD *stream_num, + [in] LPCWSTR name, + [out] WMT_ATTR_DATATYPE *type, + [out, size_is( *length )] BYTE *value, + [in, out] WORD *length ); + + HRESULT SetAttribute( + [in] WORD stream_num, + [in] LPCWSTR name, + [in] WMT_ATTR_DATATYPE type, + [in, size_is( length )] const BYTE *value, + [in] WORD length ); + + HRESULT GetMarkerCount( + [out] WORD *markers ); + + HRESULT GetMarker( + [in] WORD index, + [out, size_is( *marker_len )] WCHAR *marker_name, + [in, out] WORD *marker_len, + [out] QWORD *marker_time ); + + HRESULT AddMarker( + [in] LPCWSTR_WMSDK_TYPE_SAFE marker_name, + [in] QWORD marker_time ); + + HRESULT RemoveMarker( + [in] WORD index ); + + HRESULT GetScriptCount( + [out] WORD *scripts ); + + HRESULT GetScript( + [in] WORD index, + [out, size_is( *type_len )] WCHAR *type, + [in, out] WORD *type_len, + [out, size_is( *command_len )] WCHAR *command, + [in, out] WORD *command_len, + [out] QWORD *script_time ); + + HRESULT AddScript( + [in] LPCWSTR_WMSDK_TYPE_SAFE type, + [in] LPCWSTR_WMSDK_TYPE_SAFE command, + [in] QWORD script_time ); + + HRESULT RemoveScript( + [in] WORD index ); +}; + +[ + object, + uuid(15cf9781-454e-482e-b393-85fae487a810), + pointer_default(unique), + local +] +interface IWMHeaderInfo2 : IWMHeaderInfo +{ + HRESULT GetCodecInfoCount( + [out] DWORD *codec_infos ); + + HRESULT GetCodecInfo( + [in] DWORD index, + [in, out] WORD *name_len, + [out, size_is( *name_len )] WCHAR *name, + [in, out] WORD *description_len, + [out, size_is( *description_len )] WCHAR *description, + [out] WMT_CODEC_INFO_TYPE *codec_type, + [in, out] WORD *codec_info_cnt, + [out, size_is( *codec_info_cnt )] BYTE *codec_info ); +}; + +[ + object, + uuid(15cc68e3-27cc-4ecd-b222-3f5d02d80bd5), + pointer_default(unique), + local +] +interface IWMHeaderInfo3 : IWMHeaderInfo2 +{ + HRESULT GetAttributeCountEx( + [in] WORD stream_num, + [out] WORD *attributes ); + + HRESULT GetAttributeIndices( + [in] WORD stream_num, + [in] LPCWSTR name, + [in] WORD *lang_index, + [out, size_is( *count )] WORD *indices, + [in, out] WORD *count ); + + HRESULT GetAttributeByIndexEx( + [in] WORD stream_num, + [in] WORD index, + [out, size_is( *name_len )] LPWSTR name, + [in, out] WORD *name_len, + [out] WMT_ATTR_DATATYPE *type, + [out] WORD *lang_index, + [out, size_is( *data_len )] BYTE *value, + [in, out] DWORD *data_len ); + + HRESULT ModifyAttribute( + [in] WORD stream_num, + [in] WORD index, + [in] WMT_ATTR_DATATYPE type, + [in] WORD lang_index, + [in, size_is( length )] const BYTE *value, + [in] DWORD length ); + + HRESULT AddAttribute( + [in] WORD stream_num, + [in] LPCWSTR name, + [out] WORD *index, + [in] WMT_ATTR_DATATYPE type, + [in] WORD lang_index, + [in, size_is( length )] const BYTE *value, + [in] DWORD length ); + + HRESULT DeleteAttribute( + [in] WORD stream_num, + [in] WORD index ); + + HRESULT AddCodecInfo( + [in] LPCWSTR_WMSDK_TYPE_SAFE name, + [in] LPCWSTR_WMSDK_TYPE_SAFE description, + [in] WMT_CODEC_INFO_TYPE codec_type, + [in] WORD codec_info_cnt, + [in, size_is( codec_info_cnt )] BYTE *codec_info ); +}; + cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") cpp_quote("HRESULT WINAPI WMCreateReader(IUnknown*,DWORD,IWMReader**);")

1 0

Huw Davies : user32/tests: Fix tests for minimium icon spacing when not in DPI scaling mode.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: e352b29d12a72e9a616d71b7a504e939c307f1c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e352b29d12a72e9a616d71b7a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 11 14:08:53 2017 +0100 user32/tests: Fix tests for minimium icon spacing when not in DPI scaling mode. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 055060e..96b1581 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -884,7 +884,7 @@ static void test_SPI_SETKEYBOARDSPEED( void ) /* 10 */ static BOOL dotest_spi_iconhorizontalspacing( INT curr_val) { BOOL rc; - INT spacing, regval; + INT spacing, regval, min_val = MulDiv( 32, dpi, USER_DEFAULT_SCREEN_DPI ); ICONMETRICSA im; rc=SystemParametersInfoA( SPI_ICONHORIZONTALSPACING, curr_val, 0, @@ -892,7 +892,7 @@ static BOOL dotest_spi_iconhorizontalspacing( INT curr_val) if (!test_error_msg(rc,"SPI_ICONHORIZONTALSPACING")) return FALSE; ok(rc, "SystemParametersInfoA: rc=%d err=%d\n", rc, GetLastError()); test_change_message( SPI_ICONHORIZONTALSPACING, 0 ); - if( curr_val < 32) curr_val = 32; + curr_val = max( curr_val, min_val ); /* The registry keys depend on the Windows version and the values too * let's test (works on win95,ME,NT4,2k,XP) */ @@ -1053,7 +1053,7 @@ static void test_SPI_SETKEYBOARDDELAY( void ) /* 23 */ static BOOL dotest_spi_iconverticalspacing( INT curr_val) { BOOL rc; - INT spacing, regval; + INT spacing, regval, min_val = MulDiv( 32, dpi, USER_DEFAULT_SCREEN_DPI ); ICONMETRICSA im; rc=SystemParametersInfoA( SPI_ICONVERTICALSPACING, curr_val, 0, @@ -1061,7 +1061,7 @@ static BOOL dotest_spi_iconverticalspacing( INT curr_val) if (!test_error_msg(rc,"SPI_ICONVERTICALSPACING")) return FALSE; ok(rc, "SystemParametersInfoA: rc=%d err=%d\n", rc, GetLastError()); test_change_message( SPI_ICONVERTICALSPACING, 0 ); - if( curr_val < 32) curr_val = 32; + curr_val = max( curr_val, min_val ); /* The registry keys depend on the Windows version and the values too * let's test (works on win95,ME,NT4,2k,XP) */

1 0

Huw Davies : user32/tests: Fix a few failures in DPI scaling mode.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: bfcf92f148dfd4f5030f86658d11773e49464787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfcf92f148dfd4f5030f86658… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 11 14:08:52 2017 +0100 user32/tests: Fix a few failures in DPI scaling mode. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 6f607d4..055060e 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -1424,7 +1424,7 @@ static void test_SPI_SETDRAGFULLWINDOWS( void ) /* 37 */ #define test_reg_font( KEY, VAL, LF) \ { LOGFONTA lfreg;\ lffromreg( KEY, VAL, &lfreg);\ - ok( (lfreg.lfHeight < 0 ? (LF).lfHeight == lfreg.lfHeight :\ + ok( (lfreg.lfHeight < 0 ? (LF).lfHeight == MulDiv( lfreg.lfHeight, dpi, real_dpi ) : \ MulDiv( -(LF).lfHeight , 72, dpi) == lfreg.lfHeight )&&\ (LF).lfWidth == lfreg.lfWidth &&\ (LF).lfWeight == lfreg.lfWeight &&\

1 0

Huw Davies : user32/tests: Correctly restore the caption sizes when run in DPI scaling mode.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: 0ce293a0d8f6f75e380a665cc7a35e5290a6e8e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ce293a0d8f6f75e380a665cc… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 11 14:08:51 2017 +0100 user32/tests: Correctly restore the caption sizes when run in DPI scaling mode. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 075a0c7..6f607d4 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -41,7 +41,7 @@ static LONG (WINAPI *pChangeDisplaySettingsExA)(LPCSTR, LPDEVMODEA, HWND, DWORD, LPVOID); static BOOL strict; -static int dpi; +static int dpi, real_dpi; static BOOL iswin9x; static HDC hdc; @@ -165,6 +165,19 @@ static int last_bpp; static BOOL displaychange_ok = FALSE, displaychange_test_active = FALSE; static HANDLE displaychange_sem = 0; +static int get_real_dpi(void) +{ + HKEY key; + DWORD value = USER_DEFAULT_SCREEN_DPI, size = sizeof(value); + + if (!RegOpenKeyA(HKEY_CURRENT_USER, "Control Panel\\Desktop", &key)) + { + RegQueryValueExA(key, "LogPixels", NULL, NULL, (BYTE *)&value, &size); + RegCloseKey(key); + } + return value; +} + static LRESULT CALLBACK SysParamsTestWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam ) { @@ -1475,12 +1488,14 @@ static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */ the caption font height is higher than the CaptionHeight field, the latter is adjusted accordingly. To be able to restore these setting accurately be restore the raw values. */ - Ncmorig.iCaptionWidth = metricfromreg( SPI_METRIC_REGKEY, SPI_CAPTIONWIDTH_VALNAME, dpi); + Ncmorig.iCaptionWidth = metricfromreg( SPI_METRIC_REGKEY, SPI_CAPTIONWIDTH_VALNAME, real_dpi); Ncmorig.iCaptionHeight = metricfromreg( SPI_METRIC_REGKEY, SPI_CAPTIONHEIGHT_VALNAME, dpi); Ncmorig.iSmCaptionHeight = metricfromreg( SPI_METRIC_REGKEY, SPI_SMCAPTIONHEIGHT_VALNAME, dpi); Ncmorig.iMenuHeight = metricfromreg( SPI_METRIC_REGKEY, SPI_MENUHEIGHT_VALNAME, dpi); /* test registry entries */ TEST_NONCLIENTMETRICS_REG( Ncmorig) + Ncmorig.lfCaptionFont.lfHeight = MulDiv( Ncmorig.lfCaptionFont.lfHeight, real_dpi, dpi ); + /* make small changes */ Ncmnew = Ncmstart; Ncmnew.iBorderWidth += 1; @@ -2933,6 +2948,8 @@ START_TEST(sysparams) hInstance = GetModuleHandleA( NULL ); hdc = GetDC(0); dpi = GetDeviceCaps( hdc, LOGPIXELSY); + real_dpi = get_real_dpi(); + trace("dpi %d real_dpi %d\n", dpi, real_dpi); iswin9x = GetVersion() & 0x80000000; /* This test requires interactivity, if we don't have it, give up */

1 0

Huw Davies : include: Add {Is,Set}ProcessDPIAware().
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: 9b9316cfb270856146c5c535ee919836a593be89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b9316cfb270856146c5c535e… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 11 14:08:50 2017 +0100 include: Add {Is,Set}ProcessDPIAware(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winuser.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/winuser.h b/include/winuser.h index 2b8331c..25fc207 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3282,6 +3282,8 @@ typedef struct tagCHANGEFILTERSTRUCT #define MSGFLT_ALLOW 1 #define MSGFLT_DISALLOW 2 +#define USER_DEFAULT_SCREEN_DPI 96 + #if defined(_WINGDI_) && !defined(NOGDI) WINUSERAPI LONG WINAPI ChangeDisplaySettingsA(LPDEVMODEA,DWORD); WINUSERAPI LONG WINAPI ChangeDisplaySettingsW(LPDEVMODEW,DWORD); @@ -3772,6 +3774,7 @@ WINUSERAPI BOOL WINAPI IsGUIThread(BOOL); WINUSERAPI BOOL WINAPI IsHungAppWindow(HWND); WINUSERAPI BOOL WINAPI IsIconic(HWND); WINUSERAPI BOOL WINAPI IsMenu(HMENU); +WINUSERAPI BOOL WINAPI IsProcessDPIAware(void); WINUSERAPI BOOL WINAPI IsTouchWindow(HWND,PULONG); WINUSERAPI BOOL WINAPI IsWinEventHookInstalled(DWORD); WINUSERAPI BOOL WINAPI IsWindow(HWND); @@ -3976,9 +3979,10 @@ WINUSERAPI BOOL WINAPI SetMenuItemInfoW(HMENU,UINT,BOOL,const MENUITEMINF #define SetMenuItemInfo WINELIB_NAME_AW(SetMenuItemInfo) WINUSERAPI LPARAM WINAPI SetMessageExtraInfo(LPARAM); WINUSERAPI BOOL WINAPI SetMessageQueue(INT); +WINUSERAPI HWND WINAPI SetParent(HWND,HWND); +WINUSERAPI BOOL WINAPI SetProcessDPIAware(void); WINUSERAPI BOOL WINAPI SetProcessDefaultLayout(DWORD); WINUSERAPI BOOL WINAPI SetProcessWindowStation(HWINSTA); -WINUSERAPI HWND WINAPI SetParent(HWND,HWND); WINUSERAPI BOOL WINAPI SetPropA(HWND,LPCSTR,HANDLE); WINUSERAPI BOOL WINAPI SetPropW(HWND,LPCWSTR,HANDLE); #define SetProp WINELIB_NAME_AW(SetProp)

1 0

Hugh McMaster : regedit: Re-implement convertHexToDWord().
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: 0a71d4fa72038b505f621fe15ba0b02663ad93cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a71d4fa72038b505f621fe15… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Apr 11 13:11:54 2017 +0000 regedit: Re-implement convertHexToDWord(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 28 ++++++++++++++++++++++------ programs/regedit/tests/regedit.c | 14 +++++++------- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index e0049c6..96c4564 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -146,15 +146,31 @@ static char* GetMultiByteStringN(const WCHAR* strW, int chars, DWORD* len) */ static BOOL convertHexToDWord(WCHAR* str, DWORD *dw) { - char buf[9]; - char dummy; + WCHAR *p, *end; + int count = 0; - WideCharToMultiByte(CP_ACP, 0, str, -1, buf, 9, NULL, NULL); - if (lstrlenW(str) > 8 || sscanf(buf, "%x%c", dw, &dummy) != 1) { - output_message(STRING_INVALID_HEX); - return FALSE; + while (*str == ' ' || *str == '\t') str++; + if (!*str) goto error; + + p = str; + while (isxdigitW(*p)) + { + count++; + p++; } + if (count > 8) goto error; + + end = p; + while (*p == ' ' || *p == '\t') p++; + if (*p && *p != ';') goto error; + + *end = 0; + *dw = strtoulW(str, &end, 16); return TRUE; + +error: + output_message(STRING_INVALID_HEX); + return FALSE; } /****************************************************************************** diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 515a6ed..54d20ed 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -530,7 +530,7 @@ static void test_invalid_import(void) "\"Test14a\"=dword:0x123\n" "\"Test14b\"=dword:123 456\n" "\"Test14c\"=dword:1234 5678\n\n"); - todo_wine verify_reg_nonexist(hkey, "Test14a"); + verify_reg_nonexist(hkey, "Test14a"); verify_reg_nonexist(hkey, "Test14b"); verify_reg_nonexist(hkey, "Test14c"); @@ -577,7 +577,7 @@ static void test_comments(void) todo_wine verify_reg(hkey, "Wine4", REG_SZ, "Value 2", 8, 0); verify_reg_nonexist(hkey, "Wine5"); dword = 0x2040608; - todo_wine verify_reg(hkey, "Wine6", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine6", REG_DWORD, &dword, sizeof(dword), 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -637,7 +637,7 @@ static void test_comments(void) verify_reg_nonexist(hkey, "Wine22"); verify_reg_nonexist(hkey, "Wine23"); dword = 0x00000004; - todo_wine verify_reg(hkey, "Wine24", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine24", REG_DWORD, &dword, sizeof(dword), 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -646,8 +646,8 @@ static void test_comments(void) "\"Wine25c\"=dword:1234#5678\n" "\"Wine25d\"=dword:1234 #5678\n\n"); dword = 0x1234; - todo_wine verify_reg(hkey, "Wine25a", REG_DWORD, &dword, sizeof(dword), 0); - todo_wine verify_reg(hkey, "Wine25b", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine25a", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine25b", REG_DWORD, &dword, sizeof(dword), 0); verify_reg_nonexist(hkey, "Wine25c"); verify_reg_nonexist(hkey, "Wine25d"); @@ -809,8 +809,8 @@ static void test_import_with_whitespace(void) "\"Wine9a\"=dword: 00000008\n" "\"Wine9b\"=dword:\t\t00000008\n\n"); dword = 0x00000008; - todo_wine verify_reg(hkey, "Wine9a", REG_DWORD, &dword, sizeof(dword), 0); - todo_wine verify_reg(hkey, "Wine9b", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine9a", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine9b", REG_DWORD, &dword, sizeof(dword), 0); lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr);

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2017