June 2012 - Wine-commits - list.winehq.org

Piotr Caban : msvcp90: Define basic_streambuf structure globally.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 237cc9506f72c9e9d174f25875a7492023ff12e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=237cc9506f72c9e9d174f2587… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 21 12:25:44 2012 +0200 msvcp90: Define basic_streambuf structure globally. --- dlls/msvcp90/ios.c | 36 ------------------------------------ dlls/msvcp90/locale.c | 4 ++-- dlls/msvcp90/msvcp90.h | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 38 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 9062760..5bfc4e6 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -50,42 +50,6 @@ typedef struct { streamsize arg; } manip_streamsize; -typedef struct { - const vtable_ptr *vtable; - mutex lock; - char *rbuf; - char *wbuf; - char **prbuf; - char **pwbuf; - char *rpos; - char *wpos; - char **prpos; - char **pwpos; - int rsize; - int wsize; - int *prsize; - int *pwsize; - locale *loc; -} basic_streambuf_char; - -typedef struct { - const vtable_ptr *vtable; - mutex lock; - wchar_t *rbuf; - wchar_t *wbuf; - wchar_t **prbuf; - wchar_t **pwbuf; - wchar_t *rpos; - wchar_t *wpos; - wchar_t **prpos; - wchar_t **pwpos; - int rsize; - int wsize; - int *prsize; - int *pwsize; - locale *loc; -} basic_streambuf_wchar; - typedef enum { INITFL_new = 0, INITFL_open = 1, diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index ca26378..94b3384 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -104,14 +104,14 @@ typedef struct { typedef struct _istreambuf_iterator_char { - struct _basic_streambuf_char *strbuf; + basic_streambuf_char *strbuf; MSVCP_bool got; char val; } istreambuf_iterator_char; typedef struct _istreambuf_iterator_wchar { - struct _basic_streambuf_wchar *strbuf; + basic_streambuf_wchar *strbuf; MSVCP_bool got; wchar_t val; } istreambuf_iterator_wchar; diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 2dde330..e6cffc7 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -484,5 +484,43 @@ typedef struct _ios_base { locale *loc; } ios_base; +/* class basic_streambuf<char> */ +typedef struct { + const vtable_ptr *vtable; + mutex lock; + char *rbuf; + char *wbuf; + char **prbuf; + char **pwbuf; + char *rpos; + char *wpos; + char **prpos; + char **pwpos; + int rsize; + int wsize; + int *prsize; + int *pwsize; + locale *loc; +} basic_streambuf_char; + +/* class basic_streambuf<wchar> */ +typedef struct { + const vtable_ptr *vtable; + mutex lock; + wchar_t *rbuf; + wchar_t *wbuf; + wchar_t **prbuf; + wchar_t **pwbuf; + wchar_t *rpos; + wchar_t *wpos; + wchar_t **prpos; + wchar_t **pwpos; + int rsize; + int wsize; + int *prsize; + int *pwsize; + locale *loc; +} basic_streambuf_wchar; + void init_io(void); void free_io(void);

1 0

Piotr Caban : msvcp90: Added num_get<char> constructors implementation.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 47b7880dc309aa25880e2621d3c704c79980c639 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47b7880dc309aa25880e2621d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 21 12:26:02 2012 +0200 msvcp90: Added num_get<char> constructors implementation. --- dlls/msvcp90/locale.c | 48 ++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 38 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 94b3384..103b084 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -4412,7 +4412,8 @@ extern const vtable_ptr MSVCP_num_get_char_vtable; DEFINE_THISCALL_WRAPPER(num_get_char__Init, 8) void __thiscall num_get_char__Init(num_get *this, const _Locinfo *locinfo) { - FIXME("(%p %p) stub\n", this, locinfo); + TRACE("(%p %p)\n", this, locinfo); + _Locinfo__Getcvt(locinfo, &this->cvt); } /* ??0?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QAE(a)ABV_Locinfo@1(a)I@Z */ @@ -4421,8 +4422,13 @@ DEFINE_THISCALL_WRAPPER(num_get_char_ctor_locinfo, 12) num_get* __thiscall num_get_char_ctor_locinfo(num_get *this, _Locinfo *locinfo, MSVCP_size_t refs) { - FIXME("(%p %p %lu) stub\n", this, locinfo, refs); - return NULL; + TRACE("(%p %p %lu)\n", this, locinfo, refs); + + locale_facet_ctor_refs(&this->facet, refs); + this->facet.vtable = &MSVCP_num_get_char_vtable; + + num_get_char__Init(this, locinfo); + return this; } /* ??0?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QAE(a)I@Z */ @@ -4430,8 +4436,14 @@ num_get* __thiscall num_get_char_ctor_locinfo(num_get *this, DEFINE_THISCALL_WRAPPER(num_get_char_ctor_refs, 8) num_get* __thiscall num_get_char_ctor_refs(num_get *this, MSVCP_size_t refs) { - FIXME("(%p %lu) stub\n", this, refs); - return NULL; + _Locinfo locinfo; + + TRACE("(%p %lu)\n", this, refs); + + _Locinfo_ctor(&locinfo); + num_get_char_ctor_locinfo(this, &locinfo, refs); + _Locinfo_dtor(&locinfo); + return this; } /* ??_F?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QAEXXZ */ @@ -4439,8 +4451,7 @@ num_get* __thiscall num_get_char_ctor_refs(num_get *this, MSVCP_size_t refs) DEFINE_THISCALL_WRAPPER(num_get_char_ctor, 4) num_get* __thiscall num_get_char_ctor(num_get *this) { - FIXME("(%p) stub\n", this); - return NULL; + return num_get_char_ctor_refs(this, 0); } /* ??1?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MAE(a)XZ */ @@ -4448,7 +4459,8 @@ num_get* __thiscall num_get_char_ctor(num_get *this) DEFINE_THISCALL_WRAPPER(num_get_char_dtor, 4) void __thiscall num_get_char_dtor(num_get *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + locale_facet_dtor(&this->facet); } DEFINE_THISCALL_WRAPPER(MSVCP_num_get_char_vector_dtor, 8) @@ -4475,8 +4487,24 @@ num_get* __thiscall MSVCP_num_get_char_vector_dtor(num_get *this, unsigned int f /* ?_Getcat@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ MSVCP_size_t __cdecl num_get_char__Getcat(const locale_facet **facet, const locale *loc) { - FIXME("(%p %p) stub\n", facet, loc); - return -1; + TRACE("(%p %p)\n", facet, loc); + + if(facet && !*facet) { + _Locinfo locinfo; + + *facet = MSVCRT_operator_new(sizeof(num_get)); + 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)); + num_get_char_ctor_locinfo((num_get*)*facet, &locinfo, 0); + _Locinfo_dtor(&locinfo); + } + + return LC_NUMERIC; } /* ?_Getffld@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABAHPADAAV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)1ABVlocale@2@@Z */

1 0

Piotr Caban : msvcp90: Added num_get<char>::_Getffld implementation.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 1507d715cc606437c13d8d1a1b20525370cb38a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1507d715cc606437c13d8d1a1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 21 12:26:20 2012 +0200 msvcp90: Added num_get<char>::_Getffld implementation. --- dlls/msvcp90/locale.c | 199 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcp90/msvcp90.h | 3 + 2 files changed, 198 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 103b084..c051618 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -25,6 +25,7 @@ #include "errno.h" #include "limits.h" #include "math.h" +#include "stdio.h" #include "wine/list.h" @@ -126,6 +127,31 @@ static locale classic_locale; /* ?_Clocptr(a)_Locimp@locale(a)std@@0PEAV123(a)EA */ locale__Locimp *locale__Locimp__Clocptr = NULL; +static char istreambuf_iterator_char_val(istreambuf_iterator_char *this) +{ + if(this->strbuf && !this->got) { + int c = basic_streambuf_char_sgetc(this->strbuf); + if(c == EOF) + this->strbuf = NULL; + else + this->val = c; + } + + this->got = TRUE; + return this->val; +} + +static void istreambuf_iterator_char_inc(istreambuf_iterator_char *this) +{ + if(!this->strbuf || basic_streambuf_char_sbumpc(this->strbuf)==EOF) { + this->strbuf = NULL; + this->got = TRUE; + }else { + this->got = FALSE; + istreambuf_iterator_char_val(this); + } +} + /* ??1facet(a)locale@std@@UAE(a)XZ */ /* ??1facet(a)locale@std@@UEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(locale_facet_dtor, 4) @@ -3401,6 +3427,32 @@ MSVCP_size_t __cdecl numpunct_char__Getcat(const locale_facet **facet, const loc return LC_NUMERIC; } +numpunct_char* numpunct_char_use_facet(const locale *loc) +{ + static numpunct_char *obj = NULL; + + _Lockit lock; + const locale_facet *fac; + + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); + fac = locale__Getfacet(loc, numpunct_char_id.id); + if(fac) { + _Lockit_dtor(&lock); + return (numpunct_char*)fac; + } + + if(obj) + return obj; + + numpunct_char__Getcat(&fac, loc); + obj = (numpunct_char*)fac; + locale_facet__Incref(&obj->facet); + locale_facet_register(&obj->facet); + _Lockit_dtor(&lock); + + return obj; +} + /* ?do_decimal_point@?$numpunct(a)D@std@@MBEDXZ */ /* ?do_decimal_point@?$numpunct(a)D@std@@MEBADXZ */ DEFINE_THISCALL_WRAPPER(numpunct_char_do_decimal_point, 4) @@ -4509,11 +4561,150 @@ MSVCP_size_t __cdecl num_get_char__Getcat(const locale_facet **facet, const loca /* ?_Getffld@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABAHPADAAV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)1ABVlocale@2@@Z */ /* ?_Getffld@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@AEBAHPEADAEAV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)1AEBVlocale@2@@Z */ -int __cdecl num_get_char__Getffld(num_get *this, char *dest, istreambuf_iterator_char *first, - istreambuf_iterator_char *last, const locale *loc) +/* Copies number to dest buffer, validates grouping and skips separators. + * Updates first so it points past the number, all digits are skipped. + * Returns how exponent needs to changed. + * Size of dest buffer is not specified, assuming it's not smaller then 32: + * strlen(+0.e+) + 22(digits) + 4(expontent) + 1(nullbyte) + */ +int __cdecl num_get_char__Getffld(const num_get *this, char *dest, istreambuf_iterator_char *first, + istreambuf_iterator_char *last, const locale *loc) { - FIXME("(%p %p %p %p) stub\n", dest, first, last, loc); - return -1; + numpunct_char *numpunct = numpunct_char_use_facet(loc); + basic_string_char grouping_bstr; + int groups_no = 0, cur_group = 0, exp = 0; + char *dest_beg = dest, *num_end = dest+25, *exp_end = dest+31, *groups = NULL, sep; + const char *grouping; + BOOL error = TRUE, dest_empty = TRUE; + + TRACE("(%p %p %p %p)\n", dest, first, last, loc); + + numpunct_char_grouping(numpunct, &grouping_bstr); + grouping = MSVCP_basic_string_char_c_str(&grouping_bstr); + sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; + + istreambuf_iterator_char_val(first); + if(first->strbuf && (first->val=='-' || first->val=='+')) { + *dest++ = first->val; + istreambuf_iterator_char_inc(first); + } + + if(sep) { + groups_no = strlen(grouping)+2; + groups = calloc(groups_no, sizeof(char)); + } + + for(; first->strbuf; istreambuf_iterator_char_inc(first)) { + if(first->val<'0' || first->val>'9') { + if(sep && first->val==sep) { + if(cur_group == groups_no+1) { + if(groups[1] != groups[2]) { + error = TRUE; + break; + }else { + memmove(groups+1, groups+2, groups_no); + groups[cur_group] = 0; + } + }else { + cur_group++; + } + }else { + break; + } + }else { + error = FALSE; + if(dest_empty && first->val == '0') + continue; + dest_empty = FALSE; + if(dest < num_end) + *dest++ = first->val; + else + exp++; + if(sep && groups[cur_group]<CHAR_MAX) + groups[cur_group]++; + } + } + + if(cur_group && !groups[cur_group]) + error = TRUE; + else if(!cur_group) + cur_group--; + + for(; cur_group>=0 && !error; cur_group--) { + if(*grouping == CHAR_MAX) { + if(cur_group) + error = TRUE; + break; + }else if((cur_group && *grouping!=groups[cur_group]) + || (!cur_group && *grouping<groups[cur_group])) { + error = TRUE; + break; + }else if(grouping[1]) { + grouping++; + } + } + MSVCP_basic_string_char_dtor(&grouping_bstr); + free(groups); + + if(error) { + *dest_beg = '\0'; + return 0; + }else if(dest_empty) { + *dest++ = '0'; + } + + if(first->strbuf && first->val==numpunct_char_decimal_point(numpunct)) { + if(dest < num_end) + *dest++ = *localeconv()->decimal_point; + istreambuf_iterator_char_inc(first); + + if(dest_empty) { + for(; first->strbuf && first->val=='0'; istreambuf_iterator_char_inc(first)) + exp--; + + if(!first->strbuf || first->val<'1' || first->val>'9') + dest--; + } + } + + for(; first->strbuf; istreambuf_iterator_char_inc(first)) { + if(first->val<'0' || first->val>'9') + break; + else if(dest<num_end) + *dest++ = first->val; + else + exp--; + } + + if(first->strbuf && (first->val=='e' || first->val=='E')) { + *dest++ = first->val; + istreambuf_iterator_char_inc(first); + + if(first->strbuf && (first->val=='-' || first->val=='+')) { + *dest++ = first->val; + istreambuf_iterator_char_inc(first); + } + + error = dest_empty = TRUE; + for(; first->strbuf && first->val=='0'; istreambuf_iterator_char_inc(first)) + error = FALSE; + + for(; first->strbuf && first->val>='0' && first->val<='9'; istreambuf_iterator_char_inc(first)) { + error = dest_empty = FALSE; + if(dest<exp_end) + *dest++ = first->val; + } + + if(error) { + *dest_beg = '\0'; + return 0; + }else if(dest_empty) { + *dest++ = '0'; + } + } + + *dest++ = '\0'; + return exp; } /* ?_Getffldx@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABAHPADAAV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)1AAVios_base@2(a)PAH@Z */ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index e6cffc7..6ac7c08 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -503,6 +503,9 @@ typedef struct { locale *loc; } basic_streambuf_char; +int __thiscall basic_streambuf_char_sgetc(basic_streambuf_char*); +int __thiscall basic_streambuf_char_sbumpc(basic_streambuf_char*); + /* class basic_streambuf<wchar> */ typedef struct { const vtable_ptr *vtable;

1 0

Piotr Caban : msvcp90: Added num_get<char>::_Getifld implementation.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 98f6028c1e60d9e9c354d3de90f7b94d773d5ef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98f6028c1e60d9e9c354d3de9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 21 12:26:47 2012 +0200 msvcp90: Added num_get<char>::_Getifld implementation. --- dlls/msvcp90/locale.c | 120 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 116 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index c051618..914637a 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -4718,11 +4718,123 @@ int __cdecl num_get_char__Getffldx(num_get *this, char *dest, istreambuf_iterato /* ?_Getifld@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABAHPADAAV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)1HABVlocale@2@@Z */ /* ?_Getifld@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@AEBAHPEADAEAV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)1HAEBVlocale@2@@Z */ -int __cdecl num_get_char__Getifld(num_get *this, char *dest, istreambuf_iterator_char *first, - istreambuf_iterator_char *last, int fmtflags, const locale *loc) +/* Copies number to dest buffer, validates grouping and skips separators. + * Updates first so it points past the number, all digits are skipped. + * Returns number base (8, 10 or 16). + * Size of dest buffer is not specified, assuming it's not smaller then 25: + * 22(8^22>2^64)+1(detect overflows)+1(sign)+1(nullbyte) = 25 + */ +int __cdecl num_get_char__Getifld(const num_get *this, char *dest, istreambuf_iterator_char *first, + istreambuf_iterator_char *last, int fmtflags, const locale *loc) { - FIXME("(%p %p %p %04x %p) stub\n", dest, first, last, fmtflags, loc); - return -1; + static const char digits[] = "0123456789abcdefABCDEF"; + + numpunct_char *numpunct = numpunct_char_use_facet(loc); + basic_string_char grouping_bstr; + int basefield, base, groups_no = 0, cur_group = 0; + char *dest_beg = dest, *dest_end = dest+24, *groups = NULL, sep; + const char *grouping; + BOOL error = TRUE, dest_empty = TRUE; + + TRACE("(%p %p %p %04x %p)\n", dest, first, last, fmtflags, loc); + + numpunct_char_grouping(numpunct, &grouping_bstr); + grouping = MSVCP_basic_string_char_c_str(&grouping_bstr); + sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; + + basefield = fmtflags & FMTFLAG_basefield; + if(basefield == FMTFLAG_oct) + base = 8; + else if(basefield == FMTFLAG_hex) + base = 22; /* equal to the size of digits buffer */ + else if(!basefield) + base = 0; + else + base = 10; + + istreambuf_iterator_char_val(first); + if(first->strbuf && (first->val=='-' || first->val=='+')) { + *dest++ = first->val; + istreambuf_iterator_char_inc(first); + } + + if(!base && first->strbuf && first->val=='0') { + istreambuf_iterator_char_inc(first); + if(first->strbuf && (first->val=='x' || first->val=='X')) { + istreambuf_iterator_char_inc(first); + base = 22; + }else { + error = FALSE; + base = 8; + } + }else { + base = 10; + } + + if(sep) { + groups_no = strlen(grouping)+2; + groups = calloc(groups_no, sizeof(char)); + } + + for(; first->strbuf; istreambuf_iterator_char_inc(first)) { + if(!memchr(digits, first->val, base)) { + if(sep && first->val==sep) { + if(cur_group == groups_no+1) { + if(groups[1] != groups[2]) { + error = TRUE; + break; + }else { + memmove(groups+1, groups+2, groups_no); + groups[cur_group] = 0; + } + }else { + cur_group++; + } + }else { + break; + } + }else { + error = FALSE; + if(dest_empty && first->val == '0') + continue; + dest_empty = FALSE; + /* skip digits that can't be copied to dest buffer, other + * functions are responsible for detecting overflows */ + if(dest < dest_end) + *dest++ = first->val; + if(sep && groups[cur_group]<CHAR_MAX) + groups[cur_group]++; + } + } + + if(cur_group && !groups[cur_group]) + error = TRUE; + else if(!cur_group) + cur_group--; + + for(; cur_group>=0 && !error; cur_group--) { + if(*grouping == CHAR_MAX) { + if(cur_group) + error = TRUE; + break; + }else if((cur_group && *grouping!=groups[cur_group]) + || (!cur_group && *grouping<groups[cur_group])) { + error = TRUE; + break; + }else if(grouping[1]) { + grouping++; + } + } + MSVCP_basic_string_char_dtor(&grouping_bstr); + free(groups); + + if(error) + dest = dest_beg; + else if(dest_empty) + *dest++ = '0'; + *dest = '\0'; + + return (base==22 ? 16 : base); } /* ?_Hexdig@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABEHD000(a)Z */

1 0

Piotr Caban : msvcp90: Added num_get<char>::get functions implementation.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: ba0908d9b3bcd1df5d2304164ab3d1cbf10c8f69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba0908d9b3bcd1df5d2304164… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 21 12:27:06 2012 +0200 msvcp90: Added num_get<char>::get functions implementation. --- dlls/msvcp90/locale.c | 286 +++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 254 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ba0908d9b3bcd1df5d230…

1 0

Francois Gouget : xcopy: Use the CSTR_XXX macros instead of numeric literals.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: ec5e3a3b50ab4a128a12c49c4eea7aad0a80b840 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec5e3a3b50ab4a128a12c49c4… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 20 23:41:05 2012 +0200 xcopy: Use the CSTR_XXX macros instead of numeric literals. --- programs/xcopy/xcopy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 604c07a..cec0828 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -761,7 +761,7 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, case 'E': if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, &word[1], 8, - EXCLUDE, -1) == 2) { + EXCLUDE, -1) == CSTR_EQUAL) { if (XCOPY_ProcessExcludeList(&word[9])) { XCOPY_FailMessage(ERROR_INVALID_PARAMETER); goto out;

1 0

Francois Gouget : oleaut32: Use the CSTR_XXX macros instead of numeric literals.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 4d22dc440b57d8b3183e23eb4e29129c76631e6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d22dc440b57d8b3183e23eb4… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 20 23:41:13 2012 +0200 oleaut32: Use the CSTR_XXX macros instead of numeric literals. --- dlls/oleaut32/vartype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 9810d35..2d27f9d 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -7017,7 +7017,7 @@ HRESULT WINAPI VarBstrCmp(BSTR pbstrLeft, BSTR pbstrRight, LCID lcid, DWORD dwFl } hres = CompareStringW(lcid, dwFlags, pbstrLeft, lenLeft, - pbstrRight, lenRight) - 1; + pbstrRight, lenRight) - CSTR_LESS_THAN; TRACE("%d\n", hres); return hres; }

1 0

Julian Rüger : ntprint/tests: Fix some typos.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 132937a4e86dc349b6cc505f564e0685dcb8084b URL: http://source.winehq.org/git/wine.git/?a=commit;h=132937a4e86dc349b6cc505f5… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Jun 21 00:01:19 2012 +0200 ntprint/tests: Fix some typos. --- dlls/ntprint/tests/ntprint.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntprint/tests/ntprint.c b/dlls/ntprint/tests/ntprint.c index 7e1ab58..e0bc01e 100644 --- a/dlls/ntprint/tests/ntprint.c +++ b/dlls/ntprint/tests/ntprint.c @@ -71,7 +71,7 @@ static void test_PSetupCreateMonitorInfo(VOID) SetLastError(0xdeadbeef); mi = pPSetupCreateMonitorInfo(NULL, NULL, NULL); if (!mi && (GetLastError() == RPC_S_SERVER_UNAVAILABLE)) { - win_skip("The Service 'Spooler' is required for many test\n"); + win_skip("The service 'Spooler' is required for many tests\n"); return; } ok( mi != NULL, "got %p with %u (expected '!= NULL')\n", mi, GetLastError()); @@ -101,7 +101,7 @@ static void test_PSetupDestroyMonitorInfo(VOID) SetLastError(0xdeadbeef); mi = pPSetupCreateMonitorInfo(NULL, NULL, NULL); if (!mi && (GetLastError() == RPC_S_SERVER_UNAVAILABLE)) { - win_skip("The Service 'Spooler' is required for many test\n"); + win_skip("The service 'Spooler' is required for many tests\n"); return; } ok( mi != NULL, "got %p with %u (expected '!= NULL')\n", mi, GetLastError()); @@ -113,7 +113,7 @@ static void test_PSetupDestroyMonitorInfo(VOID) /* lasterror is returned */ trace("returned with %u\n", GetLastError()); - /* Try to destroy the handle twice crash with native ntprint.dll */ + /* Trying to destroy the handle twice crashes with native ntprint.dll */ if (0) { SetLastError(0xdeadbeef); pPSetupDestroyMonitorInfo(mi);

1 0

Thomas Faber : imagehlp: Do not pass NULL to WriteFile as lpNumberOfBytesWritten.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: fd181c4937634c59502e548d1d65008b7c937e5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd181c4937634c59502e548d1… Author: Thomas Faber <thfabba(a)gmx.de> Date: Wed Jun 20 23:48:44 2012 +0200 imagehlp: Do not pass NULL to WriteFile as lpNumberOfBytesWritten. --- dlls/imagehlp/integrity.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/imagehlp/integrity.c b/dlls/imagehlp/integrity.c index c6d490c..d86ec11 100644 --- a/dlls/imagehlp/integrity.c +++ b/dlls/imagehlp/integrity.c @@ -461,7 +461,7 @@ BOOL WINAPI ImageAddCertificate( char null[8]; ZeroMemory(null, 8); - WriteFile(FileHandle, null, 8 - (Certificate->dwLength % 8), NULL, NULL); + WriteFile(FileHandle, null, 8 - (Certificate->dwLength % 8), &count, NULL); size += 8 - (Certificate->dwLength % 8); }

1 0

Dmitry Timoshkov : gdiplus: Make some data const.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 450e09c8c69942ed0c7baad4b958c3e07dbdab4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=450e09c8c69942ed0c7baad4b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 21 13:30:57 2012 +0900 gdiplus: Make some data const. --- dlls/gdiplus/image.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 52b3750..351160b 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2462,7 +2462,7 @@ struct image_format_dimension const GUID *dimension; }; -static struct image_format_dimension image_format_dimensions[] = +static const struct image_format_dimension image_format_dimensions[] = { {&ImageFormatGIF, &FrameDimensionTime}, {&ImageFormatIcon, &FrameDimensionResolution}, @@ -2563,7 +2563,7 @@ GpStatus WINGDIPAPI GdipLoadImageFromFileICM(GDIPCONST WCHAR* filename,GpImage * return GdipLoadImageFromFile(filename, image); } -static const WICPixelFormatGUID *wic_pixel_formats[] = { +static const WICPixelFormatGUID * const wic_pixel_formats[] = { &GUID_WICPixelFormat16bppBGR555, &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat32bppBGR,

1 0