December 2011 - Wine-Commits

Piotr Caban : msvcp90: Added ctype<char>::toupper functions implementation.
by Alexandre Julliard Dec. 21, 2011

Dec. 21, 2011

Module: wine Branch: master Commit: 7fe9abd5cc63f6b8e66226d8157acb89bb0ab432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fe9abd5cc63f6b8e66226d81… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 21 15:59:18 2011 +0100 msvcp90: Added ctype<char>::toupper functions implementation. --- dlls/msvcp90/locale.c | 66 +++++++++++++++++++++++++++++++++++++++----- dlls/msvcp90/msvcp90.spec | 2 +- 2 files changed, 59 insertions(+), 9 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 39f01bf..7708e38 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -1505,23 +1505,73 @@ const char* __thiscall ctype_char_tolower(const ctype_char *this, char *first, c return call_ctype_char_do_tolower(this, first, last); } +/* _Toupper */ +int __cdecl _Toupper(int ch, const _Ctypevec *ctype) +{ + unsigned int cp; + + TRACE("%d %p\n", ch, ctype); + + if(ctype) + cp = ctype->page; + else + cp = ___lc_codepage_func(); + + /* Don't convert to unicode in case of C locale */ + if(!cp) { + if(ch>='a' && ch<='z') + ch = ch-'a'+'A'; + return ch; + } else { + WCHAR wide, upper; + char str[2]; + int size; + + if(ch > 255) { + str[0] = (ch>>8) & 255; + str[1] = ch & 255; + size = 2; + } else { + str[0] = ch & 255; + size = 1; + } + + if(!MultiByteToWideChar(cp, MB_ERR_INVALID_CHARS, str, size, &wide, 1)) + return ch; + + upper = toupperW(wide); + if(upper == wide) + return ch; + + WideCharToMultiByte(cp, 0, &upper, 1, str, 2, NULL, NULL); + + return str[0] + (str[1]<<8); + } +} + /* ?do_toupper@?$ctype(a)D@std@@MBEDD(a)Z */ /* ?do_toupper@?$ctype(a)D@std@@MEBADD(a)Z */ +#define call_ctype_char_do_toupper_ch(this, ch) CALL_VTBL_FUNC(this, 16, \ + char, (const ctype_char*, char), (this, ch)) DEFINE_THISCALL_WRAPPER(ctype_char_do_toupper_ch, 8) char __thiscall ctype_char_do_toupper_ch(const ctype_char *this, char ch) { - FIXME("(%p %c) stub\n", this, ch); - return 0; + TRACE("(%p %c)\n", this, ch); + return _Toupper(ch, &this->ctype); } /* ?do_toupper@?$ctype(a)D@std@@MBEPBDPADPBD(a)Z */ /* ?do_toupper@?$ctype(a)D@std@@MEBAPEBDPEADPEBD(a)Z */ +#define call_ctype_char_do_toupper(this, first, last) CALL_VTBL_FUNC(this, 12, \ + const char*, (const ctype_char*, char*, const char*), (this, first, last)) DEFINE_THISCALL_WRAPPER(ctype_char_do_toupper, 12) const char* __thiscall ctype_char_do_toupper(const ctype_char *this, char *first, const char *last) { - FIXME("(%p %p %p) stub\n", this, first, last); - return NULL; + TRACE("(%p %p %p)\n", this, first, last); + for(; first<last; first++) + *first = _Toupper(*first, &this->ctype); + return last; } /* ?toupper@?$ctype(a)D@std@@QBEDD(a)Z */ @@ -1529,8 +1579,8 @@ const char* __thiscall ctype_char_do_toupper(const ctype_char *this, DEFINE_THISCALL_WRAPPER(ctype_char_toupper_ch, 8) char __thiscall ctype_char_toupper_ch(const ctype_char *this, char ch) { - FIXME("(%p %c) stub\n", this, ch); - return 0; + TRACE("(%p %c)\n", this, ch); + return call_ctype_char_do_toupper_ch(this, ch); } /* ?toupper@?$ctype(a)D@std@@QBEPBDPADPBD(a)Z */ @@ -1538,8 +1588,8 @@ char __thiscall ctype_char_toupper_ch(const ctype_char *this, char ch) DEFINE_THISCALL_WRAPPER(ctype_char_toupper, 12) const char* __thiscall ctype_char_toupper(const ctype_char *this, char *first, const char *last) { - FIXME("(%p %p %p) stub\n", this, first, last); - return NULL; + TRACE("(%p %p %p)\n", this, first, last); + return call_ctype_char_do_toupper(this, first, last); } /* ?is@?$ctype(a)D@std@@QBE_NFD(a)Z */ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index b7599ef..976ab8f 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5799,7 +5799,7 @@ @ cdecl _Strcoll(ptr ptr ptr ptr ptr) @ stub _Strxfrm @ cdecl _Tolower(long ptr) -@ stub _Toupper +@ cdecl _Toupper(long ptr) @ stub _Towlower @ stub _Towupper @ stub _Wcrtomb

