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

Henri Verbeet : wined3d: Introduce a helper function for printing floats in GLSL shaders.
by Alexandre Julliard 11 Jun '13

11 Jun '13

Module: wine Branch: master Commit: e0494afa007a1d1ba2f4b649beedca27cb20808e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0494afa007a1d1ba2f4b649b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 11 10:21:28 2013 +0200 wined3d: Introduce a helper function for printing floats in GLSL shaders. --- dlls/wined3d/arb_program_shader.c | 7 ++ dlls/wined3d/glsl_shader.c | 120 ++++++++++++++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 7 -- 3 files changed, 105 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ef75a2f..fd2df68 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -39,6 +39,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); WINE_DECLARE_DEBUG_CHANNEL(d3d_constants); WINE_DECLARE_DEBUG_CHANNEL(d3d); +/* sRGB correction constants */ +static const float srgb_cmp = 0.0031308f; +static const float srgb_mul_low = 12.92f; +static const float srgb_pow = 0.41666f; +static const float srgb_mul_high = 1.055f; +static const float srgb_sub_high = 0.055f; + static BOOL shader_is_pshader_version(enum wined3d_shader_type type) { return type == WINED3D_SHADER_TYPE_PIXEL; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0379729..ffe4d25 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -47,6 +47,9 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); #define WINED3D_GLSL_SAMPLE_LOD 0x4 #define WINED3D_GLSL_SAMPLE_GRAD 0x8 +static const float srgb_const0[] = {0.41666f, 1.055f, 0.055f, 12.92f}; /* pow, mul_high, sub_high, mul_low */ +static const float srgb_const1[] = {0.0031308f, 0.0f, 0.0f, 0.0f}; /* cmp */ + struct glsl_dst_param { char reg_name[150]; @@ -242,6 +245,64 @@ static const char *shader_glsl_get_prefix(enum wined3d_shader_type type) } } +/* This should be equivalent to using the %.8e format specifier, but always + * using '.' as decimal separator. This doesn't handle +/-INF or NAN, since + * the GLSL parser wouldn't be able to handle those anyway. */ +static void shader_glsl_ftoa(float value, char *s) +{ + int x, frac, exponent; + const char *sign = ""; + double d; + + d = value; + if (copysignf(1.0f, value) < 0.0f) + { + d = -d; + sign = "-"; + } + + if (d == 0.0f) + { + x = 0; + frac = 0; + exponent = 0; + } + else + { + double t, diff; + + exponent = floorf(log10f(d)); + d /= pow(10.0, exponent); + + x = d; + t = (d - x) * 100000000; + frac = t; + diff = t - frac; + + if ((diff > 0.5) || (diff == 0.5 && (frac & 1))) + { + if (++frac >= 100000000) + { + frac = 0; + ++x; + } + } + } + + sprintf(s, "%s%d.%08de%+03d", sign, x, frac, exponent); +} + +static void shader_glsl_append_imm_vec4(struct wined3d_shader_buffer *buffer, const float *values) +{ + char str[4][16]; + + shader_glsl_ftoa(values[0], str[0]); + shader_glsl_ftoa(values[1], str[1]); + shader_glsl_ftoa(values[2], str[2]); + shader_glsl_ftoa(values[3], str[3]); + shader_addline(buffer, "vec4(%s, %s, %s, %s)", str[0], str[1], str[2], str[3]); +} + /* Extract a line from the info log. * Note that this modifies the source string. */ static char *get_info_log_line(char **ptr) @@ -1206,10 +1267,12 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont if (ps_args->srgb_correction) { - shader_addline(buffer, "const vec4 srgb_const0 = vec4(%.8e, %.8e, %.8e, %.8e);\n", - srgb_pow, srgb_mul_high, srgb_sub_high, srgb_mul_low); - shader_addline(buffer, "const vec4 srgb_const1 = vec4(%.8e, 0.0, 0.0, 0.0);\n", - srgb_cmp); + shader_addline(buffer, "const vec4 srgb_const0 = "); + shader_glsl_append_imm_vec4(buffer, srgb_const0); + shader_addline(buffer, ";\n"); + shader_addline(buffer, "const vec4 srgb_const1 = "); + shader_glsl_append_imm_vec4(buffer, srgb_const1); + shader_addline(buffer, ";\n"); } if (reg_maps->vpos || reg_maps->usesdsy) { @@ -1221,13 +1284,21 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont } else { - /* This happens because we do not have proper tracking of the constant registers that are - * actually used, only the max limit of the shader version - */ + float ycorrection[] = + { + context->render_offscreen ? 0.0f : fb->render_targets[0]->resource.height, + context->render_offscreen ? 1.0f : -1.0f, + 0.0f, + 0.0f, + }; + + /* This happens because we do not have proper tracking of the + * constant registers that are actually used, only the max + * limit of the shader version. */ FIXME("Cannot find a free uniform for vpos correction params\n"); - shader_addline(buffer, "const vec4 ycorrection = vec4(%f, %f, 0.0, 0.0);\n", - context->render_offscreen ? 0.0f : fb->render_targets[0]->resource.height, - context->render_offscreen ? 1.0f : -1.0f); + shader_addline(buffer, "const vec4 ycorrection = "); + shader_glsl_append_imm_vec4(buffer, ycorrection); + shader_addline(buffer, ";\n"); } shader_addline(buffer, "vec4 vpos;\n"); } @@ -1261,10 +1332,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont { LIST_FOR_EACH_ENTRY(lconst, &shader->constantsF, struct wined3d_shader_lconst, entry) { - 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]); + shader_addline(buffer, "const vec4 %s_lc%u = ", prefix, lconst->idx); + shader_glsl_append_imm_vec4(buffer, (const float *)lconst->value); + shader_addline(buffer, ";\n"); } } @@ -1388,6 +1458,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; const char *prefix = shader_glsl_get_prefix(version->type); struct glsl_src_param rel_param0, rel_param1; + char imm_str[4][16]; if (reg->idx[0].offset != ~0U && reg->idx[0].rel_addr) shader_glsl_add_src_param(ins, reg->idx[0].rel_addr, WINED3DSP_WRITEMASK_0, &rel_param0); @@ -1583,7 +1654,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * switch (reg->data_type) { case WINED3D_DATA_FLOAT: - sprintf(register_name, "%.8e", *(const float *)reg->immconst_data); + shader_glsl_ftoa(*(const float *)reg->immconst_data, register_name); break; case WINED3D_DATA_INT: sprintf(register_name, "%#x", reg->immconst_data[0]); @@ -1603,9 +1674,12 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * switch (reg->data_type) { case WINED3D_DATA_FLOAT: - sprintf(register_name, "vec4(%.8e, %.8e, %.8e, %.8e)", - *(const float *)&reg->immconst_data[0], *(const float *)&reg->immconst_data[1], - *(const float *)&reg->immconst_data[2], *(const float *)&reg->immconst_data[3]); + shader_glsl_ftoa(*(const float *)&reg->immconst_data[0], imm_str[0]); + shader_glsl_ftoa(*(const float *)&reg->immconst_data[1], imm_str[1]); + shader_glsl_ftoa(*(const float *)&reg->immconst_data[2], imm_str[2]); + shader_glsl_ftoa(*(const float *)&reg->immconst_data[3], imm_str[3]); + sprintf(register_name, "vec4(%s, %s, %s, %s)", + imm_str[0], imm_str[1], imm_str[2], imm_str[3]); break; case WINED3D_DATA_INT: sprintf(register_name, "ivec4(%#x, %#x, %#x, %#x)", @@ -5399,10 +5473,12 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct wined3d_shader_buf if (settings->sRGB_write) { - shader_addline(buffer, "const vec4 srgb_const0 = vec4(%.8e, %.8e, %.8e, %.8e);\n", - srgb_pow, srgb_mul_high, srgb_sub_high, srgb_mul_low); - shader_addline(buffer, "const vec4 srgb_const1 = vec4(%.8e, 0.0, 0.0, 0.0);\n", - srgb_cmp); + shader_addline(buffer, "const vec4 srgb_const0 = "); + shader_glsl_append_imm_vec4(buffer, srgb_const0); + shader_addline(buffer, ";\n"); + shader_addline(buffer, "const vec4 srgb_const1 = "); + shader_glsl_append_imm_vec4(buffer, srgb_const1); + shader_addline(buffer, ";\n"); } shader_addline(buffer, "void main()\n{\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6539548..4ac9098 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2854,13 +2854,6 @@ struct ps_np2fixup_info { WORD num_consts; }; -/* sRGB correction constants */ -static const float srgb_cmp = 0.0031308f; -static const float srgb_mul_low = 12.92f; -static const float srgb_pow = 0.41666f; -static const float srgb_mul_high = 1.055f; -static const float srgb_sub_high = 0.055f; - struct wined3d_palette { LONG ref;

