May 2011 - Wine-Commits - list.winehq.org

Piotr Caban : msvcrt: Added _stricoll_l implementation.
by Alexandre Julliard May 12, 2011

May 12, 2011

Module: wine Branch: master Commit: ff7cf637df2b3dc3d58f6a320a855f4b8212c48c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff7cf637df2b3dc3d58f6a320… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 12 11:39:22 2011 +0200 msvcrt: Added _stricoll_l implementation. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 30 ++++++++++++++++++++---------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 605997c..958c6cb 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -929,7 +929,7 @@ @ cdecl _stricmp(str str) ntdll._stricmp # stub _stricmp_l(str str ptr) @ cdecl _stricoll(str str) MSVCRT__stricoll -# stub _stricoll_l(str str ptr) +@ cdecl _stricoll_l(str str ptr) MSVCRT__stricoll_l @ cdecl _strlwr(str) @ cdecl _strlwr_l(str ptr) @ cdecl _strlwr_s(ptr long) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index a3d8d57..1e7e890 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -547,6 +547,26 @@ int CDECL MSVCRT_strcoll( const char* str1, const char* str2 ) } /********************************************************************* + * _stricoll_l (MSVCRT.@) + */ +int CDECL MSVCRT__stricoll_l( const char* str1, const char* str2, MSVCRT__locale_t locale ) +{ + if(!locale) + locale = get_locale(); + + return CompareStringA(locale->locinfo->lc_handle[MSVCRT_LC_CTYPE], NORM_IGNORECASE, + str1, -1, str2, -1)-2; +} + +/********************************************************************* + * _stricoll (MSVCRT.@) + */ +int CDECL MSVCRT__stricoll( const char* str1, const char* str2 ) +{ + return MSVCRT__stricoll_l(str1, str2, NULL); +} + +/********************************************************************* * strcpy_s (MSVCRT.@) */ int CDECL MSVCRT_strcpy_s( char* dst, MSVCRT_size_t elem, const char* src ) @@ -644,16 +664,6 @@ MSVCRT_size_t CDECL MSVCRT_strxfrm( char *dest, const char *src, MSVCRT_size_t l return strxfrm( dest, src, len ); } -/********************************************************************* - * _stricoll (MSVCRT.@) - */ -int CDECL MSVCRT__stricoll( const char* str1, const char* str2 ) -{ - /* FIXME: handle collates */ - TRACE("str1 %s str2 %s\n", debugstr_a(str1), debugstr_a(str2)); - return lstrcmpiA( str1, str2 ); -} - /******************************************************************** * _atoldbl (MSVCRT.@) */

1 0

Piotr Caban : msvcrt: Added _toupper_l implementation.
by Alexandre Julliard May 12, 2011

May 12, 2011

Module: wine Branch: master Commit: 1e981e5e9c6cfa3f0943cc6d53e8b44e9ed1c297 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e981e5e9c6cfa3f0943cc6d5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 12 11:38:23 2011 +0200 msvcrt: Added _toupper_l implementation. --- dlls/msvcrt/ctype.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 4 ++-- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 2149591..9de24e8 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -20,6 +20,7 @@ #include "msvcrt.h" #include "winnls.h" +#include "wine/unicode.h" /* Some abbreviations to make the following table readable */ #define _C_ MSVCRT__CONTROL @@ -328,6 +329,49 @@ int CDECL MSVCRT___iscsymf(int c) } /********************************************************************* + * _toupper_l (MSVCRT.@) + */ +int CDECL MSVCRT__toupper_l(int c, MSVCRT__locale_t locale) +{ + if(!locale) + locale = get_locale(); + + if(c < 256) + return locale->locinfo->pcumap[c]; + + if(locale->locinfo->pctype[(c>>8)&255] & MSVCRT__LEADBYTE) + { + WCHAR wide, upper; + char str[2], *p = str; + *p++ = (c>>8) & 255; + *p++ = c & 255; + + if(!MultiByteToWideChar(locale->locinfo->lc_codepage, + MB_ERR_INVALID_CHARS, str, 2, &wide, 1)) + return c; + + upper = toupperW(wide); + if(upper == wide) + return c; + + WideCharToMultiByte(locale->locinfo->lc_codepage, 0, + &upper, 1, str, 2, NULL, NULL); + + return str[0] + (str[1]<<8); + } + + return c; +} + +/********************************************************************* + * toupper (MSVCRT.@) + */ +int CDECL MSVCRT_toupper(int c) +{ + return MSVCRT__toupper_l(c, NULL); +} + +/********************************************************************* * _toupper (MSVCRT.@) */ int CDECL MSVCRT__toupper(int c) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 15de47a..ebef717 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -979,7 +979,7 @@ @ cdecl _tolower(long) MSVCRT__tolower # stub _tolower_l(long ptr) @ cdecl _toupper(long) MSVCRT__toupper -# stub _toupper_l(long ptr) +@ cdecl _toupper_l(long ptr) MSVCRT__toupper_l @ cdecl _towlower_l(long ptr) MSVCRT__towlower_l @ cdecl _towupper_l(long ptr) MSVCRT__towupper_l @ extern _tzname MSVCRT__tzname @@ -1426,7 +1426,7 @@ @ cdecl tmpnam(ptr) MSVCRT_tmpnam # stub tmpnam_s(ptr long) @ cdecl tolower(long) ntdll.tolower -@ cdecl toupper(long) ntdll.toupper +@ cdecl toupper(long) MSVCRT_toupper @ cdecl towlower(long) ntdll.towlower @ cdecl towupper(long) ntdll.towupper @ cdecl ungetc(long ptr) MSVCRT_ungetc