1 0

Piotr Caban : msvcp90: Added ctype<char>::tolower functions implementation.
by Alexandre Julliard Dec. 21, 2011

Dec. 21, 2011

Module: wine Branch: master Commit: 283c07b8ceae3bec3816eaf38581d6fbe37c9434 URL: http://source.winehq.org/git/wine.git/?a=commit;h=283c07b8ceae3bec3816eaf38… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 21 15:59:09 2011 +0100 msvcp90: Added ctype<char>::tolower functions implementation. --- dlls/msvcp90/locale.c | 88 +++++++++++++++++++++++++++++++++++++++----- dlls/msvcp90/msvcp90.h | 1 + dlls/msvcp90/msvcp90.spec | 2 +- dlls/msvcrt/locale.c | 4 +- dlls/msvcrt/msvcrt.h | 2 +- 5 files changed, 83 insertions(+), 14 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 95b5407..39f01bf 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -26,12 +26,14 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); char* __cdecl _Getdays(void); char* __cdecl _Getmonths(void); void* __cdecl _Gettnames(void); +unsigned int __cdecl ___lc_codepage_func(void); typedef int category; @@ -1397,26 +1399,92 @@ const char* __thiscall ctype_char__Widen_s(const ctype_char *this, /* ?_Getcat@?$ctype(a)D@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ MSVCP_size_t __cdecl ctype_char__Getcat(const locale_facet **facet, const locale *loc) { - FIXME("(%p %p) stub\n", facet, loc); - return 0; + TRACE("(%p %p)\n", facet, loc); + + if(facet && !*facet) { + _Locinfo locinfo; + + *facet = MSVCRT_operator_new(sizeof(ctype_char)); + if(!*facet) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + return 0; + } + + _Locinfo_ctor_cstr(&locinfo, MSVCP_basic_string_char_c_str(&loc->ptr->name)); + ctype_char_ctor_locinfo((ctype_char*)*facet, &locinfo, 0); + _Locinfo_dtor(&locinfo); + } + + return LC_CTYPE; +} + +/* _Tolower */ +int __cdecl _Tolower(int ch, const _Ctypevec *ctype) +{ + unsigned int cp; + + TRACE("%d %p\n", ch, ctype); + + if(ctype) + cp = ctype->page; + else + cp = ___lc_codepage_func(); + + /* Don't convert to unicode in case of C locale */ + if(!cp) { + if(ch>='A' && ch<='Z') + ch = ch-'A'+'a'; + return ch; + } else { + WCHAR wide, lower; + char str[2]; + int size; + + if(ch > 255) { + str[0] = (ch>>8) & 255; + str[1] = ch & 255; + size = 2; + } else { + str[0] = ch & 255; + size = 1; + } + + if(!MultiByteToWideChar(cp, MB_ERR_INVALID_CHARS, str, size, &wide, 1)) + return ch; + + lower = tolowerW(wide); + if(lower == wide) + return ch; + + WideCharToMultiByte(cp, 0, &lower, 1, str, 2, NULL, NULL); + + return str[0] + (str[1]<<8); + } } /* ?do_tolower@?$ctype(a)D@std@@MBEDD(a)Z */ /* ?do_tolower@?$ctype(a)D@std@@MEBADD(a)Z */ +#define call_ctype_char_do_tolower_ch(this, ch) CALL_VTBL_FUNC(this, 8, \ + char, (const ctype_char*, char), (this, ch)) DEFINE_THISCALL_WRAPPER(ctype_char_do_tolower_ch, 8) char __thiscall ctype_char_do_tolower_ch(const ctype_char *this, char ch) { - FIXME("(%p %c) stub\n", this, ch); - return 0; + TRACE("(%p %c)\n", this, ch); + return _Tolower(ch, &this->ctype); } /* ?do_tolower@?$ctype(a)D@std@@MBEPBDPADPBD(a)Z */ /* ?do_tolower@?$ctype(a)D@std@@MEBAPEBDPEADPEBD(a)Z */ +#define call_ctype_char_do_tolower(this, first, last) CALL_VTBL_FUNC(this, 4, \ + const char*, (const ctype_char*, char*, const char*), (this, first, last)) DEFINE_THISCALL_WRAPPER(ctype_char_do_tolower, 12) const char* __thiscall ctype_char_do_tolower(const ctype_char *this, char *first, const char *last) { - FIXME("(%p %p %p) stub\n", this, first, last); - return NULL; + TRACE("(%p %p %p)\n", this, first, last); + for(; first<last; first++) + *first = _Tolower(*first, &this->ctype); + return last; } /* ?tolower@?$ctype(a)D@std@@QBEDD(a)Z */ @@ -1424,8 +1492,8 @@ const char* __thiscall ctype_char_do_tolower(const ctype_char *this, char *first DEFINE_THISCALL_WRAPPER(ctype_char_tolower_ch, 8) char __thiscall ctype_char_tolower_ch(const ctype_char *this, char ch) { - FIXME("(%p %c) stub\n", this, ch); - return 0; + TRACE("(%p %c)\n", this, ch); + return call_ctype_char_do_tolower_ch(this, ch); } /* ?tolower@?$ctype(a)D@std@@QBEPBDPADPBD(a)Z */ @@ -1433,8 +1501,8 @@ char __thiscall ctype_char_tolower_ch(const ctype_char *this, char ch) DEFINE_THISCALL_WRAPPER(ctype_char_tolower, 12) const char* __thiscall ctype_char_tolower(const ctype_char *this, char *first, const char *last) { - FIXME("(%p %p %p) stub\n", this, first, last); - return NULL; + TRACE("(%p %p %p)\n", this, first, last); + return call_ctype_char_do_tolower(this, first, last); } /* ?do_toupper@?$ctype(a)D@std@@MBEDD(a)Z */ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 63350fc..61567e8 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -136,6 +136,7 @@ const rtti_object_locator name ## _rtti = { \ extern void *vtbl_wrapper_0; extern void *vtbl_wrapper_4; +extern void *vtbl_wrapper_8; extern void *vtbl_wrapper_12; extern void *vtbl_wrapper_16; extern void *vtbl_wrapper_20; diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index f53b579..b7599ef 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5798,7 +5798,7 @@ @ stub _Stoulx @ cdecl _Strcoll(ptr ptr ptr ptr ptr) @ stub _Strxfrm -@ stub _Tolower +@ cdecl _Tolower(long ptr) @ stub _Toupper @ stub _Towlower @ stub _Towupper diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index c3a1c4b..60ea424 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -42,7 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #define MAX_LOCALE_LENGTH 256 MSVCRT__locale_t MSVCRT_locale = NULL; unsigned short *MSVCRT__pctype = NULL; -int MSVCRT___lc_codepage = 0; +unsigned int MSVCRT___lc_codepage = 0; int MSVCRT___lc_collate_cp = 0; LCID MSVCRT___lc_handle[MSVCRT_LC_MAX - MSVCRT_LC_MIN + 1] = { 0 }; int MSVCRT___mb_cur_max = 1; @@ -640,7 +640,7 @@ LCID* CDECL ___lc_handle_func(void) /********************************************************************* * ___lc_codepage_func (MSVCRT.@) */ -int CDECL ___lc_codepage_func(void) +unsigned int CDECL ___lc_codepage_func(void) { return MSVCRT___lc_codepage; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 0695e6f..7ea0067 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -218,7 +218,7 @@ extern thread_data_t *msvcrt_get_thread_data(void); LCID MSVCRT_locale_to_LCID(const char *); extern MSVCRT__locale_t MSVCRT_locale; -extern int MSVCRT___lc_codepage; +extern unsigned int MSVCRT___lc_codepage; extern int MSVCRT___lc_collate_cp; extern WORD MSVCRT__ctype [257];

