August 2009 - Wine-Commits - list.winehq.org

Alexandre Julliard : Wine release 1.1.28
by Alexandre Julliard Aug. 21, 2009

Aug. 21, 2009

Module: website Branch: master Commit: 12ca7c15abec07e7a1f55fc295ad8b695689c2dc URL: http://source.winehq.org/git/website.git/?a=commit;h=12ca7c15abec07e7a1f55f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 21 19:02:45 2009 +0200 Wine release 1.1.28 --- news/en/2009082101.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/en/2009082101.xml b/news/en/2009082101.xml new file mode 100644 index 0000000..257c764 --- /dev/null +++ b/news/en/2009082101.xml @@ -0,0 +1,16 @@ +<news> +<date>August 21, 2009</date> +<title>Wine 1.1.28 Released</title> +<body> + The Wine development release 1.1.28 is now available. + <a href="{$root}/announce/1.1.28">What's new</a> in this release: +<ul> + <li>Support for IRDA protocol.</li> + <li>Faster initial wineprefix creation.</li> + <li>Axis remapping with evdev joysticks.</li> + <li>More image formats in WindowsCodecs.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.28.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

Tag wine-1.1.28 : Alexandre Julliard : Release 1.1.28
by Alexandre Julliard Aug. 21, 2009

Aug. 21, 2009

Module: wine Branch: refs/tags/wine-1.1.28 Tag: 3bfc57c05c8800d709c100478b1a3d6c95db0fee URL: http://source.winehq.org/git/wine.git/?a=tag;h=3bfc57c05c8800d709c100478b1a… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 21 18:55:38 2009 +0200 Release 1.1.28

1 0

Alexandre Julliard : Release 1.1.28.
by Alexandre Julliard Aug. 21, 2009

Aug. 21, 2009

Module: wine Branch: master Commit: f6f458a1eb162adeec83c2241a746b7214a8e843 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6f458a1eb162adeec83c2241… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 21 18:55:37 2009 +0200 Release 1.1.28. --- ANNOUNCE | 1282 +++++++++++++++++++++++++++++-------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 622 insertions(+), 680 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f6f458a1eb162adeec83c…

1 0

Ge van Geldorp : winetest: Put Win7 results in their own group.
by Alexandre Julliard Aug. 21, 2009

Aug. 21, 2009

Module: tools Branch: master Commit: 610b4b6c3f20be5463f735de6385eba01b8dddf6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=610b4b6c3f20be5463f735de… Author: Ge van Geldorp <ge(a)gse.nl> Date: Fri Aug 21 15:02:44 2009 +0200 winetest: Put Win7 results in their own group. --- winetest/build-index | 3 ++- winetest/dissect | 14 +++++++++----- winetest/gather | 6 ++++-- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index dcd43db..21f35fd 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -27,11 +27,12 @@ my %xp = (name => "XP"); my %w2k3 = (name => "2003"); my %vista = (name => "Vista"); my %w2k8 = (name => "2008"); +my %win7 = (name => "Win7"); my %unknown = (name => "Other"); my %wine = (name => "Wine"); # Define the order of version groups in the summary -my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%unknown, \%wine); +my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%win7, \%unknown, \%wine); my @months = ("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"); diff --git a/winetest/dissect b/winetest/dissect index b18434a..8bd7865 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -174,11 +174,15 @@ if ($plid==1 && $major==4) { $version = "2003"; } } - } elsif ($major==6 && $minor== 0) { - if ($product==1) { - $version = "vista"; - } elsif ($product==3) { - $version = "2008"; + } elsif ($major==6) + if ($minor == 0) { + if ($product==1) { + $version = "vista"; + } elsif ($product==3) { + $version = "2008"; + } + } elsif ($minor == 1) { + $version = "win7"; } } } elsif ($plid==3) { diff --git a/winetest/gather b/winetest/gather index 9957e14..ce3b530 100755 --- a/winetest/gather +++ b/winetest/gather @@ -94,15 +94,17 @@ my %xp = (name => "XP"); my %w2k3 = (name => "2003"); my %vista = (name => "Vista"); my %w2k8 = (name => "2008"); +my %win7 = (name => "Win7"); my %unknown = (name => "Other"); my %wine = (name => "Wine"); # Map dissect's IDs to the above hashes my %idmap = (95=>\%w95, 98=>\%w98, me=>\%me, nt3=>\%nt3, nt4=>\%nt4, 2000=>\%w2k, - xp=>\%xp, 2003=>\%w2k3, vista=>\%vista, 2008=>\%w2k8, unknown=>\%unknown, wine=>\%wine); + xp=>\%xp, 2003=>\%w2k3, vista=>\%vista, 2008=>\%w2k8, win7=>\%win7, + unknown=>\%unknown, wine=>\%wine); # Define the order of version groups in the summary -my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%unknown, \%wine); +my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%win7, \%unknown, \%wine); my ($outdated,undef) = glob "$datadir/*/outdated"; exit 2 unless defined $outdated;

