wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

Henri Verbeet : d3d10: Implement d3d10_effect_blend_variable_GetBlendState( ).
by Alexandre Julliard 27 Sep '12

27 Sep '12

Module: wine Branch: master Commit: fb2dac9621aa9cfae93cb50162ccf576a7415475 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb2dac9621aa9cfae93cb5016… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 26 22:34:01 2012 +0200 d3d10: Implement d3d10_effect_blend_variable_GetBlendState(). --- dlls/d3d10/d3d10_private.h | 4 +++ dlls/d3d10/effect.c | 49 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 4f40c3e..65ec465 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -109,6 +109,10 @@ struct d3d10_effect_state_object_variable D3D10_BLEND_DESC blend; D3D10_SAMPLER_DESC sampler; } desc; + union + { + ID3D10BlendState *blend; + } object; }; /* ID3D10EffectType */ diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 30832f5..7d14620 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1561,6 +1561,32 @@ static HRESULT parse_fx10_variable(struct d3d10_effect_variable *v, const char * return S_OK; } +static HRESULT create_state_object(struct d3d10_effect_variable *v) +{ + ID3D10Device *device = v->effect->device; + HRESULT hr; + + switch (v->type->basetype) + { + case D3D10_SVT_BLEND: + if (FAILED(hr = ID3D10Device_CreateBlendState(device, + &v->u.state.desc.blend, &v->u.state.object.blend))) + return hr; + break; + + case D3D10_SVT_DEPTHSTENCIL: + case D3D10_SVT_RASTERIZER: + case D3D10_SVT_SAMPLER: + break; + + default: + ERR("Unhandled variable type %s.\n", debug_d3d10_shader_variable_type(v->type->basetype)); + return E_FAIL; + } + + return S_OK; +} + static HRESULT parse_fx10_local_variable(struct d3d10_effect_variable *v, const char **ptr, const char *data) { unsigned int i; @@ -1660,6 +1686,9 @@ static HRESULT parse_fx10_local_variable(struct d3d10_effect_variable *v, const ERR("Failed to read property list.\n"); return E_FAIL; } + + if (FAILED(hr = create_state_object(v))) + return hr; } } break; @@ -5984,9 +6013,25 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_blend_variable_GetRawValue(ID3D10E static HRESULT STDMETHODCALLTYPE d3d10_effect_blend_variable_GetBlendState(ID3D10EffectBlendVariable *iface, UINT index, ID3D10BlendState **blend_state) { - FIXME("iface %p, index %u, blend_state %p stub!\n", iface, index, blend_state); + struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); - return E_NOTIMPL; + TRACE("iface %p, index %u, blend_state %p.\n", iface, index, blend_state); + + if (v->type->element_count) + v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); + else if (index) + return E_FAIL; + + if (v->type->basetype != D3D10_SVT_BLEND) + { + WARN("Variable is not a blend state.\n"); + return E_FAIL; + } + + if ((*blend_state = v->u.state.object.blend)) + ID3D10BlendState_AddRef(*blend_state); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_blend_variable_GetBackingStore(ID3D10EffectBlendVariable *iface,

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

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

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: 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: 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: 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

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

Jason Edmeades : cmd: Display 'set' sort ordering correctly.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: cd9451c4993ae852df69cac4fe22e2838ae9fbe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd9451c4993ae852df69cac4f… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Sep 25 23:16:54 2012 +0100 cmd: Display 'set' sort ordering correctly. --- programs/cmd/builtins.c | 5 ++++- programs/cmd/tests/test_builtins.cmd.exp | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index ad9d40c..8421194 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2234,13 +2234,16 @@ void WCMD_setshow_date (void) { /**************************************************************************** * WCMD_compare + * Note: Native displays 'fred' before 'fred ', so need to only compare up to + * the equals sign. */ static int WCMD_compare( const void *a, const void *b ) { int r; const WCHAR * const *str_a = a, * const *str_b = b; + static const WCHAR eqW[] = {'=','\0'}; r = CompareStringW( LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - *str_a, -1, *str_b, -1 ); + *str_a, strcspnW(*str_a, eqW), *str_b, strcspnW(*str_b, eqW) ); if( r == CSTR_LESS_THAN ) return -1; if( r == CSTR_GREATER_THAN ) return 1; return 0; diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index d2938ce..57bc82a 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -235,8 +235,8 @@ FOOBAR = baz baz2 0 bar -@todo_wine@FOOBAR= bar -@todo_wine@FOOBAR = baz2 +FOOBAR= bar +FOOBAR = baz2 FOOBAR = baz2 FOOBAR not defined 1

1 0

Jason Edmeades : cmd: Echo back command with whitespace removed first.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: a810e41e47172f0929cce27c60147e2b72e5ba83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a810e41e47172f0929cce27c6… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Sep 25 22:05:03 2012 +0100 cmd: Echo back command with whitespace removed first. --- programs/cmd/tests/test_builtins.cmd | 5 +++++ programs/cmd/tests/test_builtins.cmd.exp | 9 +++++++-- programs/cmd/wcmdmain.c | 17 ++++++++++++----- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 7c4b37f..d3bdf04 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -30,6 +30,9 @@ echo @tab@ on @space@ @echo off echo off@tab@@space@ +@echo noecho1 + @echo noecho2 +@@@@@echo echo3 echo ------------ Testing 'echo' [OFF] ------------ echo word echo 'singlequotedword' @@ -324,6 +327,8 @@ set VAR= echo ------------ Testing variable substitution ------------ echo --- in FOR variables for %%i in ("A B" C) do echo %%i +rem check works when prefix with @ +@for %%i in ("A B" C) do echo %%i rem quotes removal for %%i in ("A B" C) do echo '%%~i' rem fully qualified path diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 2888ffc..d2938ce 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -51,7 +51,7 @@ word@space@ @pwd@>echo word@space@@space@@space@ word@space@@space@ -@todo_wine@@pwd@>echo word@space@ +@pwd@>echo word@space@ word @pwd@>echo@tab@word@space@ @@ -63,7 +63,7 @@ word@space@@tab@ @pwd@>echo@tab@word@tab@@space@@space@ word@tab@@space@ -@todo_wine@@pwd@>echo word@space@ +@pwd@>echo word@space@ word @pwd@>echo@space@@tab@word@space@ @@ -76,6 +76,9 @@ word @tab@word @pwd@>echo @tab@ on @space@@space@ +noecho1 +noecho2 +echo3 ------------ Testing 'echo' [OFF] ------------ word 'singlequotedword' @@ -282,6 +285,8 @@ r@or_broken@qwerty --- in FOR variables "A B" C +"A B" +C 'A B'@or_broken@'' 'C'@or_broken@'' @pwd@\C D@or_broken@%~ff diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index b095deb..c0d4925 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1819,27 +1819,34 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE /* Replace env vars if in a batch context */ if (context) handleExpansion(extraSpace, FALSE, NULL, NULL); + + /* Skip preceeding whitespace */ + while (*curPos == ' ' || *curPos == '\t') curPos++; + /* Show prompt before batch line IF echo is on and in batch program */ - if (context && echo_mode && extraSpace[0] && (extraSpace[0] != '@')) { + if (context && echo_mode && *curPos && (*curPos != '@')) { static const WCHAR echoDot[] = {'e','c','h','o','.'}; static const WCHAR echoCol[] = {'e','c','h','o',':'}; const DWORD len = sizeof(echoDot)/sizeof(echoDot[0]); - DWORD curr_size = strlenW(extraSpace); + DWORD curr_size = strlenW(curPos); DWORD min_len = (curr_size < len ? curr_size : len); WCMD_show_prompt(); - WCMD_output_asis(extraSpace); + WCMD_output_asis(curPos); /* I don't know why Windows puts a space here but it does */ /* Except for lines starting with 'echo.' or 'echo:'. Ask MS why */ if (CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, - extraSpace, min_len, echoDot, len) != CSTR_EQUAL + curPos, min_len, echoDot, len) != CSTR_EQUAL && CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, - extraSpace, min_len, echoCol, len) != CSTR_EQUAL) + curPos, min_len, echoCol, len) != CSTR_EQUAL) { WCMD_output_asis(spaceW); } WCMD_output_asis(newlineW); } + /* Skip repeated 'no echo' characters */ + while (*curPos == '@') curPos++; + /* Start with an empty string, copying to the command string */ curStringLen = 0; curRedirsLen = 0;

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
83
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 September 2012