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

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

25 Jun '12

Module: wine Branch: master Commit: 0dd32496b40a6ca467b8f7c733c61acb9177fab2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dd32496b40a6ca467b8f7c73… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 25 15:49:15 2012 +0200 msvcp90: Added num_get<wchar>::_Getifld implementation. --- dlls/msvcp90/locale.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 130 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 6b72c65..e9b931a 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -4439,22 +4439,146 @@ int __cdecl num_get_wchar__Getffldx(num_get *this, char *dest, istreambuf_iterat return -1; } +static int num_get__Getifld(const num_get *this, char *dest, istreambuf_iterator_wchar *first, + istreambuf_iterator_wchar *last, int fmtflags, const locale *loc, numpunct_wchar *numpunct) +{ + wchar_t digits[23], *digits_pos, sep; + basic_string_char grouping_bstr; + int i, basefield, base, groups_no = 0, cur_group = 0; + char *dest_beg = dest, *dest_end = dest+24, *groups = NULL; + const char *grouping; + BOOL error = TRUE, dest_empty = TRUE; + + TRACE("(%p %p %p %04x %p)\n", dest, first, last, fmtflags, loc); + + for(i=0; i<10; i++) + digits[i] = mb_to_wc('0'+i, &this->cvt); + for(i=0; i<6; i++) { + digits[10+i] = mb_to_wc('a'+i, &this->cvt); + digits[16+i] = mb_to_wc('A'+i, &this->cvt); + } + + numpunct_wchar_grouping(numpunct, &grouping_bstr); + grouping = MSVCP_basic_string_char_c_str(&grouping_bstr); + sep = grouping[0] ? numpunct_wchar_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_wchar_val(first); + if(first->strbuf && first->val==mb_to_wc('-', &this->cvt)) { + *dest++ = '-'; + istreambuf_iterator_wchar_inc(first); + }else if(first->strbuf && first->val==mb_to_wc('+', &this->cvt)) { + *dest++ = '+'; + istreambuf_iterator_wchar_inc(first); + } + + if(!base && first->strbuf && first->val==digits[0]) { + istreambuf_iterator_wchar_inc(first); + if(first->strbuf && (first->val==mb_to_wc('x', &this->cvt) || first->val==mb_to_wc('x', &this->cvt))) { + istreambuf_iterator_wchar_inc(first); + base = 22; + }else { + error = FALSE; + base = 8; + } + }else { + base = 10; + } + digits[base] = 0; + + if(sep) { + groups_no = strlen(grouping)+2; + groups = calloc(groups_no, sizeof(char)); + } + + for(; first->strbuf; istreambuf_iterator_wchar_inc(first)) { + if(!(digits_pos = wcschr(digits, first->val))) { + 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 == digits[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++ = (digits_pos-digits<10 ? '0'+digits_pos-digits : + (digits_pos-digits<16 ? 'a'+digits_pos-digits-10 : + 'A'+digits_pos-digits-16)); + 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); +} + /* ?_Getifld@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@ABAHPADAAV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)1HABVlocale@2@@Z */ /* ?_Getifld@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBAHPEADAEAV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)1HAEBVlocale@2@@Z */ -int __cdecl num_get_wchar__Getifld(num_get *this, char *dest, istreambuf_iterator_wchar *first, +int __cdecl num_get_wchar__Getifld(const num_get *this, char *dest, istreambuf_iterator_wchar *first, istreambuf_iterator_wchar *last, int fmtflags, const locale *loc) { - FIXME("(%p %p %p %04x %p) stub\n", dest, first, last, fmtflags, loc); - return -1; + return num_get__Getifld(this, dest, first, last, + fmtflags, loc, numpunct_wchar_use_facet(loc)); } /* ?_Getifld@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@ABAHPADAAV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)1HABVlocale@2@@Z */ /* ?_Getifld@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@AEBAHPEADAEAV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)1HAEBVlocale@2@@Z */ -int __cdecl num_get_short__Getifld(num_get *this, char *dest, istreambuf_iterator_wchar *first, +int __cdecl num_get_short__Getifld(const num_get *this, char *dest, istreambuf_iterator_wchar *first, istreambuf_iterator_wchar *last, int fmtflags, const locale *loc) { - FIXME("(%p %p %p %04x %p) stub\n", dest, first, last, fmtflags, loc); - return -1; + return num_get__Getifld(this, dest, first, last, + fmtflags, loc, numpunct_short_use_facet(loc)); } /* ?_Hexdig@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@ABEH_W000(a)Z */

1 0

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

25 Jun '12

Module: wine Branch: master Commit: d7bb597c0a7bb19f8258e2092f377c661afa69f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7bb597c0a7bb19f8258e2092… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 25 15:49:35 2012 +0200 msvcp90: Added num_get<wchar>::get functions implementation. --- dlls/msvcp90/locale.c | 335 +++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 298 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d7bb597c0a7bb19f8258e…

1 0

Piotr Caban : msvcp90: Added basic_ostream<wchar> implementation.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 6902b5112846981b5eba96798b1c2da5ee553f2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6902b5112846981b5eba96798… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 25 15:49:53 2012 +0200 msvcp90: Added basic_ostream<wchar> implementation. --- dlls/msvcp90/ios.c | 636 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 18 ++ dlls/msvcp90/msvcp90.spec | 136 +++++----- 3 files changed, 722 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6902b5112846981b5eba9…

1 0

Piotr Caban : msvcp90: Export clog object.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 96416c69ef18a4f563ffe64db9c27afa6a4047ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=96416c69ef18a4f563ffe64db… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 25 15:50:13 2012 +0200 msvcp90: Export clog object. --- dlls/msvcp90/ios.c | 16 ++++++++++++++++ dlls/msvcp90/msvcp90.spec | 6 +++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 3a3350f..e140d84 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -6475,6 +6475,16 @@ struct { /* ?_Ptr_cerr(a)std@@3PEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)EA */ basic_ostream_char *_Ptr_cerr = &cerr.obj; +static basic_filebuf_char filebuf_log; +/* ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A */ +struct { + basic_ostream_char obj; + basic_ios_char vbase; +} clog = { { 0 } }; +/* ?_Ptr_clog(a)std@@3PAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A */ +/* ?_Ptr_clog(a)std@@3PEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)EA */ +basic_ostream_char *_Ptr_clog = &clog.obj; + void init_io(void) { basic_filebuf_char_ctor_file(&filebuf_stdin, stdin); @@ -6485,6 +6495,9 @@ void init_io(void) basic_filebuf_char_ctor_file(&filebuf_stderr, stderr); basic_ostream_char_ctor(&cerr.obj, &filebuf_stderr.base, FALSE/*FIXME*/, TRUE); + + basic_filebuf_char_ctor_file(&filebuf_log, stderr); + basic_ostream_char_ctor(&clog.obj, &filebuf_log.base, FALSE/*FIXME*/, TRUE); } void free_io(void) @@ -6497,4 +6510,7 @@ void free_io(void) basic_ostream_char_dtor(&cerr.obj); basic_filebuf_char_dtor(&filebuf_stderr); + + basic_ostream_char_dtor(&clog.obj); + basic_filebuf_char_dtor(&filebuf_log); } diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 60540bc..e2d31d7 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2698,8 +2698,8 @@ @ extern -arch=win64 ?_Ptr_cerr(a)std@@3PEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)EA _Ptr_cerr @ extern -arch=win32 ?_Ptr_cin(a)std@@3PAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)A _Ptr_cin @ extern -arch=win64 ?_Ptr_cin(a)std@@3PEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)EA _Ptr_cin -# extern -arch=win32 ?_Ptr_clog(a)std@@3PAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A -# extern -arch=win64 ?_Ptr_clog(a)std@@3PEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)EA +@ extern -arch=win32 ?_Ptr_clog(a)std@@3PAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A _Ptr_clog +@ extern -arch=win64 ?_Ptr_clog(a)std@@3PEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)EA _Ptr_clog @ extern -arch=win32 ?_Ptr_cout(a)std@@3PAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A _Ptr_cout @ extern -arch=win64 ?_Ptr_cout(a)std@@3PEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)EA _Ptr_cout # extern -arch=win32 ?_Ptr_wcerr(a)std@@3PAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)A @@ -3083,7 +3083,7 @@ @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXH_N(a)Z(ptr long long) ios_base_clear_reraise @ thiscall -arch=win32 ?clear(a)ios_base@std@@QAEXI(a)Z(ptr long) ios_base_clear_unsigned @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXI(a)Z(ptr long) ios_base_clear_unsigned -# extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A +@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A clog @ thiscall -arch=win32 ?close@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEPAV12(a)XZ(ptr) basic_filebuf_char_close @ cdecl -arch=win64 ?close@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAPEAV12(a)XZ(ptr) basic_filebuf_char_close @ stub -arch=win32 ?close@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QAEPAV12(a)XZ

1 0

Nikolay Sivov : msxml3: Recognise PROPFIND method in open().
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: d7a21dedbb15633fafd265babcc6698a3d87f5b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7a21dedbb15633fafd265bab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 23 17:06:04 2012 +0400 msxml3: Recognise PROPFIND method in open(). --- dlls/msxml3/httprequest.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index ea5fb14..4ce5a77 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -759,6 +759,7 @@ static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url, static const WCHAR MethodPutW[] = {'P','U','T',0}; static const WCHAR MethodPostW[] = {'P','O','S','T',0}; static const WCHAR MethodDeleteW[] = {'D','E','L','E','T','E',0}; + static const WCHAR MethodPropFindW[] = {'P','R','O','P','F','I','N','D',0}; VARIANT str, is_async; HRESULT hr; @@ -782,7 +783,8 @@ static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url, { This->verb = BINDVERB_POST; } - else if (!strcmpiW(method, MethodDeleteW)) + else if (!strcmpiW(method, MethodDeleteW) || + !strcmpiW(method, MethodPropFindW)) { This->verb = BINDVERB_CUSTOM; SysReAllocString(&This->custom, method);

1 0

Nikolay Sivov : msxml3: Fix async flag setting.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 76dc17b496929a003cf03bb6c48a0f5eac4c4efa URL: http://source.winehq.org/git/wine.git/?a=commit;h=76dc17b496929a003cf03bb6c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 23 19:44:04 2012 +0400 msxml3: Fix async flag setting. --- dlls/msxml3/httprequest.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 4ce5a77..3ea7745 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -815,7 +815,7 @@ static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url, VariantInit(&is_async); hr = VariantChangeType(&is_async, &async, 0, VT_BOOL); - This->async = hr == S_OK && V_BOOL(&is_async) == VARIANT_TRUE; + This->async = hr == S_OK && V_BOOL(&is_async); VariantInit(&str); hr = VariantChangeType(&str, &user, 0, VT_BSTR);

1 0

Nikolay Sivov : msxml3: Accept VT_ERROR body as empty data.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 3ec82583d0ca47f77fe7651cef89892beea59bd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ec82583d0ca47f77fe7651ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 24 00:16:39 2012 +0400 msxml3: Accept VT_ERROR body as empty data. --- dlls/msxml3/httprequest.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 3ea7745..5700311 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -695,6 +695,7 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * break; } case VT_EMPTY: + case VT_ERROR: ptr = NULL; size = 0; break;

1 0

Nikolay Sivov : msxml3: Support VT_I2 variants tracing.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: fd5e384979cef576ecf9173f2a8e22c4dddc4d3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd5e384979cef576ecf9173f2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 23 17:08:27 2012 +0400 msxml3: Support VT_I2 variants tracing. --- dlls/msxml3/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index bfb301e..48d007f 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -268,6 +268,8 @@ const char *debugstr_variant(const VARIANT *v) return "{VT_EMPTY}"; case VT_NULL: return "{VT_NULL}"; + case VT_I2: + return wine_dbg_sprintf("{VT_I2: %d}", V_I2(v)); case VT_I4: return wine_dbg_sprintf("{VT_I4: %d}", V_I4(v)); case VT_R8:

1 0

Jacek Caban : jscript: Don' t use DISPPARAMS named args for internal parameter passing.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 0307d7356982230841612002b39d240adc8cf0ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=0307d7356982230841612002b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 25 14:07:48 2012 +0200 jscript: Don't use DISPPARAMS named args for internal parameter passing. --- dlls/jscript/dispex.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 37dc9de..c52ac7d 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -358,7 +358,8 @@ static HRESULT convert_params(const DISPPARAMS *dp, VARIANT *buf, DISPPARAMS *re VARIANT *d; unsigned i; - *ret = *dp; + ret->cArgs = dp->cArgs - dp->cNamedArgs; + ret->cNamedArgs = 0; for(i = 0; i < ret->cArgs && !need_conversion; i++) { switch(V_VT(get_arg(dp, i))) { @@ -369,8 +370,10 @@ static HRESULT convert_params(const DISPPARAMS *dp, VARIANT *buf, DISPPARAMS *re } } - if(!need_conversion) + if(!need_conversion) { + ret->rgvarg = dp->rgvarg + dp->cNamedArgs; return S_OK; + } if(ret->cArgs > 6) { ret->rgvarg = heap_alloc(ret->cArgs * sizeof(VARIANT));

1 0

Jacek Caban : jscript: Don't use DISPPARAMS for internal arguments.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: f8383c3417e0bc4addc8427f0acff32b5344455b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8383c3417e0bc4addc8427f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 25 14:08:38 2012 +0200 jscript: Don't use DISPPARAMS for internal arguments. --- dlls/jscript/activex.c | 8 +- dlls/jscript/array.c | 107 +++++++++---------- dlls/jscript/bool.c | 12 +- dlls/jscript/date.c | 277 +++++++++++++++++++++++------------------------ dlls/jscript/dispex.c | 224 ++++++++++++++++++-------------------- dlls/jscript/engine.c | 47 ++------ dlls/jscript/error.c | 48 ++++---- dlls/jscript/function.c | 154 ++++++++++---------------- dlls/jscript/global.c | 168 ++++++++++++++--------------- dlls/jscript/jscript.h | 16 ++-- dlls/jscript/jsutils.c | 5 +- dlls/jscript/math.c | 116 ++++++++++---------- dlls/jscript/number.c | 40 ++++---- dlls/jscript/object.c | 32 +++--- dlls/jscript/regexp.c | 49 ++++----- dlls/jscript/string.c | 244 ++++++++++++++++++++---------------------- dlls/jscript/vbarray.c | 42 ++++---- 17 files changed, 744 insertions(+), 845 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f8383c3417e0bc4addc84…

1 0