September 2012 - Wine-commits

Alexandre Julliard : gdi32: Allow GetCharABCWidths on all scalable fonts, not just TrueType ones.
by Alexandre Julliard 27 Sep '12

27 Sep '12

Module: wine Branch: master Commit: f0e4062773ac8028cb9674703926523de44a64c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0e4062773ac8028cb9674703… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 26 22:42:28 2012 +0200 gdi32: Allow GetCharABCWidths on all scalable fonts, not just TrueType ones. --- dlls/gdi32/font.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 5fefa2f..85a27f1 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2692,9 +2692,9 @@ BOOL WINAPI GetCharABCWidthsW( HDC hdc, UINT firstChar, UINT lastChar, return FALSE; } - /* unlike GetCharABCWidthsFloatW, this one is supposed to fail on non-TrueType fonts */ + /* unlike GetCharABCWidthsFloatW, this one is supposed to fail on non-scalable fonts */ dev = GET_DC_PHYSDEV( dc, pGetTextMetrics ); - if (!dev->funcs->pGetTextMetrics( dev, &tm ) || !(tm.tmPitchAndFamily & TMPF_TRUETYPE)) + if (!dev->funcs->pGetTextMetrics( dev, &tm ) || !(tm.tmPitchAndFamily & TMPF_VECTOR)) { release_dc_ptr( dc ); return FALSE;

1 0

Jörg Höhle : winmm: The "open new ..." MCI string command sets an empty OPEN_ELEMENT.
by Alexandre Julliard 27 Sep '12

27 Sep '12

Module: wine Branch: master Commit: 8ff7436d218834835edd54fb72f6b05c59e6590d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ff7436d218834835edd54fb7… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Sep 20 16:48:17 2012 +0200 winmm: The "open new ..." MCI string command sets an empty OPEN_ELEMENT. --- dlls/winmm/mci.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index ba2fea6..1448b16 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -898,6 +898,13 @@ static DWORD MCI_SendCommandFrom32(MCIDEVICEID wDevID, UINT16 wMsg, DWORD_PTR dw /************************************************************************** * MCI_FinishOpen [internal] + * + * Three modes of operation: + * 1 open foo.ext ... -> OPEN_ELEMENT with lpstrElementName=foo.ext + * open sequencer!foo.ext same with lpstrElementName=foo.ext + * 2 open new type waveaudio -> OPEN_ELEMENT with empty ("") lpstrElementName + * 3 open sequencer -> OPEN_ELEMENT unset, and + * capability sequencer (auto-open) likewise */ static DWORD MCI_FinishOpen(LPWINE_MCIDRIVER wmd, LPMCI_OPEN_PARMSW lpParms, DWORD dwParam) @@ -1371,6 +1378,8 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, dwRet = MCIERR_MISSING_DEVICE_NAME; goto errCleanUp; } + dwFlags |= MCI_OPEN_ELEMENT; + data.open.lpstrElementName = &wszNull[0]; } else if ((devType = strchrW(dev, '!')) != NULL) { *devType++ = '\0'; tmp = devType; devType = dev; dev = tmp;

1 0

Matteo Bruni : d3dcompiler: Move variables declaration to a separate function.
by Alexandre Julliard 27 Sep '12

27 Sep '12

Module: wine Branch: master Commit: 4019a3deb60a3848ac1762c3dd2e63d302cfdcc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4019a3deb60a3848ac1762c3d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 26 19:22:31 2012 +0200 d3dcompiler: Move variables declaration to a separate function. --- dlls/d3dcompiler_43/hlsl.y | 235 ++++++++++++++++++++++++-------------------- 1 files changed, 129 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4019a3deb60a3848ac176…

1 0

Matteo Bruni : d3dcompiler: Parse structure declarations.
by Alexandre Julliard 27 Sep '12

27 Sep '12

Module: wine Branch: master Commit: 97a170d2d18e1646e339cfb82454dab79ddf2842 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97a170d2d18e1646e339cfb82… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 26 19:22:32 2012 +0200 d3dcompiler: Parse structure declarations. --- dlls/d3dcompiler_43/hlsl.y | 189 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 186 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 670b4f5..d8c0d2b 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -597,6 +597,13 @@ static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers, continue; } + if (type->type == HLSL_CLASS_STRUCT) + { + FIXME("Struct var with an initializer.\n"); + free_instr_list(v->initializer); + d3dcompiler_free(v); + continue; + } if (type->type > HLSL_CLASS_LAST_NUMERIC) { FIXME("Initializers for non scalar/struct variables not supported yet.\n"); @@ -630,6 +637,79 @@ static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers, return statements_list; } +static BOOL add_struct_field(struct list *fields, struct hlsl_struct_field *field) +{ + struct hlsl_struct_field *f; + + LIST_FOR_EACH_ENTRY(f, fields, struct hlsl_struct_field, entry) + { + if (!strcmp(f->name, field->name)) + return FALSE; + } + list_add_tail(fields, &field->entry); + return TRUE; +} + +static struct list *gen_struct_fields(struct hlsl_type *type, DWORD modifiers, struct list *fields) +{ + struct parse_variable_def *v, *v_next; + struct hlsl_struct_field *field; + struct list *list; + + list = d3dcompiler_alloc(sizeof(*list)); + if (!list) + { + ERR("Out of memory.\n"); + return NULL; + } + list_init(list); + LIST_FOR_EACH_ENTRY_SAFE(v, v_next, fields, struct parse_variable_def, entry) + { + debug_dump_decl(type, 0, v->name, v->loc.line); + field = d3dcompiler_alloc(sizeof(*field)); + if (!field) + { + ERR("Out of memory.\n"); + d3dcompiler_free(v); + return list; + } + field->type = type; + field->name = v->name; + field->modifiers = modifiers; + field->semantic = v->semantic; + if (v->initializer) + { + hlsl_report_message(v->loc.file, v->loc.line, v->loc.col, HLSL_LEVEL_ERROR, + "struct field with an initializer.\n"); + free_instr_list(v->initializer); + } + list_add_tail(list, &field->entry); + d3dcompiler_free(v); + } + d3dcompiler_free(fields); + return list; +} + +static struct hlsl_type *new_struct_type(const char *name, DWORD modifiers, struct list *fields) +{ + struct hlsl_type *type = d3dcompiler_alloc(sizeof(*type)); + + if (!type) + { + ERR("Out of memory.\n"); + return NULL; + } + type->type = HLSL_CLASS_STRUCT; + type->name = name; + type->dimx = type->dimy = 1; + type->modifiers = modifiers; + type->e.elements = fields; + + list_add_tail(&hlsl_ctx.types, &type->entry); + + return type; +} + static BOOL add_typedef(DWORD modifiers, struct hlsl_type *orig_type, struct list *list, struct source_location *loc) { @@ -809,12 +889,17 @@ static BOOL add_typedef(DWORD modifiers, struct hlsl_type *orig_type, struct lis %type <type> type %type <list> declaration_statement %type <list> declaration +%type <list> struct_declaration +%type <type> struct_spec +%type <type> named_struct_spec +%type <type> unnamed_struct_spec %type <list> type_specs %type <variable_def> type_spec %type <list> complex_initializer %type <list> initializer_expr_list %type <instr> initializer_expr %type <modifiers> var_modifiers +%type <list> field %type <list> parameters %type <list> param_list %type <instr> expr @@ -828,10 +913,12 @@ static BOOL add_typedef(DWORD modifiers, struct hlsl_type *orig_type, struct lis %type <list> loop_statement %type <function> func_declaration %type <function> func_prototype +%type <list> fields_list %type <parameter> parameter %type <name> semantic %type <variable_def> variable_def %type <list> variables_def +%type <list> variables_def_optional %type <if_body> if_body %type <instr> primary_expr %type <instr> postfix_expr @@ -889,10 +976,99 @@ preproc_directive: PRE_LINE STRING } } +struct_declaration: struct_spec variables_def_optional ';' + { + struct source_location loc; + + set_location(&loc, &@3); + if (!$2) + { + if (!$1->name) + { + hlsl_report_message(loc.file, loc.line, loc.col, + HLSL_LEVEL_ERROR, "anonymous struct declaration with no variables"); + } + check_type_modifiers($1->modifiers, &loc); + } + $$ = declare_vars($1, 0, $2); + } + +struct_spec: named_struct_spec + | unnamed_struct_spec + +named_struct_spec: var_modifiers KW_STRUCT any_identifier '{' fields_list '}' + { + BOOL ret; + struct source_location loc; + + TRACE("Structure %s declaration.\n", debugstr_a($3)); + set_location(&loc, &@1); + check_invalid_matrix_modifiers($1, &loc); + $$ = new_struct_type($3, $1, $5); + + if (get_variable(hlsl_ctx.cur_scope, $3)) + { + hlsl_report_message(hlsl_ctx.source_file, @3.first_line, @3.first_column, + HLSL_LEVEL_ERROR, "redefinition of '%s'", $3); + return 1; + } + + ret = add_type_to_scope(hlsl_ctx.cur_scope, $$); + if (!ret) + { + hlsl_report_message(hlsl_ctx.source_file, @3.first_line, @3.first_column, + HLSL_LEVEL_ERROR, "redefinition of struct '%s'", $3); + return 1; + } + } + +unnamed_struct_spec: var_modifiers KW_STRUCT '{' fields_list '}' + { + struct source_location loc; + + TRACE("Anonymous structure declaration.\n"); + set_location(&loc, &@1); + check_invalid_matrix_modifiers($1, &loc); + $$ = new_struct_type(NULL, $1, $4); + } + any_identifier: VAR_IDENTIFIER | TYPE_IDENTIFIER | NEW_IDENTIFIER +fields_list: /* Empty */ + { + $$ = d3dcompiler_alloc(sizeof(*$$)); + list_init($$); + } + | fields_list field + { + BOOL ret; + struct hlsl_struct_field *field, *next; + + $$ = $1; + LIST_FOR_EACH_ENTRY_SAFE(field, next, $2, struct hlsl_struct_field, entry) + { + ret = add_struct_field($$, field); + if (ret == FALSE) + { + hlsl_report_message(hlsl_ctx.source_file, @2.first_line, @2.first_column, + HLSL_LEVEL_ERROR, "redefinition of '%s'", field->name); + d3dcompiler_free(field); + } + } + d3dcompiler_free($2); + } + +field: var_modifiers type variables_def ';' + { + $$ = gen_struct_fields($2, $1, $3); + } + | unnamed_struct_spec variables_def ';' + { + $$ = gen_struct_fields($1, 0, $2); + } + func_declaration: func_prototype compound_statement { TRACE("Function %s parsed.\n", $1->name); @@ -1123,9 +1299,7 @@ base_type: KW_VOID } declaration_statement: declaration - { - $$ = $1; - } + | struct_declaration | typedef { $$ = d3dcompiler_alloc(sizeof(*$$)); @@ -1171,6 +1345,15 @@ declaration: var_modifiers type variables_def ';' $$ = declare_vars($2, $1, $3); } +variables_def_optional: /* Empty */ + { + $$ = NULL; + } + | variables_def + { + $$ = $1; + } + variables_def: variable_def { $$ = d3dcompiler_alloc(sizeof(*$$));

1 0

Matteo Bruni : d3dcompiler: Also free the list itself in free_instr_list().
by Alexandre Julliard 27 Sep '12

27 Sep '12

Module: wine Branch: master Commit: f2d2755eefccd98851a5e2a0f2e1f10ca7d9cfc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2d2755eefccd98851a5e2a0f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 26 19:22:33 2012 +0200 d3dcompiler: Also free the list itself in free_instr_list(). --- dlls/d3dcompiler_43/utils.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index d50a9be..7fbf3b5 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -2222,6 +2222,7 @@ void free_instr_list(struct list *list) return; LIST_FOR_EACH_ENTRY_SAFE(node, next_node, list, struct hlsl_ir_node, entry) free_instr(node); + d3dcompiler_free(list); } static void free_ir_constant(struct hlsl_ir_constant *constant) @@ -2360,5 +2361,5 @@ void free_function(struct hlsl_ir_function_decl *func) d3dcompiler_free(param); d3dcompiler_free(func->parameters); free_instr_list(func->body); - d3dcompiler_free(func->body); + d3dcompiler_free(func); }

