March 2012 - Wine-Commits - list.winehq.org

Cheer Xiao : po: Update simplified Chinese translation.
by Alexandre Julliard March 16, 2012

March 16, 2012

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

Alexandre Julliard : Release 1.5.0.
by Alexandre Julliard March 16, 2012

March 16, 2012

Module: wine Branch: master Commit: 7da070f9ca89a0204f587a5aa7bfb721e2c389a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7da070f9ca89a0204f587a5aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 16 19:57:36 2012 +0100 Release 1.5.0. --- ANNOUNCE | 974 ++++++++++++++++++++++++++++++++----------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 516 insertions(+), 478 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7da070f9ca89a0204f587…

1 0

Jacek Caban : mshtml: Store filter in HTMLElement object.
by Alexandre Julliard March 16, 2012

March 16, 2012

Module: wine Branch: master Commit: 348338257b62b2c18e6ade0aace296908a8bf8d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=348338257b62b2c18e6ade0aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 16 12:17:50 2012 +0100 mshtml: Store filter in HTMLElement object. --- dlls/mshtml/htmlelem.c | 8 ++++++-- dlls/mshtml/htmlstyle.c | 24 +++++++++++++++++------- dlls/mshtml/htmlstyle.h | 2 +- dlls/mshtml/mshtml_private.h | 3 ++- 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 7084105..1eab2cd 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -507,7 +507,7 @@ static HRESULT WINAPI HTMLElement_get_style(IHTMLElement *iface, IHTMLStyle **p) return E_FAIL; } - hres = HTMLStyle_Create(nsstyle, &This->style); + hres = HTMLStyle_Create(This, nsstyle, &This->style); nsIDOMCSSStyleDeclaration_Release(nsstyle); if(FAILED(hres)) return hres; @@ -1648,8 +1648,10 @@ void HTMLElement_destructor(HTMLDOMNode *iface) if(This->nselem) nsIDOMHTMLElement_Release(This->nselem); - if(This->style) + if(This->style) { + This->style->elem = NULL; IHTMLStyle_Release(&This->style->IHTMLStyle_iface); + } if(This->attrs) { HTMLDOMAttribute *attr; @@ -1660,6 +1662,8 @@ void HTMLElement_destructor(HTMLDOMNode *iface) IHTMLAttributeCollection_Release(&This->attrs->IHTMLAttributeCollection_iface); } + heap_free(This->filter); + HTMLDOMNode_destructor(&This->node); } diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 0487992..06a9a53 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -694,7 +694,6 @@ static ULONG WINAPI HTMLStyle_Release(IHTMLStyle *iface) if(!ref) { if(This->nsstyle) nsIDOMCSSStyleDeclaration_Release(This->nsstyle); - heap_free(This->filter); release_dispex(&This->dispex); heap_free(This); } @@ -2597,7 +2596,7 @@ static void set_opacity(HTMLStyle *This, const WCHAR *val) static void update_filter(HTMLStyle *This) { - const WCHAR *ptr = This->filter, *ptr2; + const WCHAR *ptr = This->elem->filter, *ptr2; static const WCHAR alphaW[] = {'a','l','p','h','a'}; @@ -2683,14 +2682,19 @@ static HRESULT WINAPI HTMLStyle_put_filter(IHTMLStyle *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + if(!This->elem) { + FIXME("Element already destroyed\n"); + return E_UNEXPECTED; + } + if(v) { new_filter = heap_strdupW(v); if(!new_filter) return E_OUTOFMEMORY; } - heap_free(This->filter); - This->filter = new_filter; + heap_free(This->elem->filter); + This->elem->filter = new_filter; update_filter(This); return S_OK; @@ -2702,8 +2706,13 @@ static HRESULT WINAPI HTMLStyle_get_filter(IHTMLStyle *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - if(This->filter) { - *p = SysAllocString(This->filter); + if(!This->elem) { + FIXME("Element already destroyed\n"); + return E_UNEXPECTED; + } + + if(This->elem->filter) { + *p = SysAllocString(This->elem->filter); if(!*p) return E_OUTOFMEMORY; }else { @@ -3038,7 +3047,7 @@ static dispex_static_data_t HTMLStyle_dispex = { HTMLStyle_iface_tids }; -HRESULT HTMLStyle_Create(nsIDOMCSSStyleDeclaration *nsstyle, HTMLStyle **ret) +HRESULT HTMLStyle_Create(HTMLElement *elem, nsIDOMCSSStyleDeclaration *nsstyle, HTMLStyle **ret) { HTMLStyle *style; @@ -3049,6 +3058,7 @@ HRESULT HTMLStyle_Create(nsIDOMCSSStyleDeclaration *nsstyle, HTMLStyle **ret) style->IHTMLStyle_iface.lpVtbl = &HTMLStyleVtbl; style->ref = 1; style->nsstyle = nsstyle; + style->elem = elem; HTMLStyle2_Init(style); HTMLStyle3_Init(style); diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index a11161e..ef4f2a2 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -28,7 +28,7 @@ struct HTMLStyle { LONG ref; nsIDOMCSSStyleDeclaration *nsstyle; - WCHAR *filter; + HTMLElement *elem; }; /* NOTE: Make sure to keep in sync with style_tbl in htmlstyle.c */ diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 75591f2..9e30464 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -556,6 +556,7 @@ typedef struct { nsIDOMHTMLElement *nselem; HTMLStyle *style; HTMLAttributeCollection *attrs; + WCHAR *filter; } HTMLElement; #define HTMLELEMENT_TIDS \ @@ -722,7 +723,7 @@ void set_ready_state(HTMLWindow*,READYSTATE) DECLSPEC_HIDDEN; HRESULT HTMLSelectionObject_Create(HTMLDocumentNode*,nsISelection*,IHTMLSelectionObject**) DECLSPEC_HIDDEN; HRESULT HTMLTxtRange_Create(HTMLDocumentNode*,nsIDOMRange*,IHTMLTxtRange**) DECLSPEC_HIDDEN; -HRESULT HTMLStyle_Create(nsIDOMCSSStyleDeclaration*,HTMLStyle**) DECLSPEC_HIDDEN; +HRESULT HTMLStyle_Create(HTMLElement*,nsIDOMCSSStyleDeclaration*,HTMLStyle**) DECLSPEC_HIDDEN; IHTMLStyleSheet *HTMLStyleSheet_Create(nsIDOMStyleSheet*) DECLSPEC_HIDDEN; IHTMLStyleSheetsCollection *HTMLStyleSheetsCollection_Create(nsIDOMStyleSheetList*) DECLSPEC_HIDDEN;

1 0

Piotr Caban : urlmon/tests: Test PI_MIMEVERIFICATION when MIME filter is in use.
by Alexandre Julliard March 16, 2012

March 16, 2012

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

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

March 16, 2012

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

Huw Davies : gdi32: Remove unused variable.
by Alexandre Julliard March 16, 2012

March 16, 2012

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 March 16, 2012

March 16, 2012

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

Piotr Caban : urlmon: Add mime handler layer before data is processed.
by Alexandre Julliard March 16, 2012

March 16, 2012

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 implementation.
by Alexandre Julliard March 16, 2012

March 16, 2012

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

Hans Leidekker : msi: Restrict the match on files from cabinets to files that have not been installed .
by Alexandre Julliard March 16, 2012

March 16, 2012

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