November 2014 - Wine-Commits

Bruno Jesus : mciavi32: Initialize a variable (Cppcheck).
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: 47554b8c6363fbd300496db25e947c74c1303910 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47554b8c6363fbd300496db25… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 31 23:44:23 2014 -0200 mciavi32: Initialize a variable (Cppcheck). --- dlls/mciavi32/info.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mciavi32/info.c b/dlls/mciavi32/info.c index 668464c..f679778 100644 --- a/dlls/mciavi32/info.c +++ b/dlls/mciavi32/info.c @@ -74,7 +74,7 @@ DWORD MCIAVI_ConvertTimeFormatToFrame(WINE_MCIAVI* wma, DWORD val) DWORD MCIAVI_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS lpParms) { WINE_MCIAVI* wma = MCIAVI_mciGetOpenDev(wDevID); - DWORD ret; + DWORD ret = MCIERR_UNSUPPORTED_FUNCTION; TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); @@ -175,7 +175,6 @@ DWORD MCIAVI_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS l /* w2k does not know MAX_WINDOWS or MAX/MINIMUM_RATE */ default: FIXME("Unknown capability (%08x) !\n", lpParms->dwItem); - ret = MCIERR_UNSUPPORTED_FUNCTION; break; } }

1 0

Marcus Meissner : dwrite: Fixed memory leak on error (Coverity).
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: a423cbdd5e18552df2da73a1c6bcf6511796bc23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a423cbdd5e18552df2da73a1c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Nov 2 11:10:22 2014 +0100 dwrite: Fixed memory leak on error (Coverity). --- dlls/dwrite/font.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 8420fdc..ed0a760 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1476,8 +1476,10 @@ HRESULT create_font_collection(IDWriteFactory* factory, IDWriteFontFileEnumerato init_font_data(factory, file, i, face_type, font_data); hr = get_filestream_from_file(file, &stream); - if (FAILED(hr)) + if (FAILED(hr)) { + heap_free (font_data); return hr; + } /* get family name from font file */ name_table = NULL;

1 0

Jacek Caban : mshtml: Wine Gecko 2.34 release.
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: f5e3281a807092b4f166a72d9e9965ad24f0a101 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5e3281a807092b4f166a72d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 3 12:39:59 2014 +0100 mshtml: Wine Gecko 2.34 release. --- dlls/appwiz.cpl/addons.c | 6 +- dlls/mshtml/binding.h | 1 + dlls/mshtml/htmlanchor.c | 2 +- dlls/mshtml/htmldoc.c | 18 +- dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/htmlnode.c | 41 ++-- dlls/mshtml/mshtml_private.h | 16 +- dlls/mshtml/mutation.c | 4 +- dlls/mshtml/navigate.c | 2 +- dlls/mshtml/nsembed.c | 1 - dlls/mshtml/nsiface.idl | 571 ++++++++++++++++++++++++------------------- dlls/mshtml/nsio.c | 54 ++++ dlls/mshtml/oleobj.c | 10 +- dlls/mshtml/script.c | 2 +- 14 files changed, 412 insertions(+), 318 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5e3281a807092b4f166a…

1 0

Henri Verbeet : d2d1: Implement d2d_gradient_GetGradientStops().
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: 8db1df50973abc79cfe91517354f08d8a4b95e2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8db1df50973abc79cfe915173… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 3 08:59:38 2014 +0100 d2d1: Implement d2d_gradient_GetGradientStops(). --- dlls/d2d1/brush.c | 18 ++++++++++++++++-- dlls/d2d1/d2d1_private.h | 3 ++- dlls/d2d1/render_target.c | 8 +++++++- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 4d7a5ad..99b111f 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -66,7 +66,10 @@ static ULONG STDMETHODCALLTYPE d2d_gradient_Release(ID2D1GradientStopCollection TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) + { + HeapFree(GetProcessHeap(), 0, gradient->stops); HeapFree(GetProcessHeap(), 0, gradient); + } return refcount; } @@ -90,7 +93,13 @@ static UINT32 STDMETHODCALLTYPE d2d_gradient_GetGradientStopCount(ID2D1GradientS static void STDMETHODCALLTYPE d2d_gradient_GetGradientStops(ID2D1GradientStopCollection *iface, D2D1_GRADIENT_STOP *stops, UINT32 stop_count) { - FIXME("iface %p, stops %p, stop_count %u stub!\n", iface, stops, stop_count); + struct d2d_gradient *gradient = impl_from_ID2D1GradientStopCollection(iface); + + TRACE("iface %p, stops %p, stop_count %u.\n", iface, stops, stop_count); + + memcpy(stops, gradient->stops, min(gradient->stop_count, stop_count) * sizeof(*stops)); + if (stop_count > gradient->stop_count) + memset(stops, 0, (stop_count - gradient->stop_count) * sizeof(*stops)); } static D2D1_GAMMA STDMETHODCALLTYPE d2d_gradient_GetColorInterpolationGamma(ID2D1GradientStopCollection *iface) @@ -119,7 +128,7 @@ static const struct ID2D1GradientStopCollectionVtbl d2d_gradient_vtbl = d2d_gradient_GetExtendMode, }; -void d2d_gradient_init(struct d2d_gradient *gradient, ID2D1RenderTarget *render_target, +HRESULT d2d_gradient_init(struct d2d_gradient *gradient, ID2D1RenderTarget *render_target, const D2D1_GRADIENT_STOP *stops, UINT32 stop_count, D2D1_GAMMA gamma, D2D1_EXTEND_MODE extend_mode) { FIXME("Ignoring gradient properties.\n"); @@ -128,6 +137,11 @@ void d2d_gradient_init(struct d2d_gradient *gradient, ID2D1RenderTarget *render_ gradient->refcount = 1; gradient->stop_count = stop_count; + if (!(gradient->stops = HeapAlloc(GetProcessHeap(), 0, stop_count * sizeof(*stops)))) + return E_OUTOFMEMORY; + memcpy(gradient->stops, stops, stop_count * sizeof(*stops)); + + return S_OK; } static void d2d_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 3fd3cdd..294c765 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -86,10 +86,11 @@ struct d2d_gradient ID2D1GradientStopCollection ID2D1GradientStopCollection_iface; LONG refcount; + D2D1_GRADIENT_STOP *stops; UINT32 stop_count; }; -void d2d_gradient_init(struct d2d_gradient *gradient, ID2D1RenderTarget *render_target, +HRESULT d2d_gradient_init(struct d2d_gradient *gradient, ID2D1RenderTarget *render_target, const D2D1_GRADIENT_STOP *stops, UINT32 stop_count, D2D1_GAMMA gamma, D2D1_EXTEND_MODE extend_mode) DECLSPEC_HIDDEN; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index a50f473..035df2b 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -335,6 +335,7 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateGradientStopCollect ID2D1GradientStopCollection **gradient) { struct d2d_gradient *object; + HRESULT hr; TRACE("iface %p, stops %p, stop_count %u, gamma %#x, extend_mode %#x, gradient %p.\n", iface, stops, stop_count, gamma, extend_mode, gradient); @@ -342,7 +343,12 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateGradientStopCollect if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - d2d_gradient_init(object, iface, stops, stop_count, gamma, extend_mode); + if (FAILED(hr = d2d_gradient_init(object, iface, stops, stop_count, gamma, extend_mode))) + { + WARN("Failed to initialize gradient, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } TRACE("Created gradient %p.\n", object); *gradient = &object->ID2D1GradientStopCollection_iface;

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_ClearState().
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: a0c6cdd5c936154b29f8d2b86976356c626613a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0c6cdd5c936154b29f8d2b86… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 3 08:59:34 2014 +0100 d3d10core: Implement d3d10_device_ClearState(). --- dlls/d3d10core/device.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index aac53dd..05639b9 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1260,7 +1260,73 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_SetPrivateDataInterface(ID3D10Devi static void STDMETHODCALLTYPE d3d10_device_ClearState(ID3D10Device1 *iface) { - FIXME("iface %p stub!\n", iface); + static const float blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p.\n", iface); + + wined3d_device_set_vertex_shader(device->wined3d_device, NULL); + for (i = 0; i < D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT; ++i) + { + wined3d_device_set_vs_sampler(device->wined3d_device, i, NULL); + } + for (i = 0; i < D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT; ++i) + { + wined3d_device_set_vs_resource_view(device->wined3d_device, i, NULL); + } + for (i = 0; i < D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT; ++i) + { + wined3d_device_set_vs_cb(device->wined3d_device, i, NULL); + } + wined3d_device_set_geometry_shader(device->wined3d_device, NULL); + for (i = 0; i < D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT; ++i) + { + wined3d_device_set_gs_sampler(device->wined3d_device, i, NULL); + } + for (i = 0; i < D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT; ++i) + { + wined3d_device_set_gs_resource_view(device->wined3d_device, i, NULL); + } + for (i = 0; i < D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT; ++i) + { + wined3d_device_set_gs_cb(device->wined3d_device, i, NULL); + } + wined3d_device_set_pixel_shader(device->wined3d_device, NULL); + for (i = 0; i < D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT; ++i) + { + wined3d_device_set_ps_sampler(device->wined3d_device, i, NULL); + } + for (i = 0; i < D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT; ++i) + { + wined3d_device_set_ps_resource_view(device->wined3d_device, i, NULL); + } + for (i = 0; i < D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT; ++i) + { + wined3d_device_set_ps_cb(device->wined3d_device, i, NULL); + } + for (i = 0; i < D3D10_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT; ++i) + { + wined3d_device_set_stream_source(device->wined3d_device, i, NULL, 0, 0); + } + wined3d_device_set_index_buffer(device->wined3d_device, NULL, WINED3DFMT_UNKNOWN); + wined3d_device_set_vertex_declaration(device->wined3d_device, NULL); + wined3d_device_set_primitive_type(device->wined3d_device, WINED3D_PT_UNDEFINED); + for (i = 0; i < D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) + { + wined3d_device_set_rendertarget_view(device->wined3d_device, i, NULL, FALSE); + } + wined3d_device_set_depth_stencil_view(device->wined3d_device, NULL); + ID3D10Device1_OMSetDepthStencilState(iface, NULL, 0); + ID3D10Device1_OMSetBlendState(iface, NULL, blend_factor, D3D10_DEFAULT_SAMPLE_MASK); + ID3D10Device1_RSSetViewports(iface, 0, NULL); + ID3D10Device1_RSSetScissorRects(iface, 0, NULL); + ID3D10Device1_RSSetState(iface, NULL); + for (i = 0; i < D3D10_SO_BUFFER_SLOT_COUNT; ++i) + { + wined3d_device_set_stream_output(device->wined3d_device, i, NULL, 0); + } + wined3d_device_set_predication(device->wined3d_device, NULL, FALSE); } static void STDMETHODCALLTYPE d3d10_device_Flush(ID3D10Device1 *iface)

1 0

Sebastian Lackner : kernel32: Set proper error codes if FindFirstFileExW doesn' t support specific search_ops / levels.
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: 3e3b03a13eba14ddb2f9d5ce331d51ed7e7834c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e3b03a13eba14ddb2f9d5ce3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Oct 3 20:01:19 2014 +0200 kernel32: Set proper error codes if FindFirstFileExW doesn't support specific search_ops / levels. --- dlls/kernel32/file.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 512b63e..4a6fc13 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1872,11 +1872,13 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, if (search_op != FindExSearchNameMatch && search_op != FindExSearchLimitToDirectories) { FIXME("search_op not implemented 0x%08x\n", search_op); + SetLastError( ERROR_INVALID_PARAMETER ); return INVALID_HANDLE_VALUE; } if (level != FindExInfoStandard) { FIXME("info level %d not implemented\n", level ); + SetLastError( ERROR_INVALID_PARAMETER ); return INVALID_HANDLE_VALUE; }

1 0

Sebastian Lackner : iphlpapi: Add stub for CancelMibChangeNotify2.
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: 2eded57ffe511029e5423a9a588fc2d418cd91bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eded57ffe511029e5423a9a5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Oct 27 02:29:21 2014 +0100 iphlpapi: Add stub for CancelMibChangeNotify2. Based on a patch by Yann Leretaille. --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 9eb5a32..ccfa6c8 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -8,7 +8,7 @@ @ stdcall AllocateAndGetTcpTableFromStack( ptr long long long ) @ stdcall AllocateAndGetUdpTableFromStack( ptr long long long ) @ stdcall CancelIPChangeNotify( ptr ) -#@ stub CancelMibChangeNotify2 +@ stdcall CancelMibChangeNotify2( ptr ) #@ stub ConvertGuidToStringA #@ stub ConvertGuidToStringW #@ stub ConvertInterfaceAliasToLuid diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 4d66810..967fb06 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -198,6 +198,15 @@ BOOL WINAPI CancelIPChangeNotify(LPOVERLAPPED overlapped) } +/****************************************************************** + * CancelMibChangeNotify2 (IPHLPAPI.@) + */ +DWORD WINAPI CancelMibChangeNotify2(HANDLE handle) +{ + FIXME("(handle %p): stub\n", handle); + return NO_ERROR; +} + /****************************************************************** * CreateIpForwardEntry (IPHLPAPI.@)

1 0

Amine Khaldi : gdi32/tests: Add basic tests for the handling of dwCount parameter in ExtCreateRegion.
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: b9f18b343150aac717f1aa9f6bf02bd98183003b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9f18b343150aac717f1aa9f6… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Sun Nov 2 23:40:42 2014 +0100 gdi32/tests: Add basic tests for the handling of dwCount parameter in ExtCreateRegion. --- dlls/gdi32/tests/clipping.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index e90f2f4..64f2a1d 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -184,11 +184,12 @@ static void test_ExtCreateRegion(void) { static const RECT empty_rect; static const RECT rc = { 111, 222, 333, 444 }; + static const RECT arc[2] = { {0, 0, 10, 10}, {10, 10, 20, 20}}; static const RECT rc_xformed = { 76, 151, 187, 262 }; union { RGNDATA data; - char buf[sizeof(RGNDATAHEADER) + sizeof(RECT)]; + char buf[sizeof(RGNDATAHEADER) + 2 * sizeof(RECT)]; } rgn; HRGN hrgn; XFORM xform; @@ -224,6 +225,20 @@ static void test_ExtCreateRegion(void) rgn.data.rdh.iType = RDH_RECTANGLES; rgn.data.rdh.dwSize = sizeof(rgn.data.rdh); + /* sizeof(RGNDATAHEADER) is large enough */ + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(NULL, sizeof(RGNDATAHEADER), &rgn.data); + ok(hrgn != 0, "ExtCreateRegion error %u\n", GetLastError()); + verify_region(hrgn, &empty_rect); + DeleteObject(hrgn); + + /* Cannot be smaller than sizeof(RGNDATAHEADER) */ + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(NULL, sizeof(RGNDATAHEADER) - 1, &rgn.data); + todo_wine + ok(!hrgn, "ExtCreateRegion should fail\n"); + ok(GetLastError() == 0xdeadbeef, "0xdeadbeef, got %u\n", GetLastError()); + SetLastError(0xdeadbeef); hrgn = ExtCreateRegion(NULL, sizeof(rgn), &rgn.data); ok(hrgn != 0, "ExtCreateRegion error %u\n", GetLastError()); @@ -234,6 +249,13 @@ static void test_ExtCreateRegion(void) SetRectEmpty(&rgn.data.rdh.rcBound); memcpy(rgn.data.Buffer, &rc, sizeof(rc)); + /* With a single rect this seems to work... */ + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(NULL, sizeof(RGNDATAHEADER) + sizeof(RECT) - 1, &rgn.data); + ok(hrgn != 0, "ExtCreateRegion error %u\n", GetLastError()); + verify_region(hrgn, &rc); + DeleteObject(hrgn); + SetLastError(0xdeadbeef); hrgn = ExtCreateRegion(NULL, sizeof(rgn), &rgn.data); ok(hrgn != 0, "ExtCreateRegion error %u\n", GetLastError()); @@ -267,6 +289,18 @@ static void test_ExtCreateRegion(void) ok(hrgn != 0, "ExtCreateRegion error %u/%x\n", GetLastError(), GetLastError()); verify_region(hrgn, &rc_xformed); DeleteObject(hrgn); + + rgn.data.rdh.nCount = 2; + SetRectEmpty(&rgn.data.rdh.rcBound); + memcpy(rgn.data.Buffer, arc, sizeof(arc)); + + /* Buffer cannot be smaller than sizeof(RGNDATAHEADER) + 2 * sizeof(RECT) */ + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(NULL, sizeof(RGNDATAHEADER) + 2 * sizeof(RECT) - 1, &rgn.data); + todo_wine + ok(!hrgn, "ExtCreateRegion should fail\n"); + ok(GetLastError() == 0xdeadbeef, "0xdeadbeef, got %u\n", GetLastError()); + } static void test_GetClipRgn(void)

1 0

Bruno Jesus : crypt32: Remove dead assignments in cert.c (Cppcheck).
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: 9df1f2fa8741df0d3c1d96a4a6c5b42abe0b6544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9df1f2fa8741df0d3c1d96a4a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 31 23:44:29 2014 -0200 crypt32: Remove dead assignments in cert.c (Cppcheck). --- dlls/crypt32/cert.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index c35f504..0cda2c4 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -984,7 +984,7 @@ static BOOL container_matches_cert(PCCERT_CONTEXT pCert, LPCSTR container, { CRYPT_KEY_PROV_INFO copy; WCHAR containerW[MAX_PATH]; - BOOL matches = FALSE; + BOOL matches; MultiByteToWideChar(CP_ACP, 0, container, -1, containerW, sizeof(containerW) / sizeof(containerW[0])); @@ -1142,7 +1142,7 @@ static BOOL cert_prov_info_matches_cert(PCCERT_CONTEXT pCert) BOOL WINAPI CryptFindCertificateKeyProvInfo(PCCERT_CONTEXT pCert, DWORD dwFlags, void *pvReserved) { - BOOL matches = FALSE; + BOOL matches; TRACE("(%p, %08x, %p)\n", pCert, dwFlags, pvReserved); @@ -2887,7 +2887,7 @@ static void CRYPT_SetBitInField(struct BitField *field, DWORD bit) static BOOL CRYPT_IsBitInFieldSet(const struct BitField *field, DWORD bit) { - BOOL set = FALSE; + BOOL set; DWORD indexIndex = bit / BITS_PER_DWORD; assert(field->cIndexes); @@ -3099,7 +3099,6 @@ static void CertContext_SetKeyProvInfo(PCCERT_CONTEXT context, CryptMemFree(szProvider); } } - size = sizeof(info.dwKeySpec); /* in case no CRYPT_KEY_PROV_INFO given, * we always use AT_SIGNATURE key spec */

1 0

Henri Verbeet : d2d1: Implement d2d_gradient_GetGradientStopCount().
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: 5279ad5b9f8d4d6aab9d7e57bfc0490201008be1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5279ad5b9f8d4d6aab9d7e57b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 3 08:59:37 2014 +0100 d2d1: Implement d2d_gradient_GetGradientStopCount(). --- dlls/d2d1/brush.c | 8 ++++++-- dlls/d2d1/d2d1_private.h | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 6e46036..4d7a5ad 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -80,9 +80,11 @@ static void STDMETHODCALLTYPE d2d_gradient_GetFactory(ID2D1GradientStopCollectio static UINT32 STDMETHODCALLTYPE d2d_gradient_GetGradientStopCount(ID2D1GradientStopCollection *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_gradient *gradient = impl_from_ID2D1GradientStopCollection(iface); - return 0; + TRACE("iface %p.\n", iface); + + return gradient->stop_count; } static void STDMETHODCALLTYPE d2d_gradient_GetGradientStops(ID2D1GradientStopCollection *iface, @@ -124,6 +126,8 @@ void d2d_gradient_init(struct d2d_gradient *gradient, ID2D1RenderTarget *render_ gradient->ID2D1GradientStopCollection_iface.lpVtbl = &d2d_gradient_vtbl; gradient->refcount = 1; + + gradient->stop_count = stop_count; } static void d2d_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 2d1fea2..3fd3cdd 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -85,6 +85,8 @@ struct d2d_gradient { ID2D1GradientStopCollection ID2D1GradientStopCollection_iface; LONG refcount; + + UINT32 stop_count; }; void d2d_gradient_init(struct d2d_gradient *gradient, ID2D1RenderTarget *render_target,

1 0

Henri Verbeet : d3d10core/tests: Add a test for ID3D10Device_ClearState().
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: cab0d8ca31b75c0b949410b51107f9fe82773faa URL: http://source.winehq.org/git/wine.git/?a=commit;h=cab0d8ca31b75c0b949410b51… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 3 08:59:35 2014 +0100 d3d10core/tests: Add a test for ID3D10Device_ClearState(). --- dlls/d3d10core/tests/device.c | 868 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 868 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cab0d8ca31b75c0b94941…

1 0

Sebastian Lackner : iphlpapi: Add stub for NotifyIpInterfaceChange.
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: 7796661b4ce8d25049839dbe20f96b258d9e42e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7796661b4ce8d25049839dbe2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Oct 27 02:50:05 2014 +0100 iphlpapi: Add stub for NotifyIpInterfaceChange. Based on a patch by Yann Leretaille. --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index ccfa6c8..c51b58b 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -233,7 +233,7 @@ @ stub NhpAllocateAndGetInterfaceInfoFromStack @ stub NhpGetInterfaceIndexFromStack @ stdcall NotifyAddrChange( ptr ptr ) -#@ stub NotifyIpInterfaceChange +@ stdcall NotifyIpInterfaceChange( long ptr ptr long ptr ) @ stdcall NotifyRouteChange( ptr ptr ) #@ stub NotifyRouteChange2 @ stub NotifyRouteChangeEx diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 967fb06..c06b69f 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2293,6 +2293,19 @@ DWORD WINAPI NotifyAddrChange(PHANDLE Handle, LPOVERLAPPED overlapped) /****************************************************************** + * NotifyIpInterfaceChange (IPHLPAPI.@) + */ +DWORD WINAPI NotifyIpInterfaceChange(ULONG family, PVOID callback, PVOID context, + BOOLEAN init_notify, PHANDLE handle) +{ + FIXME("(family %d, callback %p, context %p, init_notify %d, handle %p): stub\n", + family, callback, context, init_notify, handle); + if (handle) *handle = NULL; + return ERROR_NOT_SUPPORTED; +} + + +/****************************************************************** * NotifyRouteChange (IPHLPAPI.@) * * Notify caller whenever the ip routing table is changed.

1 0

Austin English : msi: Add stubs for MsiRemovePatches(A/W).
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: d2bc004264a9e140005758165a770f4b32165fff URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2bc004264a9e140005758165… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Nov 2 20:28:02 2014 -0600 msi: Add stubs for MsiRemovePatches(A/W). --- dlls/msi/msi.c | 18 ++++++++++++++++++ dlls/msi/msi.spec | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 433776d..6589ca9 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -4244,3 +4244,21 @@ UINT WINAPI Migrate10CachedPackagesW(void* a, void* b, void* c, DWORD d) FIXME("%p,%p,%p,%08x\n", a, b, c, d); return ERROR_SUCCESS; } + +/*********************************************************************** + * MsiRemovePatchesA [MSI.@] + */ +UINT WINAPI MsiRemovePatchesA(LPCSTR patchlist, LPCSTR product, INSTALLTYPE type, LPCSTR propertylist) +{ + FIXME("(%s %s %d %s\n", debugstr_a(patchlist), debugstr_a(product), type, debugstr_a(propertylist)); + return ERROR_SUCCESS; +} + +/*********************************************************************** + * MsiRemovePatchesW [MSI.@] + */ +UINT WINAPI MsiRemovePatchesW(LPCWSTR patchlist, LPCWSTR product, INSTALLTYPE type, LPCWSTR propertylist) +{ + FIXME("(%s %s %d %s\n", debugstr_w(patchlist), debugstr_w(product), type, debugstr_w(propertylist)); + return ERROR_SUCCESS; +} diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index a2b1007..2d065b1 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -230,8 +230,8 @@ 234 stub MsiDeleteUserDataW 235 stub Migrate10CachedPackagesA 236 stdcall Migrate10CachedPackagesW(ptr ptr ptr long) -237 stub MsiRemovePatchesA -238 stub MsiRemovePatchesW +237 stdcall MsiRemovePatchesA(str str long str) +238 stdcall MsiRemovePatchesW(wstr wstr long wstr) 239 stdcall MsiApplyMultiplePatchesA(str str str) 240 stdcall MsiApplyMultiplePatchesW(wstr wstr wstr) 241 stub MsiExtractPatchXMLDataA

1 0

Michael Stefaniuc : crypt32/tests: Avoid an always true ok() condition ( PVS-Studio).
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: 25b4a92813f8ec44d5c0c6112c135f0b903c8e47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25b4a92813f8ec44d5c0c6112… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 22:28:15 2014 +0100 crypt32/tests: Avoid an always true ok() condition (PVS-Studio). --- dlls/crypt32/tests/ctl.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/dlls/crypt32/tests/ctl.c b/dlls/crypt32/tests/ctl.c index 55bbc6e..79a60f8 100644 --- a/dlls/crypt32/tests/ctl.c +++ b/dlls/crypt32/tests/ctl.c @@ -390,20 +390,8 @@ static void testAddCTLToStore(void) signedCTLWithCTLInnerContentAndBadSig, sizeof(signedCTLWithCTLInnerContentAndBadSig), CERT_STORE_ADD_NEW, NULL); - if (ret) - { - /* win9x */ - ok(GetLastError() == CRYPT_E_NOT_FOUND || - GetLastError() == OSS_DATA_ERROR /* some win98 */, - "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); - } - else - { - ok(!ret && (GetLastError() == CRYPT_E_EXISTS || - GetLastError() == OSS_DATA_ERROR), - "expected CRYPT_E_EXISTS or OSS_DATA_ERROR, got %d %08x\n", ret, - GetLastError()); - } + ok(!ret && (GetLastError() == CRYPT_E_EXISTS || GetLastError() == OSS_DATA_ERROR), + "expected CRYPT_E_EXISTS or OSS_DATA_ERROR, got %d %08x\n", ret, GetLastError()); CertCloseStore(store, 0); store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0,

1 0

Bruno Jesus : compobj.dll16: Remove dead assignments in compobj.c ( Cppcheck).
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: 00a6a1ac2fdbbf76c1d0458864f9c1cc14cc90c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00a6a1ac2fdbbf76c1d045886… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 31 23:44:39 2014 -0200 compobj.dll16: Remove dead assignments in compobj.c (Cppcheck). --- dlls/compobj.dll16/compobj.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/compobj.dll16/compobj.c b/dlls/compobj.dll16/compobj.c index ed36564..6261c13 100644 --- a/dlls/compobj.dll16/compobj.c +++ b/dlls/compobj.dll16/compobj.c @@ -668,18 +668,17 @@ HRESULT WINAPI CLSIDFromProgID16(LPCOLESTR16 progid, LPCLSID riid) { char *buf,buf2[80]; LONG buf2len; - HRESULT err; HKEY xhkey; buf = HeapAlloc(GetProcessHeap(),0,strlen(progid)+8); sprintf(buf,"%s\\CLSID",progid); - if ((err=RegOpenKeyA(HKEY_CLASSES_ROOT,buf,&xhkey))) { + if (RegOpenKeyA(HKEY_CLASSES_ROOT,buf,&xhkey)) { HeapFree(GetProcessHeap(),0,buf); return CO_E_CLASSSTRING; } HeapFree(GetProcessHeap(),0,buf); buf2len = sizeof(buf2); - if ((err=RegQueryValueA(xhkey,NULL,buf2,&buf2len))) { + if (RegQueryValueA(xhkey,NULL,buf2,&buf2len)) { RegCloseKey(xhkey); return CO_E_CLASSSTRING; }

1 0

Huw Davies : comctl32/tests: Post a key-down message rather than use keybd_event.
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: dd856be316f7aac99bd70400e6d5b927177d1343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd856be316f7aac99bd70400e… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 31 11:55:18 2014 +0000 comctl32/tests: Post a key-down message rather than use keybd_event. --- dlls/comctl32/tests/propsheet.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 2797e94..815b8ad 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -524,7 +524,7 @@ page_with_custom_default_button_dlg_proc(HWND hdlg, UINT msg, WPARAM wparam, LPA static void test_custom_default_button(void) { - HWND hdlg; + HWND hdlg, page; PROPSHEETPAGEA psp[1]; PROPSHEETHEADERA psh; MSG msg; @@ -568,7 +568,8 @@ static void test_custom_default_button(void) /* At this point, the combobox should have keyboard focus, so we press ENTER. * Pull the lever, Kronk! */ - keybd_event(VK_RETURN, 0, 0, 0); + page = (HWND)SendMessageW(hdlg, PSM_GETCURRENTPAGEHWND, 0, 0); + PostMessageW(GetDlgItem(page, IDC_PS_COMBO1), WM_KEYDOWN, VK_RETURN, 0); /* Process all the messages in the queue for this thread. */ while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE))

1 0

Bruno Jesus : comctl32/tests: Remove dead assignments in treeview.c ( Cppcheck).
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: f4a13b9f1bf691aa85b6d968d51c4f764cb7a822 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4a13b9f1bf691aa85b6d968d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 31 23:44:07 2014 -0200 comctl32/tests: Remove dead assignments in treeview.c (Cppcheck). --- dlls/comctl32/tests/treeview.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index ce65f06..eb7d7e5 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -663,7 +663,7 @@ static void test_focus(void) static void test_get_set_bkcolor(void) { - COLORREF crColor = RGB(0,0,0); + COLORREF crColor; HWND hTree; hTree = create_treeview_control(0); @@ -719,9 +719,9 @@ static void test_get_set_imagelist(void) static void test_get_set_indent(void) { - int ulIndent = -1; - int ulMinIndent = -1; - int ulMoreThanTwiceMin = -1; + int ulIndent; + int ulMinIndent; + int ulMoreThanTwiceMin; HWND hTree; hTree = create_treeview_control(0); @@ -914,7 +914,7 @@ static void test_get_set_scrolltime(void) static void test_get_set_textcolor(void) { /* If the value is -1, the control is using the system color for the text color. */ - COLORREF crColor = RGB(0,0,0); + COLORREF crColor; HWND hTree; hTree = create_treeview_control(0); @@ -974,8 +974,8 @@ static void test_get_set_tooltips(void) static void test_get_set_unicodeformat(void) { - BOOL bPreviousSetting = FALSE; - BOOL bNewSetting = FALSE; + BOOL bPreviousSetting; + BOOL bNewSetting; HWND hTree; hTree = create_treeview_control(0);

1 0

Michael Stefaniuc : urlmon/tests: Visually separate two if statements ( PVS-Studio).
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: wine Branch: master Commit: 0ef0477f9ec7b632fb21c87d64e7ad08171e3cf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ef0477f9ec7b632fb21c87d6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 31 10:59:25 2014 +0100 urlmon/tests: Visually separate two if statements (PVS-Studio). --- dlls/urlmon/tests/protocol.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 9ffa04d..df3c364 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -1991,7 +1991,9 @@ static HRESULT WINAPI ProtocolEmul_Read(IInternetProtocolEx *iface, void *pv, memcpy(pv, "gif87a", 6); prot_read += *pcbRead = cb; return S_OK; - }if(prot_state == 4) { + } + + if(prot_state == 4) { *pcbRead = 0; return S_FALSE; }

1 0

Jacek Caban : winegecko.php: Added 2.34 release.
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

Module: tools Branch: master Commit: f3bcf0e6c98932f06dfcfd3eef03f306fe51d11b URL: http://source.winehq.org/git/tools.git/?a=commit;h=f3bcf0e6c98932f06dfcfd3e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 3 12:39:00 2014 +0100 winegecko.php: Added 2.34 release. --- winegecko.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/winegecko.php b/winegecko.php index cba6bbf..eaa1f22 100644 --- a/winegecko.php +++ b/winegecko.php @@ -82,7 +82,9 @@ $aFileSizes = array( '2.34-beta1-x86'=>28131328, '2.34-beta1-x86_64'=>29696000, '2.34-beta2-x86'=>28270080, - '2.34-beta2-x86_64'=>29807616 + '2.34-beta2-x86_64'=>29807616, + '2.34-x86'=>28269568, + '2.34-x86_64'=>29802496 ); // Exact size of the file:

1 0