wine-commits June 2020

wine-commits@winehq.org

1 participants
947 discussions

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 : 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

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

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: 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 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 futex-based SRW lock implementation to the Unix library.
by Alexandre Julliard 09 Jun '20

09 Jun '20

Module: wine Branch: master Commit: 246dedaa091308f140a3cac41845f5e978492e37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=246dedaa091308f140a3cac4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 9 12:35:01 2020 +0200 ntdll: Move the futex-based SRW lock implementation to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 307 +----------------------------------- dlls/ntdll/unix/loader.c | 6 + dlls/ntdll/unix/sync.c | 345 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 7 + dlls/ntdll/unixlib.h | 10 +- 5 files changed, 373 insertions(+), 302 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=246dedaa091308f140a3…

1 0

Alexandre Julliard : ntdll: Move some more thread functions to the Unix library.
by Alexandre Julliard 09 Jun '20

09 Jun '20

Module: wine Branch: master Commit: 4d70266274c1102c385dd00303d312d94453d19b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d70266274c1102c385dd003… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 9 12:34:37 2020 +0200 ntdll: Move some more thread functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 80 +++--------------------- dlls/ntdll/unix/loader.c | 8 ++- dlls/ntdll/unix/thread.c | 134 ++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unixlib.h | 11 +++- 5 files changed, 157 insertions(+), 78 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4d70266274c1102c385d…

1 0

Alexandre Julliard : ntdll: Move signal handlers to the Unix library.
by Alexandre Julliard 09 Jun '20

09 Jun '20

Module: wine Branch: master Commit: 2333099c52566c6cf3d3f981588a26d4ff408155 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2333099c52566c6cf3d3f981… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 9 12:32:41 2020 +0200 ntdll: Move signal handlers to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/exception.c | 71 -- dlls/ntdll/loader.c | 5 +- dlls/ntdll/ntdll_misc.h | 18 - dlls/ntdll/server.c | 153 ---- dlls/ntdll/signal_arm.c | 587 --------------- dlls/ntdll/signal_arm64.c | 458 ------------ dlls/ntdll/signal_i386.c | 1489 -------------------------------------- dlls/ntdll/signal_powerpc.c | 580 +-------------- dlls/ntdll/signal_x86_64.c | 718 +----------------- dlls/ntdll/thread.c | 12 +- dlls/ntdll/unix/loader.c | 6 - dlls/ntdll/unix/server.c | 33 +- dlls/ntdll/unix/signal_arm.c | 508 +++++++++++++ dlls/ntdll/unix/signal_arm64.c | 431 +++++++++++ dlls/ntdll/unix/signal_i386.c | 1310 ++++++++++++++++++++++++++++++++- dlls/ntdll/unix/signal_powerpc.c | 488 +++++++++++++ dlls/ntdll/unix/signal_x86_64.c | 778 +++++++++++++++++++- dlls/ntdll/unix/thread.c | 11 +- dlls/ntdll/unix/unix_private.h | 15 +- dlls/ntdll/unix/virtual.c | 10 +- dlls/ntdll/unixlib.h | 10 +- dlls/ntdll/virtual.c | 44 +- 22 files changed, 3582 insertions(+), 4153 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2333099c52566c6cf3d3…

1 0

Dmitry Timoshkov : crypt32: Store CRYPT_KEY_PROV_INFO in a platform independent way.
by Alexandre Julliard 09 Jun '20

09 Jun '20

