February 2017 - Wine-Commits

Józef Kucia : wined3d: Introduce helper function to reserve memory for arrays.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: master Commit: 36b9bc946b9cb73142af28cef36f9fb598c7e7fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=36b9bc946b9cb73142af28cef… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 28 14:42:36 2017 +0100 wined3d: Introduce helper function to reserve memory for arrays. 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/buffer.c | 15 ++++-------- dlls/wined3d/context.c | 54 ++++++++++++------------------------------ dlls/wined3d/utils.c | 30 +++++++++++++++++++++++ dlls/wined3d/wined3d_main.c | 25 +++++-------------- dlls/wined3d/wined3d_private.h | 16 +++++++------ 5 files changed, 64 insertions(+), 76 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 5ea7eff..c584147 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -64,18 +64,11 @@ static void buffer_invalidate_bo_range(struct wined3d_buffer *buffer, unsigned i goto invalidate_all; } - if (buffer->modified_areas >= buffer->maps_size) + if (!wined3d_array_reserve((void **)&buffer->maps, &buffer->maps_size, + buffer->modified_areas + 1, sizeof(*buffer->maps))) { - struct wined3d_map_range *new; - - if (!(new = HeapReAlloc(GetProcessHeap(), 0, buffer->maps, 2 * buffer->maps_size * sizeof(*buffer->maps)))) - { - ERR("Failed to allocate maps array, invalidating entire buffer.\n"); - goto invalidate_all; - } - - buffer->maps = new; - buffer->maps_size *= 2; + ERR("Failed to allocate maps array, invalidating entire buffer.\n"); + goto invalidate_all; } buffer->maps[buffer->modified_areas].offset = offset; diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 076ebee..10a7222 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -719,20 +719,12 @@ void context_free_occlusion_query(struct wined3d_occlusion_query *query) list_remove(&query->entry); query->context = NULL; - if (context->free_occlusion_query_count >= context->free_occlusion_query_size - 1) + if (!wined3d_array_reserve((void **)&context->free_occlusion_queries, + &context->free_occlusion_query_size, context->free_occlusion_query_count + 1, + sizeof(*context->free_occlusion_queries))) { - UINT new_size = context->free_occlusion_query_size << 1; - GLuint *new_data = HeapReAlloc(GetProcessHeap(), 0, context->free_occlusion_queries, - new_size * sizeof(*context->free_occlusion_queries)); - - if (!new_data) - { - ERR("Failed to grow free list, leaking query %u in context %p.\n", query->id, context); - return; - } - - context->free_occlusion_query_size = new_size; - context->free_occlusion_queries = new_data; + ERR("Failed to grow free list, leaking query %u in context %p.\n", query->id, context); + return; } context->free_occlusion_queries[context->free_occlusion_query_count++] = query->id; @@ -787,20 +779,12 @@ void context_free_event_query(struct wined3d_event_query *query) list_remove(&query->entry); query->context = NULL; - if (context->free_event_query_count >= context->free_event_query_size - 1) + if (!wined3d_array_reserve((void **)&context->free_event_queries, + &context->free_event_query_size, context->free_event_query_count + 1, + sizeof(*context->free_event_queries))) { - UINT new_size = context->free_event_query_size << 1; - union wined3d_gl_query_object *new_data = HeapReAlloc(GetProcessHeap(), 0, context->free_event_queries, - new_size * sizeof(*context->free_event_queries)); - - if (!new_data) - { - ERR("Failed to grow free list, leaking query %u in context %p.\n", query->object.id, context); - return; - } - - context->free_event_query_size = new_size; - context->free_event_queries = new_data; + ERR("Failed to grow free list, leaking query %u in context %p.\n", query->object.id, context); + return; } context->free_event_queries[context->free_event_query_count++] = query->object; @@ -834,20 +818,12 @@ void context_free_timestamp_query(struct wined3d_timestamp_query *query) list_remove(&query->entry); query->context = NULL; - if (context->free_timestamp_query_count >= context->free_timestamp_query_size - 1) + if (!wined3d_array_reserve((void **)&context->free_timestamp_queries, + &context->free_timestamp_query_size, context->free_timestamp_query_count + 1, + sizeof(*context->free_timestamp_queries))) { - UINT new_size = context->free_timestamp_query_size << 1; - GLuint *new_data = HeapReAlloc(GetProcessHeap(), 0, context->free_timestamp_queries, - new_size * sizeof(*context->free_timestamp_queries)); - - if (!new_data) - { - ERR("Failed to grow free list, leaking query %u in context %p.\n", query->id, context); - return; - } - - context->free_timestamp_query_size = new_size; - context->free_timestamp_queries = new_data; + ERR("Failed to grow free list, leaking query %u in context %p.\n", query->id, context); + return; } context->free_timestamp_queries[context->free_timestamp_query_count++] = query->id; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index c392388..04317f1 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6007,3 +6007,33 @@ void wined3d_gl_limits_get_texture_unit_range(const struct wined3d_gl_limits *gl *base = gl_limits->graphics_samplers - 1; *count = gl_limits->compute_samplers; } + +BOOL wined3d_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, SIZE_T size) +{ + SIZE_T max_capacity, new_capacity; + void *new_elements; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~(SIZE_T)0 / size; + if (count > max_capacity) + return FALSE; + + new_capacity = max(1, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = count; + + if (!*elements) + new_elements = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, new_capacity * size); + else + new_elements = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *elements, new_capacity * size); + if (!new_elements) + return FALSE; + + *elements = new_elements; + *capacity = new_capacity; + return TRUE; +} diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 442a970..c59a956 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -43,7 +43,7 @@ struct wined3d_wndproc_table { struct wined3d_wndproc *entries; unsigned int count; - unsigned int size; + SIZE_T size; }; static struct wined3d_wndproc_table wndproc_table; @@ -443,25 +443,12 @@ BOOL wined3d_register_window(HWND window, struct wined3d_device *device) return TRUE; } - if (wndproc_table.size == wndproc_table.count) + if (!wined3d_array_reserve((void **)&wndproc_table.entries, &wndproc_table.size, + wndproc_table.count + 1, sizeof(*entry))) { - unsigned int new_size = max(1, wndproc_table.size * 2); - struct wined3d_wndproc *new_entries; - - if (!wndproc_table.entries) - new_entries = wined3d_calloc(new_size, sizeof(*new_entries)); - else - new_entries = HeapReAlloc(GetProcessHeap(), 0, wndproc_table.entries, new_size * sizeof(*new_entries)); - - if (!new_entries) - { - wined3d_wndproc_mutex_unlock(); - ERR("Failed to grow table.\n"); - return FALSE; - } - - wndproc_table.entries = new_entries; - wndproc_table.size = new_size; + wined3d_wndproc_mutex_unlock(); + ERR("Failed to grow table.\n"); + return FALSE; } entry = &wndproc_table.entries[wndproc_table.count++]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 613d1c9..1164cf8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1660,18 +1660,18 @@ struct wined3d_context /* Queries */ GLuint *free_occlusion_queries; - UINT free_occlusion_query_size; - UINT free_occlusion_query_count; + SIZE_T free_occlusion_query_size; + unsigned int free_occlusion_query_count; struct list occlusion_queries; union wined3d_gl_query_object *free_event_queries; - UINT free_event_query_size; - UINT free_event_query_count; + SIZE_T free_event_query_size; + unsigned int free_event_query_count; struct list event_queries; GLuint *free_timestamp_queries; - UINT free_timestamp_query_size; - UINT free_timestamp_query_count; + SIZE_T free_timestamp_query_size; + unsigned int free_timestamp_query_count; struct list timestamp_queries; struct wined3d_stream_info stream_info; @@ -3296,7 +3296,7 @@ struct wined3d_buffer void *map_ptr; struct wined3d_map_range *maps; - ULONG maps_size, modified_areas; + SIZE_T maps_size, modified_areas; DWORD locations; struct wined3d_event_query *query; @@ -3879,6 +3879,8 @@ void wined3d_format_get_float_color_key(const struct wined3d_format *format, const struct wined3d_color_key_conversion * wined3d_format_get_color_key_conversion( const struct wined3d_texture *texture, BOOL need_alpha_ck) DECLSPEC_HIDDEN; +BOOL wined3d_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, SIZE_T size) DECLSPEC_HIDDEN; + static inline BOOL wined3d_format_is_typeless(const struct wined3d_format *format) { return format->id == format->typeless_id && format->id != WINED3DFMT_UNKNOWN;

1 0

Józef Kucia : wined3d: Add quirk for Nvidia viewport subpixel bits bug.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: master Commit: 6823abd521c0c12d20d9171fb5ae8b300009d082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6823abd521c0c12d20d9171fb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 27 13:42:00 2017 +0100 wined3d: Add quirk for Nvidia viewport subpixel bits bug. 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/directx.c | 27 ++++++++++++++++++++++++ dlls/wined3d/utils.c | 47 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 76 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d19b681..dbcd12a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -914,6 +914,17 @@ static BOOL match_broken_arb_fog(const struct wined3d_gl_info *gl_info, struct w return data[0] != 0x00ff0000 || data[3] != 0x0000ff00; } +static BOOL match_broken_viewport_subpixel_bits(const struct wined3d_gl_info *gl_info, + struct wined3d_caps_gl_ctx *ctx, const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, + enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) +{ + if (!gl_info->supported[ARB_VIEWPORT_ARRAY]) + return FALSE; + if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) + return FALSE; + return !wined3d_caps_gl_ctx_test_viewport_subpixel_bits(ctx); +} + static void quirk_apple_glsl_constants(struct wined3d_gl_info *gl_info) { /* MacOS needs uniforms for relative addressing offsets. This can accumulate to quite a few uniforms. @@ -1042,6 +1053,17 @@ static void quirk_broken_arb_fog(struct wined3d_gl_info *gl_info) gl_info->quirks |= WINED3D_QUIRK_BROKEN_ARB_FOG; } +static void quirk_broken_viewport_subpixel_bits(struct wined3d_gl_info *gl_info) +{ + TRACE("Disabling ARB_viewport_array.\n"); + gl_info->supported[ARB_VIEWPORT_ARRAY] = FALSE; + if (gl_info->supported[ARB_CLIP_CONTROL]) + { + TRACE("Disabling ARB_clip_control.\n"); + gl_info->supported[ARB_CLIP_CONTROL] = FALSE; + } +} + struct driver_quirk { BOOL (*match)(const struct wined3d_gl_info *gl_info, struct wined3d_caps_gl_ctx *ctx, @@ -1133,6 +1155,11 @@ static const struct driver_quirk quirk_table[] = quirk_broken_arb_fog, "ARBfp fogstart == fogend workaround" }, + { + match_broken_viewport_subpixel_bits, + quirk_broken_viewport_subpixel_bits, + "Nvidia viewport subpixel bits bug" + }, }; /* Certain applications (Steam) complain if we report an outdated driver version. In general, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b076783..c392388 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3509,6 +3509,53 @@ fail: return FALSE; } +BOOL wined3d_caps_gl_ctx_test_viewport_subpixel_bits(struct wined3d_caps_gl_ctx *ctx) +{ + static const struct wined3d_color red = {1.0f, 0.0f, 0.0f, 1.0f}; + const struct wined3d_gl_info *gl_info = ctx->gl_info; + static const float offset = -63.0f / 128.0f; + GLuint texture, fbo; + DWORD readback[4]; + unsigned int i; + + gl_info->gl_ops.gl.p_glGenTextures(1, &texture); + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, texture); + gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0); + gl_info->gl_ops.gl.p_glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, ARRAY_SIZE(readback), 1, 0, + GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL); + gl_info->fbo_ops.glGenFramebuffers(1, &fbo); + gl_info->fbo_ops.glBindFramebuffer(GL_FRAMEBUFFER, fbo); + gl_info->fbo_ops.glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, + GL_TEXTURE_2D, texture, 0); + checkGLcall("create resources"); + + gl_info->gl_ops.gl.p_glClearColor(1.0f, 1.0f, 1.0f, 1.0f); + gl_info->gl_ops.gl.p_glClear(GL_COLOR_BUFFER_BIT); + GL_EXTCALL(glViewportIndexedf(0, offset, offset, 4.0f, 1.0f)); + draw_test_quad(ctx, NULL, &red); + checkGLcall("draw"); + + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, texture); + gl_info->gl_ops.gl.p_glGetTexImage(GL_TEXTURE_2D, 0, + GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, readback); + checkGLcall("readback"); + + TRACE("Readback colors are 0x%08x, 0x%08x, 0x%08x, 0x%08x.\n", + readback[0], readback[1], readback[2], readback[3]); + + gl_info->gl_ops.gl.p_glDeleteTextures(1, &texture); + gl_info->fbo_ops.glDeleteFramebuffers(1, &fbo); + gl_info->fbo_ops.glBindFramebuffer(GL_FRAMEBUFFER, 0); + checkGLcall("delete resources"); + + for (i = 0; i < ARRAY_SIZE(readback); ++i) + { + if (readback[i] != 0xffff0000) + return FALSE; + } + return TRUE; +} + float wined3d_adapter_find_polyoffset_scale(struct wined3d_caps_gl_ctx *ctx, GLenum format) { const struct wined3d_gl_info *gl_info = ctx->gl_info; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 611b3b6..613d1c9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2354,6 +2354,8 @@ BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, struct wined3d_caps_gl_ctx *ctx) DECLSPEC_HIDDEN; UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) DECLSPEC_HIDDEN; +BOOL wined3d_caps_gl_ctx_test_viewport_subpixel_bits(struct wined3d_caps_gl_ctx *ctx) DECLSPEC_HIDDEN; + void install_gl_compat_wrapper(struct wined3d_gl_info *gl_info, enum wined3d_gl_extension ext) DECLSPEC_HIDDEN; enum projection_types

1 0

Piotr Caban : msvcr100: Use InterlockedDecrement in SpinWait::_SpinOnce.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: master Commit: a6bfecd4019ec9869d51d296c48e9250ebbed3e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6bfecd4019ec9869d51d296c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 28 11:21:34 2017 +0100 msvcr100: Use InterlockedDecrement in SpinWait::_SpinOnce. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/lock.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index 3153ae1..f4c44170 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -265,13 +265,7 @@ MSVCRT_bool __thiscall SpinWait__SpinOnce(SpinWait *this) SpinWait__Reset(this); /* fall through */ case SPINWAIT_SPIN: -#ifdef __i386__ - __asm__ __volatile__( "rep;nop" : : : "memory" ); -#else - __asm__ __volatile__( "" : : : "memory" ); -#endif - - this->spin--; + InterlockedDecrement((LONG*)&this->spin); if(!this->spin) this->state = this->unknown ? SPINWAIT_YIELD : SPINWAIT_DONE; return TRUE;

1 0

Henri Verbeet : wined3d: Use the command stream state in wined3d_cs_exec_draw().
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: master Commit: a7560cf695acaf378b8ca37989220fce6ddd3a44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7560cf695acaf378b8ca3798… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 28 06:11:58 2017 +0100 wined3d: Use the command stream state in wined3d_cs_exec_draw(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index c686181..1769dc1 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -581,7 +581,7 @@ void wined3d_cs_emit_dispatch(struct wined3d_cs *cs, static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) { - struct wined3d_state *state = &cs->device->state; + struct wined3d_state *state = &cs->state; const struct wined3d_cs_draw *op = data; unsigned int i; @@ -592,11 +592,11 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) device_invalidate_state(cs->device, STATE_BASEVERTEXINDEX); } - if (cs->state.gl_primitive_type != op->primitive_type) + if (state->gl_primitive_type != op->primitive_type) { - if (cs->state.gl_primitive_type == GL_POINTS || op->primitive_type == GL_POINTS) + if (state->gl_primitive_type == GL_POINTS || op->primitive_type == GL_POINTS) device_invalidate_state(cs->device, STATE_POINT_ENABLE); - cs->state.gl_primitive_type = op->primitive_type; + state->gl_primitive_type = op->primitive_type; } draw_primitive(cs->device, state, op->base_vertex_idx, op->start_idx,

1 0

Henri Verbeet : wined3d: Use the command stream state in wined3d_cs_exec_dispatch().
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: master Commit: a7809706bb60c56ec6a3888cd8997a707bc5f293 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7809706bb60c56ec6a3888cd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 28 06:11:59 2017 +0100 wined3d: Use the command stream state in wined3d_cs_exec_dispatch(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 1769dc1..8afa731 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -549,8 +549,8 @@ static void release_unordered_access_resources(const struct wined3d_shader *shad static void wined3d_cs_exec_dispatch(struct wined3d_cs *cs, const void *data) { - struct wined3d_state *state = &cs->device->state; const struct wined3d_cs_dispatch *op = data; + struct wined3d_state *state = &cs->state; dispatch_compute(cs->device, state, op->group_count_x, op->group_count_y, op->group_count_z);

1 0

Bruno Jesus : ws2_32: Discard MSG_PARTIAL as it is supported only in message protocols.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: master Commit: 130452bb3de29b15e4c2c28a77dec2a9faa17bae URL: http://source.winehq.org/git/wine.git/?a=commit;h=130452bb3de29b15e4c2c28a7… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Tue Feb 28 03:19:07 2017 -0300 ws2_32: Discard MSG_PARTIAL as it is supported only in message protocols. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f0e8f2a..97cb7db 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -624,6 +624,7 @@ static const int ws_flags_map[][2] = MAP_OPTION( MSG_PEEK ), MAP_OPTION( MSG_DONTROUTE ), MAP_OPTION( MSG_WAITALL ), + { WS_MSG_PARTIAL, 0 }, }; static const int ws_sock_map[][2] =

1 0

Henri Verbeet : wined3d: Use the command stream state in swapchain_gl_present().
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: master Commit: b7f0d3312eeb63d6b360d499f20f71aeee245d5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7f0d3312eeb63d6b360d499f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 28 06:12:00 2017 +0100 wined3d: Use the command stream state in swapchain_gl_present(). 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 1a8e7fa..8a62119 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -487,7 +487,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, DWORD flags) { struct wined3d_texture *back_buffer = swapchain->back_buffers[0]; - const struct wined3d_fb_state *fb = &swapchain->device->fb; + const struct wined3d_fb_state *fb = &swapchain->device->cs->fb; const struct wined3d_gl_info *gl_info; struct wined3d_texture *logo_texture; struct wined3d_context *context;

1 0

Piotr Caban : msvcp110: Add _Lock_shared_ptr_spin_lock implementation.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: master Commit: 3b9e9dd06a1c3b89c90d565e82f92eba1bea821e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b9e9dd06a1c3b89c90d565e8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 28 11:21:00 2017 +0100 msvcp110: Add _Lock_shared_ptr_spin_lock implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp140/msvcp140.spec | 4 ++-- dlls/msvcp90/misc.c | 21 +++++++++++++++++++++ 5 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index b09a1d4..a7c3297 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3815,7 +3815,7 @@ @ stub _LXp_sqrtx @ stub _LXp_subx @ extern _LZero -@ stub _Lock_shared_ptr_spin_lock +@ cdecl _Lock_shared_ptr_spin_lock() @ cdecl _Mbrtowc(ptr ptr long ptr ptr) @ stub _Mtx_clear_owner @ cdecl _Mtx_current_owns(ptr) @@ -3874,7 +3874,7 @@ @ stub _Tss_delete @ stub _Tss_get @ stub _Tss_set -@ stub _Unlock_shared_ptr_spin_lock +@ cdecl _Unlock_shared_ptr_spin_lock() @ cdecl _Wcrtomb(ptr long ptr ptr) @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) @ stub _Wcsxfrm diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 863ead9..61d4b32 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3760,7 +3760,7 @@ @ stub _LXp_sqrtx @ stub _LXp_subx @ extern _LZero -@ stub _Lock_shared_ptr_spin_lock +@ cdecl _Lock_shared_ptr_spin_lock() @ cdecl _Mbrtowc(ptr ptr long ptr ptr) @ stub _Mtx_clear_owner @ cdecl _Mtx_current_owns(ptr) @@ -3821,7 +3821,7 @@ @ stub _Tss_delete @ stub _Tss_get @ stub _Tss_set -@ stub _Unlock_shared_ptr_spin_lock +@ cdecl _Unlock_shared_ptr_spin_lock() @ cdecl _Wcrtomb(ptr long ptr ptr) @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) @ stub _Wcsxfrm diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 438cddb..f649bbc 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3760,7 +3760,7 @@ @ stub _LXp_sqrtx @ stub _LXp_subx @ extern _LZero msvcp120._LZero -@ stub _Lock_shared_ptr_spin_lock +@ cdecl _Lock_shared_ptr_spin_lock() msvcp120._Lock_shared_ptr_spin_lock @ cdecl _Mbrtowc(ptr ptr long ptr ptr) msvcp120._Mbrtowc @ stub _Mtx_clear_owner @ cdecl _Mtx_current_owns(ptr) msvcp120._Mtx_current_owns @@ -3821,7 +3821,7 @@ @ stub _Tss_delete @ stub _Tss_get @ stub _Tss_set -@ stub _Unlock_shared_ptr_spin_lock +@ cdecl _Unlock_shared_ptr_spin_lock() msvcp120._Unlock_shared_ptr_spin_lock @ cdecl _Wcrtomb(ptr long ptr ptr) msvcp120._Wcrtomb @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) msvcp120._Wcscoll @ stub _Wcsxfrm diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 9a3052d..ee31c77 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3668,7 +3668,7 @@ @ extern _LSnan _LSnan @ stub _Last_write_time @ stub _Link -@ stub _Lock_shared_ptr_spin_lock +@ cdecl _Lock_shared_ptr_spin_lock() @ stub _Lstat @ stub _Make_dir @ cdecl _Mbrtowc(ptr ptr long ptr ptr) _Mbrtowc @@ -3738,7 +3738,7 @@ @ cdecl _Towlower(long ptr) _Towlower @ cdecl _Towupper(long ptr) _Towupper @ stub _Unlink -@ stub _Unlock_shared_ptr_spin_lock +@ cdecl _Unlock_shared_ptr_spin_lock() @ stub _WStod @ stub _WStodx @ stub _WStof diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index ce9a4e2..703ed9f 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1339,3 +1339,24 @@ void __cdecl threads__Mtx_unlock(void *mtx) { LeaveCriticalSection(mtx); } + +#if _MSVCP_VER >= 110 +static LONG shared_ptr_lock; + +void __cdecl _Lock_shared_ptr_spin_lock(void) +{ + LONG l = 0; + + while(InterlockedCompareExchange(&shared_ptr_lock, 1, 0) != 0) { + if(l++ == 1000) { + Sleep(0); + l = 0; + } + } +} + +void __cdecl _Unlock_shared_ptr_spin_lock(void) +{ + shared_ptr_lock = 0; +} +#endif

1 0

Thomas Faber : ole32: Zero STGMEDIUM before calling IDataObject::GetData.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: master Commit: 87dba2bbd057a9b4004d85854ed562112c99a904 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87dba2bbd057a9b4004d85854… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Thu Feb 23 17:55:00 2017 +0100 ole32: Zero STGMEDIUM before calling IDataObject::GetData. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/clipboard.c | 10 ++++++++-- dlls/ole32/tests/clipboard.c | 4 ++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index faec553..d48ea79 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -741,7 +741,7 @@ static HRESULT get_data_from_storage(IDataObject *data, FORMATETC *fmt, HGLOBAL hr = IDataObject_GetDataHere(data, &stg_fmt, &med); if(FAILED(hr)) { - med.u.pstg = NULL; + memset(&med, 0, sizeof(med)); hr = IDataObject_GetData(data, &stg_fmt, &med); if(FAILED(hr)) goto end; @@ -789,7 +789,7 @@ static HRESULT get_data_from_stream(IDataObject *data, FORMATETC *fmt, HGLOBAL * LARGE_INTEGER offs; ULARGE_INTEGER pos; - med.u.pstm = NULL; + memset(&med, 0, sizeof(med)); hr = IDataObject_GetData(data, &stm_fmt, &med); if(FAILED(hr)) goto error; @@ -826,6 +826,7 @@ static HRESULT get_data_from_global(IDataObject *data, FORMATETC *fmt, HGLOBAL * mem_fmt = *fmt; mem_fmt.tymed = TYMED_HGLOBAL; + memset(&med, 0, sizeof(med)); hr = IDataObject_GetData(data, &mem_fmt, &med); if(FAILED(hr)) return hr; @@ -853,6 +854,7 @@ static HRESULT get_data_from_enhmetafile(IDataObject *data, FORMATETC *fmt, HGLO mem_fmt = *fmt; mem_fmt.tymed = TYMED_ENHMF; + memset(&med, 0, sizeof(med)); hr = IDataObject_GetData(data, &mem_fmt, &med); if(FAILED(hr)) return hr; @@ -880,6 +882,7 @@ static HRESULT get_data_from_metafilepict(IDataObject *data, FORMATETC *fmt, HGL mem_fmt = *fmt; mem_fmt.tymed = TYMED_MFPICT; + memset(&med, 0, sizeof(med)); hr = IDataObject_GetData(data, &mem_fmt, &med); if(FAILED(hr)) return hr; @@ -909,6 +912,7 @@ static HRESULT get_data_from_bitmap(IDataObject *data, FORMATETC *fmt, HBITMAP * mem_fmt = *fmt; mem_fmt.tymed = TYMED_GDI; + memset(&med, 0, sizeof(med)); hr = IDataObject_GetData(data, &mem_fmt, &med); if(FAILED(hr)) return hr; @@ -1394,6 +1398,8 @@ static HRESULT WINAPI snapshot_GetData(IDataObject *iface, FORMATETC *fmt, if ( !fmt || !med ) return E_INVALIDARG; + memset(med, 0, sizeof(*med)); + if ( !OpenClipboard(NULL)) return CLIPBRD_E_CANT_OPEN; if(!This->data) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index a30796c..1c8923e 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -246,6 +246,10 @@ static HRESULT WINAPI DataObjectImpl_GetData(IDataObject* iface, FORMATETC *pfor DataObjectImpl_GetData_calls++; + ok(pmedium->tymed == 0, "pmedium->tymed = %u\n", pmedium->tymed); + ok(U(*pmedium).hGlobal == NULL, "pmedium->hGlobal = %p\n", U(*pmedium).hGlobal); + ok(pmedium->pUnkForRelease == NULL, "pmedium->pUnkForRelease = %p\n", pmedium->pUnkForRelease); + if(pformatetc->lindex != -1) return DV_E_FORMATETC;

1 0

André Hentschel : d3dx9: Fix some spec file entries.
by Alexandre Julliard Feb. 28, 2017

Feb. 28, 2017

Module: wine Branch: master Commit: de9c3f7d03e8cd75983800f16162544657ac76c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de9c3f7d03e8cd75983800f16… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 24 22:59:10 2017 +0100 d3dx9: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_24/d3dx9_24.spec | 4 ++-- dlls/d3dx9_25/d3dx9_25.spec | 4 ++-- dlls/d3dx9_26/d3dx9_26.spec | 4 ++-- dlls/d3dx9_27/d3dx9_27.spec | 4 ++-- dlls/d3dx9_28/d3dx9_28.spec | 4 ++-- dlls/d3dx9_29/d3dx9_29.spec | 4 ++-- dlls/d3dx9_30/d3dx9_30.spec | 4 ++-- dlls/d3dx9_31/d3dx9_31.spec | 4 ++-- dlls/d3dx9_32/d3dx9_32.spec | 4 ++-- dlls/d3dx9_33/d3dx9_33.spec | 4 ++-- dlls/d3dx9_34/d3dx9_34.spec | 4 ++-- dlls/d3dx9_35/d3dx9_35.spec | 4 ++-- dlls/d3dx9_37/d3dx9_37.spec | 4 ++-- dlls/d3dx9_38/d3dx9_38.spec | 4 ++-- dlls/d3dx9_39/d3dx9_39.spec | 4 ++-- dlls/d3dx9_40/d3dx9_40.spec | 4 ++-- dlls/d3dx9_41/d3dx9_41.spec | 4 ++-- dlls/d3dx9_42/d3dx9_42.spec | 4 ++-- dlls/d3dx9_43/d3dx9_43.spec | 4 ++-- 19 files changed, 38 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de9c3f7d03e8cd7598380…

1 0