1 0

Alexandre Rostovtsev : configure: In gnutls-3.2, gnutls_mac_get_key_size() moved to crypto.h.
by Alexandre Julliard 11 Jun '13

11 Jun '13

Module: wine Branch: master Commit: fee9cd3b243ed4eeb111417a472831bb364fc2fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fee9cd3b243ed4eeb111417a4… Author: Alexandre Rostovtsev <tetromino(a)gentoo.org> Date: Tue Jun 11 01:01:56 2013 -0400 configure: In gnutls-3.2, gnutls_mac_get_key_size() moved to crypto.h. Based on a patch by Ben Kohler <bkohler(a)gmail.com>. --- configure | 1 + configure.ac | 3 ++- dlls/secur32/schannel_gnutls.c | 1 + 3 files changed, 4 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 3006070..86eab07 100755 --- a/configure +++ b/configure @@ -10200,6 +10200,7 @@ if test "x$ac_cv_header_gnutls_gnutls_h" = xyes; then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <gnutls/gnutls.h> +#include <gnutls/crypto.h> int main () { diff --git a/configure.ac b/configure.ac index 680432c..a01b44c 100644 --- a/configure.ac +++ b/configure.ac @@ -1344,7 +1344,8 @@ then ac_save_CPPFLAGS="$CPPFLAGS" WINE_PACKAGE_FLAGS(GNUTLS,[gnutls]) AC_CHECK_HEADER(gnutls/gnutls.h, - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h> +#include <gnutls/crypto.h>]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])], [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS])])], [GNUTLS_CFLAGS=""]) CPPFLAGS="$ac_save_CPPFLAGS" diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 70b8276..cbe64e8 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -25,6 +25,7 @@ #include <stdarg.h> #ifdef SONAME_LIBGNUTLS #include <gnutls/gnutls.h> +#include <gnutls/crypto.h> #endif #include "windef.h"

