January 2017 - Wine-commits

Jacek Caban : inetcomm: Added support for decoding base64 in IMimeBody:: GetData.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 915acd68de3531348d36bd31a02413b122554221 URL: http://source.winehq.org/git/wine.git/?a=commit;h=915acd68de3531348d36bd31a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 16:01:07 2017 +0100 inetcomm: Added support for decoding base64 in IMimeBody::GetData. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 95 ++++++++++++++++++++++++++++++++++++++++++- dlls/inetcomm/tests/mimeole.c | 22 ++++++++++ 2 files changed, 116 insertions(+), 1 deletion(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 0f0da61..90a5dd4 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1515,6 +1515,88 @@ static HRESULT WINAPI MimeBody_GetDataHere( return E_NOTIMPL; } +static const signed char base64_decode_table[] = +{ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x00 */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x10 */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, /* 0x20 */ + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, /* 0x30 */ + -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, /* 0x40 */ + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, /* 0x50 */ + -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, /* 0x60 */ + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1 /* 0x70 */ +}; + +static HRESULT decode_base64(IStream *input, IStream **ret_stream) +{ + const unsigned char *ptr, *end; + unsigned char buf[1024]; + LARGE_INTEGER pos; + unsigned char *ret; + unsigned char in[4]; + IStream *output; + DWORD size; + int n = 0; + HRESULT hres; + + pos.QuadPart = 0; + hres = IStream_Seek(input, pos, STREAM_SEEK_SET, NULL); + if(FAILED(hres)) + return hres; + + hres = CreateStreamOnHGlobal(NULL, TRUE, &output); + if(FAILED(hres)) + return hres; + + while(1) { + hres = IStream_Read(input, buf, sizeof(buf), &size); + if(FAILED(hres) || !size) + break; + + ptr = ret = buf; + end = buf + size; + + while(1) { + /* skip invalid chars */ + while(ptr < end && + (*ptr >= sizeof(base64_decode_table)/sizeof(*base64_decode_table) + || base64_decode_table[*ptr] == -1)) + ptr++; + if(ptr == end) + break; + + in[n++] = base64_decode_table[*ptr++]; + switch(n) { + case 2: + *ret++ = in[0] << 2 | in[1] >> 4; + continue; + case 3: + *ret++ = in[1] << 4 | in[2] >> 2; + continue; + case 4: + *ret++ = ((in[2] << 6) & 0xc0) | in[3]; + n = 0; + } + } + + if(ret > buf) { + hres = IStream_Write(output, buf, ret - buf, NULL); + if(FAILED(hres)) + break; + } + } + + if(SUCCEEDED(hres)) + hres = IStream_Seek(output, pos, STREAM_SEEK_SET, NULL); + if(FAILED(hres)) { + IStream_Release(output); + return hres; + } + + *ret_stream = output; + return S_OK; +} + static HRESULT WINAPI MimeBody_GetData( IMimeBody* iface, ENCODINGTYPE ietEncoding, @@ -1524,7 +1606,18 @@ static HRESULT WINAPI MimeBody_GetData( ULARGE_INTEGER start, size; HRESULT hres; - FIXME("(%p)->(%d, %p). Ignoring encoding type.\n", This, ietEncoding, ppStream); + TRACE("(%p)->(%d %p)\n", This, ietEncoding, ppStream); + + if(This->encoding != ietEncoding) { + switch(This->encoding) { + case IET_BASE64: + if(ietEncoding != IET_BINARY) + FIXME("Encofing %d is not supported.\n", ietEncoding); + return decode_base64(This->data, ppStream); + default: + FIXME("Decoding %d is not supported.\n", This->encoding); + } + } start.QuadPart = 0; hres = get_stream_size(This->data, &size); diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 5d7bb9a..0765396 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -494,6 +494,28 @@ static void test_SetData(void) IStream_Release(stream); IStream_Release(stream2); IStream_Release(&test_stream->IStream_iface); + + stream = create_stream_from_string(" \t\r\n|}~YWJj ZGV|}~mZw== \t"); /* "abcdefg" in base64 obscured by invalid chars */ + hr = IMimeBody_SetData(body, IET_BASE64, "text", "plain", &IID_IStream, stream); + IStream_Release(stream); + ok(hr == S_OK, "SetData failed: %08x\n", hr); + + test_current_encoding(body, IET_BASE64); + + hr = IMimeBody_GetData(body, IET_BINARY, &stream); + ok(hr == S_OK, "GetData failed %08x\n", hr); + + test_stream_read(stream, S_OK, "abc", 3); + test_stream_read(stream, S_OK, "defg", -1); + + IStream_Release(stream); + + hr = IMimeBody_GetData(body, IET_BASE64, &stream); + ok(hr == S_OK, "GetData failed %08x\n", hr); + + test_stream_read(stream, S_OK, " \t\r", 3); + IStream_Release(stream); + IMimeBody_Release(body); }

