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

Alexandre Julliard : Wine release 1.7.24
by Alexandre Julliard Aug. 8, 2014

Aug. 8, 2014

Module: website Branch: master Commit: dab285c0010d9dfc401872682c24354eb09ed955 URL: http://source.winehq.org/git/website.git/?a=commit;h=dab285c0010d9dfc401872… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 8 22:27:18 2014 +0200 Wine release 1.7.24 --- news/en/2014080801.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2014080801.xml b/news/en/2014080801.xml new file mode 100644 index 0000000..72bbcb4 --- /dev/null +++ b/news/en/2014080801.xml @@ -0,0 +1,15 @@ +<news> +<date>August 8, 2014</date> +<title>Wine 1.7.24 Released</title> +<body> + The Wine development release 1.7.24 is now available. + <a href="{$root}/announce/1.7.24">What's new</a> in this release: +<ul> + <li>Beginning of some DirectWrite classes implementation.</li> + <li>Initial wrapper dll for the packet capture library.</li> + <li>Some crypto improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.24.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.7.24 : Alexandre Julliard : Release 1.7.24
by Alexandre Julliard Aug. 8, 2014

Aug. 8, 2014

Module: wine Branch: refs/tags/wine-1.7.24 Tag: d8535ee782c2606414449bd78e21c590d196ac9e URL: http://source.winehq.org/git/wine.git/?a=tag;h=d8535ee782c2606414449bd78e21… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 8 22:19:29 2014 +0200 Release 1.7.24

1 0

Alexandre Julliard : Release 1.7.24.
by Alexandre Julliard Aug. 8, 2014

Aug. 8, 2014

Module: wine Branch: master Commit: 09311834bb9a34b99ee86663298a30a31c13d2a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09311834bb9a34b99ee866632… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 8 22:19:29 2014 +0200 Release 1.7.24. --- ANNOUNCE | 438 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +-- 4 files changed, 211 insertions(+), 250 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=09311834bb9a34b99ee86…

1 0

Zhenbo Li : mshtml: Added IHTMLStyle:: textTransform property implementation.
by Alexandre Julliard Aug. 8, 2014

Aug. 8, 2014

