May 2022 - Wine-Commits - list.winehq.org

Rémi Bernon : ntdll: Use a block member in the free list entry struct.
by Alexandre Julliard May 27, 2022

May 27, 2022

Module: wine Branch: master Commit: 7964d641225dd322557db16b5c89ed6e5734ed8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7964d641225dd322557db16b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 4 00:06:27 2022 +0200 ntdll: Use a block member in the free list entry struct. And use ARENA_FLAG_FREE|ARENA_FLAG_PREV_FREE flag combination to mark and ignore free list links. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 0f75ef1fe81..411bb26aa3d 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -94,9 +94,8 @@ C_ASSERT( sizeof(struct block) == 8 ); typedef struct entry { - DWORD size; /* Block size; must be the first field */ - DWORD magic; /* Magic number */ - struct list entry; /* Entry in free list */ + struct block block; + struct list entry; } ARENA_FREE; typedef struct @@ -972,8 +971,8 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, list_init( &heap->freeList[0].arena.entry ); for (i = 0, pEntry = heap->freeList; i < HEAP_NB_FREE_LISTS; i++, pEntry++) { - pEntry->arena.size = BLOCK_FLAG_FREE_LINK; - pEntry->arena.magic = ARENA_FREE_MAGIC; + block_set_size( &pEntry->arena.block, BLOCK_FLAG_FREE_LINK, 0 ); + block_set_type( &pEntry->arena.block, ARENA_FREE_MAGIC ); if (i) list_add_after( &pEntry[-1].arena.entry, &pEntry->arena.entry ); } @@ -1080,7 +1079,7 @@ static BOOL is_valid_free_block( const HEAP *heap, const struct block *block ) if ((subheap = find_subheap( heap, block, FALSE ))) return TRUE; if (block_get_flags( block ) != BLOCK_FLAG_FREE_LINK) return FALSE; - for (i = 0; i < HEAP_NB_FREE_LISTS; i++) if (block == (struct block *)&heap->freeList[i].arena) return TRUE; + for (i = 0; i < HEAP_NB_FREE_LISTS; i++) if (block == &heap->freeList[i].arena.block) return TRUE; return FALSE; }

1 0

Huw Davies : kernelbase: Avoid relying on the exception handler to test that handle != NULL.
by Alexandre Julliard May 27, 2022

May 27, 2022