1 0

Matteo Bruni : d3dcompiler: Store the pointer to the struct field in the dereference node.
by Alexandre Julliard 27 Sep '12

27 Sep '12

Module: wine Branch: master Commit: 9cbd80bda18091caaf98634d2a010a764f3992be URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cbd80bda18091caaf98634d2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 26 19:22:34 2012 +0200 d3dcompiler: Store the pointer to the struct field in the dereference node. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 +- dlls/d3dcompiler_43/utils.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 03fe66c..5ed0bda 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -903,7 +903,7 @@ struct hlsl_ir_deref struct { struct hlsl_ir_node *record; - const char *field; + struct hlsl_struct_field *field; } record; } v; }; diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 7fbf3b5..b957643 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1912,7 +1912,7 @@ static void debug_dump_ir_deref(const struct hlsl_ir_deref *deref) break; case HLSL_IR_DEREF_RECORD: debug_dump_instr(deref->v.record.record); - TRACE(".%s", debugstr_a(deref->v.record.field)); + TRACE(".%s", debugstr_a(deref->v.record.field->name)); break; } } @@ -2261,7 +2261,6 @@ static void free_ir_deref(struct hlsl_ir_deref *deref) break; case HLSL_IR_DEREF_RECORD: free_instr(deref->v.record.record); - d3dcompiler_free((void *)deref->v.record.field); break; } d3dcompiler_free(deref);

