October 2012 - Wine-commits

Jacek Caban : vbscript: Added LTrim() implementation.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 71a4a1d43a5b50e5b68b99b16617148a44027334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71a4a1d43a5b50e5b68b99b16… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 2 10:33:50 2012 +0200 vbscript: Added LTrim() implementation. --- dlls/vbscript/global.c | 25 +++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 12 ++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index e6211b7..6db59ca 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -852,8 +852,29 @@ static HRESULT Global_UCase(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VAR static HRESULT Global_LTrim(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + BSTR str, conv_str = NULL; + WCHAR *ptr; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + if(V_VT(arg) == VT_BSTR) { + str = V_BSTR(arg); + }else { + hres = to_string(arg, &conv_str); + if(FAILED(hres)) + return hres; + str = conv_str; + } + + for(ptr = str; *ptr && isspaceW(*ptr); ptr++); + + str = SysAllocString(ptr); + SysFreeString(conv_str); + if(!str) + return E_OUTOFMEMORY; + + return return_bstr(res, str); } static HRESULT Global_RTrim(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 7553d59..b64043d 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -237,6 +237,18 @@ TestTrim "", "" TestTrim 123, "123" if isEnglishLang then TestTrim true, "True" +Sub TestLTrim(str, exstr) + Call ok(LTrim(str) = exstr, "LTrim(" & str & ") = " & LTrim(str)) +End Sub + +TestLTrim " test ", "test " +TestLTrim "test ", "test " +TestLTrim " test", "test" +TestLTrim "test", "test" +TestLTrim "", "" +TestLTrim 123, "123" +if isEnglishLang then TestLTrim true, "True" + Sub TestRound(val, exval, vt) Call ok(Round(val) = exval, "Round(" & val & ") = " & Round(val)) Call ok(getVT(Round(val)) = vt, "getVT(Round(" & val & ")) = " & getVT(Round(val)))

1 0

Jacek Caban : vbscript: Added RTrim implementation.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: ed3d0e00aeca051b648af31baa897ff9e0a90776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed3d0e00aeca051b648af31ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 2 10:34:07 2012 +0200 vbscript: Added RTrim implementation. --- dlls/vbscript/global.c | 25 +++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 12 ++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 6db59ca..e2319ae 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -879,8 +879,29 @@ static HRESULT Global_LTrim(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VAR static HRESULT Global_RTrim(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + BSTR str, conv_str = NULL; + WCHAR *ptr; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + if(V_VT(arg) == VT_BSTR) { + str = V_BSTR(arg); + }else { + hres = to_string(arg, &conv_str); + if(FAILED(hres)) + return hres; + str = conv_str; + } + + for(ptr = str+SysStringLen(str); ptr-1 > str && isspaceW(*(ptr-1)); ptr--); + + str = SysAllocStringLen(str, ptr-str); + SysFreeString(conv_str); + if(!str) + return E_OUTOFMEMORY; + + return return_bstr(res, str); } static HRESULT Global_Trim(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 b64043d..6bcded8 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -254,6 +254,18 @@ Sub TestRound(val, exval, vt) Call ok(getVT(Round(val)) = vt, "getVT(Round(" & val & ")) = " & getVT(Round(val))) End Sub +Sub TestRTrim(str, exstr) + Call ok(RTrim(str) = exstr, "RTrim(" & str & ") = " & RTrim(str)) +End Sub + +TestRTrim " test ", " test" +TestRTrim "test ", "test" +TestRTrim " test", " test" +TestRTrim "test", "test" +TestRTrim "", "" +TestRTrim 123, "123" +if isEnglishLang then TestRTrim true, "True" + TestRound 3, 3, "VT_I2" TestRound 3.3, 3, "VT_R8" TestRound 3.8, 4, "VT_R8"

1 0

Dan Kegel : vcomp: Better stub for omp_get_num_threads.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 9ba01e0246b4edc832b864b35867fa54bde3876a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ba01e0246b4edc832b864b35… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Sep 29 20:20:36 2012 -0700 vcomp: Better stub for omp_get_num_threads. --- dlls/vcomp/main.c | 6 ++++++ dlls/vcomp/vcomp.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 1e51eef..170bd43 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -35,6 +35,12 @@ int CDECL omp_get_num_procs(void) return 1; } +int CDECL omp_get_num_threads(void) +{ + TRACE("stub\n"); + return 1; +} + /* Time in seconds since "some time in the past" */ double CDECL omp_get_wtime(void) { diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index 3e02bea..e53a475 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -94,7 +94,7 @@ @ stub omp_get_max_threads @ stub omp_get_nested @ cdecl omp_get_num_procs() -@ stub omp_get_num_threads +@ cdecl omp_get_num_threads() @ stub omp_get_thread_num @ stub omp_get_wtick @ cdecl omp_get_wtime()

1 0

Dan Kegel : vcomp: Better stub for omp_set_num_threads.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 54a10eb1aa0bb0fe46a205a67de2b39eb82a17ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=54a10eb1aa0bb0fe46a205a67… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Sep 29 20:20:37 2012 -0700 vcomp: Better stub for omp_set_num_threads. --- dlls/vcomp/main.c | 5 +++++ dlls/vcomp/vcomp.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 170bd43..a369af1 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -47,6 +47,11 @@ double CDECL omp_get_wtime(void) return GetTickCount() / 1000.0; } +void CDECL omp_set_num_threads(int num_threads) +{ + TRACE("(%d): stub\n", num_threads); +} + void CDECL _vcomp_set_num_threads(int num_threads) { TRACE("(%d): stub\n", num_threads); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index e53a475..cca56f1 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -105,7 +105,7 @@ @ stub omp_set_lock @ stub omp_set_nest_lock @ stub omp_set_nested -@ stub omp_set_num_threads +@ cdecl omp_set_num_threads(long) @ stub omp_test_lock @ stub omp_test_nest_lock @ stub omp_unset_lock

1 0

Dan Kegel : vcomp: Better stub for omp_get_max_threads.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: ed23241733c5071aec3d1d51275ed478cc97f745 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed23241733c5071aec3d1d512… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Sep 29 20:20:38 2012 -0700 vcomp: Better stub for omp_get_max_threads. --- dlls/vcomp/main.c | 6 ++++++ dlls/vcomp/vcomp.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index a369af1..78c2c08 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -29,6 +29,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(vcomp); +int CDECL omp_get_max_threads(void) +{ + TRACE("stub\n"); + return 1; +} + int CDECL omp_get_num_procs(void) { TRACE("stub\n"); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index cca56f1..a29b9f9 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -91,7 +91,7 @@ @ stub omp_destroy_lock @ stub omp_destroy_nest_lock @ stub omp_get_dynamic -@ stub omp_get_max_threads +@ cdecl omp_get_max_threads() @ stub omp_get_nested @ cdecl omp_get_num_procs() @ cdecl omp_get_num_threads()

1 0

Dan Kegel : vcomp: Better stubs for omp_get_dynamic, omp_set_dynamic.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: d58ade2d4250e32eb3b96131f0fd09bdc1d4ed15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d58ade2d4250e32eb3b96131f… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Sep 29 20:20:39 2012 -0700 vcomp: Better stubs for omp_get_dynamic, omp_set_dynamic. --- dlls/vcomp/main.c | 11 +++++++++++ dlls/vcomp/vcomp.spec | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 78c2c08..1f80563 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -29,6 +29,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(vcomp); +int CDECL omp_get_dynamic(void) +{ + TRACE("stub\n"); + return 0; +} + int CDECL omp_get_max_threads(void) { TRACE("stub\n"); @@ -53,6 +59,11 @@ double CDECL omp_get_wtime(void) return GetTickCount() / 1000.0; } +void CDECL omp_set_dynamic(int val) +{ + TRACE("(%d): stub\n", val); +} + void CDECL omp_set_num_threads(int num_threads) { TRACE("(%d): stub\n", num_threads); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index a29b9f9..ce66c52 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -90,7 +90,7 @@ @ stub _vcomp_single_end @ stub omp_destroy_lock @ stub omp_destroy_nest_lock -@ stub omp_get_dynamic +@ cdecl omp_get_dynamic() @ cdecl omp_get_max_threads() @ stub omp_get_nested @ cdecl omp_get_num_procs() @@ -101,7 +101,7 @@ @ stub omp_in_parallel @ stub omp_init_lock @ stub omp_init_nest_lock -@ stub omp_set_dynamic +@ cdecl omp_set_dynamic(long) @ stub omp_set_lock @ stub omp_set_nest_lock @ stub omp_set_nested

1 0

Dan Kegel : vcomp: Better stubs for omp_get_nested, omp_set_nested.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 15b59d75c65457e72ce6f1836edc208c336a3b6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=15b59d75c65457e72ce6f1836… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Sep 29 20:20:40 2012 -0700 vcomp: Better stubs for omp_get_nested, omp_set_nested. --- dlls/vcomp/main.c | 11 +++++++++++ dlls/vcomp/vcomp.spec | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 1f80563..b758fbd 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -41,6 +41,12 @@ int CDECL omp_get_max_threads(void) return 1; } +int CDECL omp_get_nested(void) +{ + TRACE("stub\n"); + return 0; +} + int CDECL omp_get_num_procs(void) { TRACE("stub\n"); @@ -64,6 +70,11 @@ void CDECL omp_set_dynamic(int val) TRACE("(%d): stub\n", val); } +void CDECL omp_set_nested(int nested) +{ + TRACE("(%d): stub\n", nested); +} + void CDECL omp_set_num_threads(int num_threads) { TRACE("(%d): stub\n", num_threads); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index ce66c52..1b58b25 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -92,7 +92,7 @@ @ stub omp_destroy_nest_lock @ cdecl omp_get_dynamic() @ cdecl omp_get_max_threads() -@ stub omp_get_nested +@ cdecl omp_get_nested() @ cdecl omp_get_num_procs() @ cdecl omp_get_num_threads() @ stub omp_get_thread_num @@ -104,7 +104,7 @@ @ cdecl omp_set_dynamic(long) @ stub omp_set_lock @ stub omp_set_nest_lock -@ stub omp_set_nested +@ cdecl omp_set_nested(long) @ cdecl omp_set_num_threads(long) @ stub omp_test_lock @ stub omp_test_nest_lock

1 0

Dan Kegel : vcomp: Better stub for omp_get_thread_num.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: d0955b1bd610298ad546300243882be3ed20f8fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0955b1bd610298ad54630024… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Sep 29 20:20:41 2012 -0700 vcomp: Better stub for omp_get_thread_num. --- dlls/vcomp/main.c | 6 ++++++ dlls/vcomp/vcomp.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index b758fbd..5faf0a1 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -59,6 +59,12 @@ int CDECL omp_get_num_threads(void) return 1; } +int CDECL omp_get_thread_num(void) +{ + TRACE("stub\n"); + return 0; +} + /* Time in seconds since "some time in the past" */ double CDECL omp_get_wtime(void) { diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index 1b58b25..41b57fb 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -95,7 +95,7 @@ @ cdecl omp_get_nested() @ cdecl omp_get_num_procs() @ cdecl omp_get_num_threads() -@ stub omp_get_thread_num +@ cdecl omp_get_thread_num() @ stub omp_get_wtick @ cdecl omp_get_wtime() @ stub omp_in_parallel

1 0

Bruno Jesus : ws2_32: Fix TRACE format in WS_getsockname.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: a82278c3490969c088cf48a345f263f8c30d300b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a82278c3490969c088cf48a34… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Oct 1 00:30:06 2012 -0300 ws2_32: Fix TRACE format in WS_getsockname. --- dlls/ws2_32/socket.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ca5d0e4..7b86ca4 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2444,7 +2444,7 @@ int WINAPI WS_getsockname(SOCKET s, struct WS_sockaddr *name, int *namelen) int fd; int res; - TRACE("socket: %04lx, ptr %p, len %8x\n", s, name, *namelen); + TRACE("socket: %04lx, ptr %p, len %08x\n", s, name, namelen?*namelen:0); /* Check if what we've received is valid. Should we use IsBadReadPtr? */ if( (name == NULL) || (namelen == NULL) )

1 0

Nikolay Sivov : mshtml: Implement IHTMLFrameBase_put_name().
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 1075118cdbdc261011bf3af46dd21101f0f42ace URL: http://source.winehq.org/git/wine.git/?a=commit;h=1075118cdbdc261011bf3af46… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 1 15:06:32 2012 +0400 mshtml: Implement IHTMLFrameBase_put_name(). --- dlls/mshtml/htmlframebase.c | 24 ++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 25 ++++++++++++++++++++++++- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index 55a56db..acb493a 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -148,8 +148,28 @@ static HRESULT WINAPI HTMLFrameBase_get_src(IHTMLFrameBase *iface, BSTR *p) static HRESULT WINAPI HTMLFrameBase_put_name(IHTMLFrameBase *iface, BSTR v) { HTMLFrameBase *This = impl_from_IHTMLFrameBase(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString name_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + if(!This->nsframe && !This->nsiframe) { + ERR("No attached ns frame object\n"); + return E_UNEXPECTED; + } + + nsAString_InitDepend(&name_str, v); + if(This->nsframe) + nsres = nsIDOMHTMLFrameElement_SetName(This->nsframe, &name_str); + else + nsres = nsIDOMHTMLIFrameElement_SetName(This->nsiframe, &name_str); + nsAString_Finish(&name_str); + if(NS_FAILED(nsres)) { + ERR("SetName failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLFrameBase_get_name(IHTMLFrameBase *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d6fbd64..08ea83e7 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4227,6 +4227,25 @@ static void _test_framebase_name(unsigned line, IHTMLElement *elem, const char * IHTMLFrameBase_Release(fbase); } +#define test_framebase_put_name(a,b) _test_framebase_put_name(__LINE__,a,b) +static void _test_framebase_put_name(unsigned line, IHTMLElement *elem, const char *name) +{ + IHTMLFrameBase *fbase; + HRESULT hres; + BSTR str; + + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLFrameBase, (void**)&fbase); + ok(hres == S_OK, "Could not get IHTMLFrameBase interface: 0x%08x\n", hres); + + str = name ? a2bstr(name) : NULL; + hres = IHTMLFrameBase_put_name(fbase, str); + ok_(__FILE__,line)(hres == S_OK, "put_name failed: %08x\n", hres); + SysFreeString(str); + + _test_framebase_name(line, elem, name); + IHTMLFrameBase_Release(fbase); +} + static void test_framebase(IUnknown *unk) { IHTMLFrameBase *fbase; @@ -6273,12 +6292,16 @@ static void test_frameset(IHTMLDocument2 *doc) test_framebase((IUnknown*)elem); test_framebase_name(elem, "nm1"); - + test_framebase_put_name(elem, "frame name"); + test_framebase_put_name(elem, NULL); + test_framebase_put_name(elem, "nm1"); IHTMLElement_Release(elem); /* get_name with no name attr */ elem = get_doc_elem_by_id(doc, "fr3"); test_framebase_name(elem, NULL); + test_framebase_put_name(elem, "frame name"); + test_framebase_put_name(elem, NULL); IHTMLElement_Release(elem); IHTMLWindow2_Release(window);

1 0