1 0

Hwang YunSong : winecfg: Update Korean resource.
by Alexandre Julliard May 12, 2011

May 12, 2011

Module: wine Branch: master Commit: 733d1763d39a213d676298b92cb700bd3ed6e35b URL: http://source.winehq.org/git/wine.git/?a=commit;h=733d1763d39a213d676298b92… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu May 12 11:07:16 2011 +0900 winecfg: Update Korean resource. --- programs/winecfg/Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index 2d13047..6451bb5 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -68,7 +68,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 9, "MS Shell Dlg" BEGIN GROUPBOX " 창 설정 ",IDC_STATIC,8,4,244,84 - CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "전체 화면 창에서 자동으로 마우스 잡기(&M)",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "창관리자가 Wine창을 꾸미도록 함(&D)",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "창관리자가 Wine창을 관리하도록 함(&W)",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "가상 데스크탑 흉내내기(&E)",IDC_ENABLE_DESKTOP,"Button",

1 0

Piotr Caban : msvcrt: Added _is*_l functions implementation.
by Alexandre Julliard May 12, 2011

May 12, 2011

Module: wine Branch: master Commit: 52c2976f1dd0139c7c651e2fdb2f38c2345c0afc URL: http://source.winehq.org/git/wine.git/?a=commit;h=52c2976f1dd0139c7c651e2fd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 12 11:37:48 2011 +0200 msvcrt: Added _is*_l functions implementation. --- dlls/msvcrt/ctype.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 22 ++++++------ 2 files changed, 99 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 9d5ed1e..2149591 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -103,6 +103,14 @@ int CDECL _isctype(int c, int type) } /********************************************************************* + * _isalnum_l (MSVCRT.@) + */ +int CDECL MSVCRT__isalnum_l(int c, MSVCRT__locale_t locale) +{ + return _isctype_l( c, MSVCRT__ALPHA | MSVCRT__DIGIT, locale ); +} + +/********************************************************************* * isalnum (MSVCRT.@) */ int CDECL MSVCRT_isalnum(int c) @@ -111,6 +119,14 @@ int CDECL MSVCRT_isalnum(int c) } /********************************************************************* + * _isalpha_l (MSVCRT.@) + */ +int CDECL MSVCRT__isalpha_l(int c, MSVCRT__locale_t locale) +{ + return _isctype_l( c, MSVCRT__ALPHA, locale ); +} + +/********************************************************************* * isalpha (MSVCRT.@) */ int CDECL MSVCRT_isalpha(int c) @@ -119,6 +135,14 @@ int CDECL MSVCRT_isalpha(int c) } /********************************************************************* + * _iscntrl_l (MSVCRT.@) + */ +int CDECL MSVCRT__iscntrl_l(int c, MSVCRT__locale_t locale) +{ + return _isctype_l( c, MSVCRT__CONTROL, locale ); +} + +/********************************************************************* * iscntrl (MSVCRT.@) */ int CDECL MSVCRT_iscntrl(int c) @@ -127,6 +151,14 @@ int CDECL MSVCRT_iscntrl(int c) } /********************************************************************* + * _isdigit_l (MSVCRT.@) + */ +int CDECL MSVCRT__isdigit_l(int c, MSVCRT__locale_t locale) +{ + return _isctype_l( c, MSVCRT__DIGIT, locale ); +} + +/********************************************************************* * isdigit (MSVCRT.@) */ int CDECL MSVCRT_isdigit(int c) @@ -135,6 +167,14 @@ int CDECL MSVCRT_isdigit(int c) } /********************************************************************* + * _isgraph_l (MSVCRT.@) + */ +int CDECL MSVCRT__isgraph_l(int c, MSVCRT__locale_t locale) +{ + return _isctype_l( c, MSVCRT__ALPHA | MSVCRT__DIGIT | MSVCRT__PUNCT, locale ); +} + +/********************************************************************* * isgraph (MSVCRT.@) */ int CDECL MSVCRT_isgraph(int c) @@ -143,6 +183,14 @@ int CDECL MSVCRT_isgraph(int c) } /********************************************************************* + * _isleadbyte_l (MSVCRT.@) + */ +int CDECL MSVCRT__isleadbyte_l(int c, MSVCRT__locale_t locale) +{ + return _isctype_l( c, MSVCRT__LEADBYTE, locale ); +} + +/********************************************************************* * isleadbyte (MSVCRT.@) */ int CDECL MSVCRT_isleadbyte(int c) @@ -151,6 +199,14 @@ int CDECL MSVCRT_isleadbyte(int c) } /********************************************************************* + * _islower_l (MSVCRT.@) + */ +int CDECL MSVCRT__islower_l(int c, MSVCRT__locale_t locale) +{ + return _isctype_l( c, MSVCRT__LOWER, locale ); +} + +/********************************************************************* * islower (MSVCRT.@) */ int CDECL MSVCRT_islower(int c) @@ -159,6 +215,14 @@ int CDECL MSVCRT_islower(int c) } /********************************************************************* + * _isprint_l (MSVCRT.@) + */ +int CDECL MSVCRT__isprint_l(int c, MSVCRT__locale_t locale) +{ + return _isctype_l( c, MSVCRT__ALPHA | MSVCRT__DIGIT | MSVCRT__BLANK | MSVCRT__PUNCT, locale ); +} + +/********************************************************************* * isprint (MSVCRT.@) */ int CDECL MSVCRT_isprint(int c) @@ -175,6 +239,14 @@ int CDECL MSVCRT_ispunct(int c) } /********************************************************************* + * _isspace_l (MSVCRT.@) + */ +int CDECL MSVCRT__isspace_l(int c, MSVCRT__locale_t locale) +{ + return _isctype_l( c, MSVCRT__SPACE, locale ); +} + +/********************************************************************* * isspace (MSVCRT.@) */ int CDECL MSVCRT_isspace(int c) @@ -183,6 +255,14 @@ int CDECL MSVCRT_isspace(int c) } /********************************************************************* + * _isupper_l (MSVCRT.@) + */ +int CDECL MSVCRT__isupper_l(int c, MSVCRT__locale_t locale) +{ + return _isctype_l( c, MSVCRT__UPPER, locale ); +} + +/********************************************************************* * isupper (MSVCRT.@) */ int CDECL MSVCRT_isupper(int c) @@ -191,6 +271,14 @@ int CDECL MSVCRT_isupper(int c) } /********************************************************************* + * _isxdigit_l (MSVCRT.@) + */ +int CDECL MSVCRT__isxdigit_l(int c, MSVCRT__locale_t locale) +{ + return _isctype_l( c, MSVCRT__HEX, locale ); +} + +/********************************************************************* * isxdigit (MSVCRT.@) */ int CDECL MSVCRT_isxdigit(int c) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 23ba26d..15de47a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -530,16 +530,16 @@ @ stub -arch=i386 _inpw(long) @ cdecl _invalid_parameter(wstr wstr wstr long long) MSVCRT__invalid_parameter @ extern _iob MSVCRT__iob -# stub _isalnum_l(long ptr) -# stub _isalpha_l(long ptr) +@ cdecl _isalnum_l(long ptr) MSVCRT__isalnum_l +@ cdecl _isalpha_l(long ptr) MSVCRT__isalpha_l @ cdecl _isatty(long) -# stub _iscntrl_l(long ptr) +@ cdecl _iscntrl_l(long ptr) MSVCRT__iscntrl_l @ cdecl _isctype(long long) @ cdecl _isctype_l(long long ptr) -# stub _isdigit_l(long ptr) -# stub _isgraph_l(long ptr) -# stub _isleadbyte_l(long ptr) -# stub _islower_l(long ptr) +@ cdecl _isdigit_l(long ptr) MSVCRT__isdigit_l +@ cdecl _isgraph_l(long ptr) MSVCRT__isgraph_l +@ cdecl _isleadbyte_l(long ptr) MSVCRT__isleadbyte_l +@ cdecl _islower_l(long ptr) MSVCRT__islower_l @ stub _ismbbalnum(long) # stub _ismbbalnum_l(long ptr) @ stub _ismbbalpha(long) @@ -600,9 +600,9 @@ # stub _ismbstrail_l(long ptr) @ cdecl _isnan( double ) # stub -arch=win64 _isnanf(float) -# stub _isprint_l(long ptr) -# stub _isspace_l(long ptr) -# stub _isupper_l(long ptr) +@ cdecl _isprint_l(long ptr) MSVCRT__isprint_l +@ cdecl _isspace_l(long ptr) MSVCRT__isspace_l +@ cdecl _isupper_l(long ptr) MSVCRT__isupper_l # stub _iswalnum_l(long ptr) @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l # stub _iswcntrl_l(long ptr) @@ -615,7 +615,7 @@ # stub _iswspace_l(long ptr) # stub _iswupper_l(long ptr) # stub _iswxdigit_l(long ptr) -# stub _isxdigit_l(long ptr) +@ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l @ cdecl _itoa(long ptr long) ntdll._itoa @ cdecl _itoa_s(long ptr long long) @ cdecl _itow(long ptr long) ntdll._itow