Module: wine Branch: master Commit: f27a77e593f687f06080aa91112157bbb86d861c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f27a77e593f687f06080aa91… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 10 14:06:49 2022 +0000 kernelbase: Avoid relying on the exception handler to test that handle != NULL. Fixes a regression in SlingPlayer 2 caused by commit a76518c186ac0893ea460cd3b061096f1b05c8cc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52127 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/kernelbase/memory.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index b89ab04a38f..9490626a40a 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -883,6 +883,7 @@ LPVOID WINAPI DECLSPEC_HOTPATCH LocalLock( HLOCAL handle ) TRACE_(globalmem)( "handle %p\n", handle ); + if (!handle) return NULL; if ((ret = unsafe_ptr_from_HLOCAL( handle ))) { __TRY

1 0

Rémi Bernon : ntdll: Use flag combination to mark free list headers.
by Alexandre Julliard May 27, 2022

May 27, 2022

Module: wine Branch: master Commit: ea533f1869c4234b736dc603992e2daafb0b4405 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea533f1869c4234b736dc603… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 27 09:11:58 2022 +0200 ntdll: Use flag combination to mark free list headers. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 0760675ec4e..0f75ef1fe81 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -87,6 +87,7 @@ C_ASSERT( sizeof(struct block) == 8 ); #define BLOCK_FLAG_FREE 0x00000001 #define BLOCK_FLAG_PREV_FREE 0x00000002 +#define BLOCK_FLAG_FREE_LINK 0x00000003 /* entry to link free blocks in free lists */ @@ -971,7 +972,7 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, list_init( &heap->freeList[0].arena.entry ); for (i = 0, pEntry = heap->freeList; i < HEAP_NB_FREE_LISTS; i++, pEntry++) { - pEntry->arena.size = 0 | BLOCK_FLAG_FREE; + pEntry->arena.size = BLOCK_FLAG_FREE_LINK; pEntry->arena.magic = ARENA_FREE_MAGIC; if (i) list_add_after( &pEntry[-1].arena.entry, &pEntry->arena.entry ); } @@ -1028,8 +1029,8 @@ static struct block *find_free_block( HEAP *heap, SIZE_T block_size, SUBHEAP **s while ((ptr = list_next( &heap->freeList[0].arena.entry, ptr ))) { entry = LIST_ENTRY( ptr, struct entry, entry ); - if (entry->size == (0 | BLOCK_FLAG_FREE)) continue; block = (struct block *)entry; + if (block_get_flags( block ) == BLOCK_FLAG_FREE_LINK) continue; if (block_get_size( block ) >= block_size) { *subheap = find_subheap( heap, block, FALSE ); @@ -1078,6 +1079,7 @@ static BOOL is_valid_free_block( const HEAP *heap, const struct block *block ) unsigned int i; if ((subheap = find_subheap( heap, block, FALSE ))) return TRUE; + if (block_get_flags( block ) != BLOCK_FLAG_FREE_LINK) return FALSE; for (i = 0; i < HEAP_NB_FREE_LISTS; i++) if (block == (struct block *)&heap->freeList[i].arena) return TRUE; return FALSE; }

1 0

Rémi Bernon : ntdll: Rename block specific flag constants.
by Alexandre Julliard May 27, 2022

May 27, 2022

Module: wine Branch: master Commit: b57dca8826bb2f76e9597ceb29702d72a9c0901a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b57dca8826bb2f76e9597ceb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat May 21 12:11:29 2022 +0200 ntdll: Rename block specific flag constants. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 61 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b57dca8826bb2f76e959…

1 0

Brendan Shanks : ntdll: Store Wow64 FS selector in thread_data.
by Alexandre Julliard May 26, 2022

May 26, 2022

Module: wine Branch: master Commit: e8a5da7d8624af45d276910cb51890e7be7b5145 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8a5da7d8624af45d276910c… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri May 13 15:26:14 2022 -0700 ntdll: Store Wow64 FS selector in thread_data. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/ntdll/unix/signal_x86_64.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index cd50df0c805..703f46b0d4e 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -367,6 +367,7 @@ struct amd64_thread_data void *exit_frame; /* 0320 exit frame pointer */ struct syscall_frame *syscall_frame; /* 0328 syscall frame pointer */ void *pthread_teb; /* 0330 thread data for pthread */ + DWORD fs; /* 0338 WOW TEB selector */ }; C_ASSERT( sizeof(struct amd64_thread_data) <= sizeof(((struct ntdll_thread_data *)0)->cpu_data) ); @@ -2008,7 +2009,7 @@ NTSTATUS set_thread_wow64_context( HANDLE handle, const void *ctx, ULONG size ) { wow_frame->SegDs = ds64_sel; wow_frame->SegEs = ds64_sel; - wow_frame->SegFs = fs32_sel; + wow_frame->SegFs = amd64_thread_data()->fs; wow_frame->SegGs = ds64_sel; } if (flags & CONTEXT_I386_DEBUG_REGISTERS) @@ -2355,7 +2356,7 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void callback_frame.frame.rdx = (ULONG_PTR)args; callback_frame.frame.r8 = len; callback_frame.frame.cs = cs64_sel; - callback_frame.frame.fs = fs32_sel; + callback_frame.frame.fs = amd64_thread_data()->fs; callback_frame.frame.gs = ds64_sel; callback_frame.frame.ss = ds64_sel; callback_frame.frame.rsp = (ULONG_PTR)args_data - 0x28; @@ -2866,6 +2867,13 @@ void signal_init_threading(void) */ NTSTATUS signal_alloc_thread( TEB *teb ) { + struct amd64_thread_data *thread_data = (struct amd64_thread_data *)&teb->GdiTebBatch; + + if (teb->WowTebOffset) + { + if (fs32_sel) + thread_data->fs = fs32_sel; + } return STATUS_SUCCESS; } @@ -2998,7 +3006,7 @@ void signal_init_process(void) cs32_sel = 0x23; if ((sel = alloc_fs_sel( -1, teb32 )) != -1) { - fs32_sel = (sel << 3) | 3; + amd64_thread_data()->fs = fs32_sel = (sel << 3) | 3; syscall_flags |= SYSCALL_HAVE_PTHREAD_TEB; if (getauxval( AT_HWCAP2 ) & 2) syscall_flags |= SYSCALL_HAVE_WRFSGSBASE; } @@ -3051,7 +3059,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B context.SegCs = cs64_sel; context.SegDs = ds64_sel; context.SegEs = ds64_sel; - context.SegFs = fs32_sel; + context.SegFs = thread_data->fs; context.SegGs = ds64_sel; context.SegSs = ds64_sel; context.EFlags = 0x200;

