November 2015 - Wine-Commits

Tag wine-1.7.55 : Alexandre Julliard : Release 1.7.55
by Alexandre Julliard Nov. 13, 2015

Nov. 13, 2015

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

Alexandre Julliard : Release 1.7.55.
by Alexandre Julliard Nov. 13, 2015

Nov. 13, 2015

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

Józef Kucia : d3d11: Implement d3d11_immediate_context_DrawIndexed().
by Alexandre Julliard Nov. 13, 2015

Nov. 13, 2015

Module: wine Branch: master Commit: f282e10e00d664ccb55147485e3b088469e6b428 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f282e10e00d664ccb55147485… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 13 02:23:39 2015 +0100 d3d11: Implement d3d11_immediate_context_DrawIndexed(). 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/d3d11/device.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d357c2a..325c006 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -227,8 +227,15 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetShader(ID3D11DeviceCo static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexed(ID3D11DeviceContext *iface, UINT index_count, UINT start_index_location, INT base_vertex_location) { - FIXME("iface %p, index_count %u, start_index_location %u, base_vertex_location %d stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + + TRACE("iface %p, index_count %u, start_index_location %u, base_vertex_location %d.\n", iface, index_count, start_index_location, base_vertex_location); + + wined3d_mutex_lock(); + wined3d_device_set_base_vertex_index(device->wined3d_device, base_vertex_location); + wined3d_device_draw_indexed_primitive(device->wined3d_device, start_index_location, index_count); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_Draw(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_OMGetRenderTargets().
by Alexandre Julliard Nov. 13, 2015

Nov. 13, 2015

Module: wine Branch: master Commit: 860433c79ad3f2f00554c0826240881b8c60d075 URL: http://source.winehq.org/git/wine.git/?a=commit;h=860433c79ad3f2f00554c0826… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 13 02:23:42 2015 +0100 d3d11: Implement d3d11_immediate_context_OMGetRenderTargets(). 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/d3d11/device.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 78a6b1d..0c146e4 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1444,8 +1444,48 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetRenderTargets(ID3D11D UINT render_target_view_count, ID3D11RenderTargetView **render_target_views, ID3D11DepthStencilView **depth_stencil_view) { - FIXME("iface %p, render_target_view_count %u, render_target_views %p, depth_stencil_view %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct wined3d_rendertarget_view *wined3d_view; + + TRACE("iface %p, render_target_view_count %u, render_target_views %p, depth_stencil_view %p.\n", iface, render_target_view_count, render_target_views, depth_stencil_view); + + wined3d_mutex_lock(); + if (render_target_views) + { + struct d3d_rendertarget_view *view_impl; + unsigned int i; + + for (i = 0; i < render_target_view_count; ++i) + { + if (!(wined3d_view = wined3d_device_get_rendertarget_view(device->wined3d_device, i)) + || !(view_impl = wined3d_rendertarget_view_get_parent(wined3d_view))) + { + render_target_views[i] = NULL; + continue; + } + + render_target_views[i] = &view_impl->ID3D11RenderTargetView_iface; + ID3D11RenderTargetView_AddRef(render_target_views[i]); + } + } + + if (depth_stencil_view) + { + struct d3d_depthstencil_view *view_impl; + + if (!(wined3d_view = wined3d_device_get_depth_stencil_view(device->wined3d_device)) + || !(view_impl = wined3d_rendertarget_view_get_parent(wined3d_view))) + { + *depth_stencil_view = NULL; + } + else + { + *depth_stencil_view = &view_impl->ID3D11DepthStencilView_iface; + ID3D11DepthStencilView_AddRef(*depth_stencil_view); + } + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetRenderTargetsAndUnorderedAccessViews(

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_DrawIndexedInstanced().
by Alexandre Julliard Nov. 13, 2015

Nov. 13, 2015

Module: wine Branch: master Commit: ea7c30e83185869c0362ff049b1ce391f117351e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea7c30e83185869c0362ff049… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 13 02:23:40 2015 +0100 d3d11: Implement d3d11_immediate_context_DrawIndexedInstanced(). 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/d3d11/device.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 325c006..78a6b1d 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -368,10 +368,18 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexedInstanced(ID3D1 UINT instance_index_count, UINT instance_count, UINT start_index_location, INT base_vertex_location, UINT start_instance_location) { - FIXME("iface %p, instance_index_count %u, instance_count %u, start_index_location %u, " - "base_vertex_location %d, start_instance_location %u stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + + TRACE("iface %p, instance_index_count %u, instance_count %u, start_index_location %u, " + "base_vertex_location %d, start_instance_location %u.\n", iface, instance_index_count, instance_count, start_index_location, base_vertex_location, start_instance_location); + + wined3d_mutex_lock(); + wined3d_device_set_base_vertex_index(device->wined3d_device, base_vertex_location); + wined3d_device_draw_indexed_primitive_instanced(device->wined3d_device, start_index_location, + instance_index_count, start_instance_location, instance_count); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_DrawInstanced(ID3D11DeviceContext *iface,

1 0

Austin English : combase: Add RoGetActivationFactory stub.
by Alexandre Julliard Nov. 13, 2015

Nov. 13, 2015

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

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

Nov. 13, 2015

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

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

Nov. 13, 2015

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 : d3d9/tests: Improve the shade mode test.
by Alexandre Julliard Nov. 13, 2015

Nov. 13, 2015

Module: wine Branch: master Commit: 59d405b473b87f790300bc4fc36aa0d8cc3efb7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=59d405b473b87f790300bc4fc… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 12 23:06:44 2015 +0100 d3d9/tests: Improve the shade mode test. 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/d3d9/tests/visual.c | 260 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 187 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59d405b473b87f790300b…

1 0

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

Nov. 13, 2015

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