1 0

Piotr Caban : msvcp90: Added ctype<char>::is functions implementation.
by Alexandre Julliard Dec. 21, 2011

Dec. 21, 2011

Module: wine Branch: master Commit: 1a711acdc2af87a98448f7c3cb2cb15e59c09277 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a711acdc2af87a98448f7c3c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 21 15:59:31 2011 +0100 msvcp90: Added ctype<char>::is functions implementation. --- dlls/msvcp90/locale.c | 28 ++++++++++++++++++---------- 1 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 7708e38..582d96f 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -1597,8 +1597,8 @@ const char* __thiscall ctype_char_toupper(const ctype_char *this, char *first, c DEFINE_THISCALL_WRAPPER(ctype_char_is_ch, 12) MSVCP_bool __thiscall ctype_char_is_ch(const ctype_char *this, short mask, char ch) { - FIXME("(%p %x %c) stub\n", this, mask, ch); - return 0; + TRACE("(%p %x %c)\n", this, mask, ch); + return (this->ctype.table[(unsigned char)ch] & mask) != 0; } /* ?is@?$ctype(a)D@std@@QBEPBDPBD0PAF(a)Z */ @@ -1606,8 +1606,10 @@ MSVCP_bool __thiscall ctype_char_is_ch(const ctype_char *this, short mask, char DEFINE_THISCALL_WRAPPER(ctype_char_is, 16) const char* __thiscall ctype_char_is(const ctype_char *this, const char *first, const char *last, short *dest) { - FIXME("(%p %p %p %p) stub\n", this, first, last, dest); - return NULL; + TRACE("(%p %p %p %p)\n", this, first, last, dest); + for(; first<last; first++) + *dest++ = this->ctype.table[(unsigned char)*first]; + return last; } /* ?scan_is@?$ctype(a)D@std@@QBEPBDFPBD0(a)Z */ @@ -1615,8 +1617,11 @@ const char* __thiscall ctype_char_is(const ctype_char *this, const char *first, DEFINE_THISCALL_WRAPPER(ctype_char_scan_is, 16) const char* __thiscall ctype_char_scan_is(const ctype_char *this, short mask, const char *first, const char *last) { - FIXME("(%p %x %p %p) stub\n", this, mask, first, last); - return NULL; + TRACE("(%p %x %p %p)\n", this, mask, first, last); + for(; first<last; first++) + if(!ctype_char_is_ch(this, mask, *first)) + break; + return first; } /* ?scan_not@?$ctype(a)D@std@@QBEPBDFPBD0(a)Z */ @@ -1624,8 +1629,11 @@ const char* __thiscall ctype_char_scan_is(const ctype_char *this, short mask, co DEFINE_THISCALL_WRAPPER(ctype_char_scan_not, 16) const char* __thiscall ctype_char_scan_not(const ctype_char *this, short mask, const char *first, const char *last) { - FIXME("(%p %x %p %p) stub\n", this, mask, first, last); - return NULL; + TRACE("(%p %x %p %p)\n", this, mask, first, last); + for(; first<last; first++) + if(ctype_char_is_ch(this, mask, *first)) + break; + return first; } /* ?table@?$ctype(a)D@std@@IBEPBFXZ */ @@ -1633,8 +1641,8 @@ const char* __thiscall ctype_char_scan_not(const ctype_char *this, short mask, c DEFINE_THISCALL_WRAPPER(ctype_char_table, 4) const short* __thiscall ctype_char_table(const ctype_char *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + return this->ctype.table; } /* ?id@?$ctype(a)_W@std@@2V0locale(a)2@A */

1 0

Piotr Caban : msvcp90: Hold _LOCK_LOCALE critical section while _Lockinfo object exists.
by Alexandre Julliard Dec. 21, 2011

Dec. 21, 2011

Module: wine Branch: master Commit: a1db838668820ac899225420f5ec08bf7ee1af2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1db838668820ac899225420f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 21 15:58:50 2011 +0100 msvcp90: Hold _LOCK_LOCALE critical section while _Lockinfo object exists. --- dlls/msvcp90/locale.c | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 8105ca0..95b5407 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -342,7 +342,6 @@ _Locinfo* __cdecl _Locinfo__Locinfo_ctor_cat_cstr(_Locinfo *locinfo, int categor MSVCP_basic_string_char_ctor_cstr(&locinfo->newlocname, locale); else MSVCP_basic_string_char_ctor_cstr(&locinfo->newlocname, "*"); - _Lockit_dtor(&locinfo->lock); return locinfo; } @@ -396,6 +395,7 @@ void __cdecl _Locinfo__Locinfo_dtor(_Locinfo *locinfo) MSVCP_basic_string_char_dtor(&locinfo->months); MSVCP_basic_string_char_dtor(&locinfo->oldlocname); MSVCP_basic_string_char_dtor(&locinfo->newlocname); + _Lockit_dtor(&locinfo->lock); } /* ??_F_Locinfo(a)std@@QAEXXZ */ @@ -425,7 +425,6 @@ _Locinfo* __cdecl _Locinfo__Locinfo_Addcats(_Locinfo *locinfo, int category, con if(!locstr) throw_exception(EXCEPTION_RUNTIME_ERROR, "bad locale name"); - _Lockit_ctor_locktype(&locinfo->lock, _LOCK_LOCALE); MSVCP_basic_string_char_dtor(&locinfo->newlocname); if(category) @@ -437,7 +436,6 @@ _Locinfo* __cdecl _Locinfo__Locinfo_Addcats(_Locinfo *locinfo, int category, con MSVCP_basic_string_char_ctor_cstr(&locinfo->newlocname, locale); else MSVCP_basic_string_char_ctor_cstr(&locinfo->newlocname, "*"); - _Lockit_dtor(&locinfo->lock); return locinfo; } @@ -652,7 +650,6 @@ void __thiscall collate_char__Init(collate *this, const _Locinfo *locinfo) DEFINE_THISCALL_WRAPPER(collate_char_ctor_name, 12) collate* __thiscall collate_char_ctor_name(collate *this, const char *name, MSVCP_size_t refs) { - _Lockit lockit; _Locinfo locinfo; TRACE("(%p %s %lu)\n", this, name, refs); @@ -660,11 +657,9 @@ collate* __thiscall collate_char_ctor_name(collate *this, const char *name, MSVC locale_facet_ctor_refs(&this->facet, refs); this->facet.vtable = &MSVCP_collate_char_vtable; - _Lockit_ctor_locktype(&lockit, _LOCK_LOCALE); _Locinfo_ctor_cstr(&locinfo, name); collate_char__Init(this, &locinfo); _Locinfo_dtor(&locinfo); - _Lockit_dtor(&lockit); return this; } @@ -851,7 +846,6 @@ void __thiscall collate_wchar__Init(collate *this, const _Locinfo *locinfo) DEFINE_THISCALL_WRAPPER(collate_wchar_ctor_name, 12) collate* __thiscall collate_wchar_ctor_name(collate *this, const char *name, MSVCP_size_t refs) { - _Lockit lockit; _Locinfo locinfo; TRACE("(%p %s %lu)\n", this, name, refs); @@ -859,11 +853,9 @@ collate* __thiscall collate_wchar_ctor_name(collate *this, const char *name, MSV locale_facet_ctor_refs(&this->facet, refs); this->facet.vtable = &MSVCP_collate_wchar_vtable; - _Lockit_ctor_locktype(&lockit, _LOCK_LOCALE); _Locinfo_ctor_cstr(&locinfo, name); collate_wchar__Init(this, &locinfo); _Locinfo_dtor(&locinfo); - _Lockit_dtor(&lockit); return this; } @@ -1209,7 +1201,6 @@ DEFINE_THISCALL_WRAPPER(ctype_char_ctor_table, 16) ctype_char* __thiscall ctype_char_ctor_table(ctype_char *this, const short *table, MSVCP_bool delete, MSVCP_size_t refs) { - _Lockit lockit; _Locinfo locinfo; TRACE("(%p %p %d %lu)\n", this, table, delete, refs); @@ -1217,11 +1208,9 @@ ctype_char* __thiscall ctype_char_ctor_table(ctype_char *this, ctype_base_ctor_refs(&this->base, refs); this->base.facet.vtable = &MSVCP_ctype_char_vtable; - _Lockit_ctor_locktype(&lockit, _LOCK_LOCALE); _Locinfo_ctor(&locinfo); ctype_char__Init(this, &locinfo); _Locinfo_dtor(&locinfo); - _Lockit_dtor(&lockit); if(table) { ctype_char__Tidy(this);

1 0

Piotr Caban : msvcp90: Added ctype<char>::widen functions implementation.
by Alexandre Julliard Dec. 21, 2011

Dec. 21, 2011

Module: wine Branch: master Commit: 8f8f6b3c0dd59507c5d6cc3f0bf9d7ecb912b043 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f8f6b3c0dd59507c5d6cc3f0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 21 15:58:35 2011 +0100 msvcp90: Added ctype<char>::widen functions implementation. --- dlls/msvcp90/locale.c | 34 ++++++++++++++++++++++------------ 1 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 1bae73e..8105ca0 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -1339,30 +1339,40 @@ const char* __thiscall ctype_char__Narrow_s(const ctype_char *this, const char * /* ?do_widen@?$ctype(a)D@std@@MBEDD(a)Z */ /* ?do_widen@?$ctype(a)D@std@@MEBADD(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_char_do_widen_ch, 8) +#define call_ctype_char_do_widen_ch(this, ch) CALL_VTBL_FUNC(this, 24, \ + char, (const ctype_char*, char), (this, ch)) char __thiscall ctype_char_do_widen_ch(const ctype_char *this, char ch) { - FIXME("(%p %c) stub\n", this, ch); - return 0; + TRACE("(%p %c)\n", this, ch); + return ch; } /* ?do_widen@?$ctype(a)D@std@@MBEPBDPBD0PAD(a)Z */ /* ?do_widen@?$ctype(a)D@std@@MEBAPEBDPEBD0PEAD(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_char_do_widen, 16) +#define call_ctype_char_do_widen(this, first, last, dest) CALL_VTBL_FUNC(this, 20, \ + const char*, (const ctype_char*, const char*, const char*, char*), \ + (this, first, last, dest)) const char* __thiscall ctype_char_do_widen(const ctype_char *this, const char *first, const char *last, char *dest) { - FIXME("(%p %p %p %p) stub\n", this, first, last, dest); - return NULL; + TRACE("(%p %p %p %p)\n", this, first, last, dest); + memcpy(dest, first, last-first); + return last; } /* ?_Do_widen_s@?$ctype(a)D@std@@MBEPBDPBD0PADI(a)Z */ /* ?_Do_widen_s@?$ctype(a)D@std@@MEBAPEBDPEBD0PEAD_K(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_char__Do_widen_s, 20) +#define call_ctype_char__Do_widen_s(this, first, last, dest, size) CALL_VTBL_FUNC(this, 28, \ + const char*, (const ctype_char*, const char*, const char*, char*, MSVCP_size_t), \ + (this, first, last, dest, size)) const char* __thiscall ctype_char__Do_widen_s(const ctype_char *this, const char *first, const char *last, char *dest, MSVCP_size_t size) { - FIXME("(%p %p %p %p %lu) stub\n", this, first, last, dest, size); - return NULL; + TRACE("(%p %p %p %p %lu)\n", this, first, last, dest, size); + memcpy_s(dest, size, first, last-first); + return last; } /* ?widen@?$ctype(a)D@std@@QBEDD(a)Z */ @@ -1370,8 +1380,8 @@ const char* __thiscall ctype_char__Do_widen_s(const ctype_char *this, DEFINE_THISCALL_WRAPPER(ctype_char_widen_ch, 8) char __thiscall ctype_char_widen_ch(const ctype_char *this, char ch) { - FIXME("(%p %c) stub\n", this, ch); - return 0; + TRACE("(%p %c)\n", this, ch); + return call_ctype_char_do_widen_ch(this, ch); } /* ?widen@?$ctype(a)D@std@@QBEPBDPBD0PAD(a)Z */ @@ -1380,8 +1390,8 @@ DEFINE_THISCALL_WRAPPER(ctype_char_widen, 16) const char* __thiscall ctype_char_widen(const ctype_char *this, const char *first, const char *last, char *dest) { - FIXME("(%p %p %p %p) stub\n", this, first, last, dest); - return NULL; + TRACE("(%p %p %p %p)\n", this, first, last, dest); + return call_ctype_char_do_widen(this, first, last, dest); } /* ?_Widen_s@?$ctype(a)D@std@@QBEPBDPBD0PADI(a)Z */ @@ -1390,8 +1400,8 @@ DEFINE_THISCALL_WRAPPER(ctype_char__Widen_s, 20) const char* __thiscall ctype_char__Widen_s(const ctype_char *this, const char *first, const char *last, char *dest, MSVCP_size_t size) { - FIXME("(%p %p %p %p %lu) stub\n", this, first, last, dest, size); - return NULL; + TRACE("(%p %p %p %p %lu)\n", this, first, last, dest, size); + return call_ctype_char__Do_widen_s(this, first, last, dest, size); } /* ?_Getcat@?$ctype(a)D@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */

1 0

Piotr Caban : msvcp90: Added ctype<char>::narrow functions implementation.
by Alexandre Julliard Dec. 21, 2011

Dec. 21, 2011

Module: wine Branch: master Commit: facb3e3fe6796f8ade8d9d4edc2d5cd99efe797c URL: http://source.winehq.org/git/wine.git/?a=commit;h=facb3e3fe6796f8ade8d9d4ed… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 21 15:58:19 2011 +0100 msvcp90: Added ctype<char>::narrow functions implementation. --- dlls/msvcp90/locale.c | 36 +++++++++++++++++++++++------------- 1 files changed, 23 insertions(+), 13 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index bf32d85..1bae73e 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -1271,30 +1271,40 @@ ctype_char* __thiscall MSVCP_ctype_char_vector_dtor(ctype_char *this, unsigned i /* ?do_narrow@?$ctype(a)D@std@@MBEDDD(a)Z */ /* ?do_narrow@?$ctype(a)D@std@@MEBADDD(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_char_do_narrow_ch, 12) +#define call_ctype_char_do_narrow_ch(this, ch, unused) CALL_VTBL_FUNC(this, 36, \ + char, (const ctype_char*, char, char), (this, ch, unused)) char __thiscall ctype_char_do_narrow_ch(const ctype_char *this, char ch, char unused) { - FIXME("(%p %c %c) stub\n", this, ch, unused); - return 0; + TRACE("(%p %c %c)\n", this, ch, unused); + return ch; } /* ?do_narrow@?$ctype(a)D@std@@MBEPBDPBD0DPAD(a)Z */ /* ?do_narrow@?$ctype(a)D@std@@MEBAPEBDPEBD0DPEAD(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_char_do_narrow, 20) +#define call_ctype_char_do_narrow(this, first, last, unused, dest) CALL_VTBL_FUNC(this, 32, \ + const char*, (const ctype_char*, const char*, const char*, char, char*), \ + (this, first, last, unused, dest)) const char* __thiscall ctype_char_do_narrow(const ctype_char *this, const char *first, const char *last, char unused, char *dest) { - FIXME("(%p %p %p %p) stub\n", this, first, last, dest); - return NULL; + TRACE("(%p %p %p %p)\n", this, first, last, dest); + memcpy(dest, first, last-first); + return last; } /* ?_Do_narrow_s@?$ctype(a)D@std@@MBEPBDPBD0DPADI(a)Z */ /* ?_Do_narrow_s@?$ctype(a)D@std@@MEBAPEBDPEBD0DPEAD_K(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_char__Do_narrow_s, 24) +#define call_ctype_char__Do_narrow_s(this, first, last, unused, dest, size) CALL_VTBL_FUNC(this, 40, \ + const char*, (const ctype_char*, const char*, const char*, char, char*, MSVCP_size_t), \ + (this, first, last, unused, dest, size)) const char* __thiscall ctype_char__Do_narrow_s(const ctype_char *this, const char *first, const char *last, char unused, char *dest, MSVCP_size_t size) { - FIXME("(%p %p %p %p %lu) stub\n", this, first, last, dest, size); - return NULL; + TRACE("(%p %p %p %p %lu)\n", this, first, last, dest, size); + memcpy_s(dest, size, first, last-first); + return last; } /* ?narrow@?$ctype(a)D@std@@QBEDDD(a)Z */ @@ -1302,8 +1312,8 @@ const char* __thiscall ctype_char__Do_narrow_s(const ctype_char *this, const cha DEFINE_THISCALL_WRAPPER(ctype_char_narrow_ch, 12) char __thiscall ctype_char_narrow_ch(const ctype_char *this, char ch, char dflt) { - FIXME("(%p %c %c) stub\n", this, ch, dflt); - return 0; + TRACE("(%p %c %c)\n", this, ch, dflt); + return call_ctype_char_do_narrow_ch(this, ch, dflt); } /* ?narrow@?$ctype(a)D@std@@QBEPBDPBD0DPAD(a)Z */ @@ -1312,18 +1322,18 @@ DEFINE_THISCALL_WRAPPER(ctype_char_narrow, 20) const char* __thiscall ctype_char_narrow(const ctype_char *this, const char *first, const char *last, char dflt, char *dest) { - FIXME("(%p %p %p %c %p) stub\n", this, first, last, dflt, dest); - return NULL; + TRACE("(%p %p %p %c %p)\n", this, first, last, dflt, dest); + return call_ctype_char_do_narrow(this, first, last, dflt, dest); } /* ?_Narrow_s@?$ctype(a)D@std@@QBEPBDPBD0DPADI(a)Z */ /* ?_Narrow_s@?$ctype(a)D@std@@QEBAPEBDPEBD0DPEAD_K(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_char__Narrow_s, 24) const char* __thiscall ctype_char__Narrow_s(const ctype_char *this, const char *first, - const char *last, char unused, char *dest, MSVCP_size_t size) + const char *last, char dflt, char *dest, MSVCP_size_t size) { - FIXME("(%p %p %p %p %lu) stub\n", this, first, last, dest, size); - return NULL; + TRACE("(%p %p %p %p %lu)\n", this, first, last, dest, size); + return call_ctype_char__Do_narrow_s(this, first, last, dflt, dest, size); } /* ?do_widen@?$ctype(a)D@std@@MBEDD(a)Z */

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value GetIntArray() test.
by Alexandre Julliard Dec. 21, 2011

Dec. 21, 2011

Module: wine Branch: master Commit: 5341b5518bc3a0526c5044bcb2dd5752c5876df5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5341b5518bc3a0526c5044bcb… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Dec 21 15:03:05 2011 +0100 d3dx9/tests: Add effect parameter value GetIntArray() test. --- dlls/d3dx9_36/tests/effect.c | 43 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 0fbe980..54d6a25 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -646,6 +646,48 @@ static void test_effect_parameter_value_GetInt(const struct test_effect_paramete } } +static void test_effect_parameter_value_GetIntArray(const struct test_effect_parameter_value_result *res, + ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) +{ + const D3DXPARAMETER_DESC *res_desc = &res->desc; + LPCSTR res_full_name = res->full_name; + INT iavalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; + HRESULT hr; + UINT l; + + memset(iavalue, 0xab, sizeof(iavalue)); + hr = effect->lpVtbl->GetIntArray(effect, parameter, iavalue, res_desc->Bytes / sizeof(*iavalue)); + if (res_desc->Class == D3DXPC_SCALAR + || res_desc->Class == D3DXPC_VECTOR + || res_desc->Class == D3DXPC_MATRIX_ROWS) + { + ok(hr == D3D_OK, "%u - %s: GetIntArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + + for (l = 0; l < res_desc->Bytes / sizeof(*iavalue); ++l) + { + ok(iavalue[l] == get_int(res_desc->Type, &res_value[l]), "%u - %s: GetIntArray iavalue[%u] failed, got %i, expected %i\n", + i, res_full_name, l, iavalue[l], get_int(res_desc->Type, &res_value[l])); + } + + for (l = res_desc->Bytes / sizeof(*iavalue); l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(iavalue[l] == 0xabababab, "%u - %s: GetIntArray iavalue[%u] failed, got %i, expected %i\n", + i, res_full_name, l, iavalue[l], 0xabababab); + } + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetIntArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + + for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(iavalue[l] == 0xabababab, "%u - %s: GetIntArray iavalue[%u] failed, got %i, expected %i\n", + i, res_full_name, l, iavalue[l], 0xabababab); + } + } +} + static void test_effect_parameter_value(IDirect3DDevice9 *device) { UINT i; @@ -719,6 +761,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) test_effect_parameter_value_GetBool(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetBoolArray(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetInt(&res[k], effect, &blob[res_value_offset], parameter, i); + test_effect_parameter_value_GetIntArray(&res[k], effect, &blob[res_value_offset], parameter, i); } count = effect->lpVtbl->Release(effect);

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value GetBoolArray() test.
by Alexandre Julliard Dec. 21, 2011

Dec. 21, 2011

Module: wine Branch: master Commit: cb664abfa0780d8e2f7a411a4ef8c03031cf9b87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb664abfa0780d8e2f7a411a4… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Dec 21 15:02:57 2011 +0100 d3dx9/tests: Add effect parameter value GetBoolArray() test. --- dlls/d3dx9_36/tests/effect.c | 43 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index db5c1f8..517a7de 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -532,6 +532,48 @@ static void test_effect_parameter_value_GetBool(const struct test_effect_paramet } } +static void test_effect_parameter_value_GetBoolArray(const struct test_effect_parameter_value_result *res, + ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) +{ + const D3DXPARAMETER_DESC *res_desc = &res->desc; + LPCSTR res_full_name = res->full_name; + BOOL bavalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; + HRESULT hr; + UINT l; + + memset(bavalue, 0xab, sizeof(bavalue)); + hr = effect->lpVtbl->GetBoolArray(effect, parameter, bavalue, res_desc->Bytes / sizeof(*bavalue)); + if (res_desc->Class == D3DXPC_SCALAR + || res_desc->Class == D3DXPC_VECTOR + || res_desc->Class == D3DXPC_MATRIX_ROWS) + { + ok(hr == D3D_OK, "%u - %s: GetBoolArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + + for (l = 0; l < res_desc->Bytes / sizeof(*bavalue); ++l) + { + ok(bavalue[l] == get_bool(&res_value[l]), "%u - %s: GetBoolArray bavalue[%u] failed, got %#x, expected %#x\n", + i, res_full_name, l, bavalue[l], get_bool(&res_value[l])); + } + + for (l = res_desc->Bytes / sizeof(*bavalue); l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(bavalue[l] == 0xabababab, "%u - %s: GetBoolArray bavalue[%u] failed, got %#x, expected %#x\n", + i, res_full_name, l, bavalue[l], 0xabababab); + } + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetBoolArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + + for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(bavalue[l] == 0xabababab, "%u - %s: GetBoolArray bavalue[%u] failed, got %#x, expected %#x\n", + i, res_full_name, l, bavalue[l], 0xabababab); + } + } +} + static void test_effect_parameter_value(IDirect3DDevice9 *device) { UINT i; @@ -603,6 +645,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) test_effect_parameter_value_GetValue(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetBool(&res[k], effect, &blob[res_value_offset], parameter, i); + test_effect_parameter_value_GetBoolArray(&res[k], effect, &blob[res_value_offset], parameter, i); } count = effect->lpVtbl->Release(effect);

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value GetBool() test.
by Alexandre Julliard Dec. 21, 2011

Dec. 21, 2011

Module: wine Branch: master Commit: bdf8e4642a71181896d20ab447528552396dd729 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdf8e4642a71181896d20ab44… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Dec 21 15:02:53 2011 +0100 d3dx9/tests: Add effect parameter value GetBool() test. --- dlls/d3dx9_36/tests/effect.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index fcb9414..db5c1f8 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -21,6 +21,12 @@ #include "wine/test.h" #include "d3dx9.h" +/* helper functions */ +static inline BOOL get_bool(LPCVOID data) +{ + return (*(BOOL *)data) ? TRUE : FALSE; +} + static const char effect_desc[] = "Technique\n" "{\n" @@ -502,6 +508,30 @@ static void test_effect_parameter_value_GetValue(const struct test_effect_parame } } +static void test_effect_parameter_value_GetBool(const struct test_effect_parameter_value_result *res, + ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) +{ + const D3DXPARAMETER_DESC *res_desc = &res->desc; + LPCSTR res_full_name = res->full_name; + BOOL bvalue = 0xabababab; + HRESULT hr; + + hr = effect->lpVtbl->GetBool(effect, parameter, &bvalue); + if (!res_desc->Elements && res_desc->Rows == 1 && res_desc->Columns == 1) + { + ok(hr == D3D_OK, "%u - %s: GetBool failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + ok(bvalue == get_bool(res_value), "%u - %s: GetBool bvalue failed, got %#x, expected %#x\n", + i, res_full_name, bvalue, get_bool(res_value)); + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetBool failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + ok(bvalue == 0xabababab, "%u - %s: GetBool bvalue failed, got %#x, expected %#x\n", + i, res_full_name, bvalue, 0xabababab); + } +} + static void test_effect_parameter_value(IDirect3DDevice9 *device) { UINT i; @@ -572,6 +602,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) "%u - %s: Warning: Array size to small\n", i, res_full_name); test_effect_parameter_value_GetValue(&res[k], effect, &blob[res_value_offset], parameter, i); + test_effect_parameter_value_GetBool(&res[k], effect, &blob[res_value_offset], parameter, i); } count = effect->lpVtbl->Release(effect);

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value GetValue() test.
by Alexandre Julliard Dec. 21, 2011

Dec. 21, 2011

Module: wine Branch: master Commit: 8a58fb3c8422c862975db5c9370bc59b922fd28a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a58fb3c8422c862975db5c93… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Dec 21 15:02:44 2011 +0100 d3dx9/tests: Add effect parameter value GetValue() test. --- dlls/d3dx9_36/tests/effect.c | 383 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 383 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a58fb3c8422c862975db…

1 0