winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
March
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
October 2012
----- 2025 -----
March 2025
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
960 discussions
Start a n
N
ew thread
Jason Edmeades : cmd: Add support for calling a built in command.
by Alexandre Julliard
17 Oct '12
17 Oct '12
Module: wine Branch: master Commit: 3c058185155a24f0e059d55c5d6318bc9a3f6400 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3c058185155a24f0e059d55c5…
Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Sun Oct 14 00:38:53 2012 +0100 cmd: Add support for calling a built in command. --- programs/cmd/batch.c | 7 +++- programs/cmd/builtins.c | 10 +++--- programs/cmd/tests/test_builtins.cmd | 16 +++++++++ programs/cmd/tests/test_builtins.cmd.exp | 19 +++++++---- programs/cmd/wcmd.h | 4 +- programs/cmd/wcmdmain.c | 50 ++++++++++++++++++++++------- 6 files changed, 79 insertions(+), 27 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=3c058185155a24f0e059d…
1
0
0
0
Jason Edmeades : cmd: Rename parameter passed to builtin calls.
by Alexandre Julliard
17 Oct '12
17 Oct '12
Module: wine Branch: master Commit: 9f83165efb341d7cb65a60ae97d9453df72f0c8e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9f83165efb341d7cb65a60ae9…
Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Oct 16 23:41:58 2012 +0100 cmd: Rename parameter passed to builtin calls. --- programs/cmd/builtins.c | 142 +++++++++++++++++++++++----------------------- programs/cmd/directory.c | 8 +- programs/cmd/wcmd.h | 18 +++--- 3 files changed, 84 insertions(+), 84 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f83165efb341d7cb65a6…
1
0
0
0
Jason Edmeades : cmd: Handle very odd delimiter support for command line.
by Alexandre Julliard
17 Oct '12
17 Oct '12
Module: wine Branch: master Commit: dccccfc27341c2b156fa14c58de2c19cb41b486d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=dccccfc27341c2b156fa14c58…
Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Oct 16 23:35:33 2012 +0100 cmd: Handle very odd delimiter support for command line. --- programs/cmd/batch.c | 17 ++++++++-- programs/cmd/builtins.c | 51 ++++++++++++++++--------------- programs/cmd/directory.c | 2 +- programs/cmd/tests/test_cmdline.cmd.exp | 22 +++++++------- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 19 ++++++----- 6 files changed, 63 insertions(+), 50 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=dccccfc27341c2b156fa1…
1
0
0
0
Henri Verbeet : ddraw/tests: Add some display mode set / restore tests with multiple ddraw objects.
by Alexandre Julliard
17 Oct '12
17 Oct '12
Module: wine Branch: master Commit: f9105db050eee83621f4aea75b9db8786fdb2188 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f9105db050eee83621f4aea75…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 17 11:33:36 2012 +0200 ddraw/tests: Add some display mode set / restore tests with multiple ddraw objects. --- dlls/ddraw/tests/ddraw1.c | 200 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 200 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 192 +++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 192 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 784 insertions(+), 0 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9105db050eee83621f4a…
1
0
0
0
Piotr Caban : msvcp: Sync implementations.
by Alexandre Julliard
17 Oct '12
17 Oct '12
Module: wine Branch: master Commit: 9b516abb482ade8594ffdca86bc3924491cc17dc URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9b516abb482ade8594ffdca86…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 10:01:40 2012 +0200 msvcp: Sync implementations. --- dlls/msvcp100/exception.c | 7 + dlls/msvcp100/locale.c | 289 +++++++++++++++++++++---------------------- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp100/string.c | 8 +- dlls/msvcp60/exception.c | 7 + dlls/msvcp60/ios.c | 240 +++++++++++++++++++++++++++++++++++ dlls/msvcp60/locale.c | 292 +++++++++++++++++++++---------------------- dlls/msvcp60/msvcp60.spec | 22 ++-- dlls/msvcp70/msvcp70.spec | 56 ++++---- dlls/msvcp71/exception.c | 7 + dlls/msvcp71/locale.c | 289 +++++++++++++++++++++---------------------- dlls/msvcp71/msvcp71.spec | 2 +- dlls/msvcp71/string.c | 4 + dlls/msvcp80/msvcp80.spec | 58 +++++----- dlls/msvcp90/string.c | 12 ++- 15 files changed, 774 insertions(+), 521 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b516abb482ade8594ffd…
1
0
0
0
Piotr Caban : msvcp60: Fixed basic_stringbuf class structure.
by Alexandre Julliard
17 Oct '12
17 Oct '12
Module: wine Branch: master Commit: 5b1ee41daa2e1d0a16d77b3e9b2e0d6630c90608 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5b1ee41daa2e1d0a16d77b3e9…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 10:01:21 2012 +0200 msvcp60: Fixed basic_stringbuf class structure. --- dlls/msvcp60/ios.c | 9 ++++----- dlls/msvcp60/msvcp.h | 1 - 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index ba6299c..3eea5d2 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -91,14 +91,18 @@ typedef enum { typedef struct { basic_streambuf_char base; + char *pendsave; char *seekhigh; + int alsize; int state; char allocator; /* empty struct */ } basic_stringbuf_char; typedef struct { basic_streambuf_wchar base; + wchar_t *pendsave; wchar_t *seekhigh; + int alsize; int state; char allocator; /* empty struct */ } basic_stringbuf_wchar; @@ -884,7 +888,6 @@ basic_streambuf_char* __thiscall basic_streambuf_char_ctor_uninitialized(basic_s { TRACE("(%p %d)\n", this, uninitialized); this->vtable = &MSVCP_basic_streambuf_char_vtable; - mutex_ctor(&this->lock); return this; } @@ -896,7 +899,6 @@ basic_streambuf_char* __thiscall basic_streambuf_char_ctor(basic_streambuf_char TRACE("(%p)\n", this); this->vtable = &MSVCP_basic_streambuf_char_vtable; - mutex_ctor(&this->lock); this->loc = MSVCRT_operator_new(sizeof(locale)); locale_ctor(this->loc); basic_streambuf_char__Init_empty(this); @@ -911,7 +913,6 @@ void __thiscall basic_streambuf_char_dtor(basic_streambuf_char *this) { TRACE("(%p)\n", this); - mutex_dtor(&this->lock); locale_dtor(this->loc); MSVCRT_operator_delete(this->loc); } @@ -995,7 +996,6 @@ void __thiscall basic_streambuf_char__Init(basic_streambuf_char *this, char **gf static void basic_streambuf_char__Lock(basic_streambuf_char *this) { TRACE("(%p)\n", this); - mutex_lock(&this->lock); } /* ?_Pnavail@?$basic_streambuf@DU?$char_traits@D@std@@@std@@IBEHXZ */ @@ -1092,7 +1092,6 @@ static streamsize basic_streambuf_char__Sgetn_s(basic_streambuf_char *this, char static void basic_streambuf_char__Unlock(basic_streambuf_char *this) { TRACE("(%p)\n", this); - mutex_unlock(&this->lock); } /* ?eback@?$basic_streambuf@DU?$char_traits@D@std@@@std@@IBEPADXZ */ diff --git a/dlls/msvcp60/msvcp.h b/dlls/msvcp60/msvcp.h index e1c13ea..e5476fd 100644 --- a/dlls/msvcp60/msvcp.h +++ b/dlls/msvcp60/msvcp.h @@ -290,7 +290,6 @@ typedef struct _ios_base { /* class basic_streambuf<char> */ typedef struct { const vtable_ptr *vtable; - mutex lock; char *rbuf; char *wbuf; char **prbuf;
1
0
0
0
Piotr Caban : msvcp60: Fixed overflow in basic_string_char_find_cstr_substr function.
by Alexandre Julliard
17 Oct '12
17 Oct '12
Module: wine Branch: master Commit: 1b6dfafce240745f6b509492673e1c1c60fe9f39 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1b6dfafce240745f6b5094926…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 10:00:13 2012 +0200 msvcp60: Fixed overflow in basic_string_char_find_cstr_substr function. --- dlls/msvcp60/string.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 2bef248..591ffdf 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -826,6 +826,8 @@ MSVCP_size_t __thiscall basic_string_char_find_cstr_substr( if(len==0 && pos<=this->size) return pos; + if(pos>=this->size || len>this->size) + return basic_string_char_npos; end = this->ptr+this->size-len+1; for(p=this->ptr+pos; p<end; p++) { @@ -2531,6 +2533,8 @@ MSVCP_size_t __thiscall basic_string_wchar_find_cstr_substr( if(len==0 && pos<=this->size) return pos; + if(pos>=this->size || len>this->size) + return basic_string_wchar_npos; end = this->ptr+this->size-len+1; for(p=this->ptr+pos; p<end; p++) {
1
0
0
0
Piotr Caban : msvcp71: Fixed basic_string::ptr implementation.
by Alexandre Julliard
17 Oct '12
17 Oct '12
Module: wine Branch: master Commit: 8de45a3df1ea0f2afe833e5638d1492244b19578 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=8de45a3df1ea0f2afe833e563…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 09:59:53 2012 +0200 msvcp71: Fixed basic_string::ptr implementation. --- dlls/msvcp71/string.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp71/string.c b/dlls/msvcp71/string.c index 9907ad1..d6336ad 100644 --- a/dlls/msvcp71/string.c +++ b/dlls/msvcp71/string.c @@ -531,7 +531,7 @@ const MSVCP_size_t MSVCP_basic_string_char_npos = -1; DEFINE_THISCALL_WRAPPER(basic_string_char_ptr, 4) char* __thiscall basic_string_char_ptr(basic_string_char *this) { - if(this->res == BUF_SIZE_CHAR-1) + if(this->res < BUF_SIZE_CHAR) return this->data.buf; return this->data.ptr; } @@ -541,7 +541,7 @@ char* __thiscall basic_string_char_ptr(basic_string_char *this) DEFINE_THISCALL_WRAPPER(basic_string_char_const_ptr, 4) const char* __thiscall basic_string_char_const_ptr(const basic_string_char *this) { - if(this->res == BUF_SIZE_CHAR-1) + if(this->res < BUF_SIZE_CHAR) return this->data.buf; return this->data.ptr; } @@ -2214,7 +2214,7 @@ const MSVCP_size_t MSVCP_basic_string_wchar_npos = -1; DEFINE_THISCALL_WRAPPER(basic_string_wchar_ptr, 4) wchar_t* __thiscall basic_string_wchar_ptr(basic_string_wchar *this) { - if(this->res == BUF_SIZE_WCHAR-1) + if(this->res < BUF_SIZE_WCHAR) return this->data.buf; return this->data.ptr; } @@ -2226,7 +2226,7 @@ wchar_t* __thiscall basic_string_wchar_ptr(basic_string_wchar *this) DEFINE_THISCALL_WRAPPER(basic_string_wchar_const_ptr, 4) const wchar_t* __thiscall basic_string_wchar_const_ptr(const basic_string_wchar *this) { - if(this->res == BUF_SIZE_WCHAR-1) + if(this->res < BUF_SIZE_WCHAR) return this->data.buf; return this->data.ptr; }
1
0
0
0
Piotr Caban : msvcp71: Added istrstream destructor implementation.
by Alexandre Julliard
17 Oct '12
17 Oct '12
Module: wine Branch: master Commit: 84c5e3a198ce7993bf1f880508715fde61003f86 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=84c5e3a198ce7993bf1f88050…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 09:59:32 2012 +0200 msvcp71: Added istrstream destructor implementation. --- dlls/msvcp71/ios.c | 28 ++++++++++++++++++++++++++++ dlls/msvcp71/msvcp71.spec | 4 ++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index b9af853..8c4e4dc 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -285,6 +285,14 @@ typedef struct { } ostrstream; typedef struct { + basic_istream_char base; + strstreambuf buf; + /* virtual inheritance + * basic_ios_char basic_ios; + */ +} istrstream; + +typedef struct { basic_iostream_char base; strstreambuf buf; /* virtual inheritance @@ -486,6 +494,8 @@ extern const vtable_ptr MSVCP_strstreambuf_vtable; static const int ostrstream_vbtable[] = {0, sizeof(ostrstream)}; extern const vtable_ptr MSVCP_ostrstream_vtable; +static const int istrstream_vbtable[] = {0, sizeof(istrstream)}; + static const int strstream_vbtable1[] = {0, sizeof(strstream)}; static const int strstream_vbtable2[] = {0, sizeof(strstream)-FIELD_OFFSET(strstream, base.base2)}; extern const vtable_ptr MSVCP_strstream_vtable; @@ -12473,6 +12483,24 @@ ostrstream* __thiscall ostrstream_vector_dtor(basic_ios_char *base, unsigned int return this; } +static inline istrstream* istrstream_from_basic_ios(basic_ios_char *ptr) +{ + return (istrstream*)((char*)ptr-istrstream_vbtable[1]); +} + +/* ??1istrstream@std@@UAE@XZ */ +/* ??1istrstream@std@@UEAA@XZ */ +DEFINE_THISCALL_WRAPPER(istrstream_dtor, 4) +void __thiscall istrstream_dtor(basic_ios_char *base) +{ + istrstream *this = istrstream_from_basic_ios(base); + + TRACE("(%p)\n", this); + + basic_istream_char_dtor(basic_istream_char_to_basic_ios(&this->base)); + strstreambuf_dtor(&this->buf); +} + static inline basic_ios_char* strstream_to_basic_ios(strstream *ptr) { return (basic_ios_char*)((char*)ptr+strstream_vbtable1[1]); diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 726bfd8..26083b8 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -1197,8 +1197,8 @@ @ cdecl -arch=win64 ??1facet@locale@std@@UEAA@XZ(ptr) locale_facet_dtor @ thiscall -arch=win32 ??1ios_base@std@@UAE@XZ(ptr) ios_base_dtor @ cdecl -arch=win64 ??1ios_base@std@@UEAA@XZ(ptr) ios_base_dtor -@ stub -arch=win32 ??1istrstream@std@@UAE@XZ -@ stub -arch=win64 ??1istrstream@std@@UEAA@XZ +@ thiscall -arch=win32 ??1istrstream@std@@UAE@XZ(ptr) istrstream_dtor +@ cdecl -arch=win64 ??1istrstream@std@@UEAA@XZ(ptr) istrstream_dtor @ thiscall -arch=win32 ??1locale@std@@QAE@XZ(ptr) locale_dtor @ cdecl -arch=win64 ??1locale@std@@QEAA@XZ(ptr) locale_dtor @ stub -arch=win32 ??1messages_base@std@@UAE@XZ
1
0
0
0
Piotr Caban : msvcp71: Added ostrstream class implementation.
by Alexandre Julliard
17 Oct '12
17 Oct '12
Module: wine Branch: master Commit: 13fa0a8e58de4d61d23784d0e4b1d62f91e22f86 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=13fa0a8e58de4d61d23784d0e…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 09:59:17 2012 +0200 msvcp71: Added ostrstream class implementation. --- dlls/msvcp71/ios.c | 95 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp71/msvcp71.spec | 6 +- 2 files changed, 98 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index f1b354b..b9af853 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -277,6 +277,14 @@ typedef struct { } strstreambuf; typedef struct { + basic_ostream_char base; + strstreambuf buf; + /* virtual inheritance + * basic_ios_char basic_ios; + */ +} ostrstream; + +typedef struct { basic_iostream_char base; strstreambuf buf; /* virtual inheritance @@ -475,6 +483,9 @@ extern const vtable_ptr MSVCP_basic_stringstream_short_vtable; /* ??_7strstreambuf@std@@6B */ extern const vtable_ptr MSVCP_strstreambuf_vtable; +static const int ostrstream_vbtable[] = {0, sizeof(ostrstream)}; +extern const vtable_ptr MSVCP_ostrstream_vtable; + static const int strstream_vbtable1[] = {0, sizeof(strstream)}; static const int strstream_vbtable2[] = {0, sizeof(strstream)-FIELD_OFFSET(strstream, base.base2)}; extern const vtable_ptr MSVCP_strstream_vtable; @@ -627,6 +638,10 @@ DEFINE_RTTI_DATA8(basic_stringstream_short, sizeof(basic_stringstream_wchar), ".?AV?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@"); DEFINE_RTTI_DATA1(strstreambuf, sizeof(strstreambuf), &basic_streambuf_char_rtti_base_descriptor, ".?AVstrstreambuf@std@@"); +DEFINE_RTTI_DATA4(ostrstream, sizeof(ostrstream), + &basic_ostream_char_rtti_base_descriptor, &basic_ios_char_rtti_base_descriptor, + &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, + "?AVostrstream@std@@"); DEFINE_RTTI_DATA8(strstream, sizeof(strstream), &basic_istream_char_rtti_base_descriptor, &basic_ios_char_rtti_base_descriptor, &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, @@ -847,6 +862,8 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(basic_streambuf_char_setbuf) VTABLE_ADD_FUNC(basic_streambuf_char_sync) VTABLE_ADD_FUNC(basic_streambuf_char_imbue)); + __ASM_VTABLE(ostrstream, + VTABLE_ADD_FUNC(ostrstream_vector_dtor)); __ASM_VTABLE(strstream, VTABLE_ADD_FUNC(strstream_vector_dtor)); #ifndef __GNUC__ @@ -12379,6 +12396,83 @@ int __thiscall strstreambuf_underflow(strstreambuf *this) return (unsigned char)(*gptr); } +static inline basic_ios_char* ostrstream_to_basic_ios(ostrstream *ptr) +{ + return (basic_ios_char*)((char*)ptr+ostrstream_vbtable[1]); +} + +static inline ostrstream* ostrstream_from_basic_ios(basic_ios_char *ptr) +{ + return (ostrstream*)((char*)ptr-ostrstream_vbtable[1]); +} + +/* ??0ostrstream@std@@QAE@PADHH@Z */ +DEFINE_THISCALL_WRAPPER(ostrstream_ctor, 20) +ostrstream* __thiscall ostrstream_ctor(ostrstream *this, char *buf, streamsize size, int mode, MSVCP_bool virt_init) +{ + basic_ios_char *basic_ios; + + TRACE("(%p %p %ld %d %d)\n", this, buf, size, mode, virt_init); + + if(virt_init) { + this->base.vbtable = ostrstream_vbtable; + basic_ios = basic_ostream_char_get_basic_ios(&this->base); + basic_ios_char_ctor(basic_ios); + }else { + basic_ios = basic_ostream_char_get_basic_ios(&this->base); + } + + strstreambuf_ctor_get_put(&this->buf, buf, size, + buf && (mode & OPENMODE_app) ? buf+strlen(buf) : buf); + basic_ostream_char_ctor(&this->base, &this->buf.base, FALSE, FALSE); + basic_ios->base.vtable = &MSVCP_ostrstream_vtable; + return this; +} + +/* ??1ostrstream@std@@UAE@XZ */ +/* ??1ostrstream@std@@UEAA@XZ */ +DEFINE_THISCALL_WRAPPER(ostrstream_dtor, 4) +void __thiscall ostrstream_dtor(basic_ios_char *base) +{ + ostrstream *this = ostrstream_from_basic_ios(base); + + TRACE("(%p)\n", this); + + basic_ostream_char_dtor(basic_ostream_char_to_basic_ios(&this->base)); + strstreambuf_dtor(&this->buf); +} + +static void ostrstream_vbase_dtor(ostrstream *this) +{ + TRACE("(%p)\n", this); + + ostrstream_dtor(ostrstream_to_basic_ios(this)); + basic_ios_char_dtor(basic_ostream_char_get_basic_ios(&this->base)); +} + +DEFINE_THISCALL_WRAPPER(ostrstream_vector_dtor, 8) +ostrstream* __thiscall ostrstream_vector_dtor(basic_ios_char *base, unsigned int flags) +{ + ostrstream *this = ostrstream_from_basic_ios(base); + + TRACE("(%p %x)\n", this, flags); + + if(flags & 2) { + /* we have an array, with the number of elements stored before the first object */ + INT_PTR i, *ptr = (INT_PTR *)this-1; + + for(i=*ptr-1; i>=0; i--) + ostrstream_vbase_dtor(this+i); + MSVCRT_operator_delete(ptr); + } else { + ostrstream_vbase_dtor(this); + if(flags & 1) + MSVCRT_operator_delete(this); + } + + return this; +} + static inline basic_ios_char* strstream_to_basic_ios(strstream *ptr) { return (basic_ios_char*)((char*)ptr+strstream_vbtable1[1]); @@ -12807,6 +12901,7 @@ void init_io(void *base) init_basic_stringstream_short_rtti(base); init_strstreambuf_rtti(base); init_strstream_rtti(base); + init_ostrstream_rtti(base); #endif basic_filebuf_char_ctor_file(&filebuf_char_stdin, stdin); diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 0e3928d..726bfd8 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -1002,7 +1002,7 @@ @ stub -arch=win64 ??0messages_base@std@@QEAA@_K@Z @ stub -arch=win32 ??0money_base@std@@QAE@I@Z @ stub -arch=win64 ??0money_base@std@@QEAA@_K@Z -@ stub -arch=win32 ??0ostrstream@std@@QAE@PADHH@Z +@ thiscall -arch=win32 ??0ostrstream@std@@QAE@PADHH@Z(ptr ptr long long long) ostrstream_ctor @ thiscall -arch=win32 ??0strstream@std@@QAE@PADHH@Z(ptr ptr long long long) strstream_ctor @ cdecl -arch=win64 ??0strstream@std@@QEAA@PEAD_JH@Z(ptr ptr long long long) strstream_ctor @ stub -arch=win32 ??0time_base@std@@QAE@I@Z @@ -1205,8 +1205,8 @@ @ stub -arch=win64 ??1messages_base@std@@UEAA@XZ @ stub -arch=win32 ??1money_base@std@@UAE@XZ @ stub -arch=win64 ??1money_base@std@@UEAA@XZ -@ stub -arch=win32 ??1ostrstream@std@@UAE@XZ -@ stub -arch=win64 ??1ostrstream@std@@UEAA@XZ +@ thiscall -arch=win32 ??1ostrstream@std@@UAE@XZ(ptr) ostrstream_dtor +@ cdecl -arch=win64 ??1ostrstream@std@@UEAA@XZ(ptr) ostrstream_dtor @ thiscall -arch=win32 ??1strstream@std@@UAE@XZ(ptr) strstream_dtor @ cdecl -arch=win64 ??1strstream@std@@UEAA@XZ(ptr) strstream_dtor @ thiscall -arch=win32 ??1strstreambuf@std@@UAE@XZ(ptr) strstreambuf_dtor
1
0
0
0
← Newer
1
...
40
41
42
43
44
45
46
...
96
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
Results per page:
10
25
50
100
200