October 2012 - Wine-Commits

Alistair Leslie-Hughes : oledb32: Add IDBProperties support in IDBInitialize.
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: 0eef665dbfe70d54b0bcee6514568554fff3f468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eef665dbfe70d54b0bcee651… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 5 14:02:51 2012 +1000 oledb32: Add IDBProperties support in IDBInitialize. --- dlls/oledb32/datainit.c | 74 +++++++++++++++++++++++++++++++++++++++++ dlls/oledb32/tests/database.c | 2 +- 2 files changed, 75 insertions(+), 1 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index a84d8aa..862c725 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -50,6 +50,7 @@ static inline datainit *impl_from_IDataInitialize(IDataInitialize *iface) typedef struct { IDBInitialize IDBInitialize_iface; + IDBProperties IDBProperties_iface; LONG ref; } dbinit; @@ -59,6 +60,74 @@ static inline dbinit *impl_from_IDBInitialize(IDBInitialize *iface) return CONTAINING_RECORD(iface, dbinit, IDBInitialize_iface); } +static inline dbinit *impl_from_IDBProperties(IDBProperties *iface) +{ + return CONTAINING_RECORD(iface, dbinit, IDBProperties_iface); +} + +static HRESULT WINAPI dbprops_QueryInterface(IDBProperties *iface, REFIID riid, void **ppvObject) +{ + dbinit *This = impl_from_IDBProperties(iface); + + return IDBInitialize_QueryInterface(&This->IDBInitialize_iface, riid, ppvObject); +} + +static ULONG WINAPI dbprops_AddRef(IDBProperties *iface) +{ + dbinit *This = impl_from_IDBProperties(iface); + + return IDBInitialize_AddRef(&This->IDBInitialize_iface); +} + +static ULONG WINAPI dbprops_Release(IDBProperties *iface) +{ + dbinit *This = impl_from_IDBProperties(iface); + + return IDBInitialize_Release(&This->IDBInitialize_iface); +} + +static HRESULT WINAPI dbprops_GetProperties(IDBProperties *iface, ULONG cPropertyIDSets, + const DBPROPIDSET rgPropertyIDSets[], ULONG *pcPropertySets, DBPROPSET **prgPropertySets) +{ + dbinit *This = impl_from_IDBProperties(iface); + + FIXME("(%p)->(%d %p %p %p)\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dbprops_GetPropertyInfo(IDBProperties *iface, ULONG cPropertyIDSets, + const DBPROPIDSET rgPropertyIDSets[], ULONG *pcPropertyInfoSets, + DBPROPINFOSET **prgPropertyInfoSets, OLECHAR **ppDescBuffer) +{ + dbinit *This = impl_from_IDBProperties(iface); + + FIXME("(%p)->(%d %p %p %p %p)\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertyInfoSets, + prgPropertyInfoSets, ppDescBuffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dbprops_SetProperties(IDBProperties *iface, ULONG cPropertySets, + DBPROPSET rgPropertySets[]) +{ + dbinit *This = impl_from_IDBProperties(iface); + + FIXME("(%p)->(%d %p)\n", This, cPropertySets, rgPropertySets); + + return E_NOTIMPL; +} + +static const struct IDBPropertiesVtbl dbprops_vtbl = +{ + dbprops_QueryInterface, + dbprops_AddRef, + dbprops_Release, + dbprops_GetProperties, + dbprops_GetPropertyInfo, + dbprops_SetProperties +}; + static HRESULT WINAPI dbinit_QueryInterface(IDBInitialize *iface, REFIID riid, void **obj) { dbinit *This = impl_from_IDBInitialize(iface); @@ -71,6 +140,10 @@ static HRESULT WINAPI dbinit_QueryInterface(IDBInitialize *iface, REFIID riid, v { *obj = iface; } + else if(IsEqualIID(riid, &IID_IDBProperties)) + { + *obj = &This->IDBProperties_iface; + } else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); @@ -144,6 +217,7 @@ static HRESULT create_db_init(void **obj) if(!This) return E_OUTOFMEMORY; This->IDBInitialize_iface.lpVtbl = &dbinit_vtbl; + This->IDBProperties_iface.lpVtbl = &dbprops_vtbl; This->ref = 1; *obj = &This->IDBInitialize_iface; diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index fe92bb8..f093d17 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -51,7 +51,7 @@ static void test_database(void) IDBProperties *props = NULL; hr = IDBInitialize_QueryInterface(dbinit, &IID_IDBProperties, (void**)&props); - todo_wine ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); if(SUCCEEDED(hr)) { IDBProperties_Release(props);

1 0

Piotr Caban : msvcp60: Added basic_fstream constructors implementation.
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: fd727fc15ef9d537fdcb4fe7d6bd2ee0c87b3ce6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd727fc15ef9d537fdcb4fe7d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 5 14:56:10 2012 +0200 msvcp60: Added basic_fstream constructors implementation. --- dlls/msvcp60/ios.c | 112 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp60/msvcp60.spec | 16 +++--- 2 files changed, 120 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index cb355ec..4d753c5 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -10178,6 +10178,57 @@ basic_fstream_char* __thiscall basic_fstream_char_ctor(basic_fstream_char *this, return this; } +/* ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PAU_iobuf@@@Z */ +/* ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEAU_iobuf@@@Z */ +static basic_fstream_char* basic_fstream_char_ctor_file(basic_fstream_char *this, + FILE *file, MSVCP_bool virt_init) +{ + basic_ios_char *basic_ios; + + TRACE("(%p %p %d)\n", this, file, virt_init); + + if(virt_init) { + this->base.base1.vbtable = basic_fstream_char_vbtable1; + this->base.base2.vbtable = basic_fstream_char_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); + } + + basic_filebuf_char_ctor_file(&this->filebuf, file); + basic_iostream_char_ctor(&this->base, &this->filebuf.base, FALSE); + basic_ios->base.vtable = &MSVCP_basic_fstream_char_vtable; + return this; +} + +/* ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)ABV01@@Z */ +/* ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)AEBV01@@Z */ +DEFINE_THISCALL_WRAPPER(basic_fstream_char_copy_ctor, 12) +basic_fstream_char* __thiscall basic_fstream_char_copy_ctor(basic_fstream_char *this, + basic_fstream_char *copy, MSVCP_bool virt_init) +{ + TRACE("(%p %p %d)\n", this, copy, virt_init); + return basic_fstream_char_ctor_file(this, copy->filebuf.file, virt_init); +} + +/* ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z */ +/* ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDH@Z */ +DEFINE_THISCALL_WRAPPER(basic_fstream_char_ctor_name, 16) +basic_fstream_char* __thiscall basic_fstream_char_ctor_name(basic_fstream_char *this, + const char *name, int mode, MSVCP_bool virt_init) +{ + TRACE("(%p %s %d %d)\n", this, name, mode, virt_init); + + basic_fstream_char_ctor(this, virt_init); + + if(!basic_filebuf_char_open(&this->filebuf, name, mode, _SH_DENYNO)) { + basic_ios_char *basic_ios = basic_istream_char_get_basic_ios(&this->base.base1); + basic_ios_char_setstate(basic_ios, IOSTATE_failbit); + } + return this; +} + /* ??1?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@UAE(a)XZ */ /* ??1?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@UEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(basic_fstream_char_dtor, 4) @@ -10322,6 +10373,67 @@ basic_fstream_wchar* __thiscall basic_fstream_short_ctor(basic_fstream_wchar *th return this; } +/* ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PAU_iobuf@@@Z */ +/* ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)PEAU_iobuf@@@Z */ +static basic_fstream_wchar* basic_fstream_wchar_ctor_file(basic_fstream_wchar *this, + FILE *file, MSVCP_bool virt_init) +{ + basic_ios_wchar *basic_ios; + + TRACE("(%p %p %d)\n", this, file, virt_init); + + if(virt_init) { + this->base.base1.vbtable = basic_fstream_wchar_vbtable1; + this->base.base2.vbtable = basic_fstream_wchar_vbtable2; + basic_ios = basic_istream_wchar_get_basic_ios(&this->base.base1); + basic_ios_wchar_ctor(basic_ios); + }else { + basic_ios = basic_istream_wchar_get_basic_ios(&this->base.base1); + } + + basic_filebuf_wchar_ctor_file(&this->filebuf, file); + basic_iostream_wchar_ctor(&this->base, &this->filebuf.base, FALSE); + basic_ios->base.vtable = &MSVCP_basic_fstream_wchar_vtable; + return this; +} + +/* ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PAU_iobuf@@@Z */ +/* ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEAU_iobuf@@@Z */ +static basic_fstream_wchar* basic_fstream_short_ctor_file(basic_fstream_wchar *this, + FILE *file, MSVCP_bool virt_init) +{ + basic_fstream_wchar_ctor_file(this, file, virt_init); + basic_istream_wchar_get_basic_ios(&this->base.base1)->base.vtable = &MSVCP_basic_fstream_short_vtable; + return this; +} + +/* ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)ABV01@@Z */ +/* ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)AEBV01@@Z */ +DEFINE_THISCALL_WRAPPER(basic_fstream_short_copy_ctor, 12) +basic_fstream_wchar* __thiscall basic_fstream_short_copy_ctor(basic_fstream_wchar *this, + basic_fstream_wchar *copy, MSVCP_bool virt_init) +{ + TRACE("(%p %p %d)\n", this, copy, virt_init); + return basic_fstream_short_ctor_file(this, copy->filebuf.file, virt_init); +} + +/* ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PB_WHH@Z */ +/* ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)PEB_WHH@Z */ +DEFINE_THISCALL_WRAPPER(basic_fstream_short_ctor_name, 16) +basic_fstream_wchar* __thiscall basic_fstream_short_ctor_name(basic_fstream_wchar *this, + const char *name, int mode, MSVCP_bool virt_init) +{ + TRACE("(%p %s %d %d)\n", this, name, mode, virt_init); + + basic_fstream_short_ctor(this, virt_init); + + if(!basic_filebuf_wchar_open(&this->filebuf, name, mode, _SH_DENYNO)) { + basic_ios_wchar *basic_ios = basic_istream_wchar_get_basic_ios(&this->base.base1); + basic_ios_wchar_setstate(basic_ios, IOSTATE_failbit); + } + return this; +} + /* ??1?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@UAE(a)XZ */ /* ??1?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@UEAA(a)XZ */ /* ??1?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@UAE(a)XZ */ diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index ee9fa34..25ee5db 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -529,16 +529,16 @@ @ cdecl -arch=win64 ??0?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEAU_iobuf@@@Z(ptr ptr) basic_filebuf_short_ctor_file @ thiscall -arch=win32 ??0?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QAE(a)W4_Uninitialized@1@@Z(ptr long) basic_filebuf_short_ctor_uninitialized @ cdecl -arch=win64 ??0?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)W4_Uninitialized@1@@Z(ptr long) basic_filebuf_short_ctor_uninitialized -@ stub -arch=win32 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)ABV01@@Z -@ stub -arch=win64 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)AEBV01@@Z -@ stub -arch=win32 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z -@ stub -arch=win64 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDH@Z +@ thiscall -arch=win32 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)ABV01@@Z(ptr ptr long) basic_fstream_char_copy_ctor +@ cdecl -arch=win64 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)AEBV01@@Z(ptr ptr long) basic_fstream_char_copy_ctor +@ thiscall -arch=win32 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z(ptr str long long) basic_fstream_char_ctor_name +@ cdecl -arch=win64 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDH@Z(ptr str long long) basic_fstream_char_ctor_name @ thiscall -arch=win32 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)XZ(ptr long) basic_fstream_char_ctor @ cdecl -arch=win64 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)XZ(ptr long) basic_fstream_char_ctor -@ stub -arch=win32 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)ABV01@@Z -@ stub -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)AEBV01@@Z -@ stub -arch=win32 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDH@Z -@ stub -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEBDH@Z +@ thiscall -arch=win32 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)ABV01@@Z(ptr ptr long) basic_fstream_short_copy_ctor +@ cdecl -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)AEBV01@@Z(ptr ptr long) basic_fstream_short_copy_ctor +@ thiscall -arch=win32 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDH@Z(ptr str long long) basic_fstream_short_ctor_name +@ cdecl -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEBDH@Z(ptr str long long) basic_fstream_short_ctor_name @ thiscall -arch=win32 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)XZ(ptr long) basic_fstream_short_ctor @ cdecl -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)XZ(ptr long) basic_fstream_short_ctor @ thiscall -arch=win32 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)ABV01@@Z(ptr ptr long) basic_ifstream_char_copy_ctor

