September 2012 - Wine-Commits

Jacek Caban : include: Added uiautomationcoreapi.h.
by Alexandre Julliard Sept. 27, 2012

Sept. 27, 2012

Module: wine Branch: master Commit: ff17a4ea862b41ec3ae023f19816059027c422fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff17a4ea862b41ec3ae023f19… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 27 12:20:41 2012 +0200 include: Added uiautomationcoreapi.h. --- include/Makefile.in | 1 + include/uiautomation.h | 2 +- include/uiautomationcoreapi.h | 49 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 1 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 0514c4f..b32e4b9 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -521,6 +521,7 @@ SRCDIR_INCLUDES = \ twain.h \ udpmib.h \ uiautomation.h \ + uiautomationcoreapi.h \ userenv.h \ usp10.h \ uuids.h \ diff --git a/include/uiautomation.h b/include/uiautomation.h index fb4a949..b58c4e6 100644 --- a/include/uiautomation.h +++ b/include/uiautomation.h @@ -18,4 +18,4 @@ #include <uiautomationcore.h> #include <uiautomationclient.h> -/* #include <uiautomationcoreapi.h> */ +#include <uiautomationcoreapi.h> diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h new file mode 100644 index 0000000..340f500 --- /dev/null +++ b/include/uiautomationcoreapi.h @@ -0,0 +1,49 @@ +/* + * Copyright 2012 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _INC_UIAUTOMATIONCOREAPI +#define _INC_UIAUTOMATIONCOREAPI + +#ifdef __cplusplus +extern "C" { +#endif + +#define UIA_E_ELEMENTNOTENABLED 0x80040200 +#define UIA_E_ELEMENTNOTAVAILABLE 0x80040201 +#define UIA_E_NOCLICKABLEPOINT 0x80040202 +#define UIA_E_PROXYASSEMBLYNOTLOADED 0x80040203 +#define UIA_E_NOTSUPPORTED 0x80040204 +#define UIA_E_INVALIDOPERATION 0x80131509 +#define UIA_E_TIMEOUT 0x80131505 + +#define UiaAppendRuntimeId 3 +#define UiaRootObjectId -25 + +DECLARE_HANDLE(HUIANODE); +DECLARE_HANDLE(HUIAPATTERNOBJECT); +DECLARE_HANDLE(HUIATEXTRANGE); +DECLARE_HANDLE(HUIAEVENT); + +BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj); +BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj); + +#ifdef __cplusplus +} +#endif + +#endif /* _INC_UIAUTOMATIONCOREAPI */

1 0

Matteo Bruni : d3dcompiler: Move variables declaration to a separate function.
by Alexandre Julliard Sept. 27, 2012

Sept. 27, 2012

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 Sept. 27, 2012

Sept. 27, 2012

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: Handle simple struct initializers.
by Alexandre Julliard Sept. 27, 2012

Sept. 27, 2012

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 Sept. 27, 2012

Sept. 27, 2012

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: Also free the list itself in free_instr_list().
by Alexandre Julliard Sept. 27, 2012

Sept. 27, 2012

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

Jörg Höhle : winmm: The "open new ..." MCI string command sets an empty OPEN_ELEMENT.
by Alexandre Julliard Sept. 27, 2012

Sept. 27, 2012

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: Store the pointer to the struct field in the dereference node.
by Alexandre Julliard Sept. 27, 2012

Sept. 27, 2012

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

Jacek Caban : mshtml: Added better IActiveScriptSiteWindow implementation.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: c9e6a96318eea4386cfd59164cae859bcba4c908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9e6a96318eea4386cfd59164… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 26 14:37:16 2012 +0200 mshtml: Added better IActiveScriptSiteWindow implementation. --- dlls/mshtml/script.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 9aa875a..d1b4c41 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -469,15 +469,21 @@ static ULONG WINAPI ActiveScriptSiteWindow_Release(IActiveScriptSiteWindow *ifac static HRESULT WINAPI ActiveScriptSiteWindow_GetWindow(IActiveScriptSiteWindow *iface, HWND *phwnd) { ScriptHost *This = impl_from_IActiveScriptSiteWindow(iface); - FIXME("(%p)->(%p)\n", This, phwnd); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, phwnd); + + if(!This->window || !This->window->base.outer_window || !This->window->base.outer_window->doc_obj) + return E_UNEXPECTED; + + *phwnd = This->window->base.outer_window->doc_obj->hwnd; + return S_OK; } static HRESULT WINAPI ActiveScriptSiteWindow_EnableModeless(IActiveScriptSiteWindow *iface, BOOL fEnable) { ScriptHost *This = impl_from_IActiveScriptSiteWindow(iface); FIXME("(%p)->(%x)\n", This, fEnable); - return E_NOTIMPL; + return S_OK; } static const IActiveScriptSiteWindowVtbl ActiveScriptSiteWindowVtbl = {

1 0

Jacek Caban : activscp.idl: Added IActiveScriptSiteUIControl declaration.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: 3ad33050287c9f4d8c54e996a8be45df5ad0ab57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ad33050287c9f4d8c54e996a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 26 14:36:34 2012 +0200 activscp.idl: Added IActiveScriptSiteUIControl declaration. --- include/activscp.idl | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/include/activscp.idl b/include/activscp.idl index 9be7ec4..c7fc2d2 100644 --- a/include/activscp.idl +++ b/include/activscp.idl @@ -60,6 +60,17 @@ typedef enum tagSCRIPTTHREADSTATE { SCRIPTTHREADSTATE_RUNNING = 1 } SCRIPTTHREADSTATE; +typedef enum tagSCRIPTUICITEM { + SCRIPTUICITEM_INPUTBOX = 1, + SCRIPTUICITEM_MSGBOX = 2 +} SCRIPTUICITEM; + +typedef enum tagSCRIPTUICHANDLING { + SCRIPTUICHANDLING_ALLOW = 0, + SCRIPTUICHANDLING_NOUIERROR = 1, + SCRIPTUICHANDLING_NOUIDEFAULT = 2 +} SCRIPTUICHANDLING; + typedef DWORD SCRIPTTHREADID; cpp_quote("#define SCRIPTTHREADID_CURRENT ((SCRIPTTHREADID)-1)") cpp_quote("#define SCRIPTTHREADID_BASE ((SCRIPTTHREADID)-2)") @@ -187,6 +198,18 @@ interface IActiveScriptSiteWindow : IUnknown } [ + object, + uuid(aedae97e-d7ee-4796-b960-7f092ae844ab), + pointer_default(unique) +] +interface IActiveScriptSiteUIControl : IUnknown +{ + HRESULT GetUIBehavior( + [in] SCRIPTUICITEM UicItem, + [out] SCRIPTUICHANDLING *pUicHandling); +} + +[ object, uuid(539698A0-CDCA-11CF-A5EB-00AA0047A063), pointer_default(unique)

1 0