wine-commits January 2017

wine-commits@winehq.org

2 participants
492 discussions

Bruno Jesus : winmm: Fix the ordinal number for function PlaySound.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 00046b816ca0cacbbebe1957326ed45abe24c097 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00046b816ca0cacbbebe19573… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Jan 27 19:14:40 2017 -0200 winmm: Fix the ordinal number for function PlaySound. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/wave.c | 6 ++++++ dlls/winmm/winmm.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index d6019f9..a8a5e8d 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1656,6 +1656,12 @@ static void test_PlaySound(void) { BOOL br; char test_file[MAX_PATH], temp[MAX_PATH], *exts; + void *psound_ordinal, *psound_name; + HMODULE dll = GetModuleHandleA("winmm.dll"); + + psound_name = GetProcAddress(dll, "PlaySound"); + psound_ordinal = GetProcAddress(dll, (LPCSTR) 2); + ok(psound_name == psound_ordinal, "Expected ordinal 2 to be PlaySound function\n"); if(waveOutGetNumDevs() == 0) { skip("No output devices available\n"); diff --git a/dlls/winmm/winmm.spec b/dlls/winmm/winmm.spec index 3d5272c..9c6ed2d 100644 --- a/dlls/winmm/winmm.spec +++ b/dlls/winmm/winmm.spec @@ -1,5 +1,5 @@ # ordinal exports -1 stdcall @(ptr long long) PlaySoundA +2 stdcall @(ptr long long) PlaySoundA 3 stub @ 4 stub @

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 2a37605ef66455a78d30b728433ba00e06001724 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a37605ef66455a78d30b7284… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Jan 27 22:03:59 2017 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/lt.po b/po/lt.po index cd73cb9..bc1054e 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,11 +1,11 @@ # Lithuanian translations for Wine -# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011, 2012, 2013, 2014, 2015, 2016. +# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011, 2012, 2013, 2014, 2015, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-11-09 23:09+0300\n" +"PO-Revision-Date: 2017-01-27 22:03+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -8364,10 +8364,8 @@ msgid "Wine Control Panel" msgstr "„Wine“ valdymo skydelis" #: shell32.rc:195 -#, fuzzy -#| msgid "Unable to display Run File dialog box (internal error)" msgid "Unable to display Run dialog box (internal error)" -msgstr "Nepavyko parodyti failo paleidimo dialogo lango (vidinė klaida)" +msgstr "Nepavyko parodyti paleidimo dialogo lango (vidinė klaida)" #: shell32.rc:196 msgid "Unable to display Browse dialog box (internal error)"

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

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

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: 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 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

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

Jacek Caban : inetcomm: Test current encoding in test_SetData.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 3c8f5c581d93c36b04c58de35d27b0397c56de52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c8f5c581d93c36b04c58de35… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 16:00:20 2017 +0100 inetcomm: Test current encoding in test_SetData. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/tests/mimeole.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 9fbaeec..5d7bb9a 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -131,6 +131,17 @@ static IStream *create_stream_from_string(const char *data) return stream; } +#define test_current_encoding(a,b) _test_current_encoding(__LINE__,a,b) +static void _test_current_encoding(unsigned line, IMimeBody *mime_body, ENCODINGTYPE encoding) +{ + ENCODINGTYPE current_encoding; + HRESULT hres; + + hres = IMimeBody_GetCurrentEncoding(mime_body, &current_encoding); + ok_(__FILE__,line)(hres == S_OK, "GetCurrentEncoding failed: %08x\n", hres); + ok_(__FILE__,line)(current_encoding == encoding, "encoding = %d, expected %d\n", current_encoding, encoding); +} + static void test_CreateBody(void) { HRESULT hr; @@ -158,9 +169,7 @@ static void test_CreateBody(void) hr = IMimeBody_InitNew(body); ok(hr == S_OK, "ret %08x\n", hr); - hr = IMimeBody_GetCurrentEncoding(body, &enc); - ok(hr == S_OK, "ret %08x\n", hr); - ok(enc == IET_7BIT, "encoding %d\n", enc); + test_current_encoding(body, IET_7BIT); hr = IMimeBody_Load(body, in); ok(hr == S_OK, "ret %08x\n", hr); @@ -445,6 +454,8 @@ static void test_SetData(void) todo_wine ok(hr == S_OK, "ret %08x\n", hr); + test_current_encoding(body, IET_BINARY); + SET_EXPECT(Stream_Stat); SET_EXPECT(Stream_Seek_END); hr = IMimeBody_GetData(body, IET_BINARY, &stream);

1 0

Jacek Caban : inetcomm/tests: Added more IMimeBody:: SetData and GetData tests.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: b0902a487d3c7de62f391e5599a89e63a0639d44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0902a487d3c7de62f391e559… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 16:00:03 2017 +0100 inetcomm/tests: Added more IMimeBody::SetData and GetData tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/tests/mimeole.c | 275 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 275 insertions(+) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 7e510c5..9fbaeec 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -32,6 +32,36 @@ #include "wine/test.h" +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + expect_ ## func = TRUE + +#define CHECK_EXPECT(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + expect_ ## func = FALSE; \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_EXPECT2(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +DEFINE_EXPECT(Stream_Read); +DEFINE_EXPECT(Stream_Stat); +DEFINE_EXPECT(Stream_Seek); +DEFINE_EXPECT(Stream_Seek_END); + static const char msg1[] = "MIME-Version: 1.0\r\n" "Content-Type: multipart/mixed;\r\n" @@ -212,6 +242,250 @@ static void test_CreateBody(void) IMimeBody_Release(body); } +typedef struct { + IStream IStream_iface; + LONG ref; + unsigned pos; +} TestStream; + +static inline TestStream *impl_from_IStream(IStream *iface) +{ + return CONTAINING_RECORD(iface, TestStream, IStream_iface); +} + +static HRESULT WINAPI Stream_QueryInterface(IStream *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ISequentialStream, riid) || IsEqualGUID(&IID_IStream, riid)) { + *ppv = iface; + return S_OK; + } + + ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI Stream_AddRef(IStream *iface) +{ + TestStream *This = impl_from_IStream(iface); + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI Stream_Release(IStream *iface) +{ + TestStream *This = impl_from_IStream(iface); + return InterlockedDecrement(&This->ref); +} + +static HRESULT WINAPI Stream_Read(IStream *iface, void *pv, ULONG cb, ULONG *pcbRead) +{ + TestStream *This = impl_from_IStream(iface); + BYTE *output = pv; + unsigned i; + + CHECK_EXPECT(Stream_Read); + + for(i = 0; i < cb; i++) + output[i] = '0' + This->pos++; + *pcbRead = i; + return S_OK; +} + +static HRESULT WINAPI Stream_Write(IStream *iface, const void *pv, ULONG cb, ULONG *pcbWritten) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static DWORD expect_seek_pos; + +static HRESULT WINAPI Stream_Seek(IStream *iface, LARGE_INTEGER dlibMove, DWORD dwOrigin, + ULARGE_INTEGER *plibNewPosition) +{ + TestStream *This = impl_from_IStream(iface); + + if(dwOrigin == STREAM_SEEK_END) { + CHECK_EXPECT(Stream_Seek_END); + ok(dlibMove.QuadPart == expect_seek_pos, "unexpected seek pos %u\n", dlibMove.u.LowPart); + if(plibNewPosition) + plibNewPosition->QuadPart = 10; + return S_OK; + } + + CHECK_EXPECT(Stream_Seek); + + ok(dlibMove.QuadPart == expect_seek_pos, "unexpected seek pos %u\n", dlibMove.u.LowPart); + ok(dwOrigin == STREAM_SEEK_SET, "dwOrigin = %d\n", dwOrigin); + This->pos = dlibMove.QuadPart; + if(plibNewPosition) + plibNewPosition->QuadPart = This->pos; + return S_OK; +} + +static HRESULT WINAPI Stream_SetSize(IStream *iface, ULARGE_INTEGER libNewSize) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Stream_CopyTo(IStream *iface, IStream *pstm, ULARGE_INTEGER cb, + ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Stream_Commit(IStream *iface, DWORD grfCommitFlags) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Stream_Revert(IStream *iface) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Stream_LockRegion(IStream *iface, ULARGE_INTEGER libOffset, + ULARGE_INTEGER cb, DWORD dwLockType) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Stream_UnlockRegion(IStream *iface, + ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Stream_Stat(IStream *iface, STATSTG *pstatstg, DWORD dwStatFlag) +{ + CHECK_EXPECT(Stream_Stat); + ok(dwStatFlag == STATFLAG_NONAME, "dwStatFlag = %x\n", dwStatFlag); + return E_NOTIMPL; +} + +static HRESULT WINAPI Stream_Clone(IStream *iface, IStream **ppstm) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IStreamVtbl StreamVtbl = { + Stream_QueryInterface, + Stream_AddRef, + Stream_Release, + Stream_Read, + Stream_Write, + Stream_Seek, + Stream_SetSize, + Stream_CopyTo, + Stream_Commit, + Stream_Revert, + Stream_LockRegion, + Stream_UnlockRegion, + Stream_Stat, + Stream_Clone +}; + +static TestStream *create_test_stream(void) +{ + TestStream *stream; + stream = HeapAlloc(GetProcessHeap(), 0, sizeof(*stream)); + stream->IStream_iface.lpVtbl = &StreamVtbl; + stream->ref = 1; + stream->pos = 0; + return stream; +} + +#define test_stream_read(a,b,c,d) _test_stream_read(__LINE__,a,b,c,d) +static void _test_stream_read(unsigned line, IStream *stream, HRESULT exhres, const char *exdata, unsigned read_size) +{ + ULONG read = 0xdeadbeed, exread = strlen(exdata); + char buf[1024]; + HRESULT hres; + + if(read_size == -1) + read_size = sizeof(buf)-1; + + hres = IStream_Read(stream, buf, read_size, &read); + ok_(__FILE__,line)(hres == exhres, "Read returned %08x, expected %08x\n", hres, exhres); + ok_(__FILE__,line)(read == exread, "unexpected read size %u, expected %u\n", read, exread); + buf[read] = 0; + ok_(__FILE__,line)(read == exread && !memcmp(buf, exdata, read), "unexpected data %s\n", buf); +} + +static void test_SetData(void) +{ + IStream *stream, *stream2; + TestStream *test_stream; + IMimeBody *body; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_IMimeBody, NULL, CLSCTX_INPROC_SERVER, &IID_IMimeBody, (void**)&body); + ok(hr == S_OK, "ret %08x\n", hr); + + /* Need to call InitNew before Load otherwise Load crashes with native inetcomm */ + hr = IMimeBody_InitNew(body); + ok(hr == S_OK, "ret %08x\n", hr); + + stream = create_stream_from_string(msg1); + hr = IMimeBody_Load(body, stream); + ok(hr == S_OK, "ret %08x\n", hr); + IStream_Release(stream); + + test_stream = create_test_stream(); + hr = IMimeBody_SetData(body, IET_BINARY, "text", "plain", &IID_IStream, &test_stream->IStream_iface); + + ok(hr == S_OK, "ret %08x\n", hr); + hr = IMimeBody_IsContentType(body, "text", "plain"); + todo_wine + ok(hr == S_OK, "ret %08x\n", hr); + + SET_EXPECT(Stream_Stat); + SET_EXPECT(Stream_Seek_END); + hr = IMimeBody_GetData(body, IET_BINARY, &stream); + CHECK_CALLED(Stream_Stat); + CHECK_CALLED(Stream_Seek_END); + ok(hr == S_OK, "GetData failed %08x\n", hr); + ok(stream != &test_stream->IStream_iface, "unexpected stream\n"); + + SET_EXPECT(Stream_Seek); + SET_EXPECT(Stream_Read); + test_stream_read(stream, S_OK, "012", 3); + CHECK_CALLED(Stream_Seek); + CHECK_CALLED(Stream_Read); + + SET_EXPECT(Stream_Stat); + SET_EXPECT(Stream_Seek_END); + hr = IMimeBody_GetData(body, IET_BINARY, &stream2); + CHECK_CALLED(Stream_Stat); + CHECK_CALLED(Stream_Seek_END); + ok(hr == S_OK, "GetData failed %08x\n", hr); + ok(stream2 != stream, "unexpected stream\n"); + + SET_EXPECT(Stream_Seek); + SET_EXPECT(Stream_Read); + test_stream_read(stream2, S_OK, "01", 2); + CHECK_CALLED(Stream_Seek); + CHECK_CALLED(Stream_Read); + + expect_seek_pos = 3; + SET_EXPECT(Stream_Seek); + SET_EXPECT(Stream_Read); + test_stream_read(stream, S_OK, "345", 3); + CHECK_CALLED(Stream_Seek); + CHECK_CALLED(Stream_Read); + + IStream_Release(stream); + IStream_Release(stream2); + IStream_Release(&test_stream->IStream_iface); + IMimeBody_Release(body); +} + static void test_Allocator(void) { HRESULT hr; @@ -844,6 +1118,7 @@ START_TEST(mimeole) test_CreateVirtualStream(); test_CreateSecurity(); test_CreateBody(); + test_SetData(); test_Allocator(); test_CreateMessage(); test_MessageSetProp();

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
50
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 January 2017