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

Martin Storsjö : ntdll: Add SEH unwind info in ARM assembly functions/trampolines.
by Alexandre Julliard June 7, 2022

June 7, 2022

Module: wine Branch: master Commit: 2d43653a2e789ed67a3c66db92276783b849051c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d43653a2e789ed67a3c66db… Author: Martin Storsjö <martin(a)martin.st> Date: Wed May 11 00:52:10 2022 +0300 ntdll: Add SEH unwind info in ARM assembly functions/trampolines. Clang generates SEH unwind info on ARM in both MSVC and mingw mode since Clang 15. The unwind info gets which gets enabled automatically by building with a new enough compiler. For functions/trampolines that are implemented in assembly, the unwind information needs to be provided by hand - in particular for cases where unwinding should be diverted. Contrary to AArch64, Clang got SEH assembler directives directly from the start when SEH was implemented (when the __SEH__ compiler define gets set), so there's no need for compiler version checks (like for AArch64 in include/wine/asm.h), but the default check for __SEH__ works fine for enabling the __ARM_SEH() macro. Use a custom unwind opcode in the private opcode space for unwinding to a specific CONTEXT instead of up to the caller. (Contrary to AArch64, there's no specific unwind opcode for restoring a full CONTEXT, but the unwind opcode space does have a couple unallocated values marked as "available", which can be used for vendor specific needs here.) This fixes unwinding in ARM PE builds. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/ntdll/signal_arm.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 7872962bbbe..01c911660de 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -731,6 +731,8 @@ static void process_unwind_codes( BYTE *ptr, BYTE *end, CONTEXT *context, WARN( "unsupported code %02x\n", *ptr ); else if (*ptr <= 0xef && ((val & 0xff) <= 0x0f)) /* ldr lr, [sp], #x */ pop_lr( 4 * (val & 0x0f), context, ptrs ); + else if (*ptr == 0xf4) /* Custom private (unallocated) opcode, saved a full CONTEXT on the stack */ + memcpy( context, (DWORD *)context->Sp, sizeof(CONTEXT) ); else if (*ptr <= 0xf4) /* Available */ WARN( "unsupported code %02x\n", *ptr ); else if (*ptr <= 0xf5) /* vpop {dS-dE} */ @@ -1075,11 +1077,18 @@ extern void * WINAPI call_consolidate_callback( CONTEXT *context, EXCEPTION_RECORD *rec ); __ASM_GLOBAL_FUNC( call_consolidate_callback, "push {r0-r2,lr}\n\t" + __ASM_SEH(".seh_nop\n\t") "sub sp, sp, #0x1a0\n\t" + __ASM_SEH(".seh_nop\n\t") "mov r1, r0\n\t" + __ASM_SEH(".seh_nop\n\t") "mov r0, sp\n\t" + __ASM_SEH(".seh_nop\n\t") "mov r2, #0x1a0\n\t" + __ASM_SEH(".seh_nop_w\n\t") "bl " __ASM_NAME("memcpy") "\n\t" + __ASM_SEH(".seh_custom 0xf4\n\t") /* A custom (unallocated) SEH opcode for CONTEXT on stack */ + __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_def_cfa 13, 0\n\t") __ASM_CFI(".cfi_escape 0x0f,0x04,0x7d,0xb8,0x00,0x06\n\t") /* DW_CFA_def_cfa_expression: DW_OP_breg13 + 56, DW_OP_deref */ __ASM_CFI(".cfi_escape 0x10,0x04,0x02,0x7d,0x14\n\t") /* DW_CFA_expression: R4 DW_OP_breg13 + 20 */ @@ -1300,6 +1309,8 @@ extern LONG __C_ExecuteExceptionFilter(PEXCEPTION_POINTERS ptrs, PVOID frame, PUCHAR nonvolatile); __ASM_GLOBAL_FUNC( __C_ExecuteExceptionFilter, "push {r4-r11,lr}\n\t" + __ASM_SEH(".seh_save_regs_w {r4-r11,lr}\n\t") + __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_def_cfa 13, 36\n\t") __ASM_CFI(".cfi_offset r4, -36\n\t") @@ -1410,7 +1421,10 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, */ __ASM_STDCALL_FUNC( RtlRaiseException, 4, "push {r0, lr}\n\t" + __ASM_SEH(".seh_save_regs {r0, lr}\n\t") "sub sp, sp, #0x1a0\n\t" /* sizeof(CONTEXT) */ + __ASM_SEH(".seh_stackalloc 0x1a0\n\t") + __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 424\n\t") __ASM_CFI(".cfi_offset lr, -4\n\t") "mov r0, sp\n\t" /* context */

1 0

Jacek Caban : mmdevapi: Remove android from default driver list.
by Alexandre Julliard June 7, 2022

June 7, 2022

Module: wine Branch: master Commit: 9a8fdc724beb6b70b7ea503807a75b6dc5ab3752 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a8fdc724beb6b70b7ea5038… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 7 02:38:36 2022 +0200 mmdevapi: Remove android from default driver list. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mmdevapi/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index a814433810a..5e0e6728763 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -102,7 +102,7 @@ static BOOL load_driver(const WCHAR *name, DriverFuncs *driver) static BOOL WINAPI init_driver(INIT_ONCE *once, void *param, void **context) { - static WCHAR default_list[] = L"pulse,alsa,oss,coreaudio,android"; + static WCHAR default_list[] = L"pulse,alsa,oss,coreaudio"; DriverFuncs driver; HKEY key; WCHAR reg_list[256], *p, *next, *driver_list = default_list;

1 0

Martin Storsjö : ntdll: Use ControlPcIsUnwound for the RtlVirtualUnwind pc parameter in virtual_unwind.
by Alexandre Julliard June 7, 2022

June 7, 2022

Module: wine Branch: master Commit: d007c91d46bb9868ccde0c32865c616b1f255827 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d007c91d46bb9868ccde0c32… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Jun 7 14:10:07 2022 +0300 ntdll: Use ControlPcIsUnwound for the RtlVirtualUnwind pc parameter in virtual_unwind. Don't just use ControlPcIsUnwound for picking which RUNTIME_FUNCTION to use, but also use it for adjusting the pc value that is passed to RtlVirtualUnwind. This fixes one testcase (that I had missed to build and run before), where the pc points at the start of an epilogue (which would mean that no handler is returned from RtlVirtualUnwind). By taking ControlPcIsUnwound and adjusting the pc pointer, the unwind handler is returned and executed. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/ntdll/signal_arm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 01c911660de..c4cf557edaf 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -133,6 +133,7 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX { LDR_DATA_TABLE_ENTRY *module; NTSTATUS status; + DWORD pc; dispatch->ImageBase = 0; dispatch->ScopeIndex = 0; @@ -143,14 +144,14 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX * signal frame. */ dispatch->ControlPcIsUnwound = (context->ContextFlags & CONTEXT_UNWOUND_TO_CALL) != 0; + pc = context->Pc - (dispatch->ControlPcIsUnwound ? 2 : 0); /* first look for PE exception information */ - if ((dispatch->FunctionEntry = lookup_function_info( - context->Pc - (dispatch->ControlPcIsUnwound ? 2 : 0), + if ((dispatch->FunctionEntry = lookup_function_info(pc, (ULONG_PTR*)&dispatch->ImageBase, &module ))) { - dispatch->LanguageHandler = RtlVirtualUnwind( type, dispatch->ImageBase, context->Pc, + dispatch->LanguageHandler = RtlVirtualUnwind( type, dispatch->ImageBase, pc, dispatch->FunctionEntry, context, &dispatch->HandlerData, (ULONG_PTR *)&dispatch->EstablisherFrame, NULL );

1 0

Martin Storsjö : ntdll: Take ControlPcIsUnwound into account on arm64 too.
by Alexandre Julliard June 7, 2022

June 7, 2022

Module: wine Branch: master Commit: 94f7f52dac5fbc3b1abe7f38cabf38853b7af0f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94f7f52dac5fbc3b1abe7f38… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Jun 7 14:12:46 2022 +0300 ntdll: Take ControlPcIsUnwound into account on arm64 too. This is the same modification as the previous patch, applied on arm64. It doesn't change the outcome for any of my tests though. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/ntdll/signal_arm64.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 034c78f6b4d..fba0da48a16 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -165,6 +165,7 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX { LDR_DATA_TABLE_ENTRY *module; NTSTATUS status; + DWORD64 pc; dispatch->ImageBase = 0; dispatch->ScopeIndex = 0; @@ -175,14 +176,14 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX * signal frame. */ dispatch->ControlPcIsUnwound = (context->ContextFlags & CONTEXT_UNWOUND_TO_CALL) != 0; + pc = context->Pc - (dispatch->ControlPcIsUnwound ? 4 : 0); /* first look for PE exception information */ - if ((dispatch->FunctionEntry = lookup_function_info( - context->Pc - (dispatch->ControlPcIsUnwound ? 4 : 0), + if ((dispatch->FunctionEntry = lookup_function_info(pc, &dispatch->ImageBase, &module ))) { - dispatch->LanguageHandler = RtlVirtualUnwind( type, dispatch->ImageBase, context->Pc, + dispatch->LanguageHandler = RtlVirtualUnwind( type, dispatch->ImageBase, pc, dispatch->FunctionEntry, context, &dispatch->HandlerData, &dispatch->EstablisherFrame, NULL );

1 0

Zebediah Figura : wined3d: Parse the eval_centroid opcode.
by Alexandre Julliard June 7, 2022

June 7, 2022

Module: wine Branch: master Commit: d95780ba39816e3eb1139366236f3835564beadd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d95780ba39816e3eb1139366… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 6 14:54:06 2022 -0500 wined3d: Parse the eval_centroid opcode. This fixes rendering of trees and other objects in SnowRunner with the Vulkan renderer. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5c45df8e6fa..dcdee479e17 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5080,6 +5080,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_ENDREP */ shader_hw_endrep, /* WINED3DSIH_ENDSWITCH */ NULL, /* WINED3DSIH_EQ */ NULL, + /* WINED3DSIH_EVAL_CENTROID */ NULL, /* WINED3DSIH_EVAL_SAMPLE_INDEX */ NULL, /* WINED3DSIH_EXP */ shader_hw_scalar_op, /* WINED3DSIH_EXPP */ shader_hw_scalar_op, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0c9822a95aa..40b5442ed04 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11323,6 +11323,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ENDREP */ shader_glsl_end, /* WINED3DSIH_ENDSWITCH */ shader_glsl_end, /* WINED3DSIH_EQ */ shader_glsl_relop, + /* WINED3DSIH_EVAL_CENTROID */ NULL, /* WINED3DSIH_EVAL_SAMPLE_INDEX */ shader_glsl_interpolate, /* WINED3DSIH_EXP */ shader_glsl_scalar_op, /* WINED3DSIH_EXPP */ shader_glsl_expp, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index c02f82b4d7b..c2e77021bb3 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -133,6 +133,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_ENDREP */ "endrep", /* WINED3DSIH_ENDSWITCH */ "endswitch", /* WINED3DSIH_EQ */ "eq", + /* WINED3DSIH_EVAL_CENTROID */ "eval_centroid", /* WINED3DSIH_EVAL_SAMPLE_INDEX */ "eval_sample_index", /* WINED3DSIH_EXP */ "exp", /* WINED3DSIH_EXPP */ "expp", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 266b54d1d15..e60eb9b2fc4 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -305,6 +305,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_IMM_ATOMIC_UMIN = 0xbd, WINED3D_SM5_OP_SYNC = 0xbe, WINED3D_SM5_OP_EVAL_SAMPLE_INDEX = 0xcc, + WINED3D_SM5_OP_EVAL_CENTROID = 0xcd, WINED3D_SM5_OP_DCL_GS_INSTANCES = 0xce, }; @@ -1124,6 +1125,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_SYNC, WINED3DSIH_SYNC, "", "", shader_sm5_read_sync}, {WINED3D_SM5_OP_EVAL_SAMPLE_INDEX, WINED3DSIH_EVAL_SAMPLE_INDEX, "f", "fi"}, + {WINED3D_SM5_OP_EVAL_CENTROID, WINED3DSIH_EVAL_CENTROID, "f", "f"}, {WINED3D_SM5_OP_DCL_GS_INSTANCES, WINED3DSIH_DCL_GS_INSTANCES, "", "", shader_sm4_read_declaration_count}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 918c1b911fe..73d13d6dd73 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -917,6 +917,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_ENDREP, WINED3DSIH_ENDSWITCH, WINED3DSIH_EQ, + WINED3DSIH_EVAL_CENTROID, WINED3DSIH_EVAL_SAMPLE_INDEX, WINED3DSIH_EXP, WINED3DSIH_EXPP,

1 0

Jacek Caban : vbscript: Use return_bool in more places.
by Alexandre Julliard June 7, 2022

June 7, 2022

Module: wine Branch: master Commit: b31e671a4538b527f9a8b803684fed5e7f57959b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b31e671a4538b527f9a8b803… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 7 18:58:32 2022 +0200 vbscript: Use return_bool in more places. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/global.c | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 731a062dea2..9bc9349dd55 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -937,11 +937,7 @@ static HRESULT Global_IsDate(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, { TRACE("%s\n", debugstr_variant(arg)); - if(res) { - V_VT(res) = VT_BOOL; - V_BOOL(res) = V_VT(arg) == VT_DATE ? VARIANT_TRUE : VARIANT_FALSE; - } - return S_OK; + return return_bool(res, V_VT(arg) == VT_DATE); } static HRESULT Global_IsEmpty(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) @@ -949,12 +945,7 @@ static HRESULT Global_IsEmpty(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt TRACE("(%s)\n", debugstr_variant(arg)); assert(args_cnt == 1); - - if(res) { - V_VT(res) = VT_BOOL; - V_BOOL(res) = V_VT(arg) == VT_EMPTY ? VARIANT_TRUE : VARIANT_FALSE; - } - return S_OK; + return return_bool(res, V_VT(arg) == VT_EMPTY); } static HRESULT Global_IsNull(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) @@ -963,11 +954,7 @@ static HRESULT Global_IsNull(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, assert(args_cnt == 1); - if(res) { - V_VT(res) = VT_BOOL; - V_BOOL(res) = V_VT(arg) == VT_NULL ? VARIANT_TRUE : VARIANT_FALSE; - } - return S_OK; + return return_bool(res, V_VT(arg) == VT_NULL); } static HRESULT Global_IsNumeric(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) @@ -999,11 +986,7 @@ static HRESULT Global_IsObject(BuiltinDisp *This, VARIANT *arg, unsigned args_cn assert(args_cnt == 1); - if(res) { - V_VT(res) = VT_BOOL; - V_BOOL(res) = V_VT(arg) == VT_DISPATCH ? VARIANT_TRUE : VARIANT_FALSE; - } - return S_OK; + return return_bool(res, V_VT(arg) == VT_DISPATCH); } static HRESULT Global_Atn(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)

1 0

Jacek Caban : jscript: Correctly handle deleted entries in iterate_map.
by Alexandre Julliard June 7, 2022

June 7, 2022

Module: wine Branch: master Commit: 6010e6b8cbb58059504c9887c1c20ec7f4ae34cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=6010e6b8cbb58059504c9887… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 7 18:40:09 2022 +0200 jscript: Correctly handle deleted entries in iterate_map. Based on patch by Gabriel Ivăncescu. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/set.c | 12 +++++++++--- dlls/mshtml/tests/documentmode.js | 24 ++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index 0ef014b86d0..c64a5598026 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -183,7 +183,7 @@ static HRESULT set_map_entry(MapInstance *map, jsval_t key, jsval_t value, jsval static HRESULT iterate_map(MapInstance *map, script_ctx_t *ctx, unsigned argc, jsval_t *argv, jsval_t *r) { - struct jsval_map_entry *entry; + struct list *iter = list_head(&map->entries); IDispatch *context_obj = NULL; HRESULT hres; @@ -200,16 +200,22 @@ static HRESULT iterate_map(MapInstance *map, script_ctx_t *ctx, unsigned argc, j context_obj = get_object(argv[1]); } - LIST_FOR_EACH_ENTRY(entry, &map->entries, struct jsval_map_entry, list_entry) { + while(iter) { + struct jsval_map_entry *entry = LIST_ENTRY(iter, struct jsval_map_entry, list_entry); jsval_t args[3], v; - if(entry->deleted) + + if(entry->deleted) { + iter = list_next(&map->entries, iter); continue; + } + args[0] = entry->value; args[1] = entry->key; args[2] = jsval_obj(&map->dispex); grab_map_entry(entry); hres = disp_call_value(ctx, get_object(argv[0]), context_obj, DISPATCH_METHOD, ARRAY_SIZE(args), args, &v); + iter = list_next(&map->entries, iter); release_map_entry(entry); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index f2da8113e18..299d46e5727 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1019,6 +1019,18 @@ sync_test("set_obj", function() { s = new Set([1, 2, 3]); ok(s.size === 0, "size = " + s.size); + + s = new Set(); + s.add(1); + s.add(2); + s.add(3); + r = 0; + s.forEach(function(value, key, obj) { + r++; + s.clear(); + ok(s.size === 0, "size = " + s.size); + }); + ok(r === 1, "r = " + r); }); sync_test("map_obj", function() { @@ -1161,6 +1173,18 @@ sync_test("map_obj", function() { }catch(e) { ok(e.number === 0xa13fc - 0x80000000, "e.number = " + e.number); } + + s = new Map(); + s.set(1, 10); + s.set(2, 20); + s.set(3, 30); + r = 0; + s.forEach(function(value, key) { + r++; + s.clear(); + ok(s.size === 0, "size = " + s.size); + }); + ok(r === 1, "r = " + r); }); sync_test("elem_attr", function() {

1 0

Jacek Caban : wineandroid: Move device thread to dllmain.c.
by Alexandre Julliard June 7, 2022

June 7, 2022

Module: wine Branch: master Commit: f07ebeca072780475b5ee5bc2af4ad27d2de723c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f07ebeca072780475b5ee5bc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 4 15:48:13 2022 +0200 wineandroid: Move device thread to dllmain.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wineandroid.drv/android.h | 3 ++ dlls/wineandroid.drv/device.c | 71 ++++++++++----------------------- dlls/wineandroid.drv/dllmain.c | 89 +++++++++++++++++++++++++++++++++++++++++- dlls/wineandroid.drv/init.c | 3 ++ dlls/wineandroid.drv/unixlib.h | 16 ++++++++ 5 files changed, 130 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f07ebeca072780475b5e…

1 0

Jacek Caban : wineandroid: Directly use ntdll instead of kernel32.
by Alexandre Julliard June 7, 2022

June 7, 2022

Module: wine Branch: master Commit: 196b4e5916dfeb44e289114580543baf64a6a5c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=196b4e5916dfeb44e2891145… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 4 16:07:18 2022 +0200 wineandroid: Directly use ntdll instead of kernel32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wineandroid.drv/device.c | 60 +++++++++++++++++++++++++++++-------------- dlls/wineandroid.drv/window.c | 12 ++++----- 2 files changed, 47 insertions(+), 25 deletions(-) diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index b54eabbcc75..b4f332d2cef 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -331,8 +331,8 @@ static int duplicate_fd( HANDLE client, int fd ) HANDLE handle, ret = 0; if (!wine_server_fd_to_handle( dup(fd), GENERIC_READ | SYNCHRONIZE, 0, &handle )) - DuplicateHandle( GetCurrentProcess(), handle, client, &ret, - 0, FALSE, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE ); + NtDuplicateObject( GetCurrentProcess(), handle, client, &ret, + 0, 0, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE ); if (!ret) return -1; return HandleToLong( ret ); @@ -347,8 +347,8 @@ static int map_native_handle( union native_handle_buffer *dest, const native_han if (mapping) /* only duplicate the mapping handle */ { HANDLE ret = 0; - if (!DuplicateHandle( GetCurrentProcess(), mapping, client, &ret, - 0, FALSE, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE )) + if (!NtDuplicateObject( GetCurrentProcess(), mapping, client, &ret, + 0, 0, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE )) return -ENOSPC; dest->handle.numFds = 0; dest->handle.numInts = 1; @@ -434,7 +434,7 @@ static int register_buffer( struct native_win_data *win, struct ANativeWindowBuf TRACE( "%p %p evicting buffer %p id %d from cache\n", win->hwnd, win->parent, win->buffers[i], i ); win->buffers[i]->common.decRef( &win->buffers[i]->common ); - if (win->mappings[i]) UnmapViewOfFile( win->mappings[i] ); + if (win->mappings[i]) NtUnmapViewOfSection( GetCurrentProcess(), win->mappings[i] ); } win->buffers[i] = buffer; @@ -442,9 +442,16 @@ static int register_buffer( struct native_win_data *win, struct ANativeWindowBuf if (mapping) { - *mapping = CreateFileMappingW( INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, - buffer->stride * buffer->height * 4, NULL ); - win->mappings[i] = MapViewOfFile( *mapping, FILE_MAP_READ, 0, 0, 0 ); + OBJECT_ATTRIBUTES attr; + LARGE_INTEGER size; + SIZE_T count = 0; + size.QuadPart = buffer->stride * buffer->height * 4; + InitializeObjectAttributes( &attr, NULL, OBJ_OPENIF, NULL, NULL ); + NtCreateSection( mapping, + STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE, + &attr, &size, PAGE_READWRITE, 0, INVALID_HANDLE_VALUE ); + NtMapViewOfSection( *mapping, GetCurrentProcess(), &win->mappings[i], 0, 0, + NULL, &count, ViewShare, 0, PAGE_READONLY ); } buffer->common.incRef( &buffer->common ); *is_new = 1; @@ -473,7 +480,7 @@ static void release_native_window( struct native_win_data *data ) for (i = 0; i < NB_CACHED_BUFFERS; i++) { if (data->buffers[i]) data->buffers[i]->common.decRef( &data->buffers[i]->common ); - if (data->mappings[i]) UnmapViewOfFile( data->mappings[i] ); + if (data->mappings[i]) NtUnmapViewOfSection( GetCurrentProcess(), data->mappings[i] ); data->buffer_lru[i] = -1; } memset( data->buffers, 0, sizeof(data->buffers) ); @@ -823,9 +830,12 @@ static NTSTATUS dequeueBuffer_ioctl( void *data, DWORD in_size, DWORD out_size, res->generation = win_data->generation; if (is_new) { - HANDLE process = OpenProcess( PROCESS_DUP_HANDLE, FALSE, current_client_id() ); + OBJECT_ATTRIBUTES attr = { .Length = sizeof(attr) }; + CLIENT_ID cid = { .UniqueProcess = UlongToHandle( current_client_id() ) }; + HANDLE process; + NtOpenProcess( &process, PROCESS_DUP_HANDLE, &attr, &cid ); map_native_handle( &res->native_handle, buffer->handle, mapping, process ); - CloseHandle( process ); + NtClose( process ); *ret_size = sizeof( *res ); } wait_fence_and_close( fence ); @@ -1212,10 +1222,19 @@ static int android_ioctl( enum android_ioctl code, void *in, DWORD in_size, void if (!device) { - HANDLE file = CreateFileW( deviceW, GENERIC_READ, - FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); - if (file == INVALID_HANDLE_VALUE) return -ENOENT; - if (InterlockedCompareExchangePointer( &device, file, NULL )) CloseHandle( file ); + OBJECT_ATTRIBUTES attr; + UNICODE_STRING name; + IO_STATUS_BLOCK io; + NTSTATUS status; + HANDLE file; + + RtlInitUnicodeString( &name, deviceW ); + InitializeObjectAttributes( &attr, &name, OBJ_CASE_INSENSITIVE, NULL, NULL ); + status = NtCreateFile( &file, GENERIC_READ | SYNCHRONIZE, &attr, &io, NULL, 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_OPEN, + FILE_NON_DIRECTORY_FILE, NULL, 0 ); + if (status) return -ENOENT; + if (InterlockedCompareExchangePointer( &device, file, NULL )) NtClose( file ); } status = NtDeviceIoControlFile( device, NULL, NULL, NULL, &iosb, ANDROID_IOCTL(code), @@ -1223,7 +1242,7 @@ static int android_ioctl( enum android_ioctl code, void *in, DWORD in_size, void if (status == STATUS_FILE_DELETED) { WARN( "parent process is gone\n" ); - ExitProcess( 1 ); + NtTerminateProcess( 0, 1 ); } if (out_size) *out_size = iosb.Information; return status_to_android_error( status ); @@ -1254,7 +1273,7 @@ static void buffer_decRef( struct android_native_base_t *base ) if (!InterlockedDecrement( &buffer->ref )) { if (!is_in_desktop_process()) gralloc_release_buffer( &buffer->buffer ); - if (buffer->bits) UnmapViewOfFile( buffer->bits ); + if (buffer->bits) NtUnmapViewOfSection( GetCurrentProcess(), buffer->bits ); free( buffer ); } } @@ -1299,9 +1318,12 @@ static int dequeueBuffer( struct ANativeWindow *window, struct ANativeWindowBuff if (use_win32) { + LARGE_INTEGER zero = { .QuadPart = 0 }; + SIZE_T count = 0; HANDLE mapping = LongToHandle( res.native_handle.handle.data[0] ); - buf->bits = MapViewOfFile( mapping, FILE_MAP_WRITE, 0, 0, 0 ); - CloseHandle( mapping ); + NtMapViewOfSection( mapping, GetCurrentProcess(), &buf->bits, 0, 0, &zero, &count, + ViewShare, 0, PAGE_READWRITE ); + NtClose( mapping ); } else if (!is_in_desktop_process()) { diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index a5d6a98cd3f..3860e0a2772 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -367,12 +367,12 @@ static void init_event_queue(void) if (pipe2( event_pipe, O_CLOEXEC | O_NONBLOCK ) == -1) { ERR( "could not create data\n" ); - ExitProcess(1); + NtTerminateProcess( 0, 1 ); } if (wine_server_fd_to_handle( event_pipe[0], GENERIC_READ | SYNCHRONIZE, 0, &handle )) { ERR( "Can't allocate handle for event fd\n" ); - ExitProcess(1); + NtTerminateProcess( 0, 1 ); } SERVER_START_REQ( set_queue_fd ) { @@ -383,9 +383,9 @@ static void init_event_queue(void) if (ret) { ERR( "Can't store handle for event fd %x\n", ret ); - ExitProcess(1); + NtTerminateProcess( 0, 1 ); } - CloseHandle( handle ); + NtClose( handle ); desktop_tid = GetCurrentThreadId(); } @@ -1450,9 +1450,9 @@ void ANDROID_SetCursor( HCURSOR handle ) static DWORD last_cursor_change; if (InterlockedExchangePointer( (void **)&last_cursor, handle ) != handle || - GetTickCount() - last_cursor_change > 100) + NtGetTickCount() - last_cursor_change > 100) { - last_cursor_change = GetTickCount(); + last_cursor_change = NtGetTickCount(); if (handle) {

1 0

Alexandre Julliard : faudio: Import upstream release 22.06.
by Alexandre Julliard June 7, 2022

June 7, 2022

Module: wine Branch: master Commit: acf815fd8af0c44ac162400781e4da6c8f897293 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acf815fd8af0c44ac1624007… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 7 08:17:41 2022 +0200 faudio: Import upstream release 22.06. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/faudio/LICENSE | 2 +- libs/faudio/include/F3DAudio.h | 2 +- libs/faudio/include/FACT.h | 2 +- libs/faudio/include/FACT3D.h | 2 +- libs/faudio/include/FAPO.h | 2 +- libs/faudio/include/FAPOBase.h | 2 +- libs/faudio/include/FAPOFX.h | 2 +- libs/faudio/include/FAudio.h | 4 ++-- libs/faudio/include/FAudioFX.h | 2 +- libs/faudio/src/F3DAudio.c | 2 +- libs/faudio/src/FACT.c | 4 +++- libs/faudio/src/FACT3D.c | 2 +- libs/faudio/src/FACT_internal.c | 10 +++++++++- libs/faudio/src/FACT_internal.h | 2 +- libs/faudio/src/FAPOBase.c | 2 +- libs/faudio/src/FAPOFX.c | 2 +- libs/faudio/src/FAPOFX_echo.c | 2 +- libs/faudio/src/FAPOFX_eq.c | 2 +- libs/faudio/src/FAPOFX_masteringlimiter.c | 2 +- libs/faudio/src/FAPOFX_reverb.c | 2 +- libs/faudio/src/FAudio.c | 2 +- libs/faudio/src/FAudioFX_reverb.c | 2 +- libs/faudio/src/FAudioFX_volumemeter.c | 2 +- libs/faudio/src/FAudio_internal.c | 10 +++++++--- libs/faudio/src/FAudio_internal.h | 2 +- libs/faudio/src/FAudio_internal_simd.c | 2 +- libs/faudio/src/FAudio_operationset.c | 2 +- 27 files changed, 44 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=acf815fd8af0c44ac162…

1 0