1 0

Alexandre Rostovtsev : configure: Always check for pkg-config.
by Alexandre Julliard 11 Jun '13

11 Jun '13

Module: wine Branch: master Commit: 21f2c0e6e709cccadf2db4dd45fedc478fc91e6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=21f2c0e6e709cccadf2db4dd4… Author: Alexandre Rostovtsev <tetromino(a)gentoo.org> Date: Tue Jun 11 01:05:42 2013 -0400 configure: Always check for pkg-config. --- configure | 188 +++++++++++++++++++++++++++++----------------------------- configure.ac | 1 + 2 files changed, 95 insertions(+), 94 deletions(-) diff --git a/configure b/configure index 86eab07..606305f 100755 --- a/configure +++ b/configure @@ -672,7 +672,6 @@ XSLT_LIBS XSLT_CFLAGS XML2_LIBS XML2_CFLAGS -PKG_CONFIG X_EXTRA_LIBS X_LIBS X_PRE_LIBS @@ -711,6 +710,7 @@ CPP OPENGL_LIBS XLIB MAINTAINER_MODE +PKG_CONFIG MSGFMT ICOTOOL CONVERT @@ -5152,6 +5152,98 @@ fi done test -n "$MSGFMT" || MSGFMT="false" +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$PKG_CONFIG"; then + ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +PKG_CONFIG=$ac_cv_prog_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_PKG_CONFIG"; then + ac_ct_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_PKG_CONFIG"; then + ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG +if test -n "$ac_ct_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5 +$as_echo "$ac_ct_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_ct_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" +fi + if test "x$enable_maintainer_mode" != "xyes" then @@ -9500,99 +9592,7 @@ test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" != xyes && enable_opencl=${enable_op if test "x$with_xml" != "xno" then ac_save_CPPFLAGS="$CPPFLAGS" - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$PKG_CONFIG"; then - ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -PKG_CONFIG=$ac_cv_prog_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_PKG_CONFIG"; then - ac_ct_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_PKG_CONFIG"; then - ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG -if test -n "$ac_ct_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5 -$as_echo "$ac_ct_PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_ct_PKG_CONFIG - fi -else - PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" -fi - -if test -n "$XML2_CFLAGS"; then : + if test -n "$XML2_CFLAGS"; then : elif test -n "$PKG_CONFIG"; then : XML2_CFLAGS=`$PKG_CONFIG --cflags libxml-2.0 2>/dev/null` diff --git a/configure.ac b/configure.ac index a01b44c..74fd134 100644 --- a/configure.ac +++ b/configure.ac @@ -288,6 +288,7 @@ AC_CHECK_PROGS(RSVG, rsvg, false) AC_CHECK_PROGS(CONVERT, convert, false) AC_CHECK_PROGS(ICOTOOL, icotool, false) AC_CHECK_PROGS(MSGFMT, msgfmt, false) +WINE_PATH_PKG_CONFIG if test "x$enable_maintainer_mode" != "xyes" then

1 0

André Hentschel : oleaut32/tests: Add tests for VarDecCmpR8 (gcov).
by Alexandre Julliard 11 Jun '13

11 Jun '13

