wine-commits April 2013

wine-commits@winehq.org

2 participants
579 discussions

Stefan Dösinger : wined3d: Put local constants into the shader code in ARB shaders.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: 8c2874ee99ac4029a201d63a8a12f46288bebc84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c2874ee99ac4029a201d63a8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 2 14:54:02 2013 +0200 wined3d: Put local constants into the shader code in ARB shaders. --- dlls/wined3d/arb_program_shader.c | 83 +++++++------------------------------ 1 files changed, 15 insertions(+), 68 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index b069335..7e695fd 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -9,7 +9,7 @@ * Copyright 2006 Ivan Gyurdiev * Copyright 2006 Jason Green * Copyright 2006 Henri Verbeet - * Copyright 2007-2008 Stefan Dösinger for CodeWeavers + * Copyright 2007-2011, 2013 Stefan Dösinger for CodeWeavers * Copyright 2009 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -753,36 +753,13 @@ static void shader_arb_update_float_pixel_constants(struct wined3d_device *devic priv->highest_dirty_ps_const = max(priv->highest_dirty_ps_const, start + count); } -static DWORD *local_const_mapping(const struct wined3d_shader *shader) -{ - const struct wined3d_shader_lconst *lconst; - DWORD *ret; - DWORD idx = 0; - - if (shader->load_local_constsF || list_empty(&shader->constantsF)) - return NULL; - - ret = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD) * shader->limits.constant_float); - if (!ret) - { - ERR("Out of memory\n"); - return NULL; - } - - LIST_FOR_EACH_ENTRY(lconst, &shader->constantsF, struct wined3d_shader_lconst, entry) - { - ret[lconst->idx] = idx++; - } - return ret; -} - /* Generate the variable & register declarations for the ARB_vertex_program output target */ -static DWORD shader_generate_arb_declarations(const struct wined3d_shader *shader, +static void shader_generate_arb_declarations(const struct wined3d_shader *shader, const struct wined3d_shader_reg_maps *reg_maps, struct wined3d_shader_buffer *buffer, - const struct wined3d_gl_info *gl_info, const DWORD *lconst_map, - DWORD *num_clipplanes, const struct shader_arb_ctx_priv *ctx) + const struct wined3d_gl_info *gl_info, DWORD *num_clipplanes, + const struct shader_arb_ctx_priv *ctx) { - DWORD i, next_local = 0; + DWORD i; char pshader = shader_is_pshader_version(reg_maps->shader_version.type); const struct wined3d_shader_lconst *lconst; unsigned max_constantsF; @@ -874,16 +851,14 @@ static DWORD shader_generate_arb_declarations(const struct wined3d_shader *shade } } - /* Load local constants using the program-local space, - * this avoids reloading them each time the shader is used - */ - if (lconst_map) + if (!shader->load_local_constsF) { LIST_FOR_EACH_ENTRY(lconst, &shader->constantsF, struct wined3d_shader_lconst, entry) { - shader_addline(buffer, "PARAM C%u = program.local[%u];\n", lconst->idx, - lconst_map[lconst->idx]); - next_local = max(next_local, lconst_map[lconst->idx] + 1); + const float *value; + value = (const float *)lconst->value; + shader_addline(buffer, "PARAM C%u = {%.8e, %.8e, %.8e, %.8e};\n", lconst->idx, + value[0], value[1], value[2], value[3]); } } @@ -924,8 +899,6 @@ static DWORD shader_generate_arb_declarations(const struct wined3d_shader *shade } } } - - return next_local; } static const char * const shift_tab[] = { @@ -3586,11 +3559,10 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, const struct arb_ps_compile_args *args, struct arb_ps_compiled_shader *compiled) { const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; - const struct wined3d_shader_lconst *lconst; const DWORD *function = shader->function; GLuint retval; char fragcolor[16]; - DWORD *lconst_map = local_const_mapping(shader), next_local; + DWORD next_local = 0; struct shader_arb_ctx_priv priv_ctx; BOOL dcl_td = FALSE; BOOL want_nv_prog = FALSE; @@ -3748,8 +3720,7 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, } /* Base Declarations */ - next_local = shader_generate_arb_declarations(shader, reg_maps, - buffer, gl_info, lconst_map, NULL, &priv_ctx); + shader_generate_arb_declarations(shader, reg_maps, buffer, gl_info, NULL, &priv_ctx); for (i = 0, map = reg_maps->bumpmat; map; map >>= 1, ++i) { @@ -3910,18 +3881,6 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, if (!native) WARN("Program exceeds native resource limits.\n"); } - /* Load immediate constants */ - if (lconst_map) - { - LIST_FOR_EACH_ENTRY(lconst, &shader->constantsF, struct wined3d_shader_lconst, entry) - { - const float *value = (const float *)lconst->value; - GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, lconst_map[lconst->idx], value)); - checkGLcall("glProgramLocalParameter4fvARB"); - } - HeapFree(GetProcessHeap(), 0, lconst_map); - } - return retval; } @@ -4177,10 +4136,9 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, const struct arb_vshader_private *shader_data = shader->backend_data; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; struct shader_arb_priv *priv = shader->device->shader_priv; - const struct wined3d_shader_lconst *lconst; const DWORD *function = shader->function; GLuint ret; - DWORD next_local, *lconst_map = local_const_mapping(shader); + DWORD next_local = 0; struct shader_arb_ctx_priv priv_ctx; unsigned int i; GLint errPos; @@ -4228,8 +4186,8 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, shader_addline(buffer, "TEMP TB;\n"); /* Base Declarations */ - next_local = shader_generate_arb_declarations(shader, reg_maps, buffer, - gl_info, lconst_map, &priv_ctx.vs_clipplanes, &priv_ctx); + shader_generate_arb_declarations(shader, reg_maps, buffer, gl_info, + &priv_ctx.vs_clipplanes, &priv_ctx); for(i = 0; i < MAX_CONST_I; i++) { @@ -4321,18 +4279,7 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, GL_EXTCALL(glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB, &native)); checkGLcall("glGetProgramivARB()"); if (!native) WARN("Program exceeds native resource limits.\n"); - - /* Load immediate constants */ - if (lconst_map) - { - LIST_FOR_EACH_ENTRY(lconst, &shader->constantsF, struct wined3d_shader_lconst, entry) - { - const float *value = (const float *)lconst->value; - GL_EXTCALL(glProgramLocalParameter4fvARB(GL_VERTEX_PROGRAM_ARB, lconst_map[lconst->idx], value)); - } - } } - HeapFree(GetProcessHeap(), 0, lconst_map); return ret; }

