wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

Qian Hong : gdi32/tests: Added more tests for vertical fonts.
by Alexandre Julliard 12 Sep '12

12 Sep '12

Module: wine Branch: master Commit: 2f76f35e468c5160b8da0b79d996a061a36bfc93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f76f35e468c5160b8da0b79d… Author: Qian Hong <fracting(a)gmail.com> Date: Wed Sep 12 21:53:38 2012 +0800 gdi32/tests: Added more tests for vertical fonts. --- dlls/gdi32/tests/font.c | 35 +++++++++++++++++++++++++++++++++-- 1 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index b11acac..1cf679b 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4046,6 +4046,16 @@ static void test_fullname(void) DeleteDC(hdc); } +static WCHAR *prepend_at(WCHAR *family) +{ + if (!family) + return NULL; + + memmove(family + 1, family, (lstrlenW(family) + 1) * sizeof(WCHAR)); + family[0] = '@'; + return family; +} + static void test_fullname2_helper(const char *Family) { char *FamilyName, *FaceName, *StyleName, *otmStr; @@ -4117,10 +4127,13 @@ static void test_fullname2_helper(const char *Family) ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_FAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); } ok(ret, "FAMILY (family name) could not be read\n"); + if (want_vertical) bufW = prepend_at(bufW); 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; - ok(!lstrcmpA(FamilyName, otmStr), "FamilyName %s doesn't match otmpFamilyName %s\n", FamilyName, otmStr); + 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); bufW[0] = 0; bufA[0] = 0; @@ -4131,8 +4144,11 @@ static void test_fullname2_helper(const char *Family) ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); } 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); - ok(!lstrcmpA(FaceName, bufA), "font face names don't match: returned %s, expect %s\n", FaceName, bufA); + 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); otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFaceName; ok(!lstrcmpA(FaceName, otmStr), "FaceName %s doesn't match otmpFaceName %s\n", FaceName, otmStr); @@ -4196,6 +4212,21 @@ static void test_fullname2(void) test_fullname2_helper("Batang"); test_fullname2_helper("UnBatang"); test_fullname2_helper("UnDotum"); + 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"); }

1 0

Qian Hong : gdi32: Prepend at when create vertical font face.
by Alexandre Julliard 12 Sep '12

12 Sep '12

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

Qian Hong : gdi32/tests: Added tests for vertical fonts.
by Alexandre Julliard 12 Sep '12

12 Sep '12

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: Fixed localized font full name (UNIQUE ID).
by Alexandre Julliard 12 Sep '12

12 Sep '12

Module: wine Branch: master Commit: 6c1e264e8e6d6c76db3c40e491bd83810cab0865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c1e264e8e6d6c76db3c40e49… Author: Qian Hong <fracting(a)gmail.com> Date: Wed Sep 12 21:42:04 2012 +0800 gdi32: Fixed localized font full name (UNIQUE ID). --- dlls/gdi32/freetype.c | 4 +++- dlls/gdi32/tests/font.c | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9412df2..2587d99 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6578,7 +6578,9 @@ static BOOL get_outline_text_metrics(GdiFont *font) } lenface = (strlenW(face_nameW) + 1) * sizeof(WCHAR); - full_nameW = get_face_name( ft_face, TT_NAME_ID_UNIQUE_ID, TT_MS_LANGID_ENGLISH_UNITED_STATES ); + full_nameW = get_face_name( ft_face, TT_NAME_ID_UNIQUE_ID, GetSystemDefaultLangID() ); + if (!full_nameW) + full_nameW = get_face_name( ft_face, TT_NAME_ID_UNIQUE_ID, TT_MS_LANGID_ENGLISH_UNITED_STATES ); if (!full_nameW) { WCHAR fake_nameW[] = {'f','a','k','e',' ','n','a','m','e', 0}; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 0c67fe7..3b79bd0 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4147,7 +4147,12 @@ static void test_fullname2_helper(const char *Family) bufW[0] = 0; bufA[0] = 0; - ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_UNIQUE_ID, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_UNIQUE_ID, bufW, buf_size, GetSystemDefaultLangID()); + if (!ret) + { + trace("no localized UNIQUE_ID found.\n"); + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_UNIQUE_ID, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + } ok(ret, "UNIQUE_ID (full name) could not be read\n"); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFullName;

1 0

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

12 Sep '12

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

Piotr Caban : msvcp: Sync spec files and implementations.
by Alexandre Julliard 12 Sep '12

12 Sep '12

