June 2012 - Wine-commits - list.winehq.org

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 363d39e153ff68b9ed2802e97c59d3681c3b2240 URL: http://source.winehq.org/git/wine.git/?a=commit;h=363d39e153ff68b9ed2802e97… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Jun 28 18:30:49 2012 +0300 po: Update Finnish translation. --- po/fi.po | 48 +++++++++++++++++++++++++++++++++++++----------- 1 files changed, 37 insertions(+), 11 deletions(-) diff --git a/po/fi.po b/po/fi.po index 3470853..8b0b6ec 100644 --- a/po/fi.po +++ b/po/fi.po @@ -9632,6 +9632,32 @@ msgid "" "/ProgIDOpen Open a document using the specified progID.\n" "/? Display this help and exit.\n" msgstr "" +"Käynnistä ohjelma tai avaa dokumentti ohjelmalla, jota yleensä käytetään " +"kyseiseen tiedostopäätteeseen.\n" +"Käyttö:\n" +"start [valitsimet] ohjelman_tiedostonimi [...]\n" +"start [valitsimet] dokumentin_tiedostonimi\n" +"\n" +"Valitsimet:\n" +"\"otsikko\" Asettaa lapsi-ikkunoiden otsikon.\n" +"/d hakemisto Käynnistä ohjelma määrätyssä hakemistossa.\n" +"/b Älä luo uutta konsolia ohjelmalle.\n" +"/i Käynnistä ohjelma tuoreilla ympäristömuuttujilla.\n" +"/min Käynnistä ohjelma pienennettynä.\n" +"/max Käynnistä ohjelma suurennettuna.\n" +"/low Käynnistä ohjelma matalassa prioriteettiluokassa.\n" +"/normal Käynnistä ohjelma normaalissa prioriteetiluokassa.\n" +"/high Käynnistä ohjelma korkeassa prioriteetiluokassa.\n" +"/realtime Käynnistä ohjelma reaaliaikaisessa prioriteetiluokassa.\n" +"/abovenormal Käynnistä ohjelma normaalia korkeammassa prioriteetiluokassa.\n" +"/belownormal Käynnistä ohjelma normaalia matalammassa prioriteetiluokassa.\n" +"/node n Käynnistä ohjelma määrätyllä NUMA-solmulla.\n" +"/affinity peite Käynnistä ohjelma määrätyllä affiniteettipeitteellä.\n" +"/wait Odota, että ohjelma sulkeutuu, ja palauta sen paluuarvo.\n" +"/unix Käytä Unix-tiedostonimeä ja avaa tiedosto siten, kuin Windows " +"Explorer avaisi sen.\n" +"/ProgIDOpen Avaa dokumentti määrätyllä progID:llä.\n" +"/? Näytä tämä ohje ja lopeta.\n" #: cmd.rc:211 msgid "TIME sets or shows the current system time.\n" @@ -11457,11 +11483,11 @@ msgstr "Virhe: Joko /im tai /pid on annettava.\n" #: taskkill.rc:31 msgid "Error: Option %1 expects a command line parameter.\n" -msgstr "Virhe: Valinta %1 vaatii komentoriviparametrin.\n" +msgstr "Virhe: Valitsin %1 vaatii komentoriviparametrin.\n" #: taskkill.rc:32 msgid "Error: Options /im and /pid are mutually exclusive.\n" -msgstr "Virhe: Valinnat /im ja /pid ovat keskenään vaihtoehtoiset.\n" +msgstr "Virhe: Valitsimet /im ja /pid ovat keskenään vaihtoehtoiset.\n" #: taskkill.rc:33 msgid "Close message sent to top-level windows of process with PID %1!u!.\n" @@ -11615,15 +11641,15 @@ msgstr "Aseta &prioriteetti" #: taskmgr.rc:156 msgid "&Realtime" -msgstr "&Reaaliaika" +msgstr "&Reaaliaikainen" #: taskmgr.rc:160 msgid "&Above Normal" -msgstr "Normaalin &yläpuolella" +msgstr "Normaalia k&orkeampi" #: taskmgr.rc:164 msgid "&Below Normal" -msgstr "Normaalin &alapuolella" +msgstr "Normaalia m&atalampi" #: taskmgr.rc:169 msgid "Set &Affinity..." @@ -12111,7 +12137,7 @@ msgstr "Kontrolloi, millä suorittimilla prosessia voidaan ajaa" #: taskmgr.rc:237 msgid "Sets process to the REALTIME priority class" -msgstr "Asettaa prosessin REALTIME-prioriteettiluokkaan" +msgstr "Asettaa prosessin prioriteettiluokkaan REAALIAIKAINEN" #: taskmgr.rc:238 msgid "Sets process to the HIGH priority class" @@ -12119,15 +12145,15 @@ msgstr "Asettaa prosessin prioriteettiluokkaan KORKEA" #: taskmgr.rc:240 msgid "Sets process to the ABOVE NORMAL priority class" -msgstr "Asettaa prosessin prioriteettiluokkaan YLI KESKITASON" +msgstr "Asettaa prosessin prioriteettiluokkaan NORMAALIA KORKEAMPI" #: taskmgr.rc:242 msgid "Sets process to the NORMAL priority class" -msgstr "Asettaa prosessin prioriteettiluokkaan KESKITASO" +msgstr "Asettaa prosessin prioriteettiluokkaan NORMAALI" #: taskmgr.rc:244 msgid "Sets process to the BELOW NORMAL priority class" -msgstr "Asettaa prosessin prioriteettiluokkaan ALLE KESKITASON" +msgstr "Asettaa prosessin prioriteettiluokkaan NORMAALIA MATALAMPI" #: taskmgr.rc:245 msgid "Sets process to the LOW priority class" @@ -13096,9 +13122,9 @@ msgid "" msgstr "" "\n" "Käyttö:\n" -" wineconsole [vaihtoehdot] <komento>\n" +" wineconsole [valitsimet] <komento>\n" "\n" -"Vaihtoehdot:\n" +"Valitsimet:\n" #: wineconsole.rc:49 msgid ""

