June 2019 - Wine-commits - list.winehq.org

Józef Kucia : tests: Add bug_if() in test_tessellation_primitive_id().
by Alexandre Julliard 28 Jun '19

28 Jun '19

Module: vkd3d Branch: master Commit: 6c40e2e26eeeec610aa3e88685424fef602230e4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6c40e2e26eeeec610aa3e88… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 27 14:26:16 2019 +0200 tests: Add bug_if() in test_tessellation_primitive_id(). The test is affected by bugs mentioned in 18442763f1683ac7c47f17588b0632c3b34ac1f2. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index c2d5bb5..1864a87 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -27434,6 +27434,7 @@ static void test_tessellation_primitive_id(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + bug_if(is_nvidia_device(context.device)) check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); ID3D12Resource_Release(vb);

1 0

Józef Kucia : vkd3d: Add DXGI_FORMAT_R32G32B32_TYPELESS.
by Alexandre Julliard 28 Jun '19

28 Jun '19

Module: vkd3d Branch: master Commit: 3d8b68e611b65ed3713922ef7f01331b3aec3428 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3d8b68e611b65ed3713922e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 27 14:26:17 2019 +0200 vkd3d: Add DXGI_FORMAT_R32G32B32_TYPELESS. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 245f297..1696062 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -30,6 +30,7 @@ static const struct vkd3d_format vkd3d_formats[] = {DXGI_FORMAT_R32G32B32A32_FLOAT, VK_FORMAT_R32G32B32A32_SFLOAT, 16, 1, 1, 1, COLOR}, {DXGI_FORMAT_R32G32B32A32_UINT, VK_FORMAT_R32G32B32A32_UINT, 16, 1, 1, 1, COLOR}, {DXGI_FORMAT_R32G32B32A32_SINT, VK_FORMAT_R32G32B32A32_SINT, 16, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R32G32B32_TYPELESS, VK_FORMAT_R32G32B32_SFLOAT, 12, 1, 1, 1, COLOR}, {DXGI_FORMAT_R32G32B32_FLOAT, VK_FORMAT_R32G32B32_SFLOAT, 12, 1, 1, 1, COLOR}, {DXGI_FORMAT_R32G32B32_UINT, VK_FORMAT_R32G32B32_UINT, 12, 1, 1, 1, COLOR}, {DXGI_FORMAT_R32G32B32_SINT, VK_FORMAT_R32G32B32_SINT, 12, 1, 1, 1, COLOR},

1 0

Henri Verbeet : wined3d: Explicitly handle Windows 2 & 3 in wined3d_driver_info_init().
by Alexandre Julliard 27 Jun '19

27 Jun '19

