November 2010 - Wine-Commits

André Hentschel : winemaker: Add spec file dependency for dlls.
by Alexandre Julliard Nov. 17, 2010

Nov. 17, 2010

Module: wine Branch: master Commit: 189a5d0978c036032aed4f06362d6e1d1efa2677 URL: http://source.winehq.org/git/wine.git/?a=commit;h=189a5d0978c036032aed4f063… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 16 22:43:55 2010 +0100 winemaker: Add spec file dependency for dlls. --- tools/winemaker | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index bd46380..68483b8 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -20,7 +20,7 @@ use strict; # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA # -my $version="0.7.4"; +my $version="0.7.5"; use Cwd; use File::Basename; @@ -2475,7 +2475,11 @@ sub generate_project_files($) my $canon=canonize("@$target[$T_NAME]"); $canon =~ s/_so$//; - print FILEO "\$(${canon}_MODULE).so: \$(${canon}_OBJS)\n"; + if (@$target[$T_TYPE] == $TT_DLL) { + print FILEO "\$(${canon}_MODULE).so: \$(${canon}_OBJS) \$(${canon}_MODULE:.dll=.spec)\n"; + } else { + print FILEO "\$(${canon}_MODULE).so: \$(${canon}_OBJS)\n"; + } if (@{@$target[$T_SOURCES_CXX]} > 0 or @{@$project_settings[$T_SOURCES_CXX]} > 0) { print FILEO "\t\$(CXX)"; } else {

1 0

Vincas Miliūnas : msvcp90: Added basic_string<char>:: swap implementation.
by Alexandre Julliard Nov. 17, 2010

Nov. 17, 2010

