wine-commits March 2012

wine-commits@winehq.org

3 participants
710 discussions

Jacek Caban : mshtml: Don' t overwrite type of result if property type is VT_VARIANT.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: cfb219f910ab5b057c589b600f042d587d6eab32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfb219f910ab5b057c589b600… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 16 18:26:47 2012 +0100 mshtml: Don't overwrite type of result if property type is VT_VARIANT. --- dlls/mshtml/dispex.c | 3 ++- dlls/mshtml/tests/script.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 7eff5c6..c42e2ef 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -825,7 +825,8 @@ static HRESULT builtin_propget(DispatchEx *This, func_info_t *func, DISPPARAMS * if(FAILED(hres)) return hres; - V_VT(res) = func->prop_vt == VT_PTR ? VT_DISPATCH : func->prop_vt; + if(func->prop_vt != VT_VARIANT) + V_VT(res) = func->prop_vt == VT_PTR ? VT_DISPATCH : func->prop_vt; return S_OK; } diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 43c66c6..df391d6 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -1854,6 +1854,14 @@ static HRESULT dispex_propput(IDispatchEx *obj, DISPID id, DWORD flags, VARIANT return IDispatchEx_InvokeEx(obj, id, LOCALE_NEUTRAL, DISPATCH_PROPERTYPUT|flags, &dp, NULL, &ei, caller_sp); } +static HRESULT dispex_propget(IDispatchEx *obj, DISPID id, VARIANT *res, IServiceProvider *caller_sp) +{ + DISPPARAMS dp = {NULL}; + EXCEPINFO ei = {0}; + + return IDispatchEx_InvokeEx(obj, id, LOCALE_NEUTRAL, DISPATCH_PROPERTYGET, &dp, res, &ei, caller_sp); +} + static void test_func(IDispatchEx *obj) { DISPID id; @@ -1999,6 +2007,12 @@ static void test_arg_conv(IHTMLWindow2 *window) CHECK_CALLED(QS_VariantConversion); CHECK_CALLED(ChangeType); + V_VT(&v) = VT_EMPTY; + hres = dispex_propget(dispex, DISPID_IHTMLBODYELEMENT_BGCOLOR, &v, &caller_sp); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(var)=%d\n", V_VT(&v)); + ok(!V_BSTR(&v), "V_BSTR(&var) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + IDispatchEx_Release(dispex); }

1 0

Cheer Xiao : po: Update simplified Chinese translation.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: 465eca3ed6192bb08fb642fad2acac53c69fec7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=465eca3ed6192bb08fb642fad… Author: Cheer Xiao <xiaqqaix(a)gmail.com> Date: Fri Mar 16 23:45:47 2012 +0800 po: Update simplified Chinese translation. --- po/zh_CN.po | 1061 +++++++++++++++++------------------------------------------ 1 files changed, 309 insertions(+), 752 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=465eca3ed6192bb08fb64…

1 0