1 0

Nikolay Sivov : winecfg: Update Russian dialog strings.
by Alexandre Julliard May 12, 2011

May 12, 2011

Module: wine Branch: master Commit: c81d6e21a3fe48360cb95cd87ac664f10b04cebe URL: http://source.winehq.org/git/wine.git/?a=commit;h=c81d6e21a3fe48360cb95cd87… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 12 12:34:35 2011 +0400 winecfg: Update Russian dialog strings. --- programs/winecfg/Ru.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc index 1cdc71a..89ae32d 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc @@ -69,10 +69,10 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Настройки окна ",IDC_STATIC,8,4,244,84 - CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "Автоматически &удерживать мышь в полноэкранных окнах",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Разрешить менеджеру окон &декорировать окна",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 - CONTROL "Разрешить менеджеру окон управлять окнами Wine",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 - CONTROL "Эмулировать виртуальный рабочий стол",IDC_ENABLE_DESKTOP,"Button", + CONTROL "Разрешить менеджеру окон управлять &окнами Wine",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 + CONTROL "&Эмулировать виртуальный рабочий стол",IDC_ENABLE_DESKTOP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,15,56,230,8 LTEXT "Размер рабочего стола:",IDC_DESKTOP_SIZE,15,70,84,8,WS_DISABLED LTEXT "X",IDC_DESKTOP_BY,149,70,8,8,WS_DISABLED

