- Wine-Devel - list.winehq.org

[PATCH] kernel32: Remove obsolete comment.
by Carlos Rivera Aug. 23, 2020

Aug. 23, 2020

Signed-off-by: Carlos Rivera <carlos(a)superkaos.org> --- dlls/kernel32/profile.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index bfaba6cdeb..8c03a45602 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1547,8 +1547,6 @@ UINT WINAPI GetPrivateProfileIntW( LPCWSTR section, LPCWSTR entry, /*********************************************************************** * GetPrivateProfileIntA (KERNEL32.@) - * - * FIXME: rewrite using unicode */ UINT WINAPI GetPrivateProfileIntA( LPCSTR section, LPCSTR entry, INT def_val, LPCSTR filename ) -- 2.28.0

1 0

[PATCH] vbscript: typename(Array()) is "Variant()".
by Robert Wilhelm Aug. 22, 2020

Aug. 22, 2020

Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/vbscript/global.c | 4 ++++ dlls/vbscript/tests/api.vbs | 2 ++ 2 files changed, 6 insertions(+) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index d4b9344206..59265fd23d 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2202,11 +2202,15 @@ static HRESULT Global_TypeName(BuiltinDisp *This, VARIANT *arg, unsigned args_cn static const WCHAR BooleanW[] = {'B', 'o', 'o', 'l', 'e', 'a', 'n', 0}; static const WCHAR EmptyW[] = {'E', 'm', 'p', 't', 'y', 0}; static const WCHAR NullW[] = {'N', 'u', 'l', 'l', 0}; + static const WCHAR ArrayW[] = {'V', 'a', 'r', 'i', 'a', 'n', 't', '(', ')', 0}; TRACE("(%s)\n", debugstr_variant(arg)); assert(args_cnt == 1); + if (V_ISARRAY(arg)) + return return_string(res, ArrayW); + switch(V_VT(arg)) { case VT_UI1: return return_string(res, ByteW); diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 6add0579e8..4834029183 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1380,6 +1380,8 @@ Call ok(TypeName(CStr(0.5)) = "String", "TypeName(CStr(0.5)) = " & TypeName(CStr Call ok(getVT(TypeName(CStr(0.5))) = "VT_BSTR", "getVT(TypeName(CStr(0.5))) = " & getVT(TypeName(CStr(0.5)))) Call ok(TypeName(True) = "Boolean", "TypeName(True) = " & TypeName(True)) Call ok(getVT(TypeName(True)) = "VT_BSTR", "getVT(TypeName(True)) = " & getVT(TypeName(True))) +Call ok(TypeName(arr) = "Variant()", "TypeName(arr) = " & TypeName(arr)) +Call ok(getVT(TypeName(arr)) = "VT_BSTR", "getVT(TypeName(arr)) = " & getVT(TypeName(arr))) Call ok(VarType(Empty) = vbEmpty, "VarType(Empty) = " & VarType(Empty)) Call ok(getVT(VarType(Empty)) = "VT_I2", "getVT(VarType(Empty)) = " & getVT(VarType(Empty))) -- 2.26.2

1 0

TestBot News
by Francois Gouget Aug. 22, 2020

Aug. 22, 2020

Last week the power supply of the gateway to the TestBot VMs blew up. Fortunately Newman was able to quickly replace that box. Then I rebooted vm1 but it remained stuck on the grub stage 1 due to a grub regression. I would normally recover from such situations by booting off the KVM's virtual USB CD drive but vm1 would not boot from it. In the end I got vm1 booting off PXE which is going to be my go-to option for such situations because it really works everywhere [1]. Then I rebooted all the other VM hosts to fix the grub issue in case they were impacted. But on the 18th ntdll:exception started causing the Windows 10 VM to crash (trick: check the screenshot). That matched the vm3 reboot so I first suspected BIOS settings but I have now confirmed that the regression was caused by the upgrade from the 4.19.0-9 kernel to 4.19.0-10! Even with 4.19.0-9 each run of ntdll:exception generates the following kernel messages: [ 295.717619] kvm [9344]: vcpu0, guest rIP: 0xfffff803be7de713 kvm_set_msr_common: MSR_IA32_DEBUGCTLMSR 0x1, nop [ 295.717650] kvm [9344]: vcpu0, guest rIP: 0xfffff803be7de77c ignored rdmsr: 0x1c9 [ 295.717666] kvm [9344]: vcpu0, guest rIP: 0xfffff803be7de78a ignored rdmsr: 0x40 [ 295.717682] kvm [9344]: vcpu0, guest rIP: 0xfffff803be7de7a1 ignored rdmsr: 0x60 [... last 4 lines repeated two more times ...] [ 295.717859] kvm [9344]: vcpu0, guest rIP: 0xfffff803be7de713 kvm_set_msr_common: MSR_IA32_DEBUGCTLMSR 0x1, nop [ 295.717884] kvm [9344]: vcpu0, guest rIP: 0xfffff803be7de77c ignored rdmsr: 0x1c9 [ 295.717907] kvm [9344]: vcpu0, guest rIP: 0xfffff803be7de713 kvm_set_msr_common: MSR_IA32_DEBUGCTLMSR 0x1, nop [... last line repeated 5 more times ...] With 4.19.0-10 the Windows 10 VM crashes on the first trace. The workaround is to add "options kvm ignore_msrs=1" to /etc/modprobe. One still gets the same set of kernel traces but no crash anymore [2]. So that lets w1064 run ntdll:exception and WineTest successfully again. Various web sources describe ignore_msrs=1 as a workaround until the kernel kvm module is fixed which I don't find very satisfying. vm4 is not doing much these days (it runs wtbdebian10 and wxppro which are both deprecated) so I experimented with the Debian Backports on it (like all VM hosts it's running Debian 10). That allowed me to upgrade the kernel to 5.7.0-0.bpo.2 and QEmu from 3.1+dfsg-8+deb10u7 to 5.0-14~bpo10+1. And that allowed me to confirm that this msr issue is still present :-( At least the same workaround still works. It also proves the ground for getting a newer QEmu without having to move to Debian Testing. Maybe that will prove useful in time. vm1 and vm2 also have slightly different rdmsr / wrmsr messages: Aug 18 13:29:02 vm1 kernel: [ 1684.092430] kvm [4996]: vcpu0, guest rIP: 0xffffffff8645eb63 ignored rdmsr: 0x606 Aug 18 13:29:02 vm1 kernel: [ 1684.229925] kvm [4996]: vcpu0, guest rIP: 0xffffffff8645eb63 ignored rdmsr: 0x611 Aug 18 13:29:02 vm1 kernel: [ 1684.229950] kvm [4996]: vcpu0, guest rIP: 0xffffffff8645eb63 ignored rdmsr: 0x639 Aug 18 13:29:02 vm1 kernel: [ 1684.229967] kvm [4996]: vcpu0, guest rIP: 0xffffffff8645eb63 ignored rdmsr: 0x641 Aug 18 13:29:02 vm1 kernel: [ 1684.229983] kvm [4996]: vcpu0, guest rIP: 0xffffffff8645eb63 ignored rdmsr: 0x619 Aug 18 08:21:50 vm2 kernel: [2464330.778885] kvm [21199]: vcpu0, guest rIP: 0xffffffff81a5eb63 ignored rdmsr: 0xc0010048 Aug 18 09:49:30 vm2 kernel: [2469591.803298] kvm [8420]: vcpu0, guest rIP: 0xffffffffad25eb63 ignored rdmsr: 0xc0010048 Aug 18 11:33:54 vm2 kernel: [2475855.580083] kvm [29506]: vcpu0, guest rIP: 0xffffffff9885eb63 ignored rdmsr: 0xc0010048 Aug 18 13:53:22 vm2 kernel: [ 1063.562138] kvm [18219]: vcpu0, guest rIP: 0xffffffff8ea5eb63 ignored rdmsr: 0xc0010048 Aug 19 03:38:16 vm2 kernel: [50561.578179] kvm [25600]: vcpu0, guest rIP: 0xffffffffabe5eb63 ignored rdmsr: 0xc0010048 And nothing for the 20th, 21st or 22nd. That means they don't happen every day and thus are not triggered by WineTest. So for now I'm ignoring them. And that's it for today. [1] And despite what some web pages claim, you don't need access to the DHCP server to set up a PXE server. https://manski.net/2016/09/pxe-server-on-existing-network-dhcp-proxy-on-ubu… [2] There's also a kvm option for silencing the traces but I don't think there's much point: better know what's going on. -- Francois Gouget <fgouget(a)codeweavers.com>

1 0

[PATCH] vbscript: Implement IsArray.
by Robert Wilhelm Aug. 22, 2020

Aug. 22, 2020

Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/vbscript/global.c | 11 +++++++++-- dlls/vbscript/tests/api.vbs | 15 +++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 17e4f4aba8..d4b9344206 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -961,8 +961,15 @@ static HRESULT Global_IsNumeric(BuiltinDisp *This, VARIANT *arg, unsigned args_c static HRESULT Global_IsArray(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("(%s)\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + if(res) { + V_VT(res) = VT_BOOL; + V_BOOL(res) = V_ISARRAY(arg) ? VARIANT_TRUE : VARIANT_FALSE; + } + return S_OK; } static HRESULT Global_IsObject(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 787da7cd71..6add0579e8 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -223,6 +223,21 @@ arr(0) = 2 arr(1) = 3 Call ok(not isNumeric(arr), "isNumeric(arr) is not true?") +Call ok(isArray(arr), "isArray(arr) is not true?") +x = Array() +Call ok(isArray(arr), "isArray(Array()) is not true?") +Call ok(not isArray(Empty), "isArray(empty) is true?") +Call ok(not isArray(Null), "isArray(Null) is true?") +Call ok(not isArray(42), "isArray(42) is true?") +Call ok(not isArray(CSng(3242.4)), "isArray(CSng(3242.4)) is true?") +Call ok(not isArray(CCur(32768.4)), "isArray(CCur(32768.4)) is true?") +Call ok(not isArray("44"), "isArray(""44"") is true?") +Call ok(not isArray("rwrf"), "isArray(""rwrf"") is true?") +Call ok(not isArray(Nothing), "isArray(Nothing) is true?") +Call ok(not isArray(New EmptyClass), "isArray(New EmptyClass) is true?") +Call ok(not isArray(true), "isArray(true) is true?") +Call ok(not isArray(CByte(32)), "isArray(CByte(32)) is true?") + Call ok(getVT(Array()) = "VT_ARRAY|VT_VARIANT", "getVT(Array()) = " & getVT(Array())) x = Array("a1", 2, "a3") Call ok(getVT(x) = "VT_ARRAY|VT_VARIANT*", "getVT(array) = " & getVT(x)) -- 2.26.2

1 0

[PATCH v2] ntdll: Add initial tests for arm64 RtlVirtualUnwind
by Martin Storsjo Aug. 21, 2020

Aug. 21, 2020

This doesn't contain many actual tests yet, but provides the infrastructure for adding more tests and for verifying the finer details of how actual windows handles certain unwinding opcodes. The tests added so far pass both on actual windows and on current wine. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- Rebased on current master, reordered to avoid potential fuzz in the diff. --- dlls/ntdll/tests/exception.c | 284 +++++++++++++++++++++++++++++++++++ 1 file changed, 284 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index e75336ed11..dd9eb966fc 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -4225,6 +4225,285 @@ static void test_debug_service(DWORD numexc) #elif defined(__aarch64__) +#define UNW_FLAG_NHANDLER 0 +#define UNW_FLAG_EHANDLER 1 +#define UNW_FLAG_UHANDLER 2 + +#define UWOP_TWOBYTES(x) (((x) >> 8) & 0xff), ((x) & 0xff) + +#define UWOP_ALLOC_SMALL(size) (0x00 | (size / 16)) +#define UWOP_SAVE_REGP(reg, offset) UWOP_TWOBYTES((0xC8 << 8) | ((reg - 19) << 6) | (offset/8)) +#define UWOP_NOP 0xE5 +#define UWOP_END 0xE4 + +struct results +{ + int pc_offset; /* pc offset from code start */ + int fp_offset; /* fp offset from stack pointer */ + int handler; /* expect handler to be set? */ + ULONG_PTR pc; /* expected final pc value */ + int frame; /* expected frame return value */ + int frame_offset; /* whether the frame return value is an offset or an absolute value */ + int regs[32][2]; /* expected values for registers */ +}; + +struct unwind_test +{ + const BYTE *function; + size_t function_size; + const BYTE *unwind_info; + size_t unwind_size; + const struct results *results; + unsigned int nb_results; +}; + +enum regs +{ + x0, x1, x2, x3, x4, x5, x6, x7, + x8, x9, x10, x11, x12, x13, x14, x15, + x16, x17, x18, x19, x20, x21, x22, x23, + x24, x25, x26, x27, x28, x29, lr, sp +}; + +static const char * const reg_names[32] = +{ + "x0", "x1", "x2", "x3", "x4", "x5", "x6", "x7", + "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", + "x16", "x17", "x18", "x19", "x20", "x21", "x22", "x23", + "x24", "x25", "x26", "x27", "x28", "x29", "lr", "sp" +}; + +#define ORIG_LR 0xCCCCCCCC + +#define UWOP(code,info) (UWOP_##code | ((info) << 4)) + +static void call_virtual_unwind( int testnum, const struct unwind_test *test ) +{ + static const int code_offset = 1024; + static const int unwind_offset = 2048; + void *handler, *data; + CONTEXT context; + RUNTIME_FUNCTION runtime_func; + KNONVOLATILE_CONTEXT_POINTERS ctx_ptr; + UINT i, j, k; + ULONG64 fake_stack[256]; + ULONG64 frame, orig_pc, orig_fp, unset_reg, sp_offset = 0; + static const UINT nb_regs = ARRAY_SIZE(test->results[i].regs); + + memcpy( (char *)code_mem + code_offset, test->function, test->function_size ); + memcpy( (char *)code_mem + unwind_offset, test->unwind_info, test->unwind_size ); + + runtime_func.BeginAddress = code_offset; + if (test->unwind_size) + runtime_func.UnwindData = unwind_offset; + else + memcpy(&runtime_func.UnwindData, test->unwind_info, 4); + + trace( "code: %p stack: %p\n", code_mem, fake_stack ); + + for (i = 0; i < test->nb_results; i++) + { + memset( &ctx_ptr, 0, sizeof(ctx_ptr) ); + memset( &context, 0x55, sizeof(context) ); + memset( &unset_reg, 0x55, sizeof(unset_reg) ); + for (j = 0; j < 256; j++) fake_stack[j] = j * 8; + + context.Sp = (ULONG_PTR)fake_stack; + context.Lr = (ULONG_PTR)ORIG_LR; + context.Fp = (ULONG_PTR)fake_stack + test->results[i].fp_offset; + orig_fp = context.Fp; + orig_pc = (ULONG64)code_mem + code_offset + test->results[i].pc_offset; + + trace( "%u/%u: pc=%p (%02x) fp=%p sp=%p\n", testnum, i, + (void *)orig_pc, *(DWORD *)orig_pc, (void *)orig_fp, (void *)context.Sp ); + + data = (void *)0xdeadbeef; + handler = RtlVirtualUnwind( UNW_FLAG_EHANDLER, (ULONG64)code_mem, orig_pc, + &runtime_func, &context, &data, &frame, &ctx_ptr ); + if (test->results[i].handler > 0) + { + /* Yet untested */ + ok( (char *)handler == (char *)code_mem + 0x200, + "%u/%u: wrong handler %p/%p\n", testnum, i, handler, (char *)code_mem + 0x200 ); + if (handler) ok( *(DWORD *)data == 0x08070605, + "%u/%u: wrong handler data %p\n", testnum, i, data ); + } + else + { + ok( handler == NULL, "%u/%u: handler %p instead of NULL\n", testnum, i, handler ); + } + + ok( context.Pc == test->results[i].pc, "%u/%u: wrong pc %p/%p\n", + testnum, i, (void *)context.Pc, (void*)test->results[i].pc ); + ok( frame == (test->results[i].frame_offset ? (ULONG64)fake_stack : 0) + test->results[i].frame, "%u/%u: wrong frame %p/%p\n", + testnum, i, (void *)frame, (char *)(test->results[i].frame_offset ? fake_stack : NULL) + test->results[i].frame ); + + sp_offset = 0; + for (k = 0; k < nb_regs; k++) + { + if (test->results[i].regs[k][0] == -1) + break; + if (test->results[i].regs[k][0] == sp) { + /* If sp is part of the registers list, treat it as an offset + * between the returned frame pointer and the sp register. */ + sp_offset = test->results[i].regs[k][1]; + break; + } + } + ok( frame - sp_offset == context.Sp, "%u/%u: wrong sp %p/%p\n", + testnum, i, (void *)frame - sp_offset, (void *)context.Sp); + + for (j = 0; j < 31; j++) /* Not including sp here */ + { + for (k = 0; k < nb_regs; k++) + { + if (test->results[i].regs[k][0] == -1) + { + k = nb_regs; + break; + } + if (test->results[i].regs[k][0] == j) break; + } + + if (j >= 19 && j <= 30 && (&ctx_ptr.X19)[j - 19]) + { + ok( k < nb_regs, "%u/%u: register %s should not be set to %llx\n", + testnum, i, reg_names[j], context.X[j] ); + if (k < nb_regs) + ok( context.X[j] == test->results[i].regs[k][1], + "%u/%u: register %s wrong %p/%x\n", + testnum, i, reg_names[j], (void *)context.X[j], test->results[i].regs[k][1] ); + } + else if (k < nb_regs) + { + ok( context.X[j] == test->results[i].regs[k][1], + "%u/%u: register %s wrong %p/%x\n", + testnum, i, reg_names[j], (void *)context.X[j], test->results[i].regs[k][1] ); + } + else + { + ok( k == nb_regs, "%u/%u: register %s should be set\n", testnum, i, reg_names[j] ); + if (j == lr) + ok( context.Lr == ORIG_LR, "%u/%u: register lr wrong %p/unset\n", + testnum, i, (void *)context.Lr ); + else if (j == x29) + ok( context.Fp == orig_fp, "%u/%u: register fp wrong %p/unset\n", + testnum, i, (void *)context.Fp ); + else + ok( context.X[j] == unset_reg, + "%u/%u: register %s wrong %p/unset\n", + testnum, i, reg_names[j], (void *)context.X[j]); + } + } + } +} + +#define DW(dword) ((dword >> 0) & 0xff), ((dword >> 8) & 0xff), ((dword >> 16) & 0xff), ((dword >> 24) & 0xff) + +static void test_virtual_unwind(void) +{ + static const BYTE function_0[] = + { + 0xff, 0x83, 0x00, 0xd1, /* 00: sub sp, sp, #32 */ + 0xf3, 0x53, 0x01, 0xa9, /* 04: stp x19, x20, [sp, #16] */ + 0x1f, 0x20, 0x03, 0xd5, /* 08: nop */ + 0xf3, 0x53, 0x41, 0xa9, /* 0c: ldp x19, x20, [sp, #16] */ + 0xff, 0x83, 0x00, 0x91, /* 10: add sp, sp, #32 */ + 0xc0, 0x03, 0x5f, 0xd6, /* 14: ret */ + }; + + static const DWORD unwind_info_0_header = + (sizeof(function_0)/4) | /* function length */ + (0 << 20) | /* X */ + (0 << 21) | /* E */ + (1 << 22) | /* epilog */ + (2 << 27); /* codes */ + static const DWORD unwind_info_0_epilog0 = + (3 << 0) | /* offset */ + (4 << 22); /* index */ + + static const BYTE unwind_info_0[] = + { + DW(unwind_info_0_header), + DW(unwind_info_0_epilog0), + + UWOP_SAVE_REGP(19, 16), /* stp x19, x20, [sp, #16] */ + UWOP_ALLOC_SMALL(32), /* sub sp, sp, #32 */ + UWOP_END, + + UWOP_SAVE_REGP(19, 16), /* stp x19, x20, [sp, #16] */ + UWOP_ALLOC_SMALL(32), /* sub sp, sp, #32 */ + UWOP_END, + }; + + static const struct results results_0[] = + { + /* offset fp handler pc frame offset registers */ + { 0x00, 0x00, 0, ORIG_LR, 0x000, TRUE, { {-1,-1} }}, + { 0x04, 0x00, 0, ORIG_LR, 0x020, TRUE, { {-1,-1} }}, + { 0x08, 0x00, 0, ORIG_LR, 0x020, TRUE, { {x19,0x10}, {x20,0x18}, {-1,-1} }}, + { 0x0c, 0x00, 0, ORIG_LR, 0x020, TRUE, { {x19,0x10}, {x20,0x18}, {-1,-1} }}, + { 0x10, 0x00, 0, ORIG_LR, 0x020, TRUE, { {-1,-1} }}, + { 0x14, 0x00, 0, ORIG_LR, 0x000, TRUE, { {-1,-1} }}, + }; + + + static const BYTE function_1[] = + { + 0xf3, 0x53, 0xbe, 0xa9, /* 00: stp x19, x20, [sp, #-32]! */ + 0xfe, 0x0b, 0x00, 0xf9, /* 04: str x30, [sp, #16] */ + 0xff, 0x43, 0x00, 0xd1, /* 08: sub sp, sp, #16 */ + 0x1f, 0x20, 0x03, 0xd5, /* 0c: nop */ + 0xff, 0x43, 0x00, 0x91, /* 10: add sp, sp, #16 */ + 0xfe, 0x0b, 0x40, 0xf9, /* 14: ldr x30, [sp, #16] */ + 0xf3, 0x53, 0xc2, 0xa8, /* 18: ldp x19, x20, [sp], #32 */ + 0xc0, 0x03, 0x5f, 0xd6, /* 1c: ret */ + }; + + static const DWORD unwind_info_1_packed = + (1 << 0) | /* Flag */ + (sizeof(function_1)/4 << 2) | /* FunctionLength */ + (0 << 13) | /* RegF */ + (2 << 16) | /* RegI */ + (0 << 20) | /* H */ + (1 << 21) | /* CR */ + (3 << 23); /* FrameSize */ + + static const BYTE unwind_info_1[] = { DW(unwind_info_1_packed) }; + + /* The prologue/epilogue locations are commented out below, as we don't + * handle those cases at the moment. */ + static const struct results results_1[] = + { + /* offset fp handler pc frame offset registers */ +#if 0 + { 0x00, 0x00, 0, ORIG_LR, 0x000, TRUE, { {-1,-1} }}, + { 0x04, 0x00, 0, ORIG_LR, 0x020, TRUE, { {x19,0x00}, {x20,0x08}, {-1,-1} }}, + { 0x08, 0x00, 0, 0x10, 0x020, TRUE, { {x19,0x00}, {x20,0x08}, {lr,0x10}, {-1,-1} }}, +#endif + { 0x0c, 0x00, 0, 0x20, 0x030, TRUE, { {x19,0x10}, {x20,0x18}, {lr,0x20}, {-1,-1} }}, + { 0x10, 0x00, 0, 0x20, 0x030, TRUE, { {x19,0x10}, {x20,0x18}, {lr,0x20}, {-1,-1} }}, +#if 0 + { 0x14, 0x00, 0, 0x10, 0x020, TRUE, { {x19,0x00}, {x20,0x08}, {lr,0x10}, {-1,-1} }}, + { 0x18, 0x00, 0, ORIG_LR, 0x020, TRUE, { {x19,0x00}, {x20,0x08}, {-1,-1} }}, + { 0x1c, 0x00, 0, ORIG_LR, 0x000, TRUE, { {-1,-1} }}, +#endif + }; + + static const struct unwind_test tests[] = + { +#define TEST(func, unwind, unwind_packed, results) \ + { func, sizeof(func), unwind, unwind_packed ? 0 : sizeof(unwind), results, ARRAY_SIZE(results) } + TEST(function_0, unwind_info_0, 0, results_0), + TEST(function_1, unwind_info_1, 1, results_1), +#undef TEST + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(tests); i++) + call_virtual_unwind( i, &tests[i] ); +} + static void test_thread_context(void) { CONTEXT context; @@ -5741,6 +6020,11 @@ START_TEST(exception) else skip( "Dynamic unwind functions not found\n" ); test_extended_context(); + +#elif defined(__aarch64__) + + test_virtual_unwind(); + #endif test_debugger(); -- 2.17.1

2 2

[PATCH v5] vbscript: Implement Split.
by Robert Wilhelm Aug. 21, 2020

Aug. 21, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47570 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- v3: Try to address comments from Jacek's review: Fix some corner cases, avoid memory leaks and add more tests. v4: If there are two delimeters or delimeter is at front or rear, an empty string is returned. v5: Try to address comments from Jacek's second review: Only set res when we return success. Check for illegal arguments. Add more testcases including two for negative max argument. Allocate Safearray only once. --- dlls/vbscript/global.c | 157 +++++++++++++++++++++++++++++++++++- dlls/vbscript/tests/api.vbs | 65 +++++++++++++++ 2 files changed, 219 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 122f5c7b71..17e4f4aba8 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2291,10 +2291,161 @@ static HRESULT Global_Join(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, V return E_NOTIMPL; } -static HRESULT Global_Split(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + BSTR str, string, delimeter = NULL; + int count, max, mode, len, start, end, ret, delimeterlen = 1; + int i,*indices = NULL, index=0, indices_max = 8; + SAFEARRAYBOUND bounds; + SAFEARRAY *sa = NULL; + VARIANT *data, var; + HRESULT hres = S_OK; + + TRACE("%s %u...\n", debugstr_variant(args), args_cnt); + + assert(1 <= args_cnt && args_cnt <= 4); + + if(V_VT(args) == VT_NULL || (args_cnt > 1 && V_VT(args+1) == VT_NULL) || (args_cnt > 2 && V_VT(args+2) == VT_NULL) + || (args_cnt == 4 && V_VT(args+3) == VT_NULL)) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + + if(V_VT(args) != VT_BSTR) { + hres = to_string(args, &string); + if(FAILED(hres)) + return hres; + }else { + string = V_BSTR(args); + } + + if(args_cnt > 1) + { + if(V_VT(args+1) != VT_BSTR) { + hres = to_string(args+1, &delimeter); + if(FAILED(hres)) + goto error; + }else { + delimeter = V_BSTR(args+1); + } + delimeterlen = SysStringLen(delimeter); + } + + if(args_cnt > 2) { + hres = to_int(args+2, &max); + if(FAILED(hres)) + goto error; + if (max < -1) { + hres = MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); + goto error; + } + }else { + max = -1; + } + + if(args_cnt == 4) { + hres = to_int(args+3, &mode); + if(FAILED(hres)) + goto error; + if (mode != 0 && mode != 1) { + hres = MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); + goto error; + } + } + else { + mode = 0; + } + + start = 0; + + len = SysStringLen(string); + count = 0; + + indices = heap_alloc( indices_max * sizeof(int)); + if(!indices) { + hres = E_OUTOFMEMORY; + goto error; + } + + while(1) { + ret = -1; + if (delimeterlen) { + ret = FindStringOrdinal(FIND_FROMSTART, string + start, len -start, + delimeter ? delimeter : L" ", delimeterlen, mode); + } + + if (ret == -1) { + end = len; + } + else { + end = start + ret; + } + + indices[index++] = end; + if (index == indices_max) { + indices_max *= 2; + indices = heap_realloc( indices, indices_max * sizeof(int)); + if(!indices) { + hres = E_OUTOFMEMORY; + goto error; + } + } + + count++; + + if (ret == -1) break; + start = start + ret + delimeterlen; + if (count == max) break; + if (start > len) break; + } + + bounds.lLbound = 0; + bounds.cElements = index; + sa = SafeArrayCreate( VT_VARIANT, 1, &bounds); + if (!sa) + { + hres = E_OUTOFMEMORY; + goto error; + } + hres = SafeArrayAccessData(sa, (void**)&data); + if(FAILED(hres)) { + SafeArrayDestroy(sa); + goto error; + } + + start = 0; + for ( i = 0; i < index; i++) + { + str = SysAllocStringLen(string + start, indices[i] - start); + if (!str) { + hres = E_OUTOFMEMORY; + break; + } + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = str; + + hres = VariantCopyInd(data+i, &var); + if(FAILED(hres)) { + SafeArrayUnaccessData(sa); + SafeArrayDestroy(sa); + goto error; + } + start = indices[i]+delimeterlen; + } + SafeArrayUnaccessData(sa); + +error: + if(SUCCEEDED(hres) && res) { + V_VT(res) = VT_ARRAY|VT_VARIANT; + V_ARRAY(res) = sa; + }else { + if (sa) SafeArrayDestroy(sa); + } + + heap_free(indices); + if(V_VT(args) != VT_BSTR) + SysFreeString(string); + if(V_VT(args+1) != VT_BSTR) + SysFreeString(delimeter); + return hres; } static HRESULT Global_Replace(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 6af49c849d..787da7cd71 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -609,6 +609,71 @@ TestLCase 0.123, doubleAsString(0.123) TestLCase Empty, "" Call ok(getVT(LCase(Null)) = "VT_NULL", "getVT(LCase(Null)) = " & getVT(LCase(Null))) +x=Split("abc") +Call ok(x(0) = "abc", "Split(""abc"")(0)=" & x(0)) +x = Split("abc def") +Call ok(x(0) = "abc", "Split(""abc def"")(0)=" & x(0)) +Call ok(x(1) = "def", "Split(""abc def"")(1)=" & x(1)) +x = Split("abc def ghi") +Call ok(x(0) = "abc", "Split(""abc def ghi"")(0)=" & x(0)) +Call ok(x(1) = "def", "Split(""abc def ghi"")(1)=" & x(1)) +Call ok(x(2) = "ghi", "Split(""abc def ghi"")(2)=" & x(2)) +x = Split("abc def","") +Call ok(x(0) = "abc def", "Split(""abc def"","""")(0)=" & x(0)) +x = Split("abc-def","-") +Call ok(x(0) = "abc", "Split(""abc-def"",""-"")(0)=" & x(0)) +Call ok(x(1) = "def", "Split(""abc-def"",""-"")(1)=" & x(1)) +x = Split("abc--def","-") +Call ok(x(0) = "abc", "Split(""abc--def"",""-"")(0)=" & x(0)) +Call ok(x(1) = "", "Split(""abc--def"",""-"")(1)=" & x(1)) +Call ok(x(2) = "def", "Split(""abc--def"",""-"")(2)=" & x(2)) +x = Split("abcdefghi","def") +Call ok(x(0) = "abc", "Split(""abcdefghi"",""def"")(0)=" & x(0)) +Call ok(x(1) = "ghi", "Split(""abcdefghi"",""def"")(1)=" & x(1)) +x = Split("12345",3) +Call ok(x(0) = "12", "Split(""12345"",3)(0)=" & x(0)) +Call ok(x(1) = "45", "Split(""12345"",3)(1)=" & x(1)) +x = Split("12345",5) +Call ok(x(0) = "1234", "Split(""12345"",5)(0)=" & x(0)) +Call ok(x(1) = "", "Split(""12345"",5)(1)=" & x(1)) +x = Split("12345",12) +Call ok(x(0) = "", "Split(""12345"",12)(0)=" & x(0)) +Call ok(x(1) = "345", "Split(""12345"",12)(1)=" & x(1)) +x = Split("abc-def-ghi","-") +Call ok(UBound(x) = 2, "UBound(Split(""abc-def-ghi"",""-""))=" & UBound(x)) +x = Split("a b c d e f g h i j k l m n o p q") +Call ok(UBound(x) = 16, "UBound(Split(""a b c d e f g h i j k l m n o p q""))=" & UBound(x)) +x = Split("abc-def-ghi","-",2) +Call ok(UBound(x) = 1, "UBound(Split(""abc-def-ghi"",""-"",2))=" & UBound(x)) +x = Split("abc-def-ghi","-",4) +Call ok(UBound(x) = 2, "UBound(Split(""abc-def-ghi"",""-"",4))=" & UBound(x)) +x = Split("abc-def-ghi","-",-1) +Call ok(UBound(x) = 2, "UBound(Split(""abc-def-ghi"",""-"",-1))=" & UBound(x)) +x = Split("abc-def-ghi","-",-1) +Call ok(UBound(x) = 2, "UBound(Split(""abc-def-ghi"",""-"",-42))=" & UBound(x)) +x = Split("abcZdefZghi","Z",3,0) +Call ok(UBound(x) = 2, "UBound(Split(""abcZdefZghi"",""Z"",3,0))=" & UBound(x)) +x = Split("abcZdefZghi","z",3,0) +Call ok(UBound(x) = 0, "UBound(Split(""abcZdefZghi"",""z"",3,0))=" & UBound(x)) +x = Split("abcZdefZghi","z",3,1) +Call ok(UBound(x) = 2, "UBound(Split(""abcZdefZghi"",""z"",3,1))=" & UBound(x)) + +Sub testSplitError(arg1, arg2, arg3, arg4, error_num) + on error resume next + Dim x + + Call Err.clear() + x = Split(arg1, arg2, arg3, arg4) + Call ok(Err.number = error_num, "Err.number = " & Err.number) +End Sub + +call testSplitError("abc-def-ghi", "-", -1, 2, 5) +call testSplitError("abc-def-ghi", "-", -42, 0, 5) +call testSplitError(null, "-", -1, 0, 94) +call testSplitError("abc-def-ghi", null, -1, 0, 94) +call testSplitError("abc-def-ghi", "-", null, 0, 94) +call testSplitError("abc-def-ghi", "-", -1, null, 94) + Sub TestStrComp(str_left, str_right, mode, ex) x = StrComp(str_left, str_right, mode) Call ok(x = ex, "StrComp(" & str_left & ", " & str_right & ", " & mode & ") = " & x & " expected " & ex) -- 2.26.2

1 0

[PATCH] ntdll: Also save unwind info for rbp in call_consolidate_callback() on x64.
by Paul Gofman Aug. 21, 2020

Aug. 21, 2020

Fixes Bloons TD 6 crash on start. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 564b74b7be6..87acff3dcd4 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1029,9 +1029,9 @@ __ASM_GLOBAL_FUNC( call_consolidate_callback, __ASM_SEH(".seh_pushframe\n\t") __ASM_SEH(".seh_endprologue\n\t") - "subq $0xf8,%rsp\n\t" /* 10*16 (float regs) + 7*8 (int regs) + 32 (shadow store). */ - __ASM_SEH(".seh_stackalloc 0xf8\n\t") - __ASM_CFI(".cfi_adjust_cfa_offset 0xf8\n\t") + "subq $0x108,%rsp\n\t" /* 10*16 (float regs) + 8*8 (int regs) + 32 (shadow store) + 8 (align). */ + __ASM_SEH(".seh_stackalloc 0x108\n\t") + __ASM_CFI(".cfi_adjust_cfa_offset 0x108\n\t") /* Setup CFI unwind to context. */ "movq %rcx,0x10(%rbp)\n\t" @@ -1058,6 +1058,9 @@ __ASM_GLOBAL_FUNC( call_consolidate_callback, __ASM_CFI(".cfi_escape 0x10,0x20,0x06,0x76,0x10,0x06,0x23,0x90,0x05\n\t") /* %xmm15 */ /* Setup SEH unwind registers restore. */ + "movq 0xa0(%rcx),%rax\n\t" /* context->Rbp */ + "movq %rax,0x100(%rsp)\n\t" + __ASM_SEH(".seh_savereg %rbp, 0x100\n\t") "movq 0x90(%rcx),%rax\n\t" /* context->Rbx */ "movq %rax,0x20(%rsp)\n\t" __ASM_SEH(".seh_savereg %rbx, 0x20\n\t") -- 2.26.2

1 0

[PATCH 1/3] windowscodecs: In struct DdsFrameDecode, add a new member "pixel_data" and rename member "data" to "block_data".
by Ziqing Hui Aug. 21, 2020

Aug. 21, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)

2 2

[PATCH] ntdll: Read the condition variable and manipulate the lock on the PE side.
by Zebediah Figura Aug. 21, 2020

Aug. 21, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49712 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/sync.c | 21 +++------ dlls/ntdll/unix/loader.c | 3 +- dlls/ntdll/unix/sync.c | 84 ++++++---------------------------- dlls/ntdll/unix/unix_private.h | 7 +-- dlls/ntdll/unixlib.h | 8 +--- 5 files changed, 26 insertions(+), 97 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index edbdd91c1b9..8df7015df9f 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -481,16 +481,12 @@ void WINAPI RtlWakeAllConditionVariable( RTL_CONDITION_VARIABLE *variable ) NTSTATUS WINAPI RtlSleepConditionVariableCS( RTL_CONDITION_VARIABLE *variable, RTL_CRITICAL_SECTION *crit, const LARGE_INTEGER *timeout ) { + const void *value = variable->Ptr; NTSTATUS status; - int val; - if ((status = unix_funcs->fast_RtlSleepConditionVariableCS( variable, crit, - timeout )) != STATUS_NOT_IMPLEMENTED) - return status; - - val = *(int *)&variable->Ptr; RtlLeaveCriticalSection( crit ); - status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); + if ((status = unix_funcs->fast_wait_cv( variable, value, timeout )) == STATUS_NOT_IMPLEMENTED) + status = RtlWaitOnAddress( &variable->Ptr, &value, sizeof(value), timeout ); RtlEnterCriticalSection( crit ); return status; } @@ -517,21 +513,16 @@ NTSTATUS WINAPI RtlSleepConditionVariableCS( RTL_CONDITION_VARIABLE *variable, R NTSTATUS WINAPI RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, RTL_SRWLOCK *lock, const LARGE_INTEGER *timeout, ULONG flags ) { + const void *value = variable->Ptr; NTSTATUS status; - int val; - - if ((status = unix_funcs->fast_RtlSleepConditionVariableSRW( variable, lock, timeout, - flags )) != STATUS_NOT_IMPLEMENTED) - return status; - - val = *(int *)&variable->Ptr; if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) RtlReleaseSRWLockShared( lock ); else RtlReleaseSRWLockExclusive( lock ); - status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); + if ((status = unix_funcs->fast_wait_cv( variable, value, timeout )) == STATUS_NOT_IMPLEMENTED) + status = RtlWaitOnAddress( variable, &value, sizeof(value), timeout ); if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) RtlAcquireSRWLockShared( lock ); diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index e7cc050ba9d..1424bf3cc6a 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1383,9 +1383,8 @@ static struct unix_funcs unix_funcs = fast_RtlAcquireSRWLockShared, fast_RtlReleaseSRWLockExclusive, fast_RtlReleaseSRWLockShared, - fast_RtlSleepConditionVariableSRW, - fast_RtlSleepConditionVariableCS, fast_RtlWakeConditionVariable, + fast_wait_cv, ntdll_atan, ntdll_ceil, ntdll_cos, diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 23dca9c61b3..18e64b02627 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -2490,81 +2490,34 @@ NTSTATUS CDECL fast_RtlReleaseSRWLockShared( RTL_SRWLOCK *lock ) return STATUS_SUCCESS; } -static NTSTATUS wait_cv( int *futex, int val, const LARGE_INTEGER *timeout ) +NTSTATUS CDECL fast_wait_cv( RTL_CONDITION_VARIABLE *variable, const void *value, const LARGE_INTEGER *timeout ) { + const char *value_ptr; + int aligned_value, *futex; struct timespec timespec; int ret; - if (timeout && timeout->QuadPart != TIMEOUT_INFINITE) - { - timespec_from_timeout( &timespec, timeout ); - ret = futex_wait( futex, val, &timespec ); - } - else - ret = futex_wait( futex, val, NULL ); - - if (ret == -1 && errno == ETIMEDOUT) - return STATUS_TIMEOUT; - return STATUS_WAIT_0; -} - -NTSTATUS CDECL fast_RtlSleepConditionVariableCS( RTL_CONDITION_VARIABLE *variable, - RTL_CRITICAL_SECTION *cs, const LARGE_INTEGER *timeout ) -{ - NTSTATUS status; - int val, *futex; - if (!use_futexes()) return STATUS_NOT_IMPLEMENTED; if (!(futex = get_futex( &variable->Ptr ))) return STATUS_NOT_IMPLEMENTED; - val = *futex; + value_ptr = (const char *)&value; + value_ptr += ((ULONG_PTR)futex) - ((ULONG_PTR)&variable->Ptr); + aligned_value = *(int *)value_ptr; - if (cs->RecursionCount == 1) + if (timeout && timeout->QuadPart != TIMEOUT_INFINITE) { - /* FIXME: simplified version of RtlLeaveCriticalSection/RtlEnterCriticalSection to avoid imports */ - cs->RecursionCount = 0; - cs->OwningThread = 0; - if (InterlockedDecrement( &cs->LockCount ) >= 0) fast_RtlpUnWaitCriticalSection( cs ); - - status = wait_cv( futex, val, timeout ); - - if (InterlockedIncrement( &cs->LockCount )) fast_RtlpWaitForCriticalSection( cs, INT_MAX ); - cs->OwningThread = ULongToHandle( GetCurrentThreadId() ); - cs->RecursionCount = 1; + timespec_from_timeout( &timespec, timeout ); + ret = futex_wait( futex, aligned_value, &timespec ); } - else status = wait_cv( futex, val, timeout ); - return status; -} - -NTSTATUS CDECL fast_RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, RTL_SRWLOCK *lock, - const LARGE_INTEGER *timeout, ULONG flags ) -{ - NTSTATUS status; - int val, *futex; - - if (!use_futexes()) - return STATUS_NOT_IMPLEMENTED; - - if (!(futex = get_futex( &variable->Ptr )) || !get_futex( &lock->Ptr )) - return STATUS_NOT_IMPLEMENTED; - - val = *futex; - - if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) - fast_RtlReleaseSRWLockShared( lock ); else - fast_RtlReleaseSRWLockExclusive( lock ); - - status = wait_cv( futex, val, timeout ); + ret = futex_wait( futex, aligned_value, NULL ); - if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) - fast_RtlAcquireSRWLockShared( lock ); - else - fast_RtlAcquireSRWLockExclusive( lock ); - return status; + if (ret == -1 && errno == ETIMEDOUT) + return STATUS_TIMEOUT; + return STATUS_WAIT_0; } NTSTATUS CDECL fast_RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable, int count ) @@ -2678,19 +2631,12 @@ NTSTATUS CDECL fast_RtlReleaseSRWLockShared( RTL_SRWLOCK *lock ) return STATUS_NOT_IMPLEMENTED; } -NTSTATUS CDECL fast_RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, RTL_SRWLOCK *lock, - const LARGE_INTEGER *timeout, ULONG flags ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS CDECL fast_RtlSleepConditionVariableCS( RTL_CONDITION_VARIABLE *variable, - RTL_CRITICAL_SECTION *cs, const LARGE_INTEGER *timeout ) +NTSTATUS CDECL fast_RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable, int count ) { return STATUS_NOT_IMPLEMENTED; } -NTSTATUS CDECL fast_RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable, int count ) +NTSTATUS CDECL fast_wait_cv( RTL_CONDITION_VARIABLE *variable, const void *value, const LARGE_INTEGER *timeout ) { return STATUS_NOT_IMPLEMENTED; } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 397211957bd..1d3d58b2533 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -98,13 +98,10 @@ extern NTSTATUS CDECL fast_RtlTryAcquireSRWLockShared( RTL_SRWLOCK *lock ) DECLS extern NTSTATUS CDECL fast_RtlAcquireSRWLockShared( RTL_SRWLOCK *lock ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_RtlReleaseSRWLockExclusive( RTL_SRWLOCK *lock ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_RtlReleaseSRWLockShared( RTL_SRWLOCK *lock ) DECLSPEC_HIDDEN; -extern NTSTATUS CDECL fast_RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, RTL_SRWLOCK *lock, - const LARGE_INTEGER *timeout, ULONG flags ) DECLSPEC_HIDDEN; -extern NTSTATUS CDECL fast_RtlSleepConditionVariableCS( RTL_CONDITION_VARIABLE *variable, - RTL_CRITICAL_SECTION *cs, - const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable, int count ) DECLSPEC_HIDDEN; extern LONGLONG CDECL fast_RtlGetSystemTimePrecise(void) DECLSPEC_HIDDEN; +extern NTSTATUS CDECL fast_wait_cv( RTL_CONDITION_VARIABLE *variable, const void *value, + const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN; void CDECL mmap_add_reserved_area( void *addr, SIZE_T size ) DECLSPEC_HIDDEN; void CDECL mmap_remove_reserved_area( void *addr, SIZE_T size ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 2f57873671c..2af1bc6ac98 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -53,13 +53,9 @@ struct unix_funcs NTSTATUS (CDECL *fast_RtlAcquireSRWLockShared)( RTL_SRWLOCK *lock ); NTSTATUS (CDECL *fast_RtlReleaseSRWLockExclusive)( RTL_SRWLOCK *lock ); NTSTATUS (CDECL *fast_RtlReleaseSRWLockShared)( RTL_SRWLOCK *lock ); - NTSTATUS (CDECL *fast_RtlSleepConditionVariableSRW)( RTL_CONDITION_VARIABLE *variable, - RTL_SRWLOCK *lock, - const LARGE_INTEGER *timeout, ULONG flags ); - NTSTATUS (CDECL *fast_RtlSleepConditionVariableCS)( RTL_CONDITION_VARIABLE *variable, - RTL_CRITICAL_SECTION *cs, - const LARGE_INTEGER *timeout ); NTSTATUS (CDECL *fast_RtlWakeConditionVariable)( RTL_CONDITION_VARIABLE *variable, int count ); + NTSTATUS (CDECL *fast_wait_cv)( RTL_CONDITION_VARIABLE *variable, const void *value, + const LARGE_INTEGER *timeout ); /* math functions */ double (CDECL *atan)( double d ); -- 2.28.0

3 3

[PATCH v2] ntdll: Decouple pthread stack and win32 stack.
by Jefferson Carpenter Aug. 21, 2020

Aug. 21, 2020

Pass DeallocationStack to NtFreeVirtualMemory.

1 1