May 2019 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_set_draw_buffer().
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: master Commit: 9cb572cb7018fc2aeb290abbde3f2db1d76b8d1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cb572cb7018fc2aeb290abb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 15 18:20:56 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_set_draw_buffer(). 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/context.c | 13 ++++++++----- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/surface.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a0f5e68..dadeafd 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7899,7 +7899,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl } wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_DRAW_FRAMEBUFFER, &dst_texture->resource, dst_sub_resource_idx, NULL, 0, dst_location); - context_set_draw_buffer(context, buffer); + wined3d_context_gl_set_draw_buffer(context_gl, buffer); wined3d_context_gl_check_fbo_status(context_gl, GL_DRAW_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4707d70..75388e0 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -702,6 +702,7 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, /* Context activation is done by the caller. */ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum target, struct fbo_entry *entry) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; GLuint read_binding, draw_binding; unsigned int i; @@ -739,7 +740,7 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ /* Set valid read and draw buffer bindings to satisfy pedantic pre-ES2_compatibility * GL contexts requirements. */ gl_info->gl_ops.gl.p_glReadBuffer(GL_NONE); - context_set_draw_buffer(context, GL_NONE); + wined3d_context_gl_set_draw_buffer(context_gl, GL_NONE); if (target != GL_FRAMEBUFFER) { if (target == GL_READ_FRAMEBUFFER) @@ -2504,12 +2505,14 @@ static void context_apply_draw_buffers(struct wined3d_context *context, DWORD rt } /* Context activation is done by the caller. */ -void context_set_draw_buffer(struct wined3d_context *context, GLenum buffer) +void wined3d_context_gl_set_draw_buffer(struct wined3d_context_gl *context_gl, GLenum buffer) { - const struct wined3d_gl_info *gl_info = context->gl_info; - DWORD *current_mask = context->current_fbo ? &context->current_fbo->rt_mask : &context->draw_buffers_mask; - DWORD new_mask = context_generate_rt_mask(buffer); + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; + struct fbo_entry *current_fbo = context_gl->c.current_fbo; + uint32_t new_mask = context_generate_rt_mask(buffer); + uint32_t *current_mask; + current_mask = current_fbo ? &current_fbo->rt_mask : &context_gl->c.draw_buffers_mask; if (new_mask == *current_mask) return; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index dbf11d7..e52738b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13333,7 +13333,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli } wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_DRAW_FRAMEBUFFER, &dst_texture->resource, dst_sub_resource_idx, NULL, 0, dst_location); - context_set_draw_buffer(context, buffer); + wined3d_context_gl_set_draw_buffer(context_gl, buffer); wined3d_context_gl_check_fbo_status(context_gl, GL_DRAW_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b76ebe9..318ac19 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -110,7 +110,7 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_DRAW_FRAMEBUFFER, NULL, 0, &dst_texture->resource, dst_sub_resource_idx, dst_location); - context_set_draw_buffer(context, GL_NONE); + wined3d_context_gl_set_draw_buffer(context_gl, GL_NONE); wined3d_context_gl_check_fbo_status(context_gl, GL_DRAW_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); @@ -270,7 +270,7 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3 wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_DRAW_FRAMEBUFFER, &dst_texture->resource, dst_sub_resource_idx, NULL, 0, dst_location); - context_set_draw_buffer(context, buffer); + wined3d_context_gl_set_draw_buffer(context_gl, buffer); wined3d_context_gl_check_fbo_status(context_gl, GL_DRAW_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); @@ -1183,7 +1183,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_texture_gl *dst_texture, gl_info->gl_ops.gl.p_glTexParameteri(texture_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); gl_info->gl_ops.gl.p_glTexParameteri(texture_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - context_set_draw_buffer(context, drawBuffer); + wined3d_context_gl_set_draw_buffer(context_gl, drawBuffer); gl_info->gl_ops.gl.p_glReadBuffer(drawBuffer); gl_info->gl_ops.gl.p_glBegin(GL_QUADS); @@ -2259,7 +2259,7 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit } wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_DRAW_FRAMEBUFFER, dst_resource, dst_sub_resource_idx, NULL, 0, dst_location); - context_set_draw_buffer(context, buffer); + wined3d_context_gl_set_draw_buffer(context_gl, buffer); wined3d_context_gl_check_fbo_status(context_gl, GL_DRAW_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f1e7f6d..2c0bdeb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2087,6 +2087,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context_gl, const struct wined3d_stream_info *si, GLuint *current_bo, const struct wined3d_state *state) DECLSPEC_HIDDEN; +void wined3d_context_gl_set_draw_buffer(struct wined3d_context_gl *context_gl, GLenum buffer) DECLSPEC_HIDDEN; void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context_gl, const struct wined3d_state *state) DECLSPEC_HIDDEN; @@ -2258,7 +2259,6 @@ void context_resource_released(const struct wined3d_device *device, struct wined void context_restore(struct wined3d_context *context, struct wined3d_texture *texture, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; BOOL context_set_current(struct wined3d_context *ctx) DECLSPEC_HIDDEN; -void context_set_draw_buffer(struct wined3d_context *context, GLenum buffer) DECLSPEC_HIDDEN; void context_set_tls_idx(DWORD idx) DECLSPEC_HIDDEN; void context_state_drawbuf(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_texture_update().
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: master Commit: fc7ea69e80b228b2de30e46432e48df9faa2e1e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc7ea69e80b228b2de30e464… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 15 18:20:57 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_texture_update(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 12 +++++++----- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 75388e0..e225571 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1093,13 +1093,15 @@ void context_gl_resource_released(struct wined3d_device *device, context_enum_fbo_entries(device, name, rb_namespace, context_queue_fbo_entry_destruction); } -void context_texture_update(struct wined3d_context *context, const struct wined3d_texture_gl *texture_gl) +void wined3d_context_gl_texture_update(struct wined3d_context_gl *context_gl, + const struct wined3d_texture_gl *texture_gl) { - const struct wined3d_gl_info *gl_info = context->gl_info; - struct fbo_entry *entry = context->current_fbo; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; + struct fbo_entry *entry = context_gl->c.current_fbo; unsigned int i; - if (!entry || context->rebind_fbo) return; + if (!entry || context_gl->c.rebind_fbo) + return; for (i = 0; i < gl_info->limits.buffers + 1; ++i) { @@ -1107,7 +1109,7 @@ void context_texture_update(struct wined3d_context *context, const struct wined3 || texture_gl->texture_srgb.name == entry->key.objects[i].object) { TRACE("Updated texture %p is bound as attachment %u to the current FBO.\n", texture_gl, i); - context->rebind_fbo = TRUE; + context_gl->c.rebind_fbo = TRUE; return; } } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 235b9f5..b865c9c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2127,7 +2127,7 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s for (i = 0; i < device->context_count; ++i) { - context_texture_update(device->contexts[i], wined3d_texture_gl(texture)); + wined3d_context_gl_texture_update(wined3d_context_gl(device->contexts[i]), wined3d_texture_gl(texture)); } } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2c0bdeb..2525fca 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2088,6 +2088,8 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context_gl, const struct wined3d_stream_info *si, GLuint *current_bo, const struct wined3d_state *state) DECLSPEC_HIDDEN; void wined3d_context_gl_set_draw_buffer(struct wined3d_context_gl *context_gl, GLenum buffer) DECLSPEC_HIDDEN; +void wined3d_context_gl_texture_update(struct wined3d_context_gl *context_gl, + const struct wined3d_texture_gl *texture_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context_gl, const struct wined3d_state *state) DECLSPEC_HIDDEN; @@ -2264,8 +2266,6 @@ void context_state_drawbuf(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void context_state_fb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; -void context_texture_update(struct wined3d_context *context, - const struct wined3d_texture_gl *texture_gl) DECLSPEC_HIDDEN; void context_unload_tex_coords(const struct wined3d_context *context) DECLSPEC_HIDDEN; void context_unmap_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, GLenum binding) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_bind_fbo().
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: master Commit: 97fb02876a7e4e8bbdd234b57459105b875354cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=97fb02876a7e4e8bbdd234b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 15 18:20:58 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_bind_fbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 49 ++++++++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e225571..e6d94f2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -46,27 +46,30 @@ static DWORD wined3d_context_tls_idx; /* FBO helper functions */ /* Context activation is done by the caller. */ -static void context_bind_fbo(struct wined3d_context *context, GLenum target, GLuint fbo) +static void wined3d_context_gl_bind_fbo(struct wined3d_context_gl *context_gl, GLenum target, GLuint fbo) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; switch (target) { case GL_READ_FRAMEBUFFER: - if (context->fbo_read_binding == fbo) return; - context->fbo_read_binding = fbo; + if (context_gl->c.fbo_read_binding == fbo) + return; + context_gl->c.fbo_read_binding = fbo; break; case GL_DRAW_FRAMEBUFFER: - if (context->fbo_draw_binding == fbo) return; - context->fbo_draw_binding = fbo; + if (context_gl->c.fbo_draw_binding == fbo) + return; + context_gl->c.fbo_draw_binding = fbo; break; case GL_FRAMEBUFFER: - if (context->fbo_read_binding == fbo - && context->fbo_draw_binding == fbo) return; - context->fbo_read_binding = fbo; - context->fbo_draw_binding = fbo; + if (context_gl->c.fbo_read_binding == fbo + && context_gl->c.fbo_draw_binding == fbo) + return; + context_gl->c.fbo_read_binding = fbo; + context_gl->c.fbo_draw_binding = fbo; break; default: @@ -98,11 +101,12 @@ static void context_clean_fbo_attachments(const struct wined3d_gl_info *gl_info, /* Context activation is done by the caller. */ static void context_destroy_fbo(struct wined3d_context *context, GLuint fbo) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; - context_bind_fbo(context, GL_FRAMEBUFFER, fbo); + wined3d_context_gl_bind_fbo(context_gl, GL_FRAMEBUFFER, fbo); context_clean_fbo_attachments(gl_info, GL_FRAMEBUFFER); - context_bind_fbo(context, GL_FRAMEBUFFER, 0); + wined3d_context_gl_bind_fbo(context_gl, GL_FRAMEBUFFER, 0); gl_info->fbo_ops.glDeleteFramebuffers(1, &fbo); checkGLcall("glDeleteFramebuffers()"); @@ -541,9 +545,10 @@ static void context_reuse_fbo_entry(struct wined3d_context *context, GLenum targ const struct wined3d_rendertarget_info *render_targets, const struct wined3d_rendertarget_info *depth_stencil, DWORD color_location, DWORD ds_location, struct fbo_entry *entry) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; - context_bind_fbo(context, target, entry->id); + wined3d_context_gl_bind_fbo(context_gl, target, entry->id); context_clean_fbo_attachments(gl_info, target); context_generate_fbo_key(context, &entry->key, render_targets, depth_stencil, color_location, ds_location); @@ -709,13 +714,13 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ if (entry->flags & WINED3D_FBO_ENTRY_FLAG_ATTACHED) { - context_bind_fbo(context, target, entry->id); + wined3d_context_gl_bind_fbo(context_gl, target, entry->id); return; } read_binding = context->fbo_read_binding; draw_binding = context->fbo_draw_binding; - context_bind_fbo(context, GL_FRAMEBUFFER, entry->id); + wined3d_context_gl_bind_fbo(context_gl, GL_FRAMEBUFFER, entry->id); if (gl_info->supported[ARB_FRAMEBUFFER_NO_ATTACHMENTS]) { @@ -744,9 +749,9 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ if (target != GL_FRAMEBUFFER) { if (target == GL_READ_FRAMEBUFFER) - context_bind_fbo(context, GL_DRAW_FRAMEBUFFER, draw_binding); + wined3d_context_gl_bind_fbo(context_gl, GL_DRAW_FRAMEBUFFER, draw_binding); else - context_bind_fbo(context, GL_READ_FRAMEBUFFER, read_binding); + wined3d_context_gl_bind_fbo(context_gl, GL_READ_FRAMEBUFFER, read_binding); } entry->flags |= WINED3D_FBO_ENTRY_FLAG_ATTACHED; @@ -757,6 +762,7 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ const struct wined3d_rendertarget_info *render_targets, const struct wined3d_rendertarget_info *depth_stencil, DWORD color_location, DWORD ds_location) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); struct fbo_entry *entry, *entry2; LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_destroy_list, struct fbo_entry, entry) @@ -766,14 +772,14 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ if (context->rebind_fbo) { - context_bind_fbo(context, GL_FRAMEBUFFER, 0); + wined3d_context_gl_bind_fbo(context_gl, GL_FRAMEBUFFER, 0); context->rebind_fbo = FALSE; } if (color_location == WINED3D_LOCATION_DRAWABLE) { context->current_fbo = NULL; - context_bind_fbo(context, target, 0); + wined3d_context_gl_bind_fbo(context_gl, target, 0); } else { @@ -2774,7 +2780,7 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, else { context->current_fbo = NULL; - context_bind_fbo(context, GL_FRAMEBUFFER, 0); + wined3d_context_gl_bind_fbo(context_gl, GL_FRAMEBUFFER, 0); rt_mask = context_generate_rt_mask_from_resource(&rt->resource); } } @@ -4035,6 +4041,7 @@ static void context_apply_compute_state(struct wined3d_context *context, const struct wined3d_device *device, const struct wined3d_state *state) { const struct wined3d_state_entry *state_table = context->state_table; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int state_id, i; @@ -4084,7 +4091,7 @@ static void context_apply_compute_state(struct wined3d_context *context, * * Without this, the bloom effect in Nier:Automata is too bright on the * Mesa radeonsi driver, and presumably on other Mesa based drivers. */ - context_bind_fbo(context, GL_FRAMEBUFFER, 0); + wined3d_context_gl_bind_fbo(context_gl, GL_FRAMEBUFFER, 0); context_invalidate_state(context, STATE_FRAMEBUFFER); context->last_was_blit = FALSE;

1 0

Alexandre Julliard : msvcp80: Fix the spec entries of the num_put_char/ short/wchar functions.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: master Commit: eee504da9e4f13d1037893351a630f1a500847be URL: https://source.winehq.org/git/wine.git/?a=commit;h=eee504da9e4f13d103789335… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 17:35:22 2019 +0200 msvcp80: Fix the spec entries of the num_put_char/short/wchar functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp80/msvcp80.spec | 114 +++++++++++++++++++++++----------------------- 1 file changed, 57 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eee504da9e4f13d10378…

1 0

Alexandre Julliard : msvcr: Fix the _NonReentrantPPLLock__Scoped_lock_ctor () spec entries.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: master Commit: a6de9b0b465bf26dca7c3578b928e75fd1dedea6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6de9b0b465bf26dca7c3578… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 17:40:07 2019 +0200 msvcr: Fix the _NonReentrantPPLLock__Scoped_lock_ctor() spec entries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index e435766..d47f89b 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -22,8 +22,8 @@ @ stub -arch=win64 ??0_ReentrantLock(a)details@Concurrency@@QEAA(a)XZ @ thiscall -arch=win32 ??0_ReentrantPPLLock(a)details@Concurrency@@QAE(a)XZ(ptr) _ReentrantPPLLock_ctor @ cdecl -arch=win64 ??0_ReentrantPPLLock(a)details@Concurrency@@QEAA(a)XZ(ptr) _ReentrantPPLLock_ctor -@ thiscall -arch=win32 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z(ptr) _NonReentrantPPLLock__Scoped_lock_ctor -@ cdecl -arch=win64 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z(ptr) _NonReentrantPPLLock__Scoped_lock_ctor +@ thiscall -arch=win32 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z(ptr ptr) _NonReentrantPPLLock__Scoped_lock_ctor +@ cdecl -arch=win64 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z(ptr ptr) _NonReentrantPPLLock__Scoped_lock_ctor @ thiscall -arch=win32 ??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z(ptr ptr) _ReentrantPPLLock__Scoped_lock_ctor @ cdecl -arch=win64 ??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z(ptr ptr) _ReentrantPPLLock__Scoped_lock_ctor @ stub -arch=win32 ??0_SpinLock(a)details@Concurrency@@QAE(a)ACJ@Z diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 39dfb8c..a58b4bd 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -53,9 +53,9 @@ @ cdecl -arch=arm ??0_Scheduler(a)details@Concurrency@@QAA(a)PAVScheduler@2@@Z(ptr ptr) _Scheduler_ctor_sched @ thiscall -arch=i386 ??0_Scheduler(a)details@Concurrency@@QAE(a)PAVScheduler@2@@Z(ptr ptr) _Scheduler_ctor_sched @ cdecl -arch=win64 ??0_Scheduler(a)details@Concurrency@@QEAA(a)PEAVScheduler@2@@Z(ptr ptr) _Scheduler_ctor_sched -@ cdecl -arch=arm ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAA(a)AAV123@@Z(ptr) _NonReentrantPPLLock__Scoped_lock_ctor -@ thiscall -arch=i386 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z(ptr) _NonReentrantPPLLock__Scoped_lock_ctor -@ cdecl -arch=win64 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z(ptr) _NonReentrantPPLLock__Scoped_lock_ctor +@ cdecl -arch=arm ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAA(a)AAV123@@Z(ptr ptr) _NonReentrantPPLLock__Scoped_lock_ctor +@ thiscall -arch=i386 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z(ptr ptr) _NonReentrantPPLLock__Scoped_lock_ctor +@ cdecl -arch=win64 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z(ptr ptr) _NonReentrantPPLLock__Scoped_lock_ctor @ cdecl -arch=arm ??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QAA(a)AAV123@@Z(ptr ptr) _ReentrantPPLLock__Scoped_lock_ctor @ thiscall -arch=i386 ??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z(ptr ptr) _ReentrantPPLLock__Scoped_lock_ctor @ cdecl -arch=win64 ??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z(ptr ptr) _ReentrantPPLLock__Scoped_lock_ctor diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 68284c9..cde5045 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -50,9 +50,9 @@ @ cdecl -arch=arm ??0_Scheduler(a)details@Concurrency@@QAA(a)PAVScheduler@2@@Z(ptr ptr) _Scheduler_ctor_sched @ thiscall -arch=i386 ??0_Scheduler(a)details@Concurrency@@QAE(a)PAVScheduler@2@@Z(ptr ptr) _Scheduler_ctor_sched @ cdecl -arch=win64 ??0_Scheduler(a)details@Concurrency@@QEAA(a)PEAVScheduler@2@@Z(ptr ptr) _Scheduler_ctor_sched -@ cdecl -arch=arm ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAA(a)AAV123@@Z(ptr) _NonReentrantPPLLock__Scoped_lock_ctor -@ thiscall -arch=i386 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z(ptr) _NonReentrantPPLLock__Scoped_lock_ctor -@ cdecl -arch=win64 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z(ptr) _NonReentrantPPLLock__Scoped_lock_ctor +@ cdecl -arch=arm ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAA(a)AAV123@@Z(ptr ptr) _NonReentrantPPLLock__Scoped_lock_ctor +@ thiscall -arch=i386 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z(ptr ptr) _NonReentrantPPLLock__Scoped_lock_ctor +@ cdecl -arch=win64 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z(ptr ptr) _NonReentrantPPLLock__Scoped_lock_ctor @ cdecl -arch=arm ??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QAA(a)AAV123@@Z(ptr ptr) _ReentrantPPLLock__Scoped_lock_ctor @ thiscall -arch=i386 ??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z(ptr ptr) _ReentrantPPLLock__Scoped_lock_ctor @ cdecl -arch=win64 ??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z(ptr ptr) _ReentrantPPLLock__Scoped_lock_ctor

1 0

Alexandre Julliard : msvcr: Fix the event_wait() spec entries.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: master Commit: 3001a554543e443479f93e461911ba449a5a046d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3001a554543e443479f93e46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 17:40:18 2019 +0200 msvcr: Fix the event_wait() spec entries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index d47f89b..3fe8a77 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -497,8 +497,8 @@ @ cdecl -arch=win64 ?unlock(a)reader_writer_lock@Concurrency@@QEAAXXZ(ptr) reader_writer_lock_unlock @ cdecl ?vswprintf@@YAHPA_WIPB_WPAD(a)Z(ptr long wstr ptr) MSVCRT_vsnwprintf @ cdecl ?wait(a)Concurrency@@YAXI(a)Z(long) Concurrency_wait -@ thiscall -arch=win32 ?wait(a)event@Concurrency@@QAEII(a)Z(ptr) event_wait -@ cdecl -arch=win64 ?wait(a)event@Concurrency@@QEAA_KI(a)Z(ptr) event_wait +@ thiscall -arch=win32 ?wait(a)event@Concurrency@@QAEII(a)Z(ptr long) event_wait +@ cdecl -arch=win64 ?wait(a)event@Concurrency@@QEAA_KI(a)Z(ptr long) event_wait @ cdecl -arch=win32 ?wait_for_multiple(a)event@Concurrency@@SAIPAPAV12(a)I_NI@Z(ptr long long long) event_wait_for_multiple @ cdecl -arch=win64 ?wait_for_multiple(a)event@Concurrency@@SA_KPEAPEAV12(a)_K_NI@Z(ptr long long long) event_wait_for_multiple @ thiscall -arch=i386 ?what(a)exception@std@@UBEPBDXZ(ptr) MSVCRT_what_exception diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index a58b4bd..ae42d3d 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -812,9 +812,9 @@ @ cdecl -arch=arm ?wait(a)_Condition_variable@details(a)Concurrency@@QAAXAAVcritical_section(a)3@@Z(ptr ptr) _Condition_variable_wait @ thiscall -arch=i386 ?wait(a)_Condition_variable@details(a)Concurrency@@QAEXAAVcritical_section(a)3@@Z(ptr ptr) _Condition_variable_wait @ cdecl -arch=win64 ?wait(a)_Condition_variable@details(a)Concurrency@@QEAAXAEAVcritical_section(a)3@@Z(ptr ptr) _Condition_variable_wait -@ cdecl -arch=arm ?wait(a)event@Concurrency@@QAAII(a)Z(ptr) event_wait -@ thiscall -arch=win32 ?wait(a)event@Concurrency@@QAEII(a)Z(ptr) event_wait -@ cdecl -arch=win64 ?wait(a)event@Concurrency@@QEAA_KI(a)Z(ptr) event_wait +@ cdecl -arch=arm ?wait(a)event@Concurrency@@QAAII(a)Z(ptr long) event_wait +@ thiscall -arch=win32 ?wait(a)event@Concurrency@@QAEII(a)Z(ptr long) event_wait +@ cdecl -arch=win64 ?wait(a)event@Concurrency@@QEAA_KI(a)Z(ptr long) event_wait @ cdecl -arch=arm ?wait_for(a)_Condition_variable@details(a)Concurrency@@QAA_NAAVcritical_section(a)3@I(a)Z(ptr ptr long) _Condition_variable_wait_for @ thiscall -arch=i386 ?wait_for(a)_Condition_variable@details(a)Concurrency@@QAE_NAAVcritical_section(a)3@I(a)Z(ptr ptr long) _Condition_variable_wait_for @ cdecl -arch=win64 ?wait_for(a)_Condition_variable@details(a)Concurrency@@QEAA_NAEAVcritical_section(a)3@I(a)Z(ptr ptr long) _Condition_variable_wait_for diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index cde5045..92ac324 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -794,9 +794,9 @@ @ cdecl -arch=arm ?wait(a)_Condition_variable@details(a)Concurrency@@QAAXAAVcritical_section(a)3@@Z(ptr ptr) _Condition_variable_wait @ thiscall -arch=i386 ?wait(a)_Condition_variable@details(a)Concurrency@@QAEXAAVcritical_section(a)3@@Z(ptr ptr) _Condition_variable_wait @ cdecl -arch=win64 ?wait(a)_Condition_variable@details(a)Concurrency@@QEAAXAEAVcritical_section(a)3@@Z(ptr ptr) _Condition_variable_wait -@ cdecl -arch=arm ?wait(a)event@Concurrency@@QAAII(a)Z(ptr) event_wait -@ thiscall -arch=win32 ?wait(a)event@Concurrency@@QAEII(a)Z(ptr) event_wait -@ cdecl -arch=win64 ?wait(a)event@Concurrency@@QEAA_KI(a)Z(ptr) event_wait +@ cdecl -arch=arm ?wait(a)event@Concurrency@@QAAII(a)Z(ptr long) event_wait +@ thiscall -arch=win32 ?wait(a)event@Concurrency@@QAEII(a)Z(ptr long) event_wait +@ cdecl -arch=win64 ?wait(a)event@Concurrency@@QEAA_KI(a)Z(ptr long) event_wait @ cdecl -arch=arm ?wait_for(a)_Condition_variable@details(a)Concurrency@@QAA_NAAVcritical_section(a)3@I(a)Z(ptr ptr long) _Condition_variable_wait_for @ thiscall -arch=i386 ?wait_for(a)_Condition_variable@details(a)Concurrency@@QAE_NAAVcritical_section(a)3@I(a)Z(ptr ptr long) _Condition_variable_wait_for @ cdecl -arch=win64 ?wait_for(a)_Condition_variable@details(a)Concurrency@@QEAA_NAEAVcritical_section(a)3@I(a)Z(ptr ptr long) _Condition_variable_wait_for

1 0

Alexandre Julliard : vssapi: Fix the VSSAPI_CVssWriter_Initialize() spec entry.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: master Commit: 9a6dc66a1e2d7596e5b06156bad4efd657e9f035 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a6dc66a1e2d7596e5b06156… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 17:43:04 2019 +0200 vssapi: Fix the VSSAPI_CVssWriter_Initialize() spec entry. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vssapi/vssapi.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/vssapi/vssapi.spec b/dlls/vssapi/vssapi.spec index c759c11..779dab1 100644 --- a/dlls/vssapi/vssapi.spec +++ b/dlls/vssapi/vssapi.spec @@ -29,8 +29,8 @@ @ stub ?GetSnapshotDeviceName(a)CVssJetWriter@@IBGJPBGPAPBG(a)Z @ stub ?GetSnapshotDeviceName(a)CVssWriter@@IBGJPBGPAPBG(a)Z @ stub ?Initialize(a)CVssJetWriter@@QAGJU_GUID@@PBG_N211K(a)Z -@ thiscall -arch=i386 ?Initialize(a)CVssWriter@@QAGJU_GUID@@PBGW4VSS_USAGE_TYPE@@W4VSS_SOURCE_TYPE@@W4_VSS_APPLICATION_LEVEL@@KW4VSS_ALTERNATE_WRITER_STATE@@_N(a)Z(ptr ptr wstr long long long long long long wstr) VSSAPI_CVssWriter_Initialize -@ cdecl -arch=win64 ?Initialize(a)CVssWriter@@QEAAJU_GUID@@PEBGW4VSS_USAGE_TYPE@@W4VSS_SOURCE_TYPE@@W4_VSS_APPLICATION_LEVEL@@KW4VSS_ALTERNATE_WRITER_STATE@@_N1(a)Z(ptr ptr wstr long long long long long long wstr) VSSAPI_CVssWriter_Initialize +@ thiscall -arch=i386 ?Initialize(a)CVssWriter@@QAGJU_GUID@@PBGW4VSS_USAGE_TYPE@@W4VSS_SOURCE_TYPE@@W4_VSS_APPLICATION_LEVEL@@KW4VSS_ALTERNATE_WRITER_STATE@@_N(a)Z(ptr int128 wstr long long long long long long wstr) VSSAPI_CVssWriter_Initialize +@ cdecl -arch=win64 ?Initialize(a)CVssWriter@@QEAAJU_GUID@@PEBGW4VSS_USAGE_TYPE@@W4VSS_SOURCE_TYPE@@W4_VSS_APPLICATION_LEVEL@@KW4VSS_ALTERNATE_WRITER_STATE@@_N1(a)Z(ptr int128 wstr long long long long long long wstr) VSSAPI_CVssWriter_Initialize @ stub ?InstallAlternateWriter(a)CVssWriter@@QAGJU_GUID@@0(a)Z @ stub ?IsBootableSystemStateBackedUp(a)CVssJetWriter@@IBG_NXZ @ stub ?IsBootableSystemStateBackedUp(a)CVssWriter@@IBG_NXZ

1 0

Alexandre Julliard : include: Define fastcall assembly wrappers globally.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: master Commit: 62fa748f234ae5c1cf8ea5a94958049efd4f8c9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=62fa748f234ae5c1cf8ea5a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 19:59:33 2019 +0200 include: Define fastcall assembly wrappers globally. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hal/hal.c | 19 ------------------- dlls/ntdll/rtl.c | 12 ------------ dlls/ntoskrnl.exe/ntoskrnl_private.h | 20 -------------------- include/wine/asm.h | 25 +++++++++++++++++++++++++ 4 files changed, 25 insertions(+), 51 deletions(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 11a5591..f06264b 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -36,25 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); #ifdef __i386__ -#define DEFINE_FASTCALL1_WRAPPER(func) \ - __ASM_STDCALL_FUNC( __fastcall_ ## func, 4, \ - "popl %eax\n\t" \ - "pushl %ecx\n\t" \ - "pushl %eax\n\t" \ - "jmp " __ASM_NAME(#func) __ASM_STDCALL(4) ) -#define DEFINE_FASTCALL_WRAPPER(func,args) \ - __ASM_STDCALL_FUNC( __fastcall_ ## func, args, \ - "popl %eax\n\t" \ - "pushl %edx\n\t" \ - "pushl %ecx\n\t" \ - "pushl %eax\n\t" \ - "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) -#else -#define DEFINE_FASTCALL1_WRAPPER(func) /* nothing */ -#define DEFINE_FASTCALL_WRAPPER(func,args) /* nothing */ -#endif - -#ifdef __i386__ extern void * WINAPI call_fastcall_func1( void *func, const void *a ); __ASM_STDCALL_FUNC( call_fastcall_func1, 8, diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 2e459b2..362fb75 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -50,18 +50,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); -#ifdef __i386__ -#define DEFINE_FASTCALL_WRAPPER(func,args) \ - __ASM_STDCALL_FUNC( __fastcall_ ## func, args, \ - "popl %eax\n\t" \ - "pushl %edx\n\t" \ - "pushl %ecx\n\t" \ - "pushl %eax\n\t" \ - "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) -#else -#define DEFINE_FASTCALL_WRAPPER(func,args) /* nothing */ -#endif - /* CRC polynomial 0xedb88320 */ static const DWORD CRC_table[256] = { diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index 65e2729..864a060 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -60,24 +60,4 @@ extern POBJECT_TYPE PsProcessType; extern POBJECT_TYPE PsThreadType; extern POBJECT_TYPE SeTokenObjectType; - -#ifdef __i386__ -#define DEFINE_FASTCALL1_WRAPPER(func) \ - __ASM_STDCALL_FUNC( __fastcall_ ## func, 4, \ - "popl %eax\n\t" \ - "pushl %ecx\n\t" \ - "pushl %eax\n\t" \ - "jmp " __ASM_NAME(#func) __ASM_STDCALL(4) ) -#define DEFINE_FASTCALL_WRAPPER(func,args) \ - __ASM_STDCALL_FUNC( __fastcall_ ## func, args, \ - "popl %eax\n\t" \ - "pushl %edx\n\t" \ - "pushl %ecx\n\t" \ - "pushl %eax\n\t" \ - "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) -#else -#define DEFINE_FASTCALL1_WRAPPER(func) /* nothing */ -#define DEFINE_FASTCALL_WRAPPER(func,args) /* nothing */ -#endif - #endif diff --git a/include/wine/asm.h b/include/wine/asm.h index bf97bc0..f1c50fd 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -63,4 +63,29 @@ #define __ASM_STDCALL_FUNC(name,args,code) __ASM_DEFINE_FUNC(__ASM_NAME(#name) __ASM_STDCALL(args),code) +/* fastcall support */ + +#ifdef __i386__ + +# define DEFINE_FASTCALL1_WRAPPER(func) \ + __ASM_STDCALL_FUNC( __fastcall_ ## func, 4, \ + "popl %eax\n\t" \ + "pushl %ecx\n\t" \ + "pushl %eax\n\t" \ + "jmp " __ASM_NAME(#func) __ASM_STDCALL(4) ) +# define DEFINE_FASTCALL_WRAPPER(func,args) \ + __ASM_STDCALL_FUNC( __fastcall_ ## func, args, \ + "popl %eax\n\t" \ + "pushl %edx\n\t" \ + "pushl %ecx\n\t" \ + "pushl %eax\n\t" \ + "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) + +#else /* __i386__ */ + +# define DEFINE_FASTCALL1_WRAPPER(func) /* nothing */ +# define DEFINE_FASTCALL_WRAPPER(func,args) /* nothing */ + +#endif /* __i386__ */ + #endif /* __WINE_WINE_ASM_H */

1 0

Alexandre Julliard : include: Define thiscall assembly wrappers globally.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: master Commit: ee4db2005eaafdab8996527c134c52d9d03e785c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee4db2005eaafdab8996527c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 20:06:32 2019 +0200 include: Define thiscall assembly wrappers globally. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/cxx.h | 23 ----------------------- dlls/msvcrt/cxx.h | 22 ---------------------- dlls/riched20/txthost.c | 29 ----------------------------- dlls/riched20/txtsrv.c | 29 ----------------------------- dlls/vssapi/main.c | 22 ---------------------- include/wine/asm.h | 37 +++++++++++++++++++++++++++++++++++++ 6 files changed, 37 insertions(+), 125 deletions(-) diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index fd69756..e14b7de 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -18,29 +18,6 @@ #include "wine/asm.h" -/* Copied from dlls/msvcrt/cxx.h */ -#undef __thiscall -#ifdef __i386__ /* thiscall functions are i386-specific */ - -#define THISCALL(func) __thiscall_ ## func -#define THISCALL_NAME(func) __ASM_NAME("__thiscall_" #func) -#define __thiscall __stdcall -#define DEFINE_THISCALL_WRAPPER(func,args) \ - extern void THISCALL(func)(void); \ - __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ - "popl %eax\n\t" \ - "pushl %ecx\n\t" \ - "pushl %eax\n\t" \ - "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) -#else /* __i386__ */ - -#define THISCALL(func) func -#define THISCALL_NAME(func) __ASM_NAME(#func) -#define __thiscall __cdecl -#define DEFINE_THISCALL_WRAPPER(func,args) /* nothing */ - -#endif /* __i386__ */ - #ifdef _WIN64 #define VTABLE_ADD_FUNC(name) "\t.quad " THISCALL_NAME(name) "\n" diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h index 75677e2..68783f5 100644 --- a/dlls/msvcrt/cxx.h +++ b/dlls/msvcrt/cxx.h @@ -18,28 +18,6 @@ #include "wine/asm.h" -#undef __thiscall -#ifdef __i386__ /* thiscall functions are i386-specific */ - -#define THISCALL(func) __thiscall_ ## func -#define THISCALL_NAME(func) __ASM_NAME("__thiscall_" #func) -#define __thiscall __stdcall -#define DEFINE_THISCALL_WRAPPER(func,args) \ - extern void THISCALL(func)(void); \ - __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ - "popl %eax\n\t" \ - "pushl %ecx\n\t" \ - "pushl %eax\n\t" \ - "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) -#else /* __i386__ */ - -#define THISCALL(func) func -#define THISCALL_NAME(func) __ASM_NAME(#func) -#define __thiscall __cdecl -#define DEFINE_THISCALL_WRAPPER(func,args) /* nothing */ - -#endif /* __i386__ */ - #ifdef _WIN64 #define VTABLE_ADD_FUNC(name) "\t.quad " THISCALL_NAME(name) "\n" diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index ab94503..e4c4e0c 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -500,35 +500,6 @@ DECLSPEC_HIDDEN HRESULT WINAPI ITextHostImpl_TxGetSelectionBarWidth(ITextHost *i } -#ifdef __i386__ /* thiscall functions are i386-specific */ - -#define THISCALL(func) (void *) __thiscall_ ## func -#ifdef _MSC_VER -#define DEFINE_THISCALL_WRAPPER(func,args) \ - __declspec(naked) HRESULT __thiscall_##func(void) \ - { \ - __asm pop eax \ - __asm push ecx \ - __asm push eax \ - __asm jmp func \ - } -#else /* _MSC_VER */ -#define DEFINE_THISCALL_WRAPPER(func,args) \ - extern HRESULT __thiscall_ ## func(void); \ - __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ - "popl %eax\n\t" \ - "pushl %ecx\n\t" \ - "pushl %eax\n\t" \ - "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) -#endif /* _MSC_VER */ - -#else /* __i386__ */ - -#define THISCALL(func) func -#define DEFINE_THISCALL_WRAPPER(func,args) /* nothing */ - -#endif /* __i386__ */ - DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetDC,4) DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxReleaseDC,8) DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxShowScrollBar,12) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index a9ceef4..6777f97 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -34,35 +34,6 @@ #include "wine/debug.h" #include "editstr.h" -#ifdef __i386__ /* thiscall functions are i386-specific */ - -#define THISCALL(func) (void *) __thiscall_ ## func -#ifdef _MSC_VER -#define DEFINE_THISCALL_WRAPPER(func,args) \ - __declspec(naked) HRESULT __thiscall_##func(void) \ - { \ - __asm pop eax \ - __asm push ecx \ - __asm push eax \ - __asm jmp func \ - } -#else /* _MSC_VER */ -#define DEFINE_THISCALL_WRAPPER(func,args) \ - extern HRESULT __thiscall_ ## func(void); \ - __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ - "popl %eax\n\t" \ - "pushl %ecx\n\t" \ - "pushl %eax\n\t" \ - "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) -#endif /* _MSC_VER */ - -#else /* __i386__ */ - -#define THISCALL(func) func -#define DEFINE_THISCALL_WRAPPER(func,args) /* nothing */ - -#endif /* __i386__ */ - WINE_DEFAULT_DEBUG_CHANNEL(richedit); typedef struct ITextServicesImpl { diff --git a/dlls/vssapi/main.c b/dlls/vssapi/main.c index 2ebd204..526772a 100644 --- a/dlls/vssapi/main.c +++ b/dlls/vssapi/main.c @@ -28,28 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL( vssapi ); -#undef __thiscall -#ifdef __i386__ /* thiscall functions are i386-specific */ - -#define THISCALL(func) __thiscall_ ## func -#define THISCALL_NAME(func) __ASM_NAME("__thiscall_" #func) -#define __thiscall __stdcall -#define DEFINE_THISCALL_WRAPPER(func,args) \ - extern void THISCALL(func)(void); \ - __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ - "popl %eax\n\t" \ - "pushl %ecx\n\t" \ - "pushl %eax\n\t" \ - "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) -#else /* __i386__ */ - -#define THISCALL(func) func -#define THISCALL_NAME(func) __ASM_NAME(#func) -#define __thiscall __cdecl -#define DEFINE_THISCALL_WRAPPER(func,args) /* nothing */ - -#endif /* __i386__ */ - struct CVssWriter { void **vtable; diff --git a/include/wine/asm.h b/include/wine/asm.h index f1c50fd..a581b12 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -88,4 +88,41 @@ #endif /* __i386__ */ +/* thiscall support */ + +#undef __thiscall +#define __thiscall __stdcall + +#ifdef __i386__ + +# ifdef _MSC_VER +# define DEFINE_THISCALL_WRAPPER(func,args) \ + __declspec(naked) HRESULT __thiscall_##func(void) \ + { __asm { \ + pop eax \ + push ecx \ + push eax \ + jmp func \ + } } +# else /* _MSC_VER */ +# define DEFINE_THISCALL_WRAPPER(func,args) \ + extern void __thiscall_ ## func(void); \ + __ASM_GLOBAL_FUNC( __thiscall_ ## func, \ + "popl %eax\n\t" \ + "pushl %ecx\n\t" \ + "pushl %eax\n\t" \ + "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) +# endif /* _MSC_VER */ + +# define THISCALL(func) (void *)__thiscall_ ## func +# define THISCALL_NAME(func) __ASM_NAME("__thiscall_" #func) + +#else /* __i386__ */ + +# define DEFINE_THISCALL_WRAPPER(func,args) /* nothing */ +# define THISCALL(func) func +# define THISCALL_NAME(func) __ASM_NAME(#func) + +#endif /* __i386__ */ + #endif /* __WINE_WINE_ASM_H */

1 0

Huw Davies : kernel32: Simplify TIME_CompTimeZoneID() by passing time as LONGLONG.
by Alexandre Julliard 15 May '19

15 May '19

Module: wine Branch: master Commit: 3593f7da663e451a9a77d23268e8f81eb4e539cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=3593f7da663e451a9a77d232… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 15 11:45:50 2019 +0100 kernel32: Simplify TIME_CompTimeZoneID() by passing time as LONGLONG. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/time.c | 52 ++++++++++++++++++++++++---------------------------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index e7f5f0e..8805c81 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -146,7 +146,7 @@ static int TIME_DayLightCompareDate( const SYSTEMTIME *date, * * PARAMS * pTZinfo [in] The time zone data. - * lpFileTime [in] The system or local time. + * time [in] The system or local time. * islocal [in] it is local time. * * RETURNS @@ -156,14 +156,13 @@ static int TIME_DayLightCompareDate( const SYSTEMTIME *date, * TIME_ZONE_ID_DAYLIGHT Current time is daylight savings time */ static DWORD TIME_CompTimeZoneID ( const TIME_ZONE_INFORMATION *pTZinfo, - FILETIME *lpFileTime, BOOL islocal ) + LONGLONG time, BOOL islocal ) { int ret, year; BOOL beforeStandardDate, afterDaylightDate; DWORD retval = TIME_ZONE_ID_INVALID; - LONGLONG llTime = 0; /* initialized to prevent gcc complaining */ SYSTEMTIME SysTime; - FILETIME ftTemp; + FILETIME ft; if (pTZinfo->DaylightDate.wMonth != 0) { @@ -181,20 +180,17 @@ static DWORD TIME_CompTimeZoneID ( const TIME_ZONE_INFORMATION *pTZinfo, return TIME_ZONE_ID_INVALID; } - if (!islocal) { - llTime = filetime_to_longlong( lpFileTime ); - llTime -= pTZinfo->Bias * (LONGLONG)600000000; - longlong_to_filetime( llTime, &ftTemp ); - lpFileTime = &ftTemp; - } + if (!islocal) + time -= pTZinfo->Bias * (LONGLONG)600000000; - FileTimeToSystemTime(lpFileTime, &SysTime); + longlong_to_filetime( time, &ft ); + FileTimeToSystemTime( &ft, &SysTime ); year = SysTime.wYear; if (!islocal) { - llTime -= pTZinfo->DaylightBias * (LONGLONG)600000000; - longlong_to_filetime( llTime, &ftTemp ); - FileTimeToSystemTime(lpFileTime, &SysTime); + time -= pTZinfo->DaylightBias * (LONGLONG)600000000; + longlong_to_filetime( time, &ft ); + FileTimeToSystemTime( &ft, &SysTime ); } /* check for daylight savings */ @@ -208,14 +204,13 @@ static DWORD TIME_CompTimeZoneID ( const TIME_ZONE_INFORMATION *pTZinfo, beforeStandardDate = SysTime.wYear < year; if (!islocal) { - llTime -= ( pTZinfo->StandardBias - pTZinfo->DaylightBias ) - * (LONGLONG)600000000; - longlong_to_filetime( llTime, &ftTemp ); - FileTimeToSystemTime(lpFileTime, &SysTime); + time -= ( pTZinfo->StandardBias - pTZinfo->DaylightBias ) * (LONGLONG)600000000; + longlong_to_filetime( time, &ft ); + FileTimeToSystemTime( &ft, &SysTime ); } if(year == SysTime.wYear) { - ret = TIME_DayLightCompareDate( &SysTime, &pTZinfo->DaylightDate); + ret = TIME_DayLightCompareDate( &SysTime, &pTZinfo->DaylightDate ); if (ret == -2) return TIME_ZONE_ID_INVALID; @@ -224,7 +219,7 @@ static DWORD TIME_CompTimeZoneID ( const TIME_ZONE_INFORMATION *pTZinfo, afterDaylightDate = SysTime.wYear > year; retval = TIME_ZONE_ID_STANDARD; - if( pTZinfo->DaylightDate.wMonth < pTZinfo->StandardDate.wMonth ) { + if( pTZinfo->DaylightDate.wMonth < pTZinfo->StandardDate.wMonth ) { /* Northern hemisphere */ if( beforeStandardDate && afterDaylightDate ) retval = TIME_ZONE_ID_DAYLIGHT; @@ -254,9 +249,10 @@ static DWORD TIME_CompTimeZoneID ( const TIME_ZONE_INFORMATION *pTZinfo, */ static DWORD TIME_ZoneID( const TIME_ZONE_INFORMATION *pTzi ) { - FILETIME ftTime; - GetSystemTimeAsFileTime( &ftTime); - return TIME_CompTimeZoneID( pTzi, &ftTime, FALSE); + LARGE_INTEGER now; + + NtQuerySystemTime( &now ); + return TIME_CompTimeZoneID( pTzi, now.QuadPart, FALSE ); } /*********************************************************************** @@ -266,7 +262,7 @@ static DWORD TIME_ZoneID( const TIME_ZONE_INFORMATION *pTzi ) * * PARAMS * pTZinfo [in] The time zone data. - * lpFileTime [in] The system or local time. + * time [in] The system or local time. * islocal [in] It is local time. * pBias [out] The calculated bias in minutes. * @@ -274,10 +270,10 @@ static DWORD TIME_ZoneID( const TIME_ZONE_INFORMATION *pTzi ) * TRUE when the time zone bias was calculated. */ static BOOL TIME_GetTimezoneBias( const TIME_ZONE_INFORMATION *pTZinfo, - FILETIME *lpFileTime, BOOL islocal, LONG *pBias ) + LONGLONG time, BOOL islocal, LONG *pBias ) { LONG bias = pTZinfo->Bias; - DWORD tzid = TIME_CompTimeZoneID( pTZinfo, lpFileTime, islocal); + DWORD tzid = TIME_CompTimeZoneID( pTZinfo, time, islocal ); if( tzid == TIME_ZONE_ID_INVALID) return FALSE; @@ -700,7 +696,7 @@ BOOL WINAPI SystemTimeToTzSpecificLocalTime( if (!SystemTimeToFileTime(lpUniversalTime, &ft)) return FALSE; llTime = filetime_to_longlong( &ft ); - if (!TIME_GetTimezoneBias(&tzinfo, &ft, FALSE, &lBias)) + if (!TIME_GetTimezoneBias(&tzinfo, llTime, FALSE, &lBias)) return FALSE; /* convert minutes to 100-nanoseconds-ticks */ llTime -= (LONGLONG)lBias * 600000000; @@ -745,7 +741,7 @@ BOOL WINAPI TzSpecificLocalTimeToSystemTime( if (!SystemTimeToFileTime(lpLocalTime, &ft)) return FALSE; t = filetime_to_longlong( &ft ); - if (!TIME_GetTimezoneBias(&tzinfo, &ft, TRUE, &lBias)) + if (!TIME_GetTimezoneBias(&tzinfo, t, TRUE, &lBias)) return FALSE; /* convert minutes to 100-nanoseconds-ticks */ t += (LONGLONG)lBias * 600000000;

1 0