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
Piotr Caban : msvcp71: Added strstream class implementation.
by Alexandre Julliard
17 Oct '12
17 Oct '12
Module: wine Branch: master Commit: a8f231b54685b5b4fd56203d980a929cd37f6c7b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a8f231b54685b5b4fd56203d9…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 09:58:57 2012 +0200 msvcp71: Added strstream class implementation. --- dlls/msvcp71/ios.c | 117 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp71/msvcp71.spec | 8 ++-- 2 files changed, 121 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index 830d730..f1b354b 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -276,6 +276,14 @@ typedef struct { void (__cdecl *pfree)(void*); } strstreambuf; +typedef struct { + basic_iostream_char base; + strstreambuf buf; + /* virtual inheritance + * basic_ios_char basic_ios; + */ +} strstream; + extern const vtable_ptr MSVCP_iosb_vtable; /* ??_7ios_base@std@@6B@ */ @@ -467,6 +475,10 @@ extern const vtable_ptr MSVCP_basic_stringstream_short_vtable; /* ??_7strstreambuf@std@@6B */ extern const vtable_ptr MSVCP_strstreambuf_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; + DEFINE_RTTI_DATA0(iosb, 0, ".?AV?$_Iosb@H@std@@"); DEFINE_RTTI_DATA1(ios_base, 0, &iosb_rtti_base_descriptor, ".?AV?$_Iosb@H@std@@"); DEFINE_RTTI_DATA2(basic_ios_char, 0, &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, @@ -615,6 +627,12 @@ 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_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, + &basic_ostream_char_rtti_base_descriptor, &basic_ios_char_rtti_base_descriptor, + &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, + "?AVstrstream@std@@"); #ifndef __GNUC__ void __asm_dummy_vtables(void) { @@ -829,6 +847,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(strstream, + VTABLE_ADD_FUNC(strstream_vector_dtor)); #ifndef __GNUC__ } #endif @@ -12088,6 +12108,23 @@ void __thiscall strstreambuf__Init(strstreambuf *this, streamsize len, char *g, basic_streambuf_char_setp(&this->base, p, this->seekhigh); } +/* ??0strstreambuf@std@@QAE@PACH0@Z */ +/* ??0strstreambuf@std@@QEAA@PEAC_J0@Z */ +/* ??0strstreambuf@std@@QAE@PADH0@Z */ +/* ??0strstreambuf@std@@QEAA@PEAD_J0@Z */ +/* ??0strstreambuf@std@@QAE@PAEH0@Z */ +/* ??0strstreambuf@std@@QEAA@PEAE_J0@Z */ +static strstreambuf* strstreambuf_ctor_get_put(strstreambuf *this, char *g, streamsize len, char *p) +{ + TRACE("(%p %p %ld %p)\n", this, g, len, p); + + basic_streambuf_char_ctor(&this->base); + this->base.vtable = &MSVCP_strstreambuf_vtable; + + strstreambuf__Init(this, len, g, p, 0); + return this; +} + /* ?_Tidy@strstreambuf@std@@IAEXXZ */ /* ?_Tidy@strstreambuf@std@@IEAAXXZ */ DEFINE_THISCALL_WRAPPER(strstreambuf__Tidy, 4) @@ -12342,6 +12379,85 @@ int __thiscall strstreambuf_underflow(strstreambuf *this) return (unsigned char)(*gptr); } +static inline basic_ios_char* strstream_to_basic_ios(strstream *ptr) +{ + return (basic_ios_char*)((char*)ptr+strstream_vbtable1[1]); +} + +static inline strstream* strstream_from_basic_ios(basic_ios_char *ptr) +{ + return (strstream*)((char*)ptr-strstream_vbtable1[1]); +} + +/* ??0strstream@std@@QAE@PADHH@Z */ +/* ??0strstream@std@@QEAA@PEAD_JH@Z */ +DEFINE_THISCALL_WRAPPER(strstream_ctor, 20) +strstream* __thiscall strstream_ctor(strstream *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.base1.vbtable = strstream_vbtable1; + this->base.base2.vbtable = strstream_vbtable2; + basic_ios = basic_istream_char_get_basic_ios(&this->base.base1); + basic_ios_char_ctor(basic_ios); + }else { + basic_ios = basic_istream_char_get_basic_ios(&this->base.base1); + } + + strstreambuf_ctor_get_put(&this->buf, buf, size, + buf && (mode & OPENMODE_app) ? buf+strlen(buf) : buf); + basic_iostream_char_ctor(&this->base, &this->buf.base, FALSE); + basic_ios->base.vtable = &MSVCP_strstream_vtable; + return this; +} + +/* ??1strstream@std@@UAE@XZ */ +/* ??1strstream@std@@UEAA@XZ */ +DEFINE_THISCALL_WRAPPER(strstream_dtor, 4) +void __thiscall strstream_dtor(basic_ios_char *base) +{ + strstream *this = strstream_from_basic_ios(base); + + TRACE("(%p)\n", this); + + basic_iostream_char_dtor(basic_iostream_char_to_basic_ios(&this->base)); + strstreambuf_dtor(&this->buf); +} + +static void strstream_vbase_dtor(strstream *this) +{ + TRACE("(%p)\n", this); + + strstream_dtor(strstream_to_basic_ios(this)); + basic_ios_char_dtor(basic_istream_char_get_basic_ios(&this->base.base1)); +} + +DEFINE_THISCALL_WRAPPER(strstream_vector_dtor, 8) +strstream* __thiscall strstream_vector_dtor(basic_ios_char *base, unsigned int flags) +{ + strstream *this = strstream_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--) + strstream_vbase_dtor(this+i); + MSVCRT_operator_delete(ptr); + } else { + strstream_vbase_dtor(this); + if(flags & 1) + MSVCRT_operator_delete(this); + } + + return this; +} + static void __cdecl setprecision_func(ios_base *base, streamsize prec) { ios_base_precision_set(base, prec); @@ -12690,6 +12806,7 @@ void init_io(void *base) init_basic_stringstream_wchar_rtti(base); init_basic_stringstream_short_rtti(base); init_strstreambuf_rtti(base); + init_strstream_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 a8c3869..0e3928d 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -1003,8 +1003,8 @@ @ 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 -@ stub -arch=win32 ??0strstream@std@@QAE@PADHH@Z -@ stub -arch=win64 ??0strstream@std@@QEAA@PEAD_JH@Z +@ 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 @ stub -arch=win64 ??0time_base@std@@QEAA@_K@Z @ stub -arch=win32 ??1?$_Mpunct@D@std@@MAE@XZ @@ -1207,8 +1207,8 @@ @ stub -arch=win64 ??1money_base@std@@UEAA@XZ @ stub -arch=win32 ??1ostrstream@std@@UAE@XZ @ stub -arch=win64 ??1ostrstream@std@@UEAA@XZ -@ stub -arch=win32 ??1strstream@std@@UAE@XZ -@ stub -arch=win64 ??1strstream@std@@UEAA@XZ +@ 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 @ cdecl -arch=win64 ??1strstreambuf@std@@UEAA@XZ(ptr) strstreambuf_dtor @ stub -arch=win32 ??1time_base@std@@UAE@XZ
1
0
0
0
Piotr Caban : msvcp90: Added _Nomemory implementation.
by Alexandre Julliard
17 Oct '12
17 Oct '12
Module: wine Branch: master Commit: 1f4f07c026d3ee5bc006b111e15f9c23bb9e41b2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1f4f07c026d3ee5bc006b111e…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 09:58:25 2012 +0200 msvcp90: Added _Nomemory implementation. --- dlls/msvcp90/exception.c | 7 +++++++ dlls/msvcp90/msvcp90.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index d883307..6247616 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -447,6 +447,13 @@ const char* __thiscall MSVCP_failure_what(failure *this) DEFINE_RTTI_DATA2(failure, 0, &runtime_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVfailure@std@@"); DEFINE_CXX_DATA2(failure, &runtime_error_cxx_type_info, &exception_cxx_type_info, MSVCP_runtime_error_dtor); +/* ?_Nomemory@std@@YAXXZ */ +void __cdecl _Nomemory(void) +{ + TRACE("()\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); +} + #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index c544ff5..742f162 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2664,7 +2664,7 @@ @ cdecl -arch=win64 ?_Narrow_s@?$ctype@G@std@@QEBAPEBGPEBG0DPEAD_K@Z(ptr ptr ptr long ptr long) ctype_wchar__Narrow_s @ thiscall -arch=win32 ?_Narrow_s@?$ctype@_W@std@@QBEPB_WPB_W0DPADI@Z(ptr ptr ptr long ptr long) ctype_wchar__Narrow_s @ cdecl -arch=win64 ?_Narrow_s@?$ctype@_W@std@@QEBAPEB_WPEB_W0DPEAD_K@Z(ptr ptr ptr long ptr long) ctype_wchar__Narrow_s -@ stub ?_Nomemory@std@@YAXXZ +@ cdecl ?_Nomemory@std@@YAXXZ() _Nomemory # extern -arch=win64 ?_Oneplusroot2high@?CA@???$_Fabs@M@std@@YAMAEBV?$complex@M@1@PEAH@Z@4MB # extern -arch=win64 ?_Oneplusroot2high@?CA@???$_Fabs@N@std@@YANAEBV?$complex@N@1@PEAH@Z@4NB # extern -arch=win64 ?_Oneplusroot2low@?CA@???$_Fabs@M@std@@YAMAEBV?$complex@M@1@PEAH@Z@4MB
1
0
0
0
Piotr Caban : msvcp90: Fixed strstreambuf_ctor_get implementation.
by Alexandre Julliard
17 Oct '12
17 Oct '12
Module: wine Branch: master Commit: ea828e557f6b7c8c2d92f9624cd6a0d341ed5666 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ea828e557f6b7c8c2d92f9624…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 09:57:39 2012 +0200 msvcp90: Fixed strstreambuf_ctor_get implementation. --- dlls/msvcp90/ios.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 00a1b68..a3c44f2 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -12561,7 +12561,7 @@ strstreambuf* __thiscall strstreambuf_ctor_get(strstreambuf *this, const char *g { TRACE("(%p %p %ld)\n", this, g, len); - strstreambuf_ctor_get_put(this, NULL, 0, NULL); + strstreambuf_ctor_get_put(this, (char*)g, len, NULL); this->strmode |= STRSTATE_Constant; return this; }
1
0
0
0
Piotr Caban : msvcp60: Added more std::getline functions.
by Alexandre Julliard
17 Oct '12
17 Oct '12
Module: wine Branch: master Commit: 50cfac7ef41e5e694f6fcdd30e6578f2035a6648 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=50cfac7ef41e5e694f6fcdd30…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 09:57:18 2012 +0200 msvcp60: Added more std::getline functions. --- dlls/msvcp60/msvcp60.spec | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 561fc64..6e3813a 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -3204,14 +3204,14 @@ @ cdecl -arch=win64 ?getline@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@PEAG_J@Z(ptr ptr long) basic_istream_wchar_getline @ thiscall -arch=win32 ?getline@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@PAGHG@Z(ptr ptr long long) basic_istream_wchar_getline_delim @ cdecl -arch=win64 ?getline@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@PEAG_JG@Z(ptr ptr long long) basic_istream_wchar_getline_delim -@ stub -arch=win32 ?getline@std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@1@AAV21@AAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@@Z -@ stub -arch=win64 ?getline@std@@YAAEAV?$basic_istream@DU?$char_traits@D@std@@@1@AEAV21@AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@@Z -@ stub -arch=win32 ?getline@std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@1@AAV21@AAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@D@Z -@ stub -arch=win64 ?getline@std@@YAAEAV?$basic_istream@DU?$char_traits@D@std@@@1@AEAV21@AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@D@Z -@ stub -arch=win32 ?getline@std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@1@AAV21@AAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@1@@Z -@ stub -arch=win64 ?getline@std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@1@AEAV21@AEAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@1@@Z -@ stub -arch=win32 ?getline@std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@1@AAV21@AAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@1@G@Z -@ stub -arch=win64 ?getline@std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@1@AEAV21@AEAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@1@G@Z +@ cdecl -arch=win32 ?getline@std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@1@AAV21@AAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@@Z(ptr ptr) basic_istream_char_getline_bstr +@ cdecl -arch=win64 ?getline@std@@YAAEAV?$basic_istream@DU?$char_traits@D@std@@@1@AEAV21@AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@@Z(ptr ptr) basic_istream_char_getline_bstr +@ cdecl -arch=win32 ?getline@std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@1@AAV21@AAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@D@Z(ptr ptr long) basic_istream_char_getline_bstr_delim +@ cdecl -arch=win64 ?getline@std@@YAAEAV?$basic_istream@DU?$char_traits@D@std@@@1@AEAV21@AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@D@Z(ptr ptr long) basic_istream_char_getline_bstr_delim +@ cdecl -arch=win32 ?getline@std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@1@AAV21@AAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@1@@Z(ptr ptr) basic_istream_wchar_getline_bstr +@ cdecl -arch=win64 ?getline@std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@1@AEAV21@AEAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@1@@Z(ptr ptr) basic_istream_wchar_getline_bstr +@ cdecl -arch=win32 ?getline@std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@1@AAV21@AAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@1@G@Z(ptr ptr long) basic_istream_wchar_getline_bstr_delim +@ cdecl -arch=win64 ?getline@std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@1@AEAV21@AEAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@1@G@Z(ptr ptr long) basic_istream_wchar_getline_bstr_delim @ stub -arch=win32 ?getloc@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QAE?AVlocale@2@XZ @ stub -arch=win64 ?getloc@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QEAA?AVlocale@2@XZ @ stub -arch=win32 ?getloc@?$basic_streambuf@GU?$char_traits@G@std@@@std@@QAE?AVlocale@2@XZ
1
0
0
0
Piotr Caban : msvcp100: Store locale string in _Yarn<char> class.
by Alexandre Julliard
17 Oct '12
17 Oct '12
Module: wine Branch: master Commit: db55f1cd83e7affa876273823abc5bea15aebc23 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=db55f1cd83e7affa876273823…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 09:56:57 2012 +0200 msvcp100: Store locale string in _Yarn<char> class. --- dlls/msvcp100/locale.c | 86 ++++++++++++++++++++++++------------------------ dlls/msvcp100/msvcp.h | 5 +++ 2 files changed, 48 insertions(+), 43 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=db55f1cd83e7affa87627…
1
0
0
0
Piotr Caban : msvcp100/tests: Added _Yarn<char> class tests.
by Alexandre Julliard
17 Oct '12
17 Oct '12
Module: wine Branch: master Commit: bdac12949c689ae10dc3315c2811b822b6bf1a53 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=bdac12949c689ae10dc3315c2…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 09:56:37 2012 +0200 msvcp100/tests: Added _Yarn<char> class tests. --- configure | 1 + configure.ac | 1 + dlls/msvcp100/tests/Makefile.in | 9 ++ dlls/msvcp100/tests/string.c | 168 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 179 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 4350884..217d06e 100755 --- a/configure +++ b/configure @@ -15608,6 +15608,7 @@ wine_fn_config_dll msvcirt enable_msvcirt wine_fn_config_dll msvcm80 enable_msvcm80 wine_fn_config_dll msvcm90 enable_msvcm90 wine_fn_config_dll msvcp100 enable_msvcp100 +wine_fn_config_test dlls/msvcp100/tests msvcp100_test wine_fn_config_dll msvcp60 enable_msvcp60 wine_fn_config_dll msvcp70 enable_msvcp70 wine_fn_config_dll msvcp71 enable_msvcp71 diff --git a/configure.ac b/configure.ac index fc1d93c..d5d99f0 100644 --- a/configure.ac +++ b/configure.ac @@ -2831,6 +2831,7 @@ WINE_CONFIG_DLL(msvcirt) WINE_CONFIG_DLL(msvcm80) WINE_CONFIG_DLL(msvcm90) WINE_CONFIG_DLL(msvcp100) +WINE_CONFIG_TEST(dlls/msvcp100/tests) WINE_CONFIG_DLL(msvcp60) WINE_CONFIG_DLL(msvcp70) WINE_CONFIG_DLL(msvcp71) diff --git a/dlls/msvcp100/tests/Makefile.in b/dlls/msvcp100/tests/Makefile.in new file mode 100644 index 0000000..fe92d54 --- /dev/null +++ b/dlls/msvcp100/tests/Makefile.in @@ -0,0 +1,9 @@ +TESTDLL = msvcp100.dll +APPMODE = -mno-cygwin +MODCFLAGS = @BUILTINFLAG@ +EXTRAINCL = -I$(top_srcdir)/include/msvcrt + +C_SRCS = \ + string.c + +@MAKE_TEST_RULES@ diff --git a/dlls/msvcp100/tests/string.c b/dlls/msvcp100/tests/string.c new file mode 100644 index 0000000..b33b145 --- /dev/null +++ b/dlls/msvcp100/tests/string.c @@ -0,0 +1,168 @@ +/* + * Copyright 2012 Piotr Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> +#include <limits.h> + +#include <windef.h> +#include <winbase.h> +#include "wine/test.h" + +typedef struct +{ + char *str; + char null_str; +} _Yarn_char; + +#undef __thiscall +#ifdef __i386__ +#define __thiscall __stdcall +#else +#define __thiscall __cdecl +#endif + +/* Emulate a __thiscall */ +#ifdef __i386__ + +#include "pshpack1.h" +struct thiscall_thunk +{ + BYTE pop_eax; /* popl %eax (ret addr) */ + BYTE pop_edx; /* popl %edx (func) */ + BYTE pop_ecx; /* popl %ecx (this) */ + BYTE push_eax; /* pushl %eax */ + WORD jmp_edx; /* jmp *%edx */ +}; +#include "poppack.h" + +static void * (WINAPI *call_thiscall_func1)( void *func, void *this ); +static void * (WINAPI *call_thiscall_func2)( void *func, void *this, const void *a ); + +static void init_thiscall_thunk(void) +{ + struct thiscall_thunk *thunk = VirtualAlloc( NULL, sizeof(*thunk), + MEM_COMMIT, PAGE_EXECUTE_READWRITE ); + thunk->pop_eax = 0x58; /* popl %eax */ + thunk->pop_edx = 0x5a; /* popl %edx */ + thunk->pop_ecx = 0x59; /* popl %ecx */ + thunk->push_eax = 0x50; /* pushl %eax */ + thunk->jmp_edx = 0xe2ff; /* jmp *%edx */ + call_thiscall_func1 = (void *)thunk; + call_thiscall_func2 = (void *)thunk; +} + +#define call_func1(func,_this) call_thiscall_func1(func,_this) +#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)a) + +#else + +#define init_thiscall_thunk() +#define call_func1(func,_this) func(_this) +#define call_func2(func,_this,a) func(_this,a) + +#endif /* __i386__ */ + +static _Yarn_char* (__thiscall *_Yarn_char_ctor_cstr)(_Yarn_char *this, const char *str); +static _Yarn_char* (__thiscall *_Yarn_char_copy_ctor)(_Yarn_char *this, const _Yarn_char *copy); +static void (__thiscall *_Yarn_char_dtor)(_Yarn_char *this); +static const char* (__thiscall *_Yarn_char_c_str)(const _Yarn_char *this); +static char (__thiscall *_Yarn_char_empty)(const _Yarn_char *this); + +#define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) +#define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) +static BOOL init(void) +{ + HMODULE msvcp = LoadLibraryA("msvcp100.dll"); + if(!msvcp) { + win_skip("msvcp100.dll not installed\n"); + return FALSE; + } + + if(sizeof(void*) == 8) { /* 64-bit initialization */ + SET(_Yarn_char_ctor_cstr, "??0?$_Yarn@D@std@@QEAA@PEBD@Z"); + SET(_Yarn_char_copy_ctor, "??0?$_Yarn@D@std@@QEAA@AEBV01@@Z"); + SET(_Yarn_char_dtor, "??1?$_Yarn@D@std@@QEAA@XZ"); + SET(_Yarn_char_c_str, "?_C_str@?$_Yarn@D@std@@QEBAPEBDXZ"); + SET(_Yarn_char_empty, "?_Empty@?$_Yarn@D@std@@QEBA_NXZ"); + }else { + SET(_Yarn_char_ctor_cstr, "??0?$_Yarn@D@std@@QAE@PBD@Z"); + SET(_Yarn_char_copy_ctor, "??0?$_Yarn@D@std@@QAE@ABV01@@Z"); + SET(_Yarn_char_dtor, "??1?$_Yarn@D@std@@QAE@XZ"); + SET(_Yarn_char_c_str, "?_C_str@?$_Yarn@D@std@@QBEPBDXZ"); + SET(_Yarn_char_empty, "?_Empty@?$_Yarn@D@std@@QBE_NXZ"); + } + + init_thiscall_thunk(); + return TRUE; +} + +static void test__Yarn_char(void) +{ + _Yarn_char c1, c2; + char bool_ret; + const char *str; + + call_func2(_Yarn_char_ctor_cstr, &c1, NULL); + ok(!c1.str, "c1.str = %s\n", c1.str); + ok(!c1.null_str, "c1.null_str = %d\n", c1.null_str); + bool_ret = (char)(INT_PTR)call_func1(_Yarn_char_empty, &c1); + ok(bool_ret == 1, "ret = %d\n", bool_ret); + str = call_func1(_Yarn_char_c_str, &c1); + ok(str == &c1.null_str, "str = %p, expected %p\n", str, &c1.null_str); + call_func1(_Yarn_char_dtor, &c1); + + call_func2(_Yarn_char_ctor_cstr, &c1, ""); + ok(c1.str != NULL, "c1.str = NULL\n"); + ok(!strcmp(c1.str, ""), "c1.str = %s\n", c1.str); + ok(!c1.null_str, "c1.null_str = %d\n", c1.null_str); + bool_ret = (char)(INT_PTR)call_func1(_Yarn_char_empty, &c1); + ok(bool_ret == 0, "ret = %d\n", bool_ret); + str = call_func1(_Yarn_char_c_str, &c1); + ok(str == c1.str, "str = %p, expected %p\n", str, c1.str); + call_func1(_Yarn_char_dtor, &c1); + + call_func2(_Yarn_char_ctor_cstr, &c1, "test"); + ok(!strcmp(c1.str, "test"), "c1.str = %s\n", c1.str); + ok(!c1.null_str, "c1.null_str = %d\n", c1.null_str); + bool_ret = (char)(INT_PTR)call_func1(_Yarn_char_empty, &c1); + ok(bool_ret == 0, "ret = %d\n", bool_ret); + str = call_func1(_Yarn_char_c_str, &c1); + ok(str == c1.str, "str = %p, expected %p\n", str, c1.str); + + call_func2(_Yarn_char_copy_ctor, &c2, &c1); + ok(c1.str != c2.str, "c1.str = c2.str\n"); + ok(!strcmp(c2.str, "test"), "c2.str = %s\n", c2.str); + ok(!c2.null_str, "c2.null_str = %d\n", c2.null_str); + call_func1(_Yarn_char_dtor, &c2); + + c1.null_str = 'a'; + call_func2(_Yarn_char_copy_ctor, &c2, &c1); + ok(c1.str != c2.str, "c1.str = c2.str\n"); + ok(!strcmp(c2.str, "test"), "c2.str = %s\n", c2.str); + ok(!c2.null_str, "c2.null_str = %d\n", c2.null_str); + call_func1(_Yarn_char_dtor, &c2); + call_func1(_Yarn_char_dtor, &c1); +} + +START_TEST(string) +{ + if(!init()) + return; + + test__Yarn_char(); +}
1
0
0
0
Piotr Caban : msvcp100: Added _Yarn<char> class implementation.
by Alexandre Julliard
17 Oct '12
17 Oct '12
Module: wine Branch: master Commit: f0a547595c3094f5ba2c0595eb02439db34b5bb5 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f0a547595c3094f5ba2c0595e…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 09:56:09 2012 +0200 msvcp100: Added _Yarn<char> class implementation. --- dlls/msvcp100/msvcp.h | 6 ++ dlls/msvcp100/msvcp100.spec | 44 +++++++++--------- dlls/msvcp100/string.c | 109 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 137 insertions(+), 22 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=f0a547595c3094f5ba2c0…
1
0
0
0
Hans Leidekker : mapi32: Forward WrapCompressedRTFStream to the registered provider, if any.
by Alexandre Julliard
17 Oct '12
17 Oct '12
Module: wine Branch: master Commit: ce2bd9eb1f426bbef9c9810b7ebce42ca8ab479a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ce2bd9eb1f426bbef9c9810b7…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 17 11:09:08 2012 +0200 mapi32: Forward WrapCompressedRTFStream to the registered provider, if any. --- dlls/mapi32/mapi32.spec | 4 ++-- dlls/mapi32/util.c | 13 +++++++++++++ dlls/mapi32/util.h | 1 + 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/mapi32/mapi32.spec b/dlls/mapi32/mapi32.spec index c84cfd4..f5a1bef 100644 --- a/dlls/mapi32/mapi32.spec +++ b/dlls/mapi32/mapi32.spec @@ -122,8 +122,8 @@ 182 stdcall FBadColumnSet@4(ptr) FBadColumnSet 183 stub RTFSync@12 184 stub RTFSync -185 stub WrapCompressedRTFStream@12 -186 stub WrapCompressedRTFStream +185 stdcall WrapCompressedRTFStream@12(ptr long ptr) WrapCompressedRTFStream +186 stdcall WrapCompressedRTFStream(ptr long ptr) 187 stub __ValidateParameters@8 188 stub __CPPValidateParameters@8 189 stub FBadSortOrderSet@4 diff --git a/dlls/mapi32/util.c b/dlls/mapi32/util.c index 2b1957c..c94e3cf 100644 --- a/dlls/mapi32/util.c +++ b/dlls/mapi32/util.c @@ -935,6 +935,18 @@ HRESULT WINAPI HrQueryAllRows(LPMAPITABLE lpTable, LPSPropTagArray lpPropTags, return MAPI_E_CALL_FAILED; } +/************************************************************************** + * WrapCompressedRTFStream (MAPI32.186) + */ +HRESULT WINAPI WrapCompressedRTFStream(LPSTREAM compressed, ULONG flags, LPSTREAM *uncompressed) +{ + if (mapiFunctions.WrapCompressedRTFStream) + return mapiFunctions.WrapCompressedRTFStream(compressed, flags, uncompressed); + + FIXME("(%p, 0x%08x, %p): stub\n", compressed, flags, uncompressed); + return MAPI_E_NO_SUPPORT; +} + static HMODULE mapi_provider; static HMODULE mapi_ex_provider; @@ -1099,6 +1111,7 @@ void load_mapi_providers(void) mapiFunctions.MAPIOpenLocalFormContainer = (void *) GetProcAddress(mapi_ex_provider, "MAPIOpenLocalFormContainer"); mapiFunctions.OpenStreamOnFile = (void*) GetProcAddress(mapi_ex_provider, "OpenStreamOnFile@24"); mapiFunctions.ScInitMapiUtil = (void*) GetProcAddress(mapi_ex_provider, "ScInitMapiUtil@4"); + mapiFunctions.WrapCompressedRTFStream = (void*) GetProcAddress(mapi_ex_provider, "WrapCompressedRTFStream@12"); } cleanUp: diff --git a/dlls/mapi32/util.h b/dlls/mapi32/util.h index 4582855..e8a5241 100644 --- a/dlls/mapi32/util.h +++ b/dlls/mapi32/util.h @@ -59,6 +59,7 @@ typedef struct MAPI_FUNCTIONS { HRESULT (WINAPI *HrQueryAllRows) (LPMAPITABLE, LPSPropTagArray, LPSRestriction, LPSSortOrderSet, LONG, LPSRowSet *); HRESULT (WINAPI *OpenStreamOnFile) (LPALLOCATEBUFFER, LPFREEBUFFER, ULONG, LPWSTR, LPWSTR, LPSTREAM *); SCODE (WINAPI *ScInitMapiUtil) (ULONG ulReserved); + HRESULT (WINAPI *WrapCompressedRTFStream) (LPSTREAM, ULONG, LPSTREAM *); } MAPI_FUNCTIONS; extern MAPI_FUNCTIONS mapiFunctions DECLSPEC_HIDDEN;
1
0
0
0
Hans Leidekker : wbemprox: Add tests for Win32_Service methods.
by Alexandre Julliard
17 Oct '12
17 Oct '12
Module: wine Branch: master Commit: 7879326f8a96541d2b8a63382ed5118cf0b5e552 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7879326f8a96541d2b8a63382…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 17 11:08:40 2012 +0200 wbemprox: Add tests for Win32_Service methods. --- dlls/wbemprox/tests/query.c | 88 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 88 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index e531b3c..07e8632 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -125,6 +125,93 @@ static void test_select( IWbemServices *services ) SysFreeString( query ); } +static void test_Win32_Service( IWbemServices *services ) +{ + static const WCHAR returnvalueW[] = {'R','e','t','u','r','n','V','a','l','u','e',0}; + static const WCHAR pauseserviceW[] = {'P','a','u','s','e','S','e','r','v','i','c','e',0}; + static const WCHAR resumeserviceW[] = {'R','e','s','u','m','e','S','e','r','v','i','c','e',0}; + static const WCHAR startserviceW[] = {'S','t','a','r','t','S','e','r','v','i','c','e',0}; + static const WCHAR stopserviceW[] = {'S','t','o','p','S','e','r','v','i','c','e',0}; + static const WCHAR stateW[] = {'S','t','a','t','e',0}; + static const WCHAR stoppedW[] = {'S','t','o','p','p','e','d',0}; + static const WCHAR serviceW[] = {'W','i','n','3','2','_','S','e','r','v','i','c','e','.', + 'N','a','m','e','=','"','S','p','o','o','l','e','r','"',0}; + BSTR class = SysAllocString( serviceW ), method; + IWbemClassObject *service, *out; + VARIANT state, retval; + CIMTYPE type; + HRESULT hr; + + hr = IWbemServices_GetObject( services, class, 0, NULL, &service, NULL ); + if (hr != S_OK) + { + win_skip( "Win32_Service not available\n" ); + return; + } + type = 0xdeadbeef; + VariantInit( &state ); + hr = IWbemClassObject_Get( service, stateW, 0, &state, &type, NULL ); + ok( hr == S_OK, "failed to get service state %08x\n", hr ); + ok( V_VT( &state ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &state ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + + if (!lstrcmpW( V_BSTR( &state ), stoppedW )) + { + out = NULL; + method = SysAllocString( startserviceW ); + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, NULL, &out, NULL ); + ok( hr == S_OK, "failed to execute method %08x\n", hr ); + SysFreeString( method ); + + VariantInit( &retval ); + hr = IWbemClassObject_Get( out, returnvalueW, 0, &retval, NULL, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( !V_I4( &retval ), "unexpected error %u\n", V_UI4( &retval ) ); + IWbemClassObject_Release( out ); + } + out = NULL; + method = SysAllocString( pauseserviceW ); + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, NULL, &out, NULL ); + ok( hr == S_OK, "failed to execute method %08x\n", hr ); + SysFreeString( method ); + + VariantInit( &retval ); + hr = IWbemClassObject_Get( out, returnvalueW, 0, &retval, NULL, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( V_I4( &retval ), "unexpected success\n" ); + IWbemClassObject_Release( out ); + + out = NULL; + method = SysAllocString( resumeserviceW ); + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, NULL, &out, NULL ); + ok( hr == S_OK, "failed to execute method %08x\n", hr ); + SysFreeString( method ); + + VariantInit( &retval ); + hr = IWbemClassObject_Get( out, returnvalueW, 0, &retval, NULL, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( V_I4( &retval ), "unexpected success\n" ); + IWbemClassObject_Release( out ); + + if (!lstrcmpW( V_BSTR( &state ), stoppedW )) + { + out = NULL; + method = SysAllocString( stopserviceW ); + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, NULL, &out, NULL ); + ok( hr == S_OK, "failed to execute method %08x\n", hr ); + SysFreeString( method ); + + VariantInit( &retval ); + hr = IWbemClassObject_Get( out, returnvalueW, 0, &retval, NULL, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( !V_I4( &retval ), "unexpected error %u\n", V_UI4( &retval ) ); + IWbemClassObject_Release( out ); + } + VariantClear( &state ); + IWbemClassObject_Release( service ); + SysFreeString( class ); +} + static void test_StdRegProv( IWbemServices *services ) { static const WCHAR enumkeyW[] = {'E','n','u','m','K','e','y',0}; @@ -327,6 +414,7 @@ START_TEST(query) ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); test_select( services ); + test_Win32_Service( services ); test_StdRegProv( services ); SysFreeString( path );
1
0
0
0
Hans Leidekker : wbemprox: Implement Win32_Service.StopService.
by Alexandre Julliard
17 Oct '12
17 Oct '12
Module: wine Branch: master Commit: d5cbcc1e70df7c5b0955d0e554a8ae807a3f579c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d5cbcc1e70df7c5b0955d0e55…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 17 11:08:14 2012 +0200 wbemprox: Implement Win32_Service.StopService. --- dlls/wbemprox/builtin.c | 6 +++++- dlls/wbemprox/service.c | 35 +++++++++++++++++++++++++++++++++++ dlls/wbemprox/wbemprox_private.h | 2 ++ 3 files changed, 42 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 69fbc18..3608a0c 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -295,7 +295,8 @@ static const struct column col_service[] = /* methods */ { method_pauseserviceW, CIM_FLAG_ARRAY|COL_FLAG_METHOD }, { method_resumeserviceW, CIM_FLAG_ARRAY|COL_FLAG_METHOD }, - { method_startserviceW, CIM_FLAG_ARRAY|COL_FLAG_METHOD } + { method_startserviceW, CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { method_stopserviceW, CIM_FLAG_ARRAY|COL_FLAG_METHOD } }; static const struct column col_sounddevice[] = { @@ -477,6 +478,7 @@ struct record_service class_method *pause_service; class_method *resume_service; class_method *start_service; + class_method *stop_service; }; struct record_sounddevice { @@ -521,6 +523,7 @@ static const struct record_params data_params[] = { class_serviceW, method_pauseserviceW, -1, param_returnvalueW, CIM_UINT32, VT_I4 }, { class_serviceW, method_resumeserviceW, -1, param_returnvalueW, CIM_UINT32, VT_I4 }, { class_serviceW, method_startserviceW, -1, param_returnvalueW, CIM_UINT32, VT_I4 }, + { class_serviceW, method_stopserviceW, -1, param_returnvalueW, CIM_UINT32, VT_I4 }, { class_stdregprovW, method_enumkeyW, 1, param_defkeyW, CIM_SINT32, 0, 0x80000002 }, { class_stdregprovW, method_enumkeyW, 1, param_subkeynameW, CIM_STRING }, { class_stdregprovW, method_enumkeyW, -1, param_returnvalueW, CIM_UINT32, VT_I4 }, @@ -1122,6 +1125,7 @@ static void fill_service( struct table *table ) rec->pause_service = service_pause_service; rec->resume_service = service_resume_service; rec->start_service = service_start_service; + rec->stop_service = service_stop_service; heap_free( config ); offset += sizeof(*rec); num_rows++; diff --git a/dlls/wbemprox/service.c b/dlls/wbemprox/service.c index cd377b9..62ac69b 100644 --- a/dlls/wbemprox/service.c +++ b/dlls/wbemprox/service.c @@ -205,3 +205,38 @@ done: if (hr != S_OK) IWbemClassObject_Release( *out ); return hr; } + +HRESULT service_stop_service( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + VARIANT name, retval; + IWbemClassObject *sig; + HRESULT hr; + + TRACE("%p, %p, %p\n", obj, in, out); + + hr = IWbemClassObject_Get( obj, prop_nameW, 0, &name, NULL, NULL ); + if (hr != S_OK) return hr; + + hr = create_signature( class_serviceW, method_stopserviceW, PARAM_OUT, &sig ); + if (hr != S_OK) + { + VariantClear( &name ); + return hr; + } + hr = IWbemClassObject_SpawnInstance( sig, 0, out ); + if (hr != S_OK) + { + VariantClear( &name ); + IWbemClassObject_Release( sig ); + return hr; + } + hr = control_service( V_BSTR(&name), SERVICE_CONTROL_STOP, &retval ); + if (hr != S_OK) goto done; + hr = IWbemClassObject_Put( *out, param_returnvalueW, 0, &retval, CIM_UINT32 ); + +done: + VariantClear( &name ); + IWbemClassObject_Release( sig ); + if (hr != S_OK) IWbemClassObject_Release( *out ); + return hr; +} diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 39870bf..4351732 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -204,6 +204,7 @@ HRESULT reg_get_stringvalue(IWbemClassObject *, IWbemClassObject *, IWbemClassOb HRESULT service_pause_service(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT service_resume_service(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT service_start_service(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT service_stop_service(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1); static inline void *heap_alloc( size_t len ) @@ -247,6 +248,7 @@ static const WCHAR method_getstringvalueW[] = {'G','e','t','S','t','r','i','n',' static const WCHAR method_pauseserviceW[] = {'P','a','u','s','e','S','e','r','v','i','c','e',0}; static const WCHAR method_resumeserviceW[] = {'R','e','s','u','m','e','S','e','r','v','i','c','e',0}; static const WCHAR method_startserviceW[] = {'S','t','a','r','t','S','e','r','v','i','c','e',0}; +static const WCHAR method_stopserviceW[] = {'S','t','o','p','S','e','r','v','i','c','e',0}; static const WCHAR param_defkeyW[] = {'h','D','e','f','K','e','y',0}; static const WCHAR param_namesW[] = {'s','N','a','m','e','s',0};
1
0
0
0
← Newer
1
...
41
42
43
44
45
46
47
...
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