January 2021 - Wine-Commits

Alexandre Julliard : ntdll: Support more Dwarf pointer types.
by Alexandre Julliard Jan. 21, 2021

Jan. 21, 2021

Module: wine Branch: master Commit: e0dbdaac64086b1982760a22b61a9da2794938c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0dbdaac64086b1982760a22… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 21 10:46:26 2021 +0100 ntdll: Support more Dwarf pointer types. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 92 +++++++++++++++++++++++------------------ 1 file changed, 52 insertions(+), 40 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index cccbfc2a3be..12e40853397 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -512,10 +512,14 @@ enum dwarf_operation }; #define DW_EH_PE_native 0x00 -#define DW_EH_PE_leb128 0x01 -#define DW_EH_PE_data2 0x02 -#define DW_EH_PE_data4 0x03 -#define DW_EH_PE_data8 0x04 +#define DW_EH_PE_uleb128 0x01 +#define DW_EH_PE_udata2 0x02 +#define DW_EH_PE_udata4 0x03 +#define DW_EH_PE_udata8 0x04 +#define DW_EH_PE_sleb128 0x09 +#define DW_EH_PE_sdata2 0x0a +#define DW_EH_PE_sdata4 0x0b +#define DW_EH_PE_sdata8 0x0c #define DW_EH_PE_signed 0x08 #define DW_EH_PE_abs 0x00 #define DW_EH_PE_pcrel 0x10 @@ -609,13 +613,13 @@ static LONG_PTR dwarf_get_sleb128( const unsigned char **p ) return ret; } -static ULONG_PTR dwarf_get_ptr( const unsigned char **p, unsigned char encoding ) +static ULONG_PTR dwarf_get_ptr( const unsigned char **p, unsigned char encoding, const struct dwarf_eh_bases *bases ) { ULONG_PTR base; if (encoding == DW_EH_PE_omit) return 0; - switch (encoding & 0xf0) + switch (encoding & 0x70) { case DW_EH_PE_abs: base = 0; @@ -623,6 +627,18 @@ static ULONG_PTR dwarf_get_ptr( const unsigned char **p, unsigned char encoding case DW_EH_PE_pcrel: base = (ULONG_PTR)*p; break; + case DW_EH_PE_textrel: + base = (ULONG_PTR)bases->tbase; + break; + case DW_EH_PE_datarel: + base = (ULONG_PTR)bases->dbase; + break; + case DW_EH_PE_funcrel: + base = (ULONG_PTR)bases->func; + break; + case DW_EH_PE_aligned: + base = ((ULONG_PTR)*p + 7) & ~7ul; + break; default: FIXME( "unsupported encoding %02x\n", encoding ); return 0; @@ -630,28 +646,21 @@ static ULONG_PTR dwarf_get_ptr( const unsigned char **p, unsigned char encoding switch (encoding & 0x0f) { - case DW_EH_PE_native: - return base + dwarf_get_u8( p ); - case DW_EH_PE_leb128: - return base + dwarf_get_uleb128( p ); - case DW_EH_PE_data2: - return base + dwarf_get_u2( p ); - case DW_EH_PE_data4: - return base + dwarf_get_u4( p ); - case DW_EH_PE_data8: - return base + dwarf_get_u8( p ); - case DW_EH_PE_signed|DW_EH_PE_leb128: - return base + dwarf_get_sleb128( p ); - case DW_EH_PE_signed|DW_EH_PE_data2: - return base + (signed short)dwarf_get_u2( p ); - case DW_EH_PE_signed|DW_EH_PE_data4: - return base + (signed int)dwarf_get_u4( p ); - case DW_EH_PE_signed|DW_EH_PE_data8: - return base + (LONG64)dwarf_get_u8( p ); + case DW_EH_PE_native: base += dwarf_get_u8( p ); break; + case DW_EH_PE_uleb128: base += dwarf_get_uleb128( p ); break; + case DW_EH_PE_udata2: base += dwarf_get_u2( p ); break; + case DW_EH_PE_udata4: base += dwarf_get_u4( p ); break; + case DW_EH_PE_udata8: base += dwarf_get_u8( p ); break; + case DW_EH_PE_sleb128: base += dwarf_get_sleb128( p ); break; + case DW_EH_PE_sdata2: base += (signed short)dwarf_get_u2( p ); break; + case DW_EH_PE_sdata4: base += (signed int)dwarf_get_u4( p ); break; + case DW_EH_PE_sdata8: base += (LONG64)dwarf_get_u8( p ); break; default: FIXME( "unsupported encoding %02x\n", encoding ); return 0; } + if (encoding & DW_EH_PE_indirect) base = *(ULONG_PTR *)base; + return base; } enum reg_rule @@ -706,7 +715,8 @@ static BOOL valid_reg( ULONG_PTR reg ) } static void execute_cfa_instructions( const unsigned char *ptr, const unsigned char *end, - ULONG_PTR last_ip, struct frame_info *info ) + ULONG_PTR last_ip, struct frame_info *info, + const struct dwarf_eh_bases *bases ) { while (ptr < end && info->ip < last_ip + info->signal_frame) { @@ -749,7 +759,7 @@ static void execute_cfa_instructions( const unsigned char *ptr, const unsigned c break; case DW_CFA_set_loc: { - ULONG_PTR loc = dwarf_get_ptr( &ptr, info->fde_encoding ); + ULONG_PTR loc = dwarf_get_ptr( &ptr, info->fde_encoding, bases ); TRACE( "%lx: DW_CFA_set_loc %lx\n", info->ip, loc ); info->ip = loc; break; @@ -998,7 +1008,8 @@ static void set_context_reg( CONTEXT *context, ULONG_PTR dw_reg, void *val ) } } -static ULONG_PTR eval_expression( const unsigned char *p, CONTEXT *context ) +static ULONG_PTR eval_expression( const unsigned char *p, CONTEXT *context, + const struct dwarf_eh_bases *bases ) { ULONG_PTR reg, tmp, stack[64]; int sp = -1; @@ -1059,7 +1070,7 @@ static ULONG_PTR eval_expression( const unsigned char *p, CONTEXT *context ) case DW_OP_ne: stack[sp-1] = (stack[sp-1] != stack[sp]); sp--; break; case DW_OP_skip: tmp = (short)dwarf_get_u2(&p); p += tmp; break; case DW_OP_bra: tmp = (short)dwarf_get_u2(&p); if (!stack[sp--]) p += tmp; break; - case DW_OP_GNU_encoded_addr: tmp = *p++; stack[++sp] = dwarf_get_ptr( &p, tmp ); break; + case DW_OP_GNU_encoded_addr: tmp = *p++; stack[++sp] = dwarf_get_ptr( &p, tmp, bases ); break; case DW_OP_regx: stack[++sp] = *(ULONG_PTR *)get_context_reg( context, dwarf_get_uleb128(&p) ); break; case DW_OP_bregx: reg = dwarf_get_uleb128(&p); @@ -1083,7 +1094,8 @@ static ULONG_PTR eval_expression( const unsigned char *p, CONTEXT *context ) } /* apply the computed frame info to the actual context */ -static void apply_frame_state( CONTEXT *context, struct frame_state *state ) +static void apply_frame_state( CONTEXT *context, struct frame_state *state, + const struct dwarf_eh_bases *bases ) { unsigned int i; ULONG_PTR cfa, value; @@ -1092,10 +1104,10 @@ static void apply_frame_state( CONTEXT *context, struct frame_state *state ) switch (state->cfa_rule) { case RULE_EXPRESSION: - cfa = *(ULONG_PTR *)eval_expression( (const unsigned char *)state->cfa_offset, context ); + cfa = *(ULONG_PTR *)eval_expression( (const unsigned char *)state->cfa_offset, context, bases ); break; case RULE_VAL_EXPRESSION: - cfa = eval_expression( (const unsigned char *)state->cfa_offset, context ); + cfa = eval_expression( (const unsigned char *)state->cfa_offset, context, bases ); break; default: cfa = *(ULONG_PTR *)get_context_reg( context, state->cfa_reg ) + state->cfa_offset; @@ -1118,11 +1130,11 @@ static void apply_frame_state( CONTEXT *context, struct frame_state *state ) set_context_reg( &new_context, i, get_context_reg( context, state->regs[i] )); break; case RULE_EXPRESSION: - value = eval_expression( (const unsigned char *)state->regs[i], context ); + value = eval_expression( (const unsigned char *)state->regs[i], context, bases ); set_context_reg( &new_context, i, (void *)value ); break; case RULE_VAL_EXPRESSION: - value = eval_expression( (const unsigned char *)state->regs[i], context ); + value = eval_expression( (const unsigned char *)state->regs[i], context, bases ); set_context_reg( &new_context, i, &value ); break; } @@ -1193,7 +1205,7 @@ static NTSTATUS dwarf_virtual_unwind( ULONG64 ip, ULONG64 *frame,CONTEXT *contex case 'P': { unsigned char encoding = *ptr++; - *handler = (void *)dwarf_get_ptr( &ptr, encoding ); + *handler = (void *)dwarf_get_ptr( &ptr, encoding, bases ); continue; } case 'R': @@ -1210,11 +1222,11 @@ static NTSTATUS dwarf_virtual_unwind( ULONG64 ip, ULONG64 *frame,CONTEXT *contex if (end) ptr = end; end = (const unsigned char *)(&cie->length + 1) + cie->length; - execute_cfa_instructions( ptr, end, ip, &info ); + execute_cfa_instructions( ptr, end, ip, &info, bases ); ptr = (const unsigned char *)(fde + 1); - info.ip = dwarf_get_ptr( &ptr, info.fde_encoding ); /* fde code start */ - code_end = info.ip + dwarf_get_ptr( &ptr, info.fde_encoding & 0x0f ); /* fde code length */ + info.ip = dwarf_get_ptr( &ptr, info.fde_encoding, bases ); /* fde code start */ + code_end = info.ip + dwarf_get_ptr( &ptr, info.fde_encoding & 0x0f, bases ); /* fde code length */ if (aug_z_format) /* get length of augmentation data */ { @@ -1223,15 +1235,15 @@ static NTSTATUS dwarf_virtual_unwind( ULONG64 ip, ULONG64 *frame,CONTEXT *contex } else end = NULL; - *handler_data = (void *)dwarf_get_ptr( &ptr, lsda_encoding ); + *handler_data = (void *)dwarf_get_ptr( &ptr, lsda_encoding, bases ); if (end) ptr = end; end = (const unsigned char *)(&fde->length + 1) + fde->length; TRACE( "fde %p len %x personality %p lsda %p code %lx-%lx\n", fde, fde->length, *handler, *handler_data, info.ip, code_end ); - execute_cfa_instructions( ptr, end, ip, &info ); + execute_cfa_instructions( ptr, end, ip, &info, bases ); *frame = context->Rsp; - apply_frame_state( context, &info.state ); + apply_frame_state( context, &info.state, bases ); TRACE( "next function rip=%016lx\n", context->Rip ); TRACE( " rax=%016lx rbx=%016lx rcx=%016lx rdx=%016lx\n",

