January 2016 - Wine-commits

Nikolay Sivov : quartz: Explicitly compare to HRESULT values.
by Alexandre Julliard 03 Jan '16

03 Jan '16

Module: wine Branch: master Commit: ed65fc7cedb4e5d7b147ff6c0643e60d94a60556 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed65fc7cedb4e5d7b147ff6c0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 2 14:04:13 2016 +0300 quartz: Explicitly compare to HRESULT values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/enumfilters.c | 2 +- dlls/quartz/filtergraph.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/enumfilters.c b/dlls/quartz/enumfilters.c index ea2af2a..331991b 100644 --- a/dlls/quartz/enumfilters.c +++ b/dlls/quartz/enumfilters.c @@ -185,7 +185,7 @@ static HRESULT WINAPI IEnumFiltersImpl_Reset(IEnumFilters * iface) This->uIndex = 0; hr = IGraphVersion_QueryVersion(This->pVersionSource, &currentVersion); - if (!hr) + if (hr == S_OK) This->Version = currentVersion; return S_OK; } diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 9f072a8..5b4b080 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1618,7 +1618,7 @@ static HRESULT GetFileSourceFilter(LPCOLESTR pszFileName, IBaseFilter **filter) /* Try to find a match without reading the file first */ hr = GetClassMediaFile(NULL, pszFileName, NULL, NULL, &clsid); - if (!hr) + if (hr == S_OK) return CreateFilterInstanceAndLoadFile(&clsid, pszFileName, filter); /* Now create a AyncReader instance, to check for signature bytes in the file */ @@ -1660,7 +1660,7 @@ static HRESULT GetFileSourceFilter(LPCOLESTR pszFileName, IBaseFilter **filter) hr = GetClassMediaFile(pReader, pszFileName, NULL, NULL, &clsid); IAsyncReader_Release(pReader); - if (!hr) + if (hr == S_OK) { /* Release the AsyncReader filter and create the matching one */ IBaseFilter_Release(*filter);

1 0

Nikolay Sivov : shell32/tests: Explicitly compare to HRESULT values.
by Alexandre Julliard 03 Jan '16

03 Jan '16

Module: wine Branch: master Commit: ccc6cfc1de88e2723ffbf0215c5fdd57ffcb23fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccc6cfc1de88e2723ffbf0215… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 2 14:07:43 2016 +0300 shell32/tests: Explicitly compare to HRESULT values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 7a53621..72aaa02 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1889,14 +1889,14 @@ static void test_SHGetFolderPathA(void) if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILES, 0, SHGFP_TYPE_CURRENT, path ); - ok( !hr, "SHGetFolderPathA failed %x\n", hr ); + ok( hr == S_OK, "SHGetFolderPathA failed %x\n", hr ); hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILESX86, 0, SHGFP_TYPE_CURRENT, path_x86 ); if (hr == E_FAIL) { win_skip( "Program Files (x86) not supported\n" ); return; } - ok( !hr, "SHGetFolderPathA failed %x\n", hr ); + ok( hr == S_OK, "SHGetFolderPathA failed %x\n", hr ); if (is_win64) { ok( lstrcmpiA( path, path_x86 ), "paths are identical '%s'\n", path ); @@ -1924,14 +1924,14 @@ static void test_SHGetFolderPathA(void) } hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILES_COMMON, 0, SHGFP_TYPE_CURRENT, path ); - ok( !hr, "SHGetFolderPathA failed %x\n", hr ); + ok( hr == S_OK, "SHGetFolderPathA failed %x\n", hr ); hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILES_COMMONX86, 0, SHGFP_TYPE_CURRENT, path_x86 ); if (hr == E_FAIL) { win_skip( "Common Files (x86) not supported\n" ); return; } - ok( !hr, "SHGetFolderPathA failed %x\n", hr ); + ok( hr == S_OK, "SHGetFolderPathA failed %x\n", hr ); if (is_win64) { ok( lstrcmpiA( path, path_x86 ), "paths are identical '%s'\n", path );

1 0

Alex Henrie : maintainers: Add Wine Staging maintainers.
by Alexandre Julliard 03 Jan '16

03 Jan '16

Module: wine Branch: master Commit: 18698993330d9a2755d3db635ea3b5d312ddca10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18698993330d9a2755d3db635… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 31 17:59:15 2015 +0100 maintainers: Add Wine Staging maintainers. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index f622df0..3e7d48d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -266,3 +266,9 @@ F: */ Stable Branch M: Michael Stefaniuc <mstefani(a)winehq.org> W: http://wiki.winehq.org/StableRules + +Staging Branch +M: Sebastian Lackner <sebastian(a)fds-team.de> +M: Michael Müller <michael(a)fds-team.de> +P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> +W: https://wine-staging.com/

1 0

Alexandre Julliard : Update copyright info for 2016.
by Alexandre Julliard 03 Jan '16

03 Jan '16

Module: wine Branch: master Commit: f6998ea4ced8b2051df64dd81242416d903a90d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6998ea4ced8b2051df64dd81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 3 20:08:27 2016 +0100 Update copyright info for 2016. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- LICENSE | 2 +- dlls/opengl32/version.rc | 2 +- include/wine/wine_common_ver.rc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index 6dbf8c0..c35515e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 1993-2015 the Wine project authors (see the file AUTHORS +Copyright (c) 1993-2016 the Wine project authors (see the file AUTHORS for a complete list) Wine is free software; you can redistribute it and/or modify it under diff --git a/dlls/opengl32/version.rc b/dlls/opengl32/version.rc index 6fd4ff9..8dbb85b 100644 --- a/dlls/opengl32/version.rc +++ b/dlls/opengl32/version.rc @@ -20,7 +20,7 @@ #define WINE_FILENAME_STR "opengl32.dll" #define WINE_FILEVERSION 5,1,2600,2082 #define WINE_FILEVERSION_STR "5.1.2600.2082" -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2015 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2016 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ #define WINE_PRODUCTVERSION 5,1,2600,2082 #define WINE_PRODUCTVERSION_STR "5.1" diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index cae5408..fcf1385 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -74,7 +74,7 @@ never complain. #endif #ifndef WINE_LEGALCOPYRIGHT -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2015 the Wine project authors (see the file AUTHORS for a complete list)" +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2016 the Wine project authors (see the file AUTHORS for a complete list)" #endif #ifndef WINE_PRODUCTVERSION

1 0

Nikolay Sivov : msxml3/tests: Fix some leaks while testing attribute values (Valgrind).
by Alexandre Julliard 03 Jan '16

03 Jan '16

Module: wine Branch: master Commit: 81fbbb30a53591344939d705d73b80202bf16daf URL: http://source.winehq.org/git/wine.git/?a=commit;h=81fbbb30a53591344939d705d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 31 12:42:54 2015 +0300 msxml3/tests: Fix some leaks while testing attribute values (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/saxreader.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 0958c03..88b2404 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -298,7 +298,10 @@ static inline void flush_sequence(struct call_sequence **seg, int sequence_index SysFreeString(call_seq->sequence[i].attributes[j].uriW); SysFreeString(call_seq->sequence[i].attributes[j].localW); SysFreeString(call_seq->sequence[i].attributes[j].qnameW); + SysFreeString(call_seq->sequence[i].attributes[j].valueW); } + HeapFree(GetProcessHeap(), 0, call_seq->sequence[i].attributes); + call_seq->sequence[i].attr_count = 0; SysFreeString(call_seq->sequence[i].arg1W); SysFreeString(call_seq->sequence[i].arg2W);

1 0

Nikolay Sivov : msxml3/tests: Fix a minor variant leak (Valgrind).
by Alexandre Julliard 03 Jan '16

03 Jan '16

Module: wine Branch: master Commit: b3356593d31635bad3d6cb212062bbc6fd921a0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3356593d31635bad3d6cb212… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 31 12:42:55 2015 +0300 msxml3/tests: Fix a minor variant leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/schema.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index be18fcf..bfedb8b 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -1316,6 +1316,7 @@ static void test_XDR_datatypes(void) EXPECT_HR(hr, S_FALSE); ok(V_VT(&type) == VT_NULL, "%s: got type %i\n", ptr->query, V_VT(&type)); } + VariantClear(&type); VariantClear(&v); hr = IXMLDOMNode_get_nodeTypedValue(node, &v);

1 0

Nikolay Sivov : msxml3/tests: Fix a stream leak (Valgrind).
by Alexandre Julliard 03 Jan '16

03 Jan '16

Module: wine Branch: master Commit: 08be561fbf959a127d2deb44c32397a473a41e1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=08be561fbf959a127d2deb44c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 31 12:42:56 2015 +0300 msxml3/tests: Fix a stream leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/httpreq.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 68de61e..ab72d3a 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -1684,6 +1684,7 @@ static void test_XMLHTTP(void) hr = GetHGlobalFromStream((IStream*)V_UNKNOWN(&varbody), &g); EXPECT_HR(hr, S_OK); ok(g != NULL, "got %p\n", g); + VariantClear(&varbody); IDispatch_Release(event);

1 0

Matteo Bruni : wined3d: Regenerate FFP replacement VS on changes to the normal attribute in the vertex declaration.
by Alexandre Julliard 03 Jan '16

03 Jan '16

Module: wine Branch: master Commit: d2d8d8f13e0302c32f63714fdb52d97195f2b335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2d8d8f13e0302c32f63714fd… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Dec 14 23:37:53 2015 +0100 wined3d: Regenerate FFP replacement VS on changes to the normal attribute in the vertex declaration. Signed-off-by: Matteo Bruni <mbruni(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 | 5 ++++- dlls/wined3d/wined3d_private.h | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6fa9521..973b4a0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8068,6 +8068,7 @@ static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; + BOOL normal = !!(context->stream_info.use_map & (1u << WINED3D_FFP_NORMAL)); BOOL transformed = context->stream_info.position_transformed; BOOL wasrhw = context->last_was_rhw; unsigned int i; @@ -8093,7 +8094,8 @@ static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, /* Because of settings->texcoords, we have to regenerate the vertex * shader on a vdecl change if there aren't enough varyings to just * always output all the texture coordinates. */ - if (gl_info->limits.glsl_varyings < wined3d_max_compat_varyings(gl_info)) + if (gl_info->limits.glsl_varyings < wined3d_max_compat_varyings(gl_info) + || normal != context->last_was_normal) context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_VERTEX; if (use_ps(state) @@ -8112,6 +8114,7 @@ static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, } context->last_was_vshader = use_vs(state); + context->last_was_normal = normal; } static void glsl_vertex_pipe_vs(struct wined3d_context *context, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 53ef63e..70857c9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1175,6 +1175,7 @@ struct wined3d_context DWORD last_was_rhw : 1; /* true iff last draw_primitive was in xyzrhw mode */ DWORD last_was_pshader : 1; DWORD last_was_vshader : 1; + DWORD last_was_normal : 1; DWORD namedArraysLoaded : 1; DWORD numberedArraysLoaded : 1; DWORD last_was_blit : 1; @@ -1185,17 +1186,17 @@ struct wined3d_context DWORD current : 1; DWORD destroyed : 1; DWORD valid : 1; - DWORD use_immediate_mode_draw : 1; DWORD texShaderBumpMap : 8; /* MAX_TEXTURES, 8 */ DWORD lastWasPow2Texture : 8; /* MAX_TEXTURES, 8 */ DWORD fixed_function_usage_map : 8; /* MAX_TEXTURES, 8 */ DWORD lowest_disabled_stage : 4; /* Max MAX_TEXTURES, 8 */ + DWORD use_immediate_mode_draw : 1; DWORD rebind_fbo : 1; DWORD needs_set : 1; DWORD hdc_is_private : 1; DWORD hdc_has_format : 1; /* only meaningful if hdc_is_private */ DWORD update_shader_resource_bindings : 1; - DWORD padding : 15; + DWORD padding : 14; DWORD shader_update_mask; DWORD constant_update_mask; DWORD numbered_array_mask;

1 0

Riccardo Bortolato : ddraw: Check for mipmap sublevel through caps in ddraw_surface7_SetColorKey().
by Alexandre Julliard 03 Jan '16

03 Jan '16

Module: wine Branch: master Commit: cb03e216e5a7081c118ad2567e1d6b9f98aafca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb03e216e5a7081c118ad2567… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Tue Dec 22 22:43:41 2015 +0100 ddraw: Check for mipmap sublevel through caps in ddraw_surface7_SetColorKey(). Enabled some previously failing tests in ddraw/tests/ddraw7.c. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 7 +------ dlls/ddraw/tests/ddraw7.c | 8 ++++---- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 8a91d4b..87f5bb0 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4726,13 +4726,8 @@ static HRESULT WINAPI ddraw_surface7_SetColorKey(IDirectDrawSurface7 *iface, DWO TRACE("iface %p, flags %#x, color_key %p.\n", iface, flags, color_key); - wined3d_mutex_lock(); - if (!surface->wined3d_texture) - { - wined3d_mutex_unlock(); + if (surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_MIPMAPSUBLEVEL) return DDERR_NOTONMIPMAPSUBLEVEL; - } - wined3d_mutex_unlock(); return ddraw_surface_set_color_key(surface, flags, color_key); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 0fd6999..632dc7d 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1764,15 +1764,15 @@ static void test_ck_complex(void) color_key.dwColorSpaceLowValue = 0x000000ff; color_key.dwColorSpaceHighValue = 0x000000ff; hr = IDirectDrawSurface7_SetColorKey(mipmap, DDCKEY_SRCBLT, &color_key); - todo_wine ok(SUCCEEDED(hr), "Failed to set color key, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to set color key, hr %#x.\n", hr); color_key.dwColorSpaceLowValue = 0; color_key.dwColorSpaceHighValue = 0; hr = IDirectDrawSurface7_GetColorKey(mipmap, DDCKEY_SRCBLT, &color_key); - todo_wine ok(SUCCEEDED(hr), "Failed to get color key, hr %#x.\n", hr); - todo_wine ok(color_key.dwColorSpaceLowValue == 0x000000ff, "Got unexpected value 0x%08x.\n", + ok(SUCCEEDED(hr), "Failed to get color key, hr %#x.\n", hr); + ok(color_key.dwColorSpaceLowValue == 0x000000ff, "Got unexpected value 0x%08x.\n", color_key.dwColorSpaceLowValue); - todo_wine ok(color_key.dwColorSpaceHighValue == 0x000000ff, "Got unexpected value 0x%08x.\n", + ok(color_key.dwColorSpaceHighValue == 0x000000ff, "Got unexpected value 0x%08x.\n", color_key.dwColorSpaceHighValue); IDirectDrawSurface_AddRef(mipmap);

1 0

Alex Henrie : wined3d: Turn char_component and color into static constants.
by Alexandre Julliard 03 Jan '16

03 Jan '16

Module: wine Branch: master Commit: 7e96e4ccf47bdb2a66007f7cca1ac80a76168925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e96e4ccf47bdb2a66007f7cc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Dec 23 21:56:57 2015 -0700 wined3d: Turn char_component and color into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/device.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6851620..8a023d8 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3218,8 +3218,8 @@ static void vshader_add_footer(struct shader_arb_ctx_priv *priv_ctx, } else if (args->clip.boolclip.clip_texcoord) { + static const char component[4] = {'x', 'y', 'z', 'w'}; unsigned int cur_clip = 0; - char component[4] = {'x', 'y', 'z', 'w'}; const char *zero = arb_get_helper_value(WINED3D_SHADER_TYPE_VERTEX, ARB_ZERO); for (i = 0; i < gl_info->limits.clipplanes; ++i) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 057ae18..76c4e7d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -679,7 +679,7 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ count = min(MAX_COMBINED_SAMPLERS, gl_info->limits.combined_samplers); for (i = 0; i < count; ++i) { - DWORD color = 0x000000ff; + static const DWORD color = 0x000000ff; /* Make appropriate texture active */ context_active_texture(context, gl_info, i);

1 0