November 2013 - Wine-commits

Jacek Caban : mshtml: Added IHTMLSelectElement:: multiple property implementation.
by Alexandre Julliard 14 Nov '13

14 Nov '13

Module: wine Branch: master Commit: eebc40f2b3935819584a20187af2e6f782270838 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eebc40f2b3935819584a20187… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 14 16:17:02 2013 +0100 mshtml: Added IHTMLSelectElement::multiple property implementation. --- dlls/mshtml/htmlselect.c | 21 +++++++++++++++++---- dlls/mshtml/tests/dom.c | 25 +++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 0f1ad8c..aef0bf0 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -156,15 +156,28 @@ static HRESULT WINAPI HTMLSelectElement_get_size(IHTMLSelectElement *iface, LONG static HRESULT WINAPI HTMLSelectElement_put_multiple(IHTMLSelectElement *iface, VARIANT_BOOL v) { HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - FIXME("(%p)->(%x)\n", This, v); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%x)\n", This, v); + + nsres = nsIDOMHTMLSelectElement_SetMultiple(This->nsselect, !!v); + assert(nsres == NS_OK); + return S_OK; } static HRESULT WINAPI HTMLSelectElement_get_multiple(IHTMLSelectElement *iface, VARIANT_BOOL *p) { HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + cpp_bool val; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLSelectElement_GetMultiple(This->nsselect, &val); + assert(nsres == NS_OK); + + *p = val ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI HTMLSelectElement_put_name(IHTMLSelectElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e43c754..cf72873 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1943,6 +1943,28 @@ static void _test_select_type(unsigned line, IHTMLSelectElement *select, const c SysFreeString(type); } +#define test_select_multiple(s,t) _test_select_multiple(__LINE__,s,t) +static void _test_select_multiple(unsigned line, IHTMLSelectElement *select, VARIANT_BOOL exmultiple) +{ + VARIANT_BOOL b = 100; + HRESULT hres; + + hres = IHTMLSelectElement_get_multiple(select, &b); + ok_(__FILE__,line) (hres == S_OK, "get_multiple failed: %08x\n", hres); + ok_(__FILE__,line) (b == exmultiple, "multiple=%x, expected %x\n", b, exmultiple); +} + +#define test_select_set_multiple(s,v) _test_select_set_multiple(__LINE__,s,v) +static void _test_select_set_multiple(unsigned line, IHTMLSelectElement *select, VARIANT_BOOL val) +{ + HRESULT hres; + + hres = IHTMLSelectElement_put_multiple(select, val); + ok_(__FILE__,line) (hres == S_OK, "put_multiple failed: %08x\n", hres); + + _test_select_multiple(line, select, val); +} + #define test_range_text(r,t) _test_range_text(__LINE__,r,t) static void _test_range_text(unsigned line, IHTMLTxtRange *range, const char *extext) { @@ -4212,6 +4234,9 @@ static void test_select_elem(IHTMLSelectElement *select) ok(iface_cmp((IUnknown*)disp, (IUnknown*)disp2), "disp != disp2\n"); IDispatch_Release(disp2); IDispatch_Release(disp); + + test_select_multiple(select, VARIANT_FALSE); + test_select_set_multiple(select, VARIANT_TRUE); } static void test_form_item(IHTMLElement *elem)

1 0

Nikolay Sivov : include: Added IShellDispatch3,4,5 definitions.
by Alexandre Julliard 14 Nov '13

14 Nov '13

Module: wine Branch: master Commit: fe5a27ae9fd29729ffadf077fb1b07ec68a87109 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe5a27ae9fd29729ffadf077f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 13 22:49:34 2013 +0400 include: Added IShellDispatch3,4,5 definitions. --- include/shldisp.idl | 41 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 40 insertions(+), 1 deletions(-) diff --git a/include/shldisp.idl b/include/shldisp.idl index 3c300db..65b67ac 100644 --- a/include/shldisp.idl +++ b/include/shldisp.idl @@ -457,7 +457,7 @@ interface IShellDispatch : IDispatch uuid(a4c6892c-3ba9-11d2-9dea-00c04fb16162), oleautomation, hidden, - dual, + dual ] interface IShellDispatch2 : IShellDispatch { @@ -474,6 +474,45 @@ interface IShellDispatch2 : IShellDispatch } [ + object, + uuid(177160ca-bb5a-411c-841d-bd38facdeaa0), + oleautomation, + hidden, + dual +] +interface IShellDispatch3 : IShellDispatch2 +{ + HRESULT AddToRecent([in] VARIANT file, [in, optional] BSTR category); +} + +[ + object, + uuid(efd84b2d-4bcf-4298-be25-eb542a59fbda), + oleautomation, + hidden, + dual +] +interface IShellDispatch4 : IShellDispatch3 +{ + HRESULT WindowsSecurity(); + HRESULT ToggleDesktop(); + HRESULT ExplorerPolicy([in] BSTR policy, [out, retval] VARIANT *value); + HRESULT GetSetting([in] long setting, [out,retval] VARIANT_BOOL *result); +} + +[ + object, + uuid(866738b9-6cf2-4de8-8767-f794ebe74f4e), + oleautomation, + hidden, + dual +] +interface IShellDispatch5 : IShellDispatch4 +{ + HRESULT WindowSwitcher(); +} + +[ uuid(13709620-c279-11ce-a49e-444553540000) ] coclass Shell