Module: wine Branch: master Commit: fd1be205ba7dc9691427aab4c35278e88eff081c URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd1be205ba7dc9691427aab4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 9 10:32:37 2020 +0800 crypt32: Store CRYPT_KEY_PROV_INFO in a platform independent way. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 151 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 101 insertions(+), 50 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 488b84001c..e4cab01cd9 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -520,38 +520,85 @@ static BOOL CertContext_GetProperty(cert_t *cert, DWORD dwPropId, return ret; } -void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO info) +/* 64-bit compatible layout, so that 64-bit crypt32 is able to read + * the structure saved by 32-bit crypt32. + */ +typedef struct { - DWORD i, containerLen, provNameLen; - LPBYTE data = (LPBYTE)info + sizeof(CRYPT_KEY_PROV_INFO); + ULONG64 pwszContainerName; + ULONG64 pwszProvName; + DWORD dwProvType; + DWORD dwFlags; + DWORD cProvParam; + ULONG64 rgProvParam; + DWORD dwKeySpec; +} store_CRYPT_KEY_PROV_INFO; - if (info->pwszContainerName) +typedef struct +{ + DWORD dwParam; + ULONG64 pbData; + DWORD cbData; + DWORD dwFlags; +} store_CRYPT_KEY_PROV_PARAM; + +void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO buf) +{ + CRYPT_KEY_PROV_INFO info; + store_CRYPT_KEY_PROV_INFO *store = (store_CRYPT_KEY_PROV_INFO *)buf; + BYTE *p = (BYTE *)(store + 1); + + if (store->pwszContainerName) { - info->pwszContainerName = (LPWSTR)data; - containerLen = (lstrlenW(info->pwszContainerName) + 1) * sizeof(WCHAR); - data += containerLen; + info.pwszContainerName = (LPWSTR)p; + p += (lstrlenW(info.pwszContainerName) + 1) * sizeof(WCHAR); } + else + info.pwszContainerName = NULL; - if (info->pwszProvName) + if (store->pwszProvName) { - info->pwszProvName = (LPWSTR)data; - provNameLen = (lstrlenW(info->pwszProvName) + 1) * sizeof(WCHAR); - data += provNameLen; + info.pwszProvName = (LPWSTR)p; + p += (lstrlenW(info.pwszProvName) + 1) * sizeof(WCHAR); } + else + info.pwszProvName = NULL; + + info.dwProvType = store->dwProvType; + info.dwFlags = store->dwFlags; + info.dwKeySpec = store->dwKeySpec; + info.cProvParam = store->cProvParam; - if (info->cProvParam) + if (info.cProvParam) { - info->rgProvParam = (PCRYPT_KEY_PROV_PARAM)data; - data += info->cProvParam * sizeof(CRYPT_KEY_PROV_PARAM); + DWORD i; + + info.rgProvParam = (CRYPT_KEY_PROV_PARAM *)p; - for (i = 0; i < info->cProvParam; i++) + for (i = 0; i < store->cProvParam; i++) { - info->rgProvParam[i].pbData = data; - data += info->rgProvParam[i].cbData; + CRYPT_KEY_PROV_PARAM param; + store_CRYPT_KEY_PROV_PARAM *store_param; + + store_param = (store_CRYPT_KEY_PROV_PARAM *)p; + p += sizeof(*store_param); + + param.dwParam = store_param[i].dwParam; + param.dwFlags = store_param[i].dwFlags; + param.cbData = store_param[i].cbData; + param.pbData = param.cbData ? p : NULL; + p += store_param[i].cbData; + + memcpy(&info.rgProvParam[i], &param, sizeof(param)); } } else - info->rgProvParam = NULL; + info.rgProvParam = NULL; + + TRACE("%s,%s,%u,%08x,%u,%p,%u\n", debugstr_w(info.pwszContainerName), debugstr_w(info.pwszProvName), + info.dwProvType, info.dwFlags, info.cProvParam, info.rgProvParam, info.dwKeySpec); + + *buf = info; } BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext, @@ -606,72 +653,76 @@ BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext, * data, but whose pointers are uninitialized. * Upon return, to contains a contiguous copy of from, packed in the following * order: - * - CRYPT_KEY_PROV_INFO + * - store_CRYPT_KEY_PROV_INFO * - pwszContainerName * - pwszProvName - * - rgProvParam[0]... + * - store_CRYPT_KEY_PROV_PARAM[0] + * - store_CRYPT_KEY_PROV_PARAM[0].data + * - ... */ -static void CRYPT_CopyKeyProvInfo(PCRYPT_KEY_PROV_INFO to, - const CRYPT_KEY_PROV_INFO *from) +static void CRYPT_CopyKeyProvInfo(store_CRYPT_KEY_PROV_INFO *to, const CRYPT_KEY_PROV_INFO *from) { DWORD i; - LPBYTE nextData = (LPBYTE)to + sizeof(CRYPT_KEY_PROV_INFO); + BYTE *p; + store_CRYPT_KEY_PROV_PARAM *param; + + p = (BYTE *)(to + 1); if (from->pwszContainerName) { - to->pwszContainerName = (LPWSTR)nextData; - lstrcpyW(to->pwszContainerName, from->pwszContainerName); - nextData += (lstrlenW(from->pwszContainerName) + 1) * sizeof(WCHAR); + to->pwszContainerName = p - (BYTE *)to; + lstrcpyW((LPWSTR)p, from->pwszContainerName); + p += (lstrlenW(from->pwszContainerName) + 1) * sizeof(WCHAR); } else - to->pwszContainerName = NULL; + to->pwszContainerName = 0; + if (from->pwszProvName) { - to->pwszProvName = (LPWSTR)nextData; - lstrcpyW(to->pwszProvName, from->pwszProvName); - nextData += (lstrlenW(from->pwszProvName) + 1) * sizeof(WCHAR); + to->pwszProvName = p - (BYTE *)to; + lstrcpyW((LPWSTR)p, from->pwszProvName); + p += (lstrlenW(from->pwszProvName) + 1) * sizeof(WCHAR); } else - to->pwszProvName = NULL; + to->pwszProvName = 0; + to->dwProvType = from->dwProvType; to->dwFlags = from->dwFlags; to->cProvParam = from->cProvParam; - to->rgProvParam = (PCRYPT_KEY_PROV_PARAM)nextData; - nextData += to->cProvParam * sizeof(CRYPT_KEY_PROV_PARAM); to->dwKeySpec = from->dwKeySpec; + for (i = 0; i < to->cProvParam; i++) { - memcpy(&to->rgProvParam[i], &from->rgProvParam[i], - sizeof(CRYPT_KEY_PROV_PARAM)); - to->rgProvParam[i].pbData = nextData; - memcpy(to->rgProvParam[i].pbData, from->rgProvParam[i].pbData, - from->rgProvParam[i].cbData); - nextData += from->rgProvParam[i].cbData; + param = (store_CRYPT_KEY_PROV_PARAM *)p; + p += sizeof(*param); + + param->dwParam = from->rgProvParam[i].dwParam; + param->cbData = from->rgProvParam[i].cbData; + param->dwFlags = from->rgProvParam[i].dwFlags; + memcpy(p, from->rgProvParam[i].pbData, from->rgProvParam[i].cbData); + p += from->rgProvParam[i].cbData; } } static BOOL CertContext_SetKeyProvInfoProperty(CONTEXT_PROPERTY_LIST *properties, const CRYPT_KEY_PROV_INFO *info) { + BYTE *buf; + DWORD size = sizeof(store_CRYPT_KEY_PROV_INFO), i; BOOL ret; - LPBYTE buf = NULL; - DWORD size = sizeof(CRYPT_KEY_PROV_INFO), i, containerSize, provNameSize; if (info->pwszContainerName) - containerSize = (lstrlenW(info->pwszContainerName) + 1) * sizeof(WCHAR); - else - containerSize = 0; + size += (lstrlenW(info->pwszContainerName) + 1) * sizeof(WCHAR); if (info->pwszProvName) - provNameSize = (lstrlenW(info->pwszProvName) + 1) * sizeof(WCHAR); - else - provNameSize = 0; - size += containerSize + provNameSize; + size += (lstrlenW(info->pwszProvName) + 1) * sizeof(WCHAR); + for (i = 0; i < info->cProvParam; i++) - size += sizeof(CRYPT_KEY_PROV_PARAM) + info->rgProvParam[i].cbData; + size += sizeof(store_CRYPT_KEY_PROV_PARAM) + info->rgProvParam[i].cbData; + buf = CryptMemAlloc(size); if (buf) { - CRYPT_CopyKeyProvInfo((PCRYPT_KEY_PROV_INFO)buf, info); + CRYPT_CopyKeyProvInfo((store_CRYPT_KEY_PROV_INFO *)buf, info); ret = ContextPropertyList_SetProperty(properties, CERT_KEY_PROV_INFO_PROP_ID, buf, size); CryptMemFree(buf);

1 0

← Newer
1
...
57
58
59
60
61
62
63
...
95
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2020