Module: wine Branch: master Commit: b3f7de8fecbaf15179bcf2cbf972590c4d5d7e75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3f7de8fecbaf15179bcf2cbf… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 9 23:27:24 2013 +0200 oleaut32/tests: Add tests for VarDecCmpR8 (gcov). --- dlls/oleaut32/tests/vartype.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 4411d7d..345a822 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -482,6 +482,7 @@ static HRESULT (WINAPI *pVarDecSub)(const DECIMAL*,const DECIMAL*,DECIMAL*); static HRESULT (WINAPI *pVarDecMul)(const DECIMAL*,const DECIMAL*,DECIMAL*); static HRESULT (WINAPI *pVarDecDiv)(const DECIMAL*,const DECIMAL*,DECIMAL*); static HRESULT (WINAPI *pVarDecCmp)(const DECIMAL*,const DECIMAL*); +static HRESULT (WINAPI *pVarDecCmpR8)(const DECIMAL*,double); static HRESULT (WINAPI *pVarDecNeg)(const DECIMAL*,DECIMAL*); static HRESULT (WINAPI *pVarBoolFromUI1)(BYTE,VARIANT_BOOL*); @@ -4258,6 +4259,8 @@ static void test_VarDecFromCy(void) #define MATH1(func) hres = p##func(&l, &out) #undef MATH2 #define MATH2(func) hres = p##func(&l, &r, &out) +#undef MATH3 +#define MATH3(func) hres = p##func(&l, r) static void test_VarDecAbs(void) { @@ -4554,6 +4557,36 @@ static void test_VarDecCmp(void) } +static void test_VarDecCmpR8(void) +{ + HRESULT hres; + DECIMAL l; + double r; + + CHECKPTR(VarDecCmpR8); + + SETDEC(l,0,0,0,1); r = 0.0; MATH3(VarDecCmpR8); EXPECT_GT; + SETDEC(l,0,0,0,1); r = 0.1; MATH3(VarDecCmpR8); EXPECT_GT; + SETDEC(l,0,0,0,1); r = -0.1; MATH3(VarDecCmpR8); EXPECT_GT; + + SETDEC(l,0,DECIMAL_NEG,0,1); r = 0.0; MATH3(VarDecCmpR8); EXPECT_LT; + SETDEC(l,0,DECIMAL_NEG,0,1); r = 0.1; MATH3(VarDecCmpR8); EXPECT_LT; + SETDEC(l,0,DECIMAL_NEG,0,1); r = -0.1; MATH3(VarDecCmpR8); EXPECT_LT; + + SETDEC(l,0,0,0,0); r = 0.0; MATH3(VarDecCmpR8); EXPECT_EQ; + SETDEC(l,0,0,0,0); r = 0.1; MATH3(VarDecCmpR8); EXPECT_LT; + SETDEC(l,0,0,0,0); r = -0.1; MATH3(VarDecCmpR8); EXPECT_GT; + + SETDEC(l,0,DECIMAL_NEG,0,0); r = 0.0; MATH3(VarDecCmpR8); EXPECT_EQ; + SETDEC(l,0,DECIMAL_NEG,0,0); r = 0.1; MATH3(VarDecCmpR8); EXPECT_LT; + SETDEC(l,0,DECIMAL_NEG,0,0); r = -0.1; MATH3(VarDecCmpR8); EXPECT_GT; + + SETDEC(l,0,0,0,1); r = DECIMAL_NEG; MATH3(VarDecCmpR8); EXPECT_LT; + SETDEC(l,0,DECIMAL_NEG,0,0); r = DECIMAL_NEG; MATH3(VarDecCmpR8); EXPECT_LT; + SETDEC(l,0,0,-1,-1); r = DECIMAL_NEG; MATH3(VarDecCmpR8); EXPECT_GT; + SETDEC(l,0,DECIMAL_NEG,-1,-1); r = DECIMAL_NEG; MATH3(VarDecCmpR8); EXPECT_LT; +} + /* * VT_BOOL */ @@ -6358,6 +6391,7 @@ START_TEST(vartype) test_VarDecAdd(); test_VarDecSub(); test_VarDecCmp(); + test_VarDecCmpR8(); test_VarDecMul(); test_VarDecDiv();

1 0

Marcus Meissner : oleaut32: Fixed incorrect pointer deref (Coverity).
by Alexandre Julliard 10 Jun '13

10 Jun '13

Module: wine Branch: master Commit: b22dade1d634c9a3843780af9755617fa6409430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b22dade1d634c9a3843780af9… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 9 20:44:19 2013 +0200 oleaut32: Fixed incorrect pointer deref (Coverity). --- dlls/oleaut32/typelib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index ad0b4ae..c2c3a63 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3506,7 +3506,7 @@ static WORD SLTG_ReadString(const char *ptr, const TLBString **pStr, ITypeLibImp len = MultiByteToWideChar(CP_ACP, 0, ptr + 2, bytelen, NULL, 0); tmp_str = SysAllocStringLen(NULL, len); - if (*tmp_str) { + if (tmp_str) { MultiByteToWideChar(CP_ACP, 0, ptr + 2, bytelen, tmp_str, len); *pStr = TLB_append_str(&lib->string_list, tmp_str); SysFreeString(tmp_str);

1 0

Marcus Meissner : oleaut32: Avoid memory leaking junk (Coverity).
by Alexandre Julliard 10 Jun '13

10 Jun '13

Module: wine Branch: master Commit: 0bd04d40cfcf1e2ce628285fd15d4881284f5fc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bd04d40cfcf1e2ce628285fd… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 9 20:47:00 2013 +0200 oleaut32: Avoid memory leaking junk (Coverity). --- dlls/oleaut32/typelib.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index c2c3a63..024df0d 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -9771,6 +9771,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface) FILE_ATTRIBUTE_NORMAL, 0); if (outfile == INVALID_HANDLE_VALUE){ WMSFT_free_file(&file); + heap_free(junk); return TYPE_E_IOERROR; } @@ -9778,10 +9779,12 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface) if (!br) { WMSFT_free_file(&file); CloseHandle(outfile); + heap_free(junk); return TYPE_E_IOERROR; } br = WriteFile(outfile, junk, junk_size, &written, NULL); + heap_free(junk); if (!br) { WMSFT_free_file(&file); CloseHandle(outfile);

1 0

Marcus Meissner : user32/tests: Remove side effects from assert()s.
by Alexandre Julliard 10 Jun '13

10 Jun '13

Module: wine Branch: master Commit: b853ddc40b342e02d7cab7ade2c2c7e544b9935d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b853ddc40b342e02d7cab7ade… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 9 22:39:54 2013 +0200 user32/tests: Remove side effects from assert()s. --- dlls/user32/tests/win.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 2d9faaa..abd7f8d 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1523,10 +1523,14 @@ static void test_MDI_child_stack(HWND mdi_client) cs.style = 0; cs.lParam = (LPARAM)mdi_lParam_test_message; - assert(child_1 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs)); - assert(child_2 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs)); - assert(child_3 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs)); - assert(child_4 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs)); + child_1 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs); + ok(child_1 != 0, "expected child_1 to be non NULL"); + child_2 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs); + ok(child_2 != 0, "expected child_2 to be non NULL"); + child_3 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs); + ok(child_3 != 0, "expected child_3 to be non NULL"); + child_4 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs); + ok(child_4 != 0, "expected child_4 to be non NULL"); stack[0] = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); stack[1] = GetWindow(stack[0], GW_HWNDNEXT);