1 0

Piotr Caban : msvcp60: Added basic_ofstream constructors implementation.
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: 1956360c6d8d5a82c28a2fed0693936a013b898e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1956360c6d8d5a82c28a2fed0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 5 14:55:51 2012 +0200 msvcp60: Added basic_ofstream constructors implementation. --- dlls/msvcp60/ios.c | 110 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp60/msvcp60.spec | 16 +++--- 2 files changed, 118 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 4b98fcf..cb355ec 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -9383,6 +9383,56 @@ basic_ofstream_char* __thiscall basic_ofstream_char_ctor(basic_ofstream_char *th return this; } +/* ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PAU_iobuf@@@Z */ +/* ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEAU_iobuf@@@Z */ +static basic_ofstream_char* basic_ofstream_char_ctor_file( + basic_ofstream_char *this, FILE *file, MSVCP_bool virt_init) +{ + basic_ios_char *basic_ios; + + TRACE("(%p %p %d)\n", this, file, virt_init); + + if(virt_init) { + this->base.vbtable = basic_ofstream_char_vbtable; + basic_ios = basic_ostream_char_get_basic_ios(&this->base); + basic_ios_char_ctor(basic_ios); + }else { + basic_ios = basic_ostream_char_get_basic_ios(&this->base); + } + + basic_filebuf_char_ctor_file(&this->filebuf, file); + basic_ostream_char_ctor(&this->base, &this->filebuf.base, FALSE, FALSE); + basic_ios->base.vtable = &MSVCP_basic_ofstream_char_vtable; + return this; +} + +/* ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)ABV01@@Z */ +/* ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)AEBV01@@Z */ +DEFINE_THISCALL_WRAPPER(basic_ofstream_char_copy_ctor, 12) +basic_ofstream_char* __thiscall basic_ofstream_char_copy_ctor(basic_ofstream_char *this, + basic_ofstream_char *copy, MSVCP_bool virt_init) +{ + TRACE("(%p %p %d)\n", this, copy, virt_init); + return basic_ofstream_char_ctor_file(this, copy->filebuf.file, virt_init); +} + +/* ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z */ +/* ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDH@Z */ +DEFINE_THISCALL_WRAPPER(basic_ofstream_char_ctor_name, 16) +basic_ofstream_char* __thiscall basic_ofstream_char_ctor_name(basic_ofstream_char *this, + const char *name, int mode, MSVCP_bool virt_init) +{ + TRACE("(%p %s %d %d)\n", this, name, mode, virt_init); + + basic_ofstream_char_ctor(this, virt_init); + + if(!basic_filebuf_char_open(&this->filebuf, name, mode|OPENMODE_out, _SH_DENYNO)) { + basic_ios_char *basic_ios = basic_ostream_char_get_basic_ios(&this->base); + basic_ios_char_setstate(basic_ios, IOSTATE_failbit); + } + return this; +} + /* ??1?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@UAE(a)XZ */ /* ??1?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@UEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(basic_ofstream_char_dtor, 4) @@ -9526,6 +9576,66 @@ basic_ofstream_wchar* __thiscall basic_ofstream_short_ctor(basic_ofstream_wchar return this; } +/* ??0?$basic_ofstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PAU_iobuf@@@Z */ +/* ??0?$basic_ofstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)PEAU_iobuf@@@Z */ +static basic_ofstream_wchar* basic_ofstream_wchar_ctor_file( + basic_ofstream_wchar *this, FILE *file, MSVCP_bool virt_init) +{ + basic_ios_wchar *basic_ios; + + TRACE("(%p %p %d)\n", this, file, virt_init); + + if(virt_init) { + this->base.vbtable = basic_ofstream_wchar_vbtable; + basic_ios = basic_ostream_wchar_get_basic_ios(&this->base); + basic_ios_wchar_ctor(basic_ios); + }else { + basic_ios = basic_ostream_wchar_get_basic_ios(&this->base); + } + + basic_filebuf_wchar_ctor_file(&this->filebuf, file); + basic_ostream_wchar_ctor(&this->base, &this->filebuf.base, FALSE, FALSE); + basic_ios->base.vtable = &MSVCP_basic_ofstream_wchar_vtable; + return this; +} + +/* ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PAU_iobuf@@@Z */ +/* ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEAU_iobuf@@@Z */ +static basic_ofstream_wchar* basic_ofstream_short_ctor_file( + basic_ofstream_wchar *this, FILE *file, MSVCP_bool virt_init) +{ + basic_ofstream_wchar_ctor_file(this, file, virt_init); + basic_ostream_wchar_get_basic_ios(&this->base)->base.vtable = &MSVCP_basic_ofstream_short_vtable; + return this; +} + +/* ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)ABV01@@Z */ +/* ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)AEBV01@@Z */ +DEFINE_THISCALL_WRAPPER(basic_ofstream_short_copy_ctor, 12) +basic_ofstream_wchar* __thiscall basic_ofstream_short_copy_ctor(basic_ofstream_wchar *this, + basic_ofstream_wchar *copy, MSVCP_bool virt_init) +{ + TRACE("(%p %p %d)\n", this, copy, virt_init); + return basic_ofstream_short_ctor_file(this, copy->filebuf.file, virt_init); +} + +/* ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDH@Z */ +/* ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEBDH@Z */ +DEFINE_THISCALL_WRAPPER(basic_ofstream_short_ctor_name, 16) +basic_ofstream_wchar* __thiscall basic_ofstream_short_ctor_name(basic_ofstream_wchar *this, + const char *name, int mode, MSVCP_bool virt_init) +{ + TRACE("(%p %s %d %d)\n", this, name, mode, virt_init); + + basic_ofstream_short_ctor(this, virt_init); + + if(!basic_filebuf_wchar_open(&this->filebuf, name, mode|OPENMODE_out, _SH_DENYNO)) { + basic_ios_wchar *basic_ios = basic_ostream_wchar_get_basic_ios(&this->base); + basic_ios_wchar_setstate(basic_ios, IOSTATE_failbit); + } + return this; +} + /* ??1?$basic_ofstream(a)_WU?$char_traits(a)_W@std@@@std@@UAE(a)XZ */ /* ??1?$basic_ofstream(a)_WU?$char_traits(a)_W@std@@@std@@UEAA(a)XZ */ /* ??1?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@UAE(a)XZ */ diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index aeae92b..ee9fa34 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -597,16 +597,16 @@ @ cdecl -arch=win64 ??0?$basic_istringstream(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAA(a)AEBV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@1(a)H@Z(ptr ptr long long) basic_istringstream_short_ctor_str @ thiscall -arch=win32 ??0?$basic_istringstream(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAE(a)H@Z(ptr long long) basic_istringstream_short_ctor_mode @ cdecl -arch=win64 ??0?$basic_istringstream(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAA(a)H@Z(ptr long long) basic_istringstream_short_ctor_mode -@ stub -arch=win32 ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)ABV01@@Z -@ stub -arch=win64 ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)AEBV01@@Z -@ stub -arch=win32 ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z -@ stub -arch=win64 ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDH@Z +@ thiscall -arch=win32 ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)ABV01@@Z(ptr ptr long) basic_ofstream_char_copy_ctor +@ cdecl -arch=win64 ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)AEBV01@@Z(ptr ptr long) basic_ofstream_char_copy_ctor +@ thiscall -arch=win32 ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z(ptr str long long) basic_ofstream_char_ctor_name +@ cdecl -arch=win64 ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDH@Z(ptr str long long) basic_ofstream_char_ctor_name @ thiscall -arch=win32 ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)XZ(ptr long) basic_ofstream_char_ctor @ cdecl -arch=win64 ??0?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)XZ(ptr long) basic_ofstream_char_ctor -@ stub -arch=win32 ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)ABV01@@Z -@ stub -arch=win64 ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)AEBV01@@Z -@ stub -arch=win32 ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDH@Z -@ stub -arch=win64 ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEBDH@Z +@ thiscall -arch=win32 ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)ABV01@@Z(ptr ptr long) basic_ofstream_short_copy_ctor +@ cdecl -arch=win64 ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)AEBV01@@Z(ptr ptr long) basic_ofstream_short_copy_ctor +@ thiscall -arch=win32 ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDH@Z(ptr str long long) basic_ofstream_short_ctor_name +@ cdecl -arch=win64 ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEBDH@Z(ptr str long long) basic_ofstream_short_ctor_name @ thiscall -arch=win32 ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)XZ(ptr long) basic_ofstream_short_ctor @ cdecl -arch=win64 ??0?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)XZ(ptr long) basic_ofstream_short_ctor @ stub -arch=win32 ??0?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)ABV01@@Z

