August 2019 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Use the format info to determine the A8_UNORM output swizzle in find_ps_compile_args ().
by Alexandre Julliard Aug. 7, 2019

Aug. 7, 2019

Module: wine Branch: master Commit: 844a5ad74f0b850911392eecf8a36c0052269ba1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=844a5ad74f0b850911392eec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 7 16:29:57 2019 +0430 wined3d: Use the format info to determine the A8_UNORM output swizzle in find_ps_compile_args(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2bd201a..6061efa 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -4159,14 +4159,11 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 args->render_offscreen = shader->reg_maps.vpos && gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS] ? context->render_offscreen : 0; - if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + for (i = 0; i < ARRAY_SIZE(state->fb->render_targets); ++i) { - for (i = 0; i < ARRAY_SIZE(state->fb->render_targets); ++i) - { - struct wined3d_rendertarget_view *rtv = state->fb->render_targets[i]; - if (rtv && rtv->format->id == WINED3DFMT_A8_UNORM) - args->rt_alpha_swizzle |= 1u << i; - } + struct wined3d_rendertarget_view *rtv = state->fb->render_targets[i]; + if (rtv && rtv->format->id == WINED3DFMT_A8_UNORM && !is_identity_fixup(rtv->format->color_fixup)) + args->rt_alpha_swizzle |= 1u << i; } }

1 0

Henri Verbeet : wined3d: Move the "level" field from struct wined3d_context to struct wined3d_context_gl.
by Alexandre Julliard Aug. 7, 2019

Aug. 7, 2019

