September 2012 - Wine-Commits

Alexandre Julliard : Wine release 1.5.14
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: website Branch: master Commit: 4b1e9c0b3b7a1c7526189bb15c62b963bb45dcf7 URL: http://source.winehq.org/git/website.git/?a=commit;h=4b1e9c0b3b7a1c7526189b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 28 20:39:47 2012 +0200 Wine release 1.5.14 --- news/en/2012092801.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/en/2012092801.xml b/news/en/2012092801.xml new file mode 100644 index 0000000..b852768 --- /dev/null +++ b/news/en/2012092801.xml @@ -0,0 +1,16 @@ +<news> +<date>September 28, 2012</date> +<title>Wine 1.5.14 Released</title> +<body> + The Wine development release 1.5.14 is now available. + <a href="{$root}/announce/1.5.14">What's new</a> in this release: +<ul> + <li>Much better behavior of the URL cache.</li> + <li>Improved GIF image support.</li> + <li>More parser features in the shader compiler.</li> + <li>Optimizations in JavaScript.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.14.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.5.14.
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: master Commit: 9bf7469f6855ae28ff23cf0cf726563650087436 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf7469f6855ae28ff23cf0cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 28 20:25:58 2012 +0200 Release 1.5.14. --- ANNOUNCE | 1104 ++++++++++++++++++++++++++++++++++--------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 630 insertions(+), 494 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9bf7469f6855ae28ff23c…

1 0

Tag wine-1.5.14 : Alexandre Julliard : Release 1.5.14
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: refs/tags/wine-1.5.14 Tag: 9f88c8a482d18d9a0b0fde78659bc3783c91e465 URL: http://source.winehq.org/git/wine.git/?a=tag;h=9f88c8a482d18d9a0b0fde78659b… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 28 20:26:03 2012 +0200 Release 1.5.14

1 0

Matteo Bruni : d3dcompiler: Fix freeing function.
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: master Commit: f10e0d4e9ed5d2f2ebe9773bd1f6e5d7ebd6cf26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f10e0d4e9ed5d2f2ebe9773bd… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 28 17:22:38 2012 +0200 d3dcompiler: Fix freeing function. --- dlls/d3dcompiler_43/hlsl.y | 4 ++-- dlls/d3dcompiler_43/utils.c | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index f9a685a..d302fa1 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -2227,7 +2227,7 @@ static DWORD add_modifier(DWORD modifiers, DWORD mod, const struct YYLTYPE *loc) struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD major, DWORD minor, const char *entrypoint, char **messages) { - struct hlsl_ir_function_decl *function; + struct hlsl_ir_function_decl *function, *next_function; struct hlsl_scope *scope, *next_scope; struct hlsl_type *hlsl_type, *next_type; struct hlsl_ir_var *var, *next_var; @@ -2284,7 +2284,7 @@ struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD major, DWORD mino d3dcompiler_free(hlsl_ctx.source_files); TRACE("Freeing functions IR.\n"); - LIST_FOR_EACH_ENTRY(function, &hlsl_ctx.functions, struct hlsl_ir_function_decl, node.entry) + LIST_FOR_EACH_ENTRY_SAFE(function, next_function, &hlsl_ctx.functions, struct hlsl_ir_function_decl, node.entry) free_function(function); TRACE("Freeing variables.\n"); diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 9f91579..eca67c9 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -2369,12 +2369,8 @@ void free_instr(struct hlsl_ir_node *node) void free_function(struct hlsl_ir_function_decl *func) { - struct hlsl_ir_var *param, *next_param; - d3dcompiler_free((void *)func->name); d3dcompiler_free((void *)func->semantic); - LIST_FOR_EACH_ENTRY_SAFE(param, next_param, func->parameters, struct hlsl_ir_var, node.entry) - d3dcompiler_free(param); d3dcompiler_free(func->parameters); free_instr_list(func->body); d3dcompiler_free(func);

1 0

Dmitry Timoshkov : gdiplus: Reuse an existing image stream in GdipImageSelectActiveFrame.
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: master Commit: 896d1047f3e925c37bb9a3008f41072c48a12527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=896d1047f3e925c37bb9a3008… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 28 10:15:39 2012 +0900 gdiplus: Reuse an existing image stream in GdipImageSelectActiveFrame. --- dlls/gdiplus/image.c | 31 ++++++++++--------------------- 1 files changed, 10 insertions(+), 21 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 5e0b1ea..3ee024c 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3531,6 +3531,8 @@ static GpStatus decode_image_wic(IStream *stream, GDIPCONST CLSID *clsid, WICRect wrc; HRESULT initresult; + TRACE("%p,%s,%u,%p\n", stream, wine_dbgstr_guid(clsid), active_frame, image); + initresult = CoInitialize(NULL); hr = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, @@ -3669,6 +3671,7 @@ end: } /* Pin the source stream */ IStream_AddRef(stream); + TRACE("=> %p\n", *image); } return status; @@ -3827,7 +3830,6 @@ GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage *image, GDIPCONST GUID *d LARGE_INTEGER seek; HRESULT hr; const struct image_codec *codec = NULL; - IStream *stream; GpImage *new_image; TRACE("(%p,%s,%u)\n", image, debugstr_guid(dimensionID), frame); @@ -3836,7 +3838,10 @@ GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage *image, GDIPCONST GUID *d return InvalidParameter; if (frame >= image->frame_count) + { + WARN("requested frame %u, but image has only %u\n", frame, image->frame_count); return InvalidParameter; + } if (image->type != ImageTypeBitmap && image->type != ImageTypeMetafile) { @@ -3853,37 +3858,22 @@ GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage *image, GDIPCONST GUID *d return Ok; } - hr = IStream_Clone(image->stream, &stream); - if (FAILED(hr)) - { - STATSTG statstg; - - hr = IStream_Stat(image->stream, &statstg, STATFLAG_NOOPEN); - if (FAILED(hr)) return hresult_to_status(hr); - - stat = GdipCreateStreamOnFile(statstg.pwcsName, GENERIC_READ, &stream); - if (stat != Ok) return stat; - } - /* choose an appropriate image decoder */ - stat = get_decoder_info(stream, &codec); + stat = get_decoder_info(image->stream, &codec); if (stat != Ok) { - IStream_Release(stream); + WARN("can't find decoder info\n"); return stat; } /* seek to the start of the stream */ seek.QuadPart = 0; - hr = IStream_Seek(stream, seek, STREAM_SEEK_SET, NULL); + hr = IStream_Seek(image->stream, seek, STREAM_SEEK_SET, NULL); if (FAILED(hr)) - { - IStream_Release(stream); return hresult_to_status(hr); - } /* call on the image decoder to do the real work */ - stat = codec->decode_func(stream, &codec->info.Clsid, frame, &new_image); + stat = codec->decode_func(image->stream, &codec->info.Clsid, frame, &new_image); if (stat == Ok) { @@ -3898,7 +3888,6 @@ GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage *image, GDIPCONST GUID *d return Ok; } - IStream_Release(stream); return stat; }