1 0

Piotr Caban : msvcp60: Added basic_ifstream constructors implementation.
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: 97f0874a7869b2c17bf1cd6d445d264acd0c63a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97f0874a7869b2c17bf1cd6d4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 5 14:55:36 2012 +0200 msvcp60: Added basic_ifstream constructors implementation. --- dlls/msvcp60/ios.c | 110 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp60/msvcp60.spec | 16 +++--- 2 files changed, 118 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 7c1c202..4b98fcf 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -9670,6 +9670,56 @@ basic_ifstream_char* __thiscall basic_ifstream_char_ctor(basic_ifstream_char *th return this; } +/* ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PAU_iobuf@@@Z */ +/* ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEAU_iobuf@@@Z */ +static basic_ifstream_char* basic_ifstream_char_ctor_file( + basic_ifstream_char *this, FILE *file, MSVCP_bool virt_init) +{ + basic_ios_char *basic_ios; + + TRACE("(%p %p %d)\n", this, file, virt_init); + + if(virt_init) { + this->base.vbtable = basic_ifstream_char_vbtable; + basic_ios = basic_istream_char_get_basic_ios(&this->base); + basic_ios_char_ctor(basic_ios); + }else { + basic_ios = basic_istream_char_get_basic_ios(&this->base); + } + + basic_filebuf_char_ctor_file(&this->filebuf, file); + basic_istream_char_ctor(&this->base, &this->filebuf.base, FALSE, FALSE); + basic_ios->base.vtable = &MSVCP_basic_ifstream_char_vtable; + return this; +} + +/* ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)ABV01@@Z */ +/* ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)AEBV01@@Z */ +DEFINE_THISCALL_WRAPPER(basic_ifstream_char_copy_ctor, 12) +basic_ifstream_char* __thiscall basic_ifstream_char_copy_ctor(basic_ifstream_char *this, + const basic_ifstream_char *copy, MSVCP_bool virt_init) +{ + TRACE("(%p %p %d)\n", this, copy, virt_init); + return basic_ifstream_char_ctor_file(this, copy->filebuf.file, virt_init); +} + +/* ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z */ +/* ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDH@Z */ +DEFINE_THISCALL_WRAPPER(basic_ifstream_char_ctor_name, 16) +basic_ifstream_char* __thiscall basic_ifstream_char_ctor_name(basic_ifstream_char *this, + const char *name, int mode, MSVCP_bool virt_init) +{ + TRACE("(%p %s %d %d)\n", this, name, mode, virt_init); + + basic_ifstream_char_ctor(this, virt_init); + + if(!basic_filebuf_char_open(&this->filebuf, name, mode|OPENMODE_in, _SH_DENYNO)) { + basic_ios_char *basic_ios = basic_istream_char_get_basic_ios(&this->base); + basic_ios_char_setstate(basic_ios, IOSTATE_failbit); + } + return this; +} + /* ??1?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@UAE(a)XZ */ /* ??1?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@UEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(basic_ifstream_char_dtor, 4) @@ -9813,6 +9863,66 @@ basic_ifstream_wchar* __thiscall basic_ifstream_short_ctor(basic_ifstream_wchar return this; } +/* ??0?$basic_ifstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PAU_iobuf@@@Z */ +/* ??0?$basic_ifstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)PEAU_iobuf@@@Z */ +static basic_ifstream_wchar* basic_ifstream_wchar_ctor_file( + basic_ifstream_wchar *this, FILE *file, MSVCP_bool virt_init) +{ + basic_ios_wchar *basic_ios; + + TRACE("(%p %p %d)\n", this, file, virt_init); + + if(virt_init) { + this->base.vbtable = basic_ifstream_wchar_vbtable; + basic_ios = basic_istream_wchar_get_basic_ios(&this->base); + basic_ios_wchar_ctor(basic_ios); + }else { + basic_ios = basic_istream_wchar_get_basic_ios(&this->base); + } + + basic_filebuf_wchar_ctor_file(&this->filebuf, file); + basic_istream_wchar_ctor(&this->base, &this->filebuf.base, FALSE, FALSE); + basic_ios->base.vtable = &MSVCP_basic_ifstream_wchar_vtable; + return this; +} + +/* ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PAU_iobuf@@@Z */ +/* ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEAU_iobuf@@@Z */ +static basic_ifstream_wchar* basic_ifstream_short_ctor_file( + basic_ifstream_wchar *this, FILE *file, MSVCP_bool virt_init) +{ + basic_ifstream_wchar_ctor_file(this, file, virt_init); + basic_istream_wchar_get_basic_ios(&this->base)->base.vtable = &MSVCP_basic_ifstream_short_vtable; + return this; +} + +/* ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)ABV01@@Z */ +/* ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)AEBV01@@Z */ +DEFINE_THISCALL_WRAPPER(basic_ifstream_short_copy_ctor, 12) +basic_ifstream_wchar* __thiscall basic_ifstream_short_copy_ctor(basic_ifstream_wchar *this, + basic_ifstream_wchar *copy, MSVCP_bool virt_init) +{ + TRACE("(%p %p %d)\n", this, copy, virt_init); + return basic_ifstream_short_ctor_file(this, copy->filebuf.file, virt_init); +} + +/* ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDH@Z */ +/* ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEBDH@Z */ +DEFINE_THISCALL_WRAPPER(basic_ifstream_short_ctor_name, 16) +basic_ifstream_wchar* __thiscall basic_ifstream_short_ctor_name(basic_ifstream_wchar *this, + const char *name, int mode, MSVCP_bool virt_init) +{ + TRACE("(%p %s %d %d)\n", this, name, mode, virt_init); + + basic_ifstream_short_ctor(this, virt_init); + + if(!basic_filebuf_wchar_open(&this->filebuf, name, mode|OPENMODE_in, _SH_DENYNO)) { + basic_ios_wchar *basic_ios = basic_istream_wchar_get_basic_ios(&this->base); + basic_ios_wchar_setstate(basic_ios, IOSTATE_failbit); + } + return this; +} + /* ??1?$basic_ifstream(a)_WU?$char_traits(a)_W@std@@@std@@UAE(a)XZ */ /* ??1?$basic_ifstream(a)_WU?$char_traits(a)_W@std@@@std@@UEAA(a)XZ */ /* ??1?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@UAE(a)XZ */ diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 94bd7ec..aeae92b 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -541,16 +541,16 @@ @ stub -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEBDH@Z @ thiscall -arch=win32 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)XZ(ptr long) basic_fstream_short_ctor @ cdecl -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)XZ(ptr long) basic_fstream_short_ctor -@ stub -arch=win32 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)ABV01@@Z -@ stub -arch=win64 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)AEBV01@@Z -@ stub -arch=win32 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z -@ stub -arch=win64 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDH@Z +@ thiscall -arch=win32 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)ABV01@@Z(ptr ptr long) basic_ifstream_char_copy_ctor +@ cdecl -arch=win64 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)AEBV01@@Z(ptr ptr long) basic_ifstream_char_copy_ctor +@ thiscall -arch=win32 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z(ptr str long long) basic_ifstream_char_ctor_name +@ cdecl -arch=win64 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDH@Z(ptr str long long) basic_ifstream_char_ctor_name @ thiscall -arch=win32 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)XZ(ptr long) basic_ifstream_char_ctor @ cdecl -arch=win64 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)XZ(ptr long) basic_ifstream_char_ctor -@ stub -arch=win32 ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)ABV01@@Z -@ stub -arch=win64 ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)AEBV01@@Z -@ stub -arch=win32 ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDH@Z -@ stub -arch=win64 ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEBDH@Z +@ thiscall -arch=win32 ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)ABV01@@Z(ptr ptr long) basic_ifstream_short_copy_ctor +@ cdecl -arch=win64 ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)AEBV01@@Z(ptr ptr long) basic_ifstream_short_copy_ctor +@ thiscall -arch=win32 ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDH@Z(ptr str long long) basic_ifstream_short_ctor_name +@ cdecl -arch=win64 ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEBDH@Z(ptr str long long) basic_ifstream_short_ctor_name @ thiscall -arch=win32 ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)XZ(ptr long) basic_ifstream_short_ctor @ cdecl -arch=win64 ??0?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)XZ(ptr long) basic_ifstream_short_ctor @ thiscall -arch=win32 ??0?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@IAE(a)XZ(ptr) basic_ios_char_ctor