1 0

Henri Verbeet : wined3d: Stencil test also uses the depth/stencil buffer.
by Alexandre Julliard Jan. 21, 2021

Jan. 21, 2021

Module: wine Branch: master Commit: c47b28f5d4324ec77404319a1dc22584f006ed1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c47b28f5d4324ec77404319a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 21 10:55:52 2021 +0100 wined3d: Stencil test also uses the depth/stencil buffer. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e010deb1264..07ddb57333c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3709,7 +3709,8 @@ static inline bool wined3d_state_uses_depth_buffer(const struct wined3d_state *s { if (!state->depth_stencil_state) return true; - return state->depth_stencil_state->desc.depth || state->depth_stencil_state->desc.depth_write; + return state->depth_stencil_state->desc.depth || state->depth_stencil_state->desc.depth_write + || state->depth_stencil_state->desc.stencil; } struct wined3d_dummy_textures

1 0

Henri Verbeet : wined3d: Correct the argument order of a FIXME in wined3d_texture_vk_download_data().
by Alexandre Julliard Jan. 21, 2021

Jan. 21, 2021

Module: wine Branch: master Commit: f0dae1d852a371293da00104ec861787f35865f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0dae1d852a371293da00104… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 21 10:55:53 2021 +0100 wined3d: Correct the argument order of a FIXME in wined3d_texture_vk_download_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 6f16868c5ad..5bb4de05d5c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4771,8 +4771,8 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, if (dst_format->id != src_texture->resource.format->id) { FIXME("Unhandled format conversion (%s -> %s).\n", - debug_d3dformat(dst_format->id), - debug_d3dformat(src_texture->resource.format->id)); + debug_d3dformat(src_texture->resource.format->id), + debug_d3dformat(dst_format->id)); return; }

