April 2011 - Wine-commits - list.winehq.org

Alexandre Julliard : msvcrt: Synchronize spec files across dlls.
by Alexandre Julliard 29 Apr '11

29 Apr '11

Module: wine Branch: master Commit: 60f3a809f5fcac32263e7b902699d0c48f7f9400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60f3a809f5fcac32263e7b902… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 29 15:06:53 2011 +0200 msvcrt: Synchronize spec files across dlls. --- dlls/msvcr100/msvcr100.spec | 26 ++-- dlls/msvcr70/msvcr70.spec | 32 +++--- dlls/msvcr71/msvcr71.spec | 190 ++++++++++++++-------------- dlls/msvcr80/msvcr80.spec | 40 +++--- dlls/msvcr90/msvcr90.spec | 38 +++--- dlls/msvcrt/msvcrt.spec | 16 +- dlls/msvcrt20/msvcrt20.spec | 162 ++++++++++++------------ dlls/msvcrt40/msvcrt40.spec | 178 +++++++++++++------------- dlls/msvcrtd/msvcrtd.spec | 300 +++++++++++++++++++++--------------------- 9 files changed, 491 insertions(+), 491 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=60f3a809f5fcac32263e7…

1 0

Alexandre Julliard : msvcrt: Forward preferably to msvcr90 when there is an export with the same name.
by Alexandre Julliard 29 Apr '11

29 Apr '11

Module: wine Branch: master Commit: 2fcba8ee23e5a65e063a2efca8a360e858395b96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fcba8ee23e5a65e063a2efca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 29 15:46:37 2011 +0200 msvcrt: Forward preferably to msvcr90 when there is an export with the same name. --- dlls/msvcr100/msvcr100.spec | 138 +++++++++++++++++++++--------------------- dlls/msvcr71/msvcr71.spec | 6 +- dlls/msvcr80/msvcr80.spec | 140 +++++++++++++++++++++--------------------- 3 files changed, 142 insertions(+), 142 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2fcba8ee23e5a65e063a2…

1 0

Piotr Caban : msvcp90: Added basic_string<char> operator< implementation.
by Alexandre Julliard 29 Apr '11

29 Apr '11

Module: wine Branch: master Commit: 6bf4541bf854af3482e26eaab8c76034b02a2134 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bf4541bf854af3482e26eaab… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 29 11:15:02 2011 +0200 msvcp90: Added basic_string<char> operator< implementation. --- dlls/msvcp90/msvcp90.spec | 24 ++++++------ dlls/msvcp90/string.c | 96 +++++++++++++++++++++++++++++++++----------- 2 files changed, 84 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6bf4541bf854af3482e26…

1 0

Piotr Caban : msvcp90: Added basic_string<char> find implementation.
by Alexandre Julliard 29 Apr '11

29 Apr '11

