wine-commits April 2020

wine-commits@winehq.org

2 participants
1016 discussions

Henri Verbeet : wined3d: Use the bo binding in wined3d_context_gl_unmap_bo_address().
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: b29ea85885ba7f48b1df42219378101c9fc1707b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b29ea85885ba7f48b1df4221… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 22 18:00:43 2020 +0430 wined3d: Use the bo binding in wined3d_context_gl_unmap_bo_address(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 8 +------- dlls/wined3d/context_gl.c | 17 +++++++++-------- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index f2cbb06860..9040fad8a9 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4635,13 +4635,7 @@ static void *adapter_gl_map_bo_address(struct wined3d_context *context, static void adapter_gl_unmap_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, uint32_t bind_flags, unsigned int range_count, const struct wined3d_range *ranges) { - struct wined3d_context_gl *context_gl; - GLenum binding; - - context_gl = wined3d_context_gl(context); - binding = wined3d_buffer_gl_binding_from_bind_flags(context_gl->gl_info, bind_flags); - - wined3d_context_gl_unmap_bo_address(context_gl, data, binding, range_count, ranges); + wined3d_context_gl_unmap_bo_address(wined3d_context_gl(context), data, range_count, ranges); } static void adapter_gl_copy_bo_address(struct wined3d_context *context, diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 2bb11c3068..a1aa3c0bb9 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2554,8 +2554,8 @@ void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, return memory; } -void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *data, - GLenum binding, unsigned int range_count, const struct wined3d_range *ranges) +void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, + const struct wined3d_bo_address *data, unsigned int range_count, const struct wined3d_range *ranges) { const struct wined3d_gl_info *gl_info; struct wined3d_bo_gl *bo; @@ -2565,18 +2565,19 @@ void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, return; gl_info = context_gl->gl_info; - wined3d_context_gl_bind_bo(context_gl, binding, bo->id); + wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { for (i = 0; i < range_count; ++i) { - GL_EXTCALL(glFlushMappedBufferRange(binding, (UINT_PTR)data->addr + ranges[i].offset, ranges[i].size)); + GL_EXTCALL(glFlushMappedBufferRange(bo->binding, + (UINT_PTR)data->addr + ranges[i].offset, ranges[i].size)); } } - GL_EXTCALL(glUnmapBuffer(binding)); - wined3d_context_gl_bind_bo(context_gl, binding, 0); + GL_EXTCALL(glUnmapBuffer(bo->binding)); + wined3d_context_gl_bind_bo(context_gl, bo->binding, 0); checkGLcall("Unmap buffer object"); } @@ -2611,8 +2612,8 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, range.offset = 0; range.size = size; - wined3d_context_gl_unmap_bo_address(context_gl, dst, dst_bo->binding, 1, &range); - wined3d_context_gl_unmap_bo_address(context_gl, src, src_bo->binding, 0, NULL); + wined3d_context_gl_unmap_bo_address(context_gl, dst, 1, &range); + wined3d_context_gl_unmap_bo_address(context_gl, src, 0, NULL); } } else if (!dst_bo && src_bo) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e549a41309..7f31733547 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2178,7 +2178,7 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, dst_z + z, update_w, update_h, 1, converted_mem, srgb, dst_texture, gl_info); } - wined3d_context_gl_unmap_bo_address(context_gl, &bo, GL_PIXEL_UNPACK_BUFFER, 0, NULL); + wined3d_context_gl_unmap_bo_address(context_gl, &bo, 0, NULL); heap_free(converted_mem); } else @@ -2820,7 +2820,7 @@ static BOOL wined3d_texture_gl_load_texture(struct wined3d_texture_gl *texture_g width, height, &texture_gl->t.async.gl_color_key); src_row_pitch = dst_row_pitch; src_slice_pitch = dst_slice_pitch; - wined3d_context_gl_unmap_bo_address(context_gl, &data, GL_PIXEL_UNPACK_BUFFER, 0, NULL); + wined3d_context_gl_unmap_bo_address(context_gl, &data, 0, NULL); data.buffer_object = 0; data.addr = dst_mem; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f835432b68..6a6b26a6ff 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2209,7 +2209,7 @@ 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_unload_tex_coords(const struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *data, - GLenum binding, unsigned int range_count, const struct wined3d_range *ranges) DECLSPEC_HIDDEN; + unsigned int range_count, const struct wined3d_range *ranges) DECLSPEC_HIDDEN; void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context_gl, const struct wined3d_state *state) DECLSPEC_HIDDEN;