Module: wine Branch: master Commit: 8dacc816ebea5187a84c979518639314d4c1f411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dacc816ebea5187a84c97951… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 12 13:27:11 2012 +0200 msvcp: Sync spec files and implementations. --- dlls/msvcp100/ios.c | 54 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp100/msvcp100.spec | 12 ++++---- dlls/msvcp70/msvcp70.spec | 12 ++++---- dlls/msvcp71/msvcp71.spec | 12 ++++---- dlls/msvcp80/msvcp80.spec | 12 ++++---- 5 files changed, 78 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8dacc816ebea5187a84c9…

1 0

Piotr Caban : msvcp90: Added std::ws(basic_istream) implementation.
by Alexandre Julliard 12 Sep '12

12 Sep '12

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@std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@1@AAV21@@Z */ +/* ?ws@std@@YAAEAV?$basic_istream@DU?$char_traits@D@std@@@1@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@DU?$char_traits@D@std@@@std@@QAEHXZ */ /* ?peek@?$basic_istream@DU?$char_traits@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@std@@YAAAV?$basic_istream@_WU?$char_traits@_W@std@@@1@AAV21@@Z */ +/* ?ws@std@@YAAEAV?$basic_istream@_WU?$char_traits@_W@std@@@1@AEAV21@@Z */ +/* ?ws@std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@1@AAV21@@Z */ +/* ?ws@std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@1@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@_WU?$char_traits@_W@std@@@std@@QAEGXZ */ /* ?peek@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAGXZ */ /* ?peek@?$basic_istream@GU?$char_traits@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@GU?$char_traits@G@std@@@std@@QEAAAEAV12@PEBG_J@Z(ptr wstr long) basic_ostream_wchar_write @ thiscall -arch=win32 ?write@?$basic_ostream@_WU?$char_traits@_W@std@@@std@@QAEAAV12@PB_WH@Z(ptr wstr long) basic_ostream_wchar_write @ cdecl -arch=win64 ?write@?$basic_ostream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV12@PEB_W_J@Z(ptr wstr long) basic_ostream_wchar_write -@ stub -arch=win32 ?ws@std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@1@AAV21@@Z -@ stub -arch=win64 ?ws@std@@YAAEAV?$basic_istream@DU?$char_traits@D@std@@@1@AEAV21@@Z -@ stub -arch=win32 ?ws@std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@1@AAV21@@Z -@ stub -arch=win64 ?ws@std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@1@AEAV21@@Z -@ stub -arch=win32 ?ws@std@@YAAAV?$basic_istream@_WU?$char_traits@_W@std@@@1@AAV21@@Z -@ stub -arch=win64 ?ws@std@@YAAEAV?$basic_istream@_WU?$char_traits@_W@std@@@1@AEAV21@@Z +@ cdecl -arch=win32 ?ws@std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@1@AAV21@@Z(ptr) ws_basic_istream_char +@ cdecl -arch=win64 ?ws@std@@YAAEAV?$basic_istream@DU?$char_traits@D@std@@@1@AEAV21@@Z(ptr) ws_basic_istream_char +@ cdecl -arch=win32 ?ws@std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@1@AAV21@@Z(ptr) ws_basic_istream_wchar +@ cdecl -arch=win64 ?ws@std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@1@AEAV21@@Z(ptr) ws_basic_istream_wchar +@ cdecl -arch=win32 ?ws@std@@YAAAV?$basic_istream@_WU?$char_traits@_W@std@@@1@AAV21@@Z(ptr) ws_basic_istream_wchar +@ cdecl -arch=win64 ?ws@std@@YAAEAV?$basic_istream@_WU?$char_traits@_W@std@@@1@AEAV21@@Z(ptr) ws_basic_istream_wchar @ cdecl ?xalloc@ios_base@std@@SAHXZ() ios_base_xalloc @ thiscall -arch=win32 ?xsgetn@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAEHPADH@Z(ptr ptr long) basic_streambuf_char_xsgetn @ cdecl -arch=win64 ?xsgetn@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAA_JPEAD_J@Z(ptr ptr long) basic_streambuf_char_xsgetn

1 0

Alexandre Julliard : winex11: Add support for the LWA_COLORKEY layered window attribute.
by Alexandre Julliard 12 Sep '12

12 Sep '12

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 12 Sep '12

12 Sep '12

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

Dmitry Timoshkov : windowscodecs: Check guid pointer for NULL in TiffDecoder_GetContainerFormat.
by Alexandre Julliard 12 Sep '12

12 Sep '12

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

← Newer
1
...
54
55
56
57
58
59
60
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2012