1 0

Gabriel Ivăncescu : mmdevapi: Don't clear possibly uninitialized PropVariant.
by Alexandre Julliard May 26, 2022

May 26, 2022

Module: wine Branch: master Commit: f5fc65ab8610669f3efccc14139f973574a20f3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5fc65ab8610669f3efccc14… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu May 26 19:06:38 2022 +0300 mmdevapi: Don't clear possibly uninitialized PropVariant. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/devenum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index ed1daa85d35..1354bf36a15 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -150,7 +150,7 @@ static HRESULT MMDevice_GetPropValue(const GUID *devguid, DWORD flow, REFPROPERT { WARN("Reading %s returned %ld\n", debugstr_w(buffer), ret); RegCloseKey(regkey); - PropVariantClear(pv); + pv->vt = VT_EMPTY; return S_OK; }

1 0

Gabriel Ivăncescu : winepulse: Try to obtain shorter device names if it exceeds 62 chars.
by Alexandre Julliard May 26, 2022

May 26, 2022

Module: wine Branch: master Commit: ccc9f1d2ce23c8fbb3059934f82079692e04e49c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccc9f1d2ce23c8fbb3059934… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu May 26 19:06:37 2022 +0300 winepulse: Try to obtain shorter device names if it exceeds 62 chars. If the device desc is longer than the limit, we try to obtain product name or alsa name (if product name does not fit in the limit), as otherwise there is no point to do it anyway. Then the profile desc is appended if it doesn't cause us to exceed the limit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53010 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/pulse.c | 92 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 80 insertions(+), 12 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 1254509f3ce..0e504b6b6dd 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -426,6 +426,81 @@ static UINT pulse_channel_map_to_channel_mask(const pa_channel_map *map) return mask; } +#define MAX_DEVICE_NAME_LEN 62 + +static WCHAR *get_device_name(const char *desc, pa_proplist *proplist) +{ + /* + Some broken apps (e.g. Split/Second with fmodex) can't handle names that + are too long and crash even on native. If the device desc is too long, + we'll attempt to incrementally build it to try to stay under the limit. + ( + 1 is to check against truncated buffer after ntdll_umbstowcs ) + */ + WCHAR buf[MAX_DEVICE_NAME_LEN + 1]; + + /* For monitors of sinks; this does not seem to be localized in PA either */ + static const WCHAR monitor_of[] = {'M','o','n','i','t','o','r',' ','o','f',' '}; + + size_t len = strlen(desc); + WCHAR *name, *tmp; + + if (!(name = malloc((len + 1) * sizeof(WCHAR)))) + return NULL; + if (!(len = ntdll_umbstowcs(desc, len, name, len))) { + free(name); + return NULL; + } + + if (len > MAX_DEVICE_NAME_LEN && proplist) { + const char *prop = pa_proplist_gets(proplist, PA_PROP_DEVICE_CLASS); + unsigned prop_len, rem = ARRAY_SIZE(buf); + BOOL monitor = FALSE; + + if (prop && !strcmp(prop, "monitor")) { + rem -= ARRAY_SIZE(monitor_of); + monitor = TRUE; + } + + prop = pa_proplist_gets(proplist, PA_PROP_DEVICE_PRODUCT_NAME); + if (!prop || !prop[0] || + !(prop_len = ntdll_umbstowcs(prop, strlen(prop), buf, rem)) || prop_len == rem) { + prop = pa_proplist_gets(proplist, "alsa.card_name"); + if (!prop || !prop[0] || + !(prop_len = ntdll_umbstowcs(prop, strlen(prop), buf, rem)) || prop_len == rem) + prop = NULL; + } + + if (prop) { + /* We know we have a name that fits within the limit now */ + WCHAR *p = name; + + if (monitor) { + memcpy(p, monitor_of, sizeof(monitor_of)); + p += ARRAY_SIZE(monitor_of); + } + len = ntdll_umbstowcs(prop, strlen(prop), p, rem); + rem -= len; + p += len; + + if (rem > 2) { + rem--; /* space */ + + prop = pa_proplist_gets(proplist, PA_PROP_DEVICE_PROFILE_DESCRIPTION); + if (prop && prop[0] && (len = ntdll_umbstowcs(prop, strlen(prop), p + 1, rem)) && len != rem) { + *p++ = ' '; + p += len; + } + } + len = p - name; + } + } + name[len] = '\0'; + + if ((tmp = realloc(name, (len + 1) * sizeof(WCHAR)))) + name = tmp; + return name; +} + static void fill_device_info(PhysDevice *dev, pa_proplist *p) { const char *buffer; @@ -452,27 +527,18 @@ static void fill_device_info(PhysDevice *dev, pa_proplist *p) } static void pulse_add_device(struct list *list, pa_proplist *proplist, int index, EndpointFormFactor form, - UINT channel_mask, const char *pulse_name, const char *name) + UINT channel_mask, const char *pulse_name, const char *desc) { - size_t len = strlen(pulse_name), name_len = strlen(name); + size_t len = strlen(pulse_name); PhysDevice *dev = malloc(FIELD_OFFSET(PhysDevice, pulse_name[len + 1])); - WCHAR *wname; if (!dev) return; - if (!(wname = malloc((name_len + 1) * sizeof(WCHAR)))) { + if (!(dev->name = get_device_name(desc, proplist))) { free(dev); return; } - - if (!(name_len = ntdll_umbstowcs(name, name_len, wname, name_len)) || - !(dev->name = realloc(wname, (name_len + 1) * sizeof(WCHAR)))) { - free(wname); - free(dev); - return; - } - dev->name[name_len] = 0; dev->form = form; dev->index = index; dev->channel_mask = channel_mask; @@ -480,6 +546,8 @@ static void pulse_add_device(struct list *list, pa_proplist *proplist, int index memcpy(dev->pulse_name, pulse_name, len + 1); list_add_tail(list, &dev->entry); + + TRACE("%s\n", debugstr_w(dev->name)); } static void pulse_phys_speakers_cb(pa_context *c, const pa_sink_info *i, int eol, void *userdata)

