June 2020 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Move the futex-based condition variable implementation to the Unix library.
by Alexandre Julliard 09 Jun '20

09 Jun '20

Module: wine Branch: master Commit: 509ad75adbca85d606a3bd8bba727abf0751cebc URL: https://source.winehq.org/git/wine.git/?a=commit;h=509ad75adbca85d606a3bd8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 9 12:38:37 2020 +0200 ntdll: Move the futex-based condition variable implementation to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 119 +++-------------------------------------- dlls/ntdll/unix/loader.c | 3 ++ dlls/ntdll/unix/sync.c | 115 +++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 6 +++ dlls/ntdll/unixlib.h | 9 +++- 5 files changed, 138 insertions(+), 114 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=509ad75adbca85d606a3…

1 0

Alexandre Julliard : ntdll: Move the wait on address implementation to the Unix library.
by Alexandre Julliard 09 Jun '20

09 Jun '20

Module: wine Branch: master Commit: 552bc8aa4703b674747df36c591038da17c0c858 URL: https://source.winehq.org/git/wine.git/?a=commit;h=552bc8aa4703b674747df36c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 9 12:39:49 2020 +0200 ntdll: Move the wait on address implementation to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 - dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/sync.c | 208 +---------------------------------------- dlls/ntdll/unix/loader.c | 4 +- dlls/ntdll/unix/server.c | 6 +- dlls/ntdll/unix/sync.c | 168 +++++++++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 10 +- dlls/ntdll/unixlib.h | 7 +- 8 files changed, 186 insertions(+), 220 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=552bc8aa4703b674747d…

1 0

Alexandre Julliard : ntdll: Move the futex-based critical section implementation to the Unix library.
by Alexandre Julliard 09 Jun '20

09 Jun '20

Module: wine Branch: master Commit: ff19f21913c508f5827df0e7e4c3a351c36711a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff19f21913c508f5827df0e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 9 13:05:58 2020 +0200 ntdll: Move the futex-based critical section implementation to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/critsection.c | 201 ++--------------------------------------- dlls/ntdll/unix/loader.c | 4 +- dlls/ntdll/unix/server.c | 4 +- dlls/ntdll/unix/sync.c | 171 +++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 7 +- dlls/ntdll/unixlib.h | 7 +- 6 files changed, 191 insertions(+), 203 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ff19f21913c508f5827d…

1 0

Alexandre Julliard : ntdll: Avoid overflowing the command line buffer.
by Alexandre Julliard 09 Jun '20

09 Jun '20

Module: wine Branch: master Commit: a240abf12b615a50105e4567951df7c1e01d5a03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a240abf12b615a50105e4567… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 9 18:34:00 2020 +0200 ntdll: Avoid overflowing the command line buffer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49314 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index f8b243154b..6b32f4d57e 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -811,8 +811,7 @@ static void build_command_line( WCHAR **argv, UNICODE_STRING *cmdline ) len = 1; for (arg = argv; *arg; arg++) len += 3 + 2 * wcslen( *arg ); - cmdline->MaximumLength = len * sizeof(WCHAR); - if (!(cmdline->Buffer = RtlAllocateHeap( GetProcessHeap(), 0, cmdline->MaximumLength ))) return; + if (!(cmdline->Buffer = RtlAllocateHeap( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return; p = cmdline->Buffer; for (arg = argv; *arg; arg++) @@ -858,7 +857,13 @@ static void build_command_line( WCHAR **argv, UNICODE_STRING *cmdline ) } if (p > cmdline->Buffer) p--; /* remove last space */ *p = 0; + if (p - cmdline->Buffer >= 32767) + { + ERR( "command line too long (%u)\n", (DWORD)(p - cmdline->Buffer) ); + NtTerminateProcess( GetCurrentProcess(), 1 ); + } cmdline->Length = (p - cmdline->Buffer) * sizeof(WCHAR); + cmdline->MaximumLength = cmdline->Length + sizeof(WCHAR); }

1 0

Jacek Caban : winnt.h: Add BitScanForward and BitScanReverse implementation.
by Alexandre Julliard 09 Jun '20

09 Jun '20

Module: wine Branch: master Commit: 2618162e898e414d930535516c3d1cd5e6152cf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2618162e898e414d93053551… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 8 18:08:00 2020 +0200 winnt.h: Add BitScanForward and BitScanReverse implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index aa4daaa55f..863b19eae5 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6717,6 +6717,58 @@ typedef enum _PROCESS_MITIGATION_POLICY MaxProcessMitigationPolicy } PROCESS_MITIGATION_POLICY, *PPROCESS_MITIGATION_POLICY; +#ifdef _MSC_VER + +BOOLEAN _BitScanForward(unsigned long*,unsigned long); +BOOLEAN _BitScanReverse(unsigned long*,unsigned long); + +#pragma intrinsic(_BitScanForward) +#pragma intrinsic(_BitScanReverse) + +static inline BOOLEAN BitScanForward(DWORD *index, DWORD mask) +{ + return _BitScanForward((unsigned long*)index, mask); +} + +static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) +{ + return _BitScanReverse((unsigned long*)index, mask); +} + +#elif defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) + +static inline BOOLEAN BitScanForward(DWORD *index, DWORD mask) +{ + *index = __builtin_ctz(mask); + return mask != 0; +} + +static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) +{ + *index = 31 - __builtin_clz(mask); + return mask != 0; +} + +#else + +static inline BOOLEAN BitScanForward(DWORD *index, DWORD mask) +{ + unsigned int r = 0; + while (r < 31 && !(mask & (1 << r))) r++; + *index = r; + return mask != 0; +} + +static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) +{ + unsigned int r = 31; + while (r > 0 && !(mask & (1 << r))) r--; + *index = r; + return mask != 0; +} + +#endif + #ifdef __cplusplus } #endif