1 0

Nikolay Sivov : shell32: Update to IShellDispatch5.
by Alexandre Julliard 14 Nov '13

14 Nov '13

Module: wine Branch: master Commit: 7b0c231f8e1199154b138225b738e752fd37305c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b0c231f8e1199154b138225b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 13 22:50:01 2013 +0400 shell32: Update to IShellDispatch5. --- dlls/shell32/shelldispatch.c | 159 +++++++++++++++++++++++++++--------------- 1 files changed, 102 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b0c231f8e1199154b138…

1 0

André Hentschel : crypt32/tests: Fix tests for win8.
by Alexandre Julliard 14 Nov '13

14 Nov '13

Module: wine Branch: master Commit: b296846c00642fc147eec90694869b9874bfc75f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b296846c00642fc147eec9069… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 13 22:08:17 2013 +0100 crypt32/tests: Fix tests for win8. --- dlls/crypt32/tests/encode.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 5d1b10d..79df078 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -1003,7 +1003,8 @@ static void compareNameValues(const CERT_NAME_VALUE *expected, ok(got->dwValueType == expected->dwValueType, "Expected string type %d, got %d\n", expected->dwValueType, got->dwValueType); - ok(got->Value.cbData == expected->Value.cbData, + ok(got->Value.cbData == expected->Value.cbData || + got->Value.cbData == expected->Value.cbData - sizeof(WCHAR) /* Win8 */, "String type %d: unexpected data size, got %d, expected %d\n", expected->dwValueType, got->Value.cbData, expected->Value.cbData); if (got->Value.cbData && got->Value.pbData) @@ -4581,7 +4582,8 @@ static void test_decodeCRLToBeSigned(DWORD dwEncoding) v1CRLWithIssuerAndEmptyEntry, v1CRLWithIssuerAndEmptyEntry[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret && (GetLastError() == CRYPT_E_ASN1_CORRUPT || - GetLastError() == OSS_DATA_ERROR /* Win9x */), + GetLastError() == OSS_DATA_ERROR /* Win9x */ || + GetLastError() == CRYPT_E_BAD_ENCODE /* Win8 */), "Expected CRYPT_E_ASN1_CORRUPT or OSS_DATA_ERROR, got %08x\n", GetLastError()); /* with a real CRL entry */

1 0

André Hentschel : ntdll/tests: Mark win8 behaviour as failing.
by Alexandre Julliard 14 Nov '13

14 Nov '13

Module: wine Branch: master Commit: 6c140786e72cab5639bc26086508a19d263b98ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c140786e72cab5639bc26086… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 13 22:08:29 2013 +0100 ntdll/tests: Mark win8 behaviour as failing. --- dlls/ntdll/tests/path.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 442dd82..cc7259e 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -102,8 +102,8 @@ static void test_RtlIsDosDeviceName_U(void) static const struct test tests[] = { - { "\\\\.\\CON", 8, 6 }, - { "\\\\.\\con", 8, 6 }, + { "\\\\.\\CON", 8, 6, TRUE }, /* fails on win8 */ + { "\\\\.\\con", 8, 6, TRUE }, /* fails on win8 */ { "\\\\.\\CON2", 0, 0 }, { "", 0, 0 }, { "\\\\foo\\nul", 0, 0 },

1 0

Frédéric Delanoy : mapi32/tests: Use BOOL type where appropriate.
by Alexandre Julliard 14 Nov '13

14 Nov '13

Module: wine Branch: master Commit: 55ddb4d997495b4f2e7c8201d33b1a6ae2046177 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55ddb4d997495b4f2e7c8201d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Nov 14 02:19:19 2013 +0100 mapi32/tests: Use BOOL type where appropriate. --- dlls/mapi32/tests/prop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mapi32/tests/prop.c b/dlls/mapi32/tests/prop.c index da0a461..a26f003 100644 --- a/dlls/mapi32/tests/prop.c +++ b/dlls/mapi32/tests/prop.c @@ -716,7 +716,7 @@ static void test_ScCountProps(void) GUID iids[4], *iid = iids; SCODE res; ULONG pt, exp, ulRet; - int success = 1; + BOOL success = TRUE; if (!pScCountProps) {

1 0

Frédéric Delanoy : winedbg: Amend parameter name in *_fetch_integer.
by Alexandre Julliard 14 Nov '13

14 Nov '13

Module: wine Branch: master Commit: baf4757c46f744188d6dbb69c69c92d33686a8b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baf4757c46f744188d6dbb69c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Nov 14 02:19:20 2013 +0100 winedbg: Amend parameter name in *_fetch_integer. --- programs/winedbg/be_arm.c | 4 ++-- programs/winedbg/be_arm64.c | 4 ++-- programs/winedbg/be_i386.c | 4 ++-- programs/winedbg/be_ppc.c | 2 +- programs/winedbg/be_x86_64.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index a86dd16..77696ad 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1845,7 +1845,7 @@ static int be_arm_adjust_pc_for_break(CONTEXT* ctx, BOOL way) } static int be_arm_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, - unsigned ext_sign, LONGLONG* ret) + unsigned is_signed, LONGLONG* ret) { if (size != 1 && size != 2 && size != 4 && size != 8) return FALSE; @@ -1856,7 +1856,7 @@ static int be_arm_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, if (!memory_read_value(lvalue, size, ret)) return FALSE; /* propagate sign information */ - if (ext_sign && size < 8 && (*ret >> (size * 8 - 1)) != 0) + if (is_signed && size < 8 && (*ret >> (size * 8 - 1)) != 0) { ULONGLONG neg = -1; *ret |= neg << (size * 8); diff --git a/programs/winedbg/be_arm64.c b/programs/winedbg/be_arm64.c index d0cb3bd..4330267 100644 --- a/programs/winedbg/be_arm64.c +++ b/programs/winedbg/be_arm64.c @@ -230,7 +230,7 @@ static int be_arm64_adjust_pc_for_break(CONTEXT* ctx, BOOL way) } static int be_arm64_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, - unsigned ext_sign, LONGLONG* ret) + unsigned is_signed, LONGLONG* ret) { if (size != 1 && size != 2 && size != 4 && size != 8) return FALSE; @@ -241,7 +241,7 @@ static int be_arm64_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size if (!memory_read_value(lvalue, size, ret)) return FALSE; /* propagate sign information */ - if (ext_sign && size < 8 && (*ret >> (size * 8 - 1)) != 0) + if (is_signed && size < 8 && (*ret >> (size * 8 - 1)) != 0) { ULONGLONG neg = -1; *ret |= neg << (size * 8); diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 15c8329..ca1ae5c 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -737,7 +737,7 @@ static int be_i386_adjust_pc_for_break(CONTEXT* ctx, BOOL way) } static int be_i386_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, - unsigned ext_sign, LONGLONG* ret) + unsigned is_signed, LONGLONG* ret) { if (size != 1 && size != 2 && size != 4 && size != 8) return FALSE; @@ -748,7 +748,7 @@ static int be_i386_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, if (!memory_read_value(lvalue, size, ret)) return FALSE; /* propagate sign information */ - if (ext_sign && size < 8 && (*ret >> (size * 8 - 1)) != 0) + if (is_signed && size < 8 && (*ret >> (size * 8 - 1)) != 0) { ULONGLONG neg = -1; *ret |= neg << (size * 8); diff --git a/programs/winedbg/be_ppc.c b/programs/winedbg/be_ppc.c index c61e264..0f6115a 100644 --- a/programs/winedbg/be_ppc.c +++ b/programs/winedbg/be_ppc.c @@ -160,7 +160,7 @@ static int be_ppc_adjust_pc_for_break(CONTEXT* ctx, BOOL way) } static int be_ppc_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, - unsigned ext_sign, LONGLONG* ret) + unsigned is_signed, LONGLONG* ret) { dbg_printf("not done\n"); return FALSE; diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index aa3a4b9..aedf3a3 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -600,7 +600,7 @@ static int be_x86_64_adjust_pc_for_break(CONTEXT* ctx, BOOL way) } static int be_x86_64_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, - unsigned ext_sign, LONGLONG* ret) + unsigned is_signed, LONGLONG* ret) { if (size != 1 && size != 2 && size != 4 && size != 8 && size != 16) return FALSE; @@ -612,7 +612,7 @@ static int be_x86_64_fetch_integer(const struct dbg_lvalue* lvalue, unsigned siz if (!memory_read_value(lvalue, size, ret)) return FALSE; /* propagate sign information */ - if (ext_sign && size < 16 && (*ret >> (size * 8 - 1)) != 0) + if (is_signed && size < 16 && (*ret >> (size * 8 - 1)) != 0) { ULONGLONG neg = -1; *ret |= neg << (size * 8);

1 0

Frédéric Delanoy : winedbg: Use BOOL type where appropriate.
by Alexandre Julliard 14 Nov '13

14 Nov '13

Module: wine Branch: master Commit: f23cb66db69680a2bfef4d41742de0fc2170dd6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f23cb66db69680a2bfef4d417… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Nov 14 03:53:02 2013 +0100 winedbg: Use BOOL type where appropriate. --- programs/winedbg/be_arm.c | 58 +++++++++++++++++----------------- programs/winedbg/be_arm64.c | 58 +++++++++++++++++----------------- programs/winedbg/be_cpu.h | 32 +++++++++--------- programs/winedbg/be_i386.c | 70 +++++++++++++++++++++--------------------- programs/winedbg/be_ppc.c | 60 ++++++++++++++++++------------------ programs/winedbg/be_x86_64.c | 66 ++++++++++++++++++++-------------------- programs/winedbg/memory.c | 4 +- 7 files changed, 174 insertions(+), 174 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f23cb66db69680a2bfef4…

1 0

Lucas Zawacki : Portuguese translation for Wine 1.7.6
by Jeremy Newman 14 Nov '13

14 Nov '13

Module: website Branch: master Commit: ecb23d47fc3e49fd3b44b98521c9a0975861106a URL: http://source.winehq.org/git/website.git/?a=commit;h=ecb23d47fc3e49fd3b44b9… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue Nov 12 22:14:26 2013 -0200 Portuguese translation for Wine 1.7.6 --- news/pt/2013110801.xml | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/news/pt/2013110801.xml b/news/pt/2013110801.xml new file mode 100644 index 0000000..9856037 --- /dev/null +++ b/news/pt/2013110801.xml @@ -0,0 +1,14 @@ +<news> +<date>8 de Novembro de 2013</date> +<title>Wine 1.7.6 lançado</title> +<body> + A versão de desenvolvimento 1.7.6 já está disponível agora. + <a href="{$root}/announce/1.7.6">Novidades</a> desta versão: +<ul> + <li>Reescrita do algoritmo BiDi para suporte completo a Unicode 6.3.</li> + <li>Suporte ao Video Mixing Renderer versão 7.</li> + <li>Melhor manipulação de redimensionamento de janelas no driver de Mac.</li> + <li>Várias correções de bugs.</li> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.6.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e irão aparecer em breve em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

Jacek Caban : vbscript: Store variables in declaration order.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: f3e1f7002dbbfa73724cd57b2e86e9864ec71e13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3e1f7002dbbfa73724cd57b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 13 16:29:05 2013 +0100 vbscript: Store variables in declaration order. --- dlls/vbscript/compile.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index ccf7700..7353c22 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -54,6 +54,7 @@ typedef struct { unsigned prop_end_label; dim_decl_t *dim_decls; + dim_decl_t *dim_decls_tail; dynamic_var_t *global_vars; const_decl_t *const_decls; @@ -945,8 +946,11 @@ static HRESULT compile_dim_statement(compile_ctx_t *ctx, dim_statement_t *stat) dim_decl = dim_decl->next; } - dim_decl->next = ctx->dim_decls; - ctx->dim_decls = stat->dim_decls; + if(ctx->dim_decls_tail) + ctx->dim_decls_tail->next = stat->dim_decls; + else + ctx->dim_decls = stat->dim_decls; + ctx->dim_decls_tail = dim_decl; return S_OK; } @@ -1239,7 +1243,7 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f } ctx->func = func; - ctx->dim_decls = NULL; + ctx->dim_decls = ctx->dim_decls_tail = NULL; ctx->const_decls = NULL; hres = compile_statement(ctx, NULL, stat); ctx->func = NULL; @@ -1668,7 +1672,6 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli ctx.funcs = NULL; ctx.func_decls = NULL; ctx.global_vars = NULL; - ctx.dim_decls = NULL; ctx.classes = NULL; ctx.labels = NULL; ctx.global_consts = NULL;

1 0