1 0

Piotr Caban : msvcp60: Added basic_ifstream::open implementation.
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: a7a350acf297ef429cbfcbbba86b10cf0813e949 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7a350acf297ef429cbfcbbba… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 5 14:54:46 2012 +0200 msvcp60: Added basic_ifstream::open implementation. --- dlls/msvcp60/ios.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp60/msvcp60.spec | 16 +++++++------- 2 files changed, 54 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 8d7381a..a169851 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -9693,6 +9693,29 @@ MSVCP_bool __thiscall basic_ifstream_char_is_open(const basic_ifstream_char *thi return basic_filebuf_char_is_open(&this->filebuf); } +/* ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPBDH(a)Z */ +/* ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBDH(a)Z */ +DEFINE_THISCALL_WRAPPER(basic_ifstream_char_open, 12) +void __thiscall basic_ifstream_char_open(basic_ifstream_char *this, + const char *name, int mode) +{ + TRACE("(%p %s %d)\n", this, name, mode); + + if(!basic_filebuf_char_open(&this->filebuf, name, mode|OPENMODE_in, _SH_DENYNO)) { + basic_ios_char *basic_ios = basic_istream_char_get_basic_ios(&this->base); + basic_ios_char_setstate(basic_ios, IOSTATE_failbit); + } +} + +/* ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPBDF(a)Z */ +/* ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBDF(a)Z */ +DEFINE_THISCALL_WRAPPER(basic_ifstream_char_open_old, 12) +void __thiscall basic_ifstream_char_open_old(basic_ifstream_char *this, + const char *name, short mode) +{ + basic_ifstream_char_open(this, name, mode); +} + /* ?rdbuf@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QBEPAV?$basic_filebuf(a)DU?$char_traits(a)D@std@@@2(a)XZ */ /* ?rdbuf@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEBAPEAV?$basic_filebuf(a)DU?$char_traits(a)D@std@@@2(a)XZ */ DEFINE_THISCALL_WRAPPER(basic_ifstream_char_rdbuf, 4) @@ -9821,6 +9844,29 @@ MSVCP_bool __thiscall basic_ifstream_wchar_is_open(const basic_ifstream_wchar *t return basic_filebuf_wchar_is_open(&this->filebuf); } +/* ?open@?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QAEXPBDH(a)Z */ +/* ?open@?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QEAAXPEBDH(a)Z */ +DEFINE_THISCALL_WRAPPER(basic_ifstream_wchar_open, 12) +void __thiscall basic_ifstream_wchar_open(basic_ifstream_wchar *this, + const char *name, int mode) +{ + TRACE("(%p %s %d)\n", this, name, mode); + + if(!basic_filebuf_wchar_open(&this->filebuf, name, mode|OPENMODE_in, _SH_DENYNO)) { + basic_ios_wchar *basic_ios = basic_istream_wchar_get_basic_ios(&this->base); + basic_ios_wchar_setstate(basic_ios, IOSTATE_failbit); + } +} + +/* ?open@?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QAEXPBDF(a)Z */ +/* ?open@?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QEAAXPEBDF(a)Z */ +DEFINE_THISCALL_WRAPPER(basic_ifstream_wchar_open_old, 12) +void __thiscall basic_ifstream_wchar_open_old(basic_ifstream_wchar *this, + const char *name, short mode) +{ + basic_ifstream_wchar_open(this, name, mode); +} + /* ?rdbuf@?$basic_ifstream(a)_WU?$char_traits(a)_W@std@@@std@@QBEPAV?$basic_filebuf(a)_WU?$char_traits(a)_W@std@@@2(a)XZ */ /* ?rdbuf@?$basic_ifstream(a)_WU?$char_traits(a)_W@std@@@std@@QEBAPEAV?$basic_filebuf(a)_WU?$char_traits(a)_W@std@@@2(a)XZ */ /* ?rdbuf@?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QBEPAV?$basic_filebuf(a)GU?$char_traits(a)G@std@@@2(a)XZ */ diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 9301a6f..97e9458 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -3514,14 +3514,14 @@ @ stub -arch=win64 ?open@?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAAXPEBDF(a)Z @ stub -arch=win32 ?open@?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAEXPBDH(a)Z @ stub -arch=win64 ?open@?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAAXPEBDH(a)Z -@ stub -arch=win32 ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPBDF(a)Z -@ stub -arch=win64 ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBDF(a)Z -@ stub -arch=win32 ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPBDH(a)Z -@ stub -arch=win64 ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBDH(a)Z -@ stub -arch=win32 ?open@?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QAEXPBDF(a)Z -@ stub -arch=win64 ?open@?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QEAAXPEBDF(a)Z -@ stub -arch=win32 ?open@?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QAEXPBDH(a)Z -@ stub -arch=win64 ?open@?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QEAAXPEBDH(a)Z +@ thiscall -arch=win32 ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPBDF(a)Z(ptr str long) basic_ifstream_char_open_old +@ cdecl -arch=win64 ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBDF(a)Z(ptr str long) basic_ifstream_char_open_old +@ thiscall -arch=win32 ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPBDH(a)Z(ptr str long) basic_ifstream_char_open +@ cdecl -arch=win64 ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBDH(a)Z(ptr str long) basic_ifstream_char_open +@ thiscall -arch=win32 ?open@?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QAEXPBDF(a)Z(ptr str long) basic_ifstream_wchar_open_old +@ cdecl -arch=win64 ?open@?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QEAAXPEBDF(a)Z(ptr str long) basic_ifstream_wchar_open_old +@ thiscall -arch=win32 ?open@?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QAEXPBDH(a)Z(ptr str long) basic_ifstream_wchar_open +@ cdecl -arch=win64 ?open@?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QEAAXPEBDH(a)Z(ptr str long) basic_ifstream_wchar_open @ stub -arch=win32 ?open@?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPBDF(a)Z @ stub -arch=win64 ?open@?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBDF(a)Z @ stub -arch=win32 ?open@?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPBDH(a)Z

