November 2010 - Wine-commits

Adam Martinson : msxml3: Fix a few error messages.
by Alexandre Julliard 25 Nov '10

25 Nov '10

Module: wine Branch: master Commit: 54d949fbe8da397552d256995f601933300c5a04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54d949fbe8da397552d256995… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Wed Nov 24 13:53:17 2010 -0600 msxml3: Fix a few error messages. --- dlls/msxml3/domdoc.c | 12 +++++++++--- dlls/msxml3/schema.c | 2 ++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 45a495d..e06b03d 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2656,9 +2656,15 @@ static HRESULT WINAPI domdoc_validateNode( { ++validated; /* TODO: get a real error code here */ - TRACE("schema validation failed\n"); - if (hr != S_OK) + if (hr == S_OK) + { + TRACE("schema validation succeeded\n"); + } + else + { + ERR("schema validation failed\n"); err_code = E_XML_INVALID; + } } else { @@ -2669,7 +2675,7 @@ static HRESULT WINAPI domdoc_validateNode( if (!validated) { - TRACE("no DTD or schema found\n"); + ERR("no DTD or schema found\n"); err_code = E_XML_NODTD; hr = S_FALSE; } diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 17439a5..fd56aeb 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -1356,6 +1356,8 @@ HRESULT SchemaCache_validate_tree(IXMLDOMSchemaCollection2* iface, xmlNodePtr tr * do we try to load from that? */ if (schema) return Schema_validate_tree(schema, tree); + else + WARN("no schema found for xmlns=%s\n", get_node_nsURI(tree)); return E_FAIL; }

1 0

Adam Martinson : msxml3/schema: Properly handle schema_cache_add() from a URL.
by Alexandre Julliard 25 Nov '10

25 Nov '10

Module: wine Branch: master Commit: 10e2d26e3f6a1041c49c98a32e9906cefa63a77d URL: http://source.winehq.org/git/wine.git/?a=commit;h=10e2d26e3f6a1041c49c98a32… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Wed Nov 24 13:53:38 2010 -0600 msxml3/schema: Properly handle schema_cache_add() from a URL. --- dlls/msxml3/schema.c | 85 +++++++++++++++++++++++++++++-------------------- 1 files changed, 50 insertions(+), 35 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index fd56aeb..eb6b6d3 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -818,38 +818,6 @@ static BOOL link_datatypes(xmlDocPtr schema) return TRUE; } -static cache_entry* cache_entry_from_url(char const* url, xmlChar const* nsURI) -{ - cache_entry* entry = heap_alloc(sizeof(cache_entry)); - xmlSchemaParserCtxtPtr spctx = xmlSchemaNewParserCtxt(url); - entry->type = SCHEMA_TYPE_XSD; - entry->ref = 0; - if (spctx) - { - if((entry->schema = Schema_parse(spctx))) - { - /* TODO: if the nsURI is different from the default xmlns or targetNamespace, - * do we need to do something special here? */ - xmldoc_init(entry->schema->doc, &CLSID_DOMDocument40); - entry->doc = entry->schema->doc; - xmldoc_add_ref(entry->doc); - } - else - { - heap_free(entry); - entry = NULL; - } - xmlSchemaFreeParserCtxt(spctx); - } - else - { - FIXME("schema for nsURI %s not found\n", wine_dbgstr_a(url)); - heap_free(entry); - entry = NULL; - } - return entry; -} - static cache_entry* cache_entry_from_xsd_doc(xmlDocPtr doc, xmlChar const* nsURI) { cache_entry* entry = heap_alloc(sizeof(cache_entry)); @@ -914,6 +882,55 @@ static cache_entry* cache_entry_from_xdr_doc(xmlDocPtr doc, xmlChar const* nsURI return entry; } +static cache_entry* cache_entry_from_url(VARIANT url, xmlChar const* nsURI) +{ + cache_entry* entry; + IXMLDOMDocument3* domdoc = NULL; + xmlDocPtr doc = NULL; + HRESULT hr = DOMDocument_create(&CLSID_DOMDocument, NULL, (void**)&domdoc); + VARIANT_BOOL b = VARIANT_FALSE; + SCHEMA_TYPE type = SCHEMA_TYPE_INVALID; + + if (hr != S_OK) + { + FIXME("failed to create domdoc\n"); + return NULL; + } + assert(domdoc != NULL); + assert(V_VT(&url) == VT_BSTR); + + hr = IXMLDOMDocument3_load(domdoc, url, &b); + if (hr != S_OK) + { + ERR("IXMLDOMDocument3_load() returned 0x%08x\n", hr); + if (b != VARIANT_TRUE) + { + FIXME("Failed to load doc at %s\n", wine_dbgstr_w(V_BSTR(&url))); + IXMLDOMDocument3_Release(domdoc); + return NULL; + } + } + doc = xmlNodePtr_from_domnode((IXMLDOMNode*)domdoc, XML_DOCUMENT_NODE)->doc; + type = schema_type_from_xmlDocPtr(doc); + + switch (type) + { + case SCHEMA_TYPE_XSD: + entry = cache_entry_from_xsd_doc(doc, nsURI); + break; + case SCHEMA_TYPE_XDR: + entry = cache_entry_from_xdr_doc(doc, nsURI); + break; + case SCHEMA_TYPE_INVALID: + entry = NULL; + FIXME("invalid schema\n"); + break; + } + IXMLDOMDocument3_Release(domdoc); + + return entry; +} + static HRESULT WINAPI schema_cache_QueryInterface(IXMLDOMSchemaCollection2* iface, REFIID riid, void** ppvObject) { @@ -1056,9 +1073,7 @@ static HRESULT WINAPI schema_cache_add(IXMLDOMSchemaCollection2* iface, BSTR uri case VT_BSTR: { - xmlChar* url = xmlChar_from_wchar(V_BSTR(&var)); - cache_entry* entry = cache_entry_from_url((char const*)url, name); - heap_free(url); + cache_entry* entry = cache_entry_from_url(var, name); if (entry) {

1 0

Adam Martinson : msxml3: Store the DOMDocument/ XMLSchemaCache object version.
by Alexandre Julliard 25 Nov '10

25 Nov '10

Module: wine Branch: master Commit: 459c29ba3451b9f0b973cea3235f7d43ee31db44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=459c29ba3451b9f0b973cea32… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Wed Nov 24 13:53:47 2010 -0600 msxml3: Store the DOMDocument/XMLSchemaCache object version. --- dlls/msxml3/domdoc.c | 36 +++++++++++++++++++++--------- dlls/msxml3/factory.c | 3 +- dlls/msxml3/msxml_private.h | 51 ++++++++++++++++++++++++++++++++++++++++++- dlls/msxml3/schema.c | 38 ++++++++++++++++++++----------- 4 files changed, 100 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=459c29ba3451b9f0b973c…

1 0

Maarten Lankhorst : winegstreamer: Do not allow timestamp + late to go negative in QOS messages.
by Alexandre Julliard 25 Nov '10

25 Nov '10

Module: wine Branch: master Commit: 3213061ebd45199c1fa9e44a257a530f924946ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=3213061ebd45199c1fa9e44a2… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Nov 24 18:23:56 2010 +0100 winegstreamer: Do not allow timestamp + late to go negative in QOS messages. --- dlls/winegstreamer/gstdemux.c | 5 ++++- dlls/winegstreamer/gsttffilter.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 7c2398b..270c93a 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1387,7 +1387,10 @@ static const IMediaSeekingVtbl GST_Seeking_Vtbl = static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) { QualityControlImpl *This = (QualityControlImpl*)iface; GSTOutPin *pin = (GSTOutPin*)This->self; - gst_pad_push_event(pin->my_sink, gst_event_new_qos(1000./qm.Proportion, qm.Late*100, qm.TimeStamp*100)); + REFERENCE_TIME late = qm.Late; + if (qm.Late < 0 && -qm.Late > qm.TimeStamp) + late = -qm.TimeStamp; + gst_pad_push_event(pin->my_sink, gst_event_new_qos(1000./qm.Proportion, late*100, qm.TimeStamp*100)); return S_OK; } diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index 912439e..b85ab43 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -437,7 +437,10 @@ static HRESULT WINAPI Gstreamer_transform_NewSegment(TransformFilter *iface, REF static HRESULT WINAPI Gstreamer_transform_QOS(TransformFilter *iface, IBaseFilter *sender, Quality qm) { GstTfImpl *This = (GstTfImpl*)iface; - gst_pad_push_event(This->my_sink, gst_event_new_qos(1000. / qm.Proportion, qm.Late * 100, qm.TimeStamp * 100)); + REFERENCE_TIME late = qm.Late; + if (qm.Late < 0 && -qm.Late > qm.TimeStamp) + late = -qm.TimeStamp; + gst_pad_push_event(This->my_sink, gst_event_new_qos(1000. / qm.Proportion, late * 100, qm.TimeStamp * 100)); return QualityControlImpl_Notify((IQualityControl*)&iface->qcimpl, sender, qm); }

1 0

Piotr Caban : msvcp90: Added basic_string<{char, wchar}> constructor ( substring) implementation.
by Alexandre Julliard 25 Nov '10

25 Nov '10

Module: wine Branch: master Commit: acf0cea825c1353dc3ec79fb1667cbd3855f7cd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acf0cea825c1353dc3ec79fb1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 24 19:58:45 2010 +0100 msvcp90: Added basic_string<{char,wchar}> constructor (substring) implementation. --- dlls/msvcp80/msvcp80.spec | 8 ++++---- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 3cadb5f..23576f5 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -740,8 +740,8 @@ @ stub -arch=win64 ??0?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IEAA(a)XZ @ thiscall -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)ABV01@@Z(ptr ptr) msvcp90.??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)ABV01@@Z @ cdecl -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)AEBV01@@Z(ptr ptr) msvcp90.??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)AEBV01@@Z -@ stub -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)ABV01@II(a)Z -@ stub -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)AEBV01@_K1(a)Z +@ thiscall -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)ABV01@II(a)Z(ptr ptr long long) msvcp90.??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)ABV01@II(a)Z +@ cdecl -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)AEBV01@_K1(a)Z(ptr ptr long long) msvcp90.??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)AEBV01@_K1(a)Z @ stub -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)ABV01@IIABV?$allocator(a)D@1@@Z @ stub -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)AEBV01@_K1AEBV?$allocator(a)D@1@@Z @ stub -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)ABV?$allocator(a)D@1@@Z @@ -792,8 +792,8 @@ @ stub -arch=win64 ??0?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAA(a)_KGAEBV?$allocator(a)G@1@@Z @ thiscall -arch=win32 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)ABV01@@Z(ptr ptr) msvcp90.??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)ABV01@@Z @ cdecl -arch=win64 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)AEBV01@@Z(ptr ptr) msvcp90.??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)AEBV01@@Z -@ stub -arch=win32 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)ABV01@II(a)Z -@ stub -arch=win64 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)AEBV01@_K1(a)Z +@ thiscall -arch=win32 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)ABV01@II(a)Z(ptr ptr long long) msvcp90.??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)ABV01@II(a)Z +@ cdecl -arch=win64 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)AEBV01@_K1(a)Z(ptr ptr long long) msvcp90.??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)AEBV01@_K1(a)Z @ stub -arch=win32 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)ABV01@IIABV?$allocator(a)_W@1@@Z @ stub -arch=win64 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)AEBV01@_K1AEBV?$allocator(a)_W@1@@Z @ stub -arch=win32 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)ABV?$allocator(a)_W@1@@Z diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index f41cf79..4162234 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -734,8 +734,8 @@ @ stub -arch=win64 ??0?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IEAA(a)XZ @ thiscall -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)ABV01@@Z(ptr ptr) MSVCP_basic_string_char_copy_ctor @ cdecl -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)AEBV01@@Z(ptr ptr) MSVCP_basic_string_char_copy_ctor -@ stub -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)ABV01@II(a)Z -@ stub -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)AEBV01@_K1(a)Z +@ thiscall -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)ABV01@II(a)Z(ptr ptr long long) MSVCP_basic_string_char_ctor_substr +@ cdecl -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)AEBV01@_K1(a)Z(ptr ptr long long) MSVCP_basic_string_char_ctor_substr @ stub -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)ABV01@IIABV?$allocator(a)D@1@@Z @ stub -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)AEBV01@_K1AEBV?$allocator(a)D@1@@Z @ stub -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)ABV?$allocator(a)D@1@@Z @@ -786,8 +786,8 @@ @ stub -arch=win64 ??0?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAA(a)_KGAEBV?$allocator(a)G@1@@Z @ thiscall -arch=win32 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)ABV01@@Z(ptr ptr) MSVCP_basic_string_wchar_copy_ctor @ cdecl -arch=win64 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)AEBV01@@Z(ptr ptr) MSVCP_basic_string_wchar_copy_ctor -@ stub -arch=win32 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)ABV01@II(a)Z -@ stub -arch=win64 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)AEBV01@_K1(a)Z +@ thiscall -arch=win32 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)ABV01@II(a)Z(ptr ptr long long) MSVCP_basic_string_wchar_ctor_substr +@ cdecl -arch=win64 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)AEBV01@_K1(a)Z(ptr ptr long long) MSVCP_basic_string_wchar_ctor_substr @ stub -arch=win32 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)ABV01@IIABV?$allocator(a)_W@1@@Z @ stub -arch=win64 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)AEBV01@_K1AEBV?$allocator(a)_W@1@@Z @ stub -arch=win32 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)ABV?$allocator(a)_W@1@@Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index db9022f..38e6366 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -737,6 +737,20 @@ basic_string_char* __thiscall MSVCP_basic_string_char_ctor_cstr( return this; } +/* ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)ABV01@II(a)Z */ +/* ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)AEBV01@_K1(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_ctor_substr, 16) +basic_string_char* __thiscall MSVCP_basic_string_char_ctor_substr( + basic_string_char *this, const basic_string_char *assign, + size_t pos, size_t len) +{ + TRACE("%p %p %lu %lu\n", this, assign, (unsigned long)pos, (unsigned long)len); + + basic_string_char_tidy(this, FALSE, 0); + MSVCP_basic_string_char_assign_substr(this, assign, pos, len); + return this; +} + /* ??1?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)XZ */ /* ??1?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_dtor, 4) @@ -1029,6 +1043,20 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_cstr( return this; } +/* ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)ABV01@II(a)Z */ +/* ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)AEBV01@_K1(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_ctor_substr, 16) +basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_substr( + basic_string_wchar *this, const basic_string_wchar *assign, + size_t pos, size_t len) +{ + TRACE("%p %p %lu %lu\n", this, assign, (unsigned long)pos, (unsigned long)len); + + basic_string_wchar_tidy(this, FALSE, 0); + MSVCP_basic_string_wchar_assign_substr(this, assign, pos, len); + return this; +} + /* ??1?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)XZ */ /* ??1?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_dtor, 4)

1 0

Piotr Caban : msvcp90: Added basic_string<char>::compare implementation.
by Alexandre Julliard 25 Nov '10

25 Nov '10

Module: wine Branch: master Commit: b09125ad4e538ed296f7e61451ff68f8b53e4058 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b09125ad4e538ed296f7e6145… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 24 19:59:16 2010 +0100 msvcp90: Added basic_string<char>::compare implementation. --- dlls/msvcp90/msvcp90.spec | 24 ++++++------ dlls/msvcp90/string.c | 90 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 4162234..c4defd2 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3114,18 +3114,18 @@ @ stub -arch=win64 ?close@?$messages(a)G@std@@QEBAXH(a)Z @ stub -arch=win32 ?close@?$messages(a)_W@std@@QBEXH(a)Z @ stub -arch=win64 ?close@?$messages(a)_W@std@@QEBAXH(a)Z -@ stub -arch=win32 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHABV12@@Z -@ stub -arch=win64 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAHAEBV12@@Z -@ stub -arch=win32 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHIIABV12@@Z -@ stub -arch=win64 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAHPEBD(a)Z -@ stub -arch=win32 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHIIABV12(a)II@Z -@ stub -arch=win64 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAH_K0AEBV12(a)00@Z -@ stub -arch=win32 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHIIPBD(a)Z -@ stub -arch=win64 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAH_K0AEBV12@@Z -@ stub -arch=win32 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHIIPBDI(a)Z -@ stub -arch=win64 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAH_K0PEBD0(a)Z -@ stub -arch=win32 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHPBD(a)Z -@ stub -arch=win64 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAH_K0PEBD(a)Z +@ thiscall -arch=win32 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHABV12@@Z(ptr ptr) MSVCP_basic_string_char_compare +@ cdecl -arch=win64 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAHAEBV12@@Z(ptr ptr) MSVCP_basic_string_char_compare +@ thiscall -arch=win32 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHIIABV12@@Z(ptr long long ptr) MSVCP_basic_string_char_compare_substr +@ cdecl -arch=win64 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAHPEBD(a)Z(ptr ptr) MSVCP_basic_string_char_compare_cstr +@ thiscall -arch=win32 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHIIABV12(a)II@Z(ptr long long ptr long long) MSVCP_basic_string_char_compare_substr_substr +@ cdecl -arch=win64 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAH_K0AEBV12(a)00@Z(ptr long long ptr long long) MSVCP_basic_string_char_compare_substr_substr +@ thiscall -arch=win32 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHIIPBD(a)Z(ptr long long ptr) MSVCP_basic_string_char_compare_substr_cstr +@ cdecl -arch=win64 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAH_K0AEBV12@@Z(ptr long long ptr) MSVCP_basic_string_char_compare_substr +@ thiscall -arch=win32 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHIIPBDI(a)Z(ptr long long ptr long) MSVCP_basic_string_char_compare_substr_cstr_len +@ cdecl -arch=win64 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAH_K0PEBD0(a)Z(ptr long long ptr long) MSVCP_basic_string_char_compare_substr_cstr_len +@ thiscall -arch=win32 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHPBD(a)Z(ptr ptr) MSVCP_basic_string_char_compare_cstr +@ cdecl -arch=win64 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAH_K0PEBD(a)Z(ptr long long ptr) MSVCP_basic_string_char_compare_substr_cstr @ stub -arch=win32 ?compare@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEHABV12@@Z @ stub -arch=win64 ?compare@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBAHAEBV12@@Z @ stub -arch=win32 ?compare@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEHIIABV12@@Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 38e6366..49751fe 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -802,6 +802,96 @@ basic_string_char* __thiscall MSVCP_basic_string_char_append( 0, MSVCP_basic_string_char_npos); } +/* ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHIIPBDI(a)Z */ +/* ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAH_K0PEBD0(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_compare_substr_cstr_len, 20) +int __thiscall MSVCP_basic_string_char_compare_substr_cstr_len( + basic_string_char *this, size_t pos, size_t num, + const char *str, size_t count) +{ + int ans; + + TRACE("%p %lu %lu %s %lu\n", this, (unsigned long)pos, + (unsigned long)num, str, (unsigned long)count); + + if(this->size < pos) + MSVCP__String_base_Xran(); + + if(pos+num > this->size) + num = this->size-pos; + + ans = MSVCP_char_traits_char_compare(basic_string_char_ptr(this)+pos, + str, num>count ? count : num); + if(ans) + return ans; + + if(num > count) + ans = 1; + else if(num < count) + ans = -1; + return ans; +} + +/* ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHIIPBD(a)Z */ +/* ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAH_K0PEBD(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_compare_substr_cstr, 16) +int __thiscall MSVCP_basic_string_char_compare_substr_cstr(basic_string_char *this, + size_t pos, size_t num, const char *str) +{ + return MSVCP_basic_string_char_compare_substr_cstr_len(this, pos, num, + str, MSVCP_char_traits_char_length(str)); +} + +/* ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHPBD(a)Z */ +/* ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAHPEBD(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_compare_cstr, 8) +int __thiscall MSVCP_basic_string_char_compare_cstr( + basic_string_char *this, const char *str) +{ + return MSVCP_basic_string_char_compare_substr_cstr_len(this, 0, this->size, + str, MSVCP_char_traits_char_length(str)); +} + +/* ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHIIABV12(a)II@Z */ +/* ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAH_K0AEBV12(a)00@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_compare_substr_substr, 24) +int __thiscall MSVCP_basic_string_char_compare_substr_substr( + basic_string_char *this, size_t pos, size_t num, + basic_string_char *compare, size_t off, size_t count) +{ + TRACE("%p %lu %lu %p %lu %lu\n", this, (unsigned long)pos, (unsigned long)num, + compare, (unsigned long)off, (unsigned long)count); + + if(compare->size < off) + MSVCP__String_base_Xran(); + + if(off+count > compare->size) + count = compare->size-off; + + return MSVCP_basic_string_char_compare_substr_cstr_len(this, pos, num, + basic_string_char_ptr(compare)+off, count); +} + +/* ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHIIABV12@@Z */ +/* ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAH_K0AEBV12@@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_compare_substr, 16) +int __thiscall MSVCP_basic_string_char_compare_substr( + basic_string_char *this, size_t pos, size_t num, + basic_string_char *compare) +{ + return MSVCP_basic_string_char_compare_substr_cstr_len(this, pos, num, + basic_string_char_ptr(compare), compare->size); +} + +/* ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHABV12@@Z */ +/* ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAHAEBV12@@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_compare, 8) +int __thiscall MSVCP_basic_string_char_compare( + basic_string_char *this, basic_string_char *compare) +{ + return MSVCP_basic_string_char_compare_substr_cstr_len(this, 0, this->size, + basic_string_char_ptr(compare), compare->size); +} /* basic_string<wchar_t, char_traits<wchar_t>, allocator<wchar_t>> */ /* ?npos@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@2IB */

