October 2012 - Wine-Commits

Nikolay Sivov : dwrite: Added IDWriteLocalizedStrings stub.
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: 45a9560e83bf172f95e404730f451fef544dc650 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45a9560e83bf172f95e404730… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 7 13:11:04 2012 -0400 dwrite: Added IDWriteLocalizedStrings stub. --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 3 +- dlls/dwrite/main.c | 121 ++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/tests/font.c | 47 ++++++++++++++++ 4 files changed, 171 insertions(+), 1 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index d3af015..cba8130 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -46,3 +46,4 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) 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; +extern HRESULT create_localizedstrings(IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 15e9d14..7a3ec6b 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -256,8 +256,9 @@ static HRESULT WINAPI dwritefontfamily_GetFont(IDWriteFontFamily *iface, UINT32 static HRESULT WINAPI dwritefontfamily_GetFamilyNames(IDWriteFontFamily *iface, IDWriteLocalizedStrings **names) { struct dwrite_fontfamily *This = impl_from_IDWriteFontFamily(iface); + FIXME("(%p)->(%p): stub\n", This, names); - return E_NOTIMPL; + return create_localizedstrings(names); } static HRESULT WINAPI dwritefontfamily_GetFirstMatchingFont(IDWriteFontFamily *iface, DWRITE_FONT_WEIGHT weight, diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index c126ec1..679416b 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -172,6 +172,127 @@ static HRESULT create_renderingparams(FLOAT gamma, FLOAT enhancedContrast, FLOAT return S_OK; } +struct localizedstrings { + IDWriteLocalizedStrings IDWriteLocalizedStrings_iface; + LONG ref; +}; + +static inline struct localizedstrings *impl_from_IDWriteLocalizedStrings(IDWriteLocalizedStrings *iface) +{ + return CONTAINING_RECORD(iface, struct localizedstrings, IDWriteLocalizedStrings_iface); +} + +static HRESULT WINAPI localizedstrings_QueryInterface(IDWriteLocalizedStrings *iface, REFIID riid, void **obj) +{ + struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDWriteLocalizedStrings)) + { + *obj = iface; + IDWriteLocalizedStrings_AddRef(iface); + return S_OK; + } + + *obj = NULL; + + return E_NOINTERFACE; +} + +static ULONG WINAPI localizedstrings_AddRef(IDWriteLocalizedStrings *iface) +{ + struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + +static ULONG WINAPI localizedstrings_Release(IDWriteLocalizedStrings *iface) +{ + struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) + heap_free(This); + + return S_OK; +} + +static UINT32 WINAPI localizedstrings_GetCount(IDWriteLocalizedStrings *iface) +{ + struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + FIXME("(%p): stub\n", This); + return 0; +} + +static HRESULT WINAPI localizedstrings_FindLocaleName(IDWriteLocalizedStrings *iface, + WCHAR const *locale_name, UINT32 *index, BOOL *exists) +{ + struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + FIXME("(%p)->(%s %p %p): stub\n", This, debugstr_w(locale_name), index, exists); + return E_NOTIMPL; +} + +static HRESULT WINAPI localizedstrings_GetLocaleNameLength(IDWriteLocalizedStrings *iface, UINT32 index, UINT32 *length) +{ + struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + FIXME("(%p)->(%u %p): stub\n", This, index, length); + return E_NOTIMPL; +} + +static HRESULT WINAPI localizedstrings_GetLocaleName(IDWriteLocalizedStrings *iface, UINT32 index, WCHAR *locale_name, UINT32 size) +{ + struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + FIXME("(%p)->(%u %p %u): stub\n", This, index, locale_name, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI localizedstrings_GetStringLength(IDWriteLocalizedStrings *iface, UINT32 index, UINT32 *length) +{ + struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + FIXME("(%p)->(%u %p): stub\n", This, index, length); + return E_NOTIMPL; +} + +static HRESULT WINAPI localizedstrings_GetString(IDWriteLocalizedStrings *iface, UINT32 index, WCHAR *buffer, UINT32 size) +{ + struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + FIXME("(%p)->(%u %p %u): stub\n", This, index, buffer, size); + return E_NOTIMPL; +} + +static const IDWriteLocalizedStringsVtbl localizedstringsvtbl = { + localizedstrings_QueryInterface, + localizedstrings_AddRef, + localizedstrings_Release, + localizedstrings_GetCount, + localizedstrings_FindLocaleName, + localizedstrings_GetLocaleNameLength, + localizedstrings_GetLocaleName, + localizedstrings_GetStringLength, + localizedstrings_GetString +}; + +HRESULT create_localizedstrings(IDWriteLocalizedStrings **strings) +{ + struct localizedstrings *This; + + *strings = NULL; + + This = heap_alloc(sizeof(struct localizedstrings)); + if (!This) return E_OUTOFMEMORY; + + This->IDWriteLocalizedStrings_iface.lpVtbl = &localizedstringsvtbl; + This->ref = 1; + + *strings = &This->IDWriteLocalizedStrings_iface; + + return S_OK; +} + static HRESULT WINAPI dwritefactory_QueryInterface(IDWriteFactory *iface, REFIID riid, void **obj) { TRACE("(%s %p)\n", debugstr_guid(riid), obj); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 229e2f7..34d123c 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -312,6 +312,52 @@ if (0) /* crashes on native */ IDWriteGdiInterop_Release(interop); } +static void test_GetFamilyNames(void) +{ + static const WCHAR arialW[] = {'A','r','i','a','l',0}; + IDWriteFontFamily *family; + IDWriteLocalizedStrings *names, *names2; + IDWriteGdiInterop *interop; + IDWriteFont *font; + LOGFONTW logfont; + HRESULT hr; + + hr = IDWriteFactory_GetGdiInterop(factory, &interop); + EXPECT_HR(hr, S_OK); + + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + logfont.lfWidth = 12; + logfont.lfWeight = FW_NORMAL; + logfont.lfItalic = 1; + lstrcpyW(logfont.lfFaceName, arialW); + + hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); + EXPECT_HR(hr, S_OK); + + hr = IDWriteFont_GetFontFamily(font, &family); + EXPECT_HR(hr, S_OK); + +if (0) /* crashes on native */ + hr = IDWriteFontFamily_GetFamilyNames(family, NULL); + + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(names, 1); + + hr = IDWriteFontFamily_GetFamilyNames(family, &names2); + ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(names2, 1); + ok(names != names2, "got %p, was %p\n", names2, names); + + IDWriteLocalizedStrings_Release(names); + IDWriteLocalizedStrings_Release(names2); + + IDWriteFontFamily_Release(family); + IDWriteFont_Release(font); + IDWriteGdiInterop_Release(interop); +} + START_TEST(font) { HRESULT hr; @@ -327,6 +373,7 @@ START_TEST(font) test_CreateFontFromLOGFONT(); test_CreateBitmapRenderTarget(); test_GetFontFamily(); + test_GetFamilyNames(); IDWriteFactory_Release(factory); }

1 0

Vincent Povirk : ole32: Stub StgConvertVariantToProperty.
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: 04eaae5ce81ef91435b89955ee89e250905cf4be URL: http://source.winehq.org/git/wine.git/?a=commit;h=04eaae5ce81ef91435b89955e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Oct 4 15:30:20 2012 -0500 ole32: Stub StgConvertVariantToProperty. --- dlls/ole32/ole32.spec | 1 + dlls/ole32/stg_prop.c | 9 +++++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index b9eb50e..9e3f80f 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -255,6 +255,7 @@ @ stub SetDocumentBitStg @ stdcall SetErrorInfo(long ptr) @ stdcall StgConvertPropertyToVariant(ptr long ptr ptr) +@ stdcall StgConvertVariantToProperty(ptr long ptr ptr long long ptr) @ stdcall StgCreateDocfile(wstr long long ptr) @ stdcall StgCreateDocfileOnILockBytes(ptr long long ptr) @ stdcall StgCreatePropSetStg(ptr long ptr) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 98f562d..b582654 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -2762,3 +2762,12 @@ BOOLEAN WINAPI StgConvertPropertyToVariant(const SERIALIZEDPROPERTYVALUE* prop, return 0; } + +SERIALIZEDPROPERTYVALUE* WINAPI StgConvertVariantToProperty(const PROPVARIANT *pvar, + USHORT CodePage, SERIALIZEDPROPERTYVALUE *pprop, ULONG *pcb, PROPID pid, + BOOLEAN fReserved, ULONG *pcIndirect) +{ + FIXME("%p,%d,%p,%p,%d,%d,%p\n", pvar, CodePage, pprop, pcb, pid, fReserved, pcIndirect); + + return NULL; +}

1 0

Nikolay Sivov : dwrite: Implement GetStringLength method.
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: 114ef0688bd141f684ce42b0f6b1db2d2e709278 URL: http://source.winehq.org/git/wine.git/?a=commit;h=114ef0688bd141f684ce42b0f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 7 17:25:23 2012 -0400 dwrite: Implement GetStringLength method. --- dlls/dwrite/main.c | 12 ++++++++++-- dlls/dwrite/tests/font.c | 18 +++++++++++++++++- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index b056cb1..4ddc74b 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -271,8 +271,16 @@ static HRESULT WINAPI localizedstrings_GetLocaleName(IDWriteLocalizedStrings *if static HRESULT WINAPI localizedstrings_GetStringLength(IDWriteLocalizedStrings *iface, UINT32 index, UINT32 *length) { struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); - FIXME("(%p)->(%u %p): stub\n", This, index, length); - return E_NOTIMPL; + + TRACE("(%p)->(%u %p)\n", This, index, length); + + if (index >= This->count) { + *length = (UINT32)-1; + return E_FAIL; + } + + *length = strlenW(This->data[index].string); + return S_OK; } static HRESULT WINAPI localizedstrings_GetString(IDWriteLocalizedStrings *iface, UINT32 index, WCHAR *buffer, UINT32 size) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 3bba1ca..b22453c 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -321,6 +321,7 @@ static void test_GetFamilyNames(void) IDWriteFont *font; LOGFONTW logfont; HRESULT hr; + UINT32 len; hr = IDWriteFactory_GetGdiInterop(factory, &interop); EXPECT_HR(hr, S_OK); @@ -350,9 +351,24 @@ if (0) /* crashes on native */ EXPECT_REF(names2, 1); ok(names != names2, "got %p, was %p\n", names2, names); - IDWriteLocalizedStrings_Release(names); IDWriteLocalizedStrings_Release(names2); + /* GetStringLength */ +if (0) /* crashes on native */ + hr = IDWriteLocalizedStrings_GetStringLength(names, 0, NULL); + + len = 0; + hr = IDWriteLocalizedStrings_GetStringLength(names, 0, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len > 0, "got %u\n", len); + + len = 100; + hr = IDWriteLocalizedStrings_GetStringLength(names, 10, &len); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(len == (UINT32)-1, "got %u\n", len); + + IDWriteLocalizedStrings_Release(names); + IDWriteFontFamily_Release(family); IDWriteFont_Release(font); IDWriteGdiInterop_Release(interop);

1 0

Vincent Povirk : ole32: Add tests for StgConvertVariantToProperty.
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: 718f09562900d9597bcfcaba54b80c7d280026cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=718f09562900d9597bcfcaba5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Oct 4 16:19:07 2012 -0500 ole32: Add tests for StgConvertVariantToProperty. --- dlls/ole32/tests/propvariant.c | 93 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 93 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 5f7adba..2de480a 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -408,9 +408,102 @@ static void test_propertytovariant(void) PropVariantClear(&propvar); } +static void test_varianttoproperty(void) +{ + HANDLE hole32; + PROPVARIANT propvar; + SERIALIZEDPROPERTYVALUE *propvalue, *own_propvalue; + SERIALIZEDPROPERTYVALUE* (__stdcall *pStgConvertVariantToProperty)( + const PROPVARIANT*,USHORT,SERIALIZEDPROPERTYVALUE*,ULONG*,PROPID,BOOLEAN,ULONG*); + ULONG len; + static const WCHAR test_string[] = {'t','e','s','t',0}; + BSTR test_string_bstr; + + hole32 = GetModuleHandleA("ole32"); + + pStgConvertVariantToProperty = (void*)GetProcAddress(hole32, "StgConvertVariantToProperty"); + + if (!pStgConvertVariantToProperty) + { + win_skip("StgConvertVariantToProperty not available\n"); + return; + } + + own_propvalue = HeapAlloc(GetProcessHeap(), 0, sizeof(SERIALIZEDPROPERTYVALUE) + 20); + + PropVariantInit(&propvar); + + propvar.vt = VT_I4; + U(propvar).lVal = 0xfeabcdef; + + len = 0xdeadbeef; + propvalue = pStgConvertVariantToProperty(&propvar, CP_WINUNICODE, NULL, &len, + 0, FALSE, 0); + + ok(propvalue == NULL, "got nonnull propvalue\n"); + todo_wine ok(len == 8, "unexpected length %d\n", len); + + if (len == 0xdeadbeef) + { + return; + } + + len = 20; + propvalue = pStgConvertVariantToProperty(&propvar, CP_WINUNICODE, own_propvalue, &len, + 0, FALSE, 0); + + ok(propvalue == own_propvalue, "unexpected propvalue %p\n", propvalue); + ok(len == 8, "unexpected length %d\n", len); + ok(!memcmp(propvalue, serialized_i4, 8), "got wrong data\n"); + + propvar.vt = VT_EMPTY; + len = 20; + own_propvalue->dwType = 0xdeadbeef; + propvalue = pStgConvertVariantToProperty(&propvar, CP_WINUNICODE, own_propvalue, &len, + 0, FALSE, 0); + + ok(propvalue == own_propvalue, "unexpected propvalue %p\n", propvalue); + ok(len == 0, "unexpected length %d\n", len); + ok(propvalue->dwType == 0xdeadbeef, "unexpected type %d\n", propvalue->dwType); + + propvar.vt = VT_NULL; + len = 20; + propvalue = pStgConvertVariantToProperty(&propvar, CP_WINUNICODE, own_propvalue, &len, + 0, FALSE, 0); + + ok(propvalue == own_propvalue, "unexpected propvalue %p\n", propvalue); + ok(len == 4, "unexpected length %d\n", len); + ok(!memcmp(propvalue, serialized_null, 4), "got wrong data\n"); + + test_string_bstr = SysAllocString(test_string); + + propvar.vt = VT_BSTR; + U(propvar).bstrVal = test_string_bstr; + len = 20; + propvalue = pStgConvertVariantToProperty(&propvar, CP_WINUNICODE, own_propvalue, &len, + 0, FALSE, 0); + + ok(propvalue == own_propvalue, "unexpected propvalue %p\n", propvalue); + ok(len == 20, "unexpected length %d\n", len); + ok(!memcmp(propvalue, serialized_bstr_wc, 20), "got wrong data\n"); + + len = 20; + propvalue = pStgConvertVariantToProperty(&propvar, CP_UTF8, own_propvalue, &len, + 0, FALSE, 0); + + ok(propvalue == own_propvalue, "unexpected propvalue %p\n", propvalue); + ok(len == 16, "unexpected length %d\n", len); + ok(!memcmp(propvalue, serialized_bstr_mb, 16), "got wrong data\n"); + + SysFreeString(test_string_bstr); + + HeapFree(GetProcessHeap(), 0, own_propvalue); +} + START_TEST(propvariant) { test_validtypes(); test_copy(); test_propertytovariant(); + test_varianttoproperty(); }

1 0

Daniel Lehman : msvcrt: Add declaration for _sc[w]printf to header.
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: 7e414ee71a6692c61733c576d18fae7cbd19a285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e414ee71a6692c61733c576d… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Oct 4 12:12:10 2012 -0700 msvcrt: Add declaration for _sc[w]printf to header. --- include/msvcrt/stdio.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 80439ee..f277516 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -121,6 +121,7 @@ int __cdecl _snprintf(char*,size_t,const char*,...); int __cdecl _snprintf_s(char*,size_t,size_t,const char*,...); char* __cdecl _tempnam(const char*,const char*); int __cdecl _unlink(const char*); +int __cdecl _scprintf(const char*,...); int __cdecl _vscprintf(const char*,__ms_va_list); int __cdecl _vsnprintf(char*,size_t,const char*,__ms_va_list); int __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,__ms_va_list); @@ -189,6 +190,7 @@ wchar_t* __cdecl _getws(wchar_t*); int __cdecl _putws(const wchar_t*); int __cdecl _snwprintf(wchar_t*,size_t,const wchar_t*,...); int __cdecl _snwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,...); +int __cdecl _scwprintf(const wchar_t*,...); int __cdecl _vscwprintf(const wchar_t*,__ms_va_list); int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list); int __cdecl _vsnwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,__ms_va_list);

