wine-commits March 2017

wine-commits@winehq.org

2 participants
717 discussions

Piotr Caban : msvcrt: Add improper_lock class implementation.
by Alexandre Julliard 27 Mar '17

27 Mar '17

Module: wine Branch: master Commit: de600ada776b78ff1b5bab5cc239a7a0127da756 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de600ada776b78ff1b5bab5cc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 27 10:26:27 2017 +0200 msvcrt: Add improper_lock class implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 8 +++--- dlls/msvcr100/msvcr100.spec | 8 +++--- dlls/msvcr110/msvcr110.spec | 12 ++++----- dlls/msvcr120/msvcr120.spec | 12 ++++----- dlls/msvcr120_app/msvcr120_app.spec | 12 ++++----- dlls/msvcrt/cpp.c | 52 +++++++++++++++++++++++++++++++++++++ dlls/msvcrt/lock.c | 6 ++--- dlls/msvcrt/msvcrt.h | 1 + 8 files changed, 82 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de600ada776b78ff1b5ba…

1 0

Henri Verbeet : wined3d: Use WINED3D_BLT_SRC_CKEY to present the logo texture.
by Alexandre Julliard 27 Mar '17

27 Mar '17

Module: wine Branch: master Commit: 0a1a6533b52273b840428e50ba256fbcf26eb562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a1a6533b52273b840428e50b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 26 20:56:03 2017 +0200 wined3d: Use WINED3D_BLT_SRC_CKEY to present the logo texture. WINED3D_BLT_ALPHA_TEST makes no sense, since the texture doesn't have an alpha channel. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index a9eb997..8444437 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -450,7 +450,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, /* Blit the logo into the upper left corner of the drawable. */ wined3d_texture_blt(back_buffer, 0, &rect, logo_texture, 0, &rect, - WINED3D_BLT_ALPHA_TEST, NULL, WINED3D_TEXF_POINT); + WINED3D_BLT_SRC_CKEY, NULL, WINED3D_TEXF_POINT); } if (swapchain->device->bCursorVisible && swapchain->device->cursor_texture

1 0

Henri Verbeet : wined3d: Rename struct blit_shader to struct wined3d_blitter_ops.
by Alexandre Julliard 27 Mar '17

27 Mar '17