1 0

Aric Stewart : usp10: Fix Contextual Shaping for Languages with RTL write order.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 10e9adfb27ef9ea5e0ee7a9c4bc9cea0480d7527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10e9adfb27ef9ea5e0ee7a9c4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jan 27 11:31:15 2017 -0600 usp10: Fix Contextual Shaping for Languages with RTL write order. Including Arabic, Syriac, Phags pa, and Mongolian. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/shape.c | 124 ++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 94 insertions(+), 30 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 1c8d064..850e929 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1072,6 +1072,8 @@ static void ContextualShape_Arabic(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p INT *context_shape; INT dirR, dirL; int i; + int char_index; + int glyph_index; if (*pcGlyphs != cChars) { @@ -1115,8 +1117,12 @@ static void ContextualShape_Arabic(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p } /* Contextual Shaping */ - i = 0; - while(i < *pcGlyphs) + if (dirL > 0) + char_index = glyph_index = 0; + else + char_index = glyph_index = cChars-1; + + while(char_index < cChars && char_index >= 0) { BOOL shaped = FALSE; @@ -1124,29 +1130,34 @@ static void ContextualShape_Arabic(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p { INT nextIndex; INT prevCount = *pcGlyphs; - nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, i, dirL, pcGlyphs, contextual_features[context_shape[i]]); + + /* Apply the contextual feature */ + nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, glyph_index, dirL, pcGlyphs, contextual_features[context_shape[char_index]]); + if (nextIndex > GSUB_E_NOGLYPH) { - i = nextIndex; - UpdateClusters(nextIndex, *pcGlyphs - prevCount, dirL, cChars, pwLogClust); + UpdateClusters(glyph_index, *pcGlyphs - prevCount, dirL, cChars, pwLogClust); + char_index += dirL; + glyph_index = nextIndex; } shaped = (nextIndex > GSUB_E_NOGLYPH); } if (!shaped) { - if (context_shape[i] == Xn) + if (context_shape[char_index] == Xn) { - WORD newGlyph = pwOutGlyphs[i]; - if (pwcChars[i] >= FIRST_ARABIC_CHAR && pwcChars[i] <= LAST_ARABIC_CHAR) + WORD newGlyph = pwOutGlyphs[glyph_index]; + if (pwcChars[char_index] >= FIRST_ARABIC_CHAR && pwcChars[char_index] <= LAST_ARABIC_CHAR) { /* fall back to presentation form B */ - WCHAR context_char = wine_shaping_forms[pwcChars[i] - FIRST_ARABIC_CHAR][context_shape[i]]; - if (context_char != pwcChars[i] && GetGlyphIndicesW(hdc, &context_char, 1, &newGlyph, 0) != GDI_ERROR && newGlyph != 0x0000) - pwOutGlyphs[i] = newGlyph; + WCHAR context_char = wine_shaping_forms[pwcChars[char_index] - FIRST_ARABIC_CHAR][context_shape[char_index]]; + if (context_char != pwcChars[char_index] && GetGlyphIndicesW(hdc, &context_char, 1, &newGlyph, 0) != GDI_ERROR && newGlyph != 0x0000) + pwOutGlyphs[glyph_index] = newGlyph; } } - i++; + char_index += dirL; + glyph_index += dirL; } } @@ -1293,6 +1304,8 @@ static void ContextualShape_Syriac(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p INT *context_shape; INT dirR, dirL; int i; + int char_index; + int glyph_index; if (*pcGlyphs != cChars) { @@ -1355,19 +1368,45 @@ right_join_causing(neighbour_joining_type(i,dirR,context_type,cChars,psa))) } /* Contextual Shaping */ - i = 0; - while(i < *pcGlyphs) + if (dirL > 0) + char_index = glyph_index = 0; + else + char_index = glyph_index = cChars-1; + + while(char_index < cChars && char_index >= 0) { - INT nextIndex; + INT nextIndex, offset = 0; INT prevCount = *pcGlyphs; - nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, i, dirL, pcGlyphs, contextual_features[context_shape[i]]); + + /* Apply CCMP first */ + apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, glyph_index, dirL, pcGlyphs, "ccmp"); + + if (prevCount != *pcGlyphs) + { + offset = *pcGlyphs - prevCount; + if (dirL < 0) + glyph_index -= offset * dirL; + } + + /* Apply the contextual feature */ + nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, glyph_index, dirL, pcGlyphs, contextual_features[context_shape[char_index]]); if (nextIndex > GSUB_E_NOGLYPH) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, dirL, cChars, pwLogClust); - i = nextIndex; + char_index += dirL; + if (!offset) + glyph_index = nextIndex; + else + { + offset = *pcGlyphs - prevCount; + glyph_index += dirL * (offset + 1); + } } else - i++; + { + char_index += dirL; + glyph_index += dirL; + } } HeapFree(GetProcessHeap(),0,context_shape); @@ -1427,6 +1466,8 @@ static void ContextualShape_Phags_pa(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS INT *context_shape; INT dirR, dirL; int i; + int char_index; + int glyph_index; if (*pcGlyphs != cChars) { @@ -1475,24 +1516,36 @@ static void ContextualShape_Phags_pa(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS } /* Contextual Shaping */ - i = 0; - while(i < *pcGlyphs) + if (dirL > 0) + char_index = glyph_index = 0; + else + char_index = glyph_index = cChars-1; + + while(char_index < cChars && char_index >= 0) { - if (context_shape[i] >= 0) + if (context_shape[char_index] >= 0) { INT nextIndex; INT prevCount = *pcGlyphs; - nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, i, dirL, pcGlyphs, contextual_features[context_shape[i]]); + nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, glyph_index, dirL, pcGlyphs, contextual_features[context_shape[char_index]]); + if (nextIndex > GSUB_E_NOGLYPH) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, dirL, cChars, pwLogClust); - i = nextIndex; + glyph_index = nextIndex; + char_index += dirL; } else - i++; + { + char_index += dirL; + glyph_index += dirL; + } } else - i++; + { + char_index += dirL; + glyph_index += dirL; + } } HeapFree(GetProcessHeap(),0,context_shape); @@ -2769,6 +2822,8 @@ static void ContextualShape_Mongolian(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS INT *context_shape; INT dirL; int i; + int char_index; + int glyph_index; if (*pcGlyphs != cChars) { @@ -2805,19 +2860,28 @@ static void ContextualShape_Mongolian(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS } /* Contextual Shaping */ - i = 0; - while(i < *pcGlyphs) + if (dirL > 0) + char_index = glyph_index = 0; + else + char_index = glyph_index = cChars-1; + + while(char_index < cChars && char_index >= 0) { INT nextIndex; INT prevCount = *pcGlyphs; - nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, i, dirL, pcGlyphs, contextual_features[context_shape[i]]); + nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, glyph_index, dirL, pcGlyphs, contextual_features[context_shape[char_index]]); + if (nextIndex > GSUB_E_NOGLYPH) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, dirL, cChars, pwLogClust); - i = nextIndex; + glyph_index = nextIndex; + char_index += dirL; } else - i++; + { + char_index += dirL; + glyph_index += dirL; + } } HeapFree(GetProcessHeap(),0,context_shape);

