September 2014 - Wine-commits

Sebastian Lackner : user32/tests: Add an additional test for GetMenuItemInfo with NULL pointer as TypeData.
by Alexandre Julliard 09 Sep '14

09 Sep '14

Module: wine Branch: master Commit: 4a3e0e1e0c8c8444a466bd4653c519be4031ecb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a3e0e1e0c8c8444a466bd465… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Sep 9 00:00:20 2014 +0200 user32/tests: Add an additional test for GetMenuItemInfo with NULL pointer as TypeData. --- dlls/user32/tests/menu.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index eaa93a5..575d786 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -1369,6 +1369,11 @@ static void test_menu_iteminfo( void ) MFT_SEPARATOR, 0, 0, 0, 0, 0, 0, string, 0, 0, empty, OK, ER ); TMII_DONE + TMII_INSMI( MIIM_STRING|MIIM_FTYPE, MFT_STRING, -1, -1, 0, 0, 0, -1, NULL, 0, 0, OK ); + TMII_GMII ( MIIM_STRING|MIIM_FTYPE, 80, + MFT_SEPARATOR, 0, 0, 0, 0, 0, 0, NULL, 0, 0, + NULL, OK, ER ); + TMII_DONE /* How is that with bitmaps? */ TMII_INSMI( MIIM_BITMAP, -1, -1, -1, 0, 0, 0, -1, 0, -1, hbm, OK );

1 0

Jactry Zeng : mshtml: Add IHTMLTableCell::bgColor property implementation.
by Alexandre Julliard 09 Sep '14

09 Sep '14