Module: wine Branch: master Commit: a6862f917031357a61902a49548049be9481d13d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6862f917031357a61902a495… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 26 20:56:02 2017 +0200 wined3d: Rename struct blit_shader to struct wined3d_blitter_ops. 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 +- dlls/wined3d/directx.c | 2 +- dlls/wined3d/surface.c | 10 +++++----- dlls/wined3d/utils.c | 4 ++-- dlls/wined3d/wined3d_private.h | 16 +++++++--------- 6 files changed, 17 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ca1d294..90e0a66 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7885,7 +7885,7 @@ static HRESULT arbfp_blit_depth_fill(struct wined3d_device *device, struct wined return WINED3DERR_INVALIDCALL; } -const struct blit_shader arbfp_blit = +const struct wined3d_blitter_ops arbfp_blit = { arbfp_blit_alloc, arbfp_blit_free, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e8b0515..b058d45 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4158,7 +4158,7 @@ HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *devi struct wined3d_rendertarget_view *view, const RECT *rect, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) { - const struct blit_shader *blitter; + const struct wined3d_blitter_ops *blitter; struct wined3d_resource *resource; enum wined3d_blit_op blit_op; RECT r; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9a67794..da6ff59 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2597,7 +2597,7 @@ static const struct wined3d_shader_backend_ops *select_shader_backend(const stru return &none_shader_backend; } -static const struct blit_shader *select_blit_implementation(const struct wined3d_gl_info *gl_info, +static const struct wined3d_blitter_ops *select_blit_implementation(const struct wined3d_gl_info *gl_info, const struct wined3d_shader_backend_ops *shader_backend_ops) { if ((shader_backend_ops == &glsl_shader_backend diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 51fdcbb..135e02d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -547,9 +547,9 @@ static HRESULT wined3d_surface_depth_fill(struct wined3d_surface *surface, const { struct wined3d_resource *resource = &surface->container->resource; struct wined3d_device *device = resource->device; + const struct wined3d_blitter_ops *blitter; struct wined3d_rendertarget_view *view; struct wined3d_view_desc view_desc; - const struct blit_shader *blitter; HRESULT hr; if (!(blitter = wined3d_select_blitter(&device->adapter->gl_info, &device->adapter->d3d_info, @@ -2105,9 +2105,9 @@ HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const st { struct wined3d_resource *resource = &s->container->resource; struct wined3d_device *device = resource->device; + const struct wined3d_blitter_ops *blitter; struct wined3d_rendertarget_view *view; struct wined3d_view_desc view_desc; - const struct blit_shader *blitter; HRESULT hr; if (!(blitter = wined3d_select_blitter(&device->adapter->gl_info, &device->adapter->d3d_info, @@ -2793,7 +2793,7 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl (old_color_key_flags & WINED3D_CKEY_SRC_BLT) ? &old_blt_key : NULL); } -const struct blit_shader ffp_blit = +const struct wined3d_blitter_ops ffp_blit = { ffp_blit_alloc, ffp_blit_free, @@ -3434,7 +3434,7 @@ static void cpu_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl ERR("Blit method not implemented by cpu_blit.\n"); } -const struct blit_shader cpu_blit = +const struct wined3d_blitter_ops cpu_blit = { cpu_blit_alloc, cpu_blit_free, @@ -3592,7 +3592,7 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst else { struct wined3d_texture_sub_resource *src_sub_resource, *dst_sub_resource; - const struct blit_shader *blitter; + const struct wined3d_blitter_ops *blitter; dst_sub_resource = surface_get_sub_resource(dst_surface); src_sub_resource = src_texture ? &src_texture->sub_resources[src_sub_resource_idx] : NULL; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e78763f..1627752 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5851,12 +5851,12 @@ int wined3d_ffp_vertex_program_key_compare(const void *key, const struct wine_rb return memcmp(ka, kb, sizeof(*ka)); } -const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, +const struct wined3d_blitter_ops *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) { - static const struct blit_shader * const blitters[] = + static const struct wined3d_blitter_ops * const blitters[] = { &arbfp_blit, &ffp_blit, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7c9b061..3f4696e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1862,9 +1862,7 @@ enum wined3d_blit_op WINED3D_BLIT_OP_DEPTH_BLIT, }; -/* Shaders for color conversions in blits. Do not do blit operations while - * already under the GL lock. */ -struct blit_shader +struct wined3d_blitter_ops { HRESULT (*alloc_private)(struct wined3d_device *device); void (*free_private)(struct wined3d_device *device); @@ -1882,12 +1880,12 @@ struct blit_shader const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter); }; -extern const struct blit_shader ffp_blit DECLSPEC_HIDDEN; -extern const struct blit_shader arbfp_blit DECLSPEC_HIDDEN; -extern const struct blit_shader cpu_blit DECLSPEC_HIDDEN; +extern const struct wined3d_blitter_ops arbfp_blit DECLSPEC_HIDDEN; +extern const struct wined3d_blitter_ops ffp_blit DECLSPEC_HIDDEN; +extern const struct wined3d_blitter_ops cpu_blit DECLSPEC_HIDDEN; BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) DECLSPEC_HIDDEN; -const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, +const struct wined3d_blitter_ops *wined3d_select_blitter(const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) @@ -2358,7 +2356,7 @@ struct wined3d_adapter const struct wined3d_vertex_pipe_ops *vertex_pipe; const struct fragment_pipeline *fragment_pipe; const struct wined3d_shader_backend_ops *shader_backend; - const struct blit_shader *blitter; + const struct wined3d_blitter_ops *blitter; }; struct wined3d_caps_gl_ctx @@ -2625,7 +2623,7 @@ struct wined3d_device struct StateEntry StateTable[STATE_HIGHEST + 1]; /* Array of functions for states which are handled by more than one pipeline part */ APPLYSTATEFUNC *multistate_funcs[STATE_HIGHEST + 1]; - const struct blit_shader *blitter; + const struct wined3d_blitter_ops *blitter; BYTE vertexBlendUsed : 1; /* To avoid needless setting of the blend matrices */ BYTE bCursorVisible : 1;

1 0

Henri Verbeet : wined3d: Get rid of blit_shader.set_shader() and blit_shader.unset_shader().
by Alexandre Julliard 27 Mar '17

27 Mar '17

Module: wine Branch: master Commit: df6b402026a82e9c55e70c8eb393112e47a6fea6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df6b402026a82e9c55e70c8eb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 26 20:56:01 2017 +0200 wined3d: Get rid of blit_shader.set_shader() and blit_shader.unset_shader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 5 ++- dlls/wined3d/surface.c | 67 +++++++++++---------------------------- dlls/wined3d/wined3d_private.h | 3 -- 3 files changed, 20 insertions(+), 55 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 8d1ca8a..ca1d294 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7885,11 +7885,10 @@ static HRESULT arbfp_blit_depth_fill(struct wined3d_device *device, struct wined return WINED3DERR_INVALIDCALL; } -const struct blit_shader arbfp_blit = { +const struct blit_shader arbfp_blit = +{ arbfp_blit_alloc, arbfp_blit_free, - arbfp_blit_set, - arbfp_blit_unset, arbfp_blit_supported, arbfp_blit_color_fill, arbfp_blit_depth_fill, diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4829e84..51fdcbb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2591,35 +2591,6 @@ static HRESULT ffp_blit_alloc(struct wined3d_device *device) { return WINED3D_OK /* Context activation is done by the caller. */ static void ffp_blit_free(struct wined3d_device *device) { } -/* Context activation is done by the caller. */ -static HRESULT ffp_blit_set(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface, - const struct wined3d_color_key *color_key) -{ - const struct wined3d_gl_info *gl_info = context->gl_info; - - gl_info->gl_ops.gl.p_glEnable(surface->container->target); - checkGLcall("glEnable(target)"); - - return WINED3D_OK; -} - -/* Context activation is done by the caller. */ -static void ffp_blit_unset(const struct wined3d_gl_info *gl_info) -{ - gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_2D); - checkGLcall("glDisable(GL_TEXTURE_2D)"); - if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) - { - gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_CUBE_MAP_ARB); - checkGLcall("glDisable(GL_TEXTURE_CUBE_MAP_ARB)"); - } - if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) - { - gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_RECTANGLE_ARB); - checkGLcall("glDisable(GL_TEXTURE_RECTANGLE_ARB)"); - } -} - static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, @@ -2769,7 +2740,8 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl context_invalidate_state(context, STATE_FRAMEBUFFER); } - ffp_blit_set(device->blit_priv, context, src_surface, NULL); + gl_info->gl_ops.gl.p_glEnable(src_texture->target); + checkGLcall("glEnable(target)"); if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST || color_key) { @@ -2799,7 +2771,18 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl } /* Leave the OpenGL state valid for blitting. */ - ffp_blit_unset(gl_info); + gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_2D); + checkGLcall("glDisable(GL_TEXTURE_2D)"); + if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) + { + gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_CUBE_MAP_ARB); + checkGLcall("glDisable(GL_TEXTURE_CUBE_MAP_ARB)"); + } + if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) + { + gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_RECTANGLE_ARB); + checkGLcall("glDisable(GL_TEXTURE_RECTANGLE_ARB)"); + } if (wined3d_settings.strict_draw_ordering || (dst_texture->swapchain && dst_texture->swapchain->front_buffer == dst_texture)) @@ -2810,11 +2793,10 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl (old_color_key_flags & WINED3D_CKEY_SRC_BLT) ? &old_blt_key : NULL); } -const struct blit_shader ffp_blit = { +const struct blit_shader ffp_blit = +{ ffp_blit_alloc, ffp_blit_free, - ffp_blit_set, - ffp_blit_unset, ffp_blit_supported, ffp_blit_color_fill, ffp_blit_depth_fill, @@ -2831,18 +2813,6 @@ static void cpu_blit_free(struct wined3d_device *device) { } -/* Context activation is done by the caller. */ -static HRESULT cpu_blit_set(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface, - const struct wined3d_color_key *color_key) -{ - return WINED3D_OK; -} - -/* Context activation is done by the caller. */ -static void cpu_blit_unset(const struct wined3d_gl_info *gl_info) -{ -} - static BOOL cpu_blit_supported(const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, @@ -3464,11 +3434,10 @@ static void cpu_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl ERR("Blit method not implemented by cpu_blit.\n"); } -const struct blit_shader cpu_blit = { +const struct blit_shader cpu_blit = +{ cpu_blit_alloc, cpu_blit_free, - cpu_blit_set, - cpu_blit_unset, cpu_blit_supported, cpu_blit_color_fill, cpu_blit_depth_fill, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f154db3..7c9b061 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1868,9 +1868,6 @@ struct blit_shader { HRESULT (*alloc_private)(struct wined3d_device *device); void (*free_private)(struct wined3d_device *device); - HRESULT (*set_shader)(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface, - const struct wined3d_color_key *color_key); - void (*unset_shader)(const struct wined3d_gl_info *gl_info); BOOL (*blit_supported)(const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format,

1 0

Henri Verbeet : wined3d: Get rid of the redundant context_acquire() call in swapchain_blit().
by Alexandre Julliard 27 Mar '17

27 Mar '17

Module: wine Branch: master Commit: 34d43fcbdde56f5198e188088ad63fde99838c62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34d43fcbdde56f5198e188088… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 26 20:56:00 2017 +0200 wined3d: Get rid of the redundant context_acquire() call in swapchain_blit(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 37f0a27..a9eb997 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -367,18 +367,13 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, else { struct wined3d_device *device = swapchain->device; - struct wined3d_context *context2; if (is_complex_fixup(texture->resource.format->color_fixup)) filter = WINED3D_TEXF_NONE; - context2 = context_acquire(device, texture, 0); - - device->blitter->blit_surface(device, WINED3D_BLIT_OP_COLOR_BLIT, context2, back_buffer, + device->blitter->blit_surface(device, WINED3D_BLIT_OP_COLOR_BLIT, context, back_buffer, src_rect, back_buffer, WINED3D_LOCATION_DRAWABLE, dst_rect, NULL, filter); checkGLcall("Swapchain present blit(manual)\n"); - - context_release(context2); } }

1 0

Henri Verbeet : wined3d: Use blit_shader.blit_surface() in swapchain_blit( ).
by Alexandre Julliard 27 Mar '17

27 Mar '17

Module: wine Branch: master Commit: 928110e5128e6365ffcb27fd4b398df3e6e065e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=928110e5128e6365ffcb27fd4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 26 20:55:59 2017 +0200 wined3d: Use blit_shader.blit_surface() in swapchain_blit(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index a52edf6..37f0a27 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -368,23 +368,14 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, { struct wined3d_device *device = swapchain->device; struct wined3d_context *context2; - RECT r; - - context2 = context_acquire(device, texture, 0); - context_apply_blit_state(context2, device); - - r = *dst_rect; - surface_translate_drawable_coords(back_buffer, swapchain->win_handle, &r); if (is_complex_fixup(texture->resource.format->color_fixup)) filter = WINED3D_TEXF_NONE; - context_apply_fbo_state_blit(context2, GL_FRAMEBUFFER, back_buffer, NULL, WINED3D_LOCATION_DRAWABLE); - context_set_draw_buffer(context, GL_BACK); + context2 = context_acquire(device, texture, 0); - device->blitter->set_shader(device->blit_priv, context2, back_buffer, NULL); - draw_textured_quad(back_buffer, context2, src_rect, &r, filter); - device->blitter->unset_shader(context->gl_info); + device->blitter->blit_surface(device, WINED3D_BLIT_OP_COLOR_BLIT, context2, back_buffer, + src_rect, back_buffer, WINED3D_LOCATION_DRAWABLE, dst_rect, NULL, filter); checkGLcall("Swapchain present blit(manual)\n"); context_release(context2);

1 0

Nikolay Sivov : include: Fix IRequestDictionary and IResponse definition.
by Alexandre Julliard 27 Mar '17

27 Mar '17

Module: wine Branch: master Commit: 7e32226afd231fd242ce60c83e527687a9bea594 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e32226afd231fd242ce60c83… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 26 17:39:34 2017 +0300 include: Fix IRequestDictionary and IResponse definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/asptlb.idl | 73 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/include/asptlb.idl b/include/asptlb.idl index 608d220..d010908 100644 --- a/include/asptlb.idl +++ b/include/asptlb.idl @@ -28,17 +28,16 @@ import "oaidl.idl"; interface IRequestDictionary : IDispatch { [propget] - HRESULT Item(IRequestDictionary *iface, [in, optional] VARIANT Var, - [retval, out] VARIANT *pVariantReturn); + HRESULT Item([in, optional] VARIANT Var, [retval, out] VARIANT *pVariantReturn); [restricted, propget] - HRESULT _NewEnum(IRequestDictionary *iface, [retval, out] IUnknown **ppEnumReturn); + HRESULT _NewEnum([retval, out] IUnknown **ppEnumReturn); [propget] - HRESULT Count(IRequestDictionary *iface, [retval, out] int *cStrRet); + HRESULT Count([retval, out] int *count); [propget] - HRESULT Key(IRequestDictionary *iface, [in] VARIANT VarKey, [retval, out]VARIANT *pvar); + HRESULT Key([in] VARIANT key, [retval, out] VARIANT *value); }; [ @@ -49,85 +48,85 @@ interface IRequestDictionary : IDispatch interface IResponse : IDispatch { [propget] - HRESULT Buffer(IResponse *iface, [retval, out] VARIANT_BOOL *fIsBuffering); + HRESULT Buffer([retval, out] VARIANT_BOOL *is_buffering); [propput] - HRESULT Buffer(IResponse *iface, [in] VARIANT_BOOL fIsBuffering); + HRESULT Buffer([in] VARIANT_BOOL is_buffering); [propget] - HRESULT ContentType(IResponse *iface, [retval, out] BSTR *pbstrContentTypeRet); + HRESULT ContentType([retval, out] BSTR *content_type); [propput] - HRESULT ContentType(IResponse *iface, [in] BSTR bstrContentType); + HRESULT ContentType([in] BSTR content_type); [propget] - HRESULT Expires(IResponse *iface, [retval, out] VARIANT *pvarExpiresMinutesRet); + HRESULT Expires([retval, out] VARIANT *minutes); [propput] - HRESULT Expires(IResponse *iface, [in] long lExpiresMinutes); + HRESULT Expires([in] LONG minutes); [propget] - HRESULT ExpiresAbsolute(IResponse *iface, [retval, out] VARIANT *pvarExpiresRet); + HRESULT ExpiresAbsolute([retval, out] VARIANT *expires); [propput] - HRESULT ExpiresAbsolute(IResponse *iface, [in] DATE dtExpires); + HRESULT ExpiresAbsolute([in] DATE expires); [propget] - HRESULT Cookies(IResponse *iface, [retval, out] IRequestDictionary **ppCookies); + HRESULT Cookies([retval, out] IRequestDictionary **cookies); [propget] - HRESULT Status(IResponse *iface, [retval][out] BSTR *pbstrStatusRet); + HRESULT Status([retval, out] BSTR *status); [propput] - HRESULT Status(IResponse *iface, [in] BSTR bstrStatus); + HRESULT Status([in] BSTR status); [hidden] - HRESULT Add(IResponse *iface, [in] BSTR bstrHeaderValue, [in] BSTR bstrHeaderName); + HRESULT Add([in] BSTR value, [in] BSTR name); - HRESULT AddHeader(IResponse *iface, [in] BSTR bstrHeaderName, [in] BSTR bstrHeaderValue); + HRESULT AddHeader([in] BSTR name, [in] BSTR value); - HRESULT AppendToLog(IResponse *iface, [in] BSTR bstrLogEntry); + HRESULT AppendToLog([in] BSTR log_entry); - HRESULT BinaryWrite(IResponse *iface, [in] VARIANT varInput); + HRESULT BinaryWrite([in] VARIANT input); - HRESULT Clear(IResponse *iface); + HRESULT Clear(); - HRESULT End(IResponse *iface); + HRESULT End(); - HRESULT Flush(IResponse *iface); + HRESULT Flush(); - HRESULT Redirect(IResponse *iface, [in] BSTR bstrURL); + HRESULT Redirect(BSTR url); - HRESULT Write(IResponse *iface, [in] VARIANT varText); + HRESULT Write([in] VARIANT text); [hidden] - HRESULT WriteBlock(IResponse *iface, [in] short iBlockNumber); + HRESULT WriteBlock([in] short block_number); - HRESULT IsClientConnected(IResponse *iface, [retval, out] VARIANT_BOOL *pfIsClientConnected); + HRESULT IsClientConnected([retval, out] VARIANT_BOOL *is_connected); [propget] - HRESULT get_CharSet( IResponse *iface, [retval, out] BSTR *pbstrCharSetRet); + HRESULT CharSet([retval, out] BSTR *charset); [propput] - HRESULT put_CharSet(IResponse *iface, [in] BSTR bstrCharSet); + HRESULT CharSet([in] BSTR charset); - HRESULT Pics(IResponse *iface, [in] BSTR bstrHeaderValue); + HRESULT Pics([in] BSTR value); [propget] - HRESULT get_CacheControl(IResponse *iface, [retval, out] BSTR *pbstrCacheControl); + HRESULT CacheControl([retval, out] BSTR *cache_control); [propput] - HRESULT put_CacheControl(IResponse *iface, [in] BSTR bstrCacheControl); + HRESULT CacheControl([in] BSTR cache_control); [propget] - HRESULT get_CodePage(IResponse *iface, [retval, out] long *plvar); + HRESULT CodePage([retval, out] LONG *codepage); [propput] - HRESULT put_CodePage(IResponse *iface, [in] long lvar); + HRESULT CodePage([in] LONG codepage); [propget] - HRESULT get_LCID(IResponse *iface, [retval, out] long *plvar); + HRESULT LCID([retval, out] LONG *lcid); [propput] - HRESULT put_LCID(IResponse *iface, [in] long lvar); -}; + HRESULT LCID([in] LONG lcid); +}

1 0

Nikolay Sivov : msxml3: Support IPersistStream* as IXSLProcessor output.
by Alexandre Julliard 27 Mar '17

27 Mar '17

Module: wine Branch: master Commit: ea9b79740954fa188e7178e6316a07a9f0b802fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea9b79740954fa188e7178e63… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 26 13:56:29 2017 +0300 msxml3: Support IPersistStream* as IXSLProcessor output. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/msxml_private.h | 3 +- dlls/msxml3/node.c | 6 +-- dlls/msxml3/stylesheet.c | 105 ++++++++++++++++++++++++++++++++++---------- dlls/msxml3/tests/domdoc.c | 54 +++++++++++++++++++++-- 4 files changed, 138 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ea9b79740954fa188e717…

1 0

Józef Kucia : d3d11: Try to avoid spurious blend state FIXMEs().
by Alexandre Julliard 27 Mar '17

27 Mar '17

Module: wine Branch: master Commit: 7019347409d3cb18cf23de7b747e8aea0ca88fef URL: http://source.winehq.org/git/wine.git/?a=commit;h=7019347409d3cb18cf23de7b7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 24 17:14:48 2017 +0100 d3d11: Try to avoid spurious blend state FIXMEs(). 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 | 49 +++++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d9c3a5a..515da0e 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -696,9 +696,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi if (!blend_factor) blend_factor = default_blend_factor; - if (blend_factor[0] != 1.0f || blend_factor[1] != 1.0f || blend_factor[2] != 1.0f || blend_factor[3] != 1.0f) - FIXME("Ignoring blend factor %s.\n", debug_float4(blend_factor)); - wined3d_mutex_lock(); memcpy(device->blend_factor, blend_factor, 4 * sizeof(*blend_factor)); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEMASK, sample_mask); @@ -718,30 +715,27 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi } desc = &device->blend_state->desc; - /* glSampleCoverage() */ - if (desc->AlphaToCoverageEnable) - FIXME("Ignoring AlphaToCoverageEnable %#x.\n", desc->AlphaToCoverageEnable); - /* glEnableIndexedEXT(GL_BLEND, ...) */ - FIXME("Per-rendertarget blend not implemented.\n"); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ALPHABLENDENABLE, desc->RenderTarget[0].BlendEnable); if (desc->RenderTarget[0].BlendEnable) { - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SRCBLEND, - desc->RenderTarget[0].SrcBlend); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLEND, - desc->RenderTarget[0].DestBlend); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOP, - desc->RenderTarget[0].BlendOp); + const D3D11_RENDER_TARGET_BLEND_DESC *d = &desc->RenderTarget[0]; + + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SRCBLEND, d->SrcBlend); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLEND, d->DestBlend); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOP, d->BlendOp); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SEPARATEALPHABLENDENABLE, TRUE); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SRCBLENDALPHA, - desc->RenderTarget[0].SrcBlendAlpha); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLENDALPHA, - desc->RenderTarget[0].DestBlendAlpha); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOPALPHA, - desc->RenderTarget[0].BlendOpAlpha); - } - FIXME("Color mask > 3 not implemented.\n"); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SRCBLENDALPHA, d->SrcBlendAlpha); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLENDALPHA, d->DestBlendAlpha); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOPALPHA, d->BlendOpAlpha); + + if (memcmp(blend_factor, default_blend_factor, sizeof(default_blend_factor)) + && (d->SrcBlend == D3D11_BLEND_BLEND_FACTOR || d->SrcBlend == D3D11_BLEND_INV_BLEND_FACTOR + || d->DestBlend == D3D11_BLEND_BLEND_FACTOR || d->DestBlend == D3D11_BLEND_INV_BLEND_FACTOR + || d->SrcBlendAlpha == D3D11_BLEND_BLEND_FACTOR || d->SrcBlendAlpha == D3D11_BLEND_INV_BLEND_FACTOR + || d->DestBlendAlpha == D3D11_BLEND_BLEND_FACTOR || d->DestBlendAlpha == D3D11_BLEND_INV_BLEND_FACTOR)) + FIXME("Ignoring blend factor %s.\n", debug_float4(blend_factor)); + } wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_COLORWRITEENABLE, desc->RenderTarget[0].RenderTargetWriteMask); wined3d_device_set_render_state(device->wined3d_device, @@ -2643,8 +2637,19 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState(ID3D11Device *ifa tmp_desc.RenderTarget[i].DestBlendAlpha = desc->RenderTarget[j].DestBlendAlpha; tmp_desc.RenderTarget[i].BlendOpAlpha = desc->RenderTarget[j].BlendOpAlpha; tmp_desc.RenderTarget[i].RenderTargetWriteMask = desc->RenderTarget[j].RenderTargetWriteMask; + + if (i > 3 && tmp_desc.RenderTarget[i].RenderTargetWriteMask != D3D11_COLOR_WRITE_ENABLE_ALL) + FIXME("Color mask %#x not supported for render target %u.\n", + tmp_desc.RenderTarget[i].RenderTargetWriteMask, i); } + /* glSampleCoverage() */ + if (tmp_desc.AlphaToCoverageEnable) + FIXME("Ignoring AlphaToCoverageEnable %#x.\n", tmp_desc.AlphaToCoverageEnable); + /* glEnableIndexedEXT(GL_BLEND, ...) */ + if (tmp_desc.IndependentBlendEnable) + FIXME("Per-rendertarget blend not implemented.\n"); + wined3d_mutex_lock(); if ((entry = wine_rb_get(&device->blend_states, &tmp_desc))) {

1 0

Józef Kucia : d3d11/tests: Introduce get_resource_data() helper function.
by Alexandre Julliard 27 Mar '17

27 Mar '17

Module: wine Branch: master Commit: f73340a9069563be4ee1f0767be5533bf427f07c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f73340a9069563be4ee1f0767… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 24 17:14:47 2017 +0100 d3d11/tests: Introduce get_resource_data() 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/d3d11/tests/d3d11.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 303f973..a22d4de 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -716,24 +716,29 @@ static void get_texture_readback(ID3D11Texture2D *texture, unsigned int sub_reso ID3D11Device_Release(device); } +static void *get_readback_data(struct resource_readback *rb, unsigned int x, unsigned int y, unsigned byte_width) +{ + return (BYTE *)rb->map_desc.pData + y * rb->map_desc.RowPitch + x * byte_width; +} + static DWORD get_readback_color(struct resource_readback *rb, unsigned int x, unsigned int y) { - return ((DWORD *)rb->map_desc.pData)[rb->map_desc.RowPitch * y / sizeof(DWORD) + x]; + return *(DWORD *)get_readback_data(rb, x, y, sizeof(DWORD)); } static float get_readback_float(struct resource_readback *rb, unsigned int x, unsigned int y) { - return ((float *)rb->map_desc.pData)[rb->map_desc.RowPitch * y / sizeof(float) + x]; + return *(float *)get_readback_data(rb, x, y, sizeof(float)); } static const struct vec4 *get_readback_vec4(struct resource_readback *rb, unsigned int x, unsigned int y) { - return &((const struct vec4 *)rb->map_desc.pData)[rb->map_desc.RowPitch * y / sizeof(struct vec4) + x]; + return get_readback_data(rb, x, y, sizeof(struct vec4)); } static const struct uvec4 *get_readback_uvec4(struct resource_readback *rb, unsigned int x, unsigned int y) { - return &((const struct uvec4 *)rb->map_desc.pData)[rb->map_desc.RowPitch * y / sizeof(struct uvec4) + x]; + return get_readback_data(rb, x, y, sizeof(struct uvec4)); } static void release_resource_readback(struct resource_readback *rb)

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2017