1 0

Piotr Caban : msvcp90: Always destroy _Lockit object in use_facet function.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: c679569f27fae1665ef0a0279b78dced97b4e1c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c679569f27fae1665ef0a0279… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 28 10:51:53 2012 +0200 msvcp90: Always destroy _Lockit object in use_facet function. --- dlls/msvcp90/locale.c | 56 ++++++++++++++++++++++++++++++++++++------------ 1 files changed, 42 insertions(+), 14 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 480861f..6fbe349 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -1537,8 +1537,10 @@ ctype_char* ctype_char_use_facet(const locale *loc) return (ctype_char*)fac; } - if(obj) + if(obj) { + _Lockit_dtor(&lock); return obj; + } ctype_char__Getcat(&fac, loc); obj = (ctype_char*)fac; @@ -2292,8 +2294,10 @@ ctype_wchar* ctype_wchar_use_facet(const locale *loc) return (ctype_wchar*)fac; } - if(obj) + if(obj) { + _Lockit_dtor(&lock); return obj; + } ctype_wchar__Getcat(&fac, loc); obj = (ctype_wchar*)fac; @@ -2318,8 +2322,10 @@ static ctype_wchar* ctype_short_use_facet(const locale *loc) return (ctype_wchar*)fac; } - if(obj) + if(obj) { + _Lockit_dtor(&lock); return obj; + } ctype_short__Getcat(&fac, loc); obj = (ctype_wchar*)fac; @@ -2783,8 +2789,10 @@ codecvt_char* codecvt_char_use_facet(const locale *loc) return (codecvt_char*)fac; } - if(obj) + if(obj) { + _Lockit_dtor(&lock); return obj; + } codecvt_char__Getcat(&fac, loc); obj = (codecvt_char*)fac; @@ -3086,8 +3094,10 @@ static codecvt_wchar* codecvt_wchar_use_facet(const locale *loc) return (codecvt_wchar*)fac; } - if(obj) + if(obj) { + _Lockit_dtor(&lock); return obj; + } codecvt_wchar__Getcat(&fac, loc); obj = (codecvt_wchar*)fac; @@ -3136,8 +3146,10 @@ static codecvt_wchar* codecvt_short_use_facet(const locale *loc) return (codecvt_wchar*)fac; } - if(obj) + if(obj) { + _Lockit_dtor(&lock); return obj; + } codecvt_short__Getcat(&fac, loc); obj = (codecvt_wchar*)fac; @@ -3547,8 +3559,10 @@ static numpunct_char* numpunct_char_use_facet(const locale *loc) return (numpunct_char*)fac; } - if(obj) + if(obj) { + _Lockit_dtor(&lock); return obj; + } numpunct_char__Getcat(&fac, loc); obj = (numpunct_char*)fac; @@ -3904,8 +3918,10 @@ static numpunct_wchar* numpunct_wchar_use_facet(const locale *loc) return (numpunct_wchar*)fac; } - if(obj) + if(obj) { + _Lockit_dtor(&lock); return obj; + } numpunct_wchar__Getcat(&fac, loc); obj = (numpunct_wchar*)fac; @@ -3950,8 +3966,10 @@ static numpunct_wchar* numpunct_short_use_facet(const locale *loc) return (numpunct_wchar*)fac; } - if(obj) + if(obj) { + _Lockit_dtor(&lock); return obj; + } numpunct_short__Getcat(&fac, loc); obj = (numpunct_wchar*)fac; @@ -4347,8 +4365,10 @@ num_get* num_get_wchar_use_facet(const locale *loc) return (num_get*)fac; } - if(obj) + if(obj) { + _Lockit_dtor(&lock); return obj; + } num_get_wchar__Getcat(&fac, loc); obj = (num_get*)fac; @@ -4385,8 +4405,10 @@ static num_get* num_get_short_use_facet(const locale *loc) return (num_get*)fac; } - if(obj) + if(obj) { + _Lockit_dtor(&lock); return obj; + } num_get_short__Getcat(&fac, loc); obj = (num_get*)fac; @@ -5483,8 +5505,10 @@ num_get* num_get_char_use_facet(const locale *loc) return (num_get*)fac; } - if(obj) + if(obj) { + _Lockit_dtor(&lock); return obj; + } num_get_char__Getcat(&fac, loc); obj = (num_get*)fac; @@ -6333,8 +6357,10 @@ num_put* num_put_char_use_facet(const locale *loc) return (num_put*)fac; } - if(obj) + if(obj) { + _Lockit_dtor(&lock); return obj; + } num_put_char__Getcat(&fac, loc); obj = (num_put*)fac; @@ -6944,8 +6970,10 @@ num_put* num_put_wchar_use_facet(const locale *loc) return (num_put*)fac; } - if(obj) + if(obj) { + _Lockit_dtor(&lock); return obj; + } num_put_wchar__Getcat(&fac, loc); obj = (num_put*)fac;