1 0

Matteo Bruni : d3dcompiler: Handle simple struct initializers.
by Alexandre Julliard 27 Sep '12

27 Sep '12

Module: wine Branch: master Commit: 16360a4f18fa1ae5034694e7c367ceda0e055aec URL: http://source.winehq.org/git/wine.git/?a=commit;h=16360a4f18fa1ae5034694e7c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 26 19:22:35 2012 +0200 d3dcompiler: Handle simple struct initializers. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 1 + dlls/d3dcompiler_43/hlsl.y | 58 ++++++++++++++++++++++++++++- dlls/d3dcompiler_43/utils.c | 17 ++++++++ 3 files changed, 74 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 5ed0bda..de948fa 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -1122,6 +1122,7 @@ struct hlsl_ir_expr *hlsl_eq(struct hlsl_ir_node *op1, struct hlsl_ir_node *op2, struct hlsl_ir_expr *hlsl_ne(struct hlsl_ir_node *op1, struct hlsl_ir_node *op2, struct source_location *loc) DECLSPEC_HIDDEN; struct hlsl_ir_deref *new_var_deref(struct hlsl_ir_var *var) DECLSPEC_HIDDEN; +struct hlsl_ir_deref *new_record_deref(struct hlsl_ir_node *record, struct hlsl_struct_field *field) DECLSPEC_HIDDEN; struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *left, enum parse_assign_op assign_op, DWORD writemask, struct hlsl_ir_node *right) DECLSPEC_HIDDEN; void push_scope(struct hlsl_parse_ctx *ctx) DECLSPEC_HIDDEN; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index d8c0d2b..f9a685a 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -502,6 +502,61 @@ static struct hlsl_ir_swizzle *get_swizzle(struct hlsl_ir_node *value, const cha return NULL; } +static void struct_var_initializer(struct list *list, struct hlsl_ir_var *var, struct list *initializer) +{ + struct hlsl_type *type = var->node.data_type; + struct hlsl_ir_node *node; + struct hlsl_struct_field *field; + struct list *cur_node; + struct hlsl_ir_node *assignment; + struct hlsl_ir_deref *deref; + + if (initializer_size(initializer) != components_count_type(type)) + { + hlsl_report_message(var->node.loc.file, var->node.loc.line, var->node.loc.col, HLSL_LEVEL_ERROR, + "structure initializer mismatch"); + free_instr_list(initializer); + return; + } + cur_node = list_head(initializer); + assert(cur_node); + node = LIST_ENTRY(cur_node, struct hlsl_ir_node, entry); + LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) + { + if (!cur_node) + { + d3dcompiler_free(initializer); + return; + } + if (components_count_type(field->type) == components_count_type(node->data_type)) + { + deref = new_record_deref(&var->node, field); + if (!deref) + { + ERR("Out of memory.\n"); + break; + } + deref->node.loc = node->loc; + assignment = make_assignment(&deref->node, ASSIGN_OP_ASSIGN, BWRITERSP_WRITEMASK_ALL, node); + list_add_tail(list, &assignment->entry); + } + else + FIXME("Initializing with \"mismatched\" fields is not supported yet.\n"); + cur_node = list_next(initializer, cur_node); + node = LIST_ENTRY(cur_node, struct hlsl_ir_node, entry); + } + + /* Free initializer elements in excess. */ + while (cur_node) + { + struct list *next = list_next(initializer, cur_node); + free_instr(node); + cur_node = next; + node = LIST_ENTRY(cur_node, struct hlsl_ir_node, entry); + } + d3dcompiler_free(initializer); +} + static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers, struct list *var_list) { struct hlsl_type *type; @@ -599,8 +654,7 @@ static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers, if (type->type == HLSL_CLASS_STRUCT) { - FIXME("Struct var with an initializer.\n"); - free_instr_list(v->initializer); + struct_var_initializer(statements_list, var, v->initializer); d3dcompiler_free(v); continue; } diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index b957643..9f91579 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1556,6 +1556,23 @@ struct hlsl_ir_deref *new_var_deref(struct hlsl_ir_var *var) return deref; } +struct hlsl_ir_deref *new_record_deref(struct hlsl_ir_node *record, struct hlsl_struct_field *field) +{ + struct hlsl_ir_deref *deref = d3dcompiler_alloc(sizeof(*deref)); + + if (!deref) + { + ERR("Out of memory.\n"); + return NULL; + } + deref->node.type = HLSL_IR_DEREF; + deref->node.data_type = field->type; + deref->type = HLSL_IR_DEREF_RECORD; + deref->v.record.record = record; + deref->v.record.field = field; + return deref; +} + static enum hlsl_ir_expr_op op_from_assignment(enum parse_assign_op op) { static const enum hlsl_ir_expr_op ops[] =