1 0

Dmitry Timoshkov : ole32/tests: Remove redundant code.
by Alexandre Julliard 10 Jun '13

10 Jun '13

Module: wine Branch: master Commit: 289437dc4d79ce2433fda4547dd58a7bf644eeae URL: http://source.winehq.org/git/wine.git/?a=commit;h=289437dc4d79ce2433fda4547… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 10 17:52:10 2013 +0900 ole32/tests: Remove redundant code. --- dlls/ole32/tests/ole_server.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/tests/ole_server.c b/dlls/ole32/tests/ole_server.c index 303ec35..d6c5ccc 100644 --- a/dlls/ole32/tests/ole_server.c +++ b/dlls/ole32/tests/ole_server.c @@ -329,7 +329,7 @@ static HANDLE start_server(const char *argv0) PROCESS_INFORMATION pi; STARTUPINFO si; SECURITY_ATTRIBUTES sa; - char **argv, cmdline[MAX_PATH * 2]; + char cmdline[MAX_PATH * 2]; BOOL ret; memset(&si, 0, sizeof(si)); @@ -343,7 +343,6 @@ static HANDLE start_server(const char *argv0) sa.lpSecurityDescriptor = NULL; sa.bInheritHandle = TRUE; - winetest_get_mainargs(&argv); sprintf(cmdline, "\"%s\" ole_server -server", argv0); ret = CreateProcess(argv0, cmdline, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); @@ -364,20 +363,13 @@ START_TEST(ole_server) HANDLE mapping, done_event, init_done_event, process; struct winetest_info *info; int argc; - char **argv, *argv0, *ext; + char **argv; mapping = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 4096, "winetest_ole_server"); ok(mapping != 0, "CreateFileMapping failed\n"); info = MapViewOfFile(mapping, FILE_MAP_READ|FILE_MAP_WRITE, 0, 0, 4096); argc = winetest_get_mainargs(&argv); - argv0 = strrchr(argv[0], '\\'); - if (!argv0) argv0 = strrchr(argv[0], '/'); - if (!argv0) argv0 = argv[0]; - else argv0++; - argv0 = strdup(argv0); - ext = strrchr(argv0, '.'); - if (ext && !lstrcmpi(ext, ".so")) *ext = 0; done_event = CreateEvent(NULL, TRUE, FALSE, "ole_server_done_event"); ok(done_event != 0, "CreateEvent error %d\n", GetLastError());

1 0

Dmitry Timoshkov : ole32/tests: Add a test for local server interaction using an in-process handler.
by Alexandre Julliard 10 Jun '13

10 Jun '13