Module: wine Branch: master Commit: c08b647cf637c21a25f3807e2b7eda97d548074b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c08b647cf637c21a25f3807e2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 29 11:15:15 2011 +0200 msvcp90: Added basic_string<char> find implementation. --- dlls/msvcp90/msvcp90.spec | 16 +++++----- dlls/msvcp90/string.c | 70 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 81eaf08..82f02ec 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3819,11 +3819,11 @@ @ stub -arch=win64 ?fill@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QEBA_WXZ @ stub -arch=win32 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIABV12(a)I@Z @ stub -arch=win64 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KAEBV12(a)_K@Z -@ stub -arch=win32 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIDI(a)Z -@ stub -arch=win64 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KD_K(a)Z +@ thiscall -arch=win32 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIDI(a)Z(ptr long long) MSVCP_basic_string_char_find_ch +@ cdecl -arch=win64 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KD_K(a)Z(ptr long long) MSVCP_basic_string_char_find_ch @ stub -arch=win32 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPBDI(a)Z -@ stub -arch=win64 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEBD_K1(a)Z -@ stub -arch=win32 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPBDII(a)Z +@ cdecl -arch=win64 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEBD_K1(a)Z(ptr str long long) MSVCP_basic_string_char_find_cstr_substr +@ thiscall -arch=win32 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPBDII(a)Z(ptr str long long) MSVCP_basic_string_char_find_cstr_substr @ stub -arch=win64 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEBD_K(a)Z @ stub -arch=win32 ?find@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEIABV12(a)I@Z @ stub -arch=win64 ?find@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBA_KAEBV12(a)_K@Z @@ -3836,11 +3836,11 @@ @ stub -arch=win32 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIABV12(a)I@Z @ stub -arch=win64 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KAEBV12(a)_K@Z @ stub -arch=win32 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIPB_WI(a)Z -@ stub -arch=win64 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KPEB_W_K1(a)Z -@ stub -arch=win32 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIPB_WII(a)Z +@ cdecl -arch=win64 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KPEB_W_K1(a)Z(ptr wstr long long) MSVCP_basic_string_wchar_find_cstr_substr +@ thiscall -arch=win32 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIPB_WII(a)Z(ptr wstr long long) MSVCP_basic_string_wchar_find_cstr_substr @ stub -arch=win64 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KPEB_W_K(a)Z -@ stub -arch=win32 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEI_WI(a)Z -@ stub -arch=win64 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_K_W_K(a)Z +@ thiscall -arch=win32 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEI_WI(a)Z(ptr long long) MSVCP_basic_string_wchar_find_ch +@ cdecl -arch=win64 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_K_W_K(a)Z(ptr long long) MSVCP_basic_string_wchar_find_ch @ cdecl -arch=win32 ?find@?$char_traits(a)D@std@@SAPBDPBDIABD(a)Z(ptr long ptr) MSVCP_char_traits_char_find @ cdecl -arch=win64 ?find@?$char_traits(a)D@std@@SAPEBDPEBD_KAEBD(a)Z(ptr long ptr) MSVCP_char_traits_char_find @ cdecl -arch=win32 ?find@?$char_traits(a)G@std@@SAPBGPBGIABG(a)Z(ptr long ptr) MSVCP_char_traits_short_find diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 5169426..23b5c3b 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1025,6 +1025,41 @@ MSVCP_BOOL __cdecl MSVCP_basic_string_char_lower_cstr_bstr( return MSVCP_basic_string_char_compare_cstr(right, left) > 0; } +/* ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPBDII(a)Z */ +/* ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEBD_K1(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_find_cstr_substr, 16) +size_t __thiscall MSVCP_basic_string_char_find_cstr_substr( + const basic_string_char *this, const char *find, size_t pos, size_t len) +{ + const char *p, *end; + + TRACE("%p %s %lu %lu\n", this, find, (unsigned long)pos, (unsigned long)len); + + if(len==0 && pos<=this->size) + return pos; + + end = basic_string_char_const_ptr(this)+this->size-len+1; + for(p=basic_string_char_const_ptr(this)+pos; p<end; p++) { + p = MSVCP_char_traits_char_find(p, end-p, find); + if(!p) + break; + + if(!MSVCP_char_traits_char_compare(p, find, len)) + return p-basic_string_char_const_ptr(this); + } + + return MSVCP_basic_string_char_npos; +} + +/* ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIDI(a)Z */ +/* ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KD_K(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_find_ch, 12) +size_t __thiscall MSVCP_basic_string_char_find_ch( + const basic_string_char *this, char ch, size_t pos) +{ + return MSVCP_basic_string_char_find_cstr_substr(this, &ch, pos, 1); +} + /* 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 */ /* ?npos@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@2_KB */ @@ -1552,3 +1587,38 @@ MSVCP_BOOL __cdecl MSVCP_basic_string_wchar_lower_cstr_bstr( { return MSVCP_basic_string_wchar_compare_cstr(right, left) > 0; } + +/* ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIPB_WII(a)Z */ +/* ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KPEB_W_K1(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_find_cstr_substr, 16) +size_t __thiscall MSVCP_basic_string_wchar_find_cstr_substr( + const basic_string_wchar *this, const wchar_t *find, size_t pos, size_t len) +{ + const wchar_t *p, *end; + + TRACE("%p %s %lu %lu\n", this, debugstr_w(find), (unsigned long)pos, (unsigned long)len); + + if(len==0 && pos<=this->size) + return pos; + + end = basic_string_wchar_const_ptr(this)+this->size-len+1; + for(p=basic_string_wchar_const_ptr(this)+pos; p<end; p++) { + p = MSVCP_char_traits_wchar_find(p, end-p, find); + if(!p) + break; + + if(!MSVCP_char_traits_wchar_compare(p, find, len)) + return p-basic_string_wchar_const_ptr(this); + } + + return MSVCP_basic_string_wchar_npos; +} + +/* ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEI_WI(a)Z */ +/* ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_K_W_K(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_find_ch, 12) +size_t __thiscall MSVCP_basic_string_wchar_find_ch( + const basic_string_wchar *this, wchar_t ch, size_t pos) +{ + return MSVCP_basic_string_wchar_find_cstr_substr(this, &ch, pos, 1); +}

1 0

Piotr Caban : msvcp90/tests: Added basic_string<char> find tests.
by Alexandre Julliard 29 Apr '11

29 Apr '11

Module: wine Branch: master Commit: 02e46c8eaa2123631c1169ef83b8bf91f5332579 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02e46c8eaa2123631c1169ef8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 29 11:15:29 2011 +0200 msvcp90/tests: Added basic_string<char> find tests. --- dlls/msvcp90/tests/string.c | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index 4f84264..4ceb24c 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -68,6 +68,7 @@ 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 size_t (WINAPI *p_basic_string_char_find_cstr_substr)(const char*, size_t, 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*); @@ -96,6 +97,7 @@ 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*, 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 size_t (WINAPI *p_basic_string_char_find_cstr_substr)(basic_string_char*, const char*, size_t, 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*); @@ -381,6 +383,8 @@ static BOOL init(void) "??$?HDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)AEBV10@0(a)Z"); p_basic_string_char_concatenate_cstr = (void*)GetProcAddress(msvcp, "??$?HDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)AEBV10@PEBD(a)Z"); + p_basic_string_char_find_cstr_substr = (void*)GetProcAddress(msvcp, + "?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEBD_K1(a)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"); @@ -439,6 +443,8 @@ static BOOL init(void) "??$?HDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)ABV10@0(a)Z"); p_basic_string_char_concatenate_cstr = (void*)GetProcAddress(msvcp, "??$?HDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)ABV10@PBD(a)Z"); + p_basic_string_char_find_cstr_substr = (void*)GetProcAddress(msvcp, + "?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPBDII(a)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"); @@ -661,7 +667,7 @@ static void test_basic_string_char_concatenate(void) { if(!p_basic_string_char_ctor_cstr || !p_basic_string_char_concatenate || !p_basic_string_char_concatenate_cstr || !p_basic_string_char_cstr || !p_basic_string_char_dtor) { - win_skip("basic_string<wchar> unavailable\n"); + win_skip("basic_string<char> unavailable\n"); return; } @@ -682,6 +688,28 @@ static void test_basic_string_char_concatenate(void) { call_func1(p_basic_string_char_dtor, &str); } +static void test_basic_string_char_find(void) { + static const char tmp[] = {'a','a','a','\0','b','b','b',0}; + basic_string_char str; + size_t ret; + + if(!p_basic_string_char_ctor || !p_basic_string_char_assign_cstr_len + || !p_basic_string_char_dtor || !p_basic_string_char_find_cstr_substr) { + win_skip("basic_stringr> unavailable\n"); + return; + } + + call_func1(p_basic_string_char_ctor, &str); + call_func3(p_basic_string_char_assign_cstr_len, &str, tmp, 7); + ret = (size_t)call_func4(p_basic_string_char_find_cstr_substr, &str, "aaa", 0, 3); + ok(ret == 0, "ret = %lu\n", (unsigned long)ret); + ret = (size_t)call_func4(p_basic_string_char_find_cstr_substr, &str, "aaa", 1, 3); + ok(ret == -1, "ret = %lu\n", (unsigned long)ret); + ret = (size_t)call_func4(p_basic_string_char_find_cstr_substr, &str, "bbb", 0, 3); + ok(ret == 4, "ret = %lu\n", (unsigned long)ret); + call_func1(p_basic_string_char_dtor, &str); +} + static void test_basic_string_wchar(void) { static const wchar_t test[] = { 't','e','s','t',0 }; @@ -807,6 +835,7 @@ START_TEST(string) test_basic_string_char_append(); test_basic_string_char_compare(); test_basic_string_char_concatenate(); + test_basic_string_char_find(); test_basic_string_wchar(); test_basic_string_wchar_swap();

1 0

Piotr Caban : msvcp90: Added basic_string<char> operator +=(char) implementation.
by Alexandre Julliard 29 Apr '11

29 Apr '11

Module: wine Branch: master Commit: b8408b257a1ce0d75494982782e4ee3ab5560a05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8408b257a1ce0d7549498278… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 29 11:15:38 2011 +0200 msvcp90: Added basic_string<char> operator +=(char) implementation. --- dlls/msvcp90/msvcp90.spec | 16 ++++++------ dlls/msvcp90/string.c | 56 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8408b257a1ce0d754949…

1 0

Piotr Caban : msvcp90: Added basic_string<char> at implementation.
by Alexandre Julliard 29 Apr '11

29 Apr '11

Module: wine Branch: master Commit: ce8a64470b09c156120b6eb538c35313dc5e0e17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce8a64470b09c156120b6eb53… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 29 11:15:47 2011 +0200 msvcp90: Added basic_string<char> at implementation. --- dlls/msvcp90/msvcp90.spec | 16 ++++++------ dlls/msvcp90/string.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 8e10b85..4161ab7 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3012,18 +3012,18 @@ @ cdecl -arch=win64 ?assign@?$char_traits(a)_W@std@@SAPEA_WPEA_W_K_W(a)Z(ptr long long) MSVCP_char_traits_wchar_assignn @ cdecl -arch=win32 ?assign@?$char_traits(a)_W@std@@SAXAA_WAB_W(a)Z(ptr ptr) MSVCP_char_traits_wchar_assign @ cdecl -arch=win64 ?assign@?$char_traits(a)_W@std@@SAXAEA_WAEB_W(a)Z(ptr ptr) MSVCP_char_traits_wchar_assign -@ stub -arch=win32 ?at@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAADI(a)Z -@ stub -arch=win64 ?at@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAD_K(a)Z -@ stub -arch=win32 ?at@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEABDI(a)Z -@ stub -arch=win64 ?at@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAAEBD_K(a)Z +@ thiscall -arch=win32 ?at@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAADI(a)Z(ptr long) MSVCP_basic_string_char_at +@ cdecl -arch=win64 ?at@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAD_K(a)Z(ptr long) MSVCP_basic_string_char_at +@ thiscall -arch=win32 ?at@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEABDI(a)Z(ptr long) MSVCP_basic_string_char_const_at +@ cdecl -arch=win64 ?at@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAAEBD_K(a)Z(ptr long) MSVCP_basic_string_char_const_at @ stub -arch=win32 ?at@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAGI(a)Z @ stub -arch=win64 ?at@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAAEAG_K(a)Z @ stub -arch=win32 ?at@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEABGI(a)Z @ stub -arch=win64 ?at@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBAAEBG_K(a)Z -@ stub -arch=win32 ?at@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAA_WI(a)Z -@ stub -arch=win64 ?at@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEA_W_K(a)Z -@ stub -arch=win32 ?at@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEAB_WI(a)Z -@ stub -arch=win64 ?at@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAAEB_W_K(a)Z +@ thiscall -arch=win32 ?at@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAA_WI(a)Z(ptr long) MSVCP_basic_string_wchar_at +@ cdecl -arch=win64 ?at@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEA_W_K(a)Z(ptr long) MSVCP_basic_string_wchar_at +@ thiscall -arch=win32 ?at@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEAB_WI(a)Z(ptr long) MSVCP_basic_string_wchar_const_at +@ cdecl -arch=win64 ?at@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAAEB_W_K(a)Z(ptr long) MSVCP_basic_string_wchar_const_at @ stub ?atan2@?$_Ctraits(a)M@std@@SAMMM(a)Z @ stub ?atan2@?$_Ctraits(a)N@std@@SANNN(a)Z @ stub ?atan2@?$_Ctraits(a)O@std@@SAOOO(a)Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index a54f323..e65043a 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1088,6 +1088,35 @@ size_t __thiscall MSVCP_basic_string_char_find_ch( return MSVCP_basic_string_char_find_cstr_substr(this, &ch, pos, 1); } +/* ?at@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAADI(a)Z */ +/* ?at@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAD_K(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_at, 8) +char* __thiscall MSVCP_basic_string_char_at( + basic_string_char *this, size_t pos) +{ + TRACE("%p %lu\n", this, (unsigned long)pos); + + if(this->size <= pos) + MSVCP__String_base_Xran(); + + return basic_string_char_ptr(this)+pos; +} + +/* ?at@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEABDI(a)Z */ +/* ?at@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAAEBD_K(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_const_at, 8) +const char* __thiscall MSVCP_basic_string_char_const_at( + const basic_string_char *this, size_t pos) +{ + TRACE("%p %lu\n", this, (unsigned long)pos); + + if(this->size <= pos) + MSVCP__String_base_Xran(); + + return basic_string_char_const_ptr(this)+pos; +} + + /* 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 */ /* ?npos@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@2_KB */ @@ -1678,3 +1707,31 @@ size_t __thiscall MSVCP_basic_string_wchar_find_ch( { return MSVCP_basic_string_wchar_find_cstr_substr(this, &ch, pos, 1); } + +/* ?at@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAA_WI(a)Z */ +/* ?at@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEA_W_K(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_at, 8) +wchar_t* __thiscall MSVCP_basic_string_wchar_at( + basic_string_wchar *this, size_t pos) +{ + TRACE("%p %lu\n", this, (unsigned long)pos); + + if(this->size <= pos) + MSVCP__String_base_Xran(); + + return basic_string_wchar_ptr(this)+pos; +} + +/* ?at@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEAB_WI(a)Z */ +/* ?at@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAAEB_W_K(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_const_at, 8) +const wchar_t* __thiscall MSVCP_basic_string_wchar_const_at( + const basic_string_wchar *this, size_t pos) +{ + TRACE("%p %lu\n", this, (unsigned long)pos); + + if(this->size <= pos) + MSVCP__String_base_Xran(); + + return basic_string_wchar_const_ptr(this)+pos; +}

1 0

Piotr Caban : msvcp90: Added basic_string<char> operator[] implementation.
by Alexandre Julliard 29 Apr '11

29 Apr '11

Module: wine Branch: master Commit: 73d60c3a08aa87d617cd16eb759794bc0a02ba8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=73d60c3a08aa87d617cd16eb7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 29 11:16:00 2011 +0200 msvcp90: Added basic_string<char> operator[] implementation. --- dlls/msvcp90/msvcp90.spec | 16 ++++++++-------- dlls/msvcp90/string.c | 8 ++++++++ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 4161ab7..2601900 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -1682,14 +1682,14 @@ @ stub -arch=win64 ??8locale(a)std@@QEBA_NAEBV01@@Z @ stub -arch=win32 ??9locale(a)std@@QBE_NABV01@@Z @ stub -arch=win64 ??9locale(a)std@@QEBA_NAEBV01@@Z -@ stub -arch=win32 ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAADI(a)Z +@ thiscall -arch=win32 ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAADI(a)Z(ptr long) MSVCP_basic_string_char_at @ stub -arch=win64 ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEADU_Size_type_nosscl(a)01@@Z @ stub -arch=win32 ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAADU_Size_type_nosscl(a)01@@Z -@ stub -arch=win64 ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAD_K(a)Z -@ stub -arch=win32 ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEABDI(a)Z +@ cdecl -arch=win64 ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAD_K(a)Z(ptr long) MSVCP_basic_string_char_at +@ thiscall -arch=win32 ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEABDI(a)Z(ptr long) MSVCP_basic_string_char_const_at @ stub -arch=win64 ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAAEBDU_Size_type_nosscl(a)01@@Z @ stub -arch=win32 ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEABDU_Size_type_nosscl(a)01@@Z -@ stub -arch=win64 ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAAEBD_K(a)Z +@ cdecl -arch=win64 ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAAEBD_K(a)Z(ptr long) MSVCP_basic_string_char_const_at @ stub -arch=win32 ??A?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAGI(a)Z @ stub -arch=win64 ??A?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAAEAGU_Size_type_nosscl(a)01@@Z @ stub -arch=win32 ??A?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAGU_Size_type_nosscl(a)01@@Z @@ -1698,14 +1698,14 @@ @ stub -arch=win64 ??A?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBAAEBGU_Size_type_nosscl(a)01@@Z @ stub -arch=win32 ??A?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEABGU_Size_type_nosscl(a)01@@Z @ stub -arch=win64 ??A?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBAAEBG_K(a)Z -@ stub -arch=win32 ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAA_WI(a)Z +@ thiscall -arch=win32 ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAA_WI(a)Z(ptr long) MSVCP_basic_string_wchar_at @ stub -arch=win64 ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEA_WU_Size_type_nosscl(a)01@@Z @ stub -arch=win32 ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAA_WU_Size_type_nosscl(a)01@@Z -@ stub -arch=win64 ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEA_W_K(a)Z -@ stub -arch=win32 ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEAB_WI(a)Z +@ cdecl -arch=win64 ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEA_W_K(a)Z(ptr long) MSVCP_basic_string_wchar_at +@ thiscall -arch=win32 ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEAB_WI(a)Z(ptr long) MSVCP_basic_string_wchar_const_at @ stub -arch=win64 ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAAEB_WU_Size_type_nosscl(a)01@@Z @ stub -arch=win32 ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEAB_WU_Size_type_nosscl(a)01@@Z -@ stub -arch=win64 ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAAEB_W_K(a)Z +@ cdecl -arch=win64 ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAAEB_W_K(a)Z(ptr long) MSVCP_basic_string_wchar_const_at @ stub -arch=win32 ??Bid(a)locale@std@@QAEIXZ @ stub -arch=win64 ??Bid(a)locale@std@@QEAA_KXZ @ stub -arch=win32 ??Bios_base(a)std@@QBEPAXXZ diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index e65043a..2c565c0 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1090,6 +1090,8 @@ size_t __thiscall MSVCP_basic_string_char_find_ch( /* ?at@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAADI(a)Z */ /* ?at@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAD_K(a)Z */ +/* ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAADI(a)Z */ +/* ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAD_K(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_at, 8) char* __thiscall MSVCP_basic_string_char_at( basic_string_char *this, size_t pos) @@ -1104,6 +1106,8 @@ char* __thiscall MSVCP_basic_string_char_at( /* ?at@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEABDI(a)Z */ /* ?at@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAAEBD_K(a)Z */ +/* ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEABDI(a)Z */ +/* ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAAEBD_K(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_const_at, 8) const char* __thiscall MSVCP_basic_string_char_const_at( const basic_string_char *this, size_t pos) @@ -1710,6 +1714,8 @@ size_t __thiscall MSVCP_basic_string_wchar_find_ch( /* ?at@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAA_WI(a)Z */ /* ?at@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEA_W_K(a)Z */ +/* ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAA_WI(a)Z */ +/* ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEA_W_K(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_at, 8) wchar_t* __thiscall MSVCP_basic_string_wchar_at( basic_string_wchar *this, size_t pos) @@ -1724,6 +1730,8 @@ wchar_t* __thiscall MSVCP_basic_string_wchar_at( /* ?at@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEAB_WI(a)Z */ /* ?at@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAAEB_W_K(a)Z */ +/* ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEAB_WI(a)Z */ +/* ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAAEB_W_K(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_const_at, 8) const wchar_t* __thiscall MSVCP_basic_string_wchar_const_at( const basic_string_wchar *this, size_t pos)

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 29 Apr '11

29 Apr '11

Module: wine Branch: master Commit: fe647da9027872a35d6829a2e7c235afa7f530b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe647da9027872a35d6829a2e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Apr 29 09:24:53 2011 +0200 po: Update French translation. --- po/fr.po | 54 +++++++++++++++++++++++------------------------------- 1 files changed, 23 insertions(+), 31 deletions(-) diff --git a/po/fr.po b/po/fr.po index 353b10c..5db3feb 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-04-13 23:40+0100\n" +"PO-Revision-Date: 2011-04-29 09:22+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -67,14 +67,12 @@ msgid "All files (*.*)" msgstr "Tous les fichiers (*.*)" #: appwiz.rc:42 -#, fuzzy msgid "&Remove" -msgstr "&Supprimer..." +msgstr "&Supprimer" #: appwiz.rc:43 -#, fuzzy msgid "&Modify/Remove" -msgstr "&Modifier/Supprimer..." +msgstr "&Modifier/Supprimer" #: appwiz.rc:48 msgid "Downloading..." @@ -690,7 +688,7 @@ msgstr "Adresse non structurée" #: crypt32.rc:51 msgid "SMIME Capabilities" -msgstr "Aptitudes SMIME" +msgstr "Aptitudes S/MIME" #: crypt32.rc:52 msgid "Prefer Signed Data" @@ -3193,7 +3191,7 @@ msgstr "Pas assez d'espace disponible pour le journal du registre\n" #: winerror.mc:1116 msgid "Registry key has subkeys\n" -msgstr "La clé de registre a des sous-clés\n" +msgstr "La clé de registre contient des sous-clés\n" #: winerror.mc:1121 msgid "Subkey must be volatile\n" @@ -4602,7 +4600,7 @@ msgstr "Répertoire temporaire non accessible en écriture\n" #: winerror.mc:2886 msgid "Installation platform not supported\n" -msgstr "Plateforme d'installation non prise en charge\n" +msgstr "Plate-forme d'installation non prise en charge\n" #: winerror.mc:2891 msgid "Installer not used\n" @@ -5736,7 +5734,7 @@ msgstr "Inactif" #: oledlg.rc:25 msgid "Insert a new %s object into your document" -msgstr "Insérer un nouvel object %s dans votre document" +msgstr "Insérer un nouvel objet %s dans votre document" #: oledlg.rc:26 msgid "" @@ -6265,7 +6263,6 @@ msgid "Pr&int..." msgstr "&Imprimer..." #: shdocvw.rc:37 wordpad.rc:34 -#, fuzzy msgid "Print previe&w" msgstr "&Aperçu avant impression..." @@ -6305,7 +6302,6 @@ msgid "&Help" msgstr "Aid&e" #: shdocvw.rc:57 -#, fuzzy msgid "&About Internet Explorer" msgstr "À &propos d'Internet Explorer..." @@ -6316,7 +6312,7 @@ msgstr "Accueil" #: shdocvw.rc:68 winhlp32.rc:66 msgid "Print..." -msgstr "Imprimer la rubrique..." +msgstr "Imprimer..." #: shdocvw.rc:73 msgid "Address" @@ -7109,7 +7105,7 @@ msgid "" "There is a problem with the device driver. Check with the device " "manufacturer about obtaining a new driver." msgstr "" -"Le pilote de périphérique présente un problème.Contactez le constructeur du " +"Le pilote de périphérique présente un problème. Contactez le constructeur du " "périphérique pour obtenir un nouveau pilote" #: winmm.rc:70 @@ -8081,7 +8077,7 @@ msgstr "" "\n" "Notez qu'entrer la commande PROMPT sans texte d'invite remet l'invite\n" "à sa valeur par défaut, à savoir la lettre du lecteur courant suivie de\n" -"son répertoire courant et d'un signe plus-grand-que (>).\n" +"son répertoire courant et d'un signe « plus grand que » (>).\n" "(c.-à-d. la commande PROMPT $p$g).\n" "\n" "L'invite peut aussi être adaptée en modifiant la variable d'environnement\n" @@ -8317,7 +8313,7 @@ msgstr "" #: cmd.rc:255 msgid "Are you sure" -msgstr "Êtes-vous sûr" +msgstr "Êtes-vous sûr(e)" #: cmd.rc:256 xcopy.rc:40 msgctxt "Yes key" @@ -9331,12 +9327,11 @@ msgstr "Valeur &DWORD" #: regedit.rc:51 regedit.rc:102 msgid "&Multi String Value" -msgstr "Valeur de chaîne &extensible" +msgstr "Valeur chaîne &multiple" #: regedit.rc:52 regedit.rc:103 -#, fuzzy msgid "&Expandable String Value" -msgstr "Valeur c&haîne" +msgstr "Valeur chaîne e&xtensible" #: regedit.rc:56 regedit.rc:107 msgid "&Rename\tF2" @@ -10926,7 +10921,7 @@ msgstr "Trier par dat&e" #: winefile.rc:60 msgid "Filter by &..." -msgstr "Filter &par..." +msgstr "Filtrer &par..." #: winefile.rc:67 msgid "&Drivebar" @@ -10950,12 +10945,11 @@ msgstr "Arranger &verticalement\tCtrl+F4" #: winefile.rc:81 msgid "Arrange &Symbols" -msgstr "Réorganiser les &icônes" +msgstr "Réorganiser les &symboles" #: winefile.rc:87 -#, fuzzy msgid "&About Wine File" -msgstr "À &propos de Winefile" +msgstr "À &propos de WineFile" #: winefile.rc:93 msgid "Applying font settings" @@ -10991,7 +10985,7 @@ msgstr "Pas encore implémenté" #: winefile.rc:107 msgid "Wine File" -msgstr "Wine File" +msgstr "WineFile" #: winefile.rc:114 msgid "CDate" @@ -11019,15 +11013,15 @@ msgstr "%s libres sur %s" #: winemine.rc:34 msgid "&Game" -msgstr "" +msgstr "&Partie" #: winemine.rc:35 msgid "&New\tF2" -msgstr "&Nouveau\tF2" +msgstr "&Nouvelle\tF2" #: winemine.rc:37 msgid "Question &Marks" -msgstr "" +msgstr "Points d'&interrogation" #: winemine.rc:39 msgid "&Beginner" @@ -11046,18 +11040,16 @@ msgid "&Custom..." msgstr "&Personnalisé..." #: winemine.rc:44 -#, fuzzy msgid "&Fastest Times" msgstr "Meilleurs &temps" #: winemine.rc:49 -#, fuzzy msgid "&About WineMine" -msgstr "À &propos de Wine" +msgstr "À &propos de WineMine" #: winemine.rc:27 msgid "WineMine" -msgstr "Démineur de Wine" +msgstr "WineMine" #: winemine.rc:28 msgid "Nobody" @@ -11113,7 +11105,7 @@ msgstr "&Toujours visible" #: winhlp32.rc:56 msgid "&About Wine Help" -msgstr "&A propos de l'Aide de Wine" +msgstr "À &propos de l'aide de Wine" #: winhlp32.rc:64 msgid "Annotation..."

1 0

Frédéric Delanoy : po: Fix/ improve some English entries.
by Alexandre Julliard 29 Apr '11

29 Apr '11

1 0