wine-commits June 2012

wine-commits@winehq.org

3 participants
827 discussions

Damjan Jovanovic : winebuild: Support the mingw32 target without an i[3456] 86- prefix.
by Alexandre Julliard 15 Jun '12

15 Jun '12

Module: wine Branch: master Commit: 4768b11c2454168bba62d710f5c66e466620aa66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4768b11c2454168bba62d710f… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jun 14 20:34:47 2012 +0200 winebuild: Support the mingw32 target without an i[3456]86- prefix. --- tools/winebuild/main.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 0eeeb04..28ecec8 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -191,12 +191,21 @@ static void set_target( const char *target ) /* get the CPU part */ - if (!(p = strchr( spec, '-' ))) fatal_error( "Invalid target specification '%s'\n", target ); - *p++ = 0; - if ((target_cpu = get_cpu_from_name( spec )) == -1) - fatal_error( "Unrecognized CPU '%s'\n", spec ); - platform = p; - if ((p = strrchr( p, '-' ))) platform = p + 1; + if ((p = strchr( spec, '-' ))) + { + *p++ = 0; + if ((target_cpu = get_cpu_from_name( spec )) == -1) + fatal_error( "Unrecognized CPU '%s'\n", spec ); + platform = p; + if ((p = strrchr( p, '-' ))) platform = p + 1; + } + else if (!strcmp( spec, "mingw32" )) + { + target_cpu = CPU_x86; + platform = spec; + } + else + fatal_error( "Invalid target specification '%s'\n", target ); /* get the OS part */

1 0

Damjan Jovanovic : configure: Detect mingw32 better on FreeBSD.
by Alexandre Julliard 15 Jun '12

15 Jun '12

Module: wine Branch: master Commit: 009ad8a4757672fa269752070407b1ae609930be URL: http://source.winehq.org/git/wine.git/?a=commit;h=009ad8a4757672fa269752070… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jun 14 08:20:58 2012 +0200 configure: Detect mingw32 better on FreeBSD. --- aclocal.m4 | 3 ++- configure | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index e7767ad..0062982 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -126,7 +126,8 @@ AC_DEFUN([WINE_CHECK_MINGW_PROG], [case "$host_cpu" in i[[3456789]]86*) ac_prefix_list="m4_foreach([ac_wine_prefix],[w64-mingw32, pc-mingw32, mingw32msvc, mingw32], - m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-ac_wine_prefix-$2 ]))" ;; + m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-ac_wine_prefix-$2 ])) + mingw32-$2" ;; x86_64) ac_prefix_list="m4_foreach([ac_wine_prefix],[pc-mingw32, w64-mingw32, mingw32msvc], m4_foreach([ac_wine_cpu],[x86_64,amd64],[ac_wine_cpu-ac_wine_prefix-$2 ]))" ;; diff --git a/configure b/configure index e5ccfa8..81d7390 100755 --- a/configure +++ b/configure @@ -7127,7 +7127,8 @@ if test "$cross_compiling" = "no" -a "x$enable_tests" != xno -a "$LIBEXT" != "dl then case "$host_cpu" in i[3456789]86*) - ac_prefix_list="i686-w64-mingw32-gcc i586-w64-mingw32-gcc i486-w64-mingw32-gcc i386-w64-mingw32-gcc i686-pc-mingw32-gcc i586-pc-mingw32-gcc i486-pc-mingw32-gcc i386-pc-mingw32-gcc i686-mingw32msvc-gcc i586-mingw32msvc-gcc i486-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc " ;; + ac_prefix_list="i686-w64-mingw32-gcc i586-w64-mingw32-gcc i486-w64-mingw32-gcc i386-w64-mingw32-gcc i686-pc-mingw32-gcc i586-pc-mingw32-gcc i486-pc-mingw32-gcc i386-pc-mingw32-gcc i686-mingw32msvc-gcc i586-mingw32msvc-gcc i486-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc + mingw32-gcc" ;; x86_64) ac_prefix_list="x86_64-pc-mingw32-gcc amd64-pc-mingw32-gcc x86_64-w64-mingw32-gcc amd64-w64-mingw32-gcc x86_64-mingw32msvc-gcc amd64-mingw32msvc-gcc " ;; *)

1 0