1 0

Nikolay Sivov : dwrite: Store font family name in IDWriteFontFamily implementation.
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: 89561b9247c0f2a91667dfddb04c0e57d7628e33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89561b9247c0f2a91667dfddb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 7 12:29:39 2012 -0400 dwrite: Store font family name in IDWriteFontFamily implementation. --- dlls/dwrite/dwrite_private.h | 17 +++++++++++++++++ dlls/dwrite/font.c | 34 ++++++++++++++++++++++++++++++++-- dlls/dwrite/tests/font.c | 27 +++++++++++++++++++++++++-- 3 files changed, 74 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 5c82453..d3af015 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/unicode.h" + static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); @@ -26,6 +28,21 @@ static inline BOOL heap_free(void *mem) return HeapFree(GetProcessHeap(), 0, mem); } +static inline LPWSTR heap_strdupW(LPCWSTR str) +{ + LPWSTR ret = NULL; + + if(str) { + DWORD size; + + size = (strlenW(str)+1)*sizeof(WCHAR); + ret = heap_alloc(size); + memcpy(ret, str, size); + } + + return ret; +} + extern HRESULT create_font_from_logfont(const LOGFONTW*, IDWriteFont**) DECLSPEC_HIDDEN; extern HRESULT create_textlayout(IDWriteTextLayout**) DECLSPEC_HIDDEN; extern HRESULT create_gdiinterop(IDWriteGdiInterop**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 892ee72..15e9d14 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -30,6 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); struct dwrite_fontfamily { IDWriteFontFamily IDWriteFontFamily_iface; LONG ref; + + WCHAR *familyname; }; struct dwrite_font { @@ -222,7 +224,10 @@ static ULONG WINAPI dwritefontfamily_Release(IDWriteFontFamily *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) + { + heap_free(This->familyname); heap_free(This); + } return S_OK; } @@ -283,7 +288,7 @@ static const IDWriteFontFamilyVtbl fontfamilyvtbl = { dwritefontfamily_GetMatchingFonts }; -static HRESULT create_fontfamily(IDWriteFontFamily **family) +static HRESULT create_fontfamily(const WCHAR *familyname, IDWriteFontFamily **family) { struct dwrite_fontfamily *This; @@ -294,6 +299,7 @@ static HRESULT create_fontfamily(IDWriteFontFamily **family) This->IDWriteFontFamily_iface.lpVtbl = &fontfamilyvtbl; This->ref = 1; + This->familyname = heap_strdupW(familyname); *family = &This->IDWriteFontFamily_iface; @@ -302,13 +308,37 @@ static HRESULT create_fontfamily(IDWriteFontFamily **family) HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) { + const WCHAR* facename, *familyname; struct dwrite_font *This; IDWriteFontFamily *family; + OUTLINETEXTMETRICW *otm; HRESULT hr; + HFONT hfont; + HDC hdc; + int ret; *font = NULL; - hr = create_fontfamily(&family); + hfont = CreateFontIndirectW(logfont); + if (!hfont) return DWRITE_E_NOFONT; + + hdc = CreateCompatibleDC(0); + SelectObject(hdc, hfont); + + ret = GetOutlineTextMetricsW(hdc, 0, NULL); + otm = heap_alloc(ret); + otm->otmSize = ret; + ret = GetOutlineTextMetricsW(hdc, otm->otmSize, otm); + + DeleteDC(hdc); + DeleteObject(hfont); + + facename = (WCHAR*)((char*)otm + (ptrdiff_t)otm->otmpFaceName); + familyname = (WCHAR*)((char*)otm + (ptrdiff_t)otm->otmpFamilyName); + TRACE("facename=%s, familyname=%s\n", debugstr_w(facename), debugstr_w(familyname)); + + hr = create_fontfamily(familyname, &family); + heap_free(otm); if (hr != S_OK) return hr; This = heap_alloc(sizeof(struct dwrite_font)); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 64fe390..229e2f7 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -43,6 +43,7 @@ static IDWriteFactory *factory; static void test_CreateFontFromLOGFONT(void) { static const WCHAR arialW[] = {'A','r','i','a','l',0}; + static const WCHAR arialspW[] = {'A','r','i','a','l',' ',0}; static const WCHAR blahW[] = {'B','l','a','h','!',0}; IDWriteGdiInterop *interop; DWRITE_FONT_WEIGHT weight; @@ -143,18 +144,40 @@ todo_wine logfont.lfWeight = FW_NORMAL; lstrcpyW(logfont.lfFaceName, blahW); + font = (void*)0xdeadbeef; hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); -todo_wine +todo_wine { EXPECT_HR(hr, DWRITE_E_NOFONT); + ok(font == NULL, "got %p\n", font); + if(font) IDWriteFont_Release(font); +} memset(&logfont, 0, sizeof(logfont)); logfont.lfHeight = 12; logfont.lfWidth = 12; logfont.lfWeight = FW_NORMAL; + lstrcpyW(logfont.lfFaceName, arialspW); + font = (void*)0xdeadbeef; hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); -todo_wine +todo_wine { EXPECT_HR(hr, DWRITE_E_NOFONT); + ok(font == NULL, "got %p\n", font); + if(font) IDWriteFont_Release(font); +} + + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + logfont.lfWidth = 12; + logfont.lfWeight = FW_NORMAL; + + font = (void*)0xdeadbeef; + hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); +todo_wine { + EXPECT_HR(hr, DWRITE_E_NOFONT); + ok(font == NULL, "got %p\n", font); + if(font) IDWriteFont_Release(font); +} IDWriteGdiInterop_Release(interop); }

