September 2012 - Wine-commits

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: 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 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 in get_outline_text_metrics for vertical fonts.
by Alexandre Julliard 12 Sep '12

12 Sep '12

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

Josh DuBois : msls31: Add stub dll.
by Alexandre Julliard 12 Sep '12

12 Sep '12

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

Dmitry Timoshkov : windowscodecs: Make sure that all GIF metadata blocks are properly packed.
by Alexandre Julliard 12 Sep '12

12 Sep '12

Module: wine Branch: master Commit: 039f6d51141f9f6a6c9df91c83e173c529ec4717 URL: http://source.winehq.org/git/wine.git/?a=commit;h=039f6d51141f9f6a6c9df91c8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 12 15:08:07 2012 +0900 windowscodecs: Make sure that all GIF metadata blocks are properly packed. --- dlls/windowscodecs/gifformat.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 318dc5d..a224356 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -48,6 +48,7 @@ static LPWSTR strdupAtoW(const char *src) static HRESULT load_LSD_metadata(IStream *stream, const GUID *vendor, DWORD options, MetadataItem **items, DWORD *count) { +#include "pshpack1.h" struct logical_screen_descriptor { char signature[6]; @@ -62,6 +63,7 @@ static HRESULT load_LSD_metadata(IStream *stream, const GUID *vendor, DWORD opti BYTE background_color_index; BYTE pixel_aspect_ratio; } lsd_data; +#include "poppack.h" HRESULT hr; ULONG bytesread, i; MetadataItem *result; @@ -85,7 +87,7 @@ static HRESULT load_LSD_metadata(IStream *stream, const GUID *vendor, DWORD opti result[0].id.vt = VT_LPWSTR; result[0].id.u.pwszVal = strdupAtoW("Signature"); result[0].value.vt = VT_UI1|VT_VECTOR; - result[0].value.u.caub.cElems = 6; + result[0].value.u.caub.cElems = sizeof(lsd_data.signature); result[0].value.u.caub.pElems = HeapAlloc(GetProcessHeap(), 0, sizeof(lsd_data.signature)); memcpy(result[0].value.u.caub.pElems, lsd_data.signature, sizeof(lsd_data.signature)); @@ -107,7 +109,7 @@ static HRESULT load_LSD_metadata(IStream *stream, const GUID *vendor, DWORD opti result[4].id.vt = VT_LPWSTR; result[4].id.u.pwszVal = strdupAtoW("ColorResolution"); result[4].value.vt = VT_UI1; - result[4].value.u.bVal = (lsd_data.packed >> 6) & 7; + result[4].value.u.bVal = (lsd_data.packed >> 4) & 7; result[5].id.vt = VT_LPWSTR; result[5].id.u.pwszVal = strdupAtoW("SortFlag"); @@ -149,6 +151,7 @@ HRESULT LSDReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) static HRESULT load_IMD_metadata(IStream *stream, const GUID *vendor, DWORD options, MetadataItem **items, DWORD *count) { +#include "pshpack1.h" struct image_descriptor { USHORT left; @@ -163,6 +166,7 @@ static HRESULT load_IMD_metadata(IStream *stream, const GUID *vendor, DWORD opti * local_color_table_size : 3; */ } imd_data; +#include "poppack.h" HRESULT hr; ULONG bytesread, i; MetadataItem *result;

1 0

Dmitry Timoshkov : windowscodecs: Create Logical Screen Descriptor metadata for the GIF decoder.
by Alexandre Julliard 12 Sep '12

12 Sep '12

