March 2017 - Wine-Commits - list.winehq.org

Nikolay Sivov : schedsvc: Fix xml buffer leak (Valgrind).
by Alexandre Julliard March 13, 2017

March 13, 2017

Module: wine Branch: master Commit: f8031d06486761b1068a5b4fa8572d08efdfb8f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8031d06486761b1068a5b4fa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 12 13:12:06 2017 +0300 schedsvc: Fix xml buffer leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/schedsvc.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index 8be8c0d..c34b485 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -259,9 +259,10 @@ static int detect_encoding(const void *buffer, DWORD size) static HRESULT read_xml(const WCHAR *name, WCHAR **xml) { + char *src, *buff; HANDLE hfile; DWORD size, attrs; - char *src; + HRESULT hr = S_OK; int cp; attrs = GetFileAttributesW(name); @@ -275,7 +276,7 @@ static HRESULT read_xml(const WCHAR *name, WCHAR **xml) return HRESULT_FROM_WIN32(GetLastError()); size = GetFileSize(hfile, NULL); - src = heap_alloc(size + 2); + buff = src = heap_alloc(size + 2); if (!src) { CloseHandle(hfile); @@ -300,9 +301,13 @@ static HRESULT read_xml(const WCHAR *name, WCHAR **xml) size = MultiByteToWideChar(cp, 0, src, -1, NULL, 0); *xml = heap_alloc(size * sizeof(WCHAR)); - if (!*xml) return E_OUTOFMEMORY; - MultiByteToWideChar(cp, 0, src, -1, *xml, size); - return S_OK; + if (*xml) + MultiByteToWideChar(cp, 0, src, -1, *xml, size); + else + hr = E_OUTOFMEMORY; + heap_free(buff); + + return hr; } HRESULT __cdecl SchRpcRetrieveTask(const WCHAR *path, const WCHAR *languages, ULONG *n_languages, WCHAR **xml)

1 0

Józef Kucia : wined3d: Get rid of incorrect usage of "tex_unit_map".
by Alexandre Julliard March 13, 2017

March 13, 2017

Module: wine Branch: master Commit: 806479e432db28c887dfb96f5a09740efe2b7c77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=806479e432db28c887dfb96f5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 13 11:57:20 2017 +0100 wined3d: Get rid of incorrect usage of "tex_unit_map". 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/state.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index b73f4a8..51257f0 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3489,7 +3489,9 @@ static void sampler_texmatrix(struct wined3d_context *context, const struct wine TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); - if(!texture) return; + if (!texture) + return; + /* The fixed function np2 texture emulation uses the texture matrix to fix up the coordinates * wined3d_texture_apply_state_changes() multiplies the set matrix with a fixup matrix. Before the * scaling is reapplied or removed, the texture matrix has to be reapplied @@ -3499,17 +3501,16 @@ static void sampler_texmatrix(struct wined3d_context *context, const struct wine */ if (sampler < MAX_TEXTURES) { - const BOOL texIsPow2 = !(texture->flags & WINED3D_TEXTURE_POW2_MAT_IDENT); + const BOOL tex_is_pow2 = !(texture->flags & WINED3D_TEXTURE_POW2_MAT_IDENT); - if (texIsPow2 || (context->lastWasPow2Texture & (1u << sampler))) + if (tex_is_pow2 || (context->lastWasPow2Texture & (1u << sampler))) { - if (texIsPow2) + if (tex_is_pow2) context->lastWasPow2Texture |= 1u << sampler; else context->lastWasPow2Texture &= ~(1u << sampler); - transform_texture(context, state, - STATE_TEXTURESTAGE(context->tex_unit_map[sampler], WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS)); + transform_texture(context, state, STATE_TEXTURESTAGE(sampler, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS)); } } }

1 0

Józef Kucia : wined3d: Simplify computation of " num_textures_used" in ATI fragment pipeline.
by Alexandre Julliard March 13, 2017

March 13, 2017