1 0

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

Oct. 8, 2012

Module: wine Branch: master Commit: 8f5b4123abc512450b97513bd92720df325ee1aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f5b4123abc512450b97513bd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 5 14:55:16 2012 +0200 msvcp60: Added basic_fstream::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 6840b78..7c1c202 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -10027,6 +10027,29 @@ MSVCP_bool __thiscall basic_fstream_char_is_open(const basic_fstream_char *this) return basic_filebuf_char_is_open(&this->filebuf); } +/* ?open@?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPBDH(a)Z */ +/* ?open@?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBDH(a)Z */ +DEFINE_THISCALL_WRAPPER(basic_fstream_char_open, 12) +void __thiscall basic_fstream_char_open(basic_fstream_char *this, + const char *name, int mode) +{ + TRACE("(%p %s %d)\n", this, name, mode); + + 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); + } +} + +/* ?open@?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPBDF(a)Z */ +/* ?open@?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBDF(a)Z */ +DEFINE_THISCALL_WRAPPER(basic_fstream_char_open_old, 12) +void __thiscall basic_fstream_char_open_old(basic_fstream_char *this, + const char *name, int mode) +{ + basic_fstream_char_open(this, name, mode); +} + /* ?rdbuf@?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QBEPAV?$basic_filebuf(a)DU?$char_traits(a)D@std@@@2(a)XZ */ /* ?rdbuf@?$basic_fstream(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_fstream_char_rdbuf, 4) @@ -10156,6 +10179,29 @@ MSVCP_bool __thiscall basic_fstream_wchar_is_open(const basic_fstream_wchar *thi return basic_filebuf_wchar_is_open(&this->filebuf); } +/* ?open@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QAEPAV12(a)PBDH@Z */ +/* ?open@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QEAAPEAV12(a)PEBDH@Z */ +DEFINE_THISCALL_WRAPPER(basic_fstream_wchar_open, 12) +void __thiscall basic_fstream_wchar_open(basic_fstream_wchar *this, + const char *name, int mode) +{ + TRACE("(%p %s %d)\n", this, name, mode); + + 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); + } +} + +/* ?open@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QAEPAV12(a)PBDF@Z */ +/* ?open@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QEAAPEAV12(a)PEBDF@Z */ +DEFINE_THISCALL_WRAPPER(basic_fstream_wchar_open_old, 12) +void __thiscall basic_fstream_wchar_open_old(basic_fstream_wchar *this, + const char *name, int mode) +{ + basic_fstream_wchar_open(this, name, mode); +} + /* ?rdbuf@?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QBEPAV?$basic_filebuf(a)_WU?$char_traits(a)_W@std@@@2(a)XZ */ /* ?rdbuf@?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QEBAPEAV?$basic_filebuf(a)_WU?$char_traits(a)_W@std@@@2(a)XZ */ /* ?rdbuf@?$basic_fstream(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 be07389..94bd7ec 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -3506,14 +3506,14 @@ @ cdecl -arch=win64 ?open@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QEAAPEAV12(a)PEBDF@Z(ptr str long) basic_filebuf_wchar_open_mode_old @ thiscall -arch=win32 ?open@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QAEPAV12(a)PBDH@Z(ptr str long) basic_filebuf_wchar_open_mode @ cdecl -arch=win64 ?open@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QEAAPEAV12(a)PEBDH@Z(ptr str long) basic_filebuf_wchar_open_mode -@ stub -arch=win32 ?open@?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPBDF(a)Z -@ stub -arch=win64 ?open@?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBDF(a)Z -@ stub -arch=win32 ?open@?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPBDH(a)Z -@ stub -arch=win64 ?open@?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBDH(a)Z -@ stub -arch=win32 ?open@?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAEXPBDF(a)Z -@ 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 +@ thiscall -arch=win32 ?open@?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPBDF(a)Z(ptr str long) basic_fstream_char_open_old +@ cdecl -arch=win64 ?open@?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBDF(a)Z(ptr str long) basic_fstream_char_open_old +@ thiscall -arch=win32 ?open@?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPBDH(a)Z(ptr str long) basic_fstream_char_open +@ cdecl -arch=win64 ?open@?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBDH(a)Z(ptr str long) basic_fstream_char_open +@ thiscall -arch=win32 ?open@?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAEXPBDF(a)Z(ptr str long) basic_fstream_wchar_open_old +@ cdecl -arch=win64 ?open@?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAAXPEBDF(a)Z(ptr str long) basic_fstream_wchar_open_old +@ thiscall -arch=win32 ?open@?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAEXPBDH(a)Z(ptr str long) basic_fstream_wchar_open +@ cdecl -arch=win64 ?open@?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAAXPEBDH(a)Z(ptr str long) basic_fstream_wchar_open @ 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

1 0

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

Oct. 8, 2012

Module: wine Branch: master Commit: 4a7420296b13d882ff0ff1e4cc4d81aaca6a2b7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a7420296b13d882ff0ff1e4c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 5 14:55:01 2012 +0200 msvcp60: Added basic_ofstream::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 a169851..6840b78 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -9452,6 +9452,29 @@ MSVCP_bool __thiscall basic_ofstream_char_is_open(const basic_ofstream_char *thi return basic_filebuf_char_is_open(&this->filebuf); } +/* ?open@?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPBDH(a)Z */ +/* ?open@?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBDH(a)Z */ +DEFINE_THISCALL_WRAPPER(basic_ofstream_char_open, 12) +void __thiscall basic_ofstream_char_open(basic_ofstream_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_out, _SH_DENYNO)) { + basic_ios_char *basic_ios = basic_ostream_char_get_basic_ios(&this->base); + basic_ios_char_setstate(basic_ios, IOSTATE_failbit); + } +} + +/* ?open@?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPBDF(a)Z */ +/* ?open@?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBDF(a)Z */ +DEFINE_THISCALL_WRAPPER(basic_ofstream_char_open_old, 12) +void __thiscall basic_ofstream_char_open_old(basic_ofstream_char *this, + const char *name, short mode) +{ + basic_ofstream_char_open(this, name, mode); +} + /* ?rdbuf@?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QBEPAV?$basic_filebuf(a)DU?$char_traits(a)D@std@@@2(a)XZ */ /* ?rdbuf@?$basic_ofstream(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_ofstream_char_rdbuf, 4) @@ -9580,6 +9603,29 @@ MSVCP_bool __thiscall basic_ofstream_wchar_is_open(const basic_ofstream_wchar *t return basic_filebuf_wchar_is_open(&this->filebuf); } +/* ?open@?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QAEXPBDH(a)Z */ +/* ?open@?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QEAAXPEBDH(a)Z */ +DEFINE_THISCALL_WRAPPER(basic_ofstream_wchar_open, 12) +void __thiscall basic_ofstream_wchar_open(basic_ofstream_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_out, _SH_DENYNO)) { + basic_ios_wchar *basic_ios = basic_ostream_wchar_get_basic_ios(&this->base); + basic_ios_wchar_setstate(basic_ios, IOSTATE_failbit); + } +} + +/* ?open@?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QAEXPBDF(a)Z */ +/* ?open@?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QEAAXPEBDF(a)Z */ +DEFINE_THISCALL_WRAPPER(basic_ofstream_wchar_open_old, 12) +void __thiscall basic_ofstream_wchar_open_old(basic_ofstream_wchar *this, + const char *name, int mode) +{ + basic_ofstream_wchar_open(this, name, mode); +} + /* ?rdbuf@?$basic_ofstream(a)_WU?$char_traits(a)_W@std@@@std@@QBEPAV?$basic_filebuf(a)_WU?$char_traits(a)_W@std@@@2(a)XZ */ /* ?rdbuf@?$basic_ofstream(a)_WU?$char_traits(a)_W@std@@@std@@QEBAPEAV?$basic_filebuf(a)_WU?$char_traits(a)_W@std@@@2(a)XZ */ /* ?rdbuf@?$basic_ofstream(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 97e9458..be07389 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -3522,14 +3522,14 @@ @ 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 -@ stub -arch=win64 ?open@?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBDH(a)Z -@ stub -arch=win32 ?open@?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QAEXPBDF(a)Z -@ stub -arch=win64 ?open@?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QEAAXPEBDF(a)Z -@ stub -arch=win32 ?open@?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QAEXPBDH(a)Z -@ stub -arch=win64 ?open@?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QEAAXPEBDH(a)Z +@ thiscall -arch=win32 ?open@?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPBDF(a)Z(ptr str long) basic_ofstream_char_open_old +@ cdecl -arch=win64 ?open@?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBDF(a)Z(ptr str long) basic_ofstream_char_open_old +@ thiscall -arch=win32 ?open@?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPBDH(a)Z(ptr str long) basic_ofstream_char_open +@ cdecl -arch=win64 ?open@?$basic_ofstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBDH(a)Z(ptr str long) basic_ofstream_char_open +@ thiscall -arch=win32 ?open@?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QAEXPBDF(a)Z(ptr str long) basic_ofstream_wchar_open_old +@ cdecl -arch=win64 ?open@?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QEAAXPEBDF(a)Z(ptr str long) basic_ofstream_wchar_open_old +@ thiscall -arch=win32 ?open@?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QAEXPBDH(a)Z(ptr str long) basic_ofstream_wchar_open +@ cdecl -arch=win64 ?open@?$basic_ofstream(a)GU?$char_traits(a)G@std@@@std@@QEAAXPEBDH(a)Z(ptr str long) basic_ofstream_wchar_open @ stub -arch=win32 ?open@?$messages(a)D@std@@QBEHABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)ABVlocale@2@@Z @ stub -arch=win64 ?open@?$messages(a)D@std@@QEBAHAEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)AEBVlocale@2@@Z @ stub -arch=win32 ?open@?$messages(a)G@std@@QBEHABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)ABVlocale@2@@Z

1 0

Nikolay Sivov : dwrite: Implement GetString().
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: 9b0f49264e423ecb49fa4fc45959556b021a2e4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b0f49264e423ecb49fa4fc45… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 7 18:43:15 2012 -0400 dwrite: Implement GetString(). --- dlls/dwrite/main.c | 17 +++++++++++++++-- dlls/dwrite/tests/font.c | 37 ++++++++++++++++++++++++++++++++++--- include/winerror.h | 2 ++ 3 files changed, 51 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 4ddc74b..67ba83c 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -286,8 +286,21 @@ static HRESULT WINAPI localizedstrings_GetStringLength(IDWriteLocalizedStrings * static HRESULT WINAPI localizedstrings_GetString(IDWriteLocalizedStrings *iface, UINT32 index, WCHAR *buffer, UINT32 size) { struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); - FIXME("(%p)->(%u %p %u): stub\n", This, index, buffer, size); - return E_NOTIMPL; + + TRACE("(%p)->(%u %p %u)\n", This, index, buffer, size); + + if (index >= This->count) { + if (buffer) *buffer = 0; + return E_FAIL; + } + + if (size < strlenW(This->data[index].string)+1) { + if (buffer) *buffer = 0; + return E_NOT_SUFFICIENT_BUFFER; + } + + strcpyW(buffer, This->data[index].string); + return S_OK; } static const IDWriteLocalizedStringsVtbl localizedstringsvtbl = { diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index b22453c..81e17fd 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -320,6 +320,7 @@ static void test_GetFamilyNames(void) IDWriteGdiInterop *interop; IDWriteFont *font; LOGFONTW logfont; + WCHAR buffer[100]; HRESULT hr; UINT32 len; @@ -357,15 +358,45 @@ if (0) /* crashes on native */ if (0) /* crashes on native */ hr = IDWriteLocalizedStrings_GetStringLength(names, 0, NULL); + len = 100; + hr = IDWriteLocalizedStrings_GetStringLength(names, 10, &len); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(len == (UINT32)-1, "got %u\n", len); + len = 0; hr = IDWriteLocalizedStrings_GetStringLength(names, 0, &len); ok(hr == S_OK, "got 0x%08x\n", hr); ok(len > 0, "got %u\n", len); - len = 100; - hr = IDWriteLocalizedStrings_GetStringLength(names, 10, &len); + /* GetString */ + hr = IDWriteLocalizedStrings_GetString(names, 0, NULL, 0); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); + + hr = IDWriteLocalizedStrings_GetString(names, 10, NULL, 0); ok(hr == E_FAIL, "got 0x%08x\n", hr); - ok(len == (UINT32)-1, "got %u\n", len); + +if (0) + hr = IDWriteLocalizedStrings_GetString(names, 0, NULL, 100); + + buffer[0] = 1; + hr = IDWriteLocalizedStrings_GetString(names, 10, buffer, 100); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(buffer[0] == 0, "got %x\n", buffer[0]); + + buffer[0] = 1; + hr = IDWriteLocalizedStrings_GetString(names, 0, buffer, len-1); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); + ok(buffer[0] == 0, "got %x\n", buffer[0]); + + buffer[0] = 1; + hr = IDWriteLocalizedStrings_GetString(names, 0, buffer, len); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); + ok(buffer[0] == 0, "got %x\n", buffer[0]); + + buffer[0] = 0; + hr = IDWriteLocalizedStrings_GetString(names, 0, buffer, len+1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(buffer[0] != 0, "got %x\n", buffer[0]); IDWriteLocalizedStrings_Release(names); diff --git a/include/winerror.h b/include/winerror.h index 0b9a59e..b6281f8 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -1939,6 +1939,8 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) /* the codes 4000-40ff are reserved for OLE */ #undef NOERROR /* arpa/nameser_compat.h defines this */ +#define E_NOT_SUFFICIENT_BUFFER HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) + #ifdef RC_INVOKED #define _HRESULT_TYPEDEF_(x) (x) #else

