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

Hans Leidekker : wbemprox: Add stub implementations of IEnumWbemClassObject and IWbemClassObject.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: 06b573279843af81f16973e3bfb7476c46d5ac35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06b573279843af81f16973e3b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 14 16:03:26 2012 +0200 wbemprox: Add stub implementations of IEnumWbemClassObject and IWbemClassObject. --- dlls/wbemprox/Makefile.in | 1 + dlls/wbemprox/class.c | 488 ++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/wbemlocator.c | 4 +- dlls/wbemprox/wbemprox_private.h | 11 + 4 files changed, 502 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=06b573279843af81f1697…

1 0

Andrew Eikum : dsound: Fail if app requests 3D buffer interface on a non-3D buffer.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: bf263a347d904b01673ab19cd35927881255544d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf263a347d904b01673ab19cd… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jun 14 09:25:48 2012 -0500 dsound: Fail if app requests 3D buffer interface on a non-3D buffer. --- dlls/dsound/buffer.c | 4 ++++ dlls/dsound/tests/ds3d.c | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 08f4ba7..caf1f86 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -764,9 +764,13 @@ static HRESULT WINAPI IDirectSoundBufferImpl_QueryInterface(IDirectSoundBuffer8 } if ( IsEqualGUID( &IID_IDirectSound3DBuffer, riid ) ) { + if(This->dsbd.dwFlags & DSBCAPS_CTRL3D){ IDirectSound3DBuffer_AddRef(&This->IDirectSound3DBuffer_iface); *ppobj = &This->IDirectSound3DBuffer_iface; return S_OK; + } + TRACE("app requested IDirectSound3DBuffer on non-3D secondary buffer\n"); + return E_NOINTERFACE; } if ( IsEqualGUID( &IID_IDirectSound3DListener, riid ) ) { diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 0fbbfe8..86099bf 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -801,7 +801,7 @@ static HRESULT test_secondary(LPGUID lpGuid, int play, ZeroMemory(&bufdesc, sizeof(bufdesc)); bufdesc.dwSize=sizeof(bufdesc); bufdesc.dwFlags=DSBCAPS_GETCURRENTPOSITION2; - if (has_3d) + if (has_3dbuffer) bufdesc.dwFlags|=DSBCAPS_CTRL3D; else bufdesc.dwFlags|= @@ -833,6 +833,14 @@ static HRESULT test_secondary(LPGUID lpGuid, int play, wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels, getDSBCAPS(bufdesc.dwFlags),rc); if (rc==DS_OK && secondary!=NULL) { + IDirectSound3DBuffer *ds3d; + + rc=IDirectSoundBuffer_QueryInterface(secondary, &IID_IDirectSound3DBuffer, (void**)&ds3d); + ok((has_3dbuffer && rc==DS_OK) || (!has_3dbuffer && rc==E_NOINTERFACE), + "Wrong return trying to get 3D buffer on %s3D secondary interface: %08x\n", has_3dbuffer ? "" : "non-", rc); + if(rc==DS_OK) + IDirectSound3DBuffer_Release(ds3d); + if (!has_3d) { LONG refvol,vol,refpan,pan;

1 0

Huw Davies : localspl: Have GetPrinterDriverDirectory create the driver directory.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: 69164eac3e50caf82863a401bba8497412993675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69164eac3e50caf82863a401b… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jun 14 15:31:38 2012 +0100 localspl: Have GetPrinterDriverDirectory create the driver directory. This is needed so that during wineprefix creation, winspool.drv can succeed in printer initialisation. --- dlls/localspl/provider.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 4a6e2d2..0c12a0e 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -140,7 +140,8 @@ static const WCHAR printersW[] = {'S','y','s','t','e','m','\\', 'C','o','n','t','r','o','l','\\', 'P','r','i','n','t','\\', 'P','r','i','n','t','e','r','s',0}; -static const WCHAR spooldriversW[] = {'\\','s','p','o','o','l','\\','d','r','i','v','e','r','s','\\',0}; +static const WCHAR spoolW[] = {'\\','s','p','o','o','l',0}; +static const WCHAR driversW[] = {'\\','d','r','i','v','e','r','s','\\',0}; static const WCHAR spoolprtprocsW[] = {'\\','s','p','o','o','l','\\','p','r','t','p','r','o','c','s','\\',0}; static const WCHAR version0_regpathW[] = {'\\','V','e','r','s','i','o','n','-','0',0}; static const WCHAR version0_subdirW[] = {'\\','0',0}; @@ -1077,7 +1078,8 @@ static BOOL WINAPI fpGetPrinterDriverDirectory(LPWSTR pName, LPWSTR pEnvironment /* GetSystemDirectoryW returns number of WCHAR including the '\0' */ needed = GetSystemDirectoryW(NULL, 0); /* add the Size for the Subdirectories */ - needed += lstrlenW(spooldriversW); + needed += lstrlenW(spoolW); + needed += lstrlenW(driversW); needed += lstrlenW(env->subdir); needed *= sizeof(WCHAR); /* return-value is size in Bytes */ @@ -1096,8 +1098,12 @@ static BOOL WINAPI fpGetPrinterDriverDirectory(LPWSTR pName, LPWSTR pEnvironment GetSystemDirectoryW( dir, cbBuf / sizeof(WCHAR) ); /* add the Subdirectories */ - lstrcatW( dir, spooldriversW ); + lstrcatW( dir, spoolW ); + CreateDirectoryW( dir, NULL ); + lstrcatW( dir, driversW ); + CreateDirectoryW( dir, NULL ); lstrcatW( dir, env->subdir ); + CreateDirectoryW( dir, NULL ); TRACE( "=> %s\n", debugstr_w( dir ) ); return TRUE;

1 0

Piotr Caban : msvcp90: Added basic_fstream<char> implementation.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: 38c7a46c5e33c5c50f83b62ea5ac7764c8523426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38c7a46c5e33c5c50f83b62ea… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 14 15:35:45 2012 +0200 msvcp90: Added basic_fstream<char> implementation. --- dlls/msvcp90/ios.c | 233 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 19 ++-- dlls/msvcp90/msvcp90.spec | 70 +++++++------- 3 files changed, 279 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=38c7a46c5e33c5c50f83b…

1 0

Piotr Caban : msvcp90: Export locale::facet vtable.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: 49c6e430d5a9742c5ea0b1dde3d3f5c7c984176a URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c6e430d5a9742c5ea0b1dde… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 14 15:36:04 2012 +0200 msvcp90: Export locale::facet vtable. --- dlls/msvcp90/locale.c | 2 ++ dlls/msvcp90/msvcp90.spec | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 55ec5aa..1d04bcb 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -202,6 +202,8 @@ static void locale_facet_register(locale_facet *add) list_add_head(&lazy_facets, &head->entry); } +/* Not exported from msvcp90 */ +/* ??_7facet(a)locale@std@@6B@ */ extern const vtable_ptr MSVCP_locale_facet_vtable; /* ??0id(a)locale@std@@QAE(a)I@Z */ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index a7014bf..6751118 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5814,3 +5814,4 @@ #Functions not exported in native dll: @ thiscall -arch=win32 ?_Tidy@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AAEX_N(a)Z(ptr long) basic_string_char_tidy_built @ cdecl -arch=win64 ?_Tidy@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AEAAX_N(a)Z(ptr long) basic_string_char_tidy_built +@ extern ??_7facet(a)locale@std@@6B@ MSVCP_locale_facet_vtable

1 0

Piotr Caban : msvcp90: Export locale::facet_Register function.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: 2c156eaeacabd4fe36f188c251f35c46e84cd1fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c156eaeacabd4fe36f188c25… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 14 15:36:26 2012 +0200 msvcp90: Export locale::facet_Register function. --- dlls/msvcp90/locale.c | 5 ++++- dlls/msvcp90/msvcp90.spec | 2 ++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 1d04bcb..4ad37e8 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -190,7 +190,10 @@ typedef struct } facets_elem; static struct list lazy_facets = LIST_INIT(lazy_facets); -static void locale_facet_register(locale_facet *add) +/* Not exported from msvcp90 */ +/* ?facet_Register(a)facet@locale(a)std@@CAXPAV123@@Z */ +/* ?facet_Register(a)facet@locale(a)std@@CAXPEAV123@@Z */ +void __cdecl locale_facet_register(locale_facet *add) { facets_elem *head = MSVCRT_operator_new(sizeof(*head)); if(!head) { diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 6751118..593f3c9 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5815,3 +5815,5 @@ @ thiscall -arch=win32 ?_Tidy@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AAEX_N(a)Z(ptr long) basic_string_char_tidy_built @ cdecl -arch=win64 ?_Tidy@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AEAAX_N(a)Z(ptr long) basic_string_char_tidy_built @ extern ??_7facet(a)locale@std@@6B@ MSVCP_locale_facet_vtable +@ cdecl -arch=win32 ?facet_Register(a)facet@locale(a)std@@CAXPAV123@@Z(ptr) locale_facet_register +@ cdecl -arch=win64 ?facet_Register(a)facet@locale(a)std@@CAXPEAV123@@Z(ptr) locale_facet_register

1 0

Piotr Caban : msvcp80: Added _Getcat implementation for supported facets.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: 2929a0e774cb61102ba7bf15d55a7ee15448e2f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2929a0e774cb61102ba7bf15d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 14 15:36:39 2012 +0200 msvcp80: Added _Getcat implementation for supported facets. --- dlls/msvcp80/msvcp80.c | 123 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp80/msvcp80.spec | 40 +++++++------- 2 files changed, 143 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2929a0e774cb61102ba7b…

1 0

Piotr Caban : msvcp90: Added basic_ostream<char>::endl implementation.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: bcdcef87137c58f4ed5a74f7582fc782d15f30a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcdcef87137c58f4ed5a74f75… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 14 15:36:56 2012 +0200 msvcp90: Added basic_ostream<char>::endl implementation. --- dlls/msvcp90/ios.c | 11 +++++++++++ dlls/msvcp90/msvcp90.spec | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 7d3a6f1..43a951d 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -3929,6 +3929,17 @@ basic_ostream_char* __thiscall basic_ostream_char_print_bool(basic_ostream_char return NULL; } +/* ?endl(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)AAV21@@Z */ +/* ?endl(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)AEAV21@@Z */ +basic_ostream_char* __cdecl basic_ostream_char_endl(basic_ostream_char *ostr) +{ + TRACE("(%p)\n", ostr); + + basic_ostream_char_put(ostr, '\n'); + basic_ostream_char_flush(ostr); + 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.spec b/dlls/msvcp90/msvcp90.spec index 593f3c9..f4c3783 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3719,8 +3719,8 @@ @ cdecl -arch=win64 ?end@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA?AV?$_String_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)XZ(ptr ptr) MSVCP_basic_string_wchar_end @ thiscall -arch=win32 ?end@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBE?AV?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)XZ(ptr ptr) MSVCP_basic_string_wchar_end @ cdecl -arch=win64 ?end@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA?AV?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)XZ(ptr ptr) MSVCP_basic_string_wchar_end -@ stub -arch=win32 ?endl(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)AAV21@@Z -@ stub -arch=win64 ?endl(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)AEAV21@@Z +@ cdecl -arch=win32 ?endl(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)AAV21@@Z(ptr) basic_ostream_char_endl +@ cdecl -arch=win64 ?endl(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)AEAV21@@Z(ptr) basic_ostream_char_endl @ stub -arch=win32 ?endl(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)AAV21@@Z @ stub -arch=win64 ?endl(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)AEAV21@@Z @ stub -arch=win32 ?endl(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)AAV21@@Z

1 0

Piotr Caban : msvcp90: Use codecvt<char>:: is in basic_istream_char__Ipfx function.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: ab999f6d3ab99246a736b5d71afe505edd97e5d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab999f6d3ab99246a736b5d71… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 14 15:37:13 2012 +0200 msvcp90: Use codecvt<char>::is in basic_istream_char__Ipfx function. --- dlls/msvcp90/ios.c | 4 ++-- dlls/msvcp90/locale.c | 42 ++++++++++++++++++++++++++---------------- dlls/msvcp90/msvcp90.h | 21 +++++++++++++++++++++ 3 files changed, 49 insertions(+), 18 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 43a951d..7102639 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -4061,6 +4061,7 @@ MSVCP_bool __thiscall basic_istream_char__Ipfx(basic_istream_char *this, MSVCP_b if(!noskip && (ios_base_flags_get(&base->base) & FMTFLAG_skipws)) { basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); + const ctype_char *ctype = ctype_char_use_facet(base->strbuf->loc); int ch; for(ch = basic_streambuf_char_sgetc(strbuf); ; @@ -4070,8 +4071,7 @@ MSVCP_bool __thiscall basic_istream_char__Ipfx(basic_istream_char *this, MSVCP_b return FALSE; } - /* TODO: use locale class instead of isspace */ - if(!isspace(ch)) + if(!ctype_char_is_ch(ctype, _SPACE|_BLANK, ch)) break; } } diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 4ad37e8..304c510 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -76,13 +76,6 @@ typedef struct { typedef struct { LCID handle; unsigned page; - const short *table; - int delfl; -} _Ctypevec; - -typedef struct { - LCID handle; - unsigned page; } _Cvtvec; typedef struct { @@ -91,15 +84,6 @@ typedef struct { } collate; typedef struct { - locale_facet facet; -} ctype_base; - -typedef struct { - ctype_base base; - _Ctypevec ctype; -} ctype_char; - -typedef struct { ctype_base base; _Ctypevec ctype; _Cvtvec cvt; @@ -1496,6 +1480,32 @@ MSVCP_size_t __cdecl ctype_char__Getcat(const locale_facet **facet, const locale return LC_CTYPE; } +ctype_char* ctype_char_use_facet(const locale *loc) +{ + static ctype_char *obj = NULL; + + _Lockit lock; + const locale_facet *fac; + + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); + fac = locale__Getfacet(loc, ctype_char_id.id); + if(fac) { + _Lockit_dtor(&lock); + return (ctype_char*)fac; + } + + if(obj) + return obj; + + ctype_char__Getcat(&fac, loc); + obj = (ctype_char*)fac; + locale_facet__Incref(&obj->base.facet); + locale_facet_register(&obj->base.facet); + _Lockit_dtor(&lock); + + return obj; +} + /* _Tolower */ int __cdecl _Tolower(int ch, const _Ctypevec *ctype) { diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index c7260c2..4523845 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -311,6 +311,26 @@ int __thiscall codecvt_char_in(const codecvt_char*, int*, const char*, const char*, const char**, char*, char*, char**); int __thiscall codecvt_base_max_length(const codecvt_base*); +typedef struct { + LCID handle; + unsigned page; + const short *table; + int delfl; +} _Ctypevec; + +/* class ctype_base */ +typedef struct { + locale_facet facet; +} ctype_base; + +/* class ctype<char> */ +typedef struct { + ctype_base base; + _Ctypevec ctype; +} ctype_char; + +MSVCP_bool __thiscall ctype_char_is_ch(const ctype_char*, short, char); + /* class locale */ typedef struct { @@ -323,6 +343,7 @@ locale* __thiscall locale_operator_assign(locale*, const locale*); 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*); /* class _Lockit */ typedef struct {

1 0

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

14 Jun '12

Module: wine Branch: master Commit: aa2733e833d644e5e87005ee04132a0617911a97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa2733e833d644e5e87005ee0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 14 15:37:36 2012 +0200 msvcp90: Added operator>>(basic_istream<char>, basic_string<char>) implementation. --- dlls/msvcp90/ios.c | 41 ++++++++++++++++++++++++++++++++++++----- dlls/msvcp90/msvcp90.spec | 12 ++++++------ 2 files changed, 42 insertions(+), 11 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 7102639..9cb3a59 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -4705,11 +4705,11 @@ basic_istream_char* __thiscall basic_istream_char_read_bool(basic_istream_char * /* ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)D@Z */ /* ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)D@Z */ -basic_istream_char* __cdecl basic_istream_char_getline_str_delim( +basic_istream_char* __cdecl basic_istream_char_getline_bstr_delim( basic_istream_char *istream, basic_string_char *str, char delim) { IOSB_iostate state = IOSTATE_failbit; - int c; + int c = delim; TRACE("(%p %p %c)\n", istream, str, delim); @@ -4724,16 +4724,47 @@ basic_istream_char* __cdecl basic_istream_char_getline_str_delim( } basic_istream_char_sentry_destroy(istream); - basic_ios_char_setstate(basic_istream_char_get_basic_ios(istream), state); + basic_ios_char_setstate(basic_istream_char_get_basic_ios(istream), + state | (c==EOF ? IOSTATE_eofbit : IOSTATE_goodbit)); return istream; } /* ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z */ /* ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z */ -basic_istream_char* __cdecl basic_istream_char_getline_str( +basic_istream_char* __cdecl basic_istream_char_getline_bstr( basic_istream_char *istream, basic_string_char *str) { - return basic_istream_char_getline_str_delim(istream, str, '\n'); + return basic_istream_char_getline_bstr_delim(istream, str, '\n'); +} + +/* ??$?5DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z */ +/* ??$?5DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z */ +basic_istream_char* __cdecl basic_istream_char_get_bstr( + basic_istream_char *istream, basic_string_char *str) +{ + IOSB_iostate state = IOSTATE_failbit; + int c = '\n'; + + TRACE("(%p %p)\n", istream, str); + + if(basic_istream_char_sentry_create(istream, FALSE)) { + basic_ios_char *base = basic_istream_char_get_basic_ios(istream); + const ctype_char *ctype = ctype_char_use_facet(base->strbuf->loc); + + MSVCP_basic_string_char_clear(str); + + for(c = basic_streambuf_char_sgetc(basic_ios_char_rdbuf_get(base)); + c!=EOF && !ctype_char_is_ch(ctype, _SPACE|_BLANK, c); + c = basic_streambuf_char_snextc(basic_ios_char_rdbuf_get(base))) { + state = IOSTATE_goodbit; + MSVCP_basic_string_char_append_ch(str, c); + } + } + basic_istream_char_sentry_destroy(istream); + + basic_ios_char_setstate(basic_istream_char_get_basic_ios(istream), + state | (c==EOF ? IOSTATE_eofbit : IOSTATE_goodbit)); + return istream; } /* ??0?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PAV?$basic_streambuf(a)DU?$char_traits(a)D@std@@@1@@Z */ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index f4c3783..5c2477a 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2,8 +2,8 @@ @ stub -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAD(a)Z @ stub -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PAD(a)Z @ stub -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEAD(a)Z -@ stub -arch=win32 ??$?5DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z -@ stub -arch=win64 ??$?5DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z +@ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(ptr ptr) basic_istream_char_get_bstr +@ cdecl -arch=win64 ??$?5DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(ptr ptr) basic_istream_char_get_bstr @ stub -arch=win32 ??$?5GU?$char_traits(a)G@std@@@std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@AAG(a)Z @ stub -arch=win64 ??$?5GU?$char_traits(a)G@std@@@std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@AEAG(a)Z @ stub -arch=win32 ??$?5GU?$char_traits(a)G@std@@@std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@PAG(a)Z @@ -386,10 +386,10 @@ @ stub -arch=win64 ??$exp(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z @ stub -arch=win32 ??$exp(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z @ stub -arch=win64 ??$exp(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z -@ cdecl -arch=win32 ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(ptr ptr) basic_istream_char_getline_str -@ cdecl -arch=win64 ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(ptr ptr) basic_istream_char_getline_str -@ cdecl -arch=win32 ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)D@Z(ptr ptr long) basic_istream_char_getline_str_delim -@ cdecl -arch=win64 ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)D@Z(ptr ptr long) basic_istream_char_getline_str_delim +@ cdecl -arch=win32 ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(ptr ptr) basic_istream_char_getline_bstr +@ cdecl -arch=win64 ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(ptr ptr) basic_istream_char_getline_bstr +@ cdecl -arch=win32 ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)D@Z(ptr ptr long) basic_istream_char_getline_bstr_delim +@ cdecl -arch=win64 ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)D@Z(ptr ptr long) basic_istream_char_getline_bstr_delim @ stub -arch=win32 ??$getline(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@AAV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0@@Z @ stub -arch=win64 ??$getline(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@AEAV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0@@Z @ stub -arch=win32 ??$getline(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@AAV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0(a)G@Z

1 0