1 0

Huw Davies : widl: The alignment written for USER_MARSHAL types is the wire-type alignment.
by Alexandre Julliard Aug. 21, 2009

Aug. 21, 2009

Module: wine Branch: master Commit: a376b86dfefaf18580cadb931d0e60346c182f54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a376b86dfefaf18580cadb931… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 21 13:20:16 2009 +0100 widl: The alignment written for USER_MARSHAL types is the wire-type alignment. --- tools/widl/typegen.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 3bcce37..d9a2c0d 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1476,13 +1476,15 @@ static void write_user_tfs(FILE *file, type_t *type, unsigned int *tfsoff) unsigned int align = 0, ualign = 0; const char *name = NULL; type_t *utype = get_user_type(type, &name); - unsigned int usize = user_type_has_variable_size(utype) ? 0 : type_memsize(utype, &ualign); + unsigned int usize = type_memsize(utype, &ualign); unsigned int size = type_memsize(type, &align); unsigned short funoff = user_type_offset(name); short reloff; guard_rec(type); + if(user_type_has_variable_size(utype)) usize = 0; + if (type_get_type(utype) == TYPE_BASIC || type_get_type(utype) == TYPE_ENUM) { @@ -1518,7 +1520,7 @@ static void write_user_tfs(FILE *file, type_t *type, unsigned int *tfsoff) print_start_tfs_comment(file, type, start); print_file(file, 2, "0x%x,\t/* FC_USER_MARSHAL */\n", RPC_FC_USER_MARSHAL); print_file(file, 2, "0x%x,\t/* Alignment= %d, Flags= %02x */\n", - flags | (align - 1), align - 1, flags); + flags | (ualign - 1), ualign - 1, flags); print_file(file, 2, "NdrFcShort(0x%hx),\t/* Function offset= %hu */\n", funoff, funoff); print_file(file, 2, "NdrFcShort(0x%hx),\t/* %u */\n", size, size); print_file(file, 2, "NdrFcShort(0x%hx),\t/* %u */\n", usize, usize);

1 0

Huw Davies : widl: A structure that contains an embedded interface ptr in an array is a BOGUS_STRUCT .
by Alexandre Julliard Aug. 21, 2009

Aug. 21, 2009