Module: wine Branch: master Commit: 6a66af88de69f2335035e3eeb4c3df365ef746a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a66af88de69f2335035e3ee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 7 16:29:59 2019 +0430 wined3d: Move the "level" field from struct wined3d_context to struct wined3d_context_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 20 +++++++++----------- dlls/wined3d/wined3d_private.h | 3 +-- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3349570..53d44d9 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1570,19 +1570,17 @@ BOOL wined3d_context_gl_set_current(struct wined3d_context_gl *context_gl) void wined3d_context_gl_release(struct wined3d_context_gl *context_gl) { - struct wined3d_context *context = &context_gl->c; - - TRACE("Releasing context %p, level %u.\n", context_gl, context->level); + TRACE("Releasing context %p, level %u.\n", context_gl, context_gl->level); if (WARN_ON(d3d)) { - if (!context->level) - WARN("Context %p is not active.\n", context); + if (!context_gl->level) + WARN("Context %p is not active.\n", context_gl); else if (context_gl != wined3d_context_gl_get_current()) - WARN("Context %p is not the current context.\n", context); + WARN("Context %p is not the current context.\n", context_gl); } - if (!--context->level) + if (!--context_gl->level) { if (wined3d_context_gl_restore_pixel_format(context_gl)) context_gl->needs_set = 1; @@ -1594,7 +1592,7 @@ void wined3d_context_gl_release(struct wined3d_context_gl *context_gl) context_gl->restore_dc = NULL; } - if (context->destroy_delayed) + if (context_gl->c.destroy_delayed) { TRACE("Destroying context %p.\n", context_gl); wined3d_context_gl_destroy(context_gl); @@ -1618,9 +1616,9 @@ void context_restore(struct wined3d_context *context, struct wined3d_texture *te static void wined3d_context_gl_enter(struct wined3d_context_gl *context_gl) { - TRACE("Entering context %p, level %u.\n", context_gl, context_gl->c.level + 1); + TRACE("Entering context %p, level %u.\n", context_gl, context_gl->level + 1); - if (!context_gl->c.level++) + if (!context_gl->level++) { const struct wined3d_context_gl *current_context = wined3d_context_gl_get_current(); HGLRC current_gl = wglGetCurrentContext(); @@ -2321,7 +2319,7 @@ void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) /* We delay destroying a context when it is active. The context_release() * function invokes wined3d_context_gl_destroy() again while leaving the * last level. */ - if (context_gl->c.level) + if (context_gl->level) { TRACE("Delaying destruction of context %p.\n", context_gl); context_gl->c.destroy_delayed = 1; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 53c8cfd..e6f9340 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1951,8 +1951,6 @@ struct wined3d_context UINT instance_count; - UINT level; - void *shader_backend_data; void *fragment_pipe_data; @@ -1999,6 +1997,7 @@ struct wined3d_context_gl GLenum *texture_type; /* The WGL context. */ + unsigned int level; HGLRC restore_ctx; HDC restore_dc; int restore_pf;

1 0

Henri Verbeet : wined3d: Invalidate the relevant sampler when unloading a currently bound texture.
by Alexandre Julliard Aug. 7, 2019

Aug. 7, 2019

Module: wine Branch: master Commit: 3bc8df5166f9ba796a9624d7363acb5ffa0ba059 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bc8df5166f9ba796a9624d7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 7 16:30:00 2019 +0430 wined3d: Invalidate the relevant sampler when unloading a currently bound texture. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 6424553..705b725 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -639,6 +639,9 @@ static void wined3d_texture_gl_unload_texture(struct wined3d_texture_gl *texture const struct wined3d_gl_info *gl_info = NULL; struct wined3d_context *context = NULL; + if (texture_gl->t.resource.bind_count) + device_invalidate_state(device, STATE_SAMPLER(texture_gl->t.sampler)); + if (texture_gl->texture_rgb.name || texture_gl->texture_srgb.name || texture_gl->rb_multisample || texture_gl->rb_resolved) {

1 0

Paul Gofman : ddraw/tests: Test restoring attached surface for ddraw2.
by Alexandre Julliard Aug. 6, 2019

Aug. 6, 2019

Module: wine Branch: master Commit: d8812edc6584d434c4ffd68dc7a3a783623a3703 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8812edc6584d434c4ffd68d… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Aug 5 21:58:34 2019 +0300 ddraw/tests: Test restoring attached surface for ddraw2. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index f25cdd8..df99938 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -8048,11 +8048,12 @@ static void test_palette_alpha(void) static void test_lost_device(void) { - IDirectDrawSurface *surface; + IDirectDrawSurface *surface, *back_buffer; DDSURFACEDESC surface_desc; HWND window1, window2; IDirectDraw2 *ddraw; ULONG refcount; + DDSCAPS caps; HRESULT hr; BOOL ret; @@ -8190,6 +8191,19 @@ static void test_lost_device(void) hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + memset(&caps, 0, sizeof(caps)); + caps.dwCaps = DDSCAPS_FLIP; + + hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &back_buffer); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Restore(surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &back_buffer); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(back_buffer); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + IDirectDrawSurface_Release(back_buffer); + IDirectDrawSurface_Release(surface); refcount = IDirectDraw2_Release(ddraw); ok(!refcount, "Got unexpected refcount %u.\n", refcount);

1 0

Paul Gofman : ddraw/tests: Test restoring attached surface for ddraw1.
by Alexandre Julliard Aug. 6, 2019

Aug. 6, 2019

Module: wine Branch: master Commit: aa6517cf875e6f94db85393391397d036b67b24b URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa6517cf875e6f94db853933… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Aug 5 21:58:35 2019 +0300 ddraw/tests: Test restoring attached surface for ddraw1. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index b28f1d7..449f0c6 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -7166,11 +7166,12 @@ static void test_palette_alpha(void) static void test_lost_device(void) { - IDirectDrawSurface *surface; + IDirectDrawSurface *surface, *back_buffer; DDSURFACEDESC surface_desc; HWND window1, window2; IDirectDraw *ddraw; ULONG refcount; + DDSCAPS caps; HRESULT hr; BOOL ret; @@ -7308,6 +7309,19 @@ static void test_lost_device(void) hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + memset(&caps, 0, sizeof(caps)); + caps.dwCaps = DDSCAPS_FLIP; + + hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &back_buffer); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Restore(surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &back_buffer); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(back_buffer); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + IDirectDrawSurface_Release(back_buffer); + IDirectDrawSurface_Release(surface); refcount = IDirectDraw_Release(ddraw); ok(!refcount, "Got unexpected refcount %u.\n", refcount);

1 0

Jacek Caban : server: Report only one debug event per process at the time.
by Alexandre Julliard Aug. 6, 2019

Aug. 6, 2019

Module: wine Branch: master Commit: c1a32a080f982d972247db3b8d42a37bea2385dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1a32a080f982d972247db3b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 6 15:05:36 2019 +0200 server: Report only one debug event per process at the time. Instead of one per thread. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 7 +++++++ server/debugger.c | 10 +++++----- server/process.c | 1 + server/process.h | 1 + server/thread.c | 1 - server/thread.h | 1 - 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 7594b25..106c1c4 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -287,6 +287,9 @@ static void next_event_(unsigned line, struct debugger_context *ctx, unsigned ti static void process_attach_events(struct debugger_context *ctx) { + DEBUG_EVENT ev; + BOOL ret; + ctx->ev.dwDebugEventCode = -1; next_event(ctx, 0); ok(ctx->ev.dwDebugEventCode == CREATE_PROCESS_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx->ev.dwDebugEventCode); @@ -304,6 +307,10 @@ static void process_attach_events(struct debugger_context *ctx) do { + /* even when there are more pending events, they are not reported until current event is continued */ + ret = WaitForDebugEvent(&ev, 10); + ok(GetLastError() == ERROR_SEM_TIMEOUT, "WaitForDebugEvent returned %x(%u)\n", ret, GetLastError()); + next_event(ctx, WAIT_EVENT_TIMEOUT); if (ctx->ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT) ok(ctx->ev.u.LoadDll.lpBaseOfDll != ntdll, "ntdll.dll reported out of order\n"); diff --git a/server/debugger.c b/server/debugger.c index 99e50aa..a5c39aa 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -244,7 +244,7 @@ static const fill_event_func fill_debug_event[NB_DEBUG_EVENTS] = static void unlink_event( struct debug_ctx *debug_ctx, struct debug_event *event ) { list_remove( &event->entry ); - if (event->sender->debug_event == event) event->sender->debug_event = NULL; + if (event->sender->process->debug_event == event) event->sender->process->debug_event = NULL; release_object( event ); } @@ -256,7 +256,7 @@ static void link_event( struct debug_event *event ) assert( debug_ctx ); grab_object( event ); list_add_tail( &debug_ctx->event_queue, &event->entry ); - if (!event->sender->debug_event) + if (!event->sender->process->debug_event) { /* grab reference since debugger could be killed while trying to wake up */ grab_object( debug_ctx ); @@ -273,7 +273,7 @@ static struct debug_event *find_event_to_send( struct debug_ctx *debug_ctx ) LIST_FOR_EACH_ENTRY( event, &debug_ctx->event_queue, struct debug_event, entry ) { if (event->state == EVENT_SENT) continue; /* already sent */ - if (event->sender->debug_event) continue; /* thread busy with another one */ + if (event->sender->process->debug_event) continue; /* process busy with another one */ return event; } return NULL; @@ -371,7 +371,7 @@ static int continue_debug_event( struct process *process, struct thread *thread, if (event->state != EVENT_SENT) continue; if (event->sender == thread) { - assert( event->sender->debug_event == event ); + assert( event->sender->process->debug_event == event ); event->status = status; event->state = EVENT_CONTINUED; @@ -594,7 +594,7 @@ DECL_HANDLER(wait_debug_event) { data_size_t size = get_reply_max_size(); event->state = EVENT_SENT; - event->sender->debug_event = event; + event->sender->process->debug_event = event; reply->pid = get_process_id( event->sender->process ); reply->tid = get_thread_id( event->sender ); if (size > sizeof(debug_event_t)) size = sizeof(debug_event_t); diff --git a/server/process.c b/server/process.c index b67bd88..16bb5d5 100644 --- a/server/process.c +++ b/server/process.c @@ -502,6 +502,7 @@ struct process *create_process( int fd, struct process *parent, int inherit_all, } process->parent_id = 0; process->debugger = NULL; + process->debug_event = NULL; process->handles = NULL; process->msg_fd = NULL; process->sigkill_timeout = NULL; diff --git a/server/process.h b/server/process.h index 20503a2..20ff6be 100644 --- a/server/process.h +++ b/server/process.h @@ -57,6 +57,7 @@ struct process process_id_t parent_id; /* parent process id (at the time of creation) */ struct list thread_list; /* thread list */ struct thread *debugger; /* thread debugging this process */ + struct debug_event *debug_event; /* debug event being sent to debugger */ struct handle_table *handles; /* handle entries */ struct fd *msg_fd; /* fd for sendmsg/recvmsg */ process_id_t id; /* id of the process */ diff --git a/server/thread.c b/server/thread.c index d5742a1..e753c8d 100644 --- a/server/thread.c +++ b/server/thread.c @@ -184,7 +184,6 @@ static inline void init_thread_structure( struct thread *thread ) thread->teb = 0; thread->entry_point = 0; thread->debug_ctx = NULL; - thread->debug_event = NULL; thread->system_regs = 0; thread->queue = NULL; thread->wait = NULL; diff --git a/server/thread.h b/server/thread.h index 40f0eec..e10120d 100644 --- a/server/thread.h +++ b/server/thread.h @@ -55,7 +55,6 @@ struct thread thread_id_t id; /* thread id */ struct list mutex_list; /* list of currently owned mutexes */ struct debug_ctx *debug_ctx; /* debugger context if this thread is a debugger */ - struct debug_event *debug_event; /* debug event being sent to debugger */ unsigned int system_regs; /* which system regs have been set */ struct msg_queue *queue; /* message queue */ struct thread_wait *wait; /* current wait condition if sleeping */

1 0

Jacek Caban : winegcc: Use -nodefaultlibs -nostartfiles for builtin DLLs.
by Alexandre Julliard Aug. 6, 2019

Aug. 6, 2019

Module: wine Branch: master Commit: 90bed22eb715201de3ddde0b08d4d6b9357c7635 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90bed22eb715201de3ddde0b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 6 12:28:53 2019 +0200 winegcc: Use -nodefaultlibs -nostartfiles for builtin DLLs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 222c750..a7476dd 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -383,6 +383,7 @@ static int try_link( const strarray *prefix, const strarray *link_tool, const ch static strarray *get_link_args( struct options *opts, const char *output_name ) { + int use_wine_crt = opts->wine_builtin && opts->shared; const strarray *link_tool = get_translator( opts ); strarray *flags = strarray_alloc(); unsigned int i; @@ -437,8 +438,8 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) else strarray_add( flags, opts->gui_app ? "-mwindows" : "-mconsole" ); if (opts->unicode_app) strarray_add( flags, "-municode" ); - if (opts->nodefaultlibs) strarray_add( flags, "-nodefaultlibs" ); - if (opts->nostartfiles) strarray_add( flags, "-nostartfiles" ); + if (opts->nodefaultlibs || use_wine_crt) strarray_add( flags, "-nodefaultlibs" ); + if (opts->nostartfiles || use_wine_crt) strarray_add( flags, "-nostartfiles" ); if (opts->subsystem) { @@ -1172,7 +1173,7 @@ static void build(struct options* opts) strarray_add(link_args, "-lc"); } - if (opts->nodefaultlibs && is_pe) strarray_add( link_args, "-lgcc" ); + if ((opts->nodefaultlibs || opts->shared) && is_pe) strarray_add( link_args, "-lgcc" ); spawn(opts->prefix, link_args, 0); strarray_free (link_args);

1 0

Jacek Caban : gdiplus: Build with ucrtbase.
by Alexandre Julliard Aug. 6, 2019

Aug. 6, 2019

Module: wine Branch: master Commit: d9fb92c8640bb7996473401b85ac32d0e617d894 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9fb92c8640bb7996473401b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 6 12:25:58 2019 +0200 gdiplus: Build with ucrtbase. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/Makefile.in b/dlls/gdiplus/Makefile.in index e73e7d4..7fcafc8 100644 --- a/dlls/gdiplus/Makefile.in +++ b/dlls/gdiplus/Makefile.in @@ -1,6 +1,6 @@ MODULE = gdiplus.dll IMPORTLIB = gdiplus -IMPORTS = uuid shlwapi ole32 user32 gdi32 +IMPORTS = uuid shlwapi ole32 user32 gdi32 ucrtbase DELAYIMPORTS = windowscodecs EXTRADLLFLAGS = -mno-cygwin

1 0

Alexandre Julliard : ntdll: Reimplement thread initialization in assembler on ARM64.
by Alexandre Julliard Aug. 6, 2019

Aug. 6, 2019

Module: wine Branch: master Commit: e91e6cc9bdb484643cb73665170a3f91ce6278ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=e91e6cc9bdb484643cb73665… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 6 10:08:41 2019 +0200 ntdll: Reimplement thread initialization in assembler on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 128 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 98 insertions(+), 30 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index d2d43b3..900fd3b 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -94,6 +94,20 @@ typedef int (*wine_signal_handler)(unsigned int sig); static wine_signal_handler handlers[256]; +struct arm64_thread_data +{ + void *exit_frame; /* exit frame pointer */ + CONTEXT *context; /* context to set with SIGUSR2 */ +}; + +C_ASSERT( sizeof(struct arm64_thread_data) <= sizeof(((TEB *)0)->SystemReserved2) ); +C_ASSERT( offsetof( TEB, SystemReserved2 ) + offsetof( struct arm64_thread_data, exit_frame ) == 0x300 ); + +static inline struct arm64_thread_data *arm64_thread_data(void) +{ + return (struct arm64_thread_data *)NtCurrentTeb()->SystemReserved2; +} + /*********************************************************************** * dispatch_signal */ @@ -1084,35 +1098,91 @@ static void WINAPI call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void * abort(); /* should not be reached */ } -typedef void (WINAPI *thread_start_func)(LPTHREAD_START_ROUTINE,void *); +extern void DECLSPEC_NORETURN start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, + void *relay, TEB *teb ); +__ASM_GLOBAL_FUNC( start_thread, + "stp x29, x30, [sp,#-16]!\n\t" + "mov x18, x4\n\t" /* teb */ + /* store exit frame */ + "mov x29, sp\n\t" + "str x29, [x4, #0x300]\n\t" /* arm64_thread_data()->exit_frame */ + /* switch to thread stack */ + "ldr x5, [x4, #8]\n\t" /* teb->Tib.StackBase */ + "sub sp, x5, #0x1000\n\t" + /* attach dlls */ + "bl " __ASM_NAME("attach_thread") "\n\t" + "mov sp, x0\n\t" + /* clear the stack */ + "and x0, x0, #~0xfff\n\t" /* round down to page size */ + "bl " __ASM_NAME("virtual_clear_thread_stack") "\n\t" + /* switch to the initial context */ + "mov x0, sp\n\t" + "ldp x1, x2, [x0, #0x10]\n\t" /* context->X1,2 */ + "ldp x3, x4, [x0, #0x20]\n\t" /* context->X3,4 */ + "ldp x5, x6, [x0, #0x30]\n\t" /* context->X5,6 */ + "ldp x7, x8, [x0, #0x40]\n\t" /* context->X7,8 */ + "ldp x9, x10, [x0, #0x50]\n\t" /* context->X9,10 */ + "ldp x11, x12, [x0, #0x60]\n\t" /* context->X11,12 */ + "ldp x13, x14, [x0, #0x70]\n\t" /* context->X13,14 */ + "ldp x15, x16, [x0, #0x80]\n\t" /* context->X15,16 */ + "ldp x17, x18, [x0, #0x90]\n\t" /* context->X17,18 */ + "ldp x19, x20, [x0, #0xa0]\n\t" /* context->X19,20 */ + "ldp x21, x22, [x0, #0xb0]\n\t" /* context->X21,22 */ + "ldp x23, x24, [x0, #0xc0]\n\t" /* context->X23,24 */ + "ldp x25, x26, [x0, #0xd0]\n\t" /* context->X25,26 */ + "ldp x27, x28, [x0, #0xe0]\n\t" /* context->X27,28 */ + "ldp x29, x30, [x0, #0xf0]\n\t" /* context->Fp,Lr */ + "ldr x17, [x0, #0x100]\n\t" /* context->Sp */ + "mov sp, x17\n\t" + "ldr x17, [x0, #0x108]\n\t" /* context->Pc */ + "ldr x0, [x0, #0x8]\n\t" /* context->X0 */ + "br x17" ) + +extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int), TEB *teb ); +__ASM_GLOBAL_FUNC( call_thread_exit_func, + "ldr x3, [x2, #0x300]\n\t" /* arm64_thread_data()->exit_frame */ + "str xzr, [x2, #0x300]\n\t" + "cbz x3, 1f\n\t" + "mov sp, x3\n" + "1:\tblr x1" ) -struct startup_info +/*********************************************************************** + * init_thread_context + */ +static void init_thread_context( CONTEXT *context, LPTHREAD_START_ROUTINE entry, void *arg, void *relay ) { - thread_start_func start; - LPTHREAD_START_ROUTINE entry; - void *arg; - BOOL suspend; -}; + context->u.s.X0 = (DWORD64)entry; + context->u.s.X1 = (DWORD64)arg; + context->u.s.X18 = (DWORD64)NtCurrentTeb(); + context->Sp = (DWORD64)NtCurrentTeb()->Tib.StackBase; + context->Pc = (DWORD64)relay; +} /*********************************************************************** - * thread_startup + * attach_thread */ -static void thread_startup( void *param ) +PCONTEXT DECLSPEC_HIDDEN attach_thread( LPTHREAD_START_ROUTINE entry, void *arg, + BOOL suspend, void *relay ) { - CONTEXT context = { 0 }; - struct startup_info *info = param; - - /* build the initial context */ - context.ContextFlags = CONTEXT_FULL; - context.u.s.X0 = (DWORD_PTR)info->entry; - context.u.s.X1 = (DWORD_PTR)info->arg; - context.Sp = (DWORD_PTR)NtCurrentTeb()->Tib.StackBase; - context.Pc = (DWORD_PTR)info->start; + CONTEXT *ctx; - if (info->suspend) wait_suspend( &context ); - LdrInitializeThunk( &context, (void **)&context.u.s.X0, 0, 0 ); + if (suspend) + { + CONTEXT context = { CONTEXT_ALL }; - ((thread_start_func)context.Pc)( (LPTHREAD_START_ROUTINE)context.u.s.X0, (void *)context.u.s.X1 ); + init_thread_context( &context, entry, arg, relay ); + wait_suspend( &context ); + ctx = (CONTEXT *)((ULONG_PTR)context.Sp & ~15) - 1; + *ctx = context; + } + else + { + ctx = (CONTEXT *)NtCurrentTeb()->Tib.StackBase - 1; + init_thread_context( ctx, entry, arg, relay ); + } + ctx->ContextFlags = CONTEXT_FULL; + LdrInitializeThunk( ctx, (void **)&ctx->u.s.X0, 0, 0 ); + return ctx; } /*********************************************************************** @@ -1120,13 +1190,12 @@ static void thread_startup( void *param ) * * Thread startup sequence: * signal_start_thread() - * -> thread_startup() - * -> call_thread_entry_point() + * -> start_thread() + * -> call_thread_func() */ void signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend ) { - struct startup_info info = { call_thread_entry_point, entry, arg, suspend }; - wine_switch_to_stack( thread_startup, &info, NtCurrentTeb()->Tib.StackBase ); + start_thread( entry, arg, suspend, call_thread_entry_point, NtCurrentTeb() ); } /********************************************************************** @@ -1134,13 +1203,12 @@ void signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend * * Process startup sequence: * signal_start_process() - * -> thread_startup() + * -> start_thread() * -> kernel32_start_process() */ void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) { - struct startup_info info = { kernel32_start_process, entry, NtCurrentTeb()->Peb, suspend }; - wine_switch_to_stack( thread_startup, &info, NtCurrentTeb()->Tib.StackBase ); + start_thread( entry, NtCurrentTeb()->Peb, suspend, kernel32_start_process, NtCurrentTeb() ); } /*********************************************************************** @@ -1148,7 +1216,7 @@ void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) */ void signal_exit_thread( int status ) { - exit_thread( status ); + call_thread_exit_func( status, exit_thread, NtCurrentTeb() ); } /*********************************************************************** @@ -1156,7 +1224,7 @@ void signal_exit_thread( int status ) */ void signal_exit_process( int status ) { - exit( status ); + call_thread_exit_func( status, exit, NtCurrentTeb() ); } /**********************************************************************

1 0

Alexandre Julliard : wpcap: Avoid deprecated pcap_lookupdev().
by Alexandre Julliard Aug. 6, 2019

Aug. 6, 2019

Module: wine Branch: master Commit: 732d0db63b5b494ce409e496cb77cf661eb7e6e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=732d0db63b5b494ce409e496… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 6 10:05:18 2019 +0200 wpcap: Avoid deprecated pcap_lookupdev(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpcap/wpcap.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 6450a0e..d2f1be7 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -202,8 +202,18 @@ int CDECL wine_pcap_list_datalinks(pcap_t *p, int **dlt_buffer) char* CDECL wine_pcap_lookupdev(char *errbuf) { + static char *ret; + pcap_if_t *devs; + TRACE("(%p)\n", errbuf); - return pcap_lookupdev(errbuf); + if (!ret) + { + if (pcap_findalldevs( &devs, errbuf ) == -1) return NULL; + if (!devs) return NULL; + if ((ret = heap_alloc( strlen(devs->name) + 1 ))) strcpy( ret, devs->name ); + pcap_freealldevs( devs ); + } + return ret; } int CDECL wine_pcap_lookupnet(const char *device, unsigned int *netp, unsigned int *maskp,

1 0