Module: wine Branch: master Commit: 2daa5367f8654a2d4d889dd834cb73e04255c22b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2daa5367f8654a2d4d889dd83… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 10 17:52:59 2013 +0900 ole32/tests: Add a test for local server interaction using an in-process handler. --- dlls/ole32/tests/ole_server.c | 92 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 85 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/tests/ole_server.c b/dlls/ole32/tests/ole_server.c index d6c5ccc..9cff693 100644 --- a/dlls/ole32/tests/ole_server.c +++ b/dlls/ole32/tests/ole_server.c @@ -55,6 +55,7 @@ static const struct GUID_NAME(IStdMarshalInfo), GUID_NAME(IExternalConnection), GUID_NAME(IRunnableObject), + GUID_NAME(ICallFactory), { &CLSID_IdentityUnmarshal, "CLSID_IdentityUnmarshal" }, { &CLSID_UnknownUnmarshal, "CLSID_UnknownUnmarshal" }, #undef GUID_NAME @@ -276,7 +277,7 @@ static void ole_server(void) } /******************************* OLE client *******************************/ -static BOOL register_server(const char *server) +static BOOL register_server(const char *server, BOOL inproc_handler) { static const WCHAR clsidW[] = {'C','L','S','I','D','\\',0}; DWORD ret; @@ -296,6 +297,13 @@ static BOOL register_server(const char *server) { ret = RegSetValue(root, "LocalServer32", REG_SZ, server_path, strlen(server_path)); ok(ret == ERROR_SUCCESS, "RegSetValue error %u\n", ret); + + if (inproc_handler) + { + ret = RegSetValue(root, "InprocHandler32", REG_SZ, "ole32.dll", 9); + ok(ret == ERROR_SUCCESS, "RegSetValue error %u\n", ret); + } + RegCloseKey(root); } @@ -316,6 +324,8 @@ static void unregister_server(void) DELETE, NULL, &root, NULL); if (ret == ERROR_SUCCESS) { + ret = RegDeleteKey(root, "InprocHandler32"); + ok(ret == ERROR_SUCCESS, "RegDeleteKey error %u\n", ret); ret = RegDeleteKey(root, "LocalServer32"); ok(ret == ERROR_SUCCESS, "RegDeleteKey error %u\n", ret); ret = RegDeleteKey(root, ""); @@ -359,6 +369,7 @@ START_TEST(ole_server) IClassFactory *factory; IUnknown *unknown; IOleObject *oleobj; + IRunnableObject *runobj; DWORD ret; HANDLE mapping, done_event, init_done_event, process; struct winetest_info *info; @@ -396,7 +407,7 @@ START_TEST(ole_server) return; } - if (!register_server(argv[0])) + if (!register_server(argv[0], FALSE)) { win_skip("not enough permissions to create a server CLSID key\n"); return; @@ -415,14 +426,81 @@ START_TEST(ole_server) hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_HANDLER, &IID_IUnknown, (void **)&unknown); ok(hr == REGDB_E_CLASSNOTREG, "expected REGDB_E_CLASSNOTREG, got %#x\n", hr); - /* server supports IID_IUnknown */ + if (!register_server(argv[0], TRUE)) + { + win_skip("not enough permissions to create a server CLSID key\n"); + unregister_server(); + return; + } + + trace("call CoCreateInstance(&IID_NULL)\n"); + hr = CoCreateInstance(&clsid, NULL, CLSCTX_LOCAL_SERVER, &IID_NULL, (void **)&unknown); + trace("ret CoCreateInstance(&IID_NULL)\n"); + ok(hr == E_NOINTERFACE, "expected E_NOINTERFACE, got %#x\n", hr); + + /* in-process handler supports IID_IUnknown starting from Vista */ + trace("call CoCreateInstance(&IID_IUnknown)\n"); + hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_HANDLER, &IID_IUnknown, (void **)&unknown); + trace("ret CoCreateInstance(&IID_IUnknown)\n"); + ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG) /* XP,win2000 and earlier */, "CoCreateInstance(IID_IUnknown) error %#x\n", hr); + if (hr != S_OK) + { + win_skip("In-process handler doesn't support IID_IUnknown on this platform\n"); + goto test_local_server; + } + + trace("call CoCreateInstance(&IID_IOleObject)\n"); + hr = CoCreateInstance(&clsid, NULL, CLSCTX_LOCAL_SERVER, &IID_IOleObject, (void **)&oleobj); + trace("ret CoCreateInstance(&IID_IOleObject)\n"); + ok(hr == E_NOINTERFACE, "expected E_NOINTERFACE, got %#x\n", hr); + + trace("call IUnknown_QueryInterface(&IID_IRunnableObject)\n"); + hr = IUnknown_QueryInterface(unknown, &IID_IRunnableObject, (void **)&runobj); + trace("ret IUnknown_QueryInterface(&IID_IRunnableObject)\n"); + ok(hr == S_OK, "QueryInterface(&IID_IRunnableObject) error %#x\n", hr); + + ret = IRunnableObject_IsRunning(runobj); + ok(!ret, "expected 0, got %d\n", ret); + + trace("call OleRun\n"); + hr = OleRun(unknown); + trace("ret OleRun\n"); +todo_wine + ok(hr == S_OK, "OleRun error %#x\n", hr); + + ret = IRunnableObject_IsRunning(runobj); +todo_wine + ok(ret == 1, "expected 1, got %d\n", ret); + + trace("call IRunnableObject_Release\n"); + ret = IRunnableObject_Release(runobj); + trace("ret IRunnableObject_Release\n"); + ok(ret == 1, "expected ref 1, got %u\n", ret); + + trace("call IUnknown_QueryInterface(&IID_IOleObject)\n"); + hr = IUnknown_QueryInterface(unknown, &IID_IOleObject, (void **)&oleobj); + trace("ret IUnknown_QueryInterface(&IID_IOleObject)\n"); + ok(hr == S_OK, "QueryInterface(&IID_IOleObject) error %#x\n", hr); + + trace("call IOleObject_Release\n"); + ret = IOleObject_Release(oleobj); + trace("ret IOleObject_Release\n"); + ok(ret == 1, "expected ref 1, got %u\n", ret); + + trace("call IUnknown_Release\n"); + ret = IUnknown_Release(unknown); + trace("ret IUnknown_Release\n"); + ok(!ret, "expected ref 0, got %u\n", ret); + +test_local_server: + /* local server supports IID_IUnknown */ trace("call CoCreateInstance(&IID_IUnknown)\n"); hr = CoCreateInstance(&clsid, NULL, CLSCTX_LOCAL_SERVER, &IID_IUnknown, (void **)&unknown); trace("ret CoCreateInstance(&IID_IUnknown)\n"); ok(hr == S_OK, "CoCreateInstance(IID_IUnknown) error %#x\n", hr); trace("call IUnknown_QueryInterface(&IID_IRunnableObject)\n"); - hr = IUnknown_QueryInterface(unknown, &IID_IRunnableObject, (void **)&oleobj); + hr = IUnknown_QueryInterface(unknown, &IID_IRunnableObject, (void **)&runobj); trace("ret IUnknown_QueryInterface(&IID_IRunnableObject)\n"); ok(hr == E_NOINTERFACE, "expected E_NOINTERFACE, got %#x\n", hr); @@ -446,9 +524,9 @@ START_TEST(ole_server) trace("ret CoGetClassObject(&IID_IClassFactory)\n"); ok(hr == S_OK, "CoGetClassObject error %#x\n", hr); - trace("call IClassFactory_QueryInterface(&IID_IOleObject)\n"); - hr = IClassFactory_QueryInterface(factory, &IID_IOleObject, (void **)&oleobj); - trace("ret IClassFactory_QueryInterface(&IID_IOleObject)\n"); + trace("call IClassFactory_CreateInstance(&IID_NULL)\n"); + hr = IClassFactory_CreateInstance(factory, NULL, &IID_NULL, (void **)&oleobj); + trace("ret IClassFactory_CreateInstance(&IID_NULL)\n"); ok(hr == E_NOINTERFACE, "expected E_NOINTERFACE, got %#x\n", hr); trace("call IClassFactory_CreateInstance(&IID_IOleObject)\n");

