wine-commits September 2014

wine-commits@winehq.org

2 participants
301 discussions

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 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

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

Michael Müller : user32: Also set cch member in GetMenuItemInfo when passing a null pointer.
by Alexandre Julliard 09 Sep '14

09 Sep '14

Module: wine Branch: master Commit: 997e197f23144fd53af6fceeec471411996ed6a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=997e197f23144fd53af6fceee… Author: Michael Müller <michael(a)fds-team.de> Date: Sun Sep 7 20:14:36 2014 +0200 user32: Also set cch member in GetMenuItemInfo when passing a null pointer. --- dlls/user32/menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 93bee49..9e05dd4 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4583,12 +4583,12 @@ static BOOL GetMenuItemInfo_common ( HMENU hmenu, UINT item, BOOL bypos, if ((lpmii->fMask & (MIIM_TYPE|MIIM_STRING))) { if( !menu->text ) { if(lpmii->dwTypeData && lpmii->cch) { - lpmii->cch = 0; if( unicode) *((WCHAR *)lpmii->dwTypeData) = 0; else *((CHAR *)lpmii->dwTypeData) = 0; } + lpmii->cch = 0; } else { int len; if (unicode)

1 0

Jactry Zeng : mshtml/tests: Fix typo.
by Alexandre Julliard 09 Sep '14

09 Sep '14

Module: wine Branch: master Commit: 4b1901d8c046d5d327397827e94f04cdc6b525b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b1901d8c046d5d327397827e… Author: Jactry Zeng <wine(a)jactry.com> Date: Tue Sep 9 14:28:54 2014 +0800 mshtml/tests: Fix typo. --- dlls/mshtml/tests/dom.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 03c3159..f946550 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5599,7 +5599,7 @@ static void test_body_funs(IHTMLBodyElement *body) hres = IHTMLBodyElement_get_bgColor(body, &vbg); ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); - ok(V_VT(&vDefaultbg) == VT_BSTR, "V_VT(&vDefaultbg) != VT_BSTR\n"); + 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); @@ -6081,7 +6081,7 @@ static void test_tr_elem(IHTMLElement *elem) hres = IHTMLTableRow_get_bgColor(row, &vbg); ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); - ok(V_VT(&vDefaultbg) == VT_BSTR, "V_VT(&vDefaultbg) != VT_BSTR\n"); + 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); @@ -6093,7 +6093,7 @@ static void test_tr_elem(IHTMLElement *elem) hres = IHTMLTableRow_get_bgColor(row, &vbg); ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); - ok(V_VT(&vDefaultbg) == VT_BSTR, "V_VT(&vDefaultbg) != VT_BSTR\n"); + 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); @@ -6323,7 +6323,7 @@ static void test_table_elem(IHTMLElement *elem) hres = IHTMLTable_get_bgColor(table, &vbg); ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); - ok(V_VT(&vDefaultbg) == VT_BSTR, "V_VT(&vDefaultbg) != VT_BSTR\n"); + 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); @@ -6335,7 +6335,7 @@ static void test_table_elem(IHTMLElement *elem) hres = IHTMLTable_get_bgColor(table, &vbg); ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); - ok(V_VT(&vDefaultbg) == VT_BSTR, "V_VT(&vDefaultbg) != VT_BSTR\n"); + 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);

1 0

André Hentschel : msvcmaker: Allow ocx tests.
by Alexandre Julliard 09 Sep '14

09 Sep '14

Module: wine Branch: master Commit: 71427de9634134e886e48eb89e2a9bf0ad83c171 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71427de9634134e886e48eb89… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 9 00:04:49 2014 +0200 msvcmaker: Allow ocx tests. --- tools/winapi/msvcmaker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index d0d0b63..a18eb97 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -199,7 +199,7 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) { $dir =~ s/\/Makefile\.in$//; my $dsp_file = $testdll; - $dsp_file =~ s/\.(dll|drv)$/_test.dsp/; + $dsp_file =~ s/\.(dll|drv|ocx)$/_test.dsp/; $dsp_file = "$dir/$dsp_file"; $wine_test_dsp_files{$dsp_file}{files} = [@files, "testlist.c"];

1 0

André Hentschel : msvcmaker: Allow hyphens in dll names.
by Alexandre Julliard 09 Sep '14

09 Sep '14

Module: wine Branch: master Commit: 97daaba1af0f433d84f37539af47cb98e57fc6e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97daaba1af0f433d84f37539a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 9 00:04:31 2014 +0200 msvcmaker: Allow hyphens in dll names. --- tools/winapi/msvcmaker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index 0c82420..d0d0b63 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -178,7 +178,7 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) { next; } - if(/^MODULE\s*=\s*([\w\.]+)$/) { + if(/^MODULE\s*=\s*([\w\.-]+)$/) { $module = $1; } elsif (/^\@MAKE_IMPLIB_RULES\@/) { $type = "lib";

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

Sebastian Lackner : ntdll: Use call_dll_entry_point to execute TLS callbacks.
by Alexandre Julliard 08 Sep '14

08 Sep '14

Module: wine Branch: master Commit: 636dc013cd45993c35ba00c7ec45c087aa183b0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=636dc013cd45993c35ba00c7e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Sep 7 01:46:52 2014 +0200 ntdll: Use call_dll_entry_point to execute TLS callbacks. --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index dfe7516..18ae29c 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1030,7 +1030,7 @@ static void call_tls_callbacks( HMODULE module, UINT reason ) GetCurrentThreadId(), *callback, module, reason_names[reason] ); __TRY { - (*callback)( module, reason, NULL ); + call_dll_entry_point( (DLLENTRYPROC)*callback, module, reason, NULL ); } __EXCEPT_ALL {

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2014