September 2012 - Wine-Commits

Qian Hong : gdi32: Prepend at when create vertical font face.
by Alexandre Julliard Sept. 12, 2012

Sept. 12, 2012

Module: wine Branch: master Commit: 97904fd1ff1e775f9af3a8915850a2c2f5d3b109 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97904fd1ff1e775f9af3a8915… Author: Qian Hong <fracting(a)gmail.com> Date: Wed Sep 12 21:51:24 2012 +0800 gdi32: Prepend at when create vertical font face. --- dlls/gdi32/freetype.c | 3 +++ dlls/gdi32/tests/font.c | 6 +----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 2587d99..7e5fc36 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1724,6 +1724,9 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, face->FullName = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, GetSystemDefaultLangID() ); if (!face->FullName) face->FullName = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, TT_MS_LANGID_ENGLISH_UNITED_STATES ); + if (vertical) + face->FullName = prepend_at( face->FullName ); + if (file) { face->file = strdupA( file ); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 3953512..b11acac 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4087,11 +4087,7 @@ static void test_fullname2_helper(const char *Family) trace("Checking font %s:\nFamilyName: %s; FaceName: %s; StyleName: %s\n", Family, FamilyName, FaceName, StyleName); get_vertical = ( FamilyName[0] == '@' ); - if (get_vertical) - { - todo_wine ok(get_vertical == want_vertical, "Vertical flags don't match: %s %s\n", Family, FamilyName); - continue; - } + ok(get_vertical == want_vertical, "Vertical flags don't match: %s %s\n", Family, FamilyName); lstrcpyA(lf.lfFaceName, FaceName); hfont = CreateFontIndirectA(&lf);

1 0

Josh DuBois : msls31: Add stub dll.
by Alexandre Julliard Sept. 12, 2012

Sept. 12, 2012

Module: wine Branch: master Commit: 92ad0a47fafaf92e4819a0229cc9fe71f5318734 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92ad0a47fafaf92e4819a0229… Author: Josh DuBois <duboisj(a)codeweavers.com> Date: Tue Sep 11 15:46:46 2012 -0500 msls31: Add stub dll. --- configure | 1 + configure.ac | 1 + dlls/msls31/Makefile.in | 6 +++ dlls/msls31/msls31.spec | 79 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msls31/msls31_main.c | 44 +++++++++++++++++++++++++ 5 files changed, 131 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 97e4664..41ef0c4 100755 --- a/configure +++ b/configure @@ -15534,6 +15534,7 @@ wine_fn_config_dll msimsg enable_msimsg wine_fn_config_dll msimtf enable_msimtf wine_fn_config_dll msisip enable_msisip wine_fn_config_dll msisys.ocx enable_msisys_ocx +wine_fn_config_dll msls31 enable_msls31 wine_fn_config_dll msnet32 enable_msnet32 wine_fn_config_dll mspatcha enable_mspatcha wine_fn_config_dll msrle32 enable_msrle32 po diff --git a/configure.ac b/configure.ac index 7e761af..2c9e582 100644 --- a/configure.ac +++ b/configure.ac @@ -2807,6 +2807,7 @@ WINE_CONFIG_DLL(msimsg) WINE_CONFIG_DLL(msimtf) WINE_CONFIG_DLL(msisip) WINE_CONFIG_DLL(msisys.ocx) +WINE_CONFIG_DLL(msls31) WINE_CONFIG_DLL(msnet32) WINE_CONFIG_DLL(mspatcha) WINE_CONFIG_DLL(msrle32,,[po]) diff --git a/dlls/msls31/Makefile.in b/dlls/msls31/Makefile.in new file mode 100644 index 0000000..91db958 --- /dev/null +++ b/dlls/msls31/Makefile.in @@ -0,0 +1,6 @@ +MODULE = msls31.dll + +C_SRCS = \ + msls31_main.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/msls31/msls31.spec b/dlls/msls31/msls31.spec new file mode 100644 index 0000000..f962a91 --- /dev/null +++ b/dlls/msls31/msls31.spec @@ -0,0 +1,79 @@ +@ stub LsAppendRunToCurrentSubline +@ stub LsCompressSubline +@ stub LsCreateContext +@ stub LsCreateLine +@ stub LsCreateSubline +@ stub LsDestroyContext +@ stub LsDestroyLine +@ stub LsDestroySubline +@ stub LsDisplayLine +@ stub LsDisplaySubline +@ stub LsEnumLine +@ stub LsEnumSubline +@ stub LsExpandSubline +@ stub LsFetchAppendToCurrentSubline +@ stub LsFetchAppendToCurrentSublineResume +@ stub LsFindNextBreakSubline +@ stub LsFindPrevBreakSubline +@ stub LsFinishCurrentSubline +@ stub LsForceBreakSubline +@ stub LsGetHihLsimethods +@ stub LsGetLineDur +@ stub LsGetMinDurBreaks +@ stub LsGetReverseLsimethods +@ stub LsGetRubyLsimethods +@ stub LsGetSpecialEffectsSubline +@ stub LsGetTatenakayokoLsimethods +@ stub LsGetWarichuLsimethods +@ stub LsLwMultDivR +@ stub LsMatchPresSubline +@ stub LsModifyLineHeight +@ stub LsPointUV2FromPointUV1 +@ stub LsPointXYFromPointUV +@ stub LsQueryCpPpointSubline +@ stub LsQueryFLineEmpty +@ stub LsQueryLineCpPpoint +@ stub LsQueryLineDup +@ stub LsQueryLinePointPcp +@ stub LsQueryPointPcpSubline +@ stub LsQueryTextCellDetails +@ stub LsResetRMInCurrentSubline +@ stub LsSetBreakSubline +@ stub LsSetBreaking +@ stub LsSetCompression +@ stub LsSetDoc +@ stub LsSetExpansion +@ stub LsSetModWidthPairs +@ stub LsSqueezeSubline +@ stub LsTruncateSubline +@ stub LsdnDistribute +@ stub LsdnFinishByOneChar +@ stub LsdnFinishByPen +@ stub LsdnFinishBySubline +@ stub LsdnFinishDelete +@ stub LsdnFinishDeleteAll +@ stub LsdnFinishRegular +@ stub LsdnFinishRegularAddAdvancePen +@ stub LsdnGetCurTabInfo +@ stub LsdnGetDup +@ stub LsdnGetFormatDepth +@ stub LsdnModifyParaEnding +@ stub LsdnQueryObjDimRange +@ stub LsdnQueryPenNode +@ stub LsdnResetObjDim +@ stub LsdnResetPenNode +@ stub LsdnResolvePrevTab +@ stub LsdnSetAbsBaseLine +@ stub LsdnSetRigidDup +@ stub LsdnSkipCurTab +@ stub LsdnSubmitSublines +@ stub LssbFDoneDisplay +@ stub LssbFDonePresSubline +@ stub LssbFIsSublineEmpty +@ stub LssbGetDupSubline +@ stub LssbGetDurTrailInSubline +@ stub LssbGetDurTrailWithPensInSubline +@ stub LssbGetNumberDnodesInSubline +@ stub LssbGetObjDimSubline +@ stub LssbGetPlsrunsFromSubline +@ stub LssbGetVisibleDcpInSubline diff --git a/dlls/msls31/msls31_main.c b/dlls/msls31/msls31_main.c new file mode 100644 index 0000000..9625a91 --- /dev/null +++ b/dlls/msls31/msls31_main.c @@ -0,0 +1,44 @@ +/* + * msls31.dll + * + * Copyright 2012 Josh DuBois for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msls31); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + } + return TRUE; +}

1 0

Qian Hong : gdi32/tests: Added tests for vertical fonts.
by Alexandre Julliard Sept. 12, 2012

Sept. 12, 2012

Module: wine Branch: master Commit: 8f91b516741be8a51ac0ae10379e79fa8ed4a53f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f91b516741be8a51ac0ae103… Author: Qian Hong <fracting(a)gmail.com> Date: Wed Sep 12 21:48:45 2012 +0800 gdi32/tests: Added tests for vertical fonts. --- dlls/gdi32/tests/font.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 3b79bd0..3953512 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4058,6 +4058,8 @@ static void test_fullname2_helper(const char *Family) int i; DWORD otm_size, ret, buf_size; OUTLINETEXTMETRICA *otm; + BOOL want_vertical, get_vertical; + want_vertical = ( Family[0] == '@' ); hdc = CreateCompatibleDC(0); ok(hdc != NULL, "CreateCompatibleDC failed\n"); @@ -4084,6 +4086,13 @@ static void test_fullname2_helper(const char *Family) trace("Checking font %s:\nFamilyName: %s; FaceName: %s; StyleName: %s\n", Family, FamilyName, FaceName, StyleName); + get_vertical = ( FamilyName[0] == '@' ); + if (get_vertical) + { + todo_wine ok(get_vertical == want_vertical, "Vertical flags don't match: %s %s\n", Family, FamilyName); + continue; + } + lstrcpyA(lf.lfFaceName, FaceName); hfont = CreateFontIndirectA(&lf); ok(hfont != 0, "CreateFontIndirectA failed\n"); @@ -4170,9 +4179,28 @@ static void test_fullname2_helper(const char *Family) static void test_fullname2(void) { + test_fullname2_helper("Arial"); + test_fullname2_helper("DejaVu Sans"); test_fullname2_helper("Lucida Sans"); + test_fullname2_helper("Tahoma"); test_fullname2_helper("Webdings"); test_fullname2_helper("Wingdings"); + test_fullname2_helper("SimSun"); + test_fullname2_helper("NSimSun"); + test_fullname2_helper("MingLiu"); + test_fullname2_helper("PMingLiu"); + test_fullname2_helper("WenQuanYi Micro Hei"); + test_fullname2_helper("MS UI Gothic"); + test_fullname2_helper("Ume UI Gothic"); + test_fullname2_helper("MS Gothic"); + test_fullname2_helper("Ume Gothic"); + test_fullname2_helper("MS PGothic"); + test_fullname2_helper("Ume P Gothic"); + test_fullname2_helper("Gulim"); + test_fullname2_helper("Batang"); + test_fullname2_helper("UnBatang"); + test_fullname2_helper("UnDotum"); + } static BOOL write_ttf_file(const char *fontname, char *tmp_name)

1 0

Qian Hong : gdi32: Prepend at in get_outline_text_metrics for vertical fonts.
by Alexandre Julliard Sept. 12, 2012

Sept. 12, 2012

Module: wine Branch: master Commit: df8be7b81aad749fc712c4a8ba79a1204faa008b URL: http://source.winehq.org/git/wine.git/?a=commit;h=df8be7b81aad749fc712c4a8b… Author: Qian Hong <fracting(a)gmail.com> Date: Wed Sep 12 21:55:15 2012 +0800 gdi32: Prepend at in get_outline_text_metrics for vertical fonts. --- dlls/gdi32/freetype.c | 1 + dlls/gdi32/tests/font.c | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 7e5fc36..3a90036 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6579,6 +6579,7 @@ static BOOL get_outline_text_metrics(GdiFont *font) FIXME("failed to read face_nameW for font %s!\n", wine_dbgstr_w(font->name)); face_nameW = strdupW(font->name); } + if (font->name[0] == '@') face_nameW = prepend_at( face_nameW ); lenface = (strlenW(face_nameW) + 1) * sizeof(WCHAR); full_nameW = get_face_name( ft_face, TT_NAME_ID_UNIQUE_ID, GetSystemDefaultLangID() ); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 1cf679b..92cc0a7 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4131,9 +4131,7 @@ static void test_fullname2_helper(const char *Family) WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); ok(!lstrcmpA(FamilyName, bufA), "font family names don't match: returned %s, expect %s\n", FamilyName, bufA); otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFamilyName; - if (want_vertical) - todo_wine ok(!lstrcmpA(FamilyName, otmStr), "FamilyName %s doesn't match otmpFamilyName %s\n", FamilyName, otmStr); - else ok(!lstrcmpA(FamilyName, otmStr), "FamilyName %s doesn't match otmpFamilyName %s\n", FamilyName, otmStr); + ok(!lstrcmpA(FamilyName, otmStr), "FamilyName %s doesn't match otmpFamilyName %s\n", FamilyName, otmStr); bufW[0] = 0; bufA[0] = 0; @@ -4146,9 +4144,7 @@ static void test_fullname2_helper(const char *Family) ok(ret, "FULL_NAME (face name) could not be read\n"); if (want_vertical) bufW = prepend_at(bufW); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); - if (want_vertical) - todo_wine ok(!lstrcmpA(FaceName, bufA), "font face names don't match: returned %s, expect %s\n", FaceName, bufA); - else ok(!lstrcmpA(FaceName, bufA), "font face names don't match: returned %s, expect %s\n", FaceName, bufA); + ok(!lstrcmpA(FaceName, bufA), "font face names don't match: returned %s, expect %s\n", FaceName, bufA); otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFaceName; ok(!lstrcmpA(FaceName, otmStr), "FaceName %s doesn't match otmpFaceName %s\n", FaceName, otmStr);

1 0

Piotr Caban : msvcp: Fixed displaying of not NULL-terminated strings in debug traces.
by Alexandre Julliard Sept. 12, 2012

Sept. 12, 2012

Module: wine Branch: master Commit: dadc409bae6bd326beb5b03ca4d20e9e44250481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dadc409bae6bd326beb5b03ca… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 12 13:27:42 2012 +0200 msvcp: Fixed displaying of not NULL-terminated strings in debug traces. --- dlls/msvcp100/string.c | 24 ++++++++++++------------ dlls/msvcp60/string.c | 24 ++++++++++++------------ dlls/msvcp90/string.c | 24 ++++++++++++------------ 3 files changed, 36 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dadc409bae6bd326beb5b…

1 0

Dmitry Timoshkov : windowscodecs: Implement GetContainerFormat for the TIFF metadata block reader.
by Alexandre Julliard Sept. 12, 2012

Sept. 12, 2012

Module: wine Branch: master Commit: b8c4ba66033955315a460c89cacade23195f80f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8c4ba66033955315a460c89c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 12 15:09:56 2012 +0900 windowscodecs: Implement GetContainerFormat for the TIFF metadata block reader. --- dlls/windowscodecs/tiffformat.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 3c5144d..05bd59e 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1147,8 +1147,12 @@ static ULONG WINAPI TiffFrameDecode_Block_Release(IWICMetadataBlockReader *iface static HRESULT WINAPI TiffFrameDecode_Block_GetContainerFormat(IWICMetadataBlockReader *iface, GUID *guid) { - FIXME("(%p,%p): stub\n", iface, guid); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, guid); + + if (!guid) return E_INVALIDARG; + + *guid = GUID_ContainerFormatTiff; + return S_OK; } static HRESULT WINAPI TiffFrameDecode_Block_GetCount(IWICMetadataBlockReader *iface,

1 0

Alexandre Julliard : winex11: Add support for the LWA_COLORKEY layered window attribute.
by Alexandre Julliard Sept. 12, 2012

Sept. 12, 2012

Module: wine Branch: master Commit: edea44f0ff995aadaaadb866a022832c16301e4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=edea44f0ff995aadaaadb866a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 12 16:00:18 2012 +0200 winex11: Add support for the LWA_COLORKEY layered window attribute. --- dlls/winex11.drv/bitblt.c | 194 ++++++++++++++++++++++++++++++++++++++++++++- dlls/winex11.drv/window.c | 24 +++++- dlls/winex11.drv/x11drv.h | 3 +- 3 files changed, 213 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=edea44f0ff995aadaaadb…

1 0

Daniel Jelinski : comctl32: Invalidate correct rectangle for marquee selection.
by Alexandre Julliard Sept. 12, 2012

Sept. 12, 2012

Module: wine Branch: master Commit: 425f0a25d64289cc7fcd58ac2b6ffc86379e3d09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=425f0a25d64289cc7fcd58ac2… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Tue Sep 11 21:36:35 2012 +0200 comctl32: Invalidate correct rectangle for marquee selection. --- dlls/comctl32/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index b8e1ce3..7a11557 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3886,7 +3886,7 @@ static void LISTVIEW_MarqueeHighlight(LISTVIEW_INFO *infoPtr, const POINT *coord } iterator_destroy(&new_elems); - LISTVIEW_InvalidateRect(infoPtr, &rect); + LISTVIEW_InvalidateRect(infoPtr, &infoPtr->marqueeDrawRect); } /***

1 0

Piotr Caban : msvcp90: Added std::ws(basic_istream) implementation.
by Alexandre Julliard Sept. 12, 2012

Sept. 12, 2012

Module: wine Branch: master Commit: 69e12a9ae931136b60fc5fa65bd793ba9e571320 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69e12a9ae931136b60fc5fa65… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 12 13:26:50 2012 +0200 msvcp90: Added std::ws(basic_istream) implementation. --- dlls/msvcp90/ios.c | 54 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 12 +++++----- 2 files changed, 60 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 699ac98..39e9a9f 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -7519,6 +7519,32 @@ basic_istream_char* __thiscall basic_istream_char_ignore(basic_istream_char *thi return this; } +/* ?ws(a)std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)AAV21@@Z */ +/* ?ws(a)std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)AEAV21@@Z */ +basic_istream_char* __cdecl ws_basic_istream_char(basic_istream_char *istream) +{ + basic_ios_char *base = basic_istream_char_get_basic_ios(istream); + int ch = '\n'; + + TRACE("(%p)\n", istream); + + if(basic_istream_char_sentry_create(istream, TRUE)) { + basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); + const ctype_char *ctype = ctype_char_use_facet(strbuf->loc); + + for(ch = basic_streambuf_char_sgetc(strbuf); ctype_char_is_ch(ctype, _SPACE, ch); + ch = basic_streambuf_char_snextc(strbuf)) { + if(ch == EOF) + break; + } + } + basic_istream_char_sentry_destroy(istream); + + if(ch == EOF) + basic_ios_char_setstate(base, IOSTATE_eofbit); + return istream; +} + /* ?peek@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEHXZ */ /* ?peek@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAHXZ */ DEFINE_THISCALL_WRAPPER(basic_istream_char_peek, 4) @@ -8750,6 +8776,34 @@ basic_istream_wchar* __thiscall basic_istream_wchar_ignore(basic_istream_wchar * return this; } +/* ?ws(a)std@@YAAAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1(a)AAV21@@Z */ +/* ?ws(a)std@@YAAEAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1(a)AEAV21@@Z */ +/* ?ws(a)std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)AAV21@@Z */ +/* ?ws(a)std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)AEAV21@@Z */ +basic_istream_wchar* __cdecl ws_basic_istream_wchar(basic_istream_wchar *istream) +{ + basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(istream); + unsigned short ch = '\n'; + + TRACE("(%p)\n", istream); + + if(basic_istream_wchar_sentry_create(istream, TRUE)) { + basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); + const ctype_wchar *ctype = ctype_wchar_use_facet(strbuf->loc); + + for(ch = basic_streambuf_wchar_sgetc(strbuf); ctype_wchar_is_ch(ctype, _SPACE, ch); + ch = basic_streambuf_wchar_snextc(strbuf)) { + if(ch == WEOF) + break; + } + } + basic_istream_wchar_sentry_destroy(istream); + + if(ch == WEOF) + basic_ios_wchar_setstate(base, IOSTATE_eofbit); + return istream; +} + /* ?peek@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QAEGXZ */ /* ?peek@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAGXZ */ /* ?peek@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QAEGXZ */ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index a14225a..b70fd27 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5711,12 +5711,12 @@ @ cdecl -arch=win64 ?write@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV12(a)PEBG_J@Z(ptr wstr long) basic_ostream_wchar_write @ thiscall -arch=win32 ?write@?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@QAEAAV12(a)PB_WH@Z(ptr wstr long) basic_ostream_wchar_write @ cdecl -arch=win64 ?write@?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAAEAV12(a)PEB_W_J@Z(ptr wstr long) basic_ostream_wchar_write -@ stub -arch=win32 ?ws(a)std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)AAV21@@Z -@ stub -arch=win64 ?ws(a)std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)AEAV21@@Z -@ stub -arch=win32 ?ws(a)std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)AAV21@@Z -@ stub -arch=win64 ?ws(a)std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)AEAV21@@Z -@ stub -arch=win32 ?ws(a)std@@YAAAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1(a)AAV21@@Z -@ stub -arch=win64 ?ws(a)std@@YAAEAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1(a)AEAV21@@Z +@ cdecl -arch=win32 ?ws(a)std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)AAV21@@Z(ptr) ws_basic_istream_char +@ cdecl -arch=win64 ?ws(a)std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)AEAV21@@Z(ptr) ws_basic_istream_char +@ cdecl -arch=win32 ?ws(a)std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)AAV21@@Z(ptr) ws_basic_istream_wchar +@ cdecl -arch=win64 ?ws(a)std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)AEAV21@@Z(ptr) ws_basic_istream_wchar +@ cdecl -arch=win32 ?ws(a)std@@YAAAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1(a)AAV21@@Z(ptr) ws_basic_istream_wchar +@ cdecl -arch=win64 ?ws(a)std@@YAAEAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1(a)AEAV21@@Z(ptr) ws_basic_istream_wchar @ cdecl ?xalloc(a)ios_base@std@@SAHXZ() ios_base_xalloc @ thiscall -arch=win32 ?xsgetn@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAEHPADH(a)Z(ptr ptr long) basic_streambuf_char_xsgetn @ cdecl -arch=win64 ?xsgetn@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MEAA_JPEAD_J(a)Z(ptr ptr long) basic_streambuf_char_xsgetn

1 0

Dmitry Timoshkov : windowscodecs: Check guid pointer for NULL in TiffDecoder_GetContainerFormat.
by Alexandre Julliard Sept. 12, 2012

Sept. 12, 2012

Module: wine Branch: master Commit: a53807e3e88ec63fae355a2e0d7282b3ad0ba09e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a53807e3e88ec63fae355a2e0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 12 15:10:26 2012 +0900 windowscodecs: Check guid pointer for NULL in TiffDecoder_GetContainerFormat. --- dlls/windowscodecs/tiffformat.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 05bd59e..05b6aba 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -595,6 +595,8 @@ exit: static HRESULT WINAPI TiffDecoder_GetContainerFormat(IWICBitmapDecoder *iface, GUID *pguidContainerFormat) { + if (!pguidContainerFormat) return E_INVALIDARG; + memcpy(pguidContainerFormat, &GUID_ContainerFormatTiff, sizeof(GUID)); return S_OK; }

1 0