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

Matteo Bruni : d3dcompiler: Parse function definitions.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: d2673848eae67a42ea5f7d253b756edc64554f00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2673848eae67a42ea5f7d253… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jun 11 19:18:34 2012 +0200 d3dcompiler: Parse function definitions. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 1 + dlls/d3dcompiler_43/hlsl.y | 74 +++++++++++++++++- dlls/d3dcompiler_43/utils.c | 124 ++++++++++++++++++++++++++++- 3 files changed, 197 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d2673848eae67a42ea5f7…

1 0

Matteo Bruni : d3dcompiler: Parse constructors.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: eeb550c0c39f4c5c3021aff814551b4deb27677b URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeb550c0c39f4c5c3021aff81… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jun 11 19:18:35 2012 +0200 d3dcompiler: Parse constructors. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 13 +++++++ dlls/d3dcompiler_43/hlsl.y | 48 +++++++++++++++++++++++++ dlls/d3dcompiler_43/utils.c | 54 ++++++++++++++++++++++++++++- 3 files changed, 114 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 695ee7d..d7fcfea 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -694,6 +694,7 @@ enum hlsl_ir_node_type { HLSL_IR_VAR = 0, HLSL_IR_CONSTANT, + HLSL_IR_CONSTRUCTOR, HLSL_IR_DEREF, HLSL_IR_FUNCTION_DECL, }; @@ -788,6 +789,12 @@ struct hlsl_ir_constant } v; }; +struct hlsl_ir_constructor +{ + struct hlsl_ir_node node; + struct list *arguments; +}; + struct hlsl_scope { struct list entry; @@ -847,6 +854,12 @@ static inline struct hlsl_ir_constant *constant_from_node(const struct hlsl_ir_n return CONTAINING_RECORD(node, struct hlsl_ir_constant, node); } +static inline struct hlsl_ir_constructor *constructor_from_node(const struct hlsl_ir_node *node) +{ + assert(node->type == HLSL_IR_CONSTRUCTOR); + return CONTAINING_RECORD(node, struct hlsl_ir_constructor, node); +} + BOOL add_declaration(struct hlsl_scope *scope, struct hlsl_ir_var *decl, BOOL local_var) DECLSPEC_HIDDEN; struct hlsl_ir_var *get_variable(struct hlsl_scope *scope, const char *name) DECLSPEC_HIDDEN; void free_declaration(struct hlsl_ir_var *decl) DECLSPEC_HIDDEN; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 5151002..a3e5f6e 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -112,6 +112,18 @@ static DWORD add_modifier(DWORD modifiers, DWORD mod) return modifiers | mod; } +static unsigned int components_count_expr_list(struct list *list) +{ + struct hlsl_ir_node *node; + unsigned int count = 0; + + LIST_FOR_EACH_ENTRY(node, list, struct hlsl_ir_node, entry) + { + count += components_count_type(node->data_type); + } + return count; +} + %} %error-verbose @@ -793,6 +805,42 @@ postfix_expr: primary_expr { $$ = $1; } + /* "var_modifiers" doesn't make sense in this case, but it's needed + in the grammar to avoid shift/reduce conflicts. */ + | var_modifiers type '(' initializer_expr_list ')' + { + struct hlsl_ir_constructor *constructor; + + TRACE("%s constructor.\n", debug_hlsl_type($2)); + if ($1) + { + hlsl_message("Line %u: unexpected modifier in a constructor.\n", + hlsl_ctx.line_no); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + return -1; + } + if ($2->type > HLSL_CLASS_LAST_NUMERIC) + { + hlsl_message("Line %u: constructors are allowed only for numeric data types.\n", + hlsl_ctx.line_no); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + return -1; + } + if ($2->dimx * $2->dimy != components_count_expr_list($4)) + { + hlsl_message("Line %u: wrong number of components in constructor.\n", + hlsl_ctx.line_no); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + return -1; + } + + constructor = d3dcompiler_alloc(sizeof(*constructor)); + constructor->node.type = HLSL_IR_CONSTRUCTOR; + constructor->node.data_type = $2; + constructor->arguments = $4; + + $$ = &constructor->node; + } unary_expr: postfix_expr { diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index d92243d..9c222cd 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -876,6 +876,32 @@ BOOL find_function(const char *name) return FALSE; } +unsigned int components_count_type(struct hlsl_type *type) +{ + unsigned int count = 0; + struct hlsl_struct_field *field; + + if (type->type <= HLSL_CLASS_LAST_NUMERIC) + { + return type->dimx * type->dimy; + } + if (type->type == HLSL_CLASS_ARRAY) + { + return components_count_type(type->e.array.type) * type->e.array.elements_count; + } + if (type->type != HLSL_CLASS_STRUCT) + { + ERR("Unexpected data type %s.\n", debug_hlsl_type(type)); + return 0; + } + + LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) + { + count += components_count_type(field->type); + } + return count; +} + struct hlsl_ir_deref *new_var_deref(struct hlsl_ir_var *var) { struct hlsl_ir_deref *deref = d3dcompiler_alloc(sizeof(*deref)); @@ -1027,6 +1053,7 @@ static const char *debug_node_type(enum hlsl_ir_node_type type) { "HLSL_IR_VAR", "HLSL_IR_CONSTANT", + "HLSL_IR_CONSTRUCTOR", "HLSL_IR_DEREF", "HLSL_IR_FUNCTION_DECL", }; @@ -1112,7 +1139,20 @@ static void debug_dump_ir_constant(const struct hlsl_ir_constant *constant) TRACE("}"); } -static void debug_dump_instr(const struct hlsl_ir_node *instr) +void debug_dump_ir_constructor(const struct hlsl_ir_constructor *constructor) +{ + struct hlsl_ir_node *arg; + + TRACE("%s (", debug_hlsl_type(constructor->node.data_type)); + LIST_FOR_EACH_ENTRY(arg, constructor->arguments, struct hlsl_ir_node, entry) + { + debug_dump_instr(arg); + TRACE(" "); + } + TRACE(")"); +} + +void debug_dump_instr(const struct hlsl_ir_node *instr) { switch (instr->type) { @@ -1122,6 +1162,9 @@ static void debug_dump_instr(const struct hlsl_ir_node *instr) case HLSL_IR_CONSTANT: debug_dump_ir_constant(constant_from_node(instr)); break; + case HLSL_IR_CONSTRUCTOR: + debug_dump_ir_constructor(constructor_from_node(instr)); + break; default: TRACE("No dump function for %s\n", debug_node_type(instr->type)); } @@ -1226,6 +1269,12 @@ static void free_ir_deref(struct hlsl_ir_deref *deref) d3dcompiler_free(deref); } +static void free_ir_constructor(struct hlsl_ir_constructor *constructor) +{ + free_instr_list(constructor->arguments); + d3dcompiler_free(constructor); +} + void free_instr(struct hlsl_ir_node *node) { switch (node->type) @@ -1239,6 +1288,9 @@ void free_instr(struct hlsl_ir_node *node) case HLSL_IR_DEREF: free_ir_deref(deref_from_node(node)); break; + case HLSL_IR_CONSTRUCTOR: + free_ir_constructor(constructor_from_node(node)); + break; default: FIXME("Unsupported node type %s\n", debug_node_type(node->type)); }