1 0

Jacek Caban : mshtml: Share nsrow reference with nsnode.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: b1ed6b2dd61811f97de9b095eb151cf4e6c50aa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1ed6b2dd61811f97de9b095e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 28 11:19:41 2012 +0200 mshtml: Share nsrow reference with nsnode. --- dlls/mshtml/htmltablerow.c | 24 +++++++----------------- 1 files changed, 7 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index db5c7f2..66cf711 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -287,19 +288,9 @@ static HRESULT HTMLTableRow_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return HTMLElement_QI(&This->element.node, riid, ppv); } -static void HTMLTableRow_destructor(HTMLDOMNode *iface) -{ - HTMLTableRow *This = impl_from_HTMLDOMNode(iface); - - if(This->nsrow) - nsIDOMHTMLTableRowElement_Release(This->nsrow); - - HTMLElement_destructor(&This->element.node); -} - static const NodeImplVtbl HTMLTableRowImplVtbl = { HTMLTableRow_QI, - HTMLTableRow_destructor, + HTMLElement_destructor, HTMLElement_clone, HTMLElement_get_attr_col }; @@ -329,14 +320,13 @@ HRESULT HTMLTableRow_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HT ret->IHTMLTableRow_iface.lpVtbl = &HTMLTableRowVtbl; ret->element.node.vtbl = &HTMLTableRowImplVtbl; + HTMLElement_Init(&ret->element, doc, nselem, &HTMLTableRow_dispex); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLTableRowElement, (void**)&ret->nsrow); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMHTMLTableRowElement iface: %08x\n", nsres); - heap_free(ret); - return E_OUTOFMEMORY; - } - HTMLElement_Init(&ret->element, doc, nselem, &HTMLTableRow_dispex); + /* Share nsrow reference with nsnode */ + assert(nsres == NS_OK && (nsIDOMNode*)ret->nsrow == ret->element.node.nsnode); + nsIDOMNode_Release(ret->element.node.nsnode); *elem = &ret->element; return S_OK;

