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

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

28 Jun '12

Module: wine Branch: master Commit: 8a9d3c845b76348e8c2fc038e48a22e7aa5c5271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a9d3c845b76348e8c2fc038e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 27 10:56:54 2012 +0200 mshtml: Share nsimg reference with nsnode. --- dlls/mshtml/htmlimg.c | 24 +++++++----------------- 1 files changed, 7 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 5d1c665..be33a71 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -621,16 +622,6 @@ static HRESULT HTMLImgElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return S_OK; } -static void HTMLImgElement_destructor(HTMLDOMNode *iface) -{ - HTMLImgElement *This = impl_from_HTMLDOMNode(iface); - - if(This->nsimg) - nsIDOMHTMLImageElement_Release(This->nsimg); - - HTMLElement_destructor(&This->element.node); -} - static HRESULT HTMLImgElement_get_readystate(HTMLDOMNode *iface, BSTR *p) { HTMLImgElement *This = impl_from_HTMLDOMNode(iface); @@ -640,7 +631,7 @@ static HRESULT HTMLImgElement_get_readystate(HTMLDOMNode *iface, BSTR *p) static const NodeImplVtbl HTMLImgElementImplVtbl = { HTMLImgElement_QI, - HTMLImgElement_destructor, + HTMLElement_destructor, HTMLElement_clone, HTMLElement_get_attr_col, NULL, @@ -676,14 +667,13 @@ HRESULT HTMLImgElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, ret->IHTMLImgElement_iface.lpVtbl = &HTMLImgElementVtbl; ret->element.node.vtbl = &HTMLImgElementImplVtbl; + HTMLElement_Init(&ret->element, doc, nselem, &HTMLImgElement_dispex); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLImageElement, (void**)&ret->nsimg); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMHTMLImageElement: %08x\n", nsres); - heap_free(ret); - return E_FAIL; - } - HTMLElement_Init(&ret->element, doc, nselem, &HTMLImgElement_dispex); + /* Share nsimg reference with nsnode */ + assert(nsres == NS_OK && (nsIDOMNode*)ret->nsimg == ret->element.node.nsnode); + nsIDOMNode_Release(ret->element.node.nsnode); *elem = &ret->element; return S_OK;

1 0

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

28 Jun '12

Module: wine Branch: master Commit: e45c62171908f36c87595a1eb49884c3c3082644 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e45c62171908f36c87595a1eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 27 10:57:56 2012 +0200 mshtml: Share nsoption reference with nsnode. --- dlls/mshtml/htmloption.c | 24 +++++++----------------- 1 files changed, 7 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index 8bc0f40..fac06ed 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -310,19 +311,9 @@ static HRESULT HTMLOptionElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return HTMLElement_QI(&This->element.node, riid, ppv); } -static void HTMLOptionElement_destructor(HTMLDOMNode *iface) -{ - HTMLOptionElement *This = impl_from_HTMLDOMNode(iface); - - if(This->nsoption) - nsIDOMHTMLOptionElement_Release(This->nsoption); - - HTMLElement_destructor(&This->element.node); -} - static const NodeImplVtbl HTMLOptionElementImplVtbl = { HTMLOptionElement_QI, - HTMLOptionElement_destructor, + HTMLElement_destructor, HTMLElement_clone, HTMLElement_get_attr_col }; @@ -351,14 +342,13 @@ HRESULT HTMLOptionElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele ret->IHTMLOptionElement_iface.lpVtbl = &HTMLOptionElementVtbl; ret->element.node.vtbl = &HTMLOptionElementImplVtbl; + HTMLElement_Init(&ret->element, doc, nselem, &HTMLOptionElement_dispex); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLOptionElement, (void**)&ret->nsoption); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMHTMLOptionElement interface: %08x\n", nsres); - heap_free(ret); - return E_FAIL; - } - HTMLElement_Init(&ret->element, doc, nselem, &HTMLOptionElement_dispex); + /* Share nsoption reference with nsnode */ + assert(nsres == NS_OK && (nsIDOMNode*)ret->nsoption == ret->element.node.nsnode); + nsIDOMNode_Release(ret->element.node.nsnode); *elem = &ret->element; return S_OK;

1 0

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

28 Jun '12

