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

André Hentschel : d3drm: Implement IDirect3DRMMeshBuilderX_GetClassName.
by Alexandre Julliard 15 Jun '12

15 Jun '12

Module: wine Branch: master Commit: afe616b5885ee89e71f2244d676aafabf27a1e9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=afe616b5885ee89e71f2244d6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 14 20:31:22 2012 +0200 d3drm: Implement IDirect3DRMMeshBuilderX_GetClassName. --- dlls/d3drm/meshbuilder.c | 18 ++++++++++++------ dlls/d3drm/tests/d3drm.c | 22 ++++++++++++++++------ 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 21cfc2f..a05c597 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -454,13 +454,13 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetName(IDirect3DRMMeshBuilder } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetClassName(IDirect3DRMMeshBuilder2* iface, - LPDWORD lpdwSize, LPSTR lpName) + LPDWORD size, LPSTR name) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - FIXME("(%p)->(%p,%p): stub\n", This, lpdwSize, lpName); + TRACE("(%p)->(%p, %p)\n", This, size, name); - return E_NOTIMPL; + return IDirect3DRMMeshBuilder3_GetClassName(&This->IDirect3DRMMeshBuilder3_iface, size, name); } /*** IDirect3DRMMeshBuilder2 methods ***/ @@ -1080,13 +1080,19 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetName(IDirect3DRMMeshBuilder } static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetClassName(IDirect3DRMMeshBuilder3* iface, - LPDWORD lpdwSize, LPSTR lpName) + LPDWORD size, LPSTR name) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - FIXME("(%p)->(%p,%p): stub\n", This, lpdwSize, lpName); + TRACE("(%p)->(%p, %p)\n", This, size, name); - return E_NOTIMPL; + if (!size || *size < strlen("Builder") || !name) + return E_INVALIDARG; + + strcpy(name, "Builder"); + *size = sizeof("Builder"); + + return D3DRM_OK; } HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index bbe2da3..2766098 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -198,13 +198,18 @@ static void test_MeshBuilder(void) hr = IDirect3DRM_CreateMeshBuilder(pD3DRM, &pMeshBuilder); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr); + hr = IDirect3DRMMeshBuilder_GetClassName(pMeshBuilder, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMMeshBuilder_GetClassName(pMeshBuilder, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = 1; + hr = IDirect3DRMMeshBuilder_GetClassName(pMeshBuilder, &size, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); size = sizeof(cname); hr = IDirect3DRMMeshBuilder_GetClassName(pMeshBuilder, &size, cname); - todo_wine { ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); - ok(size != sizeof(cname), "size didn't change: %u\n", size); + ok(size == sizeof("Builder"), "wrong strlen: %u\n", size); ok(!strcmp(cname, "Builder"), "Expected cname to be \"Builder\", but got \"%s\"\n", cname); - } info.lpMemory = data_bad_version; info.dSize = strlen(data_bad_version); @@ -463,13 +468,18 @@ static void test_MeshBuilder3(void) hr = IDirect3DRM3_CreateMeshBuilder(pD3DRM3, &pMeshBuilder3); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder3 interface (hr = %x)\n", hr); + hr = IDirect3DRMMeshBuilder3_GetClassName(pMeshBuilder3, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMMeshBuilder3_GetClassName(pMeshBuilder3, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = 1; + hr = IDirect3DRMMeshBuilder3_GetClassName(pMeshBuilder3, &size, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); size = sizeof(cname); hr = IDirect3DRMMeshBuilder3_GetClassName(pMeshBuilder3, &size, cname); - todo_wine { ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); - ok(size != sizeof(cname), "size didn't change: %u\n", size); + ok(size == sizeof("Builder"), "wrong strlen: %u\n", size); ok(!strcmp(cname, "Builder"), "Expected cname to be \"Builder\", but got \"%s\"\n", cname); - } info.lpMemory = data_bad_version; info.dSize = strlen(data_bad_version);

1 0

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

15 Jun '12

Module: wine Branch: master Commit: e43f6ec6385fdefa87138c2881a29e593a101b32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e43f6ec6385fdefa87138c288… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 15 11:07:23 2012 +0200 msvcp90: Added operator<<(basic_ostream<char>, basic_string<char>) implementation. --- dlls/msvcp90/ios.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 1 + dlls/msvcp90/msvcp90.spec | 4 ++-- dlls/msvcp90/string.c | 2 +- 4 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 9cb3a59..4fd7640 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -3940,6 +3940,50 @@ basic_ostream_char* __cdecl basic_ostream_char_endl(basic_ostream_char *ostr) return ostr; } +/* $?6DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z */ +/* ??$?6DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z */ +basic_ostream_char* __cdecl basic_ostream_char_print_bstr(basic_ostream_char *ostr, const basic_string_char *str) +{ + basic_ios_char *base = basic_ostream_char_get_basic_ios(ostr); + IOSB_iostate state = IOSTATE_goodbit; + + TRACE("(%p %p)\n", ostr, str); + + if(basic_ostream_char_sentry_create(ostr)) { + MSVCP_size_t len = MSVCP_basic_string_char_length(str); + streamsize pad = (base->base.wide>len ? base->base.wide-len : 0); + + if((base->base.fmtfl & FMTFLAG_adjustfield) != FMTFLAG_left) { + for(; pad!=0; pad--) { + if(basic_streambuf_char_sputc(base->strbuf, base->fillch) == EOF) { + state = IOSTATE_badbit; + break; + } + } + } + + if(state == IOSTATE_goodbit) { + if(basic_streambuf_char_sputn(base->strbuf, MSVCP_basic_string_char_c_str(str), len) != len) + state = IOSTATE_badbit; + } + + for(; pad!=0; pad--) { + if(basic_streambuf_char_sputc(base->strbuf, base->fillch) == EOF) { + state = IOSTATE_badbit; + break; + } + } + + base->base.wide = 0; + }else { + state = IOSTATE_badbit; + } + basic_ostream_char_sentry_destroy(ostr); + + basic_ios_char_setstate(base, state); + return ostr; +} + /* Caution: basic_istream uses virtual inheritance. */ static inline basic_ios_char* basic_istream_char_get_basic_ios(basic_istream_char *this) { diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 4523845..a7091ee 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -258,6 +258,7 @@ void __stdcall MSVCP_basic_string_char_dtor(basic_string_char*); const char* __stdcall MSVCP_basic_string_char_c_str(const basic_string_char*); void __thiscall MSVCP_basic_string_char_clear(basic_string_char*); basic_string_char* __thiscall MSVCP_basic_string_char_append_ch(basic_string_char*, char); +MSVCP_size_t __thiscall MSVCP_basic_string_char_length(const basic_string_char*); #define BUF_SIZE_WCHAR 8 typedef struct _basic_string_wchar diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 5c2477a..5290c68 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -42,8 +42,8 @@ @ stub -arch=win64 ??$?5_WU?$char_traits(a)_W@std@@@std@@YAAEAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@0(a)AEAV10@PEA_W(a)Z @ stub -arch=win32 ??$?5_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YAAAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@AAV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0@@Z @ stub -arch=win64 ??$?5_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YAAEAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@0(a)AEAV10@AEAV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0@@Z -@ stub -arch=win32 ??$?6DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z -@ stub -arch=win64 ??$?6DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z +@ cdecl -arch=win32 ??$?6DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(ptr ptr) basic_ostream_char_print_bstr +@ cdecl -arch=win64 ??$?6DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(ptr ptr) basic_ostream_char_print_bstr @ stub -arch=win32 ??$?6GU?$char_traits(a)G@std@@@std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@G(a)Z @ stub -arch=win64 ??$?6GU?$char_traits(a)G@std@@@std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@G(a)Z @ stub -arch=win32 ??$?6GU?$char_traits(a)G@std@@@std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@PBG(a)Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index e404699..bb42944 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1077,7 +1077,7 @@ void __thiscall MSVCP_basic_string_char_dtor(basic_string_char *this) /* ?length@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIXZ */ /* ?length@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_length, 4) -MSVCP_size_t __thiscall MSVCP_basic_string_char_length(basic_string_char *this) +MSVCP_size_t __thiscall MSVCP_basic_string_char_length(const basic_string_char *this) { TRACE("%p\n", this); return this->size;

1 0

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

15 Jun '12

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

1 0

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

15 Jun '12

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

1 0

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

15 Jun '12

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

1 0

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

15 Jun '12

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

1 0

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

15 Jun '12

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

1 0

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

15 Jun '12

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

1 0

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

15 Jun '12

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

1 0

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

15 Jun '12

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

1 0