Module: wine Branch: master Commit: 5373f8520d2fec729730aaa6a3278cefa46f9414 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5373f8520d2fec729730aaa6a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 12 15:09:09 2012 +0900 windowscodecs: Create Logical Screen Descriptor metadata for the GIF decoder. --- dlls/windowscodecs/gifformat.c | 136 +++++++++++++++++++++++++++++++++++ dlls/windowscodecs/tests/metadata.c | 2 - 2 files changed, 136 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index a224356..66c56a8 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -1,5 +1,6 @@ /* * Copyright 2009 Vincent Povirk for CodeWeavers + * Copyright 2012 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -322,8 +323,28 @@ HRESULT GCEReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) return MetadataReader_Create(&GCEReader_Vtbl, pUnkOuter, iid, ppv); } +static IStream *create_stream(const void *data, int data_size) +{ + HRESULT hr; + IStream *stream; + HGLOBAL hdata; + void *locked_data; + + hdata = GlobalAlloc(GMEM_MOVEABLE, data_size); + if (!hdata) return NULL; + + locked_data = GlobalLock(hdata); + memcpy(locked_data, data, data_size); + GlobalUnlock(hdata); + + hr = CreateStreamOnHGlobal(hdata, TRUE, &stream); + return FAILED(hr) ? NULL : stream; +} + typedef struct { IWICBitmapDecoder IWICBitmapDecoder_iface; + IWICMetadataBlockReader IWICMetadataBlockReader_iface; + BYTE LSD_data[13]; /* Logical Screen Descriptor */ LONG ref; BOOL initialized; GifFileType *gif; @@ -342,6 +363,11 @@ static inline GifDecoder *impl_from_IWICBitmapDecoder(IWICBitmapDecoder *iface) return CONTAINING_RECORD(iface, GifDecoder, IWICBitmapDecoder_iface); } +static inline GifDecoder *impl_from_IWICMetadataBlockReader(IWICMetadataBlockReader *iface) +{ + return CONTAINING_RECORD(iface, GifDecoder, IWICMetadataBlockReader_iface); +} + static inline GifFrameDecode *impl_from_IWICBitmapFrameDecode(IWICBitmapFrameDecode *iface) { return CONTAINING_RECORD(iface, GifFrameDecode, IWICBitmapFrameDecode_iface); @@ -591,6 +617,10 @@ static HRESULT WINAPI GifDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID { *ppv = &This->IWICBitmapDecoder_iface; } + else if (IsEqualIID(&IID_IWICMetadataBlockReader, iid)) + { + *ppv = &This->IWICMetadataBlockReader_iface; + } else { *ppv = NULL; @@ -692,6 +722,10 @@ static HRESULT WINAPI GifDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p /* make sure we don't use the stream after this method returns */ This->gif->UserData = NULL; + seek.QuadPart = 0; + IStream_Seek(pIStream, seek, STREAM_SEEK_SET, NULL); + IStream_Read(pIStream, &This->LSD_data, sizeof(This->LSD_data), NULL); + This->initialized = TRUE; LeaveCriticalSection(&This->lock); @@ -817,6 +851,107 @@ static const IWICBitmapDecoderVtbl GifDecoder_Vtbl = { GifDecoder_GetFrame }; +static HRESULT WINAPI GifDecoder_Block_QueryInterface(IWICMetadataBlockReader *iface, + REFIID iid, void **ppv) +{ + GifDecoder *This = impl_from_IWICMetadataBlockReader(iface); + return IWICBitmapDecoder_QueryInterface(&This->IWICBitmapDecoder_iface, iid, ppv); +} + +static ULONG WINAPI GifDecoder_Block_AddRef(IWICMetadataBlockReader *iface) +{ + GifDecoder *This = impl_from_IWICMetadataBlockReader(iface); + return IWICBitmapDecoder_AddRef(&This->IWICBitmapDecoder_iface); +} + +static ULONG WINAPI GifDecoder_Block_Release(IWICMetadataBlockReader *iface) +{ + GifDecoder *This = impl_from_IWICMetadataBlockReader(iface); + return IWICBitmapDecoder_Release(&This->IWICBitmapDecoder_iface); +} + +static HRESULT WINAPI GifDecoder_Block_GetContainerFormat(IWICMetadataBlockReader *iface, + GUID *guid) +{ + TRACE("(%p,%p)\n", iface, guid); + + if (!guid) return E_INVALIDARG; + + *guid = GUID_ContainerFormatGif; + return S_OK; +} + +static HRESULT WINAPI GifDecoder_Block_GetCount(IWICMetadataBlockReader *iface, + UINT *count) +{ + TRACE("%p,%p\n", iface, count); + + if (!count) return E_INVALIDARG; + + *count = 1; + return S_OK; +} + +static HRESULT create_LSD_metadata_reader(GifDecoder *This, IWICMetadataReader **reader) +{ + HRESULT hr; + IWICMetadataReader *metadata_reader; + IWICPersistStream *persist; + IStream *stream; + + /* FIXME: Use IWICComponentFactory_CreateMetadataReader once it's implemented */ + + hr = CoCreateInstance(&CLSID_WICLSDMetadataReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICMetadataReader, (void **)&metadata_reader); + if (FAILED(hr)) return hr; + + hr = IWICMetadataReader_QueryInterface(metadata_reader, &IID_IWICPersistStream, (void **)&persist); + if (FAILED(hr)) + { + IWICMetadataReader_Release(metadata_reader); + return hr; + } + + stream = create_stream(This->LSD_data, sizeof(This->LSD_data)); + IWICPersistStream_LoadEx(persist, stream, NULL, WICPersistOptionsDefault); + IStream_Release(stream); + + IWICPersistStream_Release(persist); + + *reader = metadata_reader; + return S_OK; +} + +static HRESULT WINAPI GifDecoder_Block_GetReaderByIndex(IWICMetadataBlockReader *iface, + UINT index, IWICMetadataReader **reader) +{ + GifDecoder *This = impl_from_IWICMetadataBlockReader(iface); + + TRACE("(%p,%u,%p)\n", iface, index, reader); + + if (!reader || index != 0) return E_INVALIDARG; + + return create_LSD_metadata_reader(This, reader); +} + +static HRESULT WINAPI GifDecoder_Block_GetEnumerator(IWICMetadataBlockReader *iface, + IEnumUnknown **enumerator) +{ + FIXME("(%p,%p): stub\n", iface, enumerator); + return E_NOTIMPL; +} + +static const IWICMetadataBlockReaderVtbl GifDecoder_BlockVtbl = +{ + GifDecoder_Block_QueryInterface, + GifDecoder_Block_AddRef, + GifDecoder_Block_Release, + GifDecoder_Block_GetContainerFormat, + GifDecoder_Block_GetCount, + GifDecoder_Block_GetReaderByIndex, + GifDecoder_Block_GetEnumerator +}; + HRESULT GifDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) { GifDecoder *This; @@ -832,6 +967,7 @@ HRESULT GifDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) if (!This) return E_OUTOFMEMORY; This->IWICBitmapDecoder_iface.lpVtbl = &GifDecoder_Vtbl; + This->IWICMetadataBlockReader_iface.lpVtbl = &GifDecoder_BlockVtbl; This->ref = 1; This->initialized = FALSE; This->gif = NULL; diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index e274106..6bdecee 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -1046,7 +1046,6 @@ static void test_metadata_gif(void) /* global metadata block */ hr = IWICBitmapDecoder_QueryInterface(decoder, &IID_IWICMetadataBlockReader, (void **)&blockreader); -todo_wine ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* before Win7 */, "QueryInterface error %#x\n", hr); if (SUCCEEDED(hr)) @@ -1149,7 +1148,6 @@ todo_wine /* global metadata block */ hr = IWICBitmapDecoder_QueryInterface(decoder, &IID_IWICMetadataBlockReader, (void **)&blockreader); -todo_wine ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* before Win7 */, "QueryInterface error %#x\n", hr); if (SUCCEEDED(hr))

1 0

Dmitry Timoshkov : windowscodecs: Implement GetContainerFormat for the TIFF metadata block reader.
by Alexandre Julliard 12 Sep '12

12 Sep '12

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

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

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