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

Henri Verbeet : wined3d: Move the "level" field from struct wined3d_context to struct wined3d_context_gl.
by Alexandre Julliard 07 Aug '19

07 Aug '19

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 07 Aug '19

07 Aug '19

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

Henri Verbeet : wined3d: Get rid of the "dirtyArray" field from struct wined3d_context.
by Alexandre Julliard 07 Aug '19

07 Aug '19

Module: wine Branch: master Commit: 2ddb6b66a7cda0bf6aaddc0c6899e35cc92ceee9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ddb6b66a7cda0bf6aaddc0c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 7 16:30:01 2019 +0430 wined3d: Get rid of the "dirtyArray" field from struct wined3d_context. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 36 ++++++++++++++++++------------------ dlls/wined3d/device.c | 20 ++++++++------------ dlls/wined3d/wined3d_private.h | 20 ++++++-------------- 3 files changed, 32 insertions(+), 44 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 53d44d9..2509d90 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1647,18 +1647,14 @@ void context_invalidate_compute_state(struct wined3d_context *context, DWORD sta context->dirty_compute_states[index] |= (1u << shift); } -void context_invalidate_state(struct wined3d_context *context, DWORD state) +void context_invalidate_state(struct wined3d_context *context, unsigned int state_id) { - DWORD rep = context->state_table[state].representative; - DWORD idx; - BYTE shift; - - if (isStateDirty(context, rep)) return; + unsigned int representative = context->state_table[state_id].representative; + unsigned int index, shift; - context->dirtyArray[context->numDirtyEntries++] = rep; - idx = rep / (sizeof(*context->isStateDirty) * CHAR_BIT); - shift = rep & ((sizeof(*context->isStateDirty) * CHAR_BIT) - 1); - context->isStateDirty[idx] |= (1u << shift); + index = representative / (sizeof(*context->dirty_graphics_states) * CHAR_BIT); + shift = representative & ((sizeof(*context->dirty_graphics_states) * CHAR_BIT) - 1); + context->dirty_graphics_states[index] |= (1u << shift); } /* This function takes care of wined3d pixel format selection. */ @@ -3911,7 +3907,7 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context_gl->gl_info; const struct wined3d_fb_state *fb = state->fb; - unsigned int i; + unsigned int i, base; WORD map; if (!have_framebuffer_attachment(gl_info->limits.buffers, fb->render_targets, fb->depth_stencil)) @@ -3963,13 +3959,18 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, wined3d_buffer_load_sysmem(state->index_buffer, context); } - for (i = 0; i < context->numDirtyEntries; ++i) + for (i = 0, base = 0; i < ARRAY_SIZE(context->dirty_graphics_states); ++i) { - DWORD rep = context->dirtyArray[i]; - DWORD idx = rep / (sizeof(*context->isStateDirty) * CHAR_BIT); - BYTE shift = rep & ((sizeof(*context->isStateDirty) * CHAR_BIT) - 1); - context->isStateDirty[idx] &= ~(1u << shift); - state_table[rep].apply(context, state, rep); + uint32_t dirty_mask = context->dirty_graphics_states[i]; + + while (dirty_mask) + { + unsigned int state_id = base + wined3d_bit_scan(&dirty_mask); + + state_table[state_id].apply(context, state, state_id); + context->dirty_graphics_states[i] &= ~(1u << (state_id - base)); + } + base += sizeof(dirty_mask) * CHAR_BIT; } if (context->shader_update_mask & ~(1u << WINED3D_SHADER_TYPE_COMPUTE)) @@ -4005,7 +4006,6 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) wined3d_context_gl_check_fbo_status(context_gl, GL_FRAMEBUFFER); - context->numDirtyEntries = 0; /* This makes the whole list clean */ context->last_was_blit = FALSE; context->last_was_ffp_blit = FALSE; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a28dd6c..c37f386 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5866,30 +5866,26 @@ err: return hr; } -void device_invalidate_state(const struct wined3d_device *device, DWORD state) +void device_invalidate_state(const struct wined3d_device *device, unsigned int state_id) { - DWORD rep = device->state_table[state].representative; + unsigned int representative, i, idx, shift; struct wined3d_context *context; - unsigned int i, idx, shift; wined3d_from_cs(device->cs); - if (STATE_IS_COMPUTE(state)) + if (STATE_IS_COMPUTE(state_id)) { for (i = 0; i < device->context_count; ++i) - context_invalidate_compute_state(device->contexts[i], state); + context_invalidate_compute_state(device->contexts[i], state_id); return; } + representative = device->state_table[state_id].representative; + idx = representative / (sizeof(*context->dirty_graphics_states) * CHAR_BIT); + shift = representative & ((sizeof(*context->dirty_graphics_states) * CHAR_BIT) - 1); for (i = 0; i < device->context_count; ++i) { - context = device->contexts[i]; - if (isStateDirty(context, rep)) continue; - - context->dirtyArray[context->numDirtyEntries++] = rep; - idx = rep / (sizeof(*context->isStateDirty) * CHAR_BIT); - shift = rep & ((sizeof(*context->isStateDirty) * CHAR_BIT) - 1); - context->isStateDirty[idx] |= (1u << shift); + device->contexts[i]->dirty_graphics_states[idx] |= (1u << shift); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e6f9340..1048d19 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1891,16 +1891,8 @@ struct wined3d_context { const struct wined3d_d3d_info *d3d_info; const struct wined3d_state_entry *state_table; - /* State dirtification - * dirtyArray is an array that contains markers for dirty states. numDirtyEntries states are dirty, their numbers are in indices - * 0...numDirtyEntries - 1. isStateDirty is a redundant copy of the dirtyArray. Technically only one of them would be needed, - * but with the help of both it is easy to find out if a state is dirty(just check the array index), and for applying dirty states - * only numDirtyEntries array elements have to be checked, not STATE_HIGHEST states. - */ - DWORD dirtyArray[STATE_HIGHEST + 1]; /* Won't get bigger than that, a state is never marked dirty 2 times */ - DWORD numDirtyEntries; - DWORD isStateDirty[STATE_HIGHEST / (sizeof(DWORD) * CHAR_BIT) + 1]; /* Bitmap to find out quickly if a state is dirty */ - unsigned int dirty_compute_states[STATE_COMPUTE_COUNT / (sizeof(unsigned int) * CHAR_BIT) + 1]; + uint32_t dirty_graphics_states[STATE_HIGHEST / (sizeof(uint32_t) * CHAR_BIT) + 1]; + uint32_t dirty_compute_states[STATE_COMPUTE_COUNT / (sizeof(uint32_t) * CHAR_BIT) + 1]; struct wined3d_device *device; struct wined3d_swapchain *swapchain; @@ -3291,11 +3283,11 @@ static inline struct wined3d_device_gl *wined3d_device_gl(struct wined3d_device return CONTAINING_RECORD(device, struct wined3d_device_gl, d); } -static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD state) +static inline BOOL isStateDirty(const struct wined3d_context *context, unsigned int state_id) { - DWORD idx = state / (sizeof(*context->isStateDirty) * CHAR_BIT); - BYTE shift = state & ((sizeof(*context->isStateDirty) * CHAR_BIT) - 1); - return context->isStateDirty[idx] & (1u << shift); + unsigned int idx = state_id / (sizeof(*context->dirty_graphics_states) * CHAR_BIT); + unsigned int shift = state_id & ((sizeof(*context->dirty_graphics_states) * CHAR_BIT) - 1); + return context->dirty_graphics_states[idx] & (1u << shift); } static inline float wined3d_alpha_ref(const struct wined3d_state *state)

1 0

Paul Gofman : ddraw/tests: Test restoring attached surface for ddraw2.
by Alexandre Julliard 06 Aug '19

06 Aug '19

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 06 Aug '19

06 Aug '19

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

Alexandre Julliard : wpcap: Avoid deprecated pcap_lookupdev().
by Alexandre Julliard 06 Aug '19

06 Aug '19

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

Alexandre Julliard : ntdll: Reimplement thread initialization in assembler on ARM64.
by Alexandre Julliard 06 Aug '19

06 Aug '19

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 : ntdll: Silence FIXME for LdrResolveDelayLoadedAPI().
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: wine Branch: master Commit: 9b6d2d33102ced7724232c40a41c4fb446737a0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b6d2d33102ced7724232c40… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 6 17:45:18 2019 +0200 ntdll: Silence FIXME for LdrResolveDelayLoadedAPI(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 67efcaf..ae04da6 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3227,7 +3227,7 @@ void* WINAPI LdrResolveDelayLoadedAPI( void* base, const IMAGE_DELAYLOAD_DESCRIP FARPROC fp; DWORD id; - FIXME("(%p, %p, %p, %p, %p, 0x%08x), partial stub\n", base, desc, dllhook, syshook, addr, flags); + TRACE( "(%p, %p, %p, %p, %p, 0x%08x)\n", base, desc, dllhook, syshook, addr, flags ); phmod = get_rva(base, desc->ModuleHandleRVA); pIAT = get_rva(base, desc->ImportAddressTableRVA);

1 0

Jacek Caban : stdlib.h: Forward strtoll to _strtoi64.
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: wine Branch: master Commit: 351a87359d6b812c277cc40460cddde1f782209f URL: https://source.winehq.org/git/wine.git/?a=commit;h=351a87359d6b812c277cc404… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 6 12:23:12 2019 +0200 stdlib.h: Forward strtoll to _strtoi64. Instead of depending on mingw implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdlib.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 47a50bc..7ca7021 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -220,9 +220,7 @@ double __cdecl strtod(const char*,char**); double __cdecl strtold(const char*,char**); __msvcrt_long __cdecl strtol(const char*,char**,int); __msvcrt_ulong __cdecl strtoul(const char*,char**,int); -__int64 __cdecl strtoll(const char*,char**,int); __int64 __cdecl strtoll_l(const char*,char**,int,_locale_t); -unsigned __int64 __cdecl strtoull(const char*,char**,int); unsigned __int64 __cdecl strtoull_l(const char*,char**,int,_locale_t); __int64 __cdecl _strtoi64(const char*,char**,int); __int64 __cdecl _strtoi64_l(const char*,char**,int,_locale_t); @@ -297,6 +295,8 @@ static inline char* itoa(int value, char* str, int radix) { return _itoa(value, static inline char* ltoa(__msvcrt_long value, char* str, int radix) { return _ltoa(value, str, radix); } static inline _onexit_t onexit(_onexit_t func) { return _onexit(func); } static inline int putenv(const char* str) { return _putenv(str); } +static inline __int64 strtoll(const char *ptr, char **endptr, int base) { return _strtoi64(ptr, endptr, base); } +static inline unsigned __int64 __cdecl strtoull(const char *ptr, char **endptr, int base) { return _strtoui64(ptr, endptr, base); } static inline void swab(char* src, char* dst, int len) { _swab(src, dst, len); } static inline char* ultoa(__msvcrt_ulong value, char* str, int radix) { return _ultoa(value, str, radix); }

1 0

Jacek Caban : stdio.h: Use __acrt_iob_func to access standard stream files.
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: wine Branch: master Commit: 14e7e331ae2e86910dbe3c2d9ecd50aa003dd195 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14e7e331ae2e86910dbe3c2d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 6 12:23:24 2019 +0200 stdio.h: Use __acrt_iob_func to access standard stream files. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 014e68a..8d8f208 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -90,9 +90,11 @@ FILE* __cdecl __iob_func(void); # endif #endif /* _STDIO_DEFINED */ -#define stdin (_iob+STDIN_FILENO) -#define stdout (_iob+STDOUT_FILENO) -#define stderr (_iob+STDERR_FILENO) +FILE *__cdecl __acrt_iob_func(unsigned index); + +#define stdin (__acrt_iob_func(0)) +#define stdout (__acrt_iob_func(1)) +#define stderr (__acrt_iob_func(2)) /* return value for _get_output_format */ #define _TWO_DIGIT_EXPONENT 0x1

1 0