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

André Hentschel : wpcap: Implement pcap_list_datalinks.
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: d6c4ed0878d497756d75c9b8c4151ade7039f1b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6c4ed0878d497756d75c9b8c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 18 23:56:15 2014 +0200 wpcap: Implement pcap_list_datalinks. --- dlls/wpcap/wpcap.c | 6 ++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 19f79e3..5e94c08 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -134,6 +134,12 @@ const char* CDECL wine_pcap_lib_version(void) return ret; } +int CDECL wine_pcap_list_datalinks(pcap_t *p, int **dlt_buffer) +{ + TRACE("(%p %p)\n", p, dlt_buffer); + return pcap_list_datalinks(p, dlt_buffer); +} + char* CDECL wine_pcap_lookupdev(char *errbuf) { TRACE("(%p)\n", errbuf); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index de90658..2fc8b4d 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -34,7 +34,7 @@ @ stub pcap_getnonblock @ stub pcap_is_swapped @ cdecl pcap_lib_version() wine_pcap_lib_version -@ stub pcap_list_datalinks +@ cdecl pcap_list_datalinks(ptr ptr) wine_pcap_list_datalinks @ stub pcap_live_dump @ stub pcap_live_dump_ended @ cdecl pcap_lookupdev(ptr) wine_pcap_lookupdev

1 0

André Hentschel : wpcap: Implement pcap_datalink_val_to_description.
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: e227f7d84d8b9a51b20dd45cd9329bc7a9497b25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e227f7d84d8b9a51b20dd45cd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 18 23:56:28 2014 +0200 wpcap: Implement pcap_datalink_val_to_description. --- dlls/wpcap/wpcap.c | 6 ++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 5e94c08..062ddb2 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -57,6 +57,12 @@ int CDECL wine_pcap_datalink_name_to_val(const char *name) return pcap_datalink_name_to_val(name); } +const char* CDECL wine_pcap_datalink_val_to_description(int dlt) +{ + TRACE("(%i)\n", dlt); + return pcap_datalink_val_to_description(dlt); +} + const char* CDECL wine_pcap_datalink_val_to_name(int dlt) { TRACE("(%i)\n", dlt); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 2fc8b4d..55e50e2 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -13,7 +13,7 @@ @ stub pcap_createsrcstr @ cdecl pcap_datalink(ptr) wine_pcap_datalink @ cdecl pcap_datalink_name_to_val(str) wine_pcap_datalink_name_to_val -@ stub pcap_datalink_val_to_description +@ cdecl pcap_datalink_val_to_description(long) wine_pcap_datalink_val_to_description @ cdecl pcap_datalink_val_to_name(long) wine_pcap_datalink_val_to_name @ cdecl pcap_dispatch(ptr long ptr ptr) wine_pcap_dispatch @ stub pcap_dump

1 0

André Hentschel : wpcap: Implement pcap_set_datalink.
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: e5e8760591e5eba79618dc2e090128d8eaefd6a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e8760591e5eba79618dc2e0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 18 23:57:01 2014 +0200 wpcap: Implement pcap_set_datalink. --- dlls/wpcap/wpcap.c | 6 ++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 062ddb2..b4ece2b 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -196,6 +196,12 @@ pcap_t* CDECL wine_pcap_open_live(const char *source, int snaplen, int promisc, return pcap_open_live(source, snaplen, promisc, to_ms, errbuf); } +int CDECL wine_pcap_set_datalink(pcap_t *p, int dlt) +{ + TRACE("(%p %i)\n", p, dlt); + return pcap_set_datalink(p, dlt); +} + int CDECL wine_pcap_setbuff(pcap_t * p, int dim) { FIXME("(%p %i) stub\n", p, dim); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 55e50e2..9694949 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -63,7 +63,7 @@ @ stub pcap_sendqueue_destroy @ stub pcap_sendqueue_queue @ stub pcap_sendqueue_transmit -@ stub pcap_set_datalink +@ cdecl pcap_set_datalink(ptr long) wine_pcap_set_datalink @ cdecl pcap_setbuff(ptr long) wine_pcap_setbuff @ cdecl pcap_setfilter(ptr ptr) wine_pcap_setfilter @ stub pcap_setmintocopy

1 0

André Hentschel : wpcap: Implement pcap_get_airpcap_handle.
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: 2b9cade4b857efe97f8a6e1c2e428ebd0eb6e085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b9cade4b857efe97f8a6e1c2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 18 23:57:52 2014 +0200 wpcap: Implement pcap_get_airpcap_handle. --- dlls/wpcap/wpcap.c | 7 +++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index b4ece2b..fb36326 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -127,6 +127,13 @@ void CDECL wine_pcap_freecode(struct bpf_program *fp) return pcap_freecode(fp); } +typedef struct _AirpcapHandle *PAirpcapHandle; +PAirpcapHandle CDECL wine_pcap_get_airpcap_handle(pcap_t *p) +{ + TRACE("(%p)\n", p); + return NULL; +} + char* CDECL wine_pcap_geterr(pcap_t *p) { TRACE("(%p)\n", p); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 9694949..718d0fe 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -28,7 +28,7 @@ @ stub pcap_findalldevs_ex @ cdecl pcap_freealldevs(ptr) wine_pcap_freealldevs @ cdecl pcap_freecode(ptr) wine_pcap_freecode -@ stub pcap_get_airpcap_handle +@ cdecl pcap_get_airpcap_handle(ptr) wine_pcap_get_airpcap_handle @ cdecl pcap_geterr(ptr) wine_pcap_geterr @ stub pcap_getevent @ stub pcap_getnonblock

1 0

Zhenbo Li : mshtml: Added IHTMLStyle2:: tableLayout property implementation.
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: 90014d154fc8523149f376405ad3191fe2f8df6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=90014d154fc8523149f376405… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon Aug 18 23:30:46 2014 +0800 mshtml: Added IHTMLStyle2::tableLayout property implementation. --- dlls/mshtml/htmlstyle.c | 3 +++ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/htmlstyle2.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 12 ++++++++++++ 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 1dca647..420c687 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -168,6 +168,8 @@ static const WCHAR attrPosition[] = {'p','o','s','i','t','i','o','n',0}; static const WCHAR attrRight[] = {'r','i','g','h','t',0}; +static const WCHAR attrTableLayout[] = + {'t','a','b','l','e','-','l','a','y','o','u','t',0}; static const WCHAR attrTextAlign[] = {'t','e','x','t','-','a','l','i','g','n',0}; static const WCHAR attrTextDecoration[] = @@ -268,6 +270,7 @@ static const style_tbl_entry_t style_tbl[] = { {attrPageBreakBefore, DISPID_IHTMLSTYLE_PAGEBREAKBEFORE}, {attrPosition, DISPID_IHTMLSTYLE2_POSITION}, {attrRight, DISPID_IHTMLSTYLE2_RIGHT}, + {attrTableLayout, DISPID_IHTMLSTYLE2_TABLELAYOUT}, {attrTextAlign, DISPID_IHTMLSTYLE_TEXTALIGN}, {attrTextDecoration, DISPID_IHTMLSTYLE_TEXTDECORATION}, {attrTextIndent, DISPID_IHTMLSTYLE_TEXTINDENT}, diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 813c782..c9f2156 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -99,6 +99,7 @@ typedef enum { STYLEID_PAGE_BREAK_BEFORE, STYLEID_POSITION, STYLEID_RIGHT, + STYLEID_TABLE_LAYOUT, STYLEID_TEXT_ALIGN, STYLEID_TEXT_DECORATION, STYLEID_TEXT_INDENT, diff --git a/dlls/mshtml/htmlstyle2.c b/dlls/mshtml/htmlstyle2.c index b2740d5..15f941f 100644 --- a/dlls/mshtml/htmlstyle2.c +++ b/dlls/mshtml/htmlstyle2.c @@ -92,15 +92,19 @@ static HRESULT WINAPI HTMLStyle2_Invoke(IHTMLStyle2 *iface, DISPID dispIdMember, static HRESULT WINAPI HTMLStyle2_put_tableLayout(IHTMLStyle2 *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_nsstyle_attr(This->nsstyle, STYLEID_TABLE_LAYOUT, v, 0); } static HRESULT WINAPI HTMLStyle2_get_tableLayout(IHTMLStyle2 *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr(This->nsstyle, STYLEID_TABLE_LAYOUT, p, 0); } static HRESULT WINAPI HTMLStyle2_put_borderCollapse(IHTMLStyle2 *iface, BSTR v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index a454eff..f279fb3 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -421,6 +421,18 @@ static void test_style2(IHTMLStyle2 *style2) hres = IHTMLStyle2_get_overflowY(style2, &str); ok(hres == S_OK, "get_overflowY failed: %08x\n", hres); ok(!strcmp_wa(str, "hidden"), "overflowX = %s\n", wine_dbgstr_w(str)); + + /* tableLayout */ + str = a2bstr("fixed"); + hres = IHTMLStyle2_put_tableLayout(style2, str); + ok(hres == S_OK, "put_tableLayout failed: %08x\n", hres); + SysFreeString(str); + + str = (void*)0xdeadbeef; + hres = IHTMLStyle2_get_tableLayout(style2, &str); + ok(hres == S_OK, "get_tableLayout failed: %08x\n", hres); + ok(!strcmp_wa(str, "fixed"), "tableLayout = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); } static void test_style3(IHTMLStyle3 *style3)

1 0

Zhenbo Li : mshtml: Added IHTMLStyle:: backgroundAttachment property implementation.
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: 87e1172953e4ffcf24f59bbd0a6d6521c6cf15f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87e1172953e4ffcf24f59bbd0… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon Aug 18 23:31:01 2014 +0800 mshtml: Added IHTMLStyle::backgroundAttachment property implementation. --- dlls/mshtml/htmlstyle.c | 15 +++++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 10 ++++++++++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 420c687..9c9c96e 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -37,6 +37,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static const WCHAR attrBackground[] = {'b','a','c','k','g','r','o','u','n','d',0}; +static const WCHAR attrBackgroundAttachment[] = + {'b','a','c','k','g','r','o','u','n','d','-','a','t','t','a','c','h','m','e','n','t',0}; static const WCHAR attrBackgroundColor[] = {'b','a','c','k','g','r','o','u','n','d','-','c','o','l','o','r',0}; static const WCHAR attrBackgroundImage[] = @@ -205,6 +207,7 @@ typedef struct { static const style_tbl_entry_t style_tbl[] = { {attrBackground, DISPID_IHTMLSTYLE_BACKGROUND}, + {attrBackgroundAttachment, DISPID_IHTMLSTYLE_BACKGROUNDATTACHMENT}, {attrBackgroundColor, DISPID_IHTMLSTYLE_BACKGROUNDCOLOR}, {attrBackgroundImage, DISPID_IHTMLSTYLE_BACKGROUNDIMAGE}, {attrBackgroundPosition, DISPID_IHTMLSTYLE_BACKGROUNDPOSITION}, @@ -1077,15 +1080,19 @@ static HRESULT WINAPI HTMLStyle_get_backgroundRepeat(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_backgroundAttachment(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_BACKGROUND_ATTACHMENT, v, 0); } static HRESULT WINAPI HTMLStyle_get_backgroundAttachment(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_BACKGROUND_ATTACHMENT, p); } static HRESULT WINAPI HTMLStyle_put_backgroundPosition(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index c9f2156..9b44a30 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -34,6 +34,7 @@ struct HTMLStyle { /* NOTE: Make sure to keep in sync with style_tbl in htmlstyle.c */ typedef enum { STYLEID_BACKGROUND, + STYLEID_BACKGROUND_ATTACHMENT, STYLEID_BACKGROUND_COLOR, STYLEID_BACKGROUND_IMAGE, STYLEID_BACKGROUND_POSITION, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index f279fb3..94226e1 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1545,6 +1545,16 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(V_BSTR(&v), "red"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + str = a2bstr("fixed"); + hres = IHTMLStyle_put_backgroundAttachment(style, str); + ok(hres == S_OK, "put_backgroundAttachment failed: %08x\n", hres); + SysFreeString(str); + + hres = IHTMLStyle_get_backgroundAttachment(style, &str); + ok(hres == S_OK, "get_backgroundAttachment failed: %08x\n", hres); + ok(!strcmp_wa(str, "fixed"), "ret = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + /* padding */ hres = IHTMLStyle_get_padding(style, &str); ok(hres == S_OK, "get_padding failed: %08x\n", hres);

1 0

Jacek Caban : d3d10_1.idl: Added _D3D10_1_CONSTANTS guard.
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: 9f06f24f0a61a9d7a3f376f39cd507e5e5552566 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f06f24f0a61a9d7a3f376f39… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 19 15:09:20 2014 +0200 d3d10_1.idl: Added _D3D10_1_CONSTANTS guard. --- include/d3d10_1.idl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/d3d10_1.idl b/include/d3d10_1.idl index d0e02d4..ba5517b 100644 --- a/include/d3d10_1.idl +++ b/include/d3d10_1.idl @@ -19,6 +19,8 @@ import "oaidl.idl"; import "ocidl.idl"; +cpp_quote("#ifndef _D3D10_1_CONSTANTS") +cpp_quote("#define _D3D10_1_CONSTANTS") const UINT D3D10_1_DEFAULT_SAMPLE_MASK = 0xffffffff; const UINT D3D10_1_GS_INPUT_REGISTER_COUNT = 32; const UINT D3D10_1_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT = 32; @@ -38,6 +40,7 @@ const UINT D3D10_1_STANDARD_VERTEX_ELEMENT_COUNT = 32; const UINT D3D10_1_SUBPIXEL_FRACTIONAL_BIT_COUNT = 8; const UINT D3D10_1_VS_INPUT_REGISTER_COUNT = 32; const UINT D3D10_1_VS_OUTPUT_REGISTER_COUNT = 32; +cpp_quote("#endif") cpp_quote("#define D3D10_1_FLOAT16_FUSED_TOLERANCE_IN_ULP (0.6)") cpp_quote("#define D3D10_1_FLOAT32_TO_INTEGER_TOLERANCE_IN_ULP (0.6f)")

1 0

Shuai Meng : vbscript: Implemented Sqr.
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: 85dfafa3e72f6b0763f2dede662d341f33a678f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85dfafa3e72f6b0763f2dede6… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Mon Aug 18 23:10:25 2014 +0800 vbscript: Implemented Sqr. --- dlls/vbscript/global.c | 13 +++++++++++-- dlls/vbscript/tests/api.vbs | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 98be6c1..183cdaf 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -699,8 +699,17 @@ static HRESULT Global_Log(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA static HRESULT Global_Sqr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres; + double d; + + hres = to_double(arg, &d); + if(FAILED(hres)) + return hres; + + if(d < 0) + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); + else + return return_double(res, sqrt(d)); } static HRESULT Global_Randomize(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 4f5800d..70268e7 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1043,4 +1043,39 @@ MyObject.myval = -2.5 Call ok(Int(MyObject) = -3, "Int(MyObject) = " & Int(MyObject)) Call ok(getVT(Int(MyObject)) = "VT_R8", "getVT(Int(MyObject)) = " & getVT(Int(MyObject))) +Sub testSqrError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = Sqr(strings) + Call ok(Err.number = error_num1, "Err.number1 = " & Err.number) + + Call Err.clear() + Call Sqr(strings) + Call ok(Err.number = error_num2, "Err.number2 = " & Err.number) +End Sub + +Call testSqrError(-2, 5, 5) +Call testSqrError(True, 5, 5) + +Call ok(Sqr(Empty) = 0, "Sqr(Empty) = " & Sqr(Empty)) +Call ok(getVT(Sqr(Empty)) = "VT_R8", "getVT(Sqr(Empty)) = " & getVT(Sqr(Empty))) +Call ok(Sqr(0) = 0, "Sqr(0) = " & Sqr(0)) +Call ok(getVT(Sqr(0)) = "VT_R8", "getVT(Sqr(0)) = " & getVT(Sqr(0))) +Call ok(Sqr(1) = 1, "Sqr(1) = " & Sqr(1)) +Call ok(getVT(Sqr(1)) = "VT_R8", "getVT(Sqr(1)) = " & getVT(Sqr(1))) +Call ok(Sqr(CSng(121)) = 11, "Sqr(CSng(121)) = " & Sqr(CSng(121))) +Call ok(getVT(Sqr(CSng(121))) = "VT_R8", "getVT(Sqr(CSng(121))) = " & getVT(Sqr(CSng(121)))) +Call ok(Sqr(36100) = 190, "Sqr(36100) = " & Sqr(36100)) +Call ok(getVT(Sqr(36100)) = "VT_R8", "getVT(Sqr(36100)) = " & getVT(Sqr(36100))) +Call ok(Sqr(CCur(0.0625)) = 0.25, "Sqr(CCur(0.0625)) = " & Sqr(CCur(0.0625))) +Call ok(getVT(Sqr(CCur(0.0625))) = "VT_R8", "getVT(Sqr(CCur(0.0625))) = " & getVT(Sqr(CCur(0.0625)))) +Call ok(Sqr("100000000") = 10000, "Sqr(""100000000"") = " & Sqr("100000000")) +Call ok(getVT(Sqr("100000000")) = "VT_R8", "getVT(Sqr(""100000000"")) = " & getVT(Sqr("100000000"))) +Call ok(Sqr(False) = 0, "Sqr(False) = " & Sqr(False)) +Call ok(getVT(Sqr(False)) = "VT_R8", "getVT(Sqr(False)) = " & getVT(Sqr(False))) +Call ok(Sqr(CByte(225)) = 15, "Sqr(CByte(225)) = " & Sqr(CByte(225))) +Call ok(getVT(Sqr(CByte(225))) = "VT_R8", "getVT(Sqr(CByte(225))) = " & getVT(Sqr(CByte(225)))) + Call reportSuccess()

1 0

Francois Gouget : shell32: Add a trailing '\n' to a FIXME().
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: 0f3728a692c63131617d939ec25b49b66ab8c588 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f3728a692c63131617d939ec… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 19 00:26:22 2014 +0200 shell32: Add a trailing '\n' to a FIXME(). --- dlls/shell32/shellitem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index 3c2bd50..b5d70dc 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -1054,7 +1054,7 @@ static HRESULT WINAPI IShellItemArray_fnGetAttributes(IShellItemArray *iface, TRACE("%p (%x, %x, %p)\n", This, AttribFlags, sfgaoMask, psfgaoAttribs); if(AttribFlags & ~(SIATTRIBFLAGS_AND|SIATTRIBFLAGS_OR)) - FIXME("%08x contains unsupported attribution flags", AttribFlags); + FIXME("%08x contains unsupported attribution flags\n", AttribFlags); for(i = 0; i < This->item_count; i++) {

1 0

Nikolay Sivov : dwrite: Use layout pointer as an argument instead of neutral list.
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: 7596dc633106bd664f0bd1f0b4dee139383fc037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7596dc633106bd664f0bd1f0b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 19 06:22:56 2014 +0400 dwrite: Use layout pointer as an argument instead of neutral list. --- dlls/dwrite/layout.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 7a4ac18..2ef7c9f 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -239,20 +239,20 @@ static void free_layout_range(struct layout_range *range) heap_free(range); } -static void free_layout_ranges_list(struct list *ranges) +static void free_layout_ranges_list(struct dwrite_textlayout *layout) { struct layout_range *cur, *cur2; - LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, ranges, struct layout_range, entry) { + LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, &layout->ranges, struct layout_range, entry) { list_remove(&cur->entry); free_layout_range(cur); } } -static struct layout_range *find_outer_range(struct list *ranges, const DWRITE_TEXT_RANGE *range) +static struct layout_range *find_outer_range(struct dwrite_textlayout *layout, const DWRITE_TEXT_RANGE *range) { struct layout_range *cur; - LIST_FOR_EACH_ENTRY(cur, ranges, struct layout_range, entry) { + LIST_FOR_EACH_ENTRY(cur, &layout->ranges, struct layout_range, entry) { if (cur->range.startPosition > range->startPosition) return NULL; @@ -267,11 +267,11 @@ static struct layout_range *find_outer_range(struct list *ranges, const DWRITE_T return NULL; } -static struct layout_range *get_layout_range_by_pos(struct list *ranges, UINT32 pos) +static struct layout_range *get_layout_range_by_pos(struct dwrite_textlayout *layout, UINT32 pos) { struct layout_range *cur; - LIST_FOR_EACH_ENTRY(cur, ranges, struct layout_range, entry) { + LIST_FOR_EACH_ENTRY(cur, &layout->ranges, struct layout_range, entry) { DWRITE_TEXT_RANGE *r = &cur->range; if (r->startPosition <= pos && pos < r->startPosition + r->length) return cur; @@ -339,7 +339,7 @@ static HRESULT set_layout_range_attr(struct dwrite_textlayout *layout, enum layo DWRITE_TEXT_RANGE r; /* If new range is completely within existing range, split existing range in two */ - if ((outer = find_outer_range(ranges, &value->range))) { + if ((outer = find_outer_range(layout, &value->range))) { /* no need to add same range */ if (is_same_layout_attrvalue(outer, attr, value)) @@ -401,7 +401,7 @@ static HRESULT set_layout_range_attr(struct dwrite_textlayout *layout, enum layo /* Now it's only possible that given range contains some existing ranges, fully or partially. Update all of them. */ - left = get_layout_range_by_pos(ranges, value->range.startPosition); + left = get_layout_range_by_pos(layout, value->range.startPosition); if (left->range.startPosition == value->range.startPosition) changed = set_layout_range_attrval(left, attr, value); else /* need to split */ { @@ -490,7 +490,7 @@ static ULONG WINAPI dwritetextlayout_Release(IDWriteTextLayout *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) { - free_layout_ranges_list(&This->ranges); + free_layout_ranges_list(This); release_format_data(&This->format); heap_free(This->str); heap_free(This); @@ -900,7 +900,7 @@ static HRESULT WINAPI dwritetextlayout_layout_GetFontWeight(IDWriteTextLayout *i if (position >= This->len) return S_OK; - range = get_layout_range_by_pos(&This->ranges, position); + range = get_layout_range_by_pos(This, position); *weight = range->weight; if (r) *r = range->range; @@ -918,7 +918,7 @@ static HRESULT WINAPI dwritetextlayout_layout_GetFontStyle(IDWriteTextLayout *if if (position >= This->len) return S_OK; - range = get_layout_range_by_pos(&This->ranges, position); + range = get_layout_range_by_pos(This, position); *style = range->style; if (r) *r = range->range; @@ -952,7 +952,7 @@ static HRESULT WINAPI dwritetextlayout_GetUnderline(IDWriteTextLayout *iface, if (position >= This->len) return S_OK; - range = get_layout_range_by_pos(&This->ranges, position); + range = get_layout_range_by_pos(This, position); *underline = range->underline; if (r) *r = range->range; @@ -970,7 +970,7 @@ static HRESULT WINAPI dwritetextlayout_GetStrikethrough(IDWriteTextLayout *iface if (position >= This->len) return S_OK; - range = get_layout_range_by_pos(&This->ranges, position); + range = get_layout_range_by_pos(This, position); *strikethrough = range->strikethrough; if (r) *r = range->range; @@ -988,7 +988,7 @@ static HRESULT WINAPI dwritetextlayout_GetDrawingEffect(IDWriteTextLayout *iface if (position >= This->len) return S_OK; - range = get_layout_range_by_pos(&This->ranges, position); + range = get_layout_range_by_pos(This, position); *effect = range->effect; if (*effect) IUnknown_AddRef(*effect); @@ -1005,7 +1005,7 @@ static HRESULT WINAPI dwritetextlayout_GetInlineObject(IDWriteTextLayout *iface, TRACE("(%p)->(%u %p %p)\n", This, position, object, r); - range = get_layout_range_by_pos(&This->ranges, position); + range = get_layout_range_by_pos(This, position); *object = range ? range->object : NULL; if (*object) IDWriteInlineObject_AddRef(*object);

1 0