1 0

Aric Stewart : usp10: Change GSUB_E_NOGLYPH value.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 0401bdfad65b4f31613506ce29ab870bae91dd9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0401bdfad65b4f31613506ce2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jan 27 11:31:37 2017 -0600 usp10: Change GSUB_E_NOGLYPH value. -1 is a potentially valid index to return for RTL languages. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 10 +++++----- dlls/usp10/usp10_internal.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index d2eb749..9a74fcc 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1098,7 +1098,7 @@ static INT GSUB_apply_ContextSubst(const OT_LookupList* lookup, const OT_LookupT TRACE(" SUBST: %i -> %i %i\n",l, SequenceIndex, lookupIndex); newIndex = GSUB_apply_lookup(lookup, lookupIndex, glyphs, glyph_index + SequenceIndex, write_dir, glyph_count); - if (newIndex == -1) + if (newIndex == GSUB_E_NOGLYPH) { ERR(" Chain failed to generate a glyph\n"); continue; @@ -1172,7 +1172,7 @@ static INT GSUB_apply_ContextSubst(const OT_LookupList* lookup, const OT_LookupT TRACE(" SUBST: %i -> %i %i\n",l, SequenceIndex, lookupIndex); newIndex = GSUB_apply_lookup(lookup, lookupIndex, glyphs, glyph_index + SequenceIndex, write_dir, glyph_count); - if (newIndex == -1) + if (newIndex == GSUB_E_NOGLYPH) { ERR(" Chain failed to generate a glyph\n"); continue; @@ -1316,7 +1316,7 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo TRACE("SUBST: %i -> %i %i\n",k, SequenceIndex, lookupIndex); newIndex = GSUB_apply_lookup(lookup, lookupIndex, glyphs, glyph_index + SequenceIndex, write_dir, glyph_count); - if (newIndex == -1) + if (newIndex == GSUB_E_NOGLYPH) { ERR("Chain failed to generate a glyph\n"); continue; @@ -1390,7 +1390,7 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo TRACE("SUBST: %i -> %i %i\n",k, SequenceIndex, lookupIndex); newIndex = GSUB_apply_lookup(lookup, lookupIndex, glyphs, glyph_index + SequenceIndex, write_dir, glyph_count); - if (newIndex == -1) + if (newIndex == GSUB_E_NOGLYPH) { ERR("Chain failed to generate a glyph\n"); continue; @@ -1401,7 +1401,7 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo else return GSUB_E_NOGLYPH; } } - return -1; + return GSUB_E_NOGLYPH; } static INT GSUB_apply_lookup(const OT_LookupList* lookup, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 1c0d1c5..ccc0f8d 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -127,8 +127,8 @@ #define NUM_PAGES 17 -#define GSUB_E_NOFEATURE -2 -#define GSUB_E_NOGLYPH -1 +#define GSUB_E_NOFEATURE -20 +#define GSUB_E_NOGLYPH -10 #define FEATURE_ALL_TABLES 0 #define FEATURE_GSUB_TABLE 1

1 0

Aric Stewart : usp10: Fix next index for RTL MultipleSubst.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: e2d4cf9e29ee98d33ebdc4aba3ccd8d9cb592661 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2d4cf9e29ee98d33ebdc4aba… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jan 27 11:31:44 2017 -0600 usp10: Fix next index for RTL MultipleSubst. MultipleSubst will expand the glyph array to the right, so when the writing direction is RTL the next index does not need to be modified by the new count of glyphs. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 9a74fcc..a9aa4f4 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -940,7 +940,10 @@ static INT GSUB_apply_MultipleSubst(const OT_LookupTable *look, WORD *glyphs, IN TRACE("\n"); } - return glyph_index + (sub_count * write_dir); + if (write_dir > 0) + return glyph_index + sub_count; + else + return glyph_index - 1; } } return GSUB_E_NOGLYPH;

1 0

Aric Stewart : usp10: Apply 'ccmp' before Arabic contextual shaping.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 0c1419542fa61d6eaacd0a007074cbb3a12605a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c1419542fa61d6eaacd0a007… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jan 27 11:31:51 2017 -0600 usp10: Apply 'ccmp' before Arabic contextual shaping. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/shape.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 850e929..bf333b2 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1128,9 +1128,19 @@ static void ContextualShape_Arabic(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p if (psc->GSUB_Table) { - INT nextIndex; + INT nextIndex, offset = 0; INT prevCount = *pcGlyphs; + /* Apply CCMP first */ + apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, glyph_index, dirL, pcGlyphs, "ccmp"); + + if (prevCount != *pcGlyphs) + { + offset = *pcGlyphs - prevCount; + if (dirL < 0) + glyph_index -= offset * dirL; + } + /* Apply the contextual feature */ nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, glyph_index, dirL, pcGlyphs, contextual_features[context_shape[char_index]]); @@ -1138,7 +1148,13 @@ static void ContextualShape_Arabic(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p { UpdateClusters(glyph_index, *pcGlyphs - prevCount, dirL, cChars, pwLogClust); char_index += dirL; - glyph_index = nextIndex; + if (!offset) + glyph_index = nextIndex; + else + { + offset = *pcGlyphs - prevCount; + glyph_index += dirL * (offset + 1); + } } shaped = (nextIndex > GSUB_E_NOGLYPH); }

1 0

Jacek Caban : widl: Accept known type as library name.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 2ff2792fc496313cf1178855dbf5e172ed08cc9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ff2792fc496313cf1178855d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 21:17:35 2017 +0100 widl: Accept known type as library name. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 6551ea2..c262ca8 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -429,6 +429,7 @@ importlib: tIMPORTLIB '(' aSTRING ')' ; libraryhdr: tLIBRARY aIDENTIFIER { $$ = $2; } + | tLIBRARY aKNOWNTYPE { $$ = $2; } ; library_start: attributes libraryhdr '{' { $$ = make_library($2, check_library_attrs($2, $1)); if (!parse_only) start_typelib($$);

1 0

André Hentschel : usp10: Fix ScriptRecordDigitSubstitution spec file entry.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 961e1e6857eb750bdc556655b9a930e1b2e6d151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=961e1e6857eb750bdc556655b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jan 26 23:46:48 2017 +0100 usp10: Fix ScriptRecordDigitSubstitution spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/usp10.spec b/dlls/usp10/usp10.spec index 4d99134..3880895 100644 --- a/dlls/usp10/usp10.spec +++ b/dlls/usp10/usp10.spec @@ -22,7 +22,7 @@ @ stdcall ScriptPlace(ptr ptr ptr long ptr ptr ptr ptr ptr) @ stdcall ScriptPlaceOpenType(ptr ptr ptr long long ptr ptr long wstr ptr ptr long ptr ptr long ptr ptr ptr) @ stub ScriptPositionSingleGlyph -@ stdcall ScriptRecordDigitSubstitution(ptr ptr) +@ stdcall ScriptRecordDigitSubstitution(long ptr) @ stdcall ScriptShape(ptr ptr ptr long long ptr ptr ptr ptr ptr) @ stdcall ScriptShapeOpenType(ptr ptr ptr long long ptr ptr long wstr long long ptr ptr ptr ptr ptr) @ stdcall ScriptStringAnalyse(ptr ptr long long long long long ptr ptr ptr ptr ptr ptr)

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICBitmapFrameEncode:: SetPalette in PNG encoder.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 8e694423f4eca7467cc8d7806a1f757c089921aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e694423f4eca7467cc8d7806… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 27 09:22:17 2017 +0300 windowscodecs: Implement IWICBitmapFrameEncode::SetPalette in PNG encoder. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 9a84162..990dcf6 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -1363,6 +1363,8 @@ typedef struct PngEncoder { BYTE *data; UINT stride; UINT passes; + WICColor palette[256]; + UINT colors; } PngEncoder; static inline PngEncoder *impl_from_IWICBitmapEncoder(IWICBitmapEncoder *iface) @@ -1554,10 +1556,24 @@ static HRESULT WINAPI PngFrameEncode_SetColorContexts(IWICBitmapFrameEncode *ifa } static HRESULT WINAPI PngFrameEncode_SetPalette(IWICBitmapFrameEncode *iface, - IWICPalette *pIPalette) + IWICPalette *palette) { - FIXME("(%p,%p): stub\n", iface, pIPalette); - return WINCODEC_ERR_UNSUPPORTEDOPERATION; + PngEncoder *This = impl_from_IWICBitmapFrameEncode(iface); + HRESULT hr; + + TRACE("(%p,%p)\n", iface, palette); + + if (!palette) return E_INVALIDARG; + + EnterCriticalSection(&This->lock); + + if (This->frame_initialized) + hr = IWICPalette_GetColors(palette, 256, This->palette, &This->colors); + else + hr = WINCODEC_ERR_NOTINITIALIZED; + + LeaveCriticalSection(&This->lock); + return hr; } static HRESULT WINAPI PngFrameEncode_SetThumbnail(IWICBitmapFrameEncode *iface, @@ -2081,6 +2097,7 @@ HRESULT PngEncoder_CreateInstance(REFIID iid, void** ppv) This->frame_committed = FALSE; This->committed = FALSE; This->data = NULL; + This->colors = 0; InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PngEncoder.lock");

1 0

Nikolay Sivov : windowscodecs/tests: Test to show that SetPalette() does not keep IWICPalette reference, for PNG encoder.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 981b97948ccb1613afd1242f6f0ee50d0d586fde URL: http://source.winehq.org/git/wine.git/?a=commit;h=981b97948ccb1613afd1242f6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 27 09:22:18 2017 +0300 windowscodecs/tests: Test to show that SetPalette() does not keep IWICPalette reference, for PNG encoder. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/converter.c | 48 ++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 2af9857..9da82f1 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -25,6 +25,7 @@ #include "windef.h" #include "objbase.h" #include "wincodec.h" +#include "wincodecsdk.h" #include "wine/test.h" typedef struct bitmap_data { @@ -577,6 +578,50 @@ struct setting { void *value; }; +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) +static void _expect_ref(IUnknown* obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); +} + +static void test_set_frame_palette(IWICBitmapFrameEncode *frameencode) +{ + IWICComponentFactory *factory; + IWICPalette *palette; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICComponentFactory, (void **)&factory); + ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + + hr = IWICBitmapFrameEncode_SetPalette(frameencode, NULL); + ok(hr == E_INVALIDARG, "SetPalette failed, hr=%x\n", hr); + + hr = IWICComponentFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette failed, hr=%x\n", hr); + + hr = IWICBitmapFrameEncode_SetPalette(frameencode, palette); +todo_wine + ok(hr == WINCODEC_ERR_NOTINITIALIZED, "Unexpected hr=%x\n", hr); + + hr = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeFixedHalftone256, FALSE); + ok(hr == S_OK, "InitializePredefined failed, hr=%x\n", hr); + + EXPECT_REF(palette, 1); + hr = IWICBitmapFrameEncode_SetPalette(frameencode, palette); + ok(hr == S_OK, "SetPalette failed, hr=%x\n", hr); + EXPECT_REF(palette, 1); + + hr = IWICBitmapFrameEncode_SetPalette(frameencode, NULL); + ok(hr == E_INVALIDARG, "SetPalette failed, hr=%x\n", hr); + + IWICPalette_Release(palette); + IWICComponentFactory_Release(factory); +} + static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* clsid_encoder, const struct bitmap_data **dsts, const CLSID *clsid_decoder, WICRect *rc, const struct setting *settings, const char *name) @@ -655,6 +700,9 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls hr = IWICBitmapFrameEncode_SetSize(frameencode, srcs[i]->width, srcs[i]->height); ok(SUCCEEDED(hr), "SetSize failed, hr=%x\n", hr); + if (IsEqualGUID(clsid_encoder, &CLSID_WICPngEncoder)) + test_set_frame_palette(frameencode); + hr = IWICBitmapFrameEncode_WriteSource(frameencode, &src_obj->IWICBitmapSource_iface, rc); if (rc && (rc->Width <= 0 || rc->Height <= 0)) {

1 0

Dmitry Timoshkov : avifil32: AVIFileGetStream should set stream to NULL in case of an error.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 7ee4021694630d7ed1d0cd4d87c2ec79911609ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ee4021694630d7ed1d0cd4d8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 26 17:32:53 2017 +0100 avifil32: AVIFileGetStream should set stream to NULL in case of an error. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/avifile.c | 1 + dlls/avifil32/tests/api.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index f649d05..7a4caaa 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -316,6 +316,7 @@ static HRESULT WINAPI IAVIFile_fnGetStream(IAVIFile *iface, IAVIStream **avis, D } /* Sorry, but the specified stream doesn't exist */ + *avis = NULL; return AVIERR_NODATA; } diff --git a/dlls/avifil32/tests/api.c b/dlls/avifil32/tests/api.c index b3d822d..66ba205 100644 --- a/dlls/avifil32/tests/api.c +++ b/dlls/avifil32/tests/api.c @@ -373,6 +373,11 @@ static void test_default_data(void) res = AVIFileOpenA(&pFile, filename, OF_SHARE_DENY_WRITE, 0L); ok(res == 0, "Unable to open file: error=%u\n", res); + pStream0 = (void *)0xdeadbeef; + res = AVIFileGetStream(pFile, &pStream0, ~0U, 0); + ok(res == AVIERR_NODATA, "expected AVIERR_NODATA, got %u\n", res); + ok(pStream0 == NULL, "AVIFileGetStream should set stream to NULL\n"); + res = AVIFileGetStream(pFile, &pStream0, 0, 0); ok(res == 0, "Unable to open video stream: error=%u\n", res);

1 0