1 0

Alexandre Julliard : include: Add a couple of dll characteristics.
by Alexandre Julliard Jan. 21, 2021

Jan. 21, 2021

Module: wine Branch: master Commit: e137063394deba721f3a8a8ebd78961f39679ad2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e137063394deba721f3a8a8e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 21 20:39:11 2021 +0100 include: Add a couple of dll characteristics. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 3 +++ tools/winedump/pe.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index fba721f7f02..f5ef0c7bd52 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3135,13 +3135,16 @@ typedef struct _IMAGE_VXD_HEADER { #define IMAGE_SUBSYSTEM_WINDOWS_BOOT_APPLICATION 16 /* DLL Characteristics */ +#define IMAGE_DLLCHARACTERISTICS_HIGH_ENTROPY_VA 0x0020 #define IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE 0x0040 #define IMAGE_DLLCHARACTERISTICS_FORCE_INTEGRITY 0x0080 #define IMAGE_DLLCHARACTERISTICS_NX_COMPAT 0x0100 #define IMAGE_DLLCHARACTERISTICS_NO_ISOLATION 0x0200 #define IMAGE_DLLCHARACTERISTICS_NO_SEH 0x0400 #define IMAGE_DLLCHARACTERISTICS_NO_BIND 0x0800 +#define IMAGE_DLLCHARACTERISTICS_APPCONTAINER 0x1000 #define IMAGE_DLLCHARACTERISTICS_WDM_DRIVER 0x2000 +#define IMAGE_DLLCHARACTERISTICS_GUARD_CF 0x4000 #define IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE 0x8000 typedef struct _IMAGE_FILE_HEADER { diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index fef95c6bb67..19ccd172da2 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -213,15 +213,18 @@ static inline void print_subsys(const char *title, WORD value) static inline void print_dllflags(const char *title, WORD value) { - printf(" %-34s 0x%X\n", title, value); + printf(" %-34s 0x%04X\n", title, value); #define X(f,s) if (value & f) printf(" %s\n", s) + X(IMAGE_DLLCHARACTERISTICS_HIGH_ENTROPY_VA, "HIGH_ENTROPY_VA"); X(IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE, "DYNAMIC_BASE"); X(IMAGE_DLLCHARACTERISTICS_FORCE_INTEGRITY, "FORCE_INTEGRITY"); X(IMAGE_DLLCHARACTERISTICS_NX_COMPAT, "NX_COMPAT"); X(IMAGE_DLLCHARACTERISTICS_NO_ISOLATION, "NO_ISOLATION"); X(IMAGE_DLLCHARACTERISTICS_NO_SEH, "NO_SEH"); X(IMAGE_DLLCHARACTERISTICS_NO_BIND, "NO_BIND"); + X(IMAGE_DLLCHARACTERISTICS_APPCONTAINER, "APPCONTAINER"); X(IMAGE_DLLCHARACTERISTICS_WDM_DRIVER, "WDM_DRIVER"); + X(IMAGE_DLLCHARACTERISTICS_GUARD_CF, "GUARD_CF"); X(IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE, "TERMINAL_SERVER_AWARE"); #undef X }

1 0

Nikolay Sivov : dwrite: Zero initialize font data structure.
by Alexandre Julliard Jan. 21, 2021

Jan. 21, 2021

Module: wine Branch: master Commit: 612652bb9ca93dbafefc2ff47714c1906cb59d4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=612652bb9ca93dbafefc2ff4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 21 16:36:50 2021 +0300 dwrite: Zero initialize font data structure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 74e6b929ecd..392c1dd0ee8 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -3932,9 +3932,6 @@ static HRESULT init_font_data(const struct fontface_desc *desc, struct dwrite_fo data->file = desc->files[0]; data->face_index = desc->index; data->face_type = desc->face_type; - data->simulations = DWRITE_FONT_SIMULATIONS_NONE; - data->bold_sim_tested = 0; - data->oblique_sim_tested = 0; IDWriteFontFile_AddRef(data->file); stream_desc.stream = desc->stream;

1 0

Daniel Lehman : ntdll: Check event type on creation.
by Alexandre Julliard Jan. 21, 2021

Jan. 21, 2021

Module: wine Branch: master Commit: 6a971e8429a81e4fcec8ac13b28bbf75b7a06bdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a971e8429a81e4fcec8ac13… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Jan 20 22:04:52 2021 -0800 ntdll: Check event type on creation. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 50 +++++++++++++++++++++++++++++++++++--------------- dlls/ntdll/unix/sync.c | 1 + 2 files changed, 36 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index ff0b9c939e4..5744b88fc84 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -26,7 +26,7 @@ #include "stdlib.h" static VOID (WINAPI *pRtlInitUnicodeString)( PUNICODE_STRING, LPCWSTR ); -static NTSTATUS (WINAPI *pNtCreateEvent) ( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES, BOOLEAN, BOOLEAN); +static NTSTATUS (WINAPI *pNtCreateEvent) ( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES, EVENT_TYPE, BOOLEAN); static NTSTATUS (WINAPI *pNtOpenEvent) ( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES); static NTSTATUS (WINAPI *pNtPulseEvent) ( HANDLE, PLONG ); static NTSTATUS (WINAPI *pNtQueryEvent) ( HANDLE, EVENT_INFORMATION_CLASS, PVOID, ULONG, PULONG ); @@ -92,12 +92,12 @@ static void test_case_sensitive (void) status = pNtCreateMutant(&Mutant, GENERIC_ALL, &attr, FALSE); ok(status == STATUS_SUCCESS, "Failed to create Mutant(%08x)\n", status); - status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, FALSE, FALSE); + status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, NotificationEvent, FALSE); ok(status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH /* Vista+ */, "got %#x\n", status); pRtlInitUnicodeString(&str, L"\\BaseNamedObjects\\Test"); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); - status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, FALSE, FALSE); + status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, NotificationEvent, FALSE); ok(status == STATUS_SUCCESS, "Failed to create Event(%08x)\n", status); pRtlInitUnicodeString(&str, L"\\BaseNamedObjects\\TEst"); @@ -113,7 +113,7 @@ static void test_case_sensitive (void) status = pNtCreateMutant(&Mutant, GENERIC_ALL, &attr, FALSE); ok(status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH /* Vista+ */, "got %#x\n", status); - status = pNtCreateEvent(&h, GENERIC_ALL, &attr, FALSE, FALSE); + status = pNtCreateEvent(&h, GENERIC_ALL, &attr, NotificationEvent, FALSE); ok(status == STATUS_OBJECT_NAME_COLLISION, "NtCreateEvent should have failed with STATUS_OBJECT_NAME_COLLISION got(%08x)\n", status); @@ -292,7 +292,7 @@ static void test_name_collisions(void) h = CreateEventA(NULL, FALSE, FALSE, "om.c-test"); ok(h != 0, "CreateEventA failed got ret=%p (%d)\n", h, GetLastError()); - status = pNtCreateEvent(&h1, GENERIC_ALL, &attr, FALSE, FALSE); + status = pNtCreateEvent(&h1, GENERIC_ALL, &attr, NotificationEvent, FALSE); ok(status == STATUS_OBJECT_NAME_EXISTS && h1 != NULL, "NtCreateEvent should have succeeded with STATUS_OBJECT_NAME_EXISTS got(%08x)\n", status); h2 = CreateEventA(NULL, FALSE, FALSE, "om.c-test"); @@ -370,7 +370,7 @@ static void test_all_kernel_objects( UINT line, OBJECT_ATTRIBUTES *attr, ok( status2 == open_expect, "%u: NtOpenSemaphore failed %x\n", line, status2 ); if (!status) pNtClose( ret ); if (!status2) pNtClose( ret2 ); - status = pNtCreateEvent( &ret, GENERIC_ALL, attr, 1, 0 ); + status = pNtCreateEvent( &ret, GENERIC_ALL, attr, SynchronizationEvent, 0 ); ok( status == create_expect, "%u: NtCreateEvent failed %x\n", line, status ); status2 = pNtOpenEvent( &ret2, GENERIC_ALL, attr ); ok( status2 == open_expect, "%u: NtOpenEvent failed %x\n", line, status2 ); @@ -462,7 +462,7 @@ static void test_name_limits(void) ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */, "%u: NtOpenSemaphore failed %x\n", str.Length, status ); pNtClose( ret ); - status = pNtCreateEvent( &ret, GENERIC_ALL, &attr2, 1, 0 ); + status = pNtCreateEvent( &ret, GENERIC_ALL, &attr2, SynchronizationEvent, 0 ); ok( status == STATUS_SUCCESS, "%u: NtCreateEvent failed %x\n", str.Length, status ); attr3.RootDirectory = ret; status = pNtOpenEvent( &ret2, GENERIC_ALL, &attr ); @@ -581,7 +581,7 @@ static void test_name_limits(void) pNtClose( ret ); status = pNtOpenSemaphore( &ret, GENERIC_ALL, NULL ); ok( status == STATUS_INVALID_PARAMETER, "NULL: NtOpenSemaphore failed %x\n", status ); - status = pNtCreateEvent( &ret, GENERIC_ALL, NULL, 1, 0 ); + status = pNtCreateEvent( &ret, GENERIC_ALL, NULL, SynchronizationEvent, 0 ); ok( status == STATUS_SUCCESS, "NULL: NtCreateEvent failed %x\n", status ); pNtClose( ret ); status = pNtOpenEvent( &ret, GENERIC_ALL, NULL ); @@ -934,7 +934,7 @@ static void test_directory(void) RtlInitUnicodeString( &str, L"om.c-event" ); InitializeObjectAttributes( &attr, &str, 0, dir1, NULL ); - status = pNtCreateEvent( &h, GENERIC_ALL, &attr, 1, 0 ); + status = pNtCreateEvent( &h, GENERIC_ALL, &attr, SynchronizationEvent, 0 ); ok( status == STATUS_SUCCESS, "NtCreateEvent failed %x\n", status ); status = pNtOpenEvent( &h2, GENERIC_ALL, &attr ); ok( status == STATUS_SUCCESS, "NtOpenEvent failed %x\n", status ); @@ -1570,7 +1570,7 @@ static void test_type_mismatch(void) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - res = pNtCreateEvent( &h, 0, &attr, 0, 0 ); + res = pNtCreateEvent( &h, 0, &attr, NotificationEvent, 0 ); ok(!res, "can't create event: %x\n", res); res = pNtReleaseSemaphore( h, 30, NULL ); @@ -1592,16 +1592,29 @@ static void test_event(void) pRtlInitUnicodeString( &str, L"\\BaseNamedObjects\\testEvent" ); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); - status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, 1, 0); + status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, 2, 0); + ok( status == STATUS_INVALID_PARAMETER, "NtCreateEvent failed %08x\n", status ); + + status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, NotificationEvent, 0); + ok( status == STATUS_SUCCESS, "NtCreateEvent failed %08x\n", status ); + memset(&info, 0xcc, sizeof(info)); + status = pNtQueryEvent(Event, EventBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); + ok( info.EventType == NotificationEvent && info.EventState == 0, + "NtQueryEvent failed, expected 0 0, got %d %d\n", info.EventType, info.EventState ); + pNtClose(Event); + + status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, SynchronizationEvent, 0); ok( status == STATUS_SUCCESS, "NtCreateEvent failed %08x\n", status ); status = pNtPulseEvent(Event, &prev_state); ok( status == STATUS_SUCCESS, "NtPulseEvent failed %08x\n", status ); ok( !prev_state, "prev_state = %x\n", prev_state ); + memset(&info, 0xcc, sizeof(info)); status = pNtQueryEvent(Event, EventBasicInformation, &info, sizeof(info), NULL); ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); - ok( info.EventType == 1 && info.EventState == 0, + ok( info.EventType == SynchronizationEvent && info.EventState == 0, "NtQueryEvent failed, expected 1 0, got %d %d\n", info.EventType, info.EventState ); status = pNtOpenEvent(&Event2, GENERIC_ALL, &attr); @@ -1610,15 +1623,22 @@ static void test_event(void) pNtClose(Event); Event = Event2; + memset(&info, 0xcc, sizeof(info)); status = pNtQueryEvent(Event, EventBasicInformation, &info, sizeof(info), NULL); ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); - ok( info.EventType == 1 && info.EventState == 0, + ok( info.EventType == SynchronizationEvent && info.EventState == 0, "NtQueryEvent failed, expected 1 0, got %d %d\n", info.EventType, info.EventState ); status = pNtSetEvent( Event, &prev_state ); ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08x\n", status ); ok( !prev_state, "prev_state = %x\n", prev_state ); + memset(&info, 0xcc, sizeof(info)); + status = pNtQueryEvent(Event, EventBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); + ok( info.EventType == SynchronizationEvent && info.EventState == 1, + "NtQueryEvent failed, expected 1 1, got %d %d\n", info.EventType, info.EventState ); + status = pNtSetEvent( Event, &prev_state ); ok( status == STATUS_SUCCESS, "NtSetEvent failed: %08x\n", status ); ok( prev_state == 1, "prev_state = %x\n", prev_state ); @@ -1824,13 +1844,13 @@ static void test_keyed_events(void) status = pNtPulseEvent( handle, NULL ); ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtPulseEvent %x\n", status ); - status = pNtCreateEvent( &event, GENERIC_ALL, &attr, FALSE, FALSE ); + status = pNtCreateEvent( &event, GENERIC_ALL, &attr, NotificationEvent, FALSE ); ok( status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH /* 7+ */, "CreateEvent %x\n", status ); NtClose( handle ); - status = pNtCreateEvent( &event, GENERIC_ALL, &attr, FALSE, FALSE ); + status = pNtCreateEvent( &event, GENERIC_ALL, &attr, NotificationEvent, FALSE ); ok( status == 0, "CreateEvent %x\n", status ); status = pNtWaitForKeyedEvent( event, (void *)8, 0, &timeout ); ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtWaitForKeyedEvent %x\n", status ); diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index dcc8c5447ef..3a3080463d7 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -427,6 +427,7 @@ NTSTATUS WINAPI NtCreateEvent( HANDLE *handle, ACCESS_MASK access, const OBJECT_ data_size_t len; struct object_attributes *objattr; + if (type != NotificationEvent && type != SynchronizationEvent) return STATUS_INVALID_PARAMETER; if ((ret = alloc_object_attributes( attr, &objattr, &len ))) return ret; SERVER_START_REQ( create_event )

1 0

Zebediah Figura : ntoskrnl: Use YieldProcessor().
by Alexandre Julliard Jan. 21, 2021

Jan. 21, 2021

Module: wine Branch: master Commit: c0ce83371b1c45d22d584afc7407cfcf9d4063aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0ce83371b1c45d22d584afc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 20 22:35:49 2021 -0600 ntoskrnl: Use YieldProcessor(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/sync.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 671398594e8..2aa60a0f2a0 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -540,15 +540,6 @@ void WINAPI KeInitializeSpinLock( KSPIN_LOCK *lock ) *lock = 0; } -static inline void small_pause(void) -{ -#ifdef __x86_64__ - __asm__ __volatile__( "rep;nop" : : : "memory" ); -#else - __asm__ __volatile__( "" : : : "memory" ); -#endif -} - /*********************************************************************** * KeAcquireSpinLockAtDpcLevel (NTOSKRNL.EXE.@) */ @@ -556,7 +547,7 @@ void WINAPI KeAcquireSpinLockAtDpcLevel( KSPIN_LOCK *lock ) { TRACE("lock %p.\n", lock); while (InterlockedCompareExchangePointer( (void **)lock, (void *)1, (void *)0 )) - small_pause(); + YieldProcessor(); } /*********************************************************************** @@ -592,7 +583,7 @@ void FASTCALL KeAcquireInStackQueuedSpinLockAtDpcLevel( KSPIN_LOCK *lock, KLOCK_ while (!((ULONG_PTR)InterlockedCompareExchangePointer( (void **)&queue->LockQueue.Lock, 0, 0 ) & QUEUED_SPINLOCK_OWNED)) { - small_pause(); + YieldProcessor(); } } } @@ -619,7 +610,7 @@ void FASTCALL KeReleaseInStackQueuedSpinLockFromDpcLevel( KLOCK_QUEUE_HANDLE *qu /* Otherwise, someone just queued themselves, but hasn't yet set * themselves as successor. Spin waiting for them to do so. */ while (!(next = queue->LockQueue.Next)) - small_pause(); + YieldProcessor(); } InterlockedExchangePointer( (void **)&next->Lock, (KSPIN_LOCK *)((ULONG_PTR)lock | QUEUED_SPINLOCK_OWNED) );

1 0

Zebediah Figura : include: Add InterlockedAnd().
by Alexandre Julliard Jan. 21, 2021

Jan. 21, 2021

Module: wine Branch: master Commit: 0d1345ac2bf5c9c4b36e34cd2a790c10dd2bbd08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d1345ac2bf5c9c4b36e34cd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 20 22:35:45 2021 -0600 include: Add InterlockedAnd(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/lock.c | 10 ---------- include/winnt.h | 12 ++++++++++++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index c10445becda..74156aa7db3 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -1157,16 +1157,6 @@ static inline void spin_wait_for_next_rwl(rwl_queue *q) SpinWait_dtor(&sw); } -static LONG InterlockedAnd(LONG *d, LONG v) -{ - LONG l = *d, old; - while ((l & v) != l) { - if((old = InterlockedCompareExchange(d, l&v, l)) == l) break; - l = old; - } - return l; -} - /* ?lock(a)reader_writer_lock@Concurrency@@QAEXXZ */ /* ?lock(a)reader_writer_lock@Concurrency@@QEAAXXZ */ DEFINE_THISCALL_WRAPPER(reader_writer_lock_lock, 4) diff --git a/include/winnt.h b/include/winnt.h index 8834ced73e6..b03f7bb3646 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6896,6 +6896,7 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) #ifdef _MSC_VER +#pragma intrinsic(_InterlockedAnd) #pragma intrinsic(_InterlockedCompareExchange) #pragma intrinsic(_InterlockedCompareExchange64) #ifdef _WIN64 @@ -6907,6 +6908,7 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) #pragma intrinsic(_InterlockedDecrement) #pragma intrinsic(_InterlockedOr) +long _InterlockedAnd(long volatile *,long); long _InterlockedCompareExchange(long volatile*,long,long); long long _InterlockedCompareExchange64(long long volatile*,long long,long long); #ifdef _WIN64 @@ -6918,6 +6920,11 @@ long _InterlockedExchangeAdd(long volatile*,long); long _InterlockedIncrement(long volatile*); long _InterlockedOr(long volatile *,long); +static FORCEINLINE LONG WINAPI InterlockedAnd( LONG volatile *dest, LONG val ) +{ + return _InterlockedAnd( (long volatile *)dest, val ); +} + static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) { return _InterlockedCompareExchange( (long volatile *)dest, xchg, compare ); @@ -7030,6 +7037,11 @@ static FORCEINLINE void MemoryBarrier(void) #elif defined(__GNUC__) +static FORCEINLINE LONG WINAPI InterlockedAnd( LONG volatile *dest, LONG val ) +{ + return __sync_fetch_and_and( dest, val ); +} + static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) { return __sync_val_compare_and_swap( dest, compare, xchg );

1 0

Zebediah Figura : winegstreamer: Keep the stream in paused state for its entire lifetime.
by Alexandre Julliard Jan. 21, 2021

Jan. 21, 2021

Module: wine Branch: master Commit: 90107bba944a1da286e9ebd246ab3fd5dd7cb115 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90107bba944a1da286e9ebd2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 20 18:58:52 2021 -0600 winegstreamer: Keep the stream in paused state for its entire lifetime. This noticeably improves stream startup time. The process of typefinding and negotiation takes about 70 ms for a simple test file on one machine, and this is currently done twice. This patch replaces the second instance with a simple seek, which takes less than 10 ms. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 194 +++++++----------------------------------- 1 file changed, 32 insertions(+), 162 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=90107bba944a1da286e9…

1 0

Zebediah Figura : winegstreamer: Consistently use GST_STATE_PAUSED for test-play.
by Alexandre Julliard Jan. 21, 2021

Jan. 21, 2021

Module: wine Branch: master Commit: b3e2009b5edfa653f7629901c2658b70f65538b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3e2009b5edfa653f7629901… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 20 18:58:50 2021 -0600 winegstreamer: Consistently use GST_STATE_PAUSED for test-play. It does not matter whether we use PAUSED or PLAYING, but we should at least be consistent. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 9cf2379cb2c..90ba02bba5d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1875,7 +1875,7 @@ static BOOL decodebin_parser_init_gst(struct parser *filter) return FALSE; } - gst_element_set_state(filter->container, GST_STATE_PLAYING); + gst_element_set_state(filter->container, GST_STATE_PAUSED); ret = gst_element_get_state(filter->container, NULL, NULL, -1); if (ret == GST_STATE_CHANGE_FAILURE) { @@ -2776,7 +2776,7 @@ static BOOL avi_splitter_init_gst(struct parser *filter) return FALSE; } - gst_element_set_state(filter->container, GST_STATE_PLAYING); + gst_element_set_state(filter->container, GST_STATE_PAUSED); ret = gst_element_get_state(filter->container, NULL, NULL, -1); if (ret == GST_STATE_CHANGE_FAILURE) {

1 0