1 0

Jacek Caban : ntdll: Reimplement _aulldiv using 32-bit arithmetic.
by Alexandre Julliard 09 Jun '20

09 Jun '20

Module: wine Branch: master Commit: d53672c6ecc8f1f1a0b883475028871c9e003431 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d53672c6ecc8f1f1a0b88347… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 8 18:12:01 2020 +0200 ntdll: Reimplement _aulldiv using 32-bit arithmetic. Based on compiler-rt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/large_int.c | 179 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 178 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c index e7b71c9385..6b63fb87ee 100644 --- a/dlls/ntdll/large_int.c +++ b/dlls/ntdll/large_int.c @@ -545,6 +545,183 @@ NTSTATUS WINAPI RtlInt64ToUnicodeString( #ifdef __i386__ +static ULONGLONG udivmod(ULONGLONG a, ULONGLONG b, ULONGLONG *rem) +{ + const ULARGE_INTEGER n = { .QuadPart = a }; + const ULARGE_INTEGER d = { .QuadPart = b }; + DWORD sr, carry, index; + ULARGE_INTEGER q, r; + + const unsigned n_uword_bits = 32; + const unsigned n_udword_bits = 64; + + /* special cases, X is unknown, K != 0 */ + if (n.u.HighPart == 0) + { + if (d.u.HighPart == 0) + { + /* 0 X / 0 X */ + if (rem) *rem = n.u.LowPart % d.u.LowPart; + return n.u.LowPart / d.u.LowPart; + } + /* 0 X / K X */ + if (rem) *rem = n.u.LowPart; + return 0; + } + + /* n.u.HighPart != 0 */ + if (d.u.LowPart == 0) + { + if (d.u.HighPart == 0) + { + /* K X / 0 0 */ + if (rem) *rem = n.u.HighPart % d.u.LowPart; + return n.u.HighPart / d.u.LowPart; + } + /* d.u.HighPart != 0 */ + if (n.u.LowPart == 0) { + /* K 0 / K 0 */ + if (rem) + { + r.u.HighPart = n.u.HighPart % d.u.HighPart; + r.u.LowPart = 0; + *rem = r.QuadPart; + } + return n.u.HighPart / d.u.HighPart; + } + /* K K / K 0 */ + if ((d.u.HighPart & (d.u.HighPart - 1)) == 0) /* if d is a power of 2 */ + { + if (rem) + { + r.u.LowPart = n.u.LowPart; + r.u.HighPart = n.u.HighPart & (d.u.HighPart - 1); + *rem = r.QuadPart; + } + BitScanForward(&index, d.u.HighPart); + return n.u.HighPart >> index; + } + /* K K / K 0 */ + BitScanReverse(&index, d.u.HighPart); + BitScanReverse(&sr, n.u.HighPart); + sr -= index; + /* 0 <= sr <= n_uword_bits - 2 or sr large */ + if (sr > n_uword_bits - 2) + { + if (rem) *rem = n.QuadPart; + return 0; + } + ++sr; + /* 1 <= sr <= n_uword_bits - 1 */ + /* q.QuadPart = n.QuadPart << (n_udword_bits - sr); */ + q.u.LowPart = 0; + q.u.HighPart = n.u.LowPart << (n_uword_bits - sr); + /* r.QuadPart = n.QuadPart >> sr; */ + r.u.HighPart = n.u.HighPart >> sr; + r.u.LowPart = (n.u.HighPart << (n_uword_bits - sr)) | (n.u.LowPart >> sr); + } + else /* d.u.LowPart != 0 */ + { + if (d.u.HighPart == 0) + { + /* K X / 0 K */ + if ((d.u.LowPart & (d.u.LowPart - 1)) == 0) /* if d is a power of 2 */ + { + if (rem) *rem = n.u.LowPart & (d.u.LowPart - 1); + if (d.u.LowPart == 1) return n.QuadPart; + BitScanForward(&sr, d.u.LowPart); + q.u.HighPart = n.u.HighPart >> sr; + q.u.LowPart = (n.u.HighPart << (n_uword_bits - sr)) | (n.u.LowPart >> sr); + return q.QuadPart; + } + BitScanReverse(&index, d.u.LowPart); + BitScanReverse(&sr, n.u.HighPart); + sr = 1 + n_uword_bits + sr - index; + /* 2 <= sr <= n_udword_bits - 1 + * q.QuadPart = n.QuadPart << (n_udword_bits - sr); + * r.QuadPart = n.QuadPart >> sr; */ + if (sr == n_uword_bits) + { + q.u.LowPart = 0; + q.u.HighPart = n.u.LowPart; + r.u.HighPart = 0; + r.u.LowPart = n.u.HighPart; + } + else if (sr < n_uword_bits) /* 2 <= sr <= n_uword_bits - 1 */ + { + q.u.LowPart = 0; + q.u.HighPart = n.u.LowPart << (n_uword_bits - sr); + r.u.HighPart = n.u.HighPart >> sr; + r.u.LowPart = (n.u.HighPart << (n_uword_bits - sr)) | (n.u.LowPart >> sr); + } + else /* n_uword_bits + 1 <= sr <= n_udword_bits - 1 */ + { + q.u.LowPart = n.u.LowPart << (n_udword_bits - sr); + q.u.HighPart = (n.u.HighPart << (n_udword_bits - sr)) | + (n.u.LowPart >> (sr - n_uword_bits)); + r.u.HighPart = 0; + r.u.LowPart = n.u.HighPart >> (sr - n_uword_bits); + } + } + else + { + /* K X / K K */ + BitScanReverse(&index, d.u.HighPart); + BitScanReverse(&sr, n.u.HighPart); + sr -= index; + /* 0 <= sr <= n_uword_bits - 1 or sr large */ + if (sr > n_uword_bits - 1) + { + if (rem) *rem = n.QuadPart; + return 0; + } + ++sr; + /* 1 <= sr <= n_uword_bits + * q.QuadPart = n.QuadPart << (n_udword_bits - sr); */ + q.u.LowPart = 0; + if (sr == n_uword_bits) + { + q.u.HighPart = n.u.LowPart; + r.u.HighPart = 0; + r.u.LowPart = n.u.HighPart; + } + else + { + q.u.HighPart = n.u.LowPart << (n_uword_bits - sr); + r.u.HighPart = n.u.HighPart >> sr; + r.u.LowPart = (n.u.HighPart << (n_uword_bits - sr)) | (n.u.LowPart >> sr); + } + } + } + /* Not a special case + * q and r are initialized with: + * q.QuadPart = n.QuadPart << (n_udword_bits - sr); + * r.QuadPart = n.QuadPart >> sr; + * 1 <= sr <= n_udword_bits - 1 */ + carry = 0; + for (; sr > 0; --sr) + { + LONGLONG s; + /* r:q = ((r:q) << 1) | carry */ + r.u.HighPart = (r.u.HighPart << 1) | (r.u.LowPart >> (n_uword_bits - 1)); + r.u.LowPart = (r.u.LowPart << 1) | (q.u.HighPart >> (n_uword_bits - 1)); + q.u.HighPart = (q.u.HighPart << 1) | (q.u.LowPart >> (n_uword_bits - 1)); + q.u.LowPart = (q.u.LowPart << 1) | carry; + /* if (r.QuadPart >= d.QuadPart) + * { + * r.QuadPart -= d.QuadPart; + * carry = 1; + * } + */ + s = (LONGLONG)(d.QuadPart - r.QuadPart - 1) >> (n_udword_bits - 1); + carry = s & 1; + r.QuadPart -= d.QuadPart & s; + } + q.QuadPart = (q.QuadPart << 1) | carry; + if (rem) *rem = r.QuadPart; + return q.QuadPart; +} + /****************************************************************************** * _alldiv (NTDLL.@) * @@ -613,7 +790,7 @@ LONGLONG WINAPI _allrem( LONGLONG a, LONGLONG b ) */ ULONGLONG WINAPI _aulldiv( ULONGLONG a, ULONGLONG b ) { - return a / b; + return udivmod(a, b, NULL); } /******************************************************************************

1 0

Jacek Caban : ntdll: Reimplement _aullrem using 32-bit arithmetic.
by Alexandre Julliard 09 Jun '20

09 Jun '20

Module: wine Branch: master Commit: 744843ed013e5e74f3e59cb197a67d05a28654b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=744843ed013e5e74f3e59cb1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 8 18:12:13 2020 +0200 ntdll: Reimplement _aullrem using 32-bit arithmetic. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/large_int.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c index 6b63fb87ee..e55d450e1e 100644 --- a/dlls/ntdll/large_int.c +++ b/dlls/ntdll/large_int.c @@ -878,7 +878,9 @@ __ASM_STDCALL_FUNC( _alldvrm, 16, */ ULONGLONG WINAPI _aullrem( ULONGLONG a, ULONGLONG b ) { - return a % b; + ULONGLONG r; + udivmod(a, b, &r); + return r; } /******************************************************************************

1 0

Jacek Caban : ntdll: Reimplement _alldiv using 32-bit arithmetic.
by Alexandre Julliard 09 Jun '20

09 Jun '20

Module: wine Branch: master Commit: 8f144eb566c0bbbe925e5fb81b67873ed6b9e8bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f144eb566c0bbbe925e5fb8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 8 18:12:21 2020 +0200 ntdll: Reimplement _alldiv using 32-bit arithmetic. Based on compiler-rt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/large_int.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c index e55d450e1e..5f53a3f404 100644 --- a/dlls/ntdll/large_int.c +++ b/dlls/ntdll/large_int.c @@ -736,7 +736,12 @@ static ULONGLONG udivmod(ULONGLONG a, ULONGLONG b, ULONGLONG *rem) */ LONGLONG WINAPI _alldiv( LONGLONG a, LONGLONG b ) { - return a / b; + LONGLONG s_a = a >> 63; /* s_a = a < 0 ? -1 : 0 */ + LONGLONG s_b = b >> 63; /* s_b = b < 0 ? -1 : 0 */ + a = (a ^ s_a) - s_a; /* negate if s_a == -1 */ + b = (b ^ s_b) - s_b; /* negate if s_b == -1 */ + s_a ^= s_b; /* sign of quotient */ + return (udivmod(a, b, NULL) ^ s_a) - s_a; /* negate if s_a == -1 */ }

1 0

Jacek Caban : ntdll: Reimplement _allrem using 32-bit arithmetic.
by Alexandre Julliard 09 Jun '20

09 Jun '20

Module: wine Branch: master Commit: 0547da64a3c431ffbc8a9304aaeb1dec3b448612 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0547da64a3c431ffbc8a9304… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 8 18:12:27 2020 +0200 ntdll: Reimplement _allrem using 32-bit arithmetic. Based on compiler-rt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/large_int.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c index 5f53a3f404..7114b8c2d9 100644 --- a/dlls/ntdll/large_int.c +++ b/dlls/ntdll/large_int.c @@ -777,7 +777,13 @@ LONGLONG WINAPI _allmul( LONGLONG a, LONGLONG b ) */ LONGLONG WINAPI _allrem( LONGLONG a, LONGLONG b ) { - return a % b; + LONGLONG s = b >> 63; /* s = b < 0 ? -1 : 0 */ + ULONGLONG r; + b = (b ^ s) - s; /* negate if s == -1 */ + s = a >> 63; /* s = a < 0 ? -1 : 0 */ + a = (a ^ s) - s; /* negate if s == -1 */ + udivmod(a, b, &r); + return ((LONGLONG)r ^ s) - s; /* negate if s == -1 */ }

1 0

Anton Baskanov : winegstreamer: Commit allocator before pausing the stream.
by Alexandre Julliard 09 Jun '20

09 Jun '20

Module: wine Branch: master Commit: a18bc50f2f38b9ab771b4e6ef11ccede4f0814cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=a18bc50f2f38b9ab771b4e6e… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Jun 9 01:00:55 2020 +0700 winegstreamer: Commit allocator before pausing the stream. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 299a7ddf56..7c38e421f9 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1391,6 +1391,15 @@ static HRESULT gstdemux_init_stream(struct strmbase_filter *iface) if (!filter->container) return VFW_E_NOT_CONNECTED; + for (i = 0; i < filter->source_count; ++i) + { + if (SUCCEEDED(pin_hr = BaseOutputPinImpl_Active(&filter->sources[i]->pin))) + hr = pin_hr; + } + + if (FAILED(hr)) + return hr; + if (filter->no_more_pads_event) ResetEvent(filter->no_more_pads_event); @@ -1422,11 +1431,6 @@ static HRESULT gstdemux_init_stream(struct strmbase_filter *iface) stop_type, seeking->llStop * 100)); } - for (i = 0; i < filter->source_count; ++i) - { - if (SUCCEEDED(pin_hr = BaseOutputPinImpl_Active(&filter->sources[i]->pin))) - hr = pin_hr; - } return hr; }

1 0