1 0

Gabriel Ivăncescu : mmdevapi: Warn if returned device name is too long.
by Alexandre Julliard May 26, 2022

May 26, 2022

Module: wine Branch: master Commit: 653d04d7f9d30fcd608c6bbd6b83ce0febb66735 URL: https://source.winehq.org/git/wine.git/?a=commit;h=653d04d7f9d30fcd608c6bbd… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu May 26 19:06:39 2022 +0300 mmdevapi: Warn if returned device name is too long. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/devenum.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 1354bf36a15..053275cac45 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -1378,6 +1378,7 @@ static HRESULT WINAPI MMDevPropStore_GetAt(IPropertyStore *iface, DWORD prop, PR static HRESULT WINAPI MMDevPropStore_GetValue(IPropertyStore *iface, REFPROPERTYKEY key, PROPVARIANT *pv) { MMDevPropStore *This = impl_from_IPropertyStore(iface); + HRESULT hres; TRACE("(%p)->(\"%s,%lu\", %p)\n", This, key ? debugstr_guid(&key->fmtid) : NULL, key ? key->pid : 0, pv); if (!key || !pv) @@ -1397,7 +1398,19 @@ static HRESULT WINAPI MMDevPropStore_GetValue(IPropertyStore *iface, REFPROPERTY return S_OK; } - return MMDevice_GetPropValue(&This->parent->devguid, This->parent->flow, key, pv); + hres = MMDevice_GetPropValue(&This->parent->devguid, This->parent->flow, key, pv); + if (FAILED(hres)) + return hres; + + if (WARN_ON(mmdevapi)) + { + if ((IsEqualPropertyKey(*key, DEVPKEY_Device_FriendlyName) || + IsEqualPropertyKey(*key, DEVPKEY_DeviceInterface_FriendlyName) || + IsEqualPropertyKey(*key, DEVPKEY_Device_DeviceDesc)) && + pv->vt == VT_LPWSTR && wcslen(pv->pwszVal) > 62) + WARN("Returned name exceeds length limit of some broken apps/libs, might crash: %s\n", debugstr_w(pv->pwszVal)); + } + return hres; } static HRESULT WINAPI MMDevPropStore_SetValue(IPropertyStore *iface, REFPROPERTYKEY key, REFPROPVARIANT pv)