1 0

Jacek Caban : mshtml: Share nsstyle reference with nsnode.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 1f5b201e34507f5ae8cb4b8022161324356177ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f5b201e34507f5ae8cb4b802… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 28 11:19:51 2012 +0200 mshtml: Share nsstyle reference with nsnode. --- dlls/mshtml/htmlstyleelem.c | 25 ++++++++----------------- 1 files changed, 8 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmlstyleelem.c b/dlls/mshtml/htmlstyleelem.c index d866db2..d0eb9c0 100644 --- a/dlls/mshtml/htmlstyleelem.c +++ b/dlls/mshtml/htmlstyleelem.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -282,19 +283,9 @@ static HRESULT HTMLStyleElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return S_OK; } -static void HTMLStyleElement_destructor(HTMLDOMNode *iface) -{ - HTMLStyleElement *This = impl_from_HTMLDOMNode(iface); - - if(This->nsstyle) - nsIDOMHTMLStyleElement_Release(This->nsstyle); - - HTMLElement_destructor(&This->element.node); -} - static const NodeImplVtbl HTMLStyleElementImplVtbl = { HTMLStyleElement_QI, - HTMLStyleElement_destructor, + HTMLElement_destructor, HTMLElement_clone, HTMLElement_get_attr_col }; @@ -323,14 +314,14 @@ HRESULT HTMLStyleElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem ret->IHTMLStyleElement_iface.lpVtbl = &HTMLStyleElementVtbl; ret->element.node.vtbl = &HTMLStyleElementImplVtbl; + HTMLElement_Init(&ret->element, doc, nselem, &HTMLStyleElement_dispex); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLStyleElement, (void**)&ret->nsstyle); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMHTMLStyleElement iface: %08x\n", nsres); - heap_free(ret); - return E_FAIL; - } - HTMLElement_Init(&ret->element, doc, nselem, &HTMLStyleElement_dispex); + /* Share nsstyle reference with nsnode */ + assert(nsres == NS_OK && (nsIDOMNode*)ret->nsstyle == ret->element.node.nsnode); + nsIDOMNode_Release(ret->element.node.nsnode); + *elem = &ret->element; return S_OK; }

1 0