1 0

Piotr Caban : msvcp90: Added basic_string<wchar>::compare implementation.
by Alexandre Julliard 25 Nov '10

25 Nov '10

Module: wine Branch: master Commit: 919a7cedb5273b9fecc855542a266db29c9db9ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=919a7cedb5273b9fecc855542… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 24 19:59:26 2010 +0100 msvcp90: Added basic_string<wchar>::compare implementation. --- dlls/msvcp90/msvcp90.spec | 24 ++++++------ dlls/msvcp90/string.c | 91 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index c4defd2..8dd5d8a 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3138,18 +3138,18 @@ @ stub -arch=win64 ?compare@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBAH_K0PEBG0(a)Z @ stub -arch=win32 ?compare@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEHPBG(a)Z @ stub -arch=win64 ?compare@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBAH_K0PEBG(a)Z -@ stub -arch=win32 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHABV12@@Z -@ stub -arch=win64 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAHAEBV12@@Z -@ stub -arch=win32 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHIIABV12@@Z -@ stub -arch=win64 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAHPEB_W(a)Z -@ stub -arch=win32 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHIIABV12(a)II@Z -@ stub -arch=win64 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAH_K0AEBV12(a)00@Z -@ stub -arch=win32 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHIIPB_W(a)Z -@ stub -arch=win64 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAH_K0AEBV12@@Z -@ stub -arch=win32 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHIIPB_WI(a)Z -@ stub -arch=win64 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAH_K0PEB_W0(a)Z -@ stub -arch=win32 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHPB_W(a)Z -@ stub -arch=win64 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAH_K0PEB_W(a)Z +@ thiscall -arch=win32 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHABV12@@Z(ptr ptr) MSVCP_basic_string_wchar_compare +@ cdecl -arch=win64 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAHAEBV12@@Z(ptr ptr) MSVCP_basic_string_wchar_compare +@ thiscall -arch=win32 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHIIABV12@@Z(ptr long long ptr) MSVCP_basic_string_wchar_compare_substr +@ cdecl -arch=win64 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAHPEB_W(a)Z(ptr ptr) MSVCP_basic_string_wchar_compare_cstr +@ thiscall -arch=win32 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHIIABV12(a)II@Z(ptr long long ptr long long) MSVCP_basic_string_wchar_compare_substr_substr +@ cdecl -arch=win64 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAH_K0AEBV12(a)00@Z(ptr long long ptr long long) MSVCP_basic_string_wchar_compare_substr_substr +@ thiscall -arch=win32 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHIIPB_W(a)Z(ptr long long ptr) MSVCP_basic_string_wchar_compare_substr_cstr +@ cdecl -arch=win64 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAH_K0AEBV12@@Z(ptr long long ptr) MSVCP_basic_string_wchar_compare_substr +@ thiscall -arch=win32 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHIIPB_WI(a)Z(ptr long long ptr long) MSVCP_basic_string_wchar_compare_substr_cstr_len +@ cdecl -arch=win64 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAH_K0PEB_W0(a)Z(ptr long long ptr long) MSVCP_basic_string_wchar_compare_substr_cstr_len +@ thiscall -arch=win32 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHPB_W(a)Z(ptr ptr) MSVCP_basic_string_wchar_compare_cstr +@ cdecl -arch=win64 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAH_K0PEB_W(a)Z(ptr long long ptr) MSVCP_basic_string_wchar_compare_substr_cstr @ cdecl -arch=win32 ?compare@?$char_traits(a)D@std@@SAHPBD0I(a)Z(ptr ptr long) MSVCP_char_traits_char_compare @ cdecl -arch=win64 ?compare@?$char_traits(a)D@std@@SAHPEBD0_K(a)Z(ptr ptr long) MSVCP_char_traits_char_compare @ cdecl -arch=win32 ?compare@?$char_traits(a)G@std@@SAHPBG0I(a)Z(ptr ptr long) MSVCP_char_traits_short_compare diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 49751fe..b7d0a2e 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1241,3 +1241,94 @@ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_append, 8) return MSVCP_basic_string_wchar_append_substr(this, append, 0, MSVCP_basic_string_wchar_npos); } + +/* ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHIIPB_WI(a)Z */ +/* ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAH_K0PEB_W0(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_compare_substr_cstr_len, 20) +int __thiscall MSVCP_basic_string_wchar_compare_substr_cstr_len( + basic_string_wchar *this, size_t pos, size_t num, + const wchar_t *str, size_t count) +{ + int ans; + + TRACE("%p %lu %lu %s %lu\n", this, (unsigned long)pos, + (unsigned long)num, debugstr_w(str), (unsigned long)count); + + if(this->size < pos) + MSVCP__String_base_Xran(); + + if(pos+num > this->size) + num = this->size-pos; + + ans = MSVCP_char_traits_wchar_compare(basic_string_wchar_ptr(this)+pos, + str, num>count ? count : num); + if(ans) + return ans; + + if(num > count) + ans = 1; + else if(num < count) + ans = -1; + return ans; +} + +/* ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHIIPB_W(a)Z */ +/* ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAH_K0PEB_W(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_compare_substr_cstr, 16) +int __thiscall MSVCP_basic_string_wchar_compare_substr_cstr(basic_string_wchar *this, + size_t pos, size_t num, const wchar_t *str) +{ + return MSVCP_basic_string_wchar_compare_substr_cstr_len(this, pos, num, + str, MSVCP_char_traits_wchar_length(str)); +} + +/* ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHPB_W(a)Z */ +/* ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAHPEB_W(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_compare_cstr, 8) +int __thiscall MSVCP_basic_string_wchar_compare_cstr( + basic_string_wchar *this, const wchar_t *str) +{ + return MSVCP_basic_string_wchar_compare_substr_cstr_len(this, 0, this->size, + str, MSVCP_char_traits_wchar_length(str)); +} + +/* ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHIIABV12(a)II@Z */ +/* ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAH_K0AEBV12(a)00@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_compare_substr_substr, 24) +int __thiscall MSVCP_basic_string_wchar_compare_substr_substr( + basic_string_wchar *this, size_t pos, size_t num, + basic_string_wchar *compare, size_t off, size_t count) +{ + TRACE("%p %lu %lu %p %lu %lu\n", this, (unsigned long)pos, (unsigned long)num, + compare, (unsigned long)off, (unsigned long)count); + + if(compare->size < off) + MSVCP__String_base_Xran(); + + if(off+count > compare->size) + count = compare->size-off; + + return MSVCP_basic_string_wchar_compare_substr_cstr_len(this, pos, num, + basic_string_wchar_ptr(compare)+off, count); +} + +/* ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHIIABV12@@Z */ +/* ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAH_K0AEBV12@@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_compare_substr, 16) +int __thiscall MSVCP_basic_string_wchar_compare_substr( + basic_string_wchar *this, size_t pos, size_t num, + basic_string_wchar *compare) +{ + return MSVCP_basic_string_wchar_compare_substr_cstr_len(this, pos, num, + basic_string_wchar_ptr(compare), compare->size); +} + +/* ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHABV12@@Z */ +/* ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAHAEBV12@@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_compare, 8) +int __thiscall MSVCP_basic_string_wchar_compare( + basic_string_wchar *this, basic_string_wchar *compare) +{ + return MSVCP_basic_string_wchar_compare_substr_cstr_len(this, 0, this->size, + basic_string_wchar_ptr(compare), compare->size); +}

1 0

Piotr Caban : msvcp80: Update spec file.
by Alexandre Julliard 25 Nov '10

25 Nov '10

Module: wine Branch: master Commit: b808de857a7cc30c49950476a9e6e9c71c39d410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b808de857a7cc30c49950476a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 24 19:59:42 2010 +0100 msvcp80: Update spec file. --- dlls/msvcp80/msvcp80.spec | 48 ++++++++++++++++++++++---------------------- 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 23576f5..d7aa771 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -3078,18 +3078,18 @@ @ stub -arch=win64 ?close@?$messages(a)G@std@@QEBAXH(a)Z @ stub -arch=win32 ?close@?$messages(a)_W@std@@QBEXH(a)Z @ stub -arch=win64 ?close@?$messages(a)_W@std@@QEBAXH(a)Z -@ stub -arch=win32 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHABV12@@Z -@ stub -arch=win64 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAHAEBV12@@Z -@ stub -arch=win32 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHIIABV12@@Z -@ stub -arch=win64 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAHPEBD(a)Z -@ stub -arch=win32 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHIIABV12(a)II@Z -@ stub -arch=win64 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAH_K0AEBV12(a)00@Z -@ stub -arch=win32 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHIIPBD(a)Z -@ stub -arch=win64 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAH_K0AEBV12@@Z -@ stub -arch=win32 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHIIPBDI(a)Z -@ stub -arch=win64 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAH_K0PEBD0(a)Z -@ stub -arch=win32 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHPBD(a)Z -@ stub -arch=win64 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAH_K0PEBD(a)Z +@ thiscall -arch=win32 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHABV12@@Z(ptr ptr) msvcp90.?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHABV12@@Z +@ cdecl -arch=win64 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAHAEBV12@@Z(ptr ptr) msvcp90.?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAHAEBV12@@Z +@ thiscall -arch=win32 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHIIABV12@@Z(ptr long long ptr) msvcp90.?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHIIABV12@@Z +@ cdecl -arch=win64 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAHPEBD(a)Z(ptr ptr) msvcp90.?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAHPEBD(a)Z +@ thiscall -arch=win32 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHIIABV12(a)II@Z(ptr long long ptr long long) msvcp90.?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHIIABV12(a)II@Z +@ cdecl -arch=win64 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAH_K0AEBV12(a)00@Z(ptr long long ptr long long) msvcp90.?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAH_K0AEBV12(a)00@Z +@ thiscall -arch=win32 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHIIPBD(a)Z(ptr long long ptr) msvcp90.?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHIIPBD(a)Z +@ cdecl -arch=win64 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAH_K0AEBV12@@Z(ptr long long ptr) msvcp90.?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAH_K0AEBV12@@Z +@ thiscall -arch=win32 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHIIPBDI(a)Z(ptr long long ptr long) msvcp90.?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHIIPBDI(a)Z +@ cdecl -arch=win64 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAH_K0PEBD0(a)Z(ptr long long ptr long) msvcp90.?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAH_K0PEBD0(a)Z +@ thiscall -arch=win32 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHPBD(a)Z(ptr ptr) msvcp90.?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHPBD(a)Z +@ cdecl -arch=win64 ?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAH_K0PEBD(a)Z(ptr long long ptr) msvcp90.?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAH_K0PEBD(a)Z @ stub -arch=win32 ?compare@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEHABV12@@Z @ stub -arch=win64 ?compare@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBAHAEBV12@@Z @ stub -arch=win32 ?compare@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEHIIABV12@@Z @@ -3102,18 +3102,18 @@ @ stub -arch=win64 ?compare@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBAH_K0PEBG0(a)Z @ stub -arch=win32 ?compare@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEHPBG(a)Z @ stub -arch=win64 ?compare@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBAH_K0PEBG(a)Z -@ stub -arch=win32 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHABV12@@Z -@ stub -arch=win64 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAHAEBV12@@Z -@ stub -arch=win32 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHIIABV12@@Z -@ stub -arch=win64 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAHPEB_W(a)Z -@ stub -arch=win32 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHIIABV12(a)II@Z -@ stub -arch=win64 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAH_K0AEBV12(a)00@Z -@ stub -arch=win32 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHIIPB_W(a)Z -@ stub -arch=win64 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAH_K0AEBV12@@Z -@ stub -arch=win32 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHIIPB_WI(a)Z -@ stub -arch=win64 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAH_K0PEB_W0(a)Z -@ stub -arch=win32 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHPB_W(a)Z -@ stub -arch=win64 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAH_K0PEB_W(a)Z +@ thiscall -arch=win32 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHABV12@@Z(ptr ptr) msvcp90.?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHABV12@@Z +@ cdecl -arch=win64 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAHAEBV12@@Z(ptr ptr) msvcp90.?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAHAEBV12@@Z +@ thiscall -arch=win32 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHIIABV12@@Z(ptr long long ptr) msvcp90.?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHIIABV12@@Z +@ cdecl -arch=win64 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAHPEB_W(a)Z(ptr ptr) msvcp90.?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAHPEB_W(a)Z +@ thiscall -arch=win32 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHIIABV12(a)II@Z(ptr long long ptr long long) msvcp90.?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHIIABV12(a)II@Z +@ cdecl -arch=win64 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAH_K0AEBV12(a)00@Z(ptr long long ptr long long) msvcp90.?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAH_K0AEBV12(a)00@Z +@ thiscall -arch=win32 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHIIPB_W(a)Z(ptr long long ptr) msvcp90.?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHIIPB_W(a)Z +@ cdecl -arch=win64 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAH_K0AEBV12@@Z(ptr long long ptr) msvcp90.?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAH_K0AEBV12@@Z +@ thiscall -arch=win32 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHIIPB_WI(a)Z(ptr long long ptr long) msvcp90.?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHIIPB_WI(a)Z +@ cdecl -arch=win64 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAH_K0PEB_W0(a)Z(ptr long long ptr long) msvcp90.?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAH_K0PEB_W0(a)Z +@ thiscall -arch=win32 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHPB_W(a)Z(ptr ptr) msvcp90.?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEHPB_W(a)Z +@ cdecl -arch=win64 ?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAH_K0PEB_W(a)Z(ptr long long ptr) msvcp90.?compare@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAH_K0PEB_W(a)Z @ cdecl -arch=win32 ?compare@?$char_traits(a)D@std@@SAHPBD0I(a)Z(ptr ptr long) msvcp90.?compare@?$char_traits(a)D@std@@SAHPBD0I(a)Z @ cdecl -arch=win64 ?compare@?$char_traits(a)D@std@@SAHPEBD0_K(a)Z(ptr ptr long) msvcp90.?compare@?$char_traits(a)D@std@@SAHPEBD0_K(a)Z @ cdecl -arch=win32 ?compare@?$char_traits(a)G@std@@SAHPBG0I(a)Z(ptr ptr long) msvcp90.?compare@?$char_traits(a)G@std@@SAHPBG0I(a)Z

1 0

Maarten Lankhorst : winegstreamer: Fix seeking for real.
by Alexandre Julliard 25 Nov '10

25 Nov '10

Module: wine Branch: master Commit: 36fb590efd7c1d27d44b81553bf6151c61454fec URL: http://source.winehq.org/git/wine.git/?a=commit;h=36fb590efd7c1d27d44b81553… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Nov 12 21:43:44 2010 +0100 winegstreamer: Fix seeking for real. --- dlls/winegstreamer/gstdemux.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 6c9aca0..7c2398b 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -326,7 +326,7 @@ static gboolean gst_base_src_perform_seek(GSTImpl *This, GstEvent *event) gst_pad_activate_push(This->my_src, 0); } - TRACE("++++++++++++++++ perform byte seek ------------------\n"); + This->nextofs = This->start = cur; /* and prepare to continue streaming */ if (flush) { @@ -829,11 +829,15 @@ static gboolean activate_push(GstPad *pad, gboolean activate) { EnterCriticalSection(&This->filter.csFilter); if (!activate) { TRACE("Deactivating\n"); + if (!This->initial) + IAsyncReader_BeginFlush(This->pInputPin.pReader); if (This->push_thread) { WaitForSingleObject(This->push_thread, -1); CloseHandle(This->push_thread); This->push_thread = NULL; } + if (!This->initial) + IAsyncReader_EndFlush(This->pInputPin.pReader); if (This->filter.state == State_Stopped) This->nextofs = This->start; } else if (!This->push_thread) { @@ -968,6 +972,7 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI gst_pad_query_duration(This->ppPins[0]->their_src, &format, &duration); for (i = 0; i < This->cStreams; ++i) { This->ppPins[i]->seek.llDuration = This->ppPins[i]->seek.llStop = duration / 100; + This->ppPins[i]->seek.llCurrent = 0; if (!This->ppPins[i]->seek.llDuration) This->ppPins[i]->seek.dwCapabilities = 0; WaitForSingleObject(This->ppPins[i]->caps_event, -1); @@ -1134,11 +1139,8 @@ static HRESULT WINAPI GST_Stop(IBaseFilter *iface) { TRACE("()\n"); - if (This->gstfilter) { - IAsyncReader_BeginFlush(This->pInputPin.pReader); + if (This->gstfilter) gst_element_set_state(This->gstfilter, GST_STATE_READY); - IAsyncReader_EndFlush(This->pInputPin.pReader); - } return S_OK; } @@ -1313,6 +1315,7 @@ static HRESULT WINAPI GST_Seeking_GetCurrentPosition(IMediaSeeking *iface, REFER return E_NOTIMPL; } *pos /= 100; + This->seek.llCurrent = *pos; return S_OK; } @@ -1339,8 +1342,10 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, REFERENCE_T hr = SourceSeekingImpl_SetPositions(iface, pCur, curflags, pStop, stopflags); if (!This->their_src) - return This->seek.llDuration ? hr : E_NOTIMPL; + return hr; + curtype = type_from_flags(curflags); + stoptype = type_from_flags(stopflags); if (curflags & AM_SEEKING_SeekToKeyFrame) f |= GST_SEEK_FLAG_KEY_UNIT; if (curflags & AM_SEEKING_Segment) @@ -1348,8 +1353,6 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, REFERENCE_T if (!(curflags & AM_SEEKING_NoFlush)) f |= GST_SEEK_FLAG_FLUSH; - curtype = type_from_flags(curflags); - stoptype = type_from_flags(stopflags); e = gst_event_new_seek(This->seek.dRate, GST_FORMAT_TIME, f, curtype, pCur ? *pCur * 100 : -1, stoptype, pStop ? *pStop * 100 : -1); if (gst_pad_push_event(This->my_sink, e)) return S_OK;

1 0

Maarten Lankhorst : quartz: Prevent circular connections in render case too .
by Alexandre Julliard 25 Nov '10

25 Nov '10

Module: wine Branch: master Commit: 0a4adc1f101058e6914619e7ab1be011c0741892 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a4adc1f101058e6914619e7a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Nov 24 18:23:54 2010 +0100 quartz: Prevent circular connections in render case too. --- dlls/quartz/filtergraph.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index eeafe32..7b3fec9 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1235,7 +1235,7 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, IPin *ppinOut) if (to == NULL) { - hr = IPin_Connect(ppinOut, pin, NULL); + hr = FilterGraph2_ConnectDirect(iface, ppinOut, pin, NULL); if (SUCCEEDED(hr)) { TRACE("Connected successfully %p/%p, %08x look if we should render more!\n", ppinOut, pin, hr);

1 0