Module: wine Branch: master Commit: e4e21193c049085dffe9475c9c9bdf9ae6807401 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4e21193c049085dffe9475c9… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 21 12:10:56 2009 +0100 widl: A structure that contains an embedded interface ptr in an array is a BOGUS_STRUCT. --- tools/widl/typegen.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 61 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index dc22fb2..3bcce37 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -222,6 +222,64 @@ enum typegen_type typegen_detect_type(const type_t *type, const attr_list_t *att return TGT_INVALID; } +static type_t *get_user_type(const type_t *t, const char **pname); + +static int type_contains_iface(const type_t *type) +{ + enum typegen_type typegen_type; + var_list_t *fields; + const var_t *field; + + typegen_type = typegen_detect_type(type, type->attrs, TDT_IGNORE_STRINGS); + + switch(typegen_type) + { + case TGT_USER_TYPE: + return type_contains_iface(get_user_type(type, NULL)); + + case TGT_BASIC: + case TGT_ENUM: + return FALSE; + + case TGT_POINTER: + return type_contains_iface(type_pointer_get_ref(type)); + + case TGT_ARRAY: + return type_contains_iface(type_array_get_element(type)); + + case TGT_IFACE_POINTER: + return TRUE; + + case TGT_STRUCT: + fields = type_struct_get_fields(type); + if (fields) LIST_FOR_EACH_ENTRY( field, fields, const var_t, entry ) + { + if(type_contains_iface(field->type)) + return TRUE; + } + return FALSE; + + case TGT_UNION: + fields = type_union_get_cases(type); + if (fields) LIST_FOR_EACH_ENTRY( field, fields, const var_t, entry ) + { + if(field->type && type_contains_iface(field->type)) + return TRUE; + } + return FALSE; + + case TGT_STRING: + /* shouldn't get here because of TDT_IGNORE_STRINGS above. fall through */ + case TGT_INVALID: + case TGT_CTXT_HANDLE: + case TGT_CTXT_HANDLE_POINTER: + /* checking after parsing should mean that we don't get here. if we do, + * it's a checker bug */ + assert(0); + } + return FALSE; +} + unsigned char get_struct_fc(const type_t *type) { int has_pointer = 0; @@ -280,8 +338,10 @@ unsigned char get_struct_fc(const type_t *type) if (get_enum_fc(t) == RPC_FC_ENUM16) return RPC_FC_BOGUS_STRUCT; break; - case TGT_POINTER: case TGT_ARRAY: + if(type_contains_iface(type_array_get_element(t))) + return RPC_FC_BOGUS_STRUCT; + case TGT_POINTER: if (get_pointer_fc(t, field->attrs, FALSE) == RPC_FC_RP || pointer_size != 4) return RPC_FC_BOGUS_STRUCT; has_pointer = 1;

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle get/put wordSpacing.
by Alexandre Julliard Aug. 21, 2009

Aug. 21, 2009

Module: wine Branch: master Commit: 4975243db388e282e91553cb95dca3e8739b582b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4975243db388e282e91553cb9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 21 20:55:29 2009 +1000 mshtml: Implement IHTMLStyle get/put wordSpacing. --- dlls/mshtml/htmlstyle.c | 11 +++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/dom.c | 20 ++++++++++++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index f938005..a5e0ace 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -121,6 +121,8 @@ static const WCHAR attrVisibility[] = {'v','i','s','i','b','i','l','i','t','y',0}; static const WCHAR attrWidth[] = {'w','i','d','t','h',0}; +static const WCHAR attrWordSpacing[] = + {'w','o','r','d','-','s','p','a','c','i','n','g',0}; static const WCHAR attrWordWrap[] = {'w','o','r','d','-','w','r','a','p',0}; static const WCHAR attrZIndex[] = @@ -173,6 +175,7 @@ static const struct{ {attrVerticalAlign, DISPID_IHTMLSTYLE_VERTICALALIGN}, {attrVisibility, DISPID_IHTMLSTYLE_VISIBILITY}, {attrWidth, DISPID_IHTMLSTYLE_WIDTH}, + {attrWordSpacing, DISPID_IHTMLSTYLE_WORDSPACING}, {attrWordWrap, DISPID_IHTMLSTYLE3_WORDWRAP}, {attrZIndex, DISPID_IHTMLSTYLE_ZINDEX} }; @@ -923,15 +926,15 @@ static HRESULT WINAPI HTMLStyle_get_backgroundPositionY(IHTMLStyle *iface, VARIA static HRESULT WINAPI HTMLStyle_put_wordSpacing(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + return set_nsstyle_attr_var(This->nsstyle, STYLEID_WORD_SPACING, &v, 0); } static HRESULT WINAPI HTMLStyle_get_wordSpacing(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr_var(This->nsstyle, STYLEID_WORD_SPACING, p, 0); } static HRESULT WINAPI HTMLStyle_put_letterSpacing(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index beab44e..41581f3 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -78,6 +78,7 @@ typedef enum { STYLEID_VERTICAL_ALIGN, STYLEID_VISIBILITY, STYLEID_WIDTH, + STYLEID_WORD_SPACING, STYLEID_WORD_WRAP, STYLEID_Z_INDEX } styleid_t; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 5cec17e..dd2c63a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3689,6 +3689,26 @@ static void test_default_style(IHTMLStyle *style) ok(hres == S_OK, "put_borderLeftWidth: %08x\n", hres); VariantClear(&vDefault); + /* wordSpacing */ + hres = IHTMLStyle_get_wordSpacing(style, &vDefault); + ok(hres == S_OK, "get_wordSpacing: %08x\n", hres); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("10"); + hres = IHTMLStyle_put_wordSpacing(style, v); + ok(hres == S_OK, "put_wordSpacing: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle_get_wordSpacing(style, &v); + ok(hres == S_OK, "get_wordSpacing: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "10px"), "expected 10px = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + hres = IHTMLStyle_put_wordSpacing(style, vDefault); + ok(hres == S_OK, "put_wordSpacing: %08x\n", hres); + VariantClear(&vDefault); + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) {

1 0

Jacek Caban : mshtml: Code clean up.
by Alexandre Julliard Aug. 21, 2009

Aug. 21, 2009

Module: wine Branch: master Commit: bed507bf83076667835feef9d5222e9d62f9ca3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bed507bf83076667835feef9d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 21 13:27:20 2009 +0200 mshtml: Code clean up. --- dlls/mshtml/nsembed.c | 70 +++++++++++++++++++++++-------------------------- 1 files changed, 33 insertions(+), 37 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index eadbfc7..41f762f 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -296,12 +296,38 @@ static BOOL load_wine_gecko(PRUnichar *gre_path) return ret; } +static void set_bool_pref(nsIPrefBranch *pref, const char *pref_name, BOOL val) +{ + nsresult nsres; + + nsres = nsIPrefBranch_SetBoolPref(pref, pref_name, val); + if(NS_FAILED(nsres)) + ERR("Could not set pref %s\n", debugstr_a(pref_name)); +} + +static void set_int_pref(nsIPrefBranch *pref, const char *pref_name, int val) +{ + nsresult nsres; + + nsres = nsIPrefBranch_SetIntPref(pref, pref_name, val); + if(NS_FAILED(nsres)) + ERR("Could not set pref %s\n", debugstr_a(pref_name)); +} + +static void set_string_pref(nsIPrefBranch *pref, const char *pref_name, const char *val) +{ + nsresult nsres; + + nsres = nsIPrefBranch_SetCharPref(pref, pref_name, val); + if(NS_FAILED(nsres)) + ERR("Could not set pref %s\n", debugstr_a(pref_name)); +} + static void set_lang(nsIPrefBranch *pref) { char langs[100]; DWORD res, size, type; HKEY hkey; - nsresult nsres; static const WCHAR international_keyW[] = {'S','o','f','t','w','a','r','e', @@ -321,9 +347,7 @@ static void set_lang(nsIPrefBranch *pref) TRACE("Setting lang %s\n", debugstr_a(langs)); - nsres = nsIPrefBranch_SetCharPref(pref, "intl.accept_languages", langs); - if(NS_FAILED(nsres)) - ERR("SetCharPref failed: %08x\n", nsres); + set_string_pref(pref, "intl.accept_languages", langs); } static void set_proxy(nsIPrefBranch *pref) @@ -333,7 +357,6 @@ static void set_proxy(nsIPrefBranch *pref) int proxy_port_num; DWORD enabled = 0, res, size, type; HKEY hkey; - nsresult nsres; static const WCHAR proxy_keyW[] = {'S','o','f','t','w','a','r','e', @@ -368,39 +391,12 @@ static void set_proxy(nsIPrefBranch *pref) proxy_port_num = atoi(proxy_port + 1); TRACE("Setting proxy to %s, port %d\n", debugstr_a(proxy), proxy_port_num); - nsres = nsIPrefBranch_SetIntPref(pref, "network.proxy.type", 1); - if(NS_FAILED(nsres)) - ERR("SetIntPref network.proxy.type failed: %08x\n", nsres); - nsres = nsIPrefBranch_SetCharPref(pref, "network.proxy.http", proxy); - if(NS_FAILED(nsres)) - ERR("SetCharPref network.proxy.http failed: %08x\n", nsres); - nsres = nsIPrefBranch_SetIntPref(pref, "network.proxy.http_port", proxy_port_num); - if(NS_FAILED(nsres)) - ERR("SetIntPref network.proxy.http_port failed: %08x\n", nsres); - nsres = nsIPrefBranch_SetCharPref(pref, "network.proxy.ssl", proxy); - if(NS_FAILED(nsres)) - ERR("SetCharPref network.proxy.ssl failed: %08x\n", nsres); - nsres = nsIPrefBranch_SetIntPref(pref, "network.proxy.ssl_port", proxy_port_num); - if(NS_FAILED(nsres)) - ERR("SetIntPref network.proxy.ssl_port failed: %08x\n", nsres); -} - -static void set_bool_pref(nsIPrefBranch *pref, const char *pref_name, BOOL val) -{ - nsresult nsres; + set_string_pref(pref, "network.proxy.http", proxy); + set_string_pref(pref, "network.proxy.ssl", proxy); - nsres = nsIPrefBranch_SetBoolPref(pref, pref_name, val); - if(NS_FAILED(nsres)) - ERR("Could not set pref %s\n", debugstr_a(pref_name)); -} - -static void set_int_pref(nsIPrefBranch *pref, const char *pref_name, int val) -{ - nsresult nsres; - - nsres = nsIPrefBranch_SetIntPref(pref, pref_name, val); - if(NS_FAILED(nsres)) - ERR("Could not set pref %s\n", debugstr_a(pref_name)); + set_int_pref(pref, "network.proxy.type", 1); + set_int_pref(pref, "network.proxy.http_port", proxy_port_num); + set_int_pref(pref, "network.proxy.ssl_port", proxy_port_num); } static void set_preferences(void)

1 0

Jacek Caban : msxml3: Store xmlnode object in domdoc.
by Alexandre Julliard Aug. 21, 2009

Aug. 21, 2009

Module: wine Branch: master Commit: 438ff138d26a02e37531af44ac138d162ae3e0f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=438ff138d26a02e37531af44a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 21 13:25:28 2009 +0200 msxml3: Store xmlnode object in domdoc. --- dlls/msxml3/domdoc.c | 107 +++++++++++++++++++++++-------------------------- 1 files changed, 50 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=438ff138d26a02e37531a…

1 0

Jacek Caban : msxml3: Store xmlnode object in domelem.
by Alexandre Julliard Aug. 21, 2009

Aug. 21, 2009

Module: wine Branch: master Commit: 38c0667334d7b929607a3b2d7e6ed4856f65f718 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38c0667334d7b929607a3b2d7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 21 13:24:53 2009 +0200 msxml3: Store xmlnode object in domelem. --- dlls/msxml3/element.c | 89 +++++++++++++++++++++++-------------------------- 1 files changed, 42 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=38c0667334d7b929607a3…

1 0