1 0

Piotr Caban : msvcrt: Added _towupper_l and _towlower_l implementation.
by Alexandre Julliard May 12, 2011

May 12, 2011

Module: wine Branch: master Commit: 69ea5768a680590bba0b768d7608c72742ccdc51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69ea5768a680590bba0b768d7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 12 11:36:56 2011 +0200 msvcrt: Added _towupper_l and _towlower_l implementation. --- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/wcs.c | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 7a05dd9..4e2417b 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -980,8 +980,8 @@ # stub _tolower_l(long ptr) @ cdecl _toupper(long) MSVCRT__toupper # stub _toupper_l(long ptr) -# stub _towlower_l(long ptr) -# stub _towupper_l(long ptr) +@ cdecl _towlower_l(long ptr) MSVCRT__towlower_l +@ cdecl _towupper_l(long ptr) MSVCRT__towupper_l @ extern _tzname MSVCRT__tzname @ cdecl _tzset() MSVCRT__tzset @ cdecl _ui64toa(int64 ptr long) ntdll._ui64toa diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index af6e7dc..623ffbc 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1445,3 +1445,19 @@ MSVCRT_size_t CDECL MSVCRT_wcsnlen(const MSVCRT_wchar_t *s, MSVCRT_size_t maxlen if (!s[i]) break; return i; } + +/********************************************************************* + * _towupper_l (MSVCRT.@) + */ +int CDECL MSVCRT__towupper_l(MSVCRT_wint_t c, MSVCRT__locale_t locale) +{ + return toupperW(c); +} + +/********************************************************************* + * _towlower_l (MSVCRT.@) + */ +int CDECL MSVCRT__towlower_l(MSVCRT_wint_t c, MSVCRT__locale_t locale) +{ + return tolowerW(c); +}

1 0

Piotr Caban : msvcrt: Added _isctype_l implementation.
by Alexandre Julliard May 12, 2011

May 12, 2011

Module: wine Branch: master Commit: e3ec37e848730b2803fff8f1193c44d74b43bacd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3ec37e848730b2803fff8f11… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 12 11:37:37 2011 +0200 msvcrt: Added _isctype_l implementation. --- dlls/msvcrt/ctype.c | 15 ++++++++++++--- dlls/msvcrt/msvcrt.spec | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index ba9d9ba..9d5ed1e 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -66,11 +66,12 @@ WORD** CDECL MSVCRT___pctype_func(void) } /********************************************************************* - * _isctype (MSVCRT.@) + * _isctype_l (MSVCRT.@) */ -int CDECL _isctype(int c, int type) +int CDECL _isctype_l(int c, int type, MSVCRT__locale_t locale) { - MSVCRT__locale_t locale = get_locale(); + if(!locale) + locale = get_locale(); if (c >= -1 && c <= 255) return locale->locinfo->pctype[c] & type; @@ -94,6 +95,14 @@ int CDECL _isctype(int c, int type) } /********************************************************************* + * _isctype (MSVCRT.@) + */ +int CDECL _isctype(int c, int type) +{ + return _isctype_l(c, type, NULL); +} + +/********************************************************************* * isalnum (MSVCRT.@) */ int CDECL MSVCRT_isalnum(int c) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 4e2417b..23ba26d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -535,7 +535,7 @@ @ cdecl _isatty(long) # stub _iscntrl_l(long ptr) @ cdecl _isctype(long long) -# stub _isctype_l(long long ptr) +@ cdecl _isctype_l(long long ptr) # stub _isdigit_l(long ptr) # stub _isgraph_l(long ptr) # stub _isleadbyte_l(long ptr)

1 0

Piotr Caban : msvcrt: Added _strlwr_s_l implementation.
by Alexandre Julliard May 12, 2011

May 12, 2011