Module: wine Branch: master Commit: f2b32208545f120624aedb8d0690ee40e7806d95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2b32208545f120624aedb8d0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 27 10:58:11 2012 +0200 mshtml: Share nsscript reference with nsnode. --- dlls/mshtml/htmlscript.c | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 376db7b..e5806db 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -305,12 +306,6 @@ static HRESULT HTMLScriptElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return HTMLElement_QI(&This->element.node, riid, ppv); } -static void HTMLScriptElement_destructor(HTMLDOMNode *iface) -{ - HTMLScriptElement *This = impl_from_HTMLDOMNode(iface); - HTMLElement_destructor(&This->element.node); -} - static HRESULT HTMLScriptElement_get_readystate(HTMLDOMNode *iface, BSTR *p) { HTMLScriptElement *This = impl_from_HTMLDOMNode(iface); @@ -320,7 +315,7 @@ static HRESULT HTMLScriptElement_get_readystate(HTMLDOMNode *iface, BSTR *p) static const NodeImplVtbl HTMLScriptElementImplVtbl = { HTMLScriptElement_QI, - HTMLScriptElement_destructor, + HTMLElement_destructor, HTMLElement_clone, HTMLElement_get_attr_col, NULL, @@ -357,14 +352,13 @@ HRESULT HTMLScriptElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele ret->IHTMLScriptElement_iface.lpVtbl = &HTMLScriptElementVtbl; ret->element.node.vtbl = &HTMLScriptElementImplVtbl; + HTMLElement_Init(&ret->element, doc, nselem, &HTMLScriptElement_dispex); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLScriptElement, (void**)&ret->nsscript); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMHTMLScriptElement: %08x\n", nsres); - heap_free(ret); - return E_FAIL; - } - HTMLElement_Init(&ret->element, doc, nselem, &HTMLScriptElement_dispex); + /* Share nsscript reference with nsnode */ + assert(nsres == NS_OK && (nsIDOMNode*)ret->nsscript == ret->element.node.nsnode); + nsIDOMNode_Release(ret->element.node.nsnode); *elem = &ret->element; return S_OK;

1 0

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

28 Jun '12

Module: wine Branch: master Commit: 7a8f0994dfc4ac05272965fa51e5dec2b159c955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a8f0994dfc4ac05272965fa5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 27 10:58:23 2012 +0200 mshtml: Share nsobject reference with nsnode. --- dlls/mshtml/htmlobject.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 6f171c6..fdd6614 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -571,8 +572,6 @@ static void HTMLObjectElement_destructor(HTMLDOMNode *iface) if(This->plugin_container.plugin_host) detach_plugin_host(This->plugin_container.plugin_host); - if(This->nsobject) - nsIDOMHTMLObjectElement_Release(This->nsobject); HTMLElement_destructor(&This->plugin_container.element.node); } @@ -646,14 +645,13 @@ HRESULT HTMLObjectElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele ret->IHTMLObjectElement2_iface.lpVtbl = &HTMLObjectElement2Vtbl; ret->plugin_container.element.node.vtbl = &HTMLObjectElementImplVtbl; + HTMLElement_Init(&ret->plugin_container.element, doc, nselem, &HTMLObjectElement_dispex); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLObjectElement, (void**)&ret->nsobject); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMHTMLObjectElement iface: %08x\n", nsres); - heap_free(ret); - return E_FAIL; - } - HTMLElement_Init(&ret->plugin_container.element, doc, nselem, &HTMLObjectElement_dispex); + /* Share nsobject reference with nsnode */ + assert(nsres == NS_OK && (nsIDOMNode*)ret->nsobject == ret->plugin_container.element.node.nsnode); + nsIDOMNode_Release(ret->plugin_container.element.node.nsnode); *elem = &ret->plugin_container.element; return S_OK;

1 0

