October 2012 - Wine-Commits

Piotr Caban : msvcp71: Added strstream class implementation.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

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(a)std@@6B@ */ @@ -467,6 +475,10 @@ extern const vtable_ptr MSVCP_basic_stringstream_short_vtable; /* ??_7strstreambuf(a)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(a)H@std@@"); DEFINE_RTTI_DATA1(ios_base, 0, &iosb_rtti_base_descriptor, ".?AV?$_Iosb(a)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(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@"); DEFINE_RTTI_DATA1(strstreambuf, sizeof(strstreambuf), &basic_streambuf_char_rtti_base_descriptor, ".?AVstrstreambuf(a)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(a)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(a)std@@QAE(a)PACH0@Z */ +/* ??0strstreambuf(a)std@@QEAA(a)PEAC_J0@Z */ +/* ??0strstreambuf(a)std@@QAE(a)PADH0@Z */ +/* ??0strstreambuf(a)std@@QEAA(a)PEAD_J0@Z */ +/* ??0strstreambuf(a)std@@QAE(a)PAEH0@Z */ +/* ??0strstreambuf(a)std@@QEAA(a)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(a)strstreambuf@std@@IAEXXZ */ /* ?_Tidy(a)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(a)std@@QAE(a)PADHH@Z */ +/* ??0strstream(a)std@@QEAA(a)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(a)std@@UAE(a)XZ */ +/* ??1strstream(a)std@@UEAA(a)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(a)std@@QAE(a)I@Z @ stub -arch=win64 ??0money_base(a)std@@QEAA(a)_K@Z @ stub -arch=win32 ??0ostrstream(a)std@@QAE(a)PADHH@Z -@ stub -arch=win32 ??0strstream(a)std@@QAE(a)PADHH@Z -@ stub -arch=win64 ??0strstream(a)std@@QEAA(a)PEAD_JH@Z +@ thiscall -arch=win32 ??0strstream(a)std@@QAE(a)PADHH@Z(ptr ptr long long long) strstream_ctor +@ cdecl -arch=win64 ??0strstream(a)std@@QEAA(a)PEAD_JH@Z(ptr ptr long long long) strstream_ctor @ stub -arch=win32 ??0time_base(a)std@@QAE(a)I@Z @ stub -arch=win64 ??0time_base(a)std@@QEAA(a)_K@Z @ stub -arch=win32 ??1?$_Mpunct(a)D@std@@MAE(a)XZ @@ -1207,8 +1207,8 @@ @ stub -arch=win64 ??1money_base(a)std@@UEAA(a)XZ @ stub -arch=win32 ??1ostrstream(a)std@@UAE(a)XZ @ stub -arch=win64 ??1ostrstream(a)std@@UEAA(a)XZ -@ stub -arch=win32 ??1strstream(a)std@@UAE(a)XZ -@ stub -arch=win64 ??1strstream(a)std@@UEAA(a)XZ +@ thiscall -arch=win32 ??1strstream(a)std@@UAE(a)XZ(ptr) strstream_dtor +@ cdecl -arch=win64 ??1strstream(a)std@@UEAA(a)XZ(ptr) strstream_dtor @ thiscall -arch=win32 ??1strstreambuf(a)std@@UAE(a)XZ(ptr) strstreambuf_dtor @ cdecl -arch=win64 ??1strstreambuf(a)std@@UEAA(a)XZ(ptr) strstreambuf_dtor @ stub -arch=win32 ??1time_base(a)std@@UAE(a)XZ

1 0

Piotr Caban : msvcp90: Fixed strstreambuf_ctor_get implementation.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

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

Piotr Caban : msvcp90: Added _Nomemory implementation.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

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(a)std@@"); DEFINE_CXX_DATA2(failure, &runtime_error_cxx_type_info, &exception_cxx_type_info, MSVCP_runtime_error_dtor); +/* ?_Nomemory(a)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(a)G@std@@QEBAPEBGPEBG0DPEAD_K(a)Z(ptr ptr ptr long ptr long) ctype_wchar__Narrow_s @ thiscall -arch=win32 ?_Narrow_s@?$ctype(a)_W@std@@QBEPB_WPB_W0DPADI(a)Z(ptr ptr ptr long ptr long) ctype_wchar__Narrow_s @ cdecl -arch=win64 ?_Narrow_s@?$ctype(a)_W@std@@QEBAPEB_WPEB_W0DPEAD_K(a)Z(ptr ptr ptr long ptr long) ctype_wchar__Narrow_s -@ stub ?_Nomemory(a)std@@YAXXZ +@ cdecl ?_Nomemory(a)std@@YAXXZ() _Nomemory # extern -arch=win64 ?_Oneplusroot2high@?CA@???$_Fabs(a)M@std@@YAMAEBV?$complex(a)M@1(a)PEAH@Z(a)4MB # extern -arch=win64 ?_Oneplusroot2high@?CA@???$_Fabs(a)N@std@@YANAEBV?$complex(a)N@1(a)PEAH@Z(a)4NB # extern -arch=win64 ?_Oneplusroot2low@?CA@???$_Fabs(a)M@std@@YAMAEBV?$complex(a)M@1(a)PEAH@Z(a)4MB

1 0

Hans Leidekker : mapi32: Forward WrapCompressedRTFStream to the registered provider, if any.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

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(a)4(ptr) FBadColumnSet 183 stub RTFSync(a)12 184 stub RTFSync -185 stub WrapCompressedRTFStream(a)12 -186 stub WrapCompressedRTFStream +185 stdcall WrapCompressedRTFStream(a)12(ptr long ptr) WrapCompressedRTFStream +186 stdcall WrapCompressedRTFStream(ptr long ptr) 187 stub __ValidateParameters(a)8 188 stub __CPPValidateParameters(a)8 189 stub FBadSortOrderSet(a)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(a)24"); mapiFunctions.ScInitMapiUtil = (void*) GetProcAddress(mapi_ex_provider, "ScInitMapiUtil(a)4"); + mapiFunctions.WrapCompressedRTFStream = (void*) GetProcAddress(mapi_ex_provider, "WrapCompressedRTFStream(a)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

Piotr Caban : msvcp60: Added more std::getline functions.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

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(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV12(a)PEAG_J@Z(ptr ptr long) basic_istream_wchar_getline @ thiscall -arch=win32 ?getline@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV12(a)PAGHG@Z(ptr ptr long long) basic_istream_wchar_getline_delim @ cdecl -arch=win64 ?getline@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV12(a)PEAG_JG@Z(ptr ptr long long) basic_istream_wchar_getline_delim -@ stub -arch=win32 ?getline(a)std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)AAV21@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z -@ stub -arch=win64 ?getline(a)std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)AEAV21@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z -@ stub -arch=win32 ?getline(a)std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)AAV21@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1(a)D@Z -@ stub -arch=win64 ?getline(a)std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)AEAV21@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1(a)D@Z -@ stub -arch=win32 ?getline(a)std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)AAV21@AAV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@1@@Z -@ stub -arch=win64 ?getline(a)std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)AEAV21@AEAV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@1@@Z -@ stub -arch=win32 ?getline(a)std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)AAV21@AAV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@1(a)G@Z -@ stub -arch=win64 ?getline(a)std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)AEAV21@AEAV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@1(a)G@Z +@ cdecl -arch=win32 ?getline(a)std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)AAV21@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z(ptr ptr) basic_istream_char_getline_bstr +@ cdecl -arch=win64 ?getline(a)std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)AEAV21@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z(ptr ptr) basic_istream_char_getline_bstr +@ cdecl -arch=win32 ?getline(a)std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)AAV21@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1(a)D@Z(ptr ptr long) basic_istream_char_getline_bstr_delim +@ cdecl -arch=win64 ?getline(a)std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)AEAV21@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1(a)D@Z(ptr ptr long) basic_istream_char_getline_bstr_delim +@ cdecl -arch=win32 ?getline(a)std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)AAV21@AAV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@1@@Z(ptr ptr) basic_istream_wchar_getline_bstr +@ cdecl -arch=win64 ?getline(a)std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)AEAV21@AEAV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@1@@Z(ptr ptr) basic_istream_wchar_getline_bstr +@ cdecl -arch=win32 ?getline(a)std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)AAV21@AAV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@1(a)G@Z(ptr ptr long) basic_istream_wchar_getline_bstr_delim +@ cdecl -arch=win64 ?getline(a)std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)AEAV21@AEAV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@1(a)G@Z(ptr ptr long) basic_istream_wchar_getline_bstr_delim @ stub -arch=win32 ?getloc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAE?AVlocale(a)2@XZ @ stub -arch=win64 ?getloc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAA?AVlocale(a)2@XZ @ stub -arch=win32 ?getloc@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QAE?AVlocale(a)2@XZ

1 0

Hans Leidekker : wbemprox: Implement Win32_Service.ResumeService.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: 139c9f02765134bf93919d45555ab7adf5c0b2a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=139c9f02765134bf93919d455… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 17 11:07:38 2012 +0200 wbemprox: Implement Win32_Service.ResumeService. --- 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 5138fde..5ed2742 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -293,7 +293,8 @@ static const struct column col_service[] = { prop_stateW, CIM_STRING }, { prop_systemnameW, CIM_STRING|COL_FLAG_DYNAMIC }, /* methods */ - { method_pauseserviceW, CIM_FLAG_ARRAY|COL_FLAG_METHOD } + { method_pauseserviceW, CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { method_resumeserviceW, CIM_FLAG_ARRAY|COL_FLAG_METHOD } }; static const struct column col_sounddevice[] = { @@ -473,6 +474,7 @@ struct record_service const WCHAR *systemname; /* methods */ class_method *pause_service; + class_method *resume_service; }; struct record_sounddevice { @@ -515,6 +517,7 @@ static const struct record_diskdrive data_diskdrive[] = 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_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 }, @@ -1114,6 +1117,7 @@ static void fill_service( struct table *table ) rec->state = get_service_state( status->dwCurrentState ); rec->systemname = heap_strdupW( sysnameW ); rec->pause_service = service_pause_service; + rec->resume_service = service_resume_service; heap_free( config ); offset += sizeof(*rec); num_rows++; diff --git a/dlls/wbemprox/service.c b/dlls/wbemprox/service.c index 7c6aabf..f381a4b 100644 --- a/dlls/wbemprox/service.c +++ b/dlls/wbemprox/service.c @@ -111,3 +111,38 @@ done: if (hr != S_OK) IWbemClassObject_Release( *out ); return hr; } + +HRESULT service_resume_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_resumeserviceW, 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_CONTINUE, &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 c2181c0..7f5bc6a 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -202,6 +202,7 @@ HRESULT reg_enum_key(IWbemClassObject *, IWbemClassObject *, IWbemClassObject ** HRESULT reg_enum_values(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT reg_get_stringvalue(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT service_pause_service(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT service_resume_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 ) @@ -243,6 +244,7 @@ static const WCHAR method_enumkeyW[] = {'E','n','u','m','K','e','y',0}; static const WCHAR method_enumvaluesW[] = {'E','n','u','m','V','a','l','u','e','s',0}; static const WCHAR method_getstringvalueW[] = {'G','e','t','S','t','r','i','n','g','V','a','l','u','e',0}; 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 param_defkeyW[] = {'h','D','e','f','K','e','y',0}; static const WCHAR param_namesW[] = {'s','N','a','m','e','s',0};

1 0

Hans Leidekker : wbemprox: Add tests for Win32_Service methods.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

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

Hans Leidekker : wbemprox: Implement Win32_Service.StartService.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: 60cab77b375e7cf3113fdb828c09ffa81eb302b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60cab77b375e7cf3113fdb828… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 17 11:07:57 2012 +0200 wbemprox: Implement Win32_Service.StartService. --- dlls/wbemprox/builtin.c | 6 +++- dlls/wbemprox/service.c | 59 ++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/wbemprox_private.h | 2 + 3 files changed, 66 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 5ed2742..69fbc18 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -294,7 +294,8 @@ static const struct column col_service[] = { prop_systemnameW, CIM_STRING|COL_FLAG_DYNAMIC }, /* methods */ { method_pauseserviceW, CIM_FLAG_ARRAY|COL_FLAG_METHOD }, - { method_resumeserviceW, CIM_FLAG_ARRAY|COL_FLAG_METHOD } + { method_resumeserviceW, CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { method_startserviceW, CIM_FLAG_ARRAY|COL_FLAG_METHOD } }; static const struct column col_sounddevice[] = { @@ -475,6 +476,7 @@ struct record_service /* methods */ class_method *pause_service; class_method *resume_service; + class_method *start_service; }; struct record_sounddevice { @@ -518,6 +520,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_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 }, @@ -1118,6 +1121,7 @@ static void fill_service( struct table *table ) rec->systemname = heap_strdupW( sysnameW ); rec->pause_service = service_pause_service; rec->resume_service = service_resume_service; + rec->start_service = service_start_service; heap_free( config ); offset += sizeof(*rec); num_rows++; diff --git a/dlls/wbemprox/service.c b/dlls/wbemprox/service.c index f381a4b..cd377b9 100644 --- a/dlls/wbemprox/service.c +++ b/dlls/wbemprox/service.c @@ -146,3 +146,62 @@ done: if (hr != S_OK) IWbemClassObject_Release( *out ); return hr; } + +static HRESULT start_service( const WCHAR *name, VARIANT *retval ) +{ + SC_HANDLE manager, service = NULL; + UINT error = 0; + + if (!(manager = OpenSCManagerW( NULL, NULL, SC_MANAGER_ENUMERATE_SERVICE ))) + { + error = map_error( GetLastError() ); + goto done; + } + if (!(service = OpenServiceW( manager, name, SERVICE_START ))) + { + error = map_error( GetLastError() ); + goto done; + } + if (!StartServiceW( service, 0, NULL )) error = map_error( GetLastError() ); + +done: + set_variant( VT_UI4, error, NULL, retval ); + CloseServiceHandle( service ); + CloseServiceHandle( manager ); + return S_OK; +} + +HRESULT service_start_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_startserviceW, 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 = start_service( V_BSTR(&name), &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 7f5bc6a..39870bf 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -203,6 +203,7 @@ HRESULT reg_enum_values(IWbemClassObject *, IWbemClassObject *, IWbemClassObject HRESULT reg_get_stringvalue(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; 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; static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1); static inline void *heap_alloc( size_t len ) @@ -245,6 +246,7 @@ static const WCHAR method_enumvaluesW[] = {'E','n','u','m','V','a','l','u','e',' static const WCHAR method_getstringvalueW[] = {'G','e','t','S','t','r','i','n','g','V','a','l','u','e',0}; 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 param_defkeyW[] = {'h','D','e','f','K','e','y',0}; static const WCHAR param_namesW[] = {'s','N','a','m','e','s',0};

1 0

Piotr Caban : msvcp100: Added _Yarn<char> class implementation.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

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

Hans Leidekker : wbemprox: Implement Win32_Service.StopService.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

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