Module: wine Branch: master Commit: 676d0d41f5662538478fa80312dde49bf923e3ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=676d0d41f5662538478fa8031… Author: Vincas Miliūnas <vincas.miliunas(a)gmail.com> Date: Tue Nov 16 20:58:15 2010 +0200 msvcp90: Added basic_string<char>::swap implementation. --- dlls/msvcp80/msvcp80.spec | 4 ++-- dlls/msvcp90/msvcp90.spec | 4 ++-- dlls/msvcp90/string.c | 22 ++++++++++++++++++++++ 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index f05b53d..ec1458f 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -5477,8 +5477,8 @@ @ stub -arch=win64 ?sungetc@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QEAAGXZ @ stub -arch=win32 ?sungetc@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@QAEGXZ @ stub -arch=win64 ?sungetc@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@QEAAGXZ -@ stub -arch=win32 ?swap@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAXAEAV12@@Z +@ thiscall -arch=win32 ?swap@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXAAV12@@Z(ptr ptr) msvcp90.?swap@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXAAV12@@Z +@ cdecl -arch=win64 ?swap@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAXAEAV12@@Z (ptr ptr) msvcp90.?swap@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAXAEAV12@@Z @ stub -arch=win32 ?swap@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEXAAV12@@Z @ stub -arch=win64 ?swap@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAXAEAV12@@Z @ stub -arch=win32 ?swap@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEXAAV12@@Z diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 9ed37ec..2520ab3 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5508,8 +5508,8 @@ @ stub -arch=win64 ?sungetc@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QEAAGXZ @ stub -arch=win32 ?sungetc@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@QAEGXZ @ stub -arch=win64 ?sungetc@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@QEAAGXZ -@ stub -arch=win32 ?swap@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAXAEAV12@@Z +@ thiscall -arch=win32 ?swap@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXAAV12@@Z(ptr ptr) MSVCP_basic_string_char_swap +@ cdecl -arch=win64 ?swap@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAXAEAV12@@Z(ptr ptr) MSVCP_basic_string_char_swap @ stub -arch=win32 ?swap@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEXAAV12@@Z @ stub -arch=win64 ?swap@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAXAEAV12@@Z @ stub -arch=win32 ?swap@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEXAAV12@@Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index cc4ff1b..68eb921 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1017,3 +1017,25 @@ size_t __thiscall MSVCP_basic_string_wchar_length(basic_string_wchar *this) TRACE("%p\n", this); return this->size; } + +/* ?swap@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXAAV12@@Z */ +/* ?swap@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAXAEAV12@@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_swap, 8) +void __thiscall MSVCP_basic_string_char_swap(basic_string_char *this, basic_string_char *str) +{ + if(this != str) { + char tmp[sizeof(this->data)]; + const size_t size = this->size; + const size_t res = this->res; + + memcpy(tmp, this->data.buf, sizeof(this->data)); + memcpy(this->data.buf, str->data.buf, sizeof(this->data)); + memcpy(str->data.buf, tmp, sizeof(this->data)); + + this->size = str->size; + this->res = str->res; + + str->size = size; + str->res = res; + } +}

1 0

Vincas Miliūnas : msvcp90/tests: Added basic_string< char>::swap tests.
by Alexandre Julliard Nov. 17, 2010

Nov. 17, 2010

Module: wine Branch: master Commit: af780d888fe8c22bd70948bbffa80cb1f193c72b URL: http://source.winehq.org/git/wine.git/?a=commit;h=af780d888fe8c22bd70948bbf… Author: Vincas Miliūnas <vincas.miliunas(a)gmail.com> Date: Tue Nov 16 20:58:29 2010 +0200 msvcp90/tests: Added basic_string<char>::swap tests. --- dlls/msvcp90/tests/string.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index cb0b74b..73bc881 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -60,6 +60,7 @@ static basic_string_char* (WINAPI *p_basic_string_char_assign_cstr_len)(const ch static const char* (WINAPI *p_basic_string_char_cstr)(void); static const char* (WINAPI *p_basic_string_char_data)(void); static size_t (WINAPI *p_basic_string_char_size)(void); +static void (WINAPI *p_basic_string_char_swap)(basic_string_char*); 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*); @@ -80,6 +81,7 @@ static basic_string_char* (__cdecl *p_basic_string_char_assign_cstr_len)(basic_s static const char* (__cdecl *p_basic_string_char_cstr)(basic_string_char*); static const char* (__cdecl *p_basic_string_char_data)(basic_string_char*); 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_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*); @@ -240,6 +242,8 @@ static BOOL init(void) "?data@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAPEBDXZ"); p_basic_string_char_size = (void*)GetProcAddress(msvcp, "?size@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KXZ"); + p_basic_string_char_swap = (void*)GetProcAddress(msvcp, + "?swap@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAXAEAV12@@Z"); p_basic_string_wchar_ctor = (void*)GetProcAddress(msvcp, "??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)XZ"); @@ -279,6 +283,8 @@ static BOOL init(void) "?data@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEPBDXZ"); p_basic_string_char_size = (void*)GetProcAddress(msvcp, "?size@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIXZ"); + p_basic_string_char_swap = (void*)GetProcAddress(msvcp, + "?swap@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXAAV12@@Z"); p_basic_string_wchar_ctor = (void*)GetProcAddress(msvcp, "??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)XZ"); @@ -375,6 +381,40 @@ static void test_basic_string_char(void) { call_func1(p_basic_string_char_dtor, &str2); } +static void test_basic_string_char_swap(void) { + basic_string_char str1, str2; + char atmp1[32], atmp2[32]; + + if(!p_basic_string_char_ctor_cstr || !p_basic_string_char_dtor || + !p_basic_string_char_swap || !p_basic_string_char_cstr) { + win_skip("basic_string<char> unavailable\n"); + return; + } + + /* Swap self, local */ + strcpy(atmp1, "qwerty"); + call_func2(p_basic_string_char_ctor_cstr, &str1, atmp1); + call_func2(p_basic_string_char_swap, &str1, &str1); + ok(strcmp(atmp1, (const char *) call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); + call_func2(p_basic_string_char_swap, &str1, &str1); + ok(strcmp(atmp1, (const char *) call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); + call_func1(p_basic_string_char_dtor, &str1); + + /* str1 allocated, str2 local */ + strcpy(atmp1, "qwerty12345678901234567890"); + strcpy(atmp2, "asd"); + call_func2(p_basic_string_char_ctor_cstr, &str1, atmp1); + call_func2(p_basic_string_char_ctor_cstr, &str2, atmp2); + call_func2(p_basic_string_char_swap, &str1, &str2); + ok(strcmp(atmp2, (const char *) call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(strcmp(atmp1, (const char *) call_func1(p_basic_string_char_cstr, &str2)) == 0, "Invalid value of str2\n"); + call_func2(p_basic_string_char_swap, &str1, &str2); + ok(strcmp(atmp1, (const char *) call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(strcmp(atmp2, (const char *) call_func1(p_basic_string_char_cstr, &str2)) == 0, "Invalid value of str2\n"); + 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 }; @@ -456,6 +496,7 @@ START_TEST(string) return; test_basic_string_char(); + test_basic_string_char_swap(); test_basic_string_wchar(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n");

1 0

Vincas Miliūnas : msvcp90: Added basic_string<wchar_t> ::swap implementation.
by Alexandre Julliard Nov. 17, 2010

Nov. 17, 2010

Module: wine Branch: master Commit: 96e4e219971143fbfafa6e35d4c918d9c5667db2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96e4e219971143fbfafa6e35d… Author: Vincas Miliūnas <vincas.miliunas(a)gmail.com> Date: Tue Nov 16 20:58:44 2010 +0200 msvcp90: Added basic_string<wchar_t>::swap implementation. --- dlls/msvcp80/msvcp80.spec | 4 ++-- dlls/msvcp90/msvcp90.spec | 4 ++-- dlls/msvcp90/string.c | 22 ++++++++++++++++++++++ 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index ec1458f..79dc7e4 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -5481,8 +5481,8 @@ @ cdecl -arch=win64 ?swap@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAXAEAV12@@Z (ptr ptr) msvcp90.?swap@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAXAEAV12@@Z @ stub -arch=win32 ?swap@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEXAAV12@@Z @ stub -arch=win64 ?swap@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAXAEAV12@@Z -@ stub -arch=win32 ?swap@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAXAEAV12@@Z +@ thiscall -arch=win32 ?swap@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEXAAV12@@Z(ptr ptr) msvcp90.?swap@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEXAAV12@@Z +@ cdecl -arch=win64 ?swap@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAXAEAV12@@Z(ptr ptr) msvcp90.?swap@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAXAEAV12@@Z @ stub -arch=win32 ?sync@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ @ stub -arch=win64 ?sync@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ @ stub -arch=win32 ?sync@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@MAEHXZ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 2520ab3..dbbf0b5 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5512,8 +5512,8 @@ @ cdecl -arch=win64 ?swap@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAXAEAV12@@Z(ptr ptr) MSVCP_basic_string_char_swap @ stub -arch=win32 ?swap@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEXAAV12@@Z @ stub -arch=win64 ?swap@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAXAEAV12@@Z -@ stub -arch=win32 ?swap@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAXAEAV12@@Z +@ thiscall -arch=win32 ?swap@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEXAAV12@@Z(ptr ptr) MSVCP_basic_string_wchar_swap +@ cdecl -arch=win64 ?swap@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAXAEAV12@@Z(ptr ptr) MSVCP_basic_string_wchar_swap @ stub -arch=win32 ?sync@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ @ stub -arch=win64 ?sync@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ @ stub -arch=win32 ?sync@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@MAEHXZ diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 68eb921..fb51ae4 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1039,3 +1039,25 @@ void __thiscall MSVCP_basic_string_char_swap(basic_string_char *this, basic_stri str->res = res; } } + +/* ?swap@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEXAAV12@@Z */ +/* ?swap@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAXAEAV12@@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_swap, 8) +void __thiscall MSVCP_basic_string_wchar_swap(basic_string_wchar *this, basic_string_wchar *str) +{ + if(this != str) { + char tmp[sizeof(this->data)]; + const size_t size = this->size; + const size_t res = this->res; + + memcpy(tmp, this->data.buf, sizeof(this->data)); + memcpy(this->data.buf, str->data.buf, sizeof(this->data)); + memcpy(str->data.buf, tmp, sizeof(this->data)); + + this->size = str->size; + this->res = str->res; + + str->size = size; + str->res = res; + } +}

1 0

Vincas Miliūnas : msvcp90/tests: Added basic_string< wchar_t>::swap tests.
by Alexandre Julliard Nov. 17, 2010

Nov. 17, 2010

Module: wine Branch: master Commit: 0de373beff1c031a88de913a477e5c144b7d3dff URL: http://source.winehq.org/git/wine.git/?a=commit;h=0de373beff1c031a88de913a4… Author: Vincas Miliūnas <vincas.miliunas(a)gmail.com> Date: Tue Nov 16 20:58:57 2010 +0200 msvcp90/tests: Added basic_string<wchar_t>::swap tests. --- dlls/msvcp90/tests/string.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 41 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index 73bc881..5d31289 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -71,6 +71,7 @@ static basic_string_wchar* (WINAPI *p_basic_string_wchar_assign_cstr_len)(const static const wchar_t* (WINAPI *p_basic_string_wchar_cstr)(void); static const wchar_t* (WINAPI *p_basic_string_wchar_data)(void); static size_t (WINAPI *p_basic_string_wchar_size)(void); +static void (WINAPI *p_basic_string_wchar_swap)(basic_string_wchar*); #else static basic_string_char* (__cdecl *p_basic_string_char_ctor)(basic_string_char*); static basic_string_char* (__cdecl *p_basic_string_char_copy_ctor)(basic_string_char*, basic_string_char*); @@ -92,6 +93,7 @@ static basic_string_wchar* (__cdecl *p_basic_string_wchar_assign_cstr_len)(basic static const wchar_t* (__cdecl *p_basic_string_wchar_cstr)(basic_string_wchar*); static const wchar_t* (__cdecl *p_basic_string_wchar_data)(basic_string_wchar*); static size_t (__cdecl *p_basic_string_wchar_size)(basic_string_wchar*); +static void (__cdecl *p_basic_string_wchar_swap)(basic_string_wchar*, basic_string_wchar*); #endif static int invalid_parameter = 0; @@ -263,7 +265,8 @@ static BOOL init(void) "?data@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAPEB_WXZ"); p_basic_string_wchar_size = (void*)GetProcAddress(msvcp, "?size@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KXZ"); - + p_basic_string_wchar_swap = (void*)GetProcAddress(msvcp, + "?swap@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAXAEAV12@@Z"); } else { p_basic_string_char_ctor = (void*)GetProcAddress(msvcp, "??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)XZ"); @@ -304,6 +307,8 @@ static BOOL init(void) "?data@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEPB_WXZ"); p_basic_string_wchar_size = (void*)GetProcAddress(msvcp, "?size@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIXZ"); + p_basic_string_wchar_swap = (void*)GetProcAddress(msvcp, + "?swap@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEXAAV12@@Z"); } return TRUE; @@ -490,6 +495,40 @@ static void test_basic_string_wchar(void) { call_func1(p_basic_string_wchar_dtor, &str2); } +static void test_basic_string_wchar_swap(void) { + basic_string_wchar str1, str2; + wchar_t wtmp1[32], wtmp2[32]; + + if(!p_basic_string_wchar_ctor_cstr || !p_basic_string_wchar_dtor || + !p_basic_string_wchar_swap || !p_basic_string_wchar_cstr) { + win_skip("basic_string<wchar_t> unavailable\n"); + return; + } + + /* Swap self, local */ + mbstowcs(wtmp1, "qwerty", 32); + call_func2(p_basic_string_wchar_ctor_cstr, &str1, wtmp1); + call_func2(p_basic_string_wchar_swap, &str1, &str1); + ok(wcscmp(wtmp1, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); + call_func2(p_basic_string_wchar_swap, &str1, &str1); + ok(wcscmp(wtmp1, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); + call_func1(p_basic_string_wchar_dtor, &str1); + + /* str1 allocated, str2 local */ + mbstowcs(wtmp1, "qwerty12345678901234567890", 32); + mbstowcs(wtmp2, "asd", 32); + call_func2(p_basic_string_wchar_ctor_cstr, &str1, wtmp1); + call_func2(p_basic_string_wchar_ctor_cstr, &str2, wtmp2); + call_func2(p_basic_string_wchar_swap, &str1, &str2); + ok(wcscmp(wtmp2, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(wcscmp(wtmp1, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str2)) == 0, "Invalid value of str2\n"); + call_func2(p_basic_string_wchar_swap, &str1, &str2); + ok(wcscmp(wtmp1, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(wcscmp(wtmp2, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str2)) == 0, "Invalid value of str2\n"); + call_func1(p_basic_string_wchar_dtor, &str1); + call_func1(p_basic_string_wchar_dtor, &str2); +} + START_TEST(string) { if(!init()) @@ -498,6 +537,7 @@ START_TEST(string) test_basic_string_char(); test_basic_string_char_swap(); test_basic_string_wchar(); + test_basic_string_wchar_swap(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n"); }

1 0

Jörg Höhle : mciseq: Bogus sizeof led to incorrect positioning.
by Alexandre Julliard Nov. 17, 2010

Nov. 17, 2010

Module: wine Branch: master Commit: 129778803ec4a72e05665acee761da0d0c461efa URL: http://source.winehq.org/git/wine.git/?a=commit;h=129778803ec4a72e05665acee… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Nov 16 21:39:17 2010 +0100 mciseq: Bogus sizeof led to incorrect positioning. --- dlls/mciseq/mcimidi.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index aa351f3..6bf7f4d 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -952,7 +952,7 @@ static DWORD MIDI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) } if (!(dwFlags & MCI_WAIT)) { - return MCI_SendCommandAsync(wDevID, MCI_PLAY, dwFlags, (DWORD_PTR)lpParms, sizeof(LPMCI_PLAY_PARMS)); + return MCI_SendCommandAsync(wDevID, MCI_PLAY, dwFlags, (DWORD_PTR)lpParms, sizeof(MCI_PLAY_PARMS)); } if (lpParms && (dwFlags & MCI_FROM)) { @@ -1191,8 +1191,6 @@ static DWORD MIDI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) midiOutReset((HMIDIOUT)wmm->hMidi); dwRet = midiOutClose((HMIDIOUT)wmm->hMidi); - /* to restart playing at beginning when it's over */ - wmm->dwPositionMS = 0; if (dwFlags & MCI_NOTIFY) oldcb = InterlockedExchangePointer(&wmm->hCallback, NULL);

1 0

André Hentschel : winemaker: Catch special case in Workspace file.
by Alexandre Julliard Nov. 17, 2010

Nov. 17, 2010

Module: wine Branch: master Commit: c9ff0c5382cf25ca101ce21c22e9420ccf69fb78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9ff0c5382cf25ca101ce21c2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 16 19:59:32 2010 +0100 winemaker: Catch special case in Workspace file. Some sln files use that as a section to keep things like changelogs, which we are not interested in. --- tools/winemaker | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 317b07a..bd46380 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1186,6 +1186,7 @@ sub source_scan_workspace_file($) if (/^Project(.*)=\s*"(.*)",\s*"(.*)",\s*"(.*)"/) { $prj_name=$2; $prj_path=$3; + if ($prj_path eq "Solution Items") { next; } @components=split /[\/\\]+/, $3; $prj_path=search_from($path, \@components); print "Name: $prj_name\nPath: $prj_path\n";

1 0

André Hentschel : include: Add some relocation types.
by Alexandre Julliard Nov. 17, 2010

Nov. 17, 2010

Module: wine Branch: master Commit: f6692721524d5d4b9f0401d4e2e11c5b26e2b3bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6692721524d5d4b9f0401d4e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 16 20:58:52 2010 +0100 include: Add some relocation types. --- include/winnt.h | 31 ++++++++++++++++++++++++------- 1 files changed, 24 insertions(+), 7 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index e6f9b3c..b72a952 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3274,6 +3274,8 @@ typedef struct _IMAGE_RELOCATION #define IMAGE_REL_I386_SEG12 9 #define IMAGE_REL_I386_SECTION 10 #define IMAGE_REL_I386_SECREL 11 +#define IMAGE_REL_I386_TOKEN 12 +#define IMAGE_REL_I386_SECREL7 13 #define IMAGE_REL_I386_REL32 20 /* MIPS relocation types */ @@ -3289,7 +3291,8 @@ typedef struct _IMAGE_RELOCATION #define IMAGE_REL_MIPS_SECREL 0x000B #define IMAGE_REL_MIPS_SECRELLO 0x000C #define IMAGE_REL_MIPS_SECRELHI 0x000D -#define IMAGE_REL_MIPS_JMPADDR16 0x0010 +#define IMAGE_REL_MIPS_TOKEN 0x000E +#define IMAGE_REL_MIPS_JMPADDR16 0x0010 #define IMAGE_REL_MIPS_REFWORDNB 0x0022 #define IMAGE_REL_MIPS_PAIR 0x0025 @@ -3342,6 +3345,7 @@ typedef struct _IMAGE_RELOCATION #define IMAGE_REL_PPC_SECRELLO 0x0013 #define IMAGE_REL_PPC_SECRELHI 0x0014 #define IMAGE_REL_PPC_GPREL 0x0015 +#define IMAGE_REL_PPC_TOKEN 0x0016 #define IMAGE_REL_PPC_TYPEMASK 0x00FF /* modifier bits */ #define IMAGE_REL_PPC_NEG 0x0100 @@ -3367,6 +3371,8 @@ typedef struct _IMAGE_RELOCATION #define IMAGE_REL_SH3_SECTION 0x000E #define IMAGE_REL_SH3_SECREL 0x000F #define IMAGE_REL_SH3_DIRECT32_NB 0x0010 +#define IMAGE_REL_SH3_GPREL4_LONG 0x0011 +#define IMAGE_REL_SH3_TOKEN 0x0012 /* ARM (Archimedes?) relocation types */ #define IMAGE_REL_ARM_ABSOLUTE 0x0000 @@ -3374,6 +3380,11 @@ typedef struct _IMAGE_RELOCATION #define IMAGE_REL_ARM_ADDR32NB 0x0002 #define IMAGE_REL_ARM_BRANCH24 0x0003 #define IMAGE_REL_ARM_BRANCH11 0x0004 +#define IMAGE_REL_ARM_TOKEN 0x0005 +#define IMAGE_REL_ARM_GPREL12 0x0006 +#define IMAGE_REL_ARM_GPREL7 0x0007 +#define IMAGE_REL_ARM_BLX24 0x0008 +#define IMAGE_REL_ARM_BLX11 0x0009 #define IMAGE_REL_ARM_SECTION 0x000E #define IMAGE_REL_ARM_SECREL 0x000F @@ -3395,12 +3406,18 @@ typedef struct _IMAGE_RELOCATION #define IMAGE_REL_IA64_SECREL 0x000E #define IMAGE_REL_IA64_LTOFF64 0x000F #define IMAGE_REL_IA64_DIR32NB 0x0010 -#define IMAGE_REL_IA64_RESERVED_11 0x0011 -#define IMAGE_REL_IA64_RESERVED_12 0x0012 -#define IMAGE_REL_IA64_RESERVED_13 0x0013 -#define IMAGE_REL_IA64_RESERVED_14 0x0014 -#define IMAGE_REL_IA64_RESERVED_15 0x0015 -#define IMAGE_REL_IA64_RESERVED_16 0x0016 +#define IMAGE_REL_IA64_SREL14 0x0011 +#define IMAGE_REL_IA64_SREL22 0x0012 +#define IMAGE_REL_IA64_SREL32 0x0013 +#define IMAGE_REL_IA64_UREL32 0x0014 +#define IMAGE_REL_IA64_PCREL60X 0x0015 +#define IMAGE_REL_IA64_PCREL60B 0x0016 +#define IMAGE_REL_IA64_PCREL60F 0x0017 +#define IMAGE_REL_IA64_PCREL60I 0x0018 +#define IMAGE_REL_IA64_PCREL60M 0x0019 +#define IMAGE_REL_IA64_IMMGPREL64 0x001A +#define IMAGE_REL_IA64_TOKEN 0x001B +#define IMAGE_REL_IA64_GPREL32 0x001C #define IMAGE_REL_IA64_ADDEND 0x001F /* AMD64 relocation types */

1 0

Vincent Povirk : ole32: Cache the contents of one extended big block depot block.
by Alexandre Julliard Nov. 17, 2010

Nov. 17, 2010

Module: wine Branch: master Commit: e883aeb3943ccf8b25b19ca582ea1d8b06561ed1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e883aeb3943ccf8b25b19ca58… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 19 16:55:49 2010 -0500 ole32: Cache the contents of one extended big block depot block. --- dlls/ole32/storage32.c | 29 +++++++++++++++++++++++++---- dlls/ole32/storage32.h | 3 +++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 311f2ae..b58e445 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2760,6 +2760,7 @@ static HRESULT StorageImpl_Construct( * There is no block depot cached yet. */ This->indexBlockDepotCached = 0xFFFFFFFF; + This->indexExtBlockDepotCached = 0xFFFFFFFF; /* * Start searching for free blocks with block 0. @@ -3134,17 +3135,32 @@ static ULONG Storage32Impl_GetExtDepotBlock(StorageImpl* This, ULONG depotIndex) ULONG extBlockOffset = numExtBlocks % depotBlocksPerExtBlock; ULONG blockIndex = BLOCK_UNUSED; ULONG extBlockIndex; + BYTE depotBuffer[MAX_BIG_BLOCK_SIZE]; + int index, num_blocks; assert(depotIndex >= COUNT_BBDEPOTINHEADER); if (extBlockCount >= This->extBigBlockDepotCount) return BLOCK_UNUSED; - extBlockIndex = This->extBigBlockDepotLocations[extBlockCount]; + if (This->indexExtBlockDepotCached != extBlockCount) + { + extBlockIndex = This->extBigBlockDepotLocations[extBlockCount]; - if (extBlockIndex != BLOCK_UNUSED) - StorageImpl_ReadDWordFromBigBlock(This, extBlockIndex, - extBlockOffset * sizeof(ULONG), &blockIndex); + StorageImpl_ReadBigBlock(This, extBlockIndex, depotBuffer); + + num_blocks = This->bigBlockSize / 4; + + for (index = 0; index < num_blocks; index++) + { + StorageUtl_ReadDWord(depotBuffer, index*sizeof(ULONG), &blockIndex); + This->extBlockDepotCached[index] = blockIndex; + } + + This->indexExtBlockDepotCached = extBlockCount; + } + + blockIndex = This->extBlockDepotCached[extBlockOffset]; return blockIndex; } @@ -3176,6 +3192,11 @@ static void Storage32Impl_SetExtDepotBlock(StorageImpl* This, ULONG depotIndex, extBlockOffset * sizeof(ULONG), blockIndex); } + + if (This->indexExtBlockDepotCached == extBlockCount) + { + This->extBlockDepotCached[extBlockOffset] = blockIndex; + } } /****************************************************************************** diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 72a5fe7..0f8b3b4 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -358,6 +358,9 @@ struct StorageImpl ULONG extBigBlockDepotCount; ULONG bigBlockDepotStart[COUNT_BBDEPOTINHEADER]; + ULONG extBlockDepotCached[MAX_BIG_BLOCK_SIZE / 4]; + ULONG indexExtBlockDepotCached; + ULONG blockDepotCached[MAX_BIG_BLOCK_SIZE / 4]; ULONG indexBlockDepotCached; ULONG prevFreeBlock;

1 0

Alexandre Julliard : user32: Check structure size in GetGUIThreadInfo.
by Alexandre Julliard Nov. 17, 2010

Nov. 17, 2010

Module: wine Branch: master Commit: 30554d4ef12038e07961b16013c5dacb0fca3503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30554d4ef12038e07961b1601… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 16 20:57:27 2010 +0100 user32: Check structure size in GetGUIThreadInfo. --- dlls/user32/focus.c | 1 + dlls/user32/message.c | 7 +++++++ dlls/user32/painting.c | 1 + dlls/user32/tests/win.c | 16 ++++++++++++++++ dlls/user32/win.c | 1 + dlls/winex11.drv/event.c | 1 + 6 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index f086584..70a2a8a 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -160,6 +160,7 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) { GUITHREADINFO info; + info.cbSize = sizeof(info); GetGUIThreadInfo( GetCurrentThreadId(), &info ); /* Do not change focus if the window is no more active */ if (hwnd == info.hwndActive) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index b073e1c..c6daf31 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2359,6 +2359,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H /* find the window to dispatch this mouse message to */ + info.cbSize = sizeof(info); GetGUIThreadInfo( GetCurrentThreadId(), &info ); if (info.hwndCapture) { @@ -4235,6 +4236,12 @@ BOOL WINAPI GetGUIThreadInfo( DWORD id, GUITHREADINFO *info ) { BOOL ret; + if (info->cbSize != sizeof(*info)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + SERVER_START_REQ( get_thread_input ) { req->tid = id; diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index e7ce2ec..c3a25fb 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -801,6 +801,7 @@ static HWND fix_caret(HWND hWnd, const RECT *scroll_rect, INT dx, INT dy, RECT rect, mapped_rcCaret; BOOL hide_caret = FALSE; + info.cbSize = sizeof(info); if (!GetGUIThreadInfo( GetCurrentThreadId(), &info )) return 0; if (!info.hwndCaret) return 0; diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 5a378de..ab06687 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -611,6 +611,22 @@ static DWORD CALLBACK enum_thread( void *arg ) BOOL ret; MSG msg; + if (pGetGUIThreadInfo) + { + GUITHREADINFO info; + info.cbSize = sizeof(info); + ret = pGetGUIThreadInfo( GetCurrentThreadId(), &info ); + ok( ret || broken(!ret), /* win9x */ + "GetGUIThreadInfo failed without message queue\n" ); + SetLastError( 0xdeadbeef ); + info.cbSize = sizeof(info) + 1; + ret = pGetGUIThreadInfo( GetCurrentThreadId(), &info ); + ok( !ret, "GetGUIThreadInfo succeeded with wrong size\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || + broken(GetLastError() == 0xdeadbeef), /* win9x */ + "wrong error %u\n", GetLastError() ); + } + PeekMessage( &msg, 0, 0, 0, PM_NOREMOVE ); /* make sure we have a message queue */ count = 0; diff --git a/dlls/user32/win.c b/dlls/user32/win.c index f9b6be2..f1da48b 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1587,6 +1587,7 @@ static void WIN_SendDestroyMsg( HWND hwnd ) { GUITHREADINFO info; + info.cbSize = sizeof(info); if (GetGUIThreadInfo( GetCurrentThreadId(), &info )) { if (hwnd == info.hwndCaret) DestroyCaret(); diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index ae0875b..5447a40 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -497,6 +497,7 @@ static void set_focus( Display *display, HWND hwnd, Time time ) TRACE( "setting foreground window to %p\n", hwnd ); SetForegroundWindow( hwnd ); + threadinfo.cbSize = sizeof(threadinfo); GetGUIThreadInfo(0, &threadinfo); focus = threadinfo.hwndFocus; if (!focus) focus = threadinfo.hwndActive;

1 0