1 0

Henri Verbeet : d3d10: Use a union to store effect variable data instead of a void pointer.
by Alexandre Julliard 27 Sep '12

27 Sep '12

Module: wine Branch: master Commit: 13c00a9d2e6ee24866f6a3e3023eabf6a5c7ae33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13c00a9d2e6ee24866f6a3e30… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 26 22:34:00 2012 +0200 d3d10: Use a union to store effect variable data instead of a void pointer. --- dlls/d3d10/d3d10_private.h | 7 +++- dlls/d3d10/effect.c | 100 +++++++++++++------------------------------ 2 files changed, 36 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=13c00a9d2e6ee24866f6a…

1 0

Jacek Caban : vbscript: Added Round implementation.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 5c211059a0fa52c508bc7e9e0c67bb782655e339 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c211059a0fa52c508bc7e9e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 26 14:36:01 2012 +0200 vbscript: Added Round implementation. --- dlls/vbscript/global.c | 71 +++++++++++++++++++++++++++++++++++++++++- dlls/vbscript/tests/api.vbs | 15 +++++++++ 2 files changed, 84 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index f7d8efe..0facdf0 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -17,6 +17,7 @@ */ #include <assert.h> +#include <math.h> #include "vbscript.h" #include "vbscript_defs.h" @@ -98,6 +99,16 @@ static HRESULT return_int(VARIANT *res, int val) return S_OK; } +static inline HRESULT return_double(VARIANT *res, double val) +{ + if(res) { + V_VT(res) = VT_R8; + V_R8(res) = val; + } + + return S_OK; +} + static inline HRESULT return_null(VARIANT *res) { if(res) @@ -122,6 +133,40 @@ static HRESULT to_int(VARIANT *v, int *ret) return S_OK; } +static HRESULT to_double(VARIANT *v, double *ret) +{ + switch(V_VT(v)) { + case VT_I2: + *ret = V_I2(v); + break; + case VT_I4: + *ret = V_I4(v); + break; + case VT_R4: + *ret = V_R4(v); + break; + case VT_R8: + *ret = V_R8(v); + break; + case VT_BSTR: { + VARIANT dst; + HRESULT hres; + + V_VT(&dst) = VT_EMPTY; + hres = VariantChangeType(&dst, v, VARIANT_LOCALBOOL, VT_R8); + if(FAILED(hres)) + return hres; + *ret = V_R8(&dst); + break; + } + default: + FIXME("arg %s not supported\n", debugstr_variant(v)); + return E_NOTIMPL; + } + + return S_OK; +} + static HRESULT to_string(VARIANT *v, BSTR *ret) { VARIANT dst; @@ -1110,8 +1155,30 @@ static HRESULT Global_MonthName(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, static HRESULT Global_Round(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + double n; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + if(!res) + return S_OK; + + switch(V_VT(arg)) { + case VT_I2: + case VT_I4: + case VT_BOOL: + *res = *arg; + return S_OK; + case VT_R8: + n = V_R8(arg); + break; + default: + hres = to_double(arg, &n); + if(FAILED(hres)) + return hres; + } + + return return_double(res, round(n)); } static HRESULT Global_Escape(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 2ad9404..f7b4295 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -183,4 +183,19 @@ Call ok(Space(1) = " ", "Space(1) = " & Space(1) & """") Call ok(Space(0) = "", "Space(0) = " & Space(0) & """") Call ok(Space(5) = " ", "Space(5) = " & Space(5) & """") +Sub TestRound(val, exval, vt) + Call ok(Round(val) = exval, "Round(" & val & ") = " & Round(val)) + Call ok(getVT(Round(val)) = vt, "getVT(Round(" & val & ")) = " & getVT(Round(val))) +End Sub + +TestRound 3, 3, "VT_I2" +TestRound 3.3, 3, "VT_R8" +TestRound 3.8, 4, "VT_R8" +TestRound 3.5, 4, "VT_R8" +TestRound -3.3, -3, "VT_R8" +TestRound -3.5, -4, "VT_R8" +TestRound "2", 2, "VT_R8" +TestRound true, true, "VT_BOOL" +TestRound false, false, "VT_BOOL" + Call reportSuccess()