Huw Davies : gdi32: Remove unused variable.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: 18d19e7f18df0d29440989b69d34b260c7851bf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18d19e7f18df0d29440989b69… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 16 14:52:00 2012 +0000 gdi32: Remove unused variable. --- dlls/gdi32/freetype.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ec39814..461d646 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1707,7 +1707,6 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ { FT_Face ft_face; TT_OS2 *pOS2; - TT_Header *pHeader = NULL; FT_Error err; FT_Long face_index = 0, num_faces; INT ret = 0; @@ -1769,7 +1768,7 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ { if(!(pOS2 = pFT_Get_Sfnt_Table(ft_face, ft_sfnt_os2)) || !pFT_Get_Sfnt_Table(ft_face, ft_sfnt_hhea) || - !(pHeader = pFT_Get_Sfnt_Table(ft_face, ft_sfnt_head))) + !pFT_Get_Sfnt_Table(ft_face, ft_sfnt_head)) { TRACE("Font %s/%p lacks either an OS2, HHEA or HEAD table.\n" "Skipping this font.\n", debugstr_a(file), font_data_ptr);

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: 879d36d07c59e1c2ae17bd9f4c0a5415c38259d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=879d36d07c59e1c2ae17bd9f4… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Mar 16 16:44:06 2012 +0200 po: Update Finnish translation. --- po/fi.po | 27 +++++++-------------------- 1 files changed, 7 insertions(+), 20 deletions(-) diff --git a/po/fi.po b/po/fi.po index f46a079..239df7a 100644 --- a/po/fi.po +++ b/po/fi.po @@ -2180,16 +2180,12 @@ msgstr "" "varmenteen tai listan:" #: cryptui.rc:296 -#, fuzzy -#| msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (.p7b)" msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (*.p7b)" -msgstr "Cryptographic Message Syntax Standard/PKCS #7 -viestit (.p7b)" +msgstr "Cryptographic Message Syntax Standard/PKCS #7 -viestit (*.p7b)" #: cryptui.rc:298 -#, fuzzy -#| msgid "Personal Information Exchange/PKCS #12 (.pfx, .p12)" msgid "Personal Information Exchange/PKCS #12 (*.pfx; *.p12)" -msgstr "Personal Information Exchange/PKCS #12 (.pfx, .p12)" +msgstr "Personal Information Exchange/PKCS #12 (*.pfx; *.p12)" #: cryptui.rc:300 cryptui.rc:78 cryptui.rc:159 msgid "Microsoft Serialized Certificate Store (*.sst)" @@ -2332,32 +2328,24 @@ msgid "Select the format you want to use:" msgstr "Valitse käytettävä muoto:" #: cryptui.rc:405 -#, fuzzy -#| msgid "&DER-encoded X.509 (.cer)" msgid "&DER-encoded X.509 (*.cer)" -msgstr "&DER-enkoodattu X.509 (.cer)" +msgstr "&DER-enkoodattu X.509 (*.cer)" #: cryptui.rc:407 -#, fuzzy -#| msgid "Ba&se64-encoded X.509 (.cer):" msgid "Ba&se64-encoded X.509 (*.cer):" -msgstr "Ba&se64-enkoodattu X.509 (.cer):" +msgstr "Ba&se64-enkoodattu X.509 (*.cer):" #: cryptui.rc:409 -#, fuzzy -#| msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (.p7b)" msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" -msgstr "&Cryptographic Message Syntax Standard/PKCS #7 -viesti (.p7b)" +msgstr "&Cryptographic Message Syntax Standard/PKCS #7 -viesti (*.p7b)" #: cryptui.rc:411 msgid "&Include all certificates in the certification path if possible" msgstr "Sisällytä kaikki varmennuspolun varmenteet, jos mahdollista" #: cryptui.rc:413 -#, fuzzy -#| msgid "&Personal Information Exchange/PKCS #12 (.pfx)" msgid "&Personal Information Exchange/PKCS #12 (*.pfx)" -msgstr "&Personal Information Exchange/PKCS #12 (.pfx)" +msgstr "&Personal Information Exchange/PKCS #12 (*.pfx)" #: cryptui.rc:415 msgid "Incl&ude all certificates in the certification path if possible" @@ -12676,9 +12664,8 @@ msgid "Select an executable file" msgstr "Valitse suoritettava tiedosto" #: winecfg.rc:66 -#, fuzzy msgid "Autodetect" -msgstr "&Hae automaattisesti" +msgstr "Hae automaattisesti" #: winecfg.rc:67 msgid "Local hard disk"

1 0

Hans Leidekker : msi: Restrict the match on files from cabinets to files that have not been installed .
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: 45a62d53b6affc7c89419ee3cace4317fbf4bd7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=45a62d53b6affc7c89419ee3c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 16 16:13:30 2012 +0100 msi: Restrict the match on files from cabinets to files that have not been installed. --- dlls/msi/files.c | 2 +- dlls/msi/media.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index e928564..e3a12c3 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -253,7 +253,7 @@ static MSIFILE *find_file( MSIPACKAGE *package, const WCHAR *filename ) LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) { - if (!strcmpiW( filename, file->File )) return file; + if (file->state != msifs_installed && !strcmpiW( filename, file->File )) return file; } return NULL; } diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 69bcb91..0199178 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -428,7 +428,7 @@ static INT_PTR cabinet_copy_file(FDINOTIFICATIONTYPE fdint, goto done; } - TRACE("extracting %s\n", debugstr_w(path)); + TRACE("extracting %s -> %s\n", debugstr_w(data->curfile), debugstr_w(path)); attrs = attrs & (FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_SYSTEM); if (!attrs) attrs = FILE_ATTRIBUTE_NORMAL;