Thomas Faber : wininet: Correctly fail INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT if libssl is not available .
by Alexandre Julliard 15 Jun '12

15 Jun '12

Module: wine Branch: master Commit: 0b60b8f35aae94b5ec9a595b113a0db638ed05fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b60b8f35aae94b5ec9a595b1… Author: Thomas Faber <thfabba(a)gmx.de> Date: Fri Jun 15 11:38:24 2012 +0200 wininet: Correctly fail INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT if libssl is not available. --- dlls/wininet/http.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 0cec4fb..0a3b8fe 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2150,6 +2150,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe CertFreeCertificateContext(context); return ERROR_SUCCESS; } + return ERROR_NOT_SUPPORTED; } case INTERNET_OPTION_CONNECT_TIMEOUT: if (*size < sizeof(DWORD))

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard 15 Jun '12

15 Jun '12

Module: wine Branch: master Commit: ca86ffb17be899e5092cbb3f5dfd19f7ff2b4668 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca86ffb17be899e5092cbb3f5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 15 11:09:33 2012 +0200 msvcp: Sync spec files. --- dlls/msvcp100/msvcp100.spec | 34 +++++++++++++++++----------------- dlls/msvcp70/msvcp70.spec | 38 +++++++++++++++++++------------------- dlls/msvcp71/msvcp71.spec | 42 +++++++++++++++++++++--------------------- dlls/msvcp80/msvcp80.spec | 42 +++++++++++++++++++++--------------------- 4 files changed, 78 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca86ffb17be899e5092cb…

1 0

Piotr Caban : msvcp90: Added basic_ios::widen implementation.
by Alexandre Julliard 15 Jun '12

15 Jun '12

