wine-commits May 2016

wine-commits@winehq.org

4 participants
542 discussions

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

27 May '16

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

Andrey Gusev : winhlp32: Fix a typo in comment.
by Alexandre Julliard 27 May '16

27 May '16

Module: wine Branch: master Commit: 6ef27773a7123d7b4e4f853f9ab7f87b8897ea80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ef27773a7123d7b4e4f853f9… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu May 26 18:18:15 2016 +0300 winhlp32: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winhlp32/winhelp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index dc6777b..0708034 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -519,7 +519,7 @@ WINHELP_WINDOW* WINHELP_GrabWindow(WINHELP_WINDOW* win) /*********************************************************************** * - * WINHELP_RelaseWindow + * WINHELP_ReleaseWindow */ BOOL WINHELP_ReleaseWindow(WINHELP_WINDOW* win) {

1 0

Andrey Gusev : urlmon: Fix a typo in comment.
by Alexandre Julliard 27 May '16

27 May '16

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 27 May '16

27 May '16

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

Henri Verbeet : d3d10: Validate the base offset in parse_fx10_body() (AFL) .
by Alexandre Julliard 27 May '16

27 May '16

Module: wine Branch: master Commit: 200bfa97a8f86cea9197b1c6a6f5a26225ecaca2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=200bfa97a8f86cea9197b1c6a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 26 19:36:56 2016 +0200 d3d10: Validate the base offset in parse_fx10_body() (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 2eb0680..2adbc08 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2104,10 +2104,17 @@ static void d3d10_effect_type_destroy(struct wine_rb_entry *entry, void *context static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD data_size) { - const char *ptr = data + e->index_offset; + const char *ptr; unsigned int i; HRESULT hr; + if (e->index_offset >= data_size) + { + WARN("Invalid index offset %#x (data size %#x).\n", e->index_offset, data_size); + return E_FAIL; + } + ptr = data + e->index_offset; + if (!(e->local_buffers = d3d10_calloc(e->local_buffer_count, sizeof(*e->local_buffers)))) { ERR("Failed to allocate local buffer memory.\n");

1 0

Henri Verbeet : d3d10: Validate the data size in parse_fx10() (AFL).
by Alexandre Julliard 27 May '16

27 May '16

Module: wine Branch: master Commit: e36630f7025b749eb3dc120f6495dd1235ed609f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e36630f7025b749eb3dc120f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 26 19:36:55 2016 +0200 d3d10: Validate the data size in parse_fx10() (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 971e1c3..2eb0680 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2180,6 +2180,12 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s const char *ptr = data; DWORD unknown; + if (!require_space(0, 19, sizeof(DWORD), data_size)) + { + WARN("Invalid data size %#x.\n", data_size); + return E_INVALIDARG; + } + /* Compiled target version (e.g. fx_4_0=0xfeff1001, fx_4_1=0xfeff1011). */ read_dword(&ptr, &e->version); TRACE("Target: %#x\n", e->version);

1 0

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

27 May '16

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

Henri Verbeet : d3d10: Simply use d3d10_effect_type_destroy() in d3d10_effect_local_buffer_destroy().
by Alexandre Julliard 27 May '16

27 May '16

Module: wine Branch: master Commit: 01f8e55d38a724de0974700a21f63aa88fcdff78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01f8e55d38a724de0974700a2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 26 19:36:53 2016 +0200 d3d10: Simply use d3d10_effect_type_destroy() in d3d10_effect_local_buffer_destroy(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index a684ee5..1f5772e 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2517,18 +2517,8 @@ static void d3d10_effect_local_buffer_destroy(struct d3d10_effect_variable *l) HeapFree(GetProcessHeap(), 0, l->members); } - if (l->type->members) - { - for (i = 0; i < l->type->member_count; ++i) - { - /* Do not release l->type->members[i].type, it will be covered by d3d10_effect_type_destroy(). */ - HeapFree(GetProcessHeap(), 0, l->type->members[i].semantic); - HeapFree(GetProcessHeap(), 0, l->type->members[i].name); - } - HeapFree(GetProcessHeap(), 0, l->type->members); - } - HeapFree(GetProcessHeap(), 0, l->type->name); - HeapFree(GetProcessHeap(), 0, l->type); + if (l->type) + d3d10_effect_type_destroy(&l->type->entry, NULL); if (l->annotations) {

1 0

Henri Verbeet : d3d10: Check if the type was initialised in d3d10_effect_variable_destroy() (AFL ).
by Alexandre Julliard 27 May '16

27 May '16

Module: wine Branch: master Commit: 908a8e677cbc3381206f61cccda01c663ed963ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=908a8e677cbc3381206f61ccc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 26 19:36:52 2016 +0200 d3d10: Check if the type was initialised in d3d10_effect_variable_destroy() (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 51 +++++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 6955445..a684ee5 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2373,36 +2373,39 @@ static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v) HeapFree(GetProcessHeap(), 0, v->elements); } - switch(v->type->basetype) + if (v->type) { - case D3D10_SVT_VERTEXSHADER: - case D3D10_SVT_PIXELSHADER: - case D3D10_SVT_GEOMETRYSHADER: - d3d10_effect_shader_variable_destroy(&v->u.shader, v->type->basetype); - break; + switch (v->type->basetype) + { + case D3D10_SVT_VERTEXSHADER: + case D3D10_SVT_PIXELSHADER: + case D3D10_SVT_GEOMETRYSHADER: + d3d10_effect_shader_variable_destroy(&v->u.shader, v->type->basetype); + break; - case D3D10_SVT_DEPTHSTENCIL: - if (v->u.state.object.depth_stencil) - ID3D10DepthStencilState_Release(v->u.state.object.depth_stencil); - break; + case D3D10_SVT_DEPTHSTENCIL: + if (v->u.state.object.depth_stencil) + ID3D10DepthStencilState_Release(v->u.state.object.depth_stencil); + break; - case D3D10_SVT_BLEND: - if (v->u.state.object.blend) - ID3D10BlendState_Release(v->u.state.object.blend); - break; + case D3D10_SVT_BLEND: + if (v->u.state.object.blend) + ID3D10BlendState_Release(v->u.state.object.blend); + break; - case D3D10_SVT_RASTERIZER: - if (v->u.state.object.rasterizer) - ID3D10RasterizerState_Release(v->u.state.object.rasterizer); - break; + case D3D10_SVT_RASTERIZER: + if (v->u.state.object.rasterizer) + ID3D10RasterizerState_Release(v->u.state.object.rasterizer); + break; - case D3D10_SVT_SAMPLER: - if (v->u.state.object.sampler) - ID3D10SamplerState_Release(v->u.state.object.sampler); - break; + case D3D10_SVT_SAMPLER: + if (v->u.state.object.sampler) + ID3D10SamplerState_Release(v->u.state.object.sampler); + break; - default: - break; + default: + break; + } } }

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 27 May '16

27 May '16

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

← Newer
1
...
4
5
6
7
8
9
10
...
55
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 May 2016