1 0

Stefan Dösinger : wined3d: Put local constants into the shader code again.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: 667f4225b5cc25c5e4f2f725d55a7c011e12c388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=667f4225b5cc25c5e4f2f725d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 2 14:54:01 2013 +0200 wined3d: Put local constants into the shader code again. This is essentially a revert of cd7825c89374fb9dd4c20aef2dbfd258713efe6a, with proper precision. --- dlls/wined3d/glsl_shader.c | 37 ++++--------------------------------- dlls/wined3d/shader.c | 28 ++++++++++++++++++++++------ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 27 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7d98487..a840a5d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1253,15 +1253,14 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont shader_addline(buffer, "vec4 tmp0;\n"); shader_addline(buffer, "vec4 tmp1;\n"); - /* Local constants use a different name so they can be loaded once at shader link time - * They can't be hardcoded into the shader text via LC = {x, y, z, w}; because the - * float -> string conversion can cause precision loss. - */ if (!shader->load_local_constsF) { LIST_FOR_EACH_ENTRY(lconst, &shader->constantsF, struct wined3d_shader_lconst, entry) { - shader_addline(buffer, "uniform vec4 %s_lc%u;\n", prefix, lconst->idx); + const float *value; + value = (const float *)lconst->value; + shader_addline(buffer, "const vec4 %s_lc%u = vec4(%.8e, %.8e, %.8e, %.8e);\n", + prefix, lconst->idx, value[0], value[1], value[2], value[3]); } } @@ -4457,25 +4456,6 @@ static void shader_glsl_generate_fog_code(struct wined3d_shader_buffer *buffer, } /* Context activation is done by the caller. */ -static void hardcode_local_constants(const struct wined3d_shader *shader, - const struct wined3d_gl_info *gl_info, GLhandleARB programId, const char *prefix) -{ - const struct wined3d_shader_lconst *lconst; - GLint tmp_loc; - const float *value; - char glsl_name[10]; - - LIST_FOR_EACH_ENTRY(lconst, &shader->constantsF, struct wined3d_shader_lconst, entry) - { - value = (const float *)lconst->value; - snprintf(glsl_name, sizeof(glsl_name), "%s_lc%u", prefix, lconst->idx); - tmp_loc = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name)); - GL_EXTCALL(glUniform4fvARB(tmp_loc, 1, value)); - } - checkGLcall("Hardcoding local constants"); -} - -/* Context activation is done by the caller. */ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context, struct wined3d_shader_buffer *buffer, const struct wined3d_shader *shader, const struct ps_compile_args *args, struct ps_np2fixup_info *np2fixup_info) @@ -5705,15 +5685,6 @@ static void set_glsl_shader_program(const struct wined3d_context *context, struc */ shader_glsl_load_vsamplers(gl_info, device->texUnitMap, programId); shader_glsl_load_psamplers(gl_info, device->texUnitMap, programId); - - /* If the local constants do not have to be loaded with the environment constants, - * load them now to have them hardcoded in the GLSL program. This saves some CPU cycles - * later - */ - if (pshader && !pshader->load_local_constsF) - hardcode_local_constants(pshader, gl_info, programId, "ps"); - if (vshader && !vshader->load_local_constsF) - hardcode_local_constants(vshader, gl_info, programId, "vs"); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 6444896..692e5b2 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -584,15 +584,16 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st else if (ins.handler_idx == WINED3DSIH_DEF) { struct wined3d_shader_lconst *lconst = HeapAlloc(GetProcessHeap(), 0, sizeof(*lconst)); + float *value; if (!lconst) return E_OUTOFMEMORY; lconst->idx = ins.dst[0].reg.idx[0].offset; memcpy(lconst->value, ins.src[0].reg.immconst_data, 4 * sizeof(DWORD)); + value = (float *)lconst->value; /* In pixel shader 1.X shaders, the constants are clamped between [-1;1] */ if (shader_version.major == 1 && shader_version.type == WINED3D_SHADER_TYPE_PIXEL) { - float *value = (float *)lconst->value; if (value[0] < -1.0f) value[0] = -1.0f; else if (value[0] > 1.0f) value[0] = 1.0f; if (value[1] < -1.0f) value[1] = -1.0f; @@ -604,6 +605,12 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st } list_add_head(&shader->constantsF, &lconst->entry); + + if (isinf(value[0]) || isnan(value[0]) || isinf(value[1]) || isnan(value[1]) + || isinf(value[2]) || isnan(value[2]) || isinf(value[3]) || isnan(value[3])) + { + shader->lconst_inf_or_nan = TRUE; + } } else if (ins.handler_idx == WINED3DSIH_DEFI) { @@ -1629,6 +1636,7 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, const DWORD *b list_init(&shader->constantsF); list_init(&shader->constantsB); list_init(&shader->constantsI); + shader->lconst_inf_or_nan = FALSE; /* Second pass: figure out which registers are used, what the semantics are, etc. */ hr = shader_get_registers_used(shader, fe, @@ -1752,12 +1760,20 @@ HRESULT CDECL wined3d_shader_set_local_constants_float(struct wined3d_shader *sh for (i = start_idx; i < end_idx; ++i) { struct wined3d_shader_lconst *lconst = HeapAlloc(GetProcessHeap(), 0, sizeof(*lconst)); + float *value; if (!lconst) return E_OUTOFMEMORY; lconst->idx = i; - memcpy(lconst->value, src_data + (i - start_idx) * 4 /* 4 components */, 4 * sizeof(float)); + value = (float *)lconst->value; + memcpy(value, src_data + (i - start_idx) * 4 /* 4 components */, 4 * sizeof(float)); list_add_head(&shader->constantsF, &lconst->entry); + + if (isinf(value[0]) || isnan(value[0]) || isinf(value[1]) || isnan(value[1]) + || isinf(value[2]) || isnan(value[2]) || isinf(value[3]) || isnan(value[3])) + { + shader->lconst_inf_or_nan = TRUE; + } } return WINED3D_OK; @@ -1916,8 +1932,8 @@ static HRESULT vertexshader_init(struct wined3d_shader *shader, struct wined3d_d vertexshader_set_limits(shader); - shader->load_local_constsF = reg_maps->usesrelconstF - && !list_empty(&shader->constantsF); + shader->load_local_constsF = (reg_maps->usesrelconstF && !list_empty(&shader->constantsF)) || + shader->lconst_inf_or_nan; return WINED3D_OK; } @@ -1964,7 +1980,7 @@ static HRESULT geometryshader_init(struct wined3d_shader *shader, struct wined3d geometryshader_set_limits(shader); - shader->load_local_constsF = FALSE; + shader->load_local_constsF = shader->lconst_inf_or_nan; return WINED3D_OK; } @@ -2253,7 +2269,7 @@ static HRESULT pixelshader_init(struct wined3d_shader *shader, struct wined3d_de } } - shader->load_local_constsF = FALSE; + shader->load_local_constsF = shader->lconst_inf_or_nan; return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2a11286..bdba525 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2618,6 +2618,7 @@ struct wined3d_shader struct list constantsF; struct list constantsI; struct wined3d_shader_reg_maps reg_maps; + BOOL lconst_inf_or_nan; struct wined3d_shader_signature_element input_signature[max(MAX_ATTRIBS, MAX_REG_INPUT)]; struct wined3d_shader_signature_element output_signature[MAX_REG_OUTPUT];

1 0

Piotr Caban : oleaut32: Add support of VT_USERDEFINED arguments with default value in AddFuncDesc.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: 3f7c07f5608f54cc043a04a8a9b3ff813dfe2ab0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f7c07f5608f54cc043a04a8a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 9 12:13:13 2013 +0200 oleaut32: Add support of VT_USERDEFINED arguments with default value in AddFuncDesc. --- dlls/oleaut32/tests/typelib.c | 15 +++++++++++---- dlls/oleaut32/typelib2.c | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 33d1139..a20b3bf 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -2048,8 +2048,10 @@ static void test_CreateTypeLib(void) { elemdesc[0].tdesc.vt = VT_USERDEFINED; U(elemdesc[0].tdesc).hreftype = hreftype; - U(elemdesc[0]).paramdesc.pparamdescex = NULL; - U(elemdesc[0]).paramdesc.wParamFlags = 0; + U(elemdesc[0]).paramdesc.pparamdescex = &paramdescex; + U(elemdesc[0]).paramdesc.wParamFlags = PARAMFLAG_FHASDEFAULT; + V_VT(&paramdescex.varDefaultValue) = VT_INT; + V_INT(&paramdescex.varDefaultValue) = 0x789; funcdesc.lprgelemdescParam = elemdesc; funcdesc.invkind = INVOKE_FUNC; @@ -2077,10 +2079,15 @@ static void test_CreateTypeLib(void) { ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); edesc = pfuncdesc->lprgelemdescParam; - ok(U(*edesc).paramdesc.pparamdescex == NULL, "got: %p\n", U(*edesc).paramdesc.pparamdescex); - ok(U(*edesc).paramdesc.wParamFlags == 0, "got: 0x%x\n", U(*edesc).paramdesc.wParamFlags); + ok(U(*edesc).paramdesc.pparamdescex != NULL, "got: %p\n", U(*edesc).paramdesc.pparamdescex); + ok(U(*edesc).paramdesc.wParamFlags == PARAMFLAG_FHASDEFAULT, + "got: 0x%x\n", U(*edesc).paramdesc.wParamFlags); ok(edesc->tdesc.vt == VT_USERDEFINED, "got: %d\n", edesc->tdesc.vt); ok(U(edesc->tdesc).hreftype == hreftype, "got: 0x%x\n", U(edesc->tdesc).hreftype); + ok(V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue) == VT_INT, "got: %d\n", + V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue)); + ok(V_INT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue) == 0x789, "got: %d\n", + V_INT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue)); ITypeInfo2_ReleaseFuncDesc(ti2, pfuncdesc); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 7d5b1c8..97f61a4 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -886,7 +886,7 @@ static HRESULT ctl2_encode_variant( arg_type = VT_UI4; v = *value; - if(arg_type == VT_VARIANT) { + if(arg_type==VT_VARIANT || arg_type==VT_USERDEFINED) { arg_type = V_VT(value); }else if(V_VT(value) != arg_type) { hres = VariantChangeType(&v, value, 0, arg_type);

1 0

Piotr Caban : oleaut32: Add support for VARIANT arguments with default value in AddFuncDesc.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: fc456a3fea0f2d907490755e32b2c65d29908bd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc456a3fea0f2d907490755e3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 9 12:12:51 2013 +0200 oleaut32: Add support for VARIANT arguments with default value in AddFuncDesc. --- dlls/oleaut32/tests/typelib.c | 48 +++++++++++++++++++++++++++++++++++++++- dlls/oleaut32/typelib2.c | 12 +++++++++- 2 files changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index ca414867..33d1139 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -2084,6 +2084,49 @@ static void test_CreateTypeLib(void) { ITypeInfo2_ReleaseFuncDesc(ti2, pfuncdesc); + elemdesc[0].tdesc.vt = VT_VARIANT; + U(elemdesc[0]).paramdesc.pparamdescex = &paramdescex; + U(elemdesc[0]).paramdesc.wParamFlags = PARAMFLAG_FHASDEFAULT; + V_VT(&paramdescex.varDefaultValue) = VT_INT; + V_INT(&paramdescex.varDefaultValue) = 3; + + funcdesc.lprgelemdescParam = elemdesc; + funcdesc.invkind = INVOKE_FUNC; + funcdesc.cParams = 1; + funcdesc.elemdescFunc.tdesc.vt = VT_VARIANT; + + hres = ICreateTypeInfo_AddFuncDesc(createti, 6, &funcdesc); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ITypeInfo2_GetFuncDesc(ti2, 6, &pfuncdesc); + ok(hres == S_OK, "got %08x\n", hres); + + ok(pfuncdesc->memid == 0x60010006, "got %x\n", pfuncdesc->memid); + ok(pfuncdesc->lprgscode == NULL, "got %p\n", pfuncdesc->lprgscode); + ok(pfuncdesc->lprgelemdescParam != NULL, "got %p\n", pfuncdesc->lprgelemdescParam); + ok(pfuncdesc->funckind == FUNC_PUREVIRTUAL, "got 0x%x\n", pfuncdesc->funckind); + ok(pfuncdesc->invkind == INVOKE_FUNC, "got 0x%x\n", pfuncdesc->invkind); + ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); + ok(pfuncdesc->cParams == 1, "got %d\n", pfuncdesc->cParams); + ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); + ok(pfuncdesc->oVft == 36 || broken(pfuncdesc->oVft == 48), /* xp64 */ + "got %d\n", pfuncdesc->oVft); + ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); + ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VARIANT, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); + ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); + + edesc = pfuncdesc->lprgelemdescParam; + ok(U(*edesc).paramdesc.pparamdescex != NULL, "got: %p\n", U(*edesc).paramdesc.pparamdescex); + ok(U(*edesc).paramdesc.wParamFlags == PARAMFLAG_FHASDEFAULT, + "got: 0x%x\n", U(*edesc).paramdesc.wParamFlags); + ok(edesc->tdesc.vt == VT_VARIANT, "got: %d\n", edesc->tdesc.vt); + ok(V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue) == VT_INT, "got: %d\n", + V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue)); + ok(V_INT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue) == 3, "got: %d\n", + V_INT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue)); + + ITypeInfo2_ReleaseFuncDesc(ti2, pfuncdesc); + hres = ITypeInfo_GetDocumentation(interface1, 0, &name, &docstring, &helpcontext, &helpfile); ok(hres == S_OK, "got %08x\n", hres); ok(name == NULL, "name != NULL\n"); @@ -2164,6 +2207,7 @@ static void test_CreateTypeLib(void) { hres = ITypeInfo_GetImplTypeFlags(interface2, 1, &impltypeflags); ok(hres == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hres); + funcdesc.elemdescFunc.tdesc.vt = VT_VOID; funcdesc.oVft = 0xaaac; hres = ICreateTypeInfo_AddFuncDesc(createti, 0, &funcdesc); ok(hres == S_OK, "got %08x\n", hres); @@ -2416,10 +2460,10 @@ static void test_CreateTypeLib(void) { ok(hres == S_OK, "got %08x\n", hres); ok(typeattr->cbSizeInstance == 4, "cbSizeInstance = %d\n", typeattr->cbSizeInstance); ok(typeattr->typekind == 3, "typekind = %d\n", typeattr->typekind); - ok(typeattr->cFuncs == 12, "cFuncs = %d\n", typeattr->cFuncs); + ok(typeattr->cFuncs == 13, "cFuncs = %d\n", typeattr->cFuncs); ok(typeattr->cVars == 0, "cVars = %d\n", typeattr->cVars); ok(typeattr->cImplTypes == 1, "cImplTypes = %d\n", typeattr->cImplTypes); - ok(typeattr->cbSizeVft == 60 || broken(typeattr->cbSizeVft == 3 * sizeof(void *) + 48), /* xp64 */ + ok(typeattr->cbSizeVft == 64 || broken(typeattr->cbSizeVft == 3 * sizeof(void *) + 52), /* xp64 */ "cbSizeVft = %d\n", typeattr->cbSizeVft); ok(typeattr->cbAlignment == 4, "cbAlignment = %d\n", typeattr->cbAlignment); ok(typeattr->wTypeFlags == 0, "wTypeFlags = %d\n", typeattr->wTypeFlags); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index f3d742d..7d5b1c8 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -886,7 +886,9 @@ static HRESULT ctl2_encode_variant( arg_type = VT_UI4; v = *value; - if(V_VT(value) != arg_type) { + if(arg_type == VT_VARIANT) { + arg_type = V_VT(value); + }else if(V_VT(value) != arg_type) { hres = VariantChangeType(&v, value, 0, arg_type); if(FAILED(hres)) return hres; @@ -894,6 +896,8 @@ static HRESULT ctl2_encode_variant( /* Check if default value can be stored in encoded_value */ switch(arg_type) { + case VT_INT: + case VT_UINT: case VT_I4: case VT_UI4: mask = 0x3ffffff; @@ -1223,6 +1227,12 @@ static int ctl2_encode_typedesc( *alignment = 4; /* guess? */ break; + case VT_VARIANT: + *encoded_tdesc = default_tdesc; + *width = sizeof(VT_VARIANT); + *alignment = 4; + break; + case VT_VOID: *encoded_tdesc = 0x80000000 | (VT_EMPTY << 16) | tdesc->vt; *width = 0;

1 0

Piotr Caban : oleaut32: Fixed setting oVft value in ITypeInfo2::GetFuncDesc .
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: cd9bbd64e8030e1ec8a87f5105f52cfdbcdc1108 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd9bbd64e8030e1ec8a87f510… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 9 12:12:20 2013 +0200 oleaut32: Fixed setting oVft value in ITypeInfo2::GetFuncDesc. --- dlls/oleaut32/tests/typelib.c | 50 ++++++++++++++++++++++++++-------------- dlls/oleaut32/typelib2.c | 4 +-- 2 files changed, 33 insertions(+), 21 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 077c59c..ca414867 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1722,8 +1722,7 @@ static void test_CreateTypeLib(void) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 0, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - todo_wine ok(pfuncdesc->oVft == 12 || - broken(pfuncdesc->oVft == 24) /* xp64 */, + ok(pfuncdesc->oVft == 12 || broken(pfuncdesc->oVft == 24) /* xp64 */, "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_BSTR, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); @@ -1783,8 +1782,7 @@ static void test_CreateTypeLib(void) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 1, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - todo_wine ok(pfuncdesc->oVft == 16 || - broken(pfuncdesc->oVft == 28) /* xp64 */, + ok(pfuncdesc->oVft == 16 || broken(pfuncdesc->oVft == 28) /* xp64 */, "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); @@ -1825,8 +1823,7 @@ static void test_CreateTypeLib(void) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 0, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - todo_wine ok(pfuncdesc->oVft == 16 || - broken(pfuncdesc->oVft == 28), /* xp64 */ + ok(pfuncdesc->oVft == 16 || broken(pfuncdesc->oVft == 28), /* xp64 */ "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); @@ -1857,8 +1854,7 @@ static void test_CreateTypeLib(void) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 1, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - todo_wine ok(pfuncdesc->oVft == 28 || - broken(pfuncdesc->oVft == 40) /* xp64 */, + ok(pfuncdesc->oVft == 28 || broken(pfuncdesc->oVft == 40) /* xp64 */, "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); @@ -1890,8 +1886,7 @@ static void test_CreateTypeLib(void) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 1, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - todo_wine ok(pfuncdesc->oVft == 28 || - broken(pfuncdesc->oVft == 40) /* xp64 */, + ok(pfuncdesc->oVft == 28 || broken(pfuncdesc->oVft == 40) /* xp64 */, "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); @@ -1927,8 +1922,7 @@ static void test_CreateTypeLib(void) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 1, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - todo_wine ok(pfuncdesc->oVft == 24 || - broken(pfuncdesc->oVft == 36) /* xp64 */, + ok(pfuncdesc->oVft == 24 || broken(pfuncdesc->oVft == 36) /* xp64 */, "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); @@ -1969,8 +1963,7 @@ static void test_CreateTypeLib(void) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 2, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - todo_wine ok(pfuncdesc->oVft == 24 || - broken(pfuncdesc->oVft == 36) /* xp64 */, + ok(pfuncdesc->oVft == 24 || broken(pfuncdesc->oVft == 36) /* xp64 */, "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); @@ -2021,8 +2014,7 @@ static void test_CreateTypeLib(void) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 2, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - todo_wine ok(pfuncdesc->oVft == 24 || - broken(pfuncdesc->oVft == 36) /* xp64 */, + ok(pfuncdesc->oVft == 24 || broken(pfuncdesc->oVft == 36) /* xp64 */, "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); @@ -2078,8 +2070,7 @@ static void test_CreateTypeLib(void) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 1, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - todo_wine ok(pfuncdesc->oVft == 32 || - broken(pfuncdesc->oVft == 44), /* xp64 */ + ok(pfuncdesc->oVft == 32 || broken(pfuncdesc->oVft == 44), /* xp64 */ "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); @@ -2179,6 +2170,29 @@ static void test_CreateTypeLib(void) { funcdesc.oVft = 0xaaa8; hres = ICreateTypeInfo_AddFuncDesc(createti, 0, &funcdesc); ok(hres == S_OK, "got %08x\n", hres); + + hres = ICreateTypeInfo_QueryInterface(createti, &IID_ITypeInfo, (void**)&ti2); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ITypeInfo2_GetFuncDesc(ti2, 0, &pfuncdesc); + ok(hres == S_OK, "got %08x\n", hres); + + ok(pfuncdesc->memid == 0x60020000, "got %x\n", pfuncdesc->memid); + ok(pfuncdesc->lprgscode == NULL, "got %p\n", pfuncdesc->lprgscode); + ok(pfuncdesc->lprgelemdescParam != NULL, "got %p\n", pfuncdesc->lprgelemdescParam); + ok(pfuncdesc->funckind == FUNC_PUREVIRTUAL, "got 0x%x\n", pfuncdesc->funckind); + ok(pfuncdesc->invkind == INVOKE_FUNC, "got 0x%x\n", pfuncdesc->invkind); + ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); + ok(pfuncdesc->cParams == 1, "got %d\n", pfuncdesc->cParams); + ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); + ok(pfuncdesc->oVft == (short)0xaaa8, "got %d\n", pfuncdesc->oVft); + ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); + ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); + ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); + + ITypeInfo2_ReleaseFuncDesc(ti2, pfuncdesc); + ITypeInfo2_Release(ti2); + funcdesc.oVft = 0; ICreateTypeInfo_Release(createti); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 354ec8a..f3d742d 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -3295,9 +3295,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetFuncDesc( (*ppFuncDesc)->callconv = (typedata[4] >> 8) & 0xF; (*ppFuncDesc)->cParams = typedata[5]; (*ppFuncDesc)->cParamsOpt = 0; /* FIXME: Unimplemented*/ - (*ppFuncDesc)->oVft = typedata[3] & 0xFFFF; - if ((*ppFuncDesc)->oVft) - --(*ppFuncDesc)->oVft; + (*ppFuncDesc)->oVft = typedata[3] & 0xFFFC; (*ppFuncDesc)->cScodes = 0; /* FIXME: Unimplemented*/ hres = ctl2_decode_typedesc(This->typelib, typedata[1], &(*ppFuncDesc)->elemdescFunc.tdesc);

1 0

Alexandre Julliard : wineconsole: Fix a pointer cast warning.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: 3221338ca36df71065df5411cf6d1c8716e25ba0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3221338ca36df71065df5411c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 9 14:41:33 2013 +0200 wineconsole: Fix a pointer cast warning. --- programs/wineconsole/wineconsole.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index bda69a4..d298705 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -760,7 +760,7 @@ static UINT WINECON_ParseOptions(const char* lpCmdLine, struct wc_init* wci) if (strncmp(wci->ptr, "--use-event=", 12) == 0) { char* end; - wci->event = (HANDLE)strtol(wci->ptr + 12, &end, 10); + wci->event = ULongToHandle( strtoul(wci->ptr + 12, &end, 10) ); if (end == wci->ptr + 12) return IDS_CMD_INVALID_EVENT_ID; wci->mode = from_event; wci->ptr = end;

1 0

Alexandre Julliard : cabarc: Avoid some redefinition warnings.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: 24fe3127835e6f91820c19e0f167fb74971e2a43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24fe3127835e6f91820c19e0f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 9 14:41:24 2013 +0200 cabarc: Avoid some redefinition warnings. --- programs/cabarc/cabarc.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c index bef4bfc..02213f6 100644 --- a/programs/cabarc/cabarc.c +++ b/programs/cabarc/cabarc.c @@ -35,6 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(cabarc); /* from msvcrt */ +#ifndef _O_RDONLY #define _O_RDONLY 0 #define _O_WRONLY 1 #define _O_RDWR 2 @@ -50,17 +51,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(cabarc); #define _O_SHORT_LIVED 0x1000 #define _O_TEXT 0x4000 #define _O_BINARY 0x8000 +#endif +#ifndef _SH_COMPAT #define _SH_COMPAT 0x00 #define _SH_DENYRW 0x10 #define _SH_DENYWR 0x20 #define _SH_DENYRD 0x30 #define _SH_DENYNO 0x40 +#endif +#ifndef _A_RDONLY #define _A_RDONLY 0x01 #define _A_HIDDEN 0x02 #define _A_SYSTEM 0x04 #define _A_ARCH 0x20 +#endif /* command-line options */ static int opt_cabinet_size = CB_MAX_DISK;

1 0

Alexandre Julliard : libport: Rename spawnvp to _spawnvp to avoid the deprecated name.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: 43ac582d7dd74acd5e1ac91ebecbe302611b298d URL: http://source.winehq.org/git/wine.git/?a=commit;h=43ac582d7dd74acd5e1ac91eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 9 13:50:40 2013 +0200 libport: Rename spawnvp to _spawnvp to avoid the deprecated name. --- configure | 1 - configure.ac | 1 - include/config.h.in | 3 --- include/wine/port.h | 4 ++-- libs/port/spawn.c | 12 +++++------- programs/explorer/desktop.c | 2 +- programs/winebrowser/main.c | 2 +- programs/winemenubuilder/winemenubuilder.c | 4 ++-- programs/winevdm/winevdm.c | 2 +- tools/winebuild/utils.c | 2 +- tools/winegcc/utils.c | 2 +- 11 files changed, 14 insertions(+), 21 deletions(-) diff --git a/configure b/configure index 6997375..8d6d227 100755 --- a/configure +++ b/configure @@ -13066,7 +13066,6 @@ for ac_func in \ sigaltstack \ sigprocmask \ snprintf \ - spawnvp \ statfs \ statvfs \ strcasecmp \ diff --git a/configure.ac b/configure.ac index 080e961..084a2d6 100644 --- a/configure.ac +++ b/configure.ac @@ -2011,7 +2011,6 @@ AC_CHECK_FUNCS(\ sigaltstack \ sigprocmask \ snprintf \ - spawnvp \ statfs \ statvfs \ strcasecmp \ diff --git a/include/config.h.in b/include/config.h.in index 2f30549..0a1d78a 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -734,9 +734,6 @@ /* Define to 1 if you have the `socketpair' function. */ #undef HAVE_SOCKETPAIR -/* Define to 1 if you have the `spawnvp' function. */ -#undef HAVE_SPAWNVP - /* Define to 1 if the system has the type `ssize_t'. */ #undef HAVE_SSIZE_T diff --git a/include/wine/port.h b/include/wine/port.h index d6904c0..76a0b3e 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -353,8 +353,8 @@ extern int mkstemps(char *template, int suffix_len); # define _P_NOWAITO 3 # define _P_DETACH 4 #endif -#ifndef HAVE_SPAWNVP -extern int spawnvp(int mode, const char *cmdname, const char * const argv[]); +#ifndef HAVE__SPAWNVP +extern int _spawnvp(int mode, const char *cmdname, const char * const argv[]); #endif /* Interlocked functions */ diff --git a/libs/port/spawn.c b/libs/port/spawn.c index 0cdc08c..97364e7 100644 --- a/libs/port/spawn.c +++ b/libs/port/spawn.c @@ -21,6 +21,8 @@ #include "config.h" #include "wine/port.h" +#ifndef HAVE__SPAWNVP + #include <errno.h> #include <signal.h> #include <stdlib.h> @@ -32,10 +34,8 @@ # include <unistd.h> #endif -#ifndef HAVE_SPAWNVP -int spawnvp(int mode, const char *cmdname, const char *const argv[]) +int _spawnvp(int mode, const char *cmdname, const char *const argv[]) { -#ifndef HAVE__SPAWNVP int pid, status, wret; if (mode == _P_OVERLAY) @@ -93,8 +93,6 @@ int spawnvp(int mode, const char *cmdname, const char *const argv[]) } return pid; -#else /* HAVE__SPAWNVP */ - return _spawnvp(mode, cmdname, argv); -#endif /* HAVE__SPAWNVP */ } -#endif /* HAVE_SPAWNVP */ + +#endif /* HAVE__SPAWNVP */ diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 4c8e599..7cfa0d1 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -45,7 +45,7 @@ static BOOL start_screensaver( void ) if (using_root) { const char *argv[3] = { "xdg-screensaver", "activate", NULL }; - int pid = spawnvp( _P_DETACH, argv[0], argv ); + int pid = _spawnvp( _P_DETACH, argv[0], argv ); if (pid > 0) { WINE_TRACE( "started process %d\n", pid ); diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index ad46b20..22f3a93 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -90,7 +90,7 @@ static int launch_app( WCHAR *candidates, const WCHAR *argv1 ) argv_new[1] = cmdline; argv_new[2] = NULL; - spawnvp( _P_OVERLAY, app, argv_new ); /* only returns on error */ + _spawnvp( _P_OVERLAY, app, argv_new ); /* only returns on error */ app = strtok( NULL, "," ); /* grab the next app */ } WINE_ERR( "could not find a suitable app to run\n" ); diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index c931363..9c81ab8 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -3371,11 +3371,11 @@ static void RefreshFileTypeAssociations(void) argv[0] = "update-mime-database"; argv[1] = mime_dir; argv[2] = NULL; - spawnvp( _P_DETACH, argv[0], argv ); + _spawnvp( _P_DETACH, argv[0], argv ); argv[0] = "update-desktop-database"; argv[1] = applications_dir; - spawnvp( _P_DETACH, argv[0], argv ); + _spawnvp( _P_DETACH, argv[0], argv ); } end: diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index d297551..b818d76 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -198,7 +198,7 @@ static void start_dosbox( const char *appname, const char *args ) args[1] = "-conf"; args[2] = config_file; args[3] = NULL; - ret = spawnvp( _P_WAIT, args[0], args ); + ret = _spawnvp( _P_WAIT, args[0], args ); } CloseHandle( file ); DeleteFileW( config ); diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 40a9afe..1c77e41 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -268,7 +268,7 @@ void spawn( struct strarray *args ) for (i = 0; args->str[i]; i++) fprintf( stderr, "%s%c", args->str[i], args->str[i+1] ? ' ' : '\n' ); - if ((status = spawnvp( _P_WAIT, args->str[0], args->str ))) + if ((status = _spawnvp( _P_WAIT, args->str[0], args->str ))) { if (status > 0) fatal_error( "%s failed with status %u\n", args->str[0], status ); else fatal_perror( "winebuild" ); diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index 05b9a65..75fb20b 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -334,7 +334,7 @@ void spawn(const strarray* prefix, const strarray* args, int ignore_errors) printf("\n"); } - if ((status = spawnvp( _P_WAIT, argv[0], argv)) && !ignore_errors) + if ((status = _spawnvp( _P_WAIT, argv[0], argv)) && !ignore_errors) { if (status > 0) error("%s failed\n", argv[0]); else perror("winegcc");

1 0

Alexandre Julliard : makefiles: Don't link against libport in the tests.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: c8ada1fc0663f77f3790babc51c3872ed7d7a4cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8ada1fc0663f77f3790babc5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 9 15:25:56 2013 +0200 makefiles: Don't link against libport in the tests. --- Maketest.rules.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Maketest.rules.in b/Maketest.rules.in index 828c375..4ee50a0 100644 --- a/Maketest.rules.in +++ b/Maketest.rules.in @@ -30,10 +30,10 @@ MAKEDEPFLAGS = -xo -xcross.o all: $(TESTPROGRAM) $(WINETEST_RES) $(MODULE) $(MODULE).so: $(OBJS) Makefile.in - $(WINEGCC) $(APPMODE) $(OBJS) -o $@ $(LIBPORT) $(ALL_LIBS) + $(WINEGCC) $(APPMODE) $(OBJS) -o $@ $(ALL_LIBS) $(WINETEST_EXE): $(OBJS) Makefile.in - $(WINEGCC) -s -Wb,-F,$(MODULE) $(APPMODE) $(OBJS) -o $@ $(LIBPORT) $(ALL_LIBS) + $(WINEGCC) -s -Wb,-F,$(MODULE) $(APPMODE) $(OBJS) -o $@ $(ALL_LIBS) $(WINETEST_RES): $(WINETEST_EXE) echo "$(MODULE) TESTRES \"$(WINETEST_EXE)\"" | $(LDPATH) $(WRC) $(RCFLAGS) -o $@

1 0

Alexandre Julliard : msvcrt: Constify the arguments of execv functions.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: d95857d6698b0b4d6bbd7427a3ba3f6febf27b27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d95857d6698b0b4d6bbd7427a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 9 13:45:48 2013 +0200 msvcrt: Constify the arguments of execv functions. --- dlls/msvcrt/process.c | 28 ++++++++++++++-------------- include/msvcrt/process.h | 16 ++++++++-------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index 872edf8..b61eea1 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -600,9 +600,9 @@ MSVCRT_intptr_t CDECL _execlpe(const char* name, const char* arg0, ...) * * Unicode version of _execv */ -MSVCRT_intptr_t CDECL _wexecv(const MSVCRT_wchar_t* name, MSVCRT_wchar_t* const* argv) +MSVCRT_intptr_t CDECL _wexecv(const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* const* argv) { - return MSVCRT__wspawnve(MSVCRT__P_OVERLAY, name, (const MSVCRT_wchar_t* const*) argv, NULL); + return MSVCRT__wspawnve(MSVCRT__P_OVERLAY, name, argv, NULL); } /********************************************************************* @@ -611,9 +611,9 @@ MSVCRT_intptr_t CDECL _wexecv(const MSVCRT_wchar_t* name, MSVCRT_wchar_t* const* * Like on Windows, this function does not handle arguments with spaces * or double-quotes. */ -MSVCRT_intptr_t CDECL _execv(const char* name, char* const* argv) +MSVCRT_intptr_t CDECL _execv(const char* name, const char* const* argv) { - return MSVCRT__spawnve(MSVCRT__P_OVERLAY, name, (const char* const*) argv, NULL); + return MSVCRT__spawnve(MSVCRT__P_OVERLAY, name, argv, NULL); } /********************************************************************* @@ -621,9 +621,9 @@ MSVCRT_intptr_t CDECL _execv(const char* name, char* const* argv) * * Unicode version of _execve */ -MSVCRT_intptr_t CDECL _wexecve(const MSVCRT_wchar_t* name, MSVCRT_wchar_t* const* argv, const MSVCRT_wchar_t* const* envv) +MSVCRT_intptr_t CDECL _wexecve(const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* const* argv, const MSVCRT_wchar_t* const* envv) { - return MSVCRT__wspawnve(MSVCRT__P_OVERLAY, name, (const MSVCRT_wchar_t* const*) argv, envv); + return MSVCRT__wspawnve(MSVCRT__P_OVERLAY, name, argv, envv); } /********************************************************************* @@ -632,9 +632,9 @@ MSVCRT_intptr_t CDECL _wexecve(const MSVCRT_wchar_t* name, MSVCRT_wchar_t* const * Like on Windows, this function does not handle arguments with spaces * or double-quotes. */ -MSVCRT_intptr_t CDECL MSVCRT__execve(const char* name, char* const* argv, const char* const* envv) +MSVCRT_intptr_t CDECL MSVCRT__execve(const char* name, const char* const* argv, const char* const* envv) { - return MSVCRT__spawnve(MSVCRT__P_OVERLAY, name, (const char* const*) argv, envv); + return MSVCRT__spawnve(MSVCRT__P_OVERLAY, name, argv, envv); } /********************************************************************* @@ -642,9 +642,9 @@ MSVCRT_intptr_t CDECL MSVCRT__execve(const char* name, char* const* argv, const * * Unicode version of _execvpe */ -MSVCRT_intptr_t CDECL _wexecvpe(const MSVCRT_wchar_t* name, MSVCRT_wchar_t* const* argv, const MSVCRT_wchar_t* const* envv) +MSVCRT_intptr_t CDECL _wexecvpe(const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* const* argv, const MSVCRT_wchar_t* const* envv) { - return MSVCRT__wspawnvpe(MSVCRT__P_OVERLAY, name, (const MSVCRT_wchar_t* const*) argv, envv); + return MSVCRT__wspawnvpe(MSVCRT__P_OVERLAY, name, argv, envv); } /********************************************************************* @@ -653,9 +653,9 @@ MSVCRT_intptr_t CDECL _wexecvpe(const MSVCRT_wchar_t* name, MSVCRT_wchar_t* cons * Like on Windows, this function does not handle arguments with spaces * or double-quotes. */ -MSVCRT_intptr_t CDECL _execvpe(const char* name, char* const* argv, const char* const* envv) +MSVCRT_intptr_t CDECL _execvpe(const char* name, const char* const* argv, const char* const* envv) { - return MSVCRT__spawnvpe(MSVCRT__P_OVERLAY, name, (const char* const*) argv, envv); + return MSVCRT__spawnvpe(MSVCRT__P_OVERLAY, name, argv, envv); } /********************************************************************* @@ -663,7 +663,7 @@ MSVCRT_intptr_t CDECL _execvpe(const char* name, char* const* argv, const char* * * Unicode version of _execvp */ -MSVCRT_intptr_t CDECL _wexecvp(const MSVCRT_wchar_t* name, MSVCRT_wchar_t* const* argv) +MSVCRT_intptr_t CDECL _wexecvp(const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* const* argv) { return _wexecvpe(name, argv, NULL); } @@ -674,7 +674,7 @@ MSVCRT_intptr_t CDECL _wexecvp(const MSVCRT_wchar_t* name, MSVCRT_wchar_t* const * Like on Windows, this function does not handle arguments with spaces * or double-quotes. */ -MSVCRT_intptr_t CDECL _execvp(const char* name, char* const* argv) +MSVCRT_intptr_t CDECL _execvp(const char* name, const char* const* argv) { return _execvpe(name, argv, NULL); } diff --git a/include/msvcrt/process.h b/include/msvcrt/process.h index 7530ab0..f9ab2a4 100644 --- a/include/msvcrt/process.h +++ b/include/msvcrt/process.h @@ -36,10 +36,10 @@ intptr_t __cdecl _execl(const char*,const char*,...); intptr_t __cdecl _execle(const char*,const char*,...); intptr_t __cdecl _execlp(const char*,const char*,...); intptr_t __cdecl _execlpe(const char*,const char*,...); -intptr_t __cdecl _execv(const char*,char* const *); -intptr_t __cdecl _execve(const char*,char* const *,const char* const *); -intptr_t __cdecl _execvp(const char*,char* const *); -intptr_t __cdecl _execvpe(const char*,char* const *,const char* const *); +intptr_t __cdecl _execv(const char*,const char* const *); +intptr_t __cdecl _execve(const char*,const char* const *,const char* const *); +intptr_t __cdecl _execvp(const char*,const char* const *); +intptr_t __cdecl _execvpe(const char*,const char* const *,const char* const *); int __cdecl _getpid(void); intptr_t __cdecl _spawnl(int,const char*,const char*,...); intptr_t __cdecl _spawnle(int,const char*,const char*,...); @@ -94,10 +94,10 @@ int __cdecl _wsystem(const wchar_t*); static inline intptr_t cwait(int *status, intptr_t pid, int action) { return _cwait(status, pid, action); } static inline int getpid(void) { return _getpid(); } -static inline intptr_t execv(const char* name, char* const* argv) { return _execv(name, argv); } -static inline intptr_t execve(const char* name, char* const* argv, const char* const* envv) { return _execve(name, argv, envv); } -static inline intptr_t execvp(const char* name, char* const* argv) { return _execvp(name, argv); } -static inline intptr_t execvpe(const char* name, char* const* argv, const char* const* envv) { return _execvpe(name, argv, envv); } +static inline intptr_t execv(const char* name, const char* const* argv) { return _execv(name, argv); } +static inline intptr_t execve(const char* name, const char* const* argv, const char* const* envv) { return _execve(name, argv, envv); } +static inline intptr_t execvp(const char* name, const char* const* argv) { return _execvp(name, argv); } +static inline intptr_t execvpe(const char* name, const char* const* argv, const char* const* envv) { return _execvpe(name, argv, envv); } static inline intptr_t spawnv(int flags, const char* name, const char* const* argv) { return _spawnv(flags, name, argv); } static inline intptr_t spawnve(int flags, const char* name, const char* const* argv, const char* const* envv) { return _spawnve(flags, name, argv, envv); } static inline intptr_t spawnvp(int flags, const char* name, const char* const* argv) { return _spawnvp(flags, name, argv); }

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
58
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 2013