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

André Hentschel : wpcap: Add stub for pcap_setbuff.
by Alexandre Julliard Aug. 15, 2014

Aug. 15, 2014

Module: wine Branch: master Commit: e7bf85ccae4af4710576291c23352e2a510e44f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7bf85ccae4af4710576291c2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 12 00:31:25 2014 +0200 wpcap: Add stub for pcap_setbuff. --- 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 0393ad1..304cc2b 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -74,6 +74,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_setbuff(pcap_t * p, int dim) +{ + FIXME("(%p %i) stub\n", p, dim); + return 0; +} + int CDECL wine_pcap_stats(pcap_t *p, struct pcap_stat *ps) { TRACE("(%p %p)\n", p, ps); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 5186276..4c9d5af 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -64,7 +64,7 @@ @ stub pcap_sendqueue_queue @ stub pcap_sendqueue_transmit @ stub pcap_set_datalink -@ stub pcap_setbuff +@ cdecl pcap_setbuff(ptr long) wine_pcap_setbuff @ stub pcap_setfilter @ stub pcap_setmintocopy @ stub pcap_setmode

1 0

André Hentschel : Add WWN 373
by Jeremy Newman Aug. 15, 2014

Aug. 15, 2014

Module: website Branch: master Commit: 485a42494620386996b8b5b5b99a3cafc815d700 URL: http://source.winehq.org/git/website.git/?a=commit;h=485a42494620386996b8b5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 15 17:39:24 2014 +0200 Add WWN 373 --- news/de/2014081501.xml | 12 + news/en/2014081501.xml | 12 + wwn/en/wn20140815_373.xml | 1456 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1480 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=485a42494620386996…

1 0

Julian Rüger : German translation for release 1.7.24
by Jeremy Newman Aug. 13, 2014

Aug. 13, 2014

Module: website Branch: master Commit: e358fd9720d26bcaafd6cb2d226f29fe7bb2f3b9 URL: http://source.winehq.org/git/website.git/?a=commit;h=e358fd9720d26bcaafd6cb… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Aug 13 01:51:01 2014 +0200 German translation for release 1.7.24 --- news/de/2014080801.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2014080801.xml b/news/de/2014080801.xml new file mode 100644 index 0000000..6475fbc --- /dev/null +++ b/news/de/2014080801.xml @@ -0,0 +1,15 @@ +<news> +<date>8. August 2014</date> +<title>Wine 1.7.24 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.24 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.24">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Anfänge der Implementationen einiger DirectWrite-Klassen.</li> + <li>Anfängliche Wrapper-DLL der Paketsammler-Bibliothek.</li> + <li>Einige Crypto-Verbesserungen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.24.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

Łukasz Wojniłowicz : Polish translation for release 1.7.24
by Jeremy Newman Aug. 12, 2014

Aug. 12, 2014

Module: website Branch: master Commit: d8f439e2f711fe249dd048dcdbec366c83f5d7d0 URL: http://source.winehq.org/git/website.git/?a=commit;h=d8f439e2f711fe249dd048… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Aug 9 05:48:21 2014 +0200 Polish translation for release 1.7.24 --- news/pl/2014080801.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/pl/2014080801.xml b/news/pl/2014080801.xml new file mode 100644 index 0000000..644fe8b --- /dev/null +++ b/news/pl/2014080801.xml @@ -0,0 +1,15 @@ +<news> +<date>Sierpień 8, 2014</date> +<title>Wydano Wine 1.7.24</title> +<body> + Wydanie rozwojowe Wine 1.7.24 jest już dostępne. + <a href="{$root}/announce/1.7.24">Co nowego</a> w tym wydaniu: +<ul> + <li>Początki implementacji klas DirectWrite.</li> + <li>Początki biblioteki owijającej dll dla biblioteki przechwytywania pakietów.</li> + <li>Kilka poprawek w kryptografii.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.24.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.23
by Jeremy Newman Aug. 12, 2014

Aug. 12, 2014

Module: website Branch: master Commit: d5999d6b69fa42b860d2586f1887394b4a45ac73 URL: http://source.winehq.org/git/website.git/?a=commit;h=d5999d6b69fa42b860d258… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Aug 8 15:19:00 2014 +0200 Polish translation for release 1.7.23 --- news/pl/2014072501.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2014072501.xml b/news/pl/2014072501.xml new file mode 100644 index 0000000..be7edee --- /dev/null +++ b/news/pl/2014072501.xml @@ -0,0 +1,16 @@ +<news> +<date>Lipiec 25, 2014</date> +<title>Wydano Wine 1.7.23</title> +<body> + Wydanie rozwojowe Wine 1.7.23 jest już dostępne. + <a href="{$root}/announce/1.7.23">Co nowego</a> w tym wydaniu: +<ul> + <li>Lepsza obsługa dla przeciągania i upuszczania plików.</li> + <li>Usprawnienia w zarządzaniu ciasteczkami HTTP.</li> + <li>Wstępna obsługa dla 64-bitowego Androida.</li> + <li>Poprawki w zarządzaniu certyfikatami kryptograficznymi.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.23.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.7.24
by Jeremy Newman Aug. 12, 2014

Aug. 12, 2014

Module: website Branch: master Commit: 0a76bcc0a1cfb31e0592927c52f187a75ebd3433 URL: http://source.winehq.org/git/website.git/?a=commit;h=0a76bcc0a1cfb31e059292… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 9 09:00:41 2014 +0200 French translation for release 1.7.24 --- news/fr/2014080801.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/fr/2014080801.xml b/news/fr/2014080801.xml new file mode 100644 index 0000000..badc927 --- /dev/null +++ b/news/fr/2014080801.xml @@ -0,0 +1,14 @@ +<news> +<date>8 août 2014</date> +<title>Sortie de Wine 1.7.24</title> +<body> + La version de développement 1.7.24 de Wine est disponible. + <a href="{$root}/announce/1.7.24">Nouveautés</a> de cette version : +<ul> + <li>Début d'implémentation de certaines classes DirectWrite.</li> + <li>DLL enveloppe initiale pour la bibliothèque de capture de paquets.</li> + <li>Quelques améliorations cryptographiques.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.24.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

Zhenbo Li : mshtml: Added IHTMLStyle:: listStylePosition property implementation.
by Alexandre Julliard Aug. 11, 2014

Aug. 11, 2014

Module: wine Branch: master Commit: bf463eae053f9cd12ac1c0b59b1bdc3e6b66585e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf463eae053f9cd12ac1c0b59… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sun Aug 10 21:14:37 2014 +0800 mshtml: Added IHTMLStyle::listStylePosition property implementation. --- dlls/mshtml/htmlstyle.c | 15 +++++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 9 +++++++++ 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 2635c8b..1dca647 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -128,6 +128,8 @@ static const WCHAR attrLineHeight[] = {'l','i','n','e','-','h','e','i','g','h','t',0}; static const WCHAR attrListStyleType[] = {'l','i','s','t','-','s','t','y','l','e','-','t','y','p','e',0}; +static const WCHAR attrListStylePosition[] = + {'l','i','s','t','-','s','t','y','l','e','-','p','o','s','i','t','i','o','n',0}; static const WCHAR attrMargin[] = {'m','a','r','g','i','n',0}; static const WCHAR attrMarginBottom[] = @@ -245,6 +247,7 @@ static const style_tbl_entry_t style_tbl[] = { {attrLeft, DISPID_IHTMLSTYLE_LEFT}, {attrLetterSpacing, DISPID_IHTMLSTYLE_LETTERSPACING}, {attrLineHeight, DISPID_IHTMLSTYLE_LINEHEIGHT}, + {attrListStylePosition, DISPID_IHTMLSTYLE_LISTSTYLEPOSITION}, {attrListStyleType, DISPID_IHTMLSTYLE_LISTSTYLETYPE}, {attrMargin, DISPID_IHTMLSTYLE_MARGIN}, {attrMarginBottom, DISPID_IHTMLSTYLE_MARGINBOTTOM}, @@ -2196,15 +2199,19 @@ static HRESULT WINAPI HTMLStyle_get_listStyleType(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_listStylePosition(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_LISTSTYLEPOSITION, v, 0); } static HRESULT WINAPI HTMLStyle_get_listStylePosition(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_LISTSTYLEPOSITION, p); } static HRESULT WINAPI HTMLStyle_put_listStyleImage(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 6edde7b..813c782 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -78,6 +78,7 @@ typedef enum { STYLEID_LEFT, STYLEID_LETTER_SPACING, STYLEID_LINE_HEIGHT, + STYLEID_LISTSTYLEPOSITION, STYLEID_LISTSTYLETYPE, STYLEID_MARGIN, STYLEID_MARGIN_BOTTOM, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 9327f28..a454eff 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -2161,6 +2161,15 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_get_listStyleType(style, &str); ok(hres == S_OK, "get_listStyleType failed: %08x\n", hres); ok(!strcmp_wa(str, "square"), "listStyleType = %s\n", wine_dbgstr_w(str)); + + str = a2bstr("inside"); + hres = IHTMLStyle_put_listStylePosition(style, str); + ok(hres == S_OK, "put_listStylePosition failed: %08x\n", hres); + SysFreeString(str); + + hres = IHTMLStyle_get_listStylePosition(style, &str); + ok(hres == S_OK, "get_listStylePosition failed: %08x\n", hres); + ok(!strcmp_wa(str, "inside"), "listStyleType = %s\n", wine_dbgstr_w(str)); SysFreeString(str); hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2);

1 0

Zhenbo Li : mshtml: Added IHTMLStyleElement::lineHeight property.
by Alexandre Julliard Aug. 11, 2014

Aug. 11, 2014

Module: wine Branch: master Commit: ed9b0f758ae6bdde28b87109eee4fdd120689f07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed9b0f758ae6bdde28b87109e… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon Aug 11 11:08:04 2014 +0800 mshtml: Added IHTMLStyleElement::lineHeight property. --- dlls/mshtml/htmlstyle.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 22 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 6731149..2635c8b 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1507,15 +1507,19 @@ static HRESULT WINAPI HTMLStyle_get_textIndent(IHTMLStyle *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle_put_lineHeight(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_nsstyle_attr_var(This->nsstyle, STYLEID_LINE_HEIGHT, &v, 0); } static HRESULT WINAPI HTMLStyle_get_lineHeight(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr_var(This->nsstyle, STYLEID_LINE_HEIGHT, p, 0); } static HRESULT WINAPI HTMLStyle_put_marginTop(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index bd4b200..9327f28 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -742,6 +742,28 @@ static void test_body_style(IHTMLStyle *style) todo_wine ok(!strcmp_wa(V_BSTR(&v), "#00fdfd"), "V_BSTR(color) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + V_VT(&v) = VT_I4; + V_I4(&v) = 3; + hres = IHTMLStyle_put_lineHeight(style, v); + ok(hres == S_OK, "put_lineHeight failed: %08x\n", hres); + + hres = IHTMLStyle_get_lineHeight(style, &v); + ok(hres == S_OK, "get_lineHeight failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(lineHeight) = %d, expect VT_BSTR\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "3"), "V_BSTR(lineHeight) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("300%"); + hres = IHTMLStyle_put_lineHeight(style, v); + ok(hres == S_OK, "put_lineHeight failed: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle_get_lineHeight(style, &v); + ok(hres == S_OK, "get_lineHeight failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(lineHeight) = %d, expect VT_BSTR\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "300%"), "V_BSTR(lineHeight) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + b = 0xfefe; hres = IHTMLStyle_get_textDecorationUnderline(style, &b); ok(hres == S_OK, "get_textDecorationUnderline failed: %08x\n", hres);

1 0

André Hentschel : wpcap: Implement pcap_freealldevs.
by Alexandre Julliard Aug. 11, 2014

Aug. 11, 2014

Module: wine Branch: master Commit: b1c54557d7deba339f943fa5a23673d556eb7d8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1c54557d7deba339f943fa5a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 10 23:09:22 2014 +0200 wpcap: Implement pcap_freealldevs. --- 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 c08bbf8..b3ce425 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -36,6 +36,12 @@ int CDECL wine_pcap_findalldevs(pcap_if_t **alldevsp, char *errbuf) return ret; } +void CDECL wine_pcap_freealldevs(pcap_if_t *alldevs) +{ + TRACE("(%p)\n", alldevs); + pcap_freealldevs(alldevs); +} + const char* CDECL wine_pcap_lib_version(void) { const char* ret = pcap_lib_version(); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 6e4606e..ad90d1f 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -26,7 +26,7 @@ @ stub pcap_fileno @ cdecl pcap_findalldevs(ptr str) wine_pcap_findalldevs @ stub pcap_findalldevs_ex -@ stub pcap_freealldevs +@ cdecl pcap_freealldevs(ptr) wine_pcap_freealldevs @ stub pcap_freecode @ stub pcap_get_airpcap_handle @ stub pcap_geterr

1 0

André Hentschel : wpcap: Implement pcap_findalldevs.
by Alexandre Julliard Aug. 11, 2014

Aug. 11, 2014

Module: wine Branch: master Commit: ca1aa1cfa21e71c20ecf91cfe2d981752886b654 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca1aa1cfa21e71c20ecf91cfe… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 10 23:08:40 2014 +0200 wpcap: Implement pcap_findalldevs. --- dlls/wpcap/wpcap.c | 13 +++++++++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index a317e5f..c08bbf8 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -22,6 +22,19 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wpcap); +WINE_DECLARE_DEBUG_CHANNEL(winediag); + +int CDECL wine_pcap_findalldevs(pcap_if_t **alldevsp, char *errbuf) +{ + int ret; + + TRACE("(%p %p)\n", alldevsp, errbuf); + ret = pcap_findalldevs(alldevsp, errbuf); + if(alldevsp && !*alldevsp) + ERR_(winediag)("Failed to access raw network (pcap), this requires special permissions.\n"); + + return ret; +} const char* CDECL wine_pcap_lib_version(void) { diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index bcf8ea4..6e4606e 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -24,7 +24,7 @@ @ stub pcap_dump_open @ stub pcap_file @ stub pcap_fileno -@ stub pcap_findalldevs +@ cdecl pcap_findalldevs(ptr str) wine_pcap_findalldevs @ stub pcap_findalldevs_ex @ stub pcap_freealldevs @ stub pcap_freecode

1 0