November 2015 - Wine-commits

Alexandre Julliard : Release 1.7.55.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: a786dca935c3e9b3d85853db4b61700e590a1c8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a786dca935c3e9b3d85853db4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 13 23:32:40 2015 +0900 Release 1.7.55. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 947 ++++++++++++++++++++++++++++++++++---------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 532 insertions(+), 435 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a786dca935c3e9b3d8585…

1 0

Tag wine-1.7.55 : Alexandre Julliard : Release 1.7.55
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: refs/tags/wine-1.7.55 Tag: f59ef168c969e0c9a971e0e07385899286f786a4 URL: http://source.winehq.org/git/wine.git/?a=tag;h=f59ef168c969e0c9a971e0e07385… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 13 23:32:40 2015 +0900 Release 1.7.55

1 0

Austin English : ntoskrnl.exe: Add ExDeletePagedLookasideList stub.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: 4d08cbf7cbd8d0eadc4fa3c28f1d3bc80383c448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d08cbf7cbd8d0eadc4fa3c28… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Nov 13 08:32:00 2015 +0100 ntoskrnl.exe: Add ExDeletePagedLookasideList stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f24901d..a845610 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1440,6 +1440,15 @@ void WINAPI ExDeleteNPagedLookasideList( PNPAGED_LOOKASIDE_LIST lookaside ) /*********************************************************************** + * ExDeletePagedLookasideList (NTOSKRNL.EXE.@) + */ +void WINAPI ExDeletePagedLookasideList( PPAGED_LOOKASIDE_LIST lookaside ) +{ + FIXME("(%p) stub\n", lookaside); +} + + +/*********************************************************************** * ExFreePool (NTOSKRNL.EXE.@) */ void WINAPI ExFreePool( void *ptr ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0210b37..5f75d4b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -124,7 +124,7 @@ @ stub ExConvertExclusiveToSharedLite @ stdcall ExCreateCallback(ptr ptr long long) @ stdcall ExDeleteNPagedLookasideList(ptr) -@ stub ExDeletePagedLookasideList +@ stdcall ExDeletePagedLookasideList(ptr) @ stdcall ExDeleteResourceLite(ptr) @ stub ExDesktopObjectType @ stub ExDisableResourceBoostLite

1 0

Austin English : combase: Add RoGetActivationFactory stub.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: c2533ecb736b3b41e3bab81d41fd5e8f65ef6596 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2533ecb736b3b41e3bab81d4… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Nov 13 08:12:54 2015 +0100 combase: Add RoGetActivationFactory stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-winrt-l1-1-0.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec index 0749ac0..74c9d27 100644 --- a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec @@ -1,5 +1,5 @@ @ stub RoActivateInstance -@ stub RoGetActivationFactory +@ stdcall RoGetActivationFactory(ptr ptr ptr) combase.RoGetActivationFactory @ stub RoGetApartmentIdentifier @ stdcall RoInitialize(long) combase.RoInitialize @ stub RoRegisterActivationFactories diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 6a76b2d..5082f39 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -248,7 +248,7 @@ @ stub RoFailFastWithErrorContext @ stub RoFreeParameterizedTypeExtra @ stub RoGetActivatableClassRegistration -@ stub RoGetActivationFactory +@ stdcall RoGetActivationFactory(ptr ptr ptr) @ stub RoGetAgileReference @ stub RoGetApartmentIdentifier @ stub RoGetErrorReportingFlags diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index a2c17db..a2dfd54 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -18,6 +18,7 @@ #include "objbase.h" #include "roapi.h" +#include "hstring.h" #include "wine/debug.h" @@ -45,3 +46,12 @@ void WINAPI RoUninitialize(void) { CoUninitialize(); } + +/*********************************************************************** + * RoGetActivationFactory (combase.@) + */ +HRESULT WINAPI RoGetActivationFactory(HSTRING classid, REFIID iid, void **factory) +{ + FIXME("stub: %p %p %p\n", classid, iid, factory); + return E_NOTIMPL; +}

1 0

Daniel Lehman : msvcp120: Implement _Cnd_* functions.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: df096e6b60e268eb7c699cf80d113866ae30fbd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df096e6b60e268eb7c699cf80… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Nov 3 17:10:16 2015 -0800 msvcp120: Implement _Cnd_* functions. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 12 +-- dlls/msvcp120/msvcp120.spec | 12 +-- dlls/msvcp120/tests/msvcp120.c | 184 +++++++++++++++++++++++++++++++++++- dlls/msvcp120_app/msvcp120_app.spec | 12 +-- dlls/msvcp90/misc.c | 104 ++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 2 + dlls/msvcp90/msvcp_main.c | 1 + 7 files changed, 308 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=df096e6b60e268eb7c699…

1 0

Jacek Caban : mshtml: Skip travellog notifications for frame navigation.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: 4354bc831fef0f4bdd19d70c691af5e56e7e8c6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4354bc831fef0f4bdd19d70c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 13 12:21:21 2015 +0100 mshtml: Skip travellog notifications for frame navigation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/persist.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 20f3191..59ca5e2 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -128,8 +128,12 @@ void set_current_mon(HTMLOuterWindow *This, IMoniker *mon, DWORD flags) HRESULT hres; if(This->mon) { - if(This->doc_obj && !(flags & (BINDING_REPLACE|BINDING_REFRESH))) - notify_travellog_update(This->doc_obj); + if(This->doc_obj && !(flags & (BINDING_REPLACE|BINDING_REFRESH))) { + if(This == This->doc_obj->basedoc.window) + notify_travellog_update(This->doc_obj); + else + TRACE("Skipping travellog update for frame navigation.\n"); + } IMoniker_Release(This->mon); This->mon = NULL; }

1 0

Matteo Bruni : wined3d: Set default texture units mapping for vertex shader samplers when possible.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: e449f90b20cf9715df4644867efc121776da6b36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e449f90b20cf9715df4644867… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 12 23:06:40 2015 +0100 wined3d: Set default texture units mapping for vertex shader samplers when possible. 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/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 1692d0d..ff2ff4e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1509,7 +1509,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, /* Initialize the texture unit mapping to a 1:1 mapping */ for (s = 0; s < MAX_COMBINED_SAMPLERS; ++s) { - if (s < gl_info->limits.fragment_samplers) + if (s < gl_info->limits.combined_samplers) { ret->tex_unit_map[s] = s; ret->rev_tex_unit_map[s] = s;

1 0

Matteo Bruni : wined3d: Avoid going through the texture units mapping when unnecessary.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: 750dc790b7a87108c9367d7363bfc2e811293bc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=750dc790b7a87108c9367d736… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 12 23:06:41 2015 +0100 wined3d: Avoid going through the texture units mapping when unnecessary. 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/context.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ff2ff4e..9203905 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2616,11 +2616,16 @@ static void context_update_fixed_function_usage_map(struct wined3d_context *cont static void context_map_fixed_function_samplers(struct wined3d_context *context, const struct wined3d_state *state) { + const struct wined3d_d3d_info *d3d_info = context->d3d_info; + const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int i, tex; WORD ffu_map; - const struct wined3d_d3d_info *d3d_info = context->d3d_info; context_update_fixed_function_usage_map(context, state); + + if (gl_info->limits.combined_samplers >= MAX_COMBINED_SAMPLERS) + return; + ffu_map = context->fixed_function_usage_map; if (d3d_info->limits.ffp_textures == d3d_info->limits.ffp_blend_stages @@ -2661,10 +2666,14 @@ static void context_map_fixed_function_samplers(struct wined3d_context *context, static void context_map_psamplers(struct wined3d_context *context, const struct wined3d_state *state) { + const struct wined3d_d3d_info *d3d_info = context->d3d_info; + const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_shader_resource_info *resource_info = state->shader[WINED3D_SHADER_TYPE_PIXEL]->reg_maps.resource_info; unsigned int i; - const struct wined3d_d3d_info *d3d_info = context->d3d_info; + + if (gl_info->limits.combined_samplers >= MAX_COMBINED_SAMPLERS) + return; for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) { @@ -2715,6 +2724,9 @@ static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, cons int start = min(MAX_COMBINED_SAMPLERS, gl_info->limits.combined_samplers) - 1; int i; + if (gl_info->limits.combined_samplers >= MAX_COMBINED_SAMPLERS) + return; + /* Note that we only care if a resource is used or not, not the * resource's specific type. Otherwise we'd need to call * shader_update_samplers() here for 1.x pixelshaders. */

1 0

Matteo Bruni : wined3d: Enforce a stable texture units mapping.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: d6c814663353d4449e67b6392dce203ffd32b8f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6c814663353d4449e67b6392… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 12 23:06:42 2015 +0100 wined3d: Enforce a stable texture units mapping. The GLSL shader backend hardcodes the sampler uniforms at program link time, it can't handle a change in the mapping between draws with the same shader program. 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/context.c | 37 +++++++++++++++++-------------------- dlls/wined3d/glsl_shader.c | 9 ++------- 2 files changed, 19 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9203905..80a9ba7 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2542,6 +2542,7 @@ static void context_map_stage(struct wined3d_context *context, DWORD stage, DWOR DWORD i = context->rev_tex_unit_map[unit]; DWORD j = context->tex_unit_map[stage]; + TRACE("Mapping stage %u to unit %u.\n", stage, unit); context->tex_unit_map[stage] = unit; if (i != WINED3D_UNMAPPED_STAGE && i != stage) context->tex_unit_map[i] = WINED3D_UNMAPPED_STAGE; @@ -2688,8 +2689,7 @@ static void context_map_psamplers(struct wined3d_context *context, const struct } static BOOL context_unit_free_for_vs(const struct wined3d_context *context, - const struct wined3d_shader_resource_info *ps_resource_info, - const struct wined3d_shader_resource_info *vs_resource_info, DWORD unit) + const struct wined3d_shader_resource_info *ps_resource_info, DWORD unit) { DWORD current_mapping = context->rev_tex_unit_map[unit]; @@ -2711,8 +2711,7 @@ static BOOL context_unit_free_for_vs(const struct wined3d_context *context, return !ps_resource_info[current_mapping].type; } - /* Used by a vertex sampler */ - return !vs_resource_info[current_mapping - MAX_FRAGMENT_SAMPLERS].type; + return TRUE; } static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, const struct wined3d_state *state) @@ -2738,18 +2737,15 @@ static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, cons DWORD vsampler_idx = i + MAX_FRAGMENT_SAMPLERS; if (vs_resource_info[i].type) { - if (context->tex_unit_map[vsampler_idx] != WINED3D_UNMAPPED_STAGE) - { - /* Already mapped somewhere */ - continue; - } - while (start >= 0) { - if (context_unit_free_for_vs(context, ps_resource_info, vs_resource_info, start)) + if (context_unit_free_for_vs(context, ps_resource_info, start)) { - context_map_stage(context, vsampler_idx, start); - context_invalidate_state(context, STATE_SAMPLER(vsampler_idx)); + if (context->tex_unit_map[vsampler_idx] != start) + { + context_map_stage(context, vsampler_idx, start); + context_invalidate_state(context, STATE_SAMPLER(vsampler_idx)); + } --start; break; @@ -2757,6 +2753,8 @@ static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, cons --start; } + if (context->tex_unit_map[vsampler_idx] == WINED3D_UNMAPPED_STAGE) + WARN("Couldn't find a free texture unit for vertex sampler %u.\n", i); } } } @@ -2765,13 +2763,12 @@ static void context_update_tex_unit_map(struct wined3d_context *context, const s { BOOL vs = use_vs(state); BOOL ps = use_ps(state); - /* - * Rules are: - * -> Pixel shaders need a 1:1 map. In theory the shader input could be mapped too, but - * that would be really messy and require shader recompilation - * -> When the mapping of a stage is changed, sampler and ALL texture stage states have - * to be reset. Because of that try to work with a 1:1 mapping as much as possible - */ + + /* Try to go for a 1:1 mapping of the samplers when possible. Pixel shaders + * need a 1:1 map at the moment. + * When the mapping of a stage is changed, sampler and ALL texture stage + * states have to be reset. */ + if (ps) context_map_psamplers(context, state); else diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 44e7090..abfaef8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7095,13 +7095,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const GL_EXTCALL(glUseProgram(program_id)); checkGLcall("glUseProgram"); - /* Load the vertex and pixel samplers now. The function that finds the mappings makes sure - * that it stays the same for each vertexshader-pixelshader pair(=linked glsl program). If - * a pshader with fixed function pipeline is used there are no vertex samplers, and if a - * vertex shader with fixed function pixel processing is used we make sure that the card - * supports enough samplers to allow the max number of vertex samplers with all possible - * fixed function fragment processing setups. So once the program is linked these samplers - * won't change. */ + /* Texture unit mapping is set up to be the same each time the shader + * program is used so we can hardcode the sampler uniform values. */ shader_glsl_load_samplers(gl_info, priv, context->tex_unit_map, program_id); entry->constant_update_mask = 0;

1 0

Matteo Bruni : wined3d: Handle WINED3D_SHADE_PHONG the same as WINED3D_SHADE_GOURAUD.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: c5b2d3f10c8c7c85683631045ddb4fc74c1d85f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5b2d3f10c8c7c85683631045… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 12 23:06:43 2015 +0100 wined3d: Handle WINED3D_SHADE_PHONG the same as WINED3D_SHADE_GOURAUD. 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/state.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 2be3cab..942023e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -176,12 +176,12 @@ static void state_shademode(struct wined3d_context *context, const struct wined3 checkGLcall("glShadeModel(GL_FLAT)"); break; case WINED3D_SHADE_GOURAUD: + /* WINED3D_SHADE_PHONG in practice is the same as WINED3D_SHADE_GOURAUD + * in D3D. */ + case WINED3D_SHADE_PHONG: gl_info->gl_ops.gl.p_glShadeModel(GL_SMOOTH); checkGLcall("glShadeModel(GL_SMOOTH)"); break; - case WINED3D_SHADE_PHONG: - FIXME("WINED3D_SHADE_PHONG isn't supported.\n"); - break; default: FIXME("Unrecognized shade mode %#x.\n", state->render_states[WINED3D_RS_SHADEMODE]);

1 0