1 0

Jacek Caban : server: Block by waiting on context handle in get_thread_context.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: c4dab9b76eb7397f6e5325ff4bdf792cf500e571 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4dab9b76eb7397f6e5325ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 22 14:33:23 2020 +0200 server: Block by waiting on context handle in get_thread_context. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48052 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45546 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 35 ++++++++----------- include/wine/server_protocol.h | 8 ++--- server/protocol.def | 5 ++- server/request.h | 5 ++- server/thread.c | 78 +++++++++++++++++++++++++++++------------- server/trace.c | 3 +- 6 files changed, 77 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c4dab9b76eb7397f6e53…

1 0

Henri Verbeet : wined3d: Use the bo binding in wined3d_context_gl_map_bo_address().
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: 7d43577d89e3be02372c472c95ad42d35bc456f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d43577d89e3be02372c472c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 22 18:00:42 2020 +0430 wined3d: Use the bo binding in wined3d_context_gl_map_bo_address(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 8 +------- dlls/wined3d/context_gl.c | 14 +++++++------- dlls/wined3d/texture.c | 6 ++---- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 11 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index ec8a2cadd2..f2cbb06860 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4629,13 +4629,7 @@ static void adapter_gl_uninit_3d(struct wined3d_device *device) static void *adapter_gl_map_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, size_t size, uint32_t bind_flags, uint32_t map_flags) { - struct wined3d_context_gl *context_gl; - GLenum binding; - - context_gl = wined3d_context_gl(context); - binding = wined3d_buffer_gl_binding_from_bind_flags(context_gl->gl_info, bind_flags); - - return wined3d_context_gl_map_bo_address(context_gl, data, size, binding, map_flags); + return wined3d_context_gl_map_bo_address(wined3d_context_gl(context), data, size, map_flags); } static void adapter_gl_unmap_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 4e0af7474c..2bb11c3068 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2525,7 +2525,7 @@ void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLen } void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, - const struct wined3d_bo_address *data, size_t size, GLenum binding, DWORD flags) + const struct wined3d_bo_address *data, size_t size, uint32_t flags) { const struct wined3d_gl_info *gl_info; struct wined3d_bo_gl *bo; @@ -2535,20 +2535,20 @@ void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, return data->addr; gl_info = context_gl->gl_info; - wined3d_context_gl_bind_bo(context_gl, binding, bo->id); + wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { - memory = GL_EXTCALL(glMapBufferRange(binding, (INT_PTR)data->addr, + memory = GL_EXTCALL(glMapBufferRange(bo->binding, (INT_PTR)data->addr, size, wined3d_resource_gl_map_flags(flags))); } else { - memory = GL_EXTCALL(glMapBuffer(binding, wined3d_resource_gl_legacy_map_flags(flags))); + memory = GL_EXTCALL(glMapBuffer(bo->binding, wined3d_resource_gl_legacy_map_flags(flags))); memory += (INT_PTR)data->addr; } - wined3d_context_gl_bind_bo(context_gl, binding, 0); + wined3d_context_gl_bind_bo(context_gl, bo->binding, 0); checkGLcall("Map buffer object"); return memory; @@ -2604,8 +2604,8 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, } else { - src_ptr = wined3d_context_gl_map_bo_address(context_gl, src, size, src_bo->binding, WINED3D_MAP_READ); - dst_ptr = wined3d_context_gl_map_bo_address(context_gl, dst, size, dst_bo->binding, WINED3D_MAP_WRITE); + src_ptr = wined3d_context_gl_map_bo_address(context_gl, src, size, WINED3D_MAP_READ); + dst_ptr = wined3d_context_gl_map_bo_address(context_gl, dst, size, WINED3D_MAP_WRITE); memcpy(dst_ptr, src_ptr, size); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index d075ccc9cd..e549a41309 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2160,8 +2160,7 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, return; } - src_mem = wined3d_context_gl_map_bo_address(context_gl, &bo, - src_slice_pitch * update_d, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); + src_mem = wined3d_context_gl_map_bo_address(context_gl, &bo, src_slice_pitch * update_d, WINED3D_MAP_READ); for (z = 0; z < update_d; ++z, src_mem += src_slice_pitch) { @@ -2811,8 +2810,7 @@ static BOOL wined3d_texture_gl_load_texture(struct wined3d_texture_gl *texture_g wined3d_format_calculate_pitch(format, device->surface_alignment, width, height, &dst_row_pitch, &dst_slice_pitch); - src_mem = wined3d_context_gl_map_bo_address(context_gl, &data, - src_slice_pitch, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); + src_mem = wined3d_context_gl_map_bo_address(context_gl, &data, src_slice_pitch, WINED3D_MAP_READ); if (!(dst_mem = heap_alloc(dst_slice_pitch))) { ERR("Out of memory (%u).\n", dst_slice_pitch); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5f0b1eee7f..f835432b68 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2200,7 +2200,7 @@ 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_map_bo_address(struct wined3d_context_gl *context_gl, - const struct wined3d_bo_address *data, size_t size, GLenum binding, DWORD flags) DECLSPEC_HIDDEN; + const struct wined3d_bo_address *data, size_t size, uint32_t flags) DECLSPEC_HIDDEN; struct wined3d_context_gl *wined3d_context_gl_reacquire(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_release(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; BOOL wined3d_context_gl_set_current(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN;

1 0

Jacek Caban : server: Don't wait for client thread to enter suspended state in set_thread_context.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: aa0c4bb5e72caf290b6588bc1f9931cc89a9feb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa0c4bb5e72caf290b6588bc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 22 14:33:09 2020 +0200 server: Don't wait for client thread to enter suspended state in set_thread_context. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 26 -------------------------- server/thread.c | 22 ++++------------------ 2 files changed, 4 insertions(+), 44 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index ee3c925f91..b8c270c16d 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -787,42 +787,16 @@ TEB_ACTIVE_FRAME * WINAPI RtlGetFrame(void) NTSTATUS set_thread_context( HANDLE handle, const context_t *context, BOOL *self ) { NTSTATUS ret; - DWORD dummy, i; SERVER_START_REQ( set_thread_context ) { req->handle = wine_server_obj_handle( handle ); - req->suspend = 1; wine_server_add_data( req, context, sizeof(*context) ); ret = wine_server_call( req ); *self = reply->self; } SERVER_END_REQ; - if (ret == STATUS_PENDING) - { - for (i = 0; i < 100; i++) - { - SERVER_START_REQ( set_thread_context ) - { - req->handle = wine_server_obj_handle( handle ); - req->suspend = 0; - wine_server_add_data( req, context, sizeof(*context) ); - ret = wine_server_call( req ); - } - SERVER_END_REQ; - if (ret == STATUS_PENDING) - { - LARGE_INTEGER timeout; - timeout.QuadPart = -10000; - NtDelayExecution( FALSE, &timeout ); - } - else break; - } - NtResumeThread( handle, &dummy ); - if (ret == STATUS_PENDING) ret = STATUS_ACCESS_DENIED; - } - return ret; } diff --git a/server/thread.c b/server/thread.c index 07be868d48..de508c6ace 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1859,35 +1859,21 @@ DECL_HANDLER(set_thread_context) if (!(thread = get_thread_from_handle( req->handle, THREAD_SET_CONTEXT ))) return; reply->self = (thread == current); - if (thread != current && (!thread->context || thread->context->status == STATUS_PENDING)) - { - /* thread is not suspended, retry (if it's still running) */ - if (thread->state == RUNNING) - { - set_error( STATUS_PENDING ); - if (req->suspend) - { - release_object( thread ); - /* make sure we have suspend access */ - if (!(thread = get_thread_from_handle( req->handle, THREAD_SUSPEND_RESUME ))) return; - suspend_thread( thread ); - } - } - else set_error( STATUS_UNSUCCESSFUL ); - } - else if (context->cpu == thread->process->cpu) + if (thread->state == TERMINATED) set_error( STATUS_UNSUCCESSFUL ); + else if (context->cpu != thread->process->cpu) set_error( STATUS_INVALID_PARAMETER ); + else { unsigned int system_flags = get_context_system_regs(context->cpu) & context->flags; unsigned int client_flags = context->flags & ~system_flags; if (system_flags) set_thread_context( thread, context, system_flags ); + if (thread != current && !get_error()) stop_thread( thread ); if (thread->context && !get_error()) { copy_context( &thread->context->regs, context, context->flags ); thread->context->regs.flags |= client_flags; } } - else set_error( STATUS_INVALID_PARAMETER ); release_object( thread ); }

1 0

Jacek Caban : server: Create thread context object in stop_thread.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: 2960a973d1263118515df1022ba4e72b1c7c52ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=2960a973d1263118515df102… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 22 14:31:54 2020 +0200 server: Create thread context object in stop_thread. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/thread.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/server/thread.c b/server/thread.c index 341693b7bd..07be868d48 100644 --- a/server/thread.c +++ b/server/thread.c @@ -131,6 +131,7 @@ static const struct object_ops thread_apc_ops = struct context { struct object obj; /* object header */ + unsigned int status; /* status of the context */ context_t regs; /* context data */ }; @@ -270,6 +271,7 @@ static struct context *create_thread_context( struct thread *thread ) { struct context *context; if (!(context = alloc_object( &context_ops ))) return NULL; + context->status = STATUS_PENDING; memset( &context->regs, 0, sizeof(context->regs) ); context->regs.cpu = thread->process->cpu; return context; @@ -374,6 +376,7 @@ static void cleanup_thread( struct thread *thread ) if (thread->context) { + thread->context->status = STATUS_ACCESS_DENIED; release_object( thread->context ); thread->context = NULL; } @@ -639,7 +642,8 @@ static void set_thread_info( struct thread *thread, /* stop a thread (at the Unix level) */ void stop_thread( struct thread *thread ) { - if (thread->context) return; /* already inside a debug event, no need for a signal */ + if (thread->context) return; /* already suspended, no need for a signal */ + if (!(thread->context = create_thread_context( thread ))) return; /* can't stop a thread while initialisation is in progress */ if (is_process_init_done(thread->process)) send_thread_signal( thread, SIGUSR1 ); } @@ -1463,7 +1467,7 @@ DECL_HANDLER(init_thread) reply->version = SERVER_PROTOCOL_VERSION; reply->server_start = server_start_time; reply->all_cpus = supported_cpus & get_prefix_cpu_mask(); - reply->suspend = (current->suspend || process->suspend); + reply->suspend = (current->suspend || process->suspend || current->context != NULL); return; error: @@ -1608,14 +1612,15 @@ DECL_HANDLER(select) if (get_req_data_size() - sizeof(*result) - req->size == sizeof(context_t)) { const context_t *context = (const context_t *)((const char *)(result + 1) + req->size); - if (current->context || context->cpu != current->process->cpu) + if ((current->context && current->context->status != STATUS_PENDING) || context->cpu != current->process->cpu) { set_error( STATUS_INVALID_PARAMETER ); return; } - if (!(current->context = create_thread_context( current ))) return; - copy_context( &current->context->regs, context, context->flags ); + if (!current->context && !(current->context = create_thread_context( current ))) return; + copy_context( &current->context->regs, context, context->flags & ~current->context->regs.flags ); + current->context->status = STATUS_SUCCESS; current->suspend_cookie = req->cookie; } @@ -1808,7 +1813,7 @@ DECL_HANDLER(get_thread_context) if (!(thread = get_thread_from_handle( req->handle, THREAD_GET_CONTEXT ))) return; reply->self = (thread == current); - if (thread != current && !thread->context) + if (thread != current && (!thread->context || thread->context->status == STATUS_PENDING)) { /* thread is not suspended, retry (if it's still running) */ if (thread->state == RUNNING) @@ -1854,7 +1859,7 @@ DECL_HANDLER(set_thread_context) if (!(thread = get_thread_from_handle( req->handle, THREAD_SET_CONTEXT ))) return; reply->self = (thread == current); - if (thread != current && !thread->context) + if (thread != current && (!thread->context || thread->context->status == STATUS_PENDING)) { /* thread is not suspended, retry (if it's still running) */ if (thread->state == RUNNING)

1 0

Jacek Caban : server: Make thread context a server object.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: 40e849ffa46ae3cd060e2db83305dda1c4d2648e URL: https://source.winehq.org/git/wine.git/?a=commit;h=40e849ffa46ae3cd060e2db8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 22 14:31:36 2020 +0200 server: Make thread context a server object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/thread.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++---------- server/thread.h | 2 +- 2 files changed, 70 insertions(+), 15 deletions(-) diff --git a/server/thread.c b/server/thread.c index 534fab6597..341693b7bd 100644 --- a/server/thread.c +++ b/server/thread.c @@ -126,6 +126,40 @@ static const struct object_ops thread_apc_ops = }; +/* thread CPU context */ + +struct context +{ + struct object obj; /* object header */ + context_t regs; /* context data */ +}; + +static void dump_context( struct object *obj, int verbose ); + +static const struct object_ops context_ops = +{ + sizeof(struct context), /* size */ + dump_context, /* dump */ + no_get_type, /* get_type */ + add_queue, /* add_queue */ + remove_queue, /* remove_queue */ + NULL, /* signaled */ + no_satisfied, /* satisfied */ + no_signal, /* signal */ + no_get_fd, /* get_fd */ + no_map_access, /* map_access */ + default_get_sd, /* get_sd */ + default_set_sd, /* set_sd */ + no_lookup_name, /* lookup_name */ + no_link_name, /* link_name */ + NULL, /* unlink_name */ + no_open_file, /* open_file */ + no_kernel_obj_list, /* get_kernel_obj_list */ + no_close_handle, /* close_handle */ + no_destroy /* destroy */ +}; + + /* thread operations */ static void dump_thread( struct object *obj, int verbose ); @@ -221,6 +255,27 @@ static inline int is_valid_address( client_ptr_t addr ) return addr && !(addr % sizeof(int)); } + +/* dump a context on stdout for debugging purposes */ +static void dump_context( struct object *obj, int verbose ) +{ + struct context *context = (struct context *)obj; + assert( obj->ops == &context_ops ); + + fprintf( stderr, "context flags=%x\n", context->regs.flags ); +} + + +static struct context *create_thread_context( struct thread *thread ) +{ + struct context *context; + if (!(context = alloc_object( &context_ops ))) return NULL; + memset( &context->regs, 0, sizeof(context->regs) ); + context->regs.cpu = thread->process->cpu; + return context; +} + + /* create a new thread */ struct thread *create_thread( int fd, struct process *process, const struct security_descriptor *sd ) { @@ -317,6 +372,11 @@ static void cleanup_thread( struct thread *thread ) { int i; + if (thread->context) + { + release_object( thread->context ); + thread->context = NULL; + } clear_apc_queue( &thread->system_apc ); clear_apc_queue( &thread->user_apc ); free( thread->req_data ); @@ -324,7 +384,6 @@ static void cleanup_thread( struct thread *thread ) if (thread->request_fd) release_object( thread->request_fd ); if (thread->reply_fd) release_object( thread->reply_fd ); if (thread->wait_fd) release_object( thread->wait_fd ); - free( thread->context ); cleanup_clipboard_thread(thread); destroy_thread_windows( thread ); free_msg_queue( thread ); @@ -343,7 +402,6 @@ static void cleanup_thread( struct thread *thread ) thread->request_fd = NULL; thread->reply_fd = NULL; thread->wait_fd = NULL; - thread->context = NULL; thread->desktop = 0; thread->desc = NULL; thread->desc_len = 0; @@ -776,9 +834,9 @@ static int send_thread_wakeup( struct thread *thread, client_ptr_t cookie, int s if (thread->context && thread->suspend_cookie == cookie && signaled != STATUS_KERNEL_APC && signaled != STATUS_USER_APC) { - if (!thread->context->flags) + if (!thread->context->regs.flags) { - free( thread->context ); + release_object( thread->context ); thread->context = NULL; } else signaled = STATUS_KERNEL_APC; /* signal a fake APC so that client calls select to get a new context */ @@ -1556,9 +1614,8 @@ DECL_HANDLER(select) return; } - if (!(current->context = mem_alloc( sizeof(*context) ))) return; - memcpy( current->context, context, sizeof(*context) ); - current->context->flags = 0; /* to keep track of what is modified */ + if (!(current->context = create_thread_context( current ))) return; + copy_context( &current->context->regs, context, context->flags ); current->suspend_cookie = req->cookie; } @@ -1633,10 +1690,8 @@ DECL_HANDLER(select) else if (get_error() != STATUS_PENDING && get_reply_max_size() == sizeof(context_t) && current->context && current->suspend_cookie == req->cookie) { - if (current->context->flags) - set_reply_data_ptr( current->context, sizeof(context_t) ); - else - free( current->context ); + if (current->context->regs.flags) set_reply_data( &current->context->regs, sizeof(context_t) ); + release_object( current->context ); current->context = NULL; } } @@ -1777,7 +1832,7 @@ DECL_HANDLER(get_thread_context) context->cpu = thread->process->cpu; if (thread->context) { - copy_context( context, thread->context, req->flags & ~flags ); + copy_context( context, &thread->context->regs, req->flags & ~flags ); context->flags |= req->flags & ~flags; } if (req->flags & flags) get_thread_context( thread, context, req->flags & flags ); @@ -1823,8 +1878,8 @@ DECL_HANDLER(set_thread_context) if (system_flags) set_thread_context( thread, context, system_flags ); if (thread->context && !get_error()) { - copy_context( thread->context, context, context->flags ); - thread->context->flags |= client_flags; + copy_context( &thread->context->regs, context, context->flags ); + thread->context->regs.flags |= client_flags; } } else set_error( STATUS_INVALID_PARAMETER ); diff --git a/server/thread.h b/server/thread.h index b86d8d3dbe..5d12d24dd8 100644 --- a/server/thread.h +++ b/server/thread.h @@ -75,7 +75,7 @@ struct thread int exit_code; /* thread exit code */ int unix_pid; /* Unix pid of client */ int unix_tid; /* Unix tid of client */ - context_t *context; /* current context */ + struct context *context; /* current context */ client_ptr_t suspend_cookie;/* wait cookie of suspending select */ client_ptr_t teb; /* TEB address (in client address space) */ client_ptr_t entry_point; /* entry point (in client address space) */

1 0

Jacek Caban : server: Don't change cached thread context in set_thread_context.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: 80ceafc2a1da1630be7665ca5d960a2972f9689e URL: https://source.winehq.org/git/wine.git/?a=commit;h=80ceafc2a1da1630be7665ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 22 14:31:18 2020 +0200 server: Don't change cached thread context in set_thread_context. Let the caller take care of that. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/mach.c | 13 +------------ server/ptrace.c | 14 -------------- server/thread.c | 2 +- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/server/mach.c b/server/mach.c index 3690b29004..69f3ee22a9 100644 --- a/server/mach.c +++ b/server/mach.c @@ -283,18 +283,7 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign state.uds.ds32.dr7 = dr7; #endif } - if (!thread_set_state( port, x86_DEBUG_STATE, (thread_state_t)&state, count )) - { - if (thread->context) /* update the cached values */ - { -#ifdef __x86_64__ - if (thread->process->cpu == CPU_x86_64) - thread->context->debug.x86_64_regs = context->debug.x86_64_regs; - else -#endif - thread->context->debug.i386_regs = context->debug.i386_regs; - } - } + thread_set_state( port, x86_DEBUG_STATE, (thread_state_t)&state, count ); mach_port_deallocate( mach_task_self(), port ); #endif } diff --git a/server/ptrace.c b/server/ptrace.c index 6be1591d54..49347791d8 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -637,36 +637,24 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign /* Linux 2.6.33+ does DR0-DR3 alignment validation, so it has to know LEN bits first */ if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.i386_regs.dr7 & 0xffff0000 ) == -1) goto error; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(0), context->debug.i386_regs.dr0 ) == -1) goto error; - if (thread->context) thread->context->debug.i386_regs.dr0 = context->debug.i386_regs.dr0; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(1), context->debug.i386_regs.dr1 ) == -1) goto error; - if (thread->context) thread->context->debug.i386_regs.dr1 = context->debug.i386_regs.dr1; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(2), context->debug.i386_regs.dr2 ) == -1) goto error; - if (thread->context) thread->context->debug.i386_regs.dr2 = context->debug.i386_regs.dr2; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(3), context->debug.i386_regs.dr3 ) == -1) goto error; - if (thread->context) thread->context->debug.i386_regs.dr3 = context->debug.i386_regs.dr3; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(6), context->debug.i386_regs.dr6 ) == -1) goto error; - if (thread->context) thread->context->debug.i386_regs.dr6 = context->debug.i386_regs.dr6; /* Linux 2.6.33+ needs enable bits set briefly to update value returned by PEEKUSER later */ ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.i386_regs.dr7 | 0x55 ); if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.i386_regs.dr7 ) == -1) goto error; - if (thread->context) thread->context->debug.i386_regs.dr7 = context->debug.i386_regs.dr7; thread->system_regs |= SERVER_CTX_DEBUG_REGISTERS; break; case CPU_x86_64: if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.x86_64_regs.dr7 & 0xffff0000 ) == -1) goto error; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(0), context->debug.x86_64_regs.dr0 ) == -1) goto error; - if (thread->context) thread->context->debug.x86_64_regs.dr0 = context->debug.x86_64_regs.dr0; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(1), context->debug.x86_64_regs.dr1 ) == -1) goto error; - if (thread->context) thread->context->debug.x86_64_regs.dr1 = context->debug.x86_64_regs.dr1; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(2), context->debug.x86_64_regs.dr2 ) == -1) goto error; - if (thread->context) thread->context->debug.x86_64_regs.dr2 = context->debug.x86_64_regs.dr2; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(3), context->debug.x86_64_regs.dr3 ) == -1) goto error; - if (thread->context) thread->context->debug.x86_64_regs.dr3 = context->debug.x86_64_regs.dr3; if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(6), context->debug.x86_64_regs.dr6 ) == -1) goto error; - if (thread->context) thread->context->debug.x86_64_regs.dr6 = context->debug.x86_64_regs.dr6; ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.x86_64_regs.dr7 | 0x55 ); if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.x86_64_regs.dr7 ) == -1) goto error; - if (thread->context) thread->context->debug.x86_64_regs.dr7 = context->debug.x86_64_regs.dr7; thread->system_regs |= SERVER_CTX_DEBUG_REGISTERS; break; default: @@ -785,8 +773,6 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign #endif if (ptrace( PTRACE_SETDBREGS, pid, (caddr_t)&dbregs, 0 ) != -1) { - if (thread->context) - thread->context->debug.i386_regs = context->debug.i386_regs; /* update the cached values */ thread->system_regs |= SERVER_CTX_DEBUG_REGISTERS; } else file_set_error(); diff --git a/server/thread.c b/server/thread.c index 0d3cb28f5c..534fab6597 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1823,7 +1823,7 @@ DECL_HANDLER(set_thread_context) if (system_flags) set_thread_context( thread, context, system_flags ); if (thread->context && !get_error()) { - copy_context( thread->context, context, client_flags ); + copy_context( thread->context, context, context->flags ); thread->context->flags |= client_flags; } }

1 0

Jacek Caban : server: Don't change context flags in copy_context.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: 89b4bdd6cd173db729f6ef9f8389a40d463ded68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89b4bdd6cd173db729f6ef9f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 22 14:31:01 2020 +0200 server: Don't change context flags in copy_context. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/thread.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/server/thread.c b/server/thread.c index 9c22d83a9d..0d3cb28f5c 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1202,7 +1202,6 @@ void kill_thread( struct thread *thread, int violent_death ) static void copy_context( context_t *to, const context_t *from, unsigned int flags ) { assert( to->cpu == from->cpu ); - to->flags |= flags; if (flags & SERVER_CTX_CONTROL) to->ctl = from->ctl; if (flags & SERVER_CTX_INTEGER) to->integer = from->integer; if (flags & SERVER_CTX_SEGMENTS) to->seg = from->seg; @@ -1776,7 +1775,11 @@ DECL_HANDLER(get_thread_context) memset( context, 0, sizeof(context_t) ); context->cpu = thread->process->cpu; - if (thread->context) copy_context( context, thread->context, req->flags & ~flags ); + if (thread->context) + { + copy_context( context, thread->context, req->flags & ~flags ); + context->flags |= req->flags & ~flags; + } if (req->flags & flags) get_thread_context( thread, context, req->flags & flags ); } release_object( thread ); @@ -1818,7 +1821,11 @@ DECL_HANDLER(set_thread_context) unsigned int client_flags = context->flags & ~system_flags; if (system_flags) set_thread_context( thread, context, system_flags ); - if (thread->context && !get_error()) copy_context( thread->context, context, client_flags ); + if (thread->context && !get_error()) + { + copy_context( thread->context, context, client_flags ); + thread->context->flags |= client_flags; + } } else set_error( STATUS_INVALID_PARAMETER );

1 0

Alexandre Julliard : ntdll: Add a helper function to allocate module dependencies.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: d2b70aa57a77103107a2e620999181c518d14bda URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2b70aa57a77103107a2e620… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 22 16:01:55 2020 +0200 ntdll: Add a helper function to allocate module dependencies. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index b457d60f6b..04ea7ea121 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -599,6 +599,27 @@ static WINE_MODREF *find_so_module( void *handle ) } +/************************************************************************* + * grow_module_deps + */ +static WINE_MODREF **grow_module_deps( WINE_MODREF *wm, int count ) +{ + WINE_MODREF **deps; + + if (wm->alloc_deps) + deps = RtlReAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, wm->deps, + (wm->alloc_deps + count) * sizeof(*deps) ); + else + deps = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, count * sizeof(*deps) ); + + if (deps) + { + wm->deps = deps; + wm->alloc_deps += count; + } + return deps; +} + /************************************************************************* * find_forwarded_export * @@ -632,18 +653,8 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS { if (!imports_fixup_done && current_modref) { - WINE_MODREF **deps; - if (current_modref->alloc_deps) - deps = RtlReAllocateHeap( GetProcessHeap(), 0, current_modref->deps, - (current_modref->alloc_deps + 1) * sizeof(*deps) ); - else - deps = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*deps) ); - if (deps) - { - deps[current_modref->nDeps++] = wm; - current_modref->deps = deps; - current_modref->alloc_deps++; - } + WINE_MODREF **deps = grow_module_deps( current_modref, 1 ); + if (deps) deps[current_modref->nDeps++] = wm; } else if (process_attach( wm, NULL ) != STATUS_SUCCESS) { @@ -1087,9 +1098,8 @@ static NTSTATUS fixup_imports_ilonly( WINE_MODREF *wm, LPCWSTR load_path, void * if (!(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) return STATUS_SUCCESS; /* already done */ wm->ldr.Flags &= ~LDR_DONT_RESOLVE_REFS; + if (!grow_module_deps( wm, 1 )) return STATUS_NO_MEMORY; wm->nDeps = 1; - wm->alloc_deps = 1; - wm->deps = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(WINE_MODREF *) ); prev = current_modref; current_modref = wm; @@ -1144,14 +1154,11 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) while (imports[nb_imports].Name && imports[nb_imports].FirstThunk) nb_imports++; if (!nb_imports) return STATUS_SUCCESS; /* no imports */ + if (!grow_module_deps( wm, nb_imports )) return STATUS_NO_MEMORY; if (!create_module_activation_context( &wm->ldr )) RtlActivateActivationContext( 0, wm->ldr.ActivationContext, &cookie ); - /* Allocate module dependency list */ - wm->alloc_deps = nb_imports; - wm->deps = RtlAllocateHeap( GetProcessHeap(), 0, nb_imports*sizeof(WINE_MODREF *) ); - /* load the imported modules. They are automatically * added to the modref list of the process. */

1 0

Alexandre Julliard : ntdll: The builtin load callback is no longer used for ntdll itself.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: 68e675d73db4fb90fff84c0e1f6de3b492061b5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=68e675d73db4fb90fff84c0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 22 15:50:44 2020 +0200 ntdll: The builtin load callback is no longer used for ntdll itself. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index e26b9d6b7f..b457d60f6b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2058,21 +2058,14 @@ static NTSTATUS build_so_dll_module( const WCHAR *load_path, const UNICODE_STRIN */ static void load_builtin_callback( void *module, const char *filename ) { - static const WCHAR emptyW[1]; - const WCHAR *load_path; - if (!module) { ERR("could not map image for %s\n", debugstr_us(builtin_load_info->filename) ); builtin_load_info->status = STATUS_NO_MEMORY; return; } - - load_path = builtin_load_info->load_path; - if (!load_path) load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; - if (!load_path) load_path = emptyW; - - builtin_load_info->status = build_so_dll_module( load_path, builtin_load_info->filename, module, + builtin_load_info->status = build_so_dll_module( builtin_load_info->load_path, + builtin_load_info->filename, module, 0, &builtin_load_info->wm ); } @@ -4482,7 +4475,7 @@ void __wine_process_init(void) NTSTATUS status; ANSI_STRING func_name; UNICODE_STRING nt_name; - HMODULE ntdll_module; + HMODULE ntdll_module = (HMODULE)((__wine_spec_nt_header.OptionalHeader.ImageBase + 0xffff) & ~0xffff); INITIAL_TEB stack; BOOL suspend; SIZE_T info_size; @@ -4512,15 +4505,11 @@ void __wine_process_init(void) /* setup the load callback and create ntdll modref */ RtlInitUnicodeString( &nt_name, ntdllW ); - default_load_info.filename = &nt_name; + map_so_dll( &__wine_spec_nt_header, ntdll_module ); + status = build_so_dll_module( params->DllPath.Buffer, &nt_name, ntdll_module, 0, &wm ); + assert( !status ); + wine_dll_set_callback( load_builtin_callback ); - ntdll_module = (HMODULE)((__wine_spec_nt_header.OptionalHeader.ImageBase + 0xffff) & ~0xffff); - if (!get_modref( ntdll_module )) - { - map_so_dll( &__wine_spec_nt_header, ntdll_module ); - status = build_so_dll_module( params->DllPath.Buffer, &nt_name, ntdll_module, 0, &wm ); - assert( !status ); - } RtlInitUnicodeString( &nt_name, kernel32W ); if ((status = load_builtin_dll( params->DllPath.Buffer, &nt_name, NULL, 0, &wm )) != STATUS_SUCCESS)

1 0

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 April 2020