1 0

Henri Verbeet : d3d10: Handle depth stencil state in d3d10_effect_object_apply().
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: b2228834c7b8ddc5a43ed95deb39e0a0ede36ab5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2228834c7b8ddc5a43ed95de… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 4 23:42:15 2012 +0200 d3d10: Handle depth stencil state in d3d10_effect_object_apply(). --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 21 ++++++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 314faf8..fc9cb41 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -75,6 +75,7 @@ struct d3d10_effect_object union { ID3D10RasterizerState *rs; + ID3D10DepthStencilState *ds; ID3D10VertexShader *vs; ID3D10PixelShader *ps; ID3D10GeometryShader *gs; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 662bfce..4b26562 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1347,6 +1347,14 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr break; } + case D3D10_EOT_DEPTH_STENCIL_STATE: + { + ID3D10EffectDepthStencilVariable *dv = variable->lpVtbl->AsDepthStencil(variable); + if (FAILED(hr = dv->lpVtbl->GetDepthStencilState(dv, variable_idx, &o->object.ds))) + return hr; + break; + } + case D3D10_EOT_VERTEXSHADER: { ID3D10EffectShaderVariable *sv = variable->lpVtbl->AsShader(variable); @@ -1377,7 +1385,6 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr break; } - case D3D10_EOT_DEPTH_STENCIL_STATE: case D3D10_EOT_BLEND_STATE: case D3D10_EOT_STENCIL_REF: case D3D10_EOT_BLEND_FACTOR: @@ -2170,6 +2177,10 @@ static HRESULT d3d10_effect_object_apply(struct d3d10_effect_object *o) ID3D10Device_RSSetState(device, o->object.rs); return S_OK; + case D3D10_EOT_DEPTH_STENCIL_STATE: + ID3D10Device_OMSetDepthStencilState(device, o->object.ds, o->pass->stencil_ref); + return S_OK; + case D3D10_EOT_VERTEXSHADER: ID3D10Device_VSSetShader(device, o->object.vs); return S_OK; @@ -2182,6 +2193,9 @@ static HRESULT d3d10_effect_object_apply(struct d3d10_effect_object *o) ID3D10Device_GSSetShader(device, o->object.gs); return S_OK; + case D3D10_EOT_STENCIL_REF: + return S_OK; + default: FIXME("Unhandled effect object type %#x.\n", o->type); return E_FAIL; @@ -2274,6 +2288,11 @@ static void d3d10_effect_object_destroy(struct d3d10_effect_object *o) ID3D10RasterizerState_Release(o->object.rs); break; + case D3D10_EOT_DEPTH_STENCIL_STATE: + if (o->object.ds) + ID3D10DepthStencilState_Release(o->object.ds); + break; + case D3D10_EOT_VERTEXSHADER: if (o->object.vs) ID3D10VertexShader_Release(o->object.vs);