Module: wine Branch: master Commit: f2af535c0598ce036a168646c08fff0b2828004b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2af535c0598ce036a168646c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 13 11:57:19 2017 +0100 wined3d: Simplify computation of "num_textures_used" in ATI fragment pipeline. 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/ati_fragment_shader.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 341bd9b..c9af8e7 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1024,7 +1024,8 @@ static void set_tex_op_atifs(struct wined3d_context *context, const struct wined gen_ffp_frag_op(context, state, &settings, TRUE); desc = (const struct atifs_ffp_desc *)find_ffp_frag_shader(&priv->fragment_shaders, &settings); - if(!desc) { + if (!desc) + { struct atifs_ffp_desc *new_desc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*new_desc)); if (!new_desc) { @@ -1036,13 +1037,13 @@ static void set_tex_op_atifs(struct wined3d_context *context, const struct wined { if (settings.op[i].cop == WINED3D_TOP_DISABLE) break; - new_desc->num_textures_used = i + 1; + ++new_desc->num_textures_used; } new_desc->parent.settings = settings; new_desc->shader = gen_ati_shader(settings.op, gl_info, new_desc->constants); add_ffp_frag_shader(&priv->fragment_shaders, &new_desc->parent); - TRACE("Allocated fixed function replacement shader descriptor %p\n", new_desc); + TRACE("Allocated fixed function replacement shader descriptor %p.\n", new_desc); desc = new_desc; }

1 0

Nikolay Sivov : wlanapi/tests: Always free interface list (Valgrind).
by Alexandre Julliard March 13, 2017

March 13, 2017

Module: wine Branch: master Commit: 6e5a0777fd6a5a3d2115209cf71b3d770ec27b52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e5a0777fd6a5a3d2115209cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 12 13:28:40 2017 +0300 wlanapi/tests: Always free interface list (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/tests/wlanapi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wlanapi/tests/wlanapi.c b/dlls/wlanapi/tests/wlanapi.c index 882aa82..cab5cf6 100644 --- a/dlls/wlanapi/tests/wlanapi.c +++ b/dlls/wlanapi/tests/wlanapi.c @@ -152,6 +152,7 @@ static void test_WlanEnumInterfaces(void) { skip("No wireless interfaces\n"); WlanCloseHandle(handle, NULL); + WlanFreeMemory(list); return; }

1 0

Francois Gouget : schedsvc/tests: Add the current process id to the test summary line.
by Alexandre Julliard March 13, 2017

March 13, 2017

Module: wine Branch: master Commit: e5eba4b7d1b4991c65b143373800d7dc40461e6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5eba4b7d1b4991c65b143373… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 12 20:45:33 2017 +0100 schedsvc/tests: Add the current process id to the test summary line. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/tests/rpcapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index 044118e..be1e5eb 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -33,7 +33,7 @@ static LONG CALLBACK rpc_exception_filter(EXCEPTION_POINTERS *ptrs) if (winetest_debug) { - fprintf(stdout, "rpcapi: 0 tests executed (0 marked as todo, 0 failures), 1 skipped.\n"); + fprintf(stdout, "%04x:rpcapi: 0 tests executed (0 marked as todo, 0 failures), 1 skipped.\n", GetCurrentProcessId()); fflush(stdout); } ExitProcess(0);

1 0

Francois Gouget : scrobj: Make scriptlet_typelib_CreateInstance() static.
by Alexandre Julliard March 13, 2017

March 13, 2017

Module: wine Branch: master Commit: 54b609ccc104b32cb4d172806494fd981dbdb5e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54b609ccc104b32cb4d172806… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Mar 12 20:46:40 2017 +0100 scrobj: Make scriptlet_typelib_CreateInstance() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 38f1c65..3e6535a 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -445,7 +445,7 @@ HRESULT WINAPI DllUnregisterServer(void) return __wine_unregister_resources(scrobj_instance); } -HRESULT WINAPI scriptlet_typelib_CreateInstance(IClassFactory *factory, IUnknown *outer, REFIID riid, void **obj) +static HRESULT WINAPI scriptlet_typelib_CreateInstance(IClassFactory *factory, IUnknown *outer, REFIID riid, void **obj) { struct scriptlet_typelib *This; HRESULT hr;

1 0

Nikolay Sivov : inetcomm/tests: Fix test stream leak (Valgrind).
by Alexandre Julliard March 13, 2017

March 13, 2017

Module: wine Branch: master Commit: 8b67cfb8e446c38361a128449dbd051f9bd7dc2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b67cfb8e446c38361a128449… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 12 12:16:54 2017 +0300 inetcomm/tests: Fix test stream leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/tests/mimeole.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index c2026bc..956a5b7 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -323,7 +323,12 @@ static ULONG WINAPI Stream_AddRef(IStream *iface) static ULONG WINAPI Stream_Release(IStream *iface) { TestStream *This = impl_from_IStream(iface); - return InterlockedDecrement(&This->ref); + ULONG ref = InterlockedDecrement(&This->ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; } static HRESULT WINAPI Stream_Read(IStream *iface, void *pv, ULONG cb, ULONG *pcbRead)

1 0

Józef Kucia : wined3d: Introduce shader_glsl_load_program_resources() helper function.
by Alexandre Julliard March 13, 2017

March 13, 2017

Module: wine Branch: master Commit: 23d28c451b5a425d395d15e48656f68e86968974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23d28c451b5a425d395d15e48… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 13 11:57:22 2017 +0100 wined3d: Introduce shader_glsl_load_program_resources() helper function. 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/glsl_shader.c | 114 ++++++++++++++++++++++++--------------------- 1 file changed, 60 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=23d28c451b5a425d395d1…

1 0

Alexandre Julliard : user32/tests: Re-enable a test about window positions.
by Alexandre Julliard March 13, 2017

March 13, 2017

Module: wine Branch: master Commit: 413e27eff1cdf55e8f05e61cf465f699b386555e URL: http://source.winehq.org/git/wine.git/?a=commit;h=413e27eff1cdf55e8f05e61cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 13 19:34:23 2017 +0100 user32/tests: Re-enable a test about window positions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 70c1370..6e11ff2 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -805,10 +805,7 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR GetWindowRect(hwnd, &rc1); SetRect(&rc2, winpos->x, winpos->y, winpos->x + winpos->cx, winpos->y + winpos->cy); /* note: winpos coordinates are relative to parent */ - MapWindowPoints(GetParent(hwnd), 0, (LPPOINT)&rc2, 2); - if (0) - { - /* Uncomment this once the test succeeds in all cases */ + MapWindowPoints(GetAncestor(hwnd,GA_PARENT), 0, (LPPOINT)&rc2, 2); ok(EqualRect(&rc1, &rc2), "rects do not match %s / %s\n", wine_dbgstr_rect(&rc1), wine_dbgstr_rect(&rc2)); @@ -817,7 +814,6 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR MapWindowPoints(0, hwnd, (LPPOINT)&rc1, 2); ok(EqualRect(&rc1, &rc2), "rects do not match %s / %s\n", wine_dbgstr_rect(&rc1), wine_dbgstr_rect(&rc2)); - } break; } case WM_NCCREATE:

1 0

Francois Gouget : ddraw/tests: Spelling fixes in comments and an ok() message.
by Alexandre Julliard March 13, 2017

March 13, 2017

Module: wine Branch: master Commit: d489a6db6503c7514236184a503ffba8022f86b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d489a6db6503c7514236184a5… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Mar 12 20:46:13 2017 +0100 ddraw/tests: Spelling fixes in comments and an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/d3d.c | 2 +- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index b7d3b05..3780b46 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1126,7 +1126,7 @@ static void Direct3D1Test(void) /* Interface consistency check. */ hr = IDirect3DDevice_GetDirect3D(Direct3DDevice1, &Direct3D_alt); ok(hr == D3D_OK, "IDirect3DDevice_GetDirect3D failed: %08x\n", hr); - ok(Direct3D_alt == Direct3D1, "Direct3D1 struct pointer missmatch: %p != %p\n", Direct3D_alt, Direct3D1); + ok(Direct3D_alt == Direct3D1, "Direct3D1 struct pointer mismatch: %p != %p\n", Direct3D_alt, Direct3D1); IDirect3D_Release(Direct3D_alt); memset(&desc, 0, sizeof(desc)); diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index da01bd2..4f53ee1 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -10487,7 +10487,7 @@ static void test_ck_operation(void) hr = IDirectDrawSurface_Lock(dst, NULL, &surface_desc, DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); color = surface_desc.lpSurface; - /* Ensure the desination was not changed. */ + /* Ensure the destination was not changed. */ ok(color[0] == 0x55555555 && color[1] == 0x55555555 && color[2] == 0x55555555 && color[3] == 0x55555555 && color[4] == 0x55555555 && color[5] == 0x55555555, "Got unexpected content %08x %08x %08x %08x %08x %08x.\n", diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 0c2c00f..be950d8 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -11825,7 +11825,7 @@ static void test_ck_operation(void) hr = IDirectDrawSurface2_Lock(dst, NULL, &surface_desc, DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); color = surface_desc.lpSurface; - /* Ensure the desination was not changed. */ + /* Ensure the destination was not changed. */ ok(color[0] == 0x55555555 && color[1] == 0x55555555 && color[2] == 0x55555555 && color[3] == 0x55555555 && color[4] == 0x55555555 && color[5] == 0x55555555, "Got unexpected content %08x %08x %08x %08x %08x %08x.\n", diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index dfdf4ce..e6248f0 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -13204,7 +13204,7 @@ static void test_ck_operation(void) hr = IDirectDrawSurface4_Lock(dst, NULL, &surface_desc, DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); color = surface_desc.lpSurface; - /* Ensure the desination was not changed. */ + /* Ensure the destination was not changed. */ ok(color[0] == 0x55555555 && color[1] == 0x55555555 && color[2] == 0x55555555 && color[3] == 0x55555555 && color[4] == 0x55555555 && color[5] == 0x55555555, "Got unexpected content %08x %08x %08x %08x %08x %08x.\n", diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 2068741..65ff2cc 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -12877,7 +12877,7 @@ static void test_ck_operation(void) hr = IDirectDrawSurface7_Lock(dst, NULL, &surface_desc, DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); color = surface_desc.lpSurface; - /* Ensure the desination was not changed. */ + /* Ensure the destination was not changed. */ ok(color[0] == 0x55555555 && color[1] == 0x55555555 && color[2] == 0x55555555 && color[3] == 0x55555555 && color[4] == 0x55555555 && color[5] == 0x55555555, "Got unexpected content %08x %08x %08x %08x %08x %08x.\n",

1 0