1 0

Piotr Caban : msvcp60: Added basic_istream::seekg implementation.
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: 1fb247b0e31460d41bbb88439a1cf926e515b035 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fb247b0e31460d41bbb88439… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 5 14:56:29 2012 +0200 msvcp60: Added basic_istream::seekg implementation. --- dlls/msvcp60/ios.c | 60 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp60/msvcp60.spec | 8 +++--- 2 files changed, 64 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 4d753c5..2b06716 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -7332,6 +7332,36 @@ fpos_int* __thiscall basic_istream_char_tellg(basic_istream_char *this, fpos_int return ret; } +/* ?seekg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)JW4seekdir@ios_base(a)2@@Z */ +/* ?seekg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)_JW4seekdir@ios_base(a)2@@Z */ +DEFINE_THISCALL_WRAPPER(basic_istream_char_seekg, 12) +basic_istream_char* __thiscall basic_istream_char_seekg(basic_istream_char *this, streamoff off, int dir) +{ + basic_ios_char *base = basic_istream_char_get_basic_ios(this); + + TRACE("(%p %ld %d)\n", this, off, dir); + + if(basic_istream_char_sentry_create(this, TRUE)) { + if(!ios_base_fail(&base->base)) { + basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); + fpos_int ret; + + basic_streambuf_char_pubseekoff(strbuf, &ret, off, dir, OPENMODE_in); + basic_istream_char_sentry_destroy(this); + + if(ret.off==0 && ret.pos==-1 && ret.state==0) + basic_ios_char_setstate(base, IOSTATE_failbit); + else + basic_ios_char_clear(base, IOSTATE_goodbit); + return this; + } + } + basic_istream_char_sentry_destroy(this); + + basic_ios_char_setstate(base, IOSTATE_failbit); + return this; +} + /* ?seekg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)V?$fpos(a)H@2@@Z */ /* ?seekg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)V?$fpos(a)H@2@@Z */ DEFINE_THISCALL_WRAPPER(basic_istream_char_seekg_fpos, 28) @@ -8572,6 +8602,36 @@ fpos_int* __thiscall basic_istream_wchar_tellg(basic_istream_wchar *this, fpos_i return ret; } +/* ?seekg@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV12(a)JW4seekdir@ios_base(a)2@@Z */ +/* ?seekg@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV12(a)_JW4seekdir@ios_base(a)2@@Z */ +DEFINE_THISCALL_WRAPPER(basic_istream_wchar_seekg, 12) +basic_istream_wchar* __thiscall basic_istream_wchar_seekg(basic_istream_wchar *this, streamoff off, int dir) +{ + basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); + + TRACE("(%p %ld %d)\n", this, off, dir); + + if(basic_istream_wchar_sentry_create(this, TRUE)) { + if(!ios_base_fail(&base->base)) { + basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); + fpos_int ret; + + basic_streambuf_wchar_pubseekoff(strbuf, &ret, off, dir, OPENMODE_in); + basic_istream_wchar_sentry_destroy(this); + + if(ret.off==0 && ret.pos==-1 && ret.state==0) + basic_ios_wchar_setstate(base, IOSTATE_failbit); + else + basic_ios_wchar_clear(base, IOSTATE_goodbit); + return this; + } + } + basic_istream_wchar_sentry_destroy(this); + + basic_ios_wchar_setstate(base, IOSTATE_failbit); + return this; +} + /* ?seekg@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QAEAAV12(a)V?$fpos(a)H@2@@Z */ /* ?seekg@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAAEAV12(a)V?$fpos(a)H@2@@Z */ /* ?seekg@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV12(a)V?$fpos(a)H@2@@Z */ diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 25ee5db..22a3da8 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -3908,14 +3908,14 @@ @ cdecl -arch=win64 ?scan_not@?$ctype(a)D@std@@QEBAPEBDFPEBD0(a)Z(ptr long ptr ptr) ctype_char_scan_not @ thiscall -arch=win32 ?scan_not@?$ctype(a)G@std@@QBEPBGFPBG0(a)Z(ptr long ptr ptr) ctype_wchar_scan_not @ cdecl -arch=win64 ?scan_not@?$ctype(a)G@std@@QEBAPEBGFPEBG0(a)Z(ptr long ptr ptr) ctype_wchar_scan_not -@ stub -arch=win32 ?seekg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)JW4seekdir@ios_base(a)2@@Z +@ thiscall -arch=win32 ?seekg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)JW4seekdir@ios_base(a)2@@Z(ptr long long) basic_istream_char_seekg @ cdecl -arch=win64 ?seekg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)V?$fpos(a)H@2@@Z(ptr ptr) basic_istream_char_seekg_fpos @ thiscall -arch=win32 ?seekg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)V?$fpos(a)H@2@@Z(ptr long long int64 long long) basic_istream_char_seekg_fpos -@ stub -arch=win64 ?seekg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)_JW4seekdir@ios_base(a)2@@Z -@ stub -arch=win32 ?seekg@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV12(a)JW4seekdir@ios_base(a)2@@Z +@ cdecl -arch=win64 ?seekg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)_JW4seekdir@ios_base(a)2@@Z(ptr long long) basic_istream_char_seekg +@ thiscall -arch=win32 ?seekg@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV12(a)JW4seekdir@ios_base(a)2@@Z(ptr long long) basic_istream_wchar_seekg @ cdecl -arch=win64 ?seekg@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV12(a)V?$fpos(a)H@2@@Z(ptr ptr) basic_istream_wchar_seekg_fpos @ thiscall -arch=win32 ?seekg@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV12(a)V?$fpos(a)H@2@@Z(ptr long long int64 long long) basic_istream_wchar_seekg_fpos -@ stub -arch=win64 ?seekg@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV12(a)_JW4seekdir@ios_base(a)2@@Z +@ cdecl -arch=win64 ?seekg@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV12(a)_JW4seekdir@ios_base(a)2@@Z(ptr long long) basic_istream_wchar_seekg @ stub -arch=win32 ?seekoff@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MAE?AV?$fpos(a)H@2(a)JW4seekdir@ios_base(a)2@H(a)Z @ stub -arch=win64 ?seekoff@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MEAA?AV?$fpos(a)H@2(a)_JW4seekdir@ios_base(a)2@H(a)Z @ stub -arch=win32 ?seekoff@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@MAE?AV?$fpos(a)H@2(a)JW4seekdir@ios_base(a)2@H(a)Z

1 0

Piotr Caban : msvcp71: Added basic_string functions that work on iterators.
by Alexandre Julliard Oct. 8, 2012

Oct. 8, 2012

Module: wine Branch: master Commit: 4cb3bcdb2cc4a189a94ab598681c727337b7c33e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cb3bcdb2cc4a189a94ab5986… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 8 11:41:17 2012 +0200 msvcp71: Added basic_string functions that work on iterators. --- dlls/msvcp71/msvcp71.spec | 60 ++++++------ dlls/msvcp71/string.c | 255 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 272 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4cb3bcdb2cc4a189a94ab…

1 0