Module: wine Branch: master Commit: b9f9a358e5fe904a5ea2c181590cb39a7a9dd492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9f9a358e5fe904a5ea2c1815… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Thu Jul 31 12:22:25 2014 +0800 mshtml: Added IHTMLStyle:: textTransform property implementation. --- dlls/mshtml/htmlstyle.c | 15 +++++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 16 ++++++++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 3ac9727..580b73c 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -172,6 +172,8 @@ static const WCHAR attrTextDecoration[] = {'t','e','x','t','-','d','e','c','o','r','a','t','i','o','n',0}; static const WCHAR attrTextIndent[] = {'t','e','x','t','-','i','n','d','e','n','t',0}; +static const WCHAR attrTextTransform[] = + {'t','e','x','t','-','t','r','a','n','s','f','o','r','m',0}; static const WCHAR attrTop[] = {'t','o','p',0}; static const WCHAR attrVerticalAlign[] = @@ -266,6 +268,7 @@ static const style_tbl_entry_t style_tbl[] = { {attrTextAlign, DISPID_IHTMLSTYLE_TEXTALIGN}, {attrTextDecoration, DISPID_IHTMLSTYLE_TEXTDECORATION}, {attrTextIndent, DISPID_IHTMLSTYLE_TEXTINDENT}, + {attrTextTransform, DISPID_IHTMLSTYLE_TEXTTRANSFORM}, {attrTop, DISPID_IHTMLSTYLE_TOP}, {attrVerticalAlign, DISPID_IHTMLSTYLE_VERTICALALIGN}, {attrVisibility, DISPID_IHTMLSTYLE_VISIBILITY}, @@ -1450,15 +1453,19 @@ static HRESULT WINAPI HTMLStyle_get_verticalAlign(IHTMLStyle *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle_put_textTransform(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_style_attr(This, STYLEID_TEXT_TRANSFORM, v, 0); } static HRESULT WINAPI HTMLStyle_get_textTransform(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_style_attr(This, STYLEID_TEXT_TRANSFORM, p); } static HRESULT WINAPI HTMLStyle_put_textAlign(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 030d8a1..6edde7b 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -101,6 +101,7 @@ typedef enum { STYLEID_TEXT_ALIGN, STYLEID_TEXT_DECORATION, STYLEID_TEXT_INDENT, + STYLEID_TEXT_TRANSFORM, STYLEID_TOP, STYLEID_VERTICAL_ALIGN, STYLEID_VISIBILITY, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 3c68f61..62a6336 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1249,6 +1249,22 @@ static void test_body_style(IHTMLStyle *style) SysFreeString(str); str = (void*)0xdeadbeef; + hres = IHTMLStyle_get_textTransform(style, &str); + ok(hres == S_OK, "get_textTransform failed: %08x\n", hres); + ok(!str, "textTransform != NULL\n"); + + str = a2bstr("lowercase"); + hres = IHTMLStyle_put_textTransform(style, str); + ok(hres == S_OK, "put_textTransform failed: %08x\n", hres); + SysFreeString(str); + + str = NULL; + hres = IHTMLStyle_get_textTransform(style, &str); + ok(hres == S_OK, "get_textTransform failed: %08x\n", hres); + ok(!strcmp_wa(str, "lowercase"), "textTransform = %s\n", wine_dbgstr_w(V_BSTR(&v))); + SysFreeString(str); + + str = (void*)0xdeadbeef; hres = IHTMLStyle_get_filter(style, &str); ok(hres == S_OK, "get_filter failed: %08x\n", hres); ok(!str, "filter != NULL\n");

1 0

Shuai Meng : vbscript: Inplemented ScriptEngineBuildVersion.
by Alexandre Julliard Aug. 8, 2014

Aug. 8, 2014

Module: wine Branch: master Commit: f3f0972ddb0ead5435fc6bd7c779f76790a54792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3f0972ddb0ead5435fc6bd7c… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Sat Aug 9 00:49:05 2014 +0800 vbscript: Inplemented ScriptEngineBuildVersion. --- dlls/vbscript/global.c | 12 ++++++++++-- dlls/vbscript/tests/api.vbs | 2 ++ dlls/vbscript/vbscript.h | 2 ++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 8f1a4b9..2aae380 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1684,8 +1684,16 @@ static HRESULT Global_ScriptEngineMinorVersion(vbdisp_t *This, VARIANT *arg, uns static HRESULT Global_ScriptEngineBuildVersion(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 0); + + if(res) { + V_VT(res) = VT_I4; + V_I4(res) = VBSCRIPT_BUILD_VERSION; + } + + return S_OK; } static HRESULT Global_FormatNumber(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 77c6852..73a1c2d 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -987,4 +987,6 @@ Call testAbsError(-4, 0, 0) Call ok(ScriptEngine = "VBScript", "Is scriptengine not VBScript?") Call ok(getVT(ScriptEngine) = "VT_BSTR", "getVT(ScriptEngine) = " & getVT(ScriptEngine)) +Call ok(getVT(ScriptEngineBuildVersion) = "VT_I4", "getVT(ScriptEngineBuildVersion) = " & getVT(ScriptEngineBuildVersion)) + Call reportSuccess() diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index ab1257f..547ffab 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -461,3 +461,5 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) return ret; } + +#define VBSCRIPT_BUILD_VERSION 16978

1 0

Shuai Meng : vbscript: Implemented ScriptEngineMinorVersion.
by Alexandre Julliard Aug. 8, 2014

Aug. 8, 2014

Module: wine Branch: master Commit: 7a768ff1a96d82ccc3b73e7de86b7c7e13beab09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a768ff1a96d82ccc3b73e7de… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Sat Aug 9 00:52:28 2014 +0800 vbscript: Implemented ScriptEngineMinorVersion. --- dlls/vbscript/global.c | 12 ++++++++++-- dlls/vbscript/tests/api.vbs | 2 ++ dlls/vbscript/vbscript.h | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index b0f7b72..933ec08 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1686,8 +1686,16 @@ static HRESULT Global_ScriptEngineMajorVersion(vbdisp_t *This, VARIANT *arg, uns static HRESULT Global_ScriptEngineMinorVersion(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 0); + + if(res) { + V_VT(res) = VT_I4; + V_I4(res) = VBSCRIPT_MINOR_VERSION; + } + + return S_OK; } static HRESULT Global_ScriptEngineBuildVersion(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index f821706..c52422f 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -991,4 +991,6 @@ Call ok(getVT(ScriptEngineBuildVersion) = "VT_I4", "getVT(ScriptEngineBuildVersi Call ok(getVT(ScriptEngineMajorVersion) = "VT_I4", "getVT(ScriptEngineMajorVersion) = " & getVT(ScriptEngineMajorVersion)) +Call ok(getVT(ScriptEngineMinorVersion) = "VT_I4", "getVT(ScriptEngineMinorVersion) = " & getVT(ScriptEngineMinorVersion)) + Call reportSuccess() diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 639e104..d21e80a 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -464,3 +464,4 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) #define VBSCRIPT_BUILD_VERSION 16978 #define VBSCRIPT_MAJOR_VERSION 5 +#define VBSCRIPT_MINOR_VERSION 8

1 0

Shuai Meng : vbscript: Implemented ScriptEngineMajorVersion.
by Alexandre Julliard Aug. 8, 2014

Aug. 8, 2014

Module: wine Branch: master Commit: 9c92e96cf0469f40985ba3086f7b0fd847c720d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c92e96cf0469f40985ba3086… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Sat Aug 9 00:49:52 2014 +0800 vbscript: Implemented ScriptEngineMajorVersion. --- dlls/vbscript/global.c | 12 ++++++++++-- dlls/vbscript/tests/api.vbs | 2 ++ dlls/vbscript/vbscript.h | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 2aae380..b0f7b72 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1672,8 +1672,16 @@ static HRESULT Global_ScriptEngine(vbdisp_t *This, VARIANT *arg, unsigned args_c static HRESULT Global_ScriptEngineMajorVersion(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 0); + + if(res) { + V_VT(res) = VT_I4; + V_I4(res) = VBSCRIPT_MAJOR_VERSION; + } + + return S_OK; } static HRESULT Global_ScriptEngineMinorVersion(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 73a1c2d..f821706 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -989,4 +989,6 @@ Call ok(getVT(ScriptEngine) = "VT_BSTR", "getVT(ScriptEngine) = " & getVT(Script Call ok(getVT(ScriptEngineBuildVersion) = "VT_I4", "getVT(ScriptEngineBuildVersion) = " & getVT(ScriptEngineBuildVersion)) +Call ok(getVT(ScriptEngineMajorVersion) = "VT_I4", "getVT(ScriptEngineMajorVersion) = " & getVT(ScriptEngineMajorVersion)) + Call reportSuccess() diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 547ffab..639e104 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -463,3 +463,4 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) } #define VBSCRIPT_BUILD_VERSION 16978 +#define VBSCRIPT_MAJOR_VERSION 5

1 0

Shuai Meng : vbscript: Implemented ScriptEngine.
by Alexandre Julliard Aug. 8, 2014

Aug. 8, 2014

Module: wine Branch: master Commit: 4da0bcc2277622f3153cf11ebea66b355e267761 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4da0bcc2277622f3153cf11eb… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Sat Aug 9 00:47:46 2014 +0800 vbscript: Implemented ScriptEngine. --- dlls/vbscript/global.c | 7 +++++-- dlls/vbscript/tests/api.vbs | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index dc41db5..8f1a4b9 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1663,8 +1663,11 @@ static HRESULT Global_LoadPicture(vbdisp_t *This, VARIANT *arg, unsigned args_cn static HRESULT Global_ScriptEngine(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 0); + + return return_string(res, vbscriptW); } static HRESULT Global_ScriptEngineMajorVersion(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index fbf252a..77c6852 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -984,4 +984,7 @@ End Sub Call testAbsError("strings", 13, 13) Call testAbsError(-4, 0, 0) +Call ok(ScriptEngine = "VBScript", "Is scriptengine not VBScript?") +Call ok(getVT(ScriptEngine) = "VT_BSTR", "getVT(ScriptEngine) = " & getVT(ScriptEngine)) + Call reportSuccess()

1 0

Francois Gouget : testbot/WineRunBuild: Sidestep issues arising from patch files containing bad characters.
by Alexandre Julliard Aug. 8, 2014

Aug. 8, 2014

Module: tools Branch: master Commit: 92b9c277eff9546542a6d5c35251ba3fca68d573 URL: http://source.winehq.org/git/tools.git/?a=commit;h=92b9c277eff9546542a6d5c3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 8 02:58:06 2014 +0200 testbot/WineRunBuild: Sidestep issues arising from patch files containing bad characters. --- testbot/bin/WineRunBuild.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index ba6bb53..91244ad 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -288,7 +288,7 @@ my $ErrMessage; my $FileName = $Step->FileName; my $TA = $VM->GetAgent(); Debug(Elapsed($Start), " Sending '$StepDir/$FileName'\n"); -if (!$TA->SendFile("$StepDir/$FileName", "staging/$FileName", 0)) +if (!$TA->SendFile("$StepDir/$FileName", "staging/patch.diff", 0)) { $ErrMessage = $TA->GetLastError(); FatalError "Could not copy the patch to the VM: $ErrMessage\n", @@ -296,7 +296,7 @@ if (!$TA->SendFile("$StepDir/$FileName", "staging/$FileName", 0)) } my $Script = "#!/bin/sh\n" . "rm -f Build.log\n" . - "../bin/build/Build.pl $FileName " . $Step->FileType . + "../bin/build/Build.pl patch.diff " . $Step->FileType . " $BaseName 32"; $Script .= ",64"if ($Run64); $Script .= " >>Build.log 2>&1\n";

1 0

Francois Gouget : testbot: Fix the check for unknown options.
by Alexandre Julliard Aug. 8, 2014

Aug. 8, 2014

Module: tools Branch: master Commit: 7683bd570d23ae0710582c47db962dd2a214a9af URL: http://source.winehq.org/git/tools.git/?a=commit;h=7683bd570d23ae0710582c47… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 8 03:11:56 2014 +0200 testbot: Fix the check for unknown options. --- testbot/bin/RevertVM.pl | 2 +- testbot/bin/WineRunBuild.pl | 2 +- testbot/bin/WineRunReconfig.pl | 2 +- testbot/bin/WineRunTask.pl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/RevertVM.pl index 8539420..e8e7a87 100755 --- a/testbot/bin/RevertVM.pl +++ b/testbot/bin/RevertVM.pl @@ -107,7 +107,7 @@ while (@ARGV) $Usage = 0; last; } - elsif ($Arg =~ /^???/) + elsif ($Arg =~ /^-/) { Error "unknown option '$Arg'\n"; $Usage = 2; diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 4aadcbb..ba6bb53 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -176,7 +176,7 @@ while (@ARGV) $Usage = 0; last; } - elsif ($Arg =~ /^???/) + elsif ($Arg =~ /^-/) { Error "unknown option '$Arg'\n"; $Usage = 2; diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index cb66a64..3af46c9 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -177,7 +177,7 @@ while (@ARGV) $Usage = 0; last; } - elsif ($Arg =~ /^???/) + elsif ($Arg =~ /^-/) { Error "unknown option '$Arg'\n"; $Usage = 2; diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index b7f235d..d82a156 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -193,7 +193,7 @@ while (@ARGV) $Usage = 0; last; } - elsif ($Arg =~ /^???/) + elsif ($Arg =~ /^-/) { Error "unknown option '$Arg'\n"; $Usage = 2;

1 0