1 0

Aric Stewart : wineqtdecoder: Ignore requests for IID_IAMFilterMiscFlags, we do not need to implement it.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: 72550c9d3aad25446dfc888302f0dbda5a29d6c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72550c9d3aad25446dfc88830… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 16 09:02:57 2012 -0500 wineqtdecoder: Ignore requests for IID_IAMFilterMiscFlags, we do not need to implement it. --- dlls/wineqtdecoder/qtsplitter.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 9f01094..aea2f47 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -341,7 +341,8 @@ static HRESULT WINAPI QT_QueryInterface(IBaseFilter *iface, REFIID riid, LPVOID return S_OK; } - if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow)) + if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow) && + !IsEqualIID(riid, &IID_IAMFilterMiscFlags)) FIXME("No interface for %s!\n", debugstr_guid(riid)); return E_NOINTERFACE;

1 0

Piotr Caban : urlmon/tests: Test PI_MIMEVERIFICATION when MIME filter is in use.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: ea407686bb62667cf6b4a5614771254054a3216e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea407686bb62667cf6b4a5614… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 16 15:00:44 2012 +0100 urlmon/tests: Test PI_MIMEVERIFICATION when MIME filter is in use. --- dlls/urlmon/tests/protocol.c | 78 ++++++++++++++++++++++++++++++++---------- 1 files changed, 60 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ea407686bb62667cf6b4a…

1 0

Piotr Caban : urlmon: Add mime handler layer before data is processed.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: 38d578af5e7f6788fd23f5bca0899977cb70ad4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=38d578af5e7f6788fd23f5bca… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 16 15:00:29 2012 +0100 urlmon: Add mime handler layer before data is processed. --- dlls/urlmon/Makefile.in | 1 - dlls/urlmon/bindprot.c | 395 +++++++++++++++++++++++++----------------- dlls/urlmon/protproxy.c | 292 ------------------------------- dlls/urlmon/tests/protocol.c | 6 +- dlls/urlmon/urlmon_main.h | 15 +-- 5 files changed, 243 insertions(+), 466 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=38d578af5e7f6788fd23f…

1 0