Piotr Caban : msvcp90: Added basic_istream::operator>>(char&) implementation.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: c1ae61b07f6f9d85188b7613cfdecb69a1e80597 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1ae61b07f6f9d85188b7613c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 27 11:15:49 2012 +0200 msvcp90: Added basic_istream::operator>>(char&) implementation. --- dlls/msvcp90/ios.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 8 +++--- 2 files changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index b3e541e..0950077 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -5755,6 +5755,30 @@ basic_istream_char* __cdecl basic_istream_char_get_bstr( return istream; } +/* ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAD(a)Z */ +/* ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAD(a)Z */ +basic_istream_char* __cdecl basic_istream_char_read_ch(basic_istream_char *istream, char *ch) +{ + IOSB_iostate state = IOSTATE_failbit; + int c = 0; + + TRACE("(%p %p)\n", istream, ch); + + if(basic_istream_char_sentry_create(istream, FALSE)) { + c = basic_streambuf_char_sbumpc(basic_ios_char_rdbuf_get( + basic_istream_char_get_basic_ios(istream))); + if(c != EOF) { + state = IOSTATE_goodbit; + *ch = c; + } + } + basic_istream_char_sentry_destroy(istream); + + basic_ios_char_setstate(basic_istream_char_get_basic_ios(istream), + state | (c==EOF ? IOSTATE_eofbit : IOSTATE_goodbit)); + return istream; +} + /* Caution: basic_istream uses virtual inheritance. */ static inline basic_ios_wchar* basic_istream_wchar_get_basic_ios(basic_istream_wchar *this) { @@ -6783,6 +6807,30 @@ basic_istream_wchar* __cdecl basic_istream_wchar_get_bstr( return istream; } +/* ??$?5_WU?$char_traits(a)_W@std@@@std@@YAAAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@AA_W(a)Z */ +/* ??$?5_WU?$char_traits(a)_W@std@@@std@@YAAEAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@0(a)AEAV10@AEA_W(a)Z */ +basic_istream_wchar* __cdecl basic_istream_wchar_read_ch(basic_istream_wchar *istream, wchar_t *ch) +{ + IOSB_iostate state = IOSTATE_failbit; + unsigned short c = 0; + + TRACE("(%p %p)\n", istream, ch); + + if(basic_istream_wchar_sentry_create(istream, FALSE)) { + c = basic_streambuf_wchar_sbumpc(basic_ios_wchar_rdbuf_get( + basic_istream_wchar_get_basic_ios(istream))); + if(c != WEOF) { + state = IOSTATE_goodbit; + *ch = c; + } + } + basic_istream_wchar_sentry_destroy(istream); + + basic_ios_wchar_setstate(basic_istream_wchar_get_basic_ios(istream), + state | (c==WEOF ? IOSTATE_eofbit : IOSTATE_goodbit)); + return istream; +} + /* ??0?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PAV?$basic_streambuf(a)DU?$char_traits(a)D@std@@@1@@Z */ /* ??0?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEAV?$basic_streambuf(a)DU?$char_traits(a)D@std@@@1@@Z */ DEFINE_THISCALL_WRAPPER(basic_iostream_char_ctor, 12) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index d1efc78..6d2656c 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -1,5 +1,5 @@ -@ stub -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAD(a)Z -@ stub -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAD(a)Z +@ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAD(a)Z(ptr ptr) basic_istream_char_read_ch +@ cdecl -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAD(a)Z(ptr ptr) basic_istream_char_read_ch @ stub -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PAD(a)Z @ stub -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEAD(a)Z @ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(ptr ptr) basic_istream_char_get_bstr @@ -36,8 +36,8 @@ @ stub -arch=win64 ??$?5U?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEAC(a)Z @ stub -arch=win32 ??$?5U?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PAE(a)Z @ stub -arch=win64 ??$?5U?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEAE(a)Z -@ stub -arch=win32 ??$?5_WU?$char_traits(a)_W@std@@@std@@YAAAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@AA_W(a)Z -@ stub -arch=win64 ??$?5_WU?$char_traits(a)_W@std@@@std@@YAAEAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@0(a)AEAV10@AEA_W(a)Z +@ cdecl -arch=win32 ??$?5_WU?$char_traits(a)_W@std@@@std@@YAAAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@AA_W(a)Z(ptr ptr) basic_istream_wchar_read_ch +@ cdecl -arch=win64 ??$?5_WU?$char_traits(a)_W@std@@@std@@YAAEAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@0(a)AEAV10@AEA_W(a)Z(ptr ptr) basic_istream_wchar_read_ch @ stub -arch=win32 ??$?5_WU?$char_traits(a)_W@std@@@std@@YAAAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@PA_W(a)Z @ stub -arch=win64 ??$?5_WU?$char_traits(a)_W@std@@@std@@YAAEAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@0(a)AEAV10@PEA_W(a)Z @ cdecl -arch=win32 ??$?5_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YAAAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@AAV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0@@Z(ptr ptr) basic_istream_wchar_get_bstr

1 0

Piotr Caban : msvcp80: Forward basic_string<char>:: erase functions to msvcp90.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 3c921119d69d718ea8fb912d14ac9c358c1e3b4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c921119d69d718ea8fb912d1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 27 11:16:05 2012 +0200 msvcp80: Forward basic_string<char>::erase functions to msvcp90. --- dlls/msvcp80/msvcp80.spec | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index bccae98..5198e27 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -3738,10 +3738,10 @@ @ cdecl -arch=win64 ?eq_int_type@?$char_traits(a)G@std@@SA_NAEBG0(a)Z(ptr ptr) msvcp90.?eq_int_type@?$char_traits(a)G@std@@SA_NAEBG0(a)Z @ cdecl -arch=win32 ?eq_int_type@?$char_traits(a)_W@std@@SA_NABG0(a)Z(ptr ptr) msvcp90.?eq_int_type@?$char_traits(a)_W@std@@SA_NABG0(a)Z @ cdecl -arch=win64 ?eq_int_type@?$char_traits(a)_W@std@@SA_NAEBG0(a)Z(ptr ptr) msvcp90.?eq_int_type@?$char_traits(a)_W@std@@SA_NAEBG0(a)Z -@ stub -arch=win32 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@0(a)Z -@ stub -arch=win64 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@0(a)Z -@ stub -arch=win32 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@@Z -@ stub -arch=win64 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@@Z +@ thiscall -arch=win32 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@0(a)Z(ptr ptr ptr ptr ptr ptr) msvcp90.?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z +@ cdecl -arch=win64 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@0(a)Z(ptr ptr ptr ptr) msvcp90.?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@0(a)Z +@ thiscall -arch=win32 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@@Z(ptr ptr ptr ptr) msvcp90.?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2@@Z +@ cdecl -arch=win64 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@@Z(ptr ptr ptr) msvcp90.?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2@@Z @ thiscall -arch=win32 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)II@Z(ptr long long) msvcp90.?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)II@Z @ cdecl -arch=win64 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)_K0@Z(ptr long long) msvcp90.?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)_K0@Z @ stub -arch=win32 ?erase@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAE?AV?$_String_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2(a)V32@0(a)Z