1 0

Brendan Shanks : ntdll: Set up 32-bit segments to support Wow64 on macOS 10.15+.
by Alexandre Julliard May 26, 2022

May 26, 2022

Module: wine Branch: master Commit: 93c5353ee7a9813b63eb117b84fba7b1616da59c URL: https://source.winehq.org/git/wine.git/?a=commit;h=93c5353ee7a9813b63eb117b… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri May 13 15:26:23 2022 -0700 ntdll: Set up 32-bit segments to support Wow64 on macOS 10.15+. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 132 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 130 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 703f46b0d4e..e3179e2f1b0 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -208,6 +208,8 @@ __ASM_GLOBAL_FUNC( alloc_fs_sel, #elif defined (__APPLE__) +#include <i386/user_ldt.h> + #define RAX_sig(context) ((context)->uc_mcontext->__ss.__rax) #define RBX_sig(context) ((context)->uc_mcontext->__ss.__rbx) #define RCX_sig(context) ((context)->uc_mcontext->__ss.__rcx) @@ -2833,6 +2835,80 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *ucontext ) } +/*********************************************************************** + * LDT support + */ + +#define LDT_SIZE 8192 + +#define LDT_FLAGS_DATA 0x13 /* Data segment */ +#define LDT_FLAGS_CODE 0x1b /* Code segment */ +#define LDT_FLAGS_32BIT 0x40 /* Segment is 32-bit (code or stack) */ +#define LDT_FLAGS_ALLOCATED 0x80 /* Segment is allocated */ + +static ULONG first_ldt_entry = 32; + +struct ldt_copy +{ + void *base[LDT_SIZE]; + unsigned int limit[LDT_SIZE]; + unsigned char flags[LDT_SIZE]; +} __wine_ldt_copy; + +static pthread_mutex_t ldt_mutex = PTHREAD_MUTEX_INITIALIZER; + +static inline void *ldt_get_base( LDT_ENTRY ent ) +{ + return (void *)(ent.BaseLow | + (ULONG_PTR)ent.HighWord.Bits.BaseMid << 16 | + (ULONG_PTR)ent.HighWord.Bits.BaseHi << 24); +} + +static inline unsigned int ldt_get_limit( LDT_ENTRY ent ) +{ + unsigned int limit = ent.LimitLow | (ent.HighWord.Bits.LimitHi << 16); + if (ent.HighWord.Bits.Granularity) limit = (limit << 12) | 0xfff; + return limit; +} + +static LDT_ENTRY ldt_make_entry( void *base, unsigned int limit, unsigned char flags ) +{ + LDT_ENTRY entry; + + entry.BaseLow = (WORD)(ULONG_PTR)base; + entry.HighWord.Bits.BaseMid = (BYTE)((ULONG_PTR)base >> 16); + entry.HighWord.Bits.BaseHi = (BYTE)((ULONG_PTR)base >> 24); + if ((entry.HighWord.Bits.Granularity = (limit >= 0x100000))) limit >>= 12; + entry.LimitLow = (WORD)limit; + entry.HighWord.Bits.LimitHi = limit >> 16; + entry.HighWord.Bits.Dpl = 3; + entry.HighWord.Bits.Pres = 1; + entry.HighWord.Bits.Type = flags; + entry.HighWord.Bits.Sys = 0; + entry.HighWord.Bits.Reserved_0 = 0; + entry.HighWord.Bits.Default_Big = (flags & LDT_FLAGS_32BIT) != 0; + return entry; +} + +static void ldt_set_entry( WORD sel, LDT_ENTRY entry ) +{ + int index = sel >> 3; + +#if defined(__APPLE__) + if (i386_set_ldt(index, (union ldt_entry *)&entry, 1) < 0) perror("i386_set_ldt"); +#else + fprintf( stderr, "No LDT support on this platform\n" ); + exit(1); +#endif + + __wine_ldt_copy.base[index] = ldt_get_base( entry ); + __wine_ldt_copy.limit[index] = ldt_get_limit( entry ); + __wine_ldt_copy.flags[index] = (entry.HighWord.Bits.Type | + (entry.HighWord.Bits.Default_Big ? LDT_FLAGS_32BIT : 0) | + LDT_FLAGS_ALLOCATED); +} + + /********************************************************************** * get_thread_ldt_entry */ @@ -2871,8 +2947,25 @@ NTSTATUS signal_alloc_thread( TEB *teb ) if (teb->WowTebOffset) { - if (fs32_sel) - thread_data->fs = fs32_sel; + if (!fs32_sel) + { + void *teb32 = (char *)teb + teb->WowTebOffset; + sigset_t sigset; + int idx; + LDT_ENTRY entry = ldt_make_entry( teb32, page_size - 1, LDT_FLAGS_DATA | LDT_FLAGS_32BIT ); + + server_enter_uninterrupted_section( &ldt_mutex, &sigset ); + for (idx = first_ldt_entry; idx < LDT_SIZE; idx++) + { + if (__wine_ldt_copy.flags[idx]) continue; + ldt_set_entry( (idx << 3) | 7, entry ); + break; + } + server_leave_uninterrupted_section( &ldt_mutex, &sigset ); + if (idx == LDT_SIZE) return STATUS_TOO_MANY_THREADS; + thread_data->fs = (idx << 3) | 7; + } + else thread_data->fs = fs32_sel; } return STATUS_SUCCESS; } @@ -2883,6 +2976,15 @@ NTSTATUS signal_alloc_thread( TEB *teb ) */ void signal_free_thread( TEB *teb ) { + struct amd64_thread_data *thread_data = (struct amd64_thread_data *)&teb->GdiTebBatch; + sigset_t sigset; + + if (teb->WowTebOffset && !fs32_sel) + { + server_enter_uninterrupted_section( &ldt_mutex, &sigset ); + __wine_ldt_copy.flags[thread_data->fs >> 3] = 0; + server_leave_uninterrupted_section( &ldt_mutex, &sigset ); + } } #ifdef __APPLE__ @@ -3012,6 +3114,32 @@ void signal_init_process(void) } else ERR_(seh)( "failed to allocate %%fs selector\n" ); } +#elif defined(__APPLE__) + if (NtCurrentTeb()->WowTebOffset) + { + void *teb32 = (char *)NtCurrentTeb() + NtCurrentTeb()->WowTebOffset; + LDT_ENTRY cs32_entry, fs32_entry; + int idx; + + cs32_entry = ldt_make_entry( NULL, -1, LDT_FLAGS_CODE | LDT_FLAGS_32BIT ); + fs32_entry = ldt_make_entry( teb32, page_size - 1, LDT_FLAGS_DATA | LDT_FLAGS_32BIT ); + + for (idx = first_ldt_entry; idx < LDT_SIZE; idx++) + { + if (__wine_ldt_copy.flags[idx]) continue; + cs32_sel = (idx << 3) | 7; + ldt_set_entry( cs32_sel, cs32_entry ); + break; + } + + for (idx = first_ldt_entry; idx < LDT_SIZE; idx++) + { + if (__wine_ldt_copy.flags[idx]) continue; + amd64_thread_data()->fs = (idx << 3) | 7; + ldt_set_entry( amd64_thread_data()->fs, fs32_entry ); + break; + } + } #endif sig_act.sa_mask = server_block_set;

1 0

Nikolay Sivov : secur32: Remove unused field from struct schan_transport.
by Alexandre Julliard May 26, 2022

May 26, 2022

Module: wine Branch: master Commit: d3378c1441c4bd7ff9dc8191ef1fee71a779d1b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3378c1441c4bd7ff9dc8191… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 26 17:06:11 2022 +0300 secur32: Remove unused field from struct schan_transport. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 2 -- dlls/secur32/secur32_priv.h | 1 - 2 files changed, 3 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index bbbac37c6bb..6ab5507becf 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -826,8 +826,6 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( else ctx->header_size = HEADER_SIZE_TLS; - ctx->transport.ctx = ctx; - if (pszTargetName && *pszTargetName) { UINT len = WideCharToMultiByte( CP_UNIXCP, 0, pszTargetName, -1, NULL, 0, NULL, NULL ); diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 64edc0581d6..be375618266 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -102,7 +102,6 @@ struct schan_buffers struct schan_transport { - struct schan_context *ctx; schan_session session; struct schan_buffers in; struct schan_buffers out;

1 0