May 2016 - Wine-Commits - list.winehq.org

Henri Verbeet : d3d10: Names and semantics are allowed to be NULL (AFL).
by Alexandre Julliard May 27, 2016

May 27, 2016

Module: wine Branch: master Commit: 1f38359ec58b8d89bcd3992b00ed4ae96da686a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f38359ec58b8d89bcd3992b0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 26 19:36:54 2016 +0200 d3d10: Names and semantics are allowed to be NULL (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 56 +++++++++++++++++++++-------------------------------- 1 file changed, 22 insertions(+), 34 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 1f5772e..971e1c3 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2692,7 +2692,7 @@ static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetCon { struct d3d10_effect_variable *l = &This->local_buffers[i]; - if (!strcmp(l->name, name)) + if (l->name && !strcmp(l->name, name)) { TRACE("Returning buffer %p.\n", l); return (ID3D10EffectConstantBuffer *)l; @@ -2761,7 +2761,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB { struct d3d10_effect_variable *v = &l->members[j]; - if (!strcmp(v->name, name)) + if (v->name && !strcmp(v->name, name)) { TRACE("Returning variable %p.\n", v); return &v->ID3D10EffectVariable_iface; @@ -2773,7 +2773,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB { struct d3d10_effect_variable *v = &This->local_variables[i]; - if (!strcmp(v->name, name)) + if (v->name && !strcmp(v->name, name)) { TRACE("Returning variable %p.\n", v); return &v->ID3D10EffectVariable_iface; @@ -2808,7 +2808,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB { struct d3d10_effect_variable *v = &l->members[j]; - if (!strcmp(v->semantic, semantic)) + if (v->semantic && !strcmp(v->semantic, semantic)) { TRACE("Returning variable %p.\n", v); return &v->ID3D10EffectVariable_iface; @@ -2820,7 +2820,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB { struct d3d10_effect_variable *v = &This->local_variables[i]; - if (!strcmp(v->semantic, semantic)) + if (v->semantic && !strcmp(v->semantic, semantic)) { TRACE("Returning variable %p.\n", v); return &v->ID3D10EffectVariable_iface; @@ -2870,7 +2870,7 @@ static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqu for (i = 0; i < This->technique_count; ++i) { struct d3d10_effect_technique *t = &This->techniques[i]; - if (!strcmp(t->name, name)) + if (t->name && !strcmp(t->name, name)) { TRACE("Returning technique %p\n", t); return &t->ID3D10EffectTechnique_iface; @@ -2992,7 +2992,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_technique_Ge for (i = 0; i < This->annotation_count; ++i) { struct d3d10_effect_variable *a = &This->annotations[i]; - if (!strcmp(a->name, name)) + if (a->name && !strcmp(a->name, name)) { TRACE("Returning annotation %p\n", a); return &a->ID3D10EffectVariable_iface; @@ -3038,7 +3038,7 @@ static struct ID3D10EffectPass * STDMETHODCALLTYPE d3d10_effect_technique_GetPas for (i = 0; i < This->pass_count; ++i) { struct d3d10_effect_pass *p = &This->passes[i]; - if (!strcmp(p->name, name)) + if (p->name && !strcmp(p->name, name)) { TRACE("Returning pass %p\n", p); return &p->ID3D10EffectPass_iface; @@ -3224,7 +3224,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_pass_GetAnno for (i = 0; i < This->annotation_count; ++i) { struct d3d10_effect_variable *a = &This->annotations[i]; - if (!strcmp(a->name, name)) + if (a->name && !strcmp(a->name, name)) { TRACE("Returning annotation %p\n", a); return &a->ID3D10EffectVariable_iface; @@ -3362,7 +3362,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_Get for (i = 0; i < This->annotation_count; ++i) { struct d3d10_effect_variable *a = &This->annotations[i]; - if (!strcmp(a->name, name)) + if (a->name && !strcmp(a->name, name)) { TRACE("Returning annotation %p\n", a); return &a->ID3D10EffectVariable_iface; @@ -3413,13 +3413,10 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_Get { struct d3d10_effect_variable *m = &This->members[i]; - if (m->name) + if (m->name && !strcmp(m->name, name)) { - if (!strcmp(m->name, name)) - { - TRACE("Returning member %p\n", m); - return &m->ID3D10EffectVariable_iface; - } + TRACE("Returning member %p\n", m); + return &m->ID3D10EffectVariable_iface; } } @@ -3446,13 +3443,10 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_Get { struct d3d10_effect_variable *m = &This->members[i]; - if (m->semantic) + if (m->semantic && !strcmp(m->semantic, semantic)) { - if (!strcmp(m->semantic, semantic)) - { - TRACE("Returning member %p\n", m); - return &m->ID3D10EffectVariable_iface; - } + TRACE("Returning member %p\n", m); + return &m->ID3D10EffectVariable_iface; } } @@ -7049,13 +7043,10 @@ static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_type_GetMemberTy { struct d3d10_effect_type_member *typem = &This->members[i]; - if (typem->name) + if (typem->name && !strcmp(typem->name, name)) { - if (!strcmp(typem->name, name)) - { - TRACE("Returning type %p.\n", typem->type); - return &typem->type->ID3D10EffectType_iface; - } + TRACE("Returning type %p.\n", typem->type); + return &typem->type->ID3D10EffectType_iface; } } @@ -7082,13 +7073,10 @@ static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_type_GetMemberTy { struct d3d10_effect_type_member *typem = &This->members[i]; - if (typem->semantic) + if (typem->semantic && !strcmp(typem->semantic, semantic)) { - if (!strcmp(typem->semantic, semantic)) - { - TRACE("Returning type %p.\n", typem->type); - return &typem->type->ID3D10EffectType_iface; - } + TRACE("Returning type %p.\n", typem->type); + return &typem->type->ID3D10EffectType_iface; } }

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard May 27, 2016

May 27, 2016

Module: wine Branch: master Commit: b826efa0638239a9476f1f533a5a180e38dcdbd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b826efa0638239a9476f1f533… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 26 20:50:31 2016 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/po/ru.po b/po/ru.po index d54423b..4418f0d 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ 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-05-16 22:15+0300\n" +"PO-Revision-Date: 2016-05-26 20:47+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -11552,6 +11552,15 @@ msgid "" " REG [operation] /?\n" "\n" msgstr "" +"Вызов:\n" +" REG [операция] [параметры]\n" +"\n" +"Поддерживаемые операции:\n" +" ADD | DELETE | QUERY\n" +"\n" +"Для получения справки по конкретной операции используйте:\n" +" REG [операция] /?\n" +"\n" #: reg.rc:36 msgid "" @@ -11654,24 +11663,20 @@ msgid "Search complete. Number of matches found: %1!d!\n" msgstr "Поиск завершён. Найдено совпадений: %1!d!\n" #: reg.rc:61 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid syntax. " -msgstr "reg: неверное имя раздела\n" +msgstr "reg: неверный синтаксис. " #: reg.rc:62 -#, fuzzy -#| msgid "uninstaller: Invalid option [%1]\n" msgid "reg: Invalid option [%1]. " -msgstr "uninstaller: неверная опция [%1]\n" +msgstr "reg: неверная опция [%1]. " #: reg.rc:63 msgid "Type \"REG /?\" for help.\n" -msgstr "" +msgstr "Для справки введите «REG /?».\n" #: reg.rc:64 msgid "Type \"REG %1 /?\" for help.\n" -msgstr "" +msgstr "Для справки введите «REG %1 /?».\n" #: regedit.rc:34 msgid "&Registry"

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard May 27, 2016

May 27, 2016

Module: wine Branch: master Commit: c15e80edd2673e0934974167e505388eee07d443 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c15e80edd2673e0934974167e… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu May 26 18:53:03 2016 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/po/fi.po b/po/fi.po index 9892c37..52fd675 100644 --- a/po/fi.po +++ b/po/fi.po @@ -11529,6 +11529,15 @@ msgid "" " REG [operation] /?\n" "\n" msgstr "" +"Käyttö:\n" +" REG [toiminto] [parametrit]\n" +"\n" +"Tuetut toiminnot:\n" +" ADD, DELETE, QUERY\n" +"\n" +"Tietystä toiminnosta saa apua komennolla\n" +" REG [toiminto] /?\n" +"\n" #: reg.rc:36 msgid "" @@ -11632,24 +11641,20 @@ msgid "Search complete. Number of matches found: %1!d!\n" msgstr "Haku on valmis. Osumia: %1!d!\n" #: reg.rc:61 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid syntax. " -msgstr "reg: Avaimen nimi ei kelpaa\n" +msgstr "reg: Syntaksi ei kelpaa. " #: reg.rc:62 -#, fuzzy -#| msgid "uninstaller: Invalid option [%1]\n" msgid "reg: Invalid option [%1]. " -msgstr "uninstaller: Virheellinen valitsin [%1]\n" +msgstr "reg: Valitsin [%1] ei kelpaa. " #: reg.rc:63 msgid "Type \"REG /?\" for help.\n" -msgstr "" +msgstr "Komennolla \"REG /?\" saat apua.\n" #: reg.rc:64 msgid "Type \"REG %1 /?\" for help.\n" -msgstr "" +msgstr "Komennolla \"REG %1 /?\" saat apua.\n" #: regedit.rc:34 msgid "&Registry"

1 0

Józef Kucia : wined3d: Add more integer formats to " typed_formats" table.
by Alexandre Julliard May 27, 2016

May 27, 2016

Module: wine Branch: master Commit: eb75b09b56d318fb0f8e2af27fc6b065fb122f15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb75b09b56d318fb0f8e2af27… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 27 11:03:52 2016 +0200 wined3d: Add more integer formats to "typed_formats" table. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d4b09f4..abe52dd 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -207,12 +207,15 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_R32G32B32A32_SINT, WINED3DFMT_R32G32B32A32_TYPELESS, "IIII"}, {WINED3DFMT_R32G32B32A32_FLOAT, WINED3DFMT_R32G32B32A32_TYPELESS, "FFFF"}, {WINED3DFMT_R32G32B32_UINT, WINED3DFMT_R32G32B32_TYPELESS, "UUU"}, + {WINED3DFMT_R32G32B32_SINT, WINED3DFMT_R32G32B32_TYPELESS, "III"}, {WINED3DFMT_R32G32B32_FLOAT, WINED3DFMT_R32G32B32_TYPELESS, "FFF"}, {WINED3DFMT_R16G16B16A16_UNORM, WINED3DFMT_R16G16B16A16_TYPELESS, "uuuu"}, {WINED3DFMT_R16G16B16A16_SNORM, WINED3DFMT_R16G16B16A16_TYPELESS, "iiii"}, + {WINED3DFMT_R16G16B16A16_UINT, WINED3DFMT_R16G16B16A16_TYPELESS, "UUUU"}, {WINED3DFMT_R16G16B16A16_SINT, WINED3DFMT_R16G16B16A16_TYPELESS, "IIII"}, {WINED3DFMT_R16G16B16A16_FLOAT, WINED3DFMT_R16G16B16A16_TYPELESS, "FFFF"}, {WINED3DFMT_R32G32_UINT, WINED3DFMT_R32G32_TYPELESS, "UU"}, + {WINED3DFMT_R32G32_SINT, WINED3DFMT_R32G32_TYPELESS, "II"}, {WINED3DFMT_R32G32_FLOAT, WINED3DFMT_R32G32_TYPELESS, "FF"}, {WINED3DFMT_R10G10B10A2_SNORM, WINED3DFMT_R10G10B10A2_TYPELESS, "iiii"}, {WINED3DFMT_R10G10B10A2_UINT, WINED3DFMT_R10G10B10A2_TYPELESS, "UUUU"}, @@ -223,15 +226,18 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_R8G8B8A8_UNORM, WINED3DFMT_R8G8B8A8_TYPELESS, "uuuu"}, {WINED3DFMT_R16G16_UNORM, WINED3DFMT_R16G16_TYPELESS, "uu"}, {WINED3DFMT_R16G16_SNORM, WINED3DFMT_R16G16_TYPELESS, "ii"}, + {WINED3DFMT_R16G16_UINT, WINED3DFMT_R16G16_TYPELESS, "UU"}, {WINED3DFMT_R16G16_SINT, WINED3DFMT_R16G16_TYPELESS, "II"}, {WINED3DFMT_R16G16_FLOAT, WINED3DFMT_R16G16_TYPELESS, "FF"}, {WINED3DFMT_R32_UINT, WINED3DFMT_R32_TYPELESS, "U"}, + {WINED3DFMT_R32_SINT, WINED3DFMT_R32_TYPELESS, "I"}, {WINED3DFMT_R32_FLOAT, WINED3DFMT_R32_TYPELESS, "F"}, {WINED3DFMT_D24_UNORM_S8_UINT, WINED3DFMT_R24G8_TYPELESS, "DS"}, {WINED3DFMT_R8G8_SNORM, WINED3DFMT_R8G8_TYPELESS, "ii"}, {WINED3DFMT_R8G8_UNORM, WINED3DFMT_R8G8_TYPELESS, "uu"}, {WINED3DFMT_R16_UNORM, WINED3DFMT_R16_TYPELESS, "u"}, {WINED3DFMT_R16_UINT, WINED3DFMT_R16_TYPELESS, "U"}, + {WINED3DFMT_R16_SINT, WINED3DFMT_R16_TYPELESS, "I"}, {WINED3DFMT_R16_FLOAT, WINED3DFMT_R16_TYPELESS, "F"}, {WINED3DFMT_R8_UNORM, WINED3DFMT_R8_TYPELESS, "u"}, {WINED3DFMT_BC1_UNORM_SRGB, WINED3DFMT_BC1_TYPELESS, ""},

1 0

Józef Kucia : wined3d: Remove redundant entries from "formats" table.
by Alexandre Julliard May 27, 2016

May 27, 2016

Module: wine Branch: master Commit: 808221ac2505889c7f57bfa6a7a4a62dae72a874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=808221ac2505889c7f57bfa6a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 27 11:03:51 2016 +0200 wined3d: Remove redundant entries from "formats" table. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4145bf5..d4b09f4 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -98,8 +98,6 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_R8G8_B8G8, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, /* Hmm? */ {WINED3DFMT_R8G8_SNORM_Cx, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, - {WINED3DFMT_R16G16_SINT, 16, 16, 0, 0, 0, 16, 0, 0, 4, 0, 0}, - {WINED3DFMT_R16G16B16A16_SINT, 16, 16, 16, 16, 0, 16, 32, 48, 8, 0, 0}, {WINED3DFMT_R11G11B10_FLOAT, 11, 11, 10, 0, 0, 11, 22, 0, 4, 0, 0}, /* Palettized formats */ {WINED3DFMT_P8_UINT_A8_UNORM, 0, 0, 0, 8, 0, 0, 0, 8, 2, 0, 0},

1 0

Andrey Gusev : urlmon: Fix a typo in comment.
by Alexandre Julliard May 27, 2016

May 27, 2016

Module: wine Branch: master Commit: 4777f6790b5673f91b59c17b7a1ecb8ea8eeb93f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4777f6790b5673f91b59c17b7… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu May 26 18:09:43 2016 +0300 urlmon: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/mimefilter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/mimefilter.c b/dlls/urlmon/mimefilter.c index ee95755..e12c2b7 100644 --- a/dlls/urlmon/mimefilter.c +++ b/dlls/urlmon/mimefilter.c @@ -689,7 +689,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer, if(dwReserved) WARN("dwReserved=%d\n", dwReserved); - /* pBC seams to not be used */ + /* pBC seems to not be used */ if(!ppwzMimeOut || (!pwzUrl && !pBuffer)) return E_INVALIDARG;

1 0

Andrey Gusev : comctl32: Fix a typo in comment.
by Alexandre Julliard May 27, 2016

May 27, 2016

Module: wine Branch: master Commit: ee19a56a94dcfbacc403081680412630676eb79f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee19a56a94dcfbacc40308168… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu May 26 18:05:58 2016 +0300 comctl32: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index b922ef7..784ca7b 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4747,7 +4747,7 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, ITERAT - CDDS_ITEMPREPAINT - CDDS_ITEMPREPAINT|CDDS_SUBITEM | => sent n times, where n is number of subitems, - CDDS_ITEMPOSTPAINT|CDDS_SUBITEM | including item iself + CDDS_ITEMPOSTPAINT|CDDS_SUBITEM | including item itself - CDDS_ITEMPOSTPAINT other styles:

1 0

Alistair Leslie-Hughes : inetcomm: Return S_OK from IMimePropertySchema ModifyProperty.
by Alexandre Julliard May 27, 2016

May 27, 2016

Module: wine Branch: master Commit: 9ae04844f0b185d2cb3eb482077b234b6fa7ff71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ae04844f0b185d2cb3eb4820… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 25 06:13:44 2016 +0000 inetcomm: Return S_OK from IMimePropertySchema ModifyProperty. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 14739ab..0288b59 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -3178,7 +3178,7 @@ static HRESULT WINAPI propschema_ModifyProperty(IMimePropertySchema *iface, cons { propschema *This = impl_from_IMimePropertySchema(iface); FIXME("(%p)->(%s, %x, %d, %d) stub\n", This, debugstr_a(name), flags, rownumber, vtdefault); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI propschema_GetPropertyId(IMimePropertySchema *iface, const char *name, DWORD *propid)

1 0

Jacek Caban : mshtml: Fixed OnStopBinding if it' s called called after we aborted document binding.
by Alexandre Julliard May 27, 2016

May 27, 2016

Module: wine Branch: master Commit: b0c759a3b91e2c7b5934b18f0faaecdcc6254bf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0c759a3b91e2c7b5934b18f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 27 13:43:32 2016 +0200 mshtml: Fixed OnStopBinding if it's called called after we aborted document binding. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/navigate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 4b86c40..aa652dd 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1397,10 +1397,10 @@ static HRESULT nsChannelBSC_stop_binding(BSCallback *bsc, HRESULT result) { nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc); - if(result != E_ABORT) { + if(result != E_ABORT && This->is_doc_channel && This->bsc.window) { if(FAILED(result)) handle_navigation_error(This, result); - else if(This->is_doc_channel && This->nschannel) { + else if(This->nschannel) { result = async_stop_request(This); if(SUCCEEDED(result)) return S_OK;

1 0

Alistair Leslie-Hughes : inetcomm: Ignore OID_TRANSMIT_BODY_ENCODING value in IMimeBody SetOption.
by Alexandre Julliard May 27, 2016

May 27, 2016

Module: wine Branch: master Commit: cec1281cd7351a9af4ae8147dd03f37f35d6c124 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cec1281cd7351a9af4ae8147d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 25 06:13:56 2016 +0000 inetcomm: Ignore OID_TRANSMIT_BODY_ENCODING value in IMimeBody SetOption. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 0288b59..71dc712 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -924,6 +924,10 @@ static HRESULT WINAPI MimeBody_SetOption( FIXME("OID_SECURITY_HWND_OWNER (value %08x): ignoring\n", pValue->u.ulVal); hr = S_OK; break; + case OID_TRANSMIT_BODY_ENCODING: + FIXME("OID_TRANSMIT_BODY_ENCODING (value %08x): ignoring\n", pValue->u.ulVal); + hr = S_OK; + break; default: FIXME("Unhandled oid %08x\n", oid); }

1 0