Jacek Caban : mshtml: Added IHTMLCurrentStyle2::get_filter tests.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: 8e2f97fa65ac0d15ad1f146ab344d5d1f68e08e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e2f97fa65ac0d15ad1f146ab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 16 12:18:19 2012 +0100 mshtml: Added IHTMLCurrentStyle2::get_filter tests. --- dlls/mshtml/tests/style.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 793b51c..9fe8512 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -52,6 +52,17 @@ static BSTR a2bstr(const char *str) return ret; } +#define get_elem2_iface(u) _get_elem2_iface(__LINE__,u) +static IHTMLElement2 *_get_elem2_iface(unsigned line, IUnknown *unk) +{ + IHTMLElement2 *elem; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLElement2, (void**)&elem); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElement2: %08x\n", hres); + return elem; +} + static IHTMLElement *get_element_by_id(IHTMLDocument2 *doc, const char *id) { HRESULT hres; @@ -1837,6 +1848,23 @@ static void _test_style_filter(unsigned line, IHTMLStyle *style, const char *exv SysFreeString(str); } +#define test_current_style_filter(a,b) _test_current_style_filter(__LINE__,a,b) +static void _test_current_style_filter(unsigned line, IHTMLCurrentStyle2 *style, const char *exval) +{ + BSTR str; + HRESULT hres; + + str = (void*)0xdeadbeef; + hres = IHTMLCurrentStyle2_get_filter(style, &str); + ok_(__FILE__,line)(hres == S_OK, "get_filter failed: %08x\n", hres); + if(exval) + ok_(__FILE__,line)(str && !strcmp_wa(str, exval), "filter = %s, expected %s\n", wine_dbgstr_w(str), exval); + else + ok_(__FILE__,line)(!str, "str = %s, expected NULL\n", wine_dbgstr_w(str)); + + SysFreeString(str); +} + #define set_style_filter(a,b) _set_style_filter(__LINE__,a,b) static void _set_style_filter(unsigned line, IHTMLStyle *style, const char *val) { @@ -1852,14 +1880,26 @@ static void _set_style_filter(unsigned line, IHTMLStyle *style, const char *val) static void test_style_filters(IHTMLElement *elem) { + IHTMLElement2 *elem2 = get_elem2_iface((IUnknown*)elem); + IHTMLCurrentStyle2 *current_style2; + IHTMLCurrentStyle *current_style; IHTMLStyle *style; HRESULT hres; hres = IHTMLElement_get_style(elem, &style); ok(hres == S_OK, "get_style failed: %08x\n", hres); + hres = IHTMLElement2_get_currentStyle(elem2, &current_style); + ok(hres == S_OK, "get_style failed: %08x\n", hres); + + hres = IHTMLCurrentStyle_QueryInterface(current_style, &IID_IHTMLCurrentStyle2, (void**)&current_style2); + IHTMLCurrentStyle_Release(current_style); + ok(hres == S_OK, "Could not get IHTMLCurrentStyle2 iface: %08x\n", hres); + test_style_filter(style, NULL); + test_current_style_filter(current_style2, NULL); set_style_filter(style, "alpha(opacity=50.0040)"); + test_current_style_filter(current_style2, "alpha(opacity=50.0040)"); set_style_filter(style, "alpha(opacity=100)"); IHTMLStyle_Release(style); @@ -1871,7 +1911,9 @@ static void test_style_filters(IHTMLElement *elem) set_style_filter(style, "xxx(a,b,c) alpha(opacity=100)"); set_style_filter(style, NULL); + IHTMLCurrentStyle2_Release(current_style2); IHTMLStyle_Release(style); + IHTMLElement2_Release(elem2); } static void test_current_style(IHTMLCurrentStyle *current_style)

1 0

Jacek Caban : mshtml: Added IHTMLCurrentStyle2::get_filter implementation.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: 57b2075af86686256696c4c3afa49f909bb48122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57b2075af86686256696c4c3a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 16 12:18:07 2012 +0100 mshtml: Added IHTMLCurrentStyle2::get_filter implementation. --- dlls/mshtml/htmlcurstyle.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index c17b3ba..f773605 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -42,6 +42,7 @@ struct HTMLCurrentStyle { LONG ref; nsIDOMCSSStyleDeclaration *nsstyle; + HTMLElement *elem; }; static inline HTMLCurrentStyle *impl_from_IHTMLCurrentStyle(IHTMLCurrentStyle *iface) @@ -118,6 +119,7 @@ static ULONG WINAPI HTMLCurrentStyle_Release(IHTMLCurrentStyle *iface) if(!ref) { if(This->nsstyle) nsIDOMCSSStyleDeclaration_Release(This->nsstyle); + IHTMLElement_Release(&This->elem->IHTMLElement_iface); release_dispex(&This->dispex); heap_free(This); } @@ -1054,8 +1056,18 @@ static HRESULT WINAPI HTMLCurrentStyle2_get_zoom(IHTMLCurrentStyle2 *iface, VARI static HRESULT WINAPI HTMLCurrentStyle2_get_filter(IHTMLCurrentStyle2 *iface, BSTR *p) { HTMLCurrentStyle *This = impl_from_IHTMLCurrentStyle2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if(This->elem->filter) { + *p = SysAllocString(This->elem->filter); + if(!*p) + return E_OUTOFMEMORY; + }else { + *p = NULL; + } + + return S_OK; } static HRESULT WINAPI HTMLCurrentStyle2_get_textAlignLast(IHTMLCurrentStyle2 *iface, BSTR *p) @@ -1349,6 +1361,9 @@ HRESULT HTMLCurrentStyle_Create(HTMLElement *elem, IHTMLCurrentStyle **p) init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLCurrentStyle_iface, &HTMLCurrentStyle_dispex); + IHTMLElement_AddRef(&elem->IHTMLElement_iface); + ret->elem = elem; + *p = &ret->IHTMLCurrentStyle_iface; return S_OK; }

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
71
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 March 2012