1 0

Piotr Caban : msvcp90: Added locale::facet:: _Register function implementation.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: f457511b1db81a951065efc8d23079f191b88e3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f457511b1db81a951065efc8d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 27 11:16:21 2012 +0200 msvcp90: Added locale::facet::_Register function implementation. --- dlls/msvcp90/locale.c | 10 ++++++++++ dlls/msvcp90/msvcp90.spec | 2 ++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 5cba182..7b98539 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -223,6 +223,16 @@ void __cdecl locale_facet_register(locale_facet *add) } /* Not exported from msvcp90 */ +/* ?_Register(a)facet@locale(a)std@@QAEXXZ */ +/* ?_Register(a)facet@locale(a)std@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(locale_facet__Register, 4) +void __thiscall locale_facet__Register(locale_facet *this) +{ + TRACE("(%p)\n", this); + locale_facet_register(this); +} + +/* Not exported from msvcp90 */ /* ??_7facet(a)locale@std@@6B@ */ extern const vtable_ptr MSVCP_locale_facet_vtable; diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 6d2656c..7126603 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5817,3 +5817,5 @@ @ extern ??_7facet(a)locale@std@@6B@ MSVCP_locale_facet_vtable @ cdecl -arch=win32 ?facet_Register(a)facet@locale(a)std@@CAXPAV123@@Z(ptr) locale_facet_register @ cdecl -arch=win64 ?facet_Register(a)facet@locale(a)std@@CAXPEAV123@@Z(ptr) locale_facet_register +@ thiscall -arch=win32 ?_Register(a)facet@locale(a)std@@QAEXXZ(ptr) locale_facet__Register +@ cdecl -arch=win64 ?_Register(a)facet@locale(a)std@@QEAAXXZ(ptr) locale_facet__Register

1 0

