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

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

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

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

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

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

27 May '16

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

Austin English : bthprops.cpl: Add BluetoothFindFirstDevice stub.
by Alexandre Julliard 27 May '16

27 May '16

Module: wine Branch: master Commit: 08809557331106b15a8b25097a611b8afaa68add URL: http://source.winehq.org/git/wine.git/?a=commit;h=08809557331106b15a8b25097… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 19 23:07:52 2016 -0500 bthprops.cpl: Add BluetoothFindFirstDevice stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bthprops.cpl/bthprops.cpl.spec | 2 +- dlls/bthprops.cpl/main.c | 11 +++++++++++ dlls/irprops.cpl/irprops.cpl.spec | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/bthprops.cpl/bthprops.cpl.spec b/dlls/bthprops.cpl/bthprops.cpl.spec index 3842a36..ed80b0e 100644 --- a/dlls/bthprops.cpl/bthprops.cpl.spec +++ b/dlls/bthprops.cpl/bthprops.cpl.spec @@ -14,7 +14,7 @@ @ stub BluetoothFindDeviceClose @ stub BluetoothFindFirstBrowseGroup @ stub BluetoothFindFirstClassId -@ stub BluetoothFindFirstDevice +@ stdcall BluetoothFindFirstDevice(ptr ptr) @ stub BluetoothFindFirstProfileDescriptor @ stub BluetoothFindFirstProtocolDescriptorStack @ stub BluetoothFindFirstProtocolEntry diff --git a/dlls/bthprops.cpl/main.c b/dlls/bthprops.cpl/main.c index b261328..02ee371 100644 --- a/dlls/bthprops.cpl/main.c +++ b/dlls/bthprops.cpl/main.c @@ -32,6 +32,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(bthpropscpl); /********************************************************************* + * BluetoothFindFirstDevice + */ +HBLUETOOTH_DEVICE_FIND WINAPI BluetoothFindFirstDevice(BLUETOOTH_DEVICE_SEARCH_PARAMS *params, + BLUETOOTH_DEVICE_INFO *info) +{ + FIXME("(%p %p): stub!\n", params, info); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} + +/********************************************************************* * BluetoothFindFirstRadio */ HBLUETOOTH_RADIO_FIND WINAPI BluetoothFindFirstRadio(BLUETOOTH_FIND_RADIO_PARAMS *params, HANDLE *radio) diff --git a/dlls/irprops.cpl/irprops.cpl.spec b/dlls/irprops.cpl/irprops.cpl.spec index 083ccf4..d628315 100644 --- a/dlls/irprops.cpl/irprops.cpl.spec +++ b/dlls/irprops.cpl/irprops.cpl.spec @@ -11,7 +11,7 @@ @ stub BluetoothFindDeviceClose @ stub BluetoothFindFirstBrowseGroup @ stub BluetoothFindFirstClassId -@ stub BluetoothFindFirstDevice +@ stdcall BluetoothFindFirstDevice(ptr ptr) bthprops.cpl.BluetoothFindFirstDevice @ stub BluetoothFindFirstProfileDescriptor @ stub BluetoothFindFirstProtocolDescriptorStack @ stub BluetoothFindFirstProtocolEntry

1 0

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

27 May '16

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

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

27 May '16

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

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

27 May '16

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