Module: wine Branch: master Commit: 504231ff5a9b3daf6ee0816e29219c3ee1451c8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=504231ff5a9b3daf6ee0816e2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 12 11:38:41 2011 +0200 msvcrt: Added _strlwr_s_l implementation. --- dlls/msvcrt/msvcrt.h | 2 ++ dlls/msvcrt/msvcrt.spec | 6 +++--- dlls/msvcrt/string.c | 33 ++++++++++++++++++++++++++++++--- 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index a243f2f..bd41bac 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -904,6 +904,8 @@ void __cdecl _wsearchenv(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, MSVCRT MSVCRT_intptr_t __cdecl MSVCRT__spawnvpe(int, const char*, const char* const*, const char* const*); void __cdecl MSVCRT__invalid_parameter(const MSVCRT_wchar_t *expr, const MSVCRT_wchar_t *func, const MSVCRT_wchar_t *file, unsigned int line, MSVCRT_uintptr_t arg); +int __cdecl MSVCRT__toupper_l(int,MSVCRT__locale_t); +int __cdecl MSVCRT__tolower_l(int,MSVCRT__locale_t); /* Maybe one day we'll enable the invalid parameter handlers with the full set of information (msvcrXXd) * #define MSVCRT_INVALID_PMT(x) MSVCRT_call_invalid_parameter_handler(x, __FUNCTION__, __FILE__, __LINE__, 0) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 84b0194..678a2c9 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -930,10 +930,10 @@ # stub _stricmp_l(str str ptr) @ cdecl _stricoll(str str) MSVCRT__stricoll # stub _stricoll_l(str str ptr) -@ cdecl _strlwr(str) ntdll._strlwr -# stub _strlwr_l(str ptr) +@ cdecl _strlwr(str) +@ cdecl _strlwr_l(str ptr) @ cdecl _strlwr_s(ptr long) -# stub _strlwr_s_l(ptr long ptr) +@ cdecl _strlwr_s_l(ptr long ptr) @ stub _strncoll(str str long) # stub _strncoll_l(str str long ptr) @ cdecl _strnicmp(str str long) ntdll._strnicmp diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 2b9d41e..10a86c5 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -51,12 +51,15 @@ char* CDECL _strdup(const char* str) } /********************************************************************* - * _strlwr_s (MSVCRT.@) + * _strlwr_s_l (MSVCRT.@) */ -int CDECL _strlwr_s(char *str, MSVCRT_size_t len) +int CDECL _strlwr_s_l(char *str, MSVCRT_size_t len, MSVCRT__locale_t locale) { char *ptr = str; + if(!locale) + locale = get_locale(); + if (!str || !len) { *MSVCRT__errno() = MSVCRT_EINVAL; @@ -78,7 +81,7 @@ int CDECL _strlwr_s(char *str, MSVCRT_size_t len) while (*str) { - *str = tolower(*str); + *str = MSVCRT__tolower_l(*str, locale); str++; } @@ -86,6 +89,30 @@ int CDECL _strlwr_s(char *str, MSVCRT_size_t len) } /********************************************************************* + * _strlwr_s (MSVCRT.@) + */ +int CDECL _strlwr_s(char *str, MSVCRT_size_t len) +{ + return _strlwr_s_l(str, len, NULL); +} + +/********************************************************************* + * _strlwr_l (MSVCRT.@) + */ +int CDECL _strlwr_l(char *str, MSVCRT__locale_t locale) +{ + return _strlwr_s_l(str, -1, locale); +} + +/********************************************************************* + * _strlwr (MSVCRT.@) + */ +int CDECL _strlwr(char *str) +{ + return _strlwr_s_l(str, -1, NULL); +} + +/********************************************************************* * _strnset (MSVCRT.@) */ char* CDECL MSVCRT__strnset(char* str, int value, MSVCRT_size_t len)

1 0

Piotr Caban : msvcrt: Added _tolower_l implementation.
by Alexandre Julliard May 12, 2011

May 12, 2011

Module: wine Branch: master Commit: 0ea4e668f5576170b7a4eecffb7fe7c9095afd8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ea4e668f5576170b7a4eecff… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 12 11:38:32 2011 +0200 msvcrt: Added _tolower_l implementation. --- dlls/msvcrt/ctype.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 4 ++-- 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 9de24e8..94815b8 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -380,6 +380,49 @@ int CDECL MSVCRT__toupper(int c) } /********************************************************************* + * _tolower_l (MSVCRT.@) + */ +int CDECL MSVCRT__tolower_l(int c, MSVCRT__locale_t locale) +{ + if(!locale) + locale = get_locale(); + + if(c < 256) + return locale->locinfo->pclmap[c]; + + if(locale->locinfo->pctype[(c>>8)&255] & MSVCRT__LEADBYTE) + { + WCHAR wide, upper; + char str[2], *p = str; + *p++ = (c>>8) & 255; + *p++ = c & 255; + + if(!MultiByteToWideChar(locale->locinfo->lc_codepage, + MB_ERR_INVALID_CHARS, str, 2, &wide, 1)) + return c; + + upper = tolowerW(wide); + if(upper == wide) + return c; + + WideCharToMultiByte(locale->locinfo->lc_codepage, 0, + &upper, 1, str, 2, NULL, NULL); + + return str[0] + (str[1]<<8); + } + + return c; +} + +/********************************************************************* + * tolower (MSVCRT.@) + */ +int CDECL MSVCRT_tolower(int c) +{ + return MSVCRT__tolower_l(c, NULL); +} + +/********************************************************************* * _tolower (MSVCRT.@) */ int CDECL MSVCRT__tolower(int c) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ebef717..84b0194 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -977,7 +977,7 @@ @ cdecl _time64(ptr) MSVCRT__time64 @ extern _timezone MSVCRT___timezone @ cdecl _tolower(long) MSVCRT__tolower -# stub _tolower_l(long ptr) +@ cdecl _tolower_l(long ptr) MSVCRT__tolower_l @ cdecl _toupper(long) MSVCRT__toupper @ cdecl _toupper_l(long ptr) MSVCRT__toupper_l @ cdecl _towlower_l(long ptr) MSVCRT__towlower_l @@ -1425,7 +1425,7 @@ # stub tmpfile_s(ptr) @ cdecl tmpnam(ptr) MSVCRT_tmpnam # stub tmpnam_s(ptr long) -@ cdecl tolower(long) ntdll.tolower +@ cdecl tolower(long) MSVCRT_tolower @ cdecl toupper(long) MSVCRT_toupper @ cdecl towlower(long) ntdll.towlower @ cdecl towupper(long) ntdll.towupper

1 0

Nikolay Sivov : comctl32/tests: Make functions from test macros.
by Alexandre Julliard May 12, 2011

May 12, 2011

Module: wine Branch: master Commit: 97314eeebd7d1e444d37f502501f33b6eb88cf62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97314eeebd7d1e444d37f5025… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 12 11:59:53 2011 +0400 comctl32/tests: Make functions from test macros. --- dlls/comctl32/tests/tab.c | 119 +++++++++++++++++++++++++-------------------- 1 files changed, 67 insertions(+), 52 deletions(-) diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index bf705a5..8b64764 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -41,25 +41,40 @@ #define TabWidthPadded(padd_x, num) (DEFAULT_MIN_TAB_WIDTH - (TAB_PADDING_X - (padd_x)) * num) -#define TabCheckSetSize(hwnd, SetWidth, SetHeight, ExpWidth, ExpHeight, Msg)\ - SendMessage (hwnd, TCM_SETITEMSIZE, 0,\ - (LPARAM) MAKELPARAM((SetWidth >= 0) ? SetWidth:0, (SetHeight >= 0) ? SetHeight:0));\ - if (winetest_interactive) RedrawWindow (hwnd, NULL, 0, RDW_UPDATENOW);\ - CheckSize(hwnd, ExpWidth, ExpHeight, Msg); - -#define CheckSize(hwnd,width,height,msg)\ - SendMessage (hwnd, TCM_GETITEMRECT, 0, (LPARAM) &rTab);\ - if ((width >= 0) && (height < 0))\ - ok (width == rTab.right - rTab.left, "%s: Expected width [%d] got [%d]\n",\ - msg, (int)width, rTab.right - rTab.left);\ - else if ((height >= 0) && (width < 0))\ - ok (height == rTab.bottom - rTab.top, "%s: Expected height [%d] got [%d]\n",\ - msg, (int)height, rTab.bottom - rTab.top);\ - else\ - ok ((width == rTab.right - rTab.left) &&\ - (height == rTab.bottom - rTab.top ),\ - "%s: Expected [%d,%d] got [%d,%d]\n", msg, (int)width, (int)height,\ - rTab.right - rTab.left, rTab.bottom - rTab.top); +static void CheckSize(HWND hwnd, INT width, INT height, const char *msg, int line) +{ + RECT r; + + SendMessage(hwnd, TCM_GETITEMRECT, 0, (LPARAM)&r); + if (width >= 0 && height < 0) + { + ok_(__FILE__,line) (width == r.right - r.left, "%s: Expected width [%d] got [%d]\n",\ + msg, width, r.right - r.left); + } + else if (height >= 0 && width < 0) + { + ok_(__FILE__,line) (height == r.bottom - r.top, "%s: Expected height [%d] got [%d]\n",\ + msg, height, r.bottom - r.top); + } + else + ok_(__FILE__,line) ((width == r.right - r.left) && (height == r.bottom - r.top ), + "%s: Expected [%d,%d] got [%d,%d]\n", msg, width, height, + r.right - r.left, r.bottom - r.top); +} + +#define CHECKSIZE(hwnd,width,height,msg) CheckSize(hwnd,width,height,msg,__LINE__) + +static void TabCheckSetSize(HWND hwnd, INT set_width, INT set_height, INT exp_width, + INT exp_height, const char *msg, int line) +{ + SendMessage(hwnd, TCM_SETITEMSIZE, 0, + (LPARAM) MAKELPARAM((set_width >= 0) ? set_width : 0, (set_height >= 0) ? set_height : 0)); + if (winetest_interactive) RedrawWindow (hwnd, NULL, 0, RDW_UPDATENOW); + CheckSize(hwnd, exp_width, exp_height, msg, line); +} + +#define TABCHECKSETSIZE(hwnd,set_width,set_height,exp_width,exp_height,msg) \ + TabCheckSetSize(hwnd,set_width,set_height,exp_width,exp_height,msg,__LINE__) static HFONT hFont; static DRAWITEMSTRUCT g_drawitem; @@ -523,16 +538,16 @@ static void test_tab(INT nMinTabWidth) ReleaseDC(hwTab, hdc); trace (" TCS_FIXEDWIDTH tabs no icon...\n"); - CheckSize(hwTab, dpi, -1, "default width"); - TabCheckSetSize(hwTab, 50, 20, 50, 20, "set size"); - TabCheckSetSize(hwTab, 0, 1, 0, 1, "min size"); + CHECKSIZE(hwTab, dpi, -1, "default width"); + TABCHECKSETSIZE(hwTab, 50, 20, 50, 20, "set size"); + TABCHECKSETSIZE(hwTab, 0, 1, 0, 1, "min size"); SendMessage(hwTab, TCM_SETIMAGELIST, 0, (LPARAM)himl); trace (" TCS_FIXEDWIDTH tabs with icon...\n"); - TabCheckSetSize(hwTab, 50, 30, 50, 30, "set size > icon"); - TabCheckSetSize(hwTab, 20, 20, 25, 20, "set size < icon"); - TabCheckSetSize(hwTab, 0, 1, 25, 1, "min size"); + TABCHECKSETSIZE(hwTab, 50, 30, 50, 30, "set size > icon"); + TABCHECKSETSIZE(hwTab, 20, 20, 25, 20, "set size < icon"); + TABCHECKSETSIZE(hwTab, 0, 1, 25, 1, "min size"); DestroyWindow (hwTab); @@ -543,19 +558,19 @@ static void test_tab(INT nMinTabWidth) dpi = GetDeviceCaps(hdc, LOGPIXELSX); ReleaseDC(hwTab, hdc); trace (" TCS_FIXEDWIDTH buttons no icon...\n"); - CheckSize(hwTab, dpi, -1, "default width"); - TabCheckSetSize(hwTab, 20, 20, 20, 20, "set size 1"); - TabCheckSetSize(hwTab, 10, 50, 10, 50, "set size 2"); - TabCheckSetSize(hwTab, 0, 1, 0, 1, "min size"); + CHECKSIZE(hwTab, dpi, -1, "default width"); + TABCHECKSETSIZE(hwTab, 20, 20, 20, 20, "set size 1"); + TABCHECKSETSIZE(hwTab, 10, 50, 10, 50, "set size 2"); + TABCHECKSETSIZE(hwTab, 0, 1, 0, 1, "min size"); SendMessage(hwTab, TCM_SETIMAGELIST, 0, (LPARAM)himl); trace (" TCS_FIXEDWIDTH buttons with icon...\n"); - TabCheckSetSize(hwTab, 50, 30, 50, 30, "set size > icon"); - TabCheckSetSize(hwTab, 20, 20, 25, 20, "set size < icon"); - TabCheckSetSize(hwTab, 0, 1, 25, 1, "min size"); + TABCHECKSETSIZE(hwTab, 50, 30, 50, 30, "set size > icon"); + TABCHECKSETSIZE(hwTab, 20, 20, 25, 20, "set size < icon"); + TABCHECKSETSIZE(hwTab, 0, 1, 25, 1, "min size"); SendMessage(hwTab, TCM_SETPADDING, 0, MAKELPARAM(4,4)); - TabCheckSetSize(hwTab, 0, 1, 25, 1, "set padding, min size"); + TABCHECKSETSIZE(hwTab, 0, 1, 25, 1, "set padding, min size"); DestroyWindow (hwTab); @@ -566,19 +581,19 @@ static void test_tab(INT nMinTabWidth) dpi = GetDeviceCaps(hdc, LOGPIXELSX); ReleaseDC(hwTab, hdc); trace (" TCS_FIXEDWIDTH | TCS_BOTTOM tabs...\n"); - CheckSize(hwTab, dpi, -1, "no icon, default width"); + CHECKSIZE(hwTab, dpi, -1, "no icon, default width"); - TabCheckSetSize(hwTab, 20, 20, 20, 20, "no icon, set size 1"); - TabCheckSetSize(hwTab, 10, 50, 10, 50, "no icon, set size 2"); - TabCheckSetSize(hwTab, 0, 1, 0, 1, "no icon, min size"); + TABCHECKSETSIZE(hwTab, 20, 20, 20, 20, "no icon, set size 1"); + TABCHECKSETSIZE(hwTab, 10, 50, 10, 50, "no icon, set size 2"); + TABCHECKSETSIZE(hwTab, 0, 1, 0, 1, "no icon, min size"); SendMessage(hwTab, TCM_SETIMAGELIST, 0, (LPARAM)himl); - TabCheckSetSize(hwTab, 50, 30, 50, 30, "with icon, set size > icon"); - TabCheckSetSize(hwTab, 20, 20, 25, 20, "with icon, set size < icon"); - TabCheckSetSize(hwTab, 0, 1, 25, 1, "with icon, min size"); + TABCHECKSETSIZE(hwTab, 50, 30, 50, 30, "with icon, set size > icon"); + TABCHECKSETSIZE(hwTab, 20, 20, 25, 20, "with icon, set size < icon"); + TABCHECKSETSIZE(hwTab, 0, 1, 25, 1, "with icon, min size"); SendMessage(hwTab, TCM_SETPADDING, 0, MAKELPARAM(4,4)); - TabCheckSetSize(hwTab, 0, 1, 25, 1, "set padding, min size"); + TABCHECKSETSIZE(hwTab, 0, 1, 25, 1, "set padding, min size"); DestroyWindow (hwTab); @@ -598,15 +613,15 @@ static void test_tab(INT nMinTabWidth) SendMessage(hwTab, TCM_SETIMAGELIST, 0, 0); SendMessage(hwTab, TCM_SETPADDING, 0, MAKELPARAM(i,i)); - TabCheckSetSize(hwTab, 50, 20, max(size.cx + i*2, nTabWidth), 20, "no icon, set size"); - TabCheckSetSize(hwTab, 0, 1, max(size.cx + i*2, nTabWidth), 1, "no icon, min size"); + TABCHECKSETSIZE(hwTab, 50, 20, max(size.cx + i*2, nTabWidth), 20, "no icon, set size"); + TABCHECKSETSIZE(hwTab, 0, 1, max(size.cx + i*2, nTabWidth), 1, "no icon, min size"); SendMessage(hwTab, TCM_SETIMAGELIST, 0, (LPARAM)himl); nTabWidth = (nMinTabWidth < 0) ? TabWidthPadded(i, 3) : nMinTabWidth; - TabCheckSetSize(hwTab, 50, 30, max(size.cx + 21 + i*3, nTabWidth), 30, "with icon, set size > icon"); - TabCheckSetSize(hwTab, 20, 20, max(size.cx + 21 + i*3, nTabWidth), 20, "with icon, set size < icon"); - TabCheckSetSize(hwTab, 0, 1, max(size.cx + 21 + i*3, nTabWidth), 1, "with icon, min size"); + TABCHECKSETSIZE(hwTab, 50, 30, max(size.cx + 21 + i*3, nTabWidth), 30, "with icon, set size > icon"); + TABCHECKSETSIZE(hwTab, 20, 20, max(size.cx + 21 + i*3, nTabWidth), 20, "with icon, set size < icon"); + TABCHECKSETSIZE(hwTab, 0, 1, max(size.cx + 21 + i*3, nTabWidth), 1, "with icon, min size"); } DestroyWindow (hwTab); @@ -626,16 +641,16 @@ static void test_tab(INT nMinTabWidth) SendMessage(hwTab, TCM_SETIMAGELIST, 0, 0); SendMessage(hwTab, TCM_SETPADDING, 0, MAKELPARAM(i,i)); - TabCheckSetSize(hwTab, 50, 20, nTabWidth, 20, "no icon, set size"); - TabCheckSetSize(hwTab, 0, 1, nTabWidth, 1, "no icon, min size"); + TABCHECKSETSIZE(hwTab, 50, 20, nTabWidth, 20, "no icon, set size"); + TABCHECKSETSIZE(hwTab, 0, 1, nTabWidth, 1, "no icon, min size"); SendMessage(hwTab, TCM_SETIMAGELIST, 0, (LPARAM)himl); if (i > 1 && nMinTabWidth > 0 && nMinTabWidth < DEFAULT_MIN_TAB_WIDTH) nTabWidth += EXTRA_ICON_PADDING *(i-1); - TabCheckSetSize(hwTab, 50, 30, nTabWidth, 30, "with icon, set size > icon"); - TabCheckSetSize(hwTab, 20, 20, nTabWidth, 20, "with icon, set size < icon"); - TabCheckSetSize(hwTab, 0, 1, nTabWidth, 1, "with icon, min size"); + TABCHECKSETSIZE(hwTab, 50, 30, nTabWidth, 30, "with icon, set size > icon"); + TABCHECKSETSIZE(hwTab, 20, 20, nTabWidth, 20, "with icon, set size < icon"); + TABCHECKSETSIZE(hwTab, 0, 1, nTabWidth, 1, "with icon, min size"); } DestroyWindow (hwTab); @@ -1034,7 +1049,7 @@ static void test_misc(void) hdc = GetDC(hTab); dpi = GetDeviceCaps(hdc, LOGPIXELSX); ReleaseDC(hTab, hdc); - CheckSize(hTab, dpi, -1 , "Default Width"); + CHECKSIZE(hTab, dpi, -1 , "Default Width"); ok_sequence(sequences, TAB_SEQ_INDEX, get_item_rect_seq, "Get itemRect test sequence", FALSE); ok_sequence(sequences, PARENT_SEQ_INDEX, empty_sequence, "Get itemRect test parent sequence", FALSE);

1 0