1 0

Dmitry Timoshkov : ole32: Add VT_I1 to the list of supported variant types.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 574a52e522f47b8ab450cea18199975413c3be2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=574a52e522f47b8ab450cea18… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 12 15:22:35 2012 +0900 ole32: Add VT_I1 to the list of supported variant types. --- dlls/ole32/ole2.c | 9 ++++++--- dlls/ole32/tests/propvariant.c | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 9e9ca65..4680f40 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2907,8 +2907,10 @@ static inline HRESULT PROPVARIANT_ValidateType(VARTYPE vt) { case VT_EMPTY: case VT_NULL: + case VT_I1: case VT_I2: case VT_I4: + case VT_I8: case VT_R4: case VT_R8: case VT_CY: @@ -2920,7 +2922,6 @@ static inline HRESULT PROPVARIANT_ValidateType(VARTYPE vt) case VT_UI1: case VT_UI2: case VT_UI4: - case VT_I8: case VT_UI8: case VT_LPSTR: case VT_LPWSTR: @@ -2933,8 +2934,10 @@ static inline HRESULT PROPVARIANT_ValidateType(VARTYPE vt) case VT_BLOB_OBJECT: case VT_CF: case VT_CLSID: + case VT_I1|VT_VECTOR: case VT_I2|VT_VECTOR: case VT_I4|VT_VECTOR: + case VT_I8|VT_VECTOR: case VT_R4|VT_VECTOR: case VT_R8|VT_VECTOR: case VT_CY|VT_VECTOR: @@ -2946,7 +2949,6 @@ static inline HRESULT PROPVARIANT_ValidateType(VARTYPE vt) case VT_UI1|VT_VECTOR: case VT_UI2|VT_VECTOR: case VT_UI4|VT_VECTOR: - case VT_I8|VT_VECTOR: case VT_UI8|VT_VECTOR: case VT_LPSTR|VT_VECTOR: case VT_LPWSTR|VT_VECTOR: @@ -2979,8 +2981,10 @@ HRESULT WINAPI PropVariantClear(PROPVARIANT * pvar) /* [in/out] */ { case VT_EMPTY: case VT_NULL: + case VT_I1: case VT_I2: case VT_I4: + case VT_I8: case VT_R4: case VT_R8: case VT_CY: @@ -2991,7 +2995,6 @@ HRESULT WINAPI PropVariantClear(PROPVARIANT * pvar) /* [in/out] */ case VT_UI1: case VT_UI2: case VT_UI4: - case VT_I8: case VT_UI8: case VT_FILETIME: break; diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 4d34117..50adfe7 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -56,7 +56,7 @@ static const struct valid_mapping { PROP_V1 | PROP_TODO , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_UNKNOWN */ { PROP_V1 , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_DECIMAL */ { PROP_INV, PROP_INV, PROP_INV, PROP_INV }, /* 15 */ - { PROP_V1 | PROP_TODO , PROP_V1 | PROP_TODO , PROP_V1 | PROP_TODO , PROP_V1 | PROP_TODO }, /* VT_I1 */ + { PROP_V1 , PROP_V1 | PROP_TODO , PROP_V1 , PROP_V1 | PROP_TODO }, /* VT_I1 */ { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI1 */ { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI2 */ { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI4 */

1 0

Hans Leidekker : msi/tests: Use only uppercase characters for the PID_REVNUMBER property.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: f6f1bfd6fbe218a1afbd55debc9999a38dbe0871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6f1bfd6fbe218a1afbd55deb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 12 09:24:35 2012 +0200 msi/tests: Use only uppercase characters for the PID_REVNUMBER property. --- dlls/msi/tests/action.c | 6 +++--- dlls/msi/tests/automation.c | 2 +- dlls/msi/tests/install.c | 2 +- dlls/msi/tests/package.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 82afd18..811bd99 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2318,7 +2318,7 @@ static void write_msi_summary_info(MSIHANDLE db, INT version, INT wordcount, con ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); r = MsiSummaryInfoSetPropertyA(summary, PID_REVNUMBER, VT_LPSTR, 0, NULL, - "{004757CA-5092-49c2-AD20-28E1CE0DF5F2}"); + "{004757CA-5092-49C2-AD20-28E1CE0DF5F2}"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); r = MsiSummaryInfoSetPropertyA(summary, PID_PAGECOUNT, VT_I4, version, NULL, NULL); @@ -2947,7 +2947,7 @@ currentuser: ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); CHECK_DEL_REG_STR(hkey, "ProductName", "MSITEST"); - CHECK_DEL_REG_STR(hkey, "PackageCode", "AC75740029052c94DA02821EECD05F2F"); + CHECK_DEL_REG_STR(hkey, "PackageCode", "AC75740029052C94DA02821EECD05F2F"); CHECK_DEL_REG_DWORD(hkey, "Language", 1033); CHECK_DEL_REG_DWORD(hkey, "Version", 0x1010001); if (!old_installer) @@ -3028,7 +3028,7 @@ machprod: ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); CHECK_DEL_REG_STR(hkey, "ProductName", "MSITEST"); - CHECK_DEL_REG_STR(hkey, "PackageCode", "AC75740029052c94DA02821EECD05F2F"); + CHECK_DEL_REG_STR(hkey, "PackageCode", "AC75740029052C94DA02821EECD05F2F"); CHECK_DEL_REG_DWORD(hkey, "Language", 1033); CHECK_DEL_REG_DWORD(hkey, "Version", 0x1010001); if (!old_installer) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 630ff76..bc0a632 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -199,7 +199,7 @@ typedef struct _msi_summary_info static const msi_summary_info summary_info[] = { ADD_INFO_LPSTR(PID_TEMPLATE, ";1033"), - ADD_INFO_LPSTR(PID_REVNUMBER, "{004757CA-5092-49c2-AD20-28E1CE0DF5F2}"), + ADD_INFO_LPSTR(PID_REVNUMBER, "{004757CA-5092-49C2-AD20-28E1CE0DF5F2}"), ADD_INFO_I4(PID_PAGECOUNT, 100), ADD_INFO_I4(PID_WORDCOUNT, 0), ADD_INFO_FILETIME(PID_CREATE_DTM, &systemtime), diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index ad3ea66..e41bef4 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -2462,7 +2462,7 @@ static void write_msi_summary_info(MSIHANDLE db, INT version, INT wordcount, con ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); r = MsiSummaryInfoSetPropertyA(summary, PID_REVNUMBER, VT_LPSTR, 0, NULL, - "{004757CA-5092-49c2-AD20-28E1CE0DF5F2}"); + "{004757CA-5092-49C2-AD20-28E1CE0DF5F2}"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); r = MsiSummaryInfoSetPropertyA(summary, PID_PAGECOUNT, VT_I4, version, NULL, NULL); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 8cf8f27..f2d940f 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2445,7 +2445,7 @@ static void test_msipackage(void) ok(r == ERROR_INSTALL_PACKAGE_INVALID, "Expected ERROR_INSTALL_PACKAGE_INVALID, got %d\n", r); - set_summary_str(hdb, PID_REVNUMBER, "{004757CD-5092-49c2-AD20-28E1CE0DF5F2}"); + set_summary_str(hdb, PID_REVNUMBER, "{004757CD-5092-49C2-AD20-28E1CE0DF5F2}"); r = MsiOpenPackage(name, &hpack); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);

1 0

Łukasz Wojniłowicz : Polish translation for release 1.5.6
by Jeremy Newman 12 Jun '12

12 Jun '12

Module: website Branch: master Commit: 7e4c1005af43f84e24ae19487e150c716e7ddc30 URL: http://source.winehq.org/git/website.git/?a=commit;h=7e4c1005af43f84e24ae19… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Jun 9 10:52:21 2012 +0200 Polish translation for release 1.5.6 --- news/pl/2012060801.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/pl/2012060801.xml b/news/pl/2012060801.xml new file mode 100644 index 0000000..5eaed3d --- /dev/null +++ b/news/pl/2012060801.xml @@ -0,0 +1,18 @@ +<news> +<date>Czerwiec 8, 2012</date> +<title>Wydano Wine 1.5.6</title> +<body> + Wydanie rozwojowe Wine 1.5.6 jest już dostępne. + <a href="{$root}/announce/1.5.6">Co nowego</a> w tym wydaniu: +<ul> + <li>Samoczynna instalacja dodatkowego pakietu Mono.</li> + <li>Aplet w panelu sterowania dla joysticków.</li> + <li>Renderowanie map bitowych zależnych od urządzenia od teraz jest wykonywane przez silnik DIB.</li> + <li>Wsparcie dla renderowania filmów przez DirectX (VMR-9).</li> + <li>Pierwsze kroki w kierunku utworzenia kompilatora cieniującego D3D.</li> + <li>Poprawki w budowaniu dla DragonFly BSD.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.6.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

André Hentschel : Wine 1.5.6 freigegeben
by Jeremy Newman 12 Jun '12

12 Jun '12

Module: website Branch: master Commit: 03d05699fc2b892fc45ede9b20647691bec15976 URL: http://source.winehq.org/git/website.git/?a=commit;h=03d05699fc2b892fc45ede… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 9 15:27:15 2012 +0200 Wine 1.5.6 freigegeben --- news/de/2012060801.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/de/2012060801.xml b/news/de/2012060801.xml new file mode 100644 index 0000000..dca71e8 --- /dev/null +++ b/news/de/2012060801.xml @@ -0,0 +1,18 @@ +<news> +<date>8. Juni 2012</date> +<title>Wine 1.5.6 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.6 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.6">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Automatische Installation des Mono Add-on Pakets.</li> + <li>Systemsteuerungsapplet für Joysticks.</li> + <li>Geräteabhängige Bitmaps werden nun durch die DIB Engine gerendert.</li> + <li>Unterstützung für Videowiedergabe mit DirectX (VMR-9).</li> + <li>Erste Schritte in Richtungg eines D3D Shader Compilers.</li> + <li>Fehlerbehebungen für den Build unter DragonFly BSD.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.6.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Lucas Fialho Zawacki : Added portuguese translation for release 1.5.6
by Jeremy Newman 12 Jun '12

12 Jun '12

Module: website Branch: master Commit: 5b0bde81d255da470c4a27932697bc71fcad8d5d URL: http://source.winehq.org/git/website.git/?a=commit;h=5b0bde81d255da470c4a27… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Mon Jun 11 13:11:35 2012 -0300 Added portuguese translation for release 1.5.6 --- news/pt/2012060801.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/pt/2012060801.xml b/news/pt/2012060801.xml new file mode 100644 index 0000000..b0e7dd9 --- /dev/null +++ b/news/pt/2012060801.xml @@ -0,0 +1,18 @@ +<news> +<date>8 de Junho de 2012</date> +<title>Wine 1.5.6 lançado</title> +<body> + A versão de desenvolvimento 1.5.6 já está disponível. + <a href="{$root}/announce/1.5.6">Novidades</a> desta versão: +<ul> + <li>Instalação automática do pacote adicional Mono.</li> + <li>Applet do painel de controle para configuração de joysticks.</li> + <li>Renderização de bitmaps em dispostivos agora feita através da engine DIB.</li> + <li>Suporte a renderização de video através do DirectX (VMR-9).</li> + <li>Primeiros passos na direção de um compilador de shaders D3D.</li> + <li>Correções no build para DragonFly BSD.</li> + <li>Várias correções de bugs.</li> +</ul> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.6.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e em breve estarão em suas respectivas <a href="{$root}/download">sessões da área de downloads.</a>. +</body></news>

1 0

Hans Leidekker : msi: Fail if a registry key cannot be created.
by Alexandre Julliard 11 Jun '12

11 Jun '12

Module: wine Branch: master Commit: fc2c8a215fd3ea70e1cabdca955818a62e85b2f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc2c8a215fd3ea70e1cabdca9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 11 15:36:35 2012 +0200 msi: Fail if a registry key cannot be created. --- dlls/msi/action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 5ba7ec3..e7b2921 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2645,7 +2645,7 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) ERR("Could not create key %s\n", debugstr_w(keypath)); msi_free(uikey); msi_free(keypath); - return ERROR_SUCCESS; + return ERROR_FUNCTION_FAILED; } value = parse_value(package, MSI_RecordGetString(row, 5), &type, &size); deformat_string(package, name, &deformated);

1 0

Hans Leidekker : msi: Support registry key names that exceed 255 characters .
by Alexandre Julliard 11 Jun '12

11 Jun '12

Module: wine Branch: master Commit: 0ed61000d3b7b7a94ab5e3455d0e97294d80442d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ed61000d3b7b7a94ab5e3455… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 11 15:36:51 2012 +0200 msi: Support registry key names that exceed 255 characters. --- dlls/msi/action.c | 101 ++++++++++++++++++++++++++++++++++++----------- dlls/msi/tests/action.c | 75 ++++++++++++++++++++++++++++++++++- 2 files changed, 152 insertions(+), 24 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index e7b2921..b256439 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2582,6 +2582,38 @@ static WCHAR *get_keypath( MSICOMPONENT *comp, HKEY root, const WCHAR *path ) return strdupW( path ); } +static HKEY open_key( HKEY root, const WCHAR *path, BOOL create ) +{ + REGSAM access = KEY_ALL_ACCESS; + WCHAR *subkey, *p, *q; + HKEY hkey, ret = NULL; + LONG res; + + if (is_wow64) access |= KEY_WOW64_64KEY; + + if (!(subkey = strdupW( path ))) return NULL; + p = subkey; + if ((q = strchrW( p, '\\' ))) *q = 0; + if (create) + res = RegCreateKeyExW( root, subkey, 0, NULL, 0, access, NULL, &hkey, NULL ); + else + res = RegOpenKeyExW( root, subkey, 0, access, &hkey ); + if (res) + { + TRACE("failed to open key %s (%d)\n", debugstr_w(subkey), res); + msi_free( subkey ); + return NULL; + } + if (q && q[1]) + { + ret = open_key( hkey, q + 1, create ); + RegCloseKey( hkey ); + } + else ret = hkey; + msi_free( subkey ); + return ret; +} + static BOOL is_special_entry( const WCHAR *name ) { return (name && (name[0] == '*' || name[0] == '+') && !name[1]); @@ -2640,7 +2672,7 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) keypath = get_keypath( comp, root_key, deformated ); msi_free( deformated ); - if (RegCreateKeyExW( root_key, keypath, 0, NULL, 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, NULL, &hkey, NULL )) + if (!(hkey = open_key( root_key, keypath, TRUE ))) { ERR("Could not create key %s\n", debugstr_w(keypath)); msi_free(uikey); @@ -2711,44 +2743,67 @@ static UINT ACTION_WriteRegistryValues(MSIPACKAGE *package) return rc; } -static void delete_reg_value( HKEY root, const WCHAR *keypath, const WCHAR *value ) +static void delete_key( HKEY root, const WCHAR *path ) +{ + REGSAM access = 0; + WCHAR *subkey, *p; + HKEY hkey; + LONG res; + + if (is_wow64) access |= KEY_WOW64_64KEY; + + if (!(subkey = strdupW( path ))) return; + for (;;) + { + if ((p = strrchrW( subkey, '\\' ))) *p = 0; + hkey = open_key( root, subkey, FALSE ); + if (!hkey) break; + if (p && p[1]) + res = RegDeleteKeyExW( hkey, p + 1, access, 0 ); + else + res = RegDeleteKeyExW( root, subkey, access, 0 ); + if (res) + { + TRACE("failed to delete key %s (%d)\n", debugstr_w(subkey), res); + break; + } + if (p && p[1]) RegCloseKey( hkey ); + else break; + } + msi_free( subkey ); +} + +static void delete_value( HKEY root, const WCHAR *path, const WCHAR *value ) { LONG res; HKEY hkey; DWORD num_subkeys, num_values; - if (!(res = RegOpenKeyExW( root, keypath, 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey ))) + if ((hkey = open_key( root, path, FALSE ))) { if ((res = RegDeleteValueW( hkey, value ))) - { TRACE("failed to delete value %s (%d)\n", debugstr_w(value), res); - } + res = RegQueryInfoKeyW( hkey, NULL, NULL, NULL, &num_subkeys, NULL, NULL, &num_values, NULL, NULL, NULL, NULL ); RegCloseKey( hkey ); if (!res && !num_subkeys && !num_values) { - TRACE("removing empty key %s\n", debugstr_w(keypath)); - RegDeleteKeyExW( root, keypath, KEY_WOW64_64KEY, 0 ); + TRACE("removing empty key %s\n", debugstr_w(path)); + delete_key( root, path ); } - return; } - TRACE("failed to open key %s (%d)\n", debugstr_w(keypath), res); } -static void delete_reg_key( HKEY root, const WCHAR *keypath ) +static void delete_tree( HKEY root, const WCHAR *path ) { + LONG res; HKEY hkey; - LONG res = RegOpenKeyExW( root, keypath, 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey ); - if (res) - { - TRACE("failed to open key %s (%d)\n", debugstr_w(keypath), res); - return; - } + + if (!(hkey = open_key( root, path, FALSE ))) return; res = RegDeleteTreeW( hkey, NULL ); - if (res) TRACE("failed to delete subtree of %s (%d)\n", debugstr_w(keypath), res); - res = RegDeleteKeyExW( root, keypath, KEY_WOW64_64KEY, 0 ); - if (res) TRACE("failed to delete key %s (%d)\n", debugstr_w(keypath), res); + if (res) TRACE("failed to delete subtree of %s (%d)\n", debugstr_w(path), res); + delete_key( root, path ); RegCloseKey( hkey ); } @@ -2807,8 +2862,8 @@ static UINT ITERATE_RemoveRegistryValuesOnUninstall( MSIRECORD *row, LPVOID para keypath = get_keypath( comp, hkey_root, deformated_key ); msi_free( deformated_key ); - if (delete_key) delete_reg_key( hkey_root, keypath ); - else delete_reg_value( hkey_root, keypath, deformated_name ); + if (delete_key) delete_tree( hkey_root, keypath ); + else delete_value( hkey_root, keypath, deformated_name ); msi_free( keypath ); uirow = MSI_CreateRecord( 2 ); @@ -2872,8 +2927,8 @@ static UINT ITERATE_RemoveRegistryValuesOnInstall( MSIRECORD *row, LPVOID param keypath = get_keypath( comp, hkey_root, deformated_key ); msi_free( deformated_key ); - if (delete_key) delete_reg_key( hkey_root, keypath ); - else delete_reg_value( hkey_root, keypath, deformated_name ); + if (delete_key) delete_tree( hkey_root, keypath ); + else delete_value( hkey_root, keypath, deformated_name ); msi_free( keypath ); uirow = MSI_CreateRecord( 2 ); diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 0bd65a0..82afd18 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -490,7 +490,8 @@ static const char wrv_registry_dat[] = "regdata\t2\tSOFTWARE\\Wine\\msitest\tValue\t[~]one[~]two[~]three\taugustus\n" "regdata1\t2\tSOFTWARE\\Wine\\msitest\t*\t\taugustus\n" "regdata2\t2\tSOFTWARE\\Wine\\msitest\t*\t#%\taugustus\n" - "regdata3\t2\tSOFTWARE\\Wine\\msitest\t*\t#x\taugustus\n"; + "regdata3\t2\tSOFTWARE\\Wine\\msitest\t*\t#x\taugustus\n" + "regdata4\t2\tSOFTWARE\\Wine\\msitest\\VisualStudio\\10.0\\AD7Metrics\\Exception\\{049EC4CC-30D2-4032-9256-EE18EB41B62B}\\Common Language Runtime Exceptions\\System.Workflow.ComponentModel.Serialization\\System.Workflow.ComponentModel.Serialization.WorkflowMarkupSerializationException\tlong\tkey\taugustus\n"; static const char cf_directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n" @@ -1818,6 +1819,75 @@ static const msi_table pa_tables[] = ADD_TABLE(property) }; +/* based on RegDeleteTreeW from dlls/advapi32/registry.c */ +static LSTATUS action_RegDeleteTreeA(HKEY hKey, LPCSTR lpszSubKey, REGSAM access) +{ + LONG ret; + DWORD dwMaxSubkeyLen, dwMaxValueLen; + DWORD dwMaxLen, dwSize; + char szNameBuf[MAX_PATH], *lpszName = szNameBuf; + HKEY hSubKey = hKey; + + if(lpszSubKey) + { + ret = RegOpenKeyExA(hKey, lpszSubKey, 0, access, &hSubKey); + if (ret) return ret; + } + + ret = RegQueryInfoKeyA(hSubKey, NULL, NULL, NULL, NULL, + &dwMaxSubkeyLen, NULL, NULL, &dwMaxValueLen, NULL, NULL, NULL); + if (ret) goto cleanup; + + dwMaxSubkeyLen++; + dwMaxValueLen++; + dwMaxLen = max(dwMaxSubkeyLen, dwMaxValueLen); + if (dwMaxLen > sizeof(szNameBuf)) + { + /* Name too big: alloc a buffer for it */ + if (!(lpszName = HeapAlloc( GetProcessHeap(), 0, dwMaxLen))) + { + ret = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + } + + /* Recursively delete all the subkeys */ + while (TRUE) + { + dwSize = dwMaxLen; + if (RegEnumKeyExA(hSubKey, 0, lpszName, &dwSize, NULL, + NULL, NULL, NULL)) break; + + ret = action_RegDeleteTreeA(hSubKey, lpszName, access); + if (ret) goto cleanup; + } + + if (lpszSubKey) + { + if (pRegDeleteKeyExA) + ret = pRegDeleteKeyExA(hKey, lpszSubKey, access, 0); + else + ret = RegDeleteKeyA(hKey, lpszSubKey); + } + else + while (TRUE) + { + dwSize = dwMaxLen; + if (RegEnumValueA(hKey, 0, lpszName, &dwSize, + NULL, NULL, NULL, NULL)) break; + + ret = RegDeleteValueA(hKey, lpszName); + if (ret) goto cleanup; + } + +cleanup: + if (lpszName != szNameBuf) + HeapFree(GetProcessHeap(), 0, lpszName); + if(lpszSubKey) + RegCloseKey(hSubKey); + return ret; +} + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -4586,6 +4656,9 @@ static void test_write_registry_values(void) res = RegQueryValueExA(hkey, "", NULL, NULL, NULL, NULL); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + res = action_RegDeleteTreeA(hkey, "VisualStudio", KEY_ALL_ACCESS); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + RegDeleteValueA(hkey, "Value"); RegCloseKey(hkey); RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest");

1 0

Nozomi Kodama : include: Remove useless todo's.
by Alexandre Julliard 11 Jun '12

11 Jun '12

Module: wine Branch: master Commit: 00fb537a2df066107f0249f894664ea3a3b3d741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00fb537a2df066107f0249f89… Author: Nozomi Kodama <Nozomi.Kodama(a)yahoo.com> Date: Sun Jun 10 17:00:05 2012 +0800 include: Remove useless todo's. --- include/d3dx9math.inl | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/include/d3dx9math.inl b/include/d3dx9math.inl index 0d80cf9..af6b456 100644 --- a/include/d3dx9math.inl +++ b/include/d3dx9math.inl @@ -557,13 +557,11 @@ inline D3DXQUATERNION& D3DXQUATERNION::operator -= (CONST D3DXQUATERNION& quat) return *this; } -/* TODO: uncomment this when D3DXQuaternionMultiply has been implemented inline D3DXQUATERNION& D3DXQUATERNION::operator *= (CONST D3DXQUATERNION& quat) { D3DXQuaternionMultiply(this, this, &quat); return *this; } -*/ inline D3DXQUATERNION& D3DXQUATERNION::operator *= (FLOAT f) { @@ -604,14 +602,12 @@ inline D3DXQUATERNION D3DXQUATERNION::operator - (CONST D3DXQUATERNION& quat) co return D3DXQUATERNION(x - quat.x, y - quat.y, z - quat.z, w - quat.w); } -/* TODO: uncomment this when D3DXQuaternionMultiply has been implemented inline D3DXQUATERNION D3DXQUATERNION::operator * (CONST D3DXQUATERNION& quat) const { D3DXQUATERNION buf; D3DXQuaternionMultiply(&buf, this, &quat); return buf; } -*/ inline D3DXQUATERNION D3DXQUATERNION::operator * (FLOAT f) const {

1 0