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

Nikolay Sivov : msxml3/tests: Remove useless VariantClear().
by Alexandre Julliard March 24, 2016

March 24, 2016

Module: wine Branch: master Commit: f21fc727c778309f211338c69ef34c32e21b356c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f21fc727c778309f211338c69… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 24 12:05:40 2016 +0300 msxml3/tests: Remove useless VariantClear(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/saxreader.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 1b83a4e..e71acaa 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -4146,7 +4146,6 @@ static void test_mxwriter_stream(void) V_UNKNOWN(&dest) = (IUnknown*)&mxstream; hr = IMXWriter_put_output(writer, dest); ok(hr == S_OK, "put_output failed with %08x on test %d\n", hr, current_stream_test_index); - VariantClear(&dest); hr = IMXWriter_put_byteOrderMark(writer, test->bom); ok(hr == S_OK, "put_byteOrderMark failed with %08x on test %d\n", hr, current_stream_test_index);

1 0

Stefan Dösinger : wined3d: Avoid storing a viewport pointer in struct wined3d_cs_set_viewport.
by Alexandre Julliard March 24, 2016

March 24, 2016

Module: wine Branch: master Commit: 74c38385baf087b1d8075e2fd2e674d352a6a8a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74c38385baf087b1d8075e2fd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 23 17:58:24 2016 +0100 wined3d: Avoid storing a viewport pointer in struct wined3d_cs_set_viewport. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 6e7a57b..910350d 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -95,7 +95,7 @@ struct wined3d_cs_set_predication struct wined3d_cs_set_viewport { enum wined3d_cs_op opcode; - const struct wined3d_viewport *viewport; + struct wined3d_viewport viewport; }; struct wined3d_cs_set_scissor_rect @@ -355,7 +355,7 @@ static void wined3d_cs_exec_set_viewport(struct wined3d_cs *cs, const void *data { const struct wined3d_cs_set_viewport *op = data; - cs->state.viewport = *op->viewport; + cs->state.viewport = op->viewport; device_invalidate_state(cs->device, STATE_VIEWPORT); } @@ -365,7 +365,7 @@ void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_vi op = cs->ops->require_space(cs, sizeof(*op)); op->opcode = WINED3D_CS_OP_SET_VIEWPORT; - op->viewport = viewport; + op->viewport = *viewport; cs->ops->submit(cs); }

1 0

Henri Verbeet : d3d11: Use %#x for tracing the feature level in layer_set_feature_level().
by Alexandre Julliard March 24, 2016

March 24, 2016

Module: wine Branch: master Commit: 16afe47b9d141aa1e61044a440e3cc2edb9d48fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=16afe47b9d141aa1e61044a44… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 23 17:58:20 2016 +0100 d3d11: Use %#x for tracing the feature level in layer_set_feature_level(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index ebd4808..3c21037 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -106,7 +106,7 @@ static void WINAPI layer_set_feature_level(enum dxgi_device_layer_id id, void *d { struct d3d_device *d3d_device = device; - TRACE("id %#x, device %p, feature_level %u.\n", id, device, feature_level); + TRACE("id %#x, device %p, feature_level %#x.\n", id, device, feature_level); if (id != DXGI_DEVICE_LAYER_D3D10_DEVICE) {

1 0

Henri Verbeet : wined3d: Introduce wined3d_texture_get_gl_buffer().
by Alexandre Julliard March 24, 2016

March 24, 2016

Module: wine Branch: master Commit: b46ef08c9cd434d71206a0444f1f7040f02400cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=b46ef08c9cd434d71206a0444… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 23 17:58:23 2016 +0100 wined3d: Introduce wined3d_texture_get_gl_buffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- dlls/wined3d/surface.c | 44 ++++++------------------------------------ dlls/wined3d/texture.c | 32 ++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 40 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 0d6ba69..d28ebd3 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -337,7 +337,7 @@ static inline DWORD context_generate_rt_mask(GLenum buffer) static inline DWORD context_generate_rt_mask_from_surface(const struct wined3d_surface *target) { - return (1u << 31) | surface_get_gl_buffer(target); + return (1u << 31) | wined3d_texture_get_gl_buffer(target->container); } static inline void context_set_fbo_key_for_surface(const struct wined3d_context *context, diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b86cb72..ceea4fe 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -698,7 +698,7 @@ static void surface_blt_fbo(const struct wined3d_device *device, if (src_location == WINED3D_LOCATION_DRAWABLE) { TRACE("Source surface %p is onscreen.\n", src_surface); - buffer = surface_get_gl_buffer(src_surface); + buffer = wined3d_texture_get_gl_buffer(src_surface->container); surface_translate_drawable_coords(src_surface, context->win_handle, &src_rect); } else @@ -715,7 +715,7 @@ static void surface_blt_fbo(const struct wined3d_device *device, if (dst_location == WINED3D_LOCATION_DRAWABLE) { TRACE("Destination surface %p is onscreen.\n", dst_surface); - buffer = surface_get_gl_buffer(dst_surface); + buffer = wined3d_texture_get_gl_buffer(dst_surface->container); surface_translate_drawable_coords(dst_surface, context->win_handle, &dst_rect); } else @@ -1444,38 +1444,6 @@ void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const checkGLcall("set_compatible_renderbuffer"); } -GLenum surface_get_gl_buffer(const struct wined3d_surface *surface) -{ - const struct wined3d_swapchain *swapchain = surface->container->swapchain; - - TRACE("surface %p.\n", surface); - - if (!swapchain) - { - ERR("Surface %p is not on a swapchain.\n", surface); - return GL_NONE; - } - - if (swapchain->back_buffers && swapchain->back_buffers[0] == surface->container) - { - if (swapchain->render_to_fbo) - { - TRACE("Returning GL_COLOR_ATTACHMENT0\n"); - return GL_COLOR_ATTACHMENT0; - } - TRACE("Returning GL_BACK\n"); - return GL_BACK; - } - else if (surface->container == swapchain->front_buffer) - { - TRACE("Returning GL_FRONT\n"); - return GL_FRONT; - } - - FIXME("Higher back buffer, returning GL_BACK\n"); - return GL_BACK; -} - /* Context activation is done by the caller. */ void surface_load(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) { @@ -1913,7 +1881,7 @@ static void read_from_framebuffer(struct wined3d_surface *surface, else { /* Onscreen surfaces are always part of a swapchain */ - GLenum buffer = surface_get_gl_buffer(surface); + GLenum buffer = wined3d_texture_get_gl_buffer(texture); TRACE("Mapping %#x buffer.\n", buffer); gl_info->gl_ops.gl.p_glReadBuffer(buffer); checkGLcall("glReadBuffer"); @@ -2016,7 +1984,7 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct if (wined3d_resource_is_offscreen(&texture->resource)) gl_info->gl_ops.gl.p_glReadBuffer(context_get_offscreen_gl_buffer(context)); else - gl_info->gl_ops.gl.p_glReadBuffer(surface_get_gl_buffer(surface)); + gl_info->gl_ops.gl.p_glReadBuffer(wined3d_texture_get_gl_buffer(texture)); checkGLcall("glReadBuffer"); gl_info->gl_ops.gl.p_glCopyTexSubImage2D(surface->texture_target, surface->texture_level, @@ -2127,7 +2095,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc } else { - gl_info->gl_ops.gl.p_glReadBuffer(surface_get_gl_buffer(src_surface)); + gl_info->gl_ops.gl.p_glReadBuffer(wined3d_texture_get_gl_buffer(src_texture)); } checkGLcall("glReadBuffer"); @@ -2291,7 +2259,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st } else { - gl_info->gl_ops.gl.p_glReadBuffer(surface_get_gl_buffer(src_surface)); + gl_info->gl_ops.gl.p_glReadBuffer(wined3d_texture_get_gl_buffer(src_texture)); } /* TODO: Only back up the part that will be overwritten */ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 2687bf1..feb6919 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -37,6 +37,38 @@ BOOL wined3d_texture_use_pbo(const struct wined3d_texture *texture, const struct && !(texture->flags & (WINED3D_TEXTURE_PIN_SYSMEM | WINED3D_TEXTURE_COND_NP2_EMULATED)); } +GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture) +{ + const struct wined3d_swapchain *swapchain = texture->swapchain; + + TRACE("texture %p.\n", texture); + + if (!swapchain) + { + ERR("Texture %p is not part of a swapchain.\n", texture); + return GL_NONE; + } + + if (swapchain->back_buffers && swapchain->back_buffers[0] == texture) + { + if (swapchain->render_to_fbo) + { + TRACE("Returning GL_COLOR_ATTACHMENT0.\n"); + return GL_COLOR_ATTACHMENT0; + } + TRACE("Returning GL_BACK.\n"); + return GL_BACK; + } + else if (texture == swapchain->front_buffer) + { + TRACE("Returning GL_FRONT.\n"); + return GL_FRONT; + } + + FIXME("Higher back buffer, returning GL_BACK.\n"); + return GL_BACK; +} + static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struct wined3d_texture_ops *texture_ops, UINT layer_count, UINT level_count, const struct wined3d_resource_desc *desc, DWORD flags, struct wined3d_device *device, void *parent, const struct wined3d_parent_ops *parent_ops, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c638c45..a9d2a96 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2453,6 +2453,7 @@ void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; BOOL wined3d_texture_check_block_align(const struct wined3d_texture *texture, unsigned int level, const struct wined3d_box *box) DECLSPEC_HIDDEN; +GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture) DECLSPEC_HIDDEN; struct wined3d_resource *wined3d_texture_get_sub_resource(const struct wined3d_texture *texture, UINT sub_resource_idx) DECLSPEC_HIDDEN; void wined3d_texture_load(struct wined3d_texture *texture, @@ -2605,7 +2606,6 @@ void wined3d_surface_cleanup(struct wined3d_surface *surface) DECLSPEC_HIDDEN; HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const struct wined3d_color *color) DECLSPEC_HIDDEN; HRESULT surface_create_dib_section(struct wined3d_surface *surface) DECLSPEC_HIDDEN; -GLenum surface_get_gl_buffer(const struct wined3d_surface *surface) DECLSPEC_HIDDEN; void surface_get_drawable_size(const struct wined3d_surface *surface, const struct wined3d_context *context, unsigned int *width, unsigned int *height) DECLSPEC_HIDDEN; HRESULT wined3d_surface_init(struct wined3d_surface *surface,

1 0

Henri Verbeet : wined3d: Pass a texture instead of a surface to context_create().
by Alexandre Julliard March 24, 2016

March 24, 2016

Module: wine Branch: master Commit: 7bf2a3452880dd5d47287d00d1836d29abfcb9ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bf2a3452880dd5d47287d00d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 23 17:58:22 2016 +0100 wined3d: Pass a texture instead of a surface to context_create(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 8 ++++---- dlls/wined3d/device.c | 6 ++---- dlls/wined3d/swapchain.c | 6 ++---- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 31fd22a..0d6ba69 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1559,7 +1559,7 @@ HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, } struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, - struct wined3d_surface *target, const struct wined3d_format *ds_format) + struct wined3d_texture *target, const struct wined3d_format *ds_format) { struct wined3d_device *device = swapchain->device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; @@ -1659,7 +1659,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, } } - color_format = target->container->resource.format; + color_format = target->resource.format; /* In case of ORM_BACKBUFFER, make sure to request an alpha component for * X4R4G4B4/X8R8G8B8 as we might need it for the backbuffer. */ @@ -1771,10 +1771,10 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, } ret->swapchain = swapchain; - ret->current_rt = target; + ret->current_rt = target->sub_resources[0].u.surface; ret->tid = GetCurrentThreadId(); - ret->render_offscreen = wined3d_resource_is_offscreen(&target->container->resource); + ret->render_offscreen = wined3d_resource_is_offscreen(&target->resource); ret->draw_buffers_mask = context_generate_rt_mask(GL_BACK); ret->valid = 1; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5a523d3..dbfa86c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4554,7 +4554,7 @@ static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d static HRESULT create_primary_opengl_context(struct wined3d_device *device, struct wined3d_swapchain *swapchain) { struct wined3d_context *context; - struct wined3d_surface *target; + struct wined3d_texture *target; HRESULT hr; if (FAILED(hr = device->shader_backend->shader_alloc_private(device, @@ -4581,9 +4581,7 @@ static HRESULT create_primary_opengl_context(struct wined3d_device *device, stru return E_OUTOFMEMORY; } - target = swapchain->back_buffers - ? surface_from_resource(wined3d_texture_get_sub_resource(swapchain->back_buffers[0], 0)) - : surface_from_resource(wined3d_texture_get_sub_resource(swapchain->front_buffer, 0)); + target = swapchain->back_buffers ? swapchain->back_buffers[0] : swapchain->front_buffer; if (!(context = context_create(swapchain, target, swapchain->ds_format))) { WARN("Failed to create context.\n"); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 7d02375..c2883bb 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -983,7 +983,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 for (i = 0; i < (sizeof(formats) / sizeof(*formats)); i++) { swapchain->ds_format = wined3d_get_format(gl_info, formats[i]); - swapchain->context[0] = context_create(swapchain, front_buffer, swapchain->ds_format); + swapchain->context[0] = context_create(swapchain, swapchain->front_buffer, swapchain->ds_format); if (swapchain->context[0]) break; TRACE("Depth stencil format %s is not supported, trying next format\n", debug_d3dformat(formats[i])); @@ -1145,9 +1145,7 @@ static struct wined3d_context *swapchain_create_context(struct wined3d_swapchain TRACE("Creating a new context for swapchain %p, thread %u.\n", swapchain, GetCurrentThreadId()); - if (!(ctx = context_create(swapchain, - surface_from_resource(wined3d_texture_get_sub_resource(swapchain->front_buffer, 0)), - swapchain->ds_format))) + if (!(ctx = context_create(swapchain, swapchain->front_buffer, swapchain->ds_format))) { ERR("Failed to create a new context for the swapchain\n"); return NULL; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9e83e6a..c638c45 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1515,7 +1515,7 @@ void context_active_texture(struct wined3d_context *context, const struct wined3 unsigned int unit) DECLSPEC_HIDDEN; void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint name) DECLSPEC_HIDDEN; void context_check_fbo_status(const struct wined3d_context *context, GLenum target) DECLSPEC_HIDDEN; -struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, struct wined3d_surface *target, +struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, struct wined3d_texture *target, const struct wined3d_format *ds_format) DECLSPEC_HIDDEN; HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, HGLRC share_ctx) DECLSPEC_HIDDEN; void context_destroy(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : dxgi: Simplify the shader model comparison in dxgi_check_feature_level_support( ).
by Alexandre Julliard March 24, 2016

March 24, 2016

Module: wine Branch: master Commit: 73da1b951d851b1d7fd52685061166fc8362d07e URL: http://source.winehq.org/git/wine.git/?a=commit;h=73da1b951d851b1d7fd526850… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 23 17:58:19 2016 +0100 dxgi: Simplify the shader model comparison in dxgi_check_feature_level_support(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/utils.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index cd8888f..c0c1fcd 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -491,6 +491,7 @@ D3D_FEATURE_LEVEL dxgi_check_feature_level_support(struct dxgi_factory *factory, {D3D_FEATURE_LEVEL_9_1, 2}, }; D3D_FEATURE_LEVEL selected_feature_level = 0; + unsigned int shader_model; unsigned int i, j; WINED3DCAPS caps; HRESULT hr; @@ -504,14 +505,14 @@ D3D_FEATURE_LEVEL dxgi_check_feature_level_support(struct dxgi_factory *factory, if (FAILED(hr)) level_count = 0; + shader_model = min(caps.VertexShaderVersion, caps.PixelShaderVersion); for (i = 0; i < level_count; ++i) { for (j = 0; j < sizeof(feature_levels_sm) / sizeof(feature_levels_sm[0]); ++j) { if (feature_levels[i] == feature_levels_sm[j].feature_level) { - if (caps.VertexShaderVersion >= feature_levels_sm[j].sm - && caps.PixelShaderVersion >= feature_levels_sm[j].sm) + if (shader_model >= feature_levels_sm[j].sm) { selected_feature_level = feature_levels[i]; TRACE("Choosing supported feature level %s (SM%u).\n",

1 0

Nikolay Sivov : msxml3/mxwriter: Simplify argument check in externalEntityDecl().
by Alexandre Julliard March 24, 2016

March 24, 2016

Module: wine Branch: master Commit: ba4fcecfa3779714a6f65f9af723bedb2826582e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba4fcecfa3779714a6f65f9af… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 24 12:05:39 2016 +0300 msxml3/mxwriter: Simplify argument check in externalEntityDecl(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/mxwriter.c | 4 +--- dlls/msxml3/tests/saxreader.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index d2d80a1..cc6c0b5 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1679,9 +1679,7 @@ static HRESULT WINAPI SAXDeclHandler_externalEntityDecl(ISAXDeclHandler *iface, TRACE("(%p)->(%s:%d %s:%d %s:%d)\n", This, debugstr_wn(name, n_name), n_name, debugstr_wn(publicId, n_publicId), n_publicId, debugstr_wn(systemId, n_systemId), n_systemId); - if (!name) return E_INVALIDARG; - if (publicId && !systemId) return E_INVALIDARG; - if (!publicId && !systemId) return E_INVALIDARG; + if (!name || !systemId) return E_INVALIDARG; write_output_buffer(This, entityW, sizeof(entityW)/sizeof(WCHAR)); if (n_name) { diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 9c8d103..1b83a4e 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -4996,11 +4996,22 @@ static void test_mxwriter_dtd(void) _bstr_("sysid"), strlen("sysid")); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = ISAXDeclHandler_externalEntityDecl(decl, _bstr_("name"), strlen("name"), NULL, 0, _bstr_("sysid"), strlen("sysid")); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ISAXDeclHandler_externalEntityDecl(decl, _bstr_("name"), strlen("name"), _bstr_("pubid"), strlen("pubid"), + NULL, 0); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + V_VT(&dest) = VT_EMPTY; hr = IMXWriter_get_output(writer, &dest); ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("<!ENTITY name PUBLIC \"pubid\" \"sysid\">\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(_bstr_( + "<!ENTITY name PUBLIC \"pubid\" \"sysid\">\r\n" + "<!ENTITY name SYSTEM \"sysid\">\r\n"), + V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); ISAXContentHandler_Release(content);

1 0

Nikolay Sivov : msxml3/mxwriter: Don' t allocate output buffer structure separately from the writer.
by Alexandre Julliard March 24, 2016

March 24, 2016

Module: wine Branch: master Commit: 62bd656711dd03f19442ecf3eeadc23e2e113a31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62bd656711dd03f19442ecf3e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 24 12:05:38 2016 +0300 msxml3/mxwriter: Don't allocate output buffer structure separately from the writer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/mxwriter.c | 251 +++++++++++++++++++++++-------------------------- 1 file changed, 120 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=62bd656711dd03f19442e…

1 0

Henri Verbeet : wined3d: Get the framebuffer height from the view in shader_glsl_load_constants().
by Alexandre Julliard March 24, 2016

March 24, 2016

Module: wine Branch: master Commit: 72e373d22000c2207b0140df71377858edb4db93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72e373d22000c2207b0140df7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 23 17:58:21 2016 +0100 wined3d: Get the framebuffer height from the view in shader_glsl_load_constants(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 11f103e..8892d49 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1430,16 +1430,16 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context if (update_mask & WINED3D_SHADER_CONST_PS_Y_CORR) { - float correction_params[] = + const struct wined3d_vec4 correction_params = { - /* position is window relative, not viewport relative */ - context->render_offscreen ? 0.0f : (float)context->current_rt->resource.height, + /* Position is relative to the framebuffer, not the viewport. */ + context->render_offscreen ? 0.0f : (float)state->fb->render_targets[0]->height, context->render_offscreen ? 1.0f : -1.0f, 0.0f, 0.0f, }; - GL_EXTCALL(glUniform4fv(prog->ps.ycorrection_location, 1, correction_params)); + GL_EXTCALL(glUniform4fv(prog->ps.ycorrection_location, 1, &correction_params.x)); } if (update_mask & WINED3D_SHADER_CONST_PS_NP2_FIXUP)

1 0

Józef Kucia : wined3d: Implement SM4 sample_c_lz instruction.
by Alexandre Julliard March 23, 2016

March 23, 2016

Module: wine Branch: master Commit: d563cdb0db7c9a881a5e374ebc1e43dad4c0b34e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d563cdb0db7c9a881a5e374eb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 23 13:42:52 2016 +0100 wined3d: Implement SM4 sample_c_lz instruction. 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 | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index dd7f3b0..48aeacc 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4478,9 +4478,16 @@ static void shader_glsl_sample_c(const struct wined3d_shader_instruction *ins) unsigned int resource_idx, sampler_idx, sampler_bind_idx; struct glsl_src_param coord_param, compare_param; struct glsl_sample_function sample_function; + const char *lod_param = NULL; DWORD flags = 0; UINT coord_size; + if (ins->handler_idx == WINED3DSIH_SAMPLE_C_LZ) + { + lod_param = "0"; + flags |= WINED3D_GLSL_SAMPLE_LOD; + } + if (wined3d_shader_instruction_has_texel_offset(ins)) flags |= WINED3D_GLSL_SAMPLE_OFFSET; @@ -4493,7 +4500,7 @@ static void shader_glsl_sample_c(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[3], WINED3DSP_WRITEMASK_0, &compare_param); sampler_bind_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, resource_idx, sampler_idx); shader_glsl_gen_sample_code(ins, sampler_bind_idx, &sample_function, WINED3DSP_NOSWIZZLE, - NULL, NULL, NULL, &ins->texel_offset, "vec%u(%s, %s)", + NULL, NULL, lod_param, &ins->texel_offset, "vec%u(%s, %s)", coord_size, coord_param.param_str, compare_param.param_str); shader_glsl_release_sample_function(ins->ctx, &sample_function); } @@ -8189,7 +8196,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_SAMPLE */ shader_glsl_sample, /* WINED3DSIH_SAMPLE_B */ shader_glsl_sample, /* WINED3DSIH_SAMPLE_C */ shader_glsl_sample_c, - /* WINED3DSIH_SAMPLE_C_LZ */ NULL, + /* WINED3DSIH_SAMPLE_C_LZ */ shader_glsl_sample_c, /* WINED3DSIH_SAMPLE_GRAD */ shader_glsl_sample, /* WINED3DSIH_SAMPLE_LOD */ shader_glsl_sample, /* WINED3DSIH_SETP */ NULL,

1 0