1 0

Francois Gouget : shell32/tests: Greatly expand the test_argify() tests.
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: 61f894c5764e724287db0ea84d204c6c6098a9f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61f894c5764e724287db0ea84… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 5 10:47:09 2012 +0200 shell32/tests: Greatly expand the test_argify() tests. --- dlls/shell32/tests/shlexec.c | 323 +++++++++++++++++++++++++++++------------- 1 files changed, 227 insertions(+), 96 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=61f894c5764e724287db0…

1 0

Jacek Caban : widl: Fixed fwrite error handling.
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: 430c3d0be2cb3478c6a308683695aef4f0480f4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=430c3d0be2cb3478c6a308683… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 5 12:05:45 2012 +0200 widl: Fixed fwrite error handling. --- tools/widl/register.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/register.c b/tools/widl/register.c index c75a6ac..d8b34d9 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -266,7 +266,7 @@ void write_regscript( const statement_list_t *stmts ) { FILE *f = fopen( regscript_name, "w" ); if (!f) error( "Could not open %s for output\n", regscript_name ); - if (fwrite( output_buffer, output_buffer_pos, 1, f ) != output_buffer_pos) + if (fwrite( output_buffer, 1, output_buffer_pos, f ) != output_buffer_pos) error( "Failed to write to %s\n", regscript_name ); if (fclose( f )) error( "Failed to write to %s\n", regscript_name );

1 0

Jacek Caban : widl: Alloc big enough buffer in dup_basename to handle registration suffix.
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: da0f33370a35fcadf743e2f56cdf7f71bd2e24db URL: http://source.winehq.org/git/wine.git/?a=commit;h=da0f33370a35fcadf743e2f56… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 5 12:05:26 2012 +0200 widl: Alloc big enough buffer in dup_basename to handle registration suffix. --- tools/widl/utils.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/utils.c b/tools/widl/utils.c index dc77ae8..9066887 100644 --- a/tools/widl/utils.c +++ b/tools/widl/utils.c @@ -159,8 +159,8 @@ char *dup_basename(const char *name, const char *ext) namelen = strlen(name); - /* +4 for later extension and +1 for '\0' */ - base = xmalloc(namelen +4 +1); + /* +6 for later extension (strlen("_r.rgs")) and +1 for '\0' */ + base = xmalloc(namelen +6 +1); strcpy(base, name); if(!strcasecmp(name + namelen-extlen, ext)) {

1 0