Module: wine Branch: master Commit: 24f9290cd6bacac5575084760225575284a08dc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24f9290cd6bacac5575084760… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 15 11:09:15 2012 +0200 msvcp90: Added basic_ios::widen implementation. --- dlls/msvcp90/ios.c | 8 ++++---- dlls/msvcp90/msvcp90.h | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index c69b5c5..2b43123 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -3259,8 +3259,8 @@ basic_ostream_char* __thiscall basic_ios_char_tie_get(const basic_ios_char *this DEFINE_THISCALL_WRAPPER(basic_ios_char_widen, 8) char __thiscall basic_ios_char_widen(basic_ios_char *this, char ch) { - FIXME("(%p %c) stub\n", this, ch); - return 0; + TRACE("(%p %c)\n", this, ch); + return ctype_char_widen_ch(ctype_char_use_facet(this->strbuf->loc), ch); } @@ -3539,8 +3539,8 @@ basic_ostream_wchar* __thiscall basic_ios_wchar_tie_get(const basic_ios_wchar *t DEFINE_THISCALL_WRAPPER(basic_ios_wchar_widen, 8) wchar_t __thiscall basic_ios_wchar_widen(basic_ios_wchar *this, char ch) { - FIXME("(%p %c)\n", this, ch); - return 0; + TRACE("(%p %c)\n", this, ch); + return ctype_wchar_widen_ch(ctype_wchar_use_facet(this->strbuf->loc), ch); } /* Caution: basic_ostream uses virtual inheritance. diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 8550ad8..36c4034 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -332,6 +332,7 @@ typedef struct { MSVCP_bool __thiscall ctype_char_is_ch(const ctype_char*, short, char); char __thiscall ctype_char_narrow_ch(const ctype_char*, char, char); +char __thiscall ctype_char_widen_ch(const ctype_char*, char); typedef struct { LCID handle; @@ -346,6 +347,7 @@ typedef struct { } ctype_wchar; char __thiscall ctype_wchar_narrow_ch(const ctype_wchar*, wchar_t, char); +wchar_t __thiscall ctype_wchar_widen_ch(const ctype_wchar*, char); /* class locale */ typedef struct

1 0

Piotr Caban : msvcp90: Added basic_ios::narrow implementation.
by Alexandre Julliard 15 Jun '12

15 Jun '12

Module: wine Branch: master Commit: 65a364a2f30b9fb16949008f325a03381eaf4d15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65a364a2f30b9fb16949008f3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 15 11:09:04 2012 +0200 msvcp90: Added basic_ios::narrow implementation. --- dlls/msvcp90/ios.c | 8 ++++---- dlls/msvcp90/locale.c | 37 ++++++++++++++++++++++++++----------- dlls/msvcp90/msvcp90.h | 16 ++++++++++++++++ 3 files changed, 46 insertions(+), 15 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 6a628dd..c69b5c5 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -3186,8 +3186,8 @@ locale *__thiscall basic_ios_char_imbue(basic_ios_char *this, locale *ret, const DEFINE_THISCALL_WRAPPER(basic_ios_char_narrow, 12) char __thiscall basic_ios_char_narrow(basic_ios_char *this, char ch, char def) { - FIXME("(%p %c %c) stub\n", this, ch, def); - return def; + TRACE("(%p %c %c)\n", this, ch, def); + return ctype_char_narrow_ch(ctype_char_use_facet(this->strbuf->loc), ch, def); } /* ?rdbuf@?$basic_ios@DU?$char_traits@D@std@@@std@@QAEPAV?$basic_streambuf@DU?$char_traits@D@std@@@2@PAV32@@Z */ @@ -3452,8 +3452,8 @@ locale *__thiscall basic_ios_wchar_imbue(basic_ios_wchar *this, locale *ret, con DEFINE_THISCALL_WRAPPER(basic_ios_wchar_narrow, 12) char __thiscall basic_ios_wchar_narrow(basic_ios_wchar *this, wchar_t ch, char def) { - FIXME("(%p %c %c) stub\n", this, ch, def); - return def; + TRACE("(%p %c %c)\n", this, ch, def); + return ctype_wchar_narrow_ch(ctype_wchar_use_facet(this->strbuf->loc), ch, def); } /* ?rdbuf@?$basic_ios@_WU?$char_traits@_W@std@@@std@@QAEPAV?$basic_streambuf@_WU?$char_traits@_W@std@@@2@PAV32@@Z */ diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 304c510..57eac2b 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -74,22 +74,11 @@ typedef struct { } _Collvec; typedef struct { - LCID handle; - unsigned page; -} _Cvtvec; - -typedef struct { locale_facet facet; _Collvec coll; } collate; typedef struct { - ctype_base base; - _Ctypevec ctype; - _Cvtvec cvt; -} ctype_wchar; - -typedef struct { locale_facet facet; const char *grouping; char dp; @@ -2235,6 +2224,32 @@ wchar_t __cdecl _Towlower(wchar_t ch, const _Ctypevec *ctype) return tolowerW(ch); } +ctype_wchar* ctype_wchar_use_facet(const locale *loc) +{ + static ctype_wchar *obj = NULL; + + _Lockit lock; + const locale_facet *fac; + + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); + fac = locale__Getfacet(loc, ctype_wchar_id.id); + if(fac) { + _Lockit_dtor(&lock); + return (ctype_wchar*)fac; + } + + if(obj) + return obj; + + ctype_wchar__Getcat(&fac, loc); + obj = (ctype_wchar*)fac; + locale_facet__Incref(&obj->base.facet); + locale_facet_register(&obj->base.facet); + _Lockit_dtor(&lock); + + return obj; +} + /* ?do_tolower@?$ctype@_W@std@@MBE_W_W@Z */ /* ?do_tolower@?$ctype@_W@std@@MEBA_W_W@Z */ /* ?do_tolower@?$ctype@G@std@@MBEGG@Z */ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 45adcc9..8550ad8 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -331,6 +331,21 @@ typedef struct { } ctype_char; MSVCP_bool __thiscall ctype_char_is_ch(const ctype_char*, short, char); +char __thiscall ctype_char_narrow_ch(const ctype_char*, char, char); + +typedef struct { + LCID handle; + unsigned page; +} _Cvtvec; + +/* class ctype<wchar> */ +typedef struct { + ctype_base base; + _Ctypevec ctype; + _Cvtvec cvt; +} ctype_wchar; + +char __thiscall ctype_wchar_narrow_ch(const ctype_wchar*, wchar_t, char); /* class locale */ typedef struct @@ -345,6 +360,7 @@ void __thiscall locale_dtor(locale*); void free_locale(void); codecvt_char* codecvt_char_use_facet(const locale*); ctype_char* ctype_char_use_facet(const locale*); +ctype_wchar* ctype_wchar_use_facet(const locale*); /* class _Lockit */ typedef struct {

1 0

Piotr Caban : msvcp90: Added setw implementation.
by Alexandre Julliard 15 Jun '12

15 Jun '12

Module: wine Branch: master Commit: 609d7dbb68dd98debeb235e4c8fe1bffd8f34cc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=609d7dbb68dd98debeb235e4c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 15 11:08:47 2012 +0200 msvcp90: Added setw implementation. --- dlls/msvcp90/ios.c | 16 ++++++++++++++++ dlls/msvcp90/msvcp90.spec | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 2c47137..6a628dd 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -5562,6 +5562,22 @@ manip_streamsize* __cdecl setprecision(manip_streamsize *ret, streamsize prec) return ret; } +static void __cdecl setw_func(ios_base *base, streamsize width) +{ + ios_base_width_set(base, width); +} + +/* ?setw@std@@YA?AU?$_Smanip@H@1@H@Z */ +/* ?setw@std@@YA?AU?$_Smanip@_J@1@_J@Z */ +manip_streamsize* __cdecl setw(manip_streamsize *ret, streamsize width) +{ + TRACE("(%p %ld)\n", ret, width); + + ret->pfunc = setw_func; + ret->arg = width; + return ret; +} + static basic_filebuf_char filebuf_stdin; /* ?cin@std@@3V?$basic_istream@DU?$char_traits@D@std@@@1@A */ struct { diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index fccc07d..baa349e 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5368,8 +5368,8 @@ @ cdecl -arch=win64 ?setstate@ios_base@std@@QEAAXH_N@Z(ptr long long) ios_base_setstate_reraise @ thiscall -arch=win32 ?setstate@ios_base@std@@QAEXI@Z(ptr long) ios_base_setstate_unsigned @ cdecl -arch=win64 ?setstate@ios_base@std@@QEAAXI@Z(ptr long) ios_base_setstate_unsigned -@ stub -arch=win32 ?setw@std@@YA?AU?$_Smanip@H@1@H@Z -@ stub -arch=win64 ?setw@std@@YA?AU?$_Smanip@_J@1@_J@Z +@ cdecl -arch=win32 ?setw@std@@YA?AU?$_Smanip@H@1@H@Z(ptr long) setw +@ cdecl -arch=win64 ?setw@std@@YA?AU?$_Smanip@_J@1@_J@Z(ptr long) setw @ thiscall -arch=win32 ?sgetc@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QAEHXZ(ptr) basic_streambuf_char_sgetc @ cdecl -arch=win64 ?sgetc@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QEAAHXZ(ptr) basic_streambuf_char_sgetc @ thiscall -arch=win32 ?sgetc@?$basic_streambuf@GU?$char_traits@G@std@@@std@@QAEGXZ(ptr) basic_streambuf_wchar_sgetc

1 0

Piotr Caban : msvcp90: Added setprecision implementation.
by Alexandre Julliard 15 Jun '12

15 Jun '12

Module: wine Branch: master Commit: 7fcffc7b5834d15cb83d7744a38c7ead7effb781 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fcffc7b5834d15cb83d7744a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 15 11:08:31 2012 +0200 msvcp90: Added setprecision implementation. --- dlls/msvcp90/ios.c | 21 +++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 4 ++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 5232ecf..2c47137 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -132,6 +132,11 @@ static inline const char* debugstr_fpos_int(fpos_int *fpos) } typedef struct { + void (__cdecl *pfunc)(ios_base*, streamsize); + streamsize arg; +} manip_streamsize; + +typedef struct { const vtable_ptr *vtable; mutex lock; char *rbuf; @@ -5541,6 +5546,22 @@ basic_filebuf_char* __thiscall basic_fstream_char_rdbuf(const basic_fstream_char return (basic_filebuf_char*)&this->filebuf; } +static void __cdecl setprecision_func(ios_base *base, streamsize prec) +{ + ios_base_precision_set(base, prec); +} + +/* ?setprecision@std@@YA?AU?$_Smanip@H@1@H@Z */ +/* ?setprecision@std@@YA?AU?$_Smanip@_J@1@_J@Z */ +manip_streamsize* __cdecl setprecision(manip_streamsize *ret, streamsize prec) +{ + TRACE("(%p %ld)\n", ret, prec); + + ret->pfunc = setprecision_func; + ret->arg = prec; + return ret; +} + static basic_filebuf_char filebuf_stdin; /* ?cin@std@@3V?$basic_istream@DU?$char_traits@D@std@@@1@A */ struct { diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index fb873b5..fccc07d 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5348,8 +5348,8 @@ @ cdecl -arch=win64 ?setp@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@IEAAXPEA_W00@Z(ptr ptr ptr ptr) basic_streambuf_wchar_setp_next @ thiscall -arch=win32 ?setp@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@IAEXPA_W0@Z(ptr ptr ptr) basic_streambuf_wchar_setp @ cdecl -arch=win64 ?setp@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@IEAAXPEA_W0@Z(ptr ptr ptr) basic_streambuf_wchar_setp -@ stub -arch=win32 ?setprecision@std@@YA?AU?$_Smanip@H@1@H@Z -@ stub -arch=win64 ?setprecision@std@@YA?AU?$_Smanip@_J@1@_J@Z +@ cdecl -arch=win32 ?setprecision@std@@YA?AU?$_Smanip@H@1@H@Z(ptr long) setprecision +@ cdecl -arch=win64 ?setprecision@std@@YA?AU?$_Smanip@_J@1@_J@Z(ptr long) setprecision @ thiscall -arch=win32 ?setstate@?$basic_ios@DU?$char_traits@D@std@@@std@@QAEXH_N@Z(ptr long long) basic_ios_char_setstate_reraise @ cdecl -arch=win64 ?setstate@?$basic_ios@DU?$char_traits@D@std@@@std@@QEAAXH_N@Z(ptr long long) basic_ios_char_setstate_reraise @ thiscall -arch=win32 ?setstate@?$basic_ios@DU?$char_traits@D@std@@@std@@QAEXI@Z(ptr long) basic_ios_char_setstate

1 0

Piotr Caban : msvcp90: Added basic_ostream<char>::operator<<(function) implementation.
by Alexandre Julliard 15 Jun '12

15 Jun '12

Module: wine Branch: master Commit: c2c9e9ef7be4b335592a866b9f26722d7f5df22e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2c9e9ef7be4b335592a866b9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 15 11:08:10 2012 +0200 msvcp90: Added basic_ostream<char>::operator<<(function) implementation. --- dlls/msvcp90/ios.c | 33 +++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 12 ++++++------ 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 12d319f..5232ecf 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -3984,6 +3984,39 @@ basic_ostream_char* __cdecl basic_ostream_char_print_bstr(basic_ostream_char *os return ostr; } +/* ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QAEAAV01@P6AAAV01@AAV01@@Z@Z */ +/* ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QEAAAEAV01@P6AAEAV01@AEAV01@@Z@Z */ +DEFINE_THISCALL_WRAPPER(basic_ostream_char_print_func, 8) +basic_ostream_char* __thiscall basic_ostream_char_print_func(basic_ostream_char *this, + basic_ostream_char* (__cdecl *pfunc)(basic_ostream_char*)) +{ + TRACE("(%p %p)\n", this, pfunc); + pfunc(this); + return this; +} + +/* ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QAEAAV01@P6AAAV?$basic_ios@DU?$char_traits@D@std@@@1@AAV21@@Z@Z */ +/* ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QEAAAEAV01@P6AAEAV?$basic_ios@DU?$char_traits@D@std@@@1@AEAV21@@Z@Z */ +DEFINE_THISCALL_WRAPPER(basic_ostream_char_print_func_basic_ios, 8) +basic_ostream_char* __thiscall basic_ostream_char_print_func_basic_ios(basic_ostream_char *this, + basic_ios_char* (__cdecl *pfunc)(basic_ios_char*)) +{ + TRACE("(%p %p)\n", this, pfunc); + pfunc(basic_ostream_char_get_basic_ios(this)); + return this; +} + +/* ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QAEAAV01@P6AAAVios_base@1@AAV21@@Z@Z */ +/* ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QEAAAEAV01@P6AAEAVios_base@1@AEAV21@@Z@Z */ +DEFINE_THISCALL_WRAPPER(basic_ostream_char_print_func_ios_base, 8) +basic_ostream_char* __thiscall basic_ostream_char_print_func_ios_base( + basic_ostream_char *this, ios_base* (__cdecl *pfunc)(ios_base*)) +{ + TRACE("(%p %p)\n", this, pfunc); + pfunc(&basic_ostream_char_get_basic_ios(this)->base); + return this; +} + /* Caution: basic_istream uses virtual inheritance. */ static inline basic_ios_char* basic_istream_char_get_basic_ios(basic_istream_char *this) { diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 84d9364..fb873b5 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -1592,12 +1592,12 @@ @ cdecl -arch=win64 ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QEAAAEAV01@N@Z(ptr double) basic_ostream_char_print_double @ stub -arch=win32 ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QAEAAV01@O@Z @ stub -arch=win64 ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QEAAAEAV01@O@Z -@ stub -arch=win32 ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QAEAAV01@P6AAAV01@AAV01@@Z@Z -@ stub -arch=win64 ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QEAAAEAV01@P6AAEAV01@AEAV01@@Z@Z -@ stub -arch=win32 ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QAEAAV01@P6AAAV?$basic_ios@DU?$char_traits@D@std@@@1@AAV21@@Z@Z -@ stub -arch=win64 ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QEAAAEAV01@P6AAEAV?$basic_ios@DU?$char_traits@D@std@@@1@AEAV21@@Z@Z -@ stub -arch=win32 ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QAEAAV01@P6AAAVios_base@1@AAV21@@Z@Z -@ stub -arch=win64 ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QEAAAEAV01@P6AAEAVios_base@1@AEAV21@@Z@Z +@ thiscall -arch=win32 ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QAEAAV01@P6AAAV01@AAV01@@Z@Z(ptr ptr) basic_ostream_char_print_func +@ cdecl -arch=win64 ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QEAAAEAV01@P6AAEAV01@AEAV01@@Z@Z(ptr ptr) basic_ostream_char_print_func +@ thiscall -arch=win32 ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QAEAAV01@P6AAAV?$basic_ios@DU?$char_traits@D@std@@@1@AAV21@@Z@Z(ptr ptr) basic_ostream_char_print_func_basic_ios +@ cdecl -arch=win64 ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QEAAAEAV01@P6AAEAV?$basic_ios@DU?$char_traits@D@std@@@1@AEAV21@@Z@Z(ptr ptr) basic_ostream_char_print_func_basic_ios +@ thiscall -arch=win32 ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QAEAAV01@P6AAAVios_base@1@AAV21@@Z@Z(ptr ptr) basic_ostream_char_print_func_ios_base +@ cdecl -arch=win64 ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QEAAAEAV01@P6AAEAVios_base@1@AEAV21@@Z@Z(ptr ptr) basic_ostream_char_print_func_ios_base @ thiscall -arch=win32 ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QAEAAV01@PAV?$basic_streambuf@DU?$char_traits@D@std@@@1@@Z(ptr ptr) basic_ostream_char_print_streambuf @ cdecl -arch=win64 ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QEAAAEAV01@PEAV?$basic_streambuf@DU?$char_traits@D@std@@@1@@Z(ptr ptr) basic_ostream_char_print_streambuf @ thiscall -arch=win32 ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QAEAAV01@PBX@Z(ptr ptr) basic_ostream_char_print_ptr

1 0

Piotr Caban : msvcp90: Added cin, cout and cerr objects.
by Alexandre Julliard 15 Jun '12

15 Jun '12

Module: wine Branch: master Commit: b9fbe6d5e686508130811df6bcbba15db54e73e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9fbe6d5e686508130811df6b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 15 11:07:49 2012 +0200 msvcp90: Added cin, cout and cerr objects. --- dlls/msvcp90/ios.c | 54 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 3 ++ dlls/msvcp90/msvcp90.spec | 18 +++++++------- dlls/msvcp90/msvcp90_main.c | 2 + 4 files changed, 68 insertions(+), 9 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 4fd7640..12d319f 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -5507,3 +5507,57 @@ basic_filebuf_char* __thiscall basic_fstream_char_rdbuf(const basic_fstream_char TRACE("(%p)\n", this); return (basic_filebuf_char*)&this->filebuf; } + +static basic_filebuf_char filebuf_stdin; +/* ?cin@std@@3V?$basic_istream@DU?$char_traits@D@std@@@1@A */ +struct { + basic_istream_char obj; + basic_ios_char vbase; +} cin = { { 0 } }; +/* ?_Ptr_cin@std@@3PAV?$basic_istream@DU?$char_traits@D@std@@@1@A */ +/* ?_Ptr_cin@std@@3PEAV?$basic_istream@DU?$char_traits@D@std@@@1@EA */ +basic_istream_char *_Ptr_cin = &cin.obj; + +static basic_filebuf_char filebuf_stdout; +/* ?cout@std@@3V?$basic_ostream@DU?$char_traits@D@std@@@1@A */ +struct { + basic_ostream_char obj; + basic_ios_char vbase; +} cout = { { 0 } }; +/* ?_Ptr_cout@std@@3PAV?$basic_ostream@DU?$char_traits@D@std@@@1@A */ +/* ?_Ptr_cout@std@@3PEAV?$basic_ostream@DU?$char_traits@D@std@@@1@EA */ +basic_ostream_char *_Ptr_cout = &cout.obj; + +static basic_filebuf_char filebuf_stderr; +/* ?cerr@std@@3V?$basic_ostream@DU?$char_traits@D@std@@@1@A */ +struct { + basic_ostream_char obj; + basic_ios_char vbase; +} cerr = { { 0 } }; +/* ?_Ptr_cerr@std@@3PAV?$basic_ostream@DU?$char_traits@D@std@@@1@A */ +/* ?_Ptr_cerr@std@@3PEAV?$basic_ostream@DU?$char_traits@D@std@@@1@EA */ +basic_ostream_char *_Ptr_cerr = &cerr.obj; + +void init_io(void) +{ + basic_filebuf_char_ctor_file(&filebuf_stdin, stdin); + basic_istream_char_ctor(&cin.obj, &filebuf_stdin.base, FALSE/*FIXME*/, TRUE); + + basic_filebuf_char_ctor_file(&filebuf_stdout, stdout); + basic_ostream_char_ctor(&cout.obj, &filebuf_stdout.base, FALSE/*FIXME*/, TRUE); + + basic_filebuf_char_ctor_file(&filebuf_stderr, stderr); + basic_ostream_char_ctor(&cerr.obj, &filebuf_stderr.base, FALSE/*FIXME*/, TRUE); +} + +void free_io(void) +{ + basic_istream_char_dtor(&cin.obj); + basic_filebuf_char_dtor(&filebuf_stdin); + + basic_ostream_char_dtor(&cout.obj); + basic_filebuf_char_dtor(&filebuf_stdout); + + basic_ostream_char_dtor(&cerr.obj); + basic_filebuf_char_dtor(&filebuf_stderr); +} diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index a7091ee..45adcc9 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -371,3 +371,6 @@ mutex* __thiscall mutex_ctor(mutex*); void __thiscall mutex_dtor(mutex*); void __thiscall mutex_lock(mutex*); void __thiscall mutex_unlock(mutex*); + +void init_io(void); +void free_io(void); diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 5290c68..84d9364 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2694,14 +2694,14 @@ @ cdecl -arch=win64 ?_Pninc@?$basic_streambuf@GU?$char_traits@G@std@@@std@@IEAAPEAGXZ(ptr) basic_streambuf_wchar__Pninc @ thiscall -arch=win32 ?_Pninc@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@IAEPA_WXZ(ptr) basic_streambuf_wchar__Pninc @ cdecl -arch=win64 ?_Pninc@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@IEAAPEA_WXZ(ptr) basic_streambuf_wchar__Pninc -# extern -arch=win32 ?_Ptr_cerr@std@@3PAV?$basic_ostream@DU?$char_traits@D@std@@@1@A -# extern -arch=win64 ?_Ptr_cerr@std@@3PEAV?$basic_ostream@DU?$char_traits@D@std@@@1@EA -# extern -arch=win32 ?_Ptr_cin@std@@3PAV?$basic_istream@DU?$char_traits@D@std@@@1@A -# extern -arch=win64 ?_Ptr_cin@std@@3PEAV?$basic_istream@DU?$char_traits@D@std@@@1@EA +@ extern -arch=win32 ?_Ptr_cerr@std@@3PAV?$basic_ostream@DU?$char_traits@D@std@@@1@A _Ptr_cerr +@ extern -arch=win64 ?_Ptr_cerr@std@@3PEAV?$basic_ostream@DU?$char_traits@D@std@@@1@EA _Ptr_cerr +@ extern -arch=win32 ?_Ptr_cin@std@@3PAV?$basic_istream@DU?$char_traits@D@std@@@1@A _Ptr_cin +@ extern -arch=win64 ?_Ptr_cin@std@@3PEAV?$basic_istream@DU?$char_traits@D@std@@@1@EA _Ptr_cin # extern -arch=win32 ?_Ptr_clog@std@@3PAV?$basic_ostream@DU?$char_traits@D@std@@@1@A # extern -arch=win64 ?_Ptr_clog@std@@3PEAV?$basic_ostream@DU?$char_traits@D@std@@@1@EA -# extern -arch=win32 ?_Ptr_cout@std@@3PAV?$basic_ostream@DU?$char_traits@D@std@@@1@A -# extern -arch=win64 ?_Ptr_cout@std@@3PEAV?$basic_ostream@DU?$char_traits@D@std@@@1@EA +@ extern -arch=win32 ?_Ptr_cout@std@@3PAV?$basic_ostream@DU?$char_traits@D@std@@@1@A _Ptr_cout +@ extern -arch=win64 ?_Ptr_cout@std@@3PEAV?$basic_ostream@DU?$char_traits@D@std@@@1@EA _Ptr_cout # extern -arch=win32 ?_Ptr_wcerr@std@@3PAV?$basic_ostream@GU?$char_traits@G@std@@@1@A # extern -arch=win64 ?_Ptr_wcerr@std@@3PEAV?$basic_ostream@GU?$char_traits@G@std@@@1@EA # extern -arch=win32 ?_Ptr_wcerr@std@@3PAV?$basic_ostream@_WU?$char_traits@_W@std@@@1@A @@ -3053,8 +3053,8 @@ @ cdecl -arch=win64 ?capacity@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBA_KXZ(ptr) MSVCP_basic_string_wchar_capacity @ thiscall -arch=win32 ?capacity@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEIXZ(ptr) MSVCP_basic_string_wchar_capacity @ cdecl -arch=win64 ?capacity@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBA_KXZ(ptr) MSVCP_basic_string_wchar_capacity -# extern ?cerr@std@@3V?$basic_ostream@DU?$char_traits@D@std@@@1@A -# extern ?cin@std@@3V?$basic_istream@DU?$char_traits@D@std@@@1@A +@ extern ?cerr@std@@3V?$basic_ostream@DU?$char_traits@D@std@@@1@A cerr +@ extern ?cin@std@@3V?$basic_istream@DU?$char_traits@D@std@@@1@A cin @ cdecl -arch=win32 ?classic@locale@std@@SAABV12@XZ() locale_classic @ cdecl -arch=win64 ?classic@locale@std@@SAAEBV12@XZ() locale_classic @ cdecl -arch=win32 ?classic_table@?$ctype@D@std@@KAPBFXZ() ctype_char_classic_table @@ -3191,7 +3191,7 @@ @ cdecl ?cos@?$_Ctraits@M@std@@SAMM@Z(float) std_Ctraits_float_cos @ cdecl ?cos@?$_Ctraits@N@std@@SANN@Z(double) std_Ctraits_double_cos @ cdecl ?cos@?$_Ctraits@O@std@@SAOO@Z(double) std_Ctraits_long_double_cos -# extern ?cout@std@@3V?$basic_ostream@DU?$char_traits@D@std@@@1@A +@ extern ?cout@std@@3V?$basic_ostream@DU?$char_traits@D@std@@@1@A cout @ stub -arch=win32 ?curr_symbol@?$_Mpunct@D@std@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ @ stub -arch=win64 ?curr_symbol@?$_Mpunct@D@std@@QEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ @ stub -arch=win32 ?curr_symbol@?$_Mpunct@G@std@@QBE?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c index de036e5..a7dc864 100644 --- a/dlls/msvcp90/msvcp90_main.c +++ b/dlls/msvcp90/msvcp90_main.c @@ -90,8 +90,10 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: init_cxx_funcs(); init_lockit(); + init_io(); break; case DLL_PROCESS_DETACH: + free_io(); free_locale(); free_lockit(); break;

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2012