Piotr Caban : msvcp90: Added _Fiopen functions implementation.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: ccb4c4846641b81baddfd854c63b78f9092bf5a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccb4c4846641b81baddfd854c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 27 11:16:44 2012 +0200 msvcp90: Added _Fiopen functions implementation. --- dlls/msvcp90/ios.c | 47 +++++++++++++++++++++++++++++++++++--------- dlls/msvcp90/msvcp90.spec | 12 +++++----- 2 files changed, 43 insertions(+), 16 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 0950077..ae9e519 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -2036,12 +2036,9 @@ MSVCP_bool __thiscall basic_filebuf_char_is_open(const basic_filebuf_char *this) return this->file != NULL; } -/* ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEPAV12(a)PB_WHH@Z */ -/* ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAPEAV12(a)PEB_WHH@Z */ -/* ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEPAV12(a)PBGHH@Z */ -/* ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAPEAV12(a)PEBGHH@Z */ -DEFINE_THISCALL_WRAPPER(basic_filebuf_char_open_wchar, 16) -basic_filebuf_char* __thiscall basic_filebuf_char_open_wchar(basic_filebuf_char *this, const wchar_t *name, int mode, int prot) +/* ?_Fiopen(a)std@@YAPAU_iobuf@@PB_WHH(a)Z */ +/* ?_Fiopen(a)std@@YAPEAU_iobuf@@PEB_WHH(a)Z */ +FILE* __cdecl _Fiopen_wchar(const wchar_t *name, int mode, int prot) { static const wchar_t rW[] = {'r',0}; static const struct { @@ -2064,10 +2061,7 @@ basic_filebuf_char* __thiscall basic_filebuf_char_open_wchar(basic_filebuf_char int mode_idx; FILE *f = NULL; - TRACE("(%p %s %d %d)\n", this, debugstr_w(name), mode, prot); - - if(basic_filebuf_char_is_open(this)) - return NULL; + TRACE("(%s %d %d)\n", debugstr_w(name), mode, prot); for(mode_idx=0; mode_idx<sizeof(str_mode)/sizeof(str_mode[0]); mode_idx++) if(str_mode[mode_idx].mode == real_mode) @@ -2096,6 +2090,39 @@ basic_filebuf_char* __thiscall basic_filebuf_char_open_wchar(basic_filebuf_char return NULL; } + return f; +} + +/* ?_Fiopen(a)std@@YAPAU_iobuf@@PBDHH(a)Z */ +/* ?_Fiopen(a)std@@YAPEAU_iobuf@@PEBDHH(a)Z */ +FILE* __cdecl _Fiopen(const char *name, int mode, int prot) +{ + wchar_t nameW[FILENAME_MAX]; + + TRACE("(%s %d %d)\n", name, mode, prot); + + if(mbstowcs_s(NULL, nameW, FILENAME_MAX, name, FILENAME_MAX-1) != 0) + return NULL; + return _Fiopen_wchar(nameW, mode, prot); +} + +/* ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEPAV12(a)PB_WHH@Z */ +/* ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAPEAV12(a)PEB_WHH@Z */ +/* ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEPAV12(a)PBGHH@Z */ +/* ?open@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAPEAV12(a)PEBGHH@Z */ +DEFINE_THISCALL_WRAPPER(basic_filebuf_char_open_wchar, 16) +basic_filebuf_char* __thiscall basic_filebuf_char_open_wchar(basic_filebuf_char *this, const wchar_t *name, int mode, int prot) +{ + FILE *f = NULL; + + TRACE("(%p %s %d %d)\n", this, debugstr_w(name), mode, prot); + + if(basic_filebuf_char_is_open(this)) + return NULL; + + if(!(f = _Fiopen_wchar(name, mode, prot))) + return NULL; + basic_filebuf_char__Init(this, f, INITFL_open); basic_filebuf_char__Initcvt(this, codecvt_char_use_facet(this->base.loc)); return this; diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 7126603..ff042d9 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2206,12 +2206,12 @@ @ cdecl -arch=win64 ?_Ffmt@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBAPEADPEADDH(a)Z(ptr ptr long long) num_put_wchar__Ffmt @ thiscall -arch=win32 ?_Findarr(a)ios_base@std@@AAEAAU_Iosarray(a)12@H(a)Z(ptr long) ios_base_Findarr @ cdecl -arch=win64 ?_Findarr(a)ios_base@std@@AEAAAEAU_Iosarray(a)12@H(a)Z(ptr long) ios_base_Findarr -@ stub -arch=win32 ?_Fiopen(a)std@@YAPAU_iobuf@@PBDHH(a)Z -@ stub -arch=win64 ?_Fiopen(a)std@@YAPEAU_iobuf@@PEBDHH(a)Z -@ stub -arch=win32 ?_Fiopen(a)std@@YAPAU_iobuf@@PBGHH(a)Z -@ stub -arch=win64 ?_Fiopen(a)std@@YAPEAU_iobuf@@PEBGHH(a)Z -@ stub -arch=win32 ?_Fiopen(a)std@@YAPAU_iobuf@@PB_WHH(a)Z -@ stub -arch=win64 ?_Fiopen(a)std@@YAPEAU_iobuf@@PEB_WHH(a)Z +@ cdecl -arch=win32 ?_Fiopen(a)std@@YAPAU_iobuf@@PBDHH(a)Z(str long long) _Fiopen +@ cdecl -arch=win64 ?_Fiopen(a)std@@YAPEAU_iobuf@@PEBDHH(a)Z(str long long) _Fiopen +@ cdecl -arch=win32 ?_Fiopen(a)std@@YAPAU_iobuf@@PBGHH(a)Z(wstr long long) _Fiopen_wchar +@ cdecl -arch=win64 ?_Fiopen(a)std@@YAPEAU_iobuf@@PEBGHH(a)Z(wstr long long) _Fiopen_wchar +@ cdecl -arch=win32 ?_Fiopen(a)std@@YAPAU_iobuf@@PB_WHH(a)Z(wstr long long) _Fiopen_wchar +@ cdecl -arch=win64 ?_Fiopen(a)std@@YAPEAU_iobuf@@PEB_WHH(a)Z(wstr long long) _Fiopen_wchar @ cdecl -arch=win32 ?_Fput@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DPBDIIII(a)Z(ptr ptr long ptr ptr long str long long long long) num_put_char__Fput @ cdecl -arch=win64 ?_Fput@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AEAVios_base(a)2@DPEBD_K333(a)Z(ptr ptr ptr ptr long str long long long long) num_put_char__Fput @ stub -arch=win32 ?_Fput@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AAVios_base(a)2@GPBDIIII(a)Z

1 0

Piotr Caban : msvcp90: Allocate different id' s for facets in use_facet functions.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 705fe163da3538ec6e98e738bb9ab921b20ea9ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=705fe163da3538ec6e98e738b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 27 11:17:03 2012 +0200 msvcp90: Allocate different id's for facets in use_facet functions. --- dlls/msvcp90/locale.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 7b98539..df0592f 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -1531,7 +1531,7 @@ ctype_char* ctype_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, ctype_char_id.id); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&ctype_char_id)); if(fac) { _Lockit_dtor(&lock); return (ctype_char*)fac; @@ -2286,7 +2286,7 @@ ctype_wchar* ctype_wchar_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, ctype_wchar_id.id); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&ctype_wchar_id)); if(fac) { _Lockit_dtor(&lock); return (ctype_wchar*)fac; @@ -2751,7 +2751,7 @@ codecvt_char* codecvt_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, codecvt_char_id.id); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&codecvt_char_id)); if(fac) { _Lockit_dtor(&lock); return (codecvt_char*)fac; @@ -3463,7 +3463,7 @@ static numpunct_char* numpunct_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, numpunct_char_id.id); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&numpunct_char_id)); if(fac) { _Lockit_dtor(&lock); return (numpunct_char*)fac; @@ -3819,7 +3819,7 @@ static numpunct_wchar* numpunct_wchar_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, numpunct_wchar_id.id); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&numpunct_wchar_id)); if(fac) { _Lockit_dtor(&lock); return (numpunct_wchar*)fac; @@ -3865,7 +3865,7 @@ static numpunct_wchar* numpunct_short_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, numpunct_short_id.id); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&numpunct_short_id)); if(fac) { _Lockit_dtor(&lock); return (numpunct_wchar*)fac; @@ -4262,7 +4262,7 @@ num_get* num_get_wchar_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, num_get_wchar_id.id); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_get_wchar_id)); if(fac) { _Lockit_dtor(&lock); return (num_get*)fac; @@ -5372,7 +5372,7 @@ num_get* num_get_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, num_get_char_id.id); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_get_char_id)); if(fac) { _Lockit_dtor(&lock); return (num_get*)fac; @@ -6222,7 +6222,7 @@ num_put* num_put_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, num_put_char_id.id); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_put_char_id)); if(fac) { _Lockit_dtor(&lock); return (num_put*)fac; @@ -6833,7 +6833,7 @@ num_put* num_put_wchar_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, num_put_wchar_id.id); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_put_wchar_id)); if(fac) { _Lockit_dtor(&lock); return (num_put*)fac;

1 0

Michael Stefaniuc : d3drm: Get rid of unsafe_impl_from_IDirect3DRMFrame2().
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 4754a3d60524dab82838b129f651770b1cf07d62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4754a3d60524dab82838b129f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 27 01:32:58 2012 +0200 d3drm: Get rid of unsafe_impl_from_IDirect3DRMFrame2(). --- dlls/d3drm/frame.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 0100221..10ddb72 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -88,7 +88,6 @@ static inline IDirect3DRMFrameImpl *impl_from_IDirect3DRMFrame3(IDirect3DRMFrame return CONTAINING_RECORD(iface, IDirect3DRMFrameImpl, IDirect3DRMFrame3_iface); } -static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame2(IDirect3DRMFrame2 *iface); static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame3(IDirect3DRMFrame3 *iface); static inline IDirect3DRMLightArrayImpl *impl_from_IDirect3DRMLightArray(IDirect3DRMLightArray *iface) @@ -604,14 +603,19 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_AddChild(IDirect3DRMFrame2* iface, LPDIRECT3DRMFRAME child) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - IDirect3DRMFrameImpl *frame = unsafe_impl_from_IDirect3DRMFrame2((LPDIRECT3DRMFRAME2)child); + IDirect3DRMFrame3 *frame; + HRESULT hr; TRACE("(%p/%p)->(%p)\n", iface, This, child); - if (!frame) + if (!child) + return D3DRMERR_BADOBJECT; + hr = IDirect3DRMFrame_QueryInterface(child, &IID_IDirect3DRMFrame3, (void**)&frame); + if (hr != S_OK) return D3DRMERR_BADOBJECT; + IDirect3DRMFrame_Release(child); - return IDirect3DRMFrame3_AddChild(&This->IDirect3DRMFrame3_iface, &frame->IDirect3DRMFrame3_iface); + return IDirect3DRMFrame3_AddChild(&This->IDirect3DRMFrame3_iface, frame); } static HRESULT WINAPI IDirect3DRMFrame2Impl_AddLight(IDirect3DRMFrame2* iface, @@ -928,14 +932,19 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_DeleteChild(IDirect3DRMFrame2* iface LPDIRECT3DRMFRAME frame) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - IDirect3DRMFrameImpl *child = unsafe_impl_from_IDirect3DRMFrame2((LPDIRECT3DRMFRAME2)frame); + IDirect3DRMFrame3 *child; + HRESULT hr; TRACE("(%p/%p)->(%p)\n", iface, This, frame); - if (!child) + if (!frame) return D3DRMERR_BADOBJECT; + hr = IDirect3DRMFrame_QueryInterface(frame, &IID_IDirect3DRMFrame3, (void**)&child); + if (hr != S_OK) + return D3DRMERR_BADOBJECT; + IDirect3DRMFrame_Release(frame); - return IDirect3DRMFrame3_DeleteChild(&This->IDirect3DRMFrame3_iface, &child->IDirect3DRMFrame3_iface); + return IDirect3DRMFrame3_DeleteChild(&This->IDirect3DRMFrame3_iface, child); } static HRESULT WINAPI IDirect3DRMFrame2Impl_DeleteLight(IDirect3DRMFrame2* iface, @@ -2650,15 +2659,6 @@ static const struct IDirect3DRMFrame3Vtbl Direct3DRMFrame3_Vtbl = IDirect3DRMFrame3Impl_GetMaterialOverride }; -static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame2(IDirect3DRMFrame2 *iface) -{ - if (!iface) - return NULL; - assert(iface->lpVtbl == &Direct3DRMFrame2_Vtbl); - - return impl_from_IDirect3DRMFrame2(iface); -} - static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame3(IDirect3DRMFrame3 *iface) { if (!iface)

1 0