1 0

Jacek Caban : hhctrl.ocx: Get rid of no longer needed hack.
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: master Commit: 7917d917baf17fe81910c0d00f5e1a4916f2659f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7917d917baf17fe81910c0d00… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 28 14:21:25 2012 +0200 hhctrl.ocx: Get rid of no longer needed hack. --- dlls/hhctrl.ocx/help.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 79e5e11..c884dc0 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -253,17 +253,12 @@ static BOOL AppendFullPathURL(LPCWSTR file, LPWSTR buf, LPCWSTR index) BOOL NavigateToChm(HHInfo *info, LPCWSTR file, LPCWSTR index) { WCHAR buf[INTERNET_MAX_URL_LENGTH]; - LPWSTR ptr; TRACE("%p %s %s\n", info, debugstr_w(file), debugstr_w(index)); if ((!info->web_browser) || !AppendFullPathURL(file, buf, index)) return FALSE; - /* FIXME: HACK */ - if((ptr = strchrW(buf, '#'))) - *ptr = 0; - return SUCCEEDED(navigate_url(info, buf)); }

1 0

Matteo Bruni : d3dcompiler: Parse struct typedefs.
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: master Commit: f50007b856b29d9f106f710313499fef68ba7e09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f50007b856b29d9f106f71031… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 28 17:22:40 2012 +0200 d3dcompiler: Parse struct typedefs. --- dlls/d3dcompiler_43/hlsl.y | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index e795962..d8c82a9 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1373,6 +1373,14 @@ typedef: KW_TYPEDEF var_modifiers type type_specs ';' if (!add_typedef($2, $3, $4, &loc)) return 1; } + | KW_TYPEDEF struct_spec type_specs ';' + { + struct source_location loc; + + set_location(&loc, &@1); + if (!add_typedef(0, $2, $3, &loc)) + return 1; + } type_specs: type_spec {

1 0

Matteo Bruni : d3dcompiler: Parse struct dereferences.
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: master Commit: 6b2ecb509abeb53ed552da14161c694afd9284ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b2ecb509abeb53ed552da141… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 28 17:22:39 2012 +0200 d3dcompiler: Parse struct dereferences. --- dlls/d3dcompiler_43/hlsl.y | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index d302fa1..e795962 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1795,7 +1795,36 @@ postfix_expr: primary_expr struct source_location loc; set_location(&loc, &@2); - if ($1->data_type->type <= HLSL_CLASS_LAST_NUMERIC) + if ($1->data_type->type == HLSL_CLASS_STRUCT) + { + struct hlsl_type *type = $1->data_type; + struct hlsl_struct_field *field; + + $$ = NULL; + LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) + { + if (!strcmp($3, field->name)) + { + struct hlsl_ir_deref *deref = new_record_deref($1, field); + + if (!deref) + { + ERR("Out of memory\n"); + return -1; + } + deref->node.loc = loc; + $$ = &deref->node; + break; + } + } + if (!$$) + { + hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, + "invalid subscript %s", debugstr_a($3)); + return 1; + } + } + else if ($1->data_type->type <= HLSL_CLASS_LAST_NUMERIC) { struct hlsl_ir_swizzle *swizzle;

1 0

Hans Leidekker : include: Add wbemprov.idl.
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: master Commit: 9e88e8104385b825784207cb1c9b3ce5bf457661 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e88e8104385b825784207cb1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 28 13:37:43 2012 +0200 include: Add wbemprov.idl. --- .gitignore | 1 + include/Makefile.in | 1 + include/wbemprov.idl | 28 ++++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 588a98c..6655913 100644 --- a/.gitignore +++ b/.gitignore @@ -247,6 +247,7 @@ include/urlhist.h include/urlmon.h include/vmr9.h include/wbemcli.h +include/wbemprov.h include/wia_lh.h include/wia_xp.h include/wincodec.h diff --git a/include/Makefile.in b/include/Makefile.in index b32e4b9..314b37f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -104,6 +104,7 @@ PUBLIC_IDL_H_SRCS = \ urlmon.idl \ vmr9.idl \ wbemcli.idl \ + wbemprov.idl \ wia_lh.idl \ wia_xp.idl \ wincodec.idl \ diff --git a/include/wbemprov.idl b/include/wbemprov.idl new file mode 100644 index 0000000..bb9f1b1 --- /dev/null +++ b/include/wbemprov.idl @@ -0,0 +1,28 @@ +/* + * Copyright 2012 Hans Leidekker 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 + */ + +[ + uuid(092df710-7010-11d1-ad90-00c04fd8fdff) +] +library WbemProviders_v1 +{ + [ + uuid(cb8555cc-9128-11d1-ad9b-00c04fd8fdff) + ] + coclass WbemAdministrativeLocator { interface IWbemLocator; } +}

1 0

Matteo Bruni : d3dcompiler: Parse array indexing expressions.
by Alexandre Julliard Sept. 28, 2012

Sept. 28, 2012

Module: wine Branch: master Commit: b1594dabcc4e01370448730b7ab326446cfed727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1594dabcc4e01370448730b7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 28 17:22:41 2012 +0200 d3dcompiler: Parse array indexing expressions. --- dlls/d3dcompiler_43/hlsl.y | 58 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index d8c82a9..8627e54 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1852,6 +1852,64 @@ postfix_expr: primary_expr return 1; } } + | postfix_expr '[' expr ']' + { + /* This may be an array dereference or a vector/matrix + * subcomponent access. + * We store it as an array dereference in any case. */ + struct hlsl_ir_deref *deref = d3dcompiler_alloc(sizeof(*deref)); + struct hlsl_type *expr_type = $1->data_type; + struct source_location loc; + + TRACE("Array dereference from type %s\n", debug_hlsl_type(expr_type)); + if (!deref) + { + ERR("Out of memory\n"); + return -1; + } + deref->node.type = HLSL_IR_DEREF; + set_location(&loc, &@2); + deref->node.loc = loc; + if (expr_type->type == HLSL_CLASS_ARRAY) + { + deref->node.data_type = expr_type->e.array.type; + } + else if (expr_type->type == HLSL_CLASS_MATRIX) + { + deref->node.data_type = new_hlsl_type(NULL, HLSL_CLASS_VECTOR, expr_type->base_type, expr_type->dimx, 1); + } + else if (expr_type->type == HLSL_CLASS_VECTOR) + { + deref->node.data_type = new_hlsl_type(NULL, HLSL_CLASS_SCALAR, expr_type->base_type, 1, 1); + } + else + { + if (expr_type->type == HLSL_CLASS_SCALAR) + hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, + "array-indexed expression is scalar"); + else + hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, + "expression is not array-indexable"); + d3dcompiler_free(deref); + free_instr($1); + free_instr($3); + return 1; + } + if ($3->data_type->type != HLSL_CLASS_SCALAR) + { + hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, + "array index is not scalar"); + d3dcompiler_free(deref); + free_instr($1); + free_instr($3); + return 1; + } + deref->type = HLSL_IR_DEREF_ARRAY; + deref->v.array.array = $1; + deref->v.array.index = $3; + + $$ = &deref->node; + } /* "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 ')'

1 0