wine-commits November 2010

wine-commits@winehq.org

2 participants
866 discussions

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/tests: Move domdoc.c schema-related tests to schema .c.
by Alexandre Julliard 25 Nov '10

25 Nov '10

Module: wine Branch: master Commit: 2f0e73f896a2a161e05fe117628fee72b11cd002 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f0e73f896a2a161e05fe1176… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Wed Nov 24 13:52:54 2010 -0600 msxml3/tests: Move domdoc.c schema-related tests to schema.c. --- dlls/msxml3/tests/domdoc.c | 1264 -------------------------------------------- dlls/msxml3/tests/schema.c | 1263 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1263 insertions(+), 1264 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2f0e73f896a2a161e05fe…

1 0

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

25 Nov '10

Module: wine Branch: master Commit: 785828fc8720efe53bea69c52384af496ed0144d URL: http://source.winehq.org/git/wine.git/?a=commit;h=785828fc8720efe53bea69c52… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 24 19:59:55 2010 +0100 msvcp90/tests: Added basic_string<char>::compare tests. --- dlls/msvcp90/tests/string.c | 130 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 129 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index 7a9dabc..1a03c44 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -63,6 +63,8 @@ static size_t (WINAPI *p_basic_string_char_size)(void); static void (WINAPI *p_basic_string_char_swap)(basic_string_char*); static basic_string_char* (WINAPI *p_basic_string_char_append)(basic_string_char*); static basic_string_char* (WINAPI *p_basic_string_char_append_substr)(basic_string_char*, size_t, size_t); +static int (WINAPI *p_basic_string_char_compare_substr_substr)(size_t, size_t, basic_string_char*, size_t, size_t); +static int (WINAPI *p_basic_string_char_compare_substr_cstr_len)(size_t, size_t, const char*, size_t); static basic_string_wchar* (WINAPI *p_basic_string_wchar_ctor)(void); static basic_string_wchar* (WINAPI *p_basic_string_wchar_copy_ctor)(basic_string_wchar*); @@ -87,6 +89,8 @@ static size_t (__cdecl *p_basic_string_char_size)(basic_string_char*); static void (__cdecl *p_basic_string_char_swap)(basic_string_char*, basic_string_char*); static basic_string_char* (WINAPI *p_basic_string_char_append)(basic_string_char*, basic_string_char*); static basic_string_char* (WINAPI *p_basic_string_char_append_substr)(basic_string_char*, basic_string_char*, size_t, size_t); +static int (WINAPI *p_basic_string_char_compare_substr_substr)(basic_string_char*, size_t, size_t, basic_string_char*, size_t, size_t); +static int (WINAPI *p_basic_string_char_compare_substr_cstr_len)(basic_string_char*, size_t, size_t, const char*, size_t); static basic_string_wchar* (__cdecl *p_basic_string_wchar_ctor)(basic_string_wchar*); static basic_string_wchar* (__cdecl *p_basic_string_wchar_copy_ctor)(basic_string_wchar*, basic_string_wchar*); @@ -179,6 +183,46 @@ static inline void* do_call_func4(void *func, void *_this, } return (void*)retval; } + +static inline void* do_call_func5(void *func, void *_this, + const void *arg1, const void *arg2, const void *arg3, const void *arg4) +{ + volatile void* retval = 0; + __asm + { + push ecx + push arg1 + push arg2 + push arg3 + push arg4 + mov ecx, _this + call func + mov retval, eax + pop ecx + } + return (void*)retval; +} + +static inline void* do_call_func6(void *func, void *_this, + const void *arg1, const void *arg2, const void *arg3, + const void *arg4, const void *arg5) +{ + volatile void* retval = 0; + __asm + { + push ecx + push arg1 + push arg2 + push arg3 + push arg4 + push arg5 + mov ecx, _this + call func + mov retval, eax + pop ecx + } + return (void*)retval; +} #else static void* do_call_func1(void *func, void *_this) { @@ -229,12 +273,44 @@ static void* do_call_func4(void *func, void *_this, ); return ret; } + +static void* do_call_func5(void *func, void *_this, + const void *arg1, const void *arg2, const void *arg3, const void *arg4) +{ + void *ret, *dummy; + __asm__ __volatile__ ( + "pushl %6\n\tpushl %5\n\tpushl %4\n\tpushl %3\n\tcall *%2" + : "=a" (ret), "=c" (dummy) + : "r" (func), "r" (arg1), "r" (arg2), "m" (arg3), "m" (arg4), "1" (_this) + : "edx", "memory" + ); + return ret; +} + +static void* do_call_func6(void *func, void *_this, + const void *arg1, const void *arg2, const void *arg3, + const void *arg4, const void *arg5) +{ + void *ret, *dummy; + __asm__ __volatile__ ( + "pushl %7\n\tpushl %6\n\tpushl %5\n\tpushl %4\n\tpushl %3\n\tcall *%2" + : "=a" (ret), "=c" (dummy) + : "r" (func), "r" (arg1), "r" (arg2), "m" (arg3), "m" (arg4), "m" (arg5), "1" (_this) + : "edx", "memory" + ); + return ret; +} #endif #define call_func1(func,_this) do_call_func1(func,_this) #define call_func2(func,_this,a) do_call_func2(func,_this,(const void*)a) #define call_func3(func,_this,a,b) do_call_func3(func,_this,(const void*)a,(const void*)b) -#define call_func4(func,_this,a,b,c) do_call_func4(func,_this,(const void*)a,(const void*)b,(const void*)c) +#define call_func4(func,_this,a,b,c) do_call_func4(func,_this,(const void*)a,\ + (const void*)b,(const void*)c) +#define call_func5(func,_this,a,b,c,d) do_call_func5(func,_this,(const void*)a,\ + (const void*)b,(const void*)c,(const void*)d) +#define call_func6(func,_this,a,b,c,d,e) do_call_func6(func,_this,(const void*)a,\ + (const void*)b,(const void*)c,(const void*)d,(const void*)e) #else @@ -242,6 +318,8 @@ static void* do_call_func4(void *func, void *_this, #define call_func2(func,_this,a) func(_this,a) #define call_func3(func,_this,a,b) func(_this,a,b) #define call_func4(func,_this,a,b,c) func(_this,a,b,c) +#define call_func5(func,_this,a,b,c,d) func(_this,a,b,c,d) +#define call_func6(func,_this,a,b,c,d,e) func(_this,a,b,c,d,e) #endif /* __i386__ */ @@ -287,6 +365,10 @@ static BOOL init(void) "?append@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@AEBV12@@Z"); p_basic_string_char_append_substr = (void*)GetProcAddress(msvcp, "?append@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@AEBV12@_K1@Z"); + p_basic_string_char_compare_substr_substr = (void*)GetProcAddress(msvcp, + "?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAH_K0AEBV12@00@Z"); + p_basic_string_char_compare_substr_cstr_len = (void*)GetProcAddress(msvcp, + "?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAH_K0PEBD0@Z"); p_basic_string_wchar_ctor = (void*)GetProcAddress(msvcp, "??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@XZ"); @@ -333,6 +415,10 @@ static BOOL init(void) "?append@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@ABV12@@Z"); p_basic_string_char_append_substr = (void*)GetProcAddress(msvcp, "?append@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@ABV12@II@Z"); + p_basic_string_char_compare_substr_substr = (void*)GetProcAddress(msvcp, + "?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHIIABV12@II@Z"); + p_basic_string_char_compare_substr_cstr_len = (void*)GetProcAddress(msvcp, + "?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHIIPBDI@Z"); p_basic_string_wchar_ctor = (void*)GetProcAddress(msvcp, "??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@XZ"); @@ -499,6 +585,47 @@ static void test_basic_string_char_append(void) { call_func1(p_basic_string_char_dtor, &str2); } +static void test_basic_string_char_compare(void) { + basic_string_char str1, str2; + int ret; + + if(!p_basic_string_char_ctor_cstr || !p_basic_string_char_dtor + || !p_basic_string_char_compare_substr_substr + || !p_basic_string_char_compare_substr_cstr_len) { + win_skip("basic_string<char> unavailable\n"); + return; + } + + call_func2(p_basic_string_char_ctor_cstr, &str1, "str1str"); + call_func2(p_basic_string_char_ctor_cstr, &str2, "str9str"); + + ret = (int)call_func6(p_basic_string_char_compare_substr_substr, + &str1, 0, 3, &str2, 0, 3); + ok(ret == 0, "ret = %d\n", ret); + ret = (int)call_func6(p_basic_string_char_compare_substr_substr, + &str1, 4, 3, &str2, 4, 10); + ok(ret == 0, "ret = %d\n", ret); + ret = (int)call_func6(p_basic_string_char_compare_substr_substr, + &str1, 1, 3, &str2, 1, 4); + ok(ret == -1, "ret = %d\n", ret); + + ret = (int)call_func5(p_basic_string_char_compare_substr_cstr_len, + &str1, 0, 1000, "str1str", 7); + ok(ret == 0, "ret = %d\n", ret); + ret = (int)call_func5(p_basic_string_char_compare_substr_cstr_len, + &str1, 1, 2, "tr", 2); + ok(ret == 0, "ret = %d\n", ret); + ret = (int)call_func5(p_basic_string_char_compare_substr_cstr_len, + &str1, 1, 0, "aaa", 0); + ok(ret == 0, "ret = %d\n", ret); + ret = (int)call_func5(p_basic_string_char_compare_substr_cstr_len, + &str1, 1, 0, "aaa", 1); + ok(ret == -1, "ret = %d\n", ret); + + call_func1(p_basic_string_char_dtor, &str1); + call_func1(p_basic_string_char_dtor, &str2); +} + static void test_basic_string_wchar(void) { static const wchar_t test[] = { 't','e','s','t',0 }; @@ -616,6 +743,7 @@ START_TEST(string) test_basic_string_char(); test_basic_string_char_swap(); test_basic_string_char_append(); + test_basic_string_char_compare(); test_basic_string_wchar(); test_basic_string_wchar_swap();

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@G@std@@QEBAXH@Z @ stub -arch=win32 ?close@?$messages@_W@std@@QBEXH@Z @ stub -arch=win64 ?close@?$messages@_W@std@@QEBAXH@Z -@ stub -arch=win32 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHABV12@@Z -@ stub -arch=win64 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAHAEBV12@@Z -@ stub -arch=win32 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHIIABV12@@Z -@ stub -arch=win64 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAHPEBD@Z -@ stub -arch=win32 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHIIABV12@II@Z -@ stub -arch=win64 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAH_K0AEBV12@00@Z -@ stub -arch=win32 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHIIPBD@Z -@ stub -arch=win64 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAH_K0AEBV12@@Z -@ stub -arch=win32 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHIIPBDI@Z -@ stub -arch=win64 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAH_K0PEBD0@Z -@ stub -arch=win32 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHPBD@Z -@ stub -arch=win64 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAH_K0PEBD@Z +@ thiscall -arch=win32 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHABV12@@Z(ptr ptr) msvcp90.?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHABV12@@Z +@ cdecl -arch=win64 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAHAEBV12@@Z(ptr ptr) msvcp90.?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAHAEBV12@@Z +@ thiscall -arch=win32 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHIIABV12@@Z(ptr long long ptr) msvcp90.?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHIIABV12@@Z +@ cdecl -arch=win64 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAHPEBD@Z(ptr ptr) msvcp90.?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAHPEBD@Z +@ thiscall -arch=win32 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHIIABV12@II@Z(ptr long long ptr long long) msvcp90.?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHIIABV12@II@Z +@ cdecl -arch=win64 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAH_K0AEBV12@00@Z(ptr long long ptr long long) msvcp90.?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAH_K0AEBV12@00@Z +@ thiscall -arch=win32 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHIIPBD@Z(ptr long long ptr) msvcp90.?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHIIPBD@Z +@ cdecl -arch=win64 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAH_K0AEBV12@@Z(ptr long long ptr) msvcp90.?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAH_K0AEBV12@@Z +@ thiscall -arch=win32 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHIIPBDI@Z(ptr long long ptr long) msvcp90.?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHIIPBDI@Z +@ cdecl -arch=win64 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAH_K0PEBD0@Z(ptr long long ptr long) msvcp90.?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAH_K0PEBD0@Z +@ thiscall -arch=win32 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHPBD@Z(ptr ptr) msvcp90.?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHPBD@Z +@ cdecl -arch=win64 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAH_K0PEBD@Z(ptr long long ptr) msvcp90.?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAH_K0PEBD@Z @ stub -arch=win32 ?compare@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEHABV12@@Z @ stub -arch=win64 ?compare@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBAHAEBV12@@Z @ stub -arch=win32 ?compare@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEHIIABV12@@Z @@ -3102,18 +3102,18 @@ @ stub -arch=win64 ?compare@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBAH_K0PEBG0@Z @ stub -arch=win32 ?compare@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEHPBG@Z @ stub -arch=win64 ?compare@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBAH_K0PEBG@Z -@ stub -arch=win32 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHABV12@@Z -@ stub -arch=win64 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAHAEBV12@@Z -@ stub -arch=win32 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHIIABV12@@Z -@ stub -arch=win64 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAHPEB_W@Z -@ stub -arch=win32 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHIIABV12@II@Z -@ stub -arch=win64 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAH_K0AEBV12@00@Z -@ stub -arch=win32 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHIIPB_W@Z -@ stub -arch=win64 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAH_K0AEBV12@@Z -@ stub -arch=win32 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHIIPB_WI@Z -@ stub -arch=win64 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAH_K0PEB_W0@Z -@ stub -arch=win32 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHPB_W@Z -@ stub -arch=win64 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAH_K0PEB_W@Z +@ thiscall -arch=win32 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHABV12@@Z(ptr ptr) msvcp90.?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHABV12@@Z +@ cdecl -arch=win64 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAHAEBV12@@Z(ptr ptr) msvcp90.?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAHAEBV12@@Z +@ thiscall -arch=win32 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHIIABV12@@Z(ptr long long ptr) msvcp90.?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHIIABV12@@Z +@ cdecl -arch=win64 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAHPEB_W@Z(ptr ptr) msvcp90.?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAHPEB_W@Z +@ thiscall -arch=win32 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHIIABV12@II@Z(ptr long long ptr long long) msvcp90.?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHIIABV12@II@Z +@ cdecl -arch=win64 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAH_K0AEBV12@00@Z(ptr long long ptr long long) msvcp90.?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAH_K0AEBV12@00@Z +@ thiscall -arch=win32 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHIIPB_W@Z(ptr long long ptr) msvcp90.?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHIIPB_W@Z +@ cdecl -arch=win64 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAH_K0AEBV12@@Z(ptr long long ptr) msvcp90.?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAH_K0AEBV12@@Z +@ thiscall -arch=win32 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHIIPB_WI@Z(ptr long long ptr long) msvcp90.?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHIIPB_WI@Z +@ cdecl -arch=win64 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAH_K0PEB_W0@Z(ptr long long ptr long) msvcp90.?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAH_K0PEB_W0@Z +@ thiscall -arch=win32 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHPB_W@Z(ptr ptr) msvcp90.?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHPB_W@Z +@ cdecl -arch=win64 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAH_K0PEB_W@Z(ptr long long ptr) msvcp90.?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAH_K0PEB_W@Z @ cdecl -arch=win32 ?compare@?$char_traits@D@std@@SAHPBD0I@Z(ptr ptr long) msvcp90.?compare@?$char_traits@D@std@@SAHPBD0I@Z @ cdecl -arch=win64 ?compare@?$char_traits@D@std@@SAHPEBD0_K@Z(ptr ptr long) msvcp90.?compare@?$char_traits@D@std@@SAHPEBD0_K@Z @ cdecl -arch=win32 ?compare@?$char_traits@G@std@@SAHPBG0I@Z(ptr ptr long) msvcp90.?compare@?$char_traits@G@std@@SAHPBG0I@Z

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@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBAH_K0PEBG0@Z @ stub -arch=win32 ?compare@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEHPBG@Z @ stub -arch=win64 ?compare@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBAH_K0PEBG@Z -@ stub -arch=win32 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHABV12@@Z -@ stub -arch=win64 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAHAEBV12@@Z -@ stub -arch=win32 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHIIABV12@@Z -@ stub -arch=win64 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAHPEB_W@Z -@ stub -arch=win32 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHIIABV12@II@Z -@ stub -arch=win64 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAH_K0AEBV12@00@Z -@ stub -arch=win32 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHIIPB_W@Z -@ stub -arch=win64 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAH_K0AEBV12@@Z -@ stub -arch=win32 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHIIPB_WI@Z -@ stub -arch=win64 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAH_K0PEB_W0@Z -@ stub -arch=win32 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHPB_W@Z -@ stub -arch=win64 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAH_K0PEB_W@Z +@ thiscall -arch=win32 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHABV12@@Z(ptr ptr) MSVCP_basic_string_wchar_compare +@ cdecl -arch=win64 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAHAEBV12@@Z(ptr ptr) MSVCP_basic_string_wchar_compare +@ thiscall -arch=win32 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHIIABV12@@Z(ptr long long ptr) MSVCP_basic_string_wchar_compare_substr +@ cdecl -arch=win64 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAHPEB_W@Z(ptr ptr) MSVCP_basic_string_wchar_compare_cstr +@ thiscall -arch=win32 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHIIABV12@II@Z(ptr long long ptr long long) MSVCP_basic_string_wchar_compare_substr_substr +@ cdecl -arch=win64 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAH_K0AEBV12@00@Z(ptr long long ptr long long) MSVCP_basic_string_wchar_compare_substr_substr +@ thiscall -arch=win32 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHIIPB_W@Z(ptr long long ptr) MSVCP_basic_string_wchar_compare_substr_cstr +@ cdecl -arch=win64 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAH_K0AEBV12@@Z(ptr long long ptr) MSVCP_basic_string_wchar_compare_substr +@ thiscall -arch=win32 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHIIPB_WI@Z(ptr long long ptr long) MSVCP_basic_string_wchar_compare_substr_cstr_len +@ cdecl -arch=win64 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAH_K0PEB_W0@Z(ptr long long ptr long) MSVCP_basic_string_wchar_compare_substr_cstr_len +@ thiscall -arch=win32 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHPB_W@Z(ptr ptr) MSVCP_basic_string_wchar_compare_cstr +@ cdecl -arch=win64 ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAH_K0PEB_W@Z(ptr long long ptr) MSVCP_basic_string_wchar_compare_substr_cstr @ cdecl -arch=win32 ?compare@?$char_traits@D@std@@SAHPBD0I@Z(ptr ptr long) MSVCP_char_traits_char_compare @ cdecl -arch=win64 ?compare@?$char_traits@D@std@@SAHPEBD0_K@Z(ptr ptr long) MSVCP_char_traits_char_compare @ cdecl -arch=win32 ?compare@?$char_traits@G@std@@SAHPBG0I@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@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHIIPB_WI@Z */ +/* ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAH_K0PEB_W0@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@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHIIPB_W@Z */ +/* ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAH_K0PEB_W@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@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHPB_W@Z */ +/* ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAHPEB_W@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@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHIIABV12@II@Z */ +/* ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAH_K0AEBV12@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@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHIIABV12@@Z */ +/* ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_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@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHABV12@@Z */ +/* ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_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 : 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@G@std@@QEBAXH@Z @ stub -arch=win32 ?close@?$messages@_W@std@@QBEXH@Z @ stub -arch=win64 ?close@?$messages@_W@std@@QEBAXH@Z -@ stub -arch=win32 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHABV12@@Z -@ stub -arch=win64 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAHAEBV12@@Z -@ stub -arch=win32 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHIIABV12@@Z -@ stub -arch=win64 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAHPEBD@Z -@ stub -arch=win32 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHIIABV12@II@Z -@ stub -arch=win64 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAH_K0AEBV12@00@Z -@ stub -arch=win32 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHIIPBD@Z -@ stub -arch=win64 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAH_K0AEBV12@@Z -@ stub -arch=win32 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHIIPBDI@Z -@ stub -arch=win64 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAH_K0PEBD0@Z -@ stub -arch=win32 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHPBD@Z -@ stub -arch=win64 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAH_K0PEBD@Z +@ thiscall -arch=win32 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHABV12@@Z(ptr ptr) MSVCP_basic_string_char_compare +@ cdecl -arch=win64 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAHAEBV12@@Z(ptr ptr) MSVCP_basic_string_char_compare +@ thiscall -arch=win32 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHIIABV12@@Z(ptr long long ptr) MSVCP_basic_string_char_compare_substr +@ cdecl -arch=win64 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAHPEBD@Z(ptr ptr) MSVCP_basic_string_char_compare_cstr +@ thiscall -arch=win32 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHIIABV12@II@Z(ptr long long ptr long long) MSVCP_basic_string_char_compare_substr_substr +@ cdecl -arch=win64 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAH_K0AEBV12@00@Z(ptr long long ptr long long) MSVCP_basic_string_char_compare_substr_substr +@ thiscall -arch=win32 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHIIPBD@Z(ptr long long ptr) MSVCP_basic_string_char_compare_substr_cstr +@ cdecl -arch=win64 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAH_K0AEBV12@@Z(ptr long long ptr) MSVCP_basic_string_char_compare_substr +@ thiscall -arch=win32 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHIIPBDI@Z(ptr long long ptr long) MSVCP_basic_string_char_compare_substr_cstr_len +@ cdecl -arch=win64 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAH_K0PEBD0@Z(ptr long long ptr long) MSVCP_basic_string_char_compare_substr_cstr_len +@ thiscall -arch=win32 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHPBD@Z(ptr ptr) MSVCP_basic_string_char_compare_cstr +@ cdecl -arch=win64 ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAH_K0PEBD@Z(ptr long long ptr) MSVCP_basic_string_char_compare_substr_cstr @ stub -arch=win32 ?compare@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEHABV12@@Z @ stub -arch=win64 ?compare@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBAHAEBV12@@Z @ stub -arch=win32 ?compare@?$basic_string@GU?$char_traits@G@std@@V?$allocator@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@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHIIPBDI@Z */ +/* ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAH_K0PEBD0@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@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHIIPBD@Z */ +/* ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAH_K0PEBD@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@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHPBD@Z */ +/* ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAHPEBD@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@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHIIABV12@II@Z */ +/* ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAH_K0AEBV12@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@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHIIABV12@@Z */ +/* ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@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@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEHABV12@@Z */ +/* ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@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@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@2IB */

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@_WU?$char_traits@_W@std@@@std@@IEAA@XZ @ thiscall -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV01@@Z(ptr ptr) msvcp90.??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV01@@Z @ cdecl -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@AEBV01@@Z(ptr ptr) msvcp90.??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@AEBV01@@Z -@ stub -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV01@II@Z -@ stub -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@AEBV01@_K1@Z +@ thiscall -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV01@II@Z(ptr ptr long long) msvcp90.??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV01@II@Z +@ cdecl -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@AEBV01@_K1@Z(ptr ptr long long) msvcp90.??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@AEBV01@_K1@Z @ stub -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV01@IIABV?$allocator@D@1@@Z @ stub -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@AEBV01@_K1AEBV?$allocator@D@1@@Z @ stub -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV?$allocator@D@1@@Z @@ -792,8 +792,8 @@ @ stub -arch=win64 ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA@_KGAEBV?$allocator@G@1@@Z @ thiscall -arch=win32 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@ABV01@@Z(ptr ptr) msvcp90.??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@ABV01@@Z @ cdecl -arch=win64 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@AEBV01@@Z(ptr ptr) msvcp90.??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@AEBV01@@Z -@ stub -arch=win32 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@ABV01@II@Z -@ stub -arch=win64 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@AEBV01@_K1@Z +@ thiscall -arch=win32 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@ABV01@II@Z(ptr ptr long long) msvcp90.??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@ABV01@II@Z +@ cdecl -arch=win64 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@AEBV01@_K1@Z(ptr ptr long long) msvcp90.??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@AEBV01@_K1@Z @ stub -arch=win32 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@ABV01@IIABV?$allocator@_W@1@@Z @ stub -arch=win64 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@AEBV01@_K1AEBV?$allocator@_W@1@@Z @ stub -arch=win32 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@ABV?$allocator@_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@_WU?$char_traits@_W@std@@@std@@IEAA@XZ @ thiscall -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV01@@Z(ptr ptr) MSVCP_basic_string_char_copy_ctor @ cdecl -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@AEBV01@@Z(ptr ptr) MSVCP_basic_string_char_copy_ctor -@ stub -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV01@II@Z -@ stub -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@AEBV01@_K1@Z +@ thiscall -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV01@II@Z(ptr ptr long long) MSVCP_basic_string_char_ctor_substr +@ cdecl -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@AEBV01@_K1@Z(ptr ptr long long) MSVCP_basic_string_char_ctor_substr @ stub -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV01@IIABV?$allocator@D@1@@Z @ stub -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@AEBV01@_K1AEBV?$allocator@D@1@@Z @ stub -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV?$allocator@D@1@@Z @@ -786,8 +786,8 @@ @ stub -arch=win64 ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA@_KGAEBV?$allocator@G@1@@Z @ thiscall -arch=win32 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@ABV01@@Z(ptr ptr) MSVCP_basic_string_wchar_copy_ctor @ cdecl -arch=win64 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@AEBV01@@Z(ptr ptr) MSVCP_basic_string_wchar_copy_ctor -@ stub -arch=win32 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@ABV01@II@Z -@ stub -arch=win64 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@AEBV01@_K1@Z +@ thiscall -arch=win32 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@ABV01@II@Z(ptr ptr long long) MSVCP_basic_string_wchar_ctor_substr +@ cdecl -arch=win64 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@AEBV01@_K1@Z(ptr ptr long long) MSVCP_basic_string_wchar_ctor_substr @ stub -arch=win32 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@ABV01@IIABV?$allocator@_W@1@@Z @ stub -arch=win64 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@AEBV01@_K1AEBV?$allocator@_W@1@@Z @ stub -arch=win32 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@ABV?$allocator@_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@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV01@II@Z */ +/* ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@AEBV01@_K1@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@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@XZ */ /* ??1?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@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@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@ABV01@II@Z */ +/* ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@AEBV01@_K1@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@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@XZ */ /* ??1?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@XZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_dtor, 4)

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

Maarten Lankhorst : quartz: Change VideoRenderer_Run to handle EndOfStream slightly better.
by Alexandre Julliard 25 Nov '10

25 Nov '10

Module: wine Branch: master Commit: f63950d023eb9411a117e42ef500f9d0f9e21786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f63950d023eb9411a117e42ef… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Nov 24 18:23:55 2010 +0100 quartz: Change VideoRenderer_Run to handle EndOfStream slightly better. --- dlls/quartz/videorenderer.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 112289a..d26ecb5 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -821,19 +821,17 @@ static HRESULT WINAPI VideoRenderer_Run(IBaseFilter * iface, REFERENCE_TIME tSta EnterCriticalSection(&This->filter.csFilter); if (This->filter.state == State_Running) goto out; - if (This->pInputPin->pin.pConnectedTo) + This->filter.rtStreamStart = tStart; + QualityControlRender_Start(&This->qcimpl, tStart); + if (This->pInputPin->pin.pConnectedTo && (This->filter.state == State_Stopped || !This->pInputPin->end_of_stream)) { if (This->filter.state == State_Stopped) { - This->pInputPin->end_of_stream = 0; ResetEvent(This->hEvent); VideoRenderer_AutoShowWindow(This); + This->pInputPin->end_of_stream = 0; } SetEvent(This->blocked); - - This->filter.rtStreamStart = tStart; - This->filter.state = State_Running; - QualityControlRender_Start(&This->qcimpl, tStart); } else if (This->filter.filterInfo.pGraph) { IMediaEventSink *pEventSink; hr = IFilterGraph_QueryInterface(This->filter.filterInfo.pGraph, &IID_IMediaEventSink, (LPVOID*)&pEventSink);

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

← Newer
1
...
12
13
14
15
16
17
18
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2010