Jacek Caban : mshtml: Share nstextarea reference with nsnode.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: b6cfd581704753ddbc5178617e4830a668a21b90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6cfd581704753ddbc5178617… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 28 11:20:05 2012 +0200 mshtml: Share nstextarea reference with nsnode. --- dlls/mshtml/htmltextarea.c | 23 +++++++---------------- 1 files changed, 7 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 2a6fe5e..c95bde2 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -398,15 +399,6 @@ static HRESULT HTMLTextAreaElement_QI(HTMLDOMNode *iface, REFIID riid, void **pp return HTMLElement_QI(&This->element.node, riid, ppv); } -static void HTMLTextAreaElement_destructor(HTMLDOMNode *iface) -{ - HTMLTextAreaElement *This = impl_from_HTMLDOMNode(iface); - - nsIDOMHTMLTextAreaElement_Release(This->nstextarea); - - HTMLElement_destructor(&This->element.node); -} - static HRESULT HTMLTextAreaElementImpl_put_disabled(HTMLDOMNode *iface, VARIANT_BOOL v) { HTMLTextAreaElement *This = impl_from_HTMLDOMNode(iface); @@ -421,7 +413,7 @@ static HRESULT HTMLTextAreaElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_ static const NodeImplVtbl HTMLTextAreaElementImplVtbl = { HTMLTextAreaElement_QI, - HTMLTextAreaElement_destructor, + HTMLElement_destructor, HTMLElement_clone, HTMLElement_get_attr_col, NULL, @@ -456,15 +448,14 @@ HRESULT HTMLTextAreaElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nse ret->IHTMLTextAreaElement_iface.lpVtbl = &HTMLTextAreaElementVtbl; ret->element.node.vtbl = &HTMLTextAreaElementImplVtbl; + HTMLElement_Init(&ret->element, doc, nselem, &HTMLTextAreaElement_dispex); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLTextAreaElement, (void**)&ret->nstextarea); - if(NS_FAILED(nsres)) { - ERR("Could not get nsDOMHTMLInputElement: %08x\n", nsres); - heap_free(ret); - return E_FAIL; - } - HTMLElement_Init(&ret->element, doc, nselem, &HTMLTextAreaElement_dispex); + /* Share nstextarea reference with nsnode */ + assert(nsres == NS_OK && (nsIDOMNode*)ret->nstextarea == ret->element.node.nsnode); + nsIDOMNode_Release(ret->element.node.nsnode); *elem = &ret->element; return S_OK;

1 0

Jacek Caban : mshtml: Use proper macro to release nstext.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 66ee1fc98db102bf353e7dcbc5b47ff81f171c02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66ee1fc98db102bf353e7dcbc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 28 11:20:14 2012 +0200 mshtml: Use proper macro to release nstext. --- dlls/mshtml/htmldoc3.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index f930bcd..5241325 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -130,7 +130,7 @@ static HRESULT WINAPI HTMLDocument3_createTextNode(IHTMLDocument3 *iface, BSTR t } hres = HTMLDOMTextNode_Create(This->doc_node, (nsIDOMNode*)nstext, &node); - nsIDOMElement_Release(nstext); + nsIDOMText_Release(nstext); if(FAILED(hres)) return hres;

1 0

Jacek Caban : mshtml: Share nsinput reference with nsnode.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: d37f7a91400bad741f47323c6fb15b86dbcb534f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d37f7a91400bad741f47323c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 28 11:20:28 2012 +0200 mshtml: Share nsinput reference with nsnode. --- dlls/mshtml/htmlinput.c | 23 +++++++---------------- 1 files changed, 7 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index a174634..27b1b47 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -1117,15 +1118,6 @@ static HRESULT HTMLInputElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return HTMLElement_QI(&This->element.node, riid, ppv); } -static void HTMLInputElement_destructor(HTMLDOMNode *iface) -{ - HTMLInputElement *This = impl_from_HTMLDOMNode(iface); - - nsIDOMHTMLInputElement_Release(This->nsinput); - - HTMLElement_destructor(&This->element.node); -} - static HRESULT HTMLInputElementImpl_fire_event(HTMLDOMNode *iface, eventid_t eid, BOOL *handled) { HTMLInputElement *This = impl_from_HTMLDOMNode(iface); @@ -1159,7 +1151,7 @@ static HRESULT HTMLInputElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_BOO static const NodeImplVtbl HTMLInputElementImplVtbl = { HTMLInputElement_QI, - HTMLInputElement_destructor, + HTMLElement_destructor, HTMLElement_clone, HTMLElement_get_attr_col, NULL, @@ -1194,14 +1186,13 @@ HRESULT HTMLInputElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem ret->IHTMLInputTextElement_iface.lpVtbl = &HTMLInputTextElementVtbl; ret->element.node.vtbl = &HTMLInputElementImplVtbl; + HTMLElement_Init(&ret->element, doc, nselem, &HTMLInputElement_dispex); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLInputElement, (void**)&ret->nsinput); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMHTMLInputElement interface: %08x\n", nsres); - heap_free(ret); - return E_FAIL; - } - HTMLElement_Init(&ret->element, doc, nselem, &HTMLInputElement_dispex); + /* Share nsinput reference with nsnode */ + assert(nsres == NS_OK && (nsIDOMNode*)ret->nsinput == ret->element.node.nsnode); + nsIDOMNode_Release(ret->element.node.nsnode); *elem = &ret->element; return S_OK;

1 0

Jacek Caban : mshtml: Share nsselect reference with nsnode.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 54fd0845c2e0661fd4d6104019e9c4e74e9f718b URL: http://source.winehq.org/git/wine.git/?a=commit;h=54fd0845c2e0661fd4d610401… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 28 11:20:40 2012 +0200 mshtml: Share nsselect reference with nsnode. --- dlls/mshtml/htmlselect.c | 23 +++++++---------------- 1 files changed, 7 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index d062c7e..587378b 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -529,15 +530,6 @@ static HRESULT HTMLSelectElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return HTMLElement_QI(&This->element.node, riid, ppv); } -static void HTMLSelectElement_destructor(HTMLDOMNode *iface) -{ - HTMLSelectElement *This = impl_from_HTMLDOMNode(iface); - - nsIDOMHTMLSelectElement_Release(This->nsselect); - - HTMLElement_destructor(&This->element.node); -} - static HRESULT HTMLSelectElementImpl_put_disabled(HTMLDOMNode *iface, VARIANT_BOOL v) { HTMLSelectElement *This = impl_from_HTMLDOMNode(iface); @@ -606,7 +598,7 @@ static HRESULT HTMLSelectElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid static const NodeImplVtbl HTMLSelectElementImplVtbl = { HTMLSelectElement_QI, - HTMLSelectElement_destructor, + HTMLElement_destructor, HTMLElement_clone, HTMLElement_get_attr_col, NULL, @@ -645,15 +637,14 @@ HRESULT HTMLSelectElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele ret->IHTMLSelectElement_iface.lpVtbl = &HTMLSelectElementVtbl; ret->element.node.vtbl = &HTMLSelectElementImplVtbl; + HTMLElement_Init(&ret->element, doc, nselem, &HTMLSelectElement_dispex); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLSelectElement, (void**)&ret->nsselect); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMHTMLSelectElement interfce: %08x\n", nsres); - heap_free(ret); - return E_FAIL; - } - HTMLElement_Init(&ret->element, doc, nselem, &HTMLSelectElement_dispex); + /* Share nsselect reference with nsnode */ + assert(nsres == NS_OK && (nsIDOMNode*)ret->nsselect == ret->element.node.nsnode); + nsIDOMNode_Release(ret->element.node.nsnode); *elem = &ret->element; return S_OK;

1 0

Dmitry Timoshkov : gdiplus: Increase refcount of the source stream when loading a bitmap instead of cloning it .
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 174b74bab29e5c83ab8a8d50d0b43b6fd1a13b53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=174b74bab29e5c83ab8a8d50d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 27 14:29:08 2012 +0900 gdiplus: Increase refcount of the source stream when loading a bitmap instead of cloning it. --- dlls/gdiplus/gdiplus_private.h | 2 +- dlls/gdiplus/image.c | 32 ++++++-------------------------- dlls/gdiplus/tests/image.c | 2 +- 3 files changed, 8 insertions(+), 28 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 1f50c91..498465d 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -262,7 +262,7 @@ struct GpAdustableArrowCap{ struct GpImage{ IPicture *picture; - IStream *stream; /* a copy of the source stream */ + IStream *stream; /* source stream */ ImageType type; GUID format; UINT flags; diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index d6e2a8c..e676a4e 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2775,6 +2775,8 @@ end: bitmap->image.frame_count = frame_count; bitmap->image.current_frame = active_frame; bitmap->image.stream = stream; + /* Pin the source stream */ + IStream_AddRef(stream); } return status; @@ -2842,7 +2844,7 @@ static GpStatus decode_image_olepicture_metafile(IStream* stream, REFCLSID clsid *image = GdipAlloc(sizeof(GpMetafile)); if(!*image) return OutOfMemory; (*image)->type = ImageTypeMetafile; - (*image)->stream = stream; + (*image)->stream = NULL; (*image)->picture = pic; (*image)->flags = ImageFlagsNone; (*image)->frame_count = 1; @@ -3011,42 +3013,21 @@ GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage *image, GDIPCONST GUID *d return stat; } -GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream *source, GpImage **image) +GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream *stream, GpImage **image) { GpStatus stat; LARGE_INTEGER seek; HRESULT hr; const struct image_codec *codec=NULL; - IStream *stream; - - hr = IStream_Clone(source, &stream); - if (FAILED(hr)) - { - STATSTG statstg; - - hr = IStream_Stat(source, &statstg, STATFLAG_NOOPEN); - if (FAILED(hr)) return hresult_to_status(hr); - - stat = GdipCreateStreamOnFile(statstg.pwcsName, GENERIC_READ, &stream); - if(stat != Ok) return stat; - } /* choose an appropriate image decoder */ stat = get_decoder_info(stream, &codec); - if (stat != Ok) - { - IStream_Release(stream); - return stat; - } + if (stat != Ok) return stat; /* seek to the start of the stream */ seek.QuadPart = 0; hr = IStream_Seek(stream, seek, STREAM_SEEK_SET, NULL); - if (FAILED(hr)) - { - IStream_Release(stream); - return hresult_to_status(hr); - } + if (FAILED(hr)) return hresult_to_status(hr); /* call on the image decoder to do the real work */ stat = codec->decode_func(stream, &codec->info.Clsid, 0, image); @@ -3058,7 +3039,6 @@ GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream *source, GpImage **image) return Ok; } - IStream_Release(stream); return stat; } diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 0285879..67d0a8b 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -2693,7 +2693,7 @@ static GpImage *load_image(const BYTE *image_data, UINT image_size) refcount = IStream_Release(stream); if (image_type == ImageTypeBitmap) - todo_wine ok(refcount >= 1, "expected stream refcount != 0\n"); + ok(refcount >= 1, "expected stream refcount != 0\n"); else ok(refcount == 0, "expected stream refcount 0, got %d\n", refcount);

1 0

Stefan Leichter : gdi32: Spelling fix.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: db21158faa1a3138aef43c3aeb9c2461c1e13e03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db21158faa1a3138aef43c3ae… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Jun 27 22:47:54 2012 +0200 gdi32: Spelling fix. --- dlls/gdi32/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 0c20ea5..bb97902 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3538,7 +3538,7 @@ INT WINAPI AddFontResourceExW( LPCWSTR str, DWORD fl, PVOID pdv ) int num_resources = 0; LPWSTR rt_font = (LPWSTR)((ULONG_PTR)8); /* we don't want to include winuser.h */ - TRACE("WineEndAddFontResourceEx failed on PE file %s - trying to load resources manually\n", + TRACE("WineEngAddFontResourceEx failed on PE file %s - trying to load resources manually\n", wine_dbgstr_w(str)); if (EnumResourceNamesW(hModule, rt_font, load_enumed_resource, (LONG_PTR)&num_resources)) ret = num_resources;

1 0