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

Alexandre Julliard : tools: Ensure that everything is stored in UTF-8 in the ANNOUNCE file.
by Alexandre Julliard May 27, 2016

May 27, 2016

Module: wine Branch: master Commit: b6a091a2b189b9974a21d7457dc9915e12f90919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6a091a2b189b9974a21d7457… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 27 23:18:05 2016 +0900 tools: Ensure that everything is stored in UTF-8 in the ANNOUNCE file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_announce | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/make_announce b/tools/make_announce index fedbc37..c65f900 100755 --- a/tools/make_announce +++ b/tools/make_announce @@ -25,7 +25,7 @@ use strict; use locale; use POSIX; use Text::CSV::Encoded; -binmode STDOUT, ':utf8'; +use open ':encoding(utf8)'; sub unescape($) {

1 0

Alexandre Julliard : explorer: Vertically center the system tray icons.
by Alexandre Julliard May 27, 2016

May 27, 2016

Module: wine Branch: master Commit: 3c33d6d32c508e516248ab7cb61e96cdcb8ca952 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c33d6d32c508e516248ab7cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 27 21:16:40 2016 +0900 explorer: Vertically center the system tray icons. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/systray.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 40e03e9..daaae87 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -125,8 +125,8 @@ static RECT get_icon_rect( struct icon *icon ) rect.right = tray_width - icon_cx * icon->display; rect.left = rect.right - icon_cx; - rect.top = 0; - rect.bottom = icon_cy; + rect.top = (tray_height - icon_cy) / 2; + rect.bottom = rect.top + icon_cy; return rect; } @@ -297,9 +297,9 @@ static void invalidate_icons( unsigned int start, unsigned int end ) RECT rect; rect.left = tray_width - (end + 1) * icon_cx; - rect.top = 0; + rect.top = (tray_height - icon_cy) / 2; rect.right = tray_width - start * icon_cx; - rect.bottom = icon_cy; + rect.bottom = rect.top + icon_cy; InvalidateRect( tray_window, &rect, TRUE ); }

1 0

Alexandre Julliard : explorer: Use the window caption font for the Start button.
by Alexandre Julliard May 27, 2016

May 27, 2016

Module: wine Branch: master Commit: 19a7037d502e765d448032383f5770d7b2621eb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19a7037d502e765d448032383… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 27 21:15:12 2016 +0900 explorer: Use the window caption font for the Start button. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/systray.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 4f94ba6..40e03e9 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -549,14 +549,21 @@ static void do_hide_systray(void) static void do_show_systray(void) { SIZE start_button_size; + NONCLIENTMETRICSW ncm; + HFONT font; HDC hdc = GetDC( 0 ); + ncm.cbSize = sizeof(NONCLIENTMETRICSW); + SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSW), &ncm, 0 ); + font = CreateFontIndirectW( &ncm.lfCaptionFont ); /* FIXME: Implement BCM_GETIDEALSIZE and use that instead. */ + SelectObject( hdc, font ); GetTextExtentPointW( hdc, start_label, lstrlenW(start_label), &start_button_size ); /* add some margins (FIXME) */ start_button_size.cx += 8; start_button_size.cy += 4; ReleaseDC( 0, hdc ); + SendMessageW( start_button, WM_SETFONT, (WPARAM)font, 0 ); tray_width = GetSystemMetrics( SM_CXSCREEN ); tray_height = max( icon_cy, start_button_size.cy );

1 0

Józef Kucia : wined3d: Do not call wined3d_buffer_map () before "buffer->maps" is initialized.
by Alexandre Julliard May 27, 2016

May 27, 2016

Module: wine Branch: master Commit: 0dcf255b51ef096d649a5b4daee7204409550376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dcf255b51ef096d649a5b4da… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 27 11:03:54 2016 +0200 wined3d: Do not call wined3d_buffer_map() before "buffer->maps" is initialized. 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/buffer.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index c82bfdb..62a1921 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1331,17 +1331,6 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device buffer->flags |= WINED3D_BUFFER_CREATEBO; } - if (data) - { - if (FAILED(hr = wined3d_buffer_upload_data(buffer, NULL, data->data))) - { - ERR("Failed to upload data, hr %#x.\n", hr); - buffer_unload(&buffer->resource); - resource_cleanup(&buffer->resource); - return hr; - } - } - if (!(buffer->maps = HeapAlloc(GetProcessHeap(), 0, sizeof(*buffer->maps)))) { ERR("Out of memory.\n"); @@ -1351,6 +1340,15 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device } buffer->maps_size = 1; + if (data && FAILED(hr = wined3d_buffer_upload_data(buffer, NULL, data->data))) + { + ERR("Failed to upload data, hr %#x.\n", hr); + buffer_unload(&buffer->resource); + resource_cleanup(&buffer->resource); + HeapFree(GetProcessHeap(), 0, buffer->maps); + return hr; + } + return WINED3D_OK; }

1 0

Józef Kucia : wined3d: Simplify buffer_is_fully_dirty ().
by Alexandre Julliard May 27, 2016

May 27, 2016

Module: wine Branch: master Commit: d39560f33f5074f2baec355f0b19b036d0da1412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d39560f33f5074f2baec355f0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 27 11:03:53 2016 +0200 wined3d: Simplify buffer_is_fully_dirty(). The buffer_invalidate_bo_range() ensures that if the whole buffer was invalidated the dirty areas array contains exactly one element. 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/buffer.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 5ddf67d..c82bfdb 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -89,14 +89,8 @@ static BOOL buffer_is_dirty(const struct wined3d_buffer *buffer) static BOOL buffer_is_fully_dirty(const struct wined3d_buffer *buffer) { - unsigned int i; - - for (i = 0; i < buffer->modified_areas; ++i) - { - if (!buffer->maps[i].offset && buffer->maps[i].size == buffer->resource.size) - return TRUE; - } - return FALSE; + return buffer->modified_areas == 1 + && !buffer->maps->offset && buffer->maps->size == buffer->resource.size; } /* Context activation is done by the caller. */ @@ -1348,10 +1342,9 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device } } - buffer->maps = HeapAlloc(GetProcessHeap(), 0, sizeof(*buffer->maps)); - if (!buffer->maps) + if (!(buffer->maps = HeapAlloc(GetProcessHeap(), 0, sizeof(*buffer->maps)))) { - ERR("Out of memory\n"); + ERR("Out of memory.\n"); buffer_unload(&buffer->resource); resource_cleanup(&buffer->resource); return E_OUTOFMEMORY;

1 0

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

May 27, 2016

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 May 27, 2016

May 27, 2016

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

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

May 27, 2016

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

Austin English : bthprops.cpl: Add BluetoothFindFirstDevice stub.
by Alexandre Julliard May 27, 2016

May 27, 2016

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

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

May 27, 2016

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