1 0

Alexandre Julliard : winebuild: Split the names of the as and ld commands to allow arguments.
by Alexandre Julliard 10 Jun '13

10 Jun '13

Module: wine Branch: master Commit: f7272176d9e74f8f645572bd3a36f6a452eaf460 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7272176d9e74f8f645572bd3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 13:17:21 2013 +0200 winebuild: Split the names of the as and ld commands to allow arguments. --- tools/winebuild/build.h | 10 +++++----- tools/winebuild/import.c | 9 +++++---- tools/winebuild/main.c | 12 ++++++------ tools/winebuild/res32.c | 4 ++-- tools/winebuild/utils.c | 43 +++++++++++++++++++++++++++++++++++-------- 5 files changed, 53 insertions(+), 25 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 08b0004..e943762 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -229,7 +229,7 @@ extern char *xstrdup( const char *str ); extern char *strupper(char *s); extern int strendswith(const char* str, const char* end); extern char *strmake(const char* fmt, ...) __attribute__((__format__ (__printf__, 1, 2 ))); -extern struct strarray *strarray_init(void); +extern struct strarray *strarray_fromstring( const char *str, const char *delim ); extern void strarray_add( struct strarray *array, ... ); extern void strarray_addv( struct strarray *array, char * const *argv ); extern void strarray_free( struct strarray *array ); @@ -246,7 +246,7 @@ extern int output( const char *format, ... ) extern void output_cfi( const char *format, ... ) __attribute__ ((__format__ (__printf__, 1, 2))); extern void spawn( struct strarray *array ); -extern char *find_tool( const char *name, const char * const *names ); +extern struct strarray *find_tool( const char *name, const char * const *names ); extern struct strarray *get_as_command(void); extern struct strarray *get_ld_command(void); extern const char *get_nm_command(void); @@ -357,9 +357,9 @@ extern FILE *output_file; extern const char *output_file_name; extern char **lib_path; -extern char *as_command; -extern char *ld_command; -extern char *nm_command; +extern struct strarray *as_command; +extern struct strarray *ld_command; +extern struct strarray *nm_command; extern char *cpu_option; #endif /* __WINE_BUILD_H */ diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index f533989..f8de47e 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1322,7 +1322,7 @@ void output_imports( DLLSPEC *spec ) /* output an import library for a Win32 module and additional object files */ void output_import_lib( DLLSPEC *spec, char **argv ) { - struct strarray *args = strarray_init(); + struct strarray *args; char *def_file; if (target_platform != PLATFORM_WINDOWS) @@ -1336,14 +1336,15 @@ void output_import_lib( DLLSPEC *spec, char **argv ) fclose( output_file ); output_file = NULL; - strarray_add( args, find_tool( "dlltool", NULL ), "-k", "-l", output_file_name, "-d", def_file, NULL ); + args = find_tool( "dlltool", NULL ); + strarray_add( args, "-k", "-l", output_file_name, "-d", def_file, NULL ); spawn( args ); strarray_free( args ); if (argv[0]) { - args = strarray_init(); - strarray_add( args, find_tool( "ar", NULL ), "rs", output_file_name, NULL ); + args = find_tool( "ar", NULL ); + strarray_add( args, "rs", output_file_name, NULL ); strarray_addv( args, argv ); spawn( args ); strarray_free( args ); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 16b4165..de526a9 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -84,9 +84,9 @@ const char *output_file_name = NULL; static const char *output_file_source_name; static int fake_module; -char *as_command = NULL; -char *ld_command = NULL; -char *nm_command = NULL; +struct strarray *as_command = NULL; +struct strarray *ld_command = NULL; +struct strarray *nm_command = NULL; char *cpu_option = NULL; static int nb_res_files; @@ -474,7 +474,7 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) set_exec_mode( MODE_IMPLIB ); break; case LONG_OPT_ASCMD: - as_command = xstrdup( optarg ); + as_command = strarray_fromstring( optarg, " " ); break; case LONG_OPT_FAKE_MODULE: fake_module = 1; @@ -486,10 +486,10 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) spec->characteristics |= IMAGE_FILE_LARGE_ADDRESS_AWARE; break; case LONG_OPT_LDCMD: - ld_command = xstrdup( optarg ); + ld_command = strarray_fromstring( optarg, " " ); break; case LONG_OPT_NMCMD: - nm_command = xstrdup( optarg ); + nm_command = strarray_fromstring( optarg, " " ); break; case LONG_OPT_NXCOMPAT: if (optarg[0] == 'n' || optarg[0] == 'N') diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index bd3f6fa..0c39ec1 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -680,8 +680,8 @@ void output_res_o_file( DLLSPEC *spec ) close( fd ); free( output_buffer ); - args = strarray_init(); - strarray_add( args, find_tool( "windres", NULL ), "-i", res_file, "-o", output_file_name, NULL ); + args = find_tool( "windres", NULL ); + strarray_add( args, "-i", res_file, "-o", output_file_name, NULL ); spawn( args ); strarray_free( args ); diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 1c77e41..d064572 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -138,12 +138,23 @@ char *strmake( const char* fmt, ... ) } } -struct strarray *strarray_init(void) +static struct strarray *strarray_init( const char *str ) { struct strarray *array = xmalloc( sizeof(*array) ); array->count = 0; array->max = 16; array->str = xmalloc( array->max * sizeof(*array->str) ); + if (str) array->str[array->count++] = str; + return array; +} + +static struct strarray *strarray_copy( const struct strarray *src ) +{ + struct strarray *array = xmalloc( sizeof(*array) ); + array->count = src->count; + array->max = src->max; + array->str = xmalloc( array->max * sizeof(*array->str) ); + memcpy( array->str, src->str, array->count * sizeof(*array->str) ); return array; } @@ -172,6 +183,19 @@ void strarray_addv( struct strarray *array, char * const *argv ) while (*argv) strarray_add_one( array, *argv++ ); } +struct strarray *strarray_fromstring( const char *str, const char *delim ) +{ + const char *tok; + struct strarray *array = strarray_init( NULL ); + char *buf = strdup( str ); + + for (tok = strtok( buf, delim ); tok; tok = strtok( NULL, delim )) + strarray_add_one( array, strdup( tok )); + + free( buf ); + return array; +} + void strarray_free( struct strarray *array ) { free( array->str ); @@ -277,7 +301,7 @@ void spawn( struct strarray *args ) } /* find a build tool in the path, trying the various names */ -char *find_tool( const char *name, const char * const *names ) +struct strarray *find_tool( const char *name, const char * const *names ) { static char **dirs; static unsigned int count, maxlen; @@ -338,7 +362,8 @@ char *find_tool( const char *name, const char * const *names ) strcpy( p, *names ); strcat( p, EXEEXT ); - if (!stat( file, &st ) && S_ISREG(st.st_mode) && (st.st_mode & 0111)) return file; + if (!stat( file, &st ) && S_ISREG(st.st_mode) && (st.st_mode & 0111)) + return strarray_init( file ); } free( file ); names++; @@ -349,7 +374,7 @@ char *find_tool( const char *name, const char * const *names ) struct strarray *get_as_command(void) { static int as_is_clang = 0; - struct strarray *args = strarray_init(); + struct strarray *args; if (!as_command) { @@ -366,7 +391,7 @@ struct strarray *get_as_command(void) if (!as_command) fatal_error( "cannot find suitable assembler\n" ); - strarray_add_one( args, as_command ); + args = strarray_copy( as_command ); if (as_is_clang) { @@ -401,7 +426,7 @@ struct strarray *get_as_command(void) struct strarray *get_ld_command(void) { - struct strarray *args = strarray_init(); + struct strarray *args; if (!ld_command) { @@ -412,7 +437,7 @@ struct strarray *get_ld_command(void) if (!ld_command) fatal_error( "cannot find suitable linker\n" ); - strarray_add_one( args, ld_command ); + args = strarray_copy( ld_command ); if (force_pointer_size) { @@ -450,7 +475,9 @@ const char *get_nm_command(void) if (!nm_command) fatal_error( "cannot find suitable name lister\n" ); - return nm_command; + if (nm_command->count > 1) + fatal_error( "multiple arguemnts in nm command not supported yet\n" ); + return nm_command->str[0]; } /* get a name for a temp file, automatically cleaned up on exit */

1 0