1 0

Jacek Caban : vbscript: Added VT_R8 support to to_int.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 1fc2896c7c57e6feb8dbcf6156da1f505ad2668e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fc2896c7c57e6feb8dbcf615… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 26 14:36:15 2012 +0200 vbscript: Added VT_R8 support to to_int. --- dlls/vbscript/global.c | 9 +++++++++ dlls/vbscript/tests/api.vbs | 12 ++++++++++++ dlls/vbscript/vbscript.h | 13 +++++++++++++ 3 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 0facdf0..6e62a34 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -125,6 +125,15 @@ static HRESULT to_int(VARIANT *v, int *ret) case VT_I4: *ret = V_I4(v); break; + case VT_R8: { + double n = round(V_R8(v)); + if(!is_int32(n)) { + FIXME("%lf is out of int range\n", n); + return E_FAIL; + } + *ret = n; + break; + } default: FIXME("not supported %s\n", debugstr_variant(v)); return E_NOTIMPL; diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index f7b4295..5efde28 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -124,6 +124,15 @@ Call ok(isNull(x), "InStr returned " & x) x = InStr(2, null, "abcd") Call ok(isNull(x), "InStr returned " & x) +x = InStr(1.3, "abcd", "bc") +Call ok(x = 2, "InStr returned " & x) + +x = InStr(2.3, "abcd", "bc") +Call ok(x = 2, "InStr returned " & x) + +x = InStr(2.6, "abcd", "bc") +Call ok(x = 0, "InStr returned " & x) + Sub TestMid(str, start, len, ex) x = Mid(str, start, len) Call ok(x = ex, "Mid(" & str & ", " & start & ", " & len & ") = " & x & " expected " & ex) @@ -182,6 +191,9 @@ Call ok(Len(empty) = 0, "Len(empty) = " & Len(empty)) Call ok(Space(1) = " ", "Space(1) = " & Space(1) & """") Call ok(Space(0) = "", "Space(0) = " & Space(0) & """") Call ok(Space(5) = " ", "Space(5) = " & Space(5) & """") +Call ok(Space(5.2) = " ", "Space(5.2) = " & Space(5.2) & """") +Call ok(Space(5.8) = " ", "Space(5.8) = " & Space(5.8) & """") +Call ok(Space(5.5) = " ", "Space(5.5) = " & Space(5.5) & """") Sub TestRound(val, exval, vt) Call ok(Round(val) = exval, "Round(" & val & ") = " & Round(val)) diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 77cf0e7..41982da 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -343,6 +343,19 @@ TID_LIST HRESULT get_typeinfo(tid_t,ITypeInfo**) DECLSPEC_HIDDEN; +#ifndef INT32_MIN +#define INT32_MIN (-2147483647-1) +#endif + +#ifndef INT32_MAX +#define INT32_MAX (2147483647) +#endif + +static inline BOOL is_int32(double d) +{ + return INT32_MIN <= d && d <= INT32_MAX && (double)(int)d == d; +} + HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; const char *debugstr_variant(const VARIANT*) DECLSPEC_HIDDEN;

1 0