Module: wine Branch: master Commit: 6d417f7890ee94dd17acc18eb2ef81f152dd0ed0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d417f7890ee94dd17acc18e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 27 16:20:10 2019 +0430 wined3d: Explicitly handle Windows 2 & 3 in wined3d_driver_info_init(). By returning Windows 9x driver versions. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c052918..7202a90 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -565,6 +565,8 @@ void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, TRACE("OS version %u.%u.\n", os_version.dwMajorVersion, os_version.dwMinorVersion); switch (os_version.dwMajorVersion) { + case 2: + case 3: case 4: /* If needed we could distinguish between 9x and NT4, but this code won't make * sense for NT4 since it had no way to obtain this info through DirectDraw 3.0.

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to shader_generate_glsl_declarations( ).
by Alexandre Julliard 27 Jun '19

27 Jun '19

Module: wine Branch: master Commit: 62179b511f7822811aa6faffcd006f4d635dbdcd URL: https://source.winehq.org/git/wine.git/?a=commit;h=62179b511f7822811aa6faff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 27 16:20:09 2019 +0430 wined3d: Pass a wined3d_context_gl structure to shader_generate_glsl_declarations(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8678a84..3c74ff7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2134,14 +2134,14 @@ static void shader_glsl_declare_generic_vertex_attribute(struct wined3d_string_b } /** Generate the variable & register declarations for the GLSL output target */ -static void shader_generate_glsl_declarations(const struct wined3d_context *context, +static void shader_generate_glsl_declarations(const struct wined3d_context_gl *context_gl, struct wined3d_string_buffer *buffer, const struct wined3d_shader *shader, const struct wined3d_shader_reg_maps *reg_maps, const struct shader_glsl_ctx_priv *ctx_priv) { const struct wined3d_shader_version *version = &reg_maps->shader_version; const struct vs_compile_args *vs_args = ctx_priv->cur_vs_args; const struct ps_compile_args *ps_args = ctx_priv->cur_ps_args; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; const struct wined3d_shader_indexable_temp *idx_temp_reg; unsigned int uniform_block_base, uniform_block_count; const struct wined3d_shader_lconst *lconst; @@ -2381,7 +2381,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont } if (shader_glsl_use_layout_binding_qualifier(gl_info)) - shader_glsl_append_sampler_binding_qualifier(buffer, context, version, entry->bind_idx); + shader_glsl_append_sampler_binding_qualifier(buffer, &context_gl->c, version, entry->bind_idx); shader_addline(buffer, "uniform %s%s %s_sampler%u;\n", sampler_type_prefix, sampler_type, prefix, entry->bind_idx); } @@ -7523,6 +7523,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context const struct wined3d_shader *shader, const struct ps_compile_args *args, struct ps_np2fixup_info *np2fixup_info) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; const struct wined3d_shader_version *version = &reg_maps->shader_version; const char *prefix = shader_glsl_get_prefix(version->type); @@ -7561,7 +7562,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context shader_addline(buffer, "#extension GL_ARB_texture_rectangle : enable\n"); /* Base Declarations */ - shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); + shader_generate_glsl_declarations(context_gl, buffer, shader, reg_maps, &priv_ctx); if (gl_info->supported[ARB_CONSERVATIVE_DEPTH]) { @@ -7873,6 +7874,7 @@ static void shader_glsl_generate_vs_epilogue(const struct wined3d_gl_info *gl_in static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context, struct shader_glsl_priv *priv, const struct wined3d_shader *shader, const struct vs_compile_args *args) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; const struct wined3d_shader_version *version = &reg_maps->shader_version; @@ -7897,7 +7899,7 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context shader_addline(buffer, "#extension GL_ARB_shader_viewport_layer_array : enable\n"); /* Base Declarations */ - shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); + shader_generate_glsl_declarations(context_gl, buffer, shader, reg_maps, &priv_ctx); for (i = 0; i < shader->input_signature.element_count; ++i) shader_glsl_declare_generic_vertex_attribute(buffer, gl_info, &shader->input_signature.elements[i]); @@ -8016,6 +8018,7 @@ static void shader_glsl_generate_shader_phase_invocation(struct wined3d_string_b static GLuint shader_glsl_generate_hull_shader(const struct wined3d_context *context, struct shader_glsl_priv *priv, const struct wined3d_shader *shader) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; struct wined3d_string_buffer *buffer = &priv->shader_buffer; @@ -8034,7 +8037,7 @@ static GLuint shader_glsl_generate_hull_shader(const struct wined3d_context *con shader_glsl_enable_extensions(buffer, gl_info); shader_addline(buffer, "#extension GL_ARB_tessellation_shader : enable\n"); - shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); + shader_generate_glsl_declarations(context_gl, buffer, shader, reg_maps, &priv_ctx); shader_addline(buffer, "layout(vertices = %u) out;\n", hs->output_vertex_count); @@ -8112,6 +8115,7 @@ static void shader_glsl_generate_ds_epilogue(const struct wined3d_gl_info *gl_in static GLuint shader_glsl_generate_domain_shader(const struct wined3d_context *context, struct shader_glsl_priv *priv, const struct wined3d_shader *shader, const struct ds_compile_args *args) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; struct wined3d_string_buffer *buffer = &priv->shader_buffer; @@ -8128,7 +8132,7 @@ static GLuint shader_glsl_generate_domain_shader(const struct wined3d_context *c shader_glsl_enable_extensions(buffer, gl_info); shader_addline(buffer, "#extension GL_ARB_tessellation_shader : enable\n"); - shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); + shader_generate_glsl_declarations(context_gl, buffer, shader, reg_maps, &priv_ctx); shader_addline(buffer, "layout("); switch (shader->u.ds.tessellator_domain) @@ -8206,6 +8210,7 @@ static GLuint shader_glsl_generate_domain_shader(const struct wined3d_context *c static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context *context, struct shader_glsl_priv *priv, const struct wined3d_shader *shader, const struct gs_compile_args *args) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; struct wined3d_string_buffer *buffer = &priv->shader_buffer; @@ -8224,7 +8229,7 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context shader_glsl_enable_extensions(buffer, gl_info); - shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); + shader_generate_glsl_declarations(context_gl, buffer, shader, reg_maps, &priv_ctx); primitive_type = shader->u.gs.input_type ? shader->u.gs.input_type : args->primitive_type; shader_addline(buffer, "layout(%s", glsl_primitive_type_from_d3d(primitive_type)); @@ -8337,6 +8342,7 @@ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context * const struct wined3d_shader *shader) { const struct wined3d_shader_thread_group_size *thread_group_size = &shader->u.cs.thread_group_size; + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_glsl_ctx_priv priv_ctx; @@ -8351,7 +8357,7 @@ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context * shader_glsl_enable_extensions(buffer, gl_info); shader_addline(buffer, "#extension GL_ARB_compute_shader : enable\n"); - shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); + shader_generate_glsl_declarations(context_gl, buffer, shader, reg_maps, &priv_ctx); for (i = 0; i < reg_maps->tgsm_count; ++i) {

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to shader_glsl_load_fog_uniform().
by Alexandre Julliard 27 Jun '19

27 Jun '19

Module: wine Branch: master Commit: e9dc1dfc2f21022fee53a62244b65eccf109ca4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9dc1dfc2f21022fee53a622… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 27 16:20:07 2019 +0430 wined3d: Pass a wined3d_context_gl structure to shader_glsl_load_fog_uniform(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fdc435e..c45b0a6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1455,10 +1455,10 @@ static void shader_glsl_pointsize_uniform(const struct wined3d_context_gl *conte checkGLcall("glUniform1f"); } -static void shader_glsl_load_fog_uniform(const struct wined3d_context *context, +static void shader_glsl_load_fog_uniform(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state, struct glsl_shader_prog_link *prog) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_color color; float start, end, scale; union @@ -1471,7 +1471,7 @@ static void shader_glsl_load_fog_uniform(const struct wined3d_context *context, GL_EXTCALL(glUniform4fv(prog->ps.fog_color_location, 1, &color.r)); tmpvalue.d = state->render_states[WINED3D_RS_FOGDENSITY]; GL_EXTCALL(glUniform1f(prog->ps.fog_density_location, tmpvalue.f)); - get_fog_start_end(context, state, &start, &end); + get_fog_start_end(&context_gl->c, state, &start, &end); scale = 1.0f / (end - start); GL_EXTCALL(glUniform1f(prog->ps.fog_end_location, end)); GL_EXTCALL(glUniform1f(prog->ps.fog_scale_location, scale)); @@ -1766,7 +1766,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context } if (update_mask & WINED3D_SHADER_CONST_PS_FOG) - shader_glsl_load_fog_uniform(context, state, prog); + shader_glsl_load_fog_uniform(context_gl, state, prog); if (update_mask & WINED3D_SHADER_CONST_PS_ALPHA_TEST) {

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to shader_glsl_pointsize_uniform().
by Alexandre Julliard 27 Jun '19

27 Jun '19

Module: wine Branch: master Commit: 45c3c20dbf471ffe82f86a1c8252e201cc0e3d23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45c3c20dbf471ffe82f86a1c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 27 16:20:06 2019 +0430 wined3d: Pass a wined3d_context_gl structure to shader_glsl_pointsize_uniform(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8faa421..fdc435e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1429,21 +1429,21 @@ static void shader_glsl_ffp_vertex_light_uniform(const struct wined3d_context_gl checkGLcall("setting FFP lights uniforms"); } -static void shader_glsl_pointsize_uniform(const struct wined3d_context *context, +static void shader_glsl_pointsize_uniform(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state, struct glsl_shader_prog_link *prog) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; float min, max; float size, att[3]; - get_pointsize_minmax(context, state, &min, &max); + get_pointsize_minmax(&context_gl->c, state, &min, &max); GL_EXTCALL(glUniform1f(prog->vs.pointsize_min_location, min)); checkGLcall("glUniform1f"); GL_EXTCALL(glUniform1f(prog->vs.pointsize_max_location, max)); checkGLcall("glUniform1f"); - get_pointsize(context, state, &size, att); + get_pointsize(&context_gl->c, state, &size, att); GL_EXTCALL(glUniform1f(prog->vs.pointsize_location, size)); checkGLcall("glUniform1f"); @@ -1551,7 +1551,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context } if (update_mask & WINED3D_SHADER_CONST_VS_POINTSIZE) - shader_glsl_pointsize_uniform(context, state, prog); + shader_glsl_pointsize_uniform(context_gl, state, prog); if (update_mask & WINED3D_SHADER_CONST_POS_FIXUP) {

1 0

Alexandre Julliard : wmphoto: Build with msvcrt.
by Alexandre Julliard 27 Jun '19

27 Jun '19

Module: wine Branch: master Commit: d3e0f275a54f5f0f22379e9274fd201664a09a5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3e0f275a54f5f0f22379e92… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 09:09:48 2019 +0200 wmphoto: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmphoto/Makefile.in | 2 ++ dlls/wmphoto/main.c | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wmphoto/Makefile.in b/dlls/wmphoto/Makefile.in index d31af33..24e1f49 100644 --- a/dlls/wmphoto/Makefile.in +++ b/dlls/wmphoto/Makefile.in @@ -1,5 +1,7 @@ MODULE = wmphoto.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = main.c IDL_SRCS = wmphoto.idl diff --git a/dlls/wmphoto/main.c b/dlls/wmphoto/main.c index a92f18b..d3a926e 100644 --- a/dlls/wmphoto/main.c +++ b/dlls/wmphoto/main.c @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMAcROS -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to shader_glsl_clip_plane_uniform().
by Alexandre Julliard 27 Jun '19

27 Jun '19

Module: wine Branch: master Commit: 7710f673548c9d556c6fd841ec1a3f57826a18ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=7710f673548c9d556c6fd841… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 27 16:20:08 2019 +0430 wined3d: Pass a wined3d_context_gl structure to shader_glsl_clip_plane_uniform(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c45b0a6..8678a84 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1478,10 +1478,10 @@ static void shader_glsl_load_fog_uniform(const struct wined3d_context_gl *contex checkGLcall("fog emulation uniforms"); } -static void shader_glsl_clip_plane_uniform(const struct wined3d_context *context, +static void shader_glsl_clip_plane_uniform(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state, unsigned int index, struct glsl_shader_prog_link *prog) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_matrix matrix; struct wined3d_vec4 plane; @@ -1547,7 +1547,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context if (update_mask & WINED3D_SHADER_CONST_VS_CLIP_PLANES) { for (i = 0; i < gl_info->limits.user_clip_distances; ++i) - shader_glsl_clip_plane_uniform(context, state, i, prog); + shader_glsl_clip_plane_uniform(context_gl, state, i, prog); } if (update_mask & WINED3D_SHADER_CONST_VS_POINTSIZE)

1 0

Alexandre Julliard : wmiutils: Build with msvcrt.
by Alexandre Julliard 27 Jun '19

27 Jun '19

Module: wine Branch: master Commit: 7c62577295333244f78ad1bd98ec7cc4e7f87b8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c62577295333244f78ad1bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 09:08:55 2019 +0200 wmiutils: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmiutils/Makefile.in | 2 ++ dlls/wmiutils/main.c | 1 - dlls/wmiutils/path.c | 49 ++++++++++++++++++++-------------------- dlls/wmiutils/statuscode.c | 6 ++--- dlls/wmiutils/wmiutils_private.h | 3 +-- 5 files changed, 29 insertions(+), 32 deletions(-) diff --git a/dlls/wmiutils/Makefile.in b/dlls/wmiutils/Makefile.in index b58d700..0d0cadd 100644 --- a/dlls/wmiutils/Makefile.in +++ b/dlls/wmiutils/Makefile.in @@ -1,6 +1,8 @@ MODULE = wmiutils.dll IMPORTS = oleaut32 ole32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c \ path.c \ diff --git a/dlls/wmiutils/main.c b/dlls/wmiutils/main.c index 89fd26b..9befe01 100644 --- a/dlls/wmiutils/main.c +++ b/dlls/wmiutils/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #define COBJMACROS diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 61386d9..6a7587a 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -18,7 +18,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" @@ -379,7 +378,7 @@ static HRESULT parse_key( struct key *key, const WCHAR *str, unsigned int *ret_l p = q = str; while (*q && *q != '=') { - if (*q == ',' || isspaceW( *q )) return WBEM_E_INVALID_PARAMETER; + if (*q == ',' || iswspace( *q )) return WBEM_E_INVALID_PARAMETER; q++; } len = q - p; @@ -389,7 +388,7 @@ static HRESULT parse_key( struct key *key, const WCHAR *str, unsigned int *ret_l key->len_name = len; p = ++q; - if (!*p || *p == ',' || isspaceW( *p )) return WBEM_E_INVALID_PARAMETER; + if (!*p || *p == ',' || iswspace( *p )) return WBEM_E_INVALID_PARAMETER; while (*q && *q != ',') q++; len = q - p; @@ -423,7 +422,7 @@ static HRESULT parse_text( struct path *path, ULONG mode, const WCHAR *text ) path->flags |= WBEMPATH_INFO_PATH_HAD_SERVER; } p = q; - if (strchrW( p, '\\' ) || strchrW( p, '/' )) + if (wcschr( p, '\\' ) || wcschr( p, '/' )) { if (*q != '\\' && *q != '/' && *q != ':') { @@ -528,14 +527,14 @@ static HRESULT WINAPI path_SetText( if (!pszPath[0]) goto done; if ((hr = parse_text( path, uMode, pszPath )) != S_OK) goto done; - len = strlenW( pszPath ); + len = lstrlenW( pszPath ); if (!(path->text = heap_alloc( (len + 1) * sizeof(WCHAR) ))) { clear_path( path ); hr = E_OUTOFMEMORY; goto done; } - strcpyW( path->text, pszPath ); + lstrcpyW( path->text, pszPath ); path->len_text = len; done: @@ -576,7 +575,7 @@ static WCHAR *build_server( struct path *path, int *len ) if (path->len_server) { p[0] = p[1] = '\\'; - strcpyW( p + 2, path->server ); + lstrcpyW( p + 2, path->server ); } else { @@ -641,15 +640,15 @@ static WCHAR *build_path( struct path *path, LONG flags, int *len ) heap_free( keylist ); return NULL; } - strcpyW( ret, namespace ); + lstrcpyW( ret, namespace ); if (path->len_class) { ret[len_namespace] = ':'; - strcpyW( ret + len_namespace + 1, path->class ); + lstrcpyW( ret + len_namespace + 1, path->class ); if (path->num_keys) { ret[len_namespace + path->len_class + 1] = '.'; - strcpyW( ret + len_namespace + path->len_class + 2, keylist ); + lstrcpyW( ret + len_namespace + path->len_class + 2, keylist ); } } heap_free( namespace ); @@ -672,11 +671,11 @@ static WCHAR *build_path( struct path *path, LONG flags, int *len ) heap_free( keylist ); return NULL; } - strcpyW( ret, path->class ); + lstrcpyW( ret, path->class ); if (path->num_keys) { ret[path->len_class] = '.'; - strcpyW( ret + path->len_class + 1, keylist ); + lstrcpyW( ret + path->len_class + 1, keylist ); } heap_free( keylist ); return ret; @@ -708,18 +707,18 @@ static WCHAR *build_path( struct path *path, LONG flags, int *len ) heap_free( keylist ); return NULL; } - strcpyW( p, server ); + lstrcpyW( p, server ); p += len_server; - strcpyW( p, namespace ); + lstrcpyW( p, namespace ); p += len_namespace; if (path->len_class) { *p++ = ':'; - strcpyW( p, path->class ); + lstrcpyW( p, path->class ); if (path->num_keys) { p[path->len_class] = '.'; - strcpyW( p + path->len_class + 1, keylist ); + lstrcpyW( p + path->len_class + 1, keylist ); } } heap_free( namespace ); @@ -746,9 +745,9 @@ static WCHAR *build_path( struct path *path, LONG flags, int *len ) heap_free( server ); return NULL; } - strcpyW( p, server ); + lstrcpyW( p, server ); p += len_server; - strcpyW( p, namespace ); + lstrcpyW( p, namespace ); heap_free( namespace ); heap_free( server ); return ret; @@ -795,7 +794,7 @@ static HRESULT WINAPI path_GetText( hr = WBEM_E_INVALID_PARAMETER; goto done; } - if (str) strcpyW( pszText, str ); + if (str) lstrcpyW( pszText, str ); else pszText[0] = 0; *puBufferLength = len + 1; @@ -866,7 +865,7 @@ static HRESULT WINAPI path_SetServer( } heap_free( path->server ); path->server = server; - path->len_server = strlenW( path->server ); + path->len_server = lstrlenW( path->server ); path->flags |= flags; } else @@ -899,7 +898,7 @@ static HRESULT WINAPI path_GetServer( LeaveCriticalSection( &path->cs ); return WBEM_E_NOT_AVAILABLE; } - if (*len > path->len_server) strcpyW( name, path->server ); + if (*len > path->len_server) lstrcpyW( name, path->server ); *len = path->len_server + 1; LeaveCriticalSection( &path->cs ); @@ -975,7 +974,7 @@ static HRESULT WINAPI path_SetNamespaceAt( path->len_namespaces[i + 1] = path->len_namespaces[i]; } path->namespaces[idx] = new; - path->len_namespaces[idx] = strlenW( new ); + path->len_namespaces[idx] = lstrlenW( new ); path->num_namespaces++; path->flags |= flags; @@ -1000,7 +999,7 @@ static HRESULT WINAPI path_GetNamespaceAt( LeaveCriticalSection( &path->cs ); return WBEM_E_INVALID_PARAMETER; } - if (*len > path->len_namespaces[idx]) strcpyW( name, path->namespaces[idx] ); + if (*len > path->len_namespaces[idx]) lstrcpyW( name, path->namespaces[idx] ); *len = path->len_namespaces[idx] + 1; LeaveCriticalSection( &path->cs ); @@ -1134,7 +1133,7 @@ static HRESULT WINAPI path_SetClassName( heap_free( path->class ); path->class = class; - path->len_class = strlenW( path->class ); + path->len_class = lstrlenW( path->class ); path->flags |= WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT; LeaveCriticalSection( &path->cs ); @@ -1159,7 +1158,7 @@ static HRESULT WINAPI path_GetClassName( LeaveCriticalSection( &path->cs ); return WBEM_E_INVALID_OBJECT_PATH; } - if (*len > path->len_class) strcpyW( name, path->class ); + if (*len > path->len_class) lstrcpyW( name, path->class ); *len = path->len_class + 1; LeaveCriticalSection( &path->cs ); diff --git a/dlls/wmiutils/statuscode.c b/dlls/wmiutils/statuscode.c index 719f3af..fb2b7db 100644 --- a/dlls/wmiutils/statuscode.c +++ b/dlls/wmiutils/statuscode.c @@ -18,7 +18,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include <stdio.h> @@ -28,7 +27,6 @@ #include "wbemcli.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wmiutils_private.h" WINE_DEFAULT_DEBUG_CHANNEL(wmiutils); @@ -100,7 +98,7 @@ static HRESULT WINAPI status_code_GetErrorCodeText( FIXME("%p, 0x%08x, 0x%04x, 0x%08x, %p\n", iface, res, lcid, flags, text); - sprintfW(msg, fmt, res); + swprintf(msg, ARRAY_SIZE(msg), fmt, res); *text = SysAllocString(msg); return WBEM_S_NO_ERROR; } @@ -118,7 +116,7 @@ static HRESULT WINAPI status_code_GetFacilityCodeText( FIXME("%p, 0x%08x, 0x%04x, 0x%08x, %p\n", iface, res, lcid, flags, text); - sprintfW(msg, fmt, res); + swprintf(msg, ARRAY_SIZE(msg), fmt, res); *text = SysAllocString(msg); return WBEM_S_NO_ERROR; } diff --git a/dlls/wmiutils/wmiutils_private.h b/dlls/wmiutils/wmiutils_private.h index 6195f21..8036afc 100644 --- a/dlls/wmiutils/wmiutils_private.h +++ b/dlls/wmiutils/wmiutils_private.h @@ -17,7 +17,6 @@ */ #include "wine/heap.h" -#include "wine/unicode.h" HRESULT WbemPath_create(LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemStatusCodeText_create(LPVOID *) DECLSPEC_HIDDEN; @@ -26,6 +25,6 @@ static inline WCHAR *strdupW( const WCHAR *src ) { WCHAR *dst; if (!src) return NULL; - if ((dst = heap_alloc( (strlenW( src ) + 1) * sizeof(WCHAR) ))) strcpyW( dst, src ); + if ((dst = heap_alloc( (lstrlenW( src ) + 1) * sizeof(WCHAR) ))) lstrcpyW( dst, src ); return dst; }

1 0

Alexandre Julliard : wmasf: Build with msvcrt.
by Alexandre Julliard 27 Jun '19

27 Jun '19

Module: wine Branch: master Commit: 7efeed692de8a49e76a214688e5b09c8c2edb2c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7efeed692de8a49e76a21468… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 09:08:22 2019 +0200 wmasf: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmasf/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wmasf/Makefile.in b/dlls/wmasf/Makefile.in index 6fec158..1da9f78 100644 --- a/dlls/wmasf/Makefile.in +++ b/dlls/wmasf/Makefile.in @@ -1,4 +1,6 @@ MODULE = wmasf.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c

1 0