Module: wine Branch: master Commit: 0cab370d1154ff600784363ea659daedcd45aaf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cab370d1154ff600784363ea… Author: Jactry Zeng <wine(a)jactry.com> Date: Fri Aug 29 23:40:05 2014 +0800 mshtml: Add IHTMLTableCell::bgColor property implementation. --- dlls/mshtml/htmltablecell.c | 40 ++++++++++++++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmltablecell.c b/dlls/mshtml/htmltablecell.c index eedae5b..4bcde18 100644 --- a/dlls/mshtml/htmltablecell.c +++ b/dlls/mshtml/htmltablecell.c @@ -174,15 +174,47 @@ static HRESULT WINAPI HTMLTableCell_get_vAlign(IHTMLTableCell *iface, BSTR *p) static HRESULT WINAPI HTMLTableCell_put_bgColor(IHTMLTableCell *iface, VARIANT v) { HTMLTableCell *This = impl_from_IHTMLTableCell(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + nsAString strColor; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + if(!variant_to_nscolor(&v, &strColor)) + return S_OK; + + nsres = nsIDOMHTMLTableCellElement_SetBgColor(This->nscell, &strColor); + nsAString_Finish(&strColor); + if(NS_FAILED(nsres)) { + ERR("SetBgColor(%s) failed: %08x\n", debugstr_variant(&v), nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLTableCell_get_bgColor(IHTMLTableCell *iface, VARIANT *p) { HTMLTableCell *This = impl_from_IHTMLTableCell(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString strColor; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&strColor, NULL); + nsres = nsIDOMHTMLTableCellElement_GetBgColor(This->nscell, &strColor); + + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *color; + nsAString_GetData(&strColor, &color); + V_VT(p) = VT_BSTR; + hres = nscolor_to_str(color, &V_BSTR(p)); + }else { + ERR("GetBgColor failed: %08x\n", nsres); + hres = E_FAIL; + } + nsAString_Finish(&strColor); + return hres; } static HRESULT WINAPI HTMLTableCell_put_noWrap(IHTMLTableCell *iface, VARIANT_BOOL v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f946550..17f39ce 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6113,6 +6113,7 @@ static void test_td_elem(IHTMLElement *elem) HRESULT hres; LONG lval; BSTR str; + VARIANT vbg, vDefaultbg; hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLTableCell, (void**)&cell); ok(hres == S_OK, "Could not get IHTMLTableRow iface: %08x\n", hres); @@ -6138,6 +6139,40 @@ static void test_td_elem(IHTMLElement *elem) SysFreeString(str); } + hres = IHTMLTableCell_get_bgColor(cell, &vDefaultbg); + ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(V_VT(&vDefaultbg) == VT_BSTR, "bstr != NULL\n"); + ok(!V_BSTR(&vDefaultbg), "V_BSTR(bgColor) = %s\n", wine_dbgstr_w(V_BSTR(&vDefaultbg))); + + V_VT(&vbg) = VT_BSTR; + V_BSTR(&vbg) = a2bstr("red"); + hres = IHTMLTableCell_put_bgColor(cell, vbg); + ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); + VariantClear(&vbg); + + hres = IHTMLTableCell_get_bgColor(cell, &vbg); + ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(V_VT(&vbg) == VT_BSTR, "V_VT(&vbg) != VT_BSTR\n"); + ok(!strcmp_wa(V_BSTR(&vbg), "#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); + VariantClear(&vbg); + + V_VT(&vbg) = VT_I4; + V_I4(&vbg) = 0xff0000; + hres = IHTMLTableCell_put_bgColor(cell, vbg); + ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); + VariantClear(&vbg); + + hres = IHTMLTableCell_get_bgColor(cell, &vbg); + ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(V_VT(&vbg) == VT_BSTR, "V_VT(&vbg) != VT_BSTR\n"); + ok(!strcmp_wa(V_BSTR(&vbg), "#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); + VariantClear(&vbg); + + /* Restore Originial */ + hres = IHTMLTableCell_put_bgColor(cell, vDefaultbg); + ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); + VariantClear(&vDefaultbg); + IHTMLTableCell_Release(cell); }

1 0

Jactry Zeng : mshtml: Return E_POINTER when p is NULL in get_nsstyle_pixel_val.
by Alexandre Julliard 09 Sep '14

09 Sep '14

Module: wine Branch: master Commit: 387257dd2c68b0c29780838b42599d64e394ab0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=387257dd2c68b0c29780838b4… Author: Jactry Zeng <wine(a)jactry.com> Date: Tue Sep 9 18:50:25 2014 +0800 mshtml: Return E_POINTER when p is NULL in get_nsstyle_pixel_val. --- dlls/mshtml/htmlstyle.c | 3 +++ dlls/mshtml/tests/style.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index f098cb0..170db72 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -684,6 +684,9 @@ static HRESULT get_nsstyle_pixel_val(HTMLStyle *This, styleid_t sid, LONG *p) nsAString str_value; HRESULT hres; + if(!p) + return E_POINTER; + nsAString_Init(&str_value, NULL); hres = get_nsstyle_attr_nsval(This->nsstyle, sid, &str_value); diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 2204c5a..64b4fe9 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1164,6 +1164,9 @@ static void test_body_style(IHTMLStyle *style) ok(hres == S_OK, "get_pixelLeft failed: %08x\n", hres); ok(l == 6, "pixelLeft = %d\n", l); + hres = IHTMLStyle_get_pixelLeft(style, NULL); + ok(hres == E_POINTER, "get_pixelLeft failed: %08x\n", hres); + V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_left(style, &v); ok(hres == S_OK, "get_left failed: %08x\n", hres);

1 0

Jactry Zeng : mshtml: Add IHTMLStyle::get_pixelWidth implementation.
by Alexandre Julliard 09 Sep '14

09 Sep '14

Module: wine Branch: master Commit: 7152077b050c2bb3092c8447ba9b129cb05db4c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7152077b050c2bb3092c8447b… Author: Jactry Zeng <wine(a)jactry.com> Date: Tue Sep 9 18:50:36 2014 +0800 mshtml: Add IHTMLStyle::get_pixelWidth implementation. --- dlls/mshtml/htmlstyle.c | 6 ++++-- dlls/mshtml/tests/style.c | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 170db72..270f1fa 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -2501,8 +2501,10 @@ static HRESULT WINAPI HTMLStyle_put_pixelWidth(IHTMLStyle *iface, LONG v) static HRESULT WINAPI HTMLStyle_get_pixelWidth(IHTMLStyle *iface, LONG *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_pixel_val(This, STYLEID_WIDTH, p); } static HRESULT WINAPI HTMLStyle_put_pixelHeight(IHTMLStyle *iface, LONG v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 64b4fe9..2a22f2f 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -963,6 +963,11 @@ static void test_body_style(IHTMLStyle *style) f == 2.2f, /* IE8 */ "f = %f\n", f); + l = 0xdeadbeef; + hres = IHTMLStyle_get_pixelWidth(style, &l); + ok(hres == S_OK, "get_pixelWidth failed: %08x\n", hres); + ok(l == 2, "pixelWidth = %d\n", l); + V_VT(&v) = VT_BSTR; V_BSTR(&v) = a2bstr("auto"); hres = IHTMLStyle_put_width(style, v); @@ -981,6 +986,11 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_put_width(style, v); ok(hres == S_OK, "put_width failed: %08x\n", hres); + l = 0xdeadbeef; + hres = IHTMLStyle_get_pixelWidth(style, &l); + ok(hres == S_OK, "get_pixelWidth failed: %08x\n", hres); + ok(l == 100, "pixelWidth = %d\n", l); + V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_width(style, &v); ok(hres == S_OK, "get_width failed: %08x\n", hres); @@ -991,6 +1001,14 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_put_pixelWidth(style, 50); ok(hres == S_OK, "put_pixelWidth failed: %08x\n", hres); + l = 0xdeadbeef; + hres = IHTMLStyle_get_pixelWidth(style, &l); + ok(hres == S_OK, "get_pixelWidth failed: %08x\n", hres); + ok(l == 50, "pixelWidth = %d\n", l); + + hres = IHTMLStyle_get_pixelWidth(style, NULL); + ok(hres == E_POINTER, "get_pixelWidth failed: %08x\n", hres); + V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_width(style, &v); ok(hres == S_OK, "get_width failed: %08x\n", hres);

1 0

Jactry Zeng : mshtml: Add IHTMLStyle::pixelHeight property implementation.
by Alexandre Julliard 09 Sep '14

09 Sep '14

Module: wine Branch: master Commit: 042b881b27de43ea8285424bba1d551e70675e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=042b881b27de43ea8285424bb… Author: Jactry Zeng <wine(a)jactry.com> Date: Tue Sep 9 18:50:46 2014 +0800 mshtml: Add IHTMLStyle::pixelHeight property implementation. --- dlls/mshtml/htmlstyle.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 270f1fa..7f82905 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -2510,15 +2510,19 @@ static HRESULT WINAPI HTMLStyle_get_pixelWidth(IHTMLStyle *iface, LONG *p) static HRESULT WINAPI HTMLStyle_put_pixelHeight(IHTMLStyle *iface, LONG v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, v); + + return set_style_pxattr(This->nsstyle, STYLEID_HEIGHT, v); } static HRESULT WINAPI HTMLStyle_get_pixelHeight(IHTMLStyle *iface, LONG *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_pixel_val(This, STYLEID_HEIGHT, p); } static HRESULT WINAPI HTMLStyle_put_posTop(IHTMLStyle *iface, float v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 2a22f2f..eda62ef 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1254,6 +1254,11 @@ static void test_body_style(IHTMLStyle *style) ok(hres == S_OK, "get_posHeight failed: %08x\n", hres); ok(f == 0.0, "expected 0.0 got %f\n", f); + l = 0xdeadbeef; + hres = IHTMLStyle_get_pixelHeight(style, &l); + ok(hres == S_OK, "get_pixelHeight failed: %08x\n", hres); + ok(!l, "pixelHeight = %d\n", l); + hres = IHTMLStyle_put_posHeight(style, 4.9f); ok(hres == S_OK, "put_posHeight failed: %08x\n", hres); @@ -1263,6 +1268,13 @@ static void test_body_style(IHTMLStyle *style) f == 4.9f, /* IE8 */ "expected 4.0 or 4.9 (IE8) got %f\n", f); + l = 0xdeadbeef; + hres = IHTMLStyle_get_pixelHeight(style, &l); + ok(hres == S_OK, "get_pixelHeight failed: %08x\n", hres); + ok(l == 4 || + l == 5, /* IE8 */ + "pixelHeight = %d\n", l); + V_VT(&v) = VT_BSTR; V_BSTR(&v) = a2bstr("70px"); hres = IHTMLStyle_put_height(style, v); @@ -1276,6 +1288,11 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(V_BSTR(&v), "70px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + l = 0xdeadbeef; + hres = IHTMLStyle_get_pixelHeight(style, &l); + ok(hres == S_OK, "get_pixelHeight failed: %08x\n", hres); + ok(l == 70, "pixelHeight = %d\n", l); + V_VT(&v) = VT_BSTR; V_BSTR(&v) = NULL; hres = IHTMLStyle_put_height(style, v); @@ -1289,6 +1306,22 @@ static void test_body_style(IHTMLStyle *style) ok(!V_BSTR(&v), "V_BSTR(v) = %s, expected NULL\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + l = 0xdeadbeef; + hres = IHTMLStyle_get_pixelHeight(style, &l); + ok(hres == S_OK, "get_pixelHeight failed: %08x\n", hres); + ok(!l, "pixelHeight = %d\n", l); + + hres = IHTMLStyle_put_pixelHeight(style, 50); + ok(hres == S_OK, "put_pixelHeight failed: %08x\n", hres); + + l = 0xdeadbeef; + hres = IHTMLStyle_get_pixelHeight(style, &l); + ok(hres == S_OK, "get_pixelHeight failed: %08x\n", hres); + ok(l == 50, "pixelHeight = %d\n", l); + + hres = IHTMLStyle_get_pixelHeight(style, NULL); + ok(hres == E_POINTER, "get_pixelHeight failed: %08x\n", hres); + V_VT(&v) = VT_I4; V_I4(&v) = 64; hres = IHTMLStyle_put_height(style, v); @@ -1305,6 +1338,11 @@ static void test_body_style(IHTMLStyle *style) ok(hres == S_OK, "get_posHeight failed: %08x\n", hres); ok(f == 64.0, "expected 64.0 got %f\n", f); + l = 0xdeadbeef; + hres = IHTMLStyle_get_pixelHeight(style, &l); + ok(hres == S_OK, "get_pixelHeight failed: %08x\n", hres); + ok(l == 64, "pixelHeight = %d\n", l); + str = (void*)0xdeadbeef; hres = IHTMLStyle_get_cursor(style, &str); ok(hres == S_OK, "get_cursor failed: %08x\n", hres);

1 0

Jactry Zeng : mshtml: Add IHTMLStyle::pixelTop property implementation.
by Alexandre Julliard 09 Sep '14

09 Sep '14

Module: wine Branch: master Commit: e402bb5642ba384238586df5dd6e8b4909f9686e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e402bb5642ba384238586df5d… Author: Jactry Zeng <wine(a)jactry.com> Date: Tue Sep 9 18:50:54 2014 +0800 mshtml: Add IHTMLStyle::pixelTop property implementation. --- dlls/mshtml/htmlstyle.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 21 +++++++++++++++++++++ 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 7f82905..52d15f9 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -2460,15 +2460,19 @@ static HRESULT WINAPI HTMLStyle_get_cssText(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_pixelTop(IHTMLStyle *iface, LONG v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, v); + + return set_style_pxattr(This->nsstyle, STYLEID_TOP, v); } static HRESULT WINAPI HTMLStyle_get_pixelTop(IHTMLStyle *iface, LONG *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_pixel_val(This, STYLEID_TOP, p); } static HRESULT WINAPI HTMLStyle_put_pixelLeft(IHTMLStyle *iface, LONG v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index eda62ef..40552a4 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1210,6 +1210,17 @@ static void test_body_style(IHTMLStyle *style) f == 4.9f, /* IE8 */ "expected 4.0 or 4.9 (IE8) got %f\n", f); + hres = IHTMLStyle_put_pixelTop(style, 6); + ok(hres == S_OK, "put_pixelTop failed: %08x\n", hres); + + l = 0xdeadbeef; + hres = IHTMLStyle_get_pixelTop(style, &l); + ok(hres == S_OK, "get_pixelTop failed: %08x\n", hres); + ok(l == 6, "pixelTop = %d\n", l); + + hres = IHTMLStyle_get_pixelTop(style, NULL); + ok(hres == E_POINTER, "get_pixelTop failed: %08x\n", hres); + V_VT(&v) = VT_BSTR; V_BSTR(&v) = a2bstr("3px"); hres = IHTMLStyle_put_top(style, v); @@ -1227,6 +1238,11 @@ static void test_body_style(IHTMLStyle *style) ok(hres == S_OK, "get_posTop failed: %08x\n", hres); ok(f == 3.0, "expected 3.0 got %f\n", f); + l = 0xdeadbeef; + hres = IHTMLStyle_get_pixelTop(style, &l); + ok(hres == S_OK, "get_pixelTop failed: %08x\n", hres); + ok(l == 3, "pixelTop = %d\n", l); + V_VT(&v) = VT_NULL; hres = IHTMLStyle_put_top(style, v); ok(hres == S_OK, "put_top failed: %08x\n", hres); @@ -1238,6 +1254,11 @@ static void test_body_style(IHTMLStyle *style) ok(!V_BSTR(&v), "V_BSTR(v) != NULL\n"); VariantClear(&v); + l = 0xdeadbeef; + hres = IHTMLStyle_get_pixelTop(style, &l); + ok(hres == S_OK, "get_pixelTop failed: %08x\n", hres); + ok(!l, "pixelTop = %d\n", l); + /* Test posHeight */ hres = IHTMLStyle_get_posHeight(style, NULL); ok(hres == E_POINTER, "get_posHeight failed: %08x\n", hres);

1 0

Alistair Leslie-Hughes : dpnet: Stub interface IDirectPlay8LobbyClient.
by Alexandre Julliard 09 Sep '14

09 Sep '14

Module: wine Branch: master Commit: 45c1d7c74584743f2af44486a86b8af933df22e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45c1d7c74584743f2af44486a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 12 15:19:03 2014 +1000 dpnet: Stub interface IDirectPlay8LobbyClient. --- dlls/dpnet/client.c | 171 +++++++++++++++++++++++++++++++++++++++++++++ dlls/dpnet/dpnet_main.c | 1 + dlls/dpnet/dpnet_private.h | 1 + dlls/dpnet/tests/client.c | 26 +++++++ 4 files changed, 199 insertions(+) diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index abcc5f7..bf2b8d2 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -36,6 +36,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(dpnet); +typedef struct IDirectPlay8LobbyClientImpl +{ + IDirectPlay8LobbyClient IDirectPlay8LobbyClient_iface; + LONG ref; +} IDirectPlay8LobbyClientImpl; + +static inline IDirectPlay8LobbyClientImpl *impl_from_IDirectPlay8LobbyClient(IDirectPlay8LobbyClient *iface) +{ + return CONTAINING_RECORD(iface, IDirectPlay8LobbyClientImpl, IDirectPlay8LobbyClient_iface); +} + static inline IDirectPlay8ClientImpl *impl_from_IDirectPlay8Client(IDirectPlay8Client *iface) { return CONTAINING_RECORD(iface, IDirectPlay8ClientImpl, IDirectPlay8Client_iface); @@ -320,3 +331,163 @@ HRESULT DPNET_CreateDirectPlay8Client(IClassFactory *iface, IUnknown *pUnkOuter, return hr; } + +static HRESULT WINAPI lobbyclient_QueryInterface(IDirectPlay8LobbyClient *iface, REFIID riid, void **obj) +{ + IDirectPlay8LobbyClientImpl *This = impl_from_IDirectPlay8LobbyClient(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + *obj = NULL; + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDirectPlay8LobbyClient)) + { + *obj = &This->IDirectPlay8LobbyClient_iface; + IUnknown_AddRef( (IUnknown*)*obj); + + return DPN_OK; + } + + WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),obj); + return E_NOINTERFACE; +} + +static ULONG WINAPI lobbyclient_AddRef(IDirectPlay8LobbyClient *iface) +{ + IDirectPlay8LobbyClientImpl *This = impl_from_IDirectPlay8LobbyClient(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI lobbyclient_Release(IDirectPlay8LobbyClient *iface) +{ + IDirectPlay8LobbyClientImpl *This = impl_from_IDirectPlay8LobbyClient(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI lobbyclient_Initialize(IDirectPlay8LobbyClient *iface, void *context, + PFNDPNMESSAGEHANDLER msghandler, DWORD flags) +{ + IDirectPlay8LobbyClientImpl *This = impl_from_IDirectPlay8LobbyClient(iface); + + FIXME("(%p)->(%p %p 0x%08x)\n", This, context, msghandler, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI lobbyclient_EnumLocalPrograms(IDirectPlay8LobbyClient *iface, GUID* guidapplication, + BYTE *enumdata, DWORD *enumDataSize, DWORD *items, DWORD flags) +{ + IDirectPlay8LobbyClientImpl *This = impl_from_IDirectPlay8LobbyClient(iface); + + FIXME("(%p)->(%p %p %p %p 0x%08x)\n", This, guidapplication, enumdata, enumDataSize, items, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI lobbyclient_ConnectApplication(IDirectPlay8LobbyClient *iface, DPL_CONNECT_INFO *connectioninfo, + void *connectioncontext, DPNHANDLE *application, DWORD timeout, + DWORD flags) +{ + IDirectPlay8LobbyClientImpl *This = impl_from_IDirectPlay8LobbyClient(iface); + + FIXME("(%p)->(%p %p %p %u 0x%08x)\n", This, connectioninfo, connectioncontext, application, timeout, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI lobbyclient_Send(IDirectPlay8LobbyClient *iface, DPNHANDLE connection, BYTE *buffer, DWORD buffersize, DWORD flags) +{ + IDirectPlay8LobbyClientImpl *This = impl_from_IDirectPlay8LobbyClient(iface); + + FIXME("(%p)->(%u %p %u 0x%08x)\n", This, connection, buffer, buffersize, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI lobbyclient_ReleaseApplication(IDirectPlay8LobbyClient *iface, DPNHANDLE connection, DWORD flags) +{ + IDirectPlay8LobbyClientImpl *This = impl_from_IDirectPlay8LobbyClient(iface); + + FIXME("(%p)->(%u 0x%08x)\n", This, connection, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI lobbyclient_Close(IDirectPlay8LobbyClient *iface, DWORD flags) +{ + IDirectPlay8LobbyClientImpl *This = impl_from_IDirectPlay8LobbyClient(iface); + + FIXME("(%p)->(0x%08x)\n", This, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI lobbyclient_GetConnectionSettings(IDirectPlay8LobbyClient *iface, DPNHANDLE connection, DPL_CONNECTION_SETTINGS *sessioninfo, DWORD *infosize, DWORD flags) +{ + IDirectPlay8LobbyClientImpl *This = impl_from_IDirectPlay8LobbyClient(iface); + + FIXME("(%p)->(%u %p %p 0x%08x)\n", This, connection, sessioninfo, infosize, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI lobbyclient_SetConnectionSettings(IDirectPlay8LobbyClient *iface, DPNHANDLE connection, const DPL_CONNECTION_SETTINGS *sessioninfo, DWORD flags) +{ + IDirectPlay8LobbyClientImpl *This = impl_from_IDirectPlay8LobbyClient(iface); + + FIXME("(%p)->(%u %p 0x%08x)\n", This, connection, sessioninfo, flags); + + return E_NOTIMPL; +} + +static const IDirectPlay8LobbyClientVtbl DirectPlay8LobbiedClient_Vtbl = +{ + lobbyclient_QueryInterface, + lobbyclient_AddRef, + lobbyclient_Release, + lobbyclient_Initialize, + lobbyclient_EnumLocalPrograms, + lobbyclient_ConnectApplication, + lobbyclient_Send, + lobbyclient_ReleaseApplication, + lobbyclient_Close, + lobbyclient_GetConnectionSettings, + lobbyclient_SetConnectionSettings +}; + +HRESULT DPNET_CreateDirectPlay8LobbyClient(IClassFactory *iface, IUnknown *outer, REFIID riid, void **obj) +{ + IDirectPlay8LobbyClientImpl *client; + HRESULT ret; + + TRACE("%p (%p, %s, %p)\n", iface, outer, debugstr_guid(riid), obj); + + client = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*client)); + if (!client) + { + *obj = NULL; + return E_OUTOFMEMORY; + } + + client->IDirectPlay8LobbyClient_iface.lpVtbl = &DirectPlay8LobbiedClient_Vtbl; + client->ref = 1; + + ret = lobbyclient_QueryInterface(&client->IDirectPlay8LobbyClient_iface, riid, obj); + lobbyclient_Release(&client->IDirectPlay8LobbyClient_iface); + + return ret; +} diff --git a/dlls/dpnet/dpnet_main.c b/dlls/dpnet/dpnet_main.c index 29cbb79..042b95a 100644 --- a/dlls/dpnet/dpnet_main.c +++ b/dlls/dpnet/dpnet_main.c @@ -122,6 +122,7 @@ static IClassFactoryImpl DPNET_CFS[] = { { { &DICF_Vtbl }, 1, &CLSID_DirectPlay8Peer, DPNET_CreateDirectPlay8Peer }, { { &DICF_Vtbl }, 1, &CLSID_DirectPlay8Address, DPNET_CreateDirectPlay8Address }, { { &DICF_Vtbl }, 1, &CLSID_DirectPlay8LobbiedApplication, DPNET_CreateDirectPlay8LobbiedApp }, + { { &DICF_Vtbl }, 1, &CLSID_DirectPlay8LobbyClient, DPNET_CreateDirectPlay8LobbyClient }, { { &DICF_Vtbl }, 1, &CLSID_DirectPlay8ThreadPool, DPNET_CreateDirectPlay8ThreadPool}, { { NULL }, 0, NULL, NULL } }; diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 8fd04d6..0c28491 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -105,6 +105,7 @@ extern HRESULT DPNET_CreateDirectPlay8Peer(LPCLASSFACTORY iface, LPUNKNOWN punkO extern HRESULT DPNET_CreateDirectPlay8Address(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; extern HRESULT DPNET_CreateDirectPlay8LobbiedApp(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; extern HRESULT DPNET_CreateDirectPlay8ThreadPool(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; +extern HRESULT DPNET_CreateDirectPlay8LobbyClient(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppobj) DECLSPEC_HIDDEN; extern void init_dpn_sp_caps(DPN_SP_CAPS *dpnspcaps) DECLSPEC_HIDDEN; diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index 92bed55..7f10439 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -41,6 +41,12 @@ static HRESULT WINAPI DirectPlayLobbyMessageHandler(PVOID context, DWORD message return S_OK; } +static HRESULT WINAPI DirectPlayLobbyClientMessageHandler(void *context, DWORD message_id, void* buffer) +{ + trace("DirectPlayLobbyClientMessageHandler: 0x%08x\n", message_id); + return S_OK; +} + static BOOL test_init_dp(void) { HRESULT hr; @@ -205,6 +211,25 @@ static void test_get_sp_caps(void) "expected 0x10000, got 0x%x\n", caps.dwSystemBufferSize); } +void test_lobbyclient(void) +{ + HRESULT hr; + IDirectPlay8LobbyClient *client = NULL; + + hr = CoCreateInstance( &CLSID_DirectPlay8LobbyClient, NULL, CLSCTX_ALL, &IID_IDirectPlay8LobbyClient, (void**)&client); + ok(hr == S_OK, "Failed to create object\n"); + if(SUCCEEDED(hr)) + { + hr = IDirectPlay8LobbyClient_Initialize(client, NULL, DirectPlayLobbyClientMessageHandler, 0); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDirectPlay8LobbyClient_Close(client, 0); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + + IDirectPlay8LobbyClient_Release(client); + } +} + static void test_cleanup_dp(void) { HRESULT hr; @@ -233,5 +258,6 @@ START_TEST(client) test_enum_service_providers(); test_enum_hosts(); test_get_sp_caps(); + test_lobbyclient(); test_cleanup_dp(); }

1 0

Julian Rüger : German translation for release 1.7.26
by Jeremy Newman 09 Sep '14

09 Sep '14

Module: website Branch: master Commit: 1a6f8aa78192939285d21471c1a8e9dd8b69e0bf URL: http://source.winehq.org/git/website.git/?a=commit;h=1a6f8aa78192939285d214… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Sep 9 16:42:16 2014 +0200 German translation for release 1.7.26 --- news/de/2014090501.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2014090501.xml b/news/de/2014090501.xml new file mode 100644 index 0000000..90c9141 --- /dev/null +++ b/news/de/2014090501.xml @@ -0,0 +1,15 @@ +<news> +<date>5. September 2014</date> +<title>Wine 1.7.26 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.26 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.26">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Noch weitere DirectWrite-Funktionen.</li> + <li>Verbesserungen am gemeinsam verwendeten Datei-Dialog.</li> + <li>Mehrere C-Laufzeit Verbesserungen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.26.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.7.26
by Jeremy Newman 08 Sep '14

08 Sep '14

Module: website Branch: master Commit: 9d7d09d0c26646cafcca021852fb5006df3017da URL: http://source.winehq.org/git/website.git/?a=commit;h=9d7d09d0c26646cafcca02… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Sep 7 09:28:44 2014 +0200 French translation for release 1.7.26 --- news/fr/2014090501.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/fr/2014090501.xml b/news/fr/2014090501.xml new file mode 100644 index 0000000..dd07b6e --- /dev/null +++ b/news/fr/2014090501.xml @@ -0,0 +1,14 @@ +<news> +<date>5 septembre 2014</date> +<title>Sortie de Wine 1.7.26</title> +<body> + La version de développement 1.7.26 de Wine est disponible. + <a href="{$root}/announce/1.7.26">Nouveautés</a> de cette version : +<ul> + <li>Encore plus de fonctions DirectWrite.</li> + <li>Améliorations dans les dialogues de sélection de fichiers communs.</li> + <li>Quelques améliorations dans le moteur d'exécution C.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.26.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

André Hentschel : rasapi32: Fix a typo in a comment.
by Alexandre Julliard 08 Sep '14

08 Sep '14

Module: wine Branch: master Commit: fc1a41439f2966b67bbc596bb76693a0bdb200c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc1a41439f2966b67bbc596bb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 7 21:32:13 2014 +0200 rasapi32: Fix a typo in a comment. --- dlls/rasapi32/rasapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c index 2184a22..235ab65 100644 --- a/dlls/rasapi32/rasapi.c +++ b/dlls/rasapi32/rasapi.c @@ -241,7 +241,7 @@ DWORD WINAPI RasEnumAutodialAddressesW(LPWSTR *a, LPDWORD b, LPDWORD c) /************************************************************************** * RasEnumDevicesA [RASAPI32.19] * - * Just return a virtual modem too see what other APIs programs will + * Just return a virtual modem to see what other APIs programs will * call with it. */ DWORD WINAPI RasEnumDevicesA(LPRASDEVINFOA